From de6361b19bd738faf4a9db3da5ec9361fafeca9b Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Mon, 20 Jan 2025 11:07:17 +0800 Subject: [PATCH 001/345] =?UTF-8?q?APPUtils=E7=BC=96=E8=AF=91=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apputils/build.properties | 4 ++-- libapputils/build.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apputils/build.properties b/apputils/build.properties index 9d55320..cecfa3a 100644 --- a/apputils/build.properties +++ b/apputils/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Jan 18 13:03:10 HKT 2025 +#Mon Jan 20 03:06:12 GMT 2025 stageCount=2 libraryProject=libapputils baseVersion=9.2 publishVersion=9.2.1 -buildCount=0 +buildCount=1 baseBetaVersion=9.2.2 diff --git a/libapputils/build.properties b/libapputils/build.properties index 154b926..cecfa3a 100644 --- a/libapputils/build.properties +++ b/libapputils/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat Jan 18 13:02:39 HKT 2025 +#Mon Jan 20 03:06:12 GMT 2025 stageCount=2 libraryProject=libapputils baseVersion=9.2 publishVersion=9.2.1 -buildCount=0 +buildCount=1 baseBetaVersion=9.2.2 From af2e09c02a1ff9e426d88be415685ff65ef7bf48 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Mon, 20 Jan 2025 12:50:22 +0800 Subject: [PATCH 002/345] =?UTF-8?q?=E5=BA=94=E7=94=A8=E9=80=80=E5=87=BA?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E8=B0=83=E8=AF=95=E5=AE=8C=E6=88=90=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97=E7=AA=97=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E5=8A=A8=E5=93=8D=E5=BA=94=E3=80=82?= 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 +++-- libapputils/build.properties | 4 +- .../libapputils/app/WinBollActivity.java | 10 ++++- .../app/WinBollActivityManager.java | 41 ++++++++++--------- .../studio/libapputils/log/LogActivity.java | 35 ++++++++++------ 6 files changed, 63 insertions(+), 42 deletions(-) diff --git a/apputils/build.properties b/apputils/build.properties index cecfa3a..099838d 100644 --- a/apputils/build.properties +++ b/apputils/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Jan 20 03:06:12 GMT 2025 +#Mon Jan 20 04:46:17 GMT 2025 stageCount=2 libraryProject=libapputils baseVersion=9.2 publishVersion=9.2.1 -buildCount=1 +buildCount=15 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 49963b5..0693802 100644 --- a/apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java +++ b/apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java @@ -50,10 +50,13 @@ final public class MainActivity extends WinBollActivity { } public void onLogUtilsClick(View view) { - Intent intent = new Intent(this, LogActivity.class); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT); - intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK); - startActivity(intent); +// Intent intent = new Intent(this, LogActivity.class); +// intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT); +// intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK); +// startActivity(intent); + + //WinBollActivityManager.getInstance().printAvtivityListInfo(); + WinBollActivityManager.getInstance(this).startWinBollActivity(this, LogActivity.class); } @Override diff --git a/libapputils/build.properties b/libapputils/build.properties index cecfa3a..099838d 100644 --- a/libapputils/build.properties +++ b/libapputils/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Jan 20 03:06:12 GMT 2025 +#Mon Jan 20 04:46:17 GMT 2025 stageCount=2 libraryProject=libapputils baseVersion=9.2 publishVersion=9.2.1 -buildCount=1 +buildCount=15 baseBetaVersion=9.2.2 diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/app/WinBollActivity.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/app/WinBollActivity.java index bd7dba6..8345392 100644 --- a/libapputils/src/main/java/cc/winboll/studio/libapputils/app/WinBollActivity.java +++ b/libapputils/src/main/java/cc/winboll/studio/libapputils/app/WinBollActivity.java @@ -366,10 +366,16 @@ abstract public class WinBollActivity extends AppCompatActivity { public boolean onOptionsItemSelected(MenuItem item) { LogUtils.d(TAG, "onOptionsItemSelected"); if (item.getItemId() == R.id.item_log) { - LogUtils.d(TAG, "item_log not yet."); +// LogUtils.d(TAG, "item_log not yet."); +// Intent intent = new Intent(this, LogActivity.class); +// intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT); +// intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK); +// startActivity(intent); + //WinBollActivityManager.getInstance().printAvtivityListInfo(); - //WinBollActivityManager.getInstance(this).startWinBollActivity(this, LogActivity.class); + WinBollActivityManager.getInstance(this).startWinBollActivity(this, LogActivity.class); } else if (item.getItemId() == R.id.item_exit) { + //ToastUtils.show("item_exit"); WinBollActivityManager.getInstance(this).finishAll(); } else if (item.getItemId() == R.id.item_info) { WinBollApplication application = (WinBollApplication) getApplication(); diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/app/WinBollActivityManager.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/app/WinBollActivityManager.java index 3d55b84..5788c37 100644 --- a/libapputils/src/main/java/cc/winboll/studio/libapputils/app/WinBollActivityManager.java +++ b/libapputils/src/main/java/cc/winboll/studio/libapputils/app/WinBollActivityManager.java @@ -13,6 +13,7 @@ import android.content.Context; import android.content.Intent; import androidx.core.app.TaskStackBuilder; import cc.winboll.studio.libapputils.log.LogUtils; +import com.hjq.toast.ToastUtils; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -175,26 +176,26 @@ public class WinBollActivityManager { */ public void finishAll() { try { - LogUtils.d(TAG, "finishAll no yet."); - //ToastUtils.show(String.format("finishAll() size : %d", _mWinBollActivityList.size())); -// for (int i = _mWinBollActivityList.size() - 1; i > -1; i--) { -// WinBollActivity activity = _mWinBollActivityList.get(i); -// ToastUtils.show("finishAll() activity"); -// if (activity != null && !activity.isFinishing() && !activity.isDestroyed()) { -// //ToastUtils.show("activity != null ..."); -// if (WinBollApplication.getWinBollUI_TYPE() == WinBollApplication.WinBollUI_TYPE.Service) { -// // 结束窗口和最近任务栏, 建议前台服务类应用使用，可以方便用户再次调用 UI 操作。 -// activity.finishAndRemoveTask(); -// //ToastUtils.show("finishAll() activity.finishAndRemoveTask();"); -// } else if (WinBollApplication.getWinBollUI_TYPE() == WinBollApplication.WinBollUI_TYPE.Aplication) { -// // 结束窗口保留最近任务栏，建议前台服务类应用使用，可以保持应用的系统自觉性。 -// activity.finish(); -// //ToastUtils.show("finishAll() activity.finish();"); -// } else { -// ToastUtils.show("WinBollApplication.WinBollUI_TYPE error."); -// } -// } -// } + for (String key : _mapActivityList.keySet()) { + //System.out.println("Key: " + key + ", Value: " + _mapActivityList.get(key)); + WinBollActivity activity = _mapActivityList.get(key); + //ToastUtils.show("finishAll() activity"); + if (activity != null && !activity.isFinishing() && !activity.isDestroyed()) { + //ToastUtils.show("activity != null ..."); + if (WinBollApplication.getWinBollUI_TYPE() == WinBollApplication.WinBollUI_TYPE.Service) { + // 结束窗口和最近任务栏, 建议前台服务类应用使用，可以方便用户再次调用 UI 操作。 + activity.finishAndRemoveTask(); + //ToastUtils.show("finishAll() activity.finishAndRemoveTask();"); + } else if (WinBollApplication.getWinBollUI_TYPE() == WinBollApplication.WinBollUI_TYPE.Aplication) { + // 结束窗口保留最近任务栏，建议前台服务类应用使用，可以保持应用的系统自觉性。 + activity.finish(); + //ToastUtils.show("finishAll() activity.finish();"); + } else { + LogUtils.d(TAG, "WinBollApplication.WinBollUI_TYPE error."); + //ToastUtils.show("WinBollApplication.WinBollUI_TYPE error."); + } + } + } } catch (Exception e) { LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); } diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/log/LogActivity.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/log/LogActivity.java index d5855ad..f7a3381 100644 --- a/libapputils/src/main/java/cc/winboll/studio/libapputils/log/LogActivity.java +++ b/libapputils/src/main/java/cc/winboll/studio/libapputils/log/LogActivity.java @@ -1,30 +1,41 @@ package cc.winboll.studio.libapputils.log; import android.os.Bundle; -import androidx.appcompat.widget.Toolbar; import cc.winboll.studio.libapputils.R; import cc.winboll.studio.libapputils.app.WinBollActivity; -import cc.winboll.studio.libapputils.ads.ADsView; import cc.winboll.studio.libapputils.app.WinBollApplication; -import android.view.View; -import android.app.Activity; +import androidx.appcompat.widget.Toolbar; /** * @Author ZhanGSKen@QQ.COM * @Date 2024/08/12 15:07:58 * @Describe WinBoll 应用日志窗口 */ -public class LogActivity extends Activity { +public class LogActivity extends WinBollActivity { public static final String TAG = "LogActivity"; LogView mLogView; - //ADsView mADsView; -// @Override -// protected boolean isEnableDisplayHomeAsUp() { -// return false; -// } + @Override + public String getTag() { + return TAG; + } + + @Override + protected Toolbar initToolBar() { + return null; + } + + @Override + protected boolean isEnableDisplayHomeAsUp() { + return false; + } + + @Override + protected boolean isAddWinBollToolBar() { + return false; + } @Override protected void onCreate(Bundle savedInstanceState) { @@ -36,8 +47,8 @@ public class LogActivity extends Activity { //mADsView.loadUrl("https://www.winboll.cc"); //mLogView.setVisibility(WinBollApplication.isDebug()?View.GONE:View.VISIBLE); //mADsView.setVisibility(WinBollApplication.isDebug()?View.GONE:View.VISIBLE); - - if(WinBollApplication.isDebug()) { mLogView.start(); } + + if (WinBollApplication.isDebug()) { mLogView.start(); } } @Override From d86d50212ecc1c754f139b318515a01c12edbd78 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Mon, 20 Jan 2025 12:57:59 +0800 Subject: [PATCH 003/345] =?UTF-8?q?=E4=BC=98=E5=8C=96Log=20UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libapputils/src/main/res/layout/view_logtag.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libapputils/src/main/res/layout/view_logtag.xml b/libapputils/src/main/res/layout/view_logtag.xml index 542c501..7f1c4ba 100644 --- a/libapputils/src/main/res/layout/view_logtag.xml +++ b/libapputils/src/main/res/layout/view_logtag.xml @@ -8,8 +8,8 @@ app:cardElevation="4dp" app:cardCornerRadius="4dp" android:id="@+id/listviewauthinfoCardView1" - android:layout_marginLeft="10dp" - android:layout_marginRight="10dp"> + android:layout_marginLeft="0dp" + android:layout_marginRight="5dp"> Date: Mon, 20 Jan 2025 13:00:52 +0800 Subject: [PATCH 004/345] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../studio/libapputils/log/LogActivity.java | 33 ++++--------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/log/LogActivity.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/log/LogActivity.java index f7a3381..94558b8 100644 --- a/libapputils/src/main/java/cc/winboll/studio/libapputils/log/LogActivity.java +++ b/libapputils/src/main/java/cc/winboll/studio/libapputils/log/LogActivity.java @@ -1,16 +1,16 @@ package cc.winboll.studio.libapputils.log; -import android.os.Bundle; -import cc.winboll.studio.libapputils.R; -import cc.winboll.studio.libapputils.app.WinBollActivity; -import cc.winboll.studio.libapputils.app.WinBollApplication; -import androidx.appcompat.widget.Toolbar; - /** * @Author ZhanGSKen@QQ.COM * @Date 2024/08/12 15:07:58 * @Describe WinBoll 应用日志窗口 */ +import android.os.Bundle; +import androidx.appcompat.widget.Toolbar; +import cc.winboll.studio.libapputils.R; +import cc.winboll.studio.libapputils.app.WinBollActivity; +import cc.winboll.studio.libapputils.app.WinBollApplication; + public class LogActivity extends WinBollActivity { public static final String TAG = "LogActivity"; @@ -43,10 +43,6 @@ public class LogActivity extends WinBollActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_log); mLogView = findViewById(R.id.logview); - //mADsView = findViewById(R.id.adsview); - //mADsView.loadUrl("https://www.winboll.cc"); - //mLogView.setVisibility(WinBollApplication.isDebug()?View.GONE:View.VISIBLE); - //mADsView.setVisibility(WinBollApplication.isDebug()?View.GONE:View.VISIBLE); if (WinBollApplication.isDebug()) { mLogView.start(); } } @@ -57,21 +53,4 @@ public class LogActivity extends WinBollActivity { super.onResume(); mLogView.start(); } - -// @Override -// protected boolean isAddWinBollToolBar() { -// return false; -// } -// -// @Override -// protected Toolbar initToolBar() { -// LogUtils.d(TAG, "initToolBar"); -// return null; -// } -// -// @Override -// public String getTag() { -// LogUtils.d(TAG, "getTag"); -// return TAG; -// } } From 17fa805a7f4408997677ba1620976607d29e0e6a Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Mon, 20 Jan 2025 13:17:58 +0800 Subject: [PATCH 005/345] =?UTF-8?q?=E6=BA=90=E7=A0=81=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/WinBollActivityManager.java | 100 ++++++------------ 1 file changed, 33 insertions(+), 67 deletions(-) diff --git a/libapputils/src/main/java/cc/winboll/studio/libapputils/app/WinBollActivityManager.java b/libapputils/src/main/java/cc/winboll/studio/libapputils/app/WinBollActivityManager.java index 5788c37..e5f9fc2 100644 --- a/libapputils/src/main/java/cc/winboll/studio/libapputils/app/WinBollActivityManager.java +++ b/libapputils/src/main/java/cc/winboll/studio/libapputils/app/WinBollActivityManager.java @@ -13,7 +13,6 @@ import android.content.Context; import android.content.Intent; import androidx.core.app.TaskStackBuilder; import cc.winboll.studio.libapputils.log.LogUtils; -import com.hjq.toast.ToastUtils; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -21,17 +20,16 @@ import java.util.Map; public class WinBollActivityManager { public static final String TAG = "WinBollActivityManager"; + public static final String EXTRA_TAG = "EXTRA_TAG"; Context mContext; static WinBollActivityManager _mWinBollActivityManager; static Map _mapActivityList; - //static ArrayList _mWinBollActivityList; public WinBollActivityManager(Context context) { mContext = context; LogUtils.d(TAG, "WinBollActivityManager()"); _mapActivityList = new HashMap(); - //_mWinBollActivityList = new ArrayList(); } public static synchronized WinBollActivityManager getInstance(Context context) { @@ -43,19 +41,10 @@ public class WinBollActivityManager { return _mWinBollActivityManager; } - /** - * 把Activity添加到管理中 - */ + // + // 把Activity添加到管理中 + // public void add(T activity) { - /*for (int i = 0; i < _mWinBollActivityList.size(); i++) { - LogUtils.d(TAG, String.format("add for i %d\nget(i).getTag() %s", i, _mWinBollActivityList.get(i).getTag())); - if (_mWinBollActivityList.get(i).getTag().equals(activity.getTag())) { - _mWinBollActivityList.add(i, activity); - _mWinBollActivityList.remove(i); - LogUtils.d(TAG, String.format("Replace activity : %s\nSize %d", activity.getTag(), _mWinBollActivityList.size())); - return; - } - }*/ if (isActive(activity.getTag())) { LogUtils.d(TAG, String.format("add(...) %s is active.", activity.getTag())); } else { @@ -67,7 +56,7 @@ public class WinBollActivityManager { // // activity: 为 null 时， - // intent.putExtra 函数 "tag" 参数为 tag + // intent.putExtra 函数 EXTRA_TAG 参数为 tag // activity: 不为 null 时， // intent.putExtra 函数 "tag" 参数为 activity.getTag() // @@ -85,7 +74,7 @@ public class WinBollActivityManager { //打开多任务窗口 flags intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT); intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK); - intent.putExtra("tag", tag); + intent.putExtra(EXTRA_TAG, tag); mContext.startActivity(intent); } catch (InstantiationException | IllegalAccessException e) { LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); @@ -106,18 +95,18 @@ public class WinBollActivityManager { //打开多任务窗口 flags intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT); intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK); - intent.putExtra("tag", tag); + intent.putExtra(EXTRA_TAG, tag); mContext.startActivity(intent); } catch (InstantiationException | IllegalAccessException e) { LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); } } - /** - * 判断 tag绑定的 MyActivity是否存在 - */ + // + // 判断 tag绑定的 MyActivity是否存在 + // public boolean isActive(String tag) { - printAvtivityListInfo(); + //printAvtivityListInfo(); WinBollActivity activity = getWinBollActivity(tag); if (activity != null) { LogUtils.d(TAG, "isActive(...) activity != null tag " + tag); @@ -142,21 +131,21 @@ public class WinBollActivityManager { return _mapActivityList.get(tag); } - /** - * 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台 - */ + // + // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台 + // public void resumeActivity(Context context, String tag) { LogUtils.d(TAG, "resumeActivty"); T activity = (T)getWinBollActivity(tag); - LogUtils.d(TAG, "activity " + activity.getTag()); + //LogUtils.d(TAG, "activity " + activity.getTag()); if (activity != null && !activity.isFinishing() && !activity.isDestroyed()) { resumeActivity(context, activity); } } - /** - * 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台 - */ + // + // 找到tag 绑定的 BaseActivity ，通过 getTaskId() 移动到前台 + // public void resumeActivity(Context context, T activity) { ActivityManager am = (ActivityManager) activity.getSystemService(Context.ACTIVITY_SERVICE); //返回启动它的根任务（home 或者 MainActivity） @@ -171,9 +160,9 @@ public class WinBollActivityManager { } - /** - * 结束所有 Activity - */ + // + // 结束所有 Activity + // public void finishAll() { try { for (String key : _mapActivityList.keySet()) { @@ -201,9 +190,9 @@ public class WinBollActivityManager { } } - /** - * 结束指定Activity - */ + // + // 结束指定Activity + // public void finish(T activity) { try { if (activity != null && !activity.isFinishing() && !activity.isDestroyed()) { @@ -226,22 +215,6 @@ public class WinBollActivityManager { if (preActivity != null) { resumeActivity(mContext, preActivity); } - -// for (int i = 0; i < _mWinBollActivityList.size(); i++) { -// if (_mWinBollActivityList.get(i).getTag().equals(activity.getTag())) { -// //ToastUtils.show(String.format("equals i : %d\nTag : %s\nSize : %d", i, activity.getTag(), _mWinBollActivityList.size())); -// if (i == 0) { -// finishAll(); -// //ToastUtils.show("finish finishAll"); -// return; -// } -// if (i > 0) { -// activity.finish(); -// resumeActivity(mContext, _mWinBollActivityList.get(i - 1)); -// return; -// } -// } -// } } } catch (Exception e) { @@ -249,6 +222,9 @@ public class WinBollActivityManager { } } + // + // 获取窗口队列中的前一个窗口 + // WinBollActivity getPreActivity(WinBollActivity activity) { try { boolean bingo = false; @@ -272,12 +248,10 @@ public class WinBollActivityManager { return null; } + // + // 从管理列表中移除管理项 + // public boolean registeRemove(T activity) { -// for (int i = 0; i < _mWinBollActivityList.size(); i++) { -// if (registeRemove(activity, i)) { -// return true; -// } -// } WinBollActivity activityTest = _mapActivityList.get(activity.getTag()); if (activityTest != null) { _mapActivityList.remove(activity.getTag()); @@ -286,15 +260,9 @@ public class WinBollActivityManager { return false; } -// public boolean registeRemove(T activity, int position) { -// if (_mWinBollActivityList.get(position) == activity) { -// _mWinBollActivityList.remove(position); -// //ToastUtils.show(String.format("registeRemove remove.\nTag %s\nposition %d", activity.getTag(), position)); -// return true; -// } -// return false; -// } - + // + // 打印管理列表项列表里的信息 + // public static void printAvtivityListInfo() { //LogUtils.d(TAG, "printAvtivityListInfo"); if (!_mapActivityList.isEmpty()) { @@ -311,6 +279,4 @@ public class WinBollActivityManager { LogUtils.d(TAG, "The map is empty."); } } - - } From 506d2619f207da97d416649cee9c6d212bbea0d7 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Mon, 20 Jan 2025 14:51:10 +0800 Subject: [PATCH 006/345] =?UTF-8?q?=E5=BA=94=E7=94=A8=E4=BB=8B=E7=BB=8D?= =?UTF-8?q?=E9=A1=B5=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 @@ + + +