Przeglądaj źródła

1.添加收到IM消息展示弹窗功能

王鹏鹏 2 lat temu
rodzic
commit
09ac45f857

+ 1 - 0
.idea/misc.xml

@@ -486,6 +486,7 @@
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/dialog_evaluate.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/dialog_game_loading.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/dialog_loading.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/fragment_task.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/rv_empty.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_full_game_text.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/game/src/main/res/drawable/bg_game_back.xml" value="0.151" />

+ 15 - 14
baselib/src/main/java/com/yingyangfly/baselib/base/BaseActivity.kt

@@ -4,8 +4,6 @@ import android.annotation.SuppressLint
 import android.app.AlertDialog
 import android.content.Context
 import android.content.pm.ActivityInfo
-import android.content.res.Configuration
-import android.content.res.Resources
 import android.os.Bundle
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
@@ -23,11 +21,10 @@ import com.yingyangfly.baselib.db.AppDataBase
 import com.yingyangfly.baselib.db.DoctorDao
 import com.yingyangfly.baselib.db.QuestionsDao
 import com.yingyangfly.baselib.dialog.LoadingDialog
+import com.yingyangfly.baselib.dialog.TaskFragment
 import com.yingyangfly.baselib.ext.getDbClass
 import com.yingyangfly.baselib.ext.initBar
-import com.yingyangfly.baselib.utils.ActivityManagers
-import com.yingyangfly.baselib.utils.ResUtil
-import com.yingyangfly.baselib.utils.ViewTool
+import com.yingyangfly.baselib.utils.*
 import gorden.rxbus2.RxBus
 
 /**
@@ -104,6 +101,7 @@ abstract class BaseActivity<DB : ViewDataBinding> : AppCompatActivity(),
         initViews()
         initListener()
         initData()
+        initLiveEventBusUtil()
     }
 
     protected inline fun binding(block: DB.() -> Unit): DB {
@@ -263,15 +261,6 @@ abstract class BaseActivity<DB : ViewDataBinding> : AppCompatActivity(),
         ActivityManagers.instance.removeActivity(this)
     }
 
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
-        if (newConfig.fontScale != 1f) {
-            // 非默认值
-            resources
-        }
-        super.onConfigurationChanged(newConfig)
-    }
-
     var showFragment: Fragment? = null
     fun showFragment(viewId: Int, f: Fragment) {
         try {
@@ -291,6 +280,18 @@ abstract class BaseActivity<DB : ViewDataBinding> : AppCompatActivity(),
         }
     }
 
+    private fun initLiveEventBusUtil() {
+        //展示任务弹窗
+        LiveEventBusUtil.observer<String>(this, RxBusCodes.SHOWTASKDIALOG) {
+            val taskFragment = TaskFragment()
+            taskFragment.setTaskDesn(it, "")
+            taskFragment.onDialogClickListener = {
+
+            }
+            taskFragment.show(supportFragmentManager, "taskFragment")
+        }
+    }
+
 //    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
 //        if (keyCode == KeyEvent.KEYCODE_BACK) {
 //            return true;

+ 5 - 0
baselib/src/main/java/com/yingyangfly/baselib/utils/RxBusCodes.kt

@@ -102,4 +102,9 @@ object RxBusCodes {
      * 开始播放音乐
      */
     const val STARTMUSIC = "startMusic"
+
+    /**
+     * 展示首页弹窗
+     */
+    const val SHOWTASKDIALOG = "showTaskDialog"
 }