Merge pull request #95 from shine2008/master

v9.4.0
netease-kit · Feb 28, 2023 · df28f27 · df28f27
2 parents 9c3b4e6 + d1e896a
commit df28f27
Show file tree

Hide file tree

Showing 440 changed files with 13,359 additions and 1,560 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -15,7 +15,7 @@ android {
         minSdk = 21
         targetSdk = 30
         versionCode = 1
-        versionName = "9.3.0"
+        versionName = "9.4.0"
         multiDexEnabled = true
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -51,18 +51,17 @@ dependencies {
     //local module code
 //    implementation(project(":contactkit-ui"))
 //    implementation(project(":conversationkit-ui"))
-//    implementation(project(":qchatkit-ui"))
 //    implementation(project(":teamkit-ui"))
 //    implementation(project(":chatkit-ui"))
 //    implementation(project(":searchkit-ui"))
 //    implementation(project(":locationkit"))
-    implementation("com.netease.yunxin.kit.contact:contactkit-ui:9.3.0")
-    implementation("com.netease.yunxin.kit.qchat:qchatkit-ui:9.3.0")
-    implementation("com.netease.yunxin.kit.conversation:conversationkit-ui:9.3.1")
-    implementation("com.netease.yunxin.kit.team:teamkit-ui:9.3.0")
-    implementation("com.netease.yunxin.kit.chat:chatkit-ui:9.3.0")
-    implementation("com.netease.yunxin.kit.search:searchkit-ui:9.3.0")
-    implementation("com.netease.yunxin.kit.locationkit:locationkit:9.3.0")
+    implementation("com.netease.yunxin.kit.contact:contactkit-ui:9.4.0")
+    implementation("com.netease.yunxin.kit.conversation:conversationkit-ui:9.4.0")
+    implementation("com.netease.yunxin.kit.team:teamkit-ui:9.4.0")
+    implementation("com.netease.yunxin.kit.chat:chatkit-ui:9.4.0")
+    implementation("com.netease.yunxin.kit.search:searchkit-ui:9.4.0")
+    implementation("com.netease.yunxin.kit.locationkit:locationkit:9.4.0")
+    implementation("com.netease.yunxin.kit.call:call-ui:1.8.2") //呼叫组件 UI 包
     implementation("com.airbnb.android:lottie:5.0.3")
     implementation("com.github.bumptech.glide:glide:4.13.1")
     implementation("com.squareup.retrofit2:retrofit:2.9.0")

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -43,6 +43,10 @@
 -keep public class * extends com.netease.yunxin.kit.corekit.XKitInitOptions
 -keep class * implements com.netease.yunxin.kit.corekit.XKitService {*;}
 
+## 呼叫组件混淆
+-keep class com.netease.lava.** {*;}
+-keep class com.netease.yunxin.** {*;}
+
 ### glide 4
 -keep public class * implements com.bumptech.glide.module.GlideModule
 -keep public class * extends com.bumptech.glide.module.AppGlideModule

diff --git a/app/src/androidTest/java/com/netease/yunxin/app/im/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/netease/yunxin/app/im/ExampleInstrumentedTest.java
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -43,7 +43,8 @@
     <!--  oppo push-->
     <uses-permission android:name="com.coloros.mcs.permission.RECIEVE_MCS_MESSAGE"/>
     <uses-permission android:name="com.heytap.mcs.permission.RECIEVE_MCS_MESSAGE"/>
-
+    <!-- 8.0+系统需要-->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application android:name=".IMApplication"
         android:allowBackup="true"
@@ -56,13 +57,14 @@
         android:theme="@style/Theme.Xkit">
         <meta-data
             android:name="com.netease.nim.appKey"
-            android:value="appkey" />
+            android:value="appKey" />
         <meta-data
             android:name="com.netease.nim.oversea.appKey"
-            android:value="oversea-appkey" />
+            android:value="appKey" />
         <meta-data
             android:name="com.amap.api.v2.apikey"
-            android:value="amap-key" />
+            android:value="apikey" />
+
         <activity android:name=".welcome.WelcomeActivity"
             android:screenOrientation="portrait"
             android:exported="true">
@@ -118,7 +120,6 @@
             android:name=".main.mine.setting.ClearCacheActivity"
             android:screenOrientation="portrait"
             android:exported="false" />
-
         <activity
             android:name=".welcome.ServerActivity"
             android:screenOrientation="portrait"
@@ -239,10 +240,10 @@
 
         <meta-data
             android:name="com.vivo.push.api_key"
-            android:value="your api_key"/>
+            android:value="api_key"/>
         <meta-data
             android:name="com.vivo.push.app_id"
-            android:value="your app_id"/>
+            android:value="app_id"/>
 
         <receiver android:name="com.netease.nimlib.mixpush.vivo.VivoPushReceiver">
             <intent-filter>
@@ -272,8 +273,10 @@
                 <action android:name="com.heytap.msp.push.RECEIVE_MCS_MESSAGE"/>
             </intent-filter>
         </service> <!--兼容Q版本-->
+
         <!-- 高德地图定位 -->
         <service android:name="com.amap.api.location.APSService" />
+
     </application>
 
-</manifest>
+</manifest>