<contacts>APK 15.3.0 release Publish.

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "winboll-x"]
-	path = winboll-x
-	url = https://gitea.winboll.cc/Studio/WinBollX.git
 [submodule "libjc/jcc/libs"]
 	path = libjc/jcc/libs
 	url = https://gitea.winboll.cc/Studio/APP_libjc_jcc_libs.git

aes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Apr 29 15:14:41 HKT 2025
+#Sat May 03 11:34:58 GMT 2025
 stageCount=1
 libraryProject=libaes
 baseVersion=15.6
 publishVersion=15.6.0
-buildCount=0
+buildCount=9
 baseBetaVersion=15.6.1

aes/src/main/java/cc/winboll/studio/aes/AboutActivity.java

@@ -10,13 +10,14 @@ import android.content.Context;
 import android.os.Bundle;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.libaes.winboll.APPInfo;
 import cc.winboll.studio.libaes.winboll.AboutView;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
-public class AboutActivity extends WinBoLLActivity implements IWinBoLLActivity {
+public class AboutActivity extends AppCompatActivity implements IWinBoLLActivity {
 
     public static final String TAG = "AboutActivity";
 

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Apr 29 14:47:34 HKT 2025
+#Sat May 03 10:32:21 GMT 2025
 stageCount=7
 libraryProject=libappbase
 baseVersion=15.7
 publishVersion=15.7.6
-buildCount=0
+buildCount=4
 baseBetaVersion=15.7.7

appbase/src/main/java/cc/winboll/studio/appbase/WinBoLLActivityBase.java

@@ -1,81 +0,0 @@
-package cc.winboll.studio.appbase;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/28 15:34:16
- * @Describe 应用活动窗口基类
- */
-import android.app.Activity;
-import android.os.Bundle;
-import android.os.PersistableBundle;
-import android.view.MenuItem;
-import cc.winboll.studio.appbase.App;
-import cc.winboll.studio.appbase.R;
-import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.dialogs.YesNoAlertDialog;
-import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
-import cc.winboll.studio.libappbase.winboll.WinBoLLActivityManager;
-
-public class WinBoLLActivityBase extends Activity implements IWinBoLLActivity {
-
-    public static final String TAG = "WinBoLLActivityBase";
-
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    WinBoLLActivityManager getWinBoLLActivityManager() {
-        return WinBoLLActivityManager.getInstance(GlobalApplication.getInstance());
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        getWinBoLLActivityManager().add(this);
-    }
-
-    @Override
-    public void onPostCreate(Bundle savedInstanceState, PersistableBundle persistentState) {
-        super.onPostCreate(savedInstanceState, persistentState);
-    }
-    
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
-            GlobalApplication.getWinBoLLActivityManager().startLogActivity(this);
-            return true;
-        } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) {
-            //moveTaskToBack(true);
-            exit();
-        }
-        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
-        return super.onOptionsItemSelected(item);
-    }
-
-    void exit() {
-        YesNoAlertDialog.show(this, "Exit " + getString(R.string.app_name), "Close all activity and exit?", new YesNoAlertDialog.OnDialogResultListener(){
-
-                @Override
-                public void onYes() {
-                    App.getWinBoLLActivityManager().finishAll();
-                }
-
-                @Override
-                public void onNo() {
-                }
-            });
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        getWinBoLLActivityManager().registeRemove(this);
-    }
-}

apputils/src/main/java/cc/winboll/studio/apputils/TestStringToQRCodeViewActivity.java

@@ -1,36 +0,0 @@
-package cc.winboll.studio.apputils;
-
-/**
- * @Author ZhanGSKen@QQ.COM
- * @Date 2025/01/17 19:50:46
- */
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.Toolbar;
-import cc.winboll.studio.apputils.R;
-import cc.winboll.studio.libapputils.views.StringToQrCodeView;
-
-public class TestStringToQRCodeViewActivity extends Activity {
-
-    public static final String TAG = "TestStringToQrCodeViewActivity";
-
-    StringToQrCodeView mStringToQrCodeView;
-//
-//    @Override
-//    public Activity getActivity() {
-//        return this;
-//    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_teststringtoqrcodeview);
-        
-        // 初始化工具栏
-        Toolbar mToolbar = findViewById(R.id.toolbar);
-        mToolbar.setSubtitle(TAG);
-        setActionBar(mToolbar);
-        
-        mStringToQrCodeView = findViewById(R.id.activityteststringtoqrcodeviewStringToQrCodeView1);
-    }
-}

apputils/src/main/java/cc/winboll/studio/apputils/WinBoLLActivityBase.java

@@ -1,51 +0,0 @@
-package cc.winboll.studio.apputils;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/28 17:11:37
- * @Describe 应用活动窗口基类
- */
-import android.app.Activity;
-import android.os.Bundle;
-import android.os.PersistableBundle;
-import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
-import cc.winboll.studio.libappbase.winboll.WinBoLLActivityManager;
-
-public class WinBoLLActivityBase extends Activity implements IWinBoLLActivity {
-
-    public static final String TAG = "WinBoLLActivityBase";
-
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    WinBoLLActivityManager getWinBoLLActivityManager() {
-        return WinBoLLActivityManager.getInstance(GlobalApplication.getInstance());
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        getWinBoLLActivityManager().add(this);
-    }
-
-    @Override
-    public void onPostCreate(Bundle savedInstanceState, PersistableBundle persistentState) {
-        super.onPostCreate(savedInstanceState, persistentState);
-    }
-
-
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        getWinBoLLActivityManager().registeRemove(this);
-    }
-}

autoinstaller/build.gradle

@@ -19,7 +19,7 @@ def genVersionName(def versionName){
 
 android {
     compileSdkVersion 32
-    buildToolsVersion "33.0.3"
+    buildToolsVersion "32.0.0"
 
     defaultConfig {
         applicationId "cc.winboll.studio.autoinstaller"
@@ -29,7 +29,7 @@ android {
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "5.0" 
+        versionName "15.2" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -41,30 +41,33 @@ 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'])
+    api 'cc.winboll.studio:libaes:15.6.0'
+    api 'cc.winboll.studio:libapputils:15.3.4'
+    api 'cc.winboll.studio:libappbase:15.7.6'
+    
+    // SSH
+    api 'com.jcraft:jsch:0.1.55'
+    // Html 解析
+    api 'org.jsoup:jsoup:1.13.1'
+    // 二维码类库
+    api 'com.google.zxing:core:3.4.1'
+    api 'com.journeyapps:zxing-android-embedded:3.6.0'
+    // 应用介绍页类库
+    api 'io.github.medyo:android-about-page:2.0.0'
+    // 吐司类库
+    api 'com.github.getActivity:ToastUtils:10.5'
+    // 网络连接类库
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
+    // AndroidX 类库
+    api 'androidx.appcompat:appcompat:1.1.0'
+    api 'com.google.android.material:material:1.4.0'
+    //api 'androidx.viewpager:viewpager:1.0.0'
+    //api 'androidx.vectordrawable:vectordrawable:1.1.0'
+    //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
+    //api 'androidx.fragment:fragment:1.1.0'
+    
 }

autoinstaller/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Jan 02 02:39:56 HKT 2025
-stageCount=4
+#Sun May 04 05:32:00 GMT 2025
+stageCount=1
 libraryProject=
-baseVersion=5.0
-publishVersion=5.0.3
-buildCount=0
-baseBetaVersion=5.0.4
+baseVersion=15.2
+publishVersion=15.2.0
+buildCount=74
+baseBetaVersion=15.2.1

autoinstaller/src/main/AndroidManifest.xml

@@ -23,6 +23,8 @@
 
     <!-- MANAGE_EXTERNAL_STORAGE -->
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
+        
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
 
     <application
         android:name=".App"
@@ -33,7 +35,7 @@
         android:persistent="true"
         android:supportsRtl="true"
         android:requestLegacyExternalStorage="true"
-        android:theme="@style/Theme.Application">
+        android:theme="@style/MyAppTheme">
 
         <activity
             android:name=".MainActivity"
@@ -54,6 +56,21 @@
 
         <service android:name=".services.AssistantService"/>
 
+        <service
+            android:name=".AppBaseTileService"
+            android:exported="true"
+            android:label="@string/tileservice_name"
+            android:icon="@drawable/ic_launcher"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+
+            <intent-filter>
+
+                <action android:name="android.service.quicksettings.action.QS_TILE"/>
+
+            </intent-filter>
+
+        </service>
+
         <receiver
             android:name=".receivers.MainReceiver"
             android:enabled="true"

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/App.java

@@ -6,22 +6,23 @@ package cc.winboll.studio.autoinstaller;
  * @Describe 全局应用类
  */
 import android.view.Gravity;
+import cc.winboll.studio.libappbase.GlobalApplication;
 import com.hjq.toast.ToastUtils;
-import cc.winboll.studio.shared.app.WinBollApplication;
+import com.hjq.toast.style.WhiteToastStyle;
 
-public class App extends WinBollApplication {
+public class App extends GlobalApplication {
     
     public static final String TAG = "App";
 
     @Override
     public void onCreate() {
         super.onCreate();
-        setIsDebug(BuildConfig.DEBUG);
+        
         // 初始化 Toast 框架
         ToastUtils.init(this);
         // 设置 Toast 布局样式
-        ToastUtils.setView(R.layout.toast_custom_view);
-        //ToastUtils.setStyle(new WhiteToastStyle());
+        //ToastUtils.setView(R.layout.view_toast);
+        ToastUtils.setStyle(new WhiteToastStyle());
         ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
     }
 }

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/AppBaseTileService.java

@@ -0,0 +1,12 @@
+package cc.winboll.studio.autoinstaller;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/04/15 09:24:46
+ * @Describe 磁贴工具服务类
+ */
+import android.service.quicksettings.Tile;
+import android.service.quicksettings.TileService;
+import cc.winboll.studio.autoinstaller.models.AppConfigs;
+
+

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";

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/MainActivity.java

@@ -6,21 +6,24 @@ import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.RadioButton;
 import android.widget.SimpleAdapter;
 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.models.APKModel;
+import cc.winboll.studio.autoinstaller.models.AppConfigs;
 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.views.ListViewForScrollView;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.LogView;
 import com.hjq.toast.ToastUtils;
 import java.io.File;
 import java.util.ArrayList;
@@ -30,8 +33,13 @@ import java.util.Map;
 public class MainActivity extends Activity {
     public static final String TAG = "MainActivity";
 
+    public static final int MSG_UPDATE_STATUS = 0;
+
     private static final int INSTALL_PERMISSION_CODE = 1;
 
+    static MainActivity _MainActivity;
+
+    ArrayList<APKModel> _APKModelList = new ArrayList<APKModel>();
     LogView mLogView;
     TextClock mTextClock;
     EditText mEditText;
@@ -60,9 +68,11 @@ public class MainActivity extends Activity {
 
         super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_main);
+        _MainActivity = this;
         initView();
 
-        if (getIntent().getAction().equals(ACTION_NEW_INSTALLTASK)) {
+        String action = getIntent().getAction();
+        if ((action != null) && action.equals(ACTION_NEW_INSTALLTASK)) {
             mszInstalledPackageName = getIntent().getStringExtra(EXTRA_INSTALLED_PACKAGENAME);
             mszInstalledAPKFilePath = getIntent().getStringExtra(EXTRA_INSTALLED_APKFILEPATH);
             installAPK();
@@ -76,11 +86,7 @@ public class MainActivity extends Activity {
         mLogView = findViewById(R.id.logview);
         mLogView.start();
 
-        AppConfigs appConfigs = AppConfigs.loadAppConfigs(this);
-        if (appConfigs == null) {
-            appConfigs = new AppConfigs(); 
-            AppConfigs.saveAppConfigs(this, appConfigs);
-        }
+        AppConfigs appConfigs = AppConfigs.getInstance(this).loadAppConfigs(this);
 
         if (appConfigs.getSetupMode() == AppConfigs.SetupMode.WATCHOUTPUTINSTALLER) {
             ((RadioButton)findViewById(R.id.activitymainRadioButton1)).setChecked(true);
@@ -131,23 +137,44 @@ public class MainActivity extends Activity {
 
     }
 
+    String getLastApkPackageName() {
+        APKModel.loadBeanList(this, _APKModelList, APKModel.class);
+        if (_APKModelList.size() > 0) {
+            return _APKModelList.get(_APKModelList.size() - 1).getApkPackageName();
+        }
+        return "";
+    }
+
     public void onOpenAPP(View view) {
-        if (mszInstalledPackageName.trim().equals("")) {
+        String szInstalledPackageName = getLastApkPackageName();
+        LogUtils.d(TAG, "szInstalledPackageName : " + szInstalledPackageName);
+        if (szInstalledPackageName.trim().equals("")) {
             ToastUtils.show("Installed APP package name is null.");
             return;
         }
 
-        Intent intent = getPackageManager().getLaunchIntentForPackage(mszInstalledPackageName);
-        if (intent != null) {
-            startActivity(intent);
-        } else {
-            // 若没能获取到启动意图，可进行相应提示等操作，比如跳转到应用商店让用户下载该应用（示例）
-            Intent marketIntent = new Intent(Intent.ACTION_VIEW);
-            marketIntent.setData(Uri.parse("market://details?id=" + mszInstalledPackageName));
-            startActivity(marketIntent);
-        }
+        PackageUtil.openAPP(this, szInstalledPackageName);
     }
 
+//    public void onOpenAPP(View view) {
+//        String szInstalledPackageName = getLastApkPackageName();
+//        if (szInstalledPackageName.trim().equals("")) {
+//            ToastUtils.show("Installed APP package name is null.");
+//            return;
+//        }
+//
+//        Intent intent = getPackageManager().getLaunchIntentForPackage(mszInstalledPackageName);
+//        if (intent != null) {
+//            //ToastUtils.show("startActivity");
+//            startActivity(intent);
+//        } else {
+//            // 若没能获取到启动意图，可进行相应提示等操作，比如跳转到应用商店让用户下载该应用（示例）
+//            Intent marketIntent = new Intent(Intent.ACTION_VIEW);
+//            marketIntent.setData(Uri.parse("market://details?id=" + mszInstalledPackageName));
+//            startActivity(marketIntent);
+//        }
+//    }
+
     public void onInstallAPK(View view) {
         installAPK();
     }
@@ -185,17 +212,22 @@ public class MainActivity extends Activity {
     }
 
     public void onLockPath(View view) {
-        AppConfigs appConfigs = AppConfigs.loadAppConfigs(this);
-
         Switch sw = (Switch)view;
-        if (sw.isChecked()) {
+        setMainServiceStatus(sw.isChecked());
+    }
+
+    public void setMainServiceStatus(boolean isEnable) {
+        AppConfigs appConfigs = AppConfigs.getInstance(this).loadAppConfigs(this);
+
+        Switch sw = (Switch)findViewById(R.id.activitymainSwitch1);
+        if (isEnable) {
             String szFilePath = mEditText.getText().toString();
 
             // 设置空路径时退出
             //
             if (szFilePath.trim().equals("")) {
                 sw.setChecked(false);
-                Toast.makeText(getApplication(), "监控路径为空。", Toast.LENGTH_SHORT).show();
+                ToastUtils.show("监控路径为空。");
                 return;
             }
 
@@ -236,7 +268,7 @@ public class MainActivity extends Activity {
             stopWatchingFile();
 
         }
-        AppConfigs.saveAppConfigs(this, appConfigs);
+        AppConfigs.getInstance(this).saveAppConfigs(this, appConfigs);
     }
 
     void stopWatchingFile() {
@@ -251,8 +283,6 @@ public class MainActivity extends Activity {
         Intent intentService = new Intent(MainActivity.this, MainService.class);
         //intentService.putExtra(MainService.EXTRA_APKFILEPATH, szAPKFilePath);
         startService(intentService);
-
-
     }
 
     /*
@@ -298,7 +328,7 @@ public class MainActivity extends Activity {
      }*/
 
     public void onChangeSetupMode(View view) {
-        AppConfigs appConfigs = AppConfigs.loadAppConfigs(this);
+        AppConfigs appConfigs = AppConfigs.getInstance(this).loadAppConfigs(this);
 
         if (view.getId() == R.id.activitymainRadioButton1) {
             appConfigs.setSetupMode(AppConfigs.SetupMode.WATCHOUTPUTINSTALLER);
@@ -307,6 +337,42 @@ public class MainActivity extends Activity {
             appConfigs.setSetupMode(AppConfigs.SetupMode.NEWAPKINFONEWAPKINFO);
             ((RadioButton)findViewById(R.id.activitymainRadioButton1)).setChecked(false);
         }
-        AppConfigs.saveAppConfigs(this, appConfigs);
+        AppConfigs.getInstance(this).saveAppConfigs(this, appConfigs);
+    }
+
+    // 定义Handler
+    static Handler _Handler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            if (msg.what == MSG_UPDATE_STATUS) {
+                if (_MainActivity != null) {
+                    boolean isEnableMainService = (boolean)msg.obj;
+                    // 处理消息，这里更新 MainService 的状态
+                    _MainActivity.setMainServiceStatus(isEnableMainService);
+                }
+            }
+        }
+    };
+
+    static void updateMainServiceStatus(boolean isEnable) {
+        if (_Handler != null) {
+            Message msg = new Message();
+            msg.obj = isEnable;
+            msg.what = MSG_UPDATE_STATUS;
+            _Handler.sendMessage(msg);
+        }
+    }
+
+    public static void stopMainService() {
+        if (_MainActivity != null && _Handler != null) {
+            updateMainServiceStatus(false);
+        }
+    }
+
+    public static void startMainService() {
+        if (_MainActivity != null && _Handler != null) {
+            updateMainServiceStatus(true);
+        }
     }
 }

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/models/APKModel.java

@@ -0,0 +1,75 @@
+package cc.winboll.studio.autoinstaller.models;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/04/02 20:50:29
+ * @Describe 监控的 APK 安装文件对应的应用信息数据模型
+ */
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.io.IOException;
+
+public class APKModel extends BaseBean {
+
+    public static final String TAG = "APPModel";
+
+    // 每次更新的 APK 文件对应的应用包名称
+    String apkPackageName;
+
+    public APKModel() {
+        this.apkPackageName = "";
+    }
+
+    public APKModel(String apkPackageName) {
+        this.apkPackageName = apkPackageName;
+    }
+
+    public void setApkPackageName(String apkPackageName) {
+        this.apkPackageName = apkPackageName;
+    }
+
+    public String getApkPackageName() {
+        return apkPackageName;
+    }
+
+
+
+    @Override
+    public String getName() {
+        return APKModel.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        jsonWriter.name("appPackageName").value(getApkPackageName());
+
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
+            if (name.equals("appPackageName")) {
+                setApkPackageName(jsonReader.nextString());
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException {
+        jsonReader.beginObject();
+        while (jsonReader.hasNext()) {
+            String name = jsonReader.nextName();
+            if (!initObjectsFromJsonReader(jsonReader, name)) {
+                jsonReader.skipValue();
+            }
+        }
+        // 结束 JSON 对象
+        jsonReader.endObject();
+        return this;
+    }
+}

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/models/AppConfigs.java

@@ -1,4 +1,4 @@
-package cc.winboll.studio.autoinstaller.beans;
+package cc.winboll.studio.autoinstaller.models;
 
 /**
  * @Author ZhanGSKen@QQ.COM
@@ -8,13 +8,14 @@ package cc.winboll.studio.autoinstaller.beans;
 import android.content.Context;
 import android.util.JsonReader;
 import android.util.JsonWriter;
-import cc.winboll.studio.autoinstaller.beans.AppConfigs;
+import cc.winboll.studio.autoinstaller.models.AppConfigs;
 import cc.winboll.studio.autoinstaller.utils.FileUtil;
+import cc.winboll.studio.libappbase.LogUtils;
+import com.hjq.toast.ToastUtils;
 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 {
 
@@ -26,6 +27,21 @@ public class AppConfigs implements Serializable {
         NEWAPKINFONEWAPKINFO  // 调用[应用信息查看器]打开应用包
         };
 
+    static volatile AppConfigs _AppConfigs;
+    Context mContext;
+
+    AppConfigs(Context context) {
+        mContext = context.getApplicationContext();
+    }
+
+    public static synchronized AppConfigs getInstance(Context context) {
+        if (_AppConfigs == null) {
+            _AppConfigs = new AppConfigs(context);
+            _AppConfigs.loadAppConfigs(_AppConfigs.mContext);
+        }
+        return _AppConfigs;
+    }
+
     // 监控文件路径
     private String watchingFilePath = "";
 
@@ -85,8 +101,8 @@ public class AppConfigs implements Serializable {
         return "";
     }
 
-    public static AppConfigs parseAppConfigs(String szAppConfigs) {
-        AppConfigs appConfigs = new AppConfigs();
+    public AppConfigs parseAppConfigs(String szAppConfigs) {
+        AppConfigs appConfigs = new AppConfigs(mContext);
         // 创建 JsonWriter 对象
         StringReader stringReader = new StringReader(szAppConfigs);
         JsonReader jsonReader = new
@@ -121,20 +137,35 @@ public class AppConfigs implements Serializable {
     static String getDataPath(Context context) {
         return context.getExternalFilesDir(TAG) + "/" + TAG + ".json";
     }
-
-    public static AppConfigs loadAppConfigs(Context context) {
+    
+    public AppConfigs loadAppConfigs() {
         AppConfigs appConfigs = null;
         try {
-            String szJson = FileUtil.readFile(getDataPath(context));
-            appConfigs = AppConfigs.parseAppConfigs(szJson);
+            String szJson = FileUtil.readFile(getDataPath(mContext));
+            appConfigs = AppConfigs.getInstance(mContext).parseAppConfigs(szJson);
         } catch (IOException e) {
             LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
         }
         return appConfigs;
     }
 
-    public static void saveAppConfigs(Context context, AppConfigs appConfigs) {
+    public AppConfigs loadAppConfigs(Context context) {
+        AppConfigs appConfigs = null;
         try {
+            String szJson = FileUtil.readFile(getDataPath(context.getApplicationContext()));
+            appConfigs = AppConfigs.getInstance(mContext).parseAppConfigs(szJson);
+            if(appConfigs != null) {
+                _AppConfigs = appConfigs;
+            }
+        } catch (IOException e) {
+            LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
+        }
+        return _AppConfigs;
+    }
+
+    public void saveAppConfigs(Context context, AppConfigs appConfigs) {
+        try {
+            ToastUtils.show(String.format("AppConfigs set enable service to %s", appConfigs.isEnableService()));
             //LogUtils.d(TAG, "appConfigs is : " + appConfigs.toString());
             String szJson = appConfigs.toString();
             FileUtil.writeFile(getDataPath(context), szJson);
@@ -142,4 +173,8 @@ public class AppConfigs implements Serializable {
             LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
         }
     }
+
+    public void saveAppConfigs() {
+        saveAppConfigs(mContext, this);
+    }
 }

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/models/MainServiceBean.java

@@ -1,54 +1,49 @@
-package cc.winboll.studio.appbase.models;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/02/17 10:05:09
- * @Describe APPSOSReportBean
- */
+package cc.winboll.studio.autoinstaller.models;
 import android.util.JsonReader;
 import android.util.JsonWriter;
 import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;
 
-public class WinBoLLNewsBean extends BaseBean {
-    
-    public static final String TAG = "WinBoLLNewsBean";
-    
-    protected String message;
-    
-    public WinBoLLNewsBean() {
-        this.message = "";
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/04/15 09:27:39
+ * @Describe MainServiceBean
+ */
+public class MainServiceBean extends BaseBean {
+
+    public static final String TAG = "MainServiceBean";
+
+    boolean isEnable;
+
+    public MainServiceBean() {
+        this.isEnable = false;
     }
 
-    public WinBoLLNewsBean(String message) {
-        this.message = message;
+    public void setIsEnable(boolean isEnable) {
+        this.isEnable = isEnable;
     }
 
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public String getMessage() {
-        return message;
+    public boolean isEnable() {
+        return isEnable;
     }
 
     @Override
     public String getName() {
-        return WinBoLLNewsBean.class.getName();
+        return MainServiceBean.class.getName();
     }
 
     @Override
     public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
         super.writeThisToJsonWriter(jsonWriter);
-        jsonWriter.name("message").value(getMessage());
+        jsonWriter.name("isEnable").value(isEnable());
 
     }
 
     @Override
     public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
         if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
-            if (name.equals("message")) {
-                setMessage(jsonReader.nextString());
+            if (name.equals("isEnable")) {
+                setIsEnable(jsonReader.nextBoolean());
             } else {
                 return false;
             }

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/receivers/MainReceiver.java

@@ -4,9 +4,9 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
-import cc.winboll.studio.autoinstaller.beans.AppConfigs;
+import cc.winboll.studio.autoinstaller.models.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
@@ -23,7 +23,7 @@ public class MainReceiver extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         String szAction = intent.getAction();
         if (szAction.equals(ACTION_BOOT_COMPLETED)) {
-            AppConfigs appConfigs = AppConfigs.loadAppConfigs(context);
+            AppConfigs appConfigs = AppConfigs.getInstance(context).loadAppConfigs(context);
             if (appConfigs.isEnableService()) {
                 Intent intentService = new Intent(context, MainService.class);
                 //intentService.putExtra(MainService.EXTRA_APKFILEPATH, appConfigs.getWatchingFilePath());

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/services/AssistantService.java

@@ -6,7 +6,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
-import cc.winboll.studio.autoinstaller.beans.AppConfigs;
+import cc.winboll.studio.autoinstaller.models.AppConfigs;
 import cc.winboll.studio.autoinstaller.utils.ServiceUtil;
 
 /**
@@ -46,7 +46,7 @@ public class AssistantService extends Service {
     public int onStartCommand(Intent intent, int flags, int startId) {
         //LogUtils.d(TAG, "call onStartCommand(...)");
         run();
-        AppConfigs appConfigs = AppConfigs.loadAppConfigs(AssistantService.this);
+        AppConfigs appConfigs = AppConfigs.getInstance(AssistantService.this).loadAppConfigs(AssistantService.this);
         return appConfigs.isEnableService() ? Service.START_STICKY: super.onStartCommand(intent, flags, startId);
     }
 
@@ -68,7 +68,7 @@ public class AssistantService extends Service {
     //
     void run() {
         //LogUtils.d(TAG, "call run()");
-        AppConfigs appConfigs = AppConfigs.loadAppConfigs(AssistantService.this);
+        AppConfigs appConfigs = AppConfigs.getInstance(AssistantService.this).loadAppConfigs(AssistantService.this);
         if (appConfigs.isEnableService()) {
             if (mIsThreadAlive == false) {
                 // 设置运行状态
@@ -101,7 +101,7 @@ public class AssistantService extends Service {
         @Override
         public void onServiceDisconnected(ComponentName name) {
             //LogUtils.d(TAG, "call onServiceDisconnected(...)");
-            AppConfigs appConfigs = AppConfigs.loadAppConfigs(AssistantService.this);
+            AppConfigs appConfigs = AppConfigs.getInstance(AssistantService.this).loadAppConfigs(AssistantService.this);
             if (appConfigs.isEnableService()) {
                 wakeupAndBindMain();
             }

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/services/MainService.java

@@ -10,25 +10,32 @@ import android.os.Build;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
+import android.service.quicksettings.Tile;
+import android.service.quicksettings.TileService;
 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;
+import cc.winboll.studio.autoinstaller.R;
+import cc.winboll.studio.autoinstaller.models.APKModel;
+import cc.winboll.studio.autoinstaller.models.AppConfigs;
 import cc.winboll.studio.autoinstaller.services.AssistantService;
 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 java.io.File;
 import java.lang.ref.WeakReference;
+import java.util.ArrayList;
 
 public class MainService extends Service {
 
     public static String TAG = "MainService";
+    
+    Context mContext;
 
+    ArrayList<APKModel> _APKModelList = new ArrayList<APKModel>();
     private static boolean _mIsServiceAlive;
     //String mszAPKFilePath;
     //String mszAPKFileName;
@@ -47,6 +54,7 @@ public class MainService extends Service {
     @Override
     public void onCreate() {
         super.onCreate();
+        mContext = this;
         LogUtils.d(TAG, "onCreate()");
         _mIsServiceAlive = false;
         mHandler = new MyHandler(MainService.this);
@@ -55,11 +63,14 @@ public class MainService extends Service {
         }
 
         run();
+        
+        // 初始化磁贴工具服务
+        MainTileService mainTileService = new MainTileService(this);
     }
 
     private void run() {
 
-        AppConfigs appConfigs = AppConfigs.loadAppConfigs(MainService.this);
+        AppConfigs appConfigs = AppConfigs.getInstance(MainService.this).loadAppConfigs(MainService.this);
         if (appConfigs.isEnableService()) {
             if (_mIsServiceAlive == false) {
                 // 设置运行状态
@@ -74,7 +85,8 @@ public class MainService extends Service {
 
                 startWatchingFile(appConfigs.getWatchingFilePath());
 
-                LogUtils.d(TAG, "running...");
+                //LogUtils.d(TAG, "running...");
+                //ToastUtils.show("running...");
 
             } else {
                 LogUtils.d(TAG, "_mIsServiceAlive is " + Boolean.toString(_mIsServiceAlive));
@@ -94,6 +106,7 @@ public class MainService extends Service {
         }
         _mIsServiceAlive = false;
         LogUtils.d(TAG, "onDestroy()");
+        mContext = null;
     }
 
     @Override
@@ -101,7 +114,7 @@ public class MainService extends Service {
         LogUtils.d(TAG, "onStartCommand");
 
         run();
-        AppConfigs appConfigs = AppConfigs.loadAppConfigs(MainService.this);
+        AppConfigs appConfigs = AppConfigs.getInstance(MainService.this).loadAppConfigs(MainService.this);
 
         return appConfigs.isEnableService() ? Service.START_STICKY: super.onStartCommand(intent, flags, startId);
     }
@@ -118,7 +131,7 @@ public class MainService extends Service {
         @Override
         public void onServiceDisconnected(ComponentName name) {
             //LogUtils.d(TAG, "call onServiceConnected(...)");
-            AppConfigs appConfigs = AppConfigs.loadAppConfigs(MainService.this);
+            AppConfigs appConfigs = AppConfigs.getInstance(MainService.this).loadAppConfigs(MainService.this);
             if (appConfigs.isEnableService()) {
                 // 唤醒守护进程
                 wakeupAndBindAssistant();
@@ -160,7 +173,7 @@ public class MainService extends Service {
 
                     });
                 mFileListener.startWatching();
-                ToastUtils.show("Start watching.");
+                //ToastUtils.show("Start watching.");
             } else {
                 // 父级文件夹不存在，就提示用户
                 Toast.makeText(getApplication(), fParentDir.toString() + " no exist.", Toast.LENGTH_SHORT).show();
@@ -176,6 +189,9 @@ public class MainService extends Service {
     // 调用[应用信息查看器]打开应用包
     //
     private void installAPK(String szAPKFilePath) {
+        String szAPKPackageName = PackageUtil.getPackageNameFromApk(this, szAPKFilePath);
+        saveAPKInfo(szAPKPackageName);
+
         long nTimeNow = System.currentTimeMillis();
         /*SimpleDateFormat dateFormat = new SimpleDateFormat(
          "yyyy-MM-dd HH:mm:ss", Locale.getDefault());
@@ -210,15 +226,24 @@ public class MainService extends Service {
     //
     void installAPK2(String szAPKFilePath) {
         LogUtils.d(TAG, "installAPK2()");
+        String szAPKPackageName = PackageUtil.getPackageNameFromApk(this, szAPKFilePath);
+        saveAPKInfo(szAPKPackageName);
+
         Intent intent = new Intent(this, MainActivity.class);
         intent.setAction(MainActivity.ACTION_NEW_INSTALLTASK);
-        intent.putExtra(MainActivity.EXTRA_INSTALLED_PACKAGENAME, PackageUtil.getPackageNameFromApk(this, szAPKFilePath));
+        intent.putExtra(MainActivity.EXTRA_INSTALLED_PACKAGENAME, szAPKPackageName);
         intent.putExtra(MainActivity.EXTRA_INSTALLED_APKFILEPATH, szAPKFilePath);
         // Intent.ACTION_VIEW);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         this.startActivity(intent);
     }
 
+    void saveAPKInfo(String szApkPackageName) {
+        APKModel.loadBeanList(this, _APKModelList, APKModel.class);
+        _APKModelList.add(new APKModel(szApkPackageName));
+        APKModel.saveBeanList(this, _APKModelList, APKModel.class);
+    }
+
     // 
     //
     static class MyHandler extends Handler {
@@ -231,7 +256,7 @@ public class MainService extends Service {
             switch (message.what) {
                 case MSG_INSTALL_APK:
                     {
-                        AppConfigs appConfigs = AppConfigs.loadAppConfigs(theActivity);
+                        AppConfigs appConfigs = AppConfigs.getInstance(theActivity).loadAppConfigs(theActivity);
                         if (appConfigs.getSetupMode() == AppConfigs.SetupMode.WATCHOUTPUTINSTALLER) {
                             theActivity.installAPK2((String)message.obj);
                         } else if (appConfigs.getSetupMode() == AppConfigs.SetupMode.NEWAPKINFONEWAPKINFO) {
@@ -245,4 +270,21 @@ public class MainService extends Service {
             super.handleMessage(message);
         }
 	}
+
+    static class MainTileService extends TileService {
+        Context mContext;
+        MainTileService(Context context) {
+            mContext = context;
+        }
+
+        @Override
+        public void onStartListening() {
+            super.onStartListening();
+            Tile tile = getQsTile();
+            tile.setIcon(android.graphics.drawable.Icon.createWithResource(this, R.drawable.ic_android));
+            // 更新磁贴状态
+            tile.setState((mContext == null || mContext.getApplicationContext() == null )?Tile.STATE_INACTIVE: Tile.STATE_ACTIVE);
+            tile.updateTile();
+        }
+    }
 }

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/utils/NotificationUtil.java

@@ -55,8 +55,9 @@ public class NotificationUtil {
 
         Notification mForegroundNotification = new Notification.Builder(service, szServiceChannelID)
             .setAutoCancel(true)
-            .setContentTitle(service.getString(R.string.app_name))
-            .setContentText(service.TAG + " is started.")
+            //.setContentTitle(service.getString(R.string.app_name))
+            .setContentTitle(service.TAG + " is started.")
+            //.setContentText(service.TAG + " is started.")
             .setWhen(System.currentTimeMillis())
             .setSmallIcon(R.drawable.ic_launcher)
             //设置红色

autoinstaller/src/main/java/cc/winboll/studio/autoinstaller/utils/PackageUtil.java

@@ -6,9 +6,11 @@ package cc.winboll.studio.autoinstaller.utils;
  * @Describe 一个获取安卓APK安装文件的应用包名的函数
  */
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import cc.winboll.studio.shared.log.LogUtils;
+import android.content.pm.ResolveInfo;
+import cc.winboll.studio.libappbase.LogUtils;
 
 public class PackageUtil {
 
@@ -27,4 +29,20 @@ public class PackageUtil {
         }
         return "";
     }
+
+    public static void openAPP(Context context, String packageName) {
+        // 这里假设要打开微信，微信的包名是com.tencent.mm
+        //String packageName = "com.tencent.mm"; 
+        LogUtils.d(TAG, "packageName : " + packageName);
+        PackageManager packageManager = context.getPackageManager();
+        Intent intent = packageManager.getLaunchIntentForPackage(packageName);
+        if (intent != null) {
+            ResolveInfo resolveInfo = packageManager.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY);
+            if (resolveInfo != null) {
+                LogUtils.d(TAG, "startActivity...");
+                context.startActivity(intent);
+            }
+        }
+
+    }
 }

autoinstaller/src/main/res/drawable/ic_android.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16.61,15.15C16.15,15.15 15.77,14.78 15.77,14.32S16.15,13.5 16.61,13.5H16.61C17.07,13.5 17.45,13.86 17.45,14.32C17.45,14.78 17.07,15.15 16.61,15.15M7.41,15.15C6.95,15.15 6.57,14.78 6.57,14.32C6.57,13.86 6.95,13.5 7.41,13.5H7.41C7.87,13.5 8.24,13.86 8.24,14.32C8.24,14.78 7.87,15.15 7.41,15.15M16.91,10.14L18.58,7.26C18.67,7.09 18.61,6.88 18.45,6.79C18.28,6.69 18.07,6.75 18,6.92L16.29,9.83C14.95,9.22 13.5,8.9 12,8.91C10.47,8.91 9,9.24 7.73,9.82L6.04,6.91C5.95,6.74 5.74,6.68 5.57,6.78C5.4,6.87 5.35,7.08 5.44,7.25L7.1,10.13C4.25,11.69 2.29,14.58 2,18H22C21.72,14.59 19.77,11.7 16.91,10.14H16.91Z"/>
+
+</vector>

autoinstaller/src/main/res/drawable/ic_cloud.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M6.5,20Q4.22,20 2.61,18.43 1,16.85 1,14.58 1,12.63 2.17,11.1 3.35,9.57 5.25,9.15 5.88,6.85 7.75,5.43 9.63,4 12,4 14.93,4 16.96,6.04 19,8.07 19,11 20.73,11.2 21.86,12.5 23,13.78 23,15.5 23,17.38 21.69,18.69 20.38,20 18.5,20Z"/>
+
+</vector>

autoinstaller/src/main/res/drawable/ic_cloud_outline.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="#ff000000"
+        android:pathData="M6.5,20Q4.22,20 2.61,18.43 1,16.85 1,14.58 1,12.63 2.17,11.1 3.35,9.57 5.25,9.15 5.88,6.85 7.75,5.43 9.63,4 12,4 14.93,4 16.96,6.04 19,8.07 19,11 20.73,11.2 21.86,12.5 23,13.78 23,15.5 23,17.38 21.69,18.69 20.38,20 18.5,20M6.5,18H18.5Q19.55,18 20.27,17.27 21,16.55 21,15.5 21,14.45 20.27,13.73 19.55,13 18.5,13H17V11Q17,8.93 15.54,7.46 14.08,6 12,6 9.93,6 8.46,7.46 7,8.93 7,11H6.5Q5.05,11 4.03,12.03 3,13.05 3,14.5 3,15.95 4.03,17 5.05,18 6.5,18M12,12Z"/>
+
+</vector>

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"

autoinstaller/src/main/res/values/strings.xml

@@ -1,3 +1,4 @@
 <resources>
     <string name="app_name">AutoInstaller</string>
+    <string name="tileservice_name">AutoInstaller</string>
 </resources>

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>

autoinstaller/src/main/res/values/themes.xml

@@ -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>

build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
         // 本地 Maven 仓库（默认路径为 ~/.m2/repository）
-        mavenLocal()
+        //mavenLocal()
         // 或自定义本地仓库路径
         maven { url "file:///sdcard/.m2/repository" }
         
@@ -31,6 +31,11 @@ buildscript {
 
 allprojects {
     repositories {
+        // 本地 Maven 仓库（默认路径为 ~/.m2/repository）
+        //mavenLocal()
+        // 或自定义本地仓库路径
+        maven { url "file:///sdcard/.m2/repository" }
+        
         // Nexus Maven 库地址
         // "WinBoLL Release"
         maven { url "https://nexus.winboll.cc/repository/maven-public/" }

contacts/build.gradle

@@ -29,7 +29,7 @@ android {
         // versionName 更新后需要手动设置 
         // 项目模块目录的 build.gradle 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.2" 
+        versionName "15.3" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -45,6 +45,9 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
+    api 'cc.winboll.studio:libaes:15.6.0'
+    api 'cc.winboll.studio:libapputils:15.3.4'
+    api 'cc.winboll.studio:libappbase:15.7.6'
     
     // 权限请求框架：https://github.com/getActivity/XXPermissions
     api 'com.github.getActivity:XXPermissions:18.63'
@@ -81,8 +84,4 @@ dependencies {
     //api 'androidx.vectordrawable:vectordrawable:1.1.0'
     //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
     //api 'androidx.fragment:fragment:1.1.0'
-    
-    api 'cc.winboll.studio:libaes:15.2.4'
-    api 'cc.winboll.studio:libapputils:15.2.1'
-    api 'cc.winboll.studio:libappbase:15.2.2'
 }

contacts/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Sun Apr 13 02:46:09 HKT 2025
-stageCount=8
+#Sun May 04 21:09:14 HKT 2025
+stageCount=1
 libraryProject=
-baseVersion=15.2
-publishVersion=15.2.7
+baseVersion=15.3
+publishVersion=15.3.0
 buildCount=0
-baseBetaVersion=15.2.8
+baseBetaVersion=15.3.1

contacts/src/main/AndroidManifest.xml

@@ -42,7 +42,8 @@
         android:icon="@drawable/ic_winboll"
         android:label="@string/app_name"
         android:theme="@style/MyAppTheme"
-        android:supportsRtl="true">
+        android:supportsRtl="true"
+        android:networkSecurityConfig="@xml/network_security_config">
 
         <activity
             android:name=".MainActivity"
@@ -192,4 +193,4 @@
 
     </application>
 
-</manifest>
+</manifest>

contacts/src/main/java/cc/winboll/studio/contacts/App.java

@@ -7,7 +7,7 @@ package cc.winboll.studio.contacts;
  */
 import android.view.Gravity;
 import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
+import cc.winboll.studio.libappbase.winboll.WinBoLLActivityManager;
 import com.hjq.toast.ToastUtils;
 
 public class App extends GlobalApplication {
@@ -20,8 +20,8 @@ public class App extends GlobalApplication {
         // 这样可以预先设置日志与数据的存储根目录。
         //setIsDebuging(BuildConfig.DEBUG);
         super.onCreate();
-        // 设置 WinBoll 应用 UI 类型
-        WinBollActivityManager.getInstance(this).setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Aplication);
+        // 设置 WinBoLL 应用 UI 类型
+        getWinBoLLActivityManager().setWinBoLLUI_TYPE(WinBoLLActivityManager.WinBoLLUI_TYPE.Aplication);
         
         //LogUtils.d(TAG, "onCreate");
         

contacts/src/main/java/cc/winboll/studio/contacts/MainActivity.java

@@ -32,22 +32,21 @@ import cc.winboll.studio.contacts.fragments.CallLogFragment;
 import cc.winboll.studio.contacts.fragments.ContactsFragment;
 import cc.winboll.studio.contacts.fragments.LogFragment;
 import cc.winboll.studio.contacts.services.MainService;
-import cc.winboll.studio.libaes.winboll.APPInfo;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.LogView;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 import com.google.android.material.tabs.TabLayout;
 import java.util.ArrayList;
 import java.util.List;
 
-final public class MainActivity extends AppCompatActivity implements IWinBollActivity, ViewPager.OnPageChangeListener, View.OnClickListener {
+final public class MainActivity extends AppCompatActivity implements IWinBoLLActivity, ViewPager.OnPageChangeListener, View.OnClickListener {
 
 	public static final String TAG = "MainActivity";
 
     public static final int REQUEST_HOME_ACTIVITY = 0;
     public static final int REQUEST_ABOUT_ACTIVITY = 1;
 
-    public static final String ACTION_SOS = "cc.winboll.studio.libappbase.WinBoll.ACTION_SOS";
+    public static final String ACTION_SOS = "cc.winboll.studio.libappbase.WinBoLL.ACTION_SOS";
 
     static MainActivity _MainActivity;
     LogView mLogView;
@@ -71,10 +70,10 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
 
     private static final int DIALER_REQUEST_CODE = 1;
 
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
+//    @Override
+//    public Activity getActivity() {
+//        return this;
+//    }
 
 //    @Override
 //    public APPInfo getAppInfo() {
@@ -95,6 +94,17 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
 //        return null;
 //    }
 
+
+    @Override
+    public Activity getActivity() {
+        return this;
+    }
+
+    @Override
+    public String getTag() {
+        return TAG;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         // 接收并处理 Intent 数据，函数 Intent 处理接收就直接返回
@@ -111,7 +121,7 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
 //            // 显示后退按钮
 //            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 //        }
-        getSupportActionBar().setSubtitle(getTag());
+        getSupportActionBar().setSubtitle(TAG);
 
         tabLayout = findViewById(R.id.tabLayout);
         viewPager = findViewById(R.id.viewPager);
@@ -339,7 +349,7 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
 //
 //        if (intent.getAction().equals(StringToQrCodeView.ACTION_UNITTEST_QRCODE)) {
 //            try {
-//                WinBollActivity clazzActivity = UnitTestActivity.class.newInstance();
+//                WinBoLLActivity clazzActivity = UnitTestActivity.class.newInstance();
 //                String tag = clazzActivity.getTag();
 //                LogUtils.d(TAG, "String tag = clazzActivity.getTag(); tag " + tag);
 //                Intent subIntent = new Intent(this, UnitTestActivity.class);
@@ -357,8 +367,8 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
 //                }
 //
 //                Files.copy(Paths.get(szSrcPath), Paths.get(file.getPath()));
-//                //startWinBollActivity(subIntent, tag);
-//                WinBollActivityManager.getInstance(this).startWinBollActivity(this, subIntent, UnitTestActivity.class);
+//                //startWinBoLLActivity(subIntent, tag);
+//                WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(this, subIntent, UnitTestActivity.class);
 //            } catch (IllegalAccessException | InstantiationException | IOException e) {
 //                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
 //                // 函数处理异常返回失败
@@ -371,10 +381,10 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
 //        return true;
 //    }
 
-    @Override
-    public String getTag() {
-        return TAG;
-    }
+//    @Override
+//    public String getTag() {
+//        return TAG;
+//    }
 
 //    @Override
 //    public void onBackPressed() {
@@ -386,7 +396,7 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
 //
 //            @Override
 //            public void onYes() {
-//                WinBollActivityManager.getInstance(getApplicationContext()).finishAll();
+//                WinBoLLActivityManager.getInstance(getApplicationContext()).finishAll();
 //            }
 //
 //            @Override
@@ -408,7 +418,7 @@ final public class MainActivity extends AppCompatActivity implements IWinBollAct
         if (item.getItemId() == R.id.item_settings) {
             Intent intent = new Intent(this, SettingsActivity.class);
             startActivity(intent);
-            //WinBollActivityManager.getInstance(this).startWinBollActivity(this, CallActivity.class);
+            //WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(this, CallActivity.class);
         }
 //        } else 
 //        if (item.getItemId() == R.id.item_exit) {

contacts/src/main/java/cc/winboll/studio/contacts/activities/AboutActivity.java

@@ -15,9 +15,9 @@ import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.libaes.winboll.APPInfo;
 import cc.winboll.studio.libaes.winboll.AboutView;
 import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 
-public class AboutActivity extends WinBollActivity implements IWinBollActivity {
+public class AboutActivity extends WinBoLLActivity implements IWinBoLLActivity {
 
     public static final String TAG = "AboutActivity";
 
@@ -64,13 +64,13 @@ public class AboutActivity extends WinBollActivity implements IWinBollActivity {
         );
         layout.addView(aboutView, params);
 
-        GlobalApplication.getWinBollActivityManager().add(this);
+        GlobalApplication.getWinBoLLActivityManager().add(this);
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        GlobalApplication.getWinBollActivityManager().registeRemove(this);
+        GlobalApplication.getWinBoLLActivityManager().registeRemove(this);
     }
 
     public AboutView CreateAboutView() {

contacts/src/main/java/cc/winboll/studio/contacts/activities/SettingsActivity.java

@@ -24,6 +24,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import cc.winboll.studio.contacts.App;
 import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.contacts.adapters.PhoneConnectRuleAdapter;
 import cc.winboll.studio.contacts.beans.MainServiceBean;
@@ -34,15 +35,13 @@ import cc.winboll.studio.contacts.bobulltoon.TomCat;
 import cc.winboll.studio.contacts.dun.Rules;
 import cc.winboll.studio.contacts.services.MainService;
 import cc.winboll.studio.contacts.views.DuInfoTextView;
-import cc.winboll.studio.libaes.winboll.APPInfo;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
+import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
 import com.hjq.toast.ToastUtils;
 import java.lang.reflect.Field;
 import java.util.List;
-import cc.winboll.studio.contacts.App;
 
-public class SettingsActivity extends AppCompatActivity implements IWinBollActivity {
+public class SettingsActivity extends AppCompatActivity implements IWinBoLLActivity {
 
     public static final String TAG = "SettingsActivity";
 
@@ -177,6 +176,8 @@ public class SettingsActivity extends AppCompatActivity implements IWinBollActiv
         etDunResumeSecondCount.setEnabled(!isEnableDun);
         etDunResumeCount.setEnabled(!isEnableDun);
 
+        EditText etBoBullToonURL = findViewById(R.id.bobulltoonurl_et);
+        etBoBullToonURL.setText(Rules.getInstance(this).getBoBullToonURL());
     }
 
     public static void notifyDunInfoUpdate() {
@@ -233,7 +234,18 @@ public class SettingsActivity extends AppCompatActivity implements IWinBollActiv
         }
     }
 
+    public void onResetBoBullToonURL(View view) {
+        Rules.getInstance(this).resetDefaultBoBullToonURL();
+        EditText etBoBullToonURL = findViewById(R.id.bobulltoonurl_et);
+        etBoBullToonURL.setText(Rules.getInstance(this).getBoBullToonURL());
+    }
+
     public void onDownloadBoBullToon(View view) {
+        EditText etBoBullToonURL = findViewById(R.id.bobulltoonurl_et);
+        if (!etBoBullToonURL.getText().toString().trim().equals(Rules.getInstance(this).getBoBullToonURL())) {
+            Rules.getInstance(this).setBoBullToonURL(etBoBullToonURL.getText().toString().trim());
+        }
+
         final TomCat tomCat = TomCat.getInstance(this);
         new Thread(new Runnable() {
                 @Override
@@ -247,8 +259,6 @@ public class SettingsActivity extends AppCompatActivity implements IWinBollActiv
             }).start();
     }
 
-
-
     public void onSearchBoBullToonPhone(View view) {
         TomCat tomCat = TomCat.getInstance(this);
         EditText etPhone = findViewById(R.id.activitysettingsEditText1);
@@ -311,8 +321,8 @@ public class SettingsActivity extends AppCompatActivity implements IWinBollActiv
             }
         }
     }
-    
+
     public void onAbout(View view) {
-        App.getWinBollActivityManager().startWinBollActivity(this, AboutActivity.class);
+        App.getWinBoLLActivityManager().startWinBoLLActivity(this, AboutActivity.class);
     }
 }

contacts/src/main/java/cc/winboll/studio/contacts/activities/WinBoLLActivity.java

@@ -1,18 +1,18 @@
-package cc.winboll.studio.aes;
+package cc.winboll.studio.contacts.activities;
 
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/31 15:16:45
+ * @Describe 应用窗口基类
+ */
 import android.app.Activity;
 import android.os.Bundle;
+import android.view.MenuItem;
 import androidx.appcompat.app.AppCompatActivity;
 import cc.winboll.studio.libaes.beans.AESThemeBean;
 import cc.winboll.studio.libaes.utils.AESThemeUtil;
 import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
-import android.view.MenuItem;
 
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/30 00:34:02
- * @Describe WinBoLL 活动窗口通用基类
- */
 public class WinBoLLActivity extends AppCompatActivity implements IWinBoLLActivity {
 
     public static final String TAG = "WinBoLLActivity";

contacts/src/main/java/cc/winboll/studio/contacts/activities/WinBollActivity.java

@@ -1,60 +0,0 @@
-package cc.winboll.studio.contacts.activities;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/31 15:16:45
- * @Describe 应用窗口基类
- */
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.MenuItem;
-import androidx.appcompat.app.AppCompatActivity;
-import cc.winboll.studio.libaes.beans.AESThemeBean;
-import cc.winboll.studio.libaes.utils.AESThemeUtil;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
-
-public class WinBollActivity extends AppCompatActivity implements IWinBollActivity {
-
-    public static final String TAG = "WinBollActivity";
-
-    protected volatile AESThemeBean.ThemeType mThemeType;
-
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        mThemeType = getThemeType();
-        setThemeStyle();
-        super.onCreate(savedInstanceState);
-    }
-
-    AESThemeBean.ThemeType getThemeType() {
-        /*SharedPreferences sharedPreferences = getSharedPreferences(
-         SHAREDPREFERENCES_NAME, MODE_PRIVATE);
-         return AESThemeBean.ThemeType.values()[((sharedPreferences.getInt(DRAWER_THEME_TYPE, AESThemeBean.ThemeType.DEFAULT.ordinal())))];
-         */
-        return AESThemeBean.getThemeStyleType(AESThemeUtil.getThemeTypeID(getApplicationContext()));
-    }
-
-    void setThemeStyle() {
-        //setTheme(AESThemeBean.getThemeStyle(getThemeType()));
-        setTheme(AESThemeUtil.getThemeTypeID(getApplicationContext()));
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if(item.getItemId() == android.R.id.home) {
-            finish();
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-}

contacts/src/main/java/cc/winboll/studio/contacts/beans/SettingsModel.java

@@ -14,6 +14,7 @@ import cc.winboll.studio.contacts.utils.IntUtils;
 public class SettingsModel extends BaseBean {
 
     public static final String TAG = "SettingsModel";
+    
     public static final int MAX_INTRANGE = 666666;
     public static final int MIN_INTRANGE = 1;
     
@@ -27,6 +28,8 @@ public class SettingsModel extends BaseBean {
     int dunResumeCount;
     // 是否启用云盾
     boolean isEnableDun;
+    // BoBullToon 应用模块数据请求地址
+    String szBoBullToon_URL;
 
     public SettingsModel() {
         this.dunTotalCount = 6;
@@ -34,14 +37,24 @@ public class SettingsModel extends BaseBean {
         this.dunResumeSecondCount = 60;
         this.dunResumeCount = 1;
         this.isEnableDun = false;
+        this.szBoBullToon_URL = "";
     }
 
-    public SettingsModel(int dunTotalCount, int dunCurrentCount, int dunResumeSecondCount, int dunResumeCount, boolean isEnableDun) {
+    public SettingsModel(int dunTotalCount, int dunCurrentCount, int dunResumeSecondCount, int dunResumeCount, boolean isEnableDun, String szBoBullToon_URL) {
         this.dunTotalCount = getSettingsModelRangeInt(dunTotalCount);
         this.dunCurrentCount = getSettingsModelRangeInt(dunCurrentCount);
         this.dunResumeSecondCount = getSettingsModelRangeInt(dunResumeSecondCount);
         this.dunResumeCount = getSettingsModelRangeInt(dunResumeCount);
         this.isEnableDun = isEnableDun;
+        this.szBoBullToon_URL = szBoBullToon_URL;
+    }
+
+    public void setBoBullToon_URL(String boBullToon_URL) {
+        this.szBoBullToon_URL = boBullToon_URL;
+    }
+
+    public String getBoBullToon_URL() {
+        return szBoBullToon_URL;
     }
 
     public void setDunTotalCount(int dunTotalCount) {
@@ -102,7 +115,8 @@ public class SettingsModel extends BaseBean {
         jsonWriter.name("dunResumeSecondCount").value(getDunResumeSecondCount());
         jsonWriter.name("dunResumeCount").value(getDunResumeCount());
         jsonWriter.name("isEnableDun").value(isEnableDun());
-
+        jsonWriter.name("szBoBullToon_URL").value(getBoBullToon_URL());
+        
     }
 
     @Override
@@ -118,6 +132,8 @@ public class SettingsModel extends BaseBean {
                 setDunResumeCount(getSettingsModelRangeInt(jsonReader.nextInt()));
             } else if (name.equals("isEnableDun")) {
                 setIsEnableDun(jsonReader.nextBoolean());
+            } else if (name.equals("szBoBullToon_URL")) {
+                setBoBullToon_URL(jsonReader.nextString());
             } else {
                 return false;
             }

contacts/src/main/java/cc/winboll/studio/contacts/bobulltoon/TomCat.java

@@ -6,6 +6,8 @@ package cc.winboll.studio.contacts.bobulltoon;
  * @Describe 汤姆猫管家 ：使用 BoBullToon 项目，对通讯地址进行筛选判断的好朋友。
  */
 import android.content.Context;
+import cc.winboll.studio.contacts.R;
+import cc.winboll.studio.contacts.dun.Rules;
 import cc.winboll.studio.libappbase.LogUtils;
 import com.hjq.toast.ToastUtils;
 import java.io.File;
@@ -28,6 +30,7 @@ public class TomCat {
     public static final String TAG = "TomCat";
 
     List<String> listPhoneBoBullToon = new ArrayList<String>();
+    String mszBoBullToon_URL;
 
     static volatile TomCat _TomCat;
     Context mContext;
@@ -41,8 +44,12 @@ public class TomCat {
         }
         return _TomCat;
     }
+    
+    public String getDefaultBobulltoonUrl() {
+        return mContext.getString(R.string.default_bobulltoon_url);
+    }
 
-    void downloadAndExtractZip(String zipUrl, String destinationFolder) throws IOException {
+    boolean downloadAndExtractZip(String zipUrl, String destinationFolder) throws IOException {
         OkHttpClient client = new OkHttpClient();
         Request request = new Request.Builder()
             .url(zipUrl)
@@ -95,13 +102,16 @@ public class TomCat {
             // 删除临时 ZIP 文件
             tempZipFile.delete();
             LogUtils.d(TAG, "已更新 BoBullToon 数据");
+            return true;
         } catch (Exception e) {
+            ToastUtils.show(e.getMessage());
             LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+            return false;
         }
     }
 
     public boolean downloadBoBullToon() {
-        String zipUrl = "http://10.8.0.12:3000/Studio/BoBullToon/archive/main.zip"; // 替换为实际的 ZIP 文件 URL
+        String zipUrl = Rules.getInstance(mContext).getBoBullToonURL(); // 替换为实际的 ZIP 文件 URL
         String destinationFolder = getWorkingFolder().getPath(); // 替换为实际的目标文件夹路径
         try {
             // 删除旧文件
@@ -113,9 +123,11 @@ public class TomCat {
             }
 
             // 更新新文件
-            downloadAndExtractZip(zipUrl, destinationFolder);
-            LogUtils.d(TAG, "ZIP 文件下载并解压成功。");
-            return true;
+            if(downloadAndExtractZip(zipUrl, destinationFolder)) {
+                LogUtils.d(TAG, "ZIP 文件下载并解压成功。");
+                return true;
+            }
+            return false;
         } catch (IOException e) {
             LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
         }

contacts/src/main/java/cc/winboll/studio/contacts/dun/Rules.java

@@ -18,6 +18,7 @@ import java.util.ArrayList;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.regex.Pattern;
+import cc.winboll.studio.contacts.bobulltoon.TomCat;
 
 public class Rules {
 
@@ -83,6 +84,20 @@ public class Rules {
         LogUtils.d(TAG, String.format("saveRules()"));
         PhoneConnectRuleModel.saveBeanList(mContext, _PhoneConnectRuleModelList, PhoneConnectRuleModel.class);
     }
+    
+    public void resetDefaultBoBullToonURL() {
+        mSettingsModel.setBoBullToon_URL(TomCat.getInstance(mContext).getDefaultBobulltoonUrl());
+        saveDun();
+    }
+
+    public void setBoBullToonURL(String szUrl) {
+        mSettingsModel.setBoBullToon_URL(szUrl);
+        saveDun();
+    }
+
+    public String getBoBullToonURL() {
+        return mSettingsModel.getBoBullToon_URL();
+    }
 
     public void loadDun() {
         mSettingsModel = SettingsModel.loadBean(mContext, SettingsModel.class);

contacts/src/main/java/cc/winboll/studio/contacts/services/MainService.java

@@ -31,7 +31,7 @@ import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.sos.SOS;
 import java.util.Timer;
 import java.util.TimerTask;
-import cc.winboll.studio.libappbase.sos.WinBoll;
+import cc.winboll.studio.libappbase.sos.WinBoLL;
 import cc.winboll.studio.contacts.App;
 import cc.winboll.studio.libappbase.sos.APPModel;
 
@@ -129,11 +129,11 @@ public class MainService extends Service {
             isServiceRunning = true;
             // 唤醒守护进程
             wakeupAndBindAssistant();
-            // 召唤 WinBoll APP 绑定本服务
+            // 召唤 WinBoLL APP 绑定本服务
             if (App.isDebuging()) {
-                WinBoll.bindToAPPBaseBeta(this, MainService.class.getName());
+                WinBoLL.bindToAPPBaseBeta(this, MainService.class.getName());
             } else {
-                WinBoll.bindToAPPBase(this, MainService.class.getName());
+                WinBoLL.bindToAPPBase(this, MainService.class.getName());
             }
 
             // 初始化服务运行参数

contacts/src/main/res/layout/activity_settings.xml

@@ -195,16 +195,29 @@
 				android:text="拨不通电话记录查询："/>
 
 			<LinearLayout
-				android:orientation="vertical"
+				android:orientation="horizontal"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:gravity="right"
 				android:layout_margin="10dp">
 
+				<EditText
+					android:layout_width="0dp"
+					android:ems="10"
+					android:layout_height="wrap_content"
+					android:layout_weight="1.0"
+					android:id="@+id/bobulltoonurl_et"/>
+
 				<Button
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:text="下载 BoBullToon"
+					android:text="重置地址"
+					android:onClick="onResetBoBullToonURL"/>
+
+				<Button
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="下载数据"
 					android:onClick="onDownloadBoBullToon"/>
 
 			</LinearLayout>

contacts/src/main/res/values/colors.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- WinBoll 默认方案 -->
+    <!-- WinBoLL 默认方案 -->
     <color name="colorPrimary">#FF196ABC</color>
     <color name="colorPrimaryDark">#FF002B57</color>
     <color name="colorAccent">#FF80BFFF</color>

contacts/src/main/res/values/strings.xml

@@ -2,5 +2,6 @@
 <resources>
 
     <string name="app_name">Contacts</string>
+    <string name="default_bobulltoon_url">http://10.8.0.12:3000/Studio/BoBullToon/archive/main.zip</string>
 
 </resources>

contacts/src/main/res/values/styles.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="MyAppTheme" parent="APPBaseTheme">
+    <style name="MyAppTheme" parent="AESTheme">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
@@ -8,7 +8,7 @@
         <item name="android:windowContentOverlay">@null</item>
     </style>
 
-    <style name="GlobalCrashActivityTheme" parent="@android:style/Theme.DeviceDefault.Light.NoActionBar">
+    <style name="GlobalCrashActivityTheme" parent="AESTheme">
         <item name="colorTittle">@color/colorAccent</item>
         <item name="colorTittleBackgound">@color/colorPrimary</item>
         <item name="colorText">@color/colorAccent</item>

contacts/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="true">winboll.cc</domain>
+    </domain-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <domain includeSubdomains="false">10.8.0.12</domain>
+    </domain-config>
+</network-security-config>

libaes/build.gradle

@@ -21,6 +21,9 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
+    //api 'cc.winboll.studio:libaes:15.6.0'
+    api 'cc.winboll.studio:libapputils:15.3.4'
+    api 'cc.winboll.studio:libappbase:15.7.6'
     
     // 吐司类库
     api 'com.github.getActivity:ToastUtils:10.5'
@@ -50,7 +53,4 @@ dependencies {
     //api 'androidx.vectordrawable:vectordrawable:1.1.0'
     //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
     //api 'androidx.fragment:fragment:1.1.0'
-    
-    api 'cc.winboll.studio:libapputils:15.3.4'
-    api 'cc.winboll.studio:libappbase:15.7.6'
 }

libaes/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Apr 29 15:14:21 HKT 2025
+#Sat May 03 11:34:58 GMT 2025
 stageCount=1
 libraryProject=libaes
 baseVersion=15.6
 publishVersion=15.6.0
-buildCount=0
+buildCount=9
 baseBetaVersion=15.6.1

libaes/src/main/AndroidManifest.xml

@@ -5,27 +5,34 @@
 
     <application>
 
-        <activity android:name="cc.winboll.studio.libaes.unittests.SecondaryLibraryActivity"
+        <activity
+            android:name="cc.winboll.studio.libaes.unittests.SecondaryLibraryActivity"
             android:exported="true"/>
 
-        <activity android:name="cc.winboll.studio.libaes.unittests.TestDrawerFragmentActivity"
+        <activity
+            android:name="cc.winboll.studio.libaes.unittests.TestDrawerFragmentActivity"
             android:exported="true"/>
 
-        <activity android:name="cc.winboll.studio.libaes.unittests.TestAToolbarActivity"
+        <activity
+            android:name="cc.winboll.studio.libaes.unittests.TestAToolbarActivity"
             android:exported="true"/>
 
-        <activity android:name="cc.winboll.studio.libaes.unittests.TestASupportToolbarActivity"
+        <activity
+            android:name="cc.winboll.studio.libaes.unittests.TestASupportToolbarActivity"
             android:exported="true"/>
 
-        <service android:name="cc.winboll.studio.libaes.winboll.WinBoLLClientService"
+        <service
+            android:name="cc.winboll.studio.libaes.winboll.WinBoLLClientService"
             android:exported="true"/>
 
-        <service android:name="cc.winboll.studio.libaes.winboll.AssistantService"
+        <service
+            android:name="cc.winboll.studio.libaes.winboll.AssistantService"
             android:exported="true"/>
 
-        <service android:name="cc.winboll.studio.libaes.winboll.WinBoLLMail"
+        <service
+            android:name="cc.winboll.studio.libaes.winboll.WinBoLLMail"
             android:exported="true"/>
 
     </application>
 
-</manifest>
+</manifest>

libaes/src/main/java/cc/winboll/studio/libaes/beans/WinBoLLClientServiceBean.java

@@ -1,9 +1,8 @@
-package cc.winboll.studio.libaes.winboll;
+package cc.winboll.studio.libaes.beans;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/28 19:05:15
- * @Describe WinBoLLService 运行参数配置
+ * @Author ZhanGSKen
+ * @Date 2025/05/03 19:16
  */
 import android.content.Context;
 import android.util.JsonReader;
@@ -14,11 +13,16 @@ import java.io.IOException;
 public class WinBoLLClientServiceBean extends BaseBean {
 
     public static final String TAG = "WinBoLLClientServiceBean";
-
-    volatile boolean isEnable;
-
+    
+    // 服务是否正在使用中
+    boolean isEnable;
+    
     public WinBoLLClientServiceBean() {
-        isEnable = false;
+        this.isEnable = false;
+    }
+
+    public WinBoLLClientServiceBean(boolean isEnable) {
+        this.isEnable = isEnable;
     }
 
     public void setIsEnable(boolean isEnable) {
@@ -29,6 +33,7 @@ public class WinBoLLClientServiceBean extends BaseBean {
         return isEnable;
     }
 
+
     @Override
     public String getName() {
         return WinBoLLClientServiceBean.class.getName();
@@ -38,17 +43,17 @@ public class WinBoLLClientServiceBean extends BaseBean {
     public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
         super.writeThisToJsonWriter(jsonWriter);
         WinBoLLClientServiceBean bean = this;
-        jsonWriter.name("isEnable").value(bean.isEnable());
+        //jsonWriter.name("logLevel").value(bean.getLogLevel().ordinal());
     }
 
     @Override
     public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
         if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
-            if (name.equals("isEnable")) {
-                setIsEnable(jsonReader.nextBoolean());
-            } else {
-                return false;
-            }
+//            if (name.equals("logLevel")) {
+//                setLogLevel(LogUtils.LOG_LEVEL.values()[jsonReader.nextInt()]);
+//            } else {
+//                return false;
+//            }
         }
         return true;
     }
@@ -68,11 +73,6 @@ public class WinBoLLClientServiceBean extends BaseBean {
     }
 
     public static WinBoLLClientServiceBean loadWinBoLLClientServiceBean(Context context) {
-        WinBoLLClientServiceBean bean = WinBoLLClientServiceBean.loadBean(context, WinBoLLClientServiceBean.class);
-        return bean == null ? new WinBoLLClientServiceBean() : bean;
-    }
-
-    public static boolean saveWinBoLLServiceBean(WinBoLLClientService service, WinBoLLClientServiceBean bean) {
-        return WinBoLLClientServiceBean.saveBean(service, bean);
+        return new WinBoLLClientServiceBean();
     }
 }

libaes/src/main/java/cc/winboll/studio/libaes/winboll/AssistantService.java

@@ -11,7 +11,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
-import cc.winboll.studio.libaes.winboll.WinBoLLClientService;
+import cc.winboll.studio.libaes.beans.WinBoLLClientServiceBean;
+import cc.winboll.studio.libaes.winboll.AssistantService;
 import cc.winboll.studio.libappbase.utils.ServiceUtils;
 
 public class AssistantService extends Service {

libaes/src/main/java/cc/winboll/studio/libaes/winboll/IWinBoLLClientServiceBinder.java

@@ -1,17 +0,0 @@
-package cc.winboll.studio.libaes.winboll;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/28 19:08:45
- * @Describe WinBoLLService 服务 Binder。
- */
-import android.graphics.drawable.Drawable;
-
-public interface IWinBoLLClientServiceBinder {
-
-    public static final String TAG = "IWinBoLLClientServiceBinder";
-
-    public WinBoLLClientService getService();
-
-    public Drawable getCurrentStatusIconDrawable();
-}

libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLClientService.java

@@ -1,192 +1,21 @@
 package cc.winboll.studio.libaes.winboll;
 
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/28 19:06:54
- * @Describe WinBoLL 客户端服务
- */
 import android.app.Service;
-import android.content.ComponentName;
-import android.content.Context;
 import android.content.Intent;
-import android.content.ServiceConnection;
-import android.graphics.drawable.Drawable;
 import android.os.IBinder;
-import cc.winboll.studio.libaes.winboll.AssistantService;
-import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.utils.ServiceUtils;
-import cc.winboll.studio.libapputils.utils.PrefUtils;
-import com.hjq.toast.ToastUtils;
-
-public class WinBoLLClientService extends Service implements IWinBoLLClientServiceBinder {
 
+/**
+ * @Author ZhanGSKen
+ * @Date 2025/05/03 19:28
+ */
+public class WinBoLLClientService extends Service {
+    
     public static final String TAG = "WinBoLLClientService";
-
-    WinBoLLClientServiceBean mWinBoLLClientServiceBean;
-    MyServiceConnection mMyServiceConnection;
-    volatile boolean mIsWinBoLLClientThreadRunning;
-    volatile boolean mIsEnableService;
-    volatile WinBoLLClientThread mWinBoLLClientThread;
-
-    public boolean isWinBoLLClientThreadRunning() {
-        return mIsWinBoLLClientThreadRunning;
-    }
-
-    @Override
-    public WinBoLLClientService getService() {
-        return WinBoLLClientService.this;
-    }
-
-    @Override
-    public Drawable getCurrentStatusIconDrawable() {
-        return mIsWinBoLLClientThreadRunning ?
-            getDrawable(EWUIStatusIconDrawable.getIconDrawableId(EWUIStatusIconDrawable.NORMAL))
-            : getDrawable(EWUIStatusIconDrawable.getIconDrawableId(EWUIStatusIconDrawable.NEWS));
-    }
-
+    
     @Override
     public IBinder onBind(Intent intent) {
+        
         return null;
     }
-
-    @Override
-    public void onCreate() {
-        //ToastUtils.show("onCreate");
-        super.onCreate();
-        mWinBoLLClientThread = null;
-        mWinBoLLClientServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this);
-        mIsEnableService = mWinBoLLClientServiceBean.isEnable();
-
-        if (mMyServiceConnection == null) {
-            mMyServiceConnection = new MyServiceConnection();
-        }
-
-        // 由系统启动时，应用可以通过下面函数实例化实际服务进程。
-        runMainThread();
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        //ToastUtils.show("onStartCommand");
-        // 由应用 Intent 启动时，应用可以通过下面函数实例化实际服务进程。
-        runMainThread();
-
-        // 返回运行参数持久化存储后，服务状态控制参数
-        // 无论 Intent 传入如何，服务状态一直以持久化存储后的参数控制，
-        // PS: 另外当然可以通过 Intent 传入的指标来修改 mWinBoLLServiceBean，
-        //     不过本服务的应用方向会变得繁琐，
-        //     现阶段只要满足手机端启动与停止本服务，WinBoLL 客户端实例运行在手机端就可以了。
-        return mIsEnableService ? Service.START_STICKY: super.onStartCommand(intent, flags, startId);
-    }
-
-    synchronized void runMainThread() {
-        if (mWinBoLLClientThread == null) {
-            //ToastUtils.show("runMainThread()");
-            mWinBoLLClientThread = new WinBoLLClientThread();
-            mWinBoLLClientThread.start();
-        }
-    }
-
-    void syncWinBoLLClientThreadStatus() {
-        mWinBoLLClientServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this);
-        mIsEnableService = mWinBoLLClientServiceBean.isEnable();
-        LogUtils.d(TAG, String.format("mIsEnableService %s", mIsEnableService));
-    }
-
-
-    // 唤醒和绑定守护进程
-    //
-    void wakeupAndBindAssistant() {
-        if (ServiceUtils.isServiceRunning(getApplicationContext(), AssistantService.class.getName()) == false) {
-            startService(new Intent(WinBoLLClientService.this, AssistantService.class));
-            //LogUtils.d(TAG, "call wakeupAndBindAssistant() : Binding... AssistantService");
-            bindService(new Intent(WinBoLLClientService.this, AssistantService.class), mMyServiceConnection, Context.BIND_IMPORTANT);
-        }
-    }
-
-    // 主进程与守护进程连接时需要用到此类
-    //
-    private class MyServiceConnection implements ServiceConnection {
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {            
-            mWinBoLLClientServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(WinBoLLClientService.this);
-            if (mWinBoLLClientServiceBean.isEnable()) {
-                // 唤醒守护进程
-                wakeupAndBindAssistant();
-            }
-        }
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        //ToastUtils.show("onDestroy");
-    }
-
-    @Override
-    public void onStart(Intent intent, int startId) {
-        super.onStart(intent, startId);
-    }
-
-    void setWinBoLLServiceEnableStatus(boolean isEnable) {
-        WinBoLLClientServiceBean bean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(this);
-        bean.setIsEnable(isEnable);
-        WinBoLLClientServiceBean.saveWinBoLLServiceBean(this, bean);
-    }
-
-    boolean getWinBoLLServiceEnableStatus(Context context) {
-        mWinBoLLClientServiceBean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(context);
-        return mWinBoLLClientServiceBean.isEnable();
-    }
-
-    /*public interface OnServiceStatusChangeListener {
-     void onServerStatusChange(boolean isServiceAlive);
-     }
-
-     public void setOnServerStatusChangeListener(OnServiceStatusChangeListener l) {
-     mOnServerStatusChangeListener = l;
-     }*/
-
-    class WinBoLLClientThread extends Thread {
-        @Override
-        public void run() {
-            super.run();
-            LogUtils.d(TAG, "run syncWinBoLLClientThreadStatus");
-            syncWinBoLLClientThreadStatus();
-            if (mIsEnableService) {
-                if (mIsWinBoLLClientThreadRunning == false) {
-                    // 设置运行状态
-                    mIsWinBoLLClientThreadRunning = true;
-                    LogUtils.d(TAG, "WinBoLLClientThread run()");
-
-                    // 唤醒守护进程
-                    //wakeupAndBindAssistant();
-                    
-                    while (mIsEnableService) {
-                        // 显示运行状态
-                        WinBoLLServiceStatusView.startConnection();
-                        LogUtils.d(TAG, String.format("while mIsEnableService is %s", mIsEnableService));
-                        
-                        try {
-                            Thread.sleep(10 * 1000);
-                        } catch (InterruptedException e) {
-                            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-                        }
-                        syncWinBoLLClientThreadStatus();
-                    }
-
-                    // 服务进程退出, 重置进程运行状态
-                    WinBoLLServiceStatusView.stopConnection();
-                    mIsWinBoLLClientThreadRunning = false;
-                    mWinBoLLClientThread = null;
-                }
-            }
-        }
-    }
-}
+    
+}

libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLMail.java

@@ -1,22 +0,0 @@
-package cc.winboll.studio.libaes.winboll;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/28 19:13:20
- * @Describe WinBoLL 邮件服务
- */
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-
-public class WinBoLLMail extends Service {
-
-    public static final String TAG = "WinBoLLMail";
-
-    @Override
-    public IBinder onBind(Intent intent) {
-
-        return null;
-    }
-
-}

libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLServerConnectionThread.java

@@ -1,106 +0,0 @@
-package cc.winboll.studio.libaes.winboll;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/29 15:57:28
- * @Describe WinBoLL 服务器服务情况测试访问进程。
- */
-import cc.winboll.studio.libappbase.LogUtils;
-import java.io.IOException;
-import okhttp3.Call;
-import okhttp3.Callback;
-import okhttp3.Credentials;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.Response;
-
-// 新增自定义回调接口
-interface TextCallback {
-    void onSuccess(String text);
-    void onFailure(Exception e);
-}
-
-public class WinBoLLServerConnectionThread extends Thread {
-
-    public static final String TAG = "WinBoLLClientService";
-
-    private final String url;
-    private final String username;
-    private final String password;
-    private final int connectTimeout;
-    private final int readTimeout;
-    private final int maxRetries;
-    private final TextCallback callback; // 新增回调成员变量
-
-    // 新增带回调的构造函数
-    public WinBoLLServerConnectionThread(String url, String username, String password, TextCallback callback) {
-        this(url, username, password, 10000, 10000, 5, callback);
-    }
-
-    // 修改原有构造函数，添加回调参数
-    public WinBoLLServerConnectionThread(String url, String username, String password, 
-                                             int connectTimeout, int readTimeout, int maxRetries, TextCallback callback) {
-        this.url = url;
-        this.username = username;
-        this.password = password;
-        this.connectTimeout = connectTimeout;
-        this.readTimeout = readTimeout;
-        this.maxRetries = maxRetries;
-        this.callback = callback;
-    }
-
-    @Override
-    public void run() {
-        LogUtils.d(TAG, String.format("run() url %s\nusername %s\npassword %s", url, username, password));
-        String credential = Credentials.basic(username, password);
-        LogUtils.d(TAG, String.format("credential %s", credential));
-
-        OkHttpClient client = new OkHttpClient();
-        Request request = new Request.Builder()
-            .url(url)
-            .header("Accept", "text/plain")
-            .header("Authorization", credential)
-            .build();
-            
-        Call call = client.newCall(request);
-        call.enqueue(new Callback() {
-                @Override
-                public void onFailure(Call call, IOException e) {
-                    // 优先调用自定义回调
-                    if (callback != null) {
-                        callback.onFailure(e);
-                    } else {
-                        LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-                    }
-                }
-
-                @Override
-                public void onResponse(Call call, Response response) throws IOException {
-                    if (!response.isSuccessful()) {
-                        if (callback != null) {
-                            callback.onFailure(new Exception("Unexpected code " + response));
-                        } else {
-                            LogUtils.d(TAG, "Unexpected code " + response, Thread.currentThread().getStackTrace());
-                        }
-                        return;
-                    }
-
-                    try {
-                        String text = response.body().string();
-                        // 优先调用自定义回调
-                        if (callback != null) {
-                            callback.onSuccess(text);
-                        } else {
-                            LogUtils.d(TAG, text);
-                        }
-                    } catch (Exception e) {
-                        if (callback != null) {
-                            callback.onFailure(e);
-                        } else {
-                            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-                        }
-                    }
-                }
-            });
-    }
-}

libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBoLLServiceStatusView.java

@@ -1,473 +1,38 @@
 package cc.winboll.studio.libaes.winboll;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
 
 /**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/28 17:41:55
- * @Describe WinBoLL 服务主机连接状态视图
+ * @Author ZhanGSKen
+ * @Date 2025/05/03 19:14
  */
-import cc.winboll.studio.libaes.R;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.graphics.drawable.Drawable;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.Message;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import cc.winboll.studio.libaes.winboll.WinBoLLClientService;
-import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libapputils.utils.PrefUtils;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-//import okhttp3.Authenticator;
-//import okhttp3.Credentials;
-//import okhttp3.OkHttpClient;
-//import okhttp3.Request;
-//import okhttp3.Response;
-//import okhttp3.Route;
-
 public class WinBoLLServiceStatusView extends LinearLayout {
-
+    
     public static final String TAG = "WinBoLLServiceStatusView";
-
-    public static final int MSG_CONNECTION_INFO = 0;
-    public static final int MSG_UPDATE_CONNECTION_STATUS = 1;
-
-    static WinBoLLServiceStatusView _WinBoLLServiceStatusView;
-    Context mContext;
-    //boolean mIsConnected;
-    volatile ConnectionThread mConnectionThread;
-
-    String mszServerHost;
-    WinBoLLClientService mWinBoLLService;
-    ImageView mImageView;
-    TextView mTextView;
-    WinBoLLServiceViewHandler mWinBoLLServiceViewHandler;
-    //WebView mWebView;
-    static volatile ConnectionStatus mConnectionStatus;
-    View.OnClickListener mViewOnClickListener;
-    static String _mUserName;
-    static String _mPassword;
-
-    static enum ConnectionStatus {
-        DISCONNECTED,
-        START_CONNECT,
-        CONNECTING,
-        CONNECTED;
-    };
-
-    boolean isBound = false;
-    ServiceConnection connection = new ServiceConnection() {
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            IWinBoLLClientServiceBinder binder = (IWinBoLLClientServiceBinder) service;
-            mWinBoLLService = binder.getService();
-            isBound = true;
-            // 可以在这里调用Service的方法进行通信，比如获取数据
-            mImageView.setBackgroundDrawable(mWinBoLLService.getCurrentStatusIconDrawable());
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-            isBound = false;
-        }
-    };
-
+    
     public WinBoLLServiceStatusView(Context context) {
         super(context);
-        mContext = context;
-        initView();
     }
 
     public WinBoLLServiceStatusView(Context context, AttributeSet attrs) {
         super(context, attrs);
-        mContext = context;
-        initView();
     }
 
     public WinBoLLServiceStatusView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        mContext = context;
-        initView();
     }
 
     public WinBoLLServiceStatusView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
-        mContext = context;
-        initView();
     }
-
-    ConnectionStatus getConnectionStatus() {
-        return false ?
-            ConnectionStatus.CONNECTED 
-            : ConnectionStatus.DISCONNECTED;
-    }
-
-    void initView() {
-        _WinBoLLServiceStatusView = this;
-
-        mImageView = new ImageView(mContext);
-        setImageViewByConnection(mImageView, false);
-        mConnectionStatus = getConnectionStatus();
-        //mIsConnected = false;
-        //mWinBoLLServerHostConnectionStatus = WinBoLLServerHostConnectionStatus.DISCONNECTED;
-        //ToastUtils.show("initView()");
-
-        mViewOnClickListener = new View.OnClickListener(){
-            @Override
-            public void onClick(View v) {
-                LogUtils.d(TAG, "onClick()");
-                if (mConnectionStatus == ConnectionStatus.CONNECTED) {
-                    LogUtils.d(TAG, "Click to stop service.");
-                    WinBoLLClientServiceBean bean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(mContext);
-                    bean.setIsEnable(false);
-                    WinBoLLClientServiceBean.saveBean(mContext, bean);
-                    Intent intent = new Intent(mContext, WinBoLLClientService.class);
-                    mContext.stopService(intent);
-                    //stopConnectionThread();
-                    mTextView.setText("");
-                    setImageViewByConnection(mImageView, false);
-                    mConnectionStatus = ConnectionStatus.DISCONNECTED;
-                } else if (mConnectionStatus == ConnectionStatus.DISCONNECTED) {
-                    LogUtils.d(TAG, "Click to start service.");
-                    WinBoLLClientServiceBean bean = WinBoLLClientServiceBean.loadWinBoLLClientServiceBean(mContext);
-                    bean.setIsEnable(true);
-                    WinBoLLClientServiceBean.saveBean(mContext, bean);
-                    Intent intent = new Intent(mContext, WinBoLLClientService.class);
-                    mContext.startService(intent);
-                    //startConnectionThread();
-                }
-            }
-        };
-        setOnClickListener(mViewOnClickListener);
-        addView(mImageView);
-        mTextView = new TextView(mContext);
-        mWinBoLLServiceViewHandler = new WinBoLLServiceViewHandler(this);
-        addView(mTextView);
-        /*mWebView = new WebView(mContext);
-         mWebView.setWebViewClient(new WebViewClient() {
-         @Override
-         public void onReceivedHttpAuthRequest(WebView view, HttpAuthHandler handler, String host, String realm) {
-         // 弹出系统基本HTTP验证窗口
-         handler.proceed("username", "password");
-         }
-         });
-         addView(mWebView);*/
-    }
-
-    void checkWinBoLLServerStatusAndUpdateCurrentView() {
-        LogUtils.d(TAG, "checkWinBoLLServerStatusAndUpdateCurrentView()");
-        /*if (getConnectionStatus() == ConnectionStatus.CONNECTED) {
-         mConnectionStatus = ConnectionStatus.CONNECTED;
-         } else {
-         mConnectionStatus = ConnectionStatus.DISCONNECTED;
-         }*/
-    }
-
-    public void setServerHost(String szWinBoLLServerHost) {
-        mszServerHost = szWinBoLLServerHost;
-    }
-
-    public void setAuthInfo(String username, String password) {
-        _mUserName = username;
-        _mPassword = password;
-    }
-
-    void setImageViewByConnection(ImageView imageView, boolean isConnected) {
-        //mIsConnected = isConnected;
-        // 获取vector drawable
-        Drawable drawable = mContext.getDrawable(isConnected ? R.drawable.ic_dev_connected : R.drawable.ic_dev_disconnected);
-        if (drawable != null) {
-            imageView.setImageDrawable(drawable);
-        }
-    }
-
-    TextCallback apiTextCallback = new TextCallback() {
-        @Override
-        public void onSuccess(String text) {
-            // 处理成功响应
-            LogUtils.d(TAG, text);
-        }
-
-        @Override
-        public void onFailure(Exception e) {
-            // 处理失败情况
-            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-        }
-    };
-
-    TextCallback cipTextCallback = new TextCallback() {
-        @Override
-        public void onSuccess(String text) {
-            // 处理成功响应
-            LogUtils.d(TAG, text);
-            LogUtils.d(TAG, "Develop Host Connection IP is : " + text);
-            mConnectionStatus = ConnectionStatus.CONNECTED;
-            // 获取当前时间
-            LocalDateTime now = LocalDateTime.now();
-            // 定义时间格式
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss");
-            // 按照指定格式格式化时间并输出
-            String formattedDateTime = now.format(formatter);
-            String msg = "ClientIP<" + formattedDateTime + ">: " + text;
-            mWinBoLLServiceViewHandler.postMessageText(msg);
-            mWinBoLLServiceViewHandler.postMessageConnectionStatus(true);
-
-        }
-
-        @Override
-        public void onFailure(Exception e) {
-            // 处理失败情况
-            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-            // 处理网络请求失败
-            setImageViewByConnection(mImageView, false);
-            mWinBoLLServiceViewHandler.postMessageText(e.getMessage());
-            mWinBoLLServiceViewHandler.postMessageConnectionStatus(false);
-        }
-    };
-
-    public void requestAPIWithBasicAuth() {
-        String targetUrl = "https://" + (GlobalApplication.isDebuging() ?"dev.winboll": "winboll") + ".cc/api/"; // 替换为实际测试的URL
-        requestWithBasicAuth(targetUrl, apiTextCallback);
-    }
-
-    public void requestCIPWithBasicAuth() {
-        String targetUrl = mszServerHost + "/cip/?simple=true";
-        requestWithBasicAuth(targetUrl, cipTextCallback);
-    }
-
-    public void requestWithBasicAuth(String targetUrl, TextCallback callback) {
-        String username = "";
-        String password = "";
-        if (GlobalApplication.isDebuging()) {
-            username = PrefUtils.getString(mContext, "metDevUserName", "");
-            password = PrefUtils.getString(mContext, "metDevUserPassword", "");
-        } else {
-            username = "WinBoLL";
-            password = "WinBoLLPowerByZhanGSKen";
-        }
+    
+    
+    void setServerHost(String szWinBoLLServerHost) {
         
-        LogUtils.d(TAG, String.format("Connection Start. targetUrl %s", targetUrl));
-        WinBoLLServerConnectionThread thread = new WinBoLLServerConnectionThread(
-            targetUrl,
-            username,
-            password,
-            cipTextCallback
-        );
-        thread.start();
     }
-
-    /*void requestWithBasicAuth(final WinBoLLServiceViewHandler textViewHandler, String targetUrl, final String username, final String password) {
-     // 用户名和密码，替换为实际的认证信息
-     //String username = "your_username";
-     //String password = "your_password";
-     LogUtils.d(TAG, "requestWithBasicAuth(...)");
-     LogUtils.d(TAG, String.format("targetUrl %s", targetUrl));
-
-     // 构建包含认证信息的请求
-     String credential = Credentials.basic(username, password);
-     LogUtils.d(TAG, String.format("credential %s", credential));
-
-     OkHttpClient client = new OkHttpClient();
-     Request request = new Request.Builder()
-     .url(targetUrl)
-     .header("Accept", "text/plain") // 设置正确的Content-Type头
-     .header("Authorization", credential)
-     .build();
-
-     Call call = client.newCall(request);
-     call.enqueue(new Callback() {
-     @Override
-     public void onFailure(Call call, IOException e) {
-     // 处理网络请求失败
-     setImageViewByConnection(mImageView, false);
-     textViewHandler.postMessageText(e.getMessage());
-     textViewHandler.postMessageConnectionStatus(false);
-     LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-     //String sz = "请求失败，状态码: " + response.code();
-     //setImageViewByConnection(mImageView, false);
-     //LogUtils.d(TAG, sz);
-     }
-
-     @Override
-     public void onResponse(Call call, Response response) throws IOException {
-     if (!response.isSuccessful()) {
-     setImageViewByConnection(mImageView, false);
-     textViewHandler.postMessageText("Unexpected code " + response);
-     textViewHandler.postMessageConnectionStatus(false);
-     LogUtils.d(TAG, "Unexpected code " + response, Thread.currentThread().getStackTrace());
-     return;
-     }
-
-     try {
-     // 读取响应体作为字符串，注意这里可能需要解码
-     String text = response.body().string();
-     LogUtils.d(TAG, "Develop Host Connection IP is : " + text);
-     mConnectionStatus = ConnectionStatus.CONNECTED;
-     // 获取当前时间
-     LocalDateTime now = LocalDateTime.now();
-     // 定义时间格式
-     DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss");
-     // 按照指定格式格式化时间并输出
-     String formattedDateTime = now.format(formatter);
-     textViewHandler.postMessageText("ClientIP<" + formattedDateTime + ">: " + text);
-     textViewHandler.postMessageConnectionStatus(true);
-
-     //org.jsoup.nodes.Document doc = org.jsoup.Jsoup.parse(text);
-     //LogUtils.d(TAG, doc.text());
-
-     // 使用id选择器找到具有特定id的元素
-     //org.jsoup.nodes.Element elementWithId = doc.select("#LastRelease").first(); // 获取第一个匹配的元素
-
-     // 提取并打印元素的文本内容
-     //mszNewestAppPackageName = elementWithId.text();
-     //ToastUtils.delayedShow(text + "\n" + mszNewestAppPackageName, 5000);
-
-     //mHandler.sendMessage(mHandler.obtainMessage(MSG_APPUPDATE_CHECKED));
-     //System.out.println(response.body().string());
-     //                        mConnectionStatus = ConnectionStatus.CONNECTED;
-     //                        // 获取当前时间
-     //                        LocalDateTime now = LocalDateTime.now();
-     //
-     //                        // 定义时间格式
-     //                        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd HH:mm:ss");
-     //                        // 按照指定格式格式化时间并输出
-     //                        String formattedDateTime = now.format(formatter);
-     //                        //System.out.println(formattedDateTime);
-     //                        textViewHandler.postMessageText("ClientIP<" + formattedDateTime + ">: " + response.body().string());
-     //                        textViewHandler.postMessageConnectionStatus(true);
-     } catch (Exception e) {
-     LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-     }
-     }
-     });
-
-     }*/
-
-    class WinBoLLServiceViewHandler extends Handler {
-        WinBoLLServiceStatusView mDevelopHostConnectionStatusView;
-
-        public WinBoLLServiceViewHandler(WinBoLLServiceStatusView view) {
-            mDevelopHostConnectionStatusView = view;
-        }
-
-        @Override
-        public void handleMessage(Message msg) {
-            if (msg.what == MSG_CONNECTION_INFO) {
-                mDevelopHostConnectionStatusView.mTextView.setText((String)msg.obj);
-            } else if (msg.what == MSG_UPDATE_CONNECTION_STATUS) {
-                mDevelopHostConnectionStatusView.setImageViewByConnection(mImageView, (boolean)msg.obj);
-                mDevelopHostConnectionStatusView.mConnectionStatus = ((boolean)msg.obj) ? ConnectionStatus.CONNECTED : ConnectionStatus.DISCONNECTED;
-            }
-            super.handleMessage(msg);
-        }
-
-        void postMessageText(String szMSG) {
-            Message msg = new Message();
-            msg.what = MSG_CONNECTION_INFO;
-            msg.obj = szMSG;
-            sendMessage(msg);
-        }
-
-        void postMessageConnectionStatus(boolean isConnected) {
-            Message msg = new Message();
-            msg.what = MSG_UPDATE_CONNECTION_STATUS;
-            msg.obj = isConnected;
-            sendMessage(msg);
-        }
+    
+    void setAuthInfo(String szDevUserName, String szDevUserPassword) {
+        
     }
-
-    public static void startConnection() {
-        if (_WinBoLLServiceStatusView != null) {
-            _WinBoLLServiceStatusView.startConnectionThread();
-        }
-    }
-
-    public static void stopConnection() {
-        if (_WinBoLLServiceStatusView != null) {
-            _WinBoLLServiceStatusView.stopConnectionThread();
-        }
-    }
-
-    void startConnectionThread() {
-        if (mConnectionStatus == ConnectionStatus.DISCONNECTED) {
-            mConnectionStatus = ConnectionStatus.START_CONNECT;
-            LogUtils.d(TAG, "startConnectionThread");
-            if (mConnectionThread != null) {
-                LogUtils.d(TAG, "mConnectionThread != null");
-                mConnectionThread.mIsExist = true;
-            }
-            mConnectionThread = new ConnectionThread();
-            mConnectionThread.start();
-        } else if (mConnectionStatus == ConnectionStatus.CONNECTING) {
-            //LogUtils.d(TAG, "mConnectionStatus == ConnectionStatus.CONNECTING");
-        } else if (mConnectionStatus == ConnectionStatus.CONNECTED) {
-            //LogUtils.d(TAG, "mConnectionStatus == ConnectionStatus.CONNECTED");
-        } else {
-            LogUtils.d(TAG, String.format("Unknow mConnectionStatus %s, can not start ConnectionThread.", mConnectionStatus));
-        }
-    }
-
-    void stopConnectionThread() {
-        LogUtils.d(TAG, "stopConnectionThread");
-        if (mConnectionThread != null) {
-            LogUtils.d(TAG, "mConnectionThread != null");
-            mConnectionThread.mIsExist = true;
-            mConnectionThread = null;
-        }
-    }
-
-
-
-    class ConnectionThread extends Thread {
-
-        public volatile boolean mIsExist;
-
-        //DevelopHostConnectionStatusViewHandler mDevelopHostConnectionStatusViewHandler;
-
-        //public ConnectionThread(DevelopHostConnectionStatusViewHandler developHostConnectionStatusViewHandler) {
-        //mDevelopHostConnectionStatusViewHandler = developHostConnectionStatusViewHandler;
-        //}
-        public ConnectionThread() {
-            mIsExist = false;
-        }
-
-        @Override
-        public void run() {
-            super.run();
-            while (mIsExist == false) {
-                if (mConnectionStatus == ConnectionStatus.START_CONNECT) {
-                    mConnectionStatus = ConnectionStatus.CONNECTING;
-                    //requestAPIWithBasicAuth();
-                    requestCIPWithBasicAuth();
-                } else if (mConnectionStatus == ConnectionStatus.CONNECTED
-                           || mConnectionStatus == ConnectionStatus.DISCONNECTED) {
-                    //ToastUtils.show("mWinBoLLServerHostConnectionStatus " + mConnectionStatus);
-                    LogUtils.d(TAG, String.format("mConnectionStatus done %s", mConnectionStatus));
-                } else {
-                    LogUtils.d(TAG, String.format("mConnectionStatus unknow %s", mConnectionStatus));
-                }
-
-                try {
-                    Thread.sleep(5 * 1000);
-                } catch (InterruptedException e) {
-                    LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-                }
-            }
-            //ToastUtils.show("ConnectionThread exit.");
-            LogUtils.d(TAG, "ConnectionThread exit.");
-        }
-    }
-
-    /*WinBoLLService.OnServiceStatusChangeListener mOnServerStatusChangeListener = new WinBoLLService.OnServiceStatusChangeListener(){
-     @Override
-     public void onServerStatusChange(boolean isServiceAlive) {
-     }
-     };*/
 }

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Apr 29 14:47:16 HKT 2025
+#Sat May 03 10:32:21 GMT 2025
 stageCount=7
 libraryProject=libappbase
 baseVersion=15.7
 publishVersion=15.7.6
-buildCount=0
+buildCount=4
 baseBetaVersion=15.7.7

libappbase/src/main/java/cc/winboll/studio/libappbase/sos/WinBoLL.java

@@ -1,39 +0,0 @@
-package cc.winboll.studio.libappbase.sos;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/02 09:54:28
- * @Describe WinBoLL 系列应用通用管理类
- */
-import android.content.Context;
-import android.content.Intent;
-import cc.winboll.studio.libappbase.LogUtils;
-
-public class WinBoLL {
-
-    public static final String TAG = "WinBoLL";
-
-    public static final String ACTION_BIND = WinBoLL.class.getName() + ".ACTION_BIND";
-    public static final String EXTRA_APPMODEL = "EXTRA_APPMODEL";
-
-    public static void bindToAPPBase(Context context, String appMainService) {
-        LogUtils.d(TAG, "bindToAPPBase(...)");
-        String toPackage = "cc.winboll.studio.appbase";
-        startBind(context, toPackage, appMainService);
-    }
-
-    public static void bindToAPPBaseBeta(Context context, String appMainService) {
-        LogUtils.d(TAG, "bindToAPPBaseBeta(...)");
-        String toPackage = "cc.winboll.studio.appbase.beta";
-        startBind(context, toPackage, appMainService);
-    }
-
-    static void startBind(Context context, String toPackage, String appMainService) {
-        Intent intent = new Intent(ACTION_BIND);
-        intent.putExtra(EXTRA_APPMODEL, (new APPModel(toPackage, appMainService)).toString());
-        intent.setPackage(toPackage);
-        LogUtils.d(TAG, String.format("ACTION_BIND :\nTo Package : %s\nAPP Main Service : %s", toPackage, appMainService));
-        context.sendBroadcast(intent);
-    }
-
-}

libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/IWinBoLLActivity.java

@@ -1,18 +0,0 @@
-package cc.winboll.studio.libappbase.winboll;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/24 08:23:40
- * @Describe WinBoLL 活动窗口通用接口
- */
-import android.app.Activity;
-import android.widget.Toolbar;
-
-public interface IWinBoLLActivity {
-
-    public static final String TAG = "IWinBoLLActivity";
-
-    // 获取活动窗口
-    abstract public Activity getActivity();
-    abstract public String getTag();
-}

libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBoLLActivityManager.java

@@ -1,356 +0,0 @@
-package cc.winboll.studio.libappbase.winboll;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/24 08:25:43
- * @Describe 应用活动窗口管理器
- * 参考 ：
- * android 类似微信小程序多任务窗口 及 设置 TaskDescription 修改 icon 和 label
- * https://blog.csdn.net/qq_29364417/article/details/109379915?app_version=6.4.2&code=app_1562916241&csdn_share_tail=%7B%22type%22%3A%22blog%22%2C%22rType%22%3A%22article%22%2C%22rId%22%3A%22109379915%22%2C%22source%22%3A%22weixin_38986226%22%7D&uLinkId=usr1mkqgl919blen&utm_source=app
- */
-import android.app.ActivityManager;
-import android.app.TaskStackBuilder;
-import android.content.Context;
-import android.content.Intent;
-import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.utils.ToastUtils;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-public class WinBoLLActivityManager {
-
-    public static final String TAG = "WinBoLLActivityManager";
-    public static final String EXTRA_TAG = "EXTRA_TAG";
-
-    public static enum WinBoLLUI_TYPE {
-        Aplication, // 退出应用后，保持最近任务栏任务记录主窗口
-        Service // 退出应用后，清理所有最近任务栏任务记录窗口
-        };
-
-    // 应用类型标志
-    static volatile WinBoLLUI_TYPE _mWinBoLLUI_TYPE = WinBoLLUI_TYPE.Service;
-
-    GlobalApplication mGlobalApplication;
-    static volatile WinBoLLActivityManager _Instance;
-    static volatile Map<String, IWinBoLLActivity> _mapIWinBoLLList;
-    volatile IWinBoLLActivity mFirstIWinBoLLActivity;
-
-    WinBoLLActivityManager(GlobalApplication application) {
-        mGlobalApplication = application;
-        _mapIWinBoLLList = new HashMap<String, IWinBoLLActivity>();
-    }
-
-    public static synchronized WinBoLLActivityManager getInstance(GlobalApplication application) {
-        LogUtils.d(TAG, "getInstance");
-        if (_Instance == null) {
-            LogUtils.d(TAG, "_Instance == null");
-            _Instance = new WinBoLLActivityManager(application);
-        }
-        return _Instance;
-    }
-
-    //
-    // 设置 WinBoLL 应用 UI 类型
-    //
-    public synchronized static void setWinBoLLUI_TYPE(WinBoLLUI_TYPE mWinBoLLUI_TYPE) {
-        _mWinBoLLUI_TYPE = mWinBoLLUI_TYPE;
-    }
-
-    //
-    // 获取 WinBoLL 应用 UI 类型
-    //
-    public synchronized static WinBoLLUI_TYPE getWinBoLLUI_TYPE() {
-        return _mWinBoLLUI_TYPE;
-    }
-
-    //
-    // 把Activity添加到管理中
-    //
-    public <T extends IWinBoLLActivity> void add(T iWinBoLL) {
-        String tag = ((IWinBoLLActivity)iWinBoLL).getTag();
-        LogUtils.d(TAG, String.format("add(T iWinBoLL) tag is %s", tag));
-        if (isActive(tag)) {
-            LogUtils.d(TAG, String.format("isActive(tag) is true, tag : %s.", tag));
-        } else {
-            // 设置起始活动窗口，以便最后退出时提问
-            if (mFirstIWinBoLLActivity == null && _mapIWinBoLLList.size() == 0) {
-                LogUtils.d(TAG, "Set firstIWinBoLLActivity, iWinBoLL.getTag() is %s" + iWinBoLL.getTag());
-                mFirstIWinBoLLActivity = iWinBoLL;
-            }
-
-            // 添加到活动窗口列表
-            _mapIWinBoLLList.put(iWinBoLL.getTag(), iWinBoLL);
-            LogUtils.d(TAG, String.format("Add activity : %s\n_mapActivityList.size() : %d", iWinBoLL.getTag(), _mapIWinBoLLList.size()));
-        }
-    }
-
-
-    //
-    // activity: 为 null 时，
-    // intent.putExtra 函数 EXTRA_TAG 参数为 tag
-    // activity: 不为 null 时，
-    // intent.putExtra 函数 "tag" 参数为 activity.getTag()
-    //
-    public <T extends IWinBoLLActivity> void startWinBoLLActivity(Context context, Class<T> clazz) {
-        try {
-            // 如果窗口已存在就重启窗口
-            String tag = ((IWinBoLLActivity)clazz.newInstance()).getTag();
-            LogUtils.d(TAG, String.format("startWinBoLLActivity(Context context, Class<T> clazz) tag is %s", tag));
-            if (isActive(tag)) {
-                resumeActivity(context, tag);
-                return;
-            }
-            //ToastUtils.show("startWinBoLLActivity(Context context, Class<T> clazz)");
-
-            // 新建一个任务窗口
-            Intent intent = new Intent(context, clazz);
-            //打开多任务窗口 flags
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
-            intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            intent.putExtra(EXTRA_TAG, tag);
-            context.startActivity(intent);
-        } catch (InstantiationException | IllegalAccessException e) {
-            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-        }
-    }
-
-    public <T extends IWinBoLLActivity> void startWinBoLLActivity(Context context, Intent intent, Class<T> clazz) {
-        try {
-            // 如果窗口已存在就重启窗口
-            String tag = ((IWinBoLLActivity)clazz.newInstance()).getTag();
-            LogUtils.d(TAG, String.format("startWinBoLLActivity(Context context, Intent intent, Class<T> clazz) tag is %s", tag));
-            if (isActive(tag)) {
-                resumeActivity(context, tag);
-                return;
-            }
-
-            // 新建一个任务窗口
-            //Intent intent = new Intent(context, clazz);
-            //打开多任务窗口 flags
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
-            intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            intent.putExtra(EXTRA_TAG, tag);
-            context.startActivity(intent);
-        } catch (InstantiationException | IllegalAccessException e) {
-            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-        }
-    }
-
-    public <T extends IWinBoLLActivity> void startLogActivity(Context context) {
-        // 如果窗口已存在就重启窗口
-        String tag = LogActivity.TAG;
-        if (isActive(tag)) {
-            resumeActivity(context, tag);
-            return;
-        }
-
-        // 新建一个任务窗口
-        Intent intent = new Intent(context, LogActivity.class);
-        //打开多任务窗口 flags
-        // Define the bounds.
-//        Rect bounds = new Rect(0, 0, 800, 200);
-//        // Set the bounds as an activity option.
-//        ActivityOptions options = ActivityOptions.makeBasic();
-//        options.setLaunchBounds(bounds);
-        intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
-        intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-
-        intent.putExtra(EXTRA_TAG, tag);
-
-        //context.startActivity(intent, options.toBundle());
-        context.startActivity(intent);
-    }
-
-    public boolean isFirstIWinBoLLActivity(IWinBoLLActivity iWinBoLLActivity) {
-        return mFirstIWinBoLLActivity != null && mFirstIWinBoLLActivity == iWinBoLLActivity;
-    }
-
-    //
-    // 判断 tag绑定的 MyActivity是否存在
-    //
-    public boolean isActive(String tag) {
-        LogUtils.d(TAG, String.format("isActive(String tag) tag is %s", tag));
-        //printIWinBoLLListInfo();
-        IWinBoLLActivity iWinBoLL = getIWinBoLL(tag);
-        if (iWinBoLL != null) {
-            //LogUtils.d(TAG, "isActive(...) activity != null tag " + tag);
-            //ToastUtils.show("activity != null tag " + tag);
-            //判断是否为 BaseActivity,如果已经销毁，则移除
-            if (iWinBoLL.getActivity().isFinishing() || iWinBoLL.getActivity().isDestroyed()) {
-                _mapIWinBoLLList.remove(iWinBoLL.getTag());
-                //_mWinBoLLActivityList.remove(activity);
-                LogUtils.d(TAG, String.format("isActive(...) remove activity.\ntag : %s", tag));
-                return false;
-            } else {
-                LogUtils.d(TAG, String.format("isActive(...) activity is exist.\ntag : %s", tag));
-                return true;
-            }
-        } else {
-            LogUtils.d(TAG, String.format("isActive(...) iWinBoLL is null tag by %s", tag));
-            return false;
-        }
-    }
-
-    static IWinBoLLActivity getIWinBoLL(String tag) {
-        LogUtils.d(TAG, String.format("getIWinBoLL(String tag) %s", tag));
-        return _mapIWinBoLLList.get(tag);
-    }
-
-    //
-    // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
-    //
-    public <T extends IWinBoLLActivity> void resumeActivity(Context context, String tag) {
-        LogUtils.d(TAG, "resumeActivity(Context context, String tag)");
-        T iWinBoLL = (T)getIWinBoLL(tag);
-        LogUtils.d(TAG, String.format("iWinBoLL.getTag() %s", iWinBoLL.getTag()));
-        //LogUtils.d(TAG, "activity " + activity.getTag());
-        if (iWinBoLL != null && !iWinBoLL.getActivity().isFinishing() && !iWinBoLL.getActivity().isDestroyed()) {
-            resumeActivity(context, iWinBoLL);
-        }
-    }
-
-    //
-    // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
-    //
-    public <T extends IWinBoLLActivity> void resumeActivity(Context context, T iWinBoLL) {
-        LogUtils.d(TAG, "resumeActivity(Context context, T iWinBoLL)");
-        ActivityManager am = (ActivityManager) mGlobalApplication.getSystemService(Context.ACTIVITY_SERVICE);
-        //返回启动它的根任务（home 或者 MainActivity）
-        Intent intent = new Intent(mGlobalApplication, iWinBoLL.getClass());
-        TaskStackBuilder stackBuilder = TaskStackBuilder.create(mGlobalApplication);
-        stackBuilder.addNextIntentWithParentStack(intent);
-        stackBuilder.startActivities();
-        //moveTaskToFront(YourTaskId, 0);
-        //ToastUtils.show("resumeActivity am.moveTaskToFront");
-        LogUtils.d(TAG, String.format("iWinBoLL.getActivity().getTaskId() %d", iWinBoLL.getActivity().getTaskId()));
-        am.moveTaskToFront(iWinBoLL.getActivity().getTaskId(), ActivityManager.MOVE_TASK_NO_USER_ACTION);
-        LogUtils.d(TAG, "am.moveTaskToFront");
-    }
-
-
-    //
-    // 结束所有 Activity
-    //
-    public void finishAll() {
-        try {
-            for (String key : _mapIWinBoLLList.keySet()) {
-                //System.out.println("Key: " + key + ", Value: " + _mapActivityList.get(key));
-                IWinBoLLActivity iWinBoLL = _mapIWinBoLLList.get(key);
-                //ToastUtils.show("finishAll() activity");
-                if (iWinBoLL != null && !iWinBoLL.getActivity().isFinishing() && !iWinBoLL.getActivity().isDestroyed()) {
-                    //ToastUtils.show("activity != null ...");
-                    if (getWinBoLLUI_TYPE() == WinBoLLUI_TYPE.Service) {
-                        // 结束窗口和最近任务栏, 建议前台服务类应用使用，可以方便用户再次调用 UI 操作。
-                        iWinBoLL.getActivity().finishAndRemoveTask();
-                        //ToastUtils.show("finishAll() activity.finishAndRemoveTask();");
-                    } else if (getWinBoLLUI_TYPE() == WinBoLLUI_TYPE.Aplication) {
-                        // 结束窗口保留最近任务栏，建议前台服务类应用使用，可以保持应用的系统自觉性。
-                        iWinBoLL.getActivity().finish();
-                        //ToastUtils.show("finishAll() activity.finish();");
-                    } else {
-                        LogUtils.d(TAG, "WinBoLLApplication.WinBoLLUI_TYPE error.");
-                        //ToastUtils.show("WinBoLLApplication.WinBoLLUI_TYPE error.");
-                    }
-                }
-            }
-        } catch (Exception e) {
-            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-        }
-    }
-
-    //
-    // 结束指定Activity
-    //
-    public <T extends IWinBoLLActivity> void finish(T iWinBoLL) {
-        try {
-            if (iWinBoLL != null && !iWinBoLL.getActivity().isFinishing() && !iWinBoLL.getActivity().isDestroyed()) {
-                //根据tag 移除 MyActivity
-                //String tag= activity.getTag();
-                //_mWinBoLLActivityList.remove(tag);
-                //ToastUtils.show("remove");
-                //ToastUtils.show("_mWinBoLLActivityArrayMap.size() " + Integer.toString(_mWinBoLLActivityArrayMap.size()));
-
-                // 窗口回调规则：
-                // [] 当前窗口位置 >> 调度出的窗口位置
-                // ★：[0] 1 2 3 4 >> 1
-                // ★：0 1 [2] 3 4 >> 1
-                // ★：0 1 2 [3] 4 >> 2
-                // ★：0 1 2 3 [4] >> 3
-                // ★：[0] >> 直接关闭当前窗口
-                //LogUtils.d(TAG, "finish no yet.");
-                IWinBoLLActivity preIWinBoLL = getPreIWinBoLL(iWinBoLL);
-                iWinBoLL.getActivity().finish();
-                if (preIWinBoLL != null) {
-                    resumeActivity(mGlobalApplication, preIWinBoLL);
-                }
-            }
-
-        } catch (Exception e) {
-            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-        }
-    }
-
-    //
-    // 获取窗口队列中的前一个窗口
-    //
-    IWinBoLLActivity getPreIWinBoLL(IWinBoLLActivity iWinBoLL) {
-        try {
-            boolean bingo = false;
-            IWinBoLLActivity preIWinBoLL = null;
-            for (Map.Entry<String, IWinBoLLActivity> entity : _mapIWinBoLLList.entrySet()) {
-                if (entity.getKey().equals(iWinBoLL.getTag())) {
-                    bingo = true;
-                    //LogUtils.d(TAG, "bingo");
-                    break;
-                }
-                preIWinBoLL = entity.getValue();
-            }
-
-            if (bingo) {
-                return preIWinBoLL;
-            }
-        } catch (Exception e) {
-            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-        }
-
-        return null;
-    }
-
-    //
-    // 从管理列表中移除管理项
-    //
-    public <T extends IWinBoLLActivity> boolean registeRemove(T activity) {
-        IWinBoLLActivity iWinBoLLTest = _mapIWinBoLLList.get(activity.getTag());
-        if (iWinBoLLTest != null) {
-            _mapIWinBoLLList.remove(activity.getTag());
-            return true;
-        }
-        return false;
-    }
-
-    //
-    // 打印管理列表项列表里的信息
-    //
-    public static void printIWinBoLLListInfo() {
-        //LogUtils.d(TAG, "printAvtivityListInfo");
-        if (!_mapIWinBoLLList.isEmpty()) {
-            StringBuilder sb = new StringBuilder("Map entries : " + Integer.toString(_mapIWinBoLLList.size()));
-            Iterator<Map.Entry<String, IWinBoLLActivity>> iterator = _mapIWinBoLLList.entrySet().iterator();
-            while (iterator.hasNext()) {
-                Map.Entry<String, IWinBoLLActivity> entry = iterator.next();
-                sb.append("\nKey: " + entry.getKey() + ", \nValue: " + entry.getValue().getTag());
-                //ToastUtils.show("\nKey: " + entry.getKey() + ", Value: " + entry.getValue().getTag());
-            }
-            sb.append("\nMap entries end.");
-            LogUtils.d(TAG, sb.toString());
-        } else {
-            LogUtils.d(TAG, "The map is empty.");
-        }
-    }
-}

powerbell/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Apr 29 21:00:39 HKT 2025
+#Sat May 03 06:21:11 GMT 2025
 stageCount=1
 libraryProject=
 baseVersion=15.3
 publishVersion=15.3.0
-buildCount=0
+buildCount=5
 baseBetaVersion=15.3.1

powerbell/src/main/java/cc/winboll/studio/powerbell/services/ControlCenterService.java

@@ -32,6 +32,8 @@ import cc.winboll.studio.powerbell.utils.AppConfigUtils;
 import cc.winboll.studio.powerbell.utils.NotificationHelper;
 import cc.winboll.studio.powerbell.utils.ServiceUtils;
 import cc.winboll.studio.powerbell.utils.StringUtils;
+import android.os.Handler;
+import android.os.Looper;
 
 public class ControlCenterService extends Service {
 
@@ -114,9 +116,17 @@ public class ControlCenterService extends Service {
                 mControlCenterServiceReceiver = new ControlCenterServiceReceiver(this);
                 mControlCenterServiceReceiver.registerAction(this);
             }
-            startRemindThread(mAppConfigUtils.mAppConfigBean);
-            ToastUtils.show("Service Is Start.");
-            LogUtils.i(TAG, "Service Is Start.");
+            
+            new Handler(Looper.getMainLooper()).postDelayed(new Runnable(){
+
+                    @Override
+                    public void run() {
+                        startRemindThread(mAppConfigUtils.mAppConfigBean);
+                        ToastUtils.show("Service Is Start.");
+                        LogUtils.i(TAG, "Service Is Start.");
+                    }
+                }, 2000);
+            
         }
     }
 

powerbell/src/main/java/cc/winboll/studio/powerbell/utils/NotificationHelper.java

@@ -83,8 +83,9 @@ public class NotificationHelper {
         Notification notification = new NotificationCompat.Builder(mContext, CHANNEL_ID_FOREGROUND)
             .setSmallIcon(R.drawable.ic_launcher)
             .setLargeIcon(BitmapFactory.decodeResource(mContext.getResources(), R.drawable.ic_launcher))
-            .setContentTitle(title)
-            .setContentText(content)
+            //.setContentTitle(title + "\n" + content)
+            .setContentTitle(content)
+            //.setContentText(content)
             .setContentIntent(pendingIntent)
             .setPriority(NotificationCompat.PRIORITY_LOW)
             .setOngoing(true)