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

更新类库，窗口管理模块置闲。

Browse Source
This commit is contained in:
ZhanGSKen
2025-03-20 01:22:05 +08:00
parent dc1b138dd7
commit fe943fef85
14 changed files with 352 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apputils/build.gradle
View File

@@ -46,8 +46,7 @@ android {
dependencies {
api project(':libapputils')
api fileTree(dir: 'libs', include: ['*.jar'])
implementation 'cc.winboll.studio:libappbase:15.0.5'
// 二维码类库
implementation 'com.google.zxing:core:3.4.1'
implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
@@ -63,4 +62,6 @@ dependencies {
// 应用介绍页类库
//implementation 'io.github.medyo:android-about-page:2.0.0'
implementation 'cc.winboll.studio:libappbase:15.0.5'
}

4
apputils/build.properties
View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Tue Mar 18 12:18:32 HKT 2025
#Wed Mar 19 17:20:42 GMT 2025
stageCount=7
libraryProject=libapputils
baseVersion=15.0
publishVersion=15.0.6
buildCount=0
buildCount=1
baseBetaVersion=15.0.7

2
apputils/src/main/java/cc/winboll/studio/apputils/App.java
View File

@@ -77,7 +77,7 @@ public class App extends GlobalApplication {
mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks();
registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
// 设置默认 WinBoll 应用 UI 类型
WinBollActivityManager.getInstance(this).setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
//WinBollActivityManager.getInstance(this).setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service);
//ToastUtils.show("WinBollUI_TYPE " + getWinBollUI_TYPE());
} catch (Exception e) {
LogUtils.d(TAG, e, Thread.currentThread().getStackTrace());

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

@@ -36,11 +36,11 @@ final public class MainActivity extends Activity implements IWinBollActivity {
Toolbar mToolbar;
LogView mLogView;
@Override
public Activity getActivity() {
return this;
}
//
// @Override
// public Activity getActivity() {
// return this;
// }
@Override
public APPInfo getAppInfo() {
@@ -177,12 +177,12 @@ final public class MainActivity extends Activity implements IWinBollActivity {
protected void onPostCreate(Bundle savedInstanceState) {
super.onPostCreate(savedInstanceState);
// 缓存当前 activity
WinBollActivityManager.getInstance(this).add(this);
//WinBollActivityManager.getInstance(this).add(this);
}
@Override
public void onDestroy() {
WinBollActivityManager.getInstance(this).registeRemove(this);
//WinBollActivityManager.getInstance(this).registeRemove(this);
super.onDestroy();
}
@@ -198,7 +198,7 @@ final public class MainActivity extends Activity implements IWinBollActivity {
// startActivity(intent);
//WinBollActivityManager.getInstance().printAvtivityListInfo();
WinBollActivityManager.getInstance(this).startWinBollActivity(this, LogActivity.class);
//WinBollActivityManager.getInstance(this).startWinBollActivity(this, LogActivity.class);
}
//
@@ -268,7 +268,7 @@ final public class MainActivity extends Activity implements IWinBollActivity {
AboutActivityFactory.showAboutActivity(this, getAppInfo());
return true;
} else if (item.getItemId() == R.id.item_teststringtoqrcodeview) {
WinBollActivityManager.getInstance(this).startWinBollActivity(this, TestStringToQrCodeViewActivity.class);
//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);
@@ -278,13 +278,13 @@ final public class MainActivity extends Activity implements IWinBollActivity {
}
return true;
} else if (item.getItemId() == R.id.item_log) {
WinBollActivityManager.getInstance(this).startWinBollActivity(this, LogActivity.class);
//WinBollActivityManager.getInstance(this).startWinBollActivity(this, LogActivity.class);
return true;
} else if (item.getItemId() == R.id.item_exitdebug) {
//AboutView.setApp2NormalMode(this);
return true;
} else if (item.getItemId() == android.R.id.home) {
WinBollActivityManager.getInstance(this).finish(this);
//WinBollActivityManager.getInstance(this).finish(this);
return true;
}
return super.onOptionsItemSelected(item);
@@ -301,7 +301,7 @@ final public class MainActivity extends Activity implements IWinBollActivity {
@Override
public void onYes() {
WinBollActivityManager.getInstance(getApplicationContext()).finishAll();
//WinBollActivityManager.getInstance(getApplicationContext()).finishAll();
}
@Override
@@ -314,12 +314,12 @@ final public class MainActivity extends Activity implements IWinBollActivity {
@Override
public void onBackPressed() {
if (WinBollActivityManager.getInstance(getApplicationContext()).isFirstIWinBollActivity(this)) {
exit();
} else {
WinBollActivityManager.getInstance(this).finish(this);
super.onBackPressed();
}
// if (WinBollActivityManager.getInstance(getApplicationContext()).isFirstIWinBollActivity(this)) {
// exit();
// } else {
// WinBollActivityManager.getInstance(this).finish(this);
// super.onBackPressed();
// }
}
public void onTestAboutActivity(View view) {
@@ -329,7 +329,7 @@ final public class MainActivity extends Activity implements IWinBollActivity {
public void onTestJavascriptHtmlActivity(View view) {
Intent intent = new Intent(this, AssetsHtmlActivity.class);
intent.putExtra(AssetsHtmlActivity.EXTRA_HTMLFILENAME, "javascript_test.html");
WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, AssetsHtmlActivity.class);
//WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, AssetsHtmlActivity.class);
}
@Override

10
apputils/src/main/java/cc/winboll/studio/apputils/TestStringToQrCodeViewActivity.java
View File

@@ -17,11 +17,11 @@ public class TestStringToQrCodeViewActivity extends Activity implements IWinBoll
public static final String TAG = "TestStringToQrCodeViewActivity";
StringToQrCodeView mStringToQrCodeView;
@Override
public Activity getActivity() {
return this;
}
//
// @Override
// public Activity getActivity() {
// return this;
// }
@Override
public APPInfo getAppInfo() {