Pq пре 3 година
родитељ
комит
4d3eb110e2

+ 13 - 12
student/src/main/java/com/cooleshow/student/ui/splash/SplashActivity.kt

@@ -8,27 +8,21 @@ import android.text.TextPaint
 import android.text.TextUtils
 import android.text.style.ClickableSpan
 import android.view.View
-import cn.jiguang.api.utils.JCollectionAuth
-import cn.jpush.android.api.JPushInterface
 import com.alibaba.android.arouter.launcher.ARouter
 import com.cooleshow.base.bean.RouteBean
-import com.cooleshow.base.common.BaseApplication
 import com.cooleshow.base.common.ConstantKey
 import com.cooleshow.base.common.WebConstants
 import com.cooleshow.base.router.RouterPath
 import com.cooleshow.base.ui.activity.BaseActivity
-import com.cooleshow.base.utils.GsonUtils
-import com.cooleshow.base.utils.JumpUtils
-import com.cooleshow.base.utils.SPUtils
-import com.cooleshow.base.utils.ToastUtil
+import com.cooleshow.base.utils.*
 import com.cooleshow.base.widgets.dialog.PrivacyTipDialog
 import com.cooleshow.student.databinding.ActivitySplashLayoutBinding
 import com.cooleshow.student.helper.InitHelper
 import com.cooleshow.usercenter.constants.UserConstants
 import com.cooleshow.usercenter.helper.UserHelper
 import com.cooleshow.usercenter.ui.activity.VerifyCodeLoginActivity
-import com.umeng.commonsdk.UMConfigure
 import io.rong.imkit.utils.StatusBarUtil
+import java.net.URLDecoder
 
 
 /**
@@ -139,11 +133,18 @@ class SplashActivity : BaseActivity<ActivitySplashLayoutBinding>() {
                 //接收h5跳转意图
                 val uri: Uri? = intent.data
                 if (uri != null && uri.isHierarchical) {
-                    val params: String = uri.getQueryParameter("url").toString()
+                    LogUtils.i("splash", "uri params:${uri.toString()}")
+                    var params: String = uri.getQueryParameter("url").toString()
                     if (!TextUtils.isEmpty(params)) {
-                        val routeBean = GsonUtils.fromJson(params, RouteBean::class.java)
-                        if (JumpUtils.jump(routeBean)) {
-                            return
+                        try {
+                            params= URLDecoder.decode(params, "UTF-8")
+                            LogUtils.i("splash", "h5 params:$params")
+                            val routeBean = GsonUtils.fromJson(params, RouteBean::class.java)
+                            if (JumpUtils.jump(routeBean)) {
+                                return
+                            }
+                        } catch (e: Exception) {
+                            e.printStackTrace()
                         }
                     }
                 }

+ 13 - 8
teacher/src/main/java/com/cooleshow/teacher/ui/splash/SplashActivity.kt

@@ -16,16 +16,14 @@ import com.cooleshow.base.common.ConstantKey
 import com.cooleshow.base.common.WebConstants
 import com.cooleshow.base.router.RouterPath
 import com.cooleshow.base.ui.activity.BaseActivity
-import com.cooleshow.base.utils.GsonUtils
-import com.cooleshow.base.utils.JumpUtils
-import com.cooleshow.base.utils.SPUtils
-import com.cooleshow.base.utils.ToastUtil
+import com.cooleshow.base.utils.*
 import com.cooleshow.base.widgets.dialog.PrivacyTipDialog
 import com.cooleshow.teacher.databinding.ActivitySplashLayoutBinding
 import com.cooleshow.usercenter.constants.UserConstants
 import com.cooleshow.usercenter.helper.UserHelper
 import com.cooleshow.usercenter.ui.activity.VerifyCodeLoginActivity
 import com.umeng.commonsdk.UMConfigure
+import java.net.URLDecoder
 
 
 /**
@@ -131,11 +129,18 @@ class SplashActivity : BaseActivity<ActivitySplashLayoutBinding>() {
                 //接收h5跳转意图
                 val uri: Uri? = intent.data
                 if (uri != null && uri.isHierarchical) {
-                    val params: String = uri.getQueryParameter("url").toString()
+                    LogUtils.i("splash", "uri params:${uri.toString()}")
+                    var params: String = uri.getQueryParameter("url").toString()
                     if (!TextUtils.isEmpty(params)) {
-                        val routeBean = GsonUtils.fromJson(params, RouteBean::class.java)
-                        if (JumpUtils.jump(routeBean)) {
-                            return
+                        try {
+                            params= URLDecoder.decode(params, "UTF-8")
+                            LogUtils.i("splash", "h5 params:$params")
+                            val routeBean = GsonUtils.fromJson(params, RouteBean::class.java)
+                            if (JumpUtils.jump(routeBean)) {
+                                return
+                            }
+                        } catch (e: Exception) {
+                            e.printStackTrace()
                         }
                     }
                 }