From 8e290cd5e6d262535e8265061319016a75f1357b Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Thu, 23 Jan 2025 04:04:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E4=BB=8B=E7=BB=8D=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=20Gitea=20=E6=8B=A5=E6=9C=89=E8=80=85=E5=B1=9E?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apputils/build.properties | 4 ++-- .../cc/winboll/studio/apputils/MainActivity.java | 1 + libapputils/build.properties | 4 ++-- .../winboll/studio/libapputils/bean/APPInfo.java | 14 +++++++++++++- .../winboll/studio/libapputils/view/AboutView.java | 3 ++- libapputils/src/main/res/values/attrs.xml | 1 + 6 files changed, 21 insertions(+), 6 deletions(-) diff --git a/apputils/build.properties b/apputils/build.properties index 0313bf9..22709dd 100644 --- a/apputils/build.properties +++ b/apputils/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu Jan 23 03:47:33 HKT 2025 +#Wed Jan 22 20:03:52 GMT 2025 stageCount=13 libraryProject=libapputils baseVersion=9.2 publishVersion=9.2.12 -buildCount=0 +buildCount=3 baseBetaVersion=9.2.13 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 338edc6..bc95219 100644 --- a/apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java +++ b/apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java @@ -174,6 +174,7 @@ final public class MainActivity extends WinBollActivity { appInfo.setAppIcon(cc.winboll.studio.libapputils.R.drawable.ic_winboll); appInfo.setAppDescription("APPUtils Description"); appInfo.setAppGitName("APP"); + appInfo.setAppGitOwner("Studio"); appInfo.setAppGitAPPBranch("apputils"); appInfo.setAppGitAPPSubProjectFolder("apputils"); appInfo.setAppHomePage("https://www.winboll.cc/studio/details.php?app=APP"); diff --git a/libapputils/build.properties b/libapputils/build.properties index 19eed2e..22709dd 100644 --- a/libapputils/build.properties +++ b/libapputils/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Thu Jan 23 03:47:26 HKT 2025 +#Wed Jan 22 20:03:52 GMT 2025 stageCount=13 libraryProject=libapputils baseVersion=9.2 publishVersion=9.2.12 -buildCount=0 +buildCount=3 baseBetaVersion=9.2.13 diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/bean/APPInfo.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/bean/APPInfo.java index a9d7d58..1997461 100644 --- a/libapputils/src/main/java/cc/winboll/studio/libapputils/bean/APPInfo.java +++ b/libapputils/src/main/java/cc/winboll/studio/libapputils/bean/APPInfo.java @@ -20,6 +20,8 @@ public class APPInfo implements Serializable { String appDescription; // 应用Git仓库地址 String appGitName; + // 应用Git仓库拥有者 + String appGitOwner; // 应用Git仓库分支 String appGitAPPBranch; // 应用Git仓库子项目文件夹 @@ -31,11 +33,12 @@ public class APPInfo implements Serializable { // 应用包存储文件夹名称 String appAPKFolderName; - public APPInfo(String appName, int appIcon, String appDescription, String appGitName, String appGitAPPBranch, String appGitAPPSubProjectFolder, String appHomePage, String appAPKName, String appAPKFolderName) { + public APPInfo(String appName, int appIcon, String appDescription, String appGitName, String appGitOwner, String appGitAPPBranch, String appGitAPPSubProjectFolder, String appHomePage, String appAPKName, String appAPKFolderName) { this.appName = appName; this.appIcon = appIcon; this.appDescription = appDescription; this.appGitName = appGitName; + this.appGitOwner = appGitOwner; this.appGitAPPBranch = appGitAPPBranch; this.appGitAPPSubProjectFolder = appGitAPPSubProjectFolder; this.appHomePage = appHomePage; @@ -48,6 +51,7 @@ public class APPInfo implements Serializable { this.appIcon = R.drawable.ic_launcher; this.appDescription = "WinBoll APP"; this.appGitName = "APP"; + this.appGitOwner = "Studio"; this.appGitAPPBranch = "app"; this.appGitAPPSubProjectFolder = "app"; this.appHomePage = "https://www.winboll.cc/studio/details.php?app=APP"; @@ -55,6 +59,14 @@ public class APPInfo implements Serializable { this.appAPKFolderName = "APP"; } + public void setAppGitOwner(String appGitOwner) { + this.appGitOwner = appGitOwner; + } + + public String getAppGitOwner() { + return appGitOwner; + } + public void setAppGitAPPBranch(String appGitAPPBranch) { this.appGitAPPBranch = appGitAPPBranch; } diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/view/AboutView.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/view/AboutView.java index 5050402..6b4b71c 100644 --- a/libapputils/src/main/java/cc/winboll/studio/libapputils/view/AboutView.java +++ b/libapputils/src/main/java/cc/winboll/studio/libapputils/view/AboutView.java @@ -88,6 +88,7 @@ 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.setAppGitOwner(typedArray.getString(R.styleable.AboutView_app_gitowner)); 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)); @@ -114,7 +115,7 @@ public class AboutView extends LinearLayout { } mszCurrentAppPackageName = mszAppAPKName + "_" + mszAppVersionName + ".apk"; mszHomePage = mszWinBollServerHost + "/studio/details.php?app=" + mszAppAPKFolderName; - mszGitea = "https://gitea.winboll.cc/Studio/" + mszAppGitName + "/src/branch/" + mAPPInfo.getAppGitAPPBranch() + "/" + mAPPInfo.getAppGitAPPSubProjectFolder(); + mszGitea = "https://gitea.winboll.cc/" + mAPPInfo.getAppGitOwner() + "/" + mszAppGitName + "/src/branch/" + mAPPInfo.getAppGitAPPBranch() + "/" + mAPPInfo.getAppGitAPPSubProjectFolder(); if (WinBollGlobalApplication.isDebug()) { LayoutInflater inflater = LayoutInflater.from(mContext); diff --git a/libapputils/src/main/res/values/attrs.xml b/libapputils/src/main/res/values/attrs.xml index 783346c..6c985c2 100644 --- a/libapputils/src/main/res/values/attrs.xml +++ b/libapputils/src/main/res/values/attrs.xml @@ -5,6 +5,7 @@ +