Merge branch 'appbase' into aes

This commit is contained in:
ZhanGSKen 2025-03-09 09:35:22 +08:00
commit 8be7a931eb
6 changed files with 26 additions and 32 deletions

View File

@ -44,8 +44,8 @@ android {
} }
dependencies { dependencies {
implementation project(':libappbase') api project(':libappbase')
implementation fileTree(dir: 'libs', include: ['*.jar']) api fileTree(dir: 'libs', include: ['*.jar'])
// SSH // SSH
implementation 'com.jcraft:jsch:0.1.55' implementation 'com.jcraft:jsch:0.1.55'
@ -60,7 +60,6 @@ dependencies {
implementation 'com.github.getActivity:ToastUtils:10.5' implementation 'com.github.getActivity:ToastUtils:10.5'
// //
implementation 'com.squareup.okhttp3:okhttp:4.4.1' implementation 'com.squareup.okhttp3:okhttp:4.4.1'
// Android // Android
implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.viewpager:viewpager:1.0.0' implementation 'androidx.viewpager:viewpager:1.0.0'

View File

@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Sat Mar 08 02:31:11 HKT 2025 #Sun Mar 09 09:15:39 HKT 2025
stageCount=2 stageCount=6
libraryProject=libappbase libraryProject=libappbase
baseVersion=2.1 baseVersion=2.1
publishVersion=2.1.1 publishVersion=2.1.5
buildCount=0 buildCount=0
baseBetaVersion=2.1.2 baseBetaVersion=2.1.6

View File

@ -1,12 +1,6 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
repositories { repositories {
// Nexus Maven
// "WinBoll Release"
maven { url "https://nexus.winboll.cc/repository/maven-public/" }
// "WinBoll Snapshot"
maven { url "https://nexus.winboll.cc/repository/maven-snapshots/" }
maven { url 'https://maven.aliyun.com/repository/public/' } maven { url 'https://maven.aliyun.com/repository/public/' }
maven { url 'https://maven.aliyun.com/repository/google/' } maven { url 'https://maven.aliyun.com/repository/google/' }
maven { url 'https://maven.aliyun.com/repository/gradle-plugin/' } maven { url 'https://maven.aliyun.com/repository/gradle-plugin/' }
@ -15,6 +9,13 @@ buildscript {
maven { url "https://jitpack.io" } maven { url "https://jitpack.io" }
mavenCentral() mavenCentral()
google() google()
// Nexus Maven
// "WinBoll Release"
maven { url "https://nexus.winboll.cc/repository/maven-public/" }
// "WinBoll Snapshot"
maven { url "https://nexus.winboll.cc/repository/maven-snapshots/" }
mavenLocal() mavenLocal()
} }
dependencies { dependencies {
@ -26,19 +27,6 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
// Nexus Maven
// "WinBoll Release"
maven { url "https://nexus.winboll.cc/repository/maven-public/" }
// "WinBoll Snapshot"
maven { url "https://nexus.winboll.cc/repository/maven-snapshots/" }
maven {
url "https://mirrors.tencent.com/repository/maven/tencent_public/"
}
maven {
url "https://mirrors.tencent.com/repository/maven/tencent_public_snapshots"
}
maven { url 'https://maven.aliyun.com/repository/public/' } maven { url 'https://maven.aliyun.com/repository/public/' }
maven { url 'https://maven.aliyun.com/repository/google/' } maven { url 'https://maven.aliyun.com/repository/google/' }
maven { url 'https://maven.aliyun.com/repository/gradle-plugin/' } maven { url 'https://maven.aliyun.com/repository/gradle-plugin/' }
@ -47,6 +35,13 @@ allprojects {
maven { url "https://jitpack.io" } maven { url "https://jitpack.io" }
mavenCentral() mavenCentral()
google() google()
// Nexus Maven
// "WinBoll Release"
maven { url "https://nexus.winboll.cc/repository/maven-public/" }
// "WinBoll Snapshot"
maven { url "https://nexus.winboll.cc/repository/maven-snapshots/" }
mavenLocal() mavenLocal()
} }
ext { ext {

View File

@ -20,7 +20,7 @@ android {
} }
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) api fileTree(dir: 'libs', include: ['*.jar'])
// SSH // SSH
implementation 'com.jcraft:jsch:0.1.55' implementation 'com.jcraft:jsch:0.1.55'

View File

@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Sat Mar 08 02:31:02 HKT 2025 #Sun Mar 09 09:15:24 HKT 2025
stageCount=2 stageCount=6
libraryProject=libappbase libraryProject=libappbase
baseVersion=2.1 baseVersion=2.1
publishVersion=2.1.1 publishVersion=2.1.5
buildCount=0 buildCount=0
baseBetaVersion=2.1.2 baseBetaVersion=2.1.6

View File

@ -38,7 +38,7 @@ public class LogUtils {
static volatile boolean _IsInited = false; static volatile boolean _IsInited = false;
static Context _mContext; static Context _mContext;
// 日志显示时间格式 // 日志显示时间格式
static SimpleDateFormat mSimpleDateFormat = new SimpleDateFormat("[yyyyMMdd_HHmmSS]", Locale.getDefault()); static SimpleDateFormat mSimpleDateFormat = new SimpleDateFormat("[yyyyMMdd_HHmmss_SSS]", Locale.getDefault());
// 应用日志文件夹 // 应用日志文件夹
static File _mfLogCacheDir; static File _mfLogCacheDir;
static File _mfLogDataDir; static File _mfLogDataDir;