整体UI优化

apputils/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 00:50:42 GMT 2025
+#Mon Mar 24 01:42:27 GMT 2025
 stageCount=11
 libraryProject=libapputils
 baseVersion=15.0
 publishVersion=15.0.10
-buildCount=11
+buildCount=41
 baseBetaVersion=15.0.11

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/MainActivity.java

@@ -68,7 +68,7 @@ final public class MainActivity extends Activity {
         mLogView.start();
 
         // 初始化工具栏
-        mToolbar = findViewById(R.id.activitymainToolbar1);
+        mToolbar = findViewById(R.id.toolbar);
         setActionBar(mToolbar);
 //        if (isEnableDisplayHomeAsUp()) {
 //            // 显示后退按钮
@@ -246,7 +246,7 @@ final public class MainActivity extends Activity {
 //            AboutActivityFactory.showAboutActivity(this, getAppInfo());
 //            return true;
         } else if (item.getItemId() == R.id.item_teststringtoqrcodeview) {
-            Intent intent = new Intent(this, TestStringToQrCodeViewActivity.class);
+            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) {
@@ -306,7 +306,7 @@ final public class MainActivity extends Activity {
         about();
     }
 
-    public void onTestHtmlActivity(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);

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

@@ -4,14 +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.bean.APPInfo;
+import cc.winboll.studio.apputils.R;
 import cc.winboll.studio.libapputils.view.StringToQrCodeView;
 
-public class TestStringToQrCodeViewActivity extends Activity {
+public class TestStringToQRCodeViewActivity extends Activity {
 
     public static final String TAG = "TestStringToQrCodeViewActivity";
 
@@ -26,6 +25,12 @@ public class TestStringToQrCodeViewActivity extends Activity {
     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"
@@ -49,8 +49,8 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:textAllCaps="false"
-				android:text="TestHtmlActivity"
+				android:text="TestAssetsHtmlActivity"
-				android:onClick="onTestHtmlActivity"/>
+				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

@@ -3,7 +3,7 @@
 	xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/item_teststringtoqrcodeview"
-        android:title="TestStringToQrCodeViewActivity"/>
+        android:title="TestStringToQRCodeViewActivity"/>
     <item
         android:id="@+id/item_testqrcodedecodeactivity"
         android:title="TestQRCodeDecodeActivity"/>

libapputils/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Mar 24 00:50:42 GMT 2025
+#Mon Mar 24 01:42:27 GMT 2025
 stageCount=11
 libraryProject=libapputils
 baseVersion=15.0
 publishVersion=15.0.10
-buildCount=11
+buildCount=41
 baseBetaVersion=15.0.11

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/AssetsHtmlActivity.java

@@ -55,6 +55,10 @@ public class AssetsHtmlActivity extends Activity {
     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/QRCodeDecodeActivity.java

@@ -10,6 +10,7 @@ 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.R;
 import com.google.zxing.ResultPoint;
 import com.journeyapps.barcodescanner.BarcodeCallback;
@@ -36,7 +37,12 @@ public class QRCodeDecodeActivity extends Activity {
     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)

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:text="QRCodeDecodeActivity"/>
-		android:id="@+id/activityqrcodedecodeTextView1"/>
 
 	<com.journeyapps.barcodescanner.DecoratedBarcodeView
 		android:layout_width="wrap_content"