[Modify]修改google,facebook的登录配置

android_crop_lib/build.gradle

@@ -0,0 +1,34 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdkVersion COMPILE_SDK_VERSION.toInteger()
+
+    defaultConfig {
+        minSdkVersion MIN_SDK_VERSION.toInteger()
+        targetSdkVersion TARGET_SDK_VERSION.toInteger()
+
+        testApplicationId 'com.soundcloud.android.crop.test'
+        testInstrumentationRunner 'android.test.InstrumentationTestRunner'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    buildToolsVersion = '30.0.3'
+}
+
+dependencies {
+    api 'androidx.annotation:annotation:1.4.0'
+    api 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation "androidx.core:core-ktx:1.7.0"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
+repositories {
+    mavenCentral()
+}
+

android_crop_lib/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="com.soundcloud.android.crop" />

android_crop_lib/src/main/java/com/soundcloud/android/crop/Crop.java

@@ -1,4 +1,4 @@
-package com.soundcloud.crop;
+package com.soundcloud.android.crop;
 
 import android.annotation.TargetApi;
 import android.app.Activity;

android_crop_lib/src/main/java/com/soundcloud/android/crop/CropImageActivity.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.soundcloud.crop;
+package com.soundcloud.android.crop;
 
 import android.annotation.TargetApi;
 import android.content.Intent;

android_crop_lib/src/main/java/com/soundcloud/android/crop/CropImageView.java

@@ -1,4 +1,4 @@
-package com.soundcloud.crop;
+package com.soundcloud.android.crop;
 
 import android.content.Context;
 import android.graphics.Canvas;

android_crop_lib/src/main/java/com/soundcloud/android/crop/CropUtil.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.soundcloud.crop;
+package com.soundcloud.android.crop;
 
 import android.app.ProgressDialog;
 import android.content.ContentResolver;

android_crop_lib/src/main/java/com/soundcloud/android/crop/HighlightView.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.soundcloud.crop;
+package com.soundcloud.android.crop;
 
 import android.annotation.SuppressLint;
 import android.content.Context;

android_crop_lib/src/main/java/com/soundcloud/android/crop/ImageViewTouchBase.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.soundcloud.crop;
+package com.soundcloud.android.crop;
 
 import android.content.Context;
 import android.graphics.Bitmap;

android_crop_lib/src/main/java/com/soundcloud/android/crop/Log.java

@@ -1,4 +1,4 @@
-package com.soundcloud.crop;
+package com.soundcloud.android.crop;
 
 class Log {
 

android_crop_lib/src/main/java/com/soundcloud/android/crop/MonitoredActivity.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.soundcloud.crop;
+package com.soundcloud.android.crop;
 
 import android.app.Activity;
 import android.os.Bundle;

android_crop_lib/src/main/java/com/soundcloud/android/crop/RotateBitmap.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.soundcloud.crop;
+package com.soundcloud.android.crop;
 
 import android.graphics.Bitmap;
 import android.graphics.Matrix;

android_crop_lib/src/main/java/com/soundcloud/android/crop/UriUtil.java

@@ -0,0 +1,48 @@
+package com.soundcloud.android.crop;
+
+import android.content.Context;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Environment;
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.io.File;
+
+public class UriUtil {
+
+    public final static String getFileProviderName(Context context){
+        return context.getPackageName()+".fileprovider";
+    }
+
+    /**
+     * 将TakePhoto 提供的Uri 解析出文件绝对路径
+     *
+     * @param uri
+     * @return
+     */
+    public static String parseOwnUri(Context context, Uri uri) {
+        if (uri == null) return null;
+        String path;
+        if (TextUtils.equals(uri.getAuthority(), getFileProviderName(context))) {
+            String target_text_camera_photos = "camera_photos/";
+            if (uri.getPath() != null && uri.getPath().contains(target_text_camera_photos)) {
+                path = new File(uri.getPath().replace(target_text_camera_photos, ""))
+                        .getAbsolutePath();
+            } else {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                    path = new File(Environment.getExternalStorageDirectory(),
+                            uri.getPath())
+                            .getAbsolutePath();
+                } else {
+                    path = uri.getPath();
+                }
+            }
+
+        } else {
+            path = uri.getPath();
+        }
+        return path;
+    }
+
+}

android_crop_lib/src/main/res/layout/crop__activity_crop.xml

@@ -9,7 +9,7 @@
         android:id="@+id/done_cancel_bar"
         layout="@layout/crop__layout_done_cancel" />
 
-    <com.soundcloud.crop.CropImageView
+    <com.soundcloud.android.crop.CropImageView
         android:id="@+id/crop_image"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

app/build.gradle

@@ -1,40 +1,38 @@
 apply plugin: 'com.android.application'
+apply plugin: 'com.google.gms.google-services'
+apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.tencent.vasdolly'
-apply from: '../project.gradle'
+apply from: '../mob.gradle'
 
-apply plugin: "com.bytedance.android.aabResGuard"
-apply plugin: "xml-class-guard"
+def onlyArm64 = Boolean.parseBoolean(only_arm64)
 
 android {
     compileSdkVersion COMPILE_SDK_VERSION.toInteger()
 
     defaultConfig {
-        applicationId isolationMode ? 'com.example.gogo' : 'app.hiyoo.fun'
+        applicationId "com.vele.pekolive"
         minSdkVersion MIN_SDK_VERSION.toInteger()
         targetSdkVersion TARGET_SDK_VERSION.toInteger()
         versionCode Integer.valueOf(version_code)
         versionName version_name
 
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 
+        ndk {
+            //设置支持的SO库架构
+            if (onlyArm64) {
+                abiFilters "arm64-v8a"
+            } else {
+                abiFilters "armeabi-v7a", "arm64-v8a"
+            }
+        }
+
         flavorDimensions 'default'
-        buildConfigField "boolean", "ISOLATION_MODE", "$isolationMode"
 
-        if (isolationMode) {
-            resValue "string", "app_name", "Hi-debug"
-        } else {
-            resValue "string", "app_name", "Hiyoo"
-        }
-    }
-
-    splits {
-        abi {
-            enable true
-            reset()
-            include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
-            universalApk true
-        }
+        manifestPlaceholders = [CRASHLYTICS_COLLECTION_ENABLED: CRASHLYTICS_COLLECTION_ENABLED.toBoolean()]
     }
 
     bundle {
@@ -50,29 +48,20 @@ android {
     }
 
     //在apk文件后边生成版本号信息
-    android.applicationVariants.configureEach { variant ->
-        variant.outputs.configureEach { output ->
-            def date = new Date().format("MMddHHmm", TimeZone.getTimeZone("GMT+08"))
-
-            def outputFile = output.outputFile
-            if (outputFile == null || !outputFile.name.endsWith('.apk')) {
-                return
+    android.applicationVariants.all {
+        variant ->
+            variant.outputs.all {
+                def date = new Date().format("MMddHHmm", TimeZone.getTimeZone("GMT+08"))
+                outputFileName = "peko_${buildType.name}_v${defaultConfig.versionName}-${date}.apk"
             }
-
-            def abi = output.getFilter(com.android.build.OutputFile.ABI)
-            if (abi == null) {
-                abi = "universal"
-            }
-            outputFileName = "hiyoo_${buildType.name}_v${defaultConfig.versionName}_${abi}_${date}.apk"
-        }
     }
 
-    lint {
+    lintOptions {
         abortOnError false
-        disable 'MissingTranslation', 'ExtraTranslation', 'ContentDescription', 'SmallSp'
+        disable 'MissingTranslation'
+        disable 'ExtraTranslation'
     }
 
-
     dataBinding {
         enabled = true
     }
@@ -83,23 +72,24 @@ android {
 
     signingConfigs {
 
-        debug {
-            storeFile file('../app_debug.jks')
-            storePassword "debug2023"
-            keyAlias "debug"
-            keyPassword "debug2023"
+        v2 {
+            storeFile file('../pekolive.jks')
+            storePassword "peko2023"
+            keyAlias "pekolive"
+            keyPassword "peko2023"
             v2SigningEnabled true
             v1SigningEnabled true
         }
 
-        release {
-            storeFile file('../hiyoo.jks')
-            storePassword "hiyoo2023"
-            keyAlias "hiyoo"
-            keyPassword "hiyoo2023"
-            v2SigningEnabled true
+        v1 {
+            storeFile file('../pekolive.jks')
+            storePassword "peko2023"
+            keyAlias "pekolive"
+            keyPassword "peko2023"
+            v2SigningEnabled false
             v1SigningEnabled true
         }
+
     }
 
     sourceSets {
@@ -149,23 +139,19 @@ android {
     }
 
     buildTypes {
-        def server_url_debug = '"http://beta.api.hiyoo.fun/"'
-        def server_url_release = '"https://api.hiyoo.fun/"'
 
         debug {
-            println("minifyEnabled = " + minify_enabled)
+            ext.enableCrashlytics = false
+            ext.alwaysUpdateBuildId = false // Firebase Crashlytics禁用更新构建ID
 
-//            ext.enableCrashlytics = false
-//            ext.alwaysUpdateBuildId = false // Firebase Crashlytics禁用更新构建ID
-
-            buildConfigField "String", "BASE_URL", server_url_debug
+            buildConfigField "String", "BASE_URL", "\"https://beta.api.pekolive.com/\""
             buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
             buildConfigField "String", "BASE_URL_STAGING", "BASE_URL"
-            buildConfigField "String", "BASE_URL_RELEASE", server_url_release
-            minifyEnabled minify_enabled.toBoolean() // 是否混淆
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            buildConfigField "String", "BASE_URL_RELEASE", "BASE_URL"
+            minifyEnabled false // 是否混淆
             crunchPngs false // 停用 PNG 压缩
-            signingConfig isolationMode ? signingConfigs.debug : signingConfigs.release
+            signingConfig signingConfigs.v2
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             gradle.taskGraph.whenReady {
                 tasks.each { task ->
                     if (task.name.contains("Test") || task.name.contains("Lint")) {
@@ -178,12 +164,12 @@ android {
         release {
             ext.enableCrashlytics = CRASHLYTICS_COLLECTION_ENABLED.toBoolean()
             ext.alwaysUpdateBuildId = CRASHLYTICS_COLLECTION_ENABLED.toBoolean()
-//            firebaseCrashlytics {
-//                //Firebase Crashlytics控制上传混淆文件开关
-//                mappingFileUploadEnabled CRASHLYTICS_COLLECTION_ENABLED.toBoolean()
-//            }
+            firebaseCrashlytics {
+                //Firebase Crashlytics控制上传混淆文件开关
+                mappingFileUploadEnabled CRASHLYTICS_COLLECTION_ENABLED.toBoolean()
+            }
 
-            buildConfigField "String", "BASE_URL", server_url_release
+            buildConfigField "String", "BASE_URL", "\"https://api.pekolive.com/\""
             buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
             buildConfigField "String", "BASE_URL_STAGING", "BASE_URL"
             buildConfigField "String", "BASE_URL_RELEASE", "BASE_URL"
@@ -191,7 +177,7 @@ android {
             shrinkResources true // 开了混淆的时候才能开启 是否去除无效的资源文件
             zipAlignEnabled true // 开了混淆的时候才能开启 是否进行压缩并重排列
             crunchPngs true // 启用 PNG 压缩
-            signingConfig isolationMode ? signingConfigs.debug : signingConfigs.release
+            signingConfig signingConfigs.v2
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -214,8 +200,11 @@ def Lombok = "1.18.24"
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
     implementation fileTree(dir: 'aliyun-libs', include: ['*.jar', '*.aar'])
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     api 'androidx.multidex:multidex:2.0.1'
 
@@ -235,8 +224,9 @@ dependencies {
     api "com.github.zyyoona7:EasyPopup:1.0.2"
     api "com.github.donkingliang:LabelsView:1.6.5"
     api "com.github.yyued:SVGAPlayer-Android:2.6.1"
+    implementation "com.orhanobut:logger:2.2.0"
     api "com.ms-square:expandableTextView:0.1.4"
-    annotationProcessor 'androidx.annotation:annotation:1.6.0'
+    annotationProcessor 'androidx.annotation:annotation:1.4.0'
 
     implementation 'io.github.h07000223:flycoTabLayout:3.0.0'
 
@@ -257,7 +247,7 @@ dependencies {
     //数字滚动效果
     implementation 'com.github.YvesCheung:RollingText:1.2.3'
     // 引入原有第三方裁图源码，方便修改
-    api project(':libs:lib_crop')
+    api project(':android_crop_lib')
 
     //rx权限请求框架
     implementation('com.github.tbruyelle:rxpermissions:0.10.2') {
@@ -270,25 +260,25 @@ dependencies {
 
     implementation 'com.github.fodroid:XRadioGroup:v1.5'
 
-    api 'com.tencent.vasdolly:helper:3.0.6'
+    api 'com.tencent.vasdolly:helper:3.0.3'
     implementation "io.github.tencent:vap:2.0.24"
 
     implementation 'com.github.mmin18:realtimeblurview:1.2.1'
 
-//    implementation 'com.appsflyer:af-android-sdk:6.8.2'
+    implementation 'com.appsflyer:af-android-sdk:6.8.2'
 
     implementation 'com.github.zhpanvip:BannerViewPager:3.5.6'
 
     //fireBase
-//    implementation platform('com.google.firebase:firebase-bom:31.1.1')
-//    implementation 'com.google.firebase:firebase-crashlytics-ktx'
-//    implementation 'com.google.firebase:firebase-analytics-ktx'
+    implementation platform('com.google.firebase:firebase-bom:31.1.1')
+    implementation 'com.google.firebase:firebase-crashlytics-ktx'
+    implementation 'com.google.firebase:firebase-analytics-ktx'
 
     //Adjust接入
-//    implementation 'com.adjust.sdk:adjust-android:4.33.0'
-//    implementation 'com.android.installreferrer:installreferrer:2.2'
+    implementation 'com.adjust.sdk:adjust-android:4.33.0'
+    implementation 'com.android.installreferrer:installreferrer:2.2'
     // Add the following if you are using the Adjust SDK inside web views on your app
-//    implementation 'com.adjust.sdk:adjust-android-webbridge:4.33.0'
+    implementation 'com.adjust.sdk:adjust-android-webbridge:4.33.0'
 
     implementation 'com.github.yalantis:ucrop:2.2.7'
 
@@ -297,19 +287,14 @@ dependencies {
     //wheelView
     implementation 'com.contrarywind:wheelview:4.1.0'
 
-//    implementation 'tech.sud.mgp:SudMGP-static:1.3.3.1158'
-
-    implementation project(':modules:module_base')
-    if (!isolationMode && file("../modules/module_google/build.gradle").exists()) {
-        implementation project(':modules:module_google')
-    }
 }
 
 channel {
     //多渠道包的输出目录，默认为new File(project.buildDir,"channel")
     outputDir = new File(project.buildDir, "channelapk")
     //多渠道包的命名规则，默认为：${appName}-${versionName}-${versionCode}-${flavorName}-${buildType}-${buildTime}
-    apkNameFormat = 'hiyoo-${buildType}-${flavorName}-v${versionName}-${buildTime}'
+    def only64 = onlyArm64 ? "-only64" : ""
+    apkNameFormat = 'peko-${buildType}only64-${flavorName}-v${versionName}-${buildTime}'.replace("only64", only64)
     //快速模式：生成渠道包时不进行校验（速度可以提升10倍以上，默认为false）
     fastMode = false
     //buildTime的时间格式，默认格式：yyyyMMdd-HHmmss
@@ -317,31 +302,3 @@ channel {
     //低内存模式（仅针对V2签名，默认为false）：只把签名块、中央目录和EOCD读取到内存，不把最大头的内容块读取到内存，在手机上合成APK时，可以使用该模式
     lowMemory = false
 }
-
-aabResGuard {
-    mappingFile = file("aab-res-guard-mapping.txt").toPath() // Mapping file used for incremental obfuscation
-    whiteList = [ // White list rules
-                  "*.R.raw.*",
-                  "*.R.drawable.icon"
-    ]
-    obfuscatedBundleFileName = "duplicated-app.aab" // Obfuscated file name, must end with '.aab'
-    mergeDuplicatedRes = true // Whether to allow the merge of duplicate resources
-    enableFilterFiles = false // Whether to allow filter files
-    filterList = [ // file filter rules
-//                   "*/arm64-v8a/*",
-//                   "META-INF/*"
-    ]
-
-    enableFilterStrings = false // switch of filter strings
-    unusedStringPath = file("unused.txt").toPath() // strings will be filtered in this file
-    languageWhiteList = ["en", "zh"] // keep en,en-xx,zh,zh-xx etc. remove others.
-}
-
-//以下均为非必须
-xmlClassGuard {
-    findAabConstraintReferencedIds = true
-    //用于增量混淆的 mapping 文件
-    mappingFile = file("xml-class-mapping.txt")
-    //更改manifest文件的package属性，即包名
-    packageChange = ["com.chwl.app": "co.ch.a"]
-}

app/google-services.json

@@ -0,0 +1,39 @@
+{
+  "project_info": {
+    "project_number": "656602722869",
+    "project_id": "pekolive-30f9e",
+    "storage_bucket": "pekolive-30f9e.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:656602722869:android:dac206f8aae0ba9021f77c",
+        "android_client_info": {
+          "package_name": "com.vele.pekolive"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "656602722869-sss2inirem512et0015kdqjp39mqgn96.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDDoTSpY3wxOefVDVKRmE9cDiT1iv8Ra-4"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "656602722869-sss2inirem512et0015kdqjp39mqgn96.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

app/proguard-rules.pro

@@ -99,32 +99,35 @@
 -keep class android.support.v7.** { *;}
 
 #----------------EventBus事件巴士-----------------
--keepattributes *Annotation*
--keepclassmembers class * {
+-keepclassmembers class ** {
     @org.greenrobot.eventbus.Subscribe <methods>;
 }
 -keep enum org.greenrobot.eventbus.ThreadMode { *; }
-# If using AsyncExecutord, keep required constructor of default event used.
-# Adjust the class name if a custom failure event type is used.
--keepclassmembers class org.greenrobot.eventbus.util.ThrowableFailureEvent {
-    <init>(java.lang.Throwable);
+
+# Only required if you use AsyncExecutor
+-keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent {
+    <init>(Java.lang.Throwable);
 }
-# Accessed via reflection, avoid renaming or removal
--keep class org.greenrobot.eventbus.android.AndroidComponentsImpl
+
 
 #-------------云信相关的混淆配置------------
 -dontwarn com.netease.**
 -keep class com.netease.** {*;}
 
+# Presenter 相关
+-keep class com.yizhuan.erban.base.** { *; }
+-keep public class * extends com.yizhuan.erban.base.BaseMvpPresenter
+-keep public class * extends com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter
+
 # 云信自定义 ViewHolder 配置
--dontwarn com.chwl.app.ui.im.recent.holder.**
--keep class com.chwl.app.ui.im.recent.holder.** {*;}
--keep class com.chwl.app.ui.im.chat.** {*;}
--keep class com.chwl.app.luckymoney.viewholder.** {*;}
--keep class com.chwl.app.share.viewholder.** {*;}
--keep class com.chwl.app.public_chat_hall.msg.viewholder.** {*;}
--keep class com.chwl.app.module_hall.im.msgholder.** {*;}
--keep class com.chwl.app.mentoring_relationship.viewholder.** {*;}
+-dontwarn com.yizhuan.erban.ui.im.recent.holder.**
+-keep class com.yizhuan.erban.ui.im.recent.holder.** {*;}
+-keep class com.yizhuan.erban.ui.im.chat.** {*;}
+-keep class com.yizhuan.erban.luckymoney.viewholder.** {*;}
+-keep class com.yizhuan.erban.share.viewholder.** {*;}
+-keep class com.yizhuan.erban.public_chat_hall.msg.viewholder.** {*;}
+-keep class com.yizhuan.erban.module_hall.im.msgholder.** {*;}
+-keep class com.yizhuan.tutu.mentoring_relationship.viewholder.** {*;}
 -keep public class * extends com.netease.nim.uikit.common.ui.recyclerview.holder.RecyclerViewHolder {*;}
 -keep public class * extends com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase {*;}
 
@@ -172,8 +175,8 @@
 -keep class com.darsh.multipleimageselect.** { *; }
 -dontwarn com.darsh.multipleimageselect.**
 
--keep class com.soundcloud.crop.** { *; }
--dontwarn com.soundcloud.crop.**
+-keep class com.soundcloud.android.crop.** { *; }
+-dontwarn com.soundcloud.android.crop.**
 
 # glide4.0
 -keep public class * implements com.bumptech.glide.module.GlideModule
@@ -185,11 +188,6 @@
 # for DexGuard only
 #-keepresourcexmlelements manifest/application/meta-data@value=GlideModule
 
-# Presenter 相关
--keep class com.chwl.app.base.** { *; }
--keep public class * extends com.chwl.app.base.BaseMvpPresenter
--keep public class * extends com.chwl.library.base.factory.AbstractMvpPresenter
-
 # BaseAdapter
 -keep class com.chad.library.adapter.** {
 *;
@@ -201,8 +199,8 @@
      <init>(...);
 }
 
--dontwarn com.chwl.app.bindadapter.**
--keep class com.chwl.app.bindadapter.** {*;}
+-dontwarn com.yizhuan.erban.bindadapter.**
+-keep class com.yizhuan.erban.bindadapter.** {*;}
 
 # Ping++ 混淆过滤
 -dontwarn com.pingplusplus.**
@@ -233,9 +231,9 @@
 
 # TODO 网络加载 一些业务bean gson 时候混淆问题
 -keep class org.json.** {*;}
--keep class com.chwl.**.bean.** {*;}
--keep class com.chwl.**.result.** {*;}
--keep class com.chwl.**.entity.** {*;}
+-dontwarn com.yizhuan.xchat_android_core.**
+-keep class com.yizhuan.xchat_android_core.** {*;}
+
 
 #百度统计
 -keep class com.baidu.bottom.** { *; }
@@ -308,8 +306,8 @@
 -keep class com.autonavi.aps.amapapi.model.**{*;}
 
 #暂时keep这个View排查华为oom问题
--keep class com.chwl.app.avroom.widget.MicroView{*;}
--keep class com.chwl.app.ui.widget.rollviewpager.RollPagerView{*;}
+-keep class com.yizhuan.erban.avroom.widget.MicroView{*;}
+-keep class com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView{*;}
 
 #linkedMe
 -keep class com.microquation.linkedme.android.** { *; }
@@ -367,7 +365,7 @@
 -dontwarn com.meizu.cloud.**
 -keep class com.meizu.cloud.** {*;}
 
--keep class com.chwl.app.ui.widget.AppBarLayoutBehavior {*;}
+-keep class com.yizhuan.erban.ui.widget.AppBarLayoutBehavior {*;}
 
 #ViewBinding使用的反射生成的对应Binding
 -keepclassmembers class * implements androidx.viewbinding.ViewBinding {
@@ -452,7 +450,7 @@
 }
 
 ## EasyPhotos
--keep class com.chwl.library.easyphoto.models.** { *; }
+-keep class com.yizhuan.xchat_android_library.easyphoto.models.** { *; }
 
 ## 图片裁剪UCrop
 -dontwarn com.yalantis.ucrop.**
@@ -477,8 +475,4 @@
 }
 -keep public class com.android.installreferrer.**{ *; }
 
--keep public class * extends java.lang.Exception
-
--keep public class com.alibaba.android.arouter.routes.**{*;}
--keep public class com.alibaba.android.arouter.facade.**{*;}
--keep class * implements com.alibaba.android.arouter.facade.template.ISyringe{*;}
+-keep public class * extends java.lang.Exception

app/src/androidTest/java/com/yizhuan/erban/ExampleInstrumentedTest.java

@@ -0,0 +1,28 @@
+package com.yizhuan.erban;
+
+import static org.junit.Assert.assertEquals;
+
+import android.content.Context;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("com.yizhuan.erban_android_client", appContext.getPackageName());
+    }
+
+}