1.优化代码

app/build.gradle

@@ -94,6 +94,9 @@ android {
 }
 
 dependencies {
+    implementation project(path: ':baselib')
+    implementation project(path: ':mmse')
+    implementation project(path: ':moca')
     implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
     implementation(rootProject.ext.androidx.kotlin_lib)
     implementation(rootProject.ext.androidx.kotlin_core)

app/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.yingyangfly.largescreen">
 
     <application
         android:allowBackup="true"
@@ -12,6 +13,30 @@
         android:theme="@style/Theme.Yingyangfly"
         android:usesCleartextTraffic="true"
         tools:replace="allowBackup"
-        tools:targetApi="31"/>
+        tools:targetApi="31">
+
+        <!-- 千万别忘了加这一句。支持api level 28 以上编译-->
+        <uses-library
+            android:name="org.apache.http.legacy"
+            android:required="false" />
+
+        <meta-data
+            android:name="ScopedStorage"
+            android:value="true" />
+
+        <activity
+            android:name="com.yingyangfly.largescreen.activity.MainActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:exported="true"
+            android:screenOrientation="landscape"
+            android:windowSoftInputMode="adjustResize|adjustPan">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+    </application>
 
 </manifest>

app/src/main/java/com/yingyangfly/largescreen/activity/MainActivity.kt

@@ -0,0 +1,37 @@
+package com.yingyangfly.largescreen.activity
+
+import android.os.Bundle
+import com.alibaba.android.arouter.launcher.ARouter
+import com.yingyangfly.baselib.base.BaseActivity
+import com.yingyangfly.baselib.config.AccountConfig
+import com.yingyangfly.baselib.router.RouterUrlCommon
+import com.yingyangfly.baselib.utils.User
+import com.yingyangfly.largescreen.databinding.ActivityMainBinding
+
+class MainActivity : BaseActivity<ActivityMainBinding>() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        if (AccountConfig.SINGLE_MODULE.not()) {
+            if (User.getToken().isNullOrEmpty()) {
+                ARouter.getInstance().build(RouterUrlCommon.hospitalEvaluation)
+                    .navigation()
+            } else {
+                ARouter.getInstance().build(RouterUrlCommon.hospitalEvaluation)
+                    .navigation()
+            }
+            finish()
+        }
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun initViews() {
+
+    }
+
+    override fun initListener() {
+    }
+
+    override fun initData() {
+
+    }
+}

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@android:color/white"
+        android:orientation="vertical">
+
+    </LinearLayout>
+
+
+</layout>

baselib/src/main/java/com/yingyangfly/baselib/base/BaseActivity.kt

@@ -112,7 +112,6 @@ abstract class BaseActivity<DB : ViewDataBinding> : AppCompatActivity(),
         initViews()
         initListener()
         initData()
-        initLiveEventBusUtil()
     }
 
     protected inline fun binding(block: DB.() -> Unit): DB {
@@ -291,33 +290,6 @@ abstract class BaseActivity<DB : ViewDataBinding> : AppCompatActivity(),
         }
     }
 
-    private fun initLiveEventBusUtil() {
-        //展示任务弹窗
-        LiveEventBusUtil.observer<MessageBean>(this, RxBusCodes.SHOWTASKDIALOG) { bean ->
-            Log.e("wwww", "showtaskdialog------------->         "+GsonUtil.GsonString(bean))
-            val taskFragment = TaskFragment()
-            taskFragment.setTaskDesn(bean.getMessageData(), "")
-            taskFragment.onDialogClickListener = {
-                if (TextUtils.isEmpty(bean.ext).not()) {
-                    if (TextUtils.equals("C", bean.businessID)) {
-                        JumpUtil.jumpActivityWithUrl(
-                            RouterUrlCommon.WEB_VIEW_INTERACTION_JS,
-                            bean.ext,
-                            mContext
-                        )
-                    } else if (TextUtils.equals("D", bean.businessID)) {
-                        JumpUtil.jumpActivityWithUrl(
-                            RouterUrlCommon.trainContentDetails,
-                            bean.ext,
-                            mContext
-                        )
-                    }
-                }
-            }
-            taskFragment.show(supportFragmentManager, "taskFragment")
-        }
-    }
-
 //    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
 //        if (keyCode == KeyEvent.KEYCODE_BACK) {
 //            return true;

baselib/src/main/java/com/yingyangfly/baselib/base/BaseFragmentActivity.kt

@@ -7,31 +7,23 @@ import android.content.pm.ActivityInfo
 import android.content.res.Configuration
 import android.content.res.Resources
 import android.os.Bundle
-import android.text.TextUtils
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import android.widget.LinearLayout
-import android.widget.RadioButton
-import android.widget.RadioGroup
 import androidx.databinding.ViewDataBinding
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import com.alibaba.android.arouter.launcher.ARouter
 import com.scwang.smartrefresh.layout.api.RefreshLayout
 import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener
 import com.yingyangfly.baselib.R
-import com.yingyangfly.baselib.bean.MessageBean
 import com.yingyangfly.baselib.databinding.ActivityBaseBinding
 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.router.RouterUrlCommon
 import com.yingyangfly.baselib.utils.*
 import gorden.rxbus2.RxBus
 
-
 /**
  * activity基类
  */
@@ -90,7 +82,6 @@ abstract class BaseFragmentActivity<DB : ViewDataBinding> : FragmentActivity(),
         initViews()
         initListener()
         initData()
-        initLiveEventBusUtil()
     }
 
     protected inline fun binding(block: DB.() -> Unit): DB {
@@ -270,63 +261,6 @@ abstract class BaseFragmentActivity<DB : ViewDataBinding> : FragmentActivity(),
         return res
     }
 
-    var showFragment: Fragment? = null
-    fun showFragment(viewId: Int, f: Fragment) {
-        try {
-            val ft = supportFragmentManager.beginTransaction()
-            if (showFragment != null)
-                ft.hide(showFragment!!)
-            if (f.isAdded) {
-                ft.show(f)
-            } else {
-                ft.add(viewId, f)
-            }
-            showFragment = f
-            ft.commitAllowingStateLoss()
-            supportFragmentManager.executePendingTransactions()// 立即执行
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    @SuppressLint("UseCompatLoadingForDrawables")
-    open fun setRadioButton(rg: RadioGroup, with: Int, hight: Int, drawable: IntArray) {
-        for (i in 0 until rg.childCount) {
-            val rb = rg.getChildAt(i) as RadioButton
-            val right = this@BaseFragmentActivity.resources.getDrawable(drawable[i])
-//            right.setBounds(0, 0,
-//                (with / BaseApplication.instance.getMetricsInfo()).toInt(),
-//                (hight / BaseApplication.instance.getHeightmetricsInfo()).toInt())
-            rb.setCompoundDrawables(right, null, right, null)
-        }
-    }
-
-    private fun initLiveEventBusUtil() {
-        //展示任务弹窗
-        LiveEventBusUtil.observer<MessageBean>(this, RxBusCodes.SHOWTASKDIALOG) { bean ->
-            val taskFragment = TaskFragment()
-            taskFragment.setTaskDesn(bean.getMessageData(), "")
-            taskFragment.onDialogClickListener = {
-                if (TextUtils.isEmpty(bean.ext).not()) {
-                    if (TextUtils.equals("C", bean.businessID)) {
-                        JumpUtil.jumpActivityWithUrl(
-                            RouterUrlCommon.WEB_VIEW_INTERACTION_JS,
-                            bean.ext,
-                            mContext
-                        )
-                    } else if (TextUtils.equals("D", bean.businessID)) {
-                        JumpUtil.jumpActivityWithUrl(
-                            RouterUrlCommon.trainContentDetails,
-                            bean.ext,
-                            mContext
-                        )
-                    }
-                }
-            }
-            taskFragment.show(supportFragmentManager, "taskFragment")
-        }
-    }
-
 //    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
 //        if (keyCode == KeyEvent.KEYCODE_BACK) {
 //            return true;

baselib/src/main/java/com/yingyangfly/baselib/base/BaseLargeScreenActivity.kt

@@ -112,7 +112,6 @@ abstract class BaseLargeScreenActivity<DB : ViewDataBinding> : AppCompatActivity
         initViews()
         initListener()
         initData()
-        initLiveEventBusUtil()
     }
 
     protected inline fun binding(block: DB.() -> Unit): DB {
@@ -291,33 +290,6 @@ abstract class BaseLargeScreenActivity<DB : ViewDataBinding> : AppCompatActivity
         }
     }
 
-    private fun initLiveEventBusUtil() {
-        //展示任务弹窗
-        LiveEventBusUtil.observer<MessageBean>(this, RxBusCodes.SHOWTASKDIALOG) { bean ->
-            Log.e("wwww", "showtaskdialog------------->         "+GsonUtil.GsonString(bean))
-            val taskFragment = TaskFragment()
-            taskFragment.setTaskDesn(bean.getMessageData(), "")
-            taskFragment.onDialogClickListener = {
-                if (TextUtils.isEmpty(bean.ext).not()) {
-                    if (TextUtils.equals("C", bean.businessID)) {
-                        JumpUtil.jumpActivityWithUrl(
-                            RouterUrlCommon.WEB_VIEW_INTERACTION_JS,
-                            bean.ext,
-                            mContext
-                        )
-                    } else if (TextUtils.equals("D", bean.businessID)) {
-                        JumpUtil.jumpActivityWithUrl(
-                            RouterUrlCommon.trainContentDetails,
-                            bean.ext,
-                            mContext
-                        )
-                    }
-                }
-            }
-            taskFragment.show(supportFragmentManager, "taskFragment")
-        }
-    }
-
 //    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
 //        if (keyCode == KeyEvent.KEYCODE_BACK) {
 //            return true;

baselib/src/main/java/com/yingyangfly/baselib/base/BaseTvActivity.kt

@@ -112,7 +112,6 @@ abstract class BaseTvActivity<DB : ViewDataBinding> : AppCompatActivity(),
         initViews()
         initListener()
         initData()
-        initLiveEventBusUtil()
     }
 
     protected inline fun binding(block: DB.() -> Unit): DB {
@@ -291,33 +290,6 @@ abstract class BaseTvActivity<DB : ViewDataBinding> : AppCompatActivity(),
         }
     }
 
-    private fun initLiveEventBusUtil() {
-        //展示任务弹窗
-        LiveEventBusUtil.observer<MessageBean>(this, RxBusCodes.SHOWTASKDIALOG) { bean ->
-            Log.e("wwww", "showtaskdialog------------->         "+GsonUtil.GsonString(bean))
-            val taskFragment = TaskFragment()
-            taskFragment.setTaskDesn(bean.getMessageData(), "")
-            taskFragment.onDialogClickListener = {
-                if (TextUtils.isEmpty(bean.ext).not()) {
-                    if (TextUtils.equals("C", bean.businessID)) {
-                        JumpUtil.jumpActivityWithUrl(
-                            RouterUrlCommon.WEB_VIEW_INTERACTION_JS,
-                            bean.ext,
-                            mContext
-                        )
-                    } else if (TextUtils.equals("D", bean.businessID)) {
-                        JumpUtil.jumpActivityWithUrl(
-                            RouterUrlCommon.trainContentDetails,
-                            bean.ext,
-                            mContext
-                        )
-                    }
-                }
-            }
-            taskFragment.show(supportFragmentManager, "taskFragment")
-        }
-    }
-
 //    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
 //        if (keyCode == KeyEvent.KEYCODE_BACK) {
 //            return true;

baselib/src/main/java/com/yingyangfly/baselib/router/RouterUrlCommon.kt

@@ -10,121 +10,11 @@ object RouterUrlCommon {
      */
     const val login = "/login/login"
 
-    /**
-     * setting设置页面
-     */
-    const val setting = "/setting/my_setting"
-
-    /**
-     * 原生webview，支持与H5交互
-     */
-    const val load_web_view = "/net_view/webViewInteractionJs"
-
-    /**
-     * Home组件WebView路径， 该WebView适合JS交互的H5页面，
-     */
-    const val WEB_VIEW_INTERACTION_JS = "/web/webViewInteractionJs"
-
-    /**
-     * 腾讯x5 webview
-     */
-    const val WEB_VIEW_TENCENT_WEBVIEW = "/tencent/webview"
-
-    /**
-     * 个人中心
-     */
-    const val personalCenter = "/personalCenter/personalCenter"
-
-    /**
-     * 训练数据
-     */
-    const val trainData = "/trainData/trainData"
-
-    /**
-     * 直播列表
-     */
-    const val liveBroadcastList = "/liveBroadcast/liveBroadcastList"
-
-    /**
-     * 直播详情
-     */
-    const val liveDetails = "/live/details"
-
-    /**
-     * 直播列表
-     */
-    const val liveBroadcast = "/liveBroadcast/liveBroadcast"
-
-    /**
-     * 服务套餐
-     */
-    const val servicePackage = "/service/package"
-
-    /**
-     * 设备租赁及服务
-     */
-    const val equipmentServices = "/equipment/services"
-
-    /**
-     * 康复课堂
-     */
-    const val leisureBrain = "/leisure/brain"
-
-    /**
-     * 视频回放页面
-     */
-    const val videoPlayer = "/video/player"
-
-    /**
-     * 消息列表
-     */
-    const val messageList = "/message/list"
-
-    /**
-     * 畅玩蓝豚
-     */
-    const val freeTrain = "/free/train"
-
-    /**
-     * 训练内容详情
-     */
-    const val trainContentDetails = "/trainContent/details"
-
-    /**
-     * 订单记录
-     */
-    const val orderList = "/OrderList/OrderList"
-
     /**
      * 新版首页
      */
     const val home = "/home/home"
 
-    /**
-     * 帮助中心
-     */
-    const val help = "/help/center"
-
-    /**
-     * 用户协议页面
-     */
-    const val agreement = "/agreement/agreement"
-
-    /**
-     * 租赁协议
-     */
-    const val leaseAgreement = "/lease/agreement"
-
-    /**
-     * 隐私协议
-     */
-    const val privacyAgreement = "/privacy/agreement"
-
-    /**
-     * 用户服务协议
-     */
-    const val userAgreement = "/user/agreement"
-
     /**
      * 版本记录
      */
@@ -150,56 +40,12 @@ object RouterUrlCommon {
      */
     const val evaluationResult = "/evaluation/result"
 
-    /**
-     * 健康咨询
-     */
-    const val healthConsultation = "/health/consultation"
-
-    /**
-     * 医生详情
-     */
-    const val doctorDetails = "/doctor/details"
-
-    /**
-     * 问诊申请
-     */
-    const val consultationRequest = "/consultation/request"
-
-    /**
-     * 问诊单
-     */
-    const val consultationSheet = "/consultation/sheet"
-
-    /**
-     * 问诊记录
-     */
-    const val consultationRecord = "/consultation/record"
-
-    /**
-     * 评价记录
-     */
-    const val evaluate = "/evaluate/evaluate"
-
-    /**
-     * 订单支付
-     */
-    const val payment = "/payment/payment"
-
-    /**
-     * 订单详情
-     */
-    const val paid = "/paid/paid"
 
     /**
      * 测评历史
      */
     const val evaluationHistory = "/evaluation/history"
 
-    /**
-     * 医生搜索
-     */
-    const val searchDoctor = "/search/doctor"
-
     /**
      * 查看大图
      */
@@ -219,19 +65,4 @@ object RouterUrlCommon {
      * 测评报告
      */
     const val reviewResultDetail = "/reviewresultdetail/reviewresultdetail"
-
-    /**
-     * 游戏介绍
-     */
-    const val gameIntroduction = "/game/introduction"
-
-    /**
-     * 玩游戏页面
-     */
-    const val playGame = "/play/game"
-
-    /**
-     * 游戏结算
-     */
-    const val gameSettlement = "/game/settlement"
 }