From 601f14db94013373df700e007095f7f2f5ecbe24 Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期五, 10 一月 2025 10:07:25 +0800
Subject: [PATCH] 反馈修改
---
app/src/main/java/com/sinata/xqmuse/ui/SplashActivity.kt | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/com/sinata/xqmuse/ui/SplashActivity.kt b/app/src/main/java/com/sinata/xqmuse/ui/SplashActivity.kt
index 2315c36..0a7a0fa 100644
--- a/app/src/main/java/com/sinata/xqmuse/ui/SplashActivity.kt
+++ b/app/src/main/java/com/sinata/xqmuse/ui/SplashActivity.kt
@@ -12,6 +12,8 @@
import androidx.core.os.bundleOf
import cn.sinata.xldutils.activity.BaseActivity
import cn.sinata.xldutils.utils.SPUtils
+import com.amap.api.location.AMapLocationClient
+import com.amap.apis.utils.core.api.AMapUtilCoreApi
import com.sinata.xqmuse.MainActivity
import com.sinata.xqmuse.R
import com.sinata.xqmuse.JkApplication
@@ -21,6 +23,7 @@
import com.sinata.xqmuse.network.request
import com.sinata.xqmuse.ui.guide.GuideActivity
import com.sinata.xqmuse.utils.Const
+import com.umeng.commonsdk.UMConfigure
import kotlinx.android.synthetic.main.activity_splash.*
import org.jetbrains.anko.startActivity
import java.io.ByteArrayInputStream
@@ -45,17 +48,20 @@
)
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_splash)
-// getImg()
+ getImg()
val data = intent.data
if (data!=null){
val url = data.toString()
Log.e("mmp","路径:${url}")
- if (url.startsWith("jkfitness://jkcyl.cn?code=")){
- code = url.substring(url.indexOf("=")+1)
- Log.e("mmp","解析参数:code=${code}")
- }
+// if (url.startsWith("xqmuse://xqmuse.cn?mid=")){ //何健豪：不做跳转详情
+// code = url.substring(url.indexOf("=")+1)
+// Log.e("mmp","解析参数:音频id=${code}")
+// }
}
+ AMapUtilCoreApi.setCollectInfoEnable(false)
if (SPUtils.instance().getBoolean(Const.User.IS_AGREE)){
+ AMapLocationClient.updatePrivacyShow(this,true,true)
+ AMapLocationClient.updatePrivacyAgree(this,true)
startNext()
}else{
getAgreement()
@@ -83,9 +89,11 @@
userRuleDialog.arguments = bundleOf("privacy" to privacy, "user" to user)
userRuleDialog.setDismissCallback(object : UserRuleDialog.OnDismiss {
override fun onDismiss() {
- if (!SPUtils.instance().getBoolean(Const.User.IS_AGREE, false))
+ if (!SPUtils.instance().getBoolean(Const.User.IS_AGREE, false)){
finish()
- else
+ AMapLocationClient.updatePrivacyShow(this@SplashActivity,true,true)
+ AMapLocationClient.updatePrivacyAgree(this@SplashActivity,true)
+ } else
startNext()
}
})
@@ -95,7 +103,6 @@
private fun getImg() {
val map = hashMapOf<String, Any>()
- map["type"] = 1
HttpManager.queryString(Apis.querySystemImg,map).request(this){ _, data->
iv_img.setImageURI(data?:"")
}
@@ -142,15 +149,16 @@
return mm.replaceAll("")
}
-
/***
* 判断是否第一次启动
*/
private fun startNext(){
+ UMConfigure.preInit(this, Const.UMENG_KEY, "")
(application as JkApplication).initSdk()
if (SPUtils.instance().getBoolean(Const.FIRST_LAUNCH,true)){ //第一次启动显示引导页
SPUtils.instance().put(Const.FIRST_LAUNCH,false).apply()
- startActivity<GuideActivity>()
+ startActivity<MainActivity>("code" to code,"isFirst" to true)
+ finish()
}else{
gotoMainOrLogin()
}
--
Gitblit v1.7.1