WinBoLL/APPBase
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

整体UI优化

Browse Source
This commit is contained in:
ZhanGSKen 2025-03-24 09:44:18 +08:00
parent f96fcbfe13
commit a96696f261
14 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apputils/build.properties
View File

@ -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

4
apputils/src/main/AndroidManifest.xml
View File

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

6
apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java
View File

@ -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);

11
apputils/src/main/java/cc/winboll/studio/apputils/TestStringToQrCodeViewActivity.java → apputils/src/main/java/cc/winboll/studio/apputils/TestStringToQRCodeViewActivity.java
View File

@ -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);
}
}

6
apputils/src/main/res/layout/activity_main.xml
View File

@ -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:onClick="onTestHtmlActivity"/>
android:text="TestAssetsHtmlActivity"
android:onClick="onTestAssetsHtmlActivity"/>
</LinearLayout>

2
apputils/src/main/res/layout/activity_teststringtoqrcodeview.xml
View File

@ -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"

2
apputils/src/main/res/menu/toolbar_main.xml
View File

@ -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"/>

4
libapputils/build.properties
View File

@ -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

3
libapputils/src/main/AndroidManifest.xml
View File

@ -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"

4
libapputils/src/main/java/cc/winboll/studio/libapputils/activities/AssetsHtmlActivity.java
View File

@ -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";

8
libapputils/src/main/java/cc/winboll/studio/libapputils/activities/QRCodeDecodeActivity.java
View File

@ -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)

2
libapputils/src/main/res/layout/activity_about.xml
View File

@ -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"

2
libapputils/src/main/res/layout/activity_assetshtml.xml
View File

@ -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"

8
libapputils/src/main/res/layout/activity_qrcodedecode.xml
View File

@ -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"