fix:修复房间榜单入口背景圆角大小问题

fix:区分个播小时榜落地页

.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;
-    }
-
-}

app/build.gradle

@@ -1,26 +1,31 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'com.tencent.vasdolly'
-apply from: '../mob.gradle'
+apply from: '../project.gradle'
 
-def onlyArm64 = Boolean.parseBoolean(only_arm64)
+apply plugin: "com.bytedance.android.aabResGuard"
+apply plugin: "xml-class-guard"
 
 android {
     compileSdkVersion COMPILE_SDK_VERSION.toInteger()
 
     defaultConfig {
-        applicationId "fun.peki.live"
+        applicationId isolationMode ? 'com.example.gogo' : 'app.hiyoo.fun'
         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
 
         flavorDimensions 'default'
+        buildConfigField "boolean", "ISOLATION_MODE", "$isolationMode"
 
-        manifestPlaceholders = [CRASHLYTICS_COLLECTION_ENABLED: CRASHLYTICS_COLLECTION_ENABLED.toBoolean()]
+        if (isolationMode) {
+            resValue "string", "app_name", "Hi-debug"
+        } else {
+            resValue "string", "app_name", "Hiyoo"
+        }
     }
 
     splits {
@@ -58,7 +63,7 @@ android {
             if (abi == null) {
                 abi = "universal"
             }
-            outputFileName = "peki_${buildType.name}_v${defaultConfig.versionName}_${abi}_${date}.apk"
+            outputFileName = "hiyoo_${buildType.name}_v${defaultConfig.versionName}_${abi}_${date}.apk"
         }
     }
 
@@ -78,24 +83,23 @@ android {
 
     signingConfigs {
 
-        v2 {
-            storeFile file('../pikolive.jks')
-            storePassword "pikolive2023"
-            keyAlias "pikolive"
-            keyPassword "pikolive2023"
+        debug {
+            storeFile file('../app_debug.jks')
+            storePassword "debug2023"
+            keyAlias "debug"
+            keyPassword "debug2023"
             v2SigningEnabled true
             v1SigningEnabled true
         }
 
-        v1 {
-            storeFile file('../pikolive.jks')
-            storePassword "pikolive2023"
-            keyAlias "pikolive"
-            keyPassword "pikolive2023"
-            v2SigningEnabled false
+        release {
+            storeFile file('../hiyoo.jks')
+            storePassword "hiyoo2023"
+            keyAlias "hiyoo"
+            keyPassword "hiyoo2023"
+            v2SigningEnabled true
             v1SigningEnabled true
         }
-
     }
 
     sourceSets {
@@ -117,7 +121,7 @@ android {
                     'src/module_treasure_box/java',
                     'src/module_community/java',
                     'src/module_album/java',
-                    'src/module_other/java',
+
             ]
 
             res.srcDirs = [
@@ -137,7 +141,6 @@ android {
                     'src/module_treasure_box/res',
                     'src/module_community/res',
                     'src/module_album/res',
-                    'src/module_other/res',
 
             ]
 
@@ -146,8 +149,8 @@ android {
     }
 
     buildTypes {
-        def server_url_debug = '"http://beta.api.pikolive.fun/"'
-        def server_url_release = '"https://api.pikolive.fun/"'
+        def server_url_debug = '"http://beta.api.hiyoo.fun/"'
+        def server_url_release = '"https://api.hiyoo.fun/"'
 
         debug {
             println("minifyEnabled = " + minify_enabled)
@@ -162,7 +165,7 @@ android {
             minifyEnabled minify_enabled.toBoolean() // 是否混淆
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             crunchPngs false // 停用 PNG 压缩
-            signingConfig signingConfigs.v2
+            signingConfig isolationMode ? signingConfigs.debug : signingConfigs.release
             gradle.taskGraph.whenReady {
                 tasks.each { task ->
                     if (task.name.contains("Test") || task.name.contains("Lint")) {
@@ -188,7 +191,7 @@ android {
             shrinkResources true // 开了混淆的时候才能开启 是否去除无效的资源文件
             zipAlignEnabled true // 开了混淆的时候才能开启 是否进行压缩并重排列
             crunchPngs true // 启用 PNG 压缩
-            signingConfig signingConfigs.v2
+            signingConfig isolationMode ? signingConfigs.debug : signingConfigs.release
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -211,14 +214,8 @@ def Lombok = "1.18.24"
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
     implementation fileTree(dir: 'aliyun-libs', include: ['*.jar', '*.aar'])
-    implementation 'androidx.appcompat:appcompat:1.4.2'
-    implementation 'com.google.android.material:material:1.6.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     api 'androidx.multidex:multidex:2.0.1'
 
@@ -238,9 +235,8 @@ 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.4.0'
+    annotationProcessor 'androidx.annotation:annotation:1.6.0'
 
     implementation 'io.github.h07000223:flycoTabLayout:3.0.0'
 
@@ -261,7 +257,7 @@ dependencies {
     //数字滚动效果
     implementation 'com.github.YvesCheung:RollingText:1.2.3'
     // 引入原有第三方裁图源码，方便修改
-    api project(':android_crop_lib')
+    api project(':libs:lib_crop')
 
     //rx权限请求框架
     implementation('com.github.tbruyelle:rxpermissions:0.10.2') {
@@ -274,12 +270,12 @@ dependencies {
 
     implementation 'com.github.fodroid:XRadioGroup:v1.5'
 
-    api 'com.tencent.vasdolly:helper:3.0.3'
+    api 'com.tencent.vasdolly:helper:3.0.6'
     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'
 
@@ -301,15 +297,19 @@ dependencies {
     //wheelView
     implementation 'com.contrarywind:wheelview:4.1.0'
 
-    implementation 'tech.sud.mgp:SudMGP-static:1.3.3.1158'
+//    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}
-    def only64 = onlyArm64 ? "-only64" : ""
-    apkNameFormat = 'peki-${buildType}only64-${flavorName}-v${versionName}-${buildTime}'.replace("only64", only64)
+    apkNameFormat = 'hiyoo-${buildType}-${flavorName}-v${versionName}-${buildTime}'
     //快速模式：生成渠道包时不进行校验（速度可以提升10倍以上，默认为false）
     fastMode = false
     //buildTime的时间格式，默认格式：yyyyMMdd-HHmmss
@@ -317,3 +317,31 @@ 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/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,8 @@
 }
 -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{*;}

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":{
-
-    }
-  }
-
-}