diff --git a/appbase/build.properties b/appbase/build.properties index 02ca35b..414130f 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Feb 17 03:10:13 GMT 2025 +#Mon Feb 17 03:42:39 GMT 2025 stageCount=2 libraryProject=libappbase baseVersion=1.5 publishVersion=1.5.1 -buildCount=184 +buildCount=185 baseBetaVersion=1.5.2 diff --git a/libappbase/build.properties b/libappbase/build.properties index 02ca35b..414130f 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Feb 17 03:10:13 GMT 2025 +#Mon Feb 17 03:42:39 GMT 2025 stageCount=2 libraryProject=libappbase baseVersion=1.5 publishVersion=1.5.1 -buildCount=184 +buildCount=185 baseBetaVersion=1.5.2 diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/receiver/WinBollReceiver.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/receiver/WinBollReceiver.java index 0618a56..db5ee64 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/receiver/WinBollReceiver.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/receiver/WinBollReceiver.java @@ -35,7 +35,7 @@ public class WinBollReceiver extends BroadcastReceiver { if (SOS != null && SOS.equals("Service")) { String szAPPSOSBean = intent.getStringExtra("APPSOSBean"); LogUtils.d(TAG, String.format("szAPPSOSBean %s", szAPPSOSBean)); - if (szAPPSOSBean != null) { + if (szAPPSOSBean != null && !szAPPSOSBean.equals("")) { try { APPSOSBean bean = APPSOSBean.parseStringToBean(szAPPSOSBean, APPSOSBean.class); if (bean != null) { diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/widgets/APPSOSReportWidget.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/widgets/APPSOSReportWidget.java index 6d0e7c8..cfa28d3 100644 --- a/libappbase/src/main/java/cc/winboll/studio/libappbase/widgets/APPSOSReportWidget.java +++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/widgets/APPSOSReportWidget.java @@ -47,18 +47,20 @@ public class APPSOSReportWidget extends AppWidgetProvider { LogUtils.d(TAG, "ACTION_ADD_SOS_REPORT"); String szAPPSOSReportBean = intent.getStringExtra("APPSOSReportBean"); LogUtils.d(TAG, String.format("szAPPSOSBean %s", szAPPSOSReportBean)); - try { - APPSOSReportBean bean = APPSOSReportBean.parseStringToBean(szAPPSOSReportBean, APPSOSReportBean.class); - if (bean != null) { - addAPPSOSReportBean(context, bean); - AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context); - int[] appWidgetIds = appWidgetManager.getAppWidgetIds(new ComponentName(context, APPSOSReportWidget.class)); - for (int appWidgetId : appWidgetIds) { - updateAppWidget(context, appWidgetManager, appWidgetId); + if (szAPPSOSReportBean != null && !szAPPSOSReportBean.equals("")) { + try { + APPSOSReportBean bean = APPSOSReportBean.parseStringToBean(szAPPSOSReportBean, APPSOSReportBean.class); + if (bean != null) { + addAPPSOSReportBean(context, bean); + AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context); + int[] appWidgetIds = appWidgetManager.getAppWidgetIds(new ComponentName(context, APPSOSReportWidget.class)); + for (int appWidgetId : appWidgetIds) { + updateAppWidget(context, appWidgetManager, appWidgetId); + } } + } catch (IOException e) { + LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); } - } catch (IOException e) { - LogUtils.d(TAG, e, Thread.currentThread().getStackTrace()); } } else if (intent.getAction().equals(ACTION_RELOAD_SOS_REPORT)) { LogUtils.d(TAG, "ACTION_RELOAD_SOS_REPORT"); @@ -83,7 +85,7 @@ public class APPSOSReportWidget extends AppWidgetProvider { } APPSOSReportBean.saveBeanList(context, _APPSOSReportBeanList, APPSOSReportBean.class); } - + void initAPPSOSReportBeanList(Context context) { if (_APPSOSReportBeanList == null) { _APPSOSReportBeanList = new ArrayList(); @@ -97,7 +99,7 @@ public class APPSOSReportWidget extends AppWidgetProvider { private void updateAppWidget(Context context, AppWidgetManager appWidgetManager, int appWidgetId) { LogUtils.d(TAG, "updateAppWidget(...)"); - + RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_layout); //设置按钮点击事件 Intent intentPre = new Intent(context, WidgetButtonClickListener.class);