<apputils>APK 9.2.6 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 01:54:23 HKT 2025
+stageCount=7
 libraryProject=libapputils
 baseVersion=9.2
-publishVersion=9.2.4
+publishVersion=9.2.6
 buildCount=0
-baseBetaVersion=9.2.5
+baseBetaVersion=9.2.7

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

@@ -23,7 +23,12 @@ public class App extends GlobalApplication {
         super.onCreate();
         // 初始化 WinBoll 框架
         WinBollUtils.getInstance(this).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 01:54:23 HKT 2025
+stageCount=7
 libraryProject=libapputils
 baseVersion=9.2
-publishVersion=9.2.4
+publishVersion=9.2.6
 buildCount=0
-baseBetaVersion=9.2.5
+baseBetaVersion=9.2.7

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/WinBollUtils.java

@@ -72,12 +72,6 @@ public class WinBollUtils {
         //
         // 初始化日志模块
         LogUtils.init(mContext);
-        // 初始化 Toast 框架
-        ToastUtils.init(application);
-        // 设置 Toast 布局样式
-        //ToastUtils.setView(R.layout.view_toast);
-        ToastUtils.setStyle(new WhiteToastStyle());
-        ToastUtils.setGravity(Gravity.BOTTOM, 0, 200);
         // 设置应用调试标志
         DebugBean debugBean = DebugBean.loadBean(mContext, DebugBean.class);
         if (debugBean == null) {

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>