[拆包]大文件ui

app/src/main/java/com/base/appzxhy/SpConstObject.kt

@@ -94,10 +94,10 @@ object SpConstObject {
     //是否上报过useType
     var useTypeEvent = false
         get() {
-            return AppPreferences.getInstance().getBoolean("fcmToken", field)
+            return AppPreferences.getInstance().getBoolean("useTypeEvent", field)
         }
         set(value) {
             field = value
-            AppPreferences.getInstance().put("fcmToken", value, true)
+            AppPreferences.getInstance().put("useTypeEvent", value, true)
         }
 }
\ No newline at end of file

app/src/main/java/com/base/appzxhy/business/helper/NewComUtils.kt

@@ -184,6 +184,7 @@ object NewComUtils {
 
             } catch (e: Exception) {
                 e.printStackTrace()
+                LogEx.logDebug("initConfig", "parseConfigBean_error", true)
                 EventUtils.event("parseConfigBean_error", value = config)
             }
         }

app/src/main/java/com/base/appzxhy/business/push/notification/MyNotificationManager.kt

@@ -64,12 +64,26 @@ object MyNotificationManager {
             }
         }
 
-        if (bean.actionId.isEmpty()) {
-            val actionId = getNextActionId()
-            bean.actionId = actionId
-        }
         try {
+
+            if (bean.actionId.isEmpty()) {
+                val actionId = getNextActionId()
+                bean.actionId = actionId
+            }
+
             sendBeanBlockingQueue.put(bean)
+
+            LogEx.logDebug(TAG, "sendNotificationCan where=${bean.where} actionId=${bean.actionId}")
+            //上报通知
+            EventUtils.event("Notification_Popup_${bean.where}", "actionId=${bean.actionId}")
+            //当天次数加一
+            dayPopupCount += 1
+            //推送时间
+            lastPopupTime = System.currentTimeMillis()
+
+            //这条推送回调
+            bean.sendSuccess?.invoke()
+
         } catch (e: Exception) {
             EventUtils.event("Notification_Error", "submitSendBean Exception")
             LogEx.logDebug("canSendNotification", "submitSendBean Exception")
@@ -103,16 +117,6 @@ object MyNotificationManager {
                         NotificationUiUtil.setNotification(bean)
                     }.await()
 
-                    LogEx.logDebug(TAG, "sendNotificationCan where=${bean.where} actionId=${bean.actionId}")
-                    //上报通知
-                    EventUtils.event("Notification_Popup_${bean.where}", "actionId=${bean.actionId}")
-                    //当天次数加一
-                    dayPopupCount += 1
-                    //推送时间
-                    lastPopupTime = System.currentTimeMillis()
-
-                    //这条推送回调
-                    bean.sendSuccess?.invoke()
 
                     async(Dispatchers.Main) {
                         //发送悬停

app/src/main/res/layout/activity_clean_result.xml

@@ -47,7 +47,7 @@
             android:id="@+id/idLottie"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="-8dp"
+            android:layout_marginTop="-16dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ll_title"
@@ -59,7 +59,7 @@
             android:id="@+id/tv_cleaned_up"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="-8dp"
+            android:layout_marginTop="-16dp"
             android:text="@string/cleaned_up"
             android:textColor="@color/white"
             android:textSize="20sp"