feat: 更改类名 ，处理代码区分

fix：UI问题修复

.gitignore

@@ -7,7 +7,7 @@
 .externalNativeBuild
 .idea
 .settings
-app/peki/debug/app-accompany-debug.apk
-app/peki/debug/output.json
+app/peko/debug/app-accompany-debug.apk
+app/peko/debug/output.json
 *.apk
-app/peki/release/output.json
+app/peko/release/output.json

android_crop_lib/build.gradle

@@ -1,34 +0,0 @@
-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-jdk8:$kotlin_version"
-}
-repositories {
-    mavenCentral()
-}
-

android_crop_lib/src/main/AndroidManifest.xml

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

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

@@ -1,48 +0,0 @@
-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/values/strings.xml

@@ -1,10 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-
-    <string name="crop__saving">正在儲存相片…</string>
-    <string name="crop__wait">請稍候…</string>
-    <string name="crop__pick_error">沒有可用的圖片來源</string>
-
-    <string name="crop__done">完成</string>
-    <string name="crop__cancel" tools:ignore="ButtonCase">取消</string>
-
-</resources>

android_crop_lib/src/main/res/values/styles.xml

@@ -1,44 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-
-    <style name="Crop"></style>
-
-    <style name="Crop.DoneCancelBar">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">@dimen/crop__bar_height</item>
-        <item name="android:orientation">horizontal</item>
-        <item name="android:divider">@drawable/crop__divider</item>
-        <item name="android:showDividers" tools:ignore="NewApi">middle</item>
-        <item name="android:dividerPadding" tools:ignore="NewApi">12dp</item>
-        <item name="android:background">@color/crop__button_bar</item>
-    </style>
-
-    <style name="Crop.ActionButton">
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:background">@drawable/crop__selectable_background</item>
-    </style>
-
-    <style name="Crop.ActionButtonText">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_gravity">center</item>
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:paddingRight">20dp</item> <!-- Offsets left drawable -->
-        <item name="android:drawablePadding">8dp</item>
-        <item name="android:textColor">@color/crop__button_text</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textSize">13sp</item>
-    </style>
-
-    <style name="Crop.ActionButtonText.Done">
-        <item name="android:drawableLeft">@drawable/crop__ic_done</item>
-        <item name="android:text">@string/crop__done</item>
-    </style>
-
-    <style name="Crop.ActionButtonText.Cancel">
-        <item name="android:drawableLeft">@drawable/crop__ic_cancel</item>
-        <item name="android:text">@string/crop__cancel</item>
-    </style>
-
-</resources>

app/proguard-rules.pro

@@ -29,9 +29,6 @@
 
 # 保留行号
 -keepattributes SourceFile,LineNumberTable
--obfuscationdictionary ../dic.txt
--classobfuscationdictionary ../dic.txt
--packageobfuscationdictionary ../dic.txt
 
 #-dontwarn  #//dontwarn去掉警告
 #-dontskipnonpubliclibraryclassmembers
@@ -119,20 +116,15 @@
 -dontwarn com.netease.**
 -keep class com.netease.** {*;}
 
-# Presenter 相关
--keep class com.bingchuang.app.base.** { *; }
--keep public class * extends com.bingchuang.app.base.BaseMvpPresenter
--keep public class * extends com.bingchuang.library.base.factory.AbstractMvpPresenter
-
 # 云信自定义 ViewHolder 配置
--dontwarn com.bingchuang.app.ui.im.recent.holder.**
--keep class com.bingchuang.app.ui.im.recent.holder.** {*;}
--keep class com.bingchuang.app.ui.im.chat.** {*;}
--keep class com.bingchuang.app.luckymoney.viewholder.** {*;}
--keep class com.bingchuang.app.share.viewholder.** {*;}
--keep class com.bingchuang.app.public_chat_hall.msg.viewholder.** {*;}
--keep class com.bingchuang.app.module_hall.im.msgholder.** {*;}
--keep class com.bingchuang.core.mentoring_relationship.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.** {*;}
 -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 {*;}
 
@@ -180,8 +172,8 @@
 -keep class com.darsh.multipleimageselect.** { *; }
 -dontwarn com.darsh.multipleimageselect.**
 
--keep class com.soundcloud.android.crop.** { *; }
--dontwarn com.soundcloud.android.crop.**
+-keep class com.soundcloud.crop.** { *; }
+-dontwarn com.soundcloud.crop.**
 
 # glide4.0
 -keep public class * implements com.bumptech.glide.module.GlideModule
@@ -193,6 +185,11 @@
 # 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.** {
 *;
@@ -204,8 +201,8 @@
      <init>(...);
 }
 
--dontwarn com.bingchuang.app.bindadapter.**
--keep class com.bingchuang.app.bindadapter.** {*;}
+-dontwarn com.chwl.app.bindadapter.**
+-keep class com.chwl.app.bindadapter.** {*;}
 
 # Ping++ 混淆过滤
 -dontwarn com.pingplusplus.**
@@ -236,13 +233,9 @@
 
 # TODO 网络加载 一些业务bean gson 时候混淆问题
 -keep class org.json.** {*;}
--dontwarn com.bingchuang.core.**
--keep class com.bingchuang.core.** {*;}
--keep class com.bingchuang.treasure_box.bean.** {*;}
--keep class com.bingchuang.app.avroom.bean.** {*;}
--keep class com.bingchuang.core2.**.bean.** {*;}
--keep class com.bingchuang.**.bean.** {*;}
-
+-keep class com.chwl.**.bean.** {*;}
+-keep class com.chwl.**.result.** {*;}
+-keep class com.chwl.**.entity.** {*;}
 
 #百度统计
 -keep class com.baidu.bottom.** { *; }
@@ -315,8 +308,8 @@
 -keep class com.autonavi.aps.amapapi.model.**{*;}
 
 #暂时keep这个View排查华为oom问题
--keep class com.bingchuang.app.avroom.widget.MicroView{*;}
--keep class com.bingchuang.app.ui.widget.rollviewpager.RollPagerView{*;}
+-keep class com.chwl.app.avroom.widget.MicroView{*;}
+-keep class com.chwl.app.ui.widget.rollviewpager.RollPagerView{*;}
 
 #linkedMe
 -keep class com.microquation.linkedme.android.** { *; }
@@ -374,7 +367,7 @@
 -dontwarn com.meizu.cloud.**
 -keep class com.meizu.cloud.** {*;}
 
--keep class com.bingchuang.app.ui.widget.AppBarLayoutBehavior {*;}
+-keep class com.chwl.app.ui.widget.AppBarLayoutBehavior {*;}
 
 #ViewBinding使用的反射生成的对应Binding
 -keepclassmembers class * implements androidx.viewbinding.ViewBinding {
@@ -459,7 +452,7 @@
 }
 
 ## EasyPhotos
--keep class com.bingchuang.library.easyphoto.models.** { *; }
+-keep class com.chwl.library.easyphoto.models.** { *; }
 
 ## 图片裁剪UCrop
 -dontwarn com.yalantis.ucrop.**
@@ -484,4 +477,164 @@
 }
 -keep public class com.android.installreferrer.**{ *; }
 
--keep public class * extends java.lang.Exception
+-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 class tech.sud.mgp.SudMGPWrapper.** {*;}
+
+#new after proguard
+-dontwarn bdcb.eedb.**
+-keep class bdcb.eedb.** {*;}
+-keep class cddcabe.afbdedeb.** {*;}
+-keep class dfedf.eedab.** {*;}
+-keep class dcdaef.bbcdfa.** {*;}
+-keep class com.chwl.app.public_chat_hall.msg.viewholder.** {*;}
+-keep class decfc.acfca.** {*;}
+-keep class com.chwl.app.mentoring_relationship.viewholder.** {*;}
+-keep class b.** { *; }
+-keep class cb.** { *; }
+-keep public class * extends b.NP
+-keep public class * extends ddbfbdf.acbaddc.AbstractMvpPresenter
+-dontwarn bacefd.cdbedf.**
+-keep class bacefd.cdbedf.** {*;}
+-keep class f.DG{*;}
+-keep class bf.CA{*;}
+-keep class q.Y {*;}
+
+-keep class bacccfc.abbadfec.** { *; }
+-keep class edecfbdbb.fbdcbfaaed.** { *; }
+-keep class bbfeef.fdaefba.** { *; }
+-keep class cfeefddf.daadadef.** { *; }
+-keep class eadfab.aaffafa.** { *; }
+-keep class cbbfdd.fdbaab.** { *; }
+-keep class fcffbcef.cbefeefa.** { *; }
+-keep class bbacbff.ecbddeb.** { *; }
+-keep class ebbbf.bfcbc.** { *; }
+-keep class afbfbfd.dffbcec.** { *; }
+-keep class el.** {*;}
+-keep class baf.edaf.** { *; }
+-keep class daddbf.cebdcdd.** { *; }
+-keep class adecece.cdedecc.** { *; }
+
+-keep class fbbaffa.faecdbe.** { *; }
+-keep class accbfce.fccdabb.** { *; }
+-keep class afbfaa.afcdcd.** { *; }
+-keep class aecbcaf.acdbabae.** { *; }
+-keep class edeebee.fefabfb.** { *; }
+-dontwarn fbbaffa.faecdbe.**
+-dontwarn accbfce.fccdabb.**
+-dontwarn afbfaa.afcdcd.**
+-dontwarn aecbcaf.acdbabae.**
+-dontwarn edeebee.fefabfb.**
+
+-keep class cp.** { *; }
+-dontwarn cp.**
+-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 {*;}
+
+-keep class aea.baaf.** { *; }
+-keep class ddfb.edcab.** { *; }
+-keep class aeaaa.dedad.** { *; }
+-keep class acbfad.dcbefe.** { *; }
+-keep class deafc.bebac.** { *; }
+-keep class ffbe.bdac.** { *; }
+-keep class eaedcce.eebdfabf.** { *; }
+-keep class edcbb.bcfca.** { *; }
+-keep class ffdab.eabbd.** { *; }
+-keep class fcfc.debbb.** { *; }
+-keep class bfbcaedcbf.fddedfaafe.** { *; }
+-keep class eacfafb.adbcafda.** { *; }
+-keep class aedfcaaf.cdfbbcce.** { *; }
+-keep class bbcf.abac.** { *; }
+-keep class edfea.cddcb.** { *; }
+-keep class ccaad.bddfa.** { *; }
+-keep class aaffcba.daeefdac.** { *; }
+-keep class cbcdae.acdabfe.** { *; }
+-keep class eedbaeb.defbdfae.** { *; }
+-keep class cfeddda.aafffbc.** { *; }
+-keep class y.** {*;}
+-keep class eaffcdbc.daeffdba.** { *; }
+-keep class bfbdcd.fafefd.** { *; }
+-keep class ba.** {*;}
+-keep class aceac.ecabfe.** { *; }
+-keep class cdccdab.ebdbacb.** { *; }
+-keep class bababbc.cecaffca.** { *; }
+-keep class edbce.fdbbbc.** { *; }
+-keep class dfaabac.aabbefcc.** { *; }
+-keep class edccdc.abfbfcc.** { *; }
+-keep class eebfd.aaccca.** { *; }
+-keep class ecaed.eebace.** { *; }
+-keep class cfeee.cdeea.** { *; }
+-keep class afb.eaca.** { *; }
+-keep class bdebccd.fbfaecdb.** { *; }
+-keep class eacfafb.aadfdcee.** { *; }
+-keep class bceba.bbfce.** { *; }
+-keep class cd.** {*;}
+-keep class fddadcc.fbdbaaa.** { *; }
+-keep class bdabfb.aecccbc.** { *; }
+-keep class g.** {*;}
+-keep class edbaad.bbdcdfc.** { *; }
+-keep class acdfe.ebeaed.** { *; }
+-keep class fabffdc.ffcdadbe.** { *; }
+-keep class abbefdab.daeaadad.** { *; }
+-keep class def.cff.** { *; }
+-keep class fbefaae.fddefebe.** { *; }
+-keep class fbdfcae.fefbfee.** { *; }
+-keep class dfefd.bacabc.** { *; }
+-keep class ffedae.acfcdbb.** { *; }
+-keep class ddeeb.bdcdf.** { *; }
+-keep class dcabc.bbdaea.** { *; }
+-keep class adbaee.fffffc.** { *; }
+-keep class bb.** {*;}
+-keep class fffba.cdbfee.** { *; }
+-keep class cbeee.efcdfb.** { *; }
+-keep class cdaabd.cfabfca.** { *; }
+-keep class dbeef.acefca.** { *; }
+-keep class edbabbab.acdccacc.** { *; }
+-keep class dedfdbd.ebffbcba.** { *; }
+-keep class dfdefbe.fedadcf.** { *; }
+-keep class accd.bbdff.** { *; }
+-keep class u.** {*;}
+-keep class ebbffdf.beebece.** { *; }
+-keep class fcfdaa.edabfab.** { *; }
+-keep class afbba.abdcd.** { *; }
+-keep class dbcce.ecaeff.** { *; }
+-keep class fbbcdb.ddfadba.** { *; }
+-keep class bbecb.daedaf.** { *; }
+-keep class cdade.adeda.** { *; }
+-keep class bg.** {*;}
+-keep class bbcabbb.dcabfcd.** { *; }
+-keep class cfadf.caddb.** { *; }
+-keep class bdbabbdc.ffafceeac.** { *; }
+-keep class bd.** {*;}
+-keep class ccbd.abca.** { *; }
+-keep class j.** {*;}
+-keep class fbeebae.ebcadebe.** { *; }
+-keep class aaecbd.bfafacd.** { *; }
+-keep class fcef.caffe.** { *; }
+-keep class decd.efffc.** { *; }
+-keep class cdfaac.caaeba.** { *; }
+-keep class fdab.dbaad.** { *; }
+-keep class dbcdb.edafab.** { *; }
+-keep class feacbcff.edcaafbbb.** { *; }
+-keep class ebdeaeb.dbccefdb.** { *; }
+-keep class feacdf.cefdbd.** { *; }
+-keep class efbbc.adeda.** { *; }
+-keep class bccd.dddee.** { *; }
+-keep class faafdf.cefbbcb.** { *; }
+-keep class fcebb.eebee.** { *; }
+-keep class cedec.faddde.** { *; }
+-keep class affae.fcdff.** { *; }
+
+-keep class eecdc.cddbfa.** { *; }
+-keep class fddd.dbae.** { *; }
+-keep class defceb.bddedaa.** { *; }
+-keep class decd.efffc.** { *; }
+
+-keep class bbfeef.fdaefba.** { *; }
+-keep class baf.edaf.** { *; }
+-keep class acdb.aacb.** { *; }
+-keep class bacfcf.dddbef.** { *; }
+-keep class cfeaf.ddccec.** { *; }

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

@@ -1,28 +0,0 @@
-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());
-    }
-
-}

app/src/main/assets/hot_region.json

@@ -0,0 +1 @@
+[{"name":"Taiwan","abbr":"TW","mcc":"466","code":"886"},{"name":"Hong Kong","abbr":"HK","mcc":"454","code":"852"},{"name":"Singapore","abbr":"SG","mcc":"525","code":"65"},{"name":"Malaysia","abbr":"MY","mcc":"502","code":"60"},{"name":"China","abbr":"CN","mcc":"460","code":"86"}]

app/src/main/assets/supplierconfig.json

@@ -1,17 +0,0 @@
-{
-  "supplier":{
-    "vivo":{
-      "appid":"100215079"
-    },
-    "xiaomi":{
-
-    },
-    "huawei":{
-
-    },
-    "oppo":{
-
-    }
-  }
-
-}