From 00d087180912329f6ecb8f7889375e5ce63729db Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Fri, 7 Mar 2025 12:37:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0UI=E8=A7=86=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appbase/build.properties | 4 +- .../appbase/receivers/MainReceiver.java | 8 +- .../studio/appbase/services/MainService.java | 10 +- ...BollNewsWidget.java => APPNewsWidget.java} | 35 +-- .../WinBollNewsWidgetClickListener.java | 4 +- appbase/src/main/res/layout/activity_main.xml | 209 +++++++++--------- libappbase/build.properties | 4 +- .../studio/libappbase/sos/WinBoll.java | 2 +- 8 files changed, 144 insertions(+), 132 deletions(-) rename appbase/src/main/java/cc/winboll/studio/appbase/widgets/{WinBollNewsWidget.java => APPNewsWidget.java} (86%) diff --git a/appbase/build.properties b/appbase/build.properties index c53df89..631b0a2 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Fri Mar 07 03:14:48 GMT 2025 +#Fri Mar 07 04:36:05 GMT 2025 stageCount=3 libraryProject=libappbase baseVersion=2.0 publishVersion=2.0.2 -buildCount=5 +buildCount=7 baseBetaVersion=2.0.3 diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/receivers/MainReceiver.java b/appbase/src/main/java/cc/winboll/studio/appbase/receivers/MainReceiver.java index 2d609b3..ad553dc 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/receivers/MainReceiver.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/receivers/MainReceiver.java @@ -13,7 +13,7 @@ import android.content.Intent; import android.content.IntentFilter; import cc.winboll.studio.appbase.beans.WinBollNewsBean; import cc.winboll.studio.appbase.services.MainService; -import cc.winboll.studio.appbase.widgets.WinBollNewsWidget; +import cc.winboll.studio.appbase.widgets.APPNewsWidget; import cc.winboll.studio.libappbase.AppUtils; import cc.winboll.studio.libappbase.LogUtils; import com.hjq.toast.ToastUtils; @@ -95,10 +95,10 @@ public class MainReceiver extends BroadcastReceiver { sbLine.append(appName); appWinBollNewsBean.setMessage(sbLine.toString()); - WinBollNewsWidget.addWinBollNewsBean(context, appWinBollNewsBean); + APPNewsWidget.addWinBollNewsBean(context, appWinBollNewsBean); - Intent intentWidget = new Intent(context, WinBollNewsWidget.class); - intentWidget.setAction(WinBollNewsWidget.ACTION_RELOAD_REPORT); + Intent intentWidget = new Intent(context, APPNewsWidget.class); + intentWidget.setAction(APPNewsWidget.ACTION_RELOAD_REPORT); context.sendBroadcast(intentWidget); } diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/services/MainService.java b/appbase/src/main/java/cc/winboll/studio/appbase/services/MainService.java index 095bcf7..0c296f0 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/services/MainService.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/services/MainService.java @@ -23,7 +23,7 @@ import cc.winboll.studio.appbase.handlers.MainServiceHandler; import cc.winboll.studio.appbase.receivers.MainReceiver; import cc.winboll.studio.appbase.services.AssistantService; import cc.winboll.studio.appbase.threads.MainServiceThread; -import cc.winboll.studio.appbase.widgets.WinBollNewsWidget; +import cc.winboll.studio.appbase.widgets.APPNewsWidget; import cc.winboll.studio.libappbase.LogUtils; import java.util.ArrayList; import cc.winboll.studio.libappbase.sos.APPModel; @@ -101,8 +101,8 @@ public class MainService extends Service { } // 启动小部件 - Intent intentTimeWidget = new Intent(this, WinBollNewsWidget.class); - intentTimeWidget.setAction(WinBollNewsWidget.ACTION_RELOAD_REPORT); + Intent intentTimeWidget = new Intent(this, APPNewsWidget.class); + intentTimeWidget.setAction(APPNewsWidget.ACTION_RELOAD_REPORT); this.sendBroadcast(intentTimeWidget); startMainServiceThread(); @@ -211,8 +211,8 @@ public class MainService extends Service { bindService(intentService, sosConnection, Context.BIND_IMPORTANT); mSOSConnectionList.add(sosConnection); - Intent intentWidget = new Intent(this, WinBollNewsWidget.class); - intentWidget.setAction(WinBollNewsWidget.ACTION_WAKEUP_SERVICE); + Intent intentWidget = new Intent(this, APPNewsWidget.class); + intentWidget.setAction(APPNewsWidget.ACTION_WAKEUP_SERVICE); APPModel appSOSBean = new APPModel(bean.getAppPackageName(), bean.getAppMainServiveName()); intentWidget.putExtra("APPSOSBean", appSOSBean.toString()); sendBroadcast(intentWidget); diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/widgets/WinBollNewsWidget.java b/appbase/src/main/java/cc/winboll/studio/appbase/widgets/APPNewsWidget.java similarity index 86% rename from appbase/src/main/java/cc/winboll/studio/appbase/widgets/WinBollNewsWidget.java rename to appbase/src/main/java/cc/winboll/studio/appbase/widgets/APPNewsWidget.java index 2b75e14..907f18b 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/widgets/WinBollNewsWidget.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/widgets/APPNewsWidget.java @@ -20,10 +20,11 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import cc.winboll.studio.libappbase.sos.APPModel; +import cc.winboll.studio.libappbase.sos.WinBoll; -public class WinBollNewsWidget extends AppWidgetProvider { +public class APPNewsWidget extends AppWidgetProvider { - public static final String TAG = "WinBollNewsWidget"; + public static final String TAG = "APPNewsWidget"; public static final String ACTION_WAKEUP_SERVICE = "cc.winboll.studio.appbase.widgets.WinBollNewsWidget.ACTION_WAKEUP_SERVICE"; public static final String ACTION_RELOAD_REPORT = "cc.winboll.studio.appbase.widgets.WinBollNewsWidget.ACTION_RELOAD_REPORT"; @@ -49,25 +50,25 @@ public class WinBollNewsWidget extends AppWidgetProvider { if (intent.getAction().equals(ACTION_RELOAD_REPORT)) { LogUtils.d(TAG, "ACTION_RELOAD_REPORT"); AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context); - int[] appWidgetIds = appWidgetManager.getAppWidgetIds(new ComponentName(context, WinBollNewsWidget.class)); + int[] appWidgetIds = appWidgetManager.getAppWidgetIds(new ComponentName(context, APPNewsWidget.class)); for (int appWidgetId : appWidgetIds) { updateAppWidget(context, appWidgetManager, appWidgetId); } }else if (intent.getAction().equals(ACTION_WAKEUP_SERVICE)) { LogUtils.d(TAG, "ACTION_WAKEUP_SERVICE"); - String szWinBollNewsBean = intent.getStringExtra("WinBollNewsBean"); - LogUtils.d(TAG, String.format("szWinBollNewsBean %s", szWinBollNewsBean)); - if (szWinBollNewsBean != null && !szWinBollNewsBean.equals("")) { + String szAPPModel = intent.getStringExtra(WinBoll.EXTRA_APPMODEL); + LogUtils.d(TAG, String.format("szAPPModel %s", szAPPModel)); + if (szAPPModel != null && !szAPPModel.equals("")) { try { - APPModel bean = APPModel.parseStringToBean(szWinBollNewsBean, APPModel.class); + APPModel bean = APPModel.parseStringToBean(szAPPModel, APPModel.class); if (bean != null) { - String szNewsPackageName = bean.getAppPackageName(); - LogUtils.d(TAG, String.format("szNewsPackageName %s", szNewsPackageName)); - String szNewsClassName = bean.getAppMainServiveName(); - LogUtils.d(TAG, String.format("szNewsClassName %s", szNewsClassName)); + String szAppPackageName = bean.getAppPackageName(); + LogUtils.d(TAG, String.format("szAppPackageName %s", szAppPackageName)); + String szAppMainServiveName = bean.getAppMainServiveName(); + LogUtils.d(TAG, String.format("szAppMainServiveName %s", szAppMainServiveName)); - String appName = AppUtils.getAppNameByPackageName(context, szNewsPackageName); + String appName = AppUtils.getAppNameByPackageName(context, szAppPackageName); LogUtils.d(TAG, String.format("appName %s", appName)); WinBollNewsBean winBollNewsBean = new WinBollNewsBean(appName); SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss"); @@ -82,7 +83,7 @@ public class WinBollNewsWidget extends AppWidgetProvider { addWinBollNewsBean(context, winBollNewsBean); AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context); - int[] appWidgetIds = appWidgetManager.getAppWidgetIds(new ComponentName(context, WinBollNewsWidget.class)); + int[] appWidgetIds = appWidgetManager.getAppWidgetIds(new ComponentName(context, APPNewsWidget.class)); for (int appWidgetId : appWidgetIds) { updateAppWidget(context, appWidgetManager, appWidgetId); } @@ -156,8 +157,8 @@ public class WinBollNewsWidget extends AppWidgetProvider { if (_CurrentPageIndex > 0) { _CurrentPageIndex = _CurrentPageIndex - 1; } - Intent intentWidget = new Intent(context, WinBollNewsWidget.class); - intentWidget.setAction(WinBollNewsWidget.ACTION_RELOAD_REPORT); + Intent intentWidget = new Intent(context, APPNewsWidget.class); + intentWidget.setAction(APPNewsWidget.ACTION_RELOAD_REPORT); context.sendBroadcast(intentWidget); } } @@ -167,8 +168,8 @@ public class WinBollNewsWidget extends AppWidgetProvider { if ((_CurrentPageIndex + 1) * _OnePageLinesCount < _WinBollNewsBeanList.size()) { _CurrentPageIndex = _CurrentPageIndex + 1; } - Intent intentWidget = new Intent(context, WinBollNewsWidget.class); - intentWidget.setAction(WinBollNewsWidget.ACTION_RELOAD_REPORT); + Intent intentWidget = new Intent(context, APPNewsWidget.class); + intentWidget.setAction(APPNewsWidget.ACTION_RELOAD_REPORT); context.sendBroadcast(intentWidget); } } diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/widgets/WinBollNewsWidgetClickListener.java b/appbase/src/main/java/cc/winboll/studio/appbase/widgets/WinBollNewsWidgetClickListener.java index 3ddf296..52e3ee8 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/widgets/WinBollNewsWidgetClickListener.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/widgets/WinBollNewsWidgetClickListener.java @@ -25,10 +25,10 @@ public class WinBollNewsWidgetClickListener extends BroadcastReceiver { } if (action.equals(ACTION_PRE)) { LogUtils.d(TAG, "ACTION_PRE"); - WinBollNewsWidget.prePage(context); + APPNewsWidget.prePage(context); } else if (action.equals(ACTION_NEXT)) { LogUtils.d(TAG, "ACTION_NEXT"); - WinBollNewsWidget.nextPage(context); + APPNewsWidget.nextPage(context); } else { LogUtils.d(TAG, String.format("action %s", action)); } diff --git a/appbase/src/main/res/layout/activity_main.xml b/appbase/src/main/res/layout/activity_main.xml index a17706a..3af84c5 100644 --- a/appbase/src/main/res/layout/activity_main.xml +++ b/appbase/src/main/res/layout/activity_main.xml @@ -1,149 +1,160 @@ + android:layout_width="match_parent" + android:layout_height="match_parent"> - - - - - + android:layout_weight="1.0"> - - - -