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

1.需求更改

This commit is contained in:
level 2025-05-29 10:17:00 +08:00
parent 0ec07185d4
commit 462cdfb2d9
5 changed files with 12 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/yingmao/clash/act/NewMainActivity.kt
View File

@ -157,7 +157,7 @@ class NewMainActivity : BaseActivity() {
fun isApiHost(host: String): Boolean { fun isApiHost(host: String): Boolean {
val mmkv = MMKV.defaultMMKV() val mmkv = MMKV.defaultMMKV()
var isApiHost = false; var isApiHost = false
val originalUrl = val originalUrl =
mmkv.decodeString(BZYConstants.MMKV_KEY_CURRENT_HOST, BuildConfig.service_url) mmkv.decodeString(BZYConstants.MMKV_KEY_CURRENT_HOST, BuildConfig.service_url)
val routerHost = mmkv.decodeStringSet(BZYConstants.MMKV_KEY_ROUTER_HOST, HashSet()) val routerHost = mmkv.decodeStringSet(BZYConstants.MMKV_KEY_ROUTER_HOST, HashSet())
@ -239,7 +239,7 @@ class NewMainActivity : BaseActivity() {
mainAtyVM = ViewModelProvider(this).get(MainAtyVM::class.java) mainAtyVM = ViewModelProvider(this).get(MainAtyVM::class.java)
observe(this, mainAtyVM) observe(this, mainAtyVM)
mainAtyVM.getRuningNoticeInfo() // mainAtyVM.getRuningNoticeInfo()
mainAtyVM.startHeartBeat() mainAtyVM.startHeartBeat()
initViews() initViews()
MMKV.defaultMMKV().encode(BZYConstants.MMKV_KEY_GLOBAL_MODEL, false) MMKV.defaultMMKV().encode(BZYConstants.MMKV_KEY_GLOBAL_MODEL, false)
@ -294,7 +294,7 @@ class NewMainActivity : BaseActivity() {
} }
} }
} else { } else {
mainAtyVM.getNoticeInfo() // mainAtyVM.getNoticeInfo()
activityPopupWindow() activityPopupWindow()
} }
} }
@ -605,6 +605,7 @@ class NewMainActivity : BaseActivity() {
val countryFlag = it.data?.countryFlag val countryFlag = it.data?.countryFlag
if(countryFlag == true){ if(countryFlag == true){
clLocation.visibility=View.VISIBLE clLocation.visibility=View.VISIBLE
clFire.visibility=View.VISIBLE
} }
} }
} }

1
app/src/main/java/com/yingmao/clash/act/RegisterActivity.kt
View File

@ -188,7 +188,6 @@ class RegisterActivity : BaseActivity(), View.OnClickListener {
reqJson.addProperty("from", "5") reqJson.addProperty("from", "5")
reqJson.addProperty("androidDevice", Utils.getUniqueID(this)) reqJson.addProperty("androidDevice", Utils.getUniqueID(this))
reqJson.addProperty("smsCode", smsCode) reqJson.addProperty("smsCode", smsCode)
android.util.Log.i("VVVVVVVVVVVVV","registerKey::"+registerKey+"registerIV2::"+registerIV2)
if (registerKey.isNotEmpty() && registerIV2.isNotEmpty()) { if (registerKey.isNotEmpty() && registerIV2.isNotEmpty()) {
val data = AESUtil.byteArrayToHexStr( val data = AESUtil.byteArrayToHexStr(
AESUtil.RegisterEncrypt(reqJson.toString(), registerKey, registerIV2) AESUtil.RegisterEncrypt(reqJson.toString(), registerKey, registerIV2)

8
app/src/main/java/com/yingmao/clash/net/http/NetService.kt
View File

@ -93,10 +93,10 @@ class NetService private constructor() : INetService {
// .sslSocketFactory(getSSLSocketFactory(), CustomTrustManager())//信任所有证书 // .sslSocketFactory(getSSLSocketFactory(), CustomTrustManager())//信任所有证书
.sslSocketFactory(getSSLSocketFactory(), trustAllCerts[0] as X509TrustManager) .sslSocketFactory(getSSLSocketFactory(), trustAllCerts[0] as X509TrustManager)
.hostnameVerifier(getHostnameVerifier()!!) .hostnameVerifier(getHostnameVerifier()!!)
// if (BuildConfig.DEBUG) { if (BuildConfig.DEBUG) {
// builder.addInterceptor(loggingInterceptor) builder.addInterceptor(loggingInterceptor)
// } }
builder.addInterceptor(loggingInterceptor) // builder.addInterceptor(loggingInterceptor)
return builder.build() return builder.build()
} }

1
app/src/main/res/layout/new_main_activity.xml
View File

@ -374,6 +374,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/clSing"> app:layout_constraintTop_toBottomOf="@+id/clSing">

44
build.gradle.kts
View File

@ -100,7 +100,7 @@ subprojects {
} }
productFlavors { productFlavors {
flavorDimensions("feature") flavorDimensions("feature")
create("9972") { create("12395") {
isDefault = true isDefault = true
dimension = flavorDimensionList[0] dimension = flavorDimensionList[0]
buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")") buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")
@ -111,45 +111,7 @@ subprojects {
buildConfigField("String", "applicationId", "\"com.jsq.mashanglian\"") buildConfigField("String", "applicationId", "\"com.jsq.mashanglian\"")
buildConfigField("String", "service_url", "\"https://api.wfvpnpro.com/\"") buildConfigField("String", "service_url", "\"https://api.wfvpnpro.com/\"")
buildConfigField("boolean", "is_free", "false") buildConfigField("boolean", "is_free", "false")
buildConfigField("String", "productId", "\"9972\"") buildConfigField("String", "productId", "\"12395\"")
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\"")
manifestPlaceholders( manifestPlaceholders(
mapOf( mapOf(
"APP_NAME" to "@string/ConnectImmediately", "APP_NAME" to "@string/ConnectImmediately",
@ -159,7 +121,7 @@ subprojects {
} }
} }
sourceSets { sourceSets {
getByName("9972") { getByName("12395") {
java.srcDirs("src/foss/java") java.srcDirs("src/foss/java")
} }
} }