移除冗余模块,其模块已转移至AES。
This commit is contained in:
		| @@ -1,8 +1,8 @@ | ||||
| #Created by .winboll/winboll_app_build.gradle | ||||
| #Mon Mar 24 08:10:09 HKT 2025 | ||||
| #Mon Mar 24 00:39:52 GMT 2025 | ||||
| stageCount=11 | ||||
| libraryProject=libapputils | ||||
| baseVersion=15.0 | ||||
| publishVersion=15.0.10 | ||||
| buildCount=0 | ||||
| buildCount=4 | ||||
| baseBetaVersion=15.0.11 | ||||
|   | ||||
| @@ -10,8 +10,6 @@ import android.content.Context; | ||||
| import android.widget.Toast; | ||||
| import cc.winboll.studio.libappbase.GlobalApplication; | ||||
| import cc.winboll.studio.libappbase.LogUtils; | ||||
| import cc.winboll.studio.libapputils.app.MyActivityLifecycleCallbacks; | ||||
| import cc.winboll.studio.libapputils.app.WinBollActivityManager; | ||||
| import cc.winboll.studio.libapputils.bean.DebugBean; | ||||
|  | ||||
| public class App extends GlobalApplication { | ||||
| @@ -21,7 +19,7 @@ public class App extends GlobalApplication { | ||||
|     public static final String _ACTION_DEBUGVIEW = App.class.getName() + "_ACTION_DEBUGVIEW"; | ||||
|  | ||||
|     //static volatile WinBollApplication _WinBollApplication = null; | ||||
|     MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks; | ||||
|     //MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks; | ||||
|  | ||||
|     // 标记当前应用是否处于调试状态 | ||||
|     static volatile boolean isDebug = false; | ||||
| @@ -34,9 +32,9 @@ public class App extends GlobalApplication { | ||||
|         return isDebug; | ||||
|     } | ||||
|  | ||||
|     MyActivityLifecycleCallbacks getMyActivityLifecycleCallbacks() { | ||||
|         return mMyActivityLifecycleCallbacks; | ||||
|     } | ||||
| //    MyActivityLifecycleCallbacks getMyActivityLifecycleCallbacks() { | ||||
| //        return mMyActivityLifecycleCallbacks; | ||||
| //    } | ||||
|  | ||||
|     @Override | ||||
|     public Context getApplicationContext() { | ||||
| @@ -74,8 +72,8 @@ public class App extends GlobalApplication { | ||||
|             } | ||||
|             // 应用窗口管理模块参数设置 | ||||
|             // | ||||
|             mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks(); | ||||
|             registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks); | ||||
|             //mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks(); | ||||
|             //registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks); | ||||
|             // 设置默认 WinBoll 应用 UI 类型 | ||||
|             //WinBollActivityManager.getInstance(this).setWinBollUI_TYPE(WinBollActivityManager.WinBollUI_TYPE.Service); | ||||
|             //ToastUtils.show("WinBollUI_TYPE " + getWinBollUI_TYPE()); | ||||
|   | ||||
| @@ -20,15 +20,13 @@ import cc.winboll.studio.libapputils.activities.AssetsHtmlActivity; | ||||
| import cc.winboll.studio.libapputils.activities.LogActivity; | ||||
| import cc.winboll.studio.libapputils.activities.QRCodeDecodeActivity; | ||||
| import cc.winboll.studio.libapputils.app.AboutActivityFactory; | ||||
| import cc.winboll.studio.libapputils.app.IWinBollActivity; | ||||
| import cc.winboll.studio.libapputils.app.WinBollActivityManager; | ||||
| import cc.winboll.studio.libapputils.bean.APPInfo; | ||||
| import cc.winboll.studio.libapputils.view.AboutView; | ||||
| import cc.winboll.studio.libapputils.view.YesNoAlertDialog; | ||||
| import java.util.List; | ||||
| import java.util.Set; | ||||
|  | ||||
| final public class MainActivity extends Activity implements IWinBollActivity { | ||||
| final public class MainActivity extends Activity { | ||||
|  | ||||
| 	public static final String TAG = "MainActivity"; | ||||
|  | ||||
| @@ -42,44 +40,24 @@ final public class MainActivity extends Activity implements IWinBollActivity { | ||||
| //        return this; | ||||
| //    } | ||||
|  | ||||
|     @Override | ||||
|     public APPInfo getAppInfo() { | ||||
|         String szBranchName = "apputils"; | ||||
|  | ||||
|         APPInfo appInfo = AboutActivityFactory.buildDefaultAPPInfo(); | ||||
|         appInfo.setAppName("APPUtils"); | ||||
|         appInfo.setAppIcon(cc.winboll.studio.libapputils.R.drawable.ic_winboll); | ||||
|         appInfo.setAppDescription("APPUtils Description"); | ||||
|         appInfo.setAppGitName("APP"); | ||||
|         appInfo.setAppGitOwner("Studio"); | ||||
|         appInfo.setAppGitAPPBranch(szBranchName); | ||||
|         appInfo.setAppGitAPPSubProjectFolder(szBranchName); | ||||
|         appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=APP"); | ||||
|         appInfo.setAppAPKName("APPUtils"); | ||||
|         appInfo.setAppAPKFolderName("APPUtils"); | ||||
|         return appInfo; | ||||
|         //return null; | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public String getTag() { | ||||
|         return TAG; | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public boolean isAddWinBollToolBar() { | ||||
|         return true; | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public Toolbar initToolBar() { | ||||
|         return findViewById(R.id.activitymainToolbar1); | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public boolean isEnableDisplayHomeAsUp() { | ||||
|         return false; | ||||
|     } | ||||
| //    @Override | ||||
| //    public APPInfo getAppInfo() { | ||||
| //        String szBranchName = "apputils"; | ||||
| // | ||||
| //        APPInfo appInfo = AboutActivityFactory.buildDefaultAPPInfo(); | ||||
| //        appInfo.setAppName("APPUtils"); | ||||
| //        appInfo.setAppIcon(cc.winboll.studio.libapputils.R.drawable.ic_winboll); | ||||
| //        appInfo.setAppDescription("APPUtils Description"); | ||||
| //        appInfo.setAppGitName("APP"); | ||||
| //        appInfo.setAppGitOwner("Studio"); | ||||
| //        appInfo.setAppGitAPPBranch(szBranchName); | ||||
| //        appInfo.setAppGitAPPSubProjectFolder(szBranchName); | ||||
| //        appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=APP"); | ||||
| //        appInfo.setAppAPKName("APPUtils"); | ||||
| //        appInfo.setAppAPKFolderName("APPUtils"); | ||||
| //        return appInfo; | ||||
| //        //return null; | ||||
| //    } | ||||
|  | ||||
|     @Override | ||||
|     protected void onCreate(Bundle savedInstanceState) { | ||||
| @@ -92,11 +70,11 @@ final public class MainActivity extends Activity implements IWinBollActivity { | ||||
|         // 初始化工具栏 | ||||
|         mToolbar = findViewById(R.id.activitymainToolbar1); | ||||
|         setActionBar(mToolbar); | ||||
|         if (isEnableDisplayHomeAsUp()) { | ||||
|             // 显示后退按钮 | ||||
|             getActionBar().setDisplayHomeAsUpEnabled(true); | ||||
|         } | ||||
|         getActionBar().setSubtitle(getTag()); | ||||
| //        if (isEnableDisplayHomeAsUp()) { | ||||
| //            // 显示后退按钮 | ||||
| //            getActionBar().setDisplayHomeAsUpEnabled(true); | ||||
| //        } | ||||
| //        getActionBar().setSubtitle(getTag()); | ||||
|  | ||||
|         checkResolveActivity(); | ||||
|         archiveInstance(); | ||||
| @@ -248,10 +226,10 @@ final public class MainActivity extends Activity implements IWinBollActivity { | ||||
|     public boolean onCreateOptionsMenu(Menu menu) { | ||||
|         //ToastUtils.show("onCreateOptionsMenu"); | ||||
|         getMenuInflater().inflate(R.menu.toolbar_main, menu); | ||||
|         if (isAddWinBollToolBar()) { | ||||
|             //ToastUtils.show("mIWinBoll.isAddWinBollToolBar()"); | ||||
|             getMenuInflater().inflate(R.menu.toolbar_winboll_shared_main, menu); | ||||
|         } | ||||
| //        if (isAddWinBollToolBar()) { | ||||
| //            //ToastUtils.show("mIWinBoll.isAddWinBollToolBar()"); | ||||
| //            getMenuInflater().inflate(R.menu.toolbar_winboll_shared_main, menu); | ||||
| //        } | ||||
|         if (App.isDebug()) { | ||||
|             getMenuInflater().inflate(R.menu.toolbar_studio_debug, menu); | ||||
|         } | ||||
| @@ -264,9 +242,9 @@ final public class MainActivity extends Activity implements IWinBollActivity { | ||||
|         if (item.getItemId() == R.id.item_exit) { | ||||
|             exit(); | ||||
|             return true; | ||||
|         } else if (item.getItemId() == R.id.item_about) { | ||||
|             AboutActivityFactory.showAboutActivity(this, getAppInfo()); | ||||
|             return true; | ||||
| //        } else if (item.getItemId() == R.id.item_about) { | ||||
| //            AboutActivityFactory.showAboutActivity(this, getAppInfo()); | ||||
| //            return true; | ||||
|         } else if (item.getItemId() == R.id.item_teststringtoqrcodeview) { | ||||
|             //WinBollActivityManager.getInstance(this).startWinBollActivity(this, TestStringToQrCodeViewActivity.class); | ||||
|         } else if (item.getItemId() == R.id.item_testqrcodedecodeactivity) { | ||||
|   | ||||
| @@ -6,38 +6,11 @@ package cc.winboll.studio.apputils; | ||||
|  */ | ||||
| import android.app.Activity; | ||||
| import android.os.Bundle; | ||||
| import android.widget.Toolbar; | ||||
| import cc.winboll.studio.libapputils.app.IWinBollActivity; | ||||
| import cc.winboll.studio.libapputils.bean.APPInfo; | ||||
|  | ||||
| public class TestBBMorseCodeActivity extends Activity implements IWinBollActivity { | ||||
| public class TestBBMorseCodeActivity extends Activity { | ||||
|  | ||||
|     public static final String TAG = "TestBBMorseCodeActivity"; | ||||
|  | ||||
|     @Override | ||||
|     public APPInfo getAppInfo() { | ||||
|         return null; | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public String getTag() { | ||||
|         return TAG; | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public Toolbar initToolBar() { | ||||
|         return findViewById(R.id.activityteststringtoqrcodeviewToolbar1); | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public boolean isEnableDisplayHomeAsUp() { | ||||
|         return true; | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public boolean isAddWinBollToolBar() { | ||||
|         return true; | ||||
|     } | ||||
|     @Override | ||||
|     protected void onCreate(Bundle savedInstanceState) { | ||||
|         super.onCreate(savedInstanceState); | ||||
|   | ||||
| @@ -8,11 +8,10 @@ import cc.winboll.studio.apputils.R; | ||||
| import android.app.Activity; | ||||
| import android.os.Bundle; | ||||
| import android.widget.Toolbar; | ||||
| import cc.winboll.studio.libapputils.app.IWinBollActivity; | ||||
| import cc.winboll.studio.libapputils.bean.APPInfo; | ||||
| import cc.winboll.studio.libapputils.view.StringToQrCodeView; | ||||
|  | ||||
| public class TestStringToQrCodeViewActivity extends Activity implements IWinBollActivity { | ||||
| public class TestStringToQrCodeViewActivity extends Activity { | ||||
|  | ||||
|     public static final String TAG = "TestStringToQrCodeViewActivity"; | ||||
|  | ||||
| @@ -23,31 +22,6 @@ public class TestStringToQrCodeViewActivity extends Activity implements IWinBoll | ||||
| //        return this; | ||||
| //    } | ||||
|  | ||||
|     @Override | ||||
|     public APPInfo getAppInfo() { | ||||
|         return null; | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public String getTag() { | ||||
|         return TAG; | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public Toolbar initToolBar() { | ||||
|         return findViewById(R.id.activityteststringtoqrcodeviewToolbar1); | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public boolean isEnableDisplayHomeAsUp() { | ||||
|         return true; | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public boolean isAddWinBollToolBar() { | ||||
|         return true; | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     protected void onCreate(Bundle savedInstanceState) { | ||||
|         super.onCreate(savedInstanceState); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 ZhanGSKen
					ZhanGSKen