From ed1a1ac1798ec42c99bd83a2fc6eb4fb5f27a99c Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Tue, 25 Mar 2025 03:54:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=A7=8B=E8=B0=83=E8=AF=95WinBollActi?= =?UTF-8?q?vityManager...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aes/build.properties | 4 +- libaes/build.gradle | 4 +- libaes/build.properties | 4 +- .../winboll/studio/libaes/beans/AESModel.java | 71 ------------------- .../studio/libaes/winboll/AboutView.java | 11 ++- 5 files changed, 11 insertions(+), 83 deletions(-) delete mode 100644 libaes/src/main/java/cc/winboll/studio/libaes/beans/AESModel.java diff --git a/aes/build.properties b/aes/build.properties index b2ab9ba..650a078 100644 --- a/aes/build.properties +++ b/aes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Mar 25 01:19:50 HKT 2025 +#Mon Mar 24 19:50:52 GMT 2025 stageCount=8 libraryProject=libaes baseVersion=15.0 publishVersion=15.0.7 -buildCount=0 +buildCount=6 baseBetaVersion=15.0.8 diff --git a/libaes/build.gradle b/libaes/build.gradle index 1692db6..f994f15 100644 --- a/libaes/build.gradle +++ b/libaes/build.gradle @@ -48,6 +48,6 @@ dependencies { //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0' //api 'androidx.fragment:fragment:1.1.0' - api 'cc.winboll.studio:libappbase:15.0.9' - api 'cc.winboll.studio:libapputils:15.0.15' + api 'cc.winboll.studio:libappbase:15.0.10' + api 'cc.winboll.studio:libapputils:15.0.17' } diff --git a/libaes/build.properties b/libaes/build.properties index ee2bbcf..650a078 100644 --- a/libaes/build.properties +++ b/libaes/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Mar 25 01:19:42 HKT 2025 +#Mon Mar 24 19:50:52 GMT 2025 stageCount=8 libraryProject=libaes baseVersion=15.0 publishVersion=15.0.7 -buildCount=0 +buildCount=6 baseBetaVersion=15.0.8 diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/beans/AESModel.java b/libaes/src/main/java/cc/winboll/studio/libaes/beans/AESModel.java deleted file mode 100644 index 330538e..0000000 --- a/libaes/src/main/java/cc/winboll/studio/libaes/beans/AESModel.java +++ /dev/null @@ -1,71 +0,0 @@ -package cc.winboll.studio.libaes.beans; - -/** - * @Author ZhanGSKen@AliYun.Com - * @Date 2025/03/24 15:27:16 - * @Describe AES数据实例化模型 - */ -import cc.winboll.studio.libappbase.BaseBean; -import android.util.JsonWriter; -import java.io.IOException; -import android.util.JsonReader; - -public class AESModel extends BaseBean { - - public static final String TAG = "AESModel"; - - boolean isInDebugMode; - - public AESModel() { - this.isInDebugMode = false; - } - - public AESModel(boolean isInDebugMode) { - this.isInDebugMode = isInDebugMode; - } - - public void setIsInDebugMode(boolean isInDebugMode) { - this.isInDebugMode = isInDebugMode; - } - - public boolean isInDebugMode() { - return isInDebugMode; - } - - @Override - public String getName() { - return AESModel.class.getName(); - } - - @Override - public void writeThisToJsonWriter(JsonWriter jsonWriter) throws IOException { - super.writeThisToJsonWriter(jsonWriter); - jsonWriter.name("isInDebugMode").value(isInDebugMode()); - } - - @Override - public boolean initObjectsFromJsonReader(JsonReader jsonReader, String name) throws IOException { - if (super.initObjectsFromJsonReader(jsonReader, name)) { return true; } else { - if (name.equals("isInDebugMode")) { - setIsInDebugMode(jsonReader.nextBoolean()); - } else { - return false; - } - } - return true; - } - - @Override - public BaseBean readBeanFromJsonReader(JsonReader jsonReader) throws IOException { - jsonReader.beginObject(); - while (jsonReader.hasNext()) { - String name = jsonReader.nextName(); - if (!initObjectsFromJsonReader(jsonReader, name)) { - jsonReader.skipValue(); - } - } - // 结束 JSON 对象 - jsonReader.endObject(); - return this; - } -} 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 228ff11..ad894b9 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 @@ -17,7 +17,6 @@ import android.view.View; import android.widget.EditText; import android.widget.LinearLayout; import cc.winboll.studio.libaes.R; -import cc.winboll.studio.libaes.beans.AESModel; import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.LogUtils; import cc.winboll.studio.libappbase.utils.ToastUtils; @@ -265,6 +264,7 @@ public class AboutView extends LinearLayout { View.OnClickListener mAppDebugOnClickListener = new View.OnClickListener(){ @Override public void onClick(View view) { + //ToastUtils.show("mAppDebugOnClickListener"); setApp2DebugMode(mContext); } }; @@ -272,6 +272,7 @@ public class AboutView extends LinearLayout { View.OnClickListener mAppNormalOnClickListener = new View.OnClickListener(){ @Override public void onClick(View view) { + //ToastUtils.show("mAppNormalOnClickListener"); setApp2NormalMode(mContext); } }; @@ -279,10 +280,9 @@ public class AboutView extends LinearLayout { public static void setApp2DebugMode(Context context) { Intent intent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName()); if (intent != null) { - intent.setAction(cc.winboll.studio.libapputils.intent.action.DEBUGVIEW); + //intent.setAction(cc.winboll.studio.libapputils.intent.action.DEBUGVIEW); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - GlobalApplication.setIsDebuging(context, true); - AESModel.saveBean(context, new AESModel(true)); + GlobalApplication.setIsDebuging(true); WinBollActivityManager.getInstance(context).finishAll(); context.startActivity(intent); @@ -293,8 +293,7 @@ public class AboutView extends LinearLayout { Intent intent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName()); if (intent != null) { intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - GlobalApplication.setIsDebuging(context, false); - AESModel.saveBean(context, new AESModel(false)); + GlobalApplication.setIsDebuging(false); WinBollActivityManager.getInstance(context).finishAll(); context.startActivity(intent);