diff --git a/app/build.gradle b/app/build.gradle index b3d9698..296fb6f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 117 - versionName "1.1.7" + versionCode 118 + versionName "1.1.8" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", @@ -38,12 +38,12 @@ OPPO_APP_SECRET: "b04e226ffee048078e646b8a08482770", // VIVO 相关应用参数 - VIVO_APP_ID : "", - VIVO_APP_KEY : "", + VIVO_APP_ID : "105749048", + VIVO_APP_KEY : "e460fbf2c689e0f8c58ecc6aa62e1803", // 小米相关应用参数 - XIAOMI_APP_ID : "", - XIAOMI_APP_KEY : "", +// XIAOMI_APP_ID : "", +// XIAOMI_APP_KEY : "", ] // 版本名后面添加一句话,意思就是flavor dimension 它的维度就是该版本号,多渠道打包很重要 @@ -162,10 +162,9 @@ implementation 'com.getui.opt:honor:3.6.0' // 荣耀 implementation 'com.hihonor.mcs:push:7.0.61.303' implementation 'com.assist-v3:oppo:3.4.0' // oppo - implementation 'commons-codec:commons-codec:1.6' + implementation 'commons-codec:commons-codec:1.15' implementation 'com.android.support:support-annotations:28.0.0' -// implementation 'com.assist-v3:vivo:3.1.2' // vivo - + implementation 'com.assist-v3:vivo:3.1.2' // vivo // implementation 'com.getui.opt:xmp:3.3.1' // 小米 //数据库框架 diff --git a/app/build.gradle b/app/build.gradle index b3d9698..296fb6f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 33 - versionCode 117 - versionName "1.1.7" + versionCode 118 + versionName "1.1.8" manifestPlaceholders = [ GETUI_APPID : "HKv8K9qARd6WckZ1o2Vbu4", @@ -38,12 +38,12 @@ OPPO_APP_SECRET: "b04e226ffee048078e646b8a08482770", // VIVO 相关应用参数 - VIVO_APP_ID : "", - VIVO_APP_KEY : "", + VIVO_APP_ID : "105749048", + VIVO_APP_KEY : "e460fbf2c689e0f8c58ecc6aa62e1803", // 小米相关应用参数 - XIAOMI_APP_ID : "", - XIAOMI_APP_KEY : "", +// XIAOMI_APP_ID : "", +// XIAOMI_APP_KEY : "", ] // 版本名后面添加一句话,意思就是flavor dimension 它的维度就是该版本号,多渠道打包很重要 @@ -162,10 +162,9 @@ implementation 'com.getui.opt:honor:3.6.0' // 荣耀 implementation 'com.hihonor.mcs:push:7.0.61.303' implementation 'com.assist-v3:oppo:3.4.0' // oppo - implementation 'commons-codec:commons-codec:1.6' + implementation 'commons-codec:commons-codec:1.15' implementation 'com.android.support:support-annotations:28.0.0' -// implementation 'com.assist-v3:vivo:3.1.2' // vivo - + implementation 'com.assist-v3:vivo:3.1.2' // vivo // implementation 'com.getui.opt:xmp:3.3.1' // 小米 //数据库框架 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1107b54..c0af158 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,7 +10,6 @@ - - - if (isChecked) { - Log.d(kTag, "initEvent: 打开") + binding.noticeSwitch.setOnClickListener { + if (binding.noticeSwitch.isChecked) { + //关闭 + PushManager.getInstance().turnOffPush(requireContext()) } else { - Log.d(kTag, "initEvent: 关闭") + //打开 + PushManager.getInstance().openNotification(requireContext()) } } }