diff --git a/apputils/build.properties b/apputils/build.properties index 2164f28..62bd441 100644 --- a/apputils/build.properties +++ b/apputils/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Apr 29 14:08:11 HKT 2025 +#Tue Apr 29 07:02:05 GMT 2025 stageCount=4 libraryProject=libapputils baseVersion=15.3 publishVersion=15.3.3 -buildCount=0 +buildCount=1 baseBetaVersion=15.3.4 diff --git a/apputils/src/main/java/cc/winboll/studio/apputils/AssetsHtmlActivity.java b/apputils/src/main/java/cc/winboll/studio/apputils/AssetsHtmlActivity.java index 432d5be..b504503 100644 --- a/apputils/src/main/java/cc/winboll/studio/apputils/AssetsHtmlActivity.java +++ b/apputils/src/main/java/cc/winboll/studio/apputils/AssetsHtmlActivity.java @@ -15,12 +15,12 @@ import android.view.MenuItem; import android.widget.Toolbar; import cc.winboll.studio.apputils.R; import cc.winboll.studio.libappbase.LogUtils; -import cc.winboll.studio.libappbase.winboll.IWinBollActivity; +import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity; import cc.winboll.studio.libapputils.views.SimpleWebView; import java.io.IOException; import java.io.InputStream; -public class AssetsHtmlActivity extends WinBollActivityBase implements IWinBollActivity { +public class AssetsHtmlActivity extends WinBoLLActivityBase implements IWinBoLLActivity { @Override public Activity getActivity() { @@ -57,7 +57,7 @@ public class AssetsHtmlActivity extends WinBollActivityBase implements IWinBollA @Override public boolean onOptionsItemSelected(MenuItem item) { // if (item.getItemId() == android.R.id.home) { -// WinBollActivityManager.getInstance(this).finish(this); +// WinBoLLActivityManager.getInstance(this).finish(this); // } return super.onOptionsItemSelected(item); } 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 afe1708..34de3b5 100644 --- a/apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java +++ b/apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java @@ -60,9 +60,9 @@ final public class MainActivity extends Activity { //if (prosessIntents(getIntent())) return; // 以下正常创建主窗口 -// // 设置 WinBoll 应用 UI 类型 -// WinBollApplication.setWinBollUI_TYPE(WinBollApplication.WinBollUI_TYPE.Aplication); -// //ToastUtils.show("WinBollUI_TYPE " + WinBollApplication.getWinBollUI_TYPE()); +// // 设置 WinBoLL 应用 UI 类型 +// WinBoLLApplication.setWinBoLLUI_TYPE(WinBoLLApplication.WinBoLLUI_TYPE.Aplication); +// //ToastUtils.show("WinBoLLUI_TYPE " + WinBoLLApplication.getWinBoLLUI_TYPE()); // LogUtils.d(TAG, "BuildConfig.DEBUG : " + Boolean.toString(BuildConfig.DEBUG)); } @@ -77,7 +77,7 @@ final public class MainActivity extends Activity { if (intent.getAction() != null) { // if (intent.getAction().equals(cc.winboll.studio.libapputils.intent.action.DEBUGVIEW)) { // App.setIsDebug(true); -// //ToastUtils.show!("WinBollApplication.setIsDebug(true) by action : " + intent.getAction()); +// //ToastUtils.show!("WinBoLLApplication.setIsDebug(true) by action : " + intent.getAction()); // // } } @@ -130,12 +130,12 @@ final public class MainActivity extends Activity { 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(); } @@ -150,8 +150,8 @@ final public class MainActivity extends Activity { // intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK); // startActivity(intent); - //WinBollActivityManager.getInstance().printAvtivityListInfo(); - //WinBollActivityManager.getInstance(this).startWinBollActivity(this, LogActivity.class); + //WinBoLLActivityManager.getInstance().printAvtivityListInfo(); + //WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(this, LogActivity.class); } // @@ -165,7 +165,7 @@ final public class MainActivity extends Activity { // if (intent.getAction().equals(StringToQrCodeView.ACTION_UNITTEST_QRCODE)) { // try { -// WinBollActivity clazzActivity = UnitTestActivity.class.newInstance(); +// WinBoLLActivity clazzActivity = UnitTestActivity.class.newInstance(); // String tag = clazzActivity.getTag(); // LogUtils.d(TAG, "String tag = clazzActivity.getTag(); tag " + tag); // Intent subIntent = new Intent(this, UnitTestActivity.class); @@ -183,8 +183,8 @@ final public class MainActivity extends Activity { // } // // Files.copy(Paths.get(szSrcPath), Paths.get(file.getPath())); -// //startWinBollActivity(subIntent, tag); -// WinBollActivityManager.getInstance(this).startWinBollActivity(this, subIntent, UnitTestActivity.class); +// //startWinBoLLActivity(subIntent, tag); +// WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(this, subIntent, UnitTestActivity.class); // } catch (IllegalAccessException | InstantiationException | IOException e) { // LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); // // 函数处理异常返回失败 @@ -201,8 +201,8 @@ final public class MainActivity extends Activity { public boolean onCreateOptionsMenu(Menu menu) { //ToastUtils.show("onCreateOptionsMenu"); getMenuInflater().inflate(R.menu.toolbar_main, menu); -// if (isAddWinBollToolBar()) { -// //ToastUtils.show("mIWinBoll.isAddWinBollToolBar()"); +// if (isAddWinBoLLToolBar()) { +// //ToastUtils.show("mIWinBoLL.isAddWinBoLLToolBar()"); // getMenuInflater().inflate(R.menu.toolbar_winboll_shared_main, menu); // } if (App.isDebuging()) { @@ -220,7 +220,7 @@ final public class MainActivity extends Activity { } 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); + //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); @@ -230,13 +230,13 @@ final public class MainActivity extends Activity { } 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); @@ -247,7 +247,7 @@ final public class MainActivity extends Activity { // // @Override // public void onYes() { -// //WinBollActivityManager.getInstance(getApplicationContext()).finishAll(); +// //WinBoLLActivityManager.getInstance(getApplicationContext()).finishAll(); // } // // @Override @@ -260,10 +260,10 @@ final public class MainActivity extends Activity { @Override public void onBackPressed() { -// if (WinBollActivityManager.getInstance(getApplicationContext()).isFirstIWinBollActivity(this)) { +// if (WinBoLLActivityManager.getInstance(getApplicationContext()).isFirstIWinBoLLActivity(this)) { // exit(); // } else { -// WinBollActivityManager.getInstance(this).finish(this); +// WinBoLLActivityManager.getInstance(this).finish(this); // super.onBackPressed(); // } } @@ -275,7 +275,7 @@ final public class MainActivity extends Activity { intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT); intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK); startActivity(intent); - //WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, AssetsHtmlActivity.class); + //WinBoLLActivityManager.getInstance(this).startWinBoLLActivity(this, intent, AssetsHtmlActivity.class); } @Override diff --git a/apputils/src/main/java/cc/winboll/studio/apputils/WinBollActivityBase.java b/apputils/src/main/java/cc/winboll/studio/apputils/WinBoLLActivityBase.java similarity index 63% rename from apputils/src/main/java/cc/winboll/studio/apputils/WinBollActivityBase.java rename to apputils/src/main/java/cc/winboll/studio/apputils/WinBoLLActivityBase.java index ff6e426..91c285e 100644 --- a/apputils/src/main/java/cc/winboll/studio/apputils/WinBollActivityBase.java +++ b/apputils/src/main/java/cc/winboll/studio/apputils/WinBoLLActivityBase.java @@ -9,12 +9,12 @@ import android.app.Activity; import android.os.Bundle; import android.os.PersistableBundle; import cc.winboll.studio.libappbase.GlobalApplication; -import cc.winboll.studio.libappbase.winboll.IWinBollActivity; -import cc.winboll.studio.libappbase.winboll.WinBollActivityManager; +import cc.winboll.studio.libappbase.winboll.IWinBoLLActivity; +import cc.winboll.studio.libappbase.winboll.WinBoLLActivityManager; -public class WinBollActivityBase extends Activity implements IWinBollActivity { +public class WinBoLLActivityBase extends Activity implements IWinBoLLActivity { - public static final String TAG = "WinBollActivityBase"; + public static final String TAG = "WinBoLLActivityBase"; @Override public Activity getActivity() { @@ -26,14 +26,14 @@ public class WinBollActivityBase extends Activity implements IWinBollActivity { return TAG; } - WinBollActivityManager getWinBollActivityManager() { - return WinBollActivityManager.getInstance(GlobalApplication.getInstance()); + WinBoLLActivityManager getWinBoLLActivityManager() { + return WinBoLLActivityManager.getInstance(GlobalApplication.getInstance()); } @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - getWinBollActivityManager().add(this); + getWinBoLLActivityManager().add(this); } @Override @@ -46,6 +46,6 @@ public class WinBollActivityBase extends Activity implements IWinBollActivity { @Override protected void onDestroy() { super.onDestroy(); - getWinBollActivityManager().registeRemove(this); + getWinBoLLActivityManager().registeRemove(this); } } diff --git a/apputils/src/main/res/values/colors.xml b/apputils/src/main/res/values/colors.xml index bb20e29..60c561c 100644 --- a/apputils/src/main/res/values/colors.xml +++ b/apputils/src/main/res/values/colors.xml @@ -1,6 +1,6 @@ - + #FF196ABC #FF002B57 #FF80BFFF diff --git a/libapputils/build.gradle b/libapputils/build.gradle index 2b8a5b6..925f384 100644 --- a/libapputils/build.gradle +++ b/libapputils/build.gradle @@ -21,7 +21,7 @@ android { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) - api 'cc.winboll.studio:libappbase:15.7.5' + api 'cc.winboll.studio:libappbase:15.7.6' // 二维码类库 api 'com.google.zxing:core:3.4.1' diff --git a/libapputils/build.properties b/libapputils/build.properties index b2fd69c..62bd441 100644 --- a/libapputils/build.properties +++ b/libapputils/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Apr 29 14:07:52 HKT 2025 +#Tue Apr 29 07:02:05 GMT 2025 stageCount=4 libraryProject=libapputils baseVersion=15.3 publishVersion=15.3.3 -buildCount=0 +buildCount=1 baseBetaVersion=15.3.4 diff --git a/libapputils/src/main/assets/winboll/studio/html/index.html b/libapputils/src/main/assets/winboll/studio/html/index.html index 4ea1b38..b95d385 100644 --- a/libapputils/src/main/assets/winboll/studio/html/index.html +++ b/libapputils/src/main/assets/winboll/studio/html/index.html @@ -3,10 +3,10 @@ - WinBoll-APP + WinBoLL-APP -

访问 WWW.WinBoll.CC

+

访问 WWW.WinBoLL.CC

diff --git a/libapputils/src/main/assets/winboll/studio/html/javascript_test.html b/libapputils/src/main/assets/winboll/studio/html/javascript_test.html index 6604456..49f5ec9 100644 --- a/libapputils/src/main/assets/winboll/studio/html/javascript_test.html +++ b/libapputils/src/main/assets/winboll/studio/html/javascript_test.html @@ -7,10 +7,10 @@ - WinBoll + WinBoLL - WinBoll Studio + WinBoLL Studio