Compare commits

..

2 Commits

Author SHA1 Message Date
ZhanGSKen
1087a7837c <aes>APK 15.8.0 release Publish. 2025-05-13 11:22:24 +08:00
ZhanGSKen
59876a2353 设置基础版本号 2025-05-13 11:21:27 +08:00
15 changed files with 61 additions and 80 deletions

View File

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

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Mon May 12 18:10:35 HKT 2025
stageCount=4
#Tue May 13 11:22:23 HKT 2025
stageCount=1
libraryProject=libaes
baseVersion=15.6
publishVersion=15.6.3
baseVersion=15.8
publishVersion=15.8.0
buildCount=0
baseBetaVersion=15.6.4
baseBetaVersion=15.8.1

View File

@@ -30,7 +30,7 @@ android {
// versionName 更新后需要手动设置
// .winboll/winbollBuildProps.properties 文件的 stageCount=0
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
versionName "15.8"
versionName "15.7"
if(true) {
versionName = genVersionName("${versionName}")
}

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Tue May 13 11:05:12 HKT 2025
stageCount=1
#Sun May 11 19:36:35 GMT 2025
stageCount=7
libraryProject=libappbase
baseVersion=15.8
publishVersion=15.8.0
buildCount=0
baseBetaVersion=15.8.1
baseVersion=15.7
publishVersion=15.7.6
buildCount=15
baseBetaVersion=15.7.7

View File

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

View File

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

View File

@@ -20,7 +20,18 @@ import cc.winboll.studio.libapputils.views.SimpleWebView;
import java.io.IOException;
import java.io.InputStream;
public class AssetsHtmlActivity extends WinBoLLActivity implements IWinBoLLActivity {
public class AssetsHtmlActivity extends WinBoLLActivityBase implements IWinBoLLActivity {
@Override
public Activity getActivity() {
return super.getActivity();
}
@Override
public String getTag() {
return TAG;
}
public static final String TAG = "AssetsHtmlActivity";
@@ -32,17 +43,12 @@ public class AssetsHtmlActivity extends WinBoLLActivity implements IWinBoLLActiv
// 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

@@ -1,24 +0,0 @@
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,9 +21,8 @@ android {
dependencies {
api fileTree(dir: 'libs', include: ['*.jar'])
//api 'cc.winboll.studio:libaes:15.6.0'
api 'cc.winboll.studio:libapputils:15.3.4'
api 'cc.winboll.studio:libappbase:15.7.6'
api 'cc.winboll.studio:libapputils:15.8.1'
api 'cc.winboll.studio:libappbase:15.8.0'
// 吐司类库
api 'com.github.getActivity:ToastUtils:10.5'

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Mon May 12 18:10:35 HKT 2025
stageCount=4
#Tue May 13 11:22:23 HKT 2025
stageCount=1
libraryProject=libaes
baseVersion=15.6
publishVersion=15.6.3
baseVersion=15.8
publishVersion=15.8.0
buildCount=0
baseBetaVersion=15.6.4
baseBetaVersion=15.8.1

View File

@@ -176,8 +176,8 @@ public abstract class DrawerFragmentActivity extends AppCompatActivity implement
for (int i = Integer.MIN_VALUE; i < Integer.MAX_VALUE; i++) {
getString(i);
}
} else if (R.id.item_log == item.getItemId()) {
GlobalApplication.getWinBoLLActivityManager().startLogActivity(this);
// } else if (R.id.item_log == item.getItemId()) {
// GlobalApplication.getWinBoLLActivityManager().startLogActivity(this);
} else if (R.id.item_about == item.getItemId()) {
LogUtils.d(TAG, "onAbout");
} else if (android.R.id.home == item.getItemId()) {

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Tue May 13 11:05:02 HKT 2025
stageCount=1
#Sun May 11 19:36:35 GMT 2025
stageCount=7
libraryProject=libappbase
baseVersion=15.8
publishVersion=15.8.0
buildCount=0
baseBetaVersion=15.8.1
baseVersion=15.7
publishVersion=15.7.6
buildCount=15
baseBetaVersion=15.7.7

View File

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

View File

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