From 0cf65ab86a77b3bed611ddc767103a7c9869d6a3 Mon Sep 17 00:00:00 2001
From: cyh <cyh>
Date: Fri, 30 May 2025 11:02:48 +0800
Subject: [PATCH] =?UTF-8?q?fix=20ym=E7=BD=91=E9=A1=B5=E6=B3=A8=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/yingmao/clash/act/LoginActivity.kt  | 8 ++++++++
 app/src/main/java/com/yingmao/clash/act/SplashActivity.kt | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/yingmao/clash/act/LoginActivity.kt b/app/src/main/java/com/yingmao/clash/act/LoginActivity.kt
index 4cd10c9..a10c219 100644
--- a/app/src/main/java/com/yingmao/clash/act/LoginActivity.kt
+++ b/app/src/main/java/com/yingmao/clash/act/LoginActivity.kt
@@ -502,7 +502,15 @@ class LoginActivity : BaseActivity(), View.OnClickListener {
                 }
 
                 R.id.tv_register -> {
+                    var isWebRegister=false
+                    //ym暂时用网页注册
+                    if (BuildConfig.is_ym){
+                        isWebRegister=true
+                    }
                     if (!BuildConfig.is_free && BuildConfig.productId.isNotEmpty()) {
+                        isWebRegister=true
+                    }
+                    if (!isWebRegister) {
                         val intent = Intent(applicationContext, SplashActivity::class.java)
                         startActivity(intent)
                     } else {
diff --git a/app/src/main/java/com/yingmao/clash/act/SplashActivity.kt b/app/src/main/java/com/yingmao/clash/act/SplashActivity.kt
index 0ffbef3..1e6ed9f 100644
--- a/app/src/main/java/com/yingmao/clash/act/SplashActivity.kt
+++ b/app/src/main/java/com/yingmao/clash/act/SplashActivity.kt
@@ -283,7 +283,7 @@ class SplashActivity : BaseActivity() {
     }
 
     private var webView: WebView? = null
-    private lateinit var pb_web: ProgressBar
+    private  var pb_web: ProgressBar?=null
     var dialogAgreementPrivacyChoose: DialogAgreementPrivacyChoose? = null
     private fun initAgreementPrivacy() {
         if (BuildConfig.is_tz && BuildConfig.productId == "182269") {
@@ -407,7 +407,7 @@ class SplashActivity : BaseActivity() {
 
             launch {
                 webView?.setOnTouchListener { _, _ -> true }
-                pb_web.visibility = View.VISIBLE
+                pb_web?.visibility = View.VISIBLE
             }
             doRegisterByEncryption()
             return true
@@ -756,7 +756,7 @@ class SplashActivity : BaseActivity() {
                         finish()
 //                        graphicVerificationDialog()
                     } else if (code == "403") {
-                        pb_web.visibility = View.INVISIBLE
+                        pb_web?.visibility = View.INVISIBLE
                         message?.let {
                             RxToast.error(it)
                         }
@@ -901,7 +901,7 @@ class SplashActivity : BaseActivity() {
         when (httpStatus.reqType) {
             HttpReqType.REGISTER -> {
                 rlPb.visibility = View.GONE
-                pb_web.visibility = View.INVISIBLE
+                pb_web?.visibility = View.INVISIBLE
                 com.cncat.vpn.common.log.Log.d("httpFailure  HttpReqType.REGISTER")
                 try {
                     RxToast.error("检测到网络异常,请尝试切换其他地址.")