Merge pull request #86 from shine2008/master

feat(imkit):发布9.2.12版本
netease-kit · Dec 7, 2022 · d50fbdc · d50fbdc
2 parents 013bba7 + 68fed08
commit d50fbdc
Show file tree

Hide file tree

Showing 88 changed files with 519 additions and 540 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.2.11"
+        versionName = "9.2.12"
         multiDexEnabled = true
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -55,12 +55,12 @@ dependencies {
 //    implementation(project(":teamkit-ui"))
 //    implementation(project(":chatkit-ui"))
 //    implementation(project(":searchkit-ui"))
-    implementation("com.netease.yunxin.kit.contact:contactkit-ui:9.2.11")
-    implementation("com.netease.yunxin.kit.qchat:qchatkit-ui:9.2.11")
-    implementation("com.netease.yunxin.kit.conversation:conversationkit-ui:9.2.11")
-    implementation("com.netease.yunxin.kit.team:teamkit-ui:9.2.11")
-    implementation("com.netease.yunxin.kit.chat:chatkit-ui:9.2.11")
-    implementation("com.netease.yunxin.kit.search:searchkit-ui:9.2.11")
+    implementation("com.netease.yunxin.kit.contact:contactkit-ui:9.2.12-rc01")
+    implementation("com.netease.yunxin.kit.qchat:qchatkit-ui:9.2.12-rc01")
+    implementation("com.netease.yunxin.kit.conversation:conversationkit-ui:9.2.12-rc01")
+    implementation("com.netease.yunxin.kit.team:teamkit-ui:9.2.12-rc01")
+    implementation("com.netease.yunxin.kit.chat:chatkit-ui:9.2.12-rc01")
+    implementation("com.netease.yunxin.kit.search:searchkit-ui:9.2.12-rc01")
     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
@@ -19,10 +19,41 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+## IM SDK
+-dontwarn com.netease.nim.**
+-keep class com.netease.nim.** {*;}
+
+-dontwarn com.netease.nimlib.**
+-keep class com.netease.nimlib.** {*;}
+
+-dontwarn com.netease.share.**
+-keep class com.netease.share.** {*;}
+
+-dontwarn com.netease.mobsec.**
+-keep class com.netease.mobsec.** {*;}
+
+#如果你使用全文检索插件，需要加入
+-dontwarn org.apache.lucene.**
+-keep class org.apache.lucene.** {*;}
+
+## IMUIKit
+-dontwarn com.netease.yunxin.kit.**
+-keep class com.netease.yunxin.kit.** {*;}
 -keep public class * extends com.netease.yunxin.kit.corekit.XKitInitOptions
+-keep class * implements com.netease.yunxin.kit.corekit.XKitService {*;}
 
--dontwarn com.netease.**
--keep class com.netease.** {*;}
+### glide 4
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
+    **[] $VALUES;
+    public *;
+}
+
+#okhttp
+-dontwarn okhttp3.**
+-keep class okhttp3.**{*;}
 
 #如果你使用全文检索插件，需要加入
 -dontwarn org.apache.lucene.**
@@ -71,33 +102,20 @@
 -keep class com.vivo.vms.** {*;}
 -keep class com.netease.nimlib.mixpush.vivo.VivoPushReceiver {*;}
 
-### APP 3rd party jars(glide)
--keep public class * implements com.bumptech.glide.module.GlideModule
--keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
-  **[] $VALUES;
-  public *;
-}
+#oppo
+-keep public class * extends android.app.Service
+-keep class com.heytap.msp.** { *;}
+
 
 ### org.json xml
 -dontwarn org.json.**
 -keep class org.json.**{*;}
 
-#okhttp
--dontwarn okhttp3.**
--keep class okhttp3.**{*;}
+
 #okio
 -dontwarn okio.**
 -keep class okio.**{*;}
 
-### glide 4
--keep public class * implements com.bumptech.glide.module.GlideModule
--keep public class * extends com.bumptech.glide.module.AppGlideModule
--keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
-    **[] $VALUES;
-    public *;
-}
-
-
 -keepclasseswithmembernames class * {
     native <methods>;
 }

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -81,7 +81,7 @@
         </activity>
 
         <activity
-            android:name=".main.mine.UserInfoActivity"
+            android:name=".main.mine.MineInfoActivity"
             android:screenOrientation="portrait"
             android:exported="false" />
 

diff --git a/app/src/main/java/com/netease/yunxin/app/im/IMApplication.java b/app/src/main/java/com/netease/yunxin/app/im/IMApplication.java
@@ -13,7 +13,7 @@
 import com.netease.nimlib.sdk.SDKOptions;
 import com.netease.yunxin.app.im.crash.AppCrashHandler;
 import com.netease.yunxin.app.im.main.MainActivity;
-import com.netease.yunxin.app.im.main.mine.UserInfoActivity;
+import com.netease.yunxin.app.im.main.mine.MineInfoActivity;
 import com.netease.yunxin.app.im.push.PushMessageHandler;
 import com.netease.yunxin.app.im.utils.Constant;
 import com.netease.yunxin.app.im.utils.DataUtils;
@@ -46,7 +46,7 @@ public void onCreate() {
 
     initUIKit();
     // temp register for mine
-    XKitRouter.registerRouter(RouterConstant.PATH_MINE_INFO_PAGE, UserInfoActivity.class);
+    XKitRouter.registerRouter(RouterConstant.PATH_MINE_INFO_PAGE, MineInfoActivity.class);
   }
 
   private void initUIKit() {

diff --git a/app/src/main/java/com/netease/yunxin/app/im/XKitInitOptionsImpl.java b/app/src/main/java/com/netease/yunxin/app/im/XKitInitOptionsImpl.java
diff --git a/app/src/main/java/com/netease/yunxin/app/im/main/mine/MineFragment.java b/app/src/main/java/com/netease/yunxin/app/im/main/mine/MineFragment.java
@@ -70,7 +70,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
     binding.userInfoClick.setOnClickListener(
         v -> {
-          UserInfoActivity.launch(
+          MineInfoActivity.launch(
               getContext(),
               new ActivityResultLauncher<Intent>() {
                 @Override

diff --git a/...in/app/im/main/mine/UserInfoActivity.java → ...in/app/im/main/mine/MineInfoActivity.java b/...in/app/im/main/mine/UserInfoActivity.java → ...in/app/im/main/mine/MineInfoActivity.java
@@ -40,7 +40,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class UserInfoActivity extends AppCompatActivity {
+public class MineInfoActivity extends AppCompatActivity {
   private ActivityUserInfoBinding binding;
   private ActivityResultLauncher<Intent> launcher;
   private UserInfo userInfo;
@@ -110,7 +110,7 @@ private void initView() {
             selectIndex = 2;
           }
           TypeSelectActivity.launch(
-              UserInfoActivity.this,
+              MineInfoActivity.this,
               getResources().getString(R.string.user_info_sexual),
               content,
               selectIndex,
@@ -154,7 +154,7 @@ private void copyAccount() {
   }
 
   private void choicePhoto() {
-    new PhotoChoiceDialog(UserInfoActivity.this)
+    new PhotoChoiceDialog(MineInfoActivity.this)
         .show(
             new CommonCallback<File>() {
               @Override
@@ -333,7 +333,7 @@ public void finish() {
   }
 
   public static void launch(Context context, @NonNull ActivityResultLauncher<Intent> launcher) {
-    Intent intent = new Intent(context, UserInfoActivity.class);
+    Intent intent = new Intent(context, MineInfoActivity.class);
     launcher.launch(intent);
   }
 }
diff --git a/app/src/main/res/layout/activity_edit_nickname.xml b/app/src/main/res/layout/activity_edit_nickname.xml
@@ -10,7 +10,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/color_e9eff5"
-    tools:context=".main.mine.UserInfoActivity">
+    tools:context=".main.mine.MineInfoActivity">
 
     <TextView
         android:id="@+id/tvTitle"

diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
@@ -10,7 +10,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/color_e9eff5"
-    tools:context=".main.mine.UserInfoActivity">
+    tools:context=".main.mine.MineInfoActivity">
 
     <TextView
         android:id="@+id/tvTitle"

diff --git a/chatkit-ui/build.gradle.kts b/chatkit-ui/build.gradle.kts
@@ -17,7 +17,7 @@ android {
         targetSdk = 30
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
-        buildConfigField("String", "versionName", "\"9.2.11\"")
+        buildConfigField("String", "versionName", "\"9.2.12\"")
     }
 
     buildTypes {
@@ -39,7 +39,7 @@ android {
 
 dependencies {
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
-    api("com.netease.yunxin.kit.chat:chatkit:9.2.11")
+    api("com.netease.yunxin.kit.chat:chatkit:9.2.12-rc01")
     api("com.netease.yunxin.kit.common:common-ui:1.1.10")
     api("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21") 
     implementation("androidx.appcompat:appcompat:1.4.2")