diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 78e4e64..8e4a3b9 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -276,3 +276,4 @@ -keep class com.google.zxing.** { *; } -keep class com.journeyapps.barcodescanner.** { *; } -keep class com.afollestad.materialdialogs.** { *; } +-keep class com.yingmao.clash.net.http.entity.** { *; } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 48c5520..aca1605 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -31,6 +31,7 @@ + = Build.VERSION_CODES.TIRAMISU) { + val requestPermissionLauncher = + registerForActivityResult( + RequestPermission() + ) { isGranted: Boolean -> + } + if (ContextCompat.checkSelfPermission( + this, + android.Manifest.permission.POST_NOTIFICATIONS + ) != PackageManager.PERMISSION_GRANTED) { + requestPermissionLauncher.launch(android.Manifest.permission.POST_NOTIFICATIONS) + } + } } /* 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 ca6fb03..51d17ce 100644 --- a/app/src/main/java/com/yingmao/clash/act/SplashActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/SplashActivity.kt @@ -78,6 +78,12 @@ class SplashActivity : BaseActivity() { setContentView(R.layout.layout_splash_activity) rlPb = findViewById(R.id.rl_pb) ll_action = findViewById(R.id.ll_action) + serStore.isYM = BuildConfig.is_ym + if (!BuildConfig.is_ym) { + serStore.isBZY = true + } + serStore.isTZ = BuildConfig.is_tz + // mPermissions.add(Manifest.permission.READ_PHONE_STATE) // mPermissions.add(Manifest.permission.INTERNET) // mPermissions.add(Manifest.permission.ACCESS_NETWORK_STATE) @@ -123,7 +129,6 @@ class SplashActivity : BaseActivity() { // com.cncat.vpn.common.log.Log.d("onOAIDGetComplete result==>${ DeviceIdentifier.getOAID(this)}") - var clashBinder = MainApplication.getApp()?.let { ClashManager(it).wrap() as IClashManager } diff --git a/app/src/main/libs/common.aar b/app/src/main/libs/common.aar index 89e0dfe..e794d8b 100644 Binary files a/app/src/main/libs/common.aar and b/app/src/main/libs/common.aar differ diff --git a/app/src/main/libs/core.aar b/app/src/main/libs/core.aar index 8a3a5b6..cba511d 100644 Binary files a/app/src/main/libs/core.aar and b/app/src/main/libs/core.aar differ diff --git a/app/src/main/libs/service.aar b/app/src/main/libs/service.aar index 2894d6a..02efbb8 100644 Binary files a/app/src/main/libs/service.aar and b/app/src/main/libs/service.aar differ