Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v9.4.0 #95

Merged
merged 2 commits into from
Feb 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
17 changes: 8 additions & 9 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down Expand Up @@ -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")
Expand Down
4 changes: 4 additions & 0 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

This file was deleted.

19 changes: 11 additions & 8 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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">
Expand Down Expand Up @@ -118,7 +120,6 @@
android:name=".main.mine.setting.ClearCacheActivity"
android:screenOrientation="portrait"
android:exported="false" />

<activity
android:name=".welcome.ServerActivity"
android:screenOrientation="portrait"
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Loading