Przeglądaj źródła

1.添加测评module

王鹏鹏 2 lat temu
rodzic
commit
895d4a4139

+ 2 - 8
app/src/main/java/com/yingyangfly/largescreen/activity/MainActivity.kt

@@ -5,20 +5,14 @@ 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()
-            }
+            ARouter.getInstance().build(RouterUrlCommon.hospitalEvaluation)
+                .navigation()
             finish()
         }
         super.onCreate(savedInstanceState)

+ 1 - 1
baselib/src/main/java/com/yingyangfly/baselib/net/BaseObserver.kt

@@ -45,7 +45,7 @@ abstract class BaseObserver<T> : Observer<XBaseEntity<T>> {
             User.saveName("")
             User.saveUserId("")
             User.saveOrgCode("")
-            JumpUtil.jumpActivity(RouterUrlCommon.login)
+            JumpUtil.jumpActivity(RouterUrlCommon.hospitalEvaluation)
         } else {
             loge("onNext--Failure--code:" + tBaseEntity.code + "--Message:" + tBaseEntity.message)
             onFail(tBaseEntity.message)

+ 1 - 1
baselib/src/main/java/com/yingyangfly/baselib/net/BaseResp.kt

@@ -37,7 +37,7 @@ open class BaseResp<T>(
                 User.saveName("")
                 User.saveUserId("")
                 User.saveOrgCode("")
-                JumpUtil.jumpActivity(RouterUrlCommon.login)
+                JumpUtil.jumpActivity(RouterUrlCommon.hospitalEvaluation)
             }
             else -> {
                 n {

+ 0 - 20
baselib/src/main/java/com/yingyangfly/baselib/router/RouterUrlCommon.kt

@@ -5,21 +5,6 @@ package com.yingyangfly.baselib.router
  */
 object RouterUrlCommon {
 
-    /**
-     * 登录
-     */
-    const val login = "/login/login"
-
-    /**
-     * 新版首页
-     */
-    const val home = "/home/home"
-
-    /**
-     * 版本记录
-     */
-    const val versionRecord = "/version/record"
-
     /**
      * 专业测评
      */
@@ -51,11 +36,6 @@ object RouterUrlCommon {
      */
     const val imagePager = "/image/pagery"
 
-    /**
-     * 大屏专业测评
-     */
-    const val bindingEvaluation = "/binding/evaluation"
-
     /**
      * 医院电视端
      */

+ 2 - 2
baselib/src/main/java/com/yingyangfly/baselib/utils/JumpUtil.kt

@@ -16,7 +16,7 @@ object JumpUtil {
     }
 
     fun jumpActivity(path: String, content: Context) {
-        if (TextUtils.equals(RouterUrlCommon.home, path)) {
+        if (TextUtils.equals(RouterUrlCommon.hospitalEvaluation, path)) {
             ARouter.getInstance().build(path)
                 .withTransition(R.anim.rightin, R.anim.rightout)
                 .navigation(content)
@@ -34,7 +34,7 @@ object JumpUtil {
     }
 
     fun jumpActivityWithUrl(path: String, url: String, content: Context) {
-        if (TextUtils.equals(RouterUrlCommon.home, path)) {
+        if (TextUtils.equals(RouterUrlCommon.hospitalEvaluation, path)) {
             ARouter.getInstance().build(path)
                 .withString("url", url)
                 .withTransition(R.anim.rightin, R.anim.rightout)