<apputils>APK 9.2.8 release Publish.

apputils/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Jan 22 21:22:05 HKT 2025
-stageCount=5
+#Thu Jan 23 02:30:17 HKT 2025
+stageCount=9
 libraryProject=libapputils
 baseVersion=9.2
-publishVersion=9.2.4
+publishVersion=9.2.8
 buildCount=0
-baseBetaVersion=9.2.5
+baseBetaVersion=9.2.9

apputils/src/main/java/cc/winboll/studio/apputils/App.java

@@ -22,8 +22,13 @@ public class App extends GlobalApplication {
     public void onCreate() {
         super.onCreate();
         // 初始化 WinBoll 框架
-        WinBollUtils.getInstance(this).init(this);
-        
+        WinBollUtils.init(this);
+        // 初始化 Toast 框架
+        ToastUtils.init(this);
+        // 设置 Toast 布局样式
+        //ToastUtils.setView(R.layout.view_toast);
+        ToastUtils.setStyle(new WhiteToastStyle());
+        ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
     }
 
 }

apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java

@@ -174,6 +174,8 @@ final public class MainActivity extends WinBollActivity {
         appInfo.setAppIcon(cc.winboll.studio.libapputils.R.drawable.ic_winboll);
         appInfo.setAppDescription("APPUtils Description");
         appInfo.setAppGitName("APP");
+        appInfo.setAppGitAPPBranch("apputils");
+        appInfo.setAppGitAPPSubProjectFolder("apputils");
         appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=APP");
         appInfo.setAppAPKName("APPUtils");
         appInfo.setAppAPKFolderName("APPUtils");

libapputils/build.properties

@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Wed Jan 22 21:22:05 HKT 2025
-stageCount=5
+#Thu Jan 23 02:30:17 HKT 2025
+stageCount=9
 libraryProject=libapputils
 baseVersion=9.2
-publishVersion=9.2.4
+publishVersion=9.2.8
 buildCount=0
-baseBetaVersion=9.2.5
+baseBetaVersion=9.2.9

libapputils/src/main/java/cc/winboll/studio/libapputils/activities/AssetsHtmlActivity.java

@@ -81,7 +81,7 @@ public class AssetsHtmlActivity extends WinBollActivity {
             if (szTemp != null && !szTemp.trim().equals("")) {
                 mszHtmlFileName = szTemp.trim();
             }
-            ToastUtils.show(mszHtmlFileName);
+            //ToastUtils.show(mszHtmlFileName);
         }
 
         // 与其他应用分享 html 帮助

libapputils/src/main/java/cc/winboll/studio/libapputils/app/WinBollActivityManager.java

@@ -171,11 +171,11 @@ public class WinBollActivityManager {
                 //ToastUtils.show("finishAll() activity");
                 if (activity != null && !activity.isFinishing() && !activity.isDestroyed()) {
                     //ToastUtils.show("activity != null ...");
-                    if (WinBollUtils.getInstance(mContext).getWinBollUI_TYPE() == WinBollUtils.WinBollUI_TYPE.Service) {
+                    if (WinBollUtils.getWinBollUI_TYPE() == WinBollUtils.WinBollUI_TYPE.Service) {
                         // 结束窗口和最近任务栏, 建议前台服务类应用使用，可以方便用户再次调用 UI 操作。
                         activity.finishAndRemoveTask();
                         //ToastUtils.show("finishAll() activity.finishAndRemoveTask();");
-                    } else if (WinBollUtils.getInstance(mContext).getWinBollUI_TYPE() == WinBollUtils.WinBollUI_TYPE.Aplication) {
+                    } else if (WinBollUtils.getWinBollUI_TYPE() == WinBollUtils.WinBollUI_TYPE.Aplication) {
                         // 结束窗口保留最近任务栏，建议前台服务类应用使用，可以保持应用的系统自觉性。
                         activity.finish();
                         //ToastUtils.show("finishAll() activity.finish();");

libapputils/src/main/java/cc/winboll/studio/libapputils/app/WinBollUtils.java

@@ -7,6 +7,7 @@ import cc.winboll.studio.libapputils.bean.DebugBean;
 import cc.winboll.studio.libapputils.log.LogUtils;
 import com.hjq.toast.ToastUtils;
 import com.hjq.toast.style.WhiteToastStyle;
+import cc.winboll.studio.GlobalApplication;
 
 public class WinBollUtils {
 
@@ -16,13 +17,13 @@ public class WinBollUtils {
     // 单件结构模块
     //
     static volatile WinBollUtils _WinBollUtils;
-    Context mContext;
-    WinBollUtils(Context context) {
-        mContext = context;
+    Application mApplication;
+    WinBollUtils(Application application) {
+        mApplication = application;
     }
-    public static synchronized WinBollUtils getInstance(Context context) {
+    static synchronized WinBollUtils getInstance(Application application) {
         if (_WinBollUtils == null) {
-            _WinBollUtils = new WinBollUtils(context);
+            _WinBollUtils = new WinBollUtils(application);
         }
         return _WinBollUtils;
     }
@@ -59,7 +60,7 @@ public class WinBollUtils {
     //
     // 获取 WinBoll 应用 UI 类型
     //
-    public static WinBollUI_TYPE getWinBollUI_TYPE() {
+    public synchronized static WinBollUI_TYPE getWinBollUI_TYPE() {
         return _mWinBollUI_TYPE;
     }
 
@@ -67,19 +68,14 @@ public class WinBollUtils {
         return mMyActivityLifecycleCallbacks;
     }
 
-    public void init(Application application) {
+    public static void init(Application application) {
+        WinBollUtils winBollUtils = WinBollUtils.getInstance(application);
         // 应用环境初始化, 基本调试环境
         //
         // 初始化日志模块
-        LogUtils.init(mContext);
-        // 初始化 Toast 框架
-        ToastUtils.init(application);
-        // 设置 Toast 布局样式
-        //ToastUtils.setView(R.layout.view_toast);
-        ToastUtils.setStyle(new WhiteToastStyle());
-        ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
+        LogUtils.init(application);
         // 设置应用调试标志
-        DebugBean debugBean = DebugBean.loadBean(mContext, DebugBean.class);
+        DebugBean debugBean = DebugBean.loadBean(application, DebugBean.class);
         if (debugBean == null) {
             //ToastUtils.show("debugBean == null");
             setIsDebug(false);
@@ -89,8 +85,8 @@ public class WinBollUtils {
         }
         // 应用窗口管理模块参数设置
         //
-        mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks(application);
-        application.registerActivityLifecycleCallbacks(mMyActivityLifecycleCallbacks);
+        winBollUtils.mMyActivityLifecycleCallbacks = new MyActivityLifecycleCallbacks(application);
+        application.registerActivityLifecycleCallbacks(winBollUtils.mMyActivityLifecycleCallbacks);
         // 设置默认 WinBoll 应用 UI 类型
         setWinBollUI_TYPE(WinBollUI_TYPE.Service);
         //ToastUtils.show("WinBollUI_TYPE " + getWinBollUI_TYPE());

libapputils/src/main/java/cc/winboll/studio/libapputils/bean/APPInfo.java

@@ -20,6 +20,10 @@ public class APPInfo implements Serializable {
     String appDescription;
     // 应用Git仓库地址
     String appGitName;
+    // 应用Git仓库分支
+    String appGitAPPBranch;
+    // 应用Git仓库子项目文件夹
+    String appGitAPPSubProjectFolder;
     // 应用主页
     String appHomePage;
     // 应用包名称
@@ -27,27 +31,46 @@ public class APPInfo implements Serializable {
     // 应用包存储文件夹名称
     String appAPKFolderName;
 
-    public APPInfo(String appName, int appIcon, String appDescription, String appGitName, String appHomePage, String appAPKName, String appAPKFolderName) {
+    public APPInfo(String appName, int appIcon, String appDescription, String appGitName, String appGitAPPBranch, String appGitAPPSubProjectFolder, String appHomePage, String appAPKName, String appAPKFolderName) {
         this.appName = appName;
         this.appIcon = appIcon;
         this.appDescription = appDescription;
         this.appGitName = appGitName;
+        this.appGitAPPBranch = appGitAPPBranch;
+        this.appGitAPPSubProjectFolder = appGitAPPSubProjectFolder;
         this.appHomePage = appHomePage;
         this.appAPKName = appAPKName;
         this.appAPKFolderName = appAPKFolderName;
     }
 
-
     public APPInfo() {
         this.appName = "WinBoll-APP";
         this.appIcon = R.drawable.ic_launcher;
         this.appDescription = "WinBoll APP";
         this.appGitName = "APP";
+        this.appGitAPPBranch = "app";
+        this.appGitAPPSubProjectFolder = "app";
         this.appHomePage = "https://www.winboll.cc/studio/details.php?app=APP";
         this.appAPKName = "APP";
         this.appAPKFolderName = "APP";
     }
 
+    public void setAppGitAPPBranch(String appGitAPPBranch) {
+        this.appGitAPPBranch = appGitAPPBranch;
+    }
+
+    public String getAppGitAPPBranch() {
+        return appGitAPPBranch;
+    }
+
+    public void setAppGitAPPSubProjectFolder(String appGitAPPSubProjectFolder) {
+        this.appGitAPPSubProjectFolder = appGitAPPSubProjectFolder;
+    }
+
+    public String getAppGitAPPSubProjectFolder() {
+        return appGitAPPSubProjectFolder;
+    }
+
     public void setAppIcon(int appIcon) {
         this.appIcon = appIcon;
     }

libapputils/src/main/java/cc/winboll/studio/libapputils/view/AboutView.java

@@ -88,6 +88,8 @@ public class AboutView extends LinearLayout {
         appInfo.setAppAPKFolderName(typedArray.getString(R.styleable.AboutView_app_apkfoldername));
         appInfo.setAppAPKName(typedArray.getString(R.styleable.AboutView_app_apkname));
         appInfo.setAppGitName(typedArray.getString(R.styleable.AboutView_app_gitname));
+        appInfo.setAppGitAPPBranch(typedArray.getString(R.styleable.AboutView_app_gitappbranch));
+        appInfo.setAppGitAPPSubProjectFolder(typedArray.getString(R.styleable.AboutView_app_gitappsubprojectfolder));
         appInfo.setAppDescription(typedArray.getString(R.styleable.AboutView_appdescription));
         appInfo.setAppIcon(typedArray.getResourceId(R.styleable.AboutView_appicon, R.drawable.ic_winboll));
         // 返回一个绑定资源结束的信号给资源
@@ -112,7 +114,7 @@ public class AboutView extends LinearLayout {
         }
         mszCurrentAppPackageName = mszAppAPKName + "_" + mszAppVersionName + ".apk";
         mszHomePage = mszWinBollServerHost + "/studio/details.php?app=" + mszAppAPKFolderName;
-        mszGitea = "https://gitea.winboll.cc/Studio/" + mszAppGitName + ".git";
+        mszGitea = "https://gitea.winboll.cc/Studio/" + mszAppGitName + "/src/branch/" + mAPPInfo.getAppGitAPPBranch() + "/" + mAPPInfo.getAppGitAPPSubProjectFolder();
 
         if (WinBollUtils.isDebug()) {
             LayoutInflater inflater = LayoutInflater.from(mContext);

libapputils/src/main/res/values/attrs.xml

@@ -5,6 +5,8 @@
         <attr name="app_apkfoldername" format="string" />
         <attr name="app_apkname" format="string" />
         <attr name="app_gitname" format="string" />
+        <attr name="app_gitappbranch" format="string" />
+        <attr name="app_gitappsubprojectfolder" format="string" />
         <attr name="appdescription" format="string" />
         <attr name="appicon" format="reference" />
     </declare-styleable>