From 6ccbaf8c328178d3a3a5ee38e4a94c3002f0d133 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Sat, 15 Mar 2025 15:21:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=B1=BB=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 autoinstaller/build.gradle                    | 34 ++++---------------
 autoinstaller/build.properties                | 12 +++----
 autoinstaller/src/main/AndroidManifest.xml    |  2 +-
 .../cc/winboll/studio/autoinstaller/App.java  | 15 ++++----
 .../studio/autoinstaller/FileListener.java    |  2 +-
 .../studio/autoinstaller/MainActivity.java    | 10 +++---
 .../autoinstaller/beans/AppConfigs.java       |  2 +-
 .../autoinstaller/receivers/MainReceiver.java |  2 +-
 .../autoinstaller/services/MainService.java   |  5 +--
 .../autoinstaller/utils/PackageUtil.java      |  2 +-
 .../src/main/res/layout/activity_main.xml     |  2 +-
 autoinstaller/src/main/res/values/styles.xml  | 13 +++++++
 autoinstaller/src/main/res/values/themes.xml  | 14 --------
 13 files changed, 49 insertions(+), 66 deletions(-)
 create mode 100644 autoinstaller/src/main/res/values/styles.xml
 delete mode 100644 autoinstaller/src/main/res/values/themes.xml

diff --git a/autoinstaller/build.gradle b/autoinstaller/build.gradle
index ba56e67..e8f0df5 100644
--- a/autoinstaller/build.gradle
+++ b/autoinstaller/build.gradle
@@ -18,18 +18,18 @@ def genVersionName(def versionName){
 }
 
 android {
-    compileSdkVersion 32
-    buildToolsVersion "33.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "cc.winboll.studio.autoinstaller"
-        minSdkVersion 24
-        targetSdkVersion 30
+        minSdkVersion 26
+        targetSdkVersion 29
         versionCode 2
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "5.0" 
+        versionName "15.0" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -41,30 +41,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
 }
 
 dependencies {
-	api 'cc.winboll.studio:winboll-shared:1.1.0'
-    api 'io.github.medyo:android-about-page:2.0.0'
-    api 'com.github.getActivity:ToastUtils:10.5'
-    api 'com.jcraft:jsch:0.1.55'
-    api 'org.jsoup:jsoup:1.13.1'
-    api 'com.squareup.okhttp3:okhttp:4.4.1'
-    
-    api 'androidx.appcompat:appcompat:1.0.0'
-    api 'androidx.fragment:fragment:1.0.0'
-    api 'com.google.android.material:material:1.0.0'
-    
-    api 'androidx.vectordrawable:vectordrawable-animated:1.0.0'
-    api 'androidx.lifecycle:lifecycle-livedata:1.0.0'
-    
-    //api 'cc.winboll.studio:libaes:6.3.2'
-    //api 'cc.winboll.studio:libapputils:8.3.8'
-    
     api fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'cc.winboll.studio:libappbase:15.0.0'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
 }
diff --git a/autoinstaller/build.properties b/autoinstaller/build.properties
index 1db8525..1cf870a 100644
--- a/autoinstaller/build.properties
+++ b/autoinstaller/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Jan 02 02:39:56 HKT 2025
-stageCount=4
+#Sat Mar 15 07:19:52 GMT 2025
+stageCount=0
 libraryProject=
-baseVersion=5.0
-publishVersion=5.0.3
-buildCount=0
-baseBetaVersion=5.0.4
+baseVersion=15.0
+publishVersion=15.0.0
+buildCount=9
+baseBetaVersion=15.0.1
diff --git a/autoinstaller/src/main/AndroidManifest.xml b/autoinstaller/src/main/AndroidManifest.xml
index 0da8a10..506ea85 100644
--- a/autoinstaller/src/main/AndroidManifest.xml
+++ b/autoinstaller/src/main/AndroidManifest.xml
@@ -33,7 +33,7 @@
         android:persistent="true"
         android:supportsRtl="true"
         android:requestLegacyExternalStorage="true"
-        android:theme="@style/Theme.Application">
+        android:theme="@style/MyAppTheme">
 
         <activity
             android:name=".MainActivity"
diff --git a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/App.java b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/App.java
index a875b79..aa13ae6 100644
--- a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/App.java
+++ b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/App.java
@@ -5,24 +5,25 @@ package cc.winboll.studio.autoinstaller;
  * @Date 2024/04/28 02:39:58
  * @Describe 全局应用类
  */
-import android.view.Gravity;
-import com.hjq.toast.ToastUtils;
-import cc.winboll.studio.shared.app.WinBollApplication;
 
-public class App extends WinBollApplication {
+
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
+
+public class App extends GlobalApplication {
     
     public static final String TAG = "App";
 
     @Override
     public void onCreate() {
         super.onCreate();
-        setIsDebug(BuildConfig.DEBUG);
+        setIsDebuging(this, BuildConfig.DEBUG);
         // 初始化 Toast 框架
         ToastUtils.init(this);
         // 设置 Toast 布局样式
-        ToastUtils.setView(R.layout.toast_custom_view);
+        //ToastUtils.setView(R.layout.toast_custom_view);
         //ToastUtils.setStyle(new WhiteToastStyle());
-        ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
+        //ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
     }
 }
 
diff --git a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/FileListener.java b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/FileListener.java
index 3bbf54e..157c8b4 100644
--- a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/FileListener.java
+++ b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/FileListener.java
@@ -1,7 +1,7 @@
 package cc.winboll.studio.autoinstaller;
 
 import android.os.FileObserver;
-import cc.winboll.studio.shared.log.LogUtils;
+import cc.winboll.studio.libappbase.LogUtils;
 
 public class FileListener extends FileObserver {
 	public final static String TAG = "FileListener";
diff --git a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/MainActivity.java b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/MainActivity.java
index 6ef2406..c78493c 100644
--- a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/MainActivity.java
+++ b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/MainActivity.java
@@ -2,6 +2,7 @@ package cc.winboll.studio.autoinstaller;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
@@ -14,14 +15,14 @@ import android.widget.Switch;
 import android.widget.TextClock;
 import android.widget.Toast;
 import androidx.core.content.FileProvider;
-import cc.winboll.studio.shared.log.LogUtils;
-import cc.winboll.studio.shared.log.LogView;
 import cc.winboll.studio.autoinstaller.MainActivity;
 import cc.winboll.studio.autoinstaller.beans.AppConfigs;
 import cc.winboll.studio.autoinstaller.services.MainService;
 import cc.winboll.studio.autoinstaller.utils.NotificationUtil;
 import cc.winboll.studio.autoinstaller.views.ListViewForScrollView;
-import com.hjq.toast.ToastUtils;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.LogView;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@@ -136,9 +137,10 @@ public class MainActivity extends Activity {
             ToastUtils.show("Installed APP package name is null.");
             return;
         }
-
+        
         Intent intent = getPackageManager().getLaunchIntentForPackage(mszInstalledPackageName);
         if (intent != null) {
+            ToastUtils.show("startActivity");
             startActivity(intent);
         } else {
             // 若没能获取到启动意图，可进行相应提示等操作，比如跳转到应用商店让用户下载该应用（示例）
diff --git a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/beans/AppConfigs.java b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/beans/AppConfigs.java
index f06959f..cd1c031 100644
--- a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/beans/AppConfigs.java
+++ b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/beans/AppConfigs.java
@@ -10,11 +10,11 @@ import android.util.JsonReader;
 import android.util.JsonWriter;
 import cc.winboll.studio.autoinstaller.beans.AppConfigs;
 import cc.winboll.studio.autoinstaller.utils.FileUtil;
+import cc.winboll.studio.libappbase.LogUtils;
 import java.io.IOException;
 import java.io.Serializable;
 import java.io.StringReader;
 import java.io.StringWriter;
-import cc.winboll.studio.shared.log.LogUtils;
 
 public class AppConfigs implements Serializable {
 
diff --git a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/receivers/MainReceiver.java b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/receivers/MainReceiver.java
index b2cf4a4..8eaa204 100644
--- a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/receivers/MainReceiver.java
+++ b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/receivers/MainReceiver.java
@@ -6,7 +6,7 @@ import android.content.Intent;
 import android.os.Build;
 import cc.winboll.studio.autoinstaller.beans.AppConfigs;
 import cc.winboll.studio.autoinstaller.services.MainService;
-import cc.winboll.studio.shared.log.LogUtils;
+import cc.winboll.studio.libappbase.LogUtils;
 
 /**
  * @Author ZhanGSKen@QQ.COM
diff --git a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/services/MainService.java b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/services/MainService.java
index 2531088..2bee70f 100644
--- a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/services/MainService.java
+++ b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/services/MainService.java
@@ -12,7 +12,6 @@ import android.os.IBinder;
 import android.os.Message;
 import android.widget.Toast;
 import androidx.core.content.FileProvider;
-import cc.winboll.studio.shared.log.LogUtils;
 import cc.winboll.studio.autoinstaller.FileListener;
 import cc.winboll.studio.autoinstaller.MainActivity;
 import cc.winboll.studio.autoinstaller.beans.AppConfigs;
@@ -21,7 +20,8 @@ import cc.winboll.studio.autoinstaller.services.MainService;
 import cc.winboll.studio.autoinstaller.utils.NotificationUtil;
 import cc.winboll.studio.autoinstaller.utils.PackageUtil;
 import cc.winboll.studio.autoinstaller.utils.ServiceUtil;
-import com.hjq.toast.ToastUtils;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
 import java.io.File;
 import java.lang.ref.WeakReference;
 
@@ -75,6 +75,7 @@ public class MainService extends Service {
                 startWatchingFile(appConfigs.getWatchingFilePath());
 
                 LogUtils.d(TAG, "running...");
+                ToastUtils.show("running...");
 
             } else {
                 LogUtils.d(TAG, "_mIsServiceAlive is " + Boolean.toString(_mIsServiceAlive));
diff --git a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/utils/PackageUtil.java b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/utils/PackageUtil.java
index 33fcdb0..e4eb5d2 100644
--- a/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/utils/PackageUtil.java
+++ b/autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/utils/PackageUtil.java
@@ -8,7 +8,7 @@ package cc.winboll.studio.autoinstaller.utils;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import cc.winboll.studio.shared.log.LogUtils;
+import cc.winboll.studio.libappbase.LogUtils;
 
 public class PackageUtil {
 
diff --git a/autoinstaller/src/main/res/layout/activity_main.xml b/autoinstaller/src/main/res/layout/activity_main.xml
index de79fc6..d4327fd 100644
--- a/autoinstaller/src/main/res/layout/activity_main.xml
+++ b/autoinstaller/src/main/res/layout/activity_main.xml
@@ -132,7 +132,7 @@
 
 	</LinearLayout>
 
-	<cc.winboll.studio.shared.log.LogView
+	<cc.winboll.studio.libappbase.LogView
 		android:orientation="horizontal"
 		android:layout_width="match_parent"
 		android:layout_height="200dp"
diff --git a/autoinstaller/src/main/res/values/styles.xml b/autoinstaller/src/main/res/values/styles.xml
new file mode 100644
index 0000000..e11b9da
--- /dev/null
+++ b/autoinstaller/src/main/res/values/styles.xml
@@ -0,0 +1,13 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <style name="MyAppTheme" parent="APPBaseTheme">
+        <item name="attrColorPrimary">@color/colorPrimary</item>
+        <item name="themeGlobalCrashActivity">@style/MyGlobalCrashActivityTheme</item>
+    </style>
+
+    <style name="MyGlobalCrashActivityTheme" parent="GlobalCrashActivityTheme">
+        <item name="colorTittle">#FFFFFFFF</item>
+        <item name="colorTittleBackgound">#FF00A4B3</item>
+        <item name="colorText">#FFFFFFFF</item>
+        <item name="colorTextBackgound">#FF000000</item>
+	</style>
+</resources>
diff --git a/autoinstaller/src/main/res/values/themes.xml b/autoinstaller/src/main/res/values/themes.xml
deleted file mode 100644
index 89d5280..0000000
--- a/autoinstaller/src/main/res/values/themes.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.Application" parent="android:Theme.Material.Light.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="android:colorPrimary">@color/purple_500</item>
-        
-        <!-- Secondary brand color. -->
-        <item name="android:colorSecondary">@color/teal_200</item>
-        
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">@color/purple_700</item>
-        <!-- Customize your theme here. -->
-    </style>
-</resources>
\ No newline at end of file