fix:临时方案修复WEB弹窗因导航栏导致的显示被裁剪问题

# Conflicts:
#	app/src/main/java/com/yizhuan/habu/ui/setting/SettingActivity.kt

android_crop_lib/build.gradle

@@ -26,7 +26,7 @@ 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"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }
 repositories {
     mavenCentral()

app/build.gradle

@@ -1,8 +1,7 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.google.gms.google-services'
-apply plugin: 'com.google.firebase.crashlytics'
+//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: '../mob.gradle'
 
@@ -12,7 +11,7 @@ android {
     compileSdkVersion COMPILE_SDK_VERSION.toInteger()
 
     defaultConfig {
-        applicationId "com.vele.pekolive"
+        applicationId "com.vele.habuplay"
         minSdkVersion MIN_SDK_VERSION.toInteger()
         targetSdkVersion TARGET_SDK_VERSION.toInteger()
         versionCode Integer.valueOf(version_code)
@@ -21,14 +20,18 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 
-        ndk {
-            //设置支持的SO库架构
-            abiFilters "x86", "x86_64"
-        }
-
         flavorDimensions 'default'
 
-        manifestPlaceholders = [CRASHLYTICS_COLLECTION_ENABLED: CRASHLYTICS_COLLECTION_ENABLED.toBoolean()]
+//        manifestPlaceholders = [CRASHLYTICS_COLLECTION_ENABLED: CRASHLYTICS_COLLECTION_ENABLED.toBoolean()]
+    }
+
+    splits {
+        abi {
+            enable true
+            reset()
+            include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+            universalApk true
+        }
     }
 
     bundle {
@@ -44,20 +47,29 @@ android {
     }
 
     //在apk文件后边生成版本号信息
-    android.applicationVariants.all {
-        variant ->
-            variant.outputs.all {
+    android.applicationVariants.configureEach { variant ->
+        variant.outputs.configureEach { output ->
             def date = new Date().format("MMddHHmm", TimeZone.getTimeZone("GMT+08"))
-                outputFileName = "piko_${buildType.name}_v${defaultConfig.versionName}-${date}.apk"
+
+            def outputFile = output.outputFile
+            if (outputFile == null || !outputFile.name.endsWith('.apk')) {
+                return
+            }
+
+            def abi = output.getFilter(com.android.build.OutputFile.ABI)
+            if (abi == null) {
+                abi = "universal"
+            }
+            outputFileName = "habu_${buildType.name}_v${defaultConfig.versionName}_${abi}_${date}.apk"
         }
     }
 
-    lintOptions {
+    lint {
         abortOnError false
-        disable 'MissingTranslation'
-        disable 'ExtraTranslation'
+        disable 'MissingTranslation', 'ExtraTranslation', 'ContentDescription', 'SmallSp'
     }
 
+
     dataBinding {
         enabled = true
     }
@@ -69,19 +81,19 @@ android {
     signingConfigs {
 
         v2 {
-            storeFile file('../pekolive.jks')
-            storePassword "peko2023"
-            keyAlias "pekolive"
-            keyPassword "peko2023"
+            storeFile file('../ananplay.jks')
+            storePassword "vele2021"
+            keyAlias "ananplay"
+            keyPassword "vele2021"
             v2SigningEnabled true
             v1SigningEnabled true
         }
 
         v1 {
-            storeFile file('../pekolive.jks')
-            storePassword "peko2023"
-            keyAlias "pekolive"
-            keyPassword "peko2023"
+            storeFile file('../ananplay.jks')
+            storePassword "vele2021"
+            keyAlias "ananplay"
+            keyPassword "vele2021"
             v2SigningEnabled false
             v1SigningEnabled true
         }
@@ -135,20 +147,23 @@ android {
     }
 
     buildTypes {
+        def server_url_debug = '"http://beta.api.pekolive.com/"'
+        def server_url_release = '"https://api.anan.chat/"'
 
         debug {
-            ext.enableCrashlytics = false
-            ext.alwaysUpdateBuildId = false // Firebase Crashlytics禁用更新构建ID
+            println("minifyEnabled = " + minify_enabled)
 
-            buildConfigField "String", "BASE_URL", "\"http://beta.api.pekolive.com/\""
+//            ext.enableCrashlytics = false
+//            ext.alwaysUpdateBuildId = false // Firebase Crashlytics禁用更新构建ID
+
+            buildConfigField "String", "BASE_URL", server_url_debug
             buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
             buildConfigField "String", "BASE_URL_STAGING", "BASE_URL"
-            buildConfigField "String", "BASE_URL_RELEASE", "BASE_URL"
-            minifyEnabled false // 是否混淆
-            // shrinkResources true // 开了混淆的时候才能开启 是否去除无效的资源文件
+            buildConfigField "String", "BASE_URL_RELEASE", server_url_release
+            minifyEnabled minify_enabled.toBoolean() // 是否混淆
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             crunchPngs false // 停用 PNG 压缩
             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")) {
@@ -161,12 +176,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", "\"https://api.pekolive.com/\""
+            buildConfigField "String", "BASE_URL", server_url_release
             buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
             buildConfigField "String", "BASE_URL_STAGING", "BASE_URL"
             buildConfigField "String", "BASE_URL_RELEASE", "BASE_URL"
@@ -200,6 +215,9 @@ dependencies {
     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'
 
@@ -267,15 +285,15 @@ dependencies {
     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'
 
@@ -285,7 +303,6 @@ dependencies {
     implementation 'com.contrarywind:wheelview:4.1.0'
 
     implementation 'tech.sud.mgp:SudMGP-static:1.3.3.1158'
-
 }
 
 channel {
@@ -293,7 +310,7 @@ channel {
     outputDir = new File(project.buildDir, "channelapk")
     //多渠道包的命名规则，默认为：${appName}-${versionName}-${versionCode}-${flavorName}-${buildType}-${buildTime}
     def only64 = onlyArm64 ? "-only64" : ""
-    apkNameFormat = 'piko-${buildType}only64-${flavorName}-v${versionName}-${buildTime}'.replace("only64", only64)
+    apkNameFormat = 'habu-${buildType}only64-${flavorName}-v${versionName}-${buildTime}'.replace("only64", only64)
     //快速模式：生成渠道包时不进行校验（速度可以提升10倍以上，默认为false）
     fastMode = false
     //buildTime的时间格式，默认格式：yyyyMMdd-HHmmss

app/google-services.json

@@ -1,39 +0,0 @@
-{
-  "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,35 +99,37 @@
 -keep class android.support.v7.** { *;}
 
 #----------------EventBus事件巴士-----------------
--keepclassmembers class ** {
+-keepattributes *Annotation*
+-keepclassmembers class * {
     @org.greenrobot.eventbus.Subscribe <methods>;
 }
 -keep enum org.greenrobot.eventbus.ThreadMode { *; }
-
-# Only required if you use AsyncExecutor
--keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent {
-    <init>(Java.lang.Throwable);
+# 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);
 }
-
+# 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 class com.yizhuan.habu.base.** { *; }
+-keep public class * extends com.yizhuan.habu.base.BaseMvpPresenter
 -keep public class * extends com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter
 
 # 云信自定义 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.** {*;}
+-dontwarn com.yizhuan.habu.ui.im.recent.holder.**
+-keep class com.yizhuan.habu.ui.im.recent.holder.** {*;}
+-keep class com.yizhuan.habu.ui.im.chat.** {*;}
+-keep class com.yizhuan.habu.luckymoney.viewholder.** {*;}
+-keep class com.yizhuan.habu.share.viewholder.** {*;}
+-keep class com.yizhuan.habu.public_chat_hall.msg.viewholder.** {*;}
+-keep class com.yizhuan.habu.module_hall.im.msgholder.** {*;}
+-keep class com.yizhuan.habu.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 {*;}
 
@@ -199,8 +201,8 @@
      <init>(...);
 }
 
--dontwarn com.yizhuan.erban.bindadapter.**
--keep class com.yizhuan.erban.bindadapter.** {*;}
+-dontwarn com.yizhuan.habu.bindadapter.**
+-keep class com.yizhuan.habu.bindadapter.** {*;}
 
 # Ping++ 混淆过滤
 -dontwarn com.pingplusplus.**
@@ -234,6 +236,7 @@
 -dontwarn com.yizhuan.xchat_android_core.**
 -keep class com.yizhuan.xchat_android_core.** {*;}
 -keep class com.yizhuan.treasure_box.bean.** {*;}
+-keep class com.yizhuan.habu.avroom.bean.** {*;}
 
 
 #百度统计
@@ -307,8 +310,8 @@
 -keep class com.autonavi.aps.amapapi.model.**{*;}
 
 #暂时keep这个View排查华为oom问题
--keep class com.yizhuan.erban.avroom.widget.MicroView{*;}
--keep class com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView{*;}
+-keep class com.yizhuan.habu.avroom.widget.MicroView{*;}
+-keep class com.yizhuan.habu.ui.widget.rollviewpager.RollPagerView{*;}
 
 #linkedMe
 -keep class com.microquation.linkedme.android.** { *; }
@@ -366,7 +369,7 @@
 -dontwarn com.meizu.cloud.**
 -keep class com.meizu.cloud.** {*;}
 
--keep class com.yizhuan.erban.ui.widget.AppBarLayoutBehavior {*;}
+-keep class com.yizhuan.habu.ui.widget.AppBarLayoutBehavior {*;}
 
 #ViewBinding使用的反射生成的对应Binding
 -keepclassmembers class * implements androidx.viewbinding.ViewBinding {

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

@@ -1,4 +1,4 @@
-package com.yizhuan.erban;
+package com.yizhuan.habu;
 
 import static org.junit.Assert.assertEquals;
 
@@ -22,7 +22,7 @@ public class ExampleInstrumentedTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("com.yizhuan.erban_android_client", appContext.getPackageName());
+        assertEquals("com.yizhuan.habu_android_client", appContext.getPackageName());
     }
 
 }

app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.yizhuan.erban">
+    package="com.yizhuan.habu">
 
     <uses-sdk tools:overrideLibrary="com.huawei.android.hms.base,com.huawei.android.hms.push" />
 
@@ -92,6 +92,7 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:resizeableActivity="true"
         android:supportsRtl="true"
+        android:testOnly="false"
         android:theme="@style/MyMaterialTheme"
         tools:replace="android:name,android:allowBackup"
         tools:targetApi="n">
@@ -112,23 +113,23 @@
             则需要考虑发起的intent会出现相同应用图标的选择对话框的情况
             参考集成文档:https://www.linkedme.cc/docs/page4.html#link1
             -->
-            <intent-filter>
+<!--            <intent-filter>-->
 
-                <!-- 此处scheme值需要替换为后台设置中的scheme值 -->
-                <action android:name="android.intent.action.VIEW" />
+<!--                &lt;!&ndash; 此处scheme值需要替换为后台设置中的scheme值 &ndash;&gt;-->
+<!--                <action android:name="android.intent.action.VIEW" />-->
 
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--                <category android:name="android.intent.category.BROWSABLE" />-->
 
-                <data
-                    android:host="main"
-                    android:scheme="pikoapp" />
-            </intent-filter>
+<!--                <data-->
+<!--                    android:host="main"-->
+<!--                    android:scheme="pikoapp" />-->
+<!--            </intent-filter>-->
         </activity>
 
-        <meta-data
-            android:name="firebase_crashlytics_collection_enabled"
-            android:value="${CRASHLYTICS_COLLECTION_ENABLED}" /> <!-- 刘海屏适配 begin -->
+<!--        <meta-data-->
+<!--            android:name="firebase_crashlytics_collection_enabled"-->
+<!--            android:value="${CRASHLYTICS_COLLECTION_ENABLED}" /> &lt;!&ndash; 刘海屏适配 begin &ndash;&gt;-->
         <!-- 小米 -->
         <activity
             android:name="com.soundcloud.android.crop.CropImageActivity"
@@ -161,7 +162,7 @@
            如果 SDKOptions 中提供了，取 SDKOptions 中的值。
         -->
         <activity
-            android:name="com.vele.pekolive.lineapi.LineAuthenticationCallbackActivity"
+            android:name="com.vele.habuplay.lineapi.LineAuthenticationCallbackActivity"
             android:exported="true"
             android:launchMode="singleTask"
             android:noHistory="true">
@@ -222,7 +223,7 @@
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
-            android:label="Piko"
+            android:label="Habu Live"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan|stateAlwaysHidden" /> <!-- 配置的service和receiver -->
@@ -259,12 +260,12 @@
             android:label="房间流水"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yizhuan.tutu.music.activity.AddLocalMusicListActivity"
+            android:name="com.yizhuan.habu.music.activity.AddLocalMusicListActivity"
             android:label="@string/main_androidmanifest_010"
             android:screenOrientation="portrait"
             android:theme="@style/AVRoomTheme" />
         <activity
-            android:name="com.yizhuan.tutu.music.activity.MusicListActivity"
+            android:name="com.yizhuan.habu.music.activity.MusicListActivity"
             android:label="@string/main_androidmanifest_011"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
@@ -649,7 +650,7 @@
             android:name=".module_hall.team.activity.HTeamMemberListActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yizhuan.tutu.mentoring_relationship.activity.MentoringRelationshipActivity"
+            android:name="com.yizhuan.habu.mentoring_relationship.activity.MentoringRelationshipActivity"
             android:label="@string/main_androidmanifest_030"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="stateHidden|adjustResize" />
@@ -658,26 +659,26 @@
             android:launchMode="singleTask"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity"
+            android:name="com.yizhuan.habu.room_chat.activity.NimRoomP2PMessageActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.RoomMsgActivity"
+            android:name="com.yizhuan.habu.room_chat.activity.RoomMsgActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.RoomNewbieActivity"
+            android:name="com.yizhuan.habu.room_chat.activity.RoomNewbieActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.RoomNewbieMessageActivity"
+            android:name="com.yizhuan.habu.room_chat.activity.RoomNewbieMessageActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.RoomInviteFansActivity"
+            android:name="com.yizhuan.habu.room_chat.activity.RoomInviteFansActivity"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.NimTeamRoomMessageActivity"
+            android:name="com.yizhuan.habu.room_chat.activity.NimTeamRoomMessageActivity"
             android:screenOrientation="portrait"
             android:theme="@style/room_message_activity" />
         <activity
-            android:name="com.yizhuan.tutu.room_chat.activity.NimHallTeamRoomMessageActivity"
+            android:name="com.yizhuan.habu.room_chat.activity.NimHallTeamRoomMessageActivity"
             android:screenOrientation="portrait"
             android:theme="@style/room_message_activity" />
         <activity
@@ -762,7 +763,7 @@
             android:name=".bank_card.activity.AddBankCardAgreementActivity"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.tongdaxing.erban.sadmin.RoomSAdminManagerActivity"
+            android:name="com.yizhuan.habu.sadmin.RoomSAdminManagerActivity"
             android:screenOrientation="portrait" />
         <activity
             android:name=".home.activity.CommunityNoticeAct"
@@ -829,6 +830,10 @@
         <activity
             android:name=".ui.webview.DatingRuleWebViewActivity"
             android:theme="@style/dialog_web_view_activity" />
+        <activity
+            android:name=".ui.webview.room_banner.RoomBannerWebDialogActivity"
+            android:theme="@style/dialog_web_view_activity"
+            android:windowSoftInputMode="adjustPan"  />
         <activity
             android:name=".ui.webview.TarotPayWebViewActivity"
             android:theme="@style/dialog_web_view_activity" />
@@ -957,11 +962,6 @@
             android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
             android:exported="false"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".ui.login.LoginBoundAuthCodeActivity"
-            android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
-            android:exported="false"
-            android:screenOrientation="portrait" />
         <activity
             android:name=".ui.setting.ShieldManageActivity"
             android:configChanges="screenSize|orientation|keyboardHidden|mcc|mnc|locale|touchscreen|screenLayout|keyboard|navigation|fontScale|uiMode|smallestScreenSize|layoutDirection"
@@ -1015,7 +1015,9 @@
             android:name="flutterEmbedding"
             android:value="2" />
 
-        <meta-data android:name="Mob-Https" android:value="yes"/>
+        <meta-data
+            android:name="Mob-Https"
+            android:value="yes" />
 
         <provider
             android:name="com.netease.nimlib.ipc.NIMContentProvider"
@@ -1060,29 +1062,7 @@
             android:name=".service.DaemonService"
             android:enabled="true" />
 
-        <meta-data
-            android:name="com.facebook.sdk.ApplicationId"
-            android:value="@string/facebook_app_id" />
-        <meta-data
-            android:name="com.facebook.sdk.ClientToken"
-            android:value="@string/facebook_client_token" />
-
-        <activity
-            android:name="com.facebook.FacebookActivity"
-            android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
-            android:label="@string/app_name" />
-        <activity
-            android:name="com.facebook.CustomTabActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="@string/fb_login_protocol_scheme" />
-            </intent-filter>
-        </activity>
+        <activity android:name=".avroom.room_album.RoomAlbumActivity" />
 
     </application>
 

app/src/main/java/com/jph/takephoto/app/TakePhotoActivity.java

@@ -13,8 +13,8 @@ import com.jph.takephoto.permission.InvokeListener;
 import com.jph.takephoto.permission.PermissionManager;
 import com.jph.takephoto.permission.PermissionManager.TPermissionType;
 import com.jph.takephoto.permission.TakePhotoInvocationHandler;
-import com.yizhuan.erban.R;
-import com.yizhuan.erban.base.BaseActivity;
+import com.yizhuan.habu.R;
+import com.yizhuan.habu.base.BaseActivity;
 
 /**
  * 继承这个类来让Activity获取拍照的能力<br>

app/src/main/java/com/jph/takephoto/app/TakePhotoFragment.java

@@ -12,7 +12,7 @@ import com.jph.takephoto.model.TResult;
 import com.jph.takephoto.permission.InvokeListener;
 import com.jph.takephoto.permission.PermissionManager;
 import com.jph.takephoto.permission.TakePhotoInvocationHandler;
-import com.yizhuan.erban.R;
+import com.yizhuan.habu.R;
 
 /**
  * 继承这个类来让Fragment获取拍照的能力<br>

app/src/main/java/com/jph/takephoto/app/TakePhotoFragmentActivity.java

@@ -12,7 +12,7 @@ import com.jph.takephoto.model.TResult;
 import com.jph.takephoto.permission.InvokeListener;
 import com.jph.takephoto.permission.PermissionManager;
 import com.jph.takephoto.permission.TakePhotoInvocationHandler;
-import com.yizhuan.erban.R;
+import com.yizhuan.habu.R;
 
 /**
  * 继承这个类来让Activity获取拍照的能力<br>

app/src/main/java/com/jph/takephoto/app/TakePhotoImpl.java

@@ -35,7 +35,7 @@ import com.jph.takephoto.uitl.TUriParse;
 import com.jph.takephoto.uitl.TUtils;
 import com.orhanobut.logger.Logger;
 import com.soundcloud.android.crop.Crop;
-import com.yizhuan.erban.R;
+import com.yizhuan.habu.R;
 import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
 
 import java.io.File;

app/src/main/java/com/jph/takephoto/compress/CompressImageUtil.java

@@ -7,7 +7,7 @@ import android.graphics.BitmapFactory;
 import android.os.Handler;
 
 import com.jph.takephoto.uitl.TFileUtils;
-import com.yizhuan.erban.R;
+import com.yizhuan.habu.R;
 import com.yizhuan.xchat_android_library.utils.ResUtil;
 
 import java.io.ByteArrayOutputStream;

app/src/main/java/com/jph/takephoto/model/TExceptionType.java

@@ -1,5 +1,5 @@
 package com.jph.takephoto.model;
-import com.yizhuan.erban.R;
+import com.yizhuan.habu.R;
 import com.yizhuan.xchat_android_library.utils.ResUtil;
 
 /**

app/src/main/java/com/jph/takephoto/permission/PermissionManager.java

@@ -13,7 +13,7 @@ import com.jph.takephoto.app.TakePhoto;
 import com.jph.takephoto.model.InvokeParam;
 import com.jph.takephoto.model.TContextWrap;
 import com.jph.takephoto.uitl.TConstant;
-import com.yizhuan.erban.R;
+import com.yizhuan.habu.R;
 import com.yizhuan.xchat_android_library.utils.ResUtil;
 import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
 

app/src/main/java/com/jph/takephoto/uitl/TImageFiles.java

@@ -12,7 +12,7 @@ import android.webkit.MimeTypeMap;
 
 import com.jph.takephoto.model.TException;
 import com.jph.takephoto.model.TExceptionType;
-import com.yizhuan.erban.R;
+import com.yizhuan.habu.R;
 import com.yizhuan.xchat_android_library.utils.ResUtil;
 import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
 

app/src/main/java/com/jph/takephoto/uitl/TUtils.java

@@ -20,7 +20,7 @@ import com.jph.takephoto.model.TExceptionType;
 import com.jph.takephoto.model.TImage;
 import com.jph.takephoto.model.TIntentWap;
 import com.soundcloud.android.crop.Crop;
-import com.yizhuan.erban.R;
+import com.yizhuan.habu.R;
 import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
 
 import java.io.File;