<powerbell>APK 15.0.3 release Publish.

androiddemo/build.gradle

@@ -18,8 +18,15 @@ def genVersionName(def versionName){
 }
 
 android {
-    compileSdkVersion 32
-    buildToolsVersion "32.0.0"
+	productFlavors {
+		beta {
+		}
+		stage {
+		}
+	}
+
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "cc.winboll.studio.androiddemo"
@@ -29,7 +36,7 @@ android {
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.0"
+        versionName "1.0"
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -47,25 +54,21 @@ dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     
     // 吐司类库
-    api 'com.github.getActivity:ToastUtils:10.5'
+    implementation 'com.github.getActivity:ToastUtils:10.5'
 
     // Android 类库
-    api 'com.android.support:appcompat-v7:28.0.0' // 包含 AppCompatActivity
-    // https://mvnrepository.com/artifact/com.android.support/support-compat
-    api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选）
     // https://mvnrepository.com/artifact/com.android.support/support-v4
-    api 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:support-v4:28.0.0'
+    // https://mvnrepository.com/artifact/com.android.support/support-compat
+    implementation 'com.android.support:support-compat:28.0.0'
     // https://mvnrepository.com/artifact/com.android.support/support-media-compat
-    api 'com.android.support:support-media-compat:28.0.0'
+    implementation 'com.android.support:support-media-compat:28.0.0'
     // https://mvnrepository.com/artifact/com.android.support/support-core-utils
-    api 'com.android.support:support-core-utils:28.0.0'
+    implementation 'com.android.support:support-core-utils:28.0.0'
     // https://mvnrepository.com/artifact/com.android.support/support-core-ui
-    api 'com.android.support:support-core-ui:28.0.0'
+    implementation 'com.android.support:support-core-ui:28.0.0'
     // https://mvnrepository.com/artifact/com.android.support/support-fragment
-    api 'com.android.support:support-fragment:28.0.0'
+    implementation 'com.android.support:support-fragment:28.0.0'
     // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7
-    api 'com.android.support:recyclerview-v7:28.0.0'
-    
-    api 'cc.winboll.studio:libappbase:15.0.9'
-    api 'cc.winboll.studio:libapputils:15.0.11'
+    implementation 'com.android.support:recyclerview-v7:28.0.0'
 }

androiddemo/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Mar 26 07:23:51 GMT 2025
+#Tue Mar 11 18:02:14 GMT 2025
 stageCount=0
 libraryProject=
-baseVersion=15.0
-publishVersion=15.0.0
-buildCount=11
-baseBetaVersion=15.0.1
+baseVersion=1.0
+publishVersion=1.0.0
+buildCount=1
+baseBetaVersion=1.0.1

androiddemo/src/main/AndroidManifest.xml

@@ -11,7 +11,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
         android:resizeableActivity="true"
-        android:name=".App">
+        android:name=".GlobalApplication">
 
         <activity
             android:name=".MainActivity"

androiddemo/src/main/java/cc/winboll/studio/androiddemo/GlobalApplication.java

@@ -1,6 +1,7 @@
 package cc.winboll.studio.androiddemo;
 
 import android.app.Activity;
+import android.app.Application;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
@@ -21,7 +22,6 @@ import android.widget.HorizontalScrollView;
 import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
-import cc.winboll.studio.libappbase.GlobalApplication;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -39,15 +39,15 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public class App extends GlobalApplication {
+public class GlobalApplication extends Application {
 
     private static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
 
     @Override
     public void onCreate() {
         super.onCreate();
-        //CrashHandler.getInstance().registerGlobal(this);
-        //CrashHandler.getInstance().registerPart(this);
+        CrashHandler.getInstance().registerGlobal(this);
+        CrashHandler.getInstance().registerPart(this);
     }
 
     public static void write(InputStream input, OutputStream output) throws IOException {
@@ -252,7 +252,7 @@ public class App extends GlobalApplication {
 
             private static String getKernel() {
                 try {
-                    return App.toString(new FileInputStream("/proc/version")).trim();
+                    return GlobalApplication.toString(new FileInputStream("/proc/version")).trim();
                 } catch (Throwable e) {
                     return e.getMessage();
                 }
@@ -331,4 +331,4 @@ public class App extends GlobalApplication {
             restart();
         }
     }
-}
+}

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

@@ -1,25 +1,15 @@
-package cc.winboll.studio.androiddemo;
-
-import android.app.Activity;
-import android.os.Bundle;
-import cc.winboll.studio.libappbase.LogView;
-
-public class MainActivity extends Activity {
-
-    LogView mLogView;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        mLogView = findViewById(R.id.logview);
-        mLogView.start();
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mLogView.start();
-    }
-}
+package cc.winboll.studio.androiddemo;
+ 
+import android.app.Activity;
+import android.os.Bundle;
+
+public class MainActivity extends Activity {
+     
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        
+    }
+	
+}

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

@@ -4,34 +4,13 @@
 	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_vertical|center_horizontal">
 
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:gravity="center_vertical|center_horizontal"
-		android:layout_weight="1.0">
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="Android Demo"
-			android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-	</LinearLayout>
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_weight="1.0">
-
-		<cc.winboll.studio.libappbase.LogView
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="Text"
-			android:id="@+id/logview"/>
-
-	</LinearLayout>
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="Android Demo"
+		android:textAppearance="?android:attr/textAppearanceLarge"/>
 
 </LinearLayout>
 

androidxdemo/build.gradle

@@ -18,8 +18,15 @@ def genVersionName(def versionName){
 }
 
 android {
-    compileSdkVersion 32
-    buildToolsVersion "32.0.0"
+	productFlavors {
+		beta {
+		}
+		stage {
+		}
+	}
+
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "cc.winboll.studio.androidxdemo"
@@ -29,7 +36,7 @@ android {
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.0"
+        versionName "1.0"
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -47,26 +54,23 @@ dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     
     // SSH
-    api 'com.jcraft:jsch:0.1.55'
+    implementation 'com.jcraft:jsch:0.1.55'
     // Html 解析
-    api 'org.jsoup:jsoup:1.13.1'
+    implementation 'org.jsoup:jsoup:1.13.1'
     // 二维码类库
-    api 'com.google.zxing:core:3.4.1'
-    api 'com.journeyapps:zxing-android-embedded:3.6.0'
+    implementation 'com.google.zxing:core:3.4.1'
+    implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
     // 应用介绍页类库
-    api 'io.github.medyo:android-about-page:2.0.0'
+    implementation 'io.github.medyo:android-about-page:2.0.0'
     // 吐司类库
-    api 'com.github.getActivity:ToastUtils:10.5'
+    implementation 'com.github.getActivity:ToastUtils:10.5'
     // 网络连接类库
-    api 'com.squareup.okhttp3:okhttp:4.4.1'
-    // AndroidX 类库
-    api 'androidx.appcompat:appcompat:1.0.0'
-    api 'com.google.android.material:material:1.4.0'
-    //api 'androidx.viewpager:viewpager:1.0.0'
-    //api 'androidx.vectordrawable:vectordrawable:1.1.0'
-    //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
-    //api 'androidx.fragment:fragment:1.1.0'
-    
-    api 'cc.winboll.studio:libappbase:15.0.9'
-    api 'cc.winboll.studio:libapputils:15.0.11'
+    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'
 }

androidxdemo/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 06:19:57 GMT 2025
+#Tue Mar 11 18:25:43 GMT 2025
 stageCount=0
 libraryProject=
-baseVersion=15.0
-publishVersion=15.0.0
-buildCount=8
-baseBetaVersion=15.0.1
+baseVersion=1.0
+publishVersion=1.0.0
+buildCount=4
+baseBetaVersion=1.0.1

androidxdemo/src/main/AndroidManifest.xml

@@ -8,9 +8,9 @@
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
-        android:theme="@style/MyAppTheme"
+        android:theme="@style/AppTheme"
         android:resizeableActivity="true"
-        android:name=".App">
+        android:name=".GlobalApplication">
 
         <activity
             android:name=".MainActivity"
@@ -34,4 +34,4 @@
 
     </application>
 
-</manifest>
+</manifest>

androidxdemo/src/main/java/cc/winboll/studio/androidxdemo/GlobalApplication.java

@@ -1,6 +1,7 @@
 package cc.winboll.studio.androidxdemo;
 
 import android.app.Activity;
+import android.app.Application;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
@@ -21,7 +22,6 @@ import android.widget.HorizontalScrollView;
 import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
-import cc.winboll.studio.libappbase.GlobalApplication;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -39,15 +39,15 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public class App extends GlobalApplication {
+public class GlobalApplication extends Application {
 
     private static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
 
     @Override
     public void onCreate() {
         super.onCreate();
-        //CrashHandler.getInstance().registerGlobal(this);
-        //CrashHandler.getInstance().registerPart(this);
+        CrashHandler.getInstance().registerGlobal(this);
+        CrashHandler.getInstance().registerPart(this);
     }
 
     public static void write(InputStream input, OutputStream output) throws IOException {
@@ -252,7 +252,7 @@ public class App extends GlobalApplication {
 
             private static String getKernel() {
                 try {
-                    return App.toString(new FileInputStream("/proc/version")).trim();
+                    return GlobalApplication.toString(new FileInputStream("/proc/version")).trim();
                 } catch (Throwable e) {
                     return e.getMessage();
                 }
@@ -331,4 +331,4 @@ public class App extends GlobalApplication {
             restart();
         }
     }
-}
+}

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

@@ -3,26 +3,17 @@ package cc.winboll.studio.androidxdemo;
 import android.os.Bundle;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.libappbase.LogView;
 
 public class MainActivity extends AppCompatActivity {
-
-    LogView mLogView;
-
+    
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-
+		
 		Toolbar toolbar=(Toolbar)findViewById(R.id.toolbar);
 		setSupportActionBar(toolbar);
-
-        mLogView = findViewById(R.id.logview);
+        
     }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mLogView.start();
-    }
-}
+    
+}

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

@@ -34,18 +34,5 @@
 
 	</LinearLayout>
 
-	<LinearLayout
-		android:orientation="vertical"
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_weight="1.0">
-
-		<cc.winboll.studio.libappbase.LogView
-			android:layout_width="match_parent"
-			android:layout_height="match_parent"
-			android:id="@+id/logview"/>
-
-	</LinearLayout>
-
 </LinearLayout>
 

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

@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="MyAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>

appbase/build.gradle

@@ -18,19 +18,18 @@ def genVersionName(def versionName){
 }
 
 android {
-    
     compileSdkVersion 32
     buildToolsVersion "32.0.0"
 
     defaultConfig {
         applicationId "cc.winboll.studio.appbase"
-        minSdkVersion 24
+        minSdkVersion 26
         targetSdkVersion 29
         versionCode 1
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.1"
+        versionName "15.0"
         if(true) {
             versionName = genVersionName("${versionName}")
         }

appbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Mar 27 10:59:31 GMT 2025
-stageCount=1
+#Mon Mar 24 14:06:25 HKT 2025
+stageCount=10
 libraryProject=libappbase
-baseVersion=15.1
-publishVersion=15.1.0
-buildCount=130
-baseBetaVersion=15.1.1
+baseVersion=15.0
+publishVersion=15.0.9
+buildCount=0
+baseBetaVersion=15.0.10

appbase/src/main/AndroidManifest.xml

@@ -8,15 +8,12 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/MyAPPBaseTheme"
-        android:resizeableActivity="true"
-        android:process=":App">
+        android:resizeableActivity="true">
 
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
-            android:exported="true"
-            android:resizeableActivity="true"
-            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation">
+            android:exported="true">
 
             <intent-filter>
 
@@ -32,19 +29,10 @@
 
         </activity>
 
-        <activity android:name=".activities.NewActivity"
-            android:exported="true"
-            android:resizeableActivity="true"
-            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"/>
-
-        <activity android:name=".activities.New2Activity"
-            android:exported="true"
-            android:resizeableActivity="true"
-            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"/>
+        <activity android:name=".GlobalApplication$CrashActivity"/>
 
         <service
             android:name=".MyTileService"
-            android:exported="true"
             android:label="@string/tileservice_name"
             android:icon="@drawable/ic_launcher"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
@@ -61,18 +49,15 @@
             android:name=".services.MainService"
             android:exported="true"/>
 
-        <service
-            android:name="cc.winboll.studio.appbase.services.TestDemoBindService"
+        <service android:name="cc.winboll.studio.appbase.services.TestDemoBindService"
             android:exported="true"/>
 
-        <service
-            android:name="cc.winboll.studio.appbase.services.TestDemoService"
+        <service android:name="cc.winboll.studio.appbase.services.TestDemoService"
             android:exported="true"/>
 
         <service android:name=".services.AssistantService"/>
 
-        <receiver android:name="cc.winboll.studio.appbase.receivers.MainReceiver"
-            android:exported="true">
+        <receiver android:name="cc.winboll.studio.appbase.receivers.MainReceiver">
 
             <intent-filter>
 
@@ -102,8 +87,7 @@
 
         </receiver>
 
-        <receiver android:name=".receivers.APPNewsWidgetClickListener"
-            android:exported="true">
+        <receiver android:name=".receivers.APPNewsWidgetClickListener">
 
             <intent-filter>
 
@@ -119,7 +103,6 @@
             android:name="android.max_aspect"
             android:value="4.0"/>
 
-
     </application>
 
 </manifest>

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

@@ -19,6 +19,7 @@ public class App extends GlobalApplication {
     @Override
     public void onCreate() {
         super.onCreate();
+        GlobalApplication.setIsDebuging(this, BuildConfig.DEBUG);
         mSOSCenterServiceReceiver = new SOSCenterServiceReceiver();
         IntentFilter intentFilter = new IntentFilter();
         intentFilter.addAction(SOS.ACTION_SOS);

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

@@ -1,47 +1,28 @@
 package cc.winboll.studio.appbase;
 
 import android.app.Activity;
-import android.app.ActivityOptions;
 import android.content.ComponentName;
 import android.content.Intent;
-import android.graphics.Rect;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.CheckBox;
+import android.widget.Toolbar;
 import cc.winboll.studio.appbase.R;
-import cc.winboll.studio.appbase.activities.NewActivity;
 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.SOS;
 import cc.winboll.studio.libappbase.utils.ToastUtils;
 import cc.winboll.studio.libappbase.widgets.StatusWidget;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
-import cc.winboll.studio.libappbase.winboll.LogActivity;
-import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
-import android.support.v7.widget.Toolbar;
 
-public class MainActivity extends AppCompatActivity implements IWinBollActivity {
+public class MainActivity extends Activity {
 
     public static final String TAG = "MainActivity";
 
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    Toolbar mToolbar;
-    //LogView mLogView;
+    LogView mLogView;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -49,40 +30,19 @@ public class MainActivity extends AppCompatActivity implements IWinBollActivity
         ToastUtils.show("onCreate");
         setContentView(R.layout.activity_main);
 
-        mToolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(mToolbar);
+        Toolbar toolbar = findViewById(R.id.activitymainToolbar1);
+        setActionBar(toolbar);
 
         CheckBox cbIsDebugMode = findViewById(R.id.activitymainCheckBox1);
         cbIsDebugMode.setChecked(GlobalApplication.isDebuging());
-        //mLogView = findViewById(R.id.activitymainLogView1);
+        mLogView = findViewById(R.id.activitymainLogView1);
 
-//        if (GlobalApplication.isDebuging()) {
-//            mLogView.start(); 
-//            ToastUtils.show("LogView start.");
-//        }
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.toolbar_main, menu);
-        getMenuInflater().inflate(R.menu.toolbar_appbase, menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
-            WinBollActivityManager.getInstance(this).startLogActivity(this);
-            return true;
-        } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) {
-            moveTaskToBack(true);
+        if (GlobalApplication.isDebuging()) {
+            mLogView.start(); 
+            ToastUtils.show("LogView start.");
         }
-        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
-        return super.onOptionsItemSelected(item);
     }
 
-
-
     @Override
     protected void onDestroy() {
         super.onDestroy();
@@ -91,9 +51,15 @@ public class MainActivity extends AppCompatActivity implements IWinBollActivity
         sendBroadcast(intentAPPWidget);
     }
 
+    @Override
+    protected void onResume() {
+        LogUtils.d(TAG, "onResume");
+        super.onResume();
+        mLogView.start();
+    }
+
 	public void onSwitchDebugMode(View view) {
-        boolean isDebuging = ((CheckBox)view).isChecked();
-        GlobalApplication.setIsDebuging(isDebuging);
+        GlobalApplication.setIsDebuging(this, ((CheckBox)view).isChecked());
     }
 
     public void onStartCenter(View view) {
@@ -174,10 +140,4 @@ public class MainActivity extends AppCompatActivity implements IWinBollActivity
         Intent intent = new Intent(this, TestDemoBindService.class);
         stopService(intent);
     }
-
-    public void onTestOpenNewActivity(View view) {
-        WinBollActivityManager.getInstance(this).startWinBollActivity(this, NewActivity.class);
-    }
-
-    
 }

appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java

@@ -1,85 +0,0 @@
-package cc.winboll.studio.appbase.activities;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/25 11:46:40
- * @Describe 测试窗口2
- */
-import android.app.Activity;
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import cc.winboll.studio.appbase.R;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
-import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
-
-public class New2Activity extends AppCompatActivity implements IWinBollActivity {
-
-    public static final String TAG = "New2Activity";
-
-    Toolbar mToolbar;
-    //LogView mLogView;
-
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_new2);
-
-//        mLogView = findViewById(R.id.logview);
-//        mLogView.start();
-        mToolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(mToolbar);
-        
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        //mLogView.start();
-    }
-
-    public void onCloseThisActivity(View view) {
-        WinBollActivityManager.getInstance(this).finish(this);
-    }
-
-    public void onCloseAllActivity(View view) {
-        WinBollActivityManager.getInstance(this).finishAll();
-    }
-
-    public void onNewActivity(View view) {
-        WinBollActivityManager.getInstance(this).startWinBollActivity(this, NewActivity.class);
-    }
-    
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.toolbar_main, menu);
-        getMenuInflater().inflate(R.menu.toolbar_appbase, menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
-            WinBollActivityManager.getInstance(this).startLogActivity(this);
-            return true;
-        } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) {
-            moveTaskToBack(true);
-        }
-        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
-        return super.onOptionsItemSelected(item);
-    }
-}

appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java

@@ -1,83 +0,0 @@
-package cc.winboll.studio.appbase.activities;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/25 05:04:22
- */
-import android.app.Activity;
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import cc.winboll.studio.appbase.R;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity;
-import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
-
-public class NewActivity extends AppCompatActivity implements IWinBollActivity {
-
-    public static final String TAG = "NewActivity";
-
-    Toolbar mToolbar;
-    //LogView mLogView;
-
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_new);
-//        mLogView = findViewById(R.id.logview);
-//        mLogView.start();
-        mToolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(mToolbar);
-        
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        //mLogView.start();
-    }
-
-    public void onCloseThisActivity(View view) {
-        WinBollActivityManager.getInstance(this).finish(this);
-    }
-
-    public void onCloseAllActivity(View view) {
-        WinBollActivityManager.getInstance(this).finishAll();
-    }
-
-    public void onNew2Activity(View view) {
-        WinBollActivityManager.getInstance(this).startWinBollActivity(this, New2Activity.class);
-    }
-    
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.toolbar_main, menu);
-        getMenuInflater().inflate(R.menu.toolbar_appbase, menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) {
-            WinBollActivityManager.getInstance(this).startLogActivity(this);
-            return true;
-        } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) {
-            moveTaskToBack(true);
-        }
-        // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。
-        return super.onOptionsItemSelected(item);
-    }
-}

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

@@ -5,10 +5,10 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<android.support.v7.widget.Toolbar
+	<android.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/toolbar"/>
+		android:id="@+id/activitymainToolbar1"/>
 
 	<ScrollView
 		android:layout_width="match_parent"
@@ -181,14 +181,7 @@
 							android:text="TestDemoServiceSOS"
 							android:textAllCaps="false"
 							android:onClick="onTestDemoServiceSOS"/>
-                        
-                        <Button
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="TestOpenNewActivity"
-                            android:textAllCaps="false"
-                            android:onClick="onTestOpenNewActivity"/>
-                        
+
 					</LinearLayout>
 
 				</ScrollView>
@@ -198,6 +191,11 @@
 		</LinearLayout>
 
 	</ScrollView>
-    
+
+	<cc.winboll.studio.libappbase.LogView
+		android:layout_height="300dp"
+		android:layout_width="match_parent"
+		android:id="@+id/activitymainLogView1"/>
+
 </LinearLayout>
 

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

@@ -1,43 +0,0 @@
-<?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="match_parent"
-	android:layout_height="match_parent">
-
-    <android.support.v7.widget.Toolbar
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-		android:id="@+id/toolbar"/>
-    
-	<TextView
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="NewActivity"/>
-
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="CloseThisActivity"
-        android:textAllCaps="false"
-        android:onClick="onCloseThisActivity"/>
-
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="CloseAllActivity"
-        android:textAllCaps="false"
-        android:onClick="onCloseAllActivity"/>
-
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="New2Activity"
-        android:textAllCaps="false"
-        android:onClick="onNew2Activity"/>
-
-    
-    
-</LinearLayout>
-

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

@@ -1,43 +0,0 @@
-<?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="match_parent"
-	android:layout_height="match_parent">
-
-    <android.support.v7.widget.Toolbar
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-		android:id="@+id/toolbar"/>
-
-	<TextView
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="New2Activity"/>
-
-	<Button
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="CloseThisActivity"
-		android:textAllCaps="false"
-		android:onClick="onCloseThisActivity"/>
-
-	<Button
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="CloseAllActivity"
-		android:textAllCaps="false"
-		android:onClick="onCloseAllActivity"/>
-
-	<Button
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:text="NewActivity"
-		android:textAllCaps="false"
-		android:onClick="onNewActivity"/>
-
-	
-
-</LinearLayout>
-

appbase/src/main/res/menu/toolbar_main.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto">
-    
-    
-</menu>

build.gradle

@@ -18,7 +18,7 @@ buildscript {
         mavenLocal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1' // 对应 compileSdkVersion 32
+        classpath 'com.android.tools.build:gradle:7.2.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

libappbase/build.gradle

@@ -4,12 +4,11 @@ apply from: '../.winboll/winboll_lib_build.gradle'
 apply from: '../.winboll/winboll_lint_build.gradle'
 
 android {
-    
     compileSdkVersion 32
     buildToolsVersion "32.0.0"
 
     defaultConfig {
-        minSdkVersion 24
+        minSdkVersion 26
         targetSdkVersion 29
     }
     buildTypes {
@@ -22,21 +21,4 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    
-    // Android 类库
-    api 'com.android.support:appcompat-v7:28.0.0' // 包含 AppCompatActivity
-    // https://mvnrepository.com/artifact/com.android.support/support-compat
-    api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选）
-    // https://mvnrepository.com/artifact/com.android.support/support-v4
-    api 'com.android.support:support-v4:28.0.0'
-    // https://mvnrepository.com/artifact/com.android.support/support-media-compat
-    api 'com.android.support:support-media-compat:28.0.0'
-    // https://mvnrepository.com/artifact/com.android.support/support-core-utils
-    api 'com.android.support:support-core-utils:28.0.0'
-    // https://mvnrepository.com/artifact/com.android.support/support-core-ui
-    api 'com.android.support:support-core-ui:28.0.0'
-    // https://mvnrepository.com/artifact/com.android.support/support-fragment
-    api 'com.android.support:support-fragment:28.0.0'
-    // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7
-    api 'com.android.support:recyclerview-v7:28.0.0'
 }

libappbase/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Mar 27 10:59:31 GMT 2025
-stageCount=1
+#Mon Mar 24 14:06:10 HKT 2025
+stageCount=10
 libraryProject=libappbase
-baseVersion=15.1
-publishVersion=15.1.0
-buildCount=130
-baseBetaVersion=15.1.1
+baseVersion=15.0
+publishVersion=15.0.9
+buildCount=0
+baseBetaVersion=15.0.10

libappbase/src/main/AndroidManifest.xml

@@ -19,18 +19,9 @@
         <activity
             android:name=".GlobalCrashActivity"
             android:label="GlobalCrashActivity"
-            android:launchMode="singleInstance"
-            android:process=":GlobalCrashActivity"/>
+            android:launchMode="standard"/>
 
-        <activity
-            android:name="cc.winboll.studio.libappbase.winboll.LogActivity"
-            android:resizeableActivity="true"
-            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
-            android:exported="true"
-            android:launchMode="singleInstance"
-            android:process=":LogActivity">
-
-        </activity>
+        <activity android:name=".LogActivity"/>
 
         <service
             android:name=".SimpleOperateSignalCenterService"
@@ -42,8 +33,7 @@
             android:name=".services.TestService"
             android:exported="true"/>
 
-        <receiver android:name=".receiver.MyBroadcastReceiver"
-            android:exported="true">
+        <receiver android:name=".receiver.MyBroadcastReceiver">
 
             <intent-filter>
 
@@ -85,8 +75,7 @@
 
         <service android:name="cc.winboll.studio.libappbase.sos.SOSCenter"/>
 
-        <receiver android:name="cc.winboll.studio.libappbase.sos.SOSCenterServiceReceiver"
-            android:exported="true">
+        <receiver android:name="cc.winboll.studio.libappbase.sos.SOSCenterServiceReceiver">
 
             <intent-filter>
 
@@ -98,4 +87,4 @@
 
     </application>
 
-</manifest>
+</manifest>

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

@@ -1,73 +0,0 @@
-package cc.winboll.studio.libappbase;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/25 02:52:46
- * @Describe 基础应用数据模型
- */
-import android.util.JsonReader;
-import android.util.JsonWriter;
-import cc.winboll.studio.libappbase.BaseBean;
-import java.io.IOException;
-
-public class APPBaseModel extends BaseBean {
-
-    public static final String TAG = "APPBaseModel";
-
-    // 应用是否处于正在调试状态
-    //
-    boolean isDebuging = false;
-
-    public APPBaseModel() {
-        this.isDebuging = false;
-    }
-
-    public APPBaseModel(boolean isDebuging) {
-        this.isDebuging = isDebuging;
-    }
-
-    public void setIsDebuging(boolean isDebuging) {
-        this.isDebuging = isDebuging;
-    }
-
-    public boolean isDebuging() {
-        return isDebuging;
-    }
-
-    @Override
-    public String getName() {
-        return APPBaseModel.class.getName();
-    }
-
-    @Override
-    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
-        super.writeThisToJsonWriter(jsonWriter);
-        jsonWriter.name("isDebuging").value(isDebuging());
-    }
-
-    @Override
-    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
-        if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else {
-            if (name.equals("isDebuging")) {
-                setIsDebuging(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/GlobalApplication.java

@@ -7,13 +7,12 @@ package cc.winboll.studio.libappbase;
  */
 import android.app.Application;
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.os.Handler;
 import android.os.Looper;
 import cc.winboll.studio.libappbase.utils.ToastUtils;
-import cc.winboll.studio.libappbase.winboll.WinBollActivityManager;
-import cc.winboll.studio.libappbase.winboll.MyActivityLifecycleCallbacks;
 
 public class GlobalApplication extends Application {
 
@@ -22,34 +21,22 @@ public class GlobalApplication extends Application {
     final static String PREFS = GlobalApplication.class.getName() + "PREFS";
     final static String PREFS_ISDEBUGING = "PREFS_ISDEBUGING";
 
+
     private static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
 
-    volatile static GlobalApplication _GlobalApplication;
     // 是否处于调试状态
     volatile static boolean isDebuging = false;
-    MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks;
 
-    public static void setIsDebuging(boolean isDebuging) {
-        if (_GlobalApplication != null) {
-            GlobalApplication.isDebuging = isDebuging;
-            APPBaseModel.saveBeanToFile(getAPPBaseModelFilePath(), new APPBaseModel(isDebuging));
-            // 获取SharedPreferences实例
-//        SharedPreferences sharedPreferences = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE);
-//        // 获取编辑器
-//        SharedPreferences.Editor editor = sharedPreferences.edit();
-//        // 保存数据
-//        editor.putBoolean(PREFS_ISDEBUGING, GlobalApplication.isDebuging);
-//        // 提交更改
-//        editor.apply();
-        }
-    }
-
-    public static GlobalApplication getInstance() {
-        return _GlobalApplication;
-    }
-
-    static String getAPPBaseModelFilePath() {
-        return _GlobalApplication.getDataDir().getPath() + "/APPBaseModel.json";
+    public static void setIsDebuging(Context context, boolean isDebuging) {
+        GlobalApplication.isDebuging = isDebuging;
+        // 获取SharedPreferences实例
+        SharedPreferences sharedPreferences = context.getSharedPreferences(PREFS, Context.MODE_PRIVATE);
+        // 获取编辑器
+        SharedPreferences.Editor editor = sharedPreferences.edit();
+        // 保存数据
+        editor.putBoolean(PREFS_ISDEBUGING, GlobalApplication.isDebuging);
+        // 提交更改
+        editor.apply();
     }
 
     public static boolean isDebuging() {
@@ -68,26 +55,8 @@ public class GlobalApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-
-        // _GlobalApplication 取值调试部分
-        //
-        boolean is_GlobalApplicationNull = false;
-        if (_GlobalApplication == null) {
-            is_GlobalApplicationNull = true;
-            _GlobalApplication = this;
-        } else {
-            is_GlobalApplicationNull = false;
-            _GlobalApplication = this;
-        }
-
-        // 设置应用调试标志
-        APPBaseModel appBaseModel = APPBaseModel.loadBeanFromFile(getAPPBaseModelFilePath(), APPBaseModel.class);
-        if (appBaseModel == null) {
-            setIsDebuging(false);
-        } else {
-            setIsDebuging(appBaseModel.isDebuging());
-        }
-
+        //GlobalApplication.isDebuging = true;
+        //GlobalApplication.setIsDebuging(this, true);
         LogUtils.init(this);
         //LogUtils.setLogLevel(LogUtils.LOG_LEVEL.Debug);
         //LogUtils.setTAGListEnable(GlobalApplication.TAG, true);
@@ -97,27 +66,16 @@ public class GlobalApplication extends Application {
         // 设置应用异常处理窗口
         CrashHandler.init(this);
 
+        // 设置应用调试状态
+        //SharedPreferences sharedPreferences = getSharedPreferences(PREFS, Context.MODE_PRIVATE);
+        //GlobalApplication.isDebuging = sharedPreferences.getBoolean(PREFS_ISDEBUGING, GlobalApplication.isDebuging);
+
         // 初始化 Toast 框架
         ToastUtils.init(this);
-
-        // _GlobalApplication 取值调试部分
-        //
-        LogUtils.d(TAG, String.format("is_GlobalApplicationNull is %s", is_GlobalApplicationNull));
-
-        WinBollActivityManager.getInstance(_GlobalApplication);
-        WinBollActivityManager.getInstance(_GlobalApplication).setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
-        // 注册回调
-        mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks();
-        registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
-    }
-
-
-    @Override
-    public void onTerminate() {
-        super.onTerminate();
-        _GlobalApplication = null;
-        // 注销回调（非必须，但建议释放资源）
-        unregisterActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
+        // 设置 Toast 布局样式
+        //ToastUtils.setView(R.layout.toast_custom_view);
+        //ToastUtils.setStyle(new WhiteToastStyle());
+        //ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
     }
 
     public static String getAppName(Context context) {

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

@@ -10,8 +10,6 @@ import android.content.ClipboardManager;
 import android.content.Context;
 import android.os.Handler;
 import android.os.Message;
-import android.text.Editable;
-import android.text.TextWatcher;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -20,8 +18,6 @@ import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
 import android.widget.CheckBox;
-import android.widget.EditText;
-import android.widget.HorizontalScrollView;
 import android.widget.RelativeLayout;
 import android.widget.ScrollView;
 import android.widget.Spinner;
@@ -46,7 +42,6 @@ public class LogView extends RelativeLayout {
     Context mContext;
     ScrollView mScrollView;
     TextView mTextView;
-    EditText metTagSearch;
     CheckBox mSelectableCheckBox;
     CheckBox mSelectAllTAGCheckBox;
     TAGListAdapter mTAGListAdapter;
@@ -112,41 +107,9 @@ public class LogView extends RelativeLayout {
         //
         mScrollView = findViewById(cc.winboll.studio.libappbase.R.id.viewlogScrollViewLog);
         mTextView = findViewById(cc.winboll.studio.libappbase.R.id.viewlogTextViewLog);
-        metTagSearch = findViewById(cc.winboll.studio.libappbase.R.id.tagsearch_et);
         // 获取Log Level spinner实例
         mLogLevelSpinner = findViewById(cc.winboll.studio.libappbase.R.id.viewlogSpinner1);
 
-        metTagSearch.addTextChangedListener(new TextWatcher() {
-
-                @Override
-                public void afterTextChanged(Editable editable) {
-                }
-
-                @Override
-                public void beforeTextChanged(CharSequence charSequence, int p, int p1, int p2) {
-                }
-
-                @Override
-                public void onTextChanged(CharSequence s, int start, int before, int count) {
-                    LogUtils.d(TAG, s.toString());
-                    if (s.length() > 0) {
-                        scrollToTag(s.toString());
-                    } else {
-                        HorizontalScrollView hsRoot = findViewById(R.id.viewlogHorizontalScrollView1);
-                        hsRoot.smoothScrollTo(0, 0);
-                        mListViewTags.resetScrollToStart();
-                    }
-//                    mListViewTags.postDelayed(new Runnable() {
-//                            @Override
-//                            public void run() {
-//                                mListViewTags.scrollToItem(5);
-//                            }
-//                        }, 100);
-                }
-                // 其他方法留空或按需实现
-            });
-
-
         (findViewById(cc.winboll.studio.libappbase.R.id.viewlogButtonClean)).setOnClickListener(new View.OnClickListener(){
 
                 @Override
@@ -270,60 +233,6 @@ public class LogView extends RelativeLayout {
         scrollLogUp();
     }
 
-    public void scrollToTag(final String prefix) {
-        if (mTAGListAdapter == null || prefix == null || prefix.length() == 0) {
-            LogUtils.d(TAG, "参数为空，无法滚动");
-            return;
-        }
-
-        final List<TAGItemModel> itemList = mTAGListAdapter.getItemList();
-
-        mListViewTags.post(new Runnable() {
-                @Override
-                public void run() {
-                    // 查找匹配的标签位置
-                    int targetPosition = -1;
-
-                    for (int i = 0; i < itemList.size(); i++) {
-                        String tag = itemList.get(i).getTag();
-                        if (tag != null && tag.toLowerCase().startsWith(prefix.toLowerCase())) {
-                            targetPosition = i;
-
-                            break;
-                        }
-                    }
-
-                    if (targetPosition != -1) {
-                        // 优化滚动逻辑
-                        //mListViewTags.setSelection(targetPosition);
-                        //mListViewTags.invalidateViews(); // 强制刷新所有可见项
-
-                        // 单独刷新目标视图
-//                        View targetView = mListViewTags.getChildAt(targetPosition);
-//                        if (targetView != null) {
-//                            targetView.requestLayout();
-//                            targetView.requestFocus();
-//                        }
-
-                        final int scrollPosition = targetPosition;
-
-                        // 延迟滚动确保布局完成
-                        mListViewTags.postDelayed(new Runnable() {
-                                @Override
-                                public void run() {
-                                    LogUtils.d(TAG, String.format("scrollPosition %d", scrollPosition));
-                                    mListViewTags.scrollToItem(scrollPosition);
-                                }
-                            }, 100);
-                    } else {
-                        LogUtils.d(TAG, "未找到匹配的标签前缀：" + prefix);
-                    }
-                }
-            });
-    }
-
-
-
     class LogViewHandler extends Handler {
 
         final static int MSG_LOGVIEW_UPDATE = 0;
@@ -391,30 +300,6 @@ public class LogView extends RelativeLayout {
         public void setChecked(boolean checked) {
             isChecked = checked;
         }
-
-        // getter/setter...
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) {
-                return true;
-            }
-            if (o == null || getClass() != o.getClass()) {
-                return false;
-            }
-            TAGItemModel that = (TAGItemModel) o;
-            // 手动处理空值比较（Java 6 不支持 Objects.equals）
-            if (tag == null) {
-                return that.tag == null;
-            } else {
-                return tag.equals(that.tag);
-            }
-        }
-
-        @Override
-        public int hashCode() {
-            return tag == null ? 0 : tag.hashCode(); // 手动处理空值
-        }
     }
 
 
@@ -429,11 +314,7 @@ public class LogView extends RelativeLayout {
             mapOrigin = map;
             loadMap(mapOrigin);
         }
-
-        public List<TAGItemModel> getItemList() {
-            return itemList;
-        }
-
+        
         @Override
         public int getCount() {
             return itemList.size();
@@ -463,7 +344,7 @@ public class LogView extends RelativeLayout {
             loadMap(mapOrigin);
             super.notifyDataSetChanged();
         }
-
+        
         @Override
         public View getView(int position, View convertView, ViewGroup parent) {
             ViewHolder holder;

libappbase/src/main/java/cc/winboll/studio/libappbase/views/HorizontalListView.java

@@ -9,34 +9,23 @@ import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ListView;
-import android.widget.Scroller;
 import cc.winboll.studio.libappbase.LogUtils;
 
 public class HorizontalListView extends ListView {
+
     public static final String TAG = "HorizontalListView";
-    private int verticalOffset = 0;
-    private Scroller scroller;
-    private int totalWidth;
+    int verticalOffset = 0;
 
     public HorizontalListView(Context context) {
         super(context);
-        init();
     }
 
     public HorizontalListView(Context context, AttributeSet attrs) {
         super(context, attrs);
-        init();
     }
 
     public HorizontalListView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
-        init();
-    }
-
-    private void init() {
-        scroller = new Scroller(getContext());
-        setHorizontalScrollBarEnabled(true);
-        setVerticalScrollBarEnabled(false);
     }
 
     public void setVerticalOffset(int verticalOffset) {
@@ -49,81 +38,28 @@ public class HorizontalListView extends ListView {
         int childCount = getChildCount();
         int left = getPaddingLeft();
         int viewHeight = getMeasuredHeight() - getPaddingTop() - getPaddingBottom();
-        totalWidth = left;
-
+        LogUtils.d(TAG, String.format("HorizontalListView的高度 %d", viewHeight));
+        
         for (int i = 0; i < childCount; i++) {
             View child = getChildAt(i);
+            // 计算每个子视图的宽度和高度
             int width = child.getMeasuredWidth();
             int height = child.getMeasuredHeight();
+            //LogUtils.d(TAG, String.format("child : width %d , height %d", width, height));
+            // 设置子视图的位置，实现水平布局
+
             child.layout(left, verticalOffset, left + width, verticalOffset + height);
             left += width;
         }
-        totalWidth = left + getPaddingRight();
     }
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         int newHeightMeasureSpec = MeasureSpec.makeMeasureSpec(Integer.MAX_VALUE >> 2, MeasureSpec.AT_MOST);
+        //super.onMeasure(widthMeasureSpec, newHeightMeasureSpec);
         int newWidthMeasureSpec = MeasureSpec.makeMeasureSpec(Integer.MAX_VALUE >> 2, MeasureSpec.AT_MOST);
+        //LogUtils.d(TAG, String.format("newWidthMeasureSpec %d, newHeightMeasureSpec %d", newWidthMeasureSpec, newHeightMeasureSpec));
         super.onMeasure(newWidthMeasureSpec, newHeightMeasureSpec);
     }
-
-    @Override
-    public void computeScroll() {
-        if (scroller.computeScrollOffset()) {
-            scrollTo(scroller.getCurrX(), scroller.getCurrY());
-            postInvalidate();
-        }
-    }
-
-    public void smoothScrollTo(int x, int y) {
-        int dx = x - getScrollX();
-        int dy = y - getScrollY();
-        scroller.startScroll(getScrollX(), getScrollY(), dx, dy, 300); // 300ms平滑动画
-        invalidate();
-    }
-
-    @Override
-    public int computeHorizontalScrollRange() {
-        return totalWidth;
-    }
-
-    @Override
-    public int computeHorizontalScrollOffset() {
-        return getScrollX();
-    }
-
-    @Override
-    public int computeHorizontalScrollExtent() {
-        return getWidth();
-    }
-
-    public void scrollToItem(int position) {
-        if (position < 0 || position >= getChildCount()) {
-            LogUtils.d(TAG, "无效的position: " + position);
-            return;
-        }
-
-        View targetView = getChildAt(position);
-        int targetLeft = targetView.getLeft();
-        int scrollX = targetLeft - getPaddingLeft();
-
-        // 修正最大滚动范围计算
-        int maxScrollX = totalWidth;
-        scrollX = Math.max(0, Math.min(scrollX, maxScrollX));
-
-        // 强制重新布局和绘制
-        requestLayout();
-        invalidateViews();
-        smoothScrollTo(scrollX, 0);
-        LogUtils.d(TAG, String.format("滚动到position: %d, scrollX: %d computeHorizontalScrollRange() %d", position, scrollX, computeHorizontalScrollRange()));
-    }
-    
-    public void resetScrollToStart() {
-        // 强制重新布局和绘制
-        requestLayout();
-        invalidateViews();
-        smoothScrollTo(0, 0);
-    }
 }
 

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

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

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

@@ -1,48 +0,0 @@
-package cc.winboll.studio.libappbase.winboll;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/25 20:34:47
- * @Describe 应用日志窗口
- */
-import android.app.Activity;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.WindowManager;
-import cc.winboll.studio.libappbase.LogView;
-import cc.winboll.studio.libappbase.R;
-import cc.winboll.studio.libappbase.utils.ToastUtils;
-
-public class LogActivity extends Activity implements IWinBollActivity {
-
-    public static final String TAG = "LogActivity";
-
-    LogView mLogView;
-
-    @Override
-    public Activity getActivity() {
-        return this;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_log);
-        //ToastUtils.show("LogActivity onCreate");
-
-        mLogView = findViewById(R.id.logview);
-        mLogView.start();
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        mLogView.start();
-    }
-
-}

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

@@ -1,107 +0,0 @@
-package cc.winboll.studio.libappbase.winboll;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/25 04:29:19
- */
-import android.app.Activity;
-import android.app.Application;
-import android.content.Intent;
-import android.os.Bundle;
-import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.utils.ToastUtils;
-import cc.winboll.studio.libappbase.winboll.IWinBollActivity; 
-
-public class MyActivityLifecycleCallbacks implements Application.ActivityLifecycleCallbacks { 
-
-    public static final String TAG = "MyActivityLifecycleCallbacks";
-    
-    
-    public String mInfo = "";
-
-    public MyActivityLifecycleCallbacks() {
-        
-    }
-    
-    WinBollActivityManager getWinBollActivityManager() {
-        return WinBollActivityManager.getInstance(GlobalApplication.getInstance());
-    }
-
-    void createActivityeInfo(Activity activity) {
-        StringBuilder sb = new StringBuilder();
-        Intent receivedIntent = activity.getIntent();
-        sb.append("\nCallingActivity : \n");
-        if (activity.getCallingActivity() != null) {
-            sb.append(activity.getCallingActivity().getPackageName());
-        }
-        sb.append("\nReceived Intent Package : \n");
-        sb.append(receivedIntent.getPackage());
-
-        Bundle extras = receivedIntent.getExtras();
-        if (extras != null) {
-            for (String key : extras.keySet()) {
-                sb.append("\nIntentInfo");
-                sb.append("\n键: ");
-                sb.append(key);
-                sb.append(", 值: ");
-                sb.append(extras.get(key));
-                //Log.d("IntentInfo", "键: " + key + ", 值: " + extras.get(key));
-            }
-        }
-        mInfo = sb.toString();
-        //Log.d("IntentInfo", "发送Intent的应用包名: " + senderPackage);
-    }
-
-    public void showActivityeInfo() {
-        ToastUtils.show("ActivityeInfo : " + mInfo);
-        LogUtils.d(TAG, "ActivityeInfo : " + mInfo);
-    }
-
-    @Override 
-    public void onActivityCreated(Activity activity, Bundle savedInstanceState) { 
-        // 在这里可以做一些初始化相关的操作，例如记录Activity的创建时间等 
-        //System.out.println(activity.getLocalClassName() + " was created"); 
-        LogUtils.d(TAG, activity.getLocalClassName() + " was created");
-        createActivityeInfo(activity);
-        getWinBollActivityManager().add((IWinBollActivity)activity);
-    } 
-
-    @Override 
-    public void onActivityStarted(Activity activity) { 
-        //System.out.println(activity.getLocalClassName() + " was started");
-        LogUtils.d(TAG, activity.getLocalClassName() + " was started");
-        //createActivityeInfo(activity);
-    } 
-
-    @Override 
-    public void onActivityResumed(Activity activity) { 
-        //System.out.println(activity.getLocalClassName() + " was resumed");
-        LogUtils.d(TAG, activity.getLocalClassName() + " was resumed");
-        //createActivityeInfo(activity);
-    } 
-
-    @Override 
-    public void onActivityPaused(Activity activity) { 
-        //System.out.println(activity.getLocalClassName() + " was paused");
-        LogUtils.d(TAG, activity.getLocalClassName() + " was paused");
-    } 
-
-    @Override 
-    public void onActivityStopped(Activity activity) { 
-        //System.out.println(activity.getLocalClassName() + " was stopped");
-        LogUtils.d(TAG, activity.getLocalClassName() + " was stopped");
-    } 
-
-    @Override 
-    public void onActivitySaveInstanceState(Activity activity, Bundle outState) { 
-        // 可以在这里添加保存状态的自定义逻辑 
-    } 
-
-    @Override 
-    public void onActivityDestroyed(Activity activity) { 
-        //System.out.println(activity.getLocalClassName() + " was destroyed");
-        LogUtils.d(TAG, activity.getLocalClassName() + " was destroyed");
-        getWinBollActivityManager().registeRemove((IWinBollActivity)activity);
-    } 
-}

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

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

libappbase/src/main/res/drawable/bg_shadow.xml

@@ -10,8 +10,8 @@
         <shape android:shape="rectangle" > 
             <gradient 
                 android:angle="270" 
-                android:endColor="#0F000000" 
-                android:startColor="#0F000000" /> 
+                android:endColor="@color/colorAccent" 
+                android:startColor="@color/colorAccent" /> 
             <corners 
                 android:bottomLeftRadius="6dip" 
                 android:bottomRightRadius="6dip" 

libappbase/src/main/res/drawable/ic_dev_connected.xml

@@ -1,11 +0,0 @@
-<?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="M4,1C2.89,1 2,1.89 2,3V7C2,8.11 2.89,9 4,9H1V11H13V9H10C11.11,9 12,8.11 12,7V3C12,1.89 11.11,1 10,1H4M4,3H10V7H4V3M3,12V14H5V12H3M14,13C12.89,13 12,13.89 12,15V19C12,20.11 12.89,21 14,21H11V23H23V21H20C21.11,21 22,20.11 22,19V15C22,13.89 21.11,13 20,13H14M3,15V17H5V15H3M14,15H20V19H14V15M3,18V20H5V18H3M6,18V20H8V18H6M9,18V20H11V18H9Z"/>
-
-</vector>

libappbase/src/main/res/drawable/ic_dev_disconnected.xml

@@ -1,11 +0,0 @@
-<?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="M4,1C2.89,1 2,1.89 2,3V7C2,8.11 2.89,9 4,9H1V11H13V9H10C11.11,9 12,8.11 12,7V3C12,1.89 11.11,1 10,1H4M4,3H10V7H4V3M14,13C12.89,13 12,13.89 12,15V19C12,20.11 12.89,21 14,21H11V23H23V21H20C21.11,21 22,20.11 22,19V15C22,13.89 21.11,13 20,13H14M3.88,13.46L2.46,14.88L4.59,17L2.46,19.12L3.88,20.54L6,18.41L8.12,20.54L9.54,19.12L7.41,17L9.54,14.88L8.12,13.46L6,15.59L3.88,13.46M14,15H20V19H14V15Z"/>
-
-</vector>

libappbase/src/main/res/drawable/ic_email.xml

@@ -1,11 +0,0 @@
-<?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="M22,6C22,4.9 21.1,4 20,4H4C2.9,4 2,4.9 2,6V18C2,19.1 2.9,20 4,20H20C21.1,20 22,19.1 22,18V6M20,6L12,11L4,6H20M20,18H4V8L12,13L20,8V18Z"/>
-
-</vector>

libappbase/src/main/res/drawable/ic_email_alert.xml

@@ -1,11 +0,0 @@
-<?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="M24,7H22V13H24V7M24,15H22V17H24V15M20,6C20,4.9 19.1,4 18,4H2C0.9,4 0,4.9 0,6V18C0,19.1 0.9,20 2,20H18C19.1,20 20,19.1 20,18V6M18,6L10,11L2,6H18M18,18H2V8L10,13L18,8V18Z"/>
-
-</vector>

libappbase/src/main/res/drawable/ic_launcher.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-    android:clickable="true">
-    <item
-        android:width="256dp"
-        android:height="256dp"
+    android:clickable="true"
+    android:layout_width="24dp"
+	android:layout_height="24dp">
+    <item android:drawable="@drawable/ic_launcher_background"/> 
+    <item 
         android:left="0dp" 
         android:top="0dp" 
         android:right="0dp" 
         android:bottom="0dp"
-        android:drawable="@drawable/ic_winboll_logo">
-    </item>
+        android:drawable="@drawable/ic_launcher_foreground"/>
 </layer-list>

libappbase/src/main/res/drawable/ic_launcher_background.xml

@@ -5,7 +5,7 @@
     android:viewportWidth="108"
     android:viewportHeight="108">
     <path
-        android:fillColor="@color/colorPrimary"
+        android:fillColor="#FF005C12"
         android:pathData="M0,0h108v108h-108z" />
     <path
         android:fillColor="#00000000"

libappbase/src/main/res/drawable/ic_winboll.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-    android:clickable="true">
-    <item
-        android:width="256dp"
-        android:height="256dp"
-        android:left="0dp" 
-        android:top="0dp" 
-        android:right="0dp" 
-        android:bottom="0dp"
-        android:drawable="@drawable/ic_winboll_logo">
-    </item>
-</layer-list>

libappbase/src/main/res/drawable/ic_winboll_help.xml

@@ -1,27 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
-    android:height="512dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512">
-    <path
-        android:fillColor="#FF1E9B54"
-        android:strokeColor="#FFF8E733"
-        android:strokeWidth="20.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M254.63 35.45C374.95 35.45 473.38 133.89 473.38 254.2 473.38 374.51 374.95 472.95 254.63 472.95 134.32 472.95 35.88 374.51 35.88 254.2 35.88 133.89 134.32 35.45 254.63 35.45"/>
-    <path
-        android:fillColor="#FF000000"
-        android:strokeColor="#FF000000"
-        android:strokeWidth="1.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M257.28 361.25C266.56 361.25 274.14 368.84 274.14 378.11 274.14 387.39 266.56 394.98 257.28 394.98 248.01 394.98 240.42 387.39 240.42 378.11 240.42 368.84 248.01 361.25 257.28 361.25"/>
-    <path
-        android:fillColor="#00000000"
-        android:strokeColor="#FF000000"
-        android:strokeWidth="30.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M182.16 214.09C181.42 199.71 182.42 177.87 207.64 155.49 213.64 150.16 220.13 146.12 226.28 143.08 238.64 136.97 249.62 134.91 252.55 134.56 252.7 134.54 252.83 134.53 252.94 134.52 253.05 134.51 253.14 134.5 253.2 134.5 255.01 134.48 294.9 136.66 313.05 160.43 332.29 185.63 344.82 221.3 300.07 263.56 263.08 298.49 258.36 318 258.54 317.72"/>
-</vector>

libappbase/src/main/res/drawable/ic_winboll_log.xml

@@ -1,41 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
-    android:height="512dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512">
-    <path
-        android:fillColor="#FF1E9B54"
-        android:strokeColor="#FFF8E733"
-        android:strokeWidth="20.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M254.63 35.45C374.95 35.45 473.38 133.89 473.38 254.2 473.38 374.51 374.95 472.95 254.63 472.95 134.32 472.95 35.88 374.51 35.88 254.2 35.88 133.89 134.32 35.45 254.63 35.45"/>
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:strokeColor="#FF000000"
-        android:strokeWidth="20.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M151.49 130.96C151.49 130.96 348.53 130.96 348.53 130.96 348.53 130.96 348.53 393.46 348.53 393.46 348.53 393.46 151.49 393.46 151.49 393.46 151.49 393.46 151.49 130.96 151.49 130.96"/>
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:strokeColor="#FF000000"
-        android:strokeWidth="20.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M186.28 207.75C186.28 207.75 304.95 207.75 304.95 207.75 304.95 207.75 304.95 205.97 304.95 205.97 304.95 205.97 186.28 205.97 186.28 205.97 186.28 205.97 186.28 207.75 186.28 207.75"/>
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:strokeColor="#FF000000"
-        android:strokeWidth="20.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M186.28 263.52C186.28 263.52 304.95 263.52 304.95 263.52 304.95 263.52 304.95 264.41 304.95 264.41 304.95 264.41 186.28 264.41 186.28 264.41 186.28 264.41 186.28 263.52 186.28 263.52"/>
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:strokeColor="#FF000000"
-        android:strokeWidth="20.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M186.28 323.62C186.28 323.62 304.95 323.62 304.95 323.62 304.95 323.62 304.95 320.62 304.95 320.62 304.95 320.62 186.28 320.62 186.28 320.62 186.28 320.62 186.28 323.62 186.28 323.62"/>
-</vector>

libappbase/src/main/res/drawable/ic_winboll_logo.xml

@@ -1,48 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
-    android:height="512dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512">
-    <path
-        android:fillColor="#FF1E9B54"
-        android:strokeColor="#FFF8E733"
-        android:strokeWidth="20.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M254.63 35.45C374.95 35.45 473.38 133.89 473.38 254.2 473.38 374.51 374.95 472.95 254.63 472.95 134.32 472.95 35.88 374.51 35.88 254.2 35.88 133.89 134.32 35.45 254.63 35.45"/>
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:strokeColor="#FFFFFFFF"
-        android:strokeWidth="1.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M257.28 361.25C266.56 361.25 274.14 368.84 274.14 378.11 274.14 387.39 266.56 394.98 257.28 394.98 248.01 394.98 240.42 387.39 240.42 378.11 240.42 368.84 248.01 361.25 257.28 361.25"/>
-    <path
-        android:fillColor="#00000000"
-        android:strokeColor="#FF000000"
-        android:strokeWidth="30.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M182.16 214.09C181.42 199.71 182.42 177.87 207.64 155.49 213.64 150.16 220.13 146.12 226.28 143.08 238.64 136.97 249.62 134.91 252.55 134.56 252.7 134.54 252.83 134.53 252.94 134.52 253.05 134.51 253.14 134.5 253.2 134.5 255.01 134.48 294.9 136.66 313.05 160.43 332.29 185.63 344.82 221.3 300.07 263.56 263.08 298.49 258.36 318 258.54 317.72"/>
-    <path
-        android:fillColor="#00000000"
-        android:strokeColor="#FFFFFFFF"
-        android:strokeWidth="30.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M103.77 307.45C103.02 293.07 104.03 271.24 129.24 248.85 135.25 243.52 141.74 239.48 147.89 236.44 160.24 230.34 171.23 228.28 174.15 227.92 174.31 227.9 174.44 227.89 174.55 227.88 174.66 227.87 174.75 227.86 174.81 227.86 176.62 227.85 216.5 230.02 234.65 253.79 253.9 278.99 266.43 314.66 221.67 356.93 184.69 391.85 179.97 411.36 180.15 411.08"/>
-    <path
-        android:fillColor="#00000000"
-        android:strokeColor="#FFFFFFFF"
-        android:strokeWidth="30.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M248.17 309.83C247.43 295.45 248.43 273.62 273.64 251.23 279.65 245.9 286.14 241.86 292.29 238.82 304.65 232.72 315.63 230.65 318.55 230.3 318.71 230.28 318.84 230.27 318.95 230.26 319.06 230.25 319.15 230.24 319.21 230.24 321.02 230.22 360.9 232.4 379.06 256.17 398.3 281.37 410.83 317.04 366.08 359.31 329.09 394.23 324.37 413.74 324.55 413.46"/>
-    <path
-        android:fillColor="#00000000"
-        android:strokeColor="#FFFFFFFF"
-        android:strokeWidth="30.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M182.16 214.09C181.42 199.71 182.42 177.87 207.64 155.49 213.64 150.16 220.13 146.12 226.28 143.08 238.64 136.97 249.62 134.91 252.55 134.56 252.7 134.54 252.83 134.53 252.94 134.52 253.05 134.51 253.14 134.5 253.2 134.5 255.01 134.48 294.9 136.66 313.05 160.43 332.29 185.63 344.82 221.3 300.07 263.56 263.08 298.49 258.36 318 258.54 317.72"/>
-</vector>

libappbase/src/main/res/drawable/ic_winboll_point.xml

@@ -1,20 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
-    android:height="512dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512">
-    <path
-        android:fillColor="#FF1E9B54"
-        android:strokeColor="#FFF8E733"
-        android:strokeWidth="20.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M254.63 35.45C374.95 35.45 473.38 133.89 473.38 254.2 473.38 374.51 374.95 472.95 254.63 472.95 134.32 472.95 35.88 374.51 35.88 254.2 35.88 133.89 134.32 35.45 254.63 35.45"/>
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:strokeColor="#FFFFFFFF"
-        android:strokeWidth="1.0"
-        android:strokeLineCap="round"
-        android:strokeMiterLimit="10"
-        android:pathData="M257.28 361.25C266.56 361.25 274.14 368.84 274.14 378.11 274.14 387.39 266.56 394.98 257.28 394.98 248.01 394.98 240.42 387.39 240.42 378.11 240.42 368.84 248.01 361.25 257.28 361.25"/>
-</vector>

libappbase/src/main/res/drawable/ic_winbollbeta.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
-    android:clickable="true">
-    <item android:drawable="@drawable/ic_launcher_background"/> 
-    <item 
-        android:left="0dp" 
-        android:top="0dp" 
-        android:right="0dp" 
-        android:bottom="0dp"
-        android:drawable="@drawable/ic_winboll_logo"/>
-</layer-list>

libappbase/src/main/res/drawable/shape_gradient.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient
-        android:angle="180"
-        android:endColor="#FFFFFFFF"
-        android:startColor="#FFFFFFFF"
-        android:type="linear" />
-
-    <corners android:radius="10dp" />
-</shape>

libappbase/src/main/res/drawable/view_border.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <stroke
-        android:width="1dp"
-        android:color="#000000" /> <!-- 这里可调整边框宽度和颜色 -->
-    <solid android:color="@android:color/transparent" />
-</shape>

libappbase/src/main/res/layout/activity_log.xml

@@ -1,14 +1,16 @@
 <?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">
+    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="match_parent">
 
-	<cc.winboll.studio.libappbase.LogView
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:id="@+id/logview"/>
+    <cc.winboll.studio.libappbase.LogView
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1.0"
+        android:id="@+id/logview"/>
 
 </LinearLayout>
-

libappbase/src/main/res/layout/view_log.xml

@@ -83,21 +83,13 @@
 			android:layout_marginLeft="5dp"
 			android:layout_marginRight="5dp"/>
 
-		<EditText
-			android:layout_width="50dp"
-			android:ems="10"
-			android:layout_height="wrap_content"
-			android:singleLine="true"
-			android:id="@+id/tagsearch_et"/>
-
 		<HorizontalScrollView
 			android:layout_width="0dp"
 			android:layout_height="match_parent"
 			android:background="@drawable/bg_border"
 			android:scrollbars="none"
 			android:padding="5dp"
-			android:layout_weight="1.0"
-			android:id="@+id/viewlogHorizontalScrollView1">
+			android:layout_weight="1.0">
 
 			<cc.winboll.studio.libappbase.views.HorizontalListView
 				android:layout_width="wrap_content"

libappbase/src/main/res/menu/toolbar_appbase.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/item_minimal"
-        android:title="MINIMAL"
-        android:icon="@drawable/ic_winboll_point"
-        app:showAsAction="always"/>
-    <item
-        android:id="@+id/item_about"
-        android:title="ABOUT"
-        android:icon="@drawable/ic_winboll_logo"
-        app:showAsAction="always"/>
-    <item
-        android:id="@+id/item_help"
-        android:title="HELP"
-        android:icon="@drawable/ic_winboll_help"
-        app:showAsAction="always"/>
-
-    <item
-        android:id="@+id/item_log"
-        android:title="LOG"
-        android:icon="@drawable/ic_winboll_log"
-        app:showAsAction="always"/>
-</menu>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="APPBaseTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="APPBaseTheme" parent="@android:style/Theme.Holo.Light.NoActionBar">
         <item name="themeGlobalCrashActivity">@style/GlobalCrashActivityTheme</item>
     </style>
 

ollama/.gitignore

@@ -1 +0,0 @@
-/build

ollama/build.gradle

@@ -1,73 +0,0 @@
-apply plugin: 'com.android.application'
-apply from: '../.winboll/winboll_app_build.gradle'
-apply from: '../.winboll/winboll_lint_build.gradle'
-
-def genVersionName(def versionName){
-    // 检查编译标志位配置
-    assert (winbollBuildProps['stageCount'] != null)
-    assert (winbollBuildProps['baseVersion'] != null)
-    // 保存基础版本号
-    winbollBuildProps.setProperty("baseVersion", "${versionName}");
-    //保存编译标志配置
-    FileOutputStream fos = new FileOutputStream(winbollBuildPropsFile)
-    winbollBuildProps.store(fos, "${winbollBuildPropsDesc}");
-    fos.close();
-    
-    // 返回编译版本号
-    return "${versionName}." + winbollBuildProps['stageCount']
-}
-
-android {
-    compileSdkVersion 32
-    buildToolsVersion "32.0.0"
-
-    defaultConfig {
-        applicationId "cc.winboll.studio.ollama"
-        minSdkVersion 26
-        targetSdkVersion 29
-        versionCode 1
-        // versionName 更新后需要手动设置 
-        // .winboll/winbollBuildProps.properties 文件的 stageCount=0
-        // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "15.0"
-        if(true) {
-            versionName = genVersionName("${versionName}")
-        }
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-}
-
-dependencies {
-    api fileTree(dir: 'libs', include: ['*.jar'])
-    
-    api 'com.squareup.okhttp3:okhttp:4.4.1'
-    
-    // 吐司类库
-    api 'com.github.getActivity:ToastUtils:10.5'
-
-    // Android 类库
-    api 'com.android.support:appcompat-v7:28.0.0' // 包含 AppCompatActivity
-    // https://mvnrepository.com/artifact/com.android.support/support-compat
-    api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选）
-    // https://mvnrepository.com/artifact/com.android.support/support-v4
-    api 'com.android.support:support-v4:28.0.0'
-    // https://mvnrepository.com/artifact/com.android.support/support-media-compat
-    api 'com.android.support:support-media-compat:28.0.0'
-    // https://mvnrepository.com/artifact/com.android.support/support-core-utils
-    api 'com.android.support:support-core-utils:28.0.0'
-    // https://mvnrepository.com/artifact/com.android.support/support-core-ui
-    api 'com.android.support:support-core-ui:28.0.0'
-    // https://mvnrepository.com/artifact/com.android.support/support-fragment
-    api 'com.android.support:support-fragment:28.0.0'
-    // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7
-    api 'com.android.support:recyclerview-v7:28.0.0'
-    
-    api 'cc.winboll.studio:libappbase:15.0.9'
-    api 'cc.winboll.studio:libapputils:15.0.11'
-}

ollama/build.properties

@@ -1,8 +0,0 @@
-#Created by .winboll/winboll_app_build.gradle
-#Fri Mar 28 05:09:21 HKT 2025
-stageCount=1
-libraryProject=
-baseVersion=15.0
-publishVersion=15.0.0
-buildCount=0
-baseBetaVersion=15.0.1

ollama/proguard-rules.pro

@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile

ollama/src/beta/AndroidManifest.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" >
-
-    <application>
-
-        <!-- Put flavor specific code here -->
-
-    </application>
-
-</manifest>
-

ollama/src/beta/res/values/strings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-
-    <string name="app_name">Ollama +</string>
-
-</resources>

ollama/src/main/AndroidManifest.xml

@@ -1,41 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="cc.winboll.studio.ollama">
-
-    <!-- 拥有完全的网络访问权限 -->
-    <uses-permission android:name="android.permission.INTERNET"/>
-
-    <application
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/MyAppTheme"
-        android:resizeableActivity="true"
-        android:name=".App"
-        android:networkSecurityConfig="@xml/network_security_config">
-
-        <activity
-            android:name=".MainActivity"
-            android:label="@string/app_name"
-            android:exported="true">
-
-            <intent-filter>
-
-                <action android:name="android.intent.action.MAIN"/>
-
-                <category android:name="android.intent.category.LAUNCHER"/>
-
-            </intent-filter>
-
-        </activity>
-
-        <meta-data
-            android:name="android.max_aspect"
-            android:value="4.0"/>
-
-        <activity android:name=".GlobalApplication$CrashActivity"/>
-
-    </application>
-
-</manifest>

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

@@ -1,334 +0,0 @@
-package cc.winboll.studio.ollama;
-
-import android.app.Activity;
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.res.Resources;
-import android.graphics.Typeface;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.ViewGroup;
-import android.widget.HorizontalScrollView;
-import android.widget.ScrollView;
-import android.widget.TextView;
-import android.widget.Toast;
-import cc.winboll.studio.libappbase.GlobalApplication;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.Thread.UncaughtExceptionHandler;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class App extends GlobalApplication {
-
-    private static Handler MAIN_HANDLER = new Handler(Looper.getMainLooper());
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        //CrashHandler.getInstance().registerGlobal(this);
-        //CrashHandler.getInstance().registerPart(this);
-    }
-
-    public static void write(InputStream input, OutputStream output) throws IOException {
-        byte[] buf = new byte[1024 * 8];
-        int len;
-        while ((len = input.read(buf)) != -1) {
-            output.write(buf, 0, len);
-        }
-    }
-
-    public static void write(File file, byte[] data) throws IOException {
-        File parent = file.getParentFile();
-        if (parent != null && !parent.exists()) parent.mkdirs();
-
-        ByteArrayInputStream input = new ByteArrayInputStream(data);
-        FileOutputStream output = new FileOutputStream(file);
-        try {
-            write(input, output);
-        } finally {
-            closeIO(input, output);
-        }
-    }
-
-    public static String toString(InputStream input) throws IOException {
-        ByteArrayOutputStream output = new ByteArrayOutputStream();
-        write(input, output);
-        try {
-            return output.toString("UTF-8");
-        } finally {
-            closeIO(input, output);
-        }
-    }
-
-    public static void closeIO(Closeable... closeables) {
-        for (Closeable closeable : closeables) {
-            try {
-                if (closeable != null) closeable.close();
-            } catch (IOException ignored) {}
-        }
-    }
-
-    public static class CrashHandler {
-
-        public static final UncaughtExceptionHandler DEFAULT_UNCAUGHT_EXCEPTION_HANDLER = Thread.getDefaultUncaughtExceptionHandler();
-
-        private static CrashHandler sInstance;
-
-        private PartCrashHandler mPartCrashHandler;
-
-        public static CrashHandler getInstance() {
-            if (sInstance == null) {
-                sInstance = new CrashHandler();
-            }
-            return sInstance;
-        }
-
-        public void registerGlobal(Context context) {
-            registerGlobal(context, null);
-        }
-
-        public void registerGlobal(Context context, String crashDir) {
-            Thread.setDefaultUncaughtExceptionHandler(new UncaughtExceptionHandlerImpl(context.getApplicationContext(), crashDir));
-        }
-
-        public void unregister() {
-            Thread.setDefaultUncaughtExceptionHandler(DEFAULT_UNCAUGHT_EXCEPTION_HANDLER);
-        }
-
-        public void registerPart(Context context) {
-            unregisterPart(context);
-            mPartCrashHandler = new PartCrashHandler(context.getApplicationContext());
-            MAIN_HANDLER.postAtFrontOfQueue(mPartCrashHandler);
-        }
-
-        public void unregisterPart(Context context) {
-            if (mPartCrashHandler != null) {
-                mPartCrashHandler.isRunning.set(false);
-                mPartCrashHandler = null;
-            }
-        }
-
-        private static class PartCrashHandler implements Runnable {
-
-            private final Context mContext;
-
-            public AtomicBoolean isRunning = new AtomicBoolean(true);
-
-            public PartCrashHandler(Context context) {
-                this.mContext = context;
-            }
-
-            @Override
-            public void run() {
-                while (isRunning.get()) {
-                    try {
-                        Looper.loop();
-                    } catch (final Throwable e) {
-                        e.printStackTrace();
-                        if (isRunning.get()) {
-                            MAIN_HANDLER.post(new Runnable(){
-
-                                    @Override
-                                    public void run() {
-                                        Toast.makeText(mContext, e.toString(), Toast.LENGTH_LONG).show();
-                                    }
-                                });
-                        } else {
-                            if (e instanceof RuntimeException) {
-                                throw (RuntimeException)e;
-                            } else {
-                                throw new RuntimeException(e);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        private static class UncaughtExceptionHandlerImpl implements UncaughtExceptionHandler {
-
-            private static DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy_MM_dd-HH_mm_ss");
-
-            private final Context mContext;
-
-            private final File mCrashDir;
-
-            public UncaughtExceptionHandlerImpl(Context context, String crashDir) {
-                this.mContext = context;
-                this.mCrashDir = TextUtils.isEmpty(crashDir) ? new File(mContext.getExternalCacheDir(), "crash") : new File(crashDir);
-            }
-
-            @Override
-            public void uncaughtException(Thread thread, Throwable throwable) {
-                try {
-
-                    String log = buildLog(throwable);
-                    writeLog(log);
-
-                    try {
-                        Intent intent = new Intent(mContext, CrashActivity.class);
-                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                        intent.putExtra(Intent.EXTRA_TEXT, log);
-                        mContext.startActivity(intent);
-                    } catch (Throwable e) {
-                        e.printStackTrace();
-                        writeLog(e.toString());
-                    }
-
-                    throwable.printStackTrace();
-                    android.os.Process.killProcess(android.os.Process.myPid());
-                    System.exit(0);
-
-                } catch (Throwable e) {
-                    if (DEFAULT_UNCAUGHT_EXCEPTION_HANDLER != null) DEFAULT_UNCAUGHT_EXCEPTION_HANDLER.uncaughtException(thread, throwable);
-                }
-            }
-
-            private String buildLog(Throwable throwable) {
-                String time = DATE_FORMAT.format(new Date());
-
-                String versionName = "unknown";
-                long versionCode = 0;
-                try {
-                    PackageInfo packageInfo = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0);
-                    versionName = packageInfo.versionName;
-                    versionCode = Build.VERSION.SDK_INT >= 28 ? packageInfo.getLongVersionCode() : packageInfo.versionCode;
-                } catch (Throwable ignored) {}
-
-                LinkedHashMap<String, String> head = new LinkedHashMap<String, String>();
-                head.put("Time Of Crash", time);
-                head.put("Device", String.format("%s, %s", Build.MANUFACTURER, Build.MODEL));
-                head.put("Android Version", String.format("%s (%d)", Build.VERSION.RELEASE, Build.VERSION.SDK_INT));
-                head.put("App Version", String.format("%s (%d)", versionName, versionCode));
-                head.put("Kernel", getKernel());
-                head.put("Support Abis", Build.VERSION.SDK_INT >= 21 && Build.SUPPORTED_ABIS != null ? Arrays.toString(Build.SUPPORTED_ABIS): "unknown");
-                head.put("Fingerprint", Build.FINGERPRINT);
-
-                StringBuilder builder = new StringBuilder();
-
-                for (String key : head.keySet()) {
-                    if (builder.length() != 0) builder.append("\n");
-                    builder.append(key);
-                    builder.append(" :    ");
-                    builder.append(head.get(key));
-                }
-
-                builder.append("\n\n");
-                builder.append(Log.getStackTraceString(throwable));
-
-                return builder.toString(); 
-            }
-
-            private void writeLog(String log) {
-                String time = DATE_FORMAT.format(new Date());
-                File file = new File(mCrashDir, "crash_" + time + ".txt");
-                try {
-                    write(file, log.getBytes("UTF-8"));
-                } catch (Throwable e) {
-                    e.printStackTrace();
-                } 
-            }
-
-            private static String getKernel() {
-                try {
-                    return App.toString(new FileInputStream("/proc/version")).trim();
-                } catch (Throwable e) {
-                    return e.getMessage();
-                }
-            }
-        }
-    }
-
-    public static final class CrashActivity extends Activity {
-
-        private String mLog;
-
-        @Override
-        protected void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-
-            setTheme(android.R.style.Theme_DeviceDefault);
-            setTitle("App Crash");
-
-            mLog = getIntent().getStringExtra(Intent.EXTRA_TEXT);
-
-            ScrollView contentView = new ScrollView(this);
-            contentView.setFillViewport(true);
-
-            HorizontalScrollView horizontalScrollView = new HorizontalScrollView(this);
-
-            TextView textView = new TextView(this);
-            int padding = dp2px(16);
-            textView.setPadding(padding, padding, padding, padding);
-            textView.setText(mLog);
-            textView.setTextIsSelectable(true);
-            textView.setTypeface(Typeface.DEFAULT);
-            textView.setLinksClickable(true);
-
-            horizontalScrollView.addView(textView);
-            contentView.addView(horizontalScrollView, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
-
-            setContentView(contentView);
-        }
-
-        private void restart() {
-            Intent intent = getPackageManager().getLaunchIntentForPackage(getPackageName());
-            if (intent != null) {
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                startActivity(intent);
-            }
-            finish();
-            android.os.Process.killProcess(android.os.Process.myPid());
-            System.exit(0);
-        }
-
-        private static int dp2px(float dpValue) {
-            final float scale = Resources.getSystem().getDisplayMetrics().density;
-            return (int) (dpValue * scale + 0.5f);
-        }
-
-        @Override
-        public boolean onCreateOptionsMenu(Menu menu) {
-            menu.add(0, android.R.id.copy, 0, android.R.string.copy)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-            return super.onCreateOptionsMenu(menu);
-        }
-
-        @Override
-        public boolean onOptionsItemSelected(MenuItem item) {
-            switch (item.getItemId()) {
-                case android.R.id.copy:
-                    ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-                    cm.setPrimaryClip(ClipData.newPlainText(getPackageName(), mLog));
-                    return true;
-            }
-            return super.onOptionsItemSelected(item);
-        }
-
-        @Override
-        public void onBackPressed() {
-            restart();
-        }
-    }
-}

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

@@ -1,88 +0,0 @@
-package cc.winboll.studio.ollama;
-
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.support.v7.app.AppCompatActivity;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ScrollView;
-import android.widget.TextView;
-
-public class MainActivity extends AppCompatActivity {
-
-    public final static int MSG_APPEND = 0;
-
-    private Handler _Handler = new Handler(Looper.getMainLooper());
-    private TextView mtvMessage;
-    private EditText metAsk;
-    private Button mbtSend;
-    private ScrollView msvMessage;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        mtvMessage = (TextView) findViewById(R.id.message_tv);
-        metAsk = (EditText) findViewById(R.id.ask_et);
-        mbtSend = (Button) findViewById(R.id.send_bt);
-        msvMessage = findViewById(R.id.message_sv);
-
-        mbtSend.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    sendQuestion();
-                }
-            });
-    }
-
-
-    //
-    // 设置输入框获得焦点的类
-    //
-//    static class MyHandler extends Handler {
-//        WeakReference<MainActivity> mActivity;  
-//        MyHandler(MainActivity activity) {  
-//            mActivity = new WeakReference<MainActivity>(activity);  
-//        }
-//        public void handleMessage(Message msg) {
-//            MainActivity theActivity = mActivity.get();
-//            switch (msg.what) {
-//                case MSG_APPEND:
-//                    theActivity.mtvMessage.append((String)msg.obj);
-//                    break;
-//                default:
-//                    break;
-//            }
-//            super.handleMessage(msg);
-//        }
-//	}
-
-    private void sendQuestion() {
-        final String question = metAsk.getText().toString().trim();
-        if (!question.equals("")) {
-            mtvMessage.append("\n\nI ：" + metAsk.getText().toString() + "\nOllama : ");
-            metAsk.setText("");
-            new OllamaClient.SyncAskThread(question, new OllamaClient.OnAnswerCallback() {
-                    @Override
-                    public void onAnswer(final String answer) {
-                        _Handler.post(new Runnable() {
-                                @Override
-                                public void run() {
-                                    mtvMessage.append(answer);
-                                    msvMessage.post(new Runnable(){
-                                            @Override
-                                            public void run() {
-                                                msvMessage.fullScroll(View.FOCUS_DOWN);
-                                            }
-                                        });
-                                }
-                            });
-                    }
-                }).start();
-        }
-    }
-}
-

ollama/src/main/java/cc/winboll/studio/ollama/OllamaClient.java

@@ -1,223 +0,0 @@
-package cc.winboll.studio.ollama;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/27 19:55:28
- * @Describe 简单Http协议访问客户端
- */
-import cc.winboll.studio.libappbase.LogUtils;
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-import okhttp3.Call;
-import okhttp3.Callback;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-import okio.Buffer;
-import okio.Source;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-public class OllamaClient {
-
-    public static final String TAG = "OllamaClient";
-
-    private static final String API_BASE_URL = "https://ollama-api.winboll.cc";
-    //private static final String API_BASE_URL = "http://10.8.0.10:11434";
-    //private static final OkHttpClient client = new OkHttpClient();
-    private static final OkHttpClient client = new OkHttpClient.Builder()
-    .connectTimeout(60, TimeUnit.SECONDS)
-    .readTimeout(60, TimeUnit.SECONDS)
-    .writeTimeout(60, TimeUnit.SECONDS)
-    .build();
-
-    // 1. 生成文本示例
-//    static void generateText(String prompt, String model) {
-//        String url = API_BASE_URL + "/api/generate";
-//        try {
-//            JSONObject payload = new JSONObject()
-//                .put("model", model)
-//                .put("prompt", prompt)
-//                .put("temperature", 0.7)
-//                .put("max_tokens", 200);
-//
-//            Request request = new Request.Builder()
-//                .url(url)
-//                .post(RequestBody.create(payload.toString(), MediaType.get("application/json")))
-//                .build();
-//
-//            Response response = client.newCall(request).execute();
-//            if (response.isSuccessful()) {
-//                String result = response.body().string();
-//                String formattedStream = OllamaResponseFormatter.formatStreamingResponse(result);
-//                
-//                // 输出示例：
-//// [2025-03-27T19:34:29.274955439Z] [llama3.1:8b] It looks like you might have miss
-//// [2025-03-27T19:34:30.482553089Z] [llama3.1:8b] pelled the word "Ollama" or perhaps said something that is not a standard word in the English language. However, I'm here to provide information and assistance on various topics, so please let me know what you meant by "Ollama." Was it related to a name, place, movie, game, or something else?
-//                
-//                LogUtils.d(TAG, formattedStream);
-////                JSONObject json = new JSONObject(result);
-////                LogUtils.d(TAG, "生成结果: " + json.getString("response"));
-//                //System.out.println("生成结果: " + json.getString("response"));
-//            } else {
-//                LogUtils.d(TAG, "请求失败: " + response.code());
-//                //System.out.println("请求失败: " + response.code() + " " + response.message());
-//            }
-//        } catch (JSONException|IOException e) {
-//            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-//        }
-//    }
-
-    // 实时输出流式响应的函数
-    static void generateTextStream(String prompt, String model, final OnAnswerCallback callback) {
-        String url = API_BASE_URL + "/api/generate";
-        try {
-            JSONObject payload = new JSONObject()
-                .put("model", model)
-                .put("prompt", prompt)
-                .put("temperature", 0.7)
-                .put("max_tokens", 200)
-                .put("stream", true); // 启用流式响应
-
-            Request request = new Request.Builder()
-                .url(url)
-                .post(RequestBody.create(payload.toString(), MediaType.get("application/json")))
-                .build();
-
-            LogUtils.d(TAG, "Request request");
-            client.newCall(request).enqueue(new Callback() {
-                    @Override
-                    public void onFailure(Call call, IOException e) {
-                        LogUtils.d(TAG, "请求失败: " + e.getMessage());
-                    }
-
-                    @Override
-                    public void onResponse(Call call, Response response) throws IOException {
-                        if (!response.isSuccessful()) {
-                            LogUtils.d(TAG, "请求失败: " + response.code());
-                            return;
-                        }
-
-                        try (ResponseBody body = response.body()) {
-                            if (body == null) return;
-
-                            // 实时流式解析
-                            LogUtils.d(TAG, "实时流式解析");
-                            Source source = body.source();
-                            Buffer buffer = new Buffer();
-                            StringBuilder fullResponse = new StringBuilder();
-                            boolean isDone = false;
-
-                            while (!isDone && source.read(buffer, 1024) != -1) {
-                                //LogUtils.d(TAG, "!isDone");
-                                String chunk = buffer.readUtf8();
-                                String[] lines = chunk.split("\n");
-
-                                for (String line : lines) {
-                                    LogUtils.d(TAG, line);
-                                    if (line.trim().startsWith("{\"model\":")) {
-                                        LogUtils.d(TAG, line);
-                                        String jsonStr = line;
-                                        if (jsonStr.equals("[DONE]")) {
-                                            isDone = true;
-                                            LogUtils.d(TAG, "流式生成完成");
-                                            break;
-                                        }
-
-                                        try {
-                                            //LogUtils.d(TAG, jsonStr);
-                                            JSONObject json = new JSONObject(jsonStr);
-                                            //LogUtils.d(TAG, json.toString());
-                                            String responseText = json.getString("response");
-                                            //LogUtils.d(TAG, responseText);
-                                            fullResponse.append(responseText);
-
-                                            // 实时输出
-                                            callback.onAnswer(responseText);
-                                            LogUtils.d(TAG, "实时响应: " + responseText);
-
-                                            // 处理完成状态
-                                            if (json.getBoolean("done")) {
-                                                isDone = true;
-                                                String doneReason = json.optString("done_reason", "unknown");
-                                                LogUtils.d(TAG, "生成完成 (原因: " + doneReason + ")");
-                                                LogUtils.d(TAG, "完整回答: " + fullResponse.toString());
-                                            }
-                                        } catch (JSONException e) {
-                                            LogUtils.d(TAG, "JSON解析错误: " + e.getMessage());
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                });
-        } catch (JSONException e) {
-            LogUtils.d(TAG, "JSON格式错误: " + e.getMessage());
-        }
-    }
-
-
-
-    // 2. 获取模型列表示例
-    static void getModelList() {
-        String url = API_BASE_URL + "/v1/models";
-        LogUtils.d(TAG, "url : " + url);
-        Request request = new Request.Builder().url(url).build();
-
-        try {
-            Response response = client.newCall(request).execute();
-            if (response.isSuccessful()) {
-                LogUtils.d(TAG, response.body().string());
-//                JSONArray models = new JSONArray(response.body().string());
-//                //System.out.println("可用模型列表:");
-//                LogUtils.d(TAG, "可用模型列表:");
-//                for (int i = 0; i < models.length(); i++) {
-//                    JSONObject model = models.getJSONObject(i);
-//                    LogUtils.d(TAG, "- " + model.getString("name") + " (" + model.getString("size") + ")");
-//                    //System.out.println("- " + model.getString("name") + " (" + model.getString("size") + ")");
-//                }
-            } else {
-                LogUtils.d(TAG, "获取模型列表失败: " + response.code());
-                //System.out.println("获取模型列表失败: " + response.code());
-            }
-        } catch (IOException e) {
-            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-        }
-    }
-
-    static void unittest(String ask, OnAnswerCallback callback) {
-        // 获取模型列表
-        getModelList();
-
-        // 生成文本
-        generateTextStream(ask, "llama3.1:8b", callback);
-    }
-
-    public static class SyncAskThread extends Thread {
-        private String ask;
-        private OnAnswerCallback callback;
-
-        public SyncAskThread(String ask, OnAnswerCallback callback) {
-            this.ask = ask;
-            this.callback = callback;
-        }
-
-        @Override
-        public void run() {
-            super.run();
-            LogUtils.d(TAG, "run() start.");
-            unittest(ask, callback);
-            LogUtils.d(TAG, "run() end.");
-        }
-    }
-
-    public interface OnAnswerCallback {
-        void onAnswer(String answer);
-    }
-}
-    
-

ollama/src/main/java/cc/winboll/studio/ollama/OllamaResponseFormatter.java

@@ -1,72 +0,0 @@
-package cc.winboll.studio.ollama;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/28 03:38:50
- */
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-public class OllamaResponseFormatter {
-    public static final String TAG = "OllamaResponseFormatter";
-
-    // 处理模型列表响应
-    public static String formatModelList(String jsonResponse) {
-        try {
-            JSONObject json = new JSONObject(jsonResponse);
-            JSONArray models = json.getJSONArray("data");
-            StringBuilder sb = new StringBuilder();
-            sb.append("可用模型列表：\n");
-
-            for (int i = 0; i < models.length(); i++) {
-                JSONObject model = models.getJSONObject(i);
-                String modelId = model.getString("id");
-                sb.append(String.format("-%d. %s\n", i + 1, modelId));
-            }
-            return sb.toString();
-        } catch (Exception e) {
-            return "格式解析错误: " + e.getMessage();
-        }
-    }
-
-    // 处理流式生成文本响应
-    public static String formatStreamingResponse(String jsonResponse) {
-        try {
-            JSONObject json = new JSONObject(jsonResponse);
-            StringBuilder sb = new StringBuilder();
-            String responseText = json.getString("response");
-            boolean isDone = json.getBoolean("done");
-
-            // 添加时间戳和模型标识
-            String timestamp = json.getString("created_at");
-            String modelName = json.getString("model");
-            sb.append(String.format("[%s] [%s] ", timestamp, modelName));
-
-            // 处理响应内容
-            if (responseText.isEmpty() && isDone) {
-                sb.append("生成完成\n");
-            } else {
-                sb.append(responseText);
-                if (isDone) {
-                    String doneReason = json.optString("done_reason", "unknown");
-                    sb.append(String.format(" (完成原因: %s)\n", doneReason));
-                }
-            }
-            return sb.toString();
-        } catch (Exception e) {
-            return "格式解析错误: " + e.getMessage();
-        }
-    }
-
-    // 使用示例
-    public static void main(String[] args) {
-        // 模型列表测试
-        String modelListJson = "{\"object\":\"list\",\"data\":[{...}]}";
-        System.out.println(formatModelList(modelListJson));
-
-        // 流式响应测试
-        String streamingJson = "{\"model\":\"llama3.1:8b\",\"created_at\":\"2025-03-27T19:34:29.274955439Z\",\"response\":\"It\",\"done\":false}";
-        System.out.println(formatStreamingResponse(streamingJson));
-    }
-}
-

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

@@ -1,69 +0,0 @@
-<?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">
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:gravity="center_vertical|center_horizontal"
-		android:layout_weight="1.0"
-		android:orientation="vertical">
-
-		<ScrollView
-			android:layout_width="match_parent"
-			android:layout_height="0dp"
-			android:layout_weight="1.0"
-			android:id="@+id/message_sv">
-
-			<TextView
-				android:layout_width="match_parent"
-				android:layout_height="match_parent"
-				android:text="Asking Ollama ..."
-				android:textAppearance="?android:attr/textAppearanceLarge"
-				android:id="@+id/message_tv"/>
-
-		</ScrollView>
-
-		<LinearLayout
-			android:orientation="horizontal"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:gravity="center_vertical">
-
-			<EditText
-				android:layout_width="0dp"
-				android:ems="10"
-				android:layout_height="wrap_content"
-				android:id="@+id/ask_et"
-				android:layout_weight="1.0"
-				android:text="Hello, World!"/>
-
-			<Button
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:text="Send"
-				android:id="@+id/send_bt"/>
-
-		</LinearLayout>
-
-	</LinearLayout>
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_weight="1.0">
-
-		<cc.winboll.studio.libappbase.LogView
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:text="Text"
-			android:id="@+id/logview"/>
-
-	</LinearLayout>
-
-</LinearLayout>
-

ollama/src/main/res/values-v21/styles.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="AppTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
-        <item name="android:colorPrimary">@color/colorPrimary</item>
-        <item name="android:colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="android:colorAccent">@color/colorAccent</item>
-        <item name="android:navigationBarColor">?android:colorPrimary</item>
-	</style>
-</resources>

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

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="colorPrimary">#009688</color>
-    <color name="colorPrimaryDark">#00796B</color>
-    <color name="colorAccent">#FF9800</color>
-</resources>

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

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">Ollama</string>
-</resources>

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="MyAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-	</style>
-</resources>

ollama/src/main/res/xml/network_security_config.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<network-security-config>
-    <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="false">10.8.0.10</domain>
-    </domain-config>
-</network-security-config>

ollama/src/stage/AndroidManifest.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" >
-
-    <application>
-
-        <!-- Put flavor specific code here -->
-
-    </application>
-
-</manifest>
-

ollama/src/stage/res/values/strings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- Put flavor specific strings here -->
-
-</resources>

powerbell/build.gradle

@@ -19,17 +19,17 @@ def genVersionName(def versionName){
 
 android {
     compileSdkVersion 32
-    buildToolsVersion "33.0.3"
+    buildToolsVersion "32.0.0"
 
     defaultConfig {
         applicationId "cc.winboll.studio.powerbell"
-        minSdkVersion 24
-        targetSdkVersion 30
+        minSdkVersion 26
+        targetSdkVersion 29
         versionCode 6
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
         // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
-        versionName "4.0" 
+        versionName "15.0" 
         if(true) {
             versionName = genVersionName("${versionName}")
         }
@@ -41,15 +41,35 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
 }
 
 dependencies {
-	api 'cc.winboll.studio:winboll-shared:1.8.0'
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    
+    // 应用介绍页类库
+    api 'io.github.medyo:android-about-page:2.0.0'
+    // SSH
+    api 'com.jcraft:jsch:0.1.55'
+    // Html 解析
+    api 'org.jsoup:jsoup:1.13.1'
+    // 二维码类库
+    api 'com.google.zxing:core:3.4.1'
+    api 'com.journeyapps:zxing-android-embedded:3.6.0'
+    // 网络连接类库
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
+    // AndroidX 类库
+    api 'androidx.appcompat:appcompat:1.1.0'
+    api 'com.google.android.material:material:1.4.0'
+    //api 'androidx.viewpager:viewpager:1.0.0'
+    //api 'androidx.vectordrawable:vectordrawable:1.1.0'
+    //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
+    //api 'androidx.fragment:fragment:1.1.0'
+    
+    api 'cc.winboll.studio:libappbase:15.0.9'
+    api 'cc.winboll.studio:libapputils:15.0.15'
+    api 'cc.winboll.studio:libaes:15.0.7'
+
+	/*api 'cc.winboll.studio:winboll-shared:1.8.0'
     api 'io.github.medyo:android-about-page:2.0.0'
     api 'com.github.getActivity:ToastUtils:10.5'
     api 'com.jcraft:jsch:0.1.55'
@@ -67,6 +87,5 @@ dependencies {
     api 'com.squareup.okhttp3:okhttp:4.4.1'
     
     api 'cc.winboll.studio:libaes:7.6.0'
-    
-    api fileTree(dir: 'libs', include: ['*.jar'])
+    */
 }

powerbell/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Thu Jan 02 11:13:45 HKT 2025
-stageCount=6
+#Tue Mar 25 02:43:07 HKT 2025
+stageCount=4
 libraryProject=
-baseVersion=4.0
-publishVersion=4.0.5
+baseVersion=15.0
+publishVersion=15.0.3
 buildCount=0
-baseBetaVersion=4.0.6
+baseBetaVersion=15.0.4

powerbell/src/beta/AndroidManifest.xml

@@ -6,20 +6,18 @@
         tools:replace="android:icon"
         android:icon="@drawable/ic_launcher_beta">
 
-        <!-- Put flavor specific code here -->
         <provider
-            tools:replace="android:authorities"
             android:name="androidx.core.content.FileProvider"
             android:authorities="cc.winboll.studio.powerbell.beta.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
 
             <meta-data
-                tools:replace="android:resource"
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_provider"/>
 
         </provider>
+
     </application>
 
 </manifest>

powerbell/src/main/AndroidManifest.xml

@@ -2,10 +2,9 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="cc.winboll.studio.powerbell">
-    
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.autofocus" />
+
+    <!-- 拍摄照片和视频 -->
+    <uses-permission android:name="android.permission.CAMERA"/>
 
     <!-- 运行前台服务 -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
@@ -22,8 +21,15 @@
     <!-- MANAGE_EXTERNAL_STORAGE -->
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
 
+    <!-- 显示通知 -->
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+
+    <uses-feature android:name="android.hardware.camera"/>
+
+    <uses-feature android:name="android.hardware.camera.autofocus"/>
+
     <application
-        android:name=".GlobalApplication"
+        android:name=".App"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
@@ -34,7 +40,8 @@
 
         <activity
             android:name=".MainActivity"
-            android:launchMode="singleTask">
+            android:launchMode="singleTask"
+            android:exported="true">
 
             <intent-filter>
 
@@ -110,6 +117,8 @@
             android:name="android.max_aspect"
             android:value="4.0"/>
 
+        <activity android:name="cc.winboll.studio.powerbell.activities.BatteryReporterActivity"/>
+
         <activity android:name="cc.winboll.studio.powerbell.activities.AboutActivity"/>
 
     </application>

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

@@ -1,15 +1,14 @@
 package cc.winboll.studio.powerbell;
 
 import android.content.Context;
-import android.view.Gravity;
+import cc.winboll.studio.libappbase.GlobalApplication;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
 import cc.winboll.studio.powerbell.receivers.GlobalApplicationReceiver;
 import cc.winboll.studio.powerbell.utils.AppCacheUtils;
 import cc.winboll.studio.powerbell.utils.AppConfigUtils;
-import cc.winboll.studio.shared.app.WinBollApplication;
-import com.hjq.toast.ToastUtils;
-import com.hjq.toast.style.WhiteToastStyle;
+import cc.winboll.studio.libapputils.bean.DebugBean;
 
-public class GlobalApplication extends WinBollApplication {
+public class App extends GlobalApplication {
 
     public static final String TAG = "GlobalApplication";
 
@@ -21,13 +20,22 @@ public class GlobalApplication extends WinBollApplication {
     @Override
     public void onCreate() {
         super.onCreate();
+        // 设置应用调试标志
+        DebugBean debugBean = DebugBean.loadBean(this, DebugBean.class);
+        if (debugBean == null) {
+            //ToastUtils.show("debugBean == null");
+            setIsDebuging(this, false);
+        } else {
+            //ToastUtils.show("saveDebugStatus(" + String.valueOf(debugBean.isDebuging()) + ")");
+            setIsDebuging(this, debugBean.isDebuging());
+        }
         
         // 初始化 Toast 框架
-        ToastUtils.init(this);
+        //ToastUtils.init(this);
         // 设置 Toast 布局样式
         //ToastUtils.setView(R.layout.toast_custom_view);
-        ToastUtils.setStyle(new WhiteToastStyle());
-        ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
+        //ToastUtils.setStyle(new WhiteToastStyle());
+        //ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
 
         // 设置数据配置存储工具
         _mAppConfigUtils = getAppConfigUtils(this);

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

@@ -12,14 +12,14 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
 import cc.winboll.studio.libaes.views.AToolbar;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.LogView;
 import cc.winboll.studio.powerbell.MainActivity;
 import cc.winboll.studio.powerbell.activities.AboutActivity;
 import cc.winboll.studio.powerbell.activities.BackgroundPictureActivity;
+import cc.winboll.studio.powerbell.activities.BatteryReporterActivity;
 import cc.winboll.studio.powerbell.activities.ClearRecordActivity;
 import cc.winboll.studio.powerbell.fragments.MainViewFragment;
-import cc.winboll.studio.powerbell.utils.NotificationUtils;
-import cc.winboll.studio.shared.log.LogUtils;
-import cc.winboll.studio.shared.log.LogView;
 
 public class MainActivity extends Activity {
     public static final String TAG = "MainActivity";
@@ -28,7 +28,7 @@ public class MainActivity extends Activity {
     public static MainActivity _mMainActivity;
     LogView mLogView;
     //ArrayList<Fragment> mlistFragment;
-    GlobalApplication mApplication;
+    App mApplication;
     //AppConfigUtils mAppConfigUtils;
     Menu mMenu;
     Fragment mCurrentShowFragment;
@@ -48,12 +48,13 @@ public class MainActivity extends Activity {
         mLogView.updateLogView();
 
         _mMainActivity = MainActivity.this;
-        mApplication = (GlobalApplication) getApplication();
+        mApplication = (App) getApplication();
         //mAppConfigUtils = AppConfigUtils.getInstance(mApplication);
 
         // 初始化工具栏
         mAToolbar = (AToolbar) findViewById(R.id.toolbar);
         setActionBar(mAToolbar);
+        //mAToolbar.setSubtitle("Main");
         mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
 
         if (mMainViewFragment == null) {
@@ -64,8 +65,10 @@ public class MainActivity extends Activity {
         }
         showFragment(mMainViewFragment);
 
-        NotificationUtils notificationUtils = new NotificationUtils(this);
-        notificationUtils.createNotificationChannel();
+//        NotificationHelper notificationUtils = new NotificationHelper(this);
+//        notificationUtils.createNotificationChannels();
+
+
     }
 
     void showFragment(Fragment fragment) {
@@ -113,7 +116,7 @@ public class MainActivity extends Activity {
     protected void onResume() {
         super.onResume();
         // 回到窗口自动取消提醒消息
-        NotificationUtils.cancelRemindNotification(this);
+        //NotificationHelper.cancelRemindNotification(this);
 
         reloadBackground();
     }
@@ -140,8 +143,11 @@ public class MainActivity extends Activity {
         super.onOptionsItemSelected(item); 
         int menuItemId = item.getItemId();
         if (menuItemId == R.id.action_about) {
+            Intent intent = new Intent(this, AboutActivity.class);
+            startActivity(intent);
+        } else if (menuItemId == R.id.action_battery_reporter) {
             Intent intent = new Intent();
-            intent.setClass(this, AboutActivity.class);
+            intent.setClass(this, BatteryReporterActivity.class);
             startActivity(intent);
         } else if (menuItemId == R.id.action_clearrecord) {
             Intent intent = new Intent();

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

@@ -1,42 +1,65 @@
 package cc.winboll.studio.powerbell.activities;
 
 /**
- * @Author ZhanGSKen@QQ.COM
- * @Date 2024/07/12 13:33:59
- * @Describe AboutActivity
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/25 01:16:32
+ * @Describe 应用介绍窗口
  */
 import android.app.Activity;
+import android.content.Context;
 import android.os.Bundle;
-import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
 import cc.winboll.studio.libaes.views.AToolbar;
+import cc.winboll.studio.libaes.winboll.APPInfo;
+import cc.winboll.studio.libaes.winboll.AboutView;
 import cc.winboll.studio.powerbell.R;
 
 public class AboutActivity extends Activity {
 
-    public static final String TAG = "AboutActivity";
+    Context mContext;
 
-    AToolbar mAToolbar;
+    public static final String TAG = "AboutActivity";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
+        mContext = this;
 
         // 初始化工具栏
-        mAToolbar = (AToolbar) findViewById(R.id.toolbar);
-        setActionBar(mAToolbar);
-        //mAToolbar.setTitle(getTitle() + "-" + getString(R.string.subtitle_activity_backgroundpicture));
-        mAToolbar.setSubtitle(R.string.subtitle_activity_about);
-        mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
-        mAToolbar.setSubtitleTextAppearance(this, R.style.Toolbar_SubTitleText);
-        //mAToolbar.setBackgroundColor(getColor(R.color.colorPrimary));
+        AToolbar mAToolbar = (AToolbar) findViewById(R.id.toolbar);
         setActionBar(mAToolbar);
+        mAToolbar.setSubtitle(getString(R.string.text_about));
+        //mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
         getActionBar().setDisplayHomeAsUpEnabled(true);
-        mAToolbar.setNavigationOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    finish();
-                }
-            });
+
+        AboutView aboutView = CreateAboutView();
+        // 在 Activity 的 onCreate 或其他生命周期方法中调用
+        LinearLayout llRoot = findViewById(R.id.root_ll);
+        //layout.setOrientation(LinearLayout.VERTICAL);
+        // 创建布局参数（宽度和高度）
+        ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.MATCH_PARENT
+        );
+        llRoot.addView(aboutView, params);
+
+    }
+
+    public AboutView CreateAboutView() {
+        String szBranchName = "powerbell";
+        APPInfo appInfo = new APPInfo();
+        appInfo.setAppName(getString(R.string.app_name));
+        appInfo.setAppIcon(R.drawable.ic_launcher);
+        appInfo.setAppDescription(getString(R.string.app_description));
+        appInfo.setAppGitName("APP");
+        appInfo.setAppGitOwner("Studio");
+        appInfo.setAppGitAPPBranch(szBranchName);
+        appInfo.setAppGitAPPSubProjectFolder(szBranchName);
+        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=PowerBell");
+        appInfo.setAppAPKName("PowerBell");
+        appInfo.setAppAPKFolderName("PowerBell");
+        return new AboutView(mContext, appInfo);
     }
 }

powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BackgroundPictureActivity.java

@@ -13,6 +13,8 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.Toast;
 import cc.winboll.studio.libaes.views.AToolbar;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
 import cc.winboll.studio.powerbell.R;
 import cc.winboll.studio.powerbell.activities.BackgroundPictureActivity;
 import cc.winboll.studio.powerbell.beans.BackgroundPictureBean;
@@ -20,8 +22,6 @@ import cc.winboll.studio.powerbell.dialogs.BackgroundPicturePreviewDialog;
 import cc.winboll.studio.powerbell.utils.BackgroundPictureUtils;
 import cc.winboll.studio.powerbell.utils.FileUtils;
 import cc.winboll.studio.powerbell.utils.UriUtil;
-import cc.winboll.studio.shared.log.LogUtils;
-import com.hjq.toast.ToastUtils;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -84,8 +84,8 @@ implements BackgroundPicturePreviewDialog.IOnRecivedPictureListener {
         setActionBar(mAToolbar);
         //mAToolbar.setTitle(getTitle() + "-" + getString(R.string.subtitle_activity_backgroundpicture));
         mAToolbar.setSubtitle(R.string.subtitle_activity_backgroundpicture);
-        mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
-        mAToolbar.setSubtitleTextAppearance(this, R.style.Toolbar_SubTitleText);
+        //mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
+        //mAToolbar.setSubtitleTextAppearance(this, R.style.Toolbar_SubTitleText);
         //mAToolbar.setBackgroundColor(getColor(R.color.colorPrimary));
         setActionBar(mAToolbar);
         getActionBar().setDisplayHomeAsUpEnabled(true);

powerbell/src/main/java/cc/winboll/studio/powerbell/activities/BatteryReporterActivity.java

@@ -0,0 +1,51 @@
+package cc.winboll.studio.powerbell.activities;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/22 14:20:15
+ */
+import android.app.Activity;
+import android.os.Bundle;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import cc.winboll.studio.powerbell.R;
+import cc.winboll.studio.powerbell.adapters.BatteryAdapter;
+import cc.winboll.studio.powerbell.beans.BatteryData;
+import java.util.Arrays;
+import java.util.List;
+
+public class BatteryReporterActivity extends Activity {
+    public static final String TAG = "BatteryReporterActivity";
+
+    private RecyclerView rvBatteryReport;
+    private BatteryAdapter adapter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_battery_reporter);
+
+        rvBatteryReport = findViewById(R.id.rvBatteryReport);
+        setupRecyclerView();
+        loadSampleData();
+    }
+
+    private void setupRecyclerView() {
+        adapter = new BatteryAdapter();
+        rvBatteryReport.setLayoutManager(new LinearLayoutManager(this));
+        rvBatteryReport.setAdapter(adapter);
+        rvBatteryReport.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL));
+    }
+
+    private void loadSampleData() {
+        List<BatteryData> dataList = Arrays.asList(
+            new BatteryData(95, "01:23:45", "00:05:12"),
+            new BatteryData(80, "02:15:30", "00:10:00"),
+            new BatteryData(65, "03:45:15", "00:15:30"),
+            new BatteryData(50, "05:00:00", "00:20:45")
+        );
+        adapter.updateData(dataList);
+    }
+}
+

powerbell/src/main/java/cc/winboll/studio/powerbell/activities/ClearRecordActivity.java

@@ -7,14 +7,14 @@ import android.view.View;
 import android.widget.TextView;
 import cc.winboll.studio.libaes.views.AOHPCTCSeekBar;
 import cc.winboll.studio.libaes.views.AToolbar;
-import cc.winboll.studio.powerbell.GlobalApplication;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
+import cc.winboll.studio.powerbell.App;
 import cc.winboll.studio.powerbell.R;
 import cc.winboll.studio.powerbell.beans.BatteryInfoBean;
 import cc.winboll.studio.powerbell.receivers.ControlCenterServiceReceiver;
 import cc.winboll.studio.powerbell.utils.AppCacheUtils;
 import cc.winboll.studio.powerbell.utils.StringUtils;
-import cc.winboll.studio.shared.log.LogUtils;
-import com.hjq.toast.ToastUtils;
 import java.util.ArrayList;
 
 public class ClearRecordActivity extends Activity {
@@ -23,21 +23,21 @@ public class ClearRecordActivity extends Activity {
 
     AToolbar mAToolbar;
     TextView mtvRecordText;
-    GlobalApplication mApplication;
+    App mApplication;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_clearrecord);
-        mApplication = (GlobalApplication) getApplication();
+        mApplication = (App) getApplication();
 
         // 初始化工具栏
         mAToolbar = (AToolbar) findViewById(R.id.toolbar);
         setActionBar(mAToolbar);
         //mAToolbar.setTitle(getTitle() + " - " + getString(R.string.subtitle_activity_clearrecord));
         mAToolbar.setSubtitle(R.string.subtitle_activity_clearrecord);
-        mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
-        mAToolbar.setSubtitleTextAppearance(this, R.style.Toolbar_SubTitleText);
+        //mAToolbar.setTitleTextAppearance(this, R.style.Toolbar_TitleText);
+        //mAToolbar.setSubtitleTextAppearance(this, R.style.Toolbar_SubTitleText);
         //mAToolbar.setBackgroundColor(getColor(R.color.colorPrimary));
         setActionBar(mAToolbar);
         getActionBar().setDisplayHomeAsUpEnabled(true);

powerbell/src/main/java/cc/winboll/studio/powerbell/adapters/BatteryAdapter.java

@@ -0,0 +1,61 @@
+package cc.winboll.studio.powerbell.adapters;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/22 14:38:55
+ * @Describe 电池报告数据适配器
+ */
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import androidx.recyclerview.widget.RecyclerView;
+import cc.winboll.studio.powerbell.R;
+import cc.winboll.studio.powerbell.adapters.BatteryAdapter;
+import cc.winboll.studio.powerbell.beans.BatteryData;
+import java.util.ArrayList;
+import java.util.List;
+
+public class BatteryAdapter extends RecyclerView.Adapter<BatteryAdapter.ViewHolder> {
+    public static final String TAG = "BatteryAdapter";
+    private List<BatteryData> dataList = new ArrayList<>();
+
+    public void updateData(List<BatteryData> newData) {
+        dataList = newData;
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext())
+            .inflate(R.layout.item_battery_report, parent, false);
+        return new ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(ViewHolder holder, int position) {
+        BatteryData item = dataList.get(position);
+        holder.tvLevel.setText(String.format("%d%%", item.getCurrentLevel()));
+        holder.tvDischargeTime.setText("使用时间: " + item.getDischargeTime());
+        holder.tvChargeTime.setText("充电时间: " + item.getChargeTime());
+    }
+
+    @Override
+    public int getItemCount() {
+        return dataList.size();
+    }
+
+    static class ViewHolder extends RecyclerView.ViewHolder {
+        TextView tvLevel;
+        TextView tvDischargeTime;
+        TextView tvChargeTime;
+
+        ViewHolder(View itemView) {
+            super(itemView);
+            tvLevel = itemView.findViewById(R.id.tvLevel);
+            tvDischargeTime = itemView.findViewById(R.id.tvDischargeTime);
+            tvChargeTime = itemView.findViewById(R.id.tvChargeTime);
+        }
+    }
+}
+

powerbell/src/main/java/cc/winboll/studio/powerbell/beans/AppConfigBean.java

@@ -7,7 +7,7 @@ package cc.winboll.studio.powerbell.beans;
  */
 import android.util.JsonReader;
 import android.util.JsonWriter;
-import cc.winboll.studio.shared.app.BaseBean;
+import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;
 import java.io.Serializable;
 

powerbell/src/main/java/cc/winboll/studio/powerbell/beans/BackgroundPictureBean.java

@@ -7,7 +7,7 @@ package cc.winboll.studio.powerbell.beans;
  */
 import android.util.JsonReader;
 import android.util.JsonWriter;
-import cc.winboll.studio.shared.app.BaseBean;
+import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;
 
 public class BackgroundPictureBean extends BaseBean {

powerbell/src/main/java/cc/winboll/studio/powerbell/beans/BatteryData.java

@@ -0,0 +1,26 @@
+package cc.winboll.studio.powerbell.beans;
+
+/**
+ * @Author ZhanGSKen@AliYun.Com
+ * @Date 2025/03/22 14:30:51
+ * @Describe 电池报告数据模型
+ */
+public class BatteryData {
+
+    public static final String TAG = "BatteryData";
+
+    private int currentLevel;
+    private String dischargeTime;
+    private String chargeTime;
+
+    public BatteryData(int currentLevel, String dischargeTime, String chargeTime) {
+        this.currentLevel = currentLevel;
+        this.dischargeTime = dischargeTime;
+        this.chargeTime = chargeTime;
+    }
+
+    public int getCurrentLevel() { return currentLevel; }
+    public String getDischargeTime() { return dischargeTime; }
+    public String getChargeTime() { return chargeTime; }
+}
+

powerbell/src/main/java/cc/winboll/studio/powerbell/beans/BatteryInfoBean.java

@@ -2,7 +2,7 @@ package cc.winboll.studio.powerbell.beans;
 
 import android.util.JsonReader;
 import android.util.JsonWriter;
-import cc.winboll.studio.shared.app.BaseBean;
+import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;
 import java.io.Serializable;
 

powerbell/src/main/java/cc/winboll/studio/powerbell/beans/ControlCenterServiceBean.java

@@ -7,7 +7,7 @@ package cc.winboll.studio.powerbell.beans;
  */
 import android.util.JsonReader;
 import android.util.JsonWriter;
-import cc.winboll.studio.shared.app.BaseBean;
+import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;
 
 public class ControlCenterServiceBean extends BaseBean {

powerbell/src/main/java/cc/winboll/studio/powerbell/dialogs/BackgroundPicturePreviewDialog.java

@@ -1,5 +1,4 @@
 package cc.winboll.studio.powerbell.dialogs;
-import cc.winboll.studio.powerbell.R;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
@@ -10,12 +9,13 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.Toast;
+import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.powerbell.MainActivity;
+import cc.winboll.studio.powerbell.R;
 import cc.winboll.studio.powerbell.activities.BackgroundPictureActivity;
 import cc.winboll.studio.powerbell.utils.BackgroundPictureUtils;
 import cc.winboll.studio.powerbell.utils.FileUtils;
 import cc.winboll.studio.powerbell.utils.UriUtil;
-import cc.winboll.studio.shared.log.LogUtils;
 import java.io.File;
 import java.io.IOException;
 

powerbell/src/main/java/cc/winboll/studio/powerbell/fragments/MainViewFragment.java

@@ -17,7 +17,8 @@ import android.widget.LinearLayout;
 import android.widget.SeekBar;
 import android.widget.Switch;
 import android.widget.TextView;
-import cc.winboll.studio.powerbell.GlobalApplication;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.powerbell.App;
 import cc.winboll.studio.powerbell.R;
 import cc.winboll.studio.powerbell.activities.BackgroundPictureActivity;
 import cc.winboll.studio.powerbell.beans.BackgroundPictureBean;
@@ -27,7 +28,6 @@ import cc.winboll.studio.powerbell.utils.BackgroundPictureUtils;
 import cc.winboll.studio.powerbell.utils.ServiceUtils;
 import cc.winboll.studio.powerbell.views.BatteryDrawable;
 import cc.winboll.studio.powerbell.views.VerticalSeekBar;
-import cc.winboll.studio.shared.log.LogUtils;
 import java.io.File;
 
 public class MainViewFragment extends Fragment {
@@ -78,7 +78,7 @@ public class MainViewFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         mView = inflater.inflate(R.layout.fragment_mainview, container, false);
         _mMainViewFragment = MainViewFragment.this;
-        mAppConfigUtils = GlobalApplication.getAppConfigUtils(getActivity());
+        mAppConfigUtils = App.getAppConfigUtils(getActivity());
         
         // 获取指定ID的View实例
         final View mainImageView = mView.findViewById(R.id.fragmentmainviewImageView1);

powerbell/src/main/java/cc/winboll/studio/powerbell/receivers/ControlCenterServiceReceiver.java

@@ -4,11 +4,11 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.powerbell.beans.AppConfigBean;
 import cc.winboll.studio.powerbell.services.ControlCenterService;
 import cc.winboll.studio.powerbell.utils.AppConfigUtils;
 import cc.winboll.studio.powerbell.utils.BatteryUtils;
-import cc.winboll.studio.shared.log.LogUtils;
 import java.lang.ref.WeakReference;
 
 public class ControlCenterServiceReceiver extends BroadcastReceiver {
@@ -52,6 +52,13 @@ public class ControlCenterServiceReceiver extends BroadcastReceiver {
                 appConfigBean.setCurrentValue(nTheQuantityOfElectricity);
                 appConfigBean.setIsCharging(isCharging);
                 mwrService.get().startRemindThread(appConfigBean);
+                
+                // 保存电池报告
+                // 示例数据更新逻辑
+//                List<BatteryData> newData = new ArrayList<>(adapter.getDataList());
+//                newData.add(0, new BatteryData(percentage, "00:00:00", "00:00:00"));
+//                adapter.updateData(newData);
+                
                 // 保存好新的电池状态标志
                 _mIsCharging = isCharging;
                 _mnTheQuantityOfElectricityOld = nTheQuantityOfElectricity;

powerbell/src/main/java/cc/winboll/studio/powerbell/receivers/GlobalApplicationReceiver.java

@@ -4,18 +4,18 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import cc.winboll.studio.powerbell.GlobalApplication;
+import cc.winboll.studio.powerbell.App;
 import cc.winboll.studio.powerbell.fragments.MainViewFragment;
 import cc.winboll.studio.powerbell.utils.AppConfigUtils;
 import cc.winboll.studio.powerbell.utils.BatteryUtils;
-import cc.winboll.studio.powerbell.utils.NotificationUtils;
+import cc.winboll.studio.powerbell.utils.NotificationHelper;
 
 public class GlobalApplicationReceiver extends BroadcastReceiver {
 
     public static final String TAG = "GlobalApplicationReceiver";
 
     AppConfigUtils mAppConfigUtils;
-    GlobalApplication mGlobalApplication;
+    App mGlobalApplication;
     // 存储电量指示值，
     // 用于校验电量消息时的电量变化
     static volatile int _mnTheQuantityOfElectricityOld = -1;
@@ -24,10 +24,10 @@ public class GlobalApplicationReceiver extends BroadcastReceiver {
     // 便利封装 registerAction() 函数
     GlobalApplicationReceiver mReceiver;
 
-    public GlobalApplicationReceiver(GlobalApplication globalApplication) {
+    public GlobalApplicationReceiver(App globalApplication) {
         mReceiver = this;
         mGlobalApplication = globalApplication;
-        mAppConfigUtils = GlobalApplication.getAppConfigUtils(mGlobalApplication);
+        mAppConfigUtils = App.getAppConfigUtils(mGlobalApplication);
     }
 
     @Override
@@ -45,9 +45,9 @@ public class GlobalApplicationReceiver extends BroadcastReceiver {
             // 新电池状态标志某一个有变化就更新显示信息
             if (_mIsCharging != isCharging || _mnTheQuantityOfElectricityOld != nTheQuantityOfElectricity) {
                 // 电池状态改变先取消旧的提醒消息
-                NotificationUtils.cancelRemindNotification(context);
+                //NotificationHelper.cancelRemindNotification(context);
                 
-                GlobalApplication.getAppCacheUtils(context).addChangingTime(nTheQuantityOfElectricity);
+                App.getAppCacheUtils(context).addChangingTime(nTheQuantityOfElectricity);
                 MainViewFragment.sendMsgCurrentValueBattery(nTheQuantityOfElectricity);
                 // 保存好新的电池状态标志
                 _mIsCharging = isCharging;

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

@@ -9,10 +9,10 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
-import cc.winboll.studio.powerbell.GlobalApplication;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.powerbell.App;
 import cc.winboll.studio.powerbell.services.ControlCenterService;
 import cc.winboll.studio.powerbell.utils.ServiceUtils;
-import cc.winboll.studio.shared.log.LogUtils;
 
 public class MainReceiver extends BroadcastReceiver {
 
@@ -27,7 +27,7 @@ public class MainReceiver extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         String szAction = intent.getAction();
         if (szAction.equals(ACTION_BOOT_COMPLETED)) {
-            boolean isEnableService = GlobalApplication.getAppConfigUtils(context).getIsEnableService();
+            boolean isEnableService = App.getAppConfigUtils(context).getIsEnableService();
             if (isEnableService) {
                 if (ServiceUtils.isServiceAlive(context.getApplicationContext(), ControlCenterService.class.getName()) == false) {
                     LogUtils.d(TAG, "wakeupAndBindMain() Wakeup... ControlCenterService");

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

@@ -6,7 +6,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
-import cc.winboll.studio.powerbell.GlobalApplication;
+import cc.winboll.studio.powerbell.App;
 import cc.winboll.studio.powerbell.services.ControlCenterService;
 import cc.winboll.studio.powerbell.utils.AppConfigUtils;
 import cc.winboll.studio.powerbell.utils.ServiceUtils;
@@ -29,7 +29,7 @@ public class AssistantService extends Service {
     public void onCreate() {
         //LogUtils.d(TAG, "onCreate");
         super.onCreate();
-        mAppConfigUtils = GlobalApplication.getAppConfigUtils(this);
+        mAppConfigUtils = App.getAppConfigUtils(this);
 
         //mMyBinder = new MyBinder();
         if (mMyServiceConnection == null) {

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

@@ -8,14 +8,19 @@ package cc.winboll.studio.powerbell.services;
  * Android Service之onStartCommand方法研究
  * https://blog.csdn.net/cyp331203/article/details/38920491
  */
-import cc.winboll.studio.powerbell.R;
+import android.app.Notification;
 import android.app.Service;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
-import cc.winboll.studio.powerbell.GlobalApplication;
+import android.widget.RemoteViews;
+import cc.winboll.studio.libappbase.LogUtils;
+import cc.winboll.studio.libappbase.utils.ToastUtils;
+import cc.winboll.studio.powerbell.App;
+import cc.winboll.studio.powerbell.MainActivity;
+import cc.winboll.studio.powerbell.R;
 import cc.winboll.studio.powerbell.beans.AppConfigBean;
 import cc.winboll.studio.powerbell.beans.NotificationMessage;
 import cc.winboll.studio.powerbell.handlers.ControlCenterServiceHandler;
@@ -24,11 +29,9 @@ import cc.winboll.studio.powerbell.services.AssistantService;
 import cc.winboll.studio.powerbell.threads.RemindThread;
 import cc.winboll.studio.powerbell.utils.AppCacheUtils;
 import cc.winboll.studio.powerbell.utils.AppConfigUtils;
-import cc.winboll.studio.powerbell.utils.NotificationUtils;
+import cc.winboll.studio.powerbell.utils.NotificationHelper;
 import cc.winboll.studio.powerbell.utils.ServiceUtils;
 import cc.winboll.studio.powerbell.utils.StringUtils;
-import cc.winboll.studio.shared.log.LogUtils;
-import com.hjq.toast.ToastUtils;
 
 public class ControlCenterService extends Service {
 
@@ -43,7 +46,8 @@ public class ControlCenterService extends Service {
     AppConfigUtils mAppConfigUtils;
     AppCacheUtils mAppCacheUtils;
     // 前台服务通知工具
-    NotificationUtils mNotificationUtils;
+    NotificationHelper mNotificationHelper;
+    Notification notification;
     RemindThread mRemindThread;
     ControlCenterServiceHandler mControlCenterServiceHandler;
     MyServiceConnection mMyServiceConnection;
@@ -64,9 +68,11 @@ public class ControlCenterService extends Service {
         super.onCreate();
         _mControlCenterService = ControlCenterService.this;
         isServiceRunning = false;
-        mAppConfigUtils = GlobalApplication.getAppConfigUtils(this);
-        mAppCacheUtils = GlobalApplication.getAppCacheUtils(this);
-        mNotificationUtils = new NotificationUtils(ControlCenterService.this);
+        mAppConfigUtils = App.getAppConfigUtils(this);
+        mAppCacheUtils = App.getAppCacheUtils(this);
+        mNotificationHelper = new NotificationHelper(ControlCenterService.this);
+        
+        
         if (mMyServiceConnection == null) {
             mMyServiceConnection = new MyServiceConnection();
         }
@@ -92,10 +98,16 @@ public class ControlCenterService extends Service {
             // 唤醒守护进程
             wakeupAndBindAssistant();
             // 显示前台通知栏
-            NotificationMessage notificationMessage=createNotificationMessage();
-            //Toast.makeText(getApplication(), "", Toast.LENGTH_SHORT).show();
-            mNotificationUtils.createForegroundNotification(this, notificationMessage);
-            mNotificationUtils.createRemindNotification(this, notificationMessage);
+            // 在Service中
+            NotificationHelper helper = new NotificationHelper(this);
+            Intent intent = new Intent(this, MainActivity.class);
+            notification = helper.showForegroundNotification(intent, getString(R.string.app_name), "Service Running, Click to open app");
+            startForeground(NotificationHelper.FOREGROUND_NOTIFICATION_ID, notification);
+            
+//            NotificationMessage notificationMessage=createNotificationMessage();
+//            //Toast.makeText(getApplication(), "", Toast.LENGTH_SHORT).show();
+//            mNotificationUtils.createForegroundNotification(this, notificationMessage);
+//            mNotificationUtils.createRemindNotification(this, notificationMessage);
 
             if (mControlCenterServiceReceiver == null) {
                 // 注册广播接收器
@@ -118,7 +130,7 @@ public class ControlCenterService extends Service {
     }
 
     NotificationMessage createNotificationMessage() {
-        String szTitle = ((GlobalApplication)getApplication()).getString(R.string.app_name);
+        String szTitle = ((App)getApplication()).getString(R.string.app_name);
         String szContent = getValuesString() + " {?} " + StringUtils.formatPCMListString(mAppCacheUtils.getArrayListBatteryInfo());
         return new NotificationMessage(szTitle, szContent);
     }
@@ -126,19 +138,19 @@ public class ControlCenterService extends Service {
     // 更新前台通知
     //
     public void updateServiceNotification() {
-        mNotificationUtils.updateForegroundNotification(ControlCenterService.this, createNotificationMessage());
+        //mNotificationUtils.updateForegroundNotification(ControlCenterService.this, createNotificationMessage());
     }
 
     // 更新前台通知
     //
     public void updateServiceNotification(NotificationMessage notificationMessage) {
-        mNotificationUtils.updateForegroundNotification(ControlCenterService.this, notificationMessage);
+        //mNotificationUtils.updateForegroundNotification(ControlCenterService.this, notificationMessage);
     }
 
     // 更新前台通知
     //
     public void updateRemindNotification(NotificationMessage notificationMessage) {
-        mNotificationUtils.updateRemindNotification(ControlCenterService.this, notificationMessage);
+        //mNotificationUtils.updateRemindNotification(ControlCenterService.this, notificationMessage);
     }
 
     // 唤醒和绑定守护进程
@@ -234,10 +246,32 @@ public class ControlCenterService extends Service {
     }
 
     public void appenRemindMSG(String szRemindMSG) {
-        NotificationMessage notificationMessage = createNotificationMessage();
-        notificationMessage.setRemindMSG(szRemindMSG);
-        //LogUtils.d(TAG, "notificationMessage : " + notificationMessage.getRemindMSG());
-        updateRemindNotification(notificationMessage);
+        String msg = "";
+        for (int i = 0; i < 20; i++) {
+            msg += szRemindMSG;
+        }
+        NotificationHelper helper = new NotificationHelper(ControlCenterService.this);
+        Intent intent = new Intent(ControlCenterService.this, MainActivity.class);
+        helper.showTemporaryNotification(intent, getString(R.string.app_name), msg);
+        
+        
+        
+//        NotificationMessage notificationMessage = createNotificationMessage();
+//        notificationMessage.setRemindMSG(szRemindMSG);
+//        //LogUtils.d(TAG, "notificationMessage : " + notificationMessage.getRemindMSG());
+//        updateRemindNotification(notificationMessage);
+    }
+    
+    // 设置颜色背景
+    public static RemoteViews setLinearLayoutColor(RemoteViews remoteViews, int viewId, int color) {
+        remoteViews.setInt(viewId, "setBackgroundColor", color);
+        return remoteViews;
+    }
+
+    // 设置Drawable背景
+    public static RemoteViews setLinearLayoutDrawable(RemoteViews remoteViews, int viewId, int drawableRes) {
+        remoteViews.setInt(viewId, "setBackgroundResource", drawableRes);
+        return remoteViews;
     }
 
     //

powerbell/src/main/java/cc/winboll/studio/powerbell/threads/RemindThread.java

@@ -2,8 +2,8 @@ package cc.winboll.studio.powerbell.threads;
 
 import android.content.Context;
 import android.os.Message;
+import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.powerbell.handlers.ControlCenterServiceHandler;
-import cc.winboll.studio.shared.log.LogUtils;
 import java.lang.ref.WeakReference;
 
 public class RemindThread extends Thread {