更改VPN未获取
This commit is contained in:
parent
71759463f6
commit
ed7ba90683
|
|
@ -446,23 +446,23 @@ open class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispa
|
||||||
withContext(Dispatchers.Main){
|
withContext(Dispatchers.Main){
|
||||||
hideLoading()
|
hideLoading()
|
||||||
stateChanged(CLASH_STOP, false)
|
stateChanged(CLASH_STOP, false)
|
||||||
|
ivAccelerate.setImageResource(R.mipmap.yjl_home_clink_bg)
|
||||||
RxToast.info(resources.getString(R.string.vpnStartingError))
|
RxToast.info(resources.getString(R.string.vpnStartingError))
|
||||||
AppLog.i("NewAccFragment", "vpnRequest::VPN权限点击取消")
|
AppLog.i("NewAccFragment", "vpnRequest::VPN权限点击取消")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
withContext(Dispatchers.Main) {
|
||||||
|
tvClick.text=resources.getString(R.string.Accelerating)
|
||||||
|
ivAccelerate.setImageResource(R.mipmap.yjl_home_clink_select_bg)
|
||||||
|
hideLoading()
|
||||||
|
}
|
||||||
accelerateViewModel.appStartupStatus()
|
accelerateViewModel.appStartupStatus()
|
||||||
}
|
}
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
stopUTimer()
|
stopUTimer()
|
||||||
e.printStackTrace()
|
e.printStackTrace()
|
||||||
}
|
}
|
||||||
withContext(Dispatchers.Main) {
|
|
||||||
tvClick.text=resources.getString(R.string.Accelerating)
|
|
||||||
ivAccelerate.setImageResource(R.mipmap.yjl_home_clink_select_bg)
|
|
||||||
hideLoading()
|
|
||||||
// checkGlo()
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -226,7 +226,7 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc
|
||||||
settingPageList.add(singItem)
|
settingPageList.add(singItem)
|
||||||
settingPageList.add(serviceTermsItem)
|
settingPageList.add(serviceTermsItem)
|
||||||
settingPageList.add(sourceSwitchItem)
|
settingPageList.add(sourceSwitchItem)
|
||||||
settingPageList.add(upLoadData)
|
// settingPageList.add(upLoadData)
|
||||||
settingPageList.add(privacyPolicyItem)
|
settingPageList.add(privacyPolicyItem)
|
||||||
settingPageList.add(initializationItem)
|
settingPageList.add(initializationItem)
|
||||||
settingPageList.add(customItem)
|
settingPageList.add(customItem)
|
||||||
|
|
|
||||||
225
build.gradle.kts
225
build.gradle.kts
|
|
@ -93,7 +93,7 @@ subprojects {
|
||||||
}
|
}
|
||||||
productFlavors {
|
productFlavors {
|
||||||
flavorDimensions("feature")
|
flavorDimensions("feature")
|
||||||
create("0000") {
|
create("0168") {
|
||||||
isDefault = true
|
isDefault = true
|
||||||
dimension = flavorDimensionList[0]
|
dimension = flavorDimensionList[0]
|
||||||
buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")
|
buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")
|
||||||
|
|
@ -101,7 +101,7 @@ subprojects {
|
||||||
buildConfigField("boolean", "is_back_cn", "false")
|
buildConfigField("boolean", "is_back_cn", "false")
|
||||||
buildConfigField("String", "applicationId", "\"com.jsq.wufu\"")
|
buildConfigField("String", "applicationId", "\"com.jsq.wufu\"")
|
||||||
buildConfigField("String", "service_url", "\"https://api.yijianlianjsq.com/\"")
|
buildConfigField("String", "service_url", "\"https://api.yijianlianjsq.com/\"")
|
||||||
buildConfigField("String", "productId", "\"0000\"")
|
buildConfigField("String", "productId", "\"0168\"")
|
||||||
manifestPlaceholders(
|
manifestPlaceholders(
|
||||||
mapOf(
|
mapOf(
|
||||||
"APP_NAME" to "@string/wf",
|
"APP_NAME" to "@string/wf",
|
||||||
|
|
@ -109,228 +109,9 @@ subprojects {
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
create("1111") {
|
|
||||||
isDefault = true
|
|
||||||
dimension = flavorDimensionList[0]
|
|
||||||
buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")
|
|
||||||
buildConfigField("boolean", "is_free", "false")
|
|
||||||
buildConfigField("boolean", "is_back_cn", "false")
|
|
||||||
buildConfigField("String", "applicationId", "\"com.jsq.wufu\"")
|
|
||||||
buildConfigField("String", "service_url", "\"https://api.yijianlianjsq.com/\"")
|
|
||||||
buildConfigField("String", "productId", "\"1111\"")
|
|
||||||
manifestPlaceholders(
|
|
||||||
mapOf(
|
|
||||||
"APP_NAME" to "@string/wf",
|
|
||||||
"APP_ICON" to "@mipmap/oneclickconnection"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
create("6666") {
|
|
||||||
isDefault = true
|
|
||||||
dimension = flavorDimensionList[0]
|
|
||||||
buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")
|
|
||||||
buildConfigField("boolean", "is_free", "false")
|
|
||||||
buildConfigField("boolean", "is_back_cn", "false")
|
|
||||||
buildConfigField("String", "applicationId", "\"com.jsq.wufu\"")
|
|
||||||
buildConfigField("String", "service_url", "\"https://api.yijianlianjsq.com/\"")
|
|
||||||
buildConfigField("String", "productId", "\"6666\"")
|
|
||||||
manifestPlaceholders(
|
|
||||||
mapOf(
|
|
||||||
"APP_NAME" to "@string/wf",
|
|
||||||
"APP_ICON" to "@mipmap/oneclickconnection"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
create("7077") {
|
|
||||||
isDefault = true
|
|
||||||
dimension = flavorDimensionList[0]
|
|
||||||
buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")
|
|
||||||
buildConfigField("boolean", "is_free", "false")
|
|
||||||
buildConfigField("boolean", "is_back_cn", "false")
|
|
||||||
buildConfigField("String", "applicationId", "\"com.jsq.wufu\"")
|
|
||||||
buildConfigField("String", "service_url", "\"https://api.yijianlianjsq.com/\"")
|
|
||||||
buildConfigField("String", "productId", "\"7077\"")
|
|
||||||
manifestPlaceholders(
|
|
||||||
mapOf(
|
|
||||||
"APP_NAME" to "@string/wf",
|
|
||||||
"APP_ICON" to "@mipmap/oneclickconnection"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
create("5555") {
|
|
||||||
isDefault = true
|
|
||||||
dimension = flavorDimensionList[0]
|
|
||||||
buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")
|
|
||||||
buildConfigField("boolean", "is_free", "false")
|
|
||||||
buildConfigField("boolean", "is_back_cn", "false")
|
|
||||||
buildConfigField("String", "applicationId", "\"com.jsq.wufu\"")
|
|
||||||
buildConfigField("String", "service_url", "\"https://api.yijianlianjsq.com/\"")
|
|
||||||
buildConfigField("String", "productId", "\"5555\"")
|
|
||||||
manifestPlaceholders(
|
|
||||||
mapOf(
|
|
||||||
"APP_NAME" to "@string/wf",
|
|
||||||
"APP_ICON" to "@mipmap/oneclickconnection"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
create("2222") {
|
|
||||||
isDefault = true
|
|
||||||
dimension = flavorDimensionList[0]
|
|
||||||
buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")
|
|
||||||
buildConfigField("boolean", "is_free", "false")
|
|
||||||
buildConfigField("boolean", "is_back_cn", "false")
|
|
||||||
buildConfigField("String", "applicationId", "\"com.jsq.wufu\"")
|
|
||||||
buildConfigField("String", "service_url", "\"https://api.yijianlianjsq.com/\"")
|
|
||||||
buildConfigField("String", "productId", "\"2222\"")
|
|
||||||
manifestPlaceholders(
|
|
||||||
mapOf(
|
|
||||||
"APP_NAME" to "@string/wf",
|
|
||||||
"APP_ICON" to "@mipmap/oneclickconnection"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
create("9999") {
|
|
||||||
isDefault = true
|
|
||||||
dimension = flavorDimensionList[0]
|
|
||||||
buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")
|
|
||||||
buildConfigField("boolean", "is_free", "false")
|
|
||||||
buildConfigField("boolean", "is_back_cn", "false")
|
|
||||||
buildConfigField("String", "applicationId", "\"com.jsq.wufu\"")
|
|
||||||
buildConfigField("String", "service_url", "\"https://api.yijianlianjsq.com/\"")
|
|
||||||
buildConfigField("String", "productId", "\"9999\"")
|
|
||||||
manifestPlaceholders(
|
|
||||||
mapOf(
|
|
||||||
"APP_NAME" to "@string/wf",
|
|
||||||
"APP_ICON" to "@mipmap/oneclickconnection"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
create("11111") {
|
|
||||||
isDefault = true
|
|
||||||
dimension = flavorDimensionList[0]
|
|
||||||
buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")
|
|
||||||
buildConfigField("boolean", "is_free", "false")
|
|
||||||
buildConfigField("boolean", "is_back_cn", "false")
|
|
||||||
buildConfigField("String", "applicationId", "\"com.jsq.wufu\"")
|
|
||||||
buildConfigField("String", "service_url", "\"https://api.yijianlianjsq.com/\"")
|
|
||||||
buildConfigField("String", "productId", "\"11111\"")
|
|
||||||
manifestPlaceholders(
|
|
||||||
mapOf(
|
|
||||||
"APP_NAME" to "@string/wf",
|
|
||||||
"APP_ICON" to "@mipmap/oneclickconnection"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
create("2211") {
|
|
||||||
isDefault = true
|
|
||||||
dimension = flavorDimensionList[0]
|
|
||||||
buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")
|
|
||||||
buildConfigField("boolean", "is_free", "false")
|
|
||||||
buildConfigField("boolean", "is_back_cn", "false")
|
|
||||||
buildConfigField("String", "applicationId", "\"com.jsq.wufu\"")
|
|
||||||
buildConfigField("String", "service_url", "\"https://api.yijianlianjsq.com/\"")
|
|
||||||
buildConfigField("String", "productId", "\"2211\"")
|
|
||||||
manifestPlaceholders(
|
|
||||||
mapOf(
|
|
||||||
"APP_NAME" to "@string/wf",
|
|
||||||
"APP_ICON" to "@mipmap/oneclickconnection"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
create("8088") {
|
|
||||||
isDefault = true
|
|
||||||
dimension = flavorDimensionList[0]
|
|
||||||
buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")
|
|
||||||
buildConfigField("boolean", "is_free", "false")
|
|
||||||
buildConfigField("boolean", "is_back_cn", "false")
|
|
||||||
buildConfigField("String", "applicationId", "\"com.jsq.wufu\"")
|
|
||||||
buildConfigField("String", "service_url", "\"https://api.yijianlianjsq.com/\"")
|
|
||||||
buildConfigField("String", "productId", "\"8088\"")
|
|
||||||
manifestPlaceholders(
|
|
||||||
mapOf(
|
|
||||||
"APP_NAME" to "@string/wf",
|
|
||||||
"APP_ICON" to "@mipmap/oneclickconnection"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
create("0214") {
|
|
||||||
isDefault = true
|
|
||||||
dimension = flavorDimensionList[0]
|
|
||||||
buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")
|
|
||||||
buildConfigField("boolean", "is_free", "false")
|
|
||||||
buildConfigField("boolean", "is_back_cn", "false")
|
|
||||||
buildConfigField("String", "applicationId", "\"com.jsq.wufu\"")
|
|
||||||
buildConfigField("String", "service_url", "\"https://api.yijianlianjsq.com/\"")
|
|
||||||
buildConfigField("String", "productId", "\"0214\"")
|
|
||||||
manifestPlaceholders(
|
|
||||||
mapOf(
|
|
||||||
"APP_NAME" to "@string/wf",
|
|
||||||
"APP_ICON" to "@mipmap/oneclickconnection"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
create("9099") {
|
|
||||||
isDefault = true
|
|
||||||
dimension = flavorDimensionList[0]
|
|
||||||
buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")
|
|
||||||
buildConfigField("boolean", "is_free", "false")
|
|
||||||
buildConfigField("boolean", "is_back_cn", "false")
|
|
||||||
buildConfigField("String", "applicationId", "\"com.jsq.wufu\"")
|
|
||||||
buildConfigField("String", "service_url", "\"https://api.yijianlianjsq.com/\"")
|
|
||||||
buildConfigField("String", "productId", "\"9099\"")
|
|
||||||
manifestPlaceholders(
|
|
||||||
mapOf(
|
|
||||||
"APP_NAME" to "@string/wf",
|
|
||||||
"APP_ICON" to "@mipmap/oneclickconnection"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
create("7777") {
|
|
||||||
isDefault = true
|
|
||||||
dimension = flavorDimensionList[0]
|
|
||||||
buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")
|
|
||||||
buildConfigField("boolean", "is_free", "false")
|
|
||||||
buildConfigField("boolean", "is_back_cn", "false")
|
|
||||||
buildConfigField("String", "applicationId", "\"com.jsq.wufu\"")
|
|
||||||
buildConfigField("String", "service_url", "\"https://api.yijianlianjsq.com/\"")
|
|
||||||
buildConfigField("String", "productId", "\"7777\"")
|
|
||||||
manifestPlaceholders(
|
|
||||||
mapOf(
|
|
||||||
"APP_NAME" to "@string/wf",
|
|
||||||
"APP_ICON" to "@mipmap/oneclickconnection"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
create("2210") {
|
|
||||||
isDefault = true
|
|
||||||
dimension = flavorDimensionList[0]
|
|
||||||
buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")
|
|
||||||
buildConfigField("boolean", "is_free", "false")
|
|
||||||
buildConfigField("boolean", "is_back_cn", "false")
|
|
||||||
buildConfigField("String", "applicationId", "\"com.jsq.wufu\"")
|
|
||||||
buildConfigField("String", "service_url", "\"https://api.yijianlianjsq.com/\"")
|
|
||||||
buildConfigField("String", "productId", "\"2210\"")
|
|
||||||
manifestPlaceholders(
|
|
||||||
mapOf(
|
|
||||||
"APP_NAME" to "@string/wf",
|
|
||||||
"APP_ICON" to "@mipmap/oneclickconnection"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
sourceSets {
|
sourceSets {
|
||||||
getByName("2211") {
|
getByName("0168") {
|
||||||
java.srcDirs("src/foss/java")
|
java.srcDirs("src/foss/java")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue