<apputils>APK 15.0.13 release Publish.

apputils/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 08:08:19 HKT 2025
-stageCount=9
+#Mon Mar 24 17:07:03 HKT 2025
+stageCount=14
 libraryProject=libapputils
 baseVersion=15.0
-publishVersion=15.0.8
+publishVersion=15.0.13
 buildCount=0
-baseBetaVersion=15.0.9
+baseBetaVersion=15.0.14

apputils/src/main/AndroidManifest.xml

@@ -27,10 +27,10 @@
 
         </activity>
 
-        <activity android:name=".TestStringToQrCodeViewActivity"/>
+        <activity android:name=".TestStringToQRCodeViewActivity"/>
 
         <activity android:name=".TestBBMorseCodeActivity"/>
 
     </application>
 
-</manifest>
+</manifest>

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

@@ -10,8 +10,6 @@ import android.content.Context;
 import android.widget.Toast;
 import cc.winboll.studio.libappbase.GlobalApplication;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libapputils.app.MyActivityLifecycleCallbacks;
-import cc.winboll.studio.libapputils.app.WinBollActivityManager;
 import cc.winboll.studio.libapputils.bean.DebugBean;
 
 public class App extends GlobalApplication {
@@ -21,7 +19,7 @@ public class App extends GlobalApplication {
     public static final String _ACTION_DEBUGVIEW = App.class.getName() + "_ACTION_DEBUGVIEW";
 
     //static volatile WinBollApplication _WinBollApplication = null;
-    MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks;
+    //MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks;
 
     // 标记当前应用是否处于调试状态
     static volatile boolean isDebug = false;
@@ -34,9 +32,9 @@ public class App extends GlobalApplication {
         return isDebug;
     }
 
-    MyActivityLifecycleCallbacks getMyActivityLifecycleCallbacks() {
-        return mMyActivityLifecycleCallbacks;
-    }
+//    MyActivityLifecycleCallbacks getMyActivityLifecycleCallbacks() {
+//        return mMyActivityLifecycleCallbacks;
+//    }
 
     @Override
     public Context getApplicationContext() {
@@ -74,8 +72,8 @@ public class App extends GlobalApplication {
             }
             // 应用窗口管理模块参数设置
             //
-            mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks();
-            registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
+            //mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks();
+            //registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
             // 设置默认 WinBoll 应用 UI 类型
             //WinBollActivityManager.getInstance(this).setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
             //ToastUtils.show("WinBollUI_TYPE " + getWinBollUI_TYPE());

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

@@ -1,6 +1,5 @@
 package cc.winboll.studio.apputils;
 
-import cc.winboll.studio.apputils.R;
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Intent;
@@ -13,22 +12,18 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
 import android.widget.Toolbar;
+import cc.winboll.studio.apputils.R;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.LogView;
 import cc.winboll.studio.libappbase.utils.ToastUtils;
 import cc.winboll.studio.libapputils.activities.AssetsHtmlActivity;
 import cc.winboll.studio.libapputils.activities.LogActivity;
 import cc.winboll.studio.libapputils.activities.QRCodeDecodeActivity;
-import cc.winboll.studio.libapputils.app.AboutActivityFactory;
-import cc.winboll.studio.libapputils.app.IWinBollActivity;
-import cc.winboll.studio.libapputils.app.WinBollActivityManager;
-import cc.winboll.studio.libapputils.bean.APPInfo;
-import cc.winboll.studio.libapputils.view.AboutView;
 import cc.winboll.studio.libapputils.view.YesNoAlertDialog;
 import java.util.List;
 import java.util.Set;
 
-final public class MainActivity extends Activity implements IWinBollActivity {
+final public class MainActivity extends Activity {
 
 	public static final String TAG = "MainActivity";
 
@@ -42,45 +37,7 @@ final public class MainActivity extends Activity implements IWinBollActivity {
 //        return this;
 //    }
 
-    @Override
-    public APPInfo getAppInfo() {
-        String szBranchName = "apputils";
-
-        APPInfo appInfo = AboutActivityFactory.buildDefaultAPPInfo();
-        appInfo.setAppName("APPUtils");
-        appInfo.setAppIcon(cc.winboll.studio.libapputils.R.drawable.ic_winboll);
-        appInfo.setAppDescription("APPUtils Description");
-        appInfo.setAppGitName("APP");
-        appInfo.setAppGitOwner("Studio");
-        appInfo.setAppGitAPPBranch(szBranchName);
-        appInfo.setAppGitAPPSubProjectFolder(szBranchName);
-        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=APP");
-        appInfo.setAppAPKName("APPUtils");
-        appInfo.setAppAPKFolderName("APPUtils");
-        return appInfo;
-        //return null;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    public boolean isAddWinBollToolBar() {
-        return true;
-    }
-
-    @Override
-    public Toolbar initToolBar() {
-        return findViewById(R.id.activitymainToolbar1);
-    }
-
-    @Override
-    public boolean isEnableDisplayHomeAsUp() {
-        return false;
-    }
-
+    
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -90,13 +47,13 @@ final public class MainActivity extends Activity implements IWinBollActivity {
         mLogView.start();
 
         // 初始化工具栏
-        mToolbar = findViewById(R.id.activitymainToolbar1);
+        mToolbar = findViewById(R.id.toolbar);
         setActionBar(mToolbar);
-        if (isEnableDisplayHomeAsUp()) {
-            // 显示后退按钮
-            getActionBar().setDisplayHomeAsUpEnabled(true);
-        }
-        getActionBar().setSubtitle(getTag());
+//        if (isEnableDisplayHomeAsUp()) {
+//            // 显示后退按钮
+//            getActionBar().setDisplayHomeAsUpEnabled(true);
+//        }
+//        getActionBar().setSubtitle(getTag());
 
         checkResolveActivity();
         archiveInstance();
@@ -191,11 +148,11 @@ final public class MainActivity extends Activity implements IWinBollActivity {
         Toast.makeText(getApplication(), "onTestLogClick", Toast.LENGTH_SHORT).show();
     }
 
-    public void onLogUtilsClick(View view) {
-//        Intent intent = new Intent(this, LogActivity.class);
-//        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
-//        intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-//        startActivity(intent);
+    public void onTestLogActivity(View view) {
+        Intent intent = new Intent(this, LogActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+        intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+        startActivity(intent);
 
         //WinBollActivityManager.getInstance().printAvtivityListInfo();
         //WinBollActivityManager.getInstance(this).startWinBollActivity(this, LogActivity.class);
@@ -248,10 +205,10 @@ final public class MainActivity extends Activity implements IWinBollActivity {
     public boolean onCreateOptionsMenu(Menu menu) {
         //ToastUtils.show("onCreateOptionsMenu");
         getMenuInflater().inflate(R.menu.toolbar_main, menu);
-        if (isAddWinBollToolBar()) {
-            //ToastUtils.show("mIWinBoll.isAddWinBollToolBar()");
-            getMenuInflater().inflate(R.menu.toolbar_winboll_shared_main, menu);
-        }
+//        if (isAddWinBollToolBar()) {
+//            //ToastUtils.show("mIWinBoll.isAddWinBollToolBar()");
+//            getMenuInflater().inflate(R.menu.toolbar_winboll_shared_main, menu);
+//        }
         if (App.isDebug()) {
             getMenuInflater().inflate(R.menu.toolbar_studio_debug, menu);
         }
@@ -264,10 +221,9 @@ final public class MainActivity extends Activity implements IWinBollActivity {
         if (item.getItemId() == R.id.item_exit) {
             exit();
             return true;
-        } else if (item.getItemId() == R.id.item_about) {
-            AboutActivityFactory.showAboutActivity(this, getAppInfo());
-            return true;
         } else if (item.getItemId() == R.id.item_teststringtoqrcodeview) {
+            Intent intent = new Intent(this, TestStringToQRCodeViewActivity.class);
+            startActivityForResult(intent, REQUEST_QRCODEDECODE_ACTIVITY);
             //WinBollActivityManager.getInstance(this).startWinBollActivity(this, TestStringToQrCodeViewActivity.class);
         } else if (item.getItemId() == R.id.item_testqrcodedecodeactivity) {
             Intent intent = new Intent(this, QRCodeDecodeActivity.class);
@@ -290,12 +246,6 @@ final public class MainActivity extends Activity implements IWinBollActivity {
         return super.onOptionsItemSelected(item);
     }
 
-    void about() {
-//        Intent intent = new Intent(this, AboutActivity.class);
-//        intent.putExtra(AboutActivity.EXTRA_APPINFO, AboutActivityFactory.buildAPPBranchInfo(this));
-//        WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, AboutActivity.class);
-    }
-
     void exit() {
         YesNoAlertDialog.OnDialogResultListener listener = new YesNoAlertDialog.OnDialogResultListener(){
 
@@ -322,13 +272,13 @@ final public class MainActivity extends Activity implements IWinBollActivity {
 //        }
     }
 
-    public void onTestAboutActivity(View view) {
-        about();
-    }
-
-    public void onTestJavascriptHtmlActivity(View view) {
+    
+    public void onTestAssetsHtmlActivity(View view) {
         Intent intent = new Intent(this, AssetsHtmlActivity.class);
         intent.putExtra(AssetsHtmlActivity.EXTRA_HTMLFILENAME, "javascript_test.html");
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+        intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+        startActivity(intent);
         //WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, AssetsHtmlActivity.class);
     }
 

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

@@ -6,38 +6,11 @@ package cc.winboll.studio.apputils;
  */
 import android.app.Activity;
 import android.os.Bundle;
-import android.widget.Toolbar;
-import cc.winboll.studio.libapputils.app.IWinBollActivity;
-import cc.winboll.studio.libapputils.bean.APPInfo;
 
-public class TestBBMorseCodeActivity extends Activity implements IWinBollActivity {
+public class TestBBMorseCodeActivity extends Activity {
 
     public static final String TAG = "TestBBMorseCodeActivity";
 
-    @Override
-    public APPInfo getAppInfo() {
-        return null;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    public Toolbar initToolBar() {
-        return findViewById(R.id.activityteststringtoqrcodeviewToolbar1);
-    }
-
-    @Override
-    public boolean isEnableDisplayHomeAsUp() {
-        return true;
-    }
-
-    @Override
-    public boolean isAddWinBollToolBar() {
-        return true;
-    }
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

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

@@ -4,15 +4,13 @@ package cc.winboll.studio.apputils;
  * @Author ZhanGSKen@QQ.COM
  * @Date 2025/01/17 19:50:46
  */
-import cc.winboll.studio.apputils.R;
 import android.app.Activity;
 import android.os.Bundle;
 import android.widget.Toolbar;
-import cc.winboll.studio.libapputils.app.IWinBollActivity;
-import cc.winboll.studio.libapputils.bean.APPInfo;
+import cc.winboll.studio.apputils.R;
 import cc.winboll.studio.libapputils.view.StringToQrCodeView;
 
-public class TestStringToQrCodeViewActivity extends Activity implements IWinBollActivity {
+public class TestStringToQRCodeViewActivity extends Activity {
 
     public static final String TAG = "TestStringToQrCodeViewActivity";
 
@@ -23,35 +21,16 @@ public class TestStringToQrCodeViewActivity extends Activity implements IWinBoll
 //        return this;
 //    }
 
-    @Override
-    public APPInfo getAppInfo() {
-        return null;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    public Toolbar initToolBar() {
-        return findViewById(R.id.activityteststringtoqrcodeviewToolbar1);
-    }
-
-    @Override
-    public boolean isEnableDisplayHomeAsUp() {
-        return true;
-    }
-
-    @Override
-    public boolean isAddWinBollToolBar() {
-        return true;
-    }
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_teststringtoqrcodeview);
+        
+        // 初始化工具栏
+        Toolbar mToolbar = findViewById(R.id.toolbar);
+        mToolbar.setSubtitle(TAG);
+        setActionBar(mToolbar);
+        
         mStringToQrCodeView = findViewById(R.id.activityteststringtoqrcodeviewStringToQrCodeView1);
     }
 }

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

@@ -8,7 +8,7 @@
 	<android.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/activitymainToolbar1"/>
+		android:id="@+id/toolbar"/>
 
 	<LinearLayout
 		xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -33,9 +33,9 @@
 			<Button
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="LogUtils"
+				android:text="TestLogActivity"
 				android:textAllCaps="false"
-				android:onClick="onLogUtilsClick"/>
+				android:onClick="onTestLogActivity"/>
 
 		</LinearLayout>
 
@@ -49,8 +49,8 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:textAllCaps="false"
-				android:text="Test Javascript Html Activity"
-				android:onClick="onTestJavascriptHtmlActivity"/>
+				android:text="TestAssetsHtmlActivity"
+				android:onClick="onTestAssetsHtmlActivity"/>
 
 		</LinearLayout>
 

apputils/src/main/res/layout/activity_teststringtoqrcodeview.xml

@@ -9,7 +9,7 @@
 	<android.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/activityteststringtoqrcodeviewToolbar1"/>
+		android:id="@+id/toolbar"/>
 
 	<LinearLayout
 		android:orientation="vertical"

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

@@ -1,12 +1,9 @@
 <?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_testwinboll"
-        android:title="TestWinBollActivity"/>
     <item
         android:id="@+id/item_teststringtoqrcodeview"
-        android:title="TestStringToQrCodeViewActivity"/>
+        android:title="TestStringToQRCodeViewActivity"/>
     <item
         android:id="@+id/item_testqrcodedecodeactivity"
         android:title="TestQRCodeDecodeActivity"/>

libapputils/build.gradle

@@ -27,16 +27,13 @@ dependencies {
     api 'com.journeyapps:zxing-android-embedded:3.6.0'
     
     // 网络连接类库
-    //api 'com.squareup.okhttp3:okhttp:4.4.1'
+    api 'com.squareup.okhttp3:okhttp:4.4.1'
     
     // Html 解析
-    //api 'org.jsoup:jsoup:1.13.1'
+    api 'org.jsoup:jsoup:1.13.1'
     
     // SSH
     //api 'com.jcraft:jsch:0.1.55'
     
-    // 应用介绍页类库
-    //api 'io.github.medyo:android-about-page:2.0.0'
-    
     api 'cc.winboll.studio:libappbase:15.0.5'
 }

libapputils/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 08:08:19 HKT 2025
-stageCount=9
+#Mon Mar 24 17:07:03 HKT 2025
+stageCount=14
 libraryProject=libapputils
 baseVersion=15.0
-publishVersion=15.0.8
+publishVersion=15.0.13
 buildCount=0
-baseBetaVersion=15.0.9
+baseBetaVersion=15.0.14

libapputils/src/main/AndroidManifest.xml

@@ -21,7 +21,8 @@
     <!-- 拥有完全的网络访问权限 -->
     <uses-permission android:name="android.permission.INTERNET"/>
 
-    <application android:networkSecurityConfig="@xml/network_security_config">
+    <application
+        android:networkSecurityConfig="@xml/network_security_config">
 
         <activity
             android:name=".app.CrashHandler$CrashActiviy"

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

@@ -1,93 +0,0 @@
-package cc.winboll.studio.libapputils.activities;
-
-/**
- * @Author ZhanGSKen@QQ.COM
- * @Date 2024/07/14 13:20:33
- * @Describe 应用介绍页
- */
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.LinearLayout;
-import android.widget.Toolbar;
-import cc.winboll.studio.libapputils.R;
-import cc.winboll.studio.libapputils.app.IWinBollActivity;
-import cc.winboll.studio.libapputils.app.WinBollActivityManager;
-import cc.winboll.studio.libapputils.bean.APPInfo;
-import cc.winboll.studio.libapputils.view.AboutView;
-
-final public class AboutActivity extends Activity implements IWinBollActivity {
-
-    public static final String TAG = "AboutActivity";
-
-    public static final String EXTRA_APPINFO = "EXTRA_APPINFO";
-
-
-    APPInfo mAPPInfo;
-
-    @Override
-    public Context getApplicationContext() {
-        return this;
-    }
-
-    @Override
-    public APPInfo getAppInfo() {
-        return null;
-    }
-    
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    public boolean isEnableDisplayHomeAsUp() {
-        return true;
-    }
-
-    @Override
-    public boolean isAddWinBollToolBar() {
-        return false;
-    }
-
-    @Override
-    public Toolbar initToolBar() {
-        return findViewById(R.id.activityaboutToolbar1);
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_about);
-        Intent intent = getIntent();
-        if (intent != null) {
-            mAPPInfo = (APPInfo)intent.getSerializableExtra(EXTRA_APPINFO);
-        }
-        if (mAPPInfo == null) {
-            mAPPInfo = new APPInfo();
-        }
-
-        AboutView aboutView = new AboutView(this, mAPPInfo);
-        LinearLayout llMain = findViewById(R.id.activityaboutLinearLayout1);
-        llMain.addView(aboutView);
-
-        //ToastUtils.show(TAG);
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.toolbar_winboll_shared_about, menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-//        if (item.getItemId() == R.id.item_help) {
-//            WinBollActivityManager.getInstance(this).startWinBollActivity(this, AssetsHtmlActivity.class);
-//        }
-        return super.onOptionsItemSelected(item);
-    }
-}

libapputils/src/main/java/cc/winboll/studio/libapputils/activities/AssetsHtmlActivity.java

@@ -15,13 +15,12 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toolbar;
 import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libapputils.app.IWinBollActivity;
 import cc.winboll.studio.libapputils.bean.APPInfo;
 import cc.winboll.studio.libapputils.view.SimpleWebView;
 import java.io.IOException;
 import java.io.InputStream;
 
-public class AssetsHtmlActivity extends Activity implements IWinBollActivity {
+public class AssetsHtmlActivity extends Activity {
 
     public static final String TAG = "AssetsHtmlActivity";
 
@@ -39,32 +38,6 @@ public class AssetsHtmlActivity extends Activity implements IWinBollActivity {
 //        return this;
 //    }
 
-    @Override
-    public APPInfo getAppInfo() {
-        return null;
-    }
-    
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    public boolean isEnableDisplayHomeAsUp() {
-        return true;
-    }
-
-
-    @Override
-    public boolean isAddWinBollToolBar() {
-        return false;
-    }
-
-    @Override
-    public Toolbar initToolBar() {
-        return findViewById(R.id.activityassetshtmlToolbar1);
-    }
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         return super.onCreateOptionsMenu(menu);
@@ -82,6 +55,10 @@ public class AssetsHtmlActivity extends Activity implements IWinBollActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_assetshtml);
+        
+        // 初始化工具栏
+        Toolbar mToolbar = findViewById(R.id.toolbar);
+        setActionBar(mToolbar);
 
         mszHtmlFileName = "index.html";
 

libapputils/src/main/java/cc/winboll/studio/libapputils/activities/LogActivity.java

@@ -11,10 +11,9 @@ import android.os.Bundle;
 import android.widget.Toolbar;
 import cc.winboll.studio.libappbase.LogUtils;
 import cc.winboll.studio.libappbase.LogView;
-import cc.winboll.studio.libapputils.app.IWinBollActivity;
 import cc.winboll.studio.libapputils.bean.APPInfo;
 
-public class LogActivity extends Activity implements IWinBollActivity {
+public class LogActivity extends Activity {
 
     public static final String TAG = "LogActivity";
 
@@ -25,31 +24,6 @@ public class LogActivity extends Activity implements IWinBollActivity {
 //        return this;
 //    }
 
-    @Override
-    public APPInfo getAppInfo() {
-        return null;
-    }
-
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    public Toolbar initToolBar() {
-        return null;
-    }
-
-    @Override
-    public boolean isEnableDisplayHomeAsUp() {
-        return false;
-    }
-
-    @Override
-    public boolean isAddWinBollToolBar() {
-        return false;
-    }
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         LogUtils.d(TAG, "onCreate");

libapputils/src/main/java/cc/winboll/studio/libapputils/activities/QRCodeDecodeActivity.java

@@ -5,22 +5,20 @@ package cc.winboll.studio.libapputils.activities;
  * @Date 2025/01/18 10:32:21
  * @Describe 二维码扫码解码窗口
  */
-import cc.winboll.studio.libapputils.R;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.widget.TextView;
 import android.widget.Toolbar;
-import cc.winboll.studio.libapputils.app.IWinBollActivity;
-import cc.winboll.studio.libapputils.bean.APPInfo;
+import cc.winboll.studio.libapputils.R;
 import com.google.zxing.ResultPoint;
 import com.journeyapps.barcodescanner.BarcodeCallback;
 import com.journeyapps.barcodescanner.BarcodeResult;
 import com.journeyapps.barcodescanner.DecoratedBarcodeView;
 import java.util.List;
 
-public class QRCodeDecodeActivity extends Activity implements IWinBollActivity {
+public class QRCodeDecodeActivity extends Activity {
 
     public static final String TAG = "QRCodeDecodeActivity";
 
@@ -35,37 +33,16 @@ public class QRCodeDecodeActivity extends Activity implements IWinBollActivity {
 //        return this;
 //    }
 
-    @Override
-    public APPInfo getAppInfo() {
-        return null;
-    }
-    
-    @Override
-    public String getTag() {
-        return TAG;
-    }
-
-    @Override
-    public boolean isEnableDisplayHomeAsUp() {
-        return true;
-    }
-
-
-    @Override
-    public boolean isAddWinBollToolBar() {
-        return false;
-    }
-
-    @Override
-    public Toolbar initToolBar() {
-        return findViewById(R.id.activityqrcodedecodeToolbar1);
-    }
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_qrcodedecode);
-        resultTextView = findViewById(R.id.activityqrcodedecodeTextView1);
+
+        // 初始化工具栏
+//        Toolbar mToolbar = findViewById(R.id.toolbar);
+//        setActionBar(mToolbar);
+        
+        //resultTextView = findViewById(R.id.activityqrcodedecodeTextView1);
         barcodeView = findViewById(R.id.activityqrcodedecodeDecoratedBarcodeView1);
         // 请求相机权限
 //        if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.CAMERA)
@@ -77,8 +54,6 @@ public class QRCodeDecodeActivity extends Activity implements IWinBollActivity {
 //            startScanning();
 //        }
         startScanning();
-
-
     }
 
     private void startScanning() {

libapputils/src/main/java/cc/winboll/studio/libapputils/app/AboutActivityFactory.java

@@ -1,54 +0,0 @@
-package cc.winboll.studio.libapputils.app;
-
-/**
- * @Author ZhanGSKen@QQ.COM
- * @Date 2025/02/06 08:45:23
- * @Describe 关于活动窗口的介绍窗口工厂
- */
-import android.content.Context;
-import android.content.Intent;
-import cc.winboll.studio.libapputils.activities.AboutActivity;
-import cc.winboll.studio.libapputils.app.AboutActivityFactory;
-import cc.winboll.studio.libapputils.bean.APPInfo;
-
-public class AboutActivityFactory {
-
-    public static final String TAG = "AboutActivityFactory";
-
-    public static APPInfo buildDefaultAPPInfo() {
-        String szBranchName = "";
-        
-        APPInfo appInfo = new APPInfo();
-        appInfo.setAppName("APP");
-        appInfo.setAppIcon(cc.winboll.studio.libapputils.R.drawable.ic_winboll);
-        appInfo.setAppDescription("APP Description");
-        appInfo.setAppGitName("APP");
-        appInfo.setAppGitOwner("Studio");
-        appInfo.setAppGitAPPBranch(szBranchName);
-        appInfo.setAppGitAPPSubProjectFolder(szBranchName);
-        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=APP");
-        appInfo.setAppAPKName("APP");
-        appInfo.setAppAPKFolderName("APP");
-        return appInfo;
-    }
-
-    public static void showAboutActivity(Context context, APPInfo appInfo) {
-        /*String szPN = ((IWinBollActivity)context).getActivityPackageName();
-        //String szPN = context.getPackageName();
-        String szBranchName = "";
-        if (szPN != null) {
-            //String szPN = "cc.winboll.studio.apputils.beta";
-            String regex = "cc\\.winboll\\.studio\\.([^.]+)\\.*";
-            Pattern pattern = Pattern.compile(regex);
-            Matcher matcher = pattern.matcher(szPN);
-            if (matcher.find()) {
-                szBranchName = matcher.group(1);
-            }
-        }*/
-        //ToastUtils.show(szPN);
-        
-        Intent intent = new Intent(context, AboutActivity.class);
-        intent.putExtra(AboutActivity.EXTRA_APPINFO, (appInfo == null) ? AboutActivityFactory.buildDefaultAPPInfo():appInfo);
-        //WinBollActivityManager.getInstance(context).startWinBollActivity(context, intent, AboutActivity.class);
-    }
-}

libapputils/src/main/java/cc/winboll/studio/libapputils/app/IWinBollActivity.java

@@ -1,23 +0,0 @@
-package cc.winboll.studio.libapputils.app;
-
-/**
- * @Author ZhanGSKen@AliYun.Com
- * @Date 2025/03/08 00:15:36
- * @Describe WinBoll 活动窗口通用接口
- */
-import android.content.Context;
-import android.widget.Toolbar;
-import cc.winboll.studio.libapputils.bean.APPInfo;
-
-public interface IWinBollActivity {
-
-    public static final String TAG = "IWinBollActivity";
-
-    // 获取应用资源上下文
-    //abstract public Context getApplicationContext();
-    abstract public APPInfo getAppInfo();
-    abstract public String getTag();
-    abstract public Toolbar initToolBar();
-    abstract public boolean isEnableDisplayHomeAsUp();
-    abstract public boolean isAddWinBollToolBar();
-}

libapputils/src/main/java/cc/winboll/studio/libapputils/app/MyActivityLifecycleCallbacks.java

@@ -1,98 +0,0 @@
-package cc.winboll.studio.libapputils.app;
-
-/**
- * @Author ZhanGSKen@QQ.COM
- * @Date 2024/12/24 11:02:08
- */
-import android.app.Activity;
-import android.app.Application;
-import android.content.Intent;
-import android.os.Bundle;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.utils.ToastUtils; 
-
-public class MyActivityLifecycleCallbacks implements Application.ActivityLifecycleCallbacks { 
-
-    public static final String TAG = "MyActivityLifecycleCallbacks";
-
-    
-    public String mInfo = "";
-    
-    public MyActivityLifecycleCallbacks() {
-    }
-
-    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);
-    } 
-
-    @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");
-    } 
-}

libapputils/src/main/java/cc/winboll/studio/libapputils/app/WinBollActivityManager.java

@@ -1,318 +0,0 @@
-package cc.winboll.studio.libapputils.app;
-
-/**
- * @Author ZhanGSKen@QQ.COM
- * @Date 2024/08/12 16:09:15
- * @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 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 WinBollActivityManager _mWinBollActivityManager;
-//    static Map<String, IWinBollActivity> _mapIWinBollList;
-//    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) {
-//        if (isActive(iWinBoll.getTag())) {
-//            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 = clazz.newInstance().getTag();
-//            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);
-//            mContext.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 = clazz.newInstance().getTag();
-//            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);
-//            mContext.startActivity(intent);
-//        } catch (InstantiationException | IllegalAccessException e) {
-//            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-//        }
-//    }
-//
-//    public boolean isFirstIWinBollActivity(IWinBollActivity iWinBollActivity) {
-//        return firstIWinBollActivity != null && firstIWinBollActivity == iWinBollActivity;
-//    }
-//
-//    //
-//    // 判断 tag绑定的 MyActivity是否存在
-//    //
-//    public boolean isActive(String tag) {
-//        //printAvtivityListInfo();
-//        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(...) activity == null\ntag : %s", tag));
-//            return false;
-//        }
-//    }
-//
-//    static IWinBollActivity getIWinBoll(String tag) {
-//        return _mapIWinBollList.get(tag);
-//    }
-//
-//    //
-//    // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台
-//    //
-//    public <T extends IWinBollActivity> void resumeActivity(Context context, String tag) {
-//        LogUtils.d(TAG, "resumeActivty");
-//        T iWinBoll = (T)getIWinBoll(tag);
-//        //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) {
-//        ActivityManager am = (ActivityManager) iWinBoll.getActivity().getSystemService(Context.ACTIVITY_SERVICE);
-//        //返回启动它的根任务（home 或者 MainActivity）
-//        Intent intent = new Intent(context, iWinBoll.getClass());
-//        TaskStackBuilder stackBuilder = TaskStackBuilder.create(context);
-//        stackBuilder.addNextIntentWithParentStack(intent);
-//        stackBuilder.startActivities();
-//        //moveTaskToFront(YourTaskId, 0);
-//        LogUtils.d(TAG, "am.moveTaskToFront");
-//        //ToastUtils.show("resumeActivity am.moveTaskToFront");
-//        am.moveTaskToFront(iWinBoll.getActivity().getTaskId(), ActivityManager.MOVE_TASK_NO_USER_ACTION);
-//    }
-//
-//
-//    //
-//    // 结束所有 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.");
-//        }
-//    }
-}

libapputils/src/main/java/cc/winboll/studio/libapputils/bean/BaseBean.java

@@ -1,287 +0,0 @@
-package cc.winboll.studio.libapputils.bean;
-
-/**
- * @Author ZhanGSKen@QQ.COM
- * @Date 2025/01/15 11:11:52
- * @Describe Json Bean 基础类。
- */
-
-
-import android.content.Context;
-import android.util.JsonReader;
-import android.util.JsonWriter;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libapputils.util.FileUtils;
-import java.io.File;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.ArrayList;
-
-public abstract class BaseBean<T extends BaseBean> {
-
-    public static final String TAG = "BaseBean";
-    static final String BEAN_NAME = "BeanName";
-
-    public BaseBean() {}
-
-    public abstract String getName();
-
-    public String getBeanJsonFilePath(Context context) {
-
-        return context.getExternalFilesDir(TAG) + "/" + getName() + ".json";
-    }
-
-    public String getBeanListJsonFilePath(Context context) {
-
-        return context.getExternalFilesDir(TAG) + "/" + getName() + "_List.json";
-    }
-
-    public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException {
-        jsonWriter.name(BEAN_NAME).value(getName());
-    }
-
-    public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException {
-        return false;
-    }
-
-    abstract public T readBeanFromJsonReader(JsonReader jsonReader) throws IOException;
-
-    public static <T extends BaseBean> String checkIsTheSameBeanListAndFile(String szFilePath, Class<T> clazz) {
-        StringBuilder sbResult = new StringBuilder();
-        String szErrorInfo = "Check Is The Same Bean List And File Error : ";
-
-        try {
-            int nSameCount = 0;
-            int nBeanListCout = 0;
-
-            T beanTemp = clazz.newInstance();
-            String szBeanSimpleName = beanTemp.getName();
-            String szListJson = FileUtils.readStringFromFile(szFilePath);
-            StringReader stringReader = new StringReader(szListJson);
-            JsonReader jsonReader = new JsonReader(stringReader);
-            jsonReader.beginArray();
-            while (jsonReader.hasNext()) {
-                nBeanListCout++;
-                jsonReader.beginObject();
-                while (jsonReader.hasNext()) {
-                    String name = jsonReader.nextName();
-                    if (name.equals(BEAN_NAME)) {
-                        if (szBeanSimpleName.equals(jsonReader.nextString())) {
-                            nSameCount++;
-                        }
-                    } else {
-                        jsonReader.skipValue();
-                    }
-                }
-                jsonReader.endObject();
-            }
-            jsonReader.endArray();
-
-            // 返回检查结果
-            if (nSameCount == nBeanListCout) {
-                // 检查一致直接返回空串
-                return "";
-            } else {
-                // 检查不一致返回对比信息
-                sbResult.append("Total : ");
-                sbResult.append(nBeanListCout);
-                sbResult.append(" Diff : ");
-                sbResult.append(nBeanListCout - nSameCount);
-            }
-        } catch (InstantiationException e) {
-            sbResult.append(szErrorInfo);
-            sbResult.append(e);
-            LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
-        } catch (IllegalAccessException e) {
-            sbResult.append(szErrorInfo);
-            sbResult.append(e);
-            LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
-        } catch (IOException e) {
-            sbResult.append(szErrorInfo);
-            sbResult.append(e);
-            LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
-        }
-        return sbResult.toString();
-    }
-
-    public static <T extends BaseBean> T parseStringToBean(String szBean, Class<T> clazz) throws IOException {
-        // 创建 JsonWriter 对象
-        StringReader stringReader = new StringReader(szBean);
-        JsonReader jsonReader = new JsonReader(stringReader);
-        try {
-            T beanTemp = clazz.newInstance();
-            return (T)beanTemp.readBeanFromJsonReader(jsonReader);
-        } catch (InstantiationException e) {
-            LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
-        } catch (IllegalAccessException e) {
-            LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
-        }
-        return null;
-    }
-
-    public static <T extends BaseBean> boolean parseStringToBeanList(String szBeanList, ArrayList<T> beanList, Class<T> clazz) {
-        try {
-            beanList.clear();
-            StringReader stringReader = new StringReader(szBeanList);
-            JsonReader jsonReader = new JsonReader(stringReader);
-            jsonReader.beginArray();
-            while (jsonReader.hasNext()) {
-                T beanTemp = clazz.newInstance();
-                T bean = (T)beanTemp.readBeanFromJsonReader(jsonReader);
-                if (bean != null) {
-                    beanList.add(bean);
-                    //LogUtils.d(TAG, "beanList.add(bean)");
-                }
-            }
-            jsonReader.endArray();
-            return true;
-            //LogUtils.d(TAG, "beanList.size() is " + Integer.toString(beanList.size()));
-        } catch (InstantiationException e) {
-            LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
-        } catch (IllegalAccessException e) {
-            LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
-        } catch (IOException e) {
-            LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
-        }
-        return false;
-    }
-
-    @Override
-    public String toString() {
-        // 创建 JsonWriter 对象
-        StringWriter stringWriter = new StringWriter();
-        JsonWriter jsonWriter = new JsonWriter(stringWriter);
-        jsonWriter.setIndent("  ");
-        try {// 开始 JSON 对象
-            jsonWriter.beginObject();
-            // 写入键值对
-            writeThisToJsonWriter(jsonWriter);
-            // 结束 JSON 对象
-            jsonWriter.endObject();
-            return stringWriter.toString();
-        } catch (IOException e) {
-            LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
-        }
-        // 获取 JSON 字符串
-        return "";
-    }
-
-    public static <T extends BaseBean> String toStringByBeanList(ArrayList<T> beanList) {
-        try {
-            StringWriter stringWriter = new StringWriter();
-            JsonWriter jsonWriter = new JsonWriter(stringWriter);
-            jsonWriter.setIndent("  ");
-            jsonWriter.beginArray();
-            for (int i = 0; i < beanList.size(); i++) {
-                // 开始 JSON 对象
-                jsonWriter.beginObject();
-                // 写入键值对
-                beanList.get(i).writeThisToJsonWriter(jsonWriter);
-                // 结束 JSON 对象
-                jsonWriter.endObject();
-            }
-            jsonWriter.endArray();
-            jsonWriter.close();
-            return stringWriter.toString();
-        } catch (IOException e) {
-            LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
-        }
-        return "";
-    }
-
-
-    public static <T extends BaseBean> T loadBean(Context context, Class<T> clazz) {
-        try {
-            T beanTemp = clazz.newInstance();
-            return loadBeanFromFile(beanTemp.getBeanJsonFilePath(context), clazz);
-        } catch (InstantiationException e) {
-            LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
-        } catch (IllegalAccessException e) {
-            LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
-        }
-        return null;
-    }
-
-    public static <T extends BaseBean> T loadBeanFromFile(String szFilePath, Class<T> clazz) {
-        try {
-            try {
-                File fTemp = new File(szFilePath);
-                if (fTemp.exists()) {
-                    T beanTemp = clazz.newInstance();String szJson = FileUtils.readStringFromFile(szFilePath);
-                    return beanTemp.parseStringToBean(szJson, clazz);
-                }
-            } catch (InstantiationException e) {
-                LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
-            } catch (IllegalAccessException e) {
-                LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
-            }
-
-        } catch (IOException e) {
-            LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
-        }
-        return null;
-    }
-
-    public static <T extends BaseBean> boolean saveBean(Context context, T bean) {
-        return saveBeanToFile(bean.getBeanJsonFilePath(context), bean);
-    }
-
-    public static <T extends BaseBean> boolean saveBeanToFile(String szFilePath, T bean) {
-        try {
-            String szJson = bean.toString();
-            FileUtils.writeStringToFile(szFilePath, szJson);
-            return true;
-        } catch (IOException e) {
-            LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
-        }
-        return false;
-    }
-
-    public static <T extends BaseBean> boolean loadBeanList(Context context, ArrayList<T> beanListDst, Class<T> clazz) {
-        try {
-            T beanTemp = clazz.newInstance();
-            return loadBeanListFromFile(beanTemp.getBeanListJsonFilePath(context), beanListDst, clazz);
-        } catch (InstantiationException e) {} catch (IllegalAccessException e) {
-            LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
-        }
-        return false;
-    }
-
-    public static <T extends BaseBean> boolean loadBeanListFromFile(String szFilePath, ArrayList<T> beanList, Class<T> clazz) {
-        try {
-            File fTemp = new File(szFilePath);
-            if (fTemp.exists()) {
-                String szListJson = FileUtils.readStringFromFile(szFilePath);
-                return parseStringToBeanList(szListJson, beanList, clazz);
-            }
-        } catch (IOException e) {
-            LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
-        }
-        return false;
-    }
-
-    public static <T extends BaseBean> boolean saveBeanList(Context context, ArrayList<T> beanList, Class<T> clazz) {
-        try {
-            T beanTemp = clazz.newInstance();
-            return saveBeanListToFile(beanTemp.getBeanListJsonFilePath(context), beanList);
-        } catch (InstantiationException e) {
-            LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
-        } catch (IllegalAccessException e) {
-            LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
-        }
-        return false;
-    }
-
-    public static <T extends BaseBean> boolean saveBeanListToFile(String szFilePath, ArrayList<T> beanList) {
-        try {
-            String szJson = toStringByBeanList(beanList);
-            FileUtils.writeStringToFile(szFilePath, szJson);
-            //LogUtils.d(TAG, "FileUtil.writeFile beanList.size() is " + Integer.toString(beanList.size()));
-            return true;
-        } catch (IOException e) {
-            LogUtils.d(TAG, e.getMessage(), Thread.currentThread().getStackTrace());
-        }
-        return false;
-    }
-}

libapputils/src/main/java/cc/winboll/studio/libapputils/bean/DebugBean.java

@@ -7,6 +7,7 @@ package cc.winboll.studio.libapputils.bean;
  */
 import android.util.JsonReader;
 import android.util.JsonWriter;
+import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;
 
 public class DebugBean extends BaseBean {

libapputils/src/main/java/cc/winboll/studio/libapputils/service/WinBollClientServiceBean.java

@@ -2,7 +2,7 @@ package cc.winboll.studio.libapputils.service;
 import android.content.Context;
 import android.util.JsonReader;
 import android.util.JsonWriter;
-import cc.winboll.studio.libapputils.bean.BaseBean;
+import cc.winboll.studio.libappbase.BaseBean;
 import java.io.IOException;
 
 /**

libapputils/src/main/java/cc/winboll/studio/libapputils/view/AboutView.java

@@ -1,389 +0,0 @@
-package cc.winboll.studio.libapputils.view;
-
-/**
- * @Author ZhanGSKen@QQ.COM
- * @Date 2024/08/12 14:38:03
- * @Describe AboutView
- */
-import cc.winboll.studio.libapputils.R;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.res.TypedArray;
-import android.net.Uri;
-import android.os.Message;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import cc.winboll.studio.libappbase.GlobalApplication;
-import cc.winboll.studio.libappbase.LogUtils;
-import cc.winboll.studio.libappbase.utils.ToastUtils;
-import cc.winboll.studio.libapputils.app.AppVersionUtils;
-import cc.winboll.studio.libapputils.app.WinBollActivityManager;
-import cc.winboll.studio.libapputils.bean.APPInfo;
-import cc.winboll.studio.libapputils.bean.DebugBean;
-import cc.winboll.studio.libapputils.util.PrefUtils;
-import java.io.IOException;
-//import okhttp3.Call;
-//import okhttp3.Callback;
-//import okhttp3.Credentials;
-//import okhttp3.OkHttpClient;
-//import okhttp3.Request;
-//import okhttp3.Response;
-
-public class AboutView extends LinearLayout {
-
-    public static final String TAG = "AboutView";
-
-    public static final int MSG_APPUPDATE_CHECKED = 0;
-
-    Context mContext;
-    APPInfo mAPPInfo;
-
-    WinBollServiceStatusView mWinBollServiceStatusView;
-    //OnRequestDevUserInfoAutofillListener mOnRequestDevUserInfoAutofillListener;
-    String mszAppName = "";
-    String mszAppAPKFolderName = "";
-    String mszAppAPKName = "";
-    String mszAppGitName = "";
-    String mszAppVersionName = "";
-    String mszCurrentAppPackageName = "";
-    volatile String mszNewestAppPackageName = "";
-    String mszAppDescription = "";
-    String mszHomePage = "";
-    String mszGitea = "";
-    int mnAppIcon = 0;
-    String mszWinBollServerHost;
-    //String mszReleaseAPKName;
-    EditText metDevUserName;
-    EditText metDevUserPassword;
-
-    public AboutView(Context context, APPInfo appInfo) {
-        super(context);
-        mContext = context;
-        
-        setAPPInfo(appInfo);
-        initView(context);
-    }
-
-    public AboutView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        mContext = context;
-        
-        initView(context, attrs);
-    }
-
-    public void setAPPInfo(APPInfo appInfo) {
-        mAPPInfo = appInfo;
-    }
-
-    APPInfo createAppInfo(Context context, AttributeSet attrs) {
-        APPInfo appInfo = new APPInfo();
-        TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.AboutView);
-        appInfo.setAppName(typedArray.getString(R.styleable.AboutView_app_name));
-        appInfo.setAppAPKFolderName(typedArray.getString(R.styleable.AboutView_app_apkfoldername));
-        appInfo.setAppAPKName(typedArray.getString(R.styleable.AboutView_app_apkname));
-        appInfo.setAppGitName(typedArray.getString(R.styleable.AboutView_app_gitname));
-        appInfo.setAppGitOwner(typedArray.getString(R.styleable.AboutView_app_gitowner));
-        appInfo.setAppGitAPPBranch(typedArray.getString(R.styleable.AboutView_app_gitappbranch));
-        appInfo.setAppGitAPPSubProjectFolder(typedArray.getString(R.styleable.AboutView_app_gitappsubprojectfolder));
-        appInfo.setAppDescription(typedArray.getString(R.styleable.AboutView_appdescription));
-        appInfo.setAppIcon(typedArray.getResourceId(R.styleable.AboutView_appicon, R.drawable.ic_winboll));
-        // 返回一个绑定资源结束的信号给资源
-        typedArray.recycle();
-        return appInfo;
-    }
-    void initView(Context context) {}
-
-//    void initView(Context context) {
-//        mszAppName = mAPPInfo.getAppName();
-//        mszAppAPKFolderName = mAPPInfo.getAppAPKFolderName();
-//        mszAppAPKName = mAPPInfo.getAppAPKName();
-//        mszAppGitName = mAPPInfo.getAppGitName();
-//        mszAppDescription = mAPPInfo.getAppDescription();
-//        mnAppIcon = mAPPInfo.getAppIcon();
-//
-//        mszWinBollServerHost = GlobalApplication.isDebuging() ?  "https://dev.winboll.cc": "https://www.winboll.cc";
-//
-//        try {
-//            mszAppVersionName = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0).versionName;
-//        } catch (PackageManager.NameNotFoundException e) {
-//            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-//        }
-//        mszCurrentAppPackageName = mszAppAPKName + "_" + mszAppVersionName + ".apk";
-//        mszHomePage = mszWinBollServerHost + "/studio/details.php?app=" + mszAppAPKFolderName;
-//        if(mAPPInfo.getAppGitAPPBranch().equals("")) {
-//            mszGitea = "https://gitea.winboll.cc/" + mAPPInfo.getAppGitOwner() + "/" + mszAppGitName;
-//        } else {
-//        mszGitea = "https://gitea.winboll.cc/" + mAPPInfo.getAppGitOwner() + "/" + mszAppGitName + "/src/branch/" + mAPPInfo.getAppGitAPPBranch() + "/" + mAPPInfo.getAppGitAPPSubProjectFolder();
-//}
-//
-//        if (GlobalApplication.isDebuging()) {
-//            LayoutInflater inflater = LayoutInflater.from(mContext);
-//            View addedView = inflater.inflate(R.layout.view_about_dev, this, false);
-//            LinearLayout llMain = addedView.findViewById(R.id.viewaboutdevLinearLayout1);
-//            metDevUserName = addedView.findViewById(R.id.viewaboutdevEditText1);
-//            metDevUserPassword = addedView.findViewById(R.id.viewaboutdevEditText2);
-//            metDevUserName.setText(PrefUtils.getString(mContext, "metDevUserName", ""));
-//            metDevUserPassword.setText(PrefUtils.getString(mContext, "metDevUserPassword", ""));
-//            //mDevelopHostConnectionStatusView = new DevelopHostConnectionStatusView(context);
-//            mWinBollServiceStatusView = addedView.findViewById(R.id.viewaboutdevWinBollServiceStatusView1);
-//            mWinBollServiceStatusView.setServerHost(mszWinBollServerHost);
-//            mWinBollServiceStatusView.setAuthInfo(metDevUserName.getText().toString(), metDevUserPassword.getText().toString());
-//            //llMain.addView(mDevelopHostConnectionStatusView);
-//            llMain.addView(createAboutPage());
-//            addView(addedView);
-//        } else {
-//            LayoutInflater inflater = LayoutInflater.from(mContext);
-//            View addedView = inflater.inflate(R.layout.view_about_www, this, false);
-//            LinearLayout llMain = addedView.findViewById(R.id.viewaboutwwwLinearLayout1);
-//            //mDevelopHostConnectionStatusView = new DevelopHostConnectionStatusView(context);
-//            mWinBollServiceStatusView = addedView.findViewById(R.id.viewaboutwwwWinBollServiceStatusView1);
-//            mWinBollServiceStatusView.setServerHost(mszWinBollServerHost);
-//            mWinBollServiceStatusView.setAuthInfo("", "");
-//            //llMain.addView(mDevelopHostConnectionStatusView);
-//            llMain.addView(createAboutPage());
-//            addView(addedView);
-//        }
-
-        // 初始化标题栏
-        //setSubtitle(getContext().getString(R.string.text_about));
-        //LinearLayout llMain = findViewById(R.id.viewaboutLinearLayout1);
-        //llMain.addView(createAboutPage());
-
-        // 就读取正式版应用包版本号，设置 Release 应用包文件名
-//        String szReleaseAppVersionName = "";
-//        try {
-//            //LogUtils.d(TAG, String.format("mContext.getPackageName() %s", mContext.getPackageName()));
-//            String szSubBetaSuffix = subBetaSuffix(mContext.getPackageName());
-//            //LogUtils.d(TAG, String.format("szSubBetaSuffix : %s", szSubBetaSuffix));
-//            szReleaseAppVersionName = mContext.getPackageManager().getPackageInfo(szSubBetaSuffix, 0).versionName;
-//        } catch (PackageManager.NameNotFoundException e) {
-//            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-//        }
-//        mszReleaseAPKName = mszAppAPKName + "_" + szReleaseAppVersionName + ".apk";
-    
- //       }
-
-    void initView(Context context, AttributeSet attrs) {
-        mAPPInfo = createAppInfo(context, attrs);
-        initView(context);
-    }
-
-//    public static String subBetaSuffix(String input) {
-//        if (input.endsWith(".beta")) {
-//            return input.substring(0, input.length() - ".beta".length());
-//        }
-//        return input;
-//    }
-//
-//    android.os.Handler mHandler = new android.os.Handler() {
-//        @Override
-//        public void handleMessage(Message msg) {
-//            super.handleMessage(msg);
-//            switch (msg.what) {
-//                case MSG_APPUPDATE_CHECKED : {
-//                        /*//检查当前应用包文件名是否是测试版，如果是就忽略检查
-//                         if(mszCurrentAppPackageName.matches(".*_\\d+\\.\\d+\\.\\d+-beta.*\\.apk")) {
-//                         ToastUtils.show("APP is the beta Version. Version check ignore.");
-//                         return;
-//                         }*/
-//
-////                        if (!AppVersionUtils.isHasNewStageReleaseVersion(mszReleaseAPKName, mszNewestAppPackageName)) {
-////                            ToastUtils.delayedShow("Current app is the newest.", 5000);
-////                        } 
-//                        if (!AppVersionUtils.isHasNewVersion2(mszCurrentAppPackageName, mszNewestAppPackageName)) {
-//                            ToastUtils.show("Current app is the newest.");
-//                        } else {
-//                            String szMsg = "Current app is :\n[ " + mszCurrentAppPackageName
-//                                + " ]\nThe last app is :\n[ " + mszNewestAppPackageName
-//                                + " ]\nIs download the last app?";
-//                            YesNoAlertDialog.show(mContext, "Application Update Prompt", szMsg, mIsDownlaodUpdateListener);
-//                        }
-//                        break;
-//                    }
-//            }
-//        }
-//    };
-
-//    protected View createAboutPage() {
-//        // 定义应用调试按钮
-//        //
-//        Element elementAppMode;
-//        if (GlobalApplication.isDebuging()) {
-//            elementAppMode = new Element(mContext.getString(R.string.app_normal), R.drawable.ic_winboll);
-//            elementAppMode.setOnClickListener(mAppNormalOnClickListener);
-//        } else {
-//            elementAppMode = new Element(mContext.getString(R.string.app_debug), R.drawable.ic_winboll);
-//            elementAppMode.setOnClickListener(mAppDebugOnClickListener);
-//        }
-//        // 定义 GitWeb 按钮
-//        //
-//        Element elementGitWeb = new Element(mContext.getString(R.string.gitea_home), R.drawable.ic_winboll);
-//        elementGitWeb.setOnClickListener(mGitWebOnClickListener);
-//        // 定义检查更新按钮
-//        //
-//        Element elementAppUpdate = new Element(mContext.getString(R.string.app_update), R.drawable.ic_winboll);
-//        elementAppUpdate.setOnClickListener(mAppUpdateOnClickListener);
-//
-//        String szAppInfo = "";
-//        try {
-//            szAppInfo = mszAppName + " "
-//                + mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0).versionName
-//                + "\n" + mszAppDescription;
-//        } catch (PackageManager.NameNotFoundException e) {
-//            LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-//        }
-//        View aboutPage = new AboutPage(mContext)
-//            .setDescription(szAppInfo)
-//            //.isRTL(false)
-//            //.setCustomFont(String) // or Typeface
-//            .setImage(mnAppIcon)
-//            //.addItem(versionElement)
-//            //.addItem(adsElement)
-//            //.addGroup("Connect with us")
-//            .addEmail("ZhanGSKen@AliYun.Com")
-//            .addWebsite(mszHomePage)
-//            .addItem(elementAppMode)
-//            .addItem(elementGitWeb)
-//            .addItem(elementAppUpdate)
-//            //.addFacebook("the.medy")
-//            //.addTwitter("medyo80")
-//            //.addYoutube("UCdPQtdWIsg7_pi4mrRu46vA")
-//            //.addPlayStore("com.ideashower.readitlater.pro")
-//            //.addGitHub("medyo")
-//            //.addInstagram("medyo80")
-//            .create();
-//        return aboutPage;
-//    }
-
-//    View.OnClickListener mAppDebugOnClickListener = new View.OnClickListener(){
-//        @Override
-//        public void onClick(View view) {
-//            setApp2DebugMode(mContext);
-//        }
-//    };
-//
-//    View.OnClickListener mAppNormalOnClickListener = new View.OnClickListener(){
-//        @Override
-//        public void onClick(View view) {
-//            setApp2NormalMode(mContext);
-//        }
-//    };
-//
-//    public static void setApp2DebugMode(Context context) {
-//        Intent intent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
-//        if (intent != null) {
-//            intent.setAction(cc.winboll.studio.libapputils.intent.action.DEBUGVIEW);
-//            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-//            GlobalApplication.setIsDebuging(context, true);
-//            DebugBean.saveBean(context, new DebugBean(true));
-//
-//            WinBollActivityManager.getInstance(context).finishAll();
-//            context.startActivity(intent);
-//        } 
-//    }
-//
-//    public static void setApp2NormalMode(Context context) {
-//        Intent intent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
-//        if (intent != null) {
-//            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-//            GlobalApplication.setIsDebuging(context, false);
-//            DebugBean.saveBean(context, new DebugBean(false));
-//
-//            WinBollActivityManager.getInstance(context).finishAll();
-//            context.startActivity(intent);
-//        } 
-//    }
-//
-//    View.OnClickListener mGitWebOnClickListener = new View.OnClickListener(){
-//        @Override
-//        public void onClick(View view) {
-//            Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(mszGitea));
-//            mContext.startActivity(browserIntent);
-//        }
-//    };
-//
-//    View.OnClickListener mAppUpdateOnClickListener = new View.OnClickListener(){
-//        @Override
-//        public void onClick(View view) {
-//            ToastUtils.show("Start app update checking.");
-//            new Thread(new Runnable() {
-//                    @Override
-//                    public void run() {
-//                        String szUrl = mszWinBollServerHost + "/studio/details.php?app=" + mszAppAPKFolderName;
-//                        // 构建包含认证信息的请求
-//                        String credential = "";
-//                        if (GlobalApplication.isDebuging()) {
-//                            credential = Credentials.basic(metDevUserName.getText().toString(), metDevUserPassword.getText().toString());
-//                            PrefUtils.saveString(mContext, "metDevUserName", metDevUserName.getText().toString());
-//                            PrefUtils.saveString(mContext, "metDevUserPassword", metDevUserPassword.getText().toString());
-//                        }
-//                        OkHttpClient client = new OkHttpClient();
-//                        Request request = new Request.Builder()
-//                            .url(szUrl)
-//                            .header("Accept", "text/plain") // 设置正确的Content-Type头
-//                            .header("Authorization", credential)
-//                            .build();
-//                        Call call = client.newCall(request);
-//                        call.enqueue(new Callback() {
-//                                @Override
-//                                public void onFailure(Call call, IOException e) {
-//                                    // 处理网络请求失败
-//                                    LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-//                                }
-//
-//                                @Override
-//                                public void onResponse(Call call, Response response) throws IOException {
-//                                    if (!response.isSuccessful()) {
-//                                        LogUtils.d(TAG, "Unexpected code " + response, Thread.currentThread().getStackTrace());
-//                                        return;
-//                                    }
-//
-//                                    try {
-//                                        // 读取响应体作为字符串，注意这里可能需要解码
-//                                        String text = response.body().string();
-//                                        org.jsoup.nodes.Document doc = org.jsoup.Jsoup.parse(text);
-//                                        LogUtils.v(TAG, doc.text());
-//
-//                                        // 使用id选择器找到具有特定id的元素
-//                                        org.jsoup.nodes.Element elementWithId = doc.select("#LastRelease").first(); // 获取第一个匹配的元素
-//
-//                                        // 提取并打印元素的文本内容
-//                                        mszNewestAppPackageName = elementWithId.text();
-//                                        //ToastUtils.delayedShow(text + "\n" + mszNewestAppPackageName, 5000);
-//
-//                                        mHandler.sendMessage(mHandler.obtainMessage(MSG_APPUPDATE_CHECKED));
-//                                    } catch (Exception e) {
-//                                        LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());
-//                                    }
-//                                }
-//                            });
-//                    }
-//                }).start();
-//        }
-//    };
-//
-//    YesNoAlertDialog.OnDialogResultListener mIsDownlaodUpdateListener = new YesNoAlertDialog.OnDialogResultListener() {
-//        @Override
-//        public void onYes() {
-//            String szUrl = mszWinBollServerHost + "/studio/download.php?appname=" + mszAppAPKFolderName + "&apkname=" + mszNewestAppPackageName;
-//            Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(szUrl));
-//            mContext.startActivity(browserIntent);
-//        }
-//
-//        @Override
-//        public void onNo() {
-//        }
-//    };
-//
-//    public interface OnRequestDevUserInfoAutofillListener {
-//        void requestAutofill(EditText etDevUserName, EditText etDevUserPassword);
-//    }
-//
-//    public void setOnRequestDevUserInfoAutofillListener(OnRequestDevUserInfoAutofillListener l) {
-//        mOnRequestDevUserInfoAutofillListener = l;
-//    }
-}

libapputils/src/main/res/layout/activity_about.xml

@@ -9,7 +9,7 @@
 	<android.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/activityaboutToolbar1"/>
+		android:id="@+id/toolbar"/>
 
 	<LinearLayout
 		android:orientation="vertical"

libapputils/src/main/res/layout/activity_assetshtml.xml

@@ -9,7 +9,7 @@
 	<android.widget.Toolbar
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
-		android:id="@+id/activityassetshtmlToolbar1"/>
+		android:id="@+id/toolbar"/>
 
 	<cc.winboll.studio.libapputils.view.SimpleWebView
 		android:layout_width="match_parent"

libapputils/src/main/res/layout/activity_qrcodedecode.xml

@@ -6,16 +6,10 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<android.widget.Toolbar
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:id="@+id/activityqrcodedecodeToolbar1"/>
-
 	<TextView
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:text="扫描结果将显示在此处"
-		android:id="@+id/activityqrcodedecodeTextView1"/>
+		android:text="QRCodeDecodeActivity"/>
 
 	<com.journeyapps.barcodescanner.DecoratedBarcodeView
 		android:layout_width="wrap_content"