diff --git a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt index 5ce20cb..fdd7848 100644 --- a/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt @@ -157,7 +157,7 @@ class NewMainActivity : BaseActivity() { fun isApiHost(host: String): Boolean { val mmkv = MMKV.defaultMMKV() - var isApiHost = false; + var isApiHost = false val originalUrl = mmkv.decodeString(BZYConstants.MMKV_KEY_CURRENT_HOST, BuildConfig.service_url) val routerHost = mmkv.decodeStringSet(BZYConstants.MMKV_KEY_ROUTER_HOST, HashSet()) @@ -239,7 +239,7 @@ class NewMainActivity : BaseActivity() { mainAtyVM = ViewModelProvider(this).get(MainAtyVM::class.java) observe(this, mainAtyVM) - mainAtyVM.getRuningNoticeInfo() +// mainAtyVM.getRuningNoticeInfo() mainAtyVM.startHeartBeat() initViews() MMKV.defaultMMKV().encode(BZYConstants.MMKV_KEY_GLOBAL_MODEL, false) @@ -294,7 +294,7 @@ class NewMainActivity : BaseActivity() { } } } else { - mainAtyVM.getNoticeInfo() +// mainAtyVM.getNoticeInfo() activityPopupWindow() } } @@ -605,6 +605,7 @@ class NewMainActivity : BaseActivity() { val countryFlag = it.data?.countryFlag if(countryFlag == true){ clLocation.visibility=View.VISIBLE + clFire.visibility=View.VISIBLE } } } diff --git a/app/src/main/java/com/yingmao/clash/act/RegisterActivity.kt b/app/src/main/java/com/yingmao/clash/act/RegisterActivity.kt index 9855611..f9b0e86 100644 --- a/app/src/main/java/com/yingmao/clash/act/RegisterActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/RegisterActivity.kt @@ -188,7 +188,6 @@ class RegisterActivity : BaseActivity(), View.OnClickListener { reqJson.addProperty("from", "5") reqJson.addProperty("androidDevice", Utils.getUniqueID(this)) reqJson.addProperty("smsCode", smsCode) - android.util.Log.i("VVVVVVVVVVVVV","registerKey::"+registerKey+"registerIV2::"+registerIV2) if (registerKey.isNotEmpty() && registerIV2.isNotEmpty()) { val data = AESUtil.byteArrayToHexStr( AESUtil.RegisterEncrypt(reqJson.toString(), registerKey, registerIV2) diff --git a/app/src/main/java/com/yingmao/clash/net/http/NetService.kt b/app/src/main/java/com/yingmao/clash/net/http/NetService.kt index 2940309..e05d3fa 100644 --- a/app/src/main/java/com/yingmao/clash/net/http/NetService.kt +++ b/app/src/main/java/com/yingmao/clash/net/http/NetService.kt @@ -93,10 +93,10 @@ class NetService private constructor() : INetService { // .sslSocketFactory(getSSLSocketFactory(), CustomTrustManager())//信任所有证书 .sslSocketFactory(getSSLSocketFactory(), trustAllCerts[0] as X509TrustManager) .hostnameVerifier(getHostnameVerifier()!!) -// if (BuildConfig.DEBUG) { -// builder.addInterceptor(loggingInterceptor) -// } - builder.addInterceptor(loggingInterceptor) + if (BuildConfig.DEBUG) { + builder.addInterceptor(loggingInterceptor) + } +// builder.addInterceptor(loggingInterceptor) return builder.build() } diff --git a/app/src/main/res/layout/new_main_activity.xml b/app/src/main/res/layout/new_main_activity.xml index d562d20..0698e09 100644 --- a/app/src/main/res/layout/new_main_activity.xml +++ b/app/src/main/res/layout/new_main_activity.xml @@ -374,6 +374,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="10dp" + android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/clSing"> diff --git a/build.gradle.kts b/build.gradle.kts index a41ca77..55e6499 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -100,7 +100,7 @@ subprojects { } productFlavors { flavorDimensions("feature") - create("9972") { + create("12395") { isDefault = true dimension = flavorDimensionList[0] buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")") @@ -111,45 +111,7 @@ subprojects { buildConfigField("String", "applicationId", "\"com.jsq.mashanglian\"") buildConfigField("String", "service_url", "\"https://api.wfvpnpro.com/\"") buildConfigField("boolean", "is_free", "false") - buildConfigField("String", "productId", "\"9972\"") - manifestPlaceholders( - mapOf( - "APP_NAME" to "@string/ConnectImmediately", - "APP_ICON" to "@mipmap/logo_connect_immediately" - ) - ) - } - create("2213") { - isDefault = true - dimension = flavorDimensionList[0] - buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")") - buildConfigField("boolean", "is_back_cn", "false") - buildConfigField("boolean", "is_ym", "true") - buildConfigField("boolean", "is_tz", "false") - buildConfigField("boolean", "is_yunti", "false") - buildConfigField("String", "applicationId", "\"com.jsq.mashanglian\"") - buildConfigField("String", "service_url", "\"https://api.wfvpnpro.com/\"") - buildConfigField("boolean", "is_free", "false") - buildConfigField("String", "productId", "\"2213\"") - manifestPlaceholders( - mapOf( - "APP_NAME" to "@string/ConnectImmediately", - "APP_ICON" to "@mipmap/logo_connect_immediately" - ) - ) - } - create("8088") { - isDefault = true - dimension = flavorDimensionList[0] - buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")") - buildConfigField("boolean", "is_back_cn", "false") - buildConfigField("boolean", "is_ym", "true") - buildConfigField("boolean", "is_tz", "false") - buildConfigField("boolean", "is_yunti", "false") - buildConfigField("String", "applicationId", "\"com.jsq.mashanglian\"") - buildConfigField("String", "service_url", "\"https://api.wfvpnpro.com/\"") - buildConfigField("boolean", "is_free", "false") - buildConfigField("String", "productId", "\"8088\"") + buildConfigField("String", "productId", "\"12395\"") manifestPlaceholders( mapOf( "APP_NAME" to "@string/ConnectImmediately", @@ -159,7 +121,7 @@ subprojects { } } sourceSets { - getByName("9972") { + getByName("12395") { java.srcDirs("src/foss/java") } }