From a9ce480f9f8a9e8b2dca1565bacac4aeaa50b05c Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 2 Apr 2025 19:43:42 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=20Http=E8=AE=BF?= =?UTF-8?q?=E9=97=AE=E9=AA=8C=E8=AF=81=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.properties | 4 ++-- libaes/build.properties | 4 ++-- .../cc/winboll/studio/libaes/winboll/AboutView.java | 11 +++++++---- .../libaes/winboll/WinBollServiceStatusView.java | 1 + 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/aes/build.properties b/aes/build.properties index d6ef5e0..cbd058f 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Mar 31 19:41:19 HKT 2025 +#Wed Apr 02 11:42:36 GMT 2025 stageCount=5 libraryProject=libaes baseVersion=15.2 publishVersion=15.2.4 -buildCount=0 +buildCount=5 baseBetaVersion=15.2.5 diff --git a/libaes/build.properties b/libaes/build.properties index c9094d5..cbd058f 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Mar 31 19:41:08 HKT 2025 +#Wed Apr 02 11:42:36 GMT 2025 stageCount=5 libraryProject=libaes baseVersion=15.2 publishVersion=15.2.4 -buildCount=0 +buildCount=5 baseBetaVersion=15.2.5 diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java index df61a6b..05d76dc 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/AboutView.java @@ -118,7 +118,7 @@ public class AboutView extends LinearLayout { } else { mszGitea = "https://gitea.winboll.cc/" + mAPPInfo.getAppGitOwner() + "/" + mszAppGitName + "/src/branch/" + mAPPInfo.getAppGitAPPBranch() + "/" + mAPPInfo.getAppGitAPPSubProjectFolder(); } - + if (GlobalApplication.isDebuging()) { LayoutInflater inflater = LayoutInflater.from(mContext); @@ -150,7 +150,7 @@ public class AboutView extends LinearLayout { // 初始化标题栏 //setSubtitle(getContext().getString(R.string.text_about)); - + // LinearLayout llMain = findViewById(R.id.viewaboutLinearLayout1); // llMain.addView(createAboutPage()); @@ -324,14 +324,17 @@ public class AboutView extends LinearLayout { PrefUtils.saveString(mContext, "metDevUserName", metDevUserName.getText().toString()); PrefUtils.saveString(mContext, "metDevUserPassword", metDevUserPassword.getText().toString()); } else { - credential = Credentials.basic("WinBoll", "WinBollPowerByZhanGSKen"); + String username = "WinBoll"; + String password = "WinBollPowerByZhanGSKen"; + credential = Credentials.basic(username, password); } - OkHttpClient client = new OkHttpClient(); + Request request = new Request.Builder() .url(szUrl) .header("Accept", "text/plain") // 设置正确的Content-Type头 .header("Authorization", credential) .build(); + OkHttpClient client = new OkHttpClient(); Call call = client.newCall(request); call.enqueue(new Callback() { @Override diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollServiceStatusView.java b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollServiceStatusView.java index 4954177..694779b 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollServiceStatusView.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/winboll/WinBollServiceStatusView.java @@ -252,6 +252,7 @@ public class WinBollServiceStatusView extends LinearLayout { username = "WinBoll"; password = "WinBollPowerByZhanGSKen"; } + LogUtils.d(TAG, String.format("Connection Start. targetUrl %s", targetUrl)); WinBollServerConnectionThread thread = new WinBollServerConnectionThread( targetUrl, From 5b82baead572beeb2ff64416fae01eabc97ecc15 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 2 Apr 2025 20:05:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=90=E5=8F=B8?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E9=A3=8E=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.properties | 4 +- .../main/java/cc/winboll/studio/aes/App.java | 13 +++- libaes/build.properties | 4 +- libaes/src/main/res/drawable/toast_frame.xml | 69 ++----------------- libaes/src/main/res/layout/view_toast.xml | 57 +++++++-------- 5 files changed, 51 insertions(+), 96 deletions(-) diff --git a/aes/build.properties b/aes/build.properties index cbd058f..d7da2ca 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Apr 02 11:42:36 GMT 2025 +#Wed Apr 02 12:03:21 GMT 2025 stageCount=5 libraryProject=libaes baseVersion=15.2 publishVersion=15.2.4 -buildCount=5 +buildCount=14 baseBetaVersion=15.2.5 diff --git a/aes/src/main/java/cc/winboll/studio/aes/App.java b/aes/src/main/java/cc/winboll/studio/aes/App.java index 2eefe56..2dc8e06 100644 --- a/aes/src/main/java/cc/winboll/studio/aes/App.java +++ b/aes/src/main/java/cc/winboll/studio/aes/App.java @@ -5,19 +5,26 @@ package cc.winboll.studio.aes; * @Date 2024/06/13 19:03:58 * @Describe AES应用类 */ +import android.view.Gravity; import cc.winboll.studio.libappbase.GlobalApplication; import com.hjq.toast.ToastUtils; public class App extends GlobalApplication { - + public static final String TAG = "App"; @Override public void onCreate() { super.onCreate(); + + // 初始化 Toast 框架 ToastUtils.init(this); - //ToastUtils.show("App onCreate"); + // 设置 Toast 布局样式 + ToastUtils.setView(R.layout.view_toast); + //ToastUtils.setStyle(new WhiteToastStyle()); + ToastUtils.setGravity(Gravity.BOTTOM, 0, 200); + } - + } diff --git a/libaes/build.properties b/libaes/build.properties index cbd058f..d7da2ca 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Apr 02 11:42:36 GMT 2025 +#Wed Apr 02 12:03:21 GMT 2025 stageCount=5 libraryProject=libaes baseVersion=15.2 publishVersion=15.2.4 -buildCount=5 +buildCount=14 baseBetaVersion=15.2.5 diff --git a/libaes/src/main/res/drawable/toast_frame.xml b/libaes/src/main/res/drawable/toast_frame.xml index 488536a..c4b8f8a 100644 --- a/libaes/src/main/res/drawable/toast_frame.xml +++ b/libaes/src/main/res/drawable/toast_frame.xml @@ -1,62 +1,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + diff --git a/libaes/src/main/res/layout/view_toast.xml b/libaes/src/main/res/layout/view_toast.xml index b413f11..c4a65fc 100644 --- a/libaes/src/main/res/layout/view_toast.xml +++ b/libaes/src/main/res/layout/view_toast.xml @@ -1,35 +1,38 @@ + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" + android:gravity="center_horizontal" + android:background="@drawable/toast_frame" + android:padding="10dp"> - + - + - + + + + + From bd6eae16e3593a99dafe79773f71450f5eced0a4 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 2 Apr 2025 20:08:50 +0800 Subject: [PATCH 3/4] APK 15.2.5 release Publish. --- aes/build.properties | 10 +++++----- libaes/build.properties | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/aes/build.properties b/aes/build.properties index d7da2ca..2a919fc 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Apr 02 12:03:21 GMT 2025 -stageCount=5 +#Wed Apr 02 20:08:50 HKT 2025 +stageCount=6 libraryProject=libaes baseVersion=15.2 -publishVersion=15.2.4 -buildCount=14 -baseBetaVersion=15.2.5 +publishVersion=15.2.5 +buildCount=0 +baseBetaVersion=15.2.6 diff --git a/libaes/build.properties b/libaes/build.properties index d7da2ca..2a919fc 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Apr 02 12:03:21 GMT 2025 -stageCount=5 +#Wed Apr 02 20:08:50 HKT 2025 +stageCount=6 libraryProject=libaes baseVersion=15.2 -publishVersion=15.2.4 -buildCount=14 -baseBetaVersion=15.2.5 +publishVersion=15.2.5 +buildCount=0 +baseBetaVersion=15.2.6 From 4afc4aafa9fd3ce3fa05f130cd5c9db6f5aea842 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 2 Apr 2025 20:09:13 +0800 Subject: [PATCH 4/4] Library Release 15.2.5 --- aes/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aes/build.properties b/aes/build.properties index 2a919fc..3498711 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Apr 02 20:08:50 HKT 2025 +#Wed Apr 02 20:09:04 HKT 2025 stageCount=6 libraryProject=libaes baseVersion=15.2