Browse Source

1.修改任务提醒当天只显示一次

王鹏鹏 2 years ago
parent
commit
eb87eeef1f

+ 3 - 0
.idea/misc.xml

@@ -9,6 +9,7 @@
         <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/drawable/bg_dialog_tip_right.xml" value="0.2165" />
         <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/layout/activity_base.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/layout/dialog_tip.xml" value="0.264" />
+        <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/layout/fragment_base.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/baselib/src/main/res/layout/fragment_dialog_base.xml" value="0.152" />
         <entry key="..\:/workspace/hcp-pad/calendarview/src/main/res/drawable-v21/cv_bg_material.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/calendarview/src/main/res/layout/cv_layout_calendar_view.xml" value="0.1" />
@@ -53,6 +54,8 @@
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_pay_success.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_purchase_services.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_purchase_services_button.xml" value="0.219" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_purchase_services_wechatpay.xml" value="0.219" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_purchase_services_wechatpay_btn.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_record.xml" value="0.2265" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_record_title.xml" value="0.2265" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/drawable/bg_select_training_package.xml" value="0.219" />

+ 8 - 5
baselib/src/main/java/com/yingyangfly/baselib/utils/User.kt

@@ -133,12 +133,15 @@ object User {
     /**
      * 是否展示过任务弹窗
      */
-    fun saveTaskDialogStatus(show: Boolean) {
-        Preferences.put(CommonParam.TASKDIALOG, show)
+    fun saveTaskDialogStatus(time: String) {
+        Preferences.put(CommonParam.TASKDIALOG, time)
     }
 
-    fun getTaskDialogStatus(): Boolean {
-        return Preferences.getBool(CommonParam.TASKDIALOG)
-
+    fun getTaskDialogStatus(): String {
+        return if (Preferences.getString(CommonParam.TASKDIALOG).isNullOrEmpty()) {
+            ""
+        } else {
+            Preferences.getString(CommonParam.TASKDIALOG)!!
+        }
     }
 }

+ 6 - 2
workbenches/src/main/java/com/yingyang/workbenches/WorkbenchesActivity.kt

@@ -1,6 +1,7 @@
 package com.yingyang.workbenches
 
 import android.annotation.SuppressLint
+import android.text.TextUtils
 import androidx.recyclerview.widget.GridLayoutManager
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.yingyang.workbenches.adapter.GameAdapter
@@ -154,6 +155,7 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
     }
 
     private fun showTaskDialog(taskDesn: String) {
+        User.saveTaskDialogStatus(User.getNowDay())
         val taskFragment = TaskFragment()
         taskFragment.setTaskDesn(taskDesn)
         taskFragment.show(supportFragmentManager, "taskFragment")
@@ -219,8 +221,10 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
                     if (it.currentTaskNum == it.totalTaskNum) {
                         showTipDialog()
                     } else {
-                        playVoice?.speak(it.taskDesn)
-                        showTaskDialog(it.taskDesn)
+                        if (TextUtils.equals(User.getNowDay(), User.getTaskDialogStatus()).not()) {
+                            playVoice?.speak(it.taskDesn)
+                            showTaskDialog(it.taskDesn)
+                        }
                     }
 
                 }