Compare commits

...

9 Commits

Author SHA1 Message Date
ZhanGSKen
58e49ed371 <apputils>APK 15.8.1 release Publish. 2025-05-13 11:17:53 +08:00
ZhanGSKen
90a6eb266b 编译调试 2025-05-13 11:17:24 +08:00
ZhanGSKen
f0a564c9bb <apputils>Start New Stage Version. 2025-05-13 11:11:32 +08:00
ZhanGSKen
46b21331af Merge remote-tracking branch 'origin/appbase' into apputils 2025-05-13 11:10:47 +08:00
ZhanGSKen
6221cc30ac <libapputils>Library Release 15.8.0 2025-05-13 11:10:23 +08:00
ZhanGSKen
8489ee6447 <apputils>APK 15.8.0 release Publish. 2025-05-13 11:09:58 +08:00
ZhanGSKen
9205af4aa9 编译调试 2025-05-13 11:08:42 +08:00
ZhanGSKen
780e730a38 设置基础版本号 2025-05-13 11:08:04 +08:00
ZhanGSKen
429499885b <libappbase>Library Release 15.8.0 2025-05-13 11:05:19 +08:00
8 changed files with 52 additions and 34 deletions

View File

@@ -1,5 +1,5 @@
#Created by .winboll/winboll_app_build.gradle
#Tue May 13 11:05:02 HKT 2025
#Tue May 13 11:05:12 HKT 2025
stageCount=1
libraryProject=libappbase
baseVersion=15.8

View File

@@ -29,7 +29,7 @@ android {
// versionName 更新后需要手动设置
// 项目模块目录的 build.gradle 文件的 stageCount=0
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
versionName "15.3"
versionName "15.8"
if(true) {
versionName = genVersionName("${versionName}")
}

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Tue Apr 29 15:04:17 HKT 2025
stageCount=5
#Tue May 13 11:17:53 HKT 2025
stageCount=2
libraryProject=libapputils
baseVersion=15.3
publishVersion=15.3.4
baseVersion=15.8
publishVersion=15.8.1
buildCount=0
baseBetaVersion=15.3.5
baseBetaVersion=15.8.2

View File

@@ -20,18 +20,7 @@ import cc.winboll.studio.libapputils.views.SimpleWebView;
import java.io.IOException;
import java.io.InputStream;
public class AssetsHtmlActivity extends WinBoLLActivityBase implements IWinBoLLActivity {
@Override
public Activity getActivity() {
return super.getActivity();
}
@Override
public String getTag() {
return TAG;
}
public class AssetsHtmlActivity extends WinBoLLActivity implements IWinBoLLActivity {
public static final String TAG = "AssetsHtmlActivity";
@@ -43,12 +32,17 @@ public class AssetsHtmlActivity extends WinBoLLActivityBase implements IWinBoLLA
// Assets 文件夹里的 Html 文件的名称
String mszHtmlFileName;
//
// @Override
// public Activity getActivity() {
// return this;
// }
@Override
public Activity getActivity() {
return this;
}
@Override
public String getTag() {
return TAG;
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
return super.onCreateOptionsMenu(menu);

View File

@@ -217,10 +217,10 @@ final public class MainActivity extends Activity {
if (item.getItemId() == R.id.item_exit) {
//exit();
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_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);
startActivityForResult(intent, REQUEST_QRCODEDECODE_ACTIVITY);

View File

@@ -0,0 +1,24 @@
package cc.winboll.studio.apputils;
/**
* @Author ZhanGSKen<zhangsken@188.com>
* @Date 2025/05/13 11:15
* @Describe WinBoLLActivity
*/
import android.app.Activity;
import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity;
public class WinBoLLActivity extends Activity implements IWinBoLLActivity {
public static final String TAG = "WinBoLLActivity";
@Override
public Activity getActivity() {
return this;
}
@Override
public String getTag() {
return TAG;
}
}

View File

@@ -21,7 +21,7 @@ android {
dependencies {
api fileTree(dir: 'libs', include: ['*.jar'])
api 'cc.winboll.studio:libappbase:15.7.6'
api 'cc.winboll.studio:libappbase:15.8.0'
// 二维码类库
api 'com.google.zxing:core:3.4.1'

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Tue Apr 29 15:03:54 HKT 2025
stageCount=5
#Tue May 13 11:17:53 HKT 2025
stageCount=2
libraryProject=libapputils
baseVersion=15.3
publishVersion=15.3.4
baseVersion=15.8
publishVersion=15.8.1
buildCount=0
baseBetaVersion=15.3.5
baseBetaVersion=15.8.2