|
|
@@ -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;
|