diff --git a/apputils/build.properties b/apputils/build.properties
index d1b4e2d..b2523ec 100644
--- a/apputils/build.properties
+++ b/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
diff --git a/apputils/src/main/AndroidManifest.xml b/apputils/src/main/AndroidManifest.xml
index 46ad5bc..66b4745 100644
--- a/apputils/src/main/AndroidManifest.xml
+++ b/apputils/src/main/AndroidManifest.xml
@@ -27,10 +27,10 @@
-
+
-
\ No newline at end of file
+
diff --git a/apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java b/apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java
index 00306c5..9facabb 100644
--- a/apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java
+++ b/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);
diff --git a/apputils/src/main/java/cc/winboll/studio/apputils/TestStringToQrCodeViewActivity.java b/apputils/src/main/java/cc/winboll/studio/apputils/TestStringToQRCodeViewActivity.java
similarity index 77%
rename from apputils/src/main/java/cc/winboll/studio/apputils/TestStringToQrCodeViewActivity.java
rename to apputils/src/main/java/cc/winboll/studio/apputils/TestStringToQRCodeViewActivity.java
index 66d01e4..ef5753e 100644
--- a/apputils/src/main/java/cc/winboll/studio/apputils/TestStringToQrCodeViewActivity.java
+++ b/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);
}
}
diff --git a/apputils/src/main/res/layout/activity_main.xml b/apputils/src/main/res/layout/activity_main.xml
index 82de67e..7a07e44 100644
--- a/apputils/src/main/res/layout/activity_main.xml
+++ b/apputils/src/main/res/layout/activity_main.xml
@@ -8,7 +8,7 @@
+ android:id="@+id/toolbar"/>
+ android:text="TestAssetsHtmlActivity"
+ android:onClick="onTestAssetsHtmlActivity"/>
diff --git a/apputils/src/main/res/layout/activity_teststringtoqrcodeview.xml b/apputils/src/main/res/layout/activity_teststringtoqrcodeview.xml
index acc41db..7d7ea83 100644
--- a/apputils/src/main/res/layout/activity_teststringtoqrcodeview.xml
+++ b/apputils/src/main/res/layout/activity_teststringtoqrcodeview.xml
@@ -9,7 +9,7 @@
+ android:id="@+id/toolbar"/>
+ android:title="TestStringToQRCodeViewActivity"/>
diff --git a/libapputils/build.properties b/libapputils/build.properties
index d1b4e2d..b2523ec 100644
--- a/libapputils/build.properties
+++ b/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
diff --git a/libapputils/src/main/AndroidManifest.xml b/libapputils/src/main/AndroidManifest.xml
index 0e7771e..22c1faa 100644
--- a/libapputils/src/main/AndroidManifest.xml
+++ b/libapputils/src/main/AndroidManifest.xml
@@ -21,7 +21,8 @@
-
+
+ android:id="@+id/toolbar"/>
+ android:id="@+id/toolbar"/>
-
-
+ android:text="QRCodeDecodeActivity"/>