From ae680b5b487b47662e7520a8bdabc5460eaa049a Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Fri, 28 Mar 2025 14:53:11 +0800 Subject: [PATCH 01/20] APK 15.1.1 release Publish. --- appbase/build.properties | 10 +++++----- libappbase/build.properties | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/appbase/build.properties b/appbase/build.properties index c509935..4f21673 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 06:24:38 GMT 2025 -stageCount=1 +#Fri Mar 28 14:53:11 HKT 2025 +stageCount=2 libraryProject=libappbase baseVersion=15.1 -publishVersion=15.1.0 -buildCount=166 -baseBetaVersion=15.1.1 +publishVersion=15.1.1 +buildCount=0 +baseBetaVersion=15.1.2 diff --git a/libappbase/build.properties b/libappbase/build.properties index c509935..4f21673 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 06:24:38 GMT 2025 -stageCount=1 +#Fri Mar 28 14:53:11 HKT 2025 +stageCount=2 libraryProject=libappbase baseVersion=15.1 -publishVersion=15.1.0 -buildCount=166 -baseBetaVersion=15.1.1 +publishVersion=15.1.1 +buildCount=0 +baseBetaVersion=15.1.2 From 4ea48a051d3c0a15791e36261d9530551f062b4c Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Fri, 28 Mar 2025 14:53:36 +0800 Subject: [PATCH 02/20] Library Release 15.1.1 --- appbase/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appbase/build.properties b/appbase/build.properties index 4f21673..260550b 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 14:53:11 HKT 2025 +#Fri Mar 28 14:53:30 HKT 2025 stageCount=2 libraryProject=libappbase baseVersion=15.1 From e71e5a852d6aabccdb0804df352e1335db5855ea Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Fri, 28 Mar 2025 15:48:33 +0800 Subject: [PATCH 03/20] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E7=AA=97=E5=8F=A3=E5=9F=BA=E7=B1=BB=E4=B8=BA=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E8=87=AA=E5=B7=B1=E5=AE=9A=E4=B9=89=EF=BC=8C=E5=A2=9E=E5=BC=BA?= =?UTF-8?q?=E7=AA=97=E5=8F=A3=E7=9A=84AppCompatActivity=E7=89=B9=E6=80=A7?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appbase/build.properties | 4 ++-- .../java/cc/winboll/studio/appbase/MainActivity.java | 1 - .../winboll/studio/appbase}/WinBollActivityBase.java | 11 +++++------ .../studio/appbase/activities/New2Activity.java | 2 +- .../studio/appbase/activities/NewActivity.java | 2 +- libappbase/build.gradle | 5 +++-- libappbase/build.properties | 4 ++-- 7 files changed, 14 insertions(+), 15 deletions(-) rename {libappbase/src/main/java/cc/winboll/studio/libappbase/winboll => appbase/src/main/java/cc/winboll/studio/appbase}/WinBollActivityBase.java (83%) diff --git a/appbase/build.properties b/appbase/build.properties index 260550b..cca1578 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 14:53:30 HKT 2025 +#Fri Mar 28 07:42:10 GMT 2025 stageCount=2 libraryProject=libappbase baseVersion=15.1 publishVersion=15.1.1 -buildCount=0 +buildCount=10 baseBetaVersion=15.1.2 diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java index ae2bee2..70879b0 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java @@ -22,7 +22,6 @@ import cc.winboll.studio.libappbase.sos.SOS; import cc.winboll.studio.libappbase.utils.ToastUtils; import cc.winboll.studio.libappbase.widgets.StatusWidget; import cc.winboll.studio.libappbase.winboll.IWinBollActivity; -import cc.winboll.studio.libappbase.winboll.WinBollActivityBase; public class MainActivity extends WinBollActivityBase implements IWinBollActivity { diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityBase.java b/appbase/src/main/java/cc/winboll/studio/appbase/WinBollActivityBase.java similarity index 83% rename from libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityBase.java rename to appbase/src/main/java/cc/winboll/studio/appbase/WinBollActivityBase.java index 1268360..7b06865 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityBase.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/WinBollActivityBase.java @@ -1,18 +1,17 @@ -package cc.winboll.studio.libappbase.winboll; +package cc.winboll.studio.appbase; /** * @Author ZhanGSKen@AliYun.Com - * @Date 2025/03/28 13:35:28 - * @Describe WinBoll应用窗口基类 + * @Date 2025/03/28 15:34:16 + * @Describe 应用活动窗口基类 */ import android.app.Activity; -import android.os.Build; import android.os.Bundle; import android.os.PersistableBundle; -import android.support.v4.content.ContextCompat; import android.support.v7.app.AppCompatActivity; import cc.winboll.studio.libappbase.GlobalApplication; -import cc.winboll.studio.libappbase.R; +import cc.winboll.studio.libappbase.winboll.IWinBollActivity; +import cc.winboll.studio.libappbase.winboll.WinBollActivityManager; public class WinBollActivityBase extends AppCompatActivity implements IWinBollActivity { diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java b/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java index fbb9b72..d27d5af 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java @@ -12,9 +12,9 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import cc.winboll.studio.appbase.R; +import cc.winboll.studio.appbase.WinBollActivityBase; import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.winboll.IWinBollActivity; -import cc.winboll.studio.libappbase.winboll.WinBollActivityBase; public class New2Activity extends WinBollActivityBase implements IWinBollActivity { diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java index 9bc8286..3df29e6 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java @@ -11,9 +11,9 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import cc.winboll.studio.appbase.R; +import cc.winboll.studio.appbase.WinBollActivityBase; import cc.winboll.studio.libappbase.GlobalApplication; import cc.winboll.studio.libappbase.winboll.IWinBollActivity; -import cc.winboll.studio.libappbase.winboll.WinBollActivityBase; public class NewActivity extends WinBollActivityBase implements IWinBollActivity { diff --git a/libappbase/build.gradle b/libappbase/build.gradle index 3970a30..2071132 100644 --- a/libappbase/build.gradle +++ b/libappbase/build.gradle @@ -26,10 +26,11 @@ dependencies { // Android 类库 //api 'com.android.support:appcompat-v7:28.0.0' api('com.android.support:appcompat-v7:28.0.0'){ - exclude group: "com.android.support", module: "support-vector-drawable" + //exclude group: "com.android.support", module: "support-vector-drawable" + exclude group: "com.android.support:animated-vector-drawable:28.0.0" } // https://mvnrepository.com/artifact/com.android.support/support-compat - api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选） + //api 'com.android.support:support-compat:28.0.0' // 保留原有依赖（可选） // https://mvnrepository.com/artifact/com.android.support/support-v4 api 'com.android.support:support-v4:28.0.0' // https://mvnrepository.com/artifact/com.android.support/support-media-compat diff --git a/libappbase/build.properties b/libappbase/build.properties index 4f21673..cca1578 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 14:53:11 HKT 2025 +#Fri Mar 28 07:42:10 GMT 2025 stageCount=2 libraryProject=libappbase baseVersion=15.1 publishVersion=15.1.1 -buildCount=0 +buildCount=10 baseBetaVersion=15.1.2 From e35a6b9a7fe6ade569a9a071618406b4ca7da284 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Fri, 28 Mar 2025 15:50:14 +0800 Subject: [PATCH 04/20] APK 15.1.2 release Publish. --- appbase/build.properties | 10 +++++----- libappbase/build.properties | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/appbase/build.properties b/appbase/build.properties index cca1578..fa4417b 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 07:42:10 GMT 2025 -stageCount=2 +#Fri Mar 28 15:50:14 HKT 2025 +stageCount=3 libraryProject=libappbase baseVersion=15.1 -publishVersion=15.1.1 -buildCount=10 -baseBetaVersion=15.1.2 +publishVersion=15.1.2 +buildCount=0 +baseBetaVersion=15.1.3 diff --git a/libappbase/build.properties b/libappbase/build.properties index cca1578..fa4417b 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 07:42:10 GMT 2025 -stageCount=2 +#Fri Mar 28 15:50:14 HKT 2025 +stageCount=3 libraryProject=libappbase baseVersion=15.1 -publishVersion=15.1.1 -buildCount=10 -baseBetaVersion=15.1.2 +publishVersion=15.1.2 +buildCount=0 +baseBetaVersion=15.1.3 From 2f6e297babc034896062c44530147c779edbd946 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Fri, 28 Mar 2025 15:50:29 +0800 Subject: [PATCH 05/20] Library Release 15.1.2 --- appbase/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appbase/build.properties b/appbase/build.properties index fa4417b..07e959b 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 15:50:14 HKT 2025 +#Fri Mar 28 15:50:23 HKT 2025 stageCount=3 libraryProject=libappbase baseVersion=15.1 From 6f7414b576e30e0fdc360350ccfc7bc68b9d7935 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Fri, 28 Mar 2025 18:10:31 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E9=80=80=E5=87=BA=E7=9A=84=E8=8F=9C=E5=8D=95=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appbase/build.properties | 4 +- .../winboll/studio/appbase/MainActivity.java | 9 +-- .../studio/appbase/WinBollActivityBase.java | 30 ++++++++++ .../appbase/activities/New2Activity.java | 2 - .../appbase/activities/NewActivity.java | 2 - libappbase/build.properties | 4 +- .../libappbase/dialogs/YesNoAlertDialog.java | 60 +++++++++++++++++++ 7 files changed, 97 insertions(+), 14 deletions(-) create mode 100644 libappbase/src/main/java/cc/winboll/studio/libappbase/dialogs/YesNoAlertDialog.java diff --git a/appbase/build.properties b/appbase/build.properties index 07e959b..28c6d77 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 15:50:23 HKT 2025 +#Fri Mar 28 10:09:25 GMT 2025 stageCount=3 libraryProject=libappbase baseVersion=15.1 publishVersion=15.1.2 -buildCount=0 +buildCount=4 baseBetaVersion=15.1.3 diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java index 70879b0..b25b6ac 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java @@ -22,6 +22,7 @@ import cc.winboll.studio.libappbase.sos.SOS; import cc.winboll.studio.libappbase.utils.ToastUtils; import cc.winboll.studio.libappbase.widgets.StatusWidget; import cc.winboll.studio.libappbase.winboll.IWinBollActivity; +import cc.winboll.studio.libappbase.dialogs.YesNoAlertDialog; public class MainActivity extends WinBollActivityBase implements IWinBollActivity { @@ -68,12 +69,6 @@ public class MainActivity extends WinBollActivityBase implements IWinBollActivit @Override public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) { - GlobalApplication.getWinBollActivityManager().startLogActivity(this); - return true; - } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) { - moveTaskToBack(true); - } // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。 return super.onOptionsItemSelected(item); } @@ -142,6 +137,8 @@ public class MainActivity extends WinBollActivityBase implements IWinBollActivit startService(intent); } + + public void onStopTestDemoService(View view) { Intent intent = new Intent(this, TestDemoService.class); diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/WinBollActivityBase.java b/appbase/src/main/java/cc/winboll/studio/appbase/WinBollActivityBase.java index 7b06865..54765d8 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/WinBollActivityBase.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/WinBollActivityBase.java @@ -9,7 +9,11 @@ import android.app.Activity; import android.os.Bundle; import android.os.PersistableBundle; import android.support.v7.app.AppCompatActivity; +import android.view.MenuItem; +import cc.winboll.studio.appbase.App; +import cc.winboll.studio.appbase.R; import cc.winboll.studio.libappbase.GlobalApplication; +import cc.winboll.studio.libappbase.dialogs.YesNoAlertDialog; import cc.winboll.studio.libappbase.winboll.IWinBollActivity; import cc.winboll.studio.libappbase.winboll.WinBollActivityManager; @@ -41,8 +45,34 @@ public class WinBollActivityBase extends AppCompatActivity implements IWinBollAc public void onPostCreate(Bundle savedInstanceState, PersistableBundle persistentState) { super.onPostCreate(savedInstanceState, persistentState); } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) { + GlobalApplication.getWinBollActivityManager().startLogActivity(this); + return true; + } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) { + //moveTaskToBack(true); + exit(); + } + // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。 + return super.onOptionsItemSelected(item); + } + void exit() { + YesNoAlertDialog.show(this, "Exit " + getString(R.string.app_name), "Close all activity and exit?", new YesNoAlertDialog.OnDialogResultListener(){ + + @Override + public void onYes() { + App.getWinBollActivityManager().finishAll(); + } + + @Override + public void onNo() { + } + }); + } @Override protected void onDestroy() { diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java b/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java index d27d5af..37f4422 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/New2Activity.java @@ -76,8 +76,6 @@ public class New2Activity extends WinBollActivityBase implements IWinBollActivit if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) { GlobalApplication.getWinBollActivityManager().startLogActivity(this); return true; - } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) { - moveTaskToBack(true); } // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。 return super.onOptionsItemSelected(item); diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java index 3df29e6..907c3ad 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/activities/NewActivity.java @@ -74,8 +74,6 @@ public class NewActivity extends WinBollActivityBase implements IWinBollActivity if (item.getItemId() == cc.winboll.studio.appbase.R.id.item_log) { GlobalApplication.getWinBollActivityManager().startLogActivity(this); return true; - } else if(item.getItemId() == cc.winboll.studio.appbase.R.id.item_minimal) { - moveTaskToBack(true); } // 在switch语句中处理每个ID，并在处理完后返回true，未处理的情况返回false。 return super.onOptionsItemSelected(item); diff --git a/libappbase/build.properties b/libappbase/build.properties index fa4417b..28c6d77 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 15:50:14 HKT 2025 +#Fri Mar 28 10:09:25 GMT 2025 stageCount=3 libraryProject=libappbase baseVersion=15.1 publishVersion=15.1.2 -buildCount=0 +buildCount=4 baseBetaVersion=15.1.3 diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/dialogs/YesNoAlertDialog.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/dialogs/YesNoAlertDialog.java new file mode 100644 index 0000000..84446d7 --- /dev/null +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/dialogs/YesNoAlertDialog.java @@ -0,0 +1,60 @@ +package cc.winboll.studio.libappbase.dialogs; + +/** + * @Author ZhanGSKen@AliYun.Com + * @Date 2025/03/28 17:40:47 + * @Date 2024/08/12 14:46:25 + * @Describe 询问用户确定与否的选择框 + */ +import android.app.AlertDialog; +import android.content.Context; +import android.content.DialogInterface; + +public class YesNoAlertDialog { + + public static final String TAG = "YesNoAlertDialog"; + + public static void show(Context context, String szTitle, String szMessage, final OnDialogResultListener listener) { + AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( + context); + + // set title + alertDialogBuilder.setTitle(szTitle); + + // set dialog message + alertDialogBuilder + .setMessage(szMessage) + .setCancelable(true) + .setOnCancelListener(new DialogInterface.OnCancelListener(){ + @Override + public void onCancel(DialogInterface dialog) { + listener.onNo(); + } + }) + .setPositiveButton("YES", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + // if this button is clicked, close + // current activity + listener.onYes(); + } + }) + .setNegativeButton("NO", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + // if this button is clicked, just close + // the dialog box and do nothing + dialog.cancel(); + } + }); + + // create alert dialog + AlertDialog alertDialog = alertDialogBuilder.create(); + + // show it + alertDialog.show(); + } + + public interface OnDialogResultListener { + abstract void onYes(); + abstract void onNo(); + } +} From d9b99ee37184bc74bd6bf7fd7e19ffb7615fba1b Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Fri, 28 Mar 2025 18:20:22 +0800 Subject: [PATCH 07/20] APK 15.1.3 release Publish. --- appbase/build.properties | 10 +++++----- libappbase/build.properties | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/appbase/build.properties b/appbase/build.properties index 28c6d77..b0aff1c 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 10:09:25 GMT 2025 -stageCount=3 +#Fri Mar 28 18:20:22 HKT 2025 +stageCount=4 libraryProject=libappbase baseVersion=15.1 -publishVersion=15.1.2 -buildCount=4 -baseBetaVersion=15.1.3 +publishVersion=15.1.3 +buildCount=0 +baseBetaVersion=15.1.4 diff --git a/libappbase/build.properties b/libappbase/build.properties index 28c6d77..b0aff1c 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 10:09:25 GMT 2025 -stageCount=3 +#Fri Mar 28 18:20:22 HKT 2025 +stageCount=4 libraryProject=libappbase baseVersion=15.1 -publishVersion=15.1.2 -buildCount=4 -baseBetaVersion=15.1.3 +publishVersion=15.1.3 +buildCount=0 +baseBetaVersion=15.1.4 From 3ef885e8c1582f9ca484bc4e8d2431290dc21763 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Fri, 28 Mar 2025 18:20:38 +0800 Subject: [PATCH 08/20] Library Release 15.1.3 --- appbase/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appbase/build.properties b/appbase/build.properties index b0aff1c..d5a81b9 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 18:20:22 HKT 2025 +#Fri Mar 28 18:20:32 HKT 2025 stageCount=4 libraryProject=libappbase baseVersion=15.1 From 0a8707b02bdb591fe4a3ae0db2d31b558f924e37 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Fri, 28 Mar 2025 19:49:30 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E7=AE=80=E5=8C=96=E5=90=90=E5=8F=B8?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appbase/build.properties | 4 ++-- libappbase/build.properties | 4 ++-- .../libappbase/winboll/MyActivityLifecycleCallbacks.java | 2 +- .../studio/libappbase/winboll/WinBollActivityManager.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/appbase/build.properties b/appbase/build.properties index d5a81b9..c1d116f 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 18:20:32 HKT 2025 +#Fri Mar 28 11:47:19 GMT 2025 stageCount=4 libraryProject=libappbase baseVersion=15.1 publishVersion=15.1.3 -buildCount=0 +buildCount=5 baseBetaVersion=15.1.4 diff --git a/libappbase/build.properties b/libappbase/build.properties index b0aff1c..c1d116f 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 18:20:22 HKT 2025 +#Fri Mar 28 11:47:19 GMT 2025 stageCount=4 libraryProject=libappbase baseVersion=15.1 publishVersion=15.1.3 -buildCount=0 +buildCount=5 baseBetaVersion=15.1.4 diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java index dfe768e..774ab8b 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/MyActivityLifecycleCallbacks.java @@ -47,7 +47,7 @@ public class MyActivityLifecycleCallbacks implements Application.ActivityLifecyc } public void showActivityeInfo() { - ToastUtils.show("ActivityeInfo : " + mInfo); + //ToastUtils.show("ActivityeInfo : " + mInfo); LogUtils.d(TAG, "ActivityeInfo : " + mInfo); } diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java index 5876951..e6c3255 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/winboll/WinBollActivityManager.java @@ -102,7 +102,7 @@ public class WinBollActivityManager { resumeActivity(context, tag); return; } - ToastUtils.show("startWinBollActivity(Context context, Class clazz)"); + //ToastUtils.show("startWinBollActivity(Context context, Class clazz)"); // 新建一个任务窗口 Intent intent = new Intent(context, clazz); From 32a8c0dfa146be156401879f8b37039dd5371604 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Fri, 28 Mar 2025 20:05:24 +0800 Subject: [PATCH 10/20] APK 15.1.4 release Publish. --- appbase/build.properties | 10 +++++----- libappbase/build.properties | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/appbase/build.properties b/appbase/build.properties index c1d116f..963c646 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 11:47:19 GMT 2025 -stageCount=4 +#Fri Mar 28 20:05:24 HKT 2025 +stageCount=5 libraryProject=libappbase baseVersion=15.1 -publishVersion=15.1.3 -buildCount=5 -baseBetaVersion=15.1.4 +publishVersion=15.1.4 +buildCount=0 +baseBetaVersion=15.1.5 diff --git a/libappbase/build.properties b/libappbase/build.properties index c1d116f..963c646 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 11:47:19 GMT 2025 -stageCount=4 +#Fri Mar 28 20:05:24 HKT 2025 +stageCount=5 libraryProject=libappbase baseVersion=15.1 -publishVersion=15.1.3 -buildCount=5 -baseBetaVersion=15.1.4 +publishVersion=15.1.4 +buildCount=0 +baseBetaVersion=15.1.5 From 07bfd44c6594b59f42813b833d5e84adec75bfaa Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Fri, 28 Mar 2025 20:05:54 +0800 Subject: [PATCH 11/20] Library Release 15.1.4 --- appbase/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appbase/build.properties b/appbase/build.properties index 963c646..5e5ae3b 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 20:05:24 HKT 2025 +#Fri Mar 28 20:05:48 HKT 2025 stageCount=5 libraryProject=libappbase baseVersion=15.1 From 87d23829ae26b7b1c42a3fff5b27e1fc7369f254 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 29 Mar 2025 08:42:10 +0800 Subject: [PATCH 12/20] =?UTF-8?q?=E5=BC=80=E5=B1=95=E6=96=B0=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E7=A9=BA=E9=97=B4=E4=B8=8B=E7=9A=84=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appbase/build.gradle | 2 +- appbase/build.properties | 12 ++++++------ libappbase/build.properties | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/appbase/build.gradle b/appbase/build.gradle index 366a201..727c7be 100644 --- a/appbase/build.gradle +++ b/appbase/build.gradle @@ -30,7 +30,7 @@ android { // versionName 更新后需要手动设置 // .winboll/winbollBuildProps.properties 文件的 stageCount=0 // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0" - versionName "15.1" + versionName "15.2" if(true) { versionName = genVersionName("${versionName}") } diff --git a/appbase/build.properties b/appbase/build.properties index 5e5ae3b..b05233c 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 20:05:48 HKT 2025 -stageCount=5 +#Sat Mar 29 00:40:24 GMT 2025 +stageCount=0 libraryProject=libappbase -baseVersion=15.1 -publishVersion=15.1.4 -buildCount=0 -baseBetaVersion=15.1.5 +baseVersion=15.2 +publishVersion=15.2.0 +buildCount=1 +baseBetaVersion=15.2.1 diff --git a/libappbase/build.properties b/libappbase/build.properties index 963c646..b05233c 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 20:05:24 HKT 2025 -stageCount=5 +#Sat Mar 29 00:40:24 GMT 2025 +stageCount=0 libraryProject=libappbase -baseVersion=15.1 -publishVersion=15.1.4 -buildCount=0 -baseBetaVersion=15.1.5 +baseVersion=15.2 +publishVersion=15.2.0 +buildCount=1 +baseBetaVersion=15.2.1 From 28ae2631a68ec62987be9f11c691562aecf076fe Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 29 Mar 2025 08:43:25 +0800 Subject: [PATCH 13/20] APK 15.2.0 release Publish. --- appbase/build.properties | 6 +++--- libappbase/build.properties | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/appbase/build.properties b/appbase/build.properties index b05233c..cfd7c17 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 29 00:40:24 GMT 2025 -stageCount=0 +#Sat Mar 29 08:43:25 HKT 2025 +stageCount=1 libraryProject=libappbase baseVersion=15.2 publishVersion=15.2.0 -buildCount=1 +buildCount=0 baseBetaVersion=15.2.1 diff --git a/libappbase/build.properties b/libappbase/build.properties index b05233c..cfd7c17 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 29 00:40:24 GMT 2025 -stageCount=0 +#Sat Mar 29 08:43:25 HKT 2025 +stageCount=1 libraryProject=libappbase baseVersion=15.2 publishVersion=15.2.0 -buildCount=1 +buildCount=0 baseBetaVersion=15.2.1 From 4a0b58fedafbdf13c51969891f6ed33b4ad64e8a Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 29 Mar 2025 08:43:50 +0800 Subject: [PATCH 14/20] Library Release 15.2.0 --- appbase/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appbase/build.properties b/appbase/build.properties index cfd7c17..ad1af13 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 29 08:43:25 HKT 2025 +#Sat Mar 29 08:43:44 HKT 2025 stageCount=1 libraryProject=libappbase baseVersion=15.2 From 3e1531d356728afc133cdf7e1d9a6ee2acf3138f Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 29 Mar 2025 11:19:35 +0800 Subject: [PATCH 15/20] BugFix --- appbase/build.properties | 4 ++-- .../java/cc/winboll/studio/appbase/MainActivity.java | 1 + libappbase/build.properties | 4 ++-- .../winboll/studio/libappbase/GlobalApplication.java | 8 ++++++-- .../java/cc/winboll/studio/libappbase/LogUtils.java | 12 +++++++++++- 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/appbase/build.properties b/appbase/build.properties index ad1af13..f29a281 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 29 08:43:44 HKT 2025 +#Sat Mar 29 03:16:41 GMT 2025 stageCount=1 libraryProject=libappbase baseVersion=15.2 publishVersion=15.2.0 -buildCount=0 +buildCount=5 baseBetaVersion=15.2.1 diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java index b25b6ac..c99a20d 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java @@ -86,6 +86,7 @@ public class MainActivity extends WinBollActivityBase implements IWinBollActivit public void onSwitchDebugMode(View view) { boolean isDebuging = ((CheckBox)view).isChecked(); GlobalApplication.setIsDebuging(isDebuging); + GlobalApplication.saveDebugStatus(); } public void onPreviewGlobalCrashActivity(View view) { diff --git a/libappbase/build.properties b/libappbase/build.properties index cfd7c17..f29a281 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 29 08:43:25 HKT 2025 +#Sat Mar 29 03:16:41 GMT 2025 stageCount=1 libraryProject=libappbase baseVersion=15.2 publishVersion=15.2.0 -buildCount=0 +buildCount=5 baseBetaVersion=15.2.1 diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java index 240c13f..9cff4a1 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/GlobalApplication.java @@ -25,9 +25,12 @@ public class GlobalApplication extends Application { MyActivityLifecycleCallbacks mMyActivityLifecycleCallbacks; public static void setIsDebuging(boolean isDebuging) { + GlobalApplication.isDebuging = isDebuging; + } + + public static void saveDebugStatus() { if (_GlobalApplication != null) { - GlobalApplication.isDebuging = isDebuging; - APPBaseModel.saveBeanToFile(getAPPBaseModelFilePath(), new APPBaseModel(isDebuging)); + APPBaseModel.saveBeanToFile(getAPPBaseModelFilePath(), new APPBaseModel(GlobalApplication.isDebuging)); } } @@ -69,6 +72,7 @@ public class GlobalApplication extends Application { APPBaseModel appBaseModel = APPBaseModel.loadBeanFromFile(getAPPBaseModelFilePath(), APPBaseModel.class); if (appBaseModel == null) { setIsDebuging(false); + saveDebugStatus(); } else { setIsDebuging(appBaseModel.isDebuging()); } diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java index a49ea55..e3524d5 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogUtils.java @@ -220,7 +220,17 @@ public class LogUtils { } static boolean isLoggable(String tag, LOG_LEVEL logLevel) { - return _IsInited && mapTAGList.get(tag) && isInTheLevel(logLevel); + if (!_IsInited) { + return false; + } + if (mapTAGList.get(tag) == null + || !mapTAGList.get(tag)) { + return false; + } + if (!isInTheLevel(logLevel)) { + return false; + } + return true; } static boolean isInTheLevel(LOG_LEVEL logLevel) { From 07959be09102576bcde4b5904f5fd4066cf3c578 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 29 Mar 2025 11:20:21 +0800 Subject: [PATCH 16/20] APK 15.2.1 release Publish. --- appbase/build.properties | 8 ++++---- libappbase/build.properties | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/appbase/build.properties b/appbase/build.properties index ad1af13..435ff5e 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 29 08:43:44 HKT 2025 -stageCount=1 +#Sat Mar 29 11:20:21 HKT 2025 +stageCount=2 libraryProject=libappbase baseVersion=15.2 -publishVersion=15.2.0 +publishVersion=15.2.1 buildCount=0 -baseBetaVersion=15.2.1 +baseBetaVersion=15.2.2 diff --git a/libappbase/build.properties b/libappbase/build.properties index cfd7c17..435ff5e 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 29 08:43:25 HKT 2025 -stageCount=1 +#Sat Mar 29 11:20:21 HKT 2025 +stageCount=2 libraryProject=libappbase baseVersion=15.2 -publishVersion=15.2.0 +publishVersion=15.2.1 buildCount=0 -baseBetaVersion=15.2.1 +baseBetaVersion=15.2.2 From 721a4034dd2f87fae95ba5cb210bb06778b844d1 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 29 Mar 2025 11:20:41 +0800 Subject: [PATCH 17/20] Library Release 15.2.1 --- appbase/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appbase/build.properties b/appbase/build.properties index 435ff5e..c6c141d 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 29 11:20:21 HKT 2025 +#Sat Mar 29 11:20:34 HKT 2025 stageCount=2 libraryProject=libappbase baseVersion=15.2 From 9b882d14ab3fc785f7712f626a9d31d81e634ec5 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 29 Mar 2025 11:27:54 +0800 Subject: [PATCH 18/20] APK 15.2.2 release Publish. --- appbase/build.properties | 8 ++++---- libappbase/build.properties | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/appbase/build.properties b/appbase/build.properties index 07b06d7..e5371fa 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 29 11:20:34 HKT 2025 -stageCount=2 +#Sat Mar 29 11:27:54 HKT 2025 +stageCount=3 libraryProject=libappbase baseVersion=15.2 -publishVersion=15.2.1 +publishVersion=15.2.2 buildCount=0 -baseBetaVersion=15.2.2 \ No newline at end of file +baseBetaVersion=15.2.3 diff --git a/libappbase/build.properties b/libappbase/build.properties index 488af65..e5371fa 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 29 11:20:21 HKT 2025 -stageCount=2 +#Sat Mar 29 11:27:54 HKT 2025 +stageCount=3 libraryProject=libappbase baseVersion=15.2 -publishVersion=15.2.1 +publishVersion=15.2.2 buildCount=0 -baseBetaVersion=15.2.2 \ No newline at end of file +baseBetaVersion=15.2.3 From b0e53d169108eceb7535e80c1794472c4496c643 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 29 Mar 2025 11:28:08 +0800 Subject: [PATCH 19/20] Library Release 15.2.2 --- appbase/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appbase/build.properties b/appbase/build.properties index e5371fa..8a2d4b2 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,5 +1,5 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Mar 29 11:27:54 HKT 2025 +#Sat Mar 29 11:28:02 HKT 2025 stageCount=3 libraryProject=libappbase baseVersion=15.2 From 2870ca911c0386cf25452efd6b73bfd9e643b675 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Sat, 29 Mar 2025 12:37:13 +0800 Subject: [PATCH 20/20] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E7=B1=BB=E5=BA=93?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- androiddemo/build.gradle | 6 +++--- androiddemo/build.properties | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/androiddemo/build.gradle b/androiddemo/build.gradle index 0aaf2e6..1ac4156 100644 --- a/androiddemo/build.gradle +++ b/androiddemo/build.gradle @@ -23,7 +23,7 @@ android { defaultConfig { applicationId "cc.winboll.studio.androiddemo" - minSdkVersion 26 + minSdkVersion 24 targetSdkVersion 29 versionCode 1 // versionName 更新后需要手动设置 @@ -66,6 +66,6 @@ dependencies { // https://mvnrepository.com/artifact/com.android.support/recyclerview-v7 api 'com.android.support:recyclerview-v7:28.0.0' - api 'cc.winboll.studio:libappbase:15.0.9' - api 'cc.winboll.studio:libapputils:15.0.11' + api 'cc.winboll.studio:libapputils:15.2.1' + api 'cc.winboll.studio:libappbase:15.2.2' } diff --git a/androiddemo/build.properties b/androiddemo/build.properties index f6428e1..ab0ea42 100644 --- a/androiddemo/build.properties +++ b/androiddemo/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 28 06:28:08 GMT 2025 +#Sat Mar 29 04:34:14 GMT 2025 stageCount=0 libraryProject= baseVersion=15.0 publishVersion=15.0.0 -buildCount=13 +buildCount=15 baseBetaVersion=15.0.1