androidcode
/
yijianlianUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix ym网页注册

This commit is contained in:
cyh 2025-05-30 11:02:48 +08:00
parent fe601e0364
commit 0cf65ab86a
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/yingmao/clash/act/LoginActivity.kt
View File

@ -502,7 +502,15 @@ class LoginActivity : BaseActivity(), View.OnClickListener {
} }
R.id.tv_register -> { R.id.tv_register -> {
var isWebRegister=false
//ym暂时用网页注册
if (BuildConfig.is_ym){
isWebRegister=true
}
if (!BuildConfig.is_free && BuildConfig.productId.isNotEmpty()) { if (!BuildConfig.is_free && BuildConfig.productId.isNotEmpty()) {
isWebRegister=true
}
if (!isWebRegister) {
val intent = Intent(applicationContext, SplashActivity::class.java) val intent = Intent(applicationContext, SplashActivity::class.java)
startActivity(intent) startActivity(intent)
} else { } else {

8
app/src/main/java/com/yingmao/clash/act/SplashActivity.kt
View File

@ -283,7 +283,7 @@ class SplashActivity : BaseActivity() {
} }
private var webView: WebView? = null private var webView: WebView? = null
private lateinit var pb_web: ProgressBar private var pb_web: ProgressBar?=null
var dialogAgreementPrivacyChoose: DialogAgreementPrivacyChoose? = null var dialogAgreementPrivacyChoose: DialogAgreementPrivacyChoose? = null
private fun initAgreementPrivacy() { private fun initAgreementPrivacy() {
if (BuildConfig.is_tz && BuildConfig.productId == "182269") { if (BuildConfig.is_tz && BuildConfig.productId == "182269") {
@ -407,7 +407,7 @@ class SplashActivity : BaseActivity() {
launch { launch {
webView?.setOnTouchListener { _, _ -> true } webView?.setOnTouchListener { _, _ -> true }
pb_web.visibility = View.VISIBLE pb_web?.visibility = View.VISIBLE
} }
doRegisterByEncryption() doRegisterByEncryption()
return true return true
@ -756,7 +756,7 @@ class SplashActivity : BaseActivity() {
finish() finish()
// graphicVerificationDialog() // graphicVerificationDialog()
} else if (code == "403") { } else if (code == "403") {
pb_web.visibility = View.INVISIBLE pb_web?.visibility = View.INVISIBLE
message?.let { message?.let {
RxToast.error(it) RxToast.error(it)
} }
@ -901,7 +901,7 @@ class SplashActivity : BaseActivity() {
when (httpStatus.reqType) { when (httpStatus.reqType) {
HttpReqType.REGISTER -> { HttpReqType.REGISTER -> {
rlPb.visibility = View.GONE rlPb.visibility = View.GONE
pb_web.visibility = View.INVISIBLE pb_web?.visibility = View.INVISIBLE
com.cncat.vpn.common.log.Log.d("httpFailure HttpReqType.REGISTER") com.cncat.vpn.common.log.Log.d("httpFailure HttpReqType.REGISTER")
try { try {
RxToast.error("检测到网络异常,请尝试切换其他地址.") RxToast.error("检测到网络异常,请尝试切换其他地址.")