Merge branch 'release' of https://gitee.com/starlock-cn/app-starlock into release

android/app/build.gradle

@@ -227,6 +227,15 @@ dependencies {
     implementation 'com.huawei.agconnect:agconnect-core:1.8.1.300'
     implementation 'com.huawei.hms:push:6.12.0.300'
     implementation 'cn.jiguang.sdk.plugin:huawei:5.2.3'
-
+    // 接入小米厂商
     implementation 'cn.jiguang.sdk.plugin:xiaomi:5.2.3'
+    //接入OPPO厂商
+    implementation 'cn.jiguang.sdk.plugin:oppo:5.2.3'
+    //引入 libs 中的 aar，如果项目中有此依赖不需要重复引用
+    implementation fileTree(include: ['*.jar','*.aar'], dir: 'libs')
+    //OPPO 3.1.0 aar 及其以上版本需要添加以下依赖
+    implementation 'com.google.code.gson:gson:2.6.2'
+    implementation 'commons-codec:commons-codec:1.6'
+    implementation 'androidx.annotation:annotation:1.1.0'
+
 }

android/app/src/main/AndroidManifest.xml

@@ -60,8 +60,37 @@
     <meta-data
             android:name="com.huawei.hms.client.cpid"
             android:value="1406555529261648640"/>
+    <meta-data android:name="OPPO_APPKEY"
+	       android:value="OP-47f668c9943248118502aa58d066393b" />
+
+     <meta-data android:name="OPPO_APPID"
+            android:value="OP-31726001" />
+
+     <meta-data android:name="OPPO_APPSECRET"
+            android:value="OP-05723986bba64183a71530b496922450" />
     <!-- 配置定位Service -->
     <service android:name="com.amap.api.location.APSService"/>
+    		 <!-- since JPushv3.6.8 ，oppov2.1.0 oppo 核心功能-->
+          <service android:name="cn.jpush.android.service.PluginOppoPushService"
+             android:permission="com.coloros.mcs.permission.SEND_MCS_MESSAGE"
+             android:exported="true">
+             <intent-filter>
+                 <action android:name="com.coloros.mcs.action.RECEIVE_MCS_MESSAGE" />
+             </intent-filter>
+         </service>
+
+         <!-- since JPushv3.6.8 ，oppov2.1.0 oppo 核心功能-->
+         <service
+             android:name="com.heytap.msp.push.service.DataMessageCallbackService"
+             android:permission="com.heytap.mcs.permission.SEND_PUSH_MESSAGE"
+             android:exported="true">
+ 
+             <intent-filter>
+                 <action android:name="com.heytap.mcs.action.RECEIVE_MCS_MESSAGE"/>
+ 
+                 <action android:name="com.heytap.msp.push.RECEIVE_MCS_MESSAGE"/>
+             </intent-filter>
+         </service> <!--兼容Q版本-->
     <activity android:name="com.skychip.lock.MainActivity" android:exported="true" android:screenOrientation="portrait" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
       <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user

images/lan/lan_zh.json

@@ -338,7 +338,7 @@
   "customMailTemplate": "自定义邮件模版",
   "record": "记录",
   "buyRealNameTip": "给用户发送电子钥匙时，可以要求其开锁前先进行人脸识别，以保证是他本人在操作。人脸实名认证调用国家公安系统接口，为付费功能，请购买次数后再使用。",
-  "buyRealNameSelectYouWantBuyTip": "请选择你希望的实名认证频数",
+  "buyRealNameSelectYouWantBuyTip": "请选择你希望的实名认证频次",
   "forTheFirstTime": "仅首次",
   "onceDay": "每日一次",
   "weekOnce": "每周一次",

pubspec.yaml

@@ -59,8 +59,9 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # 1.0.49+2024052401：xhj UI ，预发布环境
 # 1.0.50+2024052701：xhj UI ，预发布环境
 # 1.0.51+2024052801：xhj 线上环境，提审
+# 1.0.53+2024052803：xhj 线上环境，提审
 
-version: 1.0.51+2024052801
+version: 1.0.53+2024052803
 
 environment:
   sdk: '>=2.12.0 <3.0.0'
@@ -164,7 +165,7 @@ dependencies:
 
   #网络图片缓存
   cached_network_image: ^3.2.0
-  webview_flutter: ^4.4.2
+  webview_flutter: 4.5.0
 
   jpush_flutter: ^2.5.1