From 3408b10a3466f2db3f81e5c484142e3c180d36ac Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期五, 12 五月 2023 11:24:02 +0800
Subject: [PATCH] 定位权限说明弹窗
---
app/src/main/java/com/fuban/driver/ui/pub/StartActivity.kt | 74 ++++++++++++++++---------------------
1 files changed, 32 insertions(+), 42 deletions(-)
diff --git a/app/src/main/java/com/fuban/driver/ui/pub/StartActivity.kt b/app/src/main/java/com/fuban/driver/ui/pub/StartActivity.kt
index ca93c0d..aaa225e 100644
--- a/app/src/main/java/com/fuban/driver/ui/pub/StartActivity.kt
+++ b/app/src/main/java/com/fuban/driver/ui/pub/StartActivity.kt
@@ -7,8 +7,8 @@
import android.webkit.WebSettings
import android.webkit.WebView
import androidx.core.app.ActivityCompat
-import cn.sinata.xldutils.utils.clickDelay
-import cn.sinata.xldutils.utils.textColor
+import androidx.core.os.bundleOf
+import cn.sinata.xldutils.utils.SPUtils
import com.fuban.driver.R
import com.fuban.driver.base.*
import com.fuban.driver.bean.AgreeBean
@@ -16,11 +16,9 @@
import com.fuban.driver.netUtls.callNet
import com.fuban.driver.netUtls.getMapByAny
import com.fuban.driver.netUtls.getToken
-import com.fuban.driver.ui.DialogUtil
import com.fuban.driver.ui.main.MainActivity
import com.fuban.driver.utils.Cache.CacheKey
-import kotlinx.android.synthetic.main.item_ys.view.*
-import org.greenrobot.eventbus.EventBus
+import com.fuban.driver.utils.view.UserRuleDialog
import org.jetbrains.anko.startActivity
class StartActivity : MyBaseActivity() {
@@ -36,7 +34,7 @@
@SuppressLint("SourceLockedOrientationActivity")
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- showYsDialog()
+ checkPrivacy()
// setRxpermiss()
}
@@ -81,53 +79,45 @@
override fun setOnclick() {
}
-
- fun showYsDialog() {
+ private var privacy = "" //隐私协议
+ private var user = "" //用户协议
+ fun checkPrivacy() {
var isAgreen = CacheKey.getKeyStr("isAgreen")
if (isAgreen.isEmpty()) {
- var dialog = DialogUtil.getDialog(this, R.layout.item_ys)
- var view = DialogUtil.getView(dialog)
callys {
- setWebview(view.wv_content,it)
+ privacy = it
+ showPrivacyDialog()
}
- view.tv_none.setOnClickListener {
- dialog.dismiss()
- }
- view.tv_agreet.clickDelay {
- CacheKey.putKeyStr("isAgreen", "1")
- dialog.dismiss()
- callLast()
- }
- view.tv_yx.clickDelay {
- view.tv_yx.textColor(this, R.color.white)
- view.tv_yh.textColor(this, R.color.main_yellow_qia)
- view.tv_yx.setBackgroundResource(R.drawable.bg_login_top_left)
- view.tv_yh.setBackgroundResource(R.drawable.bg_logion_top_right)
- callys {
- setWebview(view.wv_content,it)
- }
- }
- view.tv_yh.clickDelay {
- view.tv_yx.textColor(this, R.color.main_yellow_qia)
- view.tv_yh.textColor(this, R.color.white)
- view.tv_yx.setBackgroundResource(R.drawable.bg_logion_top_left)
- view.tv_yh.setBackgroundResource(R.drawable.bg_login_top_left_select)
- callyh {
- setWebview(view.wv_content,it)
- }
- }
- dialog.setOnDismissListener {
- if (CacheKey.getKeyStr("isAgreen").isEmpty())
- finish()
+ callyh {
+ user = it
+ showPrivacyDialog()
}
}else
callLast()
}
+ private fun showPrivacyDialog(){
+ if (privacy.isNotEmpty() && user.isNotEmpty()) {
+ val userRuleDialog = UserRuleDialog()
+ userRuleDialog.arguments = bundleOf("privacy" to privacy, "user" to user)
+ userRuleDialog.setDismissCallback(object : UserRuleDialog.OnDismiss {
+ override fun onDismiss() {
+ if (CacheKey.getKeyStr("isAgreen").isNullOrEmpty())
+ finish()
+ else
+ callLast()
+ }
+ })
+ val ft = supportFragmentManager.beginTransaction()
+ ft.add(userRuleDialog, "rule")
+ ft.commitAllowingStateLoss()
+ }
+ }
+
fun callys(ok: (s: String) -> Unit) {
var map = getMapByAny()
map["type"] = 1
- callNet(Api.queryByType, map) {
+ callNet(false,Api.queryByType, map) {
var data = gson.fromJson<AgreeBean>(it, AgreeBean::class.java)
ok(data.data.content)
}
@@ -136,7 +126,7 @@
fun callyh(ok: (s: String) -> Unit) {
var map = getMapByAny()
map["type"] = 2
- callNet(Api.queryByType, map) {
+ callNet(false,Api.queryByType, map) {
var data = gson.fromJson<AgreeBean>(it, AgreeBean::class.java)
ok(data.data.content)
}
--
Gitblit v1.7.1