<contacts>APK 1.0.19 release Publish.

appbase/build.gradle

@@ -29,7 +29,7 @@ android {
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "2.0" 
+        versionName "2.1"
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -45,5 +45,26 @@ android {
 
 dependencies {
     api project(':libappbase')
-	api fileTree(dir: 'libs', include: ['*.jar'])
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    
+    // SSH
+    implementation 'com.jcraft:jsch:0.1.55'
+    // Html 解析
+    implementation 'org.jsoup:jsoup:1.13.1'
+    // 二维码类库
+    implementation 'com.google.zxing:core:3.4.1'
+    implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
+    // 应用介绍页类库
+    implementation 'io.github.medyo:android-about-page:2.0.0'
+    // 吐司类库
+    implementation 'com.github.getActivity:ToastUtils:10.5'
+    // 网络连接类库
+    implementation 'com.squareup.okhttp3:okhttp:4.4.1'
+    // Android 类库
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.viewpager:viewpager:1.0.0'
+    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
+    implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
+    implementation 'androidx.fragment:fragment:1.1.0'
+    implementation 'com.google.android.material:material:1.4.0'
 }

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Feb 25 16:51:17 HKT 2025
-stageCount=3
+#Sun Mar 09 09:15:39 HKT 2025
+stageCount=6
 libraryProject=libappbase
-baseVersion=2.0
-publishVersion=2.0.2
+baseVersion=2.1
+publishVersion=2.1.5
 buildCount=0
-baseBetaVersion=2.0.3
+baseBetaVersion=2.1.6

appbase/src/main/AndroidManifest.xml

@@ -54,19 +54,25 @@
         <receiver android:name="cc.winboll.studio.appbase.receivers.MainReceiver">
 
             <intent-filter>
+
                 <action android:name="cc.winboll.studio.appbase.receivers.MainReceiver"/>
+
             </intent-filter>
 
         </receiver>
 
         <receiver
-            android:name=".widgets.SOSWidget"
+            android:name=".widgets.APPNewsWidget"
             android:exported="true">
 
             <intent-filter>
-                <action android:name="cc.winboll.studio.appbase.widgets.SOSWidget.ACTION_WAKEUP_SERVICE"/>
-                <action android:name="cc.winboll.studio.appbase.widgets.SOSWidget.ACTION_RELOAD_REPORT"/>
+
+                <action android:name="cc.winboll.studio.appbase.widgets.APPNewsWidget.ACTION_WAKEUP_SERVICE"/>
+
+                <action android:name="cc.winboll.studio.appbase.widgets.APPNewsWidget.ACTION_RELOAD_REPORT"/>
+
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
+
             </intent-filter>
 
             <meta-data
@@ -75,13 +81,13 @@
 
         </receiver>
 
-        <receiver android:name=".widgets.SOSWidgetClickListener">
+        <receiver android:name=".widgets.APPNewsWidgetClickListener">
 
             <intent-filter>
 
-                <action android:name="cc.winboll.studio.appbase.widgets.SOSWidgetClickListener.ACTION_PRE"/>
+                <action android:name="cc.winboll.studio.appbase.widgets.APPNewsWidgetClickListener.ACTION_PRE"/>
 
-                <action android:name="cc.winboll.studio.appbase.widgets.SOSWidgetClickListener.ACTION_NEXT"/>
+                <action android:name="cc.winboll.studio.appbase.widgets.APPNewsWidgetClickListener.ACTION_NEXT"/>
 
             </intent-filter>
 
@@ -91,6 +97,11 @@
             android:name="android.max_aspect"
             android:value="4.0"/>
 
+        <service android:name="cc.winboll.studio.appbase.services.TestDemoBindService"
+            android:exported="true"/>
+            
+        <service android:name="cc.winboll.studio.appbase.services.TestDemoService"
+            android:exported="true"/>
 
     </application>
 

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

@@ -6,22 +6,23 @@ package cc.winboll.studio.appbase;
  * @Describe APPbase 应用类
  */
 import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.SOSCSBroadcastReceiver;
 import android.content.IntentFilter;
+import cc.winboll.studio.libappbase.sos.SOSCenterServiceReceiver;
+import cc.winboll.studio.libappbase.sos.SOS;
 
 public class App extends GlobalApplication {
 
     public static final String TAG = "App";
     
-    SOSCSBroadcastReceiver mSOSCSBroadcastReceiver;
+    SOSCenterServiceReceiver mSOSCenterServiceReceiver;
     
     @Override
     public void onCreate() {
         super.onCreate();
         GlobalApplication.setIsDebuging(this, BuildConfig.DEBUG);
-        mSOSCSBroadcastReceiver = new SOSCSBroadcastReceiver();
+        mSOSCenterServiceReceiver = new SOSCenterServiceReceiver();
         IntentFilter intentFilter = new IntentFilter();
-        intentFilter.addAction(SOSCSBroadcastReceiver.ACTION_SOS);
-        registerReceiver(mSOSCSBroadcastReceiver, intentFilter);
+        intentFilter.addAction(SOS.ACTION_SOS);
+        registerReceiver(mSOSCenterServiceReceiver, intentFilter);
     }
 }

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

@@ -1,6 +1,5 @@
 package cc.winboll.studio.appbase;
 
-import android.content.ComponentName;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
@@ -9,15 +8,16 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
 import cc.winboll.studio.appbase.R;
 import cc.winboll.studio.appbase.services.MainService;
+import cc.winboll.studio.appbase.services.TestDemoBindService;
+import cc.winboll.studio.appbase.services.TestDemoService;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.LogView;
-import cc.winboll.studio.libappbase.SOS;
-import cc.winboll.studio.libappbase.SimpleOperateSignalCenterService;
-import cc.winboll.studio.libappbase.bean.APPSOSBean;
-import cc.winboll.studio.libappbase.services.TestService;
 import cc.winboll.studio.libappbase.widgets.StatusWidget;
 import com.hjq.toast.ToastUtils;
+import android.content.ComponentName;
+import cc.winboll.studio.libappbase.sos.SOS;
+import cc.winboll.studio.libappbase.sos.SOSObject;
 
 public class MainActivity extends AppCompatActivity {
 
@@ -68,17 +68,17 @@ public class MainActivity extends AppCompatActivity {
         MainService.stopMainService(this);
     }
 
-    public void onTestStopWithoutSettingEnable(View view) {
-        LogUtils.d(TAG, "onTestStopWithoutSettingEnable");
-        stopService(new Intent(this, SimpleOperateSignalCenterService.class));
+    public void onTestStopMainServiceWithoutSettingEnable(View view) {
+        LogUtils.d(TAG, "onTestStopMainServiceWithoutSettingEnable");
+        stopService(new Intent(this, MainService.class));
     }
 
-    public void onTestStartWithString(View view) {
-        LogUtils.d(TAG, "onTestStartWithString");
+    public void onTestUseComponentStartService(View view) {
+        LogUtils.d(TAG, "onTestUseComponentStartService");
 
         // 目标服务的包名和类名
         String packageName = this.getPackageName();
-        String serviceClassName = SimpleOperateSignalCenterService.class.getName();
+        String serviceClassName = TestDemoService.class.getName();
 
         // 构建Intent
         Intent intentService = new Intent();
@@ -87,30 +87,55 @@ public class MainActivity extends AppCompatActivity {
         startService(intentService);
     }
 
-    public void onSOS(View view) {
-        Intent intent = new Intent(this, TestService.class);
+    public void onTestSOS(View view) {
+        Intent intent = new Intent(this, TestDemoService.class);
         stopService(intent);
-        SOS.sosWinBollService(this, new APPSOSBean(getPackageName(), TestService.class.getName()));
+        if(App.isDebuging()) {
+            SOS.sosToAppBaseBeta(this, TestDemoService.class.getName());
+        } else {
+            SOS.sosToAppBase(this, TestDemoService.class.getName());
+        }
     }
 
-    public void onStartTestService(View view) {
-        Intent intent = new Intent(this, TestService.class);
-        intent.setAction(SOS.ACTION_SERVICE_ENABLE);
+    public void onSartTestDemoService(View view) {
+        Intent intent = new Intent(this, TestDemoService.class);
+        intent.setAction(TestDemoService.ACTION_ENABLE);
         startService(intent);
 
     }
 
-    public void onStopTestService(View view) {
-        Intent intent = new Intent(this, TestService.class);
-        intent.setAction(SOS.ACTION_SERVICE_DISABLE);
+    public void onStopTestDemoService(View view) {
+        Intent intent = new Intent(this, TestDemoService.class);
+        intent.setAction(TestDemoService.ACTION_DISABLE);
         startService(intent);
         
-        Intent intentStop = new Intent(this, TestService.class);
+        Intent intentStop = new Intent(this, TestDemoService.class);
         stopService(intentStop);
     }
 
-    public void onStopTestServiceNoSettings(View view) {
-        Intent intent = new Intent(this, TestService.class);
+    public void onStopTestDemoServiceNoSettings(View view) {
+        Intent intent = new Intent(this, TestDemoService.class);
+        stopService(intent);
+    }
+    
+    public void onSartTestDemoBindService(View view) {
+        Intent intent = new Intent(this, TestDemoBindService.class);
+        intent.setAction(TestDemoBindService.ACTION_ENABLE);
+        startService(intent);
+
+    }
+
+    public void onStopTestDemoBindService(View view) {
+        Intent intent = new Intent(this, TestDemoBindService.class);
+        intent.setAction(TestDemoBindService.ACTION_DISABLE);
+        startService(intent);
+
+        Intent intentStop = new Intent(this, TestDemoBindService.class);
+        stopService(intentStop);
+    }
+
+    public void onStopTestDemoBindServiceNoSettings(View view) {
+        Intent intent = new Intent(this, TestDemoBindService.class);
         stopService(intent);
     }
 }

appbase/src/main/java/cc/winboll/studio/appbase/beans/MainServiceBean.java

@@ -35,8 +35,7 @@ public class MainServiceBean extends BaseBean {
     @Override
     public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
         super.writeThisToJsonWriter(jsonWriter);
-        MainServiceBean bean = this;
-        jsonWriter.name("isEnable").value(bean.isEnable());
+        jsonWriter.name("isEnable").value(isEnable());
 
     }
 

appbase/src/main/java/cc/winboll/studio/appbase/beans/TestDemoBindServiceBean.java

@@ -1,8 +1,8 @@
-package cc.winboll.studio.libappbase.bean;
+package cc.winboll.studio.appbase.beans;
 
 /**
  * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/02/19 13:34:52
+ * @Date 2025/03/07 12:47:22
  * @Describe TestServiceBean
  */
 import android.util.JsonReader;
@@ -10,13 +10,13 @@ import android.util.JsonWriter;
 import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;
 
-public class TestServiceBean extends BaseBean {
+public class TestDemoBindServiceBean extends BaseBean {
 
     public static final String TAG = "TestServiceBean";
 
     boolean isEnable;
 
-    public TestServiceBean() {
+    public TestDemoBindServiceBean() {
         this.isEnable = false;
     }
 
@@ -30,7 +30,7 @@ public class TestServiceBean extends BaseBean {
 
     @Override
     public String getName() {
-        return TestServiceBean.class.getName();
+        return TestDemoBindServiceBean.class.getName();
     }
 
     @Override

appbase/src/main/java/cc/winboll/studio/appbase/beans/TestDemoServiceBean.java

@@ -1,20 +1,22 @@
-package cc.winboll.studio.libappbase.bean;
+package cc.winboll.studio.appbase.beans;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/07 12:49:21
+ * @Describe TestDemoServiceBean
+ */
 import android.util.JsonReader;
 import android.util.JsonWriter;
 import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;
 
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/02/13 04:27:42
- */
-public class SimpleOperateSignalCenterServiceBean extends BaseBean {
+public class TestDemoServiceBean extends BaseBean {
 
-    public static final String TAG = "SimpleOperateSignalCenterServiceBean";
+    public static final String TAG = "TestDemoServiceBean";
 
     boolean isEnable;
-    
-    public SimpleOperateSignalCenterServiceBean() {
+
+    public TestDemoServiceBean() {
         this.isEnable = false;
     }
 
@@ -28,7 +30,7 @@ public class SimpleOperateSignalCenterServiceBean extends BaseBean {
 
     @Override
     public String getName() {
-        return SimpleOperateSignalCenterServiceBean.class.getName();
+        return TestDemoServiceBean.class.getName();
     }
 
     @Override

appbase/src/main/java/cc/winboll/studio/appbase/beans/WinBollNewsBean.java

@@ -10,45 +10,45 @@ import android.util.JsonWriter;
 import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;
 
-public class SOSReportBean extends BaseBean {
+public class WinBollNewsBean extends BaseBean {
     
-    public static final String TAG = "APPSOSReportBean";
+    public static final String TAG = "WinBollNewsBean";
     
-    protected String sosReport;
+    protected String message;
     
-    public SOSReportBean() {
-        this.sosReport = "";
+    public WinBollNewsBean() {
+        this.message = "";
     }
 
-    public SOSReportBean(String sosReport) {
-        this.sosReport = sosReport;
+    public WinBollNewsBean(String message) {
+        this.message = message;
     }
 
-    public void setSosReport(String sosReport) {
-        this.sosReport = sosReport;
+    public void setMessage(String message) {
+        this.message = message;
     }
 
-    public String getSosReport() {
-        return sosReport;
+    public String getMessage() {
+        return message;
     }
 
     @Override
     public String getName() {
-        return SOSReportBean.class.getName();
+        return WinBollNewsBean.class.getName();
     }
 
     @Override
     public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
         super.writeThisToJsonWriter(jsonWriter);
-        jsonWriter.name("sosReport").value(getSosReport());
+        jsonWriter.name("message").value(getMessage());
 
     }
 
     @Override
     public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
         if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
-            if (name.equals("sosReport")) {
-                setSosReport(jsonReader.nextString());
+            if (name.equals("message")) {
+                setMessage(jsonReader.nextString());
             } else {
                 return false;
             }

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

@@ -11,28 +11,28 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import cc.winboll.studio.appbase.beans.SOSReportBean;
+import cc.winboll.studio.appbase.beans.WinBollNewsBean;
 import cc.winboll.studio.appbase.services.MainService;
-import cc.winboll.studio.appbase.widgets.SOSWidget;
+import cc.winboll.studio.appbase.widgets.APPNewsWidget;
 import cc.winboll.studio.libappbase.AppUtils;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.SOS;
-import cc.winboll.studio.libappbase.bean.APPSOSBean;
 import com.hjq.toast.ToastUtils;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import cc.winboll.studio.libappbase.sos.WinBoll;
+import cc.winboll.studio.libappbase.sos.APPModel;
+import cc.winboll.studio.libappbase.sos.SOS;
+import cc.winboll.studio.libappbase.sos.SOSObject;
 
 public class MainReceiver extends BroadcastReceiver {
 
     public static final String TAG = "MainReceiver";
+
     public static final String ACTION_BOOT_COMPLETED = "android.intent.action.BOOT_COMPLETED";
+
     WeakReference<MainService> mwrService;
-    // 存储电量指示值，
-    // 用于校验电量消息时的电量变化
-    static volatile int _mnTheQuantityOfElectricityOld = -1;
-    static volatile boolean _mIsCharging = false;
 
     public MainReceiver(MainService service) {
         mwrService = new WeakReference<MainService>(service);
@@ -43,74 +43,62 @@ public class MainReceiver extends BroadcastReceiver {
         String szAction = intent.getAction();
         if (szAction.equals(ACTION_BOOT_COMPLETED)) {
             ToastUtils.show("ACTION_BOOT_COMPLETED");
-        } else if (szAction.equals(SOS.ACTION_BIND)) {
+        } else if (szAction.equals(WinBoll.ACTION_BIND)) {
             LogUtils.d(TAG, "ACTION_BIND");
             LogUtils.d(TAG, String.format("context.getPackageName() %s", context.getPackageName()));
             LogUtils.d(TAG, String.format("intent.getAction() %s", intent.getAction()));
-            String SOS = intent.getStringExtra("SOS");
-            LogUtils.d(TAG, String.format("SOS %s", SOS));
-            if (SOS != null && SOS.equals("Service")) {
-                String szAPPSOSBean = intent.getStringExtra("APPSOSBean");
-                LogUtils.d(TAG, String.format("szAPPSOSBean %s", szAPPSOSBean));
-                if (szAPPSOSBean != null && !szAPPSOSBean.equals("")) {
-                    try {
-                        APPSOSBean bean = APPSOSBean.parseStringToBean(szAPPSOSBean, APPSOSBean.class);
-                        if (bean != null) {
-                            String sosPackage = bean.getSosPackage();
-                            LogUtils.d(TAG, String.format("sosPackage %s", sosPackage));
-                            String sosClassName = bean.getSosClassName();
-                            LogUtils.d(TAG, String.format("sosClassName %s", sosClassName));
-                            mwrService.get().bindSOSConnection(bean);
-                        }
-                    } catch (IOException e) {
-                        LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+            String szAPPModel = intent.getStringExtra(WinBoll.EXTRA_APPMODEL);
+            LogUtils.d(TAG, String.format("szAPPModel %s", szAPPModel));
+            if (szAPPModel != null && !szAPPModel.equals("")) {
+                try {
+                    APPModel bean = APPModel.parseStringToBean(szAPPModel, APPModel.class);
+                    if (bean != null) {
+                        String szAppPackageName = bean.getAppPackageName();
+                        LogUtils.d(TAG, String.format("szAppPackageName %s", szAppPackageName));
+                        String szAppMainServiveName = bean.getAppMainServiveName();
+                        LogUtils.d(TAG, String.format("szAppMainServiveName %s", szAppMainServiveName));
+                        mwrService.get().bindAPPModelConnection(bean);
                     }
+                } catch (IOException e) {
+                    LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
                 }
             }
         } else if (intent.getAction().equals(SOS.ACTION_SOS)) {
             LogUtils.d(TAG, "ACTION_SOS");
-            LogUtils.d(TAG, String.format("context.getPackageName() %s", context.getPackageName()));
-            LogUtils.d(TAG, String.format("intent.getAction() %s", intent.getAction()));
-            String SOS = intent.getStringExtra("SOS");
-            LogUtils.d(TAG, String.format("SOS %s", SOS));
-            if (SOS != null && SOS.equals("Service")) {
-                String szAPPSOSBean = intent.getStringExtra("APPSOSBean");
-                LogUtils.d(TAG, String.format("szAPPSOSBean %s", szAPPSOSBean));
-                if (szAPPSOSBean != null && !szAPPSOSBean.equals("")) {
-                    try {
-                        APPSOSBean bean = APPSOSBean.parseStringToBean(szAPPSOSBean, APPSOSBean.class);
-                        if (bean != null) {
-                            String sosPackage = bean.getSosPackage();
-                            LogUtils.d(TAG, String.format("sosPackage %s", sosPackage));
-                            String sosClassName = bean.getSosClassName();
-                            LogUtils.d(TAG, String.format("sosClassName %s", sosClassName));
+            String sos = intent.getStringExtra(SOS.EXTRA_OBJECT);
+            LogUtils.d(TAG, String.format("SOS %s", sos));
+            if (sos != null && !sos.equals("")) {
+                SOSObject bean = SOS.parseSOSObject(sos);
+                if (bean != null) {
+                    String szObjectPackageName = bean.getObjectPackageName();
+                    LogUtils.d(TAG, String.format("szObjectPackageName %s", szObjectPackageName));
+                    String szObjectServiveName = bean.getObjectServiveName();
+                    LogUtils.d(TAG, String.format("szObjectServiveName %s", szObjectServiveName));
 
-                            Intent intentService = new Intent();
-                            intentService.setComponent(new ComponentName(sosPackage, sosClassName));
-                            context.startService(intentService);
+                    Intent intentService = new Intent();
+                    intentService.setComponent(new ComponentName(szObjectPackageName, szObjectServiveName));
+                    context.startService(intentService);
 
-                            String appName = AppUtils.getAppNameByPackageName(context, sosPackage);
-                            LogUtils.d(TAG, String.format("appName %s", appName));
-                            SOSReportBean appSOSReportBean = new SOSReportBean(appName);
-                            SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
-                            String currentTime = sdf.format(new Date());
-                            StringBuilder sbLine = new StringBuilder();
-                            sbLine.append("[");
-                            sbLine.append(currentTime);
-                            sbLine.append("] Power to ");
-                            sbLine.append(appName);
-                            appSOSReportBean.setSosReport(sbLine.toString());
+                    String appName = AppUtils.getAppNameByPackageName(context, szObjectPackageName);
+                    LogUtils.d(TAG, String.format("appName %s", appName));
+                    WinBollNewsBean appWinBollNewsBean = new WinBollNewsBean(appName);
+                    SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
+                    String currentTime = sdf.format(new Date());
+                    StringBuilder sbLine = new StringBuilder();
+                    sbLine.append("[");
+                    sbLine.append(currentTime);
+                    sbLine.append("] Power to ");
+                    sbLine.append(appName);
+                    appWinBollNewsBean.setMessage(sbLine.toString());
 
-                            SOSWidget.addAPPSOSReportBean(context, appSOSReportBean);
-                            
-                            Intent intentWidget = new Intent(context, SOSWidget.class);
-                            intentWidget.setAction(SOSWidget.ACTION_RELOAD_REPORT);
-                            context.sendBroadcast(intentWidget);
-                        }
-                    } catch (IOException e) {
-                        LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-                    }
+                    APPNewsWidget.addWinBollNewsBean(context, appWinBollNewsBean);
+
+                    Intent intentWidget = new Intent(context, APPNewsWidget.class);
+                    intentWidget.setAction(APPNewsWidget.ACTION_RELOAD_REPORT);
+                    context.sendBroadcast(intentWidget);
                 }
+
+
             }
         } else {
             ToastUtils.show(szAction);
@@ -123,9 +111,7 @@ public class MainReceiver extends BroadcastReceiver {
         IntentFilter filter=new IntentFilter();
         filter.addAction(ACTION_BOOT_COMPLETED);
         filter.addAction(SOS.ACTION_SOS);
-        filter.addAction(SOS.ACTION_BIND);
-        filter.addAction(SOS.ACTION_SERVICE_ENABLE);
-        filter.addAction(SOS.ACTION_SERVICE_DISABLE);
+        filter.addAction(WinBoll.ACTION_BIND);
         //filter.addAction(Intent.ACTION_BATTERY_CHANGED);
         service.registerReceiver(this, filter);
     }

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

@@ -23,10 +23,10 @@ import cc.winboll.studio.appbase.handlers.MainServiceHandler;
 import cc.winboll.studio.appbase.receivers.MainReceiver;
 import cc.winboll.studio.appbase.services.AssistantService;
 import cc.winboll.studio.appbase.threads.MainServiceThread;
-import cc.winboll.studio.appbase.widgets.SOSWidget;
+import cc.winboll.studio.appbase.widgets.APPNewsWidget;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.bean.APPSOSBean;
 import java.util.ArrayList;
+import cc.winboll.studio.libappbase.sos.APPModel;
 
 public class MainService extends Service {
 
@@ -45,7 +45,7 @@ public class MainService extends Service {
     AssistantService mAssistantService;
     boolean isBound = false;
     MainReceiver mMainReceiver;
-    ArrayList<SOSConnection> mSOSConnectionList;
+    ArrayList<APPConnection> mAPPModelConnectionList;
 
     @Override
     public IBinder onBind(Intent intent) {
@@ -60,7 +60,7 @@ public class MainService extends Service {
     public void onCreate() {
         super.onCreate();
         LogUtils.d(TAG, "onCreate()");
-        mSOSConnectionList = new ArrayList<SOSConnection>();
+        mAPPModelConnectionList = new ArrayList<APPConnection>();
 
         _mControlCenterService = MainService.this;
         isServiceRunning = false;
@@ -101,8 +101,8 @@ public class MainService extends Service {
             }
 
             // 启动小部件
-            Intent intentTimeWidget = new Intent(this, SOSWidget.class);
-            intentTimeWidget.setAction(SOSWidget.ACTION_RELOAD_REPORT);
+            Intent intentTimeWidget = new Intent(this, APPNewsWidget.class);
+            intentTimeWidget.setAction(APPNewsWidget.ACTION_RELOAD_REPORT);
             this.sendBroadcast(intentTimeWidget);
 
             startMainServiceThread();
@@ -117,21 +117,11 @@ public class MainService extends Service {
     //
     void wakeupAndBindAssistant() {
         LogUtils.d(TAG, "wakeupAndBindAssistant()");
-//        if (ServiceUtils.isServiceAlive(getApplicationContext(), AssistantService.class.getName()) == false) {
-//            startService(new Intent(MainService.this, AssistantService.class));
-//            //LogUtils.d(TAG, "call wakeupAndBindAssistant() : Binding... AssistantService");
-//            bindService(new Intent(MainService.this, AssistantService.class), mMyServiceConnection, Context.BIND_IMPORTANT);
-//        }
+
         Intent intent = new Intent(this, AssistantService.class);
         startService(intent);
         // 绑定服务的Intent
-        //Intent intent = new Intent(this, AssistantService.class);
         bindService(intent, mMyServiceConnection, Context.BIND_IMPORTANT);
-
-//        Intent intent = new Intent(this, AssistantService.class);
-//        startService(intent);
-//        LogUtils.d(TAG, "startService(intent)");
-//        bindService(new Intent(this, AssistantService.class), mMyServiceConnection, Context.BIND_IMPORTANT);
     }
 
     // 开启提醒铃声线程
@@ -192,40 +182,40 @@ public class MainService extends Service {
         }
     }
 
-    public void bindSOSConnection(APPSOSBean bean) {
-        LogUtils.d(TAG, "bindSOSConnection(...)");
+    public void bindAPPModelConnection(APPModel bean) {
+        LogUtils.d(TAG, "bindAPPModelConnection(...)");
         // 清理旧的绑定链接
-        for (int i = mSOSConnectionList.size() - 1; i > -1; i--) {
-            SOSConnection item = mSOSConnectionList.get(i);
-            if (item.isBindToAPPSOSBean(bean)) {
+        for (int i = mAPPModelConnectionList.size() - 1; i > -1; i--) {
+            APPConnection item = mAPPModelConnectionList.get(i);
+            if (item.isBindToAPP(bean)) {
                 LogUtils.d(TAG, "Bind Servive exist.");
                 unbindService(item);
-                mSOSConnectionList.remove(i);
+                mAPPModelConnectionList.remove(i);
             }
         }
 
         // 绑定服务
-        SOSConnection sosConnection = new SOSConnection();
+        APPConnection appConnection = new APPConnection();
         Intent intentService = new Intent();
-        intentService.setComponent(new ComponentName(bean.getSosPackage(), bean.getSosClassName()));
-        bindService(intentService, sosConnection, Context.BIND_IMPORTANT);
-        mSOSConnectionList.add(sosConnection);
+        intentService.setComponent(new ComponentName(bean.getAppPackageName(), bean.getAppMainServiveName()));
+        bindService(intentService, appConnection, Context.BIND_IMPORTANT);
+        mAPPModelConnectionList.add(appConnection);
         
-        Intent intentWidget = new Intent(this, SOSWidget.class);
-        intentWidget.setAction(SOSWidget.ACTION_WAKEUP_SERVICE);
-        APPSOSBean appSOSBean = new APPSOSBean(bean.getSosPackage(), bean.getSosClassName());
+        Intent intentWidget = new Intent(this, APPNewsWidget.class);
+        intentWidget.setAction(APPNewsWidget.ACTION_WAKEUP_SERVICE);
+        APPModel appSOSBean = new APPModel(bean.getAppPackageName(), bean.getAppMainServiveName());
         intentWidget.putExtra("APPSOSBean", appSOSBean.toString());
         sendBroadcast(intentWidget);
     }
 
-    public class SOSConnection implements ServiceConnection {
+    public class APPConnection implements ServiceConnection {
 
         ComponentName mComponentName;
 
-        boolean isBindToAPPSOSBean(APPSOSBean bean) {
+        boolean isBindToAPP(APPModel bean) {
             return mComponentName != null
-                && mComponentName.getClassName().equals(bean.getSosClassName())
-                && mComponentName.getPackageName().equals(bean.getSosPackage());
+                && mComponentName.getClassName().equals(bean.getAppMainServiveName())
+                && mComponentName.getPackageName().equals(bean.getAppPackageName());
         }
 
         @Override
@@ -241,13 +231,13 @@ public class MainService extends Service {
             LogUtils.d(TAG, String.format("onServiceDisconnected : \ngetClassName %s\ngetPackageName %s", name.getClassName(), name.getPackageName()));
 
             // 尝试无参数启动一下服务
-            String sosPackage = mComponentName.getPackageName();
-            LogUtils.d(TAG, String.format("sosPackage %s", sosPackage));
-            String sosClassName = mComponentName.getClassName();
-            LogUtils.d(TAG, String.format("sosClassName %s", sosClassName));
+            String appPackage = mComponentName.getPackageName();
+            LogUtils.d(TAG, String.format("appPackage %s", appPackage));
+            String appMainServiceClassName = mComponentName.getClassName();
+            LogUtils.d(TAG, String.format("appMainServiceClassName %s", appMainServiceClassName));
 
             Intent intentService = new Intent();
-            intentService.setComponent(new ComponentName(sosPackage, sosClassName));
+            intentService.setComponent(new ComponentName(appPackage, appMainServiceClassName));
             startService(intentService);
         }
 

appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoBindService.java

@@ -0,0 +1,178 @@
+package cc.winboll.studio.appbase.services;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/07 12:45:49
+ * @Describe 启动时申请绑定到APPBase主服务的服务示例
+ */
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Binder;
+import android.os.IBinder;
+import cc.winboll.studio.appbase.beans.TestDemoBindServiceBean;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.sos.WinBoll;
+import cc.winboll.studio.appbase.App;
+import cc.winboll.studio.libappbase.sos.SOS;
+
+public class TestDemoBindService extends Service {
+
+    public static final String TAG = "TestDemoBindService";
+
+    public static final String ACTION_ENABLE = TestDemoBindService.class.getName() + ".ACTION_ENABLE";
+    public static final String ACTION_DISABLE = TestDemoBindService.class.getName() + ".ACTION_DISABLE";
+
+    volatile static TestThread _TestThread;
+
+    volatile static boolean _IsRunning;
+
+    public synchronized static void setIsRunning(boolean isRunning) {
+        _IsRunning = isRunning;
+    }
+
+    public static boolean isRunning() {
+        return _IsRunning;
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return new MyBinder();
+    }
+
+    public class MyBinder extends Binder {
+        public TestDemoBindService getService() {
+            return TestDemoBindService.this;
+        }
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        LogUtils.d(TAG, "onCreate()");
+
+        run();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        LogUtils.d(TAG, "onStartCommand(...)");
+        TestDemoBindServiceBean bean = TestDemoBindServiceBean.loadBean(this, TestDemoBindServiceBean.class);
+        if (bean == null) {
+            bean = new TestDemoBindServiceBean();
+        }
+
+        if (intent.getAction() != null) {
+            if (intent.getAction().equals(ACTION_ENABLE)) {
+                bean.setIsEnable(true);
+                LogUtils.d(TAG, "setIsEnable(true);");
+                TestDemoBindServiceBean.saveBean(this, bean);
+            } else if (intent.getAction().equals(ACTION_DISABLE)) {
+                bean.setIsEnable(false);
+                LogUtils.d(TAG, "setIsEnable(false);");
+                TestDemoBindServiceBean.saveBean(this, bean);
+            }
+        }
+
+        run();
+
+        return (bean.isEnable()) ? START_STICKY : super.onStartCommand(intent, flags, startId);
+        //return super.onStartCommand(intent, flags, startId);
+    }
+
+    void run() {
+        LogUtils.d(TAG, "run()");
+        TestDemoBindServiceBean bean = TestDemoBindServiceBean.loadBean(this, TestDemoBindServiceBean.class);
+        if (bean == null) {
+            bean = new TestDemoBindServiceBean();
+            TestDemoBindServiceBean.saveBean(this, bean);
+        }
+        if (bean.isEnable()) {
+            LogUtils.d(TAG, "run() bean.isEnable()");
+            TestThread.getInstance(this).start();
+            LogUtils.d(TAG, "_TestThread.start()");
+        }
+    }
+
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        LogUtils.d(TAG, "onDestroy()");
+        TestDemoBindServiceBean bean = TestDemoBindServiceBean.loadBean(this, TestDemoBindServiceBean.class);
+        if (bean == null) {
+            bean = new TestDemoBindServiceBean();
+        }
+
+        TestThread.getInstance(this).setIsExit(true);
+        
+        // 预防 APPBase 应用重启绑定失效。
+        // 所以退出时检查本服务是否配置启用，如果启用就发送一个 SOS 信号。
+        // 这样 APPBase 就会用组件方式启动本服务。
+        if (bean.isEnable()) {
+            if (App.isDebuging()) {
+                SOS.sosToAppBaseBeta(this, TestDemoBindService.class.getName());
+            } else {
+                SOS.sosToAppBase(this, TestDemoBindService.class.getName());
+            }
+        }
+
+        _IsRunning = false;
+    }
+
+    static class TestThread extends Thread {
+
+        volatile static TestThread _TestThread;
+        Context mContext;
+        volatile boolean isStarted = false;
+        volatile boolean isExit = false;
+
+        TestThread(Context context) {
+            super();
+            mContext = context;
+        }
+
+        public static synchronized TestThread getInstance(Context context) {
+            if (_TestThread != null) {
+                _TestThread.setIsExit(true);
+            }
+            _TestThread = new TestThread(context);
+
+            return _TestThread;
+        }
+
+        public synchronized void setIsExit(boolean isExit) {
+            this.isExit = isExit;
+        }
+
+        public boolean isExit() {
+            return isExit;
+        }
+
+        @Override
+        public void run() {
+            if (isStarted == false) {
+                isStarted = true;
+                super.run();
+                LogUtils.d(TAG, "run() start");
+                if (App.isDebuging()) {
+                    WinBoll.bindToAPPBaseBeta(mContext, TestDemoBindService.class.getName());
+                } else {
+                    WinBoll.bindToAPPBase(mContext, TestDemoBindService.class.getName());
+                }
+
+                while (!isExit()) {
+                    LogUtils.d(TAG, "run()");
+
+                    try {
+                        Thread.sleep(1000);
+                    } catch (InterruptedException e) {
+                        LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+                    }
+                }
+
+                LogUtils.d(TAG, "run() exit");
+            }
+        }
+    }
+}

appbase/src/main/java/cc/winboll/studio/appbase/services/TestDemoService.java

@@ -1,23 +1,25 @@
-package cc.winboll.studio.libappbase.services;
+package cc.winboll.studio.appbase.services;
 
 /**
  * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/02/15 20:48:36
- * @Describe TestService
+ * @Date 2025/03/07 12:39:24
+ * @Describe 普通服务示例
  */
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Binder;
 import android.os.IBinder;
+import cc.winboll.studio.appbase.beans.TestDemoServiceBean;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.SOS;
-import cc.winboll.studio.libappbase.bean.APPSOSBean;
-import cc.winboll.studio.libappbase.bean.TestServiceBean;
+import cc.winboll.studio.libappbase.sos.WinBoll;
 
-public class TestService extends Service {
+public class TestDemoService extends Service {
 
-    public static final String TAG = "TestService";
+    public static final String TAG = "TestDemoService";
+
+    public static final String ACTION_ENABLE = TestDemoService.class.getName() + ".ACTION_ENABLE";
+    public static final String ACTION_DISABLE = TestDemoService.class.getName() + ".ACTION_DISABLE";
 
     volatile static TestThread _TestThread;
 
@@ -37,8 +39,8 @@ public class TestService extends Service {
     }
 
     public class MyBinder extends Binder {
-        public TestService getService() {
-            return TestService.this;
+        public TestDemoService getService() {
+            return TestDemoService.this;
         }
     }
 
@@ -54,29 +56,35 @@ public class TestService extends Service {
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         LogUtils.d(TAG, "onStartCommand(...)");
-        TestServiceBean bean = TestServiceBean.loadBean(this, TestServiceBean.class);
+        TestDemoServiceBean bean = TestDemoServiceBean.loadBean(this, TestDemoServiceBean.class);
         if (bean == null) {
-            bean = new TestServiceBean();
+            bean = new TestDemoServiceBean();
         }
-        if (intent.getAction() != null && intent.getAction().equals(SOS.ACTION_SERVICE_ENABLE)) {
-            bean.setIsEnable(true);
-            TestServiceBean.saveBean(this, bean);
-            run();
-        } else if (intent.getAction() != null && intent.getAction().equals(SOS.ACTION_SERVICE_DISABLE)) {
-            bean.setIsEnable(false);
-            TestServiceBean.saveBean(this, bean);
+
+        if (intent.getAction() != null) {
+            if (intent.getAction().equals(ACTION_ENABLE)) {
+                bean.setIsEnable(true);
+                LogUtils.d(TAG, "setIsEnable(true);");
+                TestDemoServiceBean.saveBean(this, bean);
+            } else if (intent.getAction().equals(ACTION_DISABLE)) {
+                bean.setIsEnable(false);
+                LogUtils.d(TAG, "setIsEnable(false);");
+                TestDemoServiceBean.saveBean(this, bean);
+            }
         }
-        LogUtils.d(TAG, String.format("TestServiceBean.saveBean setIsEnable %s", bean.isEnable()));
+
+        run();
+
         return (bean.isEnable()) ? START_STICKY : super.onStartCommand(intent, flags, startId);
         //return super.onStartCommand(intent, flags, startId);
     }
 
     void run() {
         LogUtils.d(TAG, "run()");
-        TestServiceBean bean = TestServiceBean.loadBean(this, TestServiceBean.class);
+        TestDemoServiceBean bean = TestDemoServiceBean.loadBean(this, TestDemoServiceBean.class);
         if (bean == null) {
-            bean = new TestServiceBean();
-            TestServiceBean.saveBean(this, bean);
+            bean = new TestDemoServiceBean();
+            TestDemoServiceBean.saveBean(this, bean);
         }
         if (bean.isEnable()) {
             LogUtils.d(TAG, "run() bean.isEnable()");
@@ -91,7 +99,7 @@ public class TestService extends Service {
         super.onDestroy();
         LogUtils.d(TAG, "onDestroy()");
         TestThread.getInstance(this).setIsExit(true);
-        
+
         _IsRunning = false;
     }
 
@@ -130,7 +138,6 @@ public class TestService extends Service {
                 isStarted = true;
                 super.run();
                 LogUtils.d(TAG, "run() start");
-                SOS.bindToAPPService(mContext, new APPSOSBean(mContext.getPackageName(), TestService.class.getName()));
 
                 while (!isExit()) {
                     LogUtils.d(TAG, "run()");

appbase/src/main/java/cc/winboll/studio/appbase/widgets/APPNewsWidget.java

@@ -12,31 +12,32 @@ import android.content.Context;
 import android.content.Intent;
 import android.widget.RemoteViews;
 import cc.winboll.studio.appbase.R;
-import cc.winboll.studio.appbase.beans.SOSReportBean;
+import cc.winboll.studio.appbase.beans.WinBollNewsBean;
 import cc.winboll.studio.libappbase.AppUtils;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.bean.APPSOSBean;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import cc.winboll.studio.libappbase.sos.APPModel;
+import cc.winboll.studio.libappbase.sos.WinBoll;
 
-public class SOSWidget extends AppWidgetProvider {
+public class APPNewsWidget extends AppWidgetProvider {
 
-    public static final String TAG = "SOSWidget";
+    public static final String TAG = "APPNewsWidget";
     
-    public static final String ACTION_WAKEUP_SERVICE = "cc.winboll.studio.appbase.widgets.SOSWidget.ACTION_WAKEUP_SERVICE";
-    public static final String ACTION_RELOAD_REPORT = "cc.winboll.studio.appbase.widgets.SOSWidget.ACTION_RELOAD_REPORT";
+    public static final String ACTION_WAKEUP_SERVICE = APPNewsWidget.class.getName() + ".ACTION_WAKEUP_SERVICE";
+    public static final String ACTION_RELOAD_REPORT = APPNewsWidget.class.getName() + ".ACTION_RELOAD_REPORT";
 
 
-    volatile static ArrayList<SOSReportBean> _SOSReportBeanList;
+    volatile static ArrayList<WinBollNewsBean> _WinBollNewsBeanList;
     final static int _MAX_PAGES = 10;
     final static int _OnePageLinesCount = 5;
     volatile static int _CurrentPageIndex = 0;
 
     @Override
     public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        initAPPSOSReportBeanList(context);
+        initWinBollNewsBeanList(context);
         for (int appWidgetId : appWidgetIds) {
             updateAppWidget(context, appWidgetManager, appWidgetId);
         }
@@ -45,31 +46,31 @@ public class SOSWidget extends AppWidgetProvider {
     @Override
     public void onReceive(Context context, Intent intent) {
         super.onReceive(context, intent);
-        initAPPSOSReportBeanList(context);
+        initWinBollNewsBeanList(context);
         if (intent.getAction().equals(ACTION_RELOAD_REPORT)) {
             LogUtils.d(TAG, "ACTION_RELOAD_REPORT");
             AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
-            int[] appWidgetIds = appWidgetManager.getAppWidgetIds(new ComponentName(context, SOSWidget.class));
+            int[] appWidgetIds = appWidgetManager.getAppWidgetIds(new ComponentName(context, APPNewsWidget.class));
             for (int appWidgetId : appWidgetIds) {
                 updateAppWidget(context, appWidgetManager, appWidgetId);
             }
         }else if (intent.getAction().equals(ACTION_WAKEUP_SERVICE)) {
             LogUtils.d(TAG, "ACTION_WAKEUP_SERVICE");
-            String szAPPSOSBean = intent.getStringExtra("APPSOSBean");
-            LogUtils.d(TAG, String.format("szAPPSOSBean %s", szAPPSOSBean));
-            if (szAPPSOSBean != null && !szAPPSOSBean.equals("")) {
+            String szAPPModel = intent.getStringExtra(WinBoll.EXTRA_APPMODEL);
+            LogUtils.d(TAG, String.format("szAPPModel %s", szAPPModel));
+            if (szAPPModel != null && !szAPPModel.equals("")) {
                 try {
-                    APPSOSBean bean = APPSOSBean.parseStringToBean(szAPPSOSBean, APPSOSBean.class);
+                    APPModel bean = APPModel.parseStringToBean(szAPPModel, APPModel.class);
                     if (bean != null) {
-                        String sosPackage = bean.getSosPackage();
-                        LogUtils.d(TAG, String.format("sosPackage %s", sosPackage));
-                        String sosClassName = bean.getSosClassName();
-                        LogUtils.d(TAG, String.format("sosClassName %s", sosClassName));
+                        String szAppPackageName = bean.getAppPackageName();
+                        LogUtils.d(TAG, String.format("szAppPackageName %s", szAppPackageName));
+                        String szAppMainServiveName = bean.getAppMainServiveName();
+                        LogUtils.d(TAG, String.format("szAppMainServiveName %s", szAppMainServiveName));
 
                         
-                        String appName = AppUtils.getAppNameByPackageName(context, sosPackage);
+                        String appName = AppUtils.getAppNameByPackageName(context, szAppPackageName);
                         LogUtils.d(TAG, String.format("appName %s", appName));
-                        SOSReportBean appSOSReportBean = new SOSReportBean(appName);
+                        WinBollNewsBean winBollNewsBean = new WinBollNewsBean(appName);
                         SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss");
                         String currentTime = sdf.format(new Date());
                         StringBuilder sbLine = new StringBuilder();
@@ -77,12 +78,12 @@ public class SOSWidget extends AppWidgetProvider {
                         sbLine.append(currentTime);
                         sbLine.append("] Wake up ");
                         sbLine.append(appName);
-                        appSOSReportBean.setSosReport(sbLine.toString());
+                        winBollNewsBean.setMessage(sbLine.toString());
                         
-                        addAPPSOSReportBean(context, appSOSReportBean);
+                        addWinBollNewsBean(context, winBollNewsBean);
 
                         AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
-                        int[] appWidgetIds = appWidgetManager.getAppWidgetIds(new ComponentName(context, SOSWidget.class));
+                        int[] appWidgetIds = appWidgetManager.getAppWidgetIds(new ComponentName(context, APPNewsWidget.class));
                         for (int appWidgetId : appWidgetIds) {
                             updateAppWidget(context, appWidgetManager, appWidgetId);
                         }
@@ -97,53 +98,53 @@ public class SOSWidget extends AppWidgetProvider {
     //
     // 加入新报告信息
     //
-    public synchronized static void addAPPSOSReportBean(Context context, SOSReportBean bean) {
-        initAPPSOSReportBeanList(context);
-        _SOSReportBeanList.add(0, bean);
+    public synchronized static void addWinBollNewsBean(Context context, WinBollNewsBean bean) {
+        initWinBollNewsBeanList(context);
+        _WinBollNewsBeanList.add(0, bean);
         // 控制记录总数
-        while (_SOSReportBeanList.size() > _MAX_PAGES * _OnePageLinesCount) {
-            _SOSReportBeanList.remove(_SOSReportBeanList.size() - 1);
+        while (_WinBollNewsBeanList.size() > _MAX_PAGES * _OnePageLinesCount) {
+            _WinBollNewsBeanList.remove(_WinBollNewsBeanList.size() - 1);
         }
-        SOSReportBean.saveBeanList(context, _SOSReportBeanList, SOSReportBean.class);
+        WinBollNewsBean.saveBeanList(context, _WinBollNewsBeanList, WinBollNewsBean.class);
     }
 
-    synchronized static void initAPPSOSReportBeanList(Context context) {
-        if (_SOSReportBeanList == null) {
-            _SOSReportBeanList = new ArrayList<SOSReportBean>();
-            SOSReportBean.loadBeanList(context, _SOSReportBeanList, SOSReportBean.class);
+    synchronized static void initWinBollNewsBeanList(Context context) {
+        if (_WinBollNewsBeanList == null) {
+            _WinBollNewsBeanList = new ArrayList<WinBollNewsBean>();
+            WinBollNewsBean.loadBeanList(context, _WinBollNewsBeanList, WinBollNewsBean.class);
         }
-        if (_SOSReportBeanList == null) {
-            _SOSReportBeanList = new ArrayList<SOSReportBean>();
-            SOSReportBean.saveBeanList(context, _SOSReportBeanList, SOSReportBean.class);
+        if (_WinBollNewsBeanList == null) {
+            _WinBollNewsBeanList = new ArrayList<WinBollNewsBean>();
+            WinBollNewsBean.saveBeanList(context, _WinBollNewsBeanList, WinBollNewsBean.class);
         }
     }
 
     private void updateAppWidget(Context context, AppWidgetManager appWidgetManager, int appWidgetId) {
         LogUtils.d(TAG, "updateAppWidget(...)");
 
-        RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_sos);
+        RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_news);
         //设置按钮点击事件
-        Intent intentPre = new Intent(context, SOSWidgetClickListener.class);
-        intentPre.setAction(SOSWidgetClickListener.ACTION_PRE);
+        Intent intentPre = new Intent(context, APPNewsWidgetClickListener.class);
+        intentPre.setAction(APPNewsWidgetClickListener.ACTION_PRE);
         PendingIntent pendingIntentPre = PendingIntent.getBroadcast(context, 0, intentPre, PendingIntent.FLAG_UPDATE_CURRENT);
         views.setOnClickPendingIntent(R.id.widget_button_pre, pendingIntentPre);
-        Intent intentNext = new Intent(context, SOSWidgetClickListener.class);
-        intentNext.setAction(SOSWidgetClickListener.ACTION_NEXT);
+        Intent intentNext = new Intent(context, APPNewsWidgetClickListener.class);
+        intentNext.setAction(APPNewsWidgetClickListener.ACTION_NEXT);
         PendingIntent pendingIntentNext = PendingIntent.getBroadcast(context, 0, intentNext, PendingIntent.FLAG_UPDATE_CURRENT);
         views.setOnClickPendingIntent(R.id.widget_button_next, pendingIntentNext);
 
-        views.setTextViewText(R.id.infoTextView, getPageInfo());
-        views.setTextViewText(R.id.sosReportTextView, getMessage());
+        views.setTextViewText(R.id.tv_msg, getPageInfo());
+        views.setTextViewText(R.id.tv_news, getMessage());
         appWidgetManager.updateAppWidget(appWidgetId, views);
     }
 
     public static String getMessage() {
         ArrayList<String> msgTemp = new ArrayList<String>();
-        if (_SOSReportBeanList != null) {
+        if (_WinBollNewsBeanList != null) {
             int start = _OnePageLinesCount * _CurrentPageIndex;
-            start = _SOSReportBeanList.size() > start ? start : _SOSReportBeanList.size() - 1;
-            for (int i = start, j = 0; i < _SOSReportBeanList.size() && j < _OnePageLinesCount && start > -1; i++, j++) {
-                msgTemp.add(_SOSReportBeanList.get(i).getSosReport());
+            start = _WinBollNewsBeanList.size() > start ? start : _WinBollNewsBeanList.size() - 1;
+            for (int i = start, j = 0; i < _WinBollNewsBeanList.size() && j < _OnePageLinesCount && start > -1; i++, j++) {
+                msgTemp.add(_WinBollNewsBeanList.get(i).getMessage());
             }
             String message = String.join("\n", msgTemp);
             return message;
@@ -152,33 +153,33 @@ public class SOSWidget extends AppWidgetProvider {
     }
 
     public static void prePage(Context context) {
-        if (_SOSReportBeanList != null) {
+        if (_WinBollNewsBeanList != null) {
             if (_CurrentPageIndex > 0) {
                 _CurrentPageIndex = _CurrentPageIndex - 1;
             }
-            Intent intentWidget = new Intent(context, SOSWidget.class);
-            intentWidget.setAction(SOSWidget.ACTION_RELOAD_REPORT);
+            Intent intentWidget = new Intent(context, APPNewsWidget.class);
+            intentWidget.setAction(APPNewsWidget.ACTION_RELOAD_REPORT);
             context.sendBroadcast(intentWidget);
         }
     }
 
     public static void nextPage(Context context) {
-        if (_SOSReportBeanList != null) {
-            if ((_CurrentPageIndex + 1) * _OnePageLinesCount < _SOSReportBeanList.size()) {
+        if (_WinBollNewsBeanList != null) {
+            if ((_CurrentPageIndex + 1) * _OnePageLinesCount < _WinBollNewsBeanList.size()) {
                 _CurrentPageIndex = _CurrentPageIndex + 1;
             }
-            Intent intentWidget = new Intent(context, SOSWidget.class);
-            intentWidget.setAction(SOSWidget.ACTION_RELOAD_REPORT);
+            Intent intentWidget = new Intent(context, APPNewsWidget.class);
+            intentWidget.setAction(APPNewsWidget.ACTION_RELOAD_REPORT);
             context.sendBroadcast(intentWidget);
         }
     }
 
     String getPageInfo() {
-        if (_SOSReportBeanList == null) {
+        if (_WinBollNewsBeanList == null) {
             return "0/0";
         }
-        int leftCount = _SOSReportBeanList.size() % _OnePageLinesCount;
-        int currentPageCount = _SOSReportBeanList.size() / _OnePageLinesCount + (leftCount == 0 ?0: 1);
+        int leftCount = _WinBollNewsBeanList.size() % _OnePageLinesCount;
+        int currentPageCount = _WinBollNewsBeanList.size() / _OnePageLinesCount + (leftCount == 0 ?0: 1);
         return String.format("%d/%d", _CurrentPageIndex + 1, currentPageCount);
     }
 }

appbase/src/main/java/cc/winboll/studio/appbase/widgets/APPNewsWidgetClickListener.java

@@ -10,11 +10,11 @@ import android.content.Context;
 import android.content.Intent;
 import cc.winboll.studio.libappbase.LogUtils;
 
-public class SOSWidgetClickListener extends BroadcastReceiver {
+public class APPNewsWidgetClickListener extends BroadcastReceiver {
 
-    public static final String TAG = "SOSWidgetClickListener";
-    public static final String ACTION_PRE = "cc.winboll.studio.appbase.widgets.SOSWidgetClickListener.ACTION_PRE";
-    public static final String ACTION_NEXT = "cc.winboll.studio.appbase.widgets.SOSWidgetClickListener.ACTION_NEXT";
+    public static final String TAG = "APPNewsWidgetClickListener";
+    public static final String ACTION_PRE = APPNewsWidgetClickListener.class.getName() + ".ACTION_PRE";
+    public static final String ACTION_NEXT = APPNewsWidgetClickListener.class.getName() + ".ACTION_NEXT";
 
     @Override
     public void onReceive(Context context, Intent intent) {
@@ -25,10 +25,10 @@ public class SOSWidgetClickListener extends BroadcastReceiver {
         }
         if (action.equals(ACTION_PRE)) {
             LogUtils.d(TAG, "ACTION_PRE");
-            SOSWidget.prePage(context);
+            APPNewsWidget.prePage(context);
         } else if (action.equals(ACTION_NEXT)) {
             LogUtils.d(TAG, "ACTION_NEXT");
-            SOSWidget.nextPage(context);
+            APPNewsWidget.nextPage(context);
         } else {
             LogUtils.d(TAG, String.format("action %s", action));
         }

appbase/src/main/res/layout/activity_main.xml

@@ -1,149 +1,194 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
 	android:orientation="vertical"
-	android:gravity="center">
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
 
 	<androidx.appcompat.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:id="@+id/activitymainToolbar1"/>
 
-	<LinearLayout
-		android:orientation="vertical"
+	<ScrollView
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:layout_weight="1.0"
-		android:gravity="center_horizontal">
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="Hello, WinBoll!"/>
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="Android版本10的代号是“Q”，API级别是29。   Android 10开始谷歌不再公开使用甜品作为版本代号，但内部仍保留了大量与“Q”相关的元素。Android 10本身并没有严格对应某个特定的Java版本，但在开发Android 10应用时，通常可以使用Java 8或更高版本。
- 
-Java 8为Android开发带来了诸如Lambda表达式、方法引用等新特性，能提高开发效率和代码可读性，与Android 10开发适配良好。Java 9及更高版本也可用于Android 10开发，能使用一些新的语言特性和API，但可能需要注意兼容性和配置问题。"/>
+		android:layout_weight="1.0">
 
 		<LinearLayout
-			android:orientation="horizontal"
+			xmlns:app="http://schemas.android.com/apk/res-auto"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:gravity="right|center_vertical">
-
-			<CheckBox
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="Debug Mode"
-				android:layout_weight="1.0"
-				android:onClick="onSwitchDebugMode"
-				android:id="@+id/activitymainCheckBox1"/>
-
-			<Button
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="Test Application CrashReport"
-				android:textAllCaps="false"
-				android:onClick="onTestApplicationCrashReport"/>
-
-		</LinearLayout>
-
-		<ScrollView
-			android:layout_width="match_parent"
-			android:layout_height="400dp">
+			android:orientation="vertical"
+			android:gravity="center">
 
 			<LinearLayout
 				android:orientation="vertical"
 				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:gravity="right">
+				android:layout_height="0dp"
+				android:layout_weight="1.0"
+				android:gravity="center_horizontal">
 
-				<HorizontalScrollView
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="Hello, WinBoll!"/>
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="Android版本10的代号是“Q”，API级别是29。   Android 10开始谷歌不再公开使用甜品作为版本代号，但内部仍保留了大量与“Q”相关的元素。Android 10本身并没有严格对应某个特定的Java版本，但在开发Android 10应用时，通常可以使用Java 8或更高版本。   Java 8为Android开发带来了诸如Lambda表达式、方法引用等新特性，能提高开发效率和代码可读性，与Android 10开发适配良好。Java 9及更高版本也可用于Android 10开发，能使用一些新的语言特性和API，但可能需要注意兼容性和配置问题。"/>
+
+				<LinearLayout
+					android:orientation="horizontal"
 					android:layout_width="match_parent"
-					android:layout_height="wrap_content">
+					android:layout_height="wrap_content"
+					android:gravity="right|center_vertical">
+
+					<CheckBox
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:text="Debug Mode"
+						android:layout_weight="1.0"
+						android:onClick="onSwitchDebugMode"
+						android:id="@+id/activitymainCheckBox1"/>
+
+					<Button
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:text="Test Application CrashReport"
+						android:textAllCaps="false"
+						android:onClick="onTestApplicationCrashReport"/>
+
+				</LinearLayout>
+
+				<ScrollView
+					android:layout_width="match_parent"
+					android:layout_height="400dp">
 
 					<LinearLayout
-						android:orientation="horizontal"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content">
+						android:orientation="vertical"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:gravity="right">
+
+						<HorizontalScrollView
+							android:layout_width="match_parent"
+							android:layout_height="wrap_content">
+
+							<LinearLayout
+								android:orientation="horizontal"
+								android:layout_width="wrap_content"
+								android:layout_height="wrap_content">
+
+								<Button
+									android:layout_width="wrap_content"
+									android:layout_height="wrap_content"
+									android:text="SartTestDemoService"
+									android:textAllCaps="false"
+									android:onClick="onSartTestDemoService"/>
+
+								<Button
+									android:layout_width="wrap_content"
+									android:layout_height="wrap_content"
+									android:text="StopTestDemoService"
+									android:textAllCaps="false"
+									android:onClick="onStopTestDemoService"/>
+
+								<Button
+									android:layout_width="wrap_content"
+									android:layout_height="wrap_content"
+									android:text="StopTestDemoServiceNoSettings"
+									android:textAllCaps="false"
+									android:onClick="onStopTestDemoServiceNoSettings"/>
+
+							</LinearLayout>
+
+						</HorizontalScrollView>
+                        
+                        <HorizontalScrollView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+
+                            <LinearLayout
+                                android:orientation="horizontal"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content">
+
+                                <Button
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="SartTestDemoBindService"
+                                    android:textAllCaps="false"
+                                    android:onClick="onSartTestDemoBindService"/>
+
+                                <Button
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="StopTestDemoBindService"
+                                    android:textAllCaps="false"
+                                    android:onClick="onStopTestDemoBindService"/>
+
+                                <Button
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:text="StopTestDemoBindServiceNoSettings"
+                                    android:textAllCaps="false"
+                                    android:onClick="onStopTestDemoBindServiceNoSettings"/>
+
+                            </LinearLayout>
+
+						</HorizontalScrollView>
+                        
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="StartCenter"
+							android:textAllCaps="false"
+							android:onClick="onStartCenter"/>
 
 						<Button
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:text="StartTestService"
+							android:text="StopCenter"
 							android:textAllCaps="false"
-							android:onClick="onStartTestService"/>
+							android:onClick="onStopCenter"/>
 
 						<Button
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:text="StopTestService"
+							android:text="TestStopMainServiceWithoutSettingEnable"
 							android:textAllCaps="false"
-							android:onClick="onStopTestService"/>
+							android:onClick="onTestStopMainServiceWithoutSettingEnable"/>
 
 						<Button
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
-							android:text="StopTestServiceNoSettings"
+							android:text="TestUseComponentStartService"
 							android:textAllCaps="false"
-							android:onClick="onStopTestServiceNoSettings"/>
+							android:onClick="onTestUseComponentStartService"/>
+
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="TestSOS"
+							android:textAllCaps="false"
+							android:onClick="onTestSOS"/>
 
 					</LinearLayout>
 
-				</HorizontalScrollView>
+				</ScrollView>
 
-				<Button
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="StartCenter"
-					android:textAllCaps="false"
-					android:onClick="onStartCenter"/>
-
-				<Button
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="StopCenter"
-					android:textAllCaps="false"
-					android:onClick="onStopCenter"/>
-
-				<Button
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="TestStopWithoutSettingEnable"
-					android:textAllCaps="false"
-					android:onClick="onTestStopWithoutSettingEnable"/>
-
-				<Button
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="TestStartWithString"
-					android:textAllCaps="false"
-					android:onClick="onTestStartWithString"/>
-
-				<Button
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="SOS"
-					android:textAllCaps="false"
-					android:onClick="onSOS"/>
+				<cc.winboll.studio.libappbase.LogView
+					android:layout_height="500dp"
+					android:layout_width="match_parent"
+					android:id="@+id/activitymainLogView1"/>
 
 			</LinearLayout>
 
-		</ScrollView>
+		</LinearLayout>
 
-		<cc.winboll.studio.libappbase.LogView
-			android:layout_weight="1.0"
-			android:layout_height="0dp"
-			android:layout_width="match_parent"
-			android:id="@+id/activitymainLogView1"/>
-
-	</LinearLayout>
+	</ScrollView>
 
 </LinearLayout>
 

appbase/src/main/res/layout/widget_news.xml

@@ -11,31 +11,40 @@
 		android:orientation="horizontal"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:gravity="right">
+		android:gravity="right|center_vertical">
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/infoTextView"/>
-        
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="⇦"
-            android:id="@+id/widget_button_pre"/>
-        
-		<Button
-			android:layout_width="wrap_content"
+		<TextView
+			android:layout_width="0dp"
 			android:layout_height="wrap_content"
+			android:id="@+id/tv_title"
+			android:layout_weight="1.0"
+			android:text="WinBollNews"
+			android:textStyle="bold"
+			android:textSize="16sp"/>
+
+		<Button
+			android:layout_width="48dp"
+			android:layout_height="48dp"
+			android:text="⇦"
+			android:id="@+id/widget_button_pre"/>
+
+		<Button
+			android:layout_width="48dp"
+			android:layout_height="48dp"
 			android:text="⇨"
 			android:id="@+id/widget_button_next"/>
 
 	</LinearLayout>
 
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/tv_msg"/>
+    
 	<TextView
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:id="@+id/sosReportTextView"
+		android:id="@+id/tv_news"
 		android:layout_weight="1.0"/>
 
 </LinearLayout>

appbase/src/main/res/xml/widget_provider_info_sos.xml

@@ -3,5 +3,5 @@
     android:minWidth="200dp"
     android:minHeight="100dp"
     android:updatePeriodMillis="1000"
-    android:initialLayout="@layout/widget_sos">
+    android:initialLayout="@layout/widget_news">
 </appwidget-provider>

build.gradle

@@ -9,13 +9,14 @@ buildscript {
         maven { url "https://jitpack.io" }
         mavenCentral()
         google()
-        mavenLocal()
+        
         // Nexus Maven 库地址
         // "WinBoll Release"
         maven { url "https://nexus.winboll.cc/repository/maven-public/" }
         // "WinBoll Snapshot"
         maven { url "https://nexus.winboll.cc/repository/maven-snapshots/" }
         
+        mavenLocal()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.2.1'
@@ -26,13 +27,6 @@ buildscript {
 
 allprojects {
     repositories {
-        maven {
-            url "https://mirrors.tencent.com/repository/maven/tencent_public/"
-        }
-        maven {
-            url "https://mirrors.tencent.com/repository/maven/tencent_public_snapshots"
-        }
-        
         maven { url 'https://maven.aliyun.com/repository/public/' } 
         maven { url 'https://maven.aliyun.com/repository/google/' }
         maven { url 'https://maven.aliyun.com/repository/gradle-plugin/' }
@@ -41,13 +35,14 @@ allprojects {
         maven { url "https://jitpack.io" }
         mavenCentral()
         google()
-        mavenLocal()
+        
         // Nexus Maven 库地址
         // "WinBoll Release"
         maven { url "https://nexus.winboll.cc/repository/maven-public/" }
         // "WinBoll Snapshot"
         maven { url "https://nexus.winboll.cc/repository/maven-snapshots/" }
         
+        mavenLocal()
     }
     ext {
         // 定义全局变量，常用于版本管理

contacts/build.gradle

@@ -41,29 +41,41 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    
-    implementation 'com.squareup.okhttp3:okhttp:4.4.1'
+    api fileTree(dir: 'libs', include: ['*.jar'])
     
+    // 权限请求框架：https://github.com/getActivity/XXPermissions
+    implementation 'com.github.getActivity:XXPermissions:18.63'
+    // 下拉控件
+    implementation 'com.baoyz.pullrefreshlayout:library:1.2.0'
+    // 拼音搜索
     // https://mvnrepository.com/artifact/com.github.open-android/pinyin4j
     implementation 'com.github.open-android:pinyin4j:2.5.0'
-
+    // SSH
+    implementation 'com.jcraft:jsch:0.1.55'
+    // Html 解析
+    implementation 'org.jsoup:jsoup:1.13.1'
+    // 二维码类库
+    implementation 'com.google.zxing:core:3.4.1'
+    implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
+    // 应用介绍页类库
     implementation 'io.github.medyo:android-about-page:2.0.0'
+    // 吐司类库
     implementation 'com.github.getActivity:ToastUtils:10.5'
+    // 网络连接类库
+    implementation 'com.squareup.okhttp3:okhttp:4.4.1'
     
+    // Android 类库
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.viewpager:viewpager:1.0.0'
+    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
+    implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
     implementation 'androidx.fragment:fragment:1.1.0'
     implementation 'com.google.android.material:material:1.4.0'
     
-    implementation 'cc.winboll.studio:libapputils:9.3.2'
-    implementation 'cc.winboll.studio:libappbase:1.5.6'
+    implementation 'cc.winboll.studio:libappbase:2.1.5'
+    implementation 'cc.winboll.studio:libapputils:9.4.4'
+    implementation 'cc.winboll.studio:libaes:7.6.12'
 }

contacts/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 03 17:39:16 HKT 2025
-stageCount=7
+#Sun Mar 09 20:33:54 HKT 2025
+stageCount=20
 libraryProject=
 baseVersion=1.0
-publishVersion=1.0.6
+publishVersion=1.0.19
 buildCount=0
-baseBetaVersion=1.0.7
+baseBetaVersion=1.0.20

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

@@ -35,9 +35,7 @@ import cc.winboll.studio.contacts.services.MainService;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.LogView;
 import cc.winboll.studio.libapputils.app.IWinBollActivity;
-import cc.winboll.studio.libapputils.app.WinBollActivityManager;
 import cc.winboll.studio.libapputils.bean.APPInfo;
-import cc.winboll.studio.libapputils.view.YesNoAlertDialog;
 import com.google.android.material.tabs.TabLayout;
 import java.util.ArrayList;
 import java.util.List;

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

@@ -29,17 +29,17 @@ import cc.winboll.studio.contacts.adapters.PhoneConnectRuleAdapter;
 import cc.winboll.studio.contacts.beans.MainServiceBean;
 import cc.winboll.studio.contacts.beans.PhoneConnectRuleModel;
 import cc.winboll.studio.contacts.beans.RingTongBean;
+import cc.winboll.studio.contacts.beans.SettingsModel;
 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.libappbase.IWinBollActivity;
-import cc.winboll.studio.libappbase.bean.APPInfo;
+import cc.winboll.studio.contacts.views.DuInfoTextView;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libapputils.app.IWinBollActivity;
+import cc.winboll.studio.libapputils.bean.APPInfo;
 import com.hjq.toast.ToastUtils;
 import java.lang.reflect.Field;
 import java.util.List;
-import cc.winboll.studio.contacts.beans.SettingsModel;
-import cc.winboll.studio.contacts.views.DuInfoTextView;
-import cc.winboll.studio.libappbase.LogUtils;
 
 public class SettingsActivity extends AppCompatActivity implements IWinBollActivity {
 
@@ -232,6 +232,12 @@ public class SettingsActivity extends AppCompatActivity implements IWinBollActiv
         Intent intent = new Intent(this, UnitTestActivity.class);
         startActivity(intent);
     }
+    
+    public void onAddNewConnectionRule(View view) {
+        Rules.getInstance(this).getPhoneBlacRuleBeanList().add(new PhoneConnectRuleModel());
+        Rules.getInstance(this).saveRules();
+        adapter.notifyDataSetChanged();
+    }
 
     public void onDefaultPhone(View view) {
         Intent intent = new Intent(Settings.ACTION_MANAGE_DEFAULT_APPS_SETTINGS);

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

@@ -7,6 +7,7 @@ import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.contacts.dun.Rules;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.LogView;
+import android.widget.EditText;
 
 /**
  * @Author ZhanGSKen@AliYun.Com
@@ -26,6 +27,15 @@ public class UnitTestActivity extends Activity {
         logView.start();
     }
 
+    public void onTestPhone(View view) {
+        // 开始测试数据
+        EditText etPhone = findViewById(R.id.phone_et);
+        Rules rules = Rules.getInstance(this);
+        String phone = etPhone.getText().toString().trim();
+        LogUtils.d(TAG, String.format("Test phone : %s\n%s", phone, rules.isAllowed(phone)));
+
+    }
+
     public void onTestMain(View view) {
         Rules rules = Rules.getInstance(this);
 

contacts/src/main/java/cc/winboll/studio/contacts/adapters/CallLogAdapter.java

@@ -5,6 +5,7 @@ package cc.winboll.studio.contacts.adapters;
  * @Date 2025/02/26 13:09:32
  * @Describe CallLogAdapter
  */
+import android.content.Context;
 import android.content.Intent;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -15,6 +16,8 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.contacts.beans.CallLogModel;
+import cc.winboll.studio.contacts.utils.ContactUtils;
+import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;
 import com.hjq.toast.ToastUtils;
 import java.text.SimpleDateFormat;
 import java.util.List;
@@ -24,8 +27,12 @@ public class CallLogAdapter extends RecyclerView.Adapter<CallLogAdapter.CallLogV
     public static final String TAG = "CallLogAdapter";
 
     private List<CallLogModel> callLogList;
+    ContactUtils mContactUtils;
+    Context mContext;
 
-    public CallLogAdapter(List<CallLogModel> callLogList) {
+    public CallLogAdapter(Context context, List<CallLogModel> callLogList) {
+        mContext = context;
+        this.mContactUtils = ContactUtils.getInstance(mContext);
         this.callLogList = callLogList;
     }
 
@@ -39,13 +46,19 @@ public class CallLogAdapter extends RecyclerView.Adapter<CallLogAdapter.CallLogV
     @Override
     public void onBindViewHolder(@NonNull CallLogViewHolder holder, int position) {
         final CallLogModel callLog = callLogList.get(position);
-        holder.phoneNumber.setText(callLog.getPhoneNumber());
+        holder.phoneNumber.setText(callLog.getPhoneNumber() + "☎" + mContactUtils.getContactsName(callLog.getPhoneNumber()));
         holder.callStatus.setText(callLog.getCallStatus());
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault());
         holder.callDate.setText(dateFormat.format(callLog.getCallDate()));
-        holder.dialButton.setOnClickListener(new View.OnClickListener() {
+
+        // 初始化拉动后拨号控件 
+        holder.dialAOHPCTCSeekBar.setThumb(holder.itemView.getContext().getDrawable(R.drawable.ic_call));
+        holder.dialAOHPCTCSeekBar.setBlurRightDP(80);
+        holder.dialAOHPCTCSeekBar.setThumbOffset(0);
+        holder.dialAOHPCTCSeekBar.setOnOHPCListener(
+            new AOHPCTCSeekBar.OnOHPCListener(){
                 @Override
-                public void onClick(View v) {
+                public void onOHPCommit() {
                     String phoneNumber = callLog.getPhoneNumber().replaceAll("\\s", "");
                     ToastUtils.show(phoneNumber);
                     Intent intent = new Intent(Intent.ACTION_CALL);
@@ -65,15 +78,16 @@ public class CallLogAdapter extends RecyclerView.Adapter<CallLogAdapter.CallLogV
     public class CallLogViewHolder extends RecyclerView.ViewHolder {
         TextView phoneNumber, callStatus, callDate;
         Button dialButton;
-        
+        AOHPCTCSeekBar dialAOHPCTCSeekBar;
 
         public CallLogViewHolder(@NonNull View itemView) {
             super(itemView);
             phoneNumber = itemView.findViewById(R.id.phone_number);
             callStatus = itemView.findViewById(R.id.call_status);
             callDate = itemView.findViewById(R.id.call_date);
-            dialButton = itemView.findViewById(R.id.dial_button);
+            dialAOHPCTCSeekBar = itemView.findViewById(R.id.aohpctcseekbar_dial);
         }
     }
+
 }
 

contacts/src/main/java/cc/winboll/studio/contacts/adapters/ContactAdapter.java

@@ -17,6 +17,7 @@ import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.contacts.beans.ContactModel;
 import com.hjq.toast.ToastUtils;
 import java.util.List;
+import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;
 
 public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactViewHolder> {
 
@@ -43,9 +44,14 @@ public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactV
         holder.contactName.setText(contact.getName());
         holder.contactNumber.setText(contact.getNumber());
 
-        holder.dialButton.setOnClickListener(new View.OnClickListener() {
+        // 初始化拉动后拨号控件 
+        holder.dialAOHPCTCSeekBar.setThumb(holder.itemView.getContext().getDrawable(R.drawable.ic_call));
+        holder.dialAOHPCTCSeekBar.setBlurRightDP(80);
+        holder.dialAOHPCTCSeekBar.setThumbOffset(0);
+        holder.dialAOHPCTCSeekBar.setOnOHPCListener(
+            new AOHPCTCSeekBar.OnOHPCListener(){
                 @Override
-                public void onClick(View v) {
+                public void onOHPCommit() {
                     String phoneNumber = contact.getNumber().replaceAll("\\s", "");
                     ToastUtils.show(phoneNumber);
                     Intent intent = new Intent(Intent.ACTION_CALL);
@@ -65,13 +71,13 @@ public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ContactV
     public class ContactViewHolder extends RecyclerView.ViewHolder {
         TextView contactName;
         TextView contactNumber;
-        Button dialButton;
-
+        AOHPCTCSeekBar dialAOHPCTCSeekBar;
+        
         public ContactViewHolder(@NonNull View itemView) {
             super(itemView);
             contactName = itemView.findViewById(R.id.contact_name);
             contactNumber = itemView.findViewById(R.id.contact_number);
-            dialButton = itemView.findViewById(R.id.dial_button);
+            dialAOHPCTCSeekBar = itemView.findViewById(R.id.aohpctcseekbar_dial);
         }
     }
 }

contacts/src/main/java/cc/winboll/studio/contacts/adapters/PhoneConnectRuleAdapter.java

@@ -19,7 +19,14 @@ import androidx.recyclerview.widget.RecyclerView;
 import cc.winboll.studio.contacts.R;
 import cc.winboll.studio.contacts.beans.PhoneConnectRuleModel;
 import cc.winboll.studio.contacts.dun.Rules;
+import java.util.ArrayList;
 import java.util.List;
+import android.widget.LinearLayout;
+import android.view.MotionEvent;
+import android.widget.HorizontalScrollView;
+import cc.winboll.studio.contacts.views.LeftScrollView;
+import com.hjq.toast.ToastUtils;
+import cc.winboll.studio.libapputils.view.YesNoAlertDialog;
 
 public class PhoneConnectRuleAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
@@ -42,10 +49,10 @@ public class PhoneConnectRuleAdapter extends RecyclerView.Adapter<RecyclerView.V
         LayoutInflater inflater = LayoutInflater.from(context);
         if (viewType == VIEW_TYPE_SIMPLE) {
             View view = inflater.inflate(R.layout.view_phone_connect_rule_simple, parent, false);
-            return new SimpleViewHolder(view);
+            return new SimpleViewHolder(parent, view);
         } else {
             View view = inflater.inflate(R.layout.view_phone_connect_rule, parent, false);
-            return new EditViewHolder(view);
+            return new EditViewHolder(parent, view);
         }
     }
 
@@ -53,15 +60,128 @@ public class PhoneConnectRuleAdapter extends RecyclerView.Adapter<RecyclerView.V
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, final int position) {
         final PhoneConnectRuleModel model = ruleList.get(position);
         if (holder instanceof SimpleViewHolder) {
-            SimpleViewHolder simpleViewHolder = (SimpleViewHolder) holder;
-            simpleViewHolder.textView.setText(model.getRuleText());
-            simpleViewHolder.button.setOnClickListener(new View.OnClickListener() {
+            final SimpleViewHolder simpleViewHolder = (SimpleViewHolder) holder;
+            String szView = model.getRuleText().trim().equals("") ?"[NULL]": model.getRuleText();
+            simpleViewHolder.tvRuleText.setText(szView);
+            simpleViewHolder.scrollView.setOnActionListener(new LeftScrollView.OnActionListener(){
+
                     @Override
-                    public void onClick(View v) {
+                    public void onUp() {
+                        ArrayList<PhoneConnectRuleModel> list = Rules.getInstance(context).getPhoneBlacRuleBeanList();
+                        if (position > 0) {
+                            ToastUtils.show("onUp");
+                            simpleViewHolder.scrollView.smoothScrollTo(0, 0);
+//                            PhoneConnectRuleModel newBean = new PhoneConnectRuleModel();
+//                            newBean.setRuleText(list.get(position).getRuleText());
+//                            newBean.setIsAllowConnection(list.get(position).isAllowConnection());
+//                            newBean.setIsEnable(list.get(position).isEnable());
+//                            newBean.setIsSimpleView(list.get(position).isSimpleView());
+                            list.add(position - 1, list.get(position));
+                            list.remove(position + 1);
+                            Rules.getInstance(context).saveRules();
+                            notifyDataSetChanged();
+                        }
+                    }
+
+                    @Override
+                    public void onDown() {
+                        ArrayList<PhoneConnectRuleModel> list = Rules.getInstance(context).getPhoneBlacRuleBeanList();
+                        if (position < list.size() - 1) {
+                            ToastUtils.show("onDown");
+                            simpleViewHolder.scrollView.smoothScrollTo(0, 0);
+//                            PhoneConnectRuleModel newBean = new PhoneConnectRuleModel();
+//                            newBean.setRuleText(list.get(position).getRuleText());
+//                            newBean.setIsAllowConnection(list.get(position).isAllowConnection());
+//                            newBean.setIsEnable(list.get(position).isEnable());
+//                            newBean.setIsSimpleView(list.get(position).isSimpleView());
+                            list.add(position + 2, list.get(position));
+                            list.remove(position);
+                            Rules.getInstance(context).saveRules();
+                            notifyDataSetChanged();
+                        }
+                    }
+
+                    @Override
+                    public void onEdit() {
+                        simpleViewHolder.scrollView.smoothScrollTo(0, 0);
                         model.setIsSimpleView(false);
-                        notifyItemChanged(position);
+                        notifyDataSetChanged();
+                        //notifyItemChanged(position);
+                    }
+
+                    @Override
+                    public void onDelete() {
+                        YesNoAlertDialog.show(simpleViewHolder.scrollView.getContext(), "删除确认", "是否删除该通话规则？", new YesNoAlertDialog.OnDialogResultListener(){
+
+                                @Override
+                                public void onYes() {
+                                    simpleViewHolder.scrollView.smoothScrollTo(0, 0);
+                                    model.setIsSimpleView(true);
+                                    ArrayList<PhoneConnectRuleModel> list = Rules.getInstance(context).getPhoneBlacRuleBeanList();
+                                    list.remove(position);
+                                    Rules.getInstance(context).saveRules();
+                                    notifyDataSetChanged();
+                                    //notifyItemChanged(position);
+                                }
+
+                                @Override
+                                public void onNo() {
+                                }
+                            });
+
                     }
                 });
+//            simpleViewHolder.editButton.setOnClickListener(new View.OnClickListener() {
+//                    @Override
+//                    public void onClick(View v) {
+//                        model.setIsSimpleView(false);
+//                        notifyItemChanged(position);
+//                    }
+//                });
+//            simpleViewHolder.deleteButton.setOnClickListener(new View.OnClickListener() {
+//                    @Override
+//                    public void onClick(View v) {
+//                        model.setIsSimpleView(false);
+//                        ArrayList<PhoneConnectRuleModel> list = Rules.getInstance(context).getPhoneBlacRuleBeanList();
+//                        list.remove(position);
+//                        Rules.getInstance(context).saveRules();
+//                        notifyItemChanged(position);
+//                    }
+//                });
+//            // 触摸事件处理
+//            simpleViewHolder.contentLayout.setOnTouchListener(new View.OnTouchListener() {
+//                    @Override
+//                    public boolean onTouch(View v, MotionEvent event) {
+//                        switch (event.getAction()) {
+//                            case MotionEvent.ACTION_DOWN:
+//                                simpleViewHolder.startX = event.getX();
+//                                simpleViewHolder.isSwiping = true;
+//                                break;
+//                            case MotionEvent.ACTION_MOVE:
+//                                if (simpleViewHolder.isSwiping) {
+//                                    float deltaX = simpleViewHolder.startX - event.getX();
+//                                    if (deltaX > 0) { // 左滑
+//                                        float translationX = Math.max(-simpleViewHolder.actionLayout.getWidth(), -deltaX);
+//                                        simpleViewHolder.contentLayout.setTranslationX(translationX);
+//                                        simpleViewHolder.actionLayout.setVisibility(View.VISIBLE);
+//                                    }
+//                                }
+//                                break;
+//                            case MotionEvent.ACTION_UP:
+//                                simpleViewHolder.isSwiping = false;
+//                                if (simpleViewHolder.contentLayout.getTranslationX() < -simpleViewHolder.actionLayout.getWidth() / 2) {
+//                                    // 保持按钮显示
+//                                    simpleViewHolder.contentLayout.setTranslationX(-actionLayout.getWidth());
+//                                } else {
+//                                    // 恢复原状
+//                                    simpleViewHolder.contentLayout.animate().translationX(0).setDuration(200).start();
+//                                    simpleViewHolder.actionLayout.setVisibility(View.INVISIBLE);
+//                                }
+//                                break;
+//                        }
+//                        return true;
+//                    }
+//                });
         } else if (holder instanceof EditViewHolder) {
             final EditViewHolder editViewHolder = (EditViewHolder) holder;
             editViewHolder.editText.setText(model.getRuleText());
@@ -95,14 +215,21 @@ public class PhoneConnectRuleAdapter extends RecyclerView.Adapter<RecyclerView.V
     }
 
     static class SimpleViewHolder extends RecyclerView.ViewHolder {
-        TextView textView;
-        Button button;
 
-        public SimpleViewHolder(@NonNull View itemView) {
+        private final LeftScrollView scrollView;
+        private final TextView tvRuleText;
+
+
+        public SimpleViewHolder(@NonNull ViewGroup parent, @NonNull View itemView) {
             super(itemView);
-            textView = itemView.findViewById(R.id.text_view);
-            button = itemView.findViewById(R.id.button);
+            scrollView = itemView.findViewById(R.id.scrollView);
+            //tvRuleText = itemView.findViewById(R.id.ruletext_tv);
+            tvRuleText = new TextView(itemView.getContext());
+            scrollView.setContentWidth(parent.getWidth());
+            //scrollView.setContentWidth(600);
+            scrollView.addContentLayout(tvRuleText);
         }
+
     }
 
     static class EditViewHolder extends RecyclerView.ViewHolder {
@@ -111,7 +238,7 @@ public class PhoneConnectRuleAdapter extends RecyclerView.Adapter<RecyclerView.V
         CheckBox checkBoxEnable;
         Button buttonConfirm;
 
-        public EditViewHolder(@NonNull View itemView) {
+        public EditViewHolder(@NonNull ViewGroup parent, @NonNull View itemView) {
             super(itemView);
             editText = itemView.findViewById(R.id.edit_text);
             checkBoxAllow = itemView.findViewById(R.id.checkbox_allow);

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

@@ -48,24 +48,29 @@ public class TomCat {
             .url(zipUrl)
             .build();
 
-        try (Response response = client.newCall(request).execute()) {
+        try {
+            Response response = client.newCall(request).execute();
             if (!response.isSuccessful()) {
                 throw new IOException("Unexpected code " + response);
             }
 
             // 下载 ZIP 文件到临时位置
             File tempZipFile = File.createTempFile("temp", ".zip");
-            try (InputStream inputStream = response.body().byteStream();
-            FileOutputStream outputStream = new FileOutputStream(tempZipFile)) {
+            try {
+                InputStream inputStream = response.body().byteStream();
+                FileOutputStream outputStream = new FileOutputStream(tempZipFile);
                 byte[] buffer = new byte[1024];
                 int length;
                 while ((length = inputStream.read(buffer)) > 0) {
                     outputStream.write(buffer, 0, length);
                 }
+            } catch (Exception e) {
+                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
             }
 
             // 解压 ZIP 文件到指定文件夹
-            try (ZipInputStream zipInputStream = new ZipInputStream(Files.newInputStream(tempZipFile.toPath()))) {
+            try {
+                ZipInputStream zipInputStream = new ZipInputStream(Files.newInputStream(tempZipFile.toPath()));
                 ZipEntry zipEntry;
                 while ((zipEntry = zipInputStream.getNextEntry()) != null) {
                     Path targetFilePath = Paths.get(destinationFolder, zipEntry.getName());
@@ -83,11 +88,15 @@ public class TomCat {
                     }
                     zipInputStream.closeEntry();
                 }
+            } catch (Exception e) {
+                LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
             }
 
             // 删除临时 ZIP 文件
             tempZipFile.delete();
             LogUtils.d(TAG, "已更新 BoBullToon 数据");
+        } catch (Exception e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
         }
     }
 
@@ -97,12 +106,12 @@ public class TomCat {
         try {
             // 删除旧文件
             File fOldFolder = new File(destinationFolder);
-            if(fOldFolder.exists()) {
+            if (fOldFolder.exists()) {
                 deleteFolderRecursive(fOldFolder);
                 fOldFolder.mkdirs();
                 LogUtils.d(TAG, "已清空 BoBullToon 数据");
             }
-            
+
             // 更新新文件
             downloadAndExtractZip(zipUrl, destinationFolder);
             LogUtils.d(TAG, "ZIP 文件下载并解压成功。");
@@ -112,14 +121,14 @@ public class TomCat {
         }
         return false;
     }
-    
+
     // 递归删除文件夹及其内容的方法
     public static void deleteFolderRecursive(File file) {
         // 判断是否为文件夹
         if (file.isDirectory()) {
             // 列出文件夹中的所有文件和子文件夹
             File[] files = file.listFiles();
-            if (files!= null) {
+            if (files != null) {
                 // 遍历并递归删除每个文件和子文件夹
                 for (File f : files) {
                     deleteFolderRecursive(f);

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

@@ -43,6 +43,7 @@ public class Rules {
     }
 
     public void reload() {
+        LogUtils.d(TAG, "reload()");
         loadRules();
         loadDun();
         setDunResumTimer();
@@ -59,10 +60,12 @@ public class Rules {
                 @Override
                 public void run() {
                     if (mSettingsModel.getDunCurrentCount() != mSettingsModel.getDunTotalCount()) {
+                        LogUtils.d(TAG, String.format("当前防御值为%d，最大防御值为%d", mSettingsModel.getDunCurrentCount(), mSettingsModel.getDunTotalCount()));
                         int newDunCount = mSettingsModel.getDunCurrentCount() + mSettingsModel.getDunResumeCount();
-                        // 保证盾值在[0，DunTotalCount]之内其他值一律重置为 DunTotalCount。
+                        // 设置盾值在[0，DunTotalCount]之内其他值一律重置为 DunTotalCount。
                         newDunCount = (newDunCount > mSettingsModel.getDunTotalCount()) ?mSettingsModel.getDunTotalCount(): newDunCount;
                         mSettingsModel.setDunCurrentCount(newDunCount);
+                        LogUtils.d(TAG, String.format("设置防御值为%d", newDunCount));
                         saveDun();
                         SettingsActivity.notifyDunInfoUpdate();
                     }
@@ -76,6 +79,7 @@ public class Rules {
     }
 
     public void saveRules() {
+        LogUtils.d(TAG, String.format("saveRules()"));
         PhoneConnectRuleModel.saveBeanList(mContext, _PhoneConnectRuleModelList, PhoneConnectRuleModel.class);
     }
 
@@ -88,14 +92,14 @@ public class Rules {
     }
 
     public void saveDun() {
-        LogUtils.d(TAG, String.format("saveDun() isEnableDun : %s", mSettingsModel.isEnableDun()));
+        LogUtils.d(TAG, String.format("saveDun()"));
         SettingsModel.saveBean(mContext, mSettingsModel);
     }
 
     public boolean isAllowed(String phoneNumber) {
         // 没有启用云盾，默认允许接通任何电话
         if (!mSettingsModel.isEnableDun()) {
-            LogUtils.d(TAG, "没有启用云盾，默认允许接通任何电话");
+            LogUtils.d(TAG, String.format("没有启用云盾，默认允许接通任何电话。isAllowed(...) return true"));
             return true;
         }
 
@@ -110,13 +114,15 @@ public class Rules {
             LogUtils.d(TAG, "盾层为1以下，防御解除");
             isDefend = true;
             isConnect = true;
+            LogUtils.d(TAG, String.format("isDefend == %s\nisConnect == %s", isDefend, isConnect));
         }
 
         // 正则运算预防针
         if (!isDefend && !RegexPPiUtils.isPPiOK(phoneNumber)) {
-            LogUtils.d(TAG, "RegexPPiUtils.isPPiOK return false.");
+            LogUtils.d(TAG, "正则运算预防针生效。");
             isDefend = true;
             isConnect = false;
+            LogUtils.d(TAG, String.format("isDefend == %s\nisConnect == %s", isDefend, isConnect));
         }
 
         // 检验拨不通号码群
@@ -124,6 +130,7 @@ public class Rules {
             LogUtils.d(TAG, String.format("PhoneNumber %s\n Is In BoBullToon", phoneNumber));
             isDefend = true;
             isConnect = false;
+            LogUtils.d(TAG, String.format("isDefend == %s\nisConnect == %s", isDefend, isConnect));
         }
 
         // 正则匹配规则名单校验
@@ -132,9 +139,10 @@ public class Rules {
                 if (_PhoneConnectRuleModelList.get(i).isEnable()) {
                     String regex = _PhoneConnectRuleModelList.get(i).getRuleText();
                     if (Pattern.matches(regex, phoneNumber)) {
-                        LogUtils.d(TAG, String.format("phoneNumber :%s \nisAllowConnection %s By Rule : %s", phoneNumber, _PhoneConnectRuleModelList.get(i).isAllowConnection(), _PhoneConnectRuleModelList.get(i)));
+                        LogUtils.d(TAG, String.format("Phone Number [%s] is matched by rule : %s", phoneNumber, _PhoneConnectRuleModelList.get(i)));
                         isDefend = true;
                         isConnect = _PhoneConnectRuleModelList.get(i).isAllowConnection();
+                        LogUtils.d(TAG, String.format("isDefend == %s\nisConnect == %s", isDefend, isConnect));
                         break;
                     }
                 }
@@ -144,6 +152,7 @@ public class Rules {
         if (isConnect) {
             // 如果防御结果为连接，则恢复防御盾牌最大值层数
             mSettingsModel.setDunCurrentCount(mSettingsModel.getDunTotalCount());
+            LogUtils.d(TAG, String.format("防御结果为连接，恢复防御盾牌最大值层数 %d", mSettingsModel.getDunTotalCount()));
             saveDun();
             SettingsActivity.notifyDunInfoUpdate();
         } else if (isDefend) {
@@ -152,12 +161,15 @@ public class Rules {
             // 每校验一次规则，云盾防御层数减1
             // 当云盾防御层数为0时，再次进行以下程序段则恢复满值防御。
             int newDunCount = mSettingsModel.getDunCurrentCount() - 1;
+            LogUtils.d(TAG, String.format("新的防御层数预计为 %d", newDunCount));
 
             // 保证盾值在[0，DunTotalCount]之内其他值一律重置为 DunTotalCount。
             if (newDunCount < 0 || newDunCount > mSettingsModel.getDunTotalCount()) {
                 mSettingsModel.setDunCurrentCount(mSettingsModel.getDunTotalCount());
+                LogUtils.d(TAG, String.format("盾值不在[0，%d]区间，恢复防御最大值%d", mSettingsModel.getDunTotalCount(), mSettingsModel.getDunTotalCount()));
             } else {
                 mSettingsModel.setDunCurrentCount(newDunCount);
+                LogUtils.d(TAG, String.format("设置防御层数为 %d", newDunCount));
             }
 
             saveDun();
@@ -165,6 +177,7 @@ public class Rules {
         }
 
         // 返回校验结果
+        LogUtils.d(TAG, String.format("返回校验结果 isConnect == %s", isConnect));
         return isConnect;
     }
 

contacts/src/main/java/cc/winboll/studio/contacts/fragments/CallLogFragment.java

@@ -65,7 +65,7 @@ public class CallLogFragment extends Fragment {
         super.onViewCreated(view, savedInstanceState);
         recyclerView = view.findViewById(R.id.recyclerView);
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
-        callLogAdapter = new CallLogAdapter(callLogList);
+        callLogAdapter = new CallLogAdapter(getContext(), callLogList);
         recyclerView.setAdapter(callLogAdapter);
 
         if (ActivityCompat.checkSelfPermission(requireContext(), Manifest.permission.READ_CALL_LOG)!= PackageManager.PERMISSION_GRANTED) {

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

@@ -20,6 +20,7 @@ import android.os.Binder;
 import android.os.IBinder;
 import cc.winboll.studio.contacts.beans.MainServiceBean;
 import cc.winboll.studio.contacts.beans.RingTongBean;
+import cc.winboll.studio.contacts.bobulltoon.TomCat;
 import cc.winboll.studio.contacts.dun.Rules;
 import cc.winboll.studio.contacts.handlers.MainServiceHandler;
 import cc.winboll.studio.contacts.listenphonecall.CallListenerService;
@@ -27,11 +28,12 @@ import cc.winboll.studio.contacts.receivers.MainReceiver;
 import cc.winboll.studio.contacts.services.MainService;
 import cc.winboll.studio.contacts.threads.MainServiceThread;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.SOS;
-import cc.winboll.studio.libappbase.bean.APPSOSBean;
+import cc.winboll.studio.libappbase.sos.SOS;
 import java.util.Timer;
 import java.util.TimerTask;
-import cc.winboll.studio.contacts.bobulltoon.TomCat;
+import cc.winboll.studio.libappbase.sos.WinBoll;
+import cc.winboll.studio.contacts.App;
+import cc.winboll.studio.libappbase.sos.APPModel;
 
 public class MainService extends Service {
 
@@ -128,7 +130,11 @@ public class MainService extends Service {
             // 唤醒守护进程
             wakeupAndBindAssistant();
             // 召唤 WinBoll APP 绑定本服务
-            SOS.bindToAPPService(this, new APPSOSBean(getPackageName(), MainService.class.getName()));
+            if (App.isDebuging()) {
+                WinBoll.bindToAPPBaseBeta(this, MainService.class.getName());
+            } else {
+                WinBoll.bindToAPPBase(this, MainService.class.getName());
+            }
 
             // 初始化服务运行参数
             _TomCat = TomCat.getInstance(this);
@@ -234,7 +240,11 @@ public class MainService extends Service {
             if (mMainServiceBean.isEnable()) {
                 // 唤醒守护进程
                 wakeupAndBindAssistant();
-                SOS.sosWinBollService(getApplicationContext(), new APPSOSBean(getPackageName(), MainService.class.getName()));
+                if (App.isDebuging()) {
+                    SOS.sosToAppBase(getApplicationContext(), MainService.class.getName());
+                } else {
+                    SOS.sosToAppBaseBeta(getApplicationContext(), MainService.class.getName());
+                }
             }
             isBound = false;
             mAssistantService = null;
@@ -296,7 +306,7 @@ public class MainService extends Service {
             LogUtils.d(TAG, "已重启 MainService");
         }
     }
-    
+
     public static void stopMainServiceAndSaveStatus(Context context) {
         LogUtils.d(TAG, "stopMainServiceAndSaveStatus");
         MainServiceBean bean = new MainServiceBean();

contacts/src/main/java/cc/winboll/studio/contacts/threads/MainServiceThread.java

@@ -6,11 +6,7 @@ package cc.winboll.studio.contacts.threads;
  */
 import android.content.Context;
 import cc.winboll.studio.contacts.handlers.MainServiceHandler;
-import cc.winboll.studio.contacts.services.MainService;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.SOS;
-import cc.winboll.studio.libappbase.bean.APPSOSBean;
-import com.hjq.toast.ToastUtils;
 import java.lang.ref.WeakReference;
 
 public class MainServiceThread extends Thread {

contacts/src/main/java/cc/winboll/studio/contacts/utils/ContactUtils.java

@@ -0,0 +1,93 @@
+package cc.winboll.studio.contacts.utils;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.Cursor;
+import android.provider.ContactsContract;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/06 21:08:16
+ * @Describe ContactUtils
+ */
+public class ContactUtils {
+
+    public static final String TAG = "ContactUtils";
+
+    Map<String, String> contactMap = new HashMap<>();
+
+    static volatile ContactUtils _ContactUtils;
+    Context mContext;
+    ContactUtils(Context context) {
+        mContext = context;
+        relaodContacts();
+    }
+    public synchronized static ContactUtils getInstance(Context context) {
+        if (_ContactUtils == null) {
+            _ContactUtils = new ContactUtils(context);
+        }
+        return _ContactUtils;
+    }
+
+    public void relaodContacts() {
+        readContacts();
+    }
+
+    private void readContacts() {
+        contactMap.clear();
+        ContentResolver contentResolver = mContext.getContentResolver();
+        Cursor cursor = contentResolver.query(ContactsContract.CommonDataKinds.Phone.CONTENT_URI,
+                                              null, null, null, null);
+        if (cursor != null) {
+            while (cursor.moveToNext()) {
+                String displayName = cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME));
+                String phoneNumber = cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.NUMBER));
+                //Map<String, String> contactMap = new HashMap<>();
+                contactMap.put(formatToSimplePhoneNumber(phoneNumber), displayName);
+            }
+            cursor.close();
+        }
+        // 此时 contactList 就是存储联系人信息的 Map 列表
+    }
+
+    public String getContactsName(String phone) {
+        String result = contactMap.get(formatToSimplePhoneNumber(phone));
+        return result == null ? "[NoInContacts]" : result;
+    }
+
+//    static String getSimplePhone(String phone) {
+//        return phone.replaceAll("[+\\s]", "");
+//    }
+    
+    public static String formatToSimplePhoneNumber(String number) {
+        // 去除所有空格和非数字字符
+        return number.replaceAll("[^0-9]", "");
+    }
+    
+    public static String getDisplayNameByPhone(Context context, String phoneNumber) {
+        String displayName = null;
+        ContentResolver resolver = context.getContentResolver();
+        String[] projection = {ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME};
+        Cursor cursor = resolver.query(ContactsContract.CommonDataKinds.Phone.CONTENT_URI, projection, ContactsContract.CommonDataKinds.Phone.NUMBER + "=?", new String[]{formatToSimplePhoneNumber(phoneNumber)}, null);
+        if (cursor!= null && cursor.moveToFirst()) {
+            displayName = cursor.getString(cursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.DISPLAY_NAME));
+            cursor.close();
+        }
+        return displayName;
+    }
+    
+    public static String formatToSpacePhoneNumber(String simpleNumber) {
+        // 去除所有空格和非数字字符
+        StringBuilder sbSpaceNumber = new StringBuilder();
+        String regex = "^1[0-9]{10}$"; 
+        if(simpleNumber.matches(regex)) {
+            sbSpaceNumber.append(simpleNumber.substring(0,2));
+            sbSpaceNumber.append(" ");
+            sbSpaceNumber.append(simpleNumber.substring(3,6));
+            sbSpaceNumber.append(" ");
+            sbSpaceNumber.append(simpleNumber.substring(7,10));
+        }
+        return sbSpaceNumber.toString();
+    }
+}

contacts/src/main/java/cc/winboll/studio/contacts/views/LeftScrollView.java

@@ -0,0 +1,220 @@
+package cc.winboll.studio.contacts.views;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/04 10:51:50
+ * @Describe CustomHorizontalScrollView
+ */
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.Button;
+import android.widget.HorizontalScrollView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import cc.winboll.studio.contacts.R;
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class LeftScrollView extends HorizontalScrollView {
+
+    public static final String TAG = "LeftScrollView";
+
+    private LinearLayout contentLayout;
+    private LinearLayout toolLayout;
+    private TextView textView;
+    private Button editButton;
+    private Button deleteButton;
+    private Button upButton;
+    private Button downButton;
+    private float mStartX;
+    private float mEndX;
+    private boolean isScrolling = false;
+    private int nScrollAcceptSize;
+
+    public LeftScrollView(Context context) {
+        super(context);
+        init();
+    }
+
+    public LeftScrollView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public LeftScrollView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    public void addContentLayout(TextView textView) {
+        contentLayout.addView(textView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
+    }
+
+    public void setContentWidth(int contentWidth) {
+        LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) contentLayout.getLayoutParams();
+        layoutParams.width = contentWidth;
+        contentLayout.setLayoutParams(layoutParams);
+
+    }
+
+    private void init() {
+        View viewMain = inflate(getContext(), R.layout.view_left_scroll, null);
+
+        // 创建内容布局
+        contentLayout = viewMain.findViewById(R.id.content_layout);
+        toolLayout = viewMain.findViewById(R.id.action_layout);
+
+        //LogUtils.d(TAG, String.format("getWidth() %d", getWidth()));
+
+        addView(viewMain);
+
+        // 创建编辑按钮
+        editButton = viewMain.findViewById(R.id.edit_btn);
+        // 创建删除按钮
+        deleteButton = viewMain.findViewById(R.id.delete_btn);
+        // 向上按钮
+        upButton = viewMain.findViewById(R.id.up_btn);
+        // 向下按钮
+        downButton = viewMain.findViewById(R.id.down_btn);
+
+        // 编辑按钮点击事件
+        editButton.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (onActionListener != null) {
+                        onActionListener.onEdit();
+                    }
+                }
+            });
+
+        // 删除按钮点击事件
+        deleteButton.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (onActionListener != null) {
+                        onActionListener.onDelete();
+                    }
+                }
+            });
+        // 编辑按钮点击事件
+        upButton.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (onActionListener != null) {
+                        onActionListener.onUp();
+                    }
+                }
+            });
+
+        // 删除按钮点击事件
+        downButton.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (onActionListener != null) {
+                        onActionListener.onDown();
+                    }
+                }
+            });
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                LogUtils.d(TAG, "ACTION_DOWN");
+                mStartX = event.getX();
+//                isScrolling = false;
+                break;
+            case MotionEvent.ACTION_MOVE:
+                //LogUtils.d(TAG, "ACTION_MOVE");
+//                float currentX = event.getX();
+//                float deltaX = mStartX - currentX;
+//                //mLastX = currentX;
+//                if (Math.abs(deltaX) > 0) {
+//                    isScrolling = true;
+//                }
+                break;
+            case MotionEvent.ACTION_UP:
+            case MotionEvent.ACTION_CANCEL:
+                if (getScrollX() > 0) {
+                    LogUtils.d(TAG, "ACTION_UP");
+                    mEndX = event.getX();
+                    LogUtils.d(TAG, String.format("mStartX %f, mEndX %f", mStartX, mEndX));
+                    if (mEndX < mStartX) {
+                        LogUtils.d(TAG, String.format("mEndX >= mStartX \ngetScrollX() %d", getScrollX()));
+                        //if (getScrollX() > editButton.getWidth()) {
+                        if (Math.abs(mStartX - mEndX) > editButton.getWidth()) {
+                            smoothScrollToRight();
+                        } else {
+                            smoothScrollToLeft();
+                        }
+                    } else {
+                        LogUtils.d(TAG, String.format("mEndX >= mStartX \ngetScrollX() %d", getScrollX()));
+                        //if (getScrollX() > deleteButton.getWidth()) {
+                        if (Math.abs(mEndX - mStartX) > deleteButton.getWidth()) {
+                            smoothScrollToLeft();
+                        } else {
+                            smoothScrollToRight();
+                        }
+                    }
+                }
+                break;
+        }
+        return super.onTouchEvent(event);
+    }
+
+    void smoothScrollToRight() {
+        mEndX = 0;
+        mStartX = 0;
+        View childView = getChildAt(0);
+        if (childView != null) {
+            // 计算需要滑动到最右边的距离
+            int scrollToX = childView.getWidth() - getWidth();
+            // 确保滑动距离不小于0
+            final int scrollToX2 = Math.max(0, scrollToX);
+            // 平滑滑动到最右边
+            post(new Runnable() {
+                    @Override
+                    public void run() {
+                        smoothScrollTo(scrollToX2, 0);
+                        LogUtils.d(TAG, "smoothScrollTo(0, 0);");
+                    }
+                });
+            LogUtils.d(TAG, "smoothScrollTo(scrollToX, 0);");
+        }
+    }
+
+    void smoothScrollToLeft() {
+        mEndX = 0;
+        mStartX = 0;
+        // 在手指抬起时，使用 post 方法调用 smoothScrollTo(0, 0)
+        post(new Runnable() {
+                @Override
+                public void run() {
+                    smoothScrollTo(0, 0);
+                    LogUtils.d(TAG, "smoothScrollTo(0, 0);");
+                }
+            });
+    }
+
+    // 设置文本内容
+    public void setText(CharSequence text) {
+        textView.setText(text);
+    }
+
+    // 定义回调接口
+    public interface OnActionListener {
+        void onEdit();
+        void onDelete();
+        void onUp();
+        void onDown();
+    }
+
+    private OnActionListener onActionListener;
+
+    public void setOnActionListener(OnActionListener listener) {
+        this.onActionListener = listener;
+    }
+}
+

contacts/src/main/res/drawable/ic_call.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.62,10.79C8.06,13.62 10.38,15.94 13.21,17.38L15.41,15.18C15.69,14.9 16.08,14.82 16.43,14.93C17.55,15.3 18.75,15.5 20,15.5A1,1 0,0 1,21 16.5V20A1,1 0,0 1,20 21A17,17 0,0 1,3 4A1,1 0,0 1,4 3H7.5A1,1 0,0 1,8.5 4C8.5,5.25 8.7,6.45 9.07,7.57C9.18,7.92 9.1,8.31 8.82,8.59L6.62,10.79Z"/>
+
+</vector>

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

@@ -12,16 +12,26 @@
 		android:layout_height="wrap_content"
 		android:id="@+id/activitymainToolbar1"/>
 
-	<androidx.viewpager.widget.ViewPager
+	<LinearLayout
+		android:orientation="vertical"
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:layout_weight="1.0"
-		android:id="@+id/viewPager"/>
+		android:padding="10dp"
+		android:layout_weight="1.0">
+
+		<androidx.viewpager.widget.ViewPager
+			android:layout_width="match_parent"
+			android:layout_height="0dp"
+            android:layout_weight="1.0"
+			android:id="@+id/viewPager"/>
+
+        <com.google.android.material.tabs.TabLayout
+            android:layout_width="match_parent"
+            android:layout_height="60dp"
+            android:id="@+id/tabLayout"/>
+        
+	</LinearLayout>
 
-	<com.google.android.material.tabs.TabLayout
-		android:layout_width="match_parent"
-		android:layout_height="60dp"
-		android:id="@+id/tabLayout"/>
 
 </LinearLayout>
 

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

@@ -1,271 +1,290 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<ScrollView
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
-	android:orientation="vertical"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<androidx.appcompat.widget.Toolbar
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:id="@+id/activitymainToolbar1"/>
-
 	<LinearLayout
 		android:orientation="vertical"
 		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_weight="1.0">
+		android:layout_height="wrap_content">
 
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="服务设置："/>
-
-		<LinearLayout
-			android:orientation="horizontal"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content">
-
-			<Switch
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:text="主要服务"
-				android:id="@+id/sw_mainservice"
-				android:layout_margin="5dp"/>
-
-		</LinearLayout>
-
-		<LinearLayout
-			android:orientation="horizontal"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content">
-
-			<TextView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="云盾设置："/>
-
-			<cc.winboll.studio.contacts.views.DuInfoTextView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:id="@+id/tv_DunInfo"/>
-
-		</LinearLayout>
-
-		<LinearLayout
-			android:orientation="horizontal"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content">
-
-			<Switch
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:text="是否启用云盾"
-				android:layout_margin="5dp"
-				android:id="@+id/sw_IsEnableDun"
-				android:onClick="onSW_IsEnableDun"/>
-
-		</LinearLayout>
-
-		<LinearLayout
-			android:orientation="horizontal"
+		<androidx.appcompat.widget.Toolbar
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:gravity="center_vertical">
-
-			<TextView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="初始防御层数量："/>
-
-			<EditText
-				android:layout_width="0dp"
-				android:inputType="number"
-				android:layout_height="wrap_content"
-				android:ems="10"
-				android:layout_weight="1.0"
-				android:id="@+id/et_DunTotalCount"/>
-
-		</LinearLayout>
-
-		<LinearLayout
-			android:orientation="horizontal"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:gravity="center_vertical">
-
-			<TextView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="恢复防御时间间隔(秒钟)："/>
-
-			<EditText
-				android:layout_width="0dp"
-				android:inputType="number"
-				android:layout_height="wrap_content"
-				android:ems="10"
-				android:layout_weight="1.0"
-				android:id="@+id/et_DunResumeSecondCount"/>
-
-		</LinearLayout>
-
-		<LinearLayout
-			android:orientation="horizontal"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:gravity="center_vertical">
-
-			<TextView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="每小时回复防御数量："/>
-
-			<EditText
-				android:layout_width="0dp"
-				android:inputType="number"
-				android:layout_height="wrap_content"
-				android:ems="10"
-				android:layout_weight="1.0"
-				android:id="@+id/et_DunResumeCount"/>
-
-		</LinearLayout>
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="应用权限设置："/>
-
-		<LinearLayout
-			android:orientation="horizontal"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:gravity="right">
-
-			<Button
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="悬浮窗设置"
-				android:id="@+id/activitysettingsButton2"
-				android:onClick="onCanDrawOverlays"/>
-
-			<Button
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="默认拨号设置"
-				android:id="@+id/activitysettingsButton1"
-				android:onClick="onDefaultPhone"/>
-
-		</LinearLayout>
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="音量设置："/>
-
-		<LinearLayout
-			android:orientation="horizontal"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:gravity="center_vertical">
-
-			<TextView
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:layout_marginLeft="10dp"
-				android:id="@+id/tv_volume"/>
-
-			<SeekBar
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_margin="10dp"
-				android:max="100"
-				android:id="@+id/bellvolume"/>
-
-		</LinearLayout>
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="拨不通电话记录查询："/>
+			android:id="@+id/activitymainToolbar1"/>
 
 		<LinearLayout
 			android:orientation="vertical"
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:gravity="right"
-			android:layout_margin="10dp">
-
-			<Button
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="下载 BoBullToon"
-				android:onClick="onDownloadBoBullToon"/>
-
-		</LinearLayout>
-
-		<LinearLayout
-			android:orientation="horizontal"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:gravity="right|center_vertical"
-			android:layout_margin="10dp">
+			android:layout_height="0dp"
+			android:layout_weight="1.0">
 
 			<TextView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="查询电话："/>
+				android:text="服务设置："/>
 
-			<EditText
-				android:layout_width="0dp"
-				android:inputType="phone"
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content">
+
+				<Switch
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:text="主要服务"
+					android:id="@+id/sw_mainservice"
+					android:layout_margin="5dp"/>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content">
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="云盾设置："/>
+
+				<cc.winboll.studio.contacts.views.DuInfoTextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:id="@+id/tv_DunInfo"/>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content">
+
+				<Switch
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:text="是否启用云盾防御"
+					android:layout_margin="5dp"
+					android:id="@+id/sw_IsEnableDun"
+					android:onClick="onSW_IsEnableDun"/>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:ems="10"
-				android:layout_weight="1.0"
-				android:id="@+id/activitysettingsEditText1"/>
+				android:gravity="center_vertical">
 
-			<Button
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="初始防御层的叠加数量："/>
+
+				<EditText
+					android:layout_width="0dp"
+					android:inputType="number"
+					android:layout_height="wrap_content"
+					android:ems="10"
+					android:layout_weight="1.0"
+					android:id="@+id/et_DunTotalCount"/>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="center_vertical">
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="防御层每次恢复的时间间隔(秒钟)："/>
+
+				<EditText
+					android:layout_width="0dp"
+					android:inputType="number"
+					android:layout_height="wrap_content"
+					android:ems="10"
+					android:layout_weight="1.0"
+					android:id="@+id/et_DunResumeSecondCount"/>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="center_vertical">
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="防御层每次恢复的叠加数量："/>
+
+				<EditText
+					android:layout_width="0dp"
+					android:inputType="number"
+					android:layout_height="wrap_content"
+					android:ems="10"
+					android:layout_weight="1.0"
+					android:id="@+id/et_DunResumeCount"/>
+
+			</LinearLayout>
+
+			<TextView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="查询记录"
-				android:onClick="onSearchBoBullToonPhone"/>
+				android:text="应用权限设置："/>
 
-		</LinearLayout>
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="right">
 
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="Phone Connect Rule :"/>
+				<Button
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="悬浮窗设置"
+					android:id="@+id/activitysettingsButton2"
+					android:onClick="onCanDrawOverlays"/>
 
-		<androidx.recyclerview.widget.RecyclerView
-			android:id="@+id/recycler_view"
-			android:layout_width="match_parent"
-			android:layout_height="0dp"
-			android:layout_weight="1.0"
-			android:background="@drawable/recycler_view_border"
-			android:layout_margin="5dp"/>
+				<Button
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="默认拨号设置"
+					android:id="@+id/activitysettingsButton1"
+					android:onClick="onDefaultPhone"/>
 
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="单元测试："/>
+			</LinearLayout>
 
-		<LinearLayout
-			android:orientation="horizontal"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:gravity="right">
-
-			<Button
+			<TextView
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="Unit Test"
-				android:onClick="onUnitTest"/>
+				android:text="音量设置："/>
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="center_vertical">
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_marginLeft="10dp"
+					android:id="@+id/tv_volume"/>
+
+				<SeekBar
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_margin="10dp"
+					android:max="100"
+					android:id="@+id/bellvolume"/>
+
+			</LinearLayout>
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="拨不通电话记录查询："/>
+
+			<LinearLayout
+				android:orientation="vertical"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="right"
+				android:layout_margin="10dp">
+
+				<Button
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="下载 BoBullToon"
+					android:onClick="onDownloadBoBullToon"/>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="right|center_vertical"
+				android:layout_margin="10dp">
+
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="查询电话："/>
+
+				<EditText
+					android:layout_width="0dp"
+					android:inputType="phone"
+					android:layout_height="wrap_content"
+					android:ems="10"
+					android:layout_weight="1.0"
+					android:id="@+id/activitysettingsEditText1"/>
+
+				<Button
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="查询记录"
+					android:onClick="onSearchBoBullToonPhone"/>
+
+			</LinearLayout>
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content">
+
+				<TextView
+					android:layout_width="0dp"
+					android:layout_height="wrap_content"
+					android:text="Phone Connect Rule :"
+					android:layout_weight="1.0"/>
+
+				<Button
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="添加新规则"
+					android:onClick="onAddNewConnectionRule"/>
+
+			</LinearLayout>
+
+			<androidx.recyclerview.widget.RecyclerView
+				android:id="@+id/recycler_view"
+				android:layout_width="match_parent"
+				android:layout_height="300dp"
+				android:background="@drawable/recycler_view_border"
+				android:layout_margin="5dp"/>
+
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="单元测试："/>
+
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:gravity="right">
+
+				<Button
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="Unit Test"
+					android:onClick="onUnitTest"/>
+
+			</LinearLayout>
 
 		</LinearLayout>
 
 	</LinearLayout>
 
-</LinearLayout>
+</ScrollView>
 

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

@@ -6,9 +6,11 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<HorizontalScrollView
+	<LinearLayout
+		android:orientation="horizontal"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content">
+		android:layout_height="wrap_content"
+		android:gravity="right">
 
 		<Button
 			android:layout_width="wrap_content"
@@ -16,7 +18,34 @@
 			android:text="Test Main"
 			android:onClick="onTestMain"/>
 
-	</HorizontalScrollView>
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:gravity="center_vertical">
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="测试号码："/>
+
+		<EditText
+			android:layout_width="0dp"
+			android:inputType="phone"
+			android:layout_height="wrap_content"
+			android:ems="10"
+			android:layout_weight="1.0"
+			android:id="@+id/phone_et"/>
+
+		<Button
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Test Phone"
+			android:onClick="onTestPhone"/>
+
+	</LinearLayout>
 
 	<cc.winboll.studio.libappbase.LogView
 		android:layout_width="match_parent"

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

@@ -1,39 +1,78 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-    android:padding="16dp">
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content">
 
-    <TextView
-        android:id="@+id/phone_number"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="16sp"
-        android:textStyle="bold" />
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
 
-    <TextView
-        android:id="@+id/call_status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="14sp"
-        android:layout_marginTop="4dp" />
+		<TextView
+			android:id="@+id/phone_number"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:textSize="18sp"
+			android:textStyle="bold"/>
 
-    <TextView
-        android:id="@+id/call_date"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="14sp"
-        android:layout_marginTop="4dp" />
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:id="@+id/call_status"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textSize="14sp"/>
+
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
+			android:id="@+id/call_date"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textSize="14sp"/>
+
+	</LinearLayout>
+
+	<RelativeLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:padding="10dp">
+
+		<View
+			android:layout_width="20dp"
+			android:layout_height="20dp"
+			android:background="#FFE7E7E7"
+			android:id="@+id/itemcalllogView1"
+			android:layout_alignParentLeft="true"/>
+
+		<cc.winboll.studio.libaes.views.AOHPCTCSeekBar
+			android:layout_toRightOf="@id/itemcalllogView1"
+			android:layout_toLeftOf="@id/itemcalllogView2"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:id="@+id/aohpctcseekbar_dial"/>
+
+		<View
+			android:layout_width="20dp"
+			android:layout_height="20dp"
+			android:background="#FFE7E7E7"
+			android:id="@+id/itemcalllogView2"
+			android:layout_alignParentRight="true"/>
+
+	</RelativeLayout>
 
-    <Button
-        android:id="@+id/dial_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Dial"
-        android:layout_marginTop="8dp"/>
-    
 </LinearLayout>
 

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

@@ -1,31 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="16dp">
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/contact_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="16sp"
-        android:textStyle="bold"/>
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content">
 
-    <TextView
-        android:id="@+id/contact_number"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="14sp"
-        android:layout_marginTop="4dp"/>
+		<TextView
+			android:id="@+id/contact_number"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textSize="18sp"
+			android:textStyle="bold"/>
 
-    <Button
-        android:id="@+id/dial_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Dial"
-        android:layout_marginTop="8dp"/>
+		<TextView
+			android:id="@+id/contact_number"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textSize="18sp"
+			android:text="☎"
+			android:textStyle="bold"/>
+
+		<TextView
+			android:id="@+id/contact_name"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textSize="18sp"
+			android:textStyle="bold"/>
+
+	</LinearLayout>
+
+	<RelativeLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:padding="10dp">
+
+		<View
+			android:layout_width="20dp"
+			android:layout_height="20dp"
+			android:background="#FFE7E7E7"
+			android:id="@+id/itemcalllogView1"
+			android:layout_alignParentLeft="true"/>
+
+		<cc.winboll.studio.libaes.views.AOHPCTCSeekBar
+			android:layout_toRightOf="@id/itemcalllogView1"
+			android:layout_toLeftOf="@id/itemcalllogView2"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:id="@+id/aohpctcseekbar_dial"/>
+
+		<View
+			android:layout_width="20dp"
+			android:layout_height="20dp"
+			android:background="#FFE7E7E7"
+			android:id="@+id/itemcalllogView2"
+			android:layout_alignParentRight="true"/>
+
+	</RelativeLayout>
 
 </LinearLayout>
 

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

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <!-- 内容区域 -->
+    <LinearLayout
+        android:id="@+id/content_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        android:background="@color/white">
+        <!-- 这里放置你的列表项内容 -->
+    </LinearLayout>
+
+    <!-- 操作按钮 -->
+    <LinearLayout
+        android:id="@+id/action_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:background="@color/lightgray">
+
+        <Button
+            android:id="@+id/edit_btn"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:text="编辑"
+            android:background="@color/blue" />
+        <Button
+            android:id="@+id/up_btn"
+            android:layout_width="40dp"
+            android:layout_height="wrap_content"
+            android:text="△"
+            android:background="@color/green" />
+        <Button
+            android:id="@+id/down_btn"
+            android:layout_width="40dp"
+            android:layout_height="wrap_content"
+            android:text="▽"
+            android:background="@color/green" />
+        <Button
+            android:id="@+id/delete_btn"
+            android:layout_width="80dp"
+            android:layout_height="wrap_content"
+            android:text="删除"
+            android:background="@color/red" />
+    </LinearLayout>
+</LinearLayout>

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

@@ -2,24 +2,15 @@
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
-	android:orientation="horizontal"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:padding="16dp"
-	android:gravity="center_vertical">
+	android:orientation="horizontal"
+	android:padding="2dp">
 
-	<TextView
-		android:id="@+id/text_view"
-		android:layout_width="0dp"
+	<cc.winboll.studio.contacts.views.LeftScrollView
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:layout_weight="1"
-		android:textSize="16sp"/>
-
-	<Button
-		android:id="@+id/button"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="编辑"/>
+		android:id="@+id/scrollView"/>
 
 </LinearLayout>
 

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

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<HorizontalScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:scrollbars="none"
+    android:id="@+id/scrollView">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <!-- 内容区域 -->
+        <LinearLayout
+            android:id="@+id/content_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="16dp"
+            android:background="@color/white">
+            <!-- 这里放置你的列表项内容 -->
+
+            <TextView
+                android:id="@+id/text_view"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:textSize="16sp"/>
+        </LinearLayout>
+
+        <!-- 操作按钮 -->
+        <LinearLayout
+            android:id="@+id/action_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:orientation="horizontal"
+            android:background="@color/lightgray">
+
+            <Button
+                android:id="@+id/edit_btn"
+                android:layout_width="80dp"
+                android:layout_height="match_parent"
+                android:text="编辑"
+                android:background="@color/blue" />
+
+            <Button
+                android:id="@+id/delete_btn"
+                android:layout_width="80dp"
+                android:layout_height="match_parent"
+                android:text="删除"
+                android:background="@color/red" />
+        </LinearLayout>
+    </LinearLayout>
+</HorizontalScrollView>

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

@@ -4,4 +4,10 @@
     <color name="colorPrimary">#FF196ABC</color>
     <color name="colorPrimaryDark">#FF002B57</color>
     <color name="colorAccent">#FF80BFFF</color>
+    <color name="blue">#FF379AFF</color>
+    <color name="green">#FF69E551</color>
+    <color name="red">#FFE55151</color>
+    <color name="white">#FFFFFFFF</color>
+    <color name="lightgray">#FFE0E0E0</color>
+    
 </resources>

libappbase/build.gradle

@@ -20,13 +20,27 @@ android {
 }
 
 dependencies {
-    api 'com.github.getActivity:ToastUtils:10.5'
-    
-    api 'androidx.appcompat:appcompat:1.3.1'
-    api 'androidx.vectordrawable:vectordrawable:1.1.0'
-    api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
-    api 'androidx.fragment:fragment:1.1.0'
-    api 'com.google.android.material:material:1.1.0'
-    
     api fileTree(dir: 'libs', include: ['*.jar'])
+    
+    // SSH
+    implementation 'com.jcraft:jsch:0.1.55'
+    // Html 解析
+    implementation 'org.jsoup:jsoup:1.13.1'
+    // 二维码类库
+    implementation 'com.google.zxing:core:3.4.1'
+    implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
+    // 应用介绍页类库
+    implementation 'io.github.medyo:android-about-page:2.0.0'
+    // 吐司类库
+    implementation 'com.github.getActivity:ToastUtils:10.5'
+    // 网络连接类库
+    implementation 'com.squareup.okhttp3:okhttp:4.4.1'
+    
+    // Android 类库
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.viewpager:viewpager:1.0.0'
+    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
+    implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
+    implementation 'androidx.fragment:fragment:1.1.0'
+    implementation 'com.google.android.material:material:1.4.0'
 }

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Tue Feb 25 16:51:09 HKT 2025
-stageCount=3
+#Sun Mar 09 09:15:24 HKT 2025
+stageCount=6
 libraryProject=libappbase
-baseVersion=2.0
-publishVersion=2.0.2
+baseVersion=2.1
+publishVersion=2.1.5
 buildCount=0
-baseBetaVersion=2.0.3
+baseBetaVersion=2.1.6

libappbase/src/main/AndroidManifest.xml

@@ -73,6 +73,18 @@
 
         </receiver>
 
+        <service android:name="cc.winboll.studio.libappbase.sos.SOSCenter"/>
+
+        <receiver android:name="cc.winboll.studio.libappbase.sos.SOSCenterServiceReceiver">
+
+            <intent-filter>
+
+                <action android:name="cc.winboll.studio.libappbase.sos.SOSCenterServiceReceiver"/>
+
+            </intent-filter>
+
+        </receiver>
+
     </application>
 
-</manifest>
+</manifest>

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

@@ -1,24 +0,0 @@
-package cc.winboll.studio.libappbase;
-
-/**
- * @Author ZhanGSKen@QQ.COM
- * @Date 2025/02/04 10:20:16
- * @Describe WinBoll Activity 接口
- */
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.libappbase.bean.APPInfo;
-
-public interface IWinBollActivity {
-
-    public static final String TAG = "IWinBollActivity";
-
-    // 获取当前具有 IWinBoll 特征的 AppCompatActivity 活动窗口
-    AppCompatActivity getActivity();
-
-    abstract public APPInfo getAppInfo();
-    abstract public String getTag();
-    abstract Toolbar initToolBar();
-    abstract boolean isEnableDisplayHomeAsUp();
-    abstract boolean isAddWinBollToolBar();
-}

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

@@ -1,68 +0,0 @@
-package cc.winboll.studio.libappbase;
-
-/**
- * @Author ZhanGSKen@QQ.COM
- * @Date 2024/08/12 15:07:58
- * @Describe WinBoll 应用日志窗口
- */
-import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.bean.APPInfo;
-import cc.winboll.studio.libappbase.R;
-
-public class LogActivity extends AppCompatActivity implements IWinBollActivity {
-
-    public static final String TAG = "LogActivity";
-
-    LogView mLogView;
-
-    @Override
-    public AppCompatActivity getActivity() {
-        return this;
-    }
-
-    @Override
-    public APPInfo getAppInfo() {
-        return null;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    public Toolbar initToolBar() {
-        return null;
-    }
-
-    @Override
-    public boolean isEnableDisplayHomeAsUp() {
-        return false;
-    }
-
-    @Override
-    public boolean isAddWinBollToolBar() {
-        return false;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        LogUtils.d(TAG, "onCreate");
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_log);
-        mLogView = findViewById(R.id.logview);
-
-        if (GlobalApplication.isDebuging()) { mLogView.start(); }
-    }
-
-    @Override
-    protected void onResume() {
-        LogUtils.d(TAG, "onResume");
-        super.onResume();
-        mLogView.start();
-    }
-}

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

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

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

@@ -1,57 +0,0 @@
-package cc.winboll.studio.libappbase;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/02/13 21:09:36
- * @Describe SOS 组件
- */
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.IBinder;
-import cc.winboll.studio.libappbase.bean.APPSOSBean;
-import java.util.ArrayList;
-
-public class SOS {
-
-    public static final String TAG = "SOS";
-    
-    public static final String ACTION_SOS = SOS.class.getName() + ".ACTION_SOS";
-    public static final String ACTION_BIND = SOS.class.getName() + ".ACTION_BIND";
-    public static final String ACTION_SERVICE_ENABLE = SOS.class.getName() + ".ACTION_SERVICE_ENABLE";
-    public static final String ACTION_SERVICE_DISABLE = SOS.class.getName() + ".ACTION_SERVICE_DISENABLE";
-    
-    public static void sosWinBollService(Context context, APPSOSBean bean) {
-        Intent intent = new Intent(ACTION_SOS);
-        intent.putExtra("SOS", "Service");
-        intent.putExtra("APPSOSBean", bean.toString());
-        String szToPackage = "";
-        if (GlobalApplication.isDebuging()) {
-            szToPackage = "cc.winboll.studio.appbase.beta";
-        } else {
-            szToPackage = "cc.winboll.studio.appbase";
-        }
-        intent.setPackage(szToPackage);
-        context.sendBroadcast(intent);
-
-        LogUtils.d(TAG, String.format("Send ACTION_SOS To WinBoll. (szToPackage : %s)", szToPackage));
-        //ToastUtils.show("SOS Send To WinBoll");
-    }
-
-    public static void bindToAPPService(Context context, APPSOSBean bean) {
-        Intent intent = new Intent(ACTION_BIND);
-        intent.putExtra("SOS", "Service");
-        intent.putExtra("APPSOSBean", bean.toString());
-        String szToPackage = "";
-        if (GlobalApplication.isDebuging()) {
-            szToPackage = "cc.winboll.studio.appbase.beta";
-        } else {
-            szToPackage = "cc.winboll.studio.appbase";
-        }
-        intent.setPackage(szToPackage);
-        context.sendBroadcast(intent);
-        LogUtils.d(TAG, String.format("Send ACTION_BIND To WinBoll. (szToPackage : %s)", szToPackage));
-    }
-    
-}

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

@@ -1,32 +0,0 @@
-package cc.winboll.studio.libappbase;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/02/12 23:44:57
- * @Describe 简单信号通信中心接收器
- */
-public class SOSCSBroadcastReceiver extends BroadcastReceiver {
-
-    public static final String TAG = "SOSCSBroadcastReceiver";
-    public static final String ACTION_SOS = SOSCSBroadcastReceiver.class.getName() + ".ACTION_SOS";
-
-    //ISOSAPP mISOSAPP;
-
-    public SOSCSBroadcastReceiver() {
-        //mISOSAPP = iSOSAPP;
-    }
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        String action = intent.getAction();
-        if (action.equals(ACTION_SOS)) {
-            LogUtils.d(TAG, "ACTION_SOS");
-            //mISOSAPP.helpISOSService(intent);
-        } else {
-            LogUtils.d(TAG, String.format("%s", action));
-        }
-    }
-}

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

@@ -0,0 +1,3 @@
+package cc.winboll.studio.libappbase;
+
+

libappbase/src/main/java/cc/winboll/studio/libappbase/bean/APPInfo.java

@@ -1,142 +0,0 @@
-package cc.winboll.studio.libappbase.bean;
-
-/**
- * @Author ZhanGSKen@QQ.COM
- * @Date 2025/01/20 14:19:02
- * @Describe 应用信息类
- */
-import cc.winboll.studio.libappbase.R;
-import java.io.Serializable;
-
-public class APPInfo implements Serializable {
-
-    public static final String TAG = "APPInfo";
-
-    // 应用名称
-    String appName;
-    // 应用图标
-    int appIcon;
-    // 应用描述
-    String appDescription;
-    // 应用Git仓库地址
-    String appGitName;
-    // 应用Git仓库拥有者
-    String appGitOwner;
-    // 应用Git仓库分支
-    String appGitAPPBranch;
-    // 应用Git仓库子项目文件夹
-    String appGitAPPSubProjectFolder;
-    // 应用主页
-    String appHomePage;
-    // 应用包名称
-    String appAPKName;
-    // 应用包存储文件夹名称
-    String appAPKFolderName;
-
-    public APPInfo(String appName, int appIcon, String appDescription, String appGitName, String appGitOwner, String appGitAPPBranch, String appGitAPPSubProjectFolder, String appHomePage, String appAPKName, String appAPKFolderName) {
-        this.appName = appName;
-        this.appIcon = appIcon;
-        this.appDescription = appDescription;
-        this.appGitName = appGitName;
-        this.appGitOwner = appGitOwner;
-        this.appGitAPPBranch = appGitAPPBranch;
-        this.appGitAPPSubProjectFolder = appGitAPPSubProjectFolder;
-        this.appHomePage = appHomePage;
-        this.appAPKName = appAPKName;
-        this.appAPKFolderName = appAPKFolderName;
-    }
-
-    public APPInfo() {
-        this.appName = "WinBoll-APP";
-        this.appIcon = R.drawable.ic_launcher;
-        this.appDescription = "WinBoll APP";
-        this.appGitName = "APP";
-        this.appGitOwner = "Studio";
-        this.appGitAPPBranch = "app";
-        this.appGitAPPSubProjectFolder = "app";
-        this.appHomePage = "https://www.winboll.cc/studio/details.php?app=APP";
-        this.appAPKName = "APP";
-        this.appAPKFolderName = "APP";
-    }
-
-    public void setAppGitOwner(String appGitOwner) {
-        this.appGitOwner = appGitOwner;
-    }
-
-    public String getAppGitOwner() {
-        return appGitOwner;
-    }
-
-    public void setAppGitAPPBranch(String appGitAPPBranch) {
-        this.appGitAPPBranch = appGitAPPBranch;
-    }
-
-    public String getAppGitAPPBranch() {
-        return appGitAPPBranch;
-    }
-
-    public void setAppGitAPPSubProjectFolder(String appGitAPPSubProjectFolder) {
-        this.appGitAPPSubProjectFolder = appGitAPPSubProjectFolder;
-    }
-
-    public String getAppGitAPPSubProjectFolder() {
-        return appGitAPPSubProjectFolder;
-    }
-
-    public void setAppIcon(int appIcon) {
-        this.appIcon = appIcon;
-    }
-
-    public int getAppIcon() {
-        return appIcon;
-    }
-
-    public void setAppDescription(String appDescription) {
-        this.appDescription = appDescription;
-    }
-
-    public String getAppDescription() {
-        return appDescription;
-    }
-
-    public void setAppAPKFolderName(String appAPKFolderName) {
-        this.appAPKFolderName = appAPKFolderName;
-    }
-
-    public String getAppAPKFolderName() {
-        return appAPKFolderName;
-    }
-
-    public void setAppName(String appName) {
-        this.appName = appName;
-    }
-
-    public String getAppName() {
-        return appName;
-    }
-
-    public void setAppGitName(String appGitName) {
-        this.appGitName = appGitName;
-    }
-
-    public String getAppGitName() {
-        return appGitName;
-    }
-
-    public void setAppHomePage(String appHomePage) {
-        this.appHomePage = appHomePage;
-    }
-
-    public String getAppHomePage() {
-        return appHomePage;
-    }
-
-    public void setAppAPKName(String appAPKName) {
-        this.appAPKName = appAPKName;
-    }
-
-    public String getAppAPKName() {
-        return appAPKName;
-    }
-}
-

libappbase/src/main/java/cc/winboll/studio/libappbase/bean/APPSOSBean.java

@@ -1,87 +0,0 @@
-package cc.winboll.studio.libappbase.bean;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/02/17 00:29:29
- * @Describe APPSOSReportBean
- */
-import android.util.JsonReader;
-import android.util.JsonWriter;
-import cc.winboll.studio.libappbase.BaseBean;
-import java.io.IOException;
-import java.io.Serializable;
-
-public class APPSOSBean extends BaseBean {
-
-    public static final String TAG = "APPSOSBean";
-
-    protected String sosPackage;
-    protected String sosClassName;
-
-    public APPSOSBean() {
-        this.sosPackage = "";
-        this.sosClassName = "";
-    }
-
-    public APPSOSBean(String sosPackage, String sosClassName) {
-        this.sosPackage = sosPackage;
-        this.sosClassName = sosClassName;
-    }
-
-    public void setSosPackage(String sosPackage) {
-        this.sosPackage = sosPackage;
-    }
-
-    public String getSosPackage() {
-        return sosPackage;
-    }
-
-    public void setSosClassName(String sosClassName) {
-        this.sosClassName = sosClassName;
-    }
-
-    public String getSosClassName() {
-        return sosClassName;
-    }
-
-    @Override
-    public String getName() {
-        return APPSOSBean.class.getName();
-    }
-
-    @Override
-    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
-        super.writeThisToJsonWriter(jsonWriter);
-        jsonWriter.name("sosPackage").value(getSosPackage());
-        jsonWriter.name("sosClassName").value(getSosClassName());
-
-    }
-
-    @Override
-    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
-        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
-            if (name.equals("sosPackage")) {
-                setSosPackage(jsonReader.nextString());
-            } else if (name.equals("sosClassName")) {
-                setSosClassName(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;
-    }
-}

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

@@ -0,0 +1,86 @@
+package cc.winboll.studio.libappbase.sos;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/02 10:28:08
+ * @Describe APPModel
+ */
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.io.IOException;
+
+public class APPModel extends BaseBean {
+
+    public static final String TAG = "APPModel";
+
+    String appPackageName;
+    String appMainServiveName;
+
+    public APPModel() {
+        this.appPackageName = "";
+        this.appMainServiveName = "";
+    }
+
+    public APPModel(String appPackageName, String appMainServiveName) {
+        this.appPackageName = appPackageName;
+        this.appMainServiveName = appMainServiveName;
+    }
+
+    public void setAppPackageName(String appPackageName) {
+        this.appPackageName = appPackageName;
+    }
+
+    public String getAppPackageName() {
+        return appPackageName;
+    }
+
+    public void setAppMainServiveName(String appMainServiveName) {
+        this.appMainServiveName = appMainServiveName;
+    }
+
+    public String getAppMainServiveName() {
+        return appMainServiveName;
+    }
+
+    @Override
+    public String getName() {
+        return APPModel.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        jsonWriter.name("appPackageName").value(getAppPackageName());
+        jsonWriter.name("appMainServiveName").value(getAppMainServiveName());
+
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
+            if (name.equals("appPackageName")) {
+                setAppPackageName(jsonReader.nextString());
+            } else if (name.equals("appMainServiveName")) {
+                setAppMainServiveName(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;
+    }
+}

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

@@ -0,0 +1,59 @@
+package cc.winboll.studio.libappbase.sos;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/02 09:36:29
+ * @Describe WinBoll 应用 SOS 机理保护类
+ */
+import android.content.Context;
+import android.content.Intent;
+import cc.winboll.studio.libappbase.LogUtils;
+import java.io.IOException;
+
+public class SOS {
+
+    public static final String TAG = "SOS";
+
+    public static final String ACTION_SOS = SOS.class.getName() + ".ACTION_SOS";
+    public static final String EXTRA_OBJECT = "EXTRA_OBJECT";
+
+    public static void sosToAppBase(Context context, String sosService) {
+        LogUtils.d(TAG, "sosToAppBase()");
+        String szToPackage = "cc.winboll.studio.appbase";
+        sos(context, szToPackage, sosService);
+
+    }
+
+    public static void sosToAppBaseBeta(Context context, String sosService) {
+        LogUtils.d(TAG, "sosToAppBaseBeta()");
+        String szToPackage = "cc.winboll.studio.appbase.beta";
+        sos(context, szToPackage, sosService);
+
+    }
+
+    static void sos(Context context, String szToPackage, String sosService) {
+        LogUtils.d(TAG, "sos(...)");
+        Intent intent = new Intent(ACTION_SOS);
+        intent.putExtra(EXTRA_OBJECT, genSOSObject(context.getPackageName(), sosService));
+        intent.setPackage(szToPackage);
+        LogUtils.d(TAG, String.format("ACTION_SOS :\nTo Package : %sSOS Service : %s\n", szToPackage, sosService));
+        context.sendBroadcast(intent);
+    }
+
+    public static SOSObject parseSOSObject(String szSOSObject) {
+        try {
+            return SOSObject.parseStringToBean(szSOSObject, SOSObject.class);
+        } catch (IOException e) {
+            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
+        }
+        return null;
+    }
+
+    public static String sosObjectToString(SOSObject object) {
+        return object.toString();
+    }
+
+    public static String genSOSObject(String objectPackageName, String objectServiveName) {
+        return (new SOSObject(objectPackageName, objectServiveName)).toString();
+    }
+}

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

@@ -1,10 +1,10 @@
-package cc.winboll.studio.libappbase;
-
+package cc.winboll.studio.libappbase.sos;
 
 /**
  * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/02/12 11:12:25
- * @Describe 简单信号服务中心
+ * @Date 2025/02/27 14:00:21
+ * @Describe Simple Operate Signal Service Center.
+ *           简单操作信号服务中心
  */
 import android.app.Service;
 import android.content.Context;
@@ -13,18 +13,19 @@ import android.os.IBinder;
 import android.os.IInterface;
 import android.os.Parcel;
 import android.os.RemoteException;
-import cc.winboll.studio.libappbase.bean.SimpleOperateSignalCenterServiceBean;
 import java.io.FileDescriptor;
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+import cc.winboll.studio.libappbase.LogUtils;
 
-public class SimpleOperateSignalCenterService extends Service {
+public class SOSCenterService extends Service {
 
-    public static final String TAG = "SimpleOperateSignalCenterService";
-    public static final String ACTION_ENABLE = SimpleOperateSignalCenterService.class.getName() + ".ACTION_ENABLE";
-    public static final String ACTION_DISABLE = SimpleOperateSignalCenterService.class.getName() + ".ACTION_DISABLE";
+    public static final String TAG = "SOSCenterService";
     
     private final IBinder binder =(IBinder)new SOSBinder();
-    
-    SimpleOperateSignalCenterServiceBean mSimpleOperateSignalCenterServiceBean;
+
+    SOSCenterServiceModel mSOSCenterServiceModel;
     static MainThread _MainThread;
     public static synchronized MainThread getMainThreadInstance() {
         if (_MainThread == null) {
@@ -37,7 +38,7 @@ public class SimpleOperateSignalCenterService extends Service {
     public IBinder onBind(Intent intent) {
         return binder;
     }
-    
+
     public class SOSBinder implements IBinder {
 
         @Override
@@ -81,21 +82,21 @@ public class SimpleOperateSignalCenterService extends Service {
         public boolean unlinkToDeath(IBinder.DeathRecipient deathRecipient, int p) {
             return false;
         }
-        
+
         public static final String TAG = "SOSBinder";
-        SimpleOperateSignalCenterService getService() {
-            return SimpleOperateSignalCenterService.this;
+        SOSCenterService getService() {
+            return SOSCenterService.this;
         }
     }
-    
+
     @Override
     public void onCreate() {
         super.onCreate();
         LogUtils.d(TAG, "onCreate");
-        mSimpleOperateSignalCenterServiceBean = SimpleOperateSignalCenterServiceBean.loadBean(this, SimpleOperateSignalCenterServiceBean.class);
-        if(mSimpleOperateSignalCenterServiceBean == null) {
-            mSimpleOperateSignalCenterServiceBean = new SimpleOperateSignalCenterServiceBean();
-            SimpleOperateSignalCenterServiceBean.saveBean(this, mSimpleOperateSignalCenterServiceBean);
+        mSOSCenterServiceModel = SOSCenterServiceModel.loadBean(this, SOSCenterServiceModel.class);
+        if(mSOSCenterServiceModel == null) {
+            mSOSCenterServiceModel = new SOSCenterServiceModel();
+            SOSCenterServiceModel.saveBean(this, mSOSCenterServiceModel);
         }
         runMainThread();
     }
@@ -103,21 +104,15 @@ public class SimpleOperateSignalCenterService extends Service {
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         LogUtils.d(TAG, "onStartCommand");
-//        if (intent.getBooleanExtra(ISOSService.EXTRA_ENABLE, false)) {
-//            LogUtils.d(TAG, "onStartCommand enable service");
-//            mSimpleOperateSignalCenterServiceBean.setIsEnable(true);
-//            SimpleOperateSignalCenterServiceBean.saveBean(this, mSimpleOperateSignalCenterServiceBean);
-//        }
 
         runMainThread();
 
-        //return super.onStartCommand(intent, flags, startId);
-        return mSimpleOperateSignalCenterServiceBean.isEnable() ? Service.START_STICKY: super.onStartCommand(intent, flags, startId);
+        return mSOSCenterServiceModel.isEnable() ? Service.START_STICKY: super.onStartCommand(intent, flags, startId);
     }
 
     void runMainThread() {
-        mSimpleOperateSignalCenterServiceBean = SimpleOperateSignalCenterServiceBean.loadBean(this, SimpleOperateSignalCenterServiceBean.class);
-        if (mSimpleOperateSignalCenterServiceBean.isEnable()
+        mSOSCenterServiceModel = mSOSCenterServiceModel.loadBean(this, SOSCenterServiceModel.class);
+        if (mSOSCenterServiceModel.isEnable()
             && _MainThread == null) {
             getMainThreadInstance().start();
         }
@@ -127,9 +122,9 @@ public class SimpleOperateSignalCenterService extends Service {
     public void onDestroy() {
         super.onDestroy();
         LogUtils.d(TAG, "onDestroy");
-        mSimpleOperateSignalCenterServiceBean = SimpleOperateSignalCenterServiceBean.loadBean(this, SimpleOperateSignalCenterServiceBean.class);
-        if (mSimpleOperateSignalCenterServiceBean.isEnable()) {
-            LogUtils.d(TAG, "mSimpleOperateSignalCenterServiceBean.isEnable()");
+        mSOSCenterServiceModel = SOSCenterServiceModel.loadBean(this, SOSCenterServiceModel.class);
+        if (mSOSCenterServiceModel.isEnable()) {
+            LogUtils.d(TAG, "mSOSCenterServiceModel.isEnable()");
 //            ISOSAPP iSOSAPP = (ISOSAPP)getApplication();
 //            iSOSAPP.helpISOSService(getISOSServiceIntentWhichAskForHelp());
         } 
@@ -141,22 +136,22 @@ public class SimpleOperateSignalCenterService extends Service {
 
     public static void stopISOSService(Context context) {
         LogUtils.d(TAG, "stopISOSService");
-        SimpleOperateSignalCenterServiceBean bean = new SimpleOperateSignalCenterServiceBean();
+        SOSCenterServiceModel bean = new SOSCenterServiceModel();
         bean.setIsEnable(false);
-        SimpleOperateSignalCenterServiceBean.saveBean(context, bean);
-        context.stopService(new Intent(context, SimpleOperateSignalCenterService.class));
+        SOSCenterServiceModel.saveBean(context, bean);
+        context.stopService(new Intent(context, SOSCenterServiceModel.class));
     }
 
     public static void startISOSService(Context context) {
         LogUtils.d(TAG, "startISOSService");
-        SimpleOperateSignalCenterServiceBean bean = new SimpleOperateSignalCenterServiceBean();
+        SOSCenterServiceModel bean = new SOSCenterServiceModel();
         bean.setIsEnable(true);
-        SimpleOperateSignalCenterServiceBean.saveBean(context, bean);
-        context.startService(new Intent(context, SimpleOperateSignalCenterService.class));
+        SOSCenterServiceModel.saveBean(context, bean);
+        context.startService(new Intent(context, SOSCenterServiceModel.class));
     }
-    
+
     public String getMessage() {
-        return "Hello from SimpleOperateSignalCenterService";
+        return "Hello from SOSCenterServiceModel";
     }
 
     static class MainThread extends Thread {

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

@@ -0,0 +1,69 @@
+package cc.winboll.studio.libappbase.sos;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/02 09:49:45
+ * @Describe SOSCenterServiceModel
+ *           Simple Operate Signal Service Model.
+ */
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.io.IOException;
+
+public class SOSCenterServiceModel extends BaseBean {
+
+    public static final String TAG = "SOSCenterServiceModel";
+
+    boolean isEnable;
+
+    public SOSCenterServiceModel() {
+        this.isEnable = false;
+    }
+
+    public void setIsEnable(boolean isEnable) {
+        this.isEnable = isEnable;
+    }
+
+    public boolean isEnable() {
+        return isEnable;
+    }
+
+    @Override
+    public String getName() {
+        return SOSCenterServiceModel.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        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("isEnable")) {
+                setIsEnable(jsonReader.nextBoolean());
+            } 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;
+    }
+}

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

@@ -0,0 +1,29 @@
+package cc.winboll.studio.libappbase.sos;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/02/27 14:04:35
+ * @Describe SOSCenterServiceReceiver
+ */
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import cc.winboll.studio.libappbase.LogUtils;
+
+public class SOSCenterServiceReceiver extends BroadcastReceiver {
+
+    public static final String TAG = "SOSCenterServiceReceiver";
+
+    public static final String ACTION_SOS = SOSCenterServiceReceiver.class.getName() + ".ACTION_SOS";
+    
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        String action = intent.getAction();
+        if (action.equals(ACTION_SOS)) {
+            // 处理接收到的广播消息
+            LogUtils.d(TAG, String.format("Action %s \n%s\n%s", action));
+        } else {
+            LogUtils.d(TAG, String.format("%s", action));
+        }
+    }
+}

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

@@ -0,0 +1,86 @@
+package cc.winboll.studio.libappbase.sos;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/02/27 14:12:05
+ * @Describe SOSBean
+ */
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
+import java.io.IOException;
+
+public class SOSObject extends BaseBean {
+
+    public static final String TAG = "SOSObject";
+
+    String objectPackageName;
+    String objectServiveName;
+
+    public SOSObject() {
+        this.objectPackageName = "";
+        this.objectServiveName = "";
+    }
+
+    public SOSObject(String objectPackageName, String objectServiveName) {
+        this.objectPackageName = objectPackageName;
+        this.objectServiveName = objectServiveName;
+    }
+
+    public void setObjectPackageName(String objectPackageName) {
+        this.objectPackageName = objectPackageName;
+    }
+
+    public String getObjectPackageName() {
+        return objectPackageName;
+    }
+
+    public void setObjectServiveName(String objectServiveName) {
+        this.objectServiveName = objectServiveName;
+    }
+
+    public String getObjectServiveName() {
+        return objectServiveName;
+    }
+
+    @Override
+    public String getName() {
+        return SOSObject.class.getName();
+    }
+
+    @Override
+    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
+        super.writeThisToJsonWriter(jsonWriter);
+        jsonWriter.name("objectPackageName").value(getObjectPackageName());
+        jsonWriter.name("objectServiveName").value(getObjectServiveName());
+
+    }
+
+    @Override
+    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
+        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
+            if (name.equals("objectPackageName")) {
+                setObjectPackageName(jsonReader.nextString());
+            } else if (name.equals("objectServiveName")) {
+                setObjectServiveName(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;
+    }
+}

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

@@ -0,0 +1,39 @@
+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/widgets/StatusWidget.java

@@ -17,7 +17,6 @@ import cc.winboll.studio.libappbase.utils.ServiceUtils;
 import com.hjq.toast.ToastUtils;
 import android.content.ServiceConnection;
 import android.os.IBinder;
-import cc.winboll.studio.libappbase.services.TestService;
 
 public class StatusWidget extends AppWidgetProvider {
 
@@ -52,12 +51,12 @@ public class StatusWidget extends AppWidgetProvider {
         PendingIntent pendingIntentAppButton = PendingIntent.getBroadcast(context, 0, intentAppButton, PendingIntent.FLAG_UPDATE_CURRENT);
         views.setOnClickPendingIntent(R.id.ivapp, pendingIntentAppButton);
 
-        boolean isActive = ServiceUtils.isServiceRunning(context, TestService.class.getName());
-        if (isActive) {
-            views.setImageViewResource(R.id.ivapp, cc.winboll.studio.libappbase.R.drawable.ic_launcher);
-        } else {
-            views.setImageViewResource(R.id.ivapp, cc.winboll.studio.libappbase.R.drawable.ic_launcher_disable);
-        }
+//        boolean isActive = ServiceUtils.isServiceRunning(context, TestService.class.getName());
+//        if (isActive) {
+//            views.setImageViewResource(R.id.ivapp, cc.winboll.studio.libappbase.R.drawable.ic_launcher);
+//        } else {
+//            views.setImageViewResource(R.id.ivapp, cc.winboll.studio.libappbase.R.drawable.ic_launcher_disable);
+//        }
         appWidgetManager.updateAppWidget(appWidgetId, views);
     }
 }