diff --git a/app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt b/app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt index b8b10b9..90788a9 100644 --- a/app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt +++ b/app/src/main/java/com/yingmao/clash/fragment/home/HomeFragment.kt @@ -446,23 +446,23 @@ open class HomeFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispa withContext(Dispatchers.Main){ hideLoading() stateChanged(CLASH_STOP, false) + ivAccelerate.setImageResource(R.mipmap.yjl_home_clink_bg) RxToast.info(resources.getString(R.string.vpnStartingError)) AppLog.i("NewAccFragment", "vpnRequest::VPN权限点击取消") } } } else { + withContext(Dispatchers.Main) { + tvClick.text=resources.getString(R.string.Accelerating) + ivAccelerate.setImageResource(R.mipmap.yjl_home_clink_select_bg) + hideLoading() + } accelerateViewModel.appStartupStatus() } } catch (e: Exception) { stopUTimer() e.printStackTrace() } - withContext(Dispatchers.Main) { - tvClick.text=resources.getString(R.string.Accelerating) - ivAccelerate.setImageResource(R.mipmap.yjl_home_clink_select_bg) - hideLoading() -// checkGlo() - } } } diff --git a/app/src/main/java/com/yingmao/clash/fragment/setting/SettingFragment.kt b/app/src/main/java/com/yingmao/clash/fragment/setting/SettingFragment.kt index 509cfc2..a8927fe 100644 --- a/app/src/main/java/com/yingmao/clash/fragment/setting/SettingFragment.kt +++ b/app/src/main/java/com/yingmao/clash/fragment/setting/SettingFragment.kt @@ -226,7 +226,7 @@ class SettingFragment : BaseFragment(), CoroutineScope by CoroutineScope(Dispatc settingPageList.add(singItem) settingPageList.add(serviceTermsItem) settingPageList.add(sourceSwitchItem) - settingPageList.add(upLoadData) +// settingPageList.add(upLoadData) settingPageList.add(privacyPolicyItem) settingPageList.add(initializationItem) settingPageList.add(customItem) diff --git a/build.gradle.kts b/build.gradle.kts index 18035cb..66f7c76 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -93,7 +93,7 @@ subprojects { } productFlavors { flavorDimensions("feature") - create("0000") { + create("0168") { isDefault = true dimension = flavorDimensionList[0] buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")") @@ -101,7 +101,7 @@ subprojects { buildConfigField("boolean", "is_back_cn", "false") buildConfigField("String", "applicationId", "\"com.jsq.wufu\"") buildConfigField("String", "service_url", "\"https://api.yijianlianjsq.com/\"") - buildConfigField("String", "productId", "\"0000\"") + buildConfigField("String", "productId", "\"0168\"") manifestPlaceholders( mapOf( "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 { - getByName("2211") { + getByName("0168") { java.srcDirs("src/foss/java") } }