From f8b4cbad5cdbf0d536c02211d67369703d2ef5e6 Mon Sep 17 00:00:00 2001
From: wlh <646507849@qq.com>
Date: Thu, 16 May 2024 17:46:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA365-1.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                   |  5 +++++
 .../main/java/com/zj365/dc/activity/WelcomeAct.kt  |  1 -
 config.gradle                                      | 14 +++++++-------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5a50715..d498b0b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -84,6 +84,11 @@
 
     <uses-sdk tools:overrideLibrary="com.yucheng.ycbtsdk" />
 
+    <!-- ********OPPO 推送 start******** -->
+    <uses-permission android:name="com.coloros.mcs.permission.RECIEVE_MCS_MESSAGE" />
+    <uses-permission android:name="com.heytap.mcs.permission.RECIEVE_MCS_MESSAGE" />
+    <!--********OPPO 推送 end******** -->
+
     <application
         android:name="com.xty.common.app.MyApp"
         android:allowBackup="true"
diff --git a/app/src/main/java/com/zj365/dc/activity/WelcomeAct.kt b/app/src/main/java/com/zj365/dc/activity/WelcomeAct.kt
index d96eab5..242fd6f 100644
--- a/app/src/main/java/com/zj365/dc/activity/WelcomeAct.kt
+++ b/app/src/main/java/com/zj365/dc/activity/WelcomeAct.kt
@@ -28,7 +28,6 @@ import com.xty.common.bracelet.YCBBlueConnectHelper
 import com.xty.common.bracelet.checkBlueConnectPermission
 import com.xty.common.getImageUrl
 import com.xty.common.util.CommonUtils
-import com.xty.network.utils.AppUtils
 import com.zj365.dc.BuildConfig
 
 import com.zj365.dc.databinding.ActWelcomeBinding
diff --git a/config.gradle b/config.gradle
index f3d580d..02079a4 100644
--- a/config.gradle
+++ b/config.gradle
@@ -6,8 +6,8 @@ ext {
             appId            : "com.zj365.dc",
             minSdk           : 23,
             targetSdk        : 32,
-            versionCode      : 118,
-            versionName      : "1.2.0"
+            versionCode      : 119,
+            versionName      : "1.2.1"
     ]
 
 
@@ -25,14 +25,14 @@ ext {
     url = [
             releaseTime:    String.valueOf(new Date().format("ddHHmm")),
             //正式环境
-//            debug_url  : "https://app.zhongjian365.com/app/",
-//            release_url: "https://app.zhongjian365.com/app/",
+            debug_url  : "https://app.zhongjian365.com/app/",
+            release_url: "https://app.zhongjian365.com/app/",
 //
 //            h5_debug_url : "https://built.zhongjian365.com/",
 //            h5_release_url : "https://built.zhongjian365.com/"
             //测试环境
-            debug_url  : "http://java01.zhongjian365.com/app/",
-            release_url: "http://java01.zhongjian365.com/app/",
+//            debug_url  : "http://java01.zhongjian365.com/app/",
+//            release_url: "http://java01.zhongjian365.com/app/",
 
             h5_debug_url : "http://testbuilt.zhongjian365.com/",
             h5_release_url : "http://testbuilt.zhongjian365.com/"
@@ -143,7 +143,7 @@ ext {
             annoation                    : 'androidx.annotation:annotation:1.1.0',
 
             jpush_xiaomi                 : 'cn.jiguang.sdk.plugin:xiaomi:5.0.0',
-       //     jpush_oppo                   : 'cn.jiguang.sdk.plugin:oppo:5.0.0',
+            jpush_oppo                   : 'cn.jiguang.sdk.plugin:oppo:5.0.0',
       //      jpush_vivo                   : 'cn.jiguang.sdk.plugin:vivo:4.7.0',
 //            jpush_honor                  : 'cn.jiguang.sdk.plugin:honor:4.7.0',
             //角标