From 506d2619f207da97d416649cee9c6d212bbea0d7 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Mon, 20 Jan 2025 14:51:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E4=BB=8B=E7=BB=8D=E9=A1=B5?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apputils/build.properties                     |   4 +-
 .../winboll/studio/apputils/MainActivity.java |  11 ++
 .../src/main/res/layout/activity_main.xml     |  15 +++
 libapputils/build.properties                  |   4 +-
 .../libapputils/activities/AboutActivity.java |  61 +++++-----
 .../studio/libapputils/bean/APPInfo.java      | 107 ++++++++++++++++++
 .../studio/libapputils/view/AboutView.java    |  49 ++++++--
 .../src/main/res/layout/activity_about.xml    |  35 +++---
 8 files changed, 225 insertions(+), 61 deletions(-)
 create mode 100644 libapputils/src/main/java/cc/winboll/studio/libapputils/bean/APPInfo.java

diff --git a/apputils/build.properties b/apputils/build.properties
index 099838d..1efde08 100644
--- a/apputils/build.properties
+++ b/apputils/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Jan 20 04:46:17 GMT 2025
+#Mon Jan 20 06:50:11 GMT 2025
 stageCount=2
 libraryProject=libapputils
 baseVersion=9.2
 publishVersion=9.2.1
-buildCount=15
+buildCount=25
 baseBetaVersion=9.2.2
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 0693802..54fd6ea 100644
--- a/apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java
+++ b/apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java
@@ -14,6 +14,8 @@ import cc.winboll.studio.libapputils.app.WinBollActivityManager;
 import cc.winboll.studio.libapputils.log.LogActivity;
 import cc.winboll.studio.libapputils.log.LogUtils;
 import com.hjq.toast.ToastUtils;
+import cc.winboll.studio.libapputils.activities.AboutActivity;
+import cc.winboll.studio.libapputils.bean.APPInfo;
 
 final public class MainActivity extends WinBollActivity {
 
@@ -161,6 +163,15 @@ final public class MainActivity extends WinBollActivity {
         }
         return super.onOptionsItemSelected(item);
     }
+    
+    public void onTestAboutActivity(View view) {
+        Intent intent = new Intent(this, AboutActivity.class);
+        APPInfo appInfo = new APPInfo();
+        appInfo.setAppIcon(cc.winboll.studio.libapputils.R.drawable.ic_winboll);
+        appInfo.setAppName("Test APP");
+        intent.putExtra(AboutActivity.EXTRA_APPINFO, appInfo);
+        WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, AboutActivity.class);
+    }
 
     public void onTestJavascriptHtmlActivity(View view) {
         Intent intent = new Intent(this, AssetsHtmlActivity.class);
diff --git a/apputils/src/main/res/layout/activity_main.xml b/apputils/src/main/res/layout/activity_main.xml
index ad57465..737ee00 100644
--- a/apputils/src/main/res/layout/activity_main.xml
+++ b/apputils/src/main/res/layout/activity_main.xml
@@ -54,6 +54,21 @@
 
         </LinearLayout>
 
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="right">
+
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAllCaps="false"
+                android:text="Test AboutActivity"
+                android:onClick="onTestAboutActivity"/>
+
+        </LinearLayout>
+        
 	</LinearLayout>
 
 </LinearLayout>
diff --git a/libapputils/build.properties b/libapputils/build.properties
index 099838d..1efde08 100644
--- a/libapputils/build.properties
+++ b/libapputils/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Jan 20 04:46:17 GMT 2025
+#Mon Jan 20 06:50:11 GMT 2025
 stageCount=2
 libraryProject=libapputils
 baseVersion=9.2
 publishVersion=9.2.1
-buildCount=15
+buildCount=25
 baseBetaVersion=9.2.2
diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/activities/AboutActivity.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/activities/AboutActivity.java
index 56ed421..108b628 100644
--- a/libapputils/src/main/java/cc/winboll/studio/libapputils/activities/AboutActivity.java
+++ b/libapputils/src/main/java/cc/winboll/studio/libapputils/activities/AboutActivity.java
@@ -1,25 +1,31 @@
 package cc.winboll.studio.libapputils.activities;
 
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
-import androidx.appcompat.widget.Toolbar;
-import cc.winboll.studio.libapputils.R;
-import cc.winboll.studio.libapputils.app.WinBollActivity;
-import cc.winboll.studio.libapputils.app.WinBollActivityManager;
-import cc.winboll.studio.libapputils.log.LogUtils;
-
 /**
  * @Author ZhanGSKen@QQ.COM
  * @Date 2024/07/14 13:20:33
- * @Describe AboutFragment Test
+ * @Describe 应用介绍页
  */
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.LinearLayout;
+import androidx.appcompat.widget.Toolbar;
+import cc.winboll.studio.libapputils.R;
+import cc.winboll.studio.libapputils.app.WinBollActivity;
+import cc.winboll.studio.libapputils.app.WinBollActivityManager;
+import cc.winboll.studio.libapputils.bean.APPInfo;
+import cc.winboll.studio.libapputils.view.AboutView;
+import com.hjq.toast.ToastUtils;
+
 final public class AboutActivity extends WinBollActivity {
 
     public static final String TAG = "AboutActivity";
+    public static final String EXTRA_APPINFO = "EXTRA_APPINFO";
 
 
+    APPInfo mAPPInfo;
+
     @Override
     public String getTag() {
         return TAG;
@@ -34,21 +40,19 @@ final public class AboutActivity extends WinBollActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
-
-        /*AboutView aboutView = findViewById(R.id.activityaboutAboutView1);
-         aboutView.setOnRequestDevUserInfoAutofillListener(new AboutView.OnRequestDevUserInfoAutofillListener(){
-
-         @Override
-         public void requestAutofill(EditText etDevUserName, EditText etDevUserPassword) {
-         AutofillManager autofillManager = (AutofillManager) getSystemService(AutofillManager.class);
-         if (autofillManager!= null) {
-         //ToastUtils.show("0");
-         autofillManager.requestAutofill(findViewById(R.id.usernameEditText));
-         autofillManager.requestAutofill(findViewById(R.id.passwordEditText));
-         }
-         }
-         });*/
-
+        Intent intent = getIntent();
+        if (intent != null) {
+            mAPPInfo = (APPInfo)intent.getSerializableExtra(EXTRA_APPINFO);
+        }
+        if (mAPPInfo == null) {
+            mAPPInfo = new APPInfo();
+        }
+        
+        AboutView aboutView = new AboutView(this, mAPPInfo);
+        LinearLayout llMain = findViewById(R.id.activityaboutLinearLayout1);
+        llMain.addView(aboutView);
+        
+        ToastUtils.show(TAG);
     }
 
     @Override
@@ -79,9 +83,8 @@ final public class AboutActivity extends WinBollActivity {
         if (item.getItemId() == R.id.item_help) {
             WinBollActivityManager.getInstance(this).startWinBollActivity(this, AssetsHtmlActivity.class);
         }
-//        else if (item.getItemId() == android.R.id.home) {
-//            WinBollActivityManager.getInstance(this).finish(this);
-//        }
         return super.onOptionsItemSelected(item);
     }
+
+
 }
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
new file mode 100644
index 0000000..d696629
--- /dev/null
+++ b/libapputils/src/main/java/cc/winboll/studio/libapputils/bean/APPInfo.java
@@ -0,0 +1,107 @@
+package cc.winboll.studio.libapputils.bean;
+
+/**
+ * @Author ZhanGSKen@QQ.COM
+ * @Date 2025/01/20 14:19:02
+ * @Describe 应用信息类
+ */
+import cc.winboll.studio.libapputils.R;
+import java.io.Serializable;
+
+public class APPInfo implements Serializable {
+
+    public static final String TAG = "APPInfo";
+
+    // 应用名称
+    String appName;
+    // 应用图标
+    int appIcon;
+    // 应用描述
+    String appDescription;
+    // 应用Git仓库地址
+    String appGitName;
+    // 应用主页
+    String appHomePage;
+    // 应用包名称
+    String appAPKName;
+    // 应用包存储文件夹名称
+    String appAPKFolderName;
+
+    public APPInfo(String appName, int appIcon, String appDescription, String appGitName, String appHomePage, String appAPKName, String appAPKFolderName) {
+        this.appName = appName;
+        this.appIcon = appIcon;
+        this.appDescription = appDescription;
+        this.appGitName = appGitName;
+        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.appHomePage = "https://www.winboll.cc/studio/details.php?app=APP";
+        this.appAPKName = "APP";
+        this.appAPKFolderName = "APP";
+    }
+
+    public void setAppIcon(int appIcon) {
+        this.appIcon = appIcon;
+    }
+
+    public int getAppIcon() {
+        return appIcon;
+    }
+
+    public void setAppDescription(String appDescription) {
+        this.appDescription = appDescription;
+    }
+
+    public String getAppDescription() {
+        return appDescription;
+    }
+
+    public void setAppAPKFolderName(String appAPKFolderName) {
+        this.appAPKFolderName = appAPKFolderName;
+    }
+
+    public String getAppAPKFolderName() {
+        return appAPKFolderName;
+    }
+
+    public void setAppName(String appName) {
+        this.appName = appName;
+    }
+
+    public String getAppName() {
+        return appName;
+    }
+
+    public void setAppGitName(String appGitName) {
+        this.appGitName = appGitName;
+    }
+
+    public String getAppGitName() {
+        return appGitName;
+    }
+
+    public void setAppHomePage(String appHomePage) {
+        this.appHomePage = appHomePage;
+    }
+
+    public String getAppHomePage() {
+        return appHomePage;
+    }
+
+    public void setAppAPKName(String appAPKName) {
+        this.appAPKName = appAPKName;
+    }
+
+    public String getAppAPKName() {
+        return appAPKName;
+    }
+}
+
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 dd6b04f..6b21db1 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
@@ -20,6 +20,7 @@ import cc.winboll.studio.libapputils.R;
 import cc.winboll.studio.libapputils.app.AppVersionUtils;
 import cc.winboll.studio.libapputils.app.WinBollActivityManager;
 import cc.winboll.studio.libapputils.app.WinBollApplication;
+import cc.winboll.studio.libapputils.bean.APPInfo;
 import cc.winboll.studio.libapputils.bean.DebugBean;
 import cc.winboll.studio.libapputils.log.LogUtils;
 import cc.winboll.studio.libapputils.util.PrefUtils;
@@ -41,6 +42,8 @@ public class AboutView extends LinearLayout {
     public static final int MSG_APPUPDATE_CHECKED = 0;
 
     Context mContext;
+    APPInfo mAPPInfo;
+
     WinBollServiceStatusView mWinBollServiceStatusView;
     OnRequestDevUserInfoAutofillListener mOnRequestDevUserInfoAutofillListener;
     String mszAppName = "";
@@ -59,23 +62,46 @@ public class AboutView extends LinearLayout {
     EditText metDevUserName;
     EditText metDevUserPassword;
 
+    public AboutView(Context context, APPInfo appInfo) {
+        super(context);
+        setAPPInfo(appInfo);
+        initView(context);
+    }
+
     public AboutView(Context context, AttributeSet attrs) {
         super(context, attrs);
         initView(context, attrs);
     }
 
-    void initView(Context context, AttributeSet attrs) {
-        mContext = context;
-        mszWinBollServerHost = WinBollApplication.isDebug() ?  "http://10.8.0.13": "https://www.winboll.cc";
+    public void setAPPInfo(APPInfo appInfo) {
+        mAPPInfo = appInfo;
+    }
+
+    APPInfo createAppInfo(Context context, AttributeSet attrs) {
+        APPInfo appInfo = new APPInfo();
         TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.AboutView);
-        mszAppName = typedArray.getString(R.styleable.AboutView_app_name);
-        mszAppAPKFolderName = typedArray.getString(R.styleable.AboutView_app_apkfoldername);
-        mszAppAPKName = typedArray.getString(R.styleable.AboutView_app_apkname);
-        mszAppGitName = typedArray.getString(R.styleable.AboutView_app_gitname);
-        mszAppDescription = typedArray.getString(R.styleable.AboutView_appdescription);
-        mnAppIcon = typedArray.getResourceId(R.styleable.AboutView_appicon, R.drawable.ic_winboll);
+        appInfo.setAppName(typedArray.getString(R.styleable.AboutView_app_name));
+        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.setAppDescription(typedArray.getString(R.styleable.AboutView_appdescription));
+        appInfo.setAppIcon(typedArray.getResourceId(R.styleable.AboutView_appicon, R.drawable.ic_winboll));
         // 返回一个绑定资源结束的信号给资源
         typedArray.recycle();
+        return appInfo;
+    }
+
+    void initView(Context context) {
+        mContext = context;
+
+        mszAppName = mAPPInfo.getAppName();
+        mszAppAPKFolderName = mAPPInfo.getAppAPKFolderName();
+        mszAppAPKName = mAPPInfo.getAppAPKName();
+        mszAppGitName = mAPPInfo.getAppGitName();
+        mszAppDescription = mAPPInfo.getAppDescription();
+        mnAppIcon = mAPPInfo.getAppIcon();
+
+        mszWinBollServerHost = WinBollApplication.isDebug() ?  "http://10.8.0.13": "https://www.winboll.cc";
 
         try {
             mszAppVersionName = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0).versionName;
@@ -131,6 +157,11 @@ public class AboutView extends LinearLayout {
 
     }
 
+    void initView(Context context, AttributeSet attrs) {
+        mAPPInfo = createAppInfo(context, attrs);
+        initView(context);
+    }
+
     public static String subBetaSuffix(String input) {
         if (input.endsWith(".beta")) {
             return input.substring(0, input.length() - ".beta".length());
diff --git a/libapputils/src/main/res/layout/activity_about.xml b/libapputils/src/main/res/layout/activity_about.xml
index 6a0d0f3..8fb9075 100644
--- a/libapputils/src/main/res/layout/activity_about.xml
+++ b/libapputils/src/main/res/layout/activity_about.xml
@@ -1,25 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
 
-    <androidx.appcompat.widget.Toolbar
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/activityaboutToolbar1"/>
+	<androidx.appcompat.widget.Toolbar
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:id="@+id/activityaboutToolbar1"/>
 
-    <cc.winboll.studio.libapputils.view.AboutView
-        app:app_name= "APP"
-        app:app_apkfoldername="APP"
-        app:app_apkname="APP"
-        app:app_gitname="APP"
-        app:appdescription="WinBoll.CC 网站客户端。"
-        app:appicon="@drawable/ic_winboll"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/activityaboutAboutView1"/>
+	<LinearLayout
+		android:orientation="vertical"
+		android:layout_width="match_parent"
+		android:layout_height="0dp"
+		android:layout_weight="1.0"
+		android:id="@+id/activityaboutLinearLayout1"/>
 
 </LinearLayout>
+