commit 8a60755b60c1f41b54b807c70fc72d9006f7d7d0
Author: zhanglei <350328959@qq.com>
Date:   Mon Jun 30 14:12:14 2025 +0800

    添加项目

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2650be5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,26 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/*
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/system/**/build/
+/captures
+.externalNativeBuild
+.cxx
+local.properties
+/system/video/build/
+/system/tuigroup/build/
+/system/tuicore/build/
+/system/tuiconversation/build/
+/system/tuicontact/build/
+/system/tuichat/build/
+/system/tuicallkit/build/
+*.apk
+app/debug/
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..bcd770c
--- /dev/null
+++ b/README.md
@@ -0,0 +1,10 @@
+# 专家端专家端安卓原生
+
+#### 介绍
+专家端专家端
+
+#### 软件架构
+软件架构说明
+使用MVVM架构
+
+
diff --git a/app/.gitignore b/app/.gitignore
new file mode 100644
index 0000000..bbf8763
--- /dev/null
+++ b/app/.gitignore
@@ -0,0 +1,18 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties
+.idea/
+.idea/gradle.xml
+.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
new file mode 100644
index 0000000..041ead2
--- /dev/null
+++ b/app/build.gradle
@@ -0,0 +1,133 @@
+plugins {
+    id 'com.android.application'
+    id 'kotlin-android'
+//    id 'kotlin-android-extensions'
+    id 'kotlin-kapt'
+    id 'org.jetbrains.kotlin.android'
+    id 'kotlin-parcelize'
+//    id 'com.huawei.agconnect'
+}
+
+android {
+    compileSdk rootProject.ext.compileSdkVersion
+
+    defaultConfig {
+        applicationId "com.yxjk.healthexpertclient"
+        minSdk rootProject.ext.minSdkVersion
+        targetSdk rootProject.ext.targetSdkVersion
+        versionCode rootProject.ext.versionCode
+        versionName rootProject.ext.versionName
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        ndk {
+            // 选择实际需要的cpu架构
+            abiFilters 'armeabi-v7a', 'arm64-v8a'//, 'x86', 'x86_64'
+        }
+//        manifestPlaceholders = [
+//                JPUSH_PKGNAME : applicationId,
+//                JPUSH_APPKEY : "4480cf772398ae1b775c91aa", //JPush 上注册的包名对应的 Appkey.
+//                JPUSH_CHANNEL : "developer-default", //暂时填写默认值即可.
+//                MEIZU_APPKEY : "MZ-魅族的APPKEY",
+//                MEIZU_APPID : "MZ-魅族的APPID",
+//                XIAOMI_APPID : "MI-小米的APPID",
+//                XIAOMI_APPKEY : "MI-小米的APPKEY",
+//                OPPO_APPKEY : "OP-oppo的APPKEY",
+//                OPPO_APPID : "OP-oppo的APPID",
+//                OPPO_APPSECRET : "OP-oppo的APPSECRET",
+//                VIVO_APPKEY : "vivo的APPKEY",
+//                VIVO_APPID : "vivo的APPID",
+//                HONOR_APPID : "Honor的APP ID"
+//        ]
+    }
+    signingConfigs{
+        release {
+            storeFile file('/key/yxjkExpert.jks')
+            storePassword "yxjk1234"
+            keyAlias "yxjk"
+            keyPassword "yxjk1234"
+            //SHA1: 48:30:3D:D2:C1:6E:E7:D5:CC:1C:24:A4:64:F5:04:19:2E:9D:F3:98
+        }
+    }
+    buildTypes {
+        debug {
+            signingConfig signingConfigs.release
+            minifyEnabled false // 开启混淆
+            shrinkResources false // 启动资源压缩
+            zipAlignEnabled true // 开启zipalign优化
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+        release {
+            signingConfig  signingConfigs.release
+            minifyEnabled false
+            shrinkResources false // 启动资源压缩
+            zipAlignEnabled true // 开启zipalign优化
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+    packagingOptions {
+        exclude 'META-INF/gradle/incremental.annotation.processors'
+        exclude 'DebugProbesKt.bin'
+    }
+    dataBinding {
+        enabled = true
+    }
+    kapt {
+        generateStubs = true
+    }
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['libs']
+            res.srcDirs = [
+                    'src/main/res-login',
+                    'src/main/res-workbench',
+                    'src/main/res-mine',
+                    'src/main/res-other',
+                    'src/main/res-im',
+                    'src/main/res'
+            ]
+        }
+    }
+}
+
+dependencies {
+    implementation project(path: ':lib_base')
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+
+    implementation rootProject.ext.androidxLibs
+    // ViewModel and LiveData
+    implementation rootProject.ext.jetpackLibs
+    /* annotationProcessor */
+    kapt rootProject.ext.annotationProcessorLibs
+    /*网络请求相关*/
+    implementation rootProject.ext.networkLibs
+    /*Glide*/
+    implementation rootProject.ext.glideLibs
+    /*AgentWeb*/
+    implementation rootProject.ext.agentWebLibs
+    /*高德地图*/
+    implementation rootProject.ext.mapLibs
+    /*极光推送*/
+//    implementation rootProject.ext.jPushLibs
+    // 其他包
+    implementation rootProject.ext.commonLibs
+//    implementation project(path: ':systemLib')
+    implementation project(path: ':system:base_resource')
+    implementation project(path: ':system:video')
+    implementation project(path: ':ninegridview')
+
+    api project(':system:tuichat')
+    api project(':system:tuicontact')
+    api project(':system:tuiconversation')
+    api project(':system:tuigroup')
+    api project(':system:tuicallkit')
+//    api project(':system:tuicallkit-7.3.4358')
+}
\ No newline at end of file
diff --git a/app/key/yxjkExpert.jks b/app/key/yxjkExpert.jks
new file mode 100644
index 0000000..f5e2dce
Binary files /dev/null and b/app/key/yxjkExpert.jks differ
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
new file mode 100644
index 0000000..0534722
--- /dev/null
+++ b/app/proguard-rules.pro
@@ -0,0 +1,229 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
+# 指定代码的压缩级别
+-optimizationpasses 5
+
+# 不忽略库中的非public的类成员
+-dontskipnonpubliclibraryclassmembers
+
+# google推荐算法
+-optimizations !code/simplification/arithmetic,!code/simplification/cast,!field/*,!class/merging/*
+
+# 避免混淆内部类、匿名类
+-keepattributes InnerClasses,EnclosingMethod
+
+# 抛出异常时保留代码行号
+-keepattributes SourceFile,LineNumberTable
+
+-verbose
+
+-printmapping proguardMapping.txt
+
+################support###############
+-keep class android.support.** { *; }
+-keep interface android.support.** { *; }
+-dontwarn android.support.**
+# Androidx的混淆
+-keep class com.google.android.material.** {*;}
+-keep class androidx.** {*;}
+-keep public class * extends androidx.**
+-keep interface androidx.** {*;}
+-dontwarn com.google.android.material.**
+-dontnote com.google.android.material.**
+-dontwarn androidx.**
+
+#kotlin
+-keep class kotlin.** { *; }
+-keep class kotlin.Metadata { *; }
+-dontwarn kotlin.**
+-keepclassmembers class **$WhenMappings {
+    <fields>;
+}
+-keepclassmembers class kotlin.Metadata {
+    public <methods>;
+}
+-assumenosideeffects class kotlin.jvm.internal.Intrinsics {
+    static void checkParameterIsNotNull(java.lang.Object, java.lang.String);
+    static void checkNotNullParameter(java.lang.Object, java.lang.String);
+}
+
+################glide###############
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep class * extends com.bumptech.glide.module.AppGlideModule {
+ <init>(...);
+}
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
+  **[] $VALUES;
+  public *;
+}
+-keep class com.bumptech.glide.load.data.ParcelFileDescriptorRewinder$InternalRewinder {
+  *** rewind();
+}
+#okhttp
+-dontwarn com.squareup.okhttp3.**
+-keep class com.squareup.okhttp3.** { *;}
+-dontwarn okio.**
+
+################retrofit###############
+-dontwarn retrofit2.**
+-keep class retrofit2.** { *; }
+-keep class io.reactivex.rxjava2.** { *; }
+-keep class org.jetbrains.kotlin.** { *; }
+-keepattributes Signature
+-keepattributes Exceptions
+
+################common###############
+
+ #实体类不参与混淆
+-keep class * implements android.os.Parcelable {
+  public static final android.os.Parcelable$Creator *;
+}
+-keepnames class * implements java.io.Serializable
+-keepattributes Signature
+-keep class **.R$* {*;}
+-ignorewarnings
+-dontwarn com.google.errorprone.annotations.Immutable
+-keepclassmembers class **.R$* {
+    public static <fields>;
+}
+
+-keepclasseswithmembernames class * { # 保持native方法不被混淆
+    native <methods>;
+}
+
+-keepclassmembers enum * {  # 使用enum类型时需要注意避免以下两个方法混淆，因为enum类的特殊性，以下两个方法会被反射调用，
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+# 保留自定义控件(继承自View)不能被混淆
+-keep public class * extends android.view.View {
+    public <init>(android.content.Context);
+    public <init>(android.content.Context, android.util.AttributeSet);
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+    public <init>(android.content.Context, android.util.AttributeSet, int, int);
+    public void set*(***);
+    *** get* ();
+}
+ -keep class * extends androidx.lifecycle.ViewModel
+ -keepclassmembers public class * extends androidx.lifecycle.ViewModel {
+     public <init>(...);
+ }
+ -keep class * implements androidx.viewbinding.ViewBinding {
+      *;
+  }
+ -keepattributes JavascriptInterface
+ -keepclassmembers class * {
+     @android.webkit.JavascriptInterface <methods>;
+ }
+ -keepclassmembers class android.webkit.WebView {
+    public *;
+ }
+ -keepclassmembers class * extends android.webkit.WebViewClient {
+     public void *(android.webkit.WebView, java.lang.String, android.graphics.Bitmap);
+     public boolean *(android.webkit.WebView, java.lang.String);
+ }
+ # 过滤注解
+ -keepattributes *Annotation*
+ -keep class * extends java.lang.annotation.Annotation { *; }
+ -keep interface * extends java.lang.annotation.Annotation { *; }
+ # 过滤泛型
+ -keepattributes Signature
+ #保持bean目录下文件不被混淆
+ -keep class com.yxjk.healthexpertclient.bean.** {*;}
+ -keep class com.btpj.lib_base.data.bean.** {*;}
+# ImmersionBar
+ -keep class com.gyf.immersionbar.* {*;}
+ -dontwarn com.gyf.immersionbar.**
+# PictureSelector
+ -keep class com.luck.picture.lib.** { *; }
+ -keep class com.luck.lib.camerax.** { *; }
+ -dontwarn com.yalantis.ucrop**
+ -keep class com.yalantis.ucrop** { *; }
+ -keep interface com.yalantis.ucrop** { *; }
+ #  BaseRecyclerViewAdapterHelper混淆
+ -keep public class * extends com.chad.library.adapter.base.viewholder.BaseViewHolder
+ -keep public class * extends com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+ -keepclassmembers class com.chad.library.adapter.base.viewholder.BaseDataBindingHolder {
+ public void *(android.view.View);
+ }
+ -keepclassmembers class * extends com.chad.library.adapter.base.viewholder.BaseDataBindingHolder {
+ public void *(android.view.View);
+ }
+# Gson
+ -keep class com.google.gson.** {*;}
+ -keep class com.google.**{*;}
+ -dontwarn com.kingja.loadsir.**
+ -keep class com.kingja.loadsir.** {*;}
+ # 对于带有回调函数的onXXEvent、**On*Listener的，不能被混淆
+ -keepclassmembers class * {
+     void *(**On*Event);
+     void *(**On*Listener);
+ }
+ # AgentWeb
+ -keep class com.just.agentweb.** {
+     *;
+ }
+ -dontwarn com.just.agentweb.**
+#EventBus
+ -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);
+ }
+# IM混淆配置
+-keep class com.tencent.imsdk.** { *; }
+# 高德地图SDK（都加上，省的以后万一加功能还得加）
+-keep   class com.amap.api.maps.**{*;}
+-keep   class com.autonavi.**{*;}
+-keep   class com.amap.api.trace.**{*;}
+# 定位
+-keep class com.amap.api.location.**{*;}
+-keep class com.amap.api.fence.**{*;}
+-keep class com.autonavi.aps.amapapi.model.**{*;}
+# 搜索
+-keep   class com.amap.api.services.**{*;}
+# 2D地图
+-keep class com.amap.api.maps2d.**{*;}
+-keep class com.amap.api.mapcore2d.**{*;}
+# 导航
+-keep class com.amap.api.navi.**{*;}
+-keep class com.autonavi.**{*;}
+# 蒲公英
+#-libraryjars libs/pgyer_sdk_x.x.jar
+-dontwarn com.pgyersdk.**
+-keep class com.pgyersdk.** { *; }
+# 极光推送
+-dontoptimize
+-dontpreverify
+
+-dontwarn cn.jpush.**
+-keep class cn.jpush.** { *; }
+-keep class * extends cn.jpush.android.service.JPushMessageReceiver { *; }
+
+-dontwarn cn.jiguang.**
+-keep class cn.jiguang.** { *; }
\ No newline at end of file
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
new file mode 100644
index 0000000..646edb3
--- /dev/null
+++ b/app/release/output-metadata.json
@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.yxjk.healthexpertclient",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 13,
+      "versionName": "1.0.23",
+      "outputFile": "app-release.apk"
+    }
+  ],
+  "elementType": "File"
+}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..5fcf6a4
--- /dev/null
+++ b/app/src/main/AndroidManifest.xml
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.yxjk.healthexpertclient"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <!--用于进行网络定位-->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"></uses-permission>
+    <!--用于访问GPS定位-->
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
+    <!--允许程序获取网络状态-->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <!--允许程序读写手机状态和身份-->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <!--用于访问wifi网络信息，wifi信息会用于进行网络定位-->
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"></uses-permission>
+    <!--用于获取wifi的获取权限，wifi信息会用来进行网络定位-->
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"></uses-permission>
+
+    <!--Android 13版本适配，细化存储权限-->
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+    <!-- 蒲公英使用，用户手机设置中允许未知来源安装包安装状态为关；-->
+    <!-- Android8.0 以后，如果要安装 apk 需要额外添加权限：-->
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <!--极光推送-->
+<!--    <uses-permission android:name="com.yxjk.healthexpertclient.permission.JPUSH_MESSAGE" />-->
+    <queries package="${applicationId}">
+        <package android:name="com.yxjk.healthexpertclient"/>
+        <intent>
+            <action android:name="android.media.action.IMAGE_CAPTURE">
+
+            </action>
+        </intent>
+        <intent>
+            <action android:name="android.media.action.ACTION_VIDEO_CAPTURE">
+
+            </action>
+        </intent>
+    </queries>
+    <application
+        android:allowBackup="false"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:taskAffinity="com.yxjk.healthexpertclient"
+        tools:replace="android:allowBackup"
+        android:allowNativeHeapPointerTagging="false"
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:usesCleartextTraffic="true"
+        android:name="com.yxjk.healthexpertclient.MyApplication"
+        android:theme="@style/Theme.HearthyClients">
+        <meta-data
+            android:name="com.amap.api.v2.apikey"
+            android:value="62fe51fa2942941774fc033ece96bbad" />
+        <!--高德定位服务-->
+        <service android:name="com.amap.api.location.APSService"></service>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.main.MainActivity"
+            android:screenOrientation="portrait"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.login.LoginActivity"
+            android:label="@string/title_login"
+            android:screenOrientation="portrait">
+
+        </activity>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.login.RetrievePassWordActivity"
+            android:label="@string/title_retrieve_password"
+            android:screenOrientation="portrait">
+        </activity>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.workbench.ConsultRecordActivity"
+            android:label="@string/title_consult_record"
+            android:screenOrientation="portrait">
+        </activity>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.workbench.ImageTextConsultDetailActivity"
+            android:label="@string/title_consult_detail"
+            android:screenOrientation="portrait">
+        </activity>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.workbench.BaseHealthyInformationActivity"
+            android:label="@string/title_consult_detail"
+            android:screenOrientation="portrait">
+        </activity>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.workbench.ArchivesDetailActivity"
+            android:label="@string/title_record_detail"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.workbench.ConsultHistoryActivity"
+            android:label="@string/title_consult_history"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.workbench.AudioVideoConsultActivity"
+            android:label="@string/title_consult_wait_confirm"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.workbench.ConsultFinishActivity"
+            android:label="@string/title_consult_wait_confirm"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.workbench.ConsultWaitStartActivity"
+            android:label="@string/title_consult_wait_confirm"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.workbench.CheckUpDetailActivity"
+            android:label="@string/title_check_up_detail"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.mine.SchedulingActivity"
+            android:label="@string/title_scheduling"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.mine.CustomSchedulingActivity"
+            android:label="@string/title_custom_scheduling"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.mine.SuspensionServiceActivity"
+            android:label="@string/title_suspension_service"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.mine.AddSuspensionAnnouncementActivity"
+            android:label="@string/title_add_suspension_announcement"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.mine.ConsultStatisticsActivity"
+            android:label="@string/title_consult_statistics"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.mine.BillRecordActivity"
+            android:label="@string/title_bill_record"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.mine.WithDrawActivity"
+            android:label="@string/title_with_draw"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.mine.EditPasswordActivity"
+            android:label="@string/title_edit_password"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.mine.PersonInfoActivity"
+            android:label="@string/title_person_info"
+            android:windowSoftInputMode="stateAlwaysHidden|adjustResize"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.mine.SettingActivity"
+            android:label="@string/title_setting"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.main.WebActivity"
+            android:label="@string/title_web_view"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.mine.GoodAtDiseaseActivity"
+            android:label="@string/title_good_at_disease"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.im.ViewLocationActivity"
+            android:label="@string/title_view_location"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.workbench.MessageListActivity"
+            android:label="@string/title_message_list"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.im.SelectLocationActivity"
+            android:label="@string/title_select_location"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name="com.yxjk.healthexpertclient.ui.workbench.BigImageActivity"
+            android:label="@string/title_image"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".ui.login.ChangePassWordActivity"
+            android:label="@string/title_image"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".ui.other.SimulateUserActivity"
+            android:label="模拟用户"
+            android:screenOrientation="portrait"/>
+        <!-- 可配置android:process参数将Service放在其他进程中；android:enabled属性不能是false -->
+        <!-- 这个是自定义Service，要继承极光JCommonService，可以在更多手机平台上使得推送通道保持的更稳定 -->
+<!--        <service android:name="com.yxjk.healthexpertclient.jpush.MyJPushService"-->
+<!--            android:enabled="true"-->
+<!--            android:exported="false"-->
+<!--            android:process=":pushcore">-->
+<!--            <intent-filter>-->
+<!--                <action android:name="cn.jiguang.user.service.action" />-->
+<!--            </intent-filter>-->
+<!--        </service>-->
+        <!-- 新的 tag/alias 接口结果返回需要开发者配置一个自定的广播 -->
+        <!-- 3.3.0开始所有事件将通过该类回调 -->
+        <!-- 该广播需要继承 JPush 提供的 JPushMessageReceiver 类, 并如下新增一个 Intent-Filter -->
+<!--        <receiver-->
+<!--            android:name="com.yxjk.healthexpertclient.jpush.MyJPushMessageReceiver"-->
+<!--            android:enabled="true"-->
+<!--            android:exported="false" >-->
+<!--            <intent-filter>-->
+<!--                <action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" />-->
+<!--                <category android:name="com.yxjk.healthexpertclient" />-->
+<!--            </intent-filter>-->
+<!--        </receiver>-->
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/app/src/main/assets/tab.json b/app/src/main/assets/tab.json
new file mode 100644
index 0000000..67fe222
--- /dev/null
+++ b/app/src/main/assets/tab.json
@@ -0,0 +1,23 @@
+{
+  "textColorNormal": "#A4A3A3",
+  "textColorSelected": "#21BEBD",
+  "textSizeNormal": 12,
+  "textSizeSelected": 12,
+  "backgroundColor": "#e9e9e9",
+  "isNameResId": false,
+  "isTitleVisible": true,
+  "tabs": [
+    {
+      "tabName": "工作台",
+      "tabTag": "WorkbenchFragment",
+      "iconNormal": "icon_main_workbench_normal",
+      "iconSelected": "icon_main_workbench_selected"
+    },
+    {
+      "tabName": "我的",
+      "tabTag": "MineFragment",
+      "iconNormal": "icon_main_mine_normal",
+      "iconSelected": "icon_main_mine_selected"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/MyApplication.kt b/app/src/main/java/com/yxjk/healthexpertclient/MyApplication.kt
new file mode 100644
index 0000000..be00857
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/MyApplication.kt
@@ -0,0 +1,210 @@
+package com.yxjk.healthexpertclient
+
+import android.app.Activity
+import android.content.Context
+import android.os.Bundle
+import android.util.Log
+import androidx.appcompat.app.AppCompatActivity
+import com.btpj.lib_base.BaseApp
+import com.btpj.lib_base.data.local.DataStoreManager
+import com.btpj.lib_base.data.local.IpManager
+import com.btpj.lib_base.ext.hideLoading
+import com.btpj.lib_base.ext.jsonToBean
+import com.btpj.lib_base.ext.showLoading
+import com.lzy.ninegrid.NineGridView
+import com.yxjk.healthexpertclient.bean.AppUpdateBean
+import com.yxjk.healthexpertclient.ext.startLoginActivity
+import com.yxjk.healthexpertclient.ext.userSigExpired
+import com.yxjk.healthexpertclient.ui.main.viewmodel.AppViewModel
+import com.yxjk.healthexpertclient.utils.BrandUtil
+import com.yxjk.healthexpertclient.utils.CustomActivityManager
+import com.yxjk.healthexpertclient.utils.DebuggerUtils
+import com.yxjk.healthexpertclient.utils.NineGridViewImageLoader
+import com.yxjk.healthexpertclient.utils.updateplugin.CheckUpdateAppVersion
+import com.yxjk.healthexpertclient.view.CustomDownloadNotifier
+import com.yxjk.healthexpertclient.view.CustomInstallNotifier
+import com.yxjk.healthexpertclient.view.CustomUpdateNotifier
+import com.tencent.imsdk.v2.V2TIMManager
+import com.tencent.imsdk.v2.V2TIMValueCallback
+import com.tencent.qcloud.tuicore.TUILogin
+import com.tencent.qcloud.tuicore.interfaces.TUILoginListener
+import com.tencent.qcloud.tuicore.util.ErrorMessageConverter
+import com.tencent.qcloud.tuikit.tuichat.config.TUIChatConfigs
+import com.tencent.qcloud.tuikit.tuichat.interfaces.IMInputViewActionListener
+import org.json.JSONException
+import org.json.JSONObject
+import org.lzh.framework.updatepluginlib.UpdateConfig
+import org.lzh.framework.updatepluginlib.base.UpdateParser
+import org.lzh.framework.updatepluginlib.base.UpdateStrategy
+import org.lzh.framework.updatepluginlib.model.CheckEntity
+import org.lzh.framework.updatepluginlib.model.Update
+
+class MyApplication : BaseApp() {
+    val TAG = MyApplication::class.java.simpleName
+    companion object {
+        lateinit var appViewModel: AppViewModel
+    }
+    override fun onCreate() {
+        super.onCreate()
+        appViewModel = getAppViewModelProvider()[AppViewModel::class.java]
+        appViewModel.init()
+        initBuildInformation()
+        initLoginStatusListener()
+        NineGridView.setImageLoader(NineGridViewImageLoader())
+        initUpdateApp()
+        initJPushSdk()
+        DataStoreManager.initialize(this)
+        DebuggerUtils.checkDebuggableInNotDebugModel(this)
+        TUIChatConfigs.getConfigs().imInputViewActionListener =
+            IMInputViewActionListener { workType, workId ->
+                var activity = CustomActivityManager.getInstance().currentActivity()
+                if(activity is AppCompatActivity){
+                    activity?.showLoading()
+                }
+                appViewModel.finishIMChat(workType, workId, finallyCall = {
+                    hideLoading()
+                })
+            }
+        registerActivityLifecycleCallbacks(AdjustLifecycleCallbacks())
+    }
+    override fun attachBaseContext(base: Context) {
+        super.attachBaseContext(base)
+    }
+    /**
+     * 初始化极光推送
+     */
+    private fun initJPushSdk(){
+//        JPushInterface.setDebugMode(true)
+//        // 调整点一：初始化代码前增加setAuth调用
+//        var isPrivacyReady: Boolean = true // app根据是否已弹窗获取隐私授权来赋值
+//        if (!isPrivacyReady) {
+//            JCollectionAuth.setAuth(this, false) // 后续初始化过程将被拦截
+//        }
+//        JPushInterface.init(this)
+//        // 调整点二：隐私政策授权获取成功后调用
+//        JCollectionAuth.setAuth(this, true); //如初始化被拦截过，将重试初始化过程
+    }
+    private fun initUpdateApp(){
+        UpdateConfig.getConfig()
+            .setCheckWorker(CheckUpdateAppVersion::class.java)
+            //为了通过原检查更新库的检查随便传入的地址，实际请求参考CheckUpdateAppVersion.class
+            .setCheckEntity(CheckEntity().setUrl("https://www.baidu.com"))
+            .setCheckNotifier(CustomUpdateNotifier())
+            .setInstallNotifier(CustomInstallNotifier())
+            .setDownloadNotifier(CustomDownloadNotifier())
+            .setUpdateParser(object : UpdateParser() {
+                override fun parse(response: String?): Update {
+                    val resultBean: AppUpdateBean? = response.jsonToBean(AppUpdateBean::class.java)
+                    val update = Update()
+                    if(resultBean == null){
+                        return update
+                    }
+                    // 此apk包的下载地址
+                    update.updateUrl = IpManager.getImageBaseUrl()+resultBean.appUrl
+                    // 此apk包的版本号(因接口只有在有更新时才会返回数据，而且没有返回云端APP版本号，故将当前APP版本号+1，传给更新框架用作判断有新版本)
+                    update.versionCode = resultBean.versionNo ?: 0
+                    // 此apk包的版本名称
+                    update.versionName = resultBean.versionName
+                    // 此apk包的更新内容
+                    update.updateContent = resultBean.updateContent
+                    // 此apk包是否为强制更新
+                    if (resultBean != null) {
+                        update.isForced = 1 == resultBean.forced
+                    }else{
+                        update.isForced = false
+                    }
+                    // 是否显示忽略此次版本更新按钮
+                    update.isIgnore = 1 == resultBean.ignoreFlag
+                    return update
+                }
+            }).updateStrategy = object : UpdateStrategy() {
+            override fun isShowUpdateDialog(update: Update): Boolean {
+                // 是否在检查到有新版本更新时展示Dialog。
+                return true
+            }
+
+            override fun isAutoInstall(): Boolean {
+                // 是否自动更新.当为自动更新时。代表下载成功后不通知用户。直接调起安装。
+                return true
+            }
+
+            override fun isShowDownloadDialog(): Boolean {
+                // 在APK下载时。是否显示下载进度的Dialog
+                return true
+            }
+        }
+    }
+    private fun initBuildInformation() {
+        try {
+            val buildInfoJson = JSONObject()
+            buildInfoJson.put("buildBrand", BrandUtil.getBuildBrand())
+            buildInfoJson.put("buildManufacturer", BrandUtil.getBuildManufacturer())
+            buildInfoJson.put("buildModel", BrandUtil.getBuildModel())
+            buildInfoJson.put("buildVersionRelease", BrandUtil.getBuildVersionRelease())
+            buildInfoJson.put("buildVersionSDKInt", BrandUtil.getBuildVersionSDKInt())
+            // 工信部要求 app 在运行期间只能获取一次设备信息。因此 app 获取设备信息设置给 SDK 后，SDK 使用该值并且不再调用系统接口。
+            V2TIMManager.getInstance().callExperimentalAPI(
+                "setBuildInfo",
+                buildInfoJson.toString(),
+                object : V2TIMValueCallback<Any?> {
+                    override fun onSuccess(o: Any?) {
+                        Log.i(TAG, "setBuildInfo success")
+                    }
+
+                    override fun onError(code: Int, desc: String) {
+                        Log.i(
+                            TAG,
+                            "setBuildInfo code:" + code + " desc:" + ErrorMessageConverter.convertIMError(
+                                code,
+                                desc
+                            )
+                        )
+                    }
+                })
+        } catch (e: JSONException) {
+            e.printStackTrace()
+        }
+    }
+
+    private fun initLoginStatusListener() {
+        TUILogin.addLoginListener(loginStatusListener)
+    }
+
+    private val loginStatusListener: TUILoginListener = object : TUILoginListener() {
+        override fun onKickedOffline() {
+            startLoginActivity(CustomActivityManager.getInstance().currentActivity())
+        }
+
+        override fun onUserSigExpired() {
+            CustomActivityManager.getInstance().currentActivity().userSigExpired()
+        }
+    }
+    private class AdjustLifecycleCallbacks : ActivityLifecycleCallbacks {
+        override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
+            println("路径" + activity.javaClass.name)
+            CustomActivityManager.getInstance().addActivity(activity)
+        }
+
+        override fun onActivityStarted(activity: Activity) {
+        }
+
+        override fun onActivityResumed(activity: Activity) {
+
+        }
+
+        override fun onActivityPaused(activity: Activity) {
+
+        }
+
+        override fun onActivityStopped(activity: Activity) {
+        }
+
+        override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
+        }
+
+        override fun onActivityDestroyed(activity: Activity) {
+            CustomActivityManager.getInstance().removeActivity(activity)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/base/BaseActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/base/BaseActivity.kt
new file mode 100644
index 0000000..83c1b6b
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/base/BaseActivity.kt
@@ -0,0 +1,95 @@
+package com.buddy.kredit.android.base
+
+import android.content.Intent
+import android.os.Bundle
+import android.os.SystemClock
+import androidx.databinding.ViewDataBinding
+import com.btpj.lib_base.base.BaseVMBActivity
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.data.local.DataStoreManager
+import com.yxjk.healthexpertclient.ext.startLoginActivity
+import com.yxjk.healthexpertclient.utils.CustomActivityManager
+import retrofit2.HttpException
+
+
+/**
+ * 继承自BaseVMBActivity
+ * 在这里只做了统一处理跳转登录页面的逻辑
+ *
+ * @author nanfeifei  2021/11/23
+ */
+abstract class BaseActivity<VM : BaseViewModel, B : ViewDataBinding>(contentViewResId: Int) :
+    BaseVMBActivity<VM, B>(contentViewResId) {
+    override fun createObserve() {
+        super.createObserve()
+        mViewModel.errorResponse.observe(this) {
+            if (it?.code == 401) {
+                startLoginActivity(this)
+            }
+        }
+        mViewModel.exception.observe(this){
+            if(it is HttpException){
+                if(it.code() == 401){
+                    startLoginActivity(this)
+                }
+            }
+        }
+    }
+    fun isLogin(): Boolean{
+        return if(!DataStoreManager.isLogin()){
+            startLoginActivity(this)
+            false
+        }else{
+            true
+        }
+    }
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+//        CustomActivityManager.getInstance().addActivity(this)
+    }
+
+    override fun onBackEvent() {
+        CustomActivityManager.getInstance().printActivity()
+        super.onBackEvent()
+    }
+
+    /**
+     * 每次启动activity都会调用此方法
+     */
+    override fun startActivity(intent: Intent) {
+        if (checkDoubleClick(intent)){
+            super.startActivity(intent)
+        }
+
+    }
+
+    private var mActivityJumpTag //activity跳转tag
+            : String? = null
+    private var mClickTime //activity跳转时间
+            : Long = 0
+
+    /**
+     * 检查是否重复跳转，不需要则重写方法并返回true
+     */
+    protected open fun checkDoubleClick(intent: Intent): Boolean {
+        // 默认检查通过
+        var result = true
+        // 标记对象
+        val tag: String? = if (intent.component != null) { // 显式跳转
+            intent.component!!.className
+        } else if (intent.action != null) { // 隐式跳转
+            intent.action
+        } else {
+            return true
+        }
+        if (tag == mActivityJumpTag && mClickTime >= SystemClock.uptimeMillis() - 500) {
+            // 检查不通过
+            result = false
+        }
+        // 记录启动标记和时间
+        mActivityJumpTag = tag
+        mClickTime = SystemClock.uptimeMillis()
+        return result
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/base/BaseFragment.kt b/app/src/main/java/com/yxjk/healthexpertclient/base/BaseFragment.kt
new file mode 100644
index 0000000..51aaf24
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/base/BaseFragment.kt
@@ -0,0 +1,81 @@
+package com.buddy.kredit.android.base
+
+import android.content.Intent
+import android.os.Bundle
+import android.os.SystemClock
+import androidx.databinding.ViewDataBinding
+import com.btpj.lib_base.base.BaseVMBFragment
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.data.local.DataStoreManager
+import com.yxjk.healthexpertclient.ext.startLoginActivity
+import retrofit2.HttpException
+
+/**
+ * 继承自BaseVMBFragment
+ * 在这里只做了统一处理跳转登录页面的逻辑
+ *
+ * @author nanfeifei  2021/11/23
+ */
+abstract class BaseFragment<VM : BaseViewModel, B : ViewDataBinding>(contentViewResId: Int) :
+    BaseVMBFragment<VM, B>(contentViewResId) {
+
+    override fun createObserve() {
+        super.createObserve()
+        mViewModel.errorResponse.observe(viewLifecycleOwner) {
+            if (it?.code == 401) { // 需要登录
+                startLoginActivity(requireContext())
+            }
+        }
+        mViewModel.exception.observe(this){
+            if(it is HttpException){
+                if(it.code() == 401){
+                    startLoginActivity(requireContext())
+                }
+            }
+        }
+    }
+    fun isLogin(): Boolean{
+        return if(!DataStoreManager.isLogin()){
+            startLoginActivity(requireContext())
+            false
+        }else{
+            true
+        }
+    }
+    /**
+     * 每次启动activity都会调用此方法
+     */
+    override fun startActivity(intent: Intent, options: Bundle?) {
+        if (checkDoubleClick(intent)){
+            super.startActivity(intent)
+        }
+    }
+    private var mActivityJumpTag //activity跳转tag
+            : String? = null
+    private var mClickTime //activity跳转时间
+            : Long = 0
+
+    /**
+     * 检查是否重复跳转，不需要则重写方法并返回true
+     */
+    protected open fun checkDoubleClick(intent: Intent): Boolean {
+        // 默认检查通过
+        var result = true
+        // 标记对象
+        val tag: String? = if (intent.component != null) { // 显式跳转
+            intent.component!!.className
+        } else if (intent.action != null) { // 隐式跳转
+            intent.action
+        } else {
+            return true
+        }
+        if (tag == mActivityJumpTag && mClickTime >= SystemClock.uptimeMillis() - 500) {
+            // 检查不通过
+            result = false
+        }
+        // 记录启动标记和时间
+        mActivityJumpTag = tag
+        mClickTime = SystemClock.uptimeMillis()
+        return result
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/AppUpdateBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/AppUpdateBean.kt
new file mode 100644
index 0000000..ed06e82
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/AppUpdateBean.kt
@@ -0,0 +1,16 @@
+package com.yxjk.healthexpertclient.bean
+
+data class AppUpdateBean(
+    var appId: String = "",
+    var appName: String = "",
+    var appStatus: Int = 0,
+    var appUrl: String = "",
+    var deviceType: Int = 0,
+    var forced: Int = 0,
+    var id: String = "",
+    var ignoreFlag: Int = 0,
+    var updateContent: String = "",
+    var updateTime: Any? = null,
+    var versionName: String = "",
+    var versionNo: Int = 0
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/CommonSettingMenuBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/CommonSettingMenuBean.kt
new file mode 100644
index 0000000..0710f68
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/CommonSettingMenuBean.kt
@@ -0,0 +1,14 @@
+package com.yxjk.healthexpertclient.bean
+
+
+import com.btpj.lib_base.base.adapter.BaseCheckRecycleViewAdapter
+
+/**
+ * 配置菜单
+ */
+data class CommonSettingMenuBean(
+    val value: String = "",
+    val text: String = "",
+    override val itemType: Int = -1,
+    override var checked: Boolean = false
+): BaseCheckRecycleViewAdapter.CheckItem
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/ImageBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/ImageBean.kt
new file mode 100644
index 0000000..0121f24
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/ImageBean.kt
@@ -0,0 +1,6 @@
+package com.yxjk.healthexpertclient.bean
+
+/**
+ * 类似九宫格图集使用
+ */
+data class ImageBean(var imageUrl: String = "", var isFilePath: Boolean = false, var isAddButton: Boolean = false)
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/UploadFileResultBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/UploadFileResultBean.kt
new file mode 100644
index 0000000..a70cdde
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/UploadFileResultBean.kt
@@ -0,0 +1,5 @@
+package com.yxjk.healthexpertclient.bean
+
+data class UploadFileResultBean(
+    var url: String = ""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/UserInfoBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/UserInfoBean.kt
new file mode 100644
index 0000000..1a8dbce
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/UserInfoBean.kt
@@ -0,0 +1,43 @@
+package com.yxjk.healthexpertclient.bean
+
+/**
+ * 登录成功之后返回的用户信息
+ */
+data class UserInfoBean(
+    var activitiSync: Any? = null,
+    var avatar: String = "",
+    var birthday: String = "",
+    var bpmStatus: Any? = null,
+    var clientId: Any? = null,
+    var createBy: Any? = null,
+    var createTime: String = "",
+    var delFlag: Int = 0,
+    var depart: Any? = null,
+    var departIds: Any? = null,
+    var departTree: List<Any> = listOf(),
+    var email: Any? = null,
+    var homePath: Any? = null,
+    var id: String = "",
+    var idCard: String = "",
+    var loginTenantId: Int = 0,
+    var orgCode: Any? = null,
+    var orgCodeTxt: Any? = null,
+    var personType: Any? = null,
+    var phone: String = "",
+    var post: Any? = null,
+    var postText: Any? = null,
+    var realname: String = "",
+    var relTenantIds: String = "",
+    var secondDepart: Any? = null,
+    var sex: String = "",
+    var sex_dictText: String = "",
+    var status: String = "",
+    var status_dictText: String = "",
+    var telephone: Any? = null,
+    var updateBy: String = "",
+    var updateTime: String = "",
+    var userIdentity: Any? = null,
+    var username: String = "",
+    var workNo: String = "",
+    var userToken: String = ""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/im/IMAssistantBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/im/IMAssistantBean.kt
new file mode 100644
index 0000000..02066da
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/im/IMAssistantBean.kt
@@ -0,0 +1,11 @@
+package com.yxjk.healthexpertclient.bean.im
+
+
+class IMAssistantBean(
+    var helpId: String = "",
+    var id: String = "",
+    val groupId: String,
+    val userId: String,
+    val member: ArrayList<String>,
+    val tfNew: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/im/IMInfoBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/im/IMInfoBean.kt
new file mode 100644
index 0000000..7e40488
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/im/IMInfoBean.kt
@@ -0,0 +1,7 @@
+package com.yxjk.healthexpertclient.bean.im
+
+data class IMInfoBean(
+    val userSig: String,
+    val userId: String,
+    val sdkAppId: String
+)
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/login/LoginResultBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/login/LoginResultBean.kt
new file mode 100644
index 0000000..db4ac92
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/login/LoginResultBean.kt
@@ -0,0 +1,8 @@
+package com.yxjk.healthexpertclient.bean.login
+
+import com.yxjk.healthexpertclient.bean.UserInfoBean
+
+data class LoginResultBean(
+    var token: String = "",
+    var userInfo: UserInfoBean = UserInfoBean()
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/BillRecordBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/BillRecordBean.kt
new file mode 100644
index 0000000..2b3b352
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/BillRecordBean.kt
@@ -0,0 +1,34 @@
+package com.yxjk.healthexpertclient.bean.mine
+
+data class BillRecordBean(
+    var accountMoney: String? = "",
+    var charDate: String? = "",
+    var createBy: String? = "",
+    var createTime: String? = "",
+    var delFlag: Int = 0,
+    var id: Int = 0,
+    var income: String = "",
+    var incomeTime: String? = "",
+    var memo: String? = "",
+    var operateId: String? = "",
+    var operateName: String? = "",
+    var operateType: String? = "",
+    var paymentAccount: String? = "",
+    var paymentMoney: String? = "",
+    var paymentName: String? = "",
+    var paymentTime: String? = "",
+    var realityMoney: String? = "",
+    var remarks: String? = "",
+    var sessionId: String? = "",
+    var status: Int = 0,
+    var sumIncome: String? = "",
+    var sumPaymentMoney: String? = "",
+    var updateBy: String? = "",
+    var updateTime: String? = "",
+    var userId: String? = "",
+    var userName: String? = "",
+    var withdraw: String? = "",
+    var withdrawalName: String? = "",
+    var waterType: String = "",  //1是收益 2是支出
+    var operateTypeName: String = ""
+    )
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/CommonSettingMenuBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/CommonSettingMenuBean.kt
new file mode 100644
index 0000000..8025465
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/CommonSettingMenuBean.kt
@@ -0,0 +1,13 @@
+package com.yxjk.healthexpertclient.bean.mine
+
+import com.btpj.lib_base.base.adapter.BaseCheckRecycleViewAdapter
+
+/**
+ * 暂停原因
+ */
+data class CommonSettingMenuBean(
+    val value: String,
+    val text: String,
+    override val itemType: Int = -1,
+    override var checked: Boolean = false
+): BaseCheckRecycleViewAdapter.CheckItem
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/ConsultStatisticsBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/ConsultStatisticsBean.kt
new file mode 100644
index 0000000..34e1bdf
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/ConsultStatisticsBean.kt
@@ -0,0 +1,7 @@
+package com.yxjk.healthexpertclient.bean.mine
+
+data class ConsultStatisticsBean(
+    var sumIncome: String = "",
+    var sumPaymentMoney: String = "",
+    var unsettled: String = ""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/ConsultTypeBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/ConsultTypeBean.kt
new file mode 100644
index 0000000..e708c1c
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/ConsultTypeBean.kt
@@ -0,0 +1,8 @@
+package com.yxjk.healthexpertclient.bean.mine
+
+data class ConsultTypeBean(
+    var completed: Int = 0,
+    var content_type: String = "",
+    var inProgress: Int = 0,
+    var total: Int = 0
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/DiseaseBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/DiseaseBean.kt
new file mode 100644
index 0000000..e1e616b
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/DiseaseBean.kt
@@ -0,0 +1,15 @@
+package com.yxjk.healthexpertclient.bean.mine
+
+import android.os.Parcelable
+import com.btpj.lib_base.base.adapter.BaseCheckRecycleViewAdapter
+import kotlinx.android.parcel.Parcelize
+
+@Parcelize
+data class DiseaseBean(
+    var departmentId: String = "",
+    var descript: String = "",
+    var id: String = "",
+    var sicksName: String = "",
+    override val itemType: Int = -1,
+    override var checked: Boolean = false
+): BaseCheckRecycleViewAdapter.CheckItem, Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/DoctorBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/DoctorBean.kt
new file mode 100644
index 0000000..eed4f28
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/DoctorBean.kt
@@ -0,0 +1,54 @@
+package com.yxjk.healthexpertclient.bean.mine
+
+/**
+ * 专家信息实体
+ */
+data class DoctorBean(
+    var address: String? = null,
+    var award: String? = null,
+    var contactAddress: String? = null,
+    var createBy: String? = null,
+    var createTime: String? = null,
+    var degreeHeat: String? = null,
+    var delFlag: Int = 0,
+    var departmentId: String = "",
+    var departmentName: String? = null,
+    var doctorJob: String = "",
+    var doctorLabel: String? = null,
+    var doctorName: String = "",
+    var doctorStatus: String = "",
+    var doctorTitle: String = "",
+    var eq: String? = null,
+    var experience: String = "",
+    var gdId: String = "",
+    var goodAt: String = "",
+    var goodAtSymptom: String = "",
+    var healthStatus: String? = null,
+    var id: String = "",
+    var introduction: String? = null,
+    var isAccept: String = "",
+    var joinWork: String? = null,
+    var memo: String? = null,
+    var messageNum: String? = null,
+    var nationality: String? = null,
+    var nativePlace: String? = null,
+    var onDutyTime: String? = null,
+    var outTime: String? = null,
+    var overallMerit: String? = null,
+    var photo: String? = null,
+    var replyNum: String? = null,
+    var resourceId: String = "",
+    var resourceName: String? = null,
+    var responseRate: String? = null,
+    var school: String? = null,
+    var sort: String = "",
+    var status: Int = 0,
+    var tfRecommend: String = "",
+    var type: String = "",
+    var updateBy: String? = null,
+    var updateTime: String? = null,
+    var userScore: String = "",
+    var userScoreNum: String = "",
+    var goodAtSickness: String? = "",
+    var goodAtSicknessName: MutableList<DiseaseBean>? = null
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/PageManagerBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/PageManagerBean.kt
new file mode 100644
index 0000000..649b66d
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/PageManagerBean.kt
@@ -0,0 +1,9 @@
+package com.yxjk.healthexpertclient.bean.mine
+
+data class PageManagerBean<T>(
+    var current: Int = 0,
+    var pages: Int = 0,
+    var records: MutableList<T> = mutableListOf(),
+    var size: Int = 0,
+    var total: Int = 0
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/SchedulingBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/SchedulingBean.kt
new file mode 100644
index 0000000..d6c28b2
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/SchedulingBean.kt
@@ -0,0 +1,17 @@
+package com.yxjk.healthexpertclient.bean.mine
+
+import com.btpj.lib_base.base.adapter.BaseCheckRecycleViewAdapter
+
+data class SchedulingBean(
+    var amNum: String? = "0",
+    var id: String? = "",
+    var pmNum: String? = "0",
+    var tfJumpHoliday: String? = "",
+    var type: String? = "",
+    var week: String? = "",
+    var timePeriod: Int = 0,
+    var tfDefault: String? = "",
+    var consultSwitchOn: Boolean = true,
+    override val itemType: Int = -1,
+    override var checked: Boolean = false
+): BaseCheckRecycleViewAdapter.CheckItem
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/SchedulingResultBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/SchedulingResultBean.kt
new file mode 100644
index 0000000..2c51349
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/SchedulingResultBean.kt
@@ -0,0 +1,8 @@
+package com.yxjk.healthexpertclient.bean.mine
+
+data class SchedulingResultBean(
+    var list: MutableList<SchedulingBean>,
+    var tfJumpHoliday: String,
+    var tfDefault: String,
+    var audioStatus: String
+)
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/SuspensionServiceBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/SuspensionServiceBean.kt
new file mode 100644
index 0000000..ed5170f
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/mine/SuspensionServiceBean.kt
@@ -0,0 +1,24 @@
+package com.yxjk.healthexpertclient.bean.mine
+
+import com.chad.library.adapter.base.entity.SectionEntity
+
+data class SuspensionServiceBean(
+    var createBy: String? = "",
+    var createTime: String? = "",
+    var delFlag: Int? = 0,
+    var doctorId: String? = "",
+    var doctorName: String? = "",
+    var endDay: String? = "",
+    var id: String? = "",
+    var memo: String? = "",
+    var notice: String? = "",
+    var serviceStatus: Int? = 0,
+    var startDay: String? = "",
+    var status: Int? = null,
+    var stopReason: String? = "",
+    var updateBy: String? = "",
+    var updateTime: String? = "",
+    var startDayLong: Long = 0,
+    var endDayLong: Long = 0,
+    override val isHeader: Boolean = false
+    ): SectionEntity
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/other/UserListBean.java b/app/src/main/java/com/yxjk/healthexpertclient/bean/other/UserListBean.java
new file mode 100644
index 0000000..5f86a1e
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/other/UserListBean.java
@@ -0,0 +1,1577 @@
+package com.yxjk.healthexpertclient.bean.other;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class UserListBean {
+
+    private List<RecordsDTO> records=new ArrayList<>();
+    private Integer total;
+    private Integer size;
+    private Integer current;
+    private Integer pages;
+
+    public List<RecordsDTO> getRecords() {
+        return records;
+    }
+
+    public void setRecords(List<RecordsDTO> records) {
+        this.records = records;
+    }
+
+    public Integer getTotal() {
+        return total;
+    }
+
+    public void setTotal(Integer total) {
+        this.total = total;
+    }
+
+    public Integer getSize() {
+        return size;
+    }
+
+    public void setSize(Integer size) {
+        this.size = size;
+    }
+
+    public Integer getCurrent() {
+        return current;
+    }
+
+    public void setCurrent(Integer current) {
+        this.current = current;
+    }
+
+    public Integer getPages() {
+        return pages;
+    }
+
+    public void setPages(Integer pages) {
+        this.pages = pages;
+    }
+
+    public static class RecordsDTO {
+        private boolean isReal=false;
+        private String id;
+        private String username;
+        private String realname;
+        private String avatar;
+        private String birthday;
+        private Integer age;
+        private String sex;
+        private String sex_dictText;
+        private Object email;
+        private String phone="";
+        private String orgCode="";
+        private Object orgCodeThree;
+        private Integer loginTenantId;
+        private String status;
+        private String status_dictText;
+        private Integer delFlag;
+        private String workNo;
+        private Object post;
+        private Object telephone;
+        private Object createBy;
+        private String createTime;
+        private Object updateBy;
+        private String updateTime;
+        private Object activitiSync;
+        private Object userIdentity;
+        private Object departIds;
+        private Object departCodes;
+        private String relTenantIds;
+        private Object clientId;
+        private Object homePath;
+        private Object postText;
+        private Object bpmStatus;
+        private String idCard="";
+        private Object postageCode;
+        private String userGroup;
+        private String userGroupUpdateTime;
+        private String personType;
+        private String personType_dictText;
+        private List<String> departTree;
+        private SecondDepartDTO secondDepart;
+        private ThreeDepartDTO threeDepart;
+        private DepartDTO depart;
+        private Object postId;
+        private Object roleCodes;
+        private Integer familyNum;
+        private Object client;
+        private String orgCodeTxt;
+
+        public boolean isReal() {
+            return isReal;
+        }
+
+        public void setReal(boolean real) {
+            isReal = real;
+        }
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getUsername() {
+            return username;
+        }
+
+        public void setUsername(String username) {
+            this.username = username;
+        }
+
+        public String getRealname() {
+            return realname;
+        }
+
+        public void setRealname(String realname) {
+            this.realname = realname;
+        }
+
+        public String getAvatar() {
+            return avatar;
+        }
+
+        public void setAvatar(String avatar) {
+            this.avatar = avatar;
+        }
+
+        public String getBirthday() {
+            return birthday;
+        }
+
+        public void setBirthday(String birthday) {
+            this.birthday = birthday;
+        }
+
+        public Integer getAge() {
+            return age;
+        }
+
+        public void setAge(Integer age) {
+            this.age = age;
+        }
+
+        public String getSex() {
+            return sex;
+        }
+
+        public void setSex(String sex) {
+            this.sex = sex;
+        }
+
+        public String getSex_dictText() {
+            return sex_dictText;
+        }
+
+        public void setSex_dictText(String sex_dictText) {
+            this.sex_dictText = sex_dictText;
+        }
+
+        public Object getEmail() {
+            return email;
+        }
+
+        public void setEmail(Object email) {
+            this.email = email;
+        }
+
+        public String getPhone() {
+            return phone;
+        }
+
+        public void setPhone(String phone) {
+            this.phone = phone;
+        }
+
+        public String getOrgCode() {
+            return orgCode;
+        }
+
+        public void setOrgCode(String orgCode) {
+            this.orgCode = orgCode;
+        }
+
+        public Object getOrgCodeThree() {
+            return orgCodeThree;
+        }
+
+        public void setOrgCodeThree(Object orgCodeThree) {
+            this.orgCodeThree = orgCodeThree;
+        }
+
+        public Integer getLoginTenantId() {
+            return loginTenantId;
+        }
+
+        public void setLoginTenantId(Integer loginTenantId) {
+            this.loginTenantId = loginTenantId;
+        }
+
+        public String getStatus() {
+            return status;
+        }
+
+        public void setStatus(String status) {
+            this.status = status;
+        }
+
+        public String getStatus_dictText() {
+            return status_dictText;
+        }
+
+        public void setStatus_dictText(String status_dictText) {
+            this.status_dictText = status_dictText;
+        }
+
+        public Integer getDelFlag() {
+            return delFlag;
+        }
+
+        public void setDelFlag(Integer delFlag) {
+            this.delFlag = delFlag;
+        }
+
+        public String getWorkNo() {
+            return workNo;
+        }
+
+        public void setWorkNo(String workNo) {
+            this.workNo = workNo;
+        }
+
+        public Object getPost() {
+            return post;
+        }
+
+        public void setPost(Object post) {
+            this.post = post;
+        }
+
+        public Object getTelephone() {
+            return telephone;
+        }
+
+        public void setTelephone(Object telephone) {
+            this.telephone = telephone;
+        }
+
+        public Object getCreateBy() {
+            return createBy;
+        }
+
+        public void setCreateBy(Object createBy) {
+            this.createBy = createBy;
+        }
+
+        public String getCreateTime() {
+            return createTime;
+        }
+
+        public void setCreateTime(String createTime) {
+            this.createTime = createTime;
+        }
+
+        public Object getUpdateBy() {
+            return updateBy;
+        }
+
+        public void setUpdateBy(Object updateBy) {
+            this.updateBy = updateBy;
+        }
+
+        public String getUpdateTime() {
+            return updateTime;
+        }
+
+        public void setUpdateTime(String updateTime) {
+            this.updateTime = updateTime;
+        }
+
+        public Object getActivitiSync() {
+            return activitiSync;
+        }
+
+        public void setActivitiSync(Object activitiSync) {
+            this.activitiSync = activitiSync;
+        }
+
+        public Object getUserIdentity() {
+            return userIdentity;
+        }
+
+        public void setUserIdentity(Object userIdentity) {
+            this.userIdentity = userIdentity;
+        }
+
+        public Object getDepartIds() {
+            return departIds;
+        }
+
+        public void setDepartIds(Object departIds) {
+            this.departIds = departIds;
+        }
+
+        public Object getDepartCodes() {
+            return departCodes;
+        }
+
+        public void setDepartCodes(Object departCodes) {
+            this.departCodes = departCodes;
+        }
+
+        public String getRelTenantIds() {
+            return relTenantIds;
+        }
+
+        public void setRelTenantIds(String relTenantIds) {
+            this.relTenantIds = relTenantIds;
+        }
+
+        public Object getClientId() {
+            return clientId;
+        }
+
+        public void setClientId(Object clientId) {
+            this.clientId = clientId;
+        }
+
+        public Object getHomePath() {
+            return homePath;
+        }
+
+        public void setHomePath(Object homePath) {
+            this.homePath = homePath;
+        }
+
+        public Object getPostText() {
+            return postText;
+        }
+
+        public void setPostText(Object postText) {
+            this.postText = postText;
+        }
+
+        public Object getBpmStatus() {
+            return bpmStatus;
+        }
+
+        public void setBpmStatus(Object bpmStatus) {
+            this.bpmStatus = bpmStatus;
+        }
+
+        public String getIdCard() {
+            return idCard==null?"":idCard;
+        }
+
+        public void setIdCard(String idCard) {
+            this.idCard = idCard;
+        }
+
+        public Object getPostageCode() {
+            return postageCode;
+        }
+
+        public void setPostageCode(Object postageCode) {
+            this.postageCode = postageCode;
+        }
+
+        public String getUserGroup() {
+            return userGroup;
+        }
+
+        public void setUserGroup(String userGroup) {
+            this.userGroup = userGroup;
+        }
+
+        public String getUserGroupUpdateTime() {
+            return userGroupUpdateTime;
+        }
+
+        public void setUserGroupUpdateTime(String userGroupUpdateTime) {
+            this.userGroupUpdateTime = userGroupUpdateTime;
+        }
+
+        public String getPersonType() {
+            return personType;
+        }
+
+        public void setPersonType(String personType) {
+            this.personType = personType;
+        }
+
+        public String getPersonType_dictText() {
+            return personType_dictText;
+        }
+
+        public void setPersonType_dictText(String personType_dictText) {
+            this.personType_dictText = personType_dictText;
+        }
+
+        public List<String> getDepartTree() {
+            return departTree;
+        }
+
+        public void setDepartTree(List<String> departTree) {
+            this.departTree = departTree;
+        }
+
+        public SecondDepartDTO getSecondDepart() {
+            return secondDepart;
+        }
+
+        public void setSecondDepart(SecondDepartDTO secondDepart) {
+            this.secondDepart = secondDepart;
+        }
+
+        public ThreeDepartDTO getThreeDepart() {
+            return threeDepart;
+        }
+
+        public void setThreeDepart(ThreeDepartDTO threeDepart) {
+            this.threeDepart = threeDepart;
+        }
+
+        public DepartDTO getDepart() {
+            return depart;
+        }
+
+        public void setDepart(DepartDTO depart) {
+            this.depart = depart;
+        }
+
+        public Object getPostId() {
+            return postId;
+        }
+
+        public void setPostId(Object postId) {
+            this.postId = postId;
+        }
+
+        public Object getRoleCodes() {
+            return roleCodes;
+        }
+
+        public void setRoleCodes(Object roleCodes) {
+            this.roleCodes = roleCodes;
+        }
+
+        public Integer getFamilyNum() {
+            return familyNum;
+        }
+
+        public void setFamilyNum(Integer familyNum) {
+            this.familyNum = familyNum;
+        }
+
+        public Object getClient() {
+            return client;
+        }
+
+        public void setClient(Object client) {
+            this.client = client;
+        }
+
+        public String getOrgCodeTxt() {
+            return orgCodeTxt;
+        }
+
+        public void setOrgCodeTxt(String orgCodeTxt) {
+            this.orgCodeTxt = orgCodeTxt;
+        }
+
+        public static class SecondDepartDTO {
+            private String id;
+            private String parentId;
+            private String departName;
+            private Object departNameEn;
+            private Object departNameAbbr;
+            private Integer departOrder;
+            private Object description;
+            private String orgCategory;
+            private String orgType;
+            private String orgCode;
+            private String orgClass;
+            private String orgClass_dictText;
+            private Object mobile;
+            private Object fax;
+            private Object address;
+            private Object healthManageUserName;
+            private Object healthManageUserMobile;
+            private Object healthManageUserAddress;
+            private Object medialManageUserName;
+            private Object medialManageUserMobile;
+            private Object medialManageUserAddress;
+            private Object monitorManageUserName;
+            private Object monitorManageUserMobile;
+            private Object memo;
+            private String status;
+            private String status_dictText;
+            private String delFlag;
+            private String delFlag_dictText;
+            private Object qywxIdentifier;
+            private Object createBy;
+            private String createTime;
+            private Object updateBy;
+            private Object updateTime;
+            private Object lng;
+            private Object lat;
+            private Integer tenantId;
+            private Integer izLeaf;
+            private Object manager;
+            private Object directorUserIds;
+            private Object oldDirectorUserIds;
+
+            public String getId() {
+                return id;
+            }
+
+            public void setId(String id) {
+                this.id = id;
+            }
+
+            public String getParentId() {
+                return parentId;
+            }
+
+            public void setParentId(String parentId) {
+                this.parentId = parentId;
+            }
+
+            public String getDepartName() {
+                return departName;
+            }
+
+            public void setDepartName(String departName) {
+                this.departName = departName;
+            }
+
+            public Object getDepartNameEn() {
+                return departNameEn;
+            }
+
+            public void setDepartNameEn(Object departNameEn) {
+                this.departNameEn = departNameEn;
+            }
+
+            public Object getDepartNameAbbr() {
+                return departNameAbbr;
+            }
+
+            public void setDepartNameAbbr(Object departNameAbbr) {
+                this.departNameAbbr = departNameAbbr;
+            }
+
+            public Integer getDepartOrder() {
+                return departOrder;
+            }
+
+            public void setDepartOrder(Integer departOrder) {
+                this.departOrder = departOrder;
+            }
+
+            public Object getDescription() {
+                return description;
+            }
+
+            public void setDescription(Object description) {
+                this.description = description;
+            }
+
+            public String getOrgCategory() {
+                return orgCategory;
+            }
+
+            public void setOrgCategory(String orgCategory) {
+                this.orgCategory = orgCategory;
+            }
+
+            public String getOrgType() {
+                return orgType;
+            }
+
+            public void setOrgType(String orgType) {
+                this.orgType = orgType;
+            }
+
+            public String getOrgCode() {
+                return orgCode;
+            }
+
+            public void setOrgCode(String orgCode) {
+                this.orgCode = orgCode;
+            }
+
+            public String getOrgClass() {
+                return orgClass;
+            }
+
+            public void setOrgClass(String orgClass) {
+                this.orgClass = orgClass;
+            }
+
+            public String getOrgClass_dictText() {
+                return orgClass_dictText;
+            }
+
+            public void setOrgClass_dictText(String orgClass_dictText) {
+                this.orgClass_dictText = orgClass_dictText;
+            }
+
+            public Object getMobile() {
+                return mobile;
+            }
+
+            public void setMobile(Object mobile) {
+                this.mobile = mobile;
+            }
+
+            public Object getFax() {
+                return fax;
+            }
+
+            public void setFax(Object fax) {
+                this.fax = fax;
+            }
+
+            public Object getAddress() {
+                return address;
+            }
+
+            public void setAddress(Object address) {
+                this.address = address;
+            }
+
+            public Object getHealthManageUserName() {
+                return healthManageUserName;
+            }
+
+            public void setHealthManageUserName(Object healthManageUserName) {
+                this.healthManageUserName = healthManageUserName;
+            }
+
+            public Object getHealthManageUserMobile() {
+                return healthManageUserMobile;
+            }
+
+            public void setHealthManageUserMobile(Object healthManageUserMobile) {
+                this.healthManageUserMobile = healthManageUserMobile;
+            }
+
+            public Object getHealthManageUserAddress() {
+                return healthManageUserAddress;
+            }
+
+            public void setHealthManageUserAddress(Object healthManageUserAddress) {
+                this.healthManageUserAddress = healthManageUserAddress;
+            }
+
+            public Object getMedialManageUserName() {
+                return medialManageUserName;
+            }
+
+            public void setMedialManageUserName(Object medialManageUserName) {
+                this.medialManageUserName = medialManageUserName;
+            }
+
+            public Object getMedialManageUserMobile() {
+                return medialManageUserMobile;
+            }
+
+            public void setMedialManageUserMobile(Object medialManageUserMobile) {
+                this.medialManageUserMobile = medialManageUserMobile;
+            }
+
+            public Object getMedialManageUserAddress() {
+                return medialManageUserAddress;
+            }
+
+            public void setMedialManageUserAddress(Object medialManageUserAddress) {
+                this.medialManageUserAddress = medialManageUserAddress;
+            }
+
+            public Object getMonitorManageUserName() {
+                return monitorManageUserName;
+            }
+
+            public void setMonitorManageUserName(Object monitorManageUserName) {
+                this.monitorManageUserName = monitorManageUserName;
+            }
+
+            public Object getMonitorManageUserMobile() {
+                return monitorManageUserMobile;
+            }
+
+            public void setMonitorManageUserMobile(Object monitorManageUserMobile) {
+                this.monitorManageUserMobile = monitorManageUserMobile;
+            }
+
+            public Object getMemo() {
+                return memo;
+            }
+
+            public void setMemo(Object memo) {
+                this.memo = memo;
+            }
+
+            public String getStatus() {
+                return status;
+            }
+
+            public void setStatus(String status) {
+                this.status = status;
+            }
+
+            public String getStatus_dictText() {
+                return status_dictText;
+            }
+
+            public void setStatus_dictText(String status_dictText) {
+                this.status_dictText = status_dictText;
+            }
+
+            public String getDelFlag() {
+                return delFlag;
+            }
+
+            public void setDelFlag(String delFlag) {
+                this.delFlag = delFlag;
+            }
+
+            public String getDelFlag_dictText() {
+                return delFlag_dictText;
+            }
+
+            public void setDelFlag_dictText(String delFlag_dictText) {
+                this.delFlag_dictText = delFlag_dictText;
+            }
+
+            public Object getQywxIdentifier() {
+                return qywxIdentifier;
+            }
+
+            public void setQywxIdentifier(Object qywxIdentifier) {
+                this.qywxIdentifier = qywxIdentifier;
+            }
+
+            public Object getCreateBy() {
+                return createBy;
+            }
+
+            public void setCreateBy(Object createBy) {
+                this.createBy = createBy;
+            }
+
+            public String getCreateTime() {
+                return createTime;
+            }
+
+            public void setCreateTime(String createTime) {
+                this.createTime = createTime;
+            }
+
+            public Object getUpdateBy() {
+                return updateBy;
+            }
+
+            public void setUpdateBy(Object updateBy) {
+                this.updateBy = updateBy;
+            }
+
+            public Object getUpdateTime() {
+                return updateTime;
+            }
+
+            public void setUpdateTime(Object updateTime) {
+                this.updateTime = updateTime;
+            }
+
+            public Object getLng() {
+                return lng;
+            }
+
+            public void setLng(Object lng) {
+                this.lng = lng;
+            }
+
+            public Object getLat() {
+                return lat;
+            }
+
+            public void setLat(Object lat) {
+                this.lat = lat;
+            }
+
+            public Integer getTenantId() {
+                return tenantId;
+            }
+
+            public void setTenantId(Integer tenantId) {
+                this.tenantId = tenantId;
+            }
+
+            public Integer getIzLeaf() {
+                return izLeaf;
+            }
+
+            public void setIzLeaf(Integer izLeaf) {
+                this.izLeaf = izLeaf;
+            }
+
+            public Object getManager() {
+                return manager;
+            }
+
+            public void setManager(Object manager) {
+                this.manager = manager;
+            }
+
+            public Object getDirectorUserIds() {
+                return directorUserIds;
+            }
+
+            public void setDirectorUserIds(Object directorUserIds) {
+                this.directorUserIds = directorUserIds;
+            }
+
+            public Object getOldDirectorUserIds() {
+                return oldDirectorUserIds;
+            }
+
+            public void setOldDirectorUserIds(Object oldDirectorUserIds) {
+                this.oldDirectorUserIds = oldDirectorUserIds;
+            }
+        }
+
+        public static class ThreeDepartDTO {
+            private String id;
+            private String parentId;
+            private String departName;
+            private Object departNameEn;
+            private Object departNameAbbr;
+            private Object departOrder;
+            private Object description;
+            private String orgCategory;
+            private String orgType;
+            private String orgCode;
+            private String orgClass;
+            private String orgClass_dictText;
+            private Object mobile;
+            private Object fax;
+            private Object address;
+            private Object healthManageUserName;
+            private Object healthManageUserMobile;
+            private Object healthManageUserAddress;
+            private Object medialManageUserName;
+            private Object medialManageUserMobile;
+            private Object medialManageUserAddress;
+            private Object monitorManageUserName;
+            private Object monitorManageUserMobile;
+            private Object memo;
+            private String status;
+            private String status_dictText;
+            private String delFlag;
+            private String delFlag_dictText;
+            private Object qywxIdentifier;
+            private Object createBy;
+            private String createTime;
+            private Object updateBy;
+            private Object updateTime;
+            private Object lng;
+            private Object lat;
+            private Integer tenantId;
+            private Integer izLeaf;
+            private Object manager;
+            private Object directorUserIds;
+            private Object oldDirectorUserIds;
+
+            public String getId() {
+                return id;
+            }
+
+            public void setId(String id) {
+                this.id = id;
+            }
+
+            public String getParentId() {
+                return parentId;
+            }
+
+            public void setParentId(String parentId) {
+                this.parentId = parentId;
+            }
+
+            public String getDepartName() {
+                return departName;
+            }
+
+            public void setDepartName(String departName) {
+                this.departName = departName;
+            }
+
+            public Object getDepartNameEn() {
+                return departNameEn;
+            }
+
+            public void setDepartNameEn(Object departNameEn) {
+                this.departNameEn = departNameEn;
+            }
+
+            public Object getDepartNameAbbr() {
+                return departNameAbbr;
+            }
+
+            public void setDepartNameAbbr(Object departNameAbbr) {
+                this.departNameAbbr = departNameAbbr;
+            }
+
+            public Object getDepartOrder() {
+                return departOrder;
+            }
+
+            public void setDepartOrder(Object departOrder) {
+                this.departOrder = departOrder;
+            }
+
+            public Object getDescription() {
+                return description;
+            }
+
+            public void setDescription(Object description) {
+                this.description = description;
+            }
+
+            public String getOrgCategory() {
+                return orgCategory;
+            }
+
+            public void setOrgCategory(String orgCategory) {
+                this.orgCategory = orgCategory;
+            }
+
+            public String getOrgType() {
+                return orgType;
+            }
+
+            public void setOrgType(String orgType) {
+                this.orgType = orgType;
+            }
+
+            public String getOrgCode() {
+                return orgCode;
+            }
+
+            public void setOrgCode(String orgCode) {
+                this.orgCode = orgCode;
+            }
+
+            public String getOrgClass() {
+                return orgClass;
+            }
+
+            public void setOrgClass(String orgClass) {
+                this.orgClass = orgClass;
+            }
+
+            public String getOrgClass_dictText() {
+                return orgClass_dictText;
+            }
+
+            public void setOrgClass_dictText(String orgClass_dictText) {
+                this.orgClass_dictText = orgClass_dictText;
+            }
+
+            public Object getMobile() {
+                return mobile;
+            }
+
+            public void setMobile(Object mobile) {
+                this.mobile = mobile;
+            }
+
+            public Object getFax() {
+                return fax;
+            }
+
+            public void setFax(Object fax) {
+                this.fax = fax;
+            }
+
+            public Object getAddress() {
+                return address;
+            }
+
+            public void setAddress(Object address) {
+                this.address = address;
+            }
+
+            public Object getHealthManageUserName() {
+                return healthManageUserName;
+            }
+
+            public void setHealthManageUserName(Object healthManageUserName) {
+                this.healthManageUserName = healthManageUserName;
+            }
+
+            public Object getHealthManageUserMobile() {
+                return healthManageUserMobile;
+            }
+
+            public void setHealthManageUserMobile(Object healthManageUserMobile) {
+                this.healthManageUserMobile = healthManageUserMobile;
+            }
+
+            public Object getHealthManageUserAddress() {
+                return healthManageUserAddress;
+            }
+
+            public void setHealthManageUserAddress(Object healthManageUserAddress) {
+                this.healthManageUserAddress = healthManageUserAddress;
+            }
+
+            public Object getMedialManageUserName() {
+                return medialManageUserName;
+            }
+
+            public void setMedialManageUserName(Object medialManageUserName) {
+                this.medialManageUserName = medialManageUserName;
+            }
+
+            public Object getMedialManageUserMobile() {
+                return medialManageUserMobile;
+            }
+
+            public void setMedialManageUserMobile(Object medialManageUserMobile) {
+                this.medialManageUserMobile = medialManageUserMobile;
+            }
+
+            public Object getMedialManageUserAddress() {
+                return medialManageUserAddress;
+            }
+
+            public void setMedialManageUserAddress(Object medialManageUserAddress) {
+                this.medialManageUserAddress = medialManageUserAddress;
+            }
+
+            public Object getMonitorManageUserName() {
+                return monitorManageUserName;
+            }
+
+            public void setMonitorManageUserName(Object monitorManageUserName) {
+                this.monitorManageUserName = monitorManageUserName;
+            }
+
+            public Object getMonitorManageUserMobile() {
+                return monitorManageUserMobile;
+            }
+
+            public void setMonitorManageUserMobile(Object monitorManageUserMobile) {
+                this.monitorManageUserMobile = monitorManageUserMobile;
+            }
+
+            public Object getMemo() {
+                return memo;
+            }
+
+            public void setMemo(Object memo) {
+                this.memo = memo;
+            }
+
+            public String getStatus() {
+                return status;
+            }
+
+            public void setStatus(String status) {
+                this.status = status;
+            }
+
+            public String getStatus_dictText() {
+                return status_dictText;
+            }
+
+            public void setStatus_dictText(String status_dictText) {
+                this.status_dictText = status_dictText;
+            }
+
+            public String getDelFlag() {
+                return delFlag;
+            }
+
+            public void setDelFlag(String delFlag) {
+                this.delFlag = delFlag;
+            }
+
+            public String getDelFlag_dictText() {
+                return delFlag_dictText;
+            }
+
+            public void setDelFlag_dictText(String delFlag_dictText) {
+                this.delFlag_dictText = delFlag_dictText;
+            }
+
+            public Object getQywxIdentifier() {
+                return qywxIdentifier;
+            }
+
+            public void setQywxIdentifier(Object qywxIdentifier) {
+                this.qywxIdentifier = qywxIdentifier;
+            }
+
+            public Object getCreateBy() {
+                return createBy;
+            }
+
+            public void setCreateBy(Object createBy) {
+                this.createBy = createBy;
+            }
+
+            public String getCreateTime() {
+                return createTime;
+            }
+
+            public void setCreateTime(String createTime) {
+                this.createTime = createTime;
+            }
+
+            public Object getUpdateBy() {
+                return updateBy;
+            }
+
+            public void setUpdateBy(Object updateBy) {
+                this.updateBy = updateBy;
+            }
+
+            public Object getUpdateTime() {
+                return updateTime;
+            }
+
+            public void setUpdateTime(Object updateTime) {
+                this.updateTime = updateTime;
+            }
+
+            public Object getLng() {
+                return lng;
+            }
+
+            public void setLng(Object lng) {
+                this.lng = lng;
+            }
+
+            public Object getLat() {
+                return lat;
+            }
+
+            public void setLat(Object lat) {
+                this.lat = lat;
+            }
+
+            public Integer getTenantId() {
+                return tenantId;
+            }
+
+            public void setTenantId(Integer tenantId) {
+                this.tenantId = tenantId;
+            }
+
+            public Integer getIzLeaf() {
+                return izLeaf;
+            }
+
+            public void setIzLeaf(Integer izLeaf) {
+                this.izLeaf = izLeaf;
+            }
+
+            public Object getManager() {
+                return manager;
+            }
+
+            public void setManager(Object manager) {
+                this.manager = manager;
+            }
+
+            public Object getDirectorUserIds() {
+                return directorUserIds;
+            }
+
+            public void setDirectorUserIds(Object directorUserIds) {
+                this.directorUserIds = directorUserIds;
+            }
+
+            public Object getOldDirectorUserIds() {
+                return oldDirectorUserIds;
+            }
+
+            public void setOldDirectorUserIds(Object oldDirectorUserIds) {
+                this.oldDirectorUserIds = oldDirectorUserIds;
+            }
+        }
+
+        public static class DepartDTO {
+            private String id;
+            private String parentId;
+            private String departName;
+            private Object departNameEn;
+            private Object departNameAbbr;
+            private Object departOrder;
+            private Object description;
+            private String orgCategory;
+            private String orgType;
+            private String orgCode;
+            private String orgClass;
+            private String orgClass_dictText;
+            private Object mobile;
+            private Object fax;
+            private Object address;
+            private Object healthManageUserName;
+            private Object healthManageUserMobile;
+            private Object healthManageUserAddress;
+            private Object medialManageUserName;
+            private Object medialManageUserMobile;
+            private Object medialManageUserAddress;
+            private Object monitorManageUserName;
+            private Object monitorManageUserMobile;
+            private Object memo;
+            private String status;
+            private String status_dictText;
+            private String delFlag;
+            private String delFlag_dictText;
+            private Object qywxIdentifier;
+            private Object createBy;
+            private String createTime;
+            private Object updateBy;
+            private Object updateTime;
+            private Object lng;
+            private Object lat;
+            private Integer tenantId;
+            private Integer izLeaf;
+            private Object manager;
+            private Object directorUserIds;
+            private Object oldDirectorUserIds;
+
+            public String getId() {
+                return id;
+            }
+
+            public void setId(String id) {
+                this.id = id;
+            }
+
+            public String getParentId() {
+                return parentId;
+            }
+
+            public void setParentId(String parentId) {
+                this.parentId = parentId;
+            }
+
+            public String getDepartName() {
+                return departName;
+            }
+
+            public void setDepartName(String departName) {
+                this.departName = departName;
+            }
+
+            public Object getDepartNameEn() {
+                return departNameEn;
+            }
+
+            public void setDepartNameEn(Object departNameEn) {
+                this.departNameEn = departNameEn;
+            }
+
+            public Object getDepartNameAbbr() {
+                return departNameAbbr;
+            }
+
+            public void setDepartNameAbbr(Object departNameAbbr) {
+                this.departNameAbbr = departNameAbbr;
+            }
+
+            public Object getDepartOrder() {
+                return departOrder;
+            }
+
+            public void setDepartOrder(Object departOrder) {
+                this.departOrder = departOrder;
+            }
+
+            public Object getDescription() {
+                return description;
+            }
+
+            public void setDescription(Object description) {
+                this.description = description;
+            }
+
+            public String getOrgCategory() {
+                return orgCategory;
+            }
+
+            public void setOrgCategory(String orgCategory) {
+                this.orgCategory = orgCategory;
+            }
+
+            public String getOrgType() {
+                return orgType;
+            }
+
+            public void setOrgType(String orgType) {
+                this.orgType = orgType;
+            }
+
+            public String getOrgCode() {
+                return orgCode;
+            }
+
+            public void setOrgCode(String orgCode) {
+                this.orgCode = orgCode;
+            }
+
+            public String getOrgClass() {
+                return orgClass;
+            }
+
+            public void setOrgClass(String orgClass) {
+                this.orgClass = orgClass;
+            }
+
+            public String getOrgClass_dictText() {
+                return orgClass_dictText;
+            }
+
+            public void setOrgClass_dictText(String orgClass_dictText) {
+                this.orgClass_dictText = orgClass_dictText;
+            }
+
+            public Object getMobile() {
+                return mobile;
+            }
+
+            public void setMobile(Object mobile) {
+                this.mobile = mobile;
+            }
+
+            public Object getFax() {
+                return fax;
+            }
+
+            public void setFax(Object fax) {
+                this.fax = fax;
+            }
+
+            public Object getAddress() {
+                return address;
+            }
+
+            public void setAddress(Object address) {
+                this.address = address;
+            }
+
+            public Object getHealthManageUserName() {
+                return healthManageUserName;
+            }
+
+            public void setHealthManageUserName(Object healthManageUserName) {
+                this.healthManageUserName = healthManageUserName;
+            }
+
+            public Object getHealthManageUserMobile() {
+                return healthManageUserMobile;
+            }
+
+            public void setHealthManageUserMobile(Object healthManageUserMobile) {
+                this.healthManageUserMobile = healthManageUserMobile;
+            }
+
+            public Object getHealthManageUserAddress() {
+                return healthManageUserAddress;
+            }
+
+            public void setHealthManageUserAddress(Object healthManageUserAddress) {
+                this.healthManageUserAddress = healthManageUserAddress;
+            }
+
+            public Object getMedialManageUserName() {
+                return medialManageUserName;
+            }
+
+            public void setMedialManageUserName(Object medialManageUserName) {
+                this.medialManageUserName = medialManageUserName;
+            }
+
+            public Object getMedialManageUserMobile() {
+                return medialManageUserMobile;
+            }
+
+            public void setMedialManageUserMobile(Object medialManageUserMobile) {
+                this.medialManageUserMobile = medialManageUserMobile;
+            }
+
+            public Object getMedialManageUserAddress() {
+                return medialManageUserAddress;
+            }
+
+            public void setMedialManageUserAddress(Object medialManageUserAddress) {
+                this.medialManageUserAddress = medialManageUserAddress;
+            }
+
+            public Object getMonitorManageUserName() {
+                return monitorManageUserName;
+            }
+
+            public void setMonitorManageUserName(Object monitorManageUserName) {
+                this.monitorManageUserName = monitorManageUserName;
+            }
+
+            public Object getMonitorManageUserMobile() {
+                return monitorManageUserMobile;
+            }
+
+            public void setMonitorManageUserMobile(Object monitorManageUserMobile) {
+                this.monitorManageUserMobile = monitorManageUserMobile;
+            }
+
+            public Object getMemo() {
+                return memo;
+            }
+
+            public void setMemo(Object memo) {
+                this.memo = memo;
+            }
+
+            public String getStatus() {
+                return status;
+            }
+
+            public void setStatus(String status) {
+                this.status = status;
+            }
+
+            public String getStatus_dictText() {
+                return status_dictText;
+            }
+
+            public void setStatus_dictText(String status_dictText) {
+                this.status_dictText = status_dictText;
+            }
+
+            public String getDelFlag() {
+                return delFlag;
+            }
+
+            public void setDelFlag(String delFlag) {
+                this.delFlag = delFlag;
+            }
+
+            public String getDelFlag_dictText() {
+                return delFlag_dictText;
+            }
+
+            public void setDelFlag_dictText(String delFlag_dictText) {
+                this.delFlag_dictText = delFlag_dictText;
+            }
+
+            public Object getQywxIdentifier() {
+                return qywxIdentifier;
+            }
+
+            public void setQywxIdentifier(Object qywxIdentifier) {
+                this.qywxIdentifier = qywxIdentifier;
+            }
+
+            public Object getCreateBy() {
+                return createBy;
+            }
+
+            public void setCreateBy(Object createBy) {
+                this.createBy = createBy;
+            }
+
+            public String getCreateTime() {
+                return createTime;
+            }
+
+            public void setCreateTime(String createTime) {
+                this.createTime = createTime;
+            }
+
+            public Object getUpdateBy() {
+                return updateBy;
+            }
+
+            public void setUpdateBy(Object updateBy) {
+                this.updateBy = updateBy;
+            }
+
+            public Object getUpdateTime() {
+                return updateTime;
+            }
+
+            public void setUpdateTime(Object updateTime) {
+                this.updateTime = updateTime;
+            }
+
+            public Object getLng() {
+                return lng;
+            }
+
+            public void setLng(Object lng) {
+                this.lng = lng;
+            }
+
+            public Object getLat() {
+                return lat;
+            }
+
+            public void setLat(Object lat) {
+                this.lat = lat;
+            }
+
+            public Integer getTenantId() {
+                return tenantId;
+            }
+
+            public void setTenantId(Integer tenantId) {
+                this.tenantId = tenantId;
+            }
+
+            public Integer getIzLeaf() {
+                return izLeaf;
+            }
+
+            public void setIzLeaf(Integer izLeaf) {
+                this.izLeaf = izLeaf;
+            }
+
+            public Object getManager() {
+                return manager;
+            }
+
+            public void setManager(Object manager) {
+                this.manager = manager;
+            }
+
+            public Object getDirectorUserIds() {
+                return directorUserIds;
+            }
+
+            public void setDirectorUserIds(Object directorUserIds) {
+                this.directorUserIds = directorUserIds;
+            }
+
+            public Object getOldDirectorUserIds() {
+                return oldDirectorUserIds;
+            }
+
+            public void setOldDirectorUserIds(Object oldDirectorUserIds) {
+                this.oldDirectorUserIds = oldDirectorUserIds;
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/AppointmentBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/AppointmentBean.kt
new file mode 100644
index 0000000..d70e133
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/AppointmentBean.kt
@@ -0,0 +1,46 @@
+package com.yxjk.healthexpertclient.bean.workbench
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class AppointmentBean(
+    val amPm: String = "",
+    val charDate: String = "",
+    val contentStatus: String = "",
+    val contentType: String = "",
+    val cost: String = "",
+    val createBy: String = "",
+    val createTime: String = "",
+    val delFlag: String = "",
+    val doctorEndTime: String = "",
+    val doctorStartTime: String = "",
+    val endTime: String = "",
+    val fromAccount: String = "",
+    val fromName: String = "",
+    val id: String = "",
+    val imId: String = "",
+    val jobStatus: String = "",
+    val medicalRecordsId: String = "",
+    val memberAge: String = "",
+    val memberId: String = "",
+    val memberName: String = "",
+    val memberSex: String = "",
+    val memo: String = "",
+    val reasonType: String = "",
+    val rejectReason: String = "",
+    val reservationTime: String = "",
+    val schedulingDateId: String = "",
+    val sessionDate: String = "",
+    val sessionStatus: String = "",
+    val sessionTime: String = "",
+    val sessionType: String = "",
+    val status: String = "",
+    val thirdAccount: String = "",
+    val thirdName: String = "",
+    val toAccount: String = "",
+    val toName: String = "",
+    val updateBy: String = "",
+    val updateTime: String = "",
+    val week: String = ""
+): Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/ArchivesBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/ArchivesBean.kt
new file mode 100644
index 0000000..f10fb19
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/ArchivesBean.kt
@@ -0,0 +1,24 @@
+package com.yxjk.healthexpertclient.bean.workbench
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class ArchivesBean(
+    val id: String? = null,
+    var medicalDescribe: String = "",
+    var recordsName: String = "",
+    val createTime: String = "",
+    val createTimeLong: Long = 0,
+    var tfPermission: String? = null,
+    var haveTime: String? = null,
+    var haveTimeValue: String? = null,
+    var desire: String = "",
+    var tfLook: String? = null,
+    var lookOffice: String? = null,
+    var tfLookValue: String? = null,
+    var lookMedicalName: String? = null,
+    var image: String = "",
+    var updateTime : String? = null,
+    var memberId: String? = null
+): Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/ArchivesDetailResultBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/ArchivesDetailResultBean.kt
new file mode 100644
index 0000000..0cfb17a
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/ArchivesDetailResultBean.kt
@@ -0,0 +1,12 @@
+package com.yxjk.healthexpertclient.bean.workbench
+
+/**
+ * @author nanfeifei
+ * @time 2023/6/20 13:35
+ * @description
+ */
+class ArchivesDetailResultBean (
+    var answer: MutableList<HealthInfoBean>? = mutableListOf(),
+    var conMedicalRecordsDO: ArchivesBean? = null,
+    var conFamilyMembersDO: ConsultInfoBean? = null
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/AudioVideoCallBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/AudioVideoCallBean.kt
new file mode 100644
index 0000000..c5fe7c4
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/AudioVideoCallBean.kt
@@ -0,0 +1,15 @@
+package com.yxjk.healthexpertclient.bean.workbench
+
+
+import com.google.gson.annotations.SerializedName
+
+data class AudioVideoCallBean(
+    @SerializedName("groupId")
+    var groupId: String = "",
+    @SerializedName("member")
+    var member: List<String> = listOf(),
+    @SerializedName("userId")
+    var userId: String = "",
+    @SerializedName("videoSessionId")
+    var videoSessionId: String = ""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/CallTimeBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/CallTimeBean.kt
new file mode 100644
index 0000000..372eef3
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/CallTimeBean.kt
@@ -0,0 +1,15 @@
+package com.yxjk.healthexpertclient.bean.workbench
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class CallTimeBean(
+    val createTime: String = "",
+    val endTime: String = "",
+    val createTimeLong: Long? = null,
+    val endTimeLong: Long?= null,
+    var startTime: String = "",
+    var startTimLong: Long? = null,
+    val type: String = ""
+): Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/CheckItemBySfzhTotalBean.java b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/CheckItemBySfzhTotalBean.java
new file mode 100644
index 0000000..f7e9672
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/CheckItemBySfzhTotalBean.java
@@ -0,0 +1,522 @@
+package com.yxjk.healthexpertclient.bean.workbench;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author nanfeifei 有问题找梁文杰咨询，复制的
+ */
+public class CheckItemBySfzhTotalBean implements Serializable {
+
+    private SuggestionInfoDTO conclusionInfo;
+    private SuggestionInfoDTO suggestionInfo;
+    private Integer normalCount;
+    private List<ResultListDTO> resultList;
+    private Integer unusualCount;
+
+    public SuggestionInfoDTO getConclusionInfo() {
+        return conclusionInfo;
+    }
+
+    public void setConclusionInfo(SuggestionInfoDTO conclusionInfo) {
+        this.conclusionInfo = conclusionInfo;
+    }
+
+    public SuggestionInfoDTO getSuggestionInfo() {
+        return suggestionInfo;
+    }
+
+    public void setSuggestionInfo(SuggestionInfoDTO suggestionInfo) {
+        this.suggestionInfo = suggestionInfo;
+    }
+
+    public Integer getNormalCount() {
+        return normalCount;
+    }
+
+    public void setNormalCount(Integer normalCount) {
+        this.normalCount = normalCount;
+    }
+
+    public List<ResultListDTO> getResultList() {
+        return resultList;
+    }
+
+    public void setResultList(List<ResultListDTO> resultList) {
+        this.resultList = resultList;
+    }
+
+    public Integer getUnusualCount() {
+        return unusualCount;
+    }
+
+    public void setUnusualCount(Integer unusualCount) {
+        this.unusualCount = unusualCount;
+    }
+
+
+    public static class SuggestionInfoDTO implements Serializable {
+        private Object id;
+        private String cqbh;
+        private String cqbhBak;
+        private String cqmc;
+        private Object cqckz;
+        private String xmz;
+        private String jcms;
+        private String xmdw;
+        private Object officeIds;
+        private Boolean exceptionFlag;
+        private Boolean newX;
+        private Boolean show;
+
+        public Object getId() {
+            return id;
+        }
+
+        public void setId(Object id) {
+            this.id = id;
+        }
+
+        public String getCqbh() {
+            return cqbh;
+        }
+
+        public void setCqbh(String cqbh) {
+            this.cqbh = cqbh;
+        }
+
+        public String getCqbhBak() {
+            return cqbhBak;
+        }
+
+        public void setCqbhBak(String cqbhBak) {
+            this.cqbhBak = cqbhBak;
+        }
+
+        public String getCqmc() {
+            return cqmc;
+        }
+
+        public void setCqmc(String cqmc) {
+            this.cqmc = cqmc;
+        }
+
+        public Object getCqckz() {
+            return cqckz;
+        }
+
+        public void setCqckz(Object cqckz) {
+            this.cqckz = cqckz;
+        }
+
+        public String getXmz() {
+            return xmz;
+        }
+
+        public void setXmz(String xmz) {
+            this.xmz = xmz;
+        }
+
+        public String getJcms() {
+            return jcms;
+        }
+
+        public void setJcms(String jcms) {
+            this.jcms = jcms;
+        }
+
+        public String getXmdw() {
+            return xmdw;
+        }
+
+        public void setXmdw(String xmdw) {
+            this.xmdw = xmdw;
+        }
+
+        public Object getOfficeIds() {
+            return officeIds;
+        }
+
+        public void setOfficeIds(Object officeIds) {
+            this.officeIds = officeIds;
+        }
+
+        public Boolean getExceptionFlag() {
+            return exceptionFlag;
+        }
+
+        public void setExceptionFlag(Boolean exceptionFlag) {
+            this.exceptionFlag = exceptionFlag;
+        }
+
+        public Boolean getNewX() {
+            return newX;
+        }
+
+        public void setNewX(Boolean newX) {
+            this.newX = newX;
+        }
+
+        public Boolean getShow() {
+            return show;
+        }
+
+        public void setShow(Boolean show) {
+            this.show = show;
+        }
+    }
+
+    public static class ResultListDTO implements Serializable {
+        private Object id;
+        private String cqbh;
+        private String cqbhBak;
+        private String cqmc;
+        private Object cqckz;
+        private Object xmz;
+        private Object jcms;
+        private Object xmdw;
+        private Object officeIds;
+        private List<ChildlistDTO> childlist;
+        private Boolean exceptionFlag;
+        private Boolean newX;
+        private Boolean show;
+
+        public Object getId() {
+            return id;
+        }
+
+        public void setId(Object id) {
+            this.id = id;
+        }
+
+        public String getCqbh() {
+            return cqbh;
+        }
+
+        public void setCqbh(String cqbh) {
+            this.cqbh = cqbh;
+        }
+
+        public String getCqbhBak() {
+            return cqbhBak;
+        }
+
+        public void setCqbhBak(String cqbhBak) {
+            this.cqbhBak = cqbhBak;
+        }
+
+        public String getCqmc() {
+            return cqmc;
+        }
+
+        public void setCqmc(String cqmc) {
+            this.cqmc = cqmc;
+        }
+
+        public Object getCqckz() {
+            return cqckz;
+        }
+
+        public void setCqckz(Object cqckz) {
+            this.cqckz = cqckz;
+        }
+
+        public Object getXmz() {
+            return xmz;
+        }
+
+        public void setXmz(Object xmz) {
+            this.xmz = xmz;
+        }
+
+        public Object getJcms() {
+            return jcms;
+        }
+
+        public void setJcms(Object jcms) {
+            this.jcms = jcms;
+        }
+
+        public Object getXmdw() {
+            return xmdw;
+        }
+
+        public void setXmdw(Object xmdw) {
+            this.xmdw = xmdw;
+        }
+
+        public Object getOfficeIds() {
+            return officeIds;
+        }
+
+        public void setOfficeIds(Object officeIds) {
+            this.officeIds = officeIds;
+        }
+
+        public List<ChildlistDTO> getChildlist() {
+            return childlist;
+        }
+
+        public void setChildlist(List<ChildlistDTO> childlist) {
+            this.childlist = childlist;
+        }
+
+        public Boolean getExceptionFlag() {
+            return exceptionFlag;
+        }
+
+        public void setExceptionFlag(Boolean exceptionFlag) {
+            this.exceptionFlag = exceptionFlag;
+        }
+
+        public Boolean getNewX() {
+            return newX;
+        }
+
+        public void setNewX(Boolean newX) {
+            this.newX = newX;
+        }
+
+        public Boolean getShow() {
+            return show;
+        }
+
+        public void setShow(Boolean show) {
+            this.show = show;
+        }
+
+        public static class ChildlistDTO  implements Serializable {
+            private Object id;
+            private String cqbh;
+            private String cqbhBak;
+            private String cqmc;
+            private String cqckz;
+            private String xmz;
+            private String jcms;
+            private String xmdw;
+            private Object officeIds;
+            private List<ChildlistDTO2> childlist;
+            private Boolean exceptionFlag;
+            private Boolean newX;
+            private Boolean show;
+
+            public Object getId() {
+                return id;
+            }
+
+            public void setId(Object id) {
+                this.id = id;
+            }
+
+            public String getCqbh() {
+                return cqbh;
+            }
+
+            public void setCqbh(String cqbh) {
+                this.cqbh = cqbh;
+            }
+
+            public String getCqbhBak() {
+                return cqbhBak;
+            }
+
+            public void setCqbhBak(String cqbhBak) {
+                this.cqbhBak = cqbhBak;
+            }
+
+            public String getCqmc() {
+                return cqmc;
+            }
+
+            public void setCqmc(String cqmc) {
+                this.cqmc = cqmc;
+            }
+
+            public String getCqckz() {
+                return cqckz;
+            }
+
+            public void setCqckz(String cqckz) {
+                this.cqckz = cqckz;
+            }
+
+            public String getXmz() {
+                return xmz;
+            }
+
+            public void setXmz(String xmz) {
+                this.xmz = xmz;
+            }
+
+            public String getJcms() {
+                return jcms;
+            }
+
+            public void setJcms(String jcms) {
+                this.jcms = jcms;
+            }
+
+            public String getXmdw() {
+                return xmdw;
+            }
+
+            public void setXmdw(String xmdw) {
+                this.xmdw = xmdw;
+            }
+
+            public Object getOfficeIds() {
+                return officeIds;
+            }
+
+            public void setOfficeIds(Object officeIds) {
+                this.officeIds = officeIds;
+            }
+
+            public List<ChildlistDTO2> getChildlist() {
+                return childlist;
+            }
+
+            public void setChildlist(List<ChildlistDTO2> childlist) {
+                this.childlist = childlist;
+            }
+
+            public Boolean getExceptionFlag() {
+                return exceptionFlag;
+            }
+
+            public void setExceptionFlag(Boolean exceptionFlag) {
+                this.exceptionFlag = exceptionFlag;
+            }
+
+            public Boolean getNewX() {
+                return newX;
+            }
+
+            public void setNewX(Boolean newX) {
+                this.newX = newX;
+            }
+
+            public Boolean getShow() {
+                return show;
+            }
+
+            public void setShow(Boolean show) {
+                this.show = show;
+            }
+
+        }
+
+        public static class ChildlistDTO2  implements Serializable {
+            private Object id;
+            private String cqbh;
+            private String cqbhBak;
+            private String cqmc;
+            private String cqckz;
+            private String xmz;
+            private String jcms;
+            private String xmdw;
+            private Object officeIds;
+            private Boolean exceptionFlag;
+            private Boolean newX;
+            private Boolean show;
+
+            public Object getId() {
+                return id;
+            }
+
+            public void setId(Object id) {
+                this.id = id;
+            }
+
+            public String getCqbh() {
+                return cqbh;
+            }
+
+            public void setCqbh(String cqbh) {
+                this.cqbh = cqbh;
+            }
+
+            public String getCqbhBak() {
+                return cqbhBak;
+            }
+
+            public void setCqbhBak(String cqbhBak) {
+                this.cqbhBak = cqbhBak;
+            }
+
+            public String getCqmc() {
+                return cqmc;
+            }
+
+            public void setCqmc(String cqmc) {
+                this.cqmc = cqmc;
+            }
+
+            public String getCqckz() {
+                return cqckz;
+            }
+
+            public void setCqckz(String cqckz) {
+                this.cqckz = cqckz;
+            }
+
+            public String getXmz() {
+                return xmz;
+            }
+
+            public void setXmz(String xmz) {
+                this.xmz = xmz;
+            }
+
+            public String getJcms() {
+                return jcms;
+            }
+
+            public void setJcms(String jcms) {
+                this.jcms = jcms;
+            }
+
+            public String getXmdw() {
+                return xmdw;
+            }
+
+            public void setXmdw(String xmdw) {
+                this.xmdw = xmdw;
+            }
+
+            public Object getOfficeIds() {
+                return officeIds;
+            }
+
+            public void setOfficeIds(Object officeIds) {
+                this.officeIds = officeIds;
+            }
+
+
+            public Boolean getExceptionFlag() {
+                return exceptionFlag;
+            }
+
+            public void setExceptionFlag(Boolean exceptionFlag) {
+                this.exceptionFlag = exceptionFlag;
+            }
+
+            public Boolean getNewX() {
+                return newX;
+            }
+
+            public void setNewX(Boolean newX) {
+                this.newX = newX;
+            }
+
+            public Boolean getShow() {
+                return show;
+            }
+
+            public void setShow(Boolean show) {
+                this.show = show;
+            }
+
+        }
+    }
+}
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/CheckRecordUserInfoBean.java b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/CheckRecordUserInfoBean.java
new file mode 100644
index 0000000..e144d9f
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/CheckRecordUserInfoBean.java
@@ -0,0 +1,167 @@
+package com.yxjk.healthexpertclient.bean.workbench;
+
+import java.util.ArrayList;
+/**
+ * 体检报告结果使用，copy自用户端
+ */
+
+public class CheckRecordUserInfoBean {
+
+    private String id;
+    private String userId;
+    private String userName;
+    private String sex;
+    private String sex_dictText;
+    private String age;
+    private String card;
+    private String mobilePhone;
+    private String email;
+    private String empNativeplace;
+    private String peQueueDate;
+    private String empBirthday;
+    private String conclusion;
+    private String suggest;
+    private String medicalYear;
+    private String hospitalName;
+    private ArrayList<ResultItemListBean> resultItemResList;
+
+    public String getHospitalName() {
+        return hospitalName == null ? "" : hospitalName;
+    }
+
+    public void setHospitalName(String hospitalName) {
+        this.hospitalName = hospitalName;
+    }
+
+    public ArrayList<ResultItemListBean> getResultItemResList() {
+        if (resultItemResList == null) {
+            return new ArrayList<>();
+        }
+        return resultItemResList;
+    }
+
+    public void setResultItemResList(ArrayList<ResultItemListBean> resultItemResList) {
+        this.resultItemResList = resultItemResList;
+    }
+
+    public String getId() {
+        return id == null ? "" : id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getUserId() {
+        return userId == null ? "" : userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getUserName() {
+        return userName == null ? "" : userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getSex() {
+        return sex == null ? "" : sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    public String getSex_dictText() {
+        return sex_dictText == null ? "" : sex_dictText;
+    }
+
+    public void setSex_dictText(String sex_dictText) {
+        this.sex_dictText = sex_dictText;
+    }
+
+    public String getAge() {
+        return age == null ? "" : age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+
+    public String getCard() {
+        return card == null ? "" : card;
+    }
+
+    public void setCard(String card) {
+        this.card = card;
+    }
+
+    public String getMobilePhone() {
+        return mobilePhone == null ? "" : mobilePhone;
+    }
+
+    public void setMobilePhone(String mobilePhone) {
+        this.mobilePhone = mobilePhone;
+    }
+
+    public String getEmail() {
+        return email == null ? "" : email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getEmpNativeplace() {
+        return empNativeplace == null ? "" : empNativeplace;
+    }
+
+    public void setEmpNativeplace(String empNativeplace) {
+        this.empNativeplace = empNativeplace;
+    }
+
+    public String getPeQueueDate() {
+        return peQueueDate == null ? "" : peQueueDate;
+    }
+
+    public void setPeQueueDate(String peQueueDate) {
+        this.peQueueDate = peQueueDate;
+    }
+
+    public String getEmpBirthday() {
+        return empBirthday == null ? "" : empBirthday;
+    }
+
+    public void setEmpBirthday(String empBirthday) {
+        this.empBirthday = empBirthday;
+    }
+
+    public String getConclusion() {
+        return conclusion == null ? "" : conclusion;
+    }
+
+    public void setConclusion(String conclusion) {
+        this.conclusion = conclusion;
+    }
+
+    public String getSuggest() {
+        return suggest == null ? "" : suggest;
+    }
+
+    public void setSuggest(String suggest) {
+        this.suggest = suggest;
+    }
+
+    public String getMedicalYear() {
+        return medicalYear == null ? "" : medicalYear;
+    }
+
+    public void setMedicalYear(String medicalYear) {
+        this.medicalYear = medicalYear;
+    }
+
+}
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/CheckUpDetailListBean.java b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/CheckUpDetailListBean.java
new file mode 100644
index 0000000..5216cf0
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/CheckUpDetailListBean.java
@@ -0,0 +1,190 @@
+package com.yxjk.healthexpertclient.bean.workbench;
+
+import java.util.List;
+
+public class CheckUpDetailListBean {
+    private String cqmc;
+    private String cqbh;
+    private String cqbhBak;
+    private String cqmcChild;
+    private String cqbhChild;
+    private String cqbhBakChild;
+    private List<CheckUpDetailListChildBean> list;
+
+    public String getCqmc() {
+        return cqmc;
+    }
+
+    public void setCqmc(String cqmc) {
+        this.cqmc = cqmc;
+    }
+
+    public String getCqbh() {
+        return cqbh;
+    }
+
+    public void setCqbh(String cqbh) {
+        this.cqbh = cqbh;
+    }
+
+    public String getCqbhBak() {
+        return cqbhBak;
+    }
+
+    public void setCqbhBak(String cqbhBak) {
+        this.cqbhBak = cqbhBak;
+    }
+
+    public String getCqmcChild() {
+        return cqmcChild;
+    }
+
+    public void setCqmcChild(String cqmcChild) {
+        this.cqmcChild = cqmcChild;
+    }
+
+    public String getCqbhChild() {
+        return cqbhChild;
+    }
+
+    public void setCqbhChild(String cqbhChild) {
+        this.cqbhChild = cqbhChild;
+    }
+
+    public String getCqbhBakChild() {
+        return cqbhBakChild;
+    }
+
+    public void setCqbhBakChild(String cqbhBakChild) {
+        this.cqbhBakChild = cqbhBakChild;
+    }
+
+    public List<CheckUpDetailListChildBean> getList() {
+        return list;
+    }
+
+    public void setList(List<CheckUpDetailListChildBean> list) {
+        this.list = list;
+    }
+
+    public static class CheckUpDetailListChildBean {
+        private Object id;
+        private String cqbh;
+        private String cqbhBak;
+        private String cqmc;
+        private String cqckz;
+        private String xmz;
+        private String jcms;
+        private String xmdw;
+        private Object officeIds;
+        private List<?> childlist;
+        private Boolean exceptionFlag=false;
+        private Boolean newX;
+        private Boolean show;
+
+        public Object getId() {
+            return id;
+        }
+
+        public void setId(Object id) {
+            this.id = id;
+        }
+
+        public String getCqbh() {
+            return cqbh;
+        }
+
+        public void setCqbh(String cqbh) {
+            this.cqbh = cqbh;
+        }
+
+        public String getCqbhBak() {
+            return cqbhBak;
+        }
+
+        public void setCqbhBak(String cqbhBak) {
+            this.cqbhBak = cqbhBak;
+        }
+
+        public String getCqmc() {
+            return cqmc;
+        }
+
+        public void setCqmc(String cqmc) {
+            this.cqmc = cqmc;
+        }
+
+        public String getCqckz() {
+            return cqckz;
+        }
+
+        public void setCqckz(String cqckz) {
+            this.cqckz = cqckz;
+        }
+
+        public String getXmz() {
+            return xmz;
+        }
+
+        public void setXmz(String xmz) {
+            this.xmz = xmz;
+        }
+
+        public String getJcms() {
+            return jcms;
+        }
+
+        public void setJcms(String jcms) {
+            this.jcms = jcms;
+        }
+
+        public String getXmdw() {
+            return xmdw;
+        }
+
+        public void setXmdw(String xmdw) {
+            this.xmdw = xmdw;
+        }
+
+        public Object getOfficeIds() {
+            return officeIds;
+        }
+
+        public void setOfficeIds(Object officeIds) {
+            this.officeIds = officeIds;
+        }
+
+        public List<?> getChildlist() {
+            return childlist;
+        }
+
+        public void setChildlist(List<?> childlist) {
+            this.childlist = childlist;
+        }
+
+        public Boolean getExceptionFlag() {
+            return exceptionFlag;
+        }
+
+        public void setExceptionFlag(Boolean exceptionFlag) {
+            this.exceptionFlag = exceptionFlag;
+        }
+
+        public Boolean getNewX() {
+            return newX;
+        }
+
+        public void setNewX(Boolean newX) {
+            this.newX = newX;
+        }
+
+        public Boolean getShow() {
+            return show;
+        }
+
+        public void setShow(Boolean show) {
+            this.show = show;
+        }
+
+    }
+}
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/ConsultDetailBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/ConsultDetailBean.kt
new file mode 100644
index 0000000..46f8af8
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/ConsultDetailBean.kt
@@ -0,0 +1,15 @@
+package com.yxjk.healthexpertclient.bean.workbench
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class ConsultDetailBean(
+    var answer: MutableList<HealthInfoBean>? = mutableListOf(),
+    var conFamilyMembersDO: ConsultInfoBean? = ConsultInfoBean(),
+    var conMedicalRecordsListDO: ArchivesBean? = ArchivesBean(),
+    var conSession: ConsultRecordBean? = ConsultRecordBean(),
+    var createTime: Long = 0,
+    var idNo: String? = null,
+    var imList: MutableList<CallTimeBean>? = mutableListOf()
+): Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/ConsultInfoBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/ConsultInfoBean.kt
new file mode 100644
index 0000000..765185b
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/ConsultInfoBean.kt
@@ -0,0 +1,19 @@
+package com.yxjk.healthexpertclient.bean.workbench
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+/**
+ * 咨询人相关信息
+ */
+@Parcelize
+data class ConsultInfoBean(
+    val birthday: String = "",
+    val familyRelation: String = "",
+    val gender: String = "",
+    val height: String = "",
+    val id: String = "",
+    val name: String = "",
+    val weight: String = "",
+    val age: String = ""
+): Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/ConsultRecordBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/ConsultRecordBean.kt
new file mode 100644
index 0000000..e4985d2
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/ConsultRecordBean.kt
@@ -0,0 +1,31 @@
+package com.yxjk.healthexpertclient.bean.workbench
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+/**
+ * 咨询记录相关信息
+ */
+@Parcelize
+data class ConsultRecordBean(
+    val doctorEndTime: String? = "",
+    val doctorStartTime: String? = "",
+    val doctorEndTimeLong: Long? = null,
+    val doctorStartTimeLong: Long? = null,
+    val sessionDateLong: Long? = null,
+    val week: String? = "",
+    val amPm: String? = "",
+    val id: String? = "",
+    val imId: String? = "",
+    val memberAge: String? = "",
+    val memberId: String? = "",
+    val memberName: String? = "",
+    val memberSex: String? = "",
+    val createTime: String? = "",
+    var unreadCount: Int = 0,
+    val contentStatus: String? = "",  //预约状态 1待确认 2待开始 3已开始 4待评价 5完成  6拒绝 7取消
+    val contentType: String? = "",  //咨询类型：1图文咨询  2音视频咨询
+    val reasonType: String? = "",   //拒绝原因
+    val rejectReason: String? = "", //拒绝的备注
+    var fromAccount: String? = null
+) : Parcelable
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/HealthInfoBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/HealthInfoBean.kt
new file mode 100644
index 0000000..94a8f99
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/HealthInfoBean.kt
@@ -0,0 +1,10 @@
+package com.yxjk.healthexpertclient.bean.workbench
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class HealthInfoBean(
+    val answerKey: String,
+    val answerValue: String
+): Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/MessageBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/MessageBean.kt
new file mode 100644
index 0000000..c8bd25c
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/MessageBean.kt
@@ -0,0 +1,21 @@
+package com.yxjk.healthexpertclient.bean.workbench
+
+data class MessageBean(
+    var contentType: String? = null,
+    var createBy: String = "",
+    var createTime: String = "",
+    var delFlag: String = "",
+    var endTime: String = "",
+    var fromAccount: String = "",
+    var groupId: String = "",
+    var id: String = "",
+    var memo: String = "",
+    var msgContent: String = "",
+    var msgSeq: String = "",
+    var msgType: String = "",
+    var sendTime: String = "",
+    var status: String = "",
+    var toAccount: String = "",
+    var updateBy: String = "",
+    var updateTime: String = ""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/PhysicalExaminationReportBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/PhysicalExaminationReportBean.kt
new file mode 100644
index 0000000..38ccbdd
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/PhysicalExaminationReportBean.kt
@@ -0,0 +1,18 @@
+package com.yxjk.healthexpertclient.bean.workbench
+
+import com.google.gson.annotations.SerializedName
+
+/**
+ * 体检报告（字段命名骂后台就行）
+ */
+data class PhysicalExaminationReportBean(
+    var id: String = "",
+    @SerializedName("peQueueDate")
+    var insertdate: String = "",  //体检记录生成时间
+    @SerializedName("userName")
+    var name: String = "",  //体检人姓名
+    @SerializedName("hospitalName")
+    var yymc: String = "", //体检地点
+    @SerializedName("medicalYear")
+    var tjrq: String = ""  //体检日期
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/RefuseReasonBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/RefuseReasonBean.kt
new file mode 100644
index 0000000..b46b6aa
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/RefuseReasonBean.kt
@@ -0,0 +1,6 @@
+package com.yxjk.healthexpertclient.bean.workbench
+
+data class RefuseReasonBean(
+    val value: String,
+    val text: String
+    )
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/ResultItemListBean.java b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/ResultItemListBean.java
new file mode 100644
index 0000000..4611712
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/ResultItemListBean.java
@@ -0,0 +1,178 @@
+package com.yxjk.healthexpertclient.bean.workbench;
+
+import java.util.List;
+
+/**
+ * 体检报告结果使用，copy自用户端
+ */
+public class ResultItemListBean {
+
+    private String analysisId;
+    private String analysisName;
+    private List<SenResultResDTO> senResultRes;
+
+    public String getAnalysisId() {
+        return analysisId;
+    }
+
+    public void setAnalysisId(String analysisId) {
+        this.analysisId = analysisId;
+    }
+
+    public String getAnalysisName() {
+        return analysisName == null ? "" : analysisName;
+    }
+
+    public void setAnalysisName(String analysisName) {
+        this.analysisName = analysisName;
+    }
+
+    public List<SenResultResDTO> getSenResultRes() {
+        return senResultRes;
+    }
+
+    public void setSenResultRes(List<SenResultResDTO> senResultRes) {
+        this.senResultRes = senResultRes;
+    }
+
+    public static class SenResultResDTO {
+        private String uniItemClassId;
+        private String uniItemClassName;
+        private List<ThirdResultResDTO> thirdResultRes;
+
+        public String getUniItemClassId() {
+            return uniItemClassId;
+        }
+
+        public void setUniItemClassId(String uniItemClassId) {
+            this.uniItemClassId = uniItemClassId;
+        }
+
+        public String getUniItemClassName() {
+            return uniItemClassName;
+        }
+
+        public void setUniItemClassName(String uniItemClassName) {
+            this.uniItemClassName = uniItemClassName;
+        }
+
+        public List<ThirdResultResDTO> getThirdResultRes() {
+            return thirdResultRes;
+        }
+
+        public void setThirdResultRes(List<ThirdResultResDTO> thirdResultRes) {
+            this.thirdResultRes = thirdResultRes;
+        }
+
+        public static class ThirdResultResDTO {
+            private Object userResultId;
+            private String id;
+            private String peItemName;
+            private Object uniItemId;
+            private String printContext;
+            private String peResult;
+            private String unit;
+            private String colour;
+            private Object uniItemClassId;
+            private Object uniItemClassName;
+            private Object analysisId;
+            private Object analysisName;
+
+            public String getColour() {
+                return colour == null ? "" : colour;
+            }
+
+            public void setColour(String colour) {
+                this.colour = colour;
+            }
+
+            public Object getUserResultId() {
+                return userResultId;
+            }
+
+            public void setUserResultId(Object userResultId) {
+                this.userResultId = userResultId;
+            }
+
+            public String getId() {
+                return id;
+            }
+
+            public void setId(String id) {
+                this.id = id;
+            }
+
+            public String getPeItemName() {
+                return peItemName;
+            }
+
+            public void setPeItemName(String peItemName) {
+                this.peItemName = peItemName;
+            }
+
+            public Object getUniItemId() {
+                return uniItemId;
+            }
+
+            public void setUniItemId(Object uniItemId) {
+                this.uniItemId = uniItemId;
+            }
+
+            public String getPrintContext() {
+                return printContext;
+            }
+
+            public void setPrintContext(String printContext) {
+                this.printContext = printContext;
+            }
+
+            public String getPeResult() {
+                return peResult;
+            }
+
+            public void setPeResult(String peResult) {
+                this.peResult = peResult;
+            }
+
+            public String getUnit() {
+                return unit;
+            }
+
+            public void setUnit(String unit) {
+                this.unit = unit;
+            }
+
+            public Object getUniItemClassId() {
+                return uniItemClassId;
+            }
+
+            public void setUniItemClassId(Object uniItemClassId) {
+                this.uniItemClassId = uniItemClassId;
+            }
+
+            public Object getUniItemClassName() {
+                return uniItemClassName;
+            }
+
+            public void setUniItemClassName(Object uniItemClassName) {
+                this.uniItemClassName = uniItemClassName;
+            }
+
+            public Object getAnalysisId() {
+                return analysisId;
+            }
+
+            public void setAnalysisId(Object analysisId) {
+                this.analysisId = analysisId;
+            }
+
+            public Object getAnalysisName() {
+                return analysisName;
+            }
+
+            public void setAnalysisName(Object analysisName) {
+                this.analysisName = analysisName;
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/WorkBenchConsultNumBean.kt b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/WorkBenchConsultNumBean.kt
new file mode 100644
index 0000000..fb2e9dd
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/bean/workbench/WorkBenchConsultNumBean.kt
@@ -0,0 +1,19 @@
+package com.yxjk.healthexpertclient.bean.workbench
+
+
+import com.google.gson.annotations.SerializedName
+
+class WorkBenchConsultNumBean(
+    @SerializedName("pictureFinish")
+    var pictureFinish: String = "",
+    @SerializedName("pictureIng")
+    var pictureIng: String = "",
+    @SerializedName("pictureUnReply")
+    var pictureUnReply: String = "",
+    @SerializedName("videoFinish")
+    var videoFinish: String = "",
+    @SerializedName("videoIng")
+    var videoIng: String = "",
+    @SerializedName("videoUnReply")
+    var videoUnReply: String = ""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/data/api/IMApi.kt b/app/src/main/java/com/yxjk/healthexpertclient/data/api/IMApi.kt
new file mode 100644
index 0000000..7d8a5d6
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/data/api/IMApi.kt
@@ -0,0 +1,14 @@
+package com.yxjk.healthexpertclient.data.api
+
+import com.btpj.lib_base.data.bean.ApiResponse
+import com.yxjk.healthexpertclient.bean.im.IMInfoBean
+import retrofit2.http.GET
+
+interface IMApi {
+    /**
+     * 获取IM登录Sig
+     */
+    @GET("/health-im/wnapp/userSigAndroid")
+    suspend fun getIMSig(): ApiResponse<IMInfoBean>
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/data/api/LoginApi.kt b/app/src/main/java/com/yxjk/healthexpertclient/data/api/LoginApi.kt
new file mode 100644
index 0000000..d95355b
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/data/api/LoginApi.kt
@@ -0,0 +1,37 @@
+package com.yxjk.healthexpertclient.data.api
+
+import com.btpj.lib_base.data.bean.ApiResponse
+import com.yxjk.healthexpertclient.bean.CommonSettingMenuBean
+import com.yxjk.healthexpertclient.bean.login.LoginResultBean
+import okhttp3.RequestBody
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.POST
+import retrofit2.http.QueryMap
+
+interface LoginApi {
+    /**
+     *  登录接口
+     */
+    @POST("/health-consultation/conDoctor/loginDoctor")
+//    @POST("/sys/mLogin")
+    suspend fun login(@Body requestBody: RequestBody): ApiResponse<LoginResultBean>
+
+    /**
+     *  校验用户信息
+     */
+    @POST("health-system/api/anon/sys/checkUser")
+    suspend fun checkUserInfo(@Body requestBody: RequestBody): ApiResponse<String>
+
+    /**
+     *  修改密码
+     */
+    @POST("health-system/api/anon/sys/resetUserPwd")
+    suspend fun resetUserPwd(@Body requestBody: RequestBody): ApiResponse<String>
+
+    /**
+     * 获取后台配置的菜单（例如：咨询人中与本人的关系）
+     */
+    @GET("/health-consultation/api/consult/conDoctor/selectDictList")
+    suspend fun getCommonSettingMenuList(@QueryMap params: MutableMap<String, Any?>): ApiResponse<MutableList<CommonSettingMenuBean>>
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/data/api/MineApi.kt b/app/src/main/java/com/yxjk/healthexpertclient/data/api/MineApi.kt
new file mode 100644
index 0000000..a953ff3
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/data/api/MineApi.kt
@@ -0,0 +1,126 @@
+package com.yxjk.healthexpertclient.data.api
+
+import com.btpj.lib_base.data.bean.ApiResponse
+import com.yxjk.healthexpertclient.bean.UploadFileResultBean
+import com.yxjk.healthexpertclient.bean.im.IMAssistantBean
+import com.yxjk.healthexpertclient.bean.mine.BillRecordBean
+import com.yxjk.healthexpertclient.bean.mine.CommonSettingMenuBean
+import com.yxjk.healthexpertclient.bean.mine.ConsultStatisticsBean
+import com.yxjk.healthexpertclient.bean.mine.ConsultTypeBean
+import com.yxjk.healthexpertclient.bean.mine.DiseaseBean
+import com.yxjk.healthexpertclient.bean.mine.DoctorBean
+import com.yxjk.healthexpertclient.bean.mine.PageManagerBean
+import com.yxjk.healthexpertclient.bean.mine.SchedulingResultBean
+import com.yxjk.healthexpertclient.bean.mine.SuspensionServiceBean
+import okhttp3.MultipartBody
+import okhttp3.RequestBody
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.Multipart
+import retrofit2.http.POST
+import retrofit2.http.PUT
+import retrofit2.http.Part
+import retrofit2.http.QueryMap
+
+interface MineApi {
+    /**
+     * 获取专家信息
+     */
+    @GET("/health-consultation/api/consult/conDoctor/queryDoctor")
+    suspend fun getDoctorInfo(): ApiResponse<DoctorBean>
+    /**
+     * 修改专家信息
+     */
+    @POST("/health-consultation/api/consult/conDoctor/update")
+    suspend fun editDoctorInfo(@Body requestBody: RequestBody): ApiResponse<String?>
+
+    /**
+     * 查询医生排班
+     */
+    @GET("/health-consultation/api/consult/conDoctorScheduling/selectDoctorScheduling")
+    suspend fun getDoctorScheduling(@QueryMap params: MutableMap<String, Any?>): ApiResponse<SchedulingResultBean>
+    /**
+     * 一次性插入排班
+     */
+    @POST("/health-consultation/api/consult/conDoctorScheduling/insertDoctorScheduling")
+    suspend fun createDoctorScheduling(@Body requestBody: RequestBody): ApiResponse<String>
+    /**
+     * 单条插入排班
+     */
+    @POST("/health-consultation/api/consult/conDoctorScheduling/insertDoctorSchedulingSingle")
+    suspend fun createDoctorCustomScheduling(@Body requestBody: RequestBody): ApiResponse<String>
+
+    /**
+     * 修改密码
+     */
+    @PUT("/health-consultation/api/consult/conDoctor/updatePassword")
+    suspend fun editPassword(@Body requestBody: RequestBody): ApiResponse<String>
+
+    /**
+     * 账单明细
+     */
+    @GET("/health-consultation/api/consult/conCostStatistics/findlistpage")
+    suspend fun getBillRecord(@QueryMap params: MutableMap<String, Any?>): ApiResponse<PageManagerBean<BillRecordBean>>
+    /**
+     * 账单详情
+     */
+    @GET("/health-consultation/api/consult/conCostStatistics/queryById")
+    suspend fun getBillDetail(@QueryMap params: MutableMap<String, Any?>): ApiResponse<BillRecordBean>
+    /**
+     * 收益统计
+     */
+    @GET("/health-consultation/api/consult/conCostStatistics/getStatistics")
+    suspend fun getConsultStatistics(): ApiResponse<ConsultStatisticsBean>
+    /**
+     * 咨询方式统计（按月）
+     */
+    @GET("/health-consultation/api/consult/conCostStatistics/groupByTypehList")
+    suspend fun getConsultTypeData(@QueryMap params: MutableMap<String, Any?>): ApiResponse<MutableList<ConsultTypeBean>>
+    /**
+     * 暂停服务记录
+     */
+    @GET("/health-consultation/api/consult/conService/list")
+    suspend fun getSuspensionServiceList(@QueryMap params: MutableMap<String, Any?>): ApiResponse<PageManagerBean<SuspensionServiceBean>>
+    /**
+     * 停止暂定服务
+     */
+    @POST("/health-consultation/api/consult/conService/edit")
+    suspend fun stopSuspensionService(@Body requestBody: RequestBody): ApiResponse<String>
+    /**
+     * 添加暂定服务
+     */
+    @POST("/health-consultation/api/consult/conService/add")
+    suspend fun addSuspensionService(@Body requestBody: RequestBody): ApiResponse<String>
+    /**
+     * 获取后台配置的功能列表（例如：医生暂停服务原因列表）
+     */
+    @GET("/health-consultation/api/consult/conDoctor/selectDictList")
+    suspend fun getCommonSettingMenuList(@QueryMap params: MutableMap<String, Any?>): ApiResponse<MutableList<CommonSettingMenuBean>>
+    /**
+     * 获取指定时间范围内存在的咨询单
+     */
+    @GET("/health-consultation/api/consult/conSession/selectSessionVideoExistDoctor")
+    suspend fun getDateRangeConsultNum(@QueryMap params: MutableMap<String, Any?>): ApiResponse<String>
+    /**
+     * 上传文件
+     */
+    @Multipart
+    @POST("/sys/upload/uploadFile")
+    suspend fun uploadFile(@Part part: MultipartBody.Part, @Part("biz") path: RequestBody): ApiResponse<UploadFileResultBean>
+    /**
+     * 更像头像
+     */
+    @POST("/sys/user/updateUserAvatar")
+    suspend fun uploadHeadImage(@QueryMap params: MutableMap<String, Any?>): ApiResponse<String>
+    /**
+     * 获取医生可选擅长疾病
+     */
+    @GET("/health-consultation/api/consult/conSicks/selectSickListByDepartmentIdDoctorSearch")
+    suspend fun getDoctorGoodAtDisease(@QueryMap params: MutableMap<String, Any?>): ApiResponse<MutableList<DiseaseBean>>
+    /**
+     * 咨询小助手
+     */
+    @GET("health-consultation/api/consult/conSession/insertProfessorAndHelperSession")
+    suspend fun submitAssistantConsultApply(): ApiResponse<IMAssistantBean>
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/data/api/OtherApi.kt b/app/src/main/java/com/yxjk/healthexpertclient/data/api/OtherApi.kt
new file mode 100644
index 0000000..7c4b49d
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/data/api/OtherApi.kt
@@ -0,0 +1,58 @@
+package com.yxjk.healthexpertclient.data.api
+
+import com.btpj.lib_base.data.bean.ApiResponse
+import com.yxjk.healthexpertclient.bean.AppUpdateBean
+import com.yxjk.healthexpertclient.bean.other.UserListBean
+import com.yxjk.healthexpertclient.bean.workbench.ArchivesDetailResultBean
+import com.yxjk.healthexpertclient.bean.workbench.AudioVideoCallBean
+import com.yxjk.healthexpertclient.bean.workbench.CheckRecordUserInfoBean
+import com.yxjk.healthexpertclient.bean.workbench.ConsultDetailBean
+import com.yxjk.healthexpertclient.bean.workbench.ConsultRecordBean
+import com.yxjk.healthexpertclient.bean.workbench.HealthInfoBean
+import com.yxjk.healthexpertclient.bean.workbench.MessageBean
+import com.yxjk.healthexpertclient.bean.workbench.PhysicalExaminationReportBean
+import com.yxjk.healthexpertclient.bean.workbench.RefuseReasonBean
+import com.yxjk.healthexpertclient.bean.workbench.WorkBenchConsultNumBean
+import okhttp3.RequestBody
+import retrofit2.http.Body
+import retrofit2.http.FieldMap
+import retrofit2.http.FormUrlEncoded
+import retrofit2.http.GET
+import retrofit2.http.POST
+import retrofit2.http.QueryMap
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/24 15:08
+ * @description 工作台接口定义
+ */
+interface OtherApi {
+    /**
+     * 获取模拟用户列表
+     */
+    @GET("/health-system/sys/user/listAll")
+    suspend fun listAll(@QueryMap params: MutableMap<String, Any?>): ApiResponse<UserListBean>
+    /**
+     * 模拟用户信息
+     */
+    @FormUrlEncoded
+    @POST("/health-system/test/fake")
+    suspend fun fake(@FieldMap params: MutableMap<String, Any?>): ApiResponse<Boolean>
+    /**
+     * 获取模拟用户信息
+     */
+    @POST("/health-system/test/fakeUser")
+    suspend fun fakeUser(@Body requestBody: RequestBody): ApiResponse<UserListBean.RecordsDTO>
+    /**
+     * 重置模拟
+     */
+    @POST("/health-system/test/restore")
+    suspend fun restore(@Body requestBody: RequestBody): ApiResponse<Boolean>
+
+    /**
+     * 校验token是否过期
+     */
+    @GET("/health-consultation/api/consult/msgRecord/selectTokenExpire")
+    suspend fun selectTokenExpire(@QueryMap params: MutableMap<String, Any?>): ApiResponse<Boolean>
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/data/api/WorkbenchApi.kt b/app/src/main/java/com/yxjk/healthexpertclient/data/api/WorkbenchApi.kt
new file mode 100644
index 0000000..89d3bec
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/data/api/WorkbenchApi.kt
@@ -0,0 +1,139 @@
+package com.yxjk.healthexpertclient.data.api
+
+import com.btpj.lib_base.data.bean.ApiResponse
+import com.yxjk.healthexpertclient.bean.AppUpdateBean
+import com.yxjk.healthexpertclient.bean.workbench.ArchivesDetailResultBean
+import com.yxjk.healthexpertclient.bean.workbench.AudioVideoCallBean
+import com.yxjk.healthexpertclient.bean.workbench.CheckRecordUserInfoBean
+import com.yxjk.healthexpertclient.bean.workbench.ConsultDetailBean
+import com.yxjk.healthexpertclient.bean.workbench.ConsultRecordBean
+import com.yxjk.healthexpertclient.bean.workbench.HealthInfoBean
+import com.yxjk.healthexpertclient.bean.workbench.MessageBean
+import com.yxjk.healthexpertclient.bean.workbench.PhysicalExaminationReportBean
+import com.yxjk.healthexpertclient.bean.workbench.RefuseReasonBean
+import com.yxjk.healthexpertclient.bean.workbench.WorkBenchConsultNumBean
+import okhttp3.RequestBody
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.POST
+import retrofit2.http.QueryMap
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/24 15:08
+ * @description 工作台接口定义
+ */
+interface WorkbenchApi {
+    /**
+     * 获取咨询记录(当前登录人专家的咨询列表)
+     */
+    @GET("/health-consultation/api/consult/conSession/selectSessionListByDoctorIdNew")
+    suspend fun getConsultRecord(@QueryMap params: MutableMap<String, Any?>): ApiResponse<MutableList<ConsultRecordBean>>
+    /**
+     * 获取咨询记录（某个用户（员工）的咨询历史记录）
+     */
+    @GET("/health-consultation/api/consult/conSession/sessionDetailDoctorSearch")
+    suspend fun getConsultHistory(@QueryMap params: MutableMap<String, Any?>): ApiResponse<MutableList<ConsultRecordBean>>
+    /**
+     * 图文咨询详情
+     */
+    @GET("/health-consultation/api/consult/conSession/sessionDetailDoctor")
+    suspend fun getImageTextConsultDetail(@QueryMap params: MutableMap<String, Any?>): ApiResponse<ConsultDetailBean>
+    /**
+     * 音视频咨询详情
+     */
+    @GET("/health-consultation/api/consult/conSession/sessionDetailDoctorAll")
+    suspend fun getAudioVideoConsultDetail(@QueryMap params: MutableMap<String, Any?>): ApiResponse<ConsultDetailBean>
+    /**
+     * 医生接受会话的原因
+     */
+    @GET("/health-consultation/api/consult/conSession/selectRejectReason")
+    suspend fun getRefusalAudioVideoCallReason(): ApiResponse<MutableList<RefuseReasonBean>>
+    /**
+     * 医生拒绝会话
+     */
+    @GET("/health-consultation/api/consult/conSession/sessionReject")
+    suspend fun refusalAudioVideoCall(@QueryMap params: MutableMap<String, Any?>): ApiResponse<String>
+    /**
+     * 医生接受会话
+     */
+    @GET("/health-consultation/api/consult/conSession/sessionConfirm")
+    suspend fun acceptAudioVideoCall(@QueryMap params: MutableMap<String, Any?>): ApiResponse<String>
+    /**
+     * 医生发起会话
+     */
+    @GET("/health-consultation/api/consult/conSessionVideoInfo/startVideoSession")
+    suspend fun initiateAudioVideoCall(@QueryMap params: MutableMap<String, Any?>): ApiResponse<AudioVideoCallBean>
+    /**
+     * 查询档案详情
+     */
+    @GET("/health-consultation/api/consult/medicalRecords/selectConMedicalRecordsByIdDoctor")
+    suspend fun getArchivesDetail(@QueryMap params: MutableMap<String, Any?>): ApiResponse<ArchivesDetailResultBean>
+    /**
+     * 查询体检报告
+     */
+    @GET("/health-archives/historyReport/selectNewHealthReport")
+    suspend fun getPhysicalExaminationReport(@QueryMap params: MutableMap<String, Any?>): ApiResponse<PhysicalExaminationReportBean>
+    /**
+     * 获取音视频咨询未处理消息数
+     */
+    @GET("/health-consultation/api/consult/ ")
+    suspend fun getAudioVideoUnreadNum(@QueryMap params: MutableMap<String, Any?>): ApiResponse<String>
+    /**
+     * 通过IM会话列表匹配对应的图文咨询列表
+     */
+    @POST("/health-consultation/api/consult/conSession/selectSessionByImIdNewNew")
+    suspend fun getImageTextConsultRecord(@Body requestBody: RequestBody): ApiResponse<MutableList<ConsultRecordBean>>
+    /**
+     * 获取用户基本健康信息
+     */
+    @GET("/health-consultation/api/consult/healthInfo/selectHealthInfoDoctor")
+    suspend fun getBaseHealthInfo(@QueryMap params: MutableMap<String, Any?>): ApiResponse<MutableList<HealthInfoBean>>
+    /**
+     *  查询体检信息(这里复制的用户端的)
+     */
+//    @GET("cqyt/middleController/getCheckItemBySfzhTotal")
+//    suspend fun getCheckItemBySfzhTotal(@Query("sfzh") sfzh:String, @Query("tjrq") tjrq:String, @Query("type") type:String=""): ApiResponse<CheckItemBySfzhTotalBean>
+    @GET("health-archives/historyReport/getHistoryReportById")
+    suspend fun getHistoryReportNoDetail(@QueryMap params: MutableMap<String, Any?>): ApiResponse<CheckRecordUserInfoBean>
+    /**
+     * 结束咨询
+     */
+    @GET("/health-consultation/api/consult/conSession/finishSession")
+    suspend fun finishConsult(@QueryMap params: MutableMap<String, Any?>): ApiResponse<String>
+    /**
+     * 音视频通话之后再次预约时间
+     */
+    @GET("/health-consultation/api/consult/sessionReservationDate/sessionReservationDate")
+    suspend fun againAppointmentDateTime(@QueryMap params: MutableMap<String, Any?>): ApiResponse<String>
+    /**
+     * 音视频通话开始
+     */
+    @GET("/health-consultation/api/consult/sessionReservationDate/sessionReservationDate")
+    suspend fun audioVideoCallStart(@QueryMap params: MutableMap<String, Any?>): ApiResponse<String>
+    /**
+     * 音视频通话结束
+     */
+    @GET("/health-consultation/api/consult/sessionReservationDate/endPhone")
+    suspend fun audioVideoCallEnd(@QueryMap params: MutableMap<String, Any?>): ApiResponse<String>
+    /**
+     * 首页咨询数量获取
+     */
+    @GET("/health-consultation/api/consult/conSession/selectSessionProfessorIngNew")
+    suspend fun getWorkBenchConsultNum(): ApiResponse<WorkBenchConsultNumBean>
+    /**
+     * 获取当前咨询中的小助手信息
+     */
+    @GET("/health-consultation/api/consult/conSession/insertProfessorAndHelperSessionShow")
+    suspend fun getConsultAssistantInfo(): ApiResponse<String>
+    /**
+     * 获取消息列表
+     */
+    @POST("/health-consultation/api/consult/msgRecord/selectMsgRecordList")
+    suspend fun getMessageList(@Body requestBody: RequestBody): ApiResponse<MutableList<MessageBean>>
+    /**
+     * 检查更新
+     */
+    @GET("/health-system/version/getSysVersionDetailByPackageName")
+    suspend fun getAppUpdateInfo(@QueryMap params: MutableMap<String, Any?>): ApiResponse<AppUpdateBean>
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/data/repository/IMRepository.kt b/app/src/main/java/com/yxjk/healthexpertclient/data/repository/IMRepository.kt
new file mode 100644
index 0000000..c42809c
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/data/repository/IMRepository.kt
@@ -0,0 +1,17 @@
+package com.yxjk.healthexpertclient.data.repository
+
+import com.btpj.lib_base.data.bean.ApiResponse
+import com.btpj.lib_base.http.BaseRepository
+import com.btpj.lib_base.http.RetrofitManager
+import com.yxjk.healthexpertclient.bean.im.IMInfoBean
+import com.yxjk.healthexpertclient.data.api.IMApi
+
+object IMRepository: BaseRepository() {
+    private val service by lazy { RetrofitManager.getService(IMApi::class.java) }
+    suspend fun getIMSig(): ApiResponse<IMInfoBean> {
+        return apiCall { service.getIMSig() }
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/data/repository/LoginRepository.kt b/app/src/main/java/com/yxjk/healthexpertclient/data/repository/LoginRepository.kt
new file mode 100644
index 0000000..094389c
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/data/repository/LoginRepository.kt
@@ -0,0 +1,53 @@
+package com.yxjk.healthexpertclient.data.repository
+
+import com.btpj.lib_base.data.bean.ApiResponse
+import com.btpj.lib_base.ext.toJson
+import com.btpj.lib_base.http.BaseRepository
+import com.btpj.lib_base.http.RetrofitManager
+import com.btpj.lib_base.http.RetrofitManager.toRequestBody
+import com.yxjk.healthexpertclient.bean.CommonSettingMenuBean
+import com.yxjk.healthexpertclient.bean.login.LoginResultBean
+import com.yxjk.healthexpertclient.data.api.LoginApi
+import com.yxjk.healthexpertclient.utils.DevicesInfoUtils
+
+object LoginRepository: BaseRepository() {
+    private val service by lazy { RetrofitManager.getService(LoginApi::class.java) }
+    suspend fun login(account: String, password: String): ApiResponse<LoginResultBean> {
+        val params = mutableMapOf<String, Any?>()
+        params["deviceType"] = "${DevicesInfoUtils.getDeviceBrand()}"
+        params["deviceSystem"] = "${DevicesInfoUtils.getDeviceModel()}(Android${DevicesInfoUtils.getDeviceAndroidVersion()})"
+        params["username"] = account
+        params["password"] = password
+        return apiCall { service.login(params.toJson().toRequestBody()) }
+    }
+
+    /**
+     * 校验用户信息
+     */
+    suspend fun checkUserInfo(realname:String,idCard:String,phone:String): ApiResponse<String> {
+        return apiCall {
+            val map = mutableMapOf<String, Any?>()
+            map.put("realname",realname)
+            map.put("idCard",idCard)
+            map.put("phone",phone)
+            service.checkUserInfo(map.toJson().toRequestBody())
+        }
+    }
+    /**
+     * 修改密码
+     */
+    suspend fun resetUserPwd(newPassword:String,newPasswordConfirm:String,resetCode:String): ApiResponse<String> {
+        return apiCall {
+            val map = mutableMapOf<String, Any?>()
+            map.put("newPassword",newPassword)
+            map.put("newPasswordConfirm",newPasswordConfirm)
+            map.put("resetCode",resetCode)
+            service.resetUserPwd(map.toJson().toRequestBody())
+        }
+    }
+    suspend fun getCommonSettingMenuList(menuKey: String): ApiResponse<MutableList<CommonSettingMenuBean>> {
+        val params = mutableMapOf<String, Any?>()
+        params["dictKey"] = menuKey
+        return apiCall { service.getCommonSettingMenuList(params)}
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/data/repository/MineRepository.kt b/app/src/main/java/com/yxjk/healthexpertclient/data/repository/MineRepository.kt
new file mode 100644
index 0000000..311acb7
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/data/repository/MineRepository.kt
@@ -0,0 +1,150 @@
+package com.yxjk.healthexpertclient.data.repository
+
+import com.btpj.lib_base.data.bean.ApiResponse
+import com.btpj.lib_base.ext.toJson
+import com.btpj.lib_base.http.BaseRepository
+import com.btpj.lib_base.http.RetrofitManager
+import com.btpj.lib_base.http.RetrofitManager.toRequestBody
+import com.yxjk.healthexpertclient.bean.UploadFileResultBean
+import com.yxjk.healthexpertclient.bean.im.IMAssistantBean
+import com.yxjk.healthexpertclient.bean.mine.BillRecordBean
+import com.yxjk.healthexpertclient.bean.mine.CommonSettingMenuBean
+import com.yxjk.healthexpertclient.bean.mine.ConsultStatisticsBean
+import com.yxjk.healthexpertclient.bean.mine.ConsultTypeBean
+import com.yxjk.healthexpertclient.bean.mine.DiseaseBean
+import com.yxjk.healthexpertclient.bean.mine.DoctorBean
+import com.yxjk.healthexpertclient.bean.mine.PageManagerBean
+import com.yxjk.healthexpertclient.bean.mine.SchedulingBean
+import com.yxjk.healthexpertclient.bean.mine.SchedulingResultBean
+import com.yxjk.healthexpertclient.bean.mine.SuspensionServiceBean
+import com.yxjk.healthexpertclient.data.api.MineApi
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.MultipartBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import java.io.File
+
+
+object MineRepository : BaseRepository() {
+    private val service by lazy { RetrofitManager.getService(MineApi::class.java) }
+    suspend fun getDoctorInfo(): ApiResponse<DoctorBean> {
+        return apiCall { service.getDoctorInfo() }
+    }
+
+    suspend fun editDoctorInfo(doctorBean: DoctorBean): ApiResponse<String?> {
+        return apiCall { service.editDoctorInfo(doctorBean.toJson().toRequestBody()) }
+    }
+
+    suspend fun getDoctorScheduling(): ApiResponse<SchedulingResultBean> {
+        val params = mutableMapOf<String, Any?>()
+        return apiCall { service.getDoctorScheduling(params) }
+    }
+
+    suspend fun createDoctorScheduling(
+        schedulingList: MutableList<SchedulingBean>,
+        isJumpHoliday: Boolean,
+        openAudioVideo: Boolean,
+        isCustomScheduling: Boolean
+    ): ApiResponse<String> {
+        val params = mutableMapOf<String, Any?>()
+        params["list"] = schedulingList
+        params["tfJumpHoliday"] = if (isJumpHoliday) "1" else "0"
+        params["tfDefault"] = if (isCustomScheduling) "1" else "0"
+        params["audioStatus"] = if (openAudioVideo) "1" else "0"
+        return apiCall { service.createDoctorScheduling(params.toJson().toRequestBody()) }
+    }
+
+    suspend fun createDoctorCustomScheduling(schedulingBean: SchedulingBean): ApiResponse<String> {
+        return apiCall { service.createDoctorScheduling(schedulingBean.toJson().toRequestBody()) }
+    }
+
+    suspend fun editPassword(
+        username: String,
+        oldPassword: String,
+        password: String,
+        confirmPassword: String
+    ): ApiResponse<String> {
+        val params = mutableMapOf<String, Any?>()
+        params["username"] = username
+        params["oldpassword"] = oldPassword
+        params["confirmpassword"] = confirmPassword
+        params["password"] = password
+//        params["oldPassword"] = oldPassword
+//        params["confirmPassword"] = confirmPassword
+        return apiCall { service.editPassword(params.toJson().toRequestBody()) }
+    }
+
+    suspend fun getBillRecord(date: String, type: String, pageNo: Int, pageSize: Int = 20): ApiResponse<PageManagerBean<BillRecordBean>>{
+        val params = mutableMapOf<String, Any?>()
+        params["date"] = date
+        params["type"] = type
+        params["pageNo"] = pageNo
+        params["pageSize"] = pageSize
+        return apiCall { service.getBillRecord(params) }
+    }
+
+    suspend fun getBillDetail(id: String): ApiResponse<BillRecordBean>{
+        val params = mutableMapOf<String, Any?>()
+        params["id"] = id
+        return apiCall { service.getBillDetail(params) }
+    }
+    /**
+     * 收益统计
+     */
+    suspend fun getConsultStatistics(): ApiResponse<ConsultStatisticsBean>{
+        return apiCall { service.getConsultStatistics() }
+    }
+    /**
+     * 咨询方式统计（按月）
+     * @param date 月份，示例2023-05
+     */
+    suspend fun getConsultTypeData(date: String): ApiResponse<MutableList<ConsultTypeBean>>{
+        val params = mutableMapOf<String, Any?>()
+        params["date"] = date
+        return apiCall { service.getConsultTypeData(params) }
+    }
+    suspend fun getSuspensionServiceList(pageNo: Int, pageSize: Int = 20): ApiResponse<PageManagerBean<SuspensionServiceBean>>{
+        val params = mutableMapOf<String, Any?>()
+        params["pageNo"] = pageNo
+        params["pageSize"] = pageSize
+        return apiCall { service.getSuspensionServiceList(params) }
+    }
+
+    suspend fun stopSuspensionService(recordId: String): ApiResponse<String>{
+        val params = mutableMapOf<String, Any?>()
+        params["id"] = recordId
+        params["serviceStatus"] = 1
+        return apiCall { service.stopSuspensionService(params.toJson().toRequestBody()) }
+    }
+    suspend fun getSuspensionReasonList(): ApiResponse<MutableList<CommonSettingMenuBean>>{
+        val params = mutableMapOf<String, Any?>()
+        params["dictKey"] = "doctor_stop_reason_type"
+        return apiCall { service.getCommonSettingMenuList(params) }
+    }
+    suspend fun addSuspensionService(suspensionServiceBean: SuspensionServiceBean): ApiResponse<String>{
+        return apiCall { service.addSuspensionService(suspensionServiceBean.toJson().toRequestBody()) }
+    }
+    suspend fun getDateRangeConsultNum(startDate: Long, endDate: Long): ApiResponse<String>{
+        val params = mutableMapOf<String, Any?>()
+        params["startTime"] = startDate
+        params["endTime"] = endDate
+        return apiCall { service.getDateRangeConsultNum(params) }
+    }
+    suspend fun uploadFile(file: File): ApiResponse<UploadFileResultBean>{
+        val photoPart = MultipartBody.Part.createFormData("file", file.name, file.asRequestBody("image/jpg".toMediaTypeOrNull()))
+        return apiCall { service.uploadFile(photoPart, "".toRequestBody("".toMediaTypeOrNull())) }
+    }
+    suspend fun uploadHeadImage(imageUrl: String): ApiResponse<String>{
+        val params = mutableMapOf<String, Any?>()
+        params["avatar"] = imageUrl
+        return apiCall { service.uploadHeadImage(params) }
+    }
+    suspend fun getDoctorGoodAtDisease(departmentId: String): ApiResponse<MutableList<DiseaseBean>>{
+        val params = mutableMapOf<String, Any?>()
+        params["departmentId"] = departmentId
+        return apiCall { service.getDoctorGoodAtDisease(params) }
+    }
+    suspend fun submitAssistantConsultApply(): ApiResponse<IMAssistantBean>{
+        return apiCall { service.submitAssistantConsultApply() }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/data/repository/OtherRepository.kt b/app/src/main/java/com/yxjk/healthexpertclient/data/repository/OtherRepository.kt
new file mode 100644
index 0000000..c2cd395
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/data/repository/OtherRepository.kt
@@ -0,0 +1,74 @@
+package com.yxjk.healthexpertclient.data.repository
+
+import com.btpj.lib_base.data.bean.ApiResponse
+import com.btpj.lib_base.data.local.DataStoreManager
+import com.btpj.lib_base.ext.toJson
+import com.btpj.lib_base.http.BaseRepository
+import com.btpj.lib_base.http.RetrofitManager
+import com.btpj.lib_base.http.RetrofitManager.toRequestBody
+import com.yxjk.healthexpertclient.BuildConfig
+import com.yxjk.healthexpertclient.bean.AppUpdateBean
+import com.yxjk.healthexpertclient.bean.other.UserListBean
+import com.yxjk.healthexpertclient.bean.workbench.ArchivesDetailResultBean
+import com.yxjk.healthexpertclient.bean.workbench.AudioVideoCallBean
+import com.yxjk.healthexpertclient.bean.workbench.CheckRecordUserInfoBean
+import com.yxjk.healthexpertclient.bean.workbench.ConsultDetailBean
+import com.yxjk.healthexpertclient.bean.workbench.ConsultRecordBean
+import com.yxjk.healthexpertclient.bean.workbench.HealthInfoBean
+import com.yxjk.healthexpertclient.bean.workbench.MessageBean
+import com.yxjk.healthexpertclient.bean.workbench.PhysicalExaminationReportBean
+import com.yxjk.healthexpertclient.bean.workbench.RefuseReasonBean
+import com.yxjk.healthexpertclient.bean.workbench.WorkBenchConsultNumBean
+import com.yxjk.healthexpertclient.data.api.OtherApi
+import com.yxjk.healthexpertclient.data.api.WorkbenchApi
+import com.yxjk.healthexpertclient.utils.DevicesInfoUtils
+
+object OtherRepository : BaseRepository() {
+    private val service by lazy { RetrofitManager.getService(OtherApi::class.java) }
+    suspend fun getList(
+        username: String
+    ): ApiResponse<UserListBean> {
+        val params = mutableMapOf<String, Any?>()
+        params["personType"] = 3
+        params["username"] = username
+        params["pageNo"] = 1
+        params["pageSize"] = 100
+        return apiCall {
+            service.listAll(params)
+        }
+    }
+
+    suspend fun simulateUser(
+        userId: String
+    ): ApiResponse<Boolean> {
+        val params = mutableMapOf<String, Any?>()
+        params["userId"] = userId
+        return apiCall { service.fake(params) }
+    }
+
+    suspend fun fakeUser(
+
+    ): ApiResponse<UserListBean.RecordsDTO> {
+        val params = mutableMapOf<String, Any?>()
+//        params["X-Access-Token"] = DataStoreManager.getToken()
+        return apiCall { service.fakeUser(params.toJson().toRequestBody()) }
+    }
+    suspend fun restore(
+    ): ApiResponse<Boolean> {
+        val params = mutableMapOf<String, Any?>()
+//        params["userId"] = userId
+        return apiCall { service.restore(params.toJson().toRequestBody()) }
+    }
+
+    /**
+     * 校验token有效性
+     */
+    suspend fun selectTokenExpire(token:String): ApiResponse<Boolean> {
+        return apiCall {
+            val map = mutableMapOf<String, Any?>()
+            map.put("token",token)
+            service.selectTokenExpire(map)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/data/repository/WorkbenchRepository.kt b/app/src/main/java/com/yxjk/healthexpertclient/data/repository/WorkbenchRepository.kt
new file mode 100644
index 0000000..babef5b
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/data/repository/WorkbenchRepository.kt
@@ -0,0 +1,193 @@
+package com.yxjk.healthexpertclient.data.repository
+
+import com.btpj.lib_base.data.bean.ApiResponse
+import com.btpj.lib_base.ext.toJson
+import com.btpj.lib_base.http.BaseRepository
+import com.btpj.lib_base.http.RetrofitManager
+import com.btpj.lib_base.http.RetrofitManager.toRequestBody
+import com.yxjk.healthexpertclient.BuildConfig
+import com.yxjk.healthexpertclient.bean.AppUpdateBean
+import com.yxjk.healthexpertclient.bean.workbench.ArchivesDetailResultBean
+import com.yxjk.healthexpertclient.bean.workbench.AudioVideoCallBean
+import com.yxjk.healthexpertclient.bean.workbench.CheckRecordUserInfoBean
+import com.yxjk.healthexpertclient.bean.workbench.ConsultDetailBean
+import com.yxjk.healthexpertclient.bean.workbench.ConsultRecordBean
+import com.yxjk.healthexpertclient.bean.workbench.HealthInfoBean
+import com.yxjk.healthexpertclient.bean.workbench.MessageBean
+import com.yxjk.healthexpertclient.bean.workbench.PhysicalExaminationReportBean
+import com.yxjk.healthexpertclient.bean.workbench.RefuseReasonBean
+import com.yxjk.healthexpertclient.bean.workbench.WorkBenchConsultNumBean
+import com.yxjk.healthexpertclient.data.api.WorkbenchApi
+
+object WorkbenchRepository : BaseRepository() {
+    private val service by lazy { RetrofitManager.getService(WorkbenchApi::class.java) }
+    suspend fun getConsultRecord(
+        type: String,
+        status: String,
+        pageNo: Int,
+        pageSize: Int
+    ): ApiResponse<MutableList<ConsultRecordBean>> {
+        val params = mutableMapOf<String, Any?>()
+        params["type"] = type
+        params["status"] = status
+        params["pageNo"] = pageNo
+        params["pageSize"] = pageSize
+        return apiCall {
+            var result = service.getConsultRecord(params)
+            result
+        }
+    }
+
+    suspend fun getConsultHistory(
+        memberId: String,
+        searchKey: String,
+        pageNo: Int,
+        pageSize: Int
+    ): ApiResponse<MutableList<ConsultRecordBean>> {
+        val params = mutableMapOf<String, Any?>()
+        params["memberId"] = memberId
+        params["searchKey"] = searchKey
+        params["pageNo"] = pageNo
+        params["pageSize"] = pageSize
+        return apiCall { service.getConsultRecord(params) }
+    }
+
+    suspend fun getImageTextConsultDetail(recordId: String): ApiResponse<ConsultDetailBean> {
+        val params = mutableMapOf<String, Any?>()
+        params["id"] = recordId
+        return apiCall { service.getImageTextConsultDetail(params) }
+    }
+
+    suspend fun getAudioVideoConsultDetail(recordId: String): ApiResponse<ConsultDetailBean> {
+        val params = mutableMapOf<String, Any?>()
+        params["id"] = recordId
+        return apiCall { service.getAudioVideoConsultDetail(params) }
+    }
+
+    suspend fun getRefusalAudioVideoCallReason(): ApiResponse<MutableList<RefuseReasonBean>> {
+        return apiCall { service.getRefusalAudioVideoCallReason() }
+    }
+
+    suspend fun refusalAudioVideoCall(
+        recordId: String,
+        reasonType: String,
+        rejectReason: String
+    ): ApiResponse<String> {
+        val params = mutableMapOf<String, Any?>()
+        params["id"] = recordId
+        params["reasonType"] = reasonType
+        params["rejectReason"] = rejectReason
+        return apiCall { service.refusalAudioVideoCall(params) }
+    }
+
+    suspend fun acceptAudioVideoCall(
+        recordId: String,
+        startTime: Long,
+        endTime: Long
+    ): ApiResponse<String> {
+        val params = mutableMapOf<String, Any?>()
+        params["id"] = recordId
+        params["startTime"] = startTime
+        params["endTime"] = endTime
+        return apiCall { service.acceptAudioVideoCall(params) }
+    }
+
+    suspend fun initiateAudioVideoCall(sessionId: String): ApiResponse<AudioVideoCallBean> {
+        val params = mutableMapOf<String, Any?>()
+        params["sessionId"] = sessionId
+        return apiCall { service.initiateAudioVideoCall(params) }
+    }
+
+    suspend fun getArchivesDetail(archivesId: String): ApiResponse<ArchivesDetailResultBean> {
+        val params = mutableMapOf<String, Any?>()
+        params["id"] = archivesId
+        return apiCall { service.getArchivesDetail(params) }
+    }
+
+    suspend fun getPhysicalExaminationReport(userId: String): ApiResponse<PhysicalExaminationReportBean> {
+        val params = mutableMapOf<String, Any?>()
+        params["userId"] = userId
+        return apiCall { service.getPhysicalExaminationReport(params) }
+    }
+
+    suspend fun getAudioVideoUnreadNum(): ApiResponse<String> {
+        val params = mutableMapOf<String, Any?>()
+        return apiCall { service.getAudioVideoUnreadNum(params) }
+    }
+
+    suspend fun getImageTextConsultRecord(tfReply:Int,imIdList: MutableList<String>): ApiResponse<MutableList<ConsultRecordBean>> {
+        val params = mutableMapOf<String, Any?>()
+        params["tfReply"] = tfReply
+        params["imIds"] = imIdList
+        return apiCall { service.getImageTextConsultRecord(params.toJson().toRequestBody()) }
+    }
+
+    suspend fun getBaseHealthInfo(memberId: String): ApiResponse<MutableList<HealthInfoBean>> {
+        val params = mutableMapOf<String, Any?>()
+        params["memberId"] = memberId
+        return apiCall { service.getBaseHealthInfo(params) }
+    }
+
+//    suspend fun getPhysicalExaminationReportDetail(
+//        idCard: String,
+//        year: String,
+//        type: String = ""
+//    ): ApiResponse<CheckItemBySfzhTotalBean> {
+//        return apiCall { service.getCheckItemBySfzhTotal(idCard, year, type) }
+//    }
+    suspend fun getHistoryReportNoDetail(id: String): ApiResponse<CheckRecordUserInfoBean>{
+        val params = mutableMapOf<String, Any?>()
+        params["id"] = id
+        return apiCall {service.getHistoryReportNoDetail(params)}
+    }
+    suspend fun finishConsult(id: String): ApiResponse<String> {
+        val map = mutableMapOf<String, Any?>()
+        map["id"] = id
+        return apiCall { service.finishConsult(map) }
+    }
+
+    suspend fun againAppointmentDateTime(
+        id: String,
+        startTime: Long,
+        endTime: Long
+    ): ApiResponse<String> {
+        val params = mutableMapOf<String, Any?>()
+        params["id"] = id
+        params["startTime"] = startTime
+        params["endTime"] = endTime
+        params["type"] = "1"
+        return apiCall { service.againAppointmentDateTime(params) }
+    }
+    suspend fun audioVideoCallStart(id: String): ApiResponse<String>{
+        val params = mutableMapOf<String, Any?>()
+        params["id"] = id
+        params["type"] = "2" //郑文斌写的接口，非要这么搞，骂人骂他
+        params["startTime"] = ""
+        params["endTime"] = ""
+        return apiCall { service.audioVideoCallStart(params) }
+    }
+    suspend fun audioVideoCallEnd(id: String): ApiResponse<String>{
+        val params = mutableMapOf<String, Any?>()
+        params["id"] = id
+        return apiCall { service.audioVideoCallEnd(params) }
+    }
+    suspend fun getWorkBenchConsultNum(): ApiResponse<WorkBenchConsultNumBean>{
+        return apiCall { service.getWorkBenchConsultNum() }
+    }
+    suspend fun getConsultAssistantInfo(): ApiResponse<String>{
+        return apiCall { service.getConsultAssistantInfo() }
+    }
+    suspend fun getMessageList(pageNo: Int,
+                               pageSize: Int): ApiResponse<MutableList<MessageBean>>{
+        val params = mutableMapOf<String, Any?>()
+        params["pageNo"] = pageNo
+        params["pageSize"] = pageSize
+        return apiCall { service.getMessageList(params.toJson().toRequestBody()) }
+    }
+    suspend fun getAppUpdateInfo(appId: String): ApiResponse<AppUpdateBean>{
+        val params = mutableMapOf<String, Any?>()
+        params["androidOrIos"] = 1
+        params["packageName"] = BuildConfig.APPLICATION_ID
+        return apiCall { service.getAppUpdateInfo(params) }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/event/AddGoodAtDiseaseEvent.kt b/app/src/main/java/com/yxjk/healthexpertclient/event/AddGoodAtDiseaseEvent.kt
new file mode 100644
index 0000000..fd2d462
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/event/AddGoodAtDiseaseEvent.kt
@@ -0,0 +1,11 @@
+package com.yxjk.healthexpertclient.event
+
+import com.yxjk.healthexpertclient.bean.mine.DiseaseBean
+
+/**
+ * @author nanfeifei
+ * @time 2023/6/25 18:34
+ * @description
+ */
+class AddGoodAtDiseaseEvent(val list: MutableList<DiseaseBean>) {
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/event/ConsultRecordEvent.kt b/app/src/main/java/com/yxjk/healthexpertclient/event/ConsultRecordEvent.kt
new file mode 100644
index 0000000..f5dae1f
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/event/ConsultRecordEvent.kt
@@ -0,0 +1,9 @@
+package com.yxjk.healthexpertclient.event
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/29 16:50
+ * @description  咨询记录在详情页操作导致状态变化后刷新列表使用
+ */
+class ConsultRecordEvent {
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/event/DoctorEvent.kt b/app/src/main/java/com/yxjk/healthexpertclient/event/DoctorEvent.kt
new file mode 100644
index 0000000..6ff9681
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/event/DoctorEvent.kt
@@ -0,0 +1,9 @@
+package com.yxjk.healthexpertclient.event
+
+/**
+ * @author nanfeifei
+ * @time 2023/6/5 16:22
+ * @description  医生信息发生变化后刷新首页医生信息
+ */
+class DoctorEvent {
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/event/GlobalEvent.java b/app/src/main/java/com/yxjk/healthexpertclient/event/GlobalEvent.java
new file mode 100644
index 0000000..94edf0a
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/event/GlobalEvent.java
@@ -0,0 +1,14 @@
+package com.yxjk.healthexpertclient.event;
+
+public class GlobalEvent {
+    public final int message;//0 重新登录
+    public Object object;
+
+    public GlobalEvent(int message) {
+        this.message = message;
+    }
+    public GlobalEvent(int message, Object object) {
+        this.message = message;
+        this.object=object;
+    }
+}
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/event/SuspensionServiceEvent.kt b/app/src/main/java/com/yxjk/healthexpertclient/event/SuspensionServiceEvent.kt
new file mode 100644
index 0000000..8f0d3af
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/event/SuspensionServiceEvent.kt
@@ -0,0 +1,9 @@
+package com.yxjk.healthexpertclient.event
+
+/**
+ * @author nanfeifei
+ * @time 2023/6/5 14:07
+ * @description 发布暂停服务后刷新暂停服务记录
+ */
+class SuspensionServiceEvent {
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/event/WorkbenchEvent.kt b/app/src/main/java/com/yxjk/healthexpertclient/event/WorkbenchEvent.kt
new file mode 100644
index 0000000..ac002a8
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/event/WorkbenchEvent.kt
@@ -0,0 +1,9 @@
+package com.yxjk.healthexpertclient.event
+
+/**
+ * @author nanfeifei
+ * @time 2023/7/18 10:30
+ * @description
+ */
+class WorkbenchEvent {
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ext/DatimeEntityExt.kt b/app/src/main/java/com/yxjk/healthexpertclient/ext/DatimeEntityExt.kt
new file mode 100644
index 0000000..aaa3add
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ext/DatimeEntityExt.kt
@@ -0,0 +1,25 @@
+package com.yxjk.healthexpertclient.ext
+
+import com.github.gzuliyujiang.wheelpicker.entity.DateEntity
+import com.github.gzuliyujiang.wheelpicker.entity.DatimeEntity
+import java.util.Calendar
+
+/**
+ * @author nanfeifei
+ * @time 2023/7/11 14:01
+ * @description  几天之后的时间
+ * @param day 日期差值
+ */
+fun DatimeEntity.dayOnAfter(day: Int): DatimeEntity{
+    val entity = DatimeEntity()
+    var calendar = Calendar.getInstance()
+    calendar.timeInMillis = this.toTimeInMillis()
+    calendar.add(Calendar.DAY_OF_MONTH, day)
+    entity.date = DateEntity.target(calendar)
+    return entity
+}
+fun DateEntity.target(millis: Long): DateEntity{
+    var calendar = Calendar.getInstance()
+    calendar.timeInMillis = millis
+    return DateEntity.target(calendar)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ext/IMManager.kt b/app/src/main/java/com/yxjk/healthexpertclient/ext/IMManager.kt
new file mode 100644
index 0000000..04c25a2
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ext/IMManager.kt
@@ -0,0 +1,161 @@
+package com.yxjk.healthexpertclient.ext
+
+import android.content.Context
+import android.util.Log
+import com.yxjk.healthexpertclient.MyApplication.Companion.appViewModel
+import com.yxjk.healthexpertclient.utils.TUIUtils
+import com.tencent.imsdk.BaseConstants
+import com.tencent.imsdk.v2.V2TIMConversation
+import com.tencent.imsdk.v2.V2TIMManager
+import com.tencent.imsdk.v2.V2TIMSDKConfig
+import com.tencent.imsdk.v2.V2TIMSDKListener
+import com.tencent.imsdk.v2.V2TIMUserFullInfo
+import com.tencent.imsdk.v2.V2TIMUserStatus
+import com.tencent.qcloud.tuicore.TUILogin
+import com.tencent.qcloud.tuicore.interfaces.TUICallback
+import com.tencent.qcloud.tuikit.TUICommonDefine
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine
+import com.tencent.qcloud.tuikit.tuicallkit.TUICallKit
+import com.tencent.qcloud.tuikit.tuicallkit.base.Constants
+import com.tencent.qcloud.tuikit.tuicallkit.config.OfflinePushInfoConfig
+import com.tencent.qcloud.tuikit.tuichat.bean.WorkBean
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+fun Context.initIMSDK(imSdkAppId: Int) {
+    val config = V2TIMSDKConfig()
+    config.logLevel = V2TIMSDKConfig.V2TIM_LOG_INFO
+    V2TIMManager.getInstance().initSDK(this, imSdkAppId, config)
+}
+/**
+ * 腾讯im登录方法
+ */
+fun Context.loginIm(successCall: () -> Unit = {}) {
+    var userId = appViewModel.imUserId.value
+    var userSig: String = appViewModel.imSig.value
+    var appId = appViewModel.imAppId.value
+    if (userSig.isNullOrEmpty()) {
+        CoroutineScope(Dispatchers.Main).launch {
+            appViewModel.getIMSig(successCall = {
+                loginIm(it.sdkAppId, it.userId, it.userSig, successCall)
+            })
+        }
+    } else {
+        loginIm(appId, userId, userSig, successCall)
+    }
+}
+
+fun Context.loginIm(appId: String, userId: String, userSig: String, successCall: () -> Unit = {}) {
+    if (TUILogin.isUserLogined() && userId == TUILogin.getUserId()) {
+        successCall.invoke()
+        return
+    }
+    TUILogin.login(
+        this,
+        appId.toInt(),
+        userId,
+        userSig,
+        TUIUtils.getLoginConfig(),
+        object : TUICallback() {
+            override fun onError(code: Int, desc: String) {
+                when (code) {
+                    BaseConstants.ERR_SVR_ACCOUNT_USERSIG_EXPIRED,
+                    BaseConstants.ERR_USER_SIG_EXPIRED -> {//UserSig过期
+                        userSigExpired()
+                    }
+                }
+                Log.i(
+                    "loginIm",
+                    "imLogin errorCode = $code, errorInfo = $desc"
+                )
+            }
+
+            override fun onSuccess() {
+                appViewModel.setUserIMInfo()
+                successCall.invoke()
+            }
+        })
+}
+fun Context.userSigExpired(loginSuccessCall: () -> Unit = {}){
+    logout(successCall = {
+        loginIm(loginSuccessCall)
+    })
+}
+fun logout(successCall: () -> Unit = {}){
+    if (!TUILogin.isUserLogined()){
+        return
+    }
+    CoroutineScope(Dispatchers.Main).launch{
+        appViewModel.imSig.emit("") //清空本地缓存的UserSig
+        appViewModel.imUserId.emit("")
+    }
+    TUILogin.logout(object : TUICallback(){
+        override fun onSuccess() {
+            successCall.invoke()
+        }
+
+        override fun onError(errorCode: Int, errorMessage: String?) {
+            Log.i("logout","IM logout errorCode = $errorCode, errorInfo = $errorMessage")
+        }
+    })
+}
+fun Context.startC2CChat(chatId: String, groupName: String, workBean: WorkBean? = null) {
+    if (TUILogin.isUserLogined()) {
+        //    TUIUtils.createGroup("VHMQIUMM", "android测试组", V2TIMConversation.V2TIM_GROUP)
+        TUIUtils.startChat(chatId, groupName, V2TIMConversation.V2TIM_C2C, workBean)
+    } else {
+        loginIm(successCall = {
+            TUIUtils.startChat(chatId, groupName, V2TIMConversation.V2TIM_C2C, workBean)
+        })
+    }
+}
+
+fun Context.startGroupChat(groupId: String, groupName: String = "", workBean: WorkBean? = null) {
+    if (TUILogin.isUserLogined()) {
+        //    TUIUtils.createGroup("VHMQIUMM", "android测试组", V2TIMConversation.V2TIM_GROUP)
+        TUIUtils.startChat(groupId, groupName, V2TIMConversation.V2TIM_GROUP, workBean)
+    } else {
+        loginIm(successCall = {
+            TUIUtils.startChat(groupId, groupName, V2TIMConversation.V2TIM_GROUP, workBean)
+        })
+    }
+}
+
+fun Context.call(
+    userId: String,
+    callMediaType: TUICallDefine.MediaType = TUICallDefine.MediaType.Video
+) {
+    if (TUILogin.isUserLogined()) {
+        TUICallKit.createInstance(this).call(userId, callMediaType)
+    } else {
+        loginIm(successCall = {
+            TUICallKit.createInstance(this).call(userId, callMediaType)
+        })
+    }
+}
+
+fun Context.groupCall(
+    groupId: String,
+    userIdList: List<String>,
+    callMediaType: TUICallDefine.MediaType = TUICallDefine.MediaType.Video,
+    params: TUICallDefine.CallParams? = null,
+    callback: TUICommonDefine.Callback? = null
+) {
+    var callParams = TUICallDefine.CallParams()
+    if (params == null) {
+        callParams.offlinePushInfo = OfflinePushInfoConfig.createOfflinePushInfo(this)
+        callParams.timeout = Constants.SIGNALING_MAX_TIME
+    } else {
+        callParams = params
+    }
+    if (TUILogin.isUserLogined()) {
+        TUICallKit.createInstance(this)
+            .groupCall(groupId, userIdList, callMediaType, callParams, callback)
+    } else {
+        loginIm(successCall = {
+            TUICallKit.createInstance(this)
+                .groupCall(groupId, userIdList, callMediaType, callParams, callback)
+        })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ext/StartActivityManager.kt b/app/src/main/java/com/yxjk/healthexpertclient/ext/StartActivityManager.kt
new file mode 100644
index 0000000..dedeb39
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ext/StartActivityManager.kt
@@ -0,0 +1,262 @@
+package com.yxjk.healthexpertclient.ext
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.core.view.ContentInfoCompat
+import com.yxjk.healthexpertclient.bean.mine.DiseaseBean
+import com.yxjk.healthexpertclient.ui.login.ChangePassWordActivity
+import com.yxjk.healthexpertclient.ui.login.LoginActivity
+import com.yxjk.healthexpertclient.ui.login.RetrievePassWordActivity
+import com.yxjk.healthexpertclient.ui.main.MainActivity
+import com.yxjk.healthexpertclient.ui.main.WebActivity
+import com.yxjk.healthexpertclient.ui.mine.AddSuspensionAnnouncementActivity
+import com.yxjk.healthexpertclient.ui.mine.BillRecordActivity
+import com.yxjk.healthexpertclient.ui.mine.ConsultStatisticsActivity
+import com.yxjk.healthexpertclient.ui.mine.CustomSchedulingActivity
+import com.yxjk.healthexpertclient.ui.mine.EditPasswordActivity
+import com.yxjk.healthexpertclient.ui.mine.GoodAtDiseaseActivity
+import com.yxjk.healthexpertclient.ui.mine.PersonInfoActivity
+import com.yxjk.healthexpertclient.ui.mine.SchedulingActivity
+import com.yxjk.healthexpertclient.ui.mine.SettingActivity
+import com.yxjk.healthexpertclient.ui.mine.SuspensionServiceActivity
+import com.yxjk.healthexpertclient.ui.mine.WithDrawActivity
+import com.yxjk.healthexpertclient.ui.other.SimulateUserActivity
+import com.yxjk.healthexpertclient.ui.workbench.ArchivesDetailActivity
+import com.yxjk.healthexpertclient.ui.workbench.AudioVideoConsultActivity
+import com.yxjk.healthexpertclient.ui.workbench.BaseHealthyInformationActivity
+import com.yxjk.healthexpertclient.ui.workbench.BigImageActivity
+import com.yxjk.healthexpertclient.ui.workbench.CheckUpDetailActivity
+import com.yxjk.healthexpertclient.ui.workbench.ConsultFinishActivity
+import com.yxjk.healthexpertclient.ui.workbench.ConsultHistoryActivity
+import com.yxjk.healthexpertclient.ui.workbench.ConsultRecordActivity
+import com.yxjk.healthexpertclient.ui.workbench.ConsultWaitStartActivity
+import com.yxjk.healthexpertclient.ui.workbench.ImageTextConsultDetailActivity
+import com.yxjk.healthexpertclient.ui.workbench.MessageListActivity
+
+fun startActivity(context: Context, @ContentInfoCompat.Flags flags: MutableList<Int>? = null,
+                  bundle: Bundle? = null, targetClass: Class<*>){
+    var intent = Intent(context, targetClass)
+    if(!flags.isNullOrEmpty()){
+        flags.forEachIndexed { index, flag ->
+            if (0 == index){
+                intent.flags = flag
+            }else{
+                intent.addFlags(flag)
+            }
+        }
+    }
+    if (bundle != null){
+        intent.putExtras(bundle)
+    }
+    context.startActivity(intent)
+}
+/**
+ * 登录
+ */
+fun startLoginActivity(context: Context){
+    var flagArray = mutableListOf<Int>()
+//    flagArray.add(Intent.FLAG_ACTIVITY_NO_HISTORY)
+    flagArray.add(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
+    startActivity(context, flags = flagArray,  targetClass = LoginActivity::class.java)
+}
+/**
+ * 找回密码
+ */
+fun startRetrievePassWordActivity(context: Context){
+    val bundle = Bundle()
+    startActivity(context, bundle = bundle,  targetClass = RetrievePassWordActivity::class.java)
+}
+/**
+ * 首页
+ */
+fun startMainActivity(context: Context){
+    val bundle = Bundle()
+    startActivity(context, bundle = bundle,  targetClass = MainActivity::class.java)
+}
+/**
+ * 咨询记录
+ */
+fun startConsultRecordActivity(context: Context, consultModel: Int, consultIndex: Int = 0){
+    val bundle = Bundle()
+    bundle.putInt("consultModel", consultModel)
+    bundle.putInt("consultIndex", consultIndex)
+    startActivity(context, bundle = bundle,  targetClass = ConsultRecordActivity::class.java)
+}
+/**
+ * 咨询详情
+ */
+fun startConsultDetailActivity(context: Context, recordId: String){
+    val bundle = Bundle()
+    bundle.putString("recordId", recordId)
+    startActivity(context, bundle = bundle,  targetClass = ImageTextConsultDetailActivity::class.java)
+}
+
+/**
+ * 基础健康信息
+ */
+fun startBaseHealthyInformationActivity(context: Context, recordId: Int){
+    val bundle = Bundle()
+    bundle.putInt("memberId", recordId)
+    startActivity(context, bundle = bundle,  targetClass = BaseHealthyInformationActivity::class.java)
+}
+/**
+ * 档案详情
+ */
+fun startArchivesDetailActivity(context: Context, archivesId: String){
+    val bundle = Bundle()
+    bundle.putString("archivesId", archivesId)
+    startActivity(context, bundle = bundle,  targetClass = ArchivesDetailActivity::class.java)
+}
+/**
+ * 咨询历史
+ */
+fun startConsultHistoryActivity(context: Context, recordId: Int){
+    val bundle = Bundle()
+    bundle.putInt("recordId", recordId)
+    startActivity(context, bundle = bundle,  targetClass = ConsultHistoryActivity::class.java)
+}
+/**
+ * 音视频咨询-待确认
+ */
+fun startConsultWaitConfirmActivity(context: Context, recordId: String){
+    val bundle = Bundle()
+    bundle.putString("recordId", recordId)
+    startActivity(context, bundle = bundle,  targetClass = AudioVideoConsultActivity::class.java)
+}
+/**
+ * 音视频咨询-已完成
+ */
+fun startConsultFinishActivity(context: Context, recordId: String){
+    val bundle = Bundle()
+    bundle.putString("recordId", recordId)
+    startActivity(context, bundle = bundle,  targetClass = ConsultFinishActivity::class.java)
+}
+/**
+ * 音视频咨询-待开始
+ */
+fun startConsultWaitStartActivity(context: Context, recordId: String){
+    val bundle = Bundle()
+    bundle.putString("recordId", recordId)
+    startActivity(context, bundle = bundle,  targetClass = ConsultWaitStartActivity::class.java)
+}
+/**
+ * 排班设置
+ */
+fun startSchedulingActivity(context: Context){
+    startActivity(context, targetClass = SchedulingActivity::class.java)
+}
+/**
+ * 自定义排班
+ */
+fun startCustomSchedulingActivity(context: Context){
+    startActivity(context, targetClass = CustomSchedulingActivity::class.java)
+}
+/**
+ * 暂停服务
+ */
+fun startSuspensionServiceActivity(context: Context){
+    startActivity(context, targetClass = SuspensionServiceActivity::class.java)
+}
+/**
+ * 暂停服务公告
+ */
+fun startAddSuspensionAnnouncementActivity(context: Context){
+    startActivity(context, targetClass = AddSuspensionAnnouncementActivity::class.java)
+}
+/**
+ * 咨询统计
+ */
+fun startConsultStatisticsActivity(context: Context){
+    startActivity(context, targetClass = ConsultStatisticsActivity::class.java)
+}
+/**
+ * 账单明细
+ */
+fun startBillRecordActivity(context: Context){
+    startActivity(context, targetClass = BillRecordActivity::class.java)
+}
+/**
+ * 提现详情
+ */
+fun startWithDrawActivity(context: Context, recordId: Int){
+    val bundle = Bundle()
+    bundle.putInt("recordId", recordId)
+    startActivity(context, bundle = bundle, targetClass = WithDrawActivity::class.java)
+}
+/**
+ * 修改密码
+ */
+fun startEditPasswordActivity(context: Context){
+    startActivity(context, targetClass = EditPasswordActivity::class.java)
+}
+
+/**
+ * 修改密码
+ */
+fun Context.startChangePassWordActivity(code:String) {
+    val bundle = Bundle()
+    bundle.putString("code", code)
+    startActivity(this, bundle = bundle,targetClass = ChangePassWordActivity::class.java)
+}
+
+/**
+ * 个人信息
+ */
+fun startPersonInfoActivity(context: Context){
+    startActivity(context, targetClass = PersonInfoActivity::class.java)
+}
+/**
+ * 设置
+ */
+fun startSettingActivity(context: Context){
+    startActivity(context, targetClass = SettingActivity::class.java)
+}
+/**
+ * 擅长病种
+ */
+fun startGoodAtDiseaseActivity(context: Context, departmentId: String, currentDiseaseList: MutableList<DiseaseBean>){
+    val bundle = Bundle()
+    bundle.putString("departmentId", departmentId)
+    bundle.putParcelableArrayList("currentDiseaseList", ArrayList(currentDiseaseList))
+    startActivity(context, bundle = bundle, targetClass = GoodAtDiseaseActivity::class.java)
+}
+/**
+ * 体检详情
+ */
+fun startCheckUpDetailActivity(context: Context, id: String?){
+    val bundle = Bundle()
+    bundle.putString("id", id.orEmpty())
+    startActivity(context, bundle = bundle, targetClass = CheckUpDetailActivity::class.java)
+}
+/**
+ * 跳转Web
+ */
+fun startWebActivity(context: Context, url: String){
+    val bundle = Bundle()
+    bundle.putString("url", url)
+    bundle.putBoolean("javaScriptEnabled", true)
+    startActivity(context, bundle = bundle, targetClass = WebActivity::class.java)
+}
+/**
+ * 消息
+ */
+fun startMessageListActivity(context: Context){
+    startActivity(context,  targetClass = MessageListActivity::class.java)
+}
+/**
+ * 查看大图
+ */
+fun Context.startBigImageActivity(url: String, isFilePath: Boolean = false){
+    val bundle = Bundle()
+    bundle.putString("imageUrl", url)
+    bundle.putBoolean("isFilePath", isFilePath)
+    startActivity(this, bundle = bundle,  targetClass = BigImageActivity::class.java)
+}
+
+/**
+ * 模拟用户
+ */
+fun startSimulateUserActivity(context: Context){
+    startActivity(context,  targetClass = SimulateUserActivity::class.java)
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/im/IMMainActivity.java b/app/src/main/java/com/yxjk/healthexpertclient/ui/im/IMMainActivity.java
new file mode 100644
index 0000000..423ef8b
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/im/IMMainActivity.java
@@ -0,0 +1,581 @@
+package com.yxjk.healthexpertclient.ui.im;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.viewpager2.widget.ViewPager2;
+
+import com.yxjk.healthexpertclient.R;
+import com.yxjk.healthexpertclient.ui.im.adapter.FragmentAdapter;
+import com.yxjk.healthexpertclient.ui.im.view.Menu;
+import com.yxjk.healthexpertclient.utils.TUIUtils;
+import com.tencent.imsdk.BaseConstants;
+import com.tencent.imsdk.v2.V2TIMCallback;
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.imsdk.v2.V2TIMConversationListFilter;
+import com.tencent.imsdk.v2.V2TIMConversationOperationResult;
+import com.tencent.imsdk.v2.V2TIMConversationResult;
+import com.tencent.imsdk.v2.V2TIMFriendApplication;
+import com.tencent.imsdk.v2.V2TIMFriendApplicationResult;
+import com.tencent.imsdk.v2.V2TIMFriendshipListener;
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMValueCallback;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.action.PopActionClickListener;
+import com.tencent.qcloud.tuicore.component.action.PopMenuAction;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.util.ErrorMessageConverter;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactConstants;
+import com.tencent.qcloud.tuikit.tuicontact.classicui.pages.TUIContactFragment;
+import com.tencent.qcloud.tuikit.tuiconversation.TUIConversationConstants;
+import com.tencent.qcloud.tuikit.tuiconversation.classicui.page.TUIConversationFragment;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+public class IMMainActivity extends BaseLightActivity {
+
+    private static final String TAG = IMMainActivity.class.getSimpleName();
+    private TextView mCommunityBtnText;
+    private TextView mConversationBtnText;
+    private TextView mContactBtnText;
+    private TextView mProfileSelfBtnText;
+    private View mConversationBtn;
+    private ImageView mCommunityBtnIcon;
+    private ImageView mConversationBtnIcon;
+    private ImageView mContactBtnIcon;
+    private ImageView mProfileSelfBtnIcon;
+    private TextView mMsgUnread;
+    private TextView mNewFriendUnread;
+    private View mainNavigationBar;
+
+    private TitleBarLayout mainTitleBar;
+    private Menu menu;
+
+    private ViewPager2 mainViewPager;
+    private List<Fragment> fragments;
+
+    private int count = 0;
+    private long lastClickTime = 0;
+    private HashMap<String, V2TIMConversation> markUnreadMap = new HashMap<>();
+
+    private static WeakReference<IMMainActivity> instance;
+    private BroadcastReceiver unreadCountReceiver;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        Log.i(TAG, "onCreate");
+        super.onCreate(savedInstanceState);
+        instance = new WeakReference<>(this);
+
+        initView();
+        initUnreadCountReceiver();
+    }
+
+    private void initUnreadCountReceiver() {
+        unreadCountReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                long unreadCount = intent.getLongExtra(TUIConstants.UNREAD_COUNT_EXTRA, 0);
+                if (unreadCount > 0) {
+                    mMsgUnread.setVisibility(View.VISIBLE);
+                } else {
+                    mMsgUnread.setVisibility(View.GONE);
+                }
+                String unreadStr = "" + unreadCount;
+                if (unreadCount > 100) {
+                    unreadStr = "99+";
+                }
+                mMsgUnread.setText(unreadStr);
+                // update Huawei offline push Badge
+//                OfflineMessageDispatcher.updateBadge(MainActivity.this, (int) unreadCount);
+            }
+        };
+
+        IntentFilter unreadCountFilter = new IntentFilter();
+        unreadCountFilter.addAction(TUIConstants.CONVERSATION_UNREAD_COUNT_ACTION);
+        LocalBroadcastManager.getInstance(this).registerReceiver(unreadCountReceiver, unreadCountFilter);
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        Log.i(TAG, "onNewIntent");
+        setIntent(intent);
+    }
+
+    private void initView() {
+        setContentView(R.layout.im_activity);
+
+        mainTitleBar = findViewById(R.id.main_title_bar);
+        initMenuAction();
+        mCommunityBtnText = findViewById(R.id.tab_community_tv);
+        mConversationBtnText = findViewById(R.id.conversation);
+        mContactBtnText = findViewById(R.id.contact);
+        mProfileSelfBtnText = findViewById(R.id.mine);
+        mCommunityBtnIcon = findViewById(R.id.tab_community_icon);
+        mConversationBtnIcon = findViewById(R.id.tab_conversation_icon);
+        mContactBtnIcon = findViewById(R.id.tab_contact_icon);
+        mProfileSelfBtnIcon = findViewById(R.id.tab_profile_icon);
+        mConversationBtn = findViewById(R.id.conversation_btn_group);
+        mMsgUnread = findViewById(R.id.msg_total_unread);
+        mNewFriendUnread = findViewById(R.id.new_friend_total_unread);
+        mainNavigationBar = findViewById(R.id.main_navigation_bar);
+
+        fragments = new ArrayList<>();
+        fragments.add(new TUIConversationFragment());
+//        fragments.add(new TUICommunityFragment());
+        fragments.add(new TUIContactFragment());
+//        fragments.add(new ProfileFragment());
+
+        mainViewPager = findViewById(R.id.view_pager);
+        FragmentAdapter fragmentAdapter = new FragmentAdapter(this);
+        fragmentAdapter.setFragmentList(fragments);
+        mainViewPager.setUserInputEnabled(false);
+        mainViewPager.setOffscreenPageLimit(4);
+        mainViewPager.setAdapter(fragmentAdapter);
+        mainViewPager.setCurrentItem(0, false);
+        setConversationTitleBar();
+
+        prepareToClearAllUnreadMessage();
+    }
+
+    private void initMenuAction() {
+        int titleBarIconSize = 23;
+        mainTitleBar.getLeftIcon().setMaxHeight(titleBarIconSize);
+        mainTitleBar.getLeftIcon().setMaxWidth(titleBarIconSize);
+        mainTitleBar.getRightIcon().setMaxHeight(titleBarIconSize);
+        mainTitleBar.getRightIcon().setMaxWidth(titleBarIconSize);
+        mainTitleBar.setOnRightClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (menu == null) {
+                    return;
+                }
+                if (menu.isShowing()) {
+                    menu.hide();
+                } else {
+                    menu.show();
+                }
+            }
+        });
+    }
+
+    private void prepareToClearAllUnreadMessage() {
+        mMsgUnread.setOnTouchListener(new View.OnTouchListener() {
+            private float downX;
+            private float downY;
+            private boolean isTriggered = false;
+            @Override
+            public boolean onTouch(View view, MotionEvent event) {
+                switch (event.getAction()) {
+                    case MotionEvent.ACTION_DOWN:
+                        downX = mMsgUnread.getX();
+                        downY = mMsgUnread.getY();
+                        break;
+                    case MotionEvent.ACTION_MOVE:
+                        if (isTriggered) {
+                            return true;
+                        }
+                        float viewX = view.getX();
+                        float viewY = view.getY();
+                        float eventX = event.getX();
+                        float eventY = event.getY();
+                        float translationX = eventX + viewX - downX;
+                        float translationY = eventY + viewY - downY;
+                        view.setTranslationX(translationX);
+                        view.setTranslationY(translationY);
+                        // If the moved x and y axis coordinates exceed a certain pixel, it will trigger one-click to clear all unread sessions
+                        if (Math.abs(translationX) > 200|| Math.abs(translationY) > 200) {
+                            isTriggered = true;
+                            mMsgUnread.setVisibility(View.GONE);
+                            triggerClearAllUnreadMessage();
+                        }
+                        break;
+                    case MotionEvent.ACTION_UP:
+                        view.setTranslationX(0);
+                        view.setTranslationY(0);
+                        isTriggered = false;
+                        break;
+                    case MotionEvent.ACTION_CANCEL:
+                        isTriggered = false;
+                        break;
+                }
+
+                return true;
+            }
+        });
+    }
+
+    private void triggerClearAllUnreadMessage() {
+        V2TIMManager.getMessageManager().markAllMessageAsRead(new V2TIMCallback() {
+            @Override
+            public void onSuccess() {
+                Log.i(TAG, "markAllMessageAsRead success");
+                ToastUtil.toastShortMessage(IMMainActivity.this.getString(R.string.mark_all_message_as_read_succ));
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                Log.i(TAG, "markAllMessageAsRead error:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
+                ToastUtil.toastShortMessage(IMMainActivity.this.getString(R.string.mark_all_message_as_read_err_format, code, ErrorMessageConverter.convertIMError(code, desc)));
+                mMsgUnread.setVisibility(View.VISIBLE);
+            }
+        });
+
+        V2TIMConversationListFilter filter = new V2TIMConversationListFilter();
+        filter.setMarkType(V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_UNREAD);
+        getMarkUnreadConversationList(filter, 0, 100, true, new V2TIMValueCallback<HashMap<String, V2TIMConversation>>() {
+            @Override
+            public void onSuccess(HashMap<String, V2TIMConversation> stringV2TIMConversationHashMap) {
+                if (stringV2TIMConversationHashMap.size() == 0) {
+                    return;
+                }
+                List<String> unreadConversationIDList = new ArrayList<>();
+                Iterator<Map.Entry<String, V2TIMConversation>> iterator = markUnreadMap.entrySet().iterator();
+                while (iterator.hasNext()) {
+                    Map.Entry<String, V2TIMConversation> entry = iterator.next();
+                    unreadConversationIDList.add(entry.getKey());
+                }
+
+                V2TIMManager.getConversationManager().markConversation(unreadConversationIDList,
+                        V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_UNREAD,
+                        false,
+                        new V2TIMValueCallback<List<V2TIMConversationOperationResult>>() {
+                    @Override
+                    public void onSuccess(List<V2TIMConversationOperationResult> v2TIMConversationOperationResults) {
+                        for (V2TIMConversationOperationResult result : v2TIMConversationOperationResults) {
+                            if (result.getResultCode() == BaseConstants.ERR_SUCC) {
+                                V2TIMConversation v2TIMConversation = markUnreadMap.get(result.getConversationID());
+                                if (!v2TIMConversation.getMarkList().contains(V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_HIDE)) {
+                                    markUnreadMap.remove(result.getConversationID());
+                                }
+                            }
+                        }
+                    }
+
+                    @Override
+                    public void onError(int code, String desc) {
+                        Log.e(TAG, "triggerClearAllUnreadMessage->markConversation error:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
+                    }
+                });
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                Log.e(TAG, "triggerClearAllUnreadMessage->getMarkUnreadConversationList error:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
+            }
+        });
+    }
+
+    private void getMarkUnreadConversationList(V2TIMConversationListFilter filter, long nextSeq, int count, boolean fromStart, V2TIMValueCallback<HashMap<String, V2TIMConversation>> callback) {
+        if (fromStart) {
+            markUnreadMap.clear();
+        }
+        V2TIMManager.getConversationManager().getConversationListByFilter(filter, nextSeq, count, new V2TIMValueCallback<V2TIMConversationResult>() {
+            @Override
+            public void onSuccess(V2TIMConversationResult v2TIMConversationResult) {
+                List<V2TIMConversation> conversationList = v2TIMConversationResult.getConversationList();
+                for (V2TIMConversation conversation : conversationList) {
+                    markUnreadMap.put(conversation.getConversationID(), conversation);
+                }
+
+                if (!v2TIMConversationResult.isFinished()) {
+                    getMarkUnreadConversationList(filter, v2TIMConversationResult.getNextSeq(), count, false, callback);
+                } else {
+                    if (callback != null) {
+                        callback.onSuccess(markUnreadMap);
+                    }
+                }
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                Log.e(TAG, "getMarkUnreadConversationList error:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
+            }
+        });
+    }
+
+
+    public void tabClick(View view) {
+        resetMenuState();
+        switch (view.getId()) {
+            case R.id.conversation_btn_group:
+                mainTitleBar.setVisibility(View.VISIBLE);
+                mainViewPager.setCurrentItem(0, false);
+                setConversationTitleBar();
+                break;
+            case R.id.community_btn_group:
+                mainTitleBar.setVisibility(View.GONE);
+                mainViewPager.setCurrentItem(1, false);
+                setCommunityBackground();
+                break;
+            case R.id.contact_btn_group:
+                mainTitleBar.setVisibility(View.VISIBLE);
+                mainViewPager.setCurrentItem(2, false);
+                setContactTitleBar();
+                break;
+            case R.id.myself_btn_group:
+                mainTitleBar.setVisibility(View.VISIBLE);
+                mainViewPager.setCurrentItem(3, false);
+                setProfileTitleBar();
+                break;
+            default:
+                break;
+        }
+    }
+
+    private void setCommunityBackground() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            getWindow().setStatusBarColor(getResources().getColor(R.color.demo_community_page_status_bar_color));
+        }
+        mainNavigationBar.setBackgroundColor(getResources().getColor(R.color.demo_community_page_navigate_bar_color));
+    }
+
+    private void setConversationTitleBar() {
+        mainTitleBar.setTitle(getResources().getString(R.string.conversation_title), ITitleBarLayout.Position.MIDDLE);
+        mainTitleBar.getLeftGroup().setVisibility(View.GONE);
+        mainTitleBar.getRightGroup().setVisibility(View.VISIBLE);
+        int titleBarIconSize = 23;
+        ViewGroup.LayoutParams params = mainTitleBar.getRightIcon().getLayoutParams();
+        params.width = titleBarIconSize;
+        params.height = titleBarIconSize;
+        mainTitleBar.getRightIcon().setLayoutParams(params);
+        setConversationMenu();
+    }
+
+    private void setConversationMenu() {
+        menu = new Menu(this, mainTitleBar.getRightIcon());
+        PopActionClickListener popActionClickListener = new PopActionClickListener() {
+            @Override
+            public void onActionClick(int position, Object data) {
+                PopMenuAction action = (PopMenuAction) data;
+                if (TextUtils.equals(action.getActionName(), getResources().getString(R.string.start_conversation))) {
+                    TUIUtils.startActivity("StartC2CChatActivity", null);
+                }
+
+                if (TextUtils.equals(action.getActionName(), getResources().getString(R.string.create_private_group))) {
+                    Bundle bundle = new Bundle();
+                    bundle.putInt(TUIConversationConstants.GroupType.TYPE, TUIConversationConstants.GroupType.PRIVATE);
+                    TUIUtils.startActivity("StartGroupChatActivity", bundle);
+                }
+                if (TextUtils.equals(action.getActionName(), getResources().getString(R.string.create_group_chat))) {
+                    Bundle bundle = new Bundle();
+                    bundle.putInt(TUIConversationConstants.GroupType.TYPE, TUIConversationConstants.GroupType.PUBLIC);
+                    TUIUtils.startActivity("StartGroupChatActivity", bundle);
+                }
+                if (TextUtils.equals(action.getActionName(), getResources().getString(R.string.create_chat_room))) {
+                    Bundle bundle = new Bundle();
+                    bundle.putInt(TUIConversationConstants.GroupType.TYPE, TUIConversationConstants.GroupType.CHAT_ROOM);
+                    TUIUtils.startActivity("StartGroupChatActivity", bundle);
+                }
+                if (TextUtils.equals(action.getActionName(), getResources().getString(R.string.create_community))) {
+                    Bundle bundle = new Bundle();
+                    bundle.putInt(TUIConversationConstants.GroupType.TYPE, TUIConversationConstants.GroupType.COMMUNITY);
+                    TUIUtils.startActivity("StartGroupChatActivity", bundle);
+                }
+                menu.hide();
+            }
+        };
+
+        List<PopMenuAction> menuActions = new ArrayList<>();
+
+        PopMenuAction action = new PopMenuAction();
+
+        action.setActionName(getResources().getString(R.string.start_conversation));
+        action.setActionClickListener(popActionClickListener);
+        action.setIconResId(R.drawable.create_c2c);
+        menuActions.add(action);
+
+        action = new PopMenuAction();
+        action.setActionName(getResources().getString(R.string.create_group_chat));
+        action.setIconResId(R.drawable.group_icon);
+        action.setActionClickListener(popActionClickListener);
+        menuActions.add(action);
+
+        menu.setMenuAction(menuActions);
+    }
+
+    private void setContactTitleBar() {
+        mainTitleBar.setTitle(getResources().getString(R.string.contact_title), ITitleBarLayout.Position.MIDDLE);
+        mainTitleBar.getLeftGroup().setVisibility(View.GONE);
+        mainTitleBar.getRightGroup().setVisibility(View.VISIBLE);
+        setContactMenu();
+    }
+
+    public void setContactMenu() {
+        menu = new Menu(this, mainTitleBar.getRightIcon());
+        List<PopMenuAction> menuActionList = new ArrayList<>(2);
+        PopActionClickListener popActionClickListener = new PopActionClickListener() {
+            @Override
+            public void onActionClick(int index, Object data) {
+                PopMenuAction action = (PopMenuAction) data;
+                if (TextUtils.equals(action.getActionName(), getResources().getString(R.string.add_friend))) {
+                    Bundle bundle = new Bundle();
+                    bundle.putBoolean(TUIContactConstants.GroupType.GROUP, false);
+                    TUIUtils.startActivity("AddMoreActivity", bundle);
+                }
+                if (TextUtils.equals(action.getActionName(), getResources().getString(R.string.add_group))) {
+                    Bundle bundle = new Bundle();
+                    bundle.putBoolean(TUIContactConstants.GroupType.GROUP, true);
+                    TUIUtils.startActivity("AddMoreActivity", bundle);
+                }
+                menu.hide();
+            }
+        };
+        PopMenuAction action = new PopMenuAction();
+        action.setActionName(getResources().getString(R.string.add_friend));
+        action.setIconResId(com.tencent.qcloud.tuikit.tuicontact.R.drawable.contact_add_friend);
+        action.setActionClickListener(popActionClickListener);
+        menuActionList.add(action);
+
+        action = new PopMenuAction();
+        action.setActionName(getResources().getString(R.string.add_group));
+        action.setIconResId(com.tencent.qcloud.tuikit.tuicontact.R.drawable.contact_add_group);
+        action.setActionClickListener(popActionClickListener);
+        menuActionList.add(action);
+        menu.setMenuAction(menuActionList);
+    }
+
+    private void setProfileTitleBar() {
+        mainTitleBar.getLeftGroup().setVisibility(View.GONE);
+        mainTitleBar.getRightGroup().setVisibility(View.GONE);
+        mainTitleBar.setTitle(getResources().getString(R.string.profile), ITitleBarLayout.Position.MIDDLE);
+    }
+
+    private void resetMenuState() {
+
+    }
+
+    private final V2TIMFriendshipListener friendshipListener = new V2TIMFriendshipListener() {
+        @Override
+        public void onFriendApplicationListAdded(List<V2TIMFriendApplication> applicationList) {
+            refreshFriendApplicationUnreadCount();
+        }
+
+        @Override
+        public void onFriendApplicationListDeleted(List<String> userIDList) {
+            refreshFriendApplicationUnreadCount();
+        }
+
+        @Override
+        public void onFriendApplicationListRead() {
+            refreshFriendApplicationUnreadCount();
+        }
+    };
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            finish();
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
+    @Override
+    public void finish() {
+        super.finish();
+    }
+
+    @Override
+    protected void onStart() {
+        Log.i(TAG, "onStart");
+        super.onStart();
+    }
+
+    @Override
+    protected void onResume() {
+        Log.i(TAG, "onResume");
+        super.onResume();
+        registerUnreadListener();
+//        handleOfflinePush();
+    }
+
+
+    private void registerUnreadListener() {
+        V2TIMManager.getFriendshipManager().addFriendListener(friendshipListener);
+        refreshFriendApplicationUnreadCount();
+    }
+
+    private void refreshFriendApplicationUnreadCount() {
+        V2TIMManager.getFriendshipManager().getFriendApplicationList(new V2TIMValueCallback<V2TIMFriendApplicationResult>() {
+            @Override
+            public void onSuccess(V2TIMFriendApplicationResult v2TIMFriendApplicationResult) {
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        int unreadCount = v2TIMFriendApplicationResult.getUnreadCount();
+                        if (unreadCount > 0) {
+                            mNewFriendUnread.setVisibility(View.VISIBLE);
+                        } else {
+                            mNewFriendUnread.setVisibility(View.GONE);
+                        }
+                        String unreadStr = "" + unreadCount;
+                        if (unreadCount > 100) {
+                            unreadStr = "99+";
+                        }
+                        mNewFriendUnread.setText(unreadStr);
+                    }
+                });
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+
+            }
+        });
+    }
+
+    @Override
+    protected void onPause() {
+        Log.i(TAG, "onPause");
+        super.onPause();
+        V2TIMManager.getFriendshipManager().removeFriendListener(friendshipListener);
+    }
+
+    @Override
+    protected void onStop() {
+        Log.i(TAG, "onStop");
+        super.onStop();
+    }
+
+    @Override
+    protected void onDestroy() {
+        Log.i(TAG, "onDestroy");
+        super.onDestroy();
+
+        if (unreadCountReceiver != null) {
+            LocalBroadcastManager.getInstance(this).unregisterReceiver(unreadCountReceiver);
+            unreadCountReceiver = null;
+        }
+    }
+
+    public static void finishMainActivity() {
+        if (instance != null && instance.get() != null) {
+            instance.get().finish();
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/im/MainMinimalistActivity.java b/app/src/main/java/com/yxjk/healthexpertclient/ui/im/MainMinimalistActivity.java
new file mode 100644
index 0000000..c7fd10c
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/im/MainMinimalistActivity.java
@@ -0,0 +1,446 @@
+package com.yxjk.healthexpertclient.ui.im;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.viewpager2.widget.ViewPager2;
+
+import com.yxjk.healthexpertclient.R;
+import com.yxjk.healthexpertclient.ui.im.adapter.FragmentAdapter;
+import com.tencent.imsdk.BaseConstants;
+import com.tencent.imsdk.v2.V2TIMCallback;
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.imsdk.v2.V2TIMConversationListFilter;
+import com.tencent.imsdk.v2.V2TIMConversationOperationResult;
+import com.tencent.imsdk.v2.V2TIMConversationResult;
+import com.tencent.imsdk.v2.V2TIMFriendApplication;
+import com.tencent.imsdk.v2.V2TIMFriendApplicationResult;
+import com.tencent.imsdk.v2.V2TIMFriendshipListener;
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMValueCallback;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.component.activities.BaseMinimalistLightActivity;
+import com.tencent.qcloud.tuicore.util.ErrorMessageConverter;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuicontact.minimalistui.pages.TUIContactMinimalistFragment;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.page.ConversationMinimalistFragment;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+public class MainMinimalistActivity extends BaseMinimalistLightActivity {
+
+    private static final String TAG = MainMinimalistActivity.class.getSimpleName();
+    private TextView mConversationBtnText;
+    private TextView mContactBtnText;
+    private TextView mProfileSelfBtnText;
+    private ImageView mConversationBtnIcon;
+    private ImageView mContactBtnIcon;
+    private ImageView mProfileSelfBtnIcon;
+    private TextView mMsgUnread;
+    private TextView mNewFriendUnread;
+
+    private ViewPager2 mainViewPager;
+    private List<Fragment> fragments;
+
+    private HashMap<String, V2TIMConversation> markUnreadMap = new HashMap<>();
+
+    private static WeakReference<MainMinimalistActivity> instance;
+    private BroadcastReceiver unreadCountReceiver;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        Log.i(TAG, "onCreate");
+        super.onCreate(savedInstanceState);
+        instance = new WeakReference<>(this);
+
+        initView();
+        initUnreadCountReceiver();
+    }
+
+    private void initUnreadCountReceiver() {
+        unreadCountReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                long unreadCount = intent.getLongExtra(TUIConstants.UNREAD_COUNT_EXTRA, 0);
+                if (unreadCount > 0) {
+                    mMsgUnread.setVisibility(View.VISIBLE);
+                } else {
+                    mMsgUnread.setVisibility(View.GONE);
+                }
+                String unreadStr = "" + unreadCount;
+                if (unreadCount > 100) {
+                    unreadStr = "99+";
+                }
+                mMsgUnread.setText(unreadStr);
+                // update Huawei offline push Badge
+//                OfflineMessageDispatcher.updateBadge(MainMinimalistActivity.this, (int) unreadCount);
+            }
+        };
+
+        IntentFilter unreadCountFilter = new IntentFilter();
+        unreadCountFilter.addAction(TUIConstants.CONVERSATION_UNREAD_COUNT_ACTION);
+        LocalBroadcastManager.getInstance(this).registerReceiver(unreadCountReceiver, unreadCountFilter);
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        Log.i(TAG, "onNewIntent");
+        setIntent(intent);
+    }
+
+    private void initView() {
+        setContentView(R.layout.overseas_main_activity);
+
+        mConversationBtnText = findViewById(R.id.conversation);
+        mContactBtnText = findViewById(R.id.contact);
+        mProfileSelfBtnText = findViewById(R.id.mine);
+        mConversationBtnIcon = findViewById(R.id.tab_conversation_icon);
+        mContactBtnIcon = findViewById(R.id.tab_contact_icon);
+        mProfileSelfBtnIcon = findViewById(R.id.tab_profile_icon);
+        mMsgUnread = findViewById(R.id.msg_total_unread);
+        mNewFriendUnread = findViewById(R.id.new_friend_total_unread);
+
+        fragments = new ArrayList<>();
+        fragments.add(new ConversationMinimalistFragment());
+        fragments.add(new TUIContactMinimalistFragment());
+//        fragments.add(new ProfileMinimalistFragment());
+
+        mainViewPager = findViewById(R.id.view_pager);
+        FragmentAdapter fragmentAdapter = new FragmentAdapter(this);
+        fragmentAdapter.setFragmentList(fragments);
+        mainViewPager.setUserInputEnabled(false);
+        mainViewPager.setOffscreenPageLimit(4);
+        mainViewPager.setAdapter(fragmentAdapter);
+        mainViewPager.setCurrentItem(0, false);
+        prepareToClearAllUnreadMessage();
+    }
+
+    private void prepareToClearAllUnreadMessage() {
+        mMsgUnread.setOnTouchListener(new View.OnTouchListener() {
+            private float downX;
+            private float downY;
+            private boolean isTriggered = false;
+            @Override
+            public boolean onTouch(View view, MotionEvent event) {
+                switch (event.getAction()) {
+                    case MotionEvent.ACTION_DOWN:
+                        downX = mMsgUnread.getX();
+                        downY = mMsgUnread.getY();
+                        break;
+                    case MotionEvent.ACTION_MOVE:
+                        if (isTriggered) {
+                            return true;
+                        }
+                        float viewX = view.getX();
+                        float viewY = view.getY();
+                        float eventX = event.getX();
+                        float eventY = event.getY();
+                        float translationX = eventX + viewX - downX;
+                        float translationY = eventY + viewY - downY;
+                        view.setTranslationX(translationX);
+                        view.setTranslationY(translationY);
+                        // If the moved x and y axis coordinates exceed a certain pixel, it will trigger one-click to clear all unread sessions
+                        if (Math.abs(translationX) > 200|| Math.abs(translationY) > 200) {
+                            isTriggered = true;
+                            mMsgUnread.setVisibility(View.GONE);
+                            triggerClearAllUnreadMessage();
+                        }
+                        break;
+                    case MotionEvent.ACTION_UP:
+                        view.setTranslationX(0);
+                        view.setTranslationY(0);
+                        isTriggered = false;
+                        break;
+                    case MotionEvent.ACTION_CANCEL:
+                        isTriggered = false;
+                        break;
+                }
+
+                return true;
+            }
+        });
+    }
+
+    private void triggerClearAllUnreadMessage() {
+        V2TIMManager.getMessageManager().markAllMessageAsRead(new V2TIMCallback() {
+            @Override
+            public void onSuccess() {
+                Log.i(TAG, "markAllMessageAsRead success");
+                ToastUtil.toastShortMessage(MainMinimalistActivity.this.getString(R.string.mark_all_message_as_read_succ));
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                Log.i(TAG, "markAllMessageAsRead error:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
+                ToastUtil.toastShortMessage(MainMinimalistActivity.this.getString(R.string.mark_all_message_as_read_err_format, code, ErrorMessageConverter.convertIMError(code, desc)));
+                mMsgUnread.setVisibility(View.VISIBLE);
+            }
+        });
+
+        V2TIMConversationListFilter filter = new V2TIMConversationListFilter();
+        filter.setMarkType(V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_UNREAD);
+        getMarkUnreadConversationList(filter, 0, 100, true, new V2TIMValueCallback<HashMap<String, V2TIMConversation>>() {
+            @Override
+            public void onSuccess(HashMap<String, V2TIMConversation> stringV2TIMConversationHashMap) {
+                if (stringV2TIMConversationHashMap.size() == 0) {
+                    return;
+                }
+                List<String> unreadConversationIDList = new ArrayList<>();
+                Iterator<Map.Entry<String, V2TIMConversation>> iterator = markUnreadMap.entrySet().iterator();
+                while (iterator.hasNext()) {
+                    Map.Entry<String, V2TIMConversation> entry = iterator.next();
+                    unreadConversationIDList.add(entry.getKey());
+                }
+
+                V2TIMManager.getConversationManager().markConversation(unreadConversationIDList,
+                        V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_UNREAD,
+                        false,
+                        new V2TIMValueCallback<List<V2TIMConversationOperationResult>>() {
+                    @Override
+                    public void onSuccess(List<V2TIMConversationOperationResult> v2TIMConversationOperationResults) {
+                        for (V2TIMConversationOperationResult result : v2TIMConversationOperationResults) {
+                            if (result.getResultCode() == BaseConstants.ERR_SUCC) {
+                                V2TIMConversation v2TIMConversation = markUnreadMap.get(result.getConversationID());
+                                if (!v2TIMConversation.getMarkList().contains(V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_HIDE)) {
+                                    markUnreadMap.remove(result.getConversationID());
+                                }
+                            }
+                        }
+                    }
+
+                    @Override
+                    public void onError(int code, String desc) {
+                        Log.e(TAG, "triggerClearAllUnreadMessage->markConversation error:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
+                    }
+                });
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                Log.e(TAG, "triggerClearAllUnreadMessage->getMarkUnreadConversationList error:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
+            }
+        });
+    }
+
+    private void getMarkUnreadConversationList(V2TIMConversationListFilter filter, long nextSeq, int count, boolean fromStart, V2TIMValueCallback<HashMap<String, V2TIMConversation>> callback) {
+        if (fromStart) {
+            markUnreadMap.clear();
+        }
+        V2TIMManager.getConversationManager().getConversationListByFilter(filter, nextSeq, count, new V2TIMValueCallback<V2TIMConversationResult>() {
+            @Override
+            public void onSuccess(V2TIMConversationResult v2TIMConversationResult) {
+                List<V2TIMConversation> conversationList = v2TIMConversationResult.getConversationList();
+                for (V2TIMConversation conversation : conversationList) {
+                    markUnreadMap.put(conversation.getConversationID(), conversation);
+                }
+
+                if (!v2TIMConversationResult.isFinished()) {
+                    getMarkUnreadConversationList(filter, v2TIMConversationResult.getNextSeq(), count, false, callback);
+                } else {
+                    if (callback != null) {
+                        callback.onSuccess(markUnreadMap);
+                    }
+                }
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                Log.e(TAG, "getMarkUnreadConversationList error:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
+            }
+        });
+    }
+
+
+    public void tabClick(View view) {
+        resetMenuState();
+        switch (view.getId()) {
+            case R.id.conversation_btn_group:
+                mainViewPager.setCurrentItem(0, false);
+                mConversationBtnText.setTextColor(getResources().getColor(R.color.demo_main_tab_text_selected_color_light));
+                mConversationBtnIcon.setBackground(getResources().getDrawable(R.drawable.demo_overseas_main_tab_conversation_selected));
+                break;
+            case R.id.contact_btn_group:
+                mainViewPager.setCurrentItem(1, false);
+                mContactBtnText.setTextColor(getResources().getColor(R.color.demo_main_tab_text_selected_color_light));
+                mContactBtnIcon.setBackground(getResources().getDrawable(R.drawable.demo_overseas_main_tab_contact_selected_bg));
+                break;
+            case R.id.myself_btn_group:
+                mainViewPager.setCurrentItem(2, false);
+                mProfileSelfBtnText.setTextColor(getResources().getColor(R.color.demo_main_tab_text_selected_color_light));
+                mProfileSelfBtnIcon.setBackground(getResources().getDrawable(R.drawable.demo_overseas_main_tab_settings_selected_bg));
+                break;
+            default:
+                break;
+        }
+    }
+
+    private void resetMenuState() {
+        mConversationBtnText.setTextColor(getResources().getColor(com.tencent.qcloud.tuicore.R.color.core_light_bg_secondary_text_color_light));
+        mConversationBtnIcon.setBackground(getResources().getDrawable(R.drawable.demo_overseas_main_tab_conversation_normal));
+        mContactBtnText.setTextColor(getResources().getColor(com.tencent.qcloud.tuicore.R.color.core_light_bg_secondary_text_color_light));
+        mContactBtnIcon.setBackground(getResources().getDrawable(R.drawable.demo_overseas_main_tab_contact_normal_bg));
+        mProfileSelfBtnText.setTextColor(getResources().getColor(com.tencent.qcloud.tuicore.R.color.core_light_bg_secondary_text_color_light));
+        mProfileSelfBtnIcon.setBackground(getResources().getDrawable(R.drawable.demo_overseas_main_tab_settings_normal_bg));
+    }
+
+    private final V2TIMFriendshipListener friendshipListener = new V2TIMFriendshipListener() {
+        @Override
+        public void onFriendApplicationListAdded(List<V2TIMFriendApplication> applicationList) {
+            refreshFriendApplicationUnreadCount();
+        }
+
+        @Override
+        public void onFriendApplicationListDeleted(List<String> userIDList) {
+            refreshFriendApplicationUnreadCount();
+        }
+
+        @Override
+        public void onFriendApplicationListRead() {
+            refreshFriendApplicationUnreadCount();
+        }
+    };
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            finish();
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
+    @Override
+    public void finish() {
+        super.finish();
+    }
+
+    @Override
+    protected void onStart() {
+        Log.i(TAG, "onStart");
+        super.onStart();
+    }
+
+    @Override
+    protected void onResume() {
+        Log.i(TAG, "onResume");
+        super.onResume();
+        registerUnreadListener();
+        handleOfflinePush();
+    }
+
+    private void handleOfflinePush() {
+        Intent intent = getIntent();
+        if (intent == null) {
+            Log.d(TAG, "handleOfflinePush intent is null");
+            return;
+        }
+
+//        if (OfflinePushConfigs.getOfflinePushConfigs().getClickNotificationCallbackMode() == OfflinePushConfigs.CLICK_NOTIFICATION_CALLBACK_INTENT) {
+//            TUIUtils.handleOfflinePush(intent, new HandleOfflinePushCallBack() {
+//                @Override
+//                public void onHandleOfflinePush(boolean hasLogged) {
+//                    if (hasLogged) {
+//                        setIntent(null);
+//                    } else {
+//                        finish();
+//                    }
+//                }
+//            });
+//        } else {
+//            String ext = intent.getStringExtra(TUIConstants.TUIOfflinePush.NOTIFICATION_EXT_KEY);
+//            TUIUtils.handleOfflinePush(ext, new HandleOfflinePushCallBack() {
+//                @Override
+//                public void onHandleOfflinePush(boolean hasLogged) {
+//                    if (hasLogged) {
+//                        setIntent(null);
+//                    } else {
+//                        finish();
+//                    }
+//                }
+//            });
+//        }
+    }
+
+
+    private void registerUnreadListener() {
+        V2TIMManager.getFriendshipManager().addFriendListener(friendshipListener);
+        refreshFriendApplicationUnreadCount();
+    }
+
+    private void refreshFriendApplicationUnreadCount() {
+        V2TIMManager.getFriendshipManager().getFriendApplicationList(new V2TIMValueCallback<V2TIMFriendApplicationResult>() {
+            @Override
+            public void onSuccess(V2TIMFriendApplicationResult v2TIMFriendApplicationResult) {
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        int unreadCount = v2TIMFriendApplicationResult.getUnreadCount();
+                        if (unreadCount > 0) {
+                            mNewFriendUnread.setVisibility(View.VISIBLE);
+                        } else {
+                            mNewFriendUnread.setVisibility(View.GONE);
+                        }
+                        String unreadStr = "" + unreadCount;
+                        if (unreadCount > 100) {
+                            unreadStr = "99+";
+                        }
+                        mNewFriendUnread.setText(unreadStr);
+                    }
+                });
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+
+            }
+        });
+    }
+
+    @Override
+    protected void onPause() {
+        Log.i(TAG, "onPause");
+        super.onPause();
+        V2TIMManager.getFriendshipManager().removeFriendListener(friendshipListener);
+    }
+
+    @Override
+    protected void onStop() {
+        Log.i(TAG, "onStop");
+        super.onStop();
+    }
+
+    @Override
+    protected void onDestroy() {
+        Log.i(TAG, "onDestroy");
+        super.onDestroy();
+
+        if (unreadCountReceiver != null) {
+            LocalBroadcastManager.getInstance(this).unregisterReceiver(unreadCountReceiver);
+            unreadCountReceiver = null;
+        }
+    }
+
+    public static void finishMainActivity() {
+        if (instance != null && instance.get() != null) {
+            instance.get().finish();
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/im/SelectLocationActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/im/SelectLocationActivity.kt
new file mode 100644
index 0000000..5a0fe17
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/im/SelectLocationActivity.kt
@@ -0,0 +1,152 @@
+package com.yxjk.healthexpertclient.ui.im
+
+import android.Manifest
+import android.content.Intent
+import android.graphics.BitmapFactory
+import android.os.Bundle
+import android.view.View
+import com.amap.api.location.AMapLocationClient
+import com.amap.api.maps.AMap
+import com.amap.api.maps.CameraUpdateFactory
+import com.amap.api.maps.model.BitmapDescriptorFactory
+import com.amap.api.maps.model.CameraPosition
+import com.amap.api.maps.model.LatLng
+import com.amap.api.maps.model.MarkerOptions
+import com.amap.api.maps.model.MyLocationStyle
+import com.btpj.lib_base.ext.toJson
+import com.buddy.kredit.android.base.BaseActivity
+import com.permissionx.guolindev.PermissionX
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.ActivitySelectLocationBinding
+import com.yxjk.healthexpertclient.ui.im.viewmodel.SelectLocationViewModel
+import com.tencent.qcloud.tuikit.tuichat.bean.message.LocationMessageBean
+import com.tencent.qcloud.tuikit.tuichat.classicui.setting.ChatLayoutSetting
+
+
+/**
+ * @author nanfeifei
+ * @time 2023/7/4 10:38
+ * @description  选择位置（IM发送位置使用）
+ */
+class SelectLocationActivity : BaseActivity<SelectLocationViewModel, ActivitySelectLocationBinding>(
+    R.layout.activity_select_location) {
+    //初始化地图控制器对象
+    var aMap: AMap? = null
+    var mCurrentLat: Double = 0.0
+    var mCurrentLon: Double = 0.0
+    var mPermissionList= arrayListOf(
+        Manifest.permission.ACCESS_COARSE_LOCATION,
+        Manifest.permission.ACCESS_FINE_LOCATION)
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        mBinding.mapView.onSaveInstanceState(outState)
+
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        AMapLocationClient.updatePrivacyShow(this@SelectLocationActivity, true, true)
+        AMapLocationClient.updatePrivacyAgree(this@SelectLocationActivity, true)
+        super.onCreate(savedInstanceState)
+    }
+    override fun initView(savedInstanceState: Bundle?) {
+        setToolBarRightText(getString(R.string.select_location_send))
+        mBinding.apply {
+            mapView.onCreate(savedInstanceState)
+            if (aMap == null) {
+                aMap = mapView.map
+            }
+            PermissionX.init(this@SelectLocationActivity)
+                .permissions(mPermissionList)
+                .request { allGranted, grantedList, deniedList ->
+                    if (allGranted){
+                        setUpMap()
+                    }
+                }
+        }
+    }
+
+    override fun initData() {
+
+    }
+    private fun setUpMap() {
+        // 自定义系统定位小蓝点
+        val myLocationStyle = MyLocationStyle()
+        // 设置小蓝点的图
+        myLocationStyle.myLocationIcon(
+            BitmapDescriptorFactory
+                .fromResource(R.drawable.ic_my_location)
+        )
+        myLocationStyle.myLocationType(MyLocationStyle.LOCATION_TYPE_SHOW)
+        mBinding.apply {
+            aMap?.myLocationStyle = myLocationStyle
+            aMap?.moveCamera(CameraUpdateFactory.zoomTo(13F))
+            aMap?.uiSettings?.isMyLocationButtonEnabled = true // 设置默认定位按钮是否显示
+            aMap?.uiSettings?.isRotateGesturesEnabled = false
+            aMap?.uiSettings?.isTiltGesturesEnabled = false
+            aMap?.isMyLocationEnabled = true // 设置为true表示显示定位层并可触发定位，false表示隐藏定位层并不可触发定位，默认是false
+            aMap?.setOnMyLocationChangeListener {
+                mCurrentLat = it.latitude
+                mCurrentLon = it.longitude
+                val markerOption = MarkerOptions()
+                markerOption.position(LatLng(mCurrentLat, mCurrentLon))
+                aMap?.moveCamera(CameraUpdateFactory.newLatLng(LatLng(mCurrentLat, mCurrentLon)))
+                markerOption.icon(
+                    BitmapDescriptorFactory.fromBitmap(
+                        BitmapFactory
+                            .decodeResource(resources, R.drawable.ic_select_location)
+                    )
+                )
+                markerOption.isFlat = true
+                var marker = aMap?.addMarker(markerOption)
+                aMap?.setOnCameraChangeListener(object : AMap.OnCameraChangeListener {
+                    override fun onCameraChange(cameraPosition: CameraPosition?) {
+                        if (cameraPosition != null) {
+                            marker?.position = cameraPosition.target
+                            mCurrentLat = cameraPosition.target.latitude
+                            mCurrentLon = cameraPosition.target.longitude
+                        }
+                    }
+
+                    override fun onCameraChangeFinish(p0: CameraPosition?) {
+
+                    }
+                })
+            }
+        }
+
+    }
+    override fun onResume() {
+        super.onResume()
+        mBinding.mapView.onResume()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        mBinding.mapView.onPause()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        mBinding.mapView.onDestroy()
+    }
+    override fun bindEvent() {
+        addClickViews(mBinding.toolbarLay.tvRight)
+    }
+
+    override fun onClick(paramView: View?) {
+        super.onClick(paramView)
+        when (paramView?.id) {
+            R.id.tv_right -> {
+                var intent = Intent()
+                var locationMessageBean = LocationMessageBean()
+                locationMessageBean.longitude = mCurrentLon
+                locationMessageBean.latitude = mCurrentLat
+                intent.putExtra(ChatLayoutSetting.KEY_CUSTOM_MESSAGE, locationMessageBean.toJson())
+                setResult(ChatLayoutSetting.RESULT_CODE_LOCATION, intent)
+                finish()
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/im/ViewLocationActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/im/ViewLocationActivity.kt
new file mode 100644
index 0000000..a084188
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/im/ViewLocationActivity.kt
@@ -0,0 +1,118 @@
+package com.yxjk.healthexpertclient.ui.im
+
+import android.Manifest
+import android.graphics.BitmapFactory
+import android.os.Bundle
+import com.amap.api.location.AMapLocationClient
+import com.amap.api.maps.AMap
+import com.amap.api.maps.CameraUpdateFactory
+import com.amap.api.maps.model.BitmapDescriptorFactory
+import com.amap.api.maps.model.LatLng
+import com.amap.api.maps.model.MarkerOptions
+import com.amap.api.maps.model.MyLocationStyle
+import com.buddy.kredit.android.base.BaseActivity
+import com.permissionx.guolindev.PermissionX
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.ActivityViewLocationBinding
+import com.yxjk.healthexpertclient.ui.im.viewmodel.ViewLocationViewModel
+
+
+/**
+ * @author nanfeifei
+ * @time 2023/7/4 10:38
+ * @description  查看位置（IM查看位置使用）
+ */
+class ViewLocationActivity : BaseActivity<ViewLocationViewModel, ActivityViewLocationBinding>(
+    R.layout.activity_view_location) {
+    //初始化地图控制器对象
+    var aMap: AMap? = null
+    var mCurrentLat: Double = 0.0
+    var mCurrentLon: Double = 0.0
+    var mPermissionList= arrayListOf(
+        Manifest.permission.ACCESS_COARSE_LOCATION,
+        Manifest.permission.ACCESS_FINE_LOCATION,
+        Manifest.permission.QUERY_ALL_PACKAGES)
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        mBinding.mapView.onSaveInstanceState(outState)
+
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        AMapLocationClient.updatePrivacyShow(this@ViewLocationActivity, true, true)
+        AMapLocationClient.updatePrivacyAgree(this@ViewLocationActivity, true)
+        super.onCreate(savedInstanceState)
+    }
+    override fun initView(savedInstanceState: Bundle?) {
+        intent.extras?.let {
+            mCurrentLat = it.getDouble("latitude")
+            mCurrentLon = it.getDouble("longitude")
+        }
+        mBinding.apply {
+            mapView.onCreate(savedInstanceState)
+            if (aMap == null) {
+                aMap = mapView.map
+            }
+            PermissionX.init(this@ViewLocationActivity)
+                .permissions(mPermissionList)
+                .request { allGranted, grantedList, deniedList ->
+                    setUpMap(allGranted)
+                }
+        }
+    }
+
+    override fun initData() {
+
+    }
+    private fun setUpMap(allGranted: Boolean) {
+
+        mBinding.apply {
+            if (allGranted){
+                // 自定义系统定位小蓝点
+                val myLocationStyle = MyLocationStyle()
+                // 设置小蓝点的图
+                myLocationStyle.myLocationIcon(
+                    BitmapDescriptorFactory
+                        .fromResource(R.drawable.ic_my_location)
+                )
+                myLocationStyle.myLocationType(MyLocationStyle.LOCATION_TYPE_SHOW)
+                aMap?.myLocationStyle = myLocationStyle
+                aMap?.uiSettings?.isMyLocationButtonEnabled = true // 设置默认定位按钮是否显示
+                aMap?.uiSettings?.isRotateGesturesEnabled = false
+                aMap?.uiSettings?.isTiltGesturesEnabled = false
+                aMap?.isMyLocationEnabled = true // 设置为true表示显示定位层并可触发定位，false表示隐藏定位层并不可触发定位，默认是false
+            }
+            aMap?.moveCamera(CameraUpdateFactory.zoomTo(13F))
+            val markerOption = MarkerOptions()
+            markerOption.position(LatLng(mCurrentLat, mCurrentLon))
+            aMap?.moveCamera(CameraUpdateFactory.newLatLng(LatLng(mCurrentLat, mCurrentLon)))
+            markerOption.icon(
+                BitmapDescriptorFactory.fromBitmap(
+                    BitmapFactory
+                        .decodeResource(resources, R.drawable.ic_select_location)
+                )
+            )
+            markerOption.isFlat = true
+            aMap?.addMarker(markerOption)
+        }
+
+    }
+    override fun onResume() {
+        super.onResume()
+        mBinding.mapView.onResume()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        mBinding.mapView.onPause()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        mBinding.mapView.onDestroy()
+    }
+    override fun bindEvent() {
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/im/adapter/FragmentAdapter.java b/app/src/main/java/com/yxjk/healthexpertclient/ui/im/adapter/FragmentAdapter.java
new file mode 100644
index 0000000..3d5eb2b
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/im/adapter/FragmentAdapter.java
@@ -0,0 +1,46 @@
+package com.yxjk.healthexpertclient.ui.im.adapter;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.lifecycle.Lifecycle;
+import androidx.viewpager2.adapter.FragmentStateAdapter;
+
+import java.util.List;
+
+public class FragmentAdapter extends FragmentStateAdapter {
+    private static final String TAG = FragmentAdapter.class.getSimpleName();
+
+    private List<Fragment> fragmentList;
+
+    public FragmentAdapter(@NonNull FragmentActivity fragmentActivity) {
+        super(fragmentActivity);
+    }
+
+    public FragmentAdapter(@NonNull Fragment fragment) {
+        super(fragment);
+    }
+
+    public FragmentAdapter(@NonNull FragmentManager fragmentManager, @NonNull Lifecycle lifecycle) {
+        super(fragmentManager, lifecycle);
+    }
+
+    public void setFragmentList(List<Fragment> fragmentList) {
+        this.fragmentList = fragmentList;
+    }
+
+    @NonNull
+    @Override
+    public Fragment createFragment(int position) {
+        if (fragmentList == null || fragmentList.size() <= position) {
+            return new Fragment();
+        }
+        return fragmentList.get(position);
+    }
+
+    @Override
+    public int getItemCount() {
+        return fragmentList == null ? 0 : fragmentList.size();
+    }
+}
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/im/utils/IMInputActionSettingUtils.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/im/utils/IMInputActionSettingUtils.kt
new file mode 100644
index 0000000..accc52d
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/im/utils/IMInputActionSettingUtils.kt
@@ -0,0 +1,29 @@
+package com.yxjk.healthexpertclient.ui.im.utils
+
+import com.tencent.qcloud.tuikit.tuichat.classicui.setting.InputActionSetting
+
+object IMInputActionSettingUtils {
+
+    /**
+     * 图文咨询IM功能配置
+     */
+    fun createImageTextConsultSetting(isSelf: Boolean = false, disableSendMessage: Boolean = false){
+        var inputActionSetting = InputActionSetting.createInstance()
+        inputActionSetting.isDisableAudioCall = true
+        inputActionSetting.isDisableVideoCall = true
+        inputActionSetting.isDisableArchives = false
+        inputActionSetting.isDisableMedicalExaminationReport = !isSelf
+        inputActionSetting.isDisableSendMessage = disableSendMessage
+    }
+    /**
+     * 小助手IM功能配置
+     */
+    fun createAssistantSetting(){
+        var inputActionSetting = InputActionSetting.createInstance()
+        inputActionSetting.isDisableAudioCall = true
+        inputActionSetting.isDisableVideoCall = true
+        inputActionSetting.isDisableArchives = true
+        inputActionSetting.isDisableMedicalExaminationReport = true
+        inputActionSetting.isDisableSendMessage = false
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/im/view/Menu.java b/app/src/main/java/com/yxjk/healthexpertclient/ui/im/view/Menu.java
new file mode 100644
index 0000000..ed406b4
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/im/view/Menu.java
@@ -0,0 +1,172 @@
+package com.yxjk.healthexpertclient.ui.im.view;
+
+import android.app.Activity;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PixelFormat;
+import android.graphics.RectF;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.PopupWindow;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.R;
+import com.tencent.qcloud.tuicore.component.action.PopMenuAction;
+import com.tencent.qcloud.tuicore.component.action.PopMenuAdapter;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Menu {
+
+    private static final int SHADOW_WIDTH = 10;
+    private static final int Y_OFFSET = 4;
+
+    private ListView mMenuList;
+    private PopMenuAdapter mMenuAdapter;
+    private PopupWindow mMenuWindow;
+    private List<PopMenuAction> mActions = new ArrayList<>();
+    private Activity mActivity;
+    private View mAttachView;
+
+    public Menu(Activity activity, View attach) {
+        mActivity = activity;
+        mAttachView = attach;
+    }
+
+    public void setMenuAction(List<PopMenuAction> menuActions) {
+        mActions.clear();
+        mActions.addAll(menuActions);
+    }
+
+    public boolean isShowing() {
+        if (mMenuWindow == null) {
+            return false;
+        }
+        return mMenuWindow.isShowing();
+    }
+
+    public void hide() {
+        mMenuWindow.dismiss();
+    }
+
+    public void show() {
+        if (mActions == null || mActions.size() == 0) {
+            return;
+        }
+        mMenuWindow = new PopupWindow(mActivity);
+        mMenuWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
+        mMenuWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+        mMenuWindow.setBackgroundDrawable(new ColorDrawable());
+
+        mMenuAdapter = new PopMenuAdapter();
+        mMenuAdapter.setDataSource(mActions);
+        View menuView = LayoutInflater.from(mActivity).inflate(R.layout.core_pop_menu, null);
+        menuView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+        mMenuWindow.setContentView(menuView);
+        mMenuList = menuView.findViewById(R.id.menu_pop_list);
+        mMenuList.setAdapter(mMenuAdapter);
+        mMenuList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                PopMenuAction action = (PopMenuAction) mMenuAdapter.getItem(position);
+                if (action != null && action.getActionClickListener() != null) {
+                    action.getActionClickListener().onActionClick(position, mActions.get(position));
+                }
+            }
+        });
+
+        int paddingLeftRight = ScreenUtil.dip2px(15.0f);
+        int paddingTopBottom = ScreenUtil.dip2px(12.0f);
+
+        int itemWidth = mActivity.getResources().getDimensionPixelSize(R.dimen.core_pop_menu_item_width);
+        int itemHeight = mActivity.getResources().getDimensionPixelSize(R.dimen.core_pop_menu_item_height);
+        float anchorWidth = mAttachView.getWidth();
+        float anchorHeight = mAttachView.getHeight();
+
+        mMenuWindow.getContentView().measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
+
+        int[] location = new int[2];
+        mAttachView.getLocationOnScreen(location);
+        int rowCount = mActions.size();
+        int indicatorHeight = mActivity.getResources().getDimensionPixelOffset(R.dimen.core_pop_menu_indicator_height);
+
+        int popWidth = itemWidth + paddingLeftRight * 2 - SHADOW_WIDTH;
+        int popHeight = itemHeight * rowCount + paddingTopBottom * 2 - SHADOW_WIDTH;
+
+        float indicatorX = anchorWidth / 2;
+        int screenWidth = ScreenUtil.getScreenWidth(mActivity);
+        int x = location[0];
+        int y;
+        float xOffset = anchorWidth / 2;
+        // If it is on the right, the x-coordinate of the small arrow and the x-position of the pop-up window will change
+        if (location[0] * 2 + anchorWidth > screenWidth) {
+            indicatorX = popWidth - anchorWidth / 2 - xOffset;
+            x = (int) (location[0] + anchorWidth - popWidth + xOffset);
+        }
+
+        y = (int) (location[1] + anchorHeight) + Y_OFFSET;
+        popHeight = popHeight - indicatorHeight;
+
+        Drawable backgroundDrawable = getBackgroundDrawable(popWidth, popHeight, indicatorX, indicatorHeight, 16);
+        menuView.setBackground(backgroundDrawable);
+
+        mMenuWindow.setFocusable(true);
+        mMenuWindow.setTouchable(true);
+        mMenuWindow.setOutsideTouchable(true);
+        mMenuWindow.showAtLocation(mAttachView, Gravity.NO_GRAVITY, x, y);
+    }
+
+    /**
+     * Draw a popup background with small triangles
+     */
+    public Drawable getBackgroundDrawable(final float widthPixel, final float heightPixel, float indicatorX, float indicatorHeight, float radius) {
+        int borderWidth = SHADOW_WIDTH;
+
+        Path path = new Path();
+        Drawable drawable = new Drawable() {
+
+            @Override
+            public void draw(@NonNull Canvas canvas) {
+                Paint paint = new Paint();
+                paint.setColor(Color.WHITE);
+                paint.setStyle(Paint.Style.FILL);
+                paint.setShadowLayer(borderWidth, 0,0,0xFFAAAAAA);
+                path.addRoundRect(new RectF(borderWidth, indicatorHeight + borderWidth, widthPixel - borderWidth, heightPixel + indicatorHeight - borderWidth), radius, radius, Path.Direction.CW);
+                path.moveTo(indicatorX - indicatorHeight, indicatorHeight + borderWidth);
+                path.lineTo(indicatorX, borderWidth);
+                path.lineTo(indicatorX + indicatorHeight, indicatorHeight + borderWidth);
+                path.close();
+                canvas.drawPath(path, paint);
+            }
+
+            @Override
+            public void setAlpha(int alpha) {
+
+            }
+
+            @Override
+            public void setColorFilter(@Nullable ColorFilter colorFilter) {
+
+            }
+
+            @Override
+            public int getOpacity() {
+                return PixelFormat.TRANSLUCENT;
+            }
+        };
+        return drawable;
+    }
+}
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/im/viewmodel/SelectLocationViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/im/viewmodel/SelectLocationViewModel.kt
new file mode 100644
index 0000000..2d93185
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/im/viewmodel/SelectLocationViewModel.kt
@@ -0,0 +1,14 @@
+package com.yxjk.healthexpertclient.ui.im.viewmodel
+
+import com.btpj.lib_base.base.BaseViewModel
+
+/**
+ * @author nanfeifei
+ * @time 2023/7/4 10:38
+ * @description
+ */
+class SelectLocationViewModel: BaseViewModel() {
+    override fun init() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/im/viewmodel/ViewLocationViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/im/viewmodel/ViewLocationViewModel.kt
new file mode 100644
index 0000000..b8eec8f
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/im/viewmodel/ViewLocationViewModel.kt
@@ -0,0 +1,14 @@
+package com.yxjk.healthexpertclient.ui.im.viewmodel
+
+import com.btpj.lib_base.base.BaseViewModel
+
+/**
+ * @author nanfeifei
+ * @time 2023/7/4 10:38
+ * @description
+ */
+class ViewLocationViewModel: BaseViewModel() {
+    override fun init() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/login/ChangePassWordActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/login/ChangePassWordActivity.kt
new file mode 100644
index 0000000..7feee50
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/login/ChangePassWordActivity.kt
@@ -0,0 +1,117 @@
+package com.yxjk.healthexpertclient.ui.login
+
+import android.content.res.ColorStateList
+import android.graphics.Color
+import android.graphics.drawable.GradientDrawable
+import android.os.Bundle
+import android.os.Handler
+import android.os.Message
+import android.text.method.HideReturnsTransformationMethod
+import android.text.method.PasswordTransformationMethod
+import android.view.View
+import android.widget.RadioButton
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.btpj.lib_base.base.BaseVMBActivity
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.ActivityChangePasswordBinding
+import com.yxjk.healthexpertclient.ui.login.viewmodel.LoginViewModel
+import com.yxjk.healthexpertclient.utils.CommonUtils
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+/**
+ * 找回密码
+ */
+class ChangePassWordActivity: BaseVMBActivity<LoginViewModel, ActivityChangePasswordBinding>(R.layout.activity_change_password), View.OnClickListener {
+    var mCode=""
+    override fun initView(savedInstanceState: Bundle?) {
+    }
+
+    override fun initData() {
+        mCode= intent.getStringExtra("code").toString()
+    }
+
+    override fun bindEvent() {
+        mBinding?.let{
+            addClickViews(it.retrieveConfirm)
+            it.loginIvEye.setOnClickListener {
+                mBinding?.let {
+                    var selection=it.tvNewPassword.selectionEnd
+                    if (it.tvNewPassword.transformationMethod== PasswordTransformationMethod.getInstance()){
+                        it.tvNewPassword.setTransformationMethod(
+                            HideReturnsTransformationMethod.getInstance())
+                        it.loginIvEye.setImageResource(R.mipmap.ic_password_show)
+                    }else{
+                        it.tvNewPassword.setTransformationMethod(
+                            PasswordTransformationMethod.getInstance())
+                        it.loginIvEye.setImageResource(R.mipmap.ic_password_hind)
+                    }
+                    it.tvNewPassword.setSelection(selection)
+                }
+            }
+            it.loginIvEye2.setOnClickListener {
+                mBinding?.let {
+                    var selection=it.tvConfirmPassword.selectionEnd
+                    if (it.tvConfirmPassword.transformationMethod== PasswordTransformationMethod.getInstance()){
+                        it.tvConfirmPassword.setTransformationMethod(
+                            HideReturnsTransformationMethod.getInstance())
+                        it.loginIvEye2.setImageResource(R.mipmap.ic_password_show)
+                    }else{
+                        it.tvConfirmPassword.setTransformationMethod(
+                            PasswordTransformationMethod.getInstance())
+                        it.loginIvEye2.setImageResource(R.mipmap.ic_password_hind)
+                    }
+                    it.tvConfirmPassword.setSelection(selection)
+                }
+            }
+        }
+    }
+    override fun createObserve() {
+        super.createObserve()
+        mBinding.apply {
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.mChangeState.collectLatest { result ->
+                        if (result){
+                            showToast("修改密码成功")
+                            finish()
+                        }
+                    }
+                }
+            }
+        }
+    }
+    override fun onClick(v: View?) {
+        processClick(v)
+    }
+
+    fun processClick(paramView: View?) {
+        when(paramView?.id){
+            R.id.retrieve_confirm -> {
+                //密码需要为12-32位（包含数字、大写、小写字母、特殊字符）
+                // TODO: 2024/5/11 密码改为12-32位
+                var newPassword=mBinding?.tvNewPassword?.text.toString().trim()
+                if (newPassword.isNullOrEmpty()) {
+                    showToast("请输入新密码")
+                    return
+                }
+                var confirmPassword=mBinding?.tvConfirmPassword?.text.toString().trim()
+                if (confirmPassword.isNullOrEmpty()) {
+                    showToast("请输入验证码")
+                    return
+                }
+                if (newPassword!=confirmPassword) {
+                    showToast("两次密码输入不一致,请重新输入")
+                    return
+                }
+                if (newPassword.length < 12 || newPassword.length > 32 || !CommonUtils.isPasswordMatches(newPassword)){
+                   showToast(getString(R.string.password_hint))
+                    return
+                }
+                mViewModel.resetUserPwd(newPassword,confirmPassword,mCode)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/login/LoginActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/login/LoginActivity.kt
new file mode 100644
index 0000000..8969c1d
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/login/LoginActivity.kt
@@ -0,0 +1,276 @@
+package com.yxjk.healthexpertclient.ui.login
+
+import android.os.Bundle
+import android.text.SpannableString
+import android.text.Spanned
+import android.text.TextPaint
+import android.text.TextUtils
+import android.text.method.LinkMovementMethod
+import android.text.style.ClickableSpan
+import android.text.style.ForegroundColorSpan
+import android.text.style.UnderlineSpan
+import android.view.Gravity
+import android.view.View
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.btpj.lib_base.data.local.DataStoreManager
+import com.btpj.lib_base.data.local.IpManager
+import com.buddy.kredit.android.base.BaseActivity
+import com.yxjk.healthexpertclient.MyApplication.Companion.appViewModel
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.ActivityLoginBinding
+import com.yxjk.healthexpertclient.ext.startMainActivity
+import com.yxjk.healthexpertclient.ext.startRetrievePassWordActivity
+import com.yxjk.healthexpertclient.ext.startWebActivity
+import com.yxjk.healthexpertclient.ui.login.viewmodel.LoginViewModel
+import com.yxjk.healthexpertclient.utils.CommonUtils
+import com.yxjk.healthexpertclient.utils.ConstantUtils
+import com.yxjk.healthexpertclient.view.PrivacyDialog
+import com.yxjk.healthexpertclient.view.TextViewDialog
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/29 16:33
+ * @description 登录
+ */
+class LoginActivity :
+    BaseActivity<LoginViewModel, ActivityLoginBinding>(R.layout.activity_login) {
+    var mTextViewDialog: TextViewDialog? = null
+    override fun transparentStatusBar(): Boolean {
+        return true
+    }
+
+    override fun initView(savedInstanceState: Bundle?) {
+        initAgreement()
+        mTextViewDialog = TextViewDialog(this)
+        mBinding.apply {
+        }
+
+    }
+
+    override fun createObserve() {
+        super.createObserve()
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.CREATED) {
+                appViewModel.loginState.collect { isLogin ->
+                    if (isLogin) {
+                        startMainActivity(this@LoginActivity)
+                        finish()
+                    } else {
+                        CommonUtils.clearUserInfo()
+                    }
+                }
+            }
+        }
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.CREATED) {
+                mViewModel.list.collectLatest { list ->
+                    if (list != null) {
+                        list?.let {
+                            for (index in 0 until it.size) {
+                                when (it[index].value) {
+                                    "1" -> {
+                                        //用户协议
+                                        if (it[index].text.isNotEmpty()) {
+                                            DataStoreManager.saveUserAgreementUrl(
+                                                IpManager.getH5BaseUrl(
+                                                    IpManager.baseUrlType
+                                                ) + it[index].text
+                                            )
+                                        }
+                                    }
+
+                                    "2" -> {
+                                        //隐私政策
+                                        if (it[index].text.isNotEmpty()) {
+                                            DataStoreManager.savePrivacyAgreementUrl(
+                                                IpManager.getH5BaseUrl(
+                                                    IpManager.baseUrlType
+                                                ) + it[index].text
+                                            )
+                                        }
+                                    }
+
+                                    "3" -> {
+                                        //相关法律说明
+                                        if (it[index].text.isNotEmpty()) {
+                                            DataStoreManager.saveLawUrl(
+                                                IpManager.getH5BaseUrl(
+                                                    IpManager.baseUrlType
+                                                ) + it[index].text
+                                            )
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    override fun initData() {
+        lifecycleScope.launch {
+            appViewModel.loginState.emit(false)
+        }
+        mViewModel.getAgreementData()
+        if (!DataStoreManager.isPrivacyState()) {
+            privacyShow()
+        }
+    }
+
+    fun privacyShow() {
+        val textViewDialog = PrivacyDialog(LoginActivity@ this)
+        textViewDialog?.setDialogTitle("隐私协议授权", 18f)
+        textViewDialog?.setContent(ConstantUtils.mPrivacy, 14f)
+        textViewDialog?.setContentStyle(Gravity.LEFT)
+        textViewDialog?.setBtnText("同意", 18f)
+        textViewDialog?.setDialogCancelable(false)
+        textViewDialog?.setCancelBtnText("退出", 18f)
+        textViewDialog?.setOnAffirmClickListener(object : PrivacyDialog.OnAffirmClickListener {
+            override fun onAffirmClick(viewDialog: PrivacyDialog) {
+                DataStoreManager.savePrivacyState(true)
+
+            }
+
+            override fun onCancelClick(viewDialog: PrivacyDialog) {
+                System.exit(0)
+            }
+        })
+        textViewDialog?.show()
+    }
+
+
+    override fun bindEvent() {
+        mBinding.apply {
+            addClickViews(loginSubmit, loginRetrievePassword)
+        }
+        mTextViewDialog?.let {
+            it.setDialogTitle("温馨提示", 18f)
+            it.setContent("您的密码不安全，请先修改密码", 14f)
+            it.setContentStyle(Gravity.LEFT)
+            it.setBtnText("确认", 18f)
+            it.setDialogCancelable(false)
+            it.setCancelBtnText("取消", 18f)
+            it.setOnAffirmClickListener(object : TextViewDialog.OnAffirmClickListener {
+                override fun onAffirmClick(viewDialog: TextViewDialog) {
+                    startRetrievePassWordActivity(this@LoginActivity)
+                }
+
+                override fun onCancelClick(viewDialog: TextViewDialog) {
+
+                }
+            })
+        }
+
+    }
+
+    override fun onClick(v: View?) {
+        super.onClick(v)
+        when (v?.id) {
+            R.id.login_submit -> {
+                mBinding.apply {
+                    val account = loginEtUserName.text.toString()
+                    val password = loginEtUserPassword.getInputContext()
+                    if (TextUtils.isEmpty(account)) {
+                        showToast(resources?.getString(R.string.login_account_hint))
+                        return
+                    }
+                    if (TextUtils.isEmpty(password)) {
+                        showToast(resources?.getString(R.string.login_password_hint))
+                        return
+                    }
+                    if (password.length < 12 || password.length > 32) {
+                        //弹窗提示去修改密码
+                        mTextViewDialog?.show()
+                    } else {
+                        mViewModel.login(account, password)
+                    }
+                }
+            }
+
+            R.id.login_retrieve_password -> { //找回密码
+                startRetrievePassWordActivity(this)
+            }
+        }
+    }
+
+    private fun initAgreement() {
+        var span = SpannableString(getString(R.string.login_privacy_agreement))
+        span.setSpan(object : ClickableSpan() {
+
+            override fun onClick(widget: View) {
+                DataStoreManager.getUserAgreementUrl()?.let {
+                    if (it.isNotEmpty()) {
+                        startWebActivity(this@LoginActivity, it)
+                    }
+                }
+            }
+            // 表示点击整个text的长度都有效触发这个事件
+        }, 6, 12, Spanned.SPAN_INCLUSIVE_EXCLUSIVE)
+        span.setSpan(NoUnderlineSpan(), 6, 12, Spanned.SPAN_MARK_MARK)
+        span.setSpan(
+            ForegroundColorSpan(
+                ContextCompat.getColor(
+                    this@LoginActivity,
+                    R.color.link_blue_color
+                )
+            ), 6, 12, Spanned.SPAN_INCLUSIVE_EXCLUSIVE
+        )
+
+        span.setSpan(object : ClickableSpan() {
+
+            override fun onClick(widget: View) {
+                DataStoreManager.getPrivacyAgreementUrl()?.let {
+                    if (it.isNotEmpty()) {
+                        startWebActivity(this@LoginActivity, it)
+                    }
+                }
+            }
+            // 表示点击整个text的长度都有效触发这个事件
+        }, 13, 19, Spanned.SPAN_INCLUSIVE_EXCLUSIVE)
+        span.setSpan(NoUnderlineSpan(), 13, 19, Spanned.SPAN_MARK_MARK)
+        span.setSpan(
+            ForegroundColorSpan(
+                ContextCompat.getColor(
+                    this@LoginActivity,
+                    R.color.link_blue_color
+                )
+            ), 13, 19, Spanned.SPAN_INCLUSIVE_EXCLUSIVE
+        )
+//        span.setSpan(object : ClickableSpan() {
+//
+//            override fun onClick(widget: View) {
+//                DataStoreManager.getLawUrl()?.let {
+//                    if (it.isNotEmpty()) {
+//                        startWebActivity(this@LoginActivity,it)
+//                    }
+//                }
+//            }
+//            // 表示点击整个text的长度都有效触发这个事件
+//        }, 20, 28, Spanned.SPAN_INCLUSIVE_EXCLUSIVE)
+//        span.setSpan(NoUnderlineSpan(), 20, 28, Spanned.SPAN_MARK_MARK)
+//        span.setSpan(
+//            ForegroundColorSpan(
+//                ContextCompat.getColor(
+//                    this@LoginActivity,
+//                    R.color.link_blue_color
+//                )
+//            ), 20, 28, Spanned.SPAN_INCLUSIVE_EXCLUSIVE
+//        )
+        mBinding.loginTvAgreement.text = span
+        mBinding.loginTvAgreement.movementMethod = LinkMovementMethod.getInstance()
+    }
+
+    internal class NoUnderlineSpan : UnderlineSpan() {
+        override fun updateDrawState(ds: TextPaint) {
+            ds.color = ds.linkColor
+            ds.isUnderlineText = false
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/login/RetrievePassWordActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/login/RetrievePassWordActivity.kt
new file mode 100644
index 0000000..b74a847
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/login/RetrievePassWordActivity.kt
@@ -0,0 +1,165 @@
+package com.yxjk.healthexpertclient.ui.login
+
+import android.content.res.ColorStateList
+import android.graphics.Color
+import android.os.Bundle
+import android.os.CountDownTimer
+import android.os.Handler
+import android.os.Message
+import android.view.View
+import android.widget.RadioButton
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.btpj.lib_base.base.BaseVMBActivity
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.ActivityRetrievePasswordBinding
+import com.yxjk.healthexpertclient.ext.startChangePassWordActivity
+import com.yxjk.healthexpertclient.ui.login.viewmodel.LoginViewModel
+import com.yxjk.healthexpertclient.ui.login.viewmodel.RetrievePassWordViewModel
+import com.yxjk.healthexpertclient.utils.AuthCodeCountDownTimer
+import com.yxjk.healthexpertclient.utils.phoneCheck
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/29 19:30
+ * @description 找回密码
+ */
+class RetrievePassWordActivity: BaseVMBActivity<LoginViewModel,ActivityRetrievePasswordBinding>(R.layout.activity_retrieve_password) , View.OnClickListener{
+    var mNumber=60
+    var mIsSendCode=true
+    var type=0  //0 信息找回  1 验证码找回
+    var mhandler=object : Handler(){
+        override fun handleMessage(msg: Message) {
+            super.handleMessage(msg)
+            when (msg.what) {
+                0 -> {
+                    if (type==1) {
+                        if (mNumber==1) {
+                            mIsSendCode=true
+                            mNumber=60
+                            mBinding?.retrieveGetCheckCode?.text="重新发送"
+                            mBinding?.retrieveGetCheckCode?.backgroundTintList = ColorStateList.valueOf(
+                                Color.parseColor("#21BEBD"))
+                        }else{
+                            mIsSendCode=false
+                            mNumber=mNumber-1
+                            mBinding?.retrieveGetCheckCode?.text="重新发送(${mNumber}s)"
+                            sendEmptyMessageDelayed(0,1000)
+                        }
+                    }else{
+                        mNumber=60
+                        mBinding?.retrieveGetCheckCode?.text="获取验证码"
+                        mBinding?.retrieveGetCheckCode?.backgroundTintList = ColorStateList.valueOf(
+                            Color.parseColor("#21BEBD"))
+                    }
+
+
+                }
+                else -> {}
+            }
+        }
+    }
+    override fun initView(savedInstanceState: Bundle?) {
+        switchFindMode()
+    }
+
+    override fun initData() {
+    }
+
+    override fun bindEvent() {
+        mBinding?.let{
+            addClickViews(it.retrieveGetCheckCode,it.retrieveConfirm)
+        }
+        mBinding?.radioGroup?.setOnCheckedChangeListener { group, checkedId ->
+            var radio=findViewById<RadioButton>(checkedId)
+            var value=radio.text.toString()
+            if (value=="用户信息找回") {
+                type=0
+                switchFindMode()
+            }else{
+                type=1
+                switchFindMode()
+            }
+        }
+    }
+
+    fun switchFindMode(){
+        if (type==0){
+            mBinding?.llInfoFind?.visibility=View.VISIBLE
+            mBinding?.llCodeFind?.visibility=View.GONE
+        }else{
+            mBinding?.llInfoFind?.visibility=View.GONE
+            mBinding?.llCodeFind?.visibility=View.VISIBLE
+        }
+    }
+
+    override fun createObserve() {
+        super.createObserve()
+        mBinding.apply {
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.mCode.collectLatest { code ->
+                        if (!code.isNullOrEmpty()) {
+                            startChangePassWordActivity(code)
+                            finish()
+                        }
+                    }
+                }
+            }
+        }
+    }
+    override fun onClick(v: View?) {
+        processClick(v)
+    }
+     fun processClick(paramView: View?) {
+        when(paramView?.id){
+            R.id.retrieve_get_check_code -> {
+                if (mIsSendCode) {
+                    mBinding?.retrieveGetCheckCode?.backgroundTintList = ColorStateList.valueOf(
+                        Color.parseColor("#BBBBBB"))
+                    mBinding?.retrieveGetCheckCode?.text="重新发送(${mNumber}s)"
+                    mhandler.sendEmptyMessageDelayed(0,1000)
+                }
+            }
+            R.id.retrieve_confirm -> {
+                if (type==0) {
+                    var name=mBinding?.tvUserName?.text.toString().trim()
+                    var idcard=mBinding?.tvUserIdCard?.text.toString().trim()
+                    var phone=mBinding?.tvUserPhone?.text.toString().trim()
+                    if (name.isNullOrEmpty()) {
+                        showToast("请输入用户姓名")
+                        return
+                    }
+                    if (idcard.isNullOrEmpty()) {
+                        showToast("请输入身份证号")
+                        return
+                    }
+                    if (phone.isNullOrEmpty()) {
+                        showToast("请输入手机号")
+                        return
+                    }
+                    mViewModel.checkUserInfo(name,idcard,phone)
+                }else if (type==1) {
+                    var phone=mBinding?.retrievePhone?.text.toString().trim()
+                    if (phone.isNullOrEmpty()) {
+                        showToast("请输入手机号码")
+                        return
+                    }
+                    if(!phone.phoneCheck()){
+                        showToast("手机号码格式不正确")
+                        return
+                    }
+                    var code=mBinding?.retrieveCheckCode?.text.toString().trim()
+                    if (code.isNullOrEmpty()) {
+                        showToast("请输入验证码")
+                        return
+                    }
+                }
+
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/login/viewmodel/LoginViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/login/viewmodel/LoginViewModel.kt
new file mode 100644
index 0000000..a5c339d
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/login/viewmodel/LoginViewModel.kt
@@ -0,0 +1,75 @@
+package com.yxjk.healthexpertclient.ui.login.viewmodel
+
+import com.baileren.rsalibrary.RSACipherStrategy
+import com.btpj.lib_base.BaseApp.Companion.appContext
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.encrypt
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.yxjk.healthexpertclient.MyApplication.Companion.appViewModel
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.CommonSettingMenuBean
+import com.yxjk.healthexpertclient.data.repository.LoginRepository
+import com.yxjk.healthexpertclient.utils.CommonUtils
+import com.yxjk.healthexpertclient.utils.ConstantUtils
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/29 18:32
+ * @description
+ */
+class LoginViewModel : BaseViewModel() {
+    val agreement = MutableStateFlow(false)
+    var mCode = MutableStateFlow("")
+    var mChangeState = MutableSharedFlow<Boolean>()
+    var list = MutableStateFlow<MutableList<CommonSettingMenuBean>?>(null)
+    override fun init() {
+
+    }
+
+    fun checkUserInfo(realname:String,idCard:String,phone:String){
+        launch({
+            handleRequest(LoginRepository.checkUserInfo(realname,idCard,phone), successBlock = {
+                it.result?.let { it1 -> mCode.emit(it1) }
+            })
+        })
+    }
+
+    fun login(account: String,password: String) {
+        launch(
+            {
+                if (!agreement.value) {
+                    exception.value =
+                        Exception(appContext.getString(R.string.login_privacy_agreement))
+                    return@launch
+                }
+
+                handleRequest(LoginRepository.login(account, password.encrypt(ConstantUtils.RSA_PUBLIC_KEY)), successBlock = {
+                    it.result?.let { result ->
+                        result.userInfo.userToken = result.token
+                        CommonUtils.saveUserInfo(result.userInfo)
+                    }
+                    appViewModel.loginState.emit(true)
+                })
+            })
+    }
+
+    fun getAgreementData(){
+        launch({
+            handleRequest(LoginRepository.getCommonSettingMenuList("z_jump_url"), successBlock = {
+                it.result?.let { it1 -> list.emit(it1) }
+            })
+        })
+    }
+    fun resetUserPwd(password:String,confirmPassword:String,resetCode:String){
+        var newPassword= RSACipherStrategy().encrypt(ConstantUtils.RSA_PUBLIC_KEY,password)
+        var newPasswordConfirm= RSACipherStrategy().encrypt(ConstantUtils.RSA_PUBLIC_KEY,confirmPassword)
+        launch({
+            handleRequest(LoginRepository.resetUserPwd(newPassword,newPasswordConfirm,resetCode), successBlock = {
+                it.result?.let { it1 -> mChangeState.emit(true) }
+            })
+        })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/login/viewmodel/RetrievePassWordViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/login/viewmodel/RetrievePassWordViewModel.kt
new file mode 100644
index 0000000..5f37189
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/login/viewmodel/RetrievePassWordViewModel.kt
@@ -0,0 +1,54 @@
+package com.yxjk.healthexpertclient.ui.login.viewmodel
+
+import com.btpj.lib_base.BaseApp.Companion.appContext
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.isMobile
+import com.btpj.lib_base.ext.launch
+import com.yxjk.healthexpertclient.R
+import kotlinx.coroutines.flow.MutableStateFlow
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/29 19:30
+ * @description
+ */
+class RetrievePassWordViewModel: BaseViewModel() {
+    var mobile = MutableStateFlow("")
+    var authCode = MutableStateFlow("")
+    var sendAuthCode = MutableStateFlow(false)
+    override fun init() {
+
+    }
+    fun sendAuthCode(){
+        launch({
+            if(mobile.value.isNullOrEmpty()){
+                exception.value = Exception(appContext.getString(R.string.retrieve_password_mobile_hint))
+                return@launch
+            }
+            if(!mobile.value.isMobile()){
+                exception.value = Exception(appContext.getString(R.string.retrieve_password_mobile_hint))
+                return@launch
+            }
+            sendAuthCode.emit(true)
+        })
+
+    }
+    fun submitAuthCode(){
+        launch({
+            if(mobile.value.isNullOrEmpty()){
+                exception.value = Exception(appContext.getString(R.string.retrieve_password_mobile_hint))
+                return@launch
+            }
+            if(!mobile.value.isMobile()){
+                exception.value = Exception(appContext.getString(R.string.retrieve_password_mobile_hint))
+                return@launch
+            }
+            if(!authCode.value.isMobile()){
+                exception.value = Exception(appContext.getString(R.string.retrieve_password_mobile_hint))
+                return@launch
+            }
+
+        })
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/main/MainActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/main/MainActivity.kt
new file mode 100644
index 0000000..9890753
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/main/MainActivity.kt
@@ -0,0 +1,154 @@
+package com.yxjk.healthexpertclient.ui.main
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import com.btpj.lib_base.ext.clearLongClickToast
+import com.buddy.kredit.android.base.BaseActivity
+import com.yxjk.healthexpertclient.MyApplication.Companion.appViewModel
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.ActivityMainBinding
+import com.yxjk.healthexpertclient.event.DoctorEvent
+import com.yxjk.healthexpertclient.ext.loginIm
+import com.yxjk.healthexpertclient.ui.main.viewmodel.MainViewModel
+import com.yxjk.healthexpertclient.ui.mine.fragment.MineFragment
+import com.yxjk.healthexpertclient.ui.workbench.fragment.WorkbenchFragment
+import com.tencent.qcloud.tuicore.TUIThemeManager
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.lzh.framework.updatepluginlib.UpdateBuilder
+
+class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(R.layout.activity_main) {
+    companion object {
+        /** 记录修改配置（如页面旋转）前navBar的位置的常量 */
+        private const val CURRENT_NAV_POSITION = "currentNavPosition"
+    }
+    private val workbenchFragment by lazy { WorkbenchFragment.newInstance() }
+    private val mineFragment by lazy { MineFragment.newInstance() }
+    /** 设置默认值为账号页，目的是第一次设置Fragment的时候防止跟实际会设置的Fragment一样，导致不添加（） */
+    private var mCurrentFragment: Fragment? = null
+    private var mCurrentNavPosition = 0
+    override fun initView(savedInstanceState: Bundle?) {
+        // 修改配置时（例如页面旋转、深浅模式切换等）的页面恢复
+        if (savedInstanceState != null) {
+            getIndexFragment(savedInstanceState.getInt(CURRENT_NAV_POSITION))
+        }
+        initTUIThemeManager()
+        UpdateBuilder.create()
+            .check()// 启动更新任务
+        mBinding.apply {
+            bottomNavigationView.apply {
+                // 处理bottomNavigationView的item长按出现Toast的问题
+                clearLongClickToast(
+                    mutableListOf(
+                        R.id.menu_workbench,
+                        R.id.menu_mine
+                    )
+                )
+
+                setOnItemSelectedListener {
+                    return@setOnItemSelectedListener onNavBarItemSelected(it.itemId)
+                }
+            }
+        }
+        getIndexFragment(0)
+    }
+
+    override fun initData() {
+        if(isLogin()){
+            appViewModel.getIMSig(successCall = {
+                loginIm()
+            })
+        }else{
+            finish()
+        }
+    }
+    private fun initTUIThemeManager(){
+        TUIThemeManager.getInstance().changeTheme(this, TUIThemeManager.THEME_SERIOUS)
+        TUIThemeManager.setWebViewLanguage(this)
+    }
+    /**
+     * 设置指定下标的Fragment
+     */
+    private fun getIndexFragment(index: Int) {
+        when (index) {
+            0 -> R.id.menu_workbench
+            1 -> R.id.menu_mine
+            else -> R.id.menu_workbench
+        }.let {
+            mBinding.bottomNavigationView.selectedItemId = it
+            onNavBarItemSelected(it)
+        }
+    }
+    /**
+     * bottomNavigationView切换时调用的方法
+     *
+     * @param itemId 切换Item的id
+     */
+    private fun onNavBarItemSelected(itemId: Int): Boolean {
+        when (itemId) {
+            R.id.menu_workbench -> {
+                mCurrentNavPosition = 0
+                switchFragment(workbenchFragment)
+                return true
+            }
+            R.id.menu_mine -> {
+                mCurrentNavPosition = 1
+                switchFragment(mineFragment)
+                return true
+            }
+            else -> {
+                mCurrentNavPosition = 0
+                switchFragment(workbenchFragment)
+                return true
+            }
+        }
+    }
+    /**
+     * 切换Fragment
+     *
+     * @param fragment 要切换的Fragment
+     */
+    private fun switchFragment(fragment: Fragment) {
+        if (fragment !== mCurrentFragment) {
+            val fragmentTransaction = supportFragmentManager.beginTransaction()
+            // 先隐藏当前显示的Fragment
+            mCurrentFragment?.let { fragmentTransaction.hide(it) }
+            if (!fragment.isAdded) {
+                var oldFragment = supportFragmentManager.findFragmentByTag(fragment.javaClass.simpleName)
+                if(oldFragment == null){
+                    // 存入Tag,以便获取，解决界面重叠问题 参考http://blog.csdn.net/showdy/article/details/50825800
+                    fragmentTransaction.add(R.id.main_content_layout, fragment, fragment.javaClass.simpleName)
+                        .show(fragment)
+                }else{
+                    fragmentTransaction.show(oldFragment)
+                }
+            } else {
+                fragmentTransaction.show(fragment)
+            }
+            // 执行提交
+            fragmentTransaction.commitAllowingStateLoss()
+            // 将当前Fragment赋值为切换后的Fragment
+            mCurrentFragment = fragment
+        }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        // 解决Fragment界面重叠问题,直接传递一个空的Bundle 参考http://blog.csdn.net/showdy/article/details/50825800
+        super.onSaveInstanceState(Bundle())
+        // 记录屏幕旋转/更换深浅模式等之前切换的Fragment的位置
+        outState.putInt(CURRENT_NAV_POSITION, mCurrentNavPosition)
+    }
+
+    override fun onBackPressed() {
+        super.onBackPressed()
+        finish()
+    }
+    override fun bindEvent() {
+
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onEvent(event: DoctorEvent) {
+        mViewModel.getDoctorInfo()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/main/WebActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/main/WebActivity.kt
new file mode 100644
index 0000000..842127e
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/main/WebActivity.kt
@@ -0,0 +1,69 @@
+package com.yxjk.healthexpertclient.ui.main
+
+import android.os.Bundle
+import android.webkit.WebView
+import android.widget.FrameLayout
+import com.buddy.kredit.android.base.BaseActivity
+import com.just.agentweb.AgentWeb
+import com.just.agentweb.WebChromeClient
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.ActivityWebBinding
+import com.yxjk.healthexpertclient.ui.main.viewmodel.WebViewModel
+/**
+ * @author nanfeifei
+ * @time 2023/5/23 16:20
+ * @description WebView页面
+ */
+class WebActivity: BaseActivity<WebViewModel, ActivityWebBinding>(R.layout.activity_web) {
+    private lateinit var mAgentWeb: AgentWeb
+    private lateinit var mUrl: String
+    private lateinit var mTitle: String
+
+    override fun initView(savedInstanceState: Bundle?) {
+
+        mAgentWeb = AgentWeb.with(this)
+            .setAgentWebParent(mBinding.flWeb, FrameLayout.LayoutParams(-1, -1))
+            .useDefaultIndicator()
+            .setWebChromeClient(object : WebChromeClient() {
+                override fun onReceivedTitle(view: WebView?, title: String?) {
+                    super.onReceivedTitle(view, title)
+                    mTitle = title ?: ""
+                    if(mTitle.startsWith("http")){
+                        mTitle = getString(R.string.app_name)
+                    }
+                    mBinding.toolbarLay.tvTitle.text = mTitle
+                }
+            })
+            .createAgentWeb()
+            .ready()
+            .go(getUrl())
+        var javaScriptEnabled = intent.extras?.getBoolean("javaScriptEnabled")
+        if (javaScriptEnabled != null) {
+            mAgentWeb.agentWebSettings.webSettings.javaScriptEnabled = javaScriptEnabled
+        }
+    }
+
+    override fun bindEvent() {
+
+    }
+
+    private fun getUrl(): String {
+        mUrl = intent.extras?.getString("url").toString()
+        return mUrl
+    }
+
+    override fun onResume() {
+        mAgentWeb.webLifeCycle.onResume()
+        super.onResume()
+    }
+
+    override fun onPause() {
+        mAgentWeb.webLifeCycle.onPause()
+        super.onPause()
+    }
+
+    override fun onDestroy() {
+        mAgentWeb.webLifeCycle.onDestroy()
+        super.onDestroy()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/main/adapter/ImageAdapter.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/main/adapter/ImageAdapter.kt
new file mode 100644
index 0000000..a14aeb6
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/main/adapter/ImageAdapter.kt
@@ -0,0 +1,128 @@
+package com.yxjk.healthexpertclient.ui.main.adapter
+
+import android.view.View
+import com.btpj.lib_base.base.adapter.BaseDataBindingAdapter
+import com.btpj.lib_base.ext.loadRoundedImage
+import com.chad.library.adapter.base.module.LoadMoreModule
+import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.ImageBean
+import com.yxjk.healthexpertclient.databinding.ItemRecycleImageBinding
+import java.io.File
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/25 18:01
+ * @description
+ */
+class ImageAdapter(var maxNum: Int): BaseDataBindingAdapter<ImageBean, ItemRecycleImageBinding>(
+    R.layout.item_recycle_image
+), LoadMoreModule {
+    private var isEditModel = false
+    private var editImageShow = false
+    override fun bindViewClickListener(
+        viewHolder: BaseDataBindingHolder<ItemRecycleImageBinding>,
+        viewType: Int
+    ) {
+        addChildClickViewIds(R.id.btn_delete)
+        super.bindViewClickListener(viewHolder, viewType)
+    }
+    override fun convert(
+        holder: BaseDataBindingHolder<ItemRecycleImageBinding>,
+        item: ImageBean
+    ) {
+        val mBinding = holder.dataBinding
+        mBinding?.let {
+            if(item.isAddButton){
+                mBinding.ivImage.setImageResource(R.drawable.icon_image_add)
+                mBinding.btnDelete.visibility = View.GONE
+            }else{
+                if(item.isFilePath){
+                    mBinding.ivImage.loadRoundedImage(File(item.imageUrl), 5f)
+                }else{
+                    mBinding.ivImage.loadRoundedImage(item.imageUrl, 5f, R.drawable.ic_default_archives_image)
+                }
+                if(isEditModel){
+                    mBinding.btnDelete.visibility = View.VISIBLE
+                }else{
+                    mBinding.btnDelete.visibility = View.GONE
+                }
+            }
+        }
+    }
+    fun isEditModel(isEdit: Boolean){
+        isEditModel = isEdit
+        notifyDataSetChanged()
+        if(isEditModel && !editImageShow){
+            showAddButton(true)
+        }
+    }
+
+    override fun setList(list: Collection<ImageBean>?) {
+        super.setList(list)
+        if(isEditModel){
+            showAddButton(true)
+        }
+    }
+    override fun setNewInstance(list: MutableList<ImageBean>?) {
+        super.setNewInstance(list)
+        if(isEditModel){
+            showAddButton(true)
+        }
+    }
+
+    override fun addData(newData: Collection<ImageBean>) {
+        if(isEditModel){
+            if(editImageShow){
+                var lastPosition = data.size - 1
+                if(lastPosition < 0){
+                    lastPosition = 0
+                }
+                addData(lastPosition, newData)
+            }else{
+                showAddButton(true)
+            }
+            if(data.size > maxNum){
+                showAddButton(false)
+            }
+        }else{
+            super.addData(newData)
+        }
+    }
+
+    override fun removeAt(position: Int) {
+        super.removeAt(position)
+        if(isEditModel && !editImageShow){
+            showAddButton(true)
+        }
+    }
+    fun getImageList(): MutableList<ImageBean>{
+        var list = mutableListOf<ImageBean>()
+        data.forEach { imageBean ->
+            if(!imageBean.isAddButton){
+                list.add(imageBean)
+            }
+        }
+        return list
+    }
+    fun getImageSize(): Int {
+        if(isEditModel && editImageShow){
+            return getDefItemCount() - 1
+        }
+        return getDefItemCount()
+    }
+
+    /**
+     * 显示添加图片按钮
+     * @param isShow true为显示 false为隐藏
+     */
+    private fun showAddButton(isShow: Boolean){
+        editImageShow = if(isShow){
+            addData(ImageBean(isAddButton = true))
+            true
+        }else{
+            removeAt(data.size-1)
+            false
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/main/viewmodel/AppViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/main/viewmodel/AppViewModel.kt
new file mode 100644
index 0000000..655a6ef
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/main/viewmodel/AppViewModel.kt
@@ -0,0 +1,84 @@
+package com.yxjk.healthexpertclient.ui.main.viewmodel
+
+import com.btpj.lib_base.BaseApp.Companion.appContext
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.addImageBaseUrl
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.yxjk.healthexpertclient.bean.UserInfoBean
+import com.yxjk.healthexpertclient.bean.im.IMInfoBean
+import com.yxjk.healthexpertclient.data.repository.IMRepository
+import com.yxjk.healthexpertclient.data.repository.WorkbenchRepository
+import com.yxjk.healthexpertclient.event.ConsultRecordEvent
+import com.yxjk.healthexpertclient.event.WorkbenchEvent
+import com.yxjk.healthexpertclient.ext.initIMSDK
+import com.yxjk.healthexpertclient.utils.CommonUtils
+import com.yxjk.healthexpertclient.utils.TUIUtils
+import com.tencent.imsdk.v2.V2TIMCallback
+import com.tencent.imsdk.v2.V2TIMManager
+import com.tencent.imsdk.v2.V2TIMUserFullInfo
+import kotlinx.coroutines.flow.MutableStateFlow
+import org.greenrobot.eventbus.EventBus
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/11 14:11
+ * @description
+ */
+class AppViewModel: BaseViewModel() {
+    var loginState = MutableStateFlow(false)
+    var imSig = MutableStateFlow("")
+    var imAppId = MutableStateFlow("")
+    var imUserId = MutableStateFlow("")
+    override fun init() {
+
+    }
+    fun getIMSig(successCall: (IMInfoBean) -> Unit = {}){
+        launch({
+            handleRequest(IMRepository.getIMSig(), successBlock = {
+                it.result?.let { imBean ->
+                    imSig.emit(imBean.userSig)
+                    imUserId.emit(imBean.userId)
+                    imAppId.emit(imBean.sdkAppId)
+                    appContext.initIMSDK(imBean.sdkAppId.toInt())
+                    successCall.invoke(imBean)
+                }
+            })
+        })
+    }
+    fun setUserIMInfo(){
+        var info = V2TIMUserFullInfo()
+        var userInfo: UserInfoBean? = CommonUtils.getUserInfo() ?: return
+        info.setNickname(userInfo?.realname)
+        info.faceUrl = addImageBaseUrl(userInfo?.avatar)
+        V2TIMManager.getInstance().setSelfInfo(info, object : V2TIMCallback {
+            override fun onSuccess() {
+                // 设置个人资料成功
+            }
+
+            override fun onError(code: Int, desc: String) {
+                // 设置个人资料失败
+            }
+        })
+    }
+    fun finishIMChat(workType: Int, workId: String, finallyCall: () -> Unit = {}){
+        launch({
+            when(workType){
+                TUIUtils.WORK_TYPE_IMAGE_TEXT_CONSULT -> {
+                    handleRequest(WorkbenchRepository.finishConsult(workId), successBlock = {
+                        EventBus.getDefault().post(ConsultRecordEvent())
+                        EventBus.getDefault().post(WorkbenchEvent())
+                    })
+                }
+                TUIUtils.WORK_TYPE_ASSISTANT -> {
+                    handleRequest(WorkbenchRepository.finishConsult(workId), successBlock = {
+                        EventBus.getDefault().post(WorkbenchEvent())
+                    })
+                }
+            }
+        }, finallyBlock = {
+            finallyCall.invoke()
+        })
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/main/viewmodel/MainViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/main/viewmodel/MainViewModel.kt
new file mode 100644
index 0000000..1602f40
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/main/viewmodel/MainViewModel.kt
@@ -0,0 +1,30 @@
+package com.yxjk.healthexpertclient.ui.main.viewmodel
+
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.yxjk.healthexpertclient.bean.im.IMAssistantBean
+import com.yxjk.healthexpertclient.bean.mine.DoctorBean
+import com.yxjk.healthexpertclient.data.repository.MineRepository
+import kotlinx.coroutines.flow.MutableStateFlow
+
+class MainViewModel: BaseViewModel() {
+    var doctorBean = MutableStateFlow(DoctorBean())
+    override fun init() {
+        getDoctorInfo()
+    }
+    fun getDoctorInfo(){
+        launch({
+            handleRequest(MineRepository.getDoctorInfo(), successBlock = {
+                it.result?.let { result -> doctorBean.emit(result) }
+            })
+        })
+    }
+    fun submitAssistantConsultApply(successCall: (IMAssistantBean) -> Unit = {}){
+        launch({
+            handleRequest(MineRepository.submitAssistantConsultApply(), successBlock = {
+                it.result?.let { it1 -> successCall.invoke(it1) }
+            })
+        })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/main/viewmodel/WebViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/main/viewmodel/WebViewModel.kt
new file mode 100644
index 0000000..106e9d7
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/main/viewmodel/WebViewModel.kt
@@ -0,0 +1,8 @@
+package com.yxjk.healthexpertclient.ui.main.viewmodel
+
+import com.btpj.lib_base.base.BaseViewModel
+
+class WebViewModel: BaseViewModel() {
+    override fun init() {
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/AddSuspensionAnnouncementActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/AddSuspensionAnnouncementActivity.kt
new file mode 100644
index 0000000..14b238b
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/AddSuspensionAnnouncementActivity.kt
@@ -0,0 +1,173 @@
+package com.yxjk.healthexpertclient.ui.mine
+
+import android.os.Bundle
+import android.view.View
+import androidx.core.view.ViewCompat
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.btpj.lib_base.base.adapter.BaseCheckRecycleViewAdapter
+import com.buddy.kredit.android.base.BaseActivity
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.listener.OnItemClickListener
+import com.github.gzuliyujiang.wheelpicker.DatePicker
+import com.github.gzuliyujiang.wheelpicker.annotation.DateMode
+import com.github.gzuliyujiang.wheelpicker.entity.DateEntity
+import com.google.android.flexbox.FlexboxLayoutManager
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.ActivityAddSuspensionAnnouncementBinding
+import com.yxjk.healthexpertclient.ui.mine.adapter.SuspensionCauseAdapter
+import com.yxjk.healthexpertclient.ui.mine.viewmodel.AddSuspensionAnnouncementViewModel
+import com.yxjk.healthexpertclient.view.SuspensionAnnouncementAffirmDialog
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/17 18:30
+ * @description 暂停服务公告
+ */
+class AddSuspensionAnnouncementActivity :
+    BaseActivity<AddSuspensionAnnouncementViewModel, ActivityAddSuspensionAnnouncementBinding>(R.layout.activity_add_suspension_announcement),
+    OnItemClickListener {
+    private val affirmDialog by lazy { SuspensionAnnouncementAffirmDialog(this) }
+    private val mAdapter: SuspensionCauseAdapter = SuspensionCauseAdapter()
+    val dataPicker: DatePicker by lazy { DatePicker(this) }
+    private var startDate: DateEntity = DateEntity.today()
+    private var endDate: DateEntity = DateEntity.today()
+    companion object{
+        const val DATE_TYPE_START = 1
+        const val DATE_TYPE_END = 2
+    }
+    override fun initView(savedInstanceState: Bundle?) {
+        mBinding.apply {
+            val flexboxLayoutManager = FlexboxLayoutManager(this@AddSuspensionAnnouncementActivity)
+            rvCauseList.layoutManager = flexboxLayoutManager
+            ViewCompat.setNestedScrollingEnabled(rvCauseList, false)
+        }
+    }
+
+    override fun initData() {
+        super.initData()
+        setDate(startDate.year, startDate.month, startDate.day, DATE_TYPE_START)
+        setDate(endDate.year, endDate.month, endDate.day, DATE_TYPE_END)
+    }
+    override fun createObserve() {
+        super.createObserve()
+        mBinding.apply {
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.causeList.collectLatest { list ->
+                        if(list.isNullOrEmpty()){
+                            return@collectLatest
+                        }
+                        mAdapter.setNewInstance(list)
+                        if (rvCauseList.adapter == null) {
+                            mAdapter.enabledCheckMode = true
+                            mAdapter.singleMode = true
+                            mAdapter.singleModeIsCanCancel = true
+                            mAdapter.setOnItemClickListener(this@AddSuspensionAnnouncementActivity)
+                            rvCauseList.adapter = mAdapter
+                        }
+                    }
+                }
+            }
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.underwayConsult.collectLatest { it ->
+                        affirmDialog.setAudioVideoNum(it)
+                        if(!affirmDialog.isShowing){
+                            affirmDialog.show()
+                        }
+                    }
+                }
+            }
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.finishActivity.collectLatest {
+                        if(it){
+                            finish()
+                        }
+                    }
+                }
+            }
+        }
+    }
+    override fun bindEvent() {
+        addClickViews(mBinding.btnSubmit, mBinding.tvStartTime, mBinding.tvEndTime)
+        affirmDialog.setOnSubmitClickListener(object : SuspensionAnnouncementAffirmDialog.OnSubmitClickListener{
+            override fun onSubmitClick(viewDialog: SuspensionAnnouncementAffirmDialog) {
+                mViewModel.addSuspensionAnnouncement()
+            }
+
+            override fun onCloseClick(viewDialog: SuspensionAnnouncementAffirmDialog) {
+            }
+        })
+    }
+
+    override fun onClick(v: View?) {
+        super.onClick(v)
+        when(v?.id){
+            R.id.btn_submit -> {
+                mViewModel.checkSuspensionAnnouncementContent(mAdapter.checkedItems)
+            }
+            R.id.tv_start_time -> {
+                showDatePicker(R.string.add_suspension_announcement_start_time, startDate, DATE_TYPE_START)
+            }
+            R.id.tv_end_time -> {
+                showDatePicker(R.string.add_suspension_announcement_end_time, endDate, DATE_TYPE_END)
+            }
+        }
+    }
+    private fun showDatePicker(titleId: Int, defaultData: DateEntity, dateType: Int) {
+        dataPicker.setBackgroundResource(R.drawable.rectangle_top_round_corner20_white)
+        dataPicker.setTitle(titleId)
+        var wheelLayout = dataPicker.wheelLayout
+        wheelLayout.setDateMode(DateMode.YEAR_MONTH_DAY)
+        wheelLayout.setRange(DateEntity.today(), DateEntity.yearOnFuture(1), defaultData)
+        wheelLayout.setResetWhenLinkage(false)
+        dataPicker.setOnDatePickedListener { year, month, day ->
+            setDate(year, month, day, dateType)
+        }
+        if(!dataPicker.isShowing){
+            dataPicker.show()
+        }
+    }
+
+    private fun setDate(year: Int, month: Int, day: Int, dateType: Int) {
+        when(dateType){
+            DATE_TYPE_START -> {
+                startDate = DateEntity.target(year, month, day)
+                mViewModel.suspensionServiceBean.value.startDayLong = startDate.toTimeInMillis()
+                mViewModel.suspensionServiceBean.value.startDay = startDate.toString()
+                mBinding.tvStartTime.text =
+                    getString(R.string.add_suspension_announcement_birthday_format, year, month, day)
+                if(startDateBeforeEndDate(startDate, endDate)){
+                    setDate(year, month, day, DATE_TYPE_END)
+                }
+            }
+            DATE_TYPE_END -> {
+                endDate = DateEntity.target(year, month, day)
+                mViewModel.suspensionServiceBean.value.endDayLong = endDate.toTimeInMillis()
+                mViewModel.suspensionServiceBean.value.endDay = endDate.toString()
+                mBinding.tvEndTime.text =
+                    getString(R.string.add_suspension_announcement_birthday_format, year, month, day)
+            }
+        }
+    }
+
+    /**
+     * 开始时间是否在结束时间之前
+     * @param startDate
+     * @param endDate
+     */
+    private fun startDateBeforeEndDate(startDate: DateEntity, endDate: DateEntity): Boolean{
+        if(startDate == null || endDate == null){
+            false
+        }
+        return startDate.toTimeInMillis() > endDate.toTimeInMillis()
+    }
+    override fun onItemClick(adapter: BaseQuickAdapter<*, *>, view: View, position: Int) {
+        (adapter as BaseCheckRecycleViewAdapter).clickItem(position, false)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/BillRecordActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/BillRecordActivity.kt
new file mode 100644
index 0000000..ddc6e05
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/BillRecordActivity.kt
@@ -0,0 +1,109 @@
+package com.yxjk.healthexpertclient.ui.mine
+
+import android.content.res.ColorStateList
+import android.os.Bundle
+import android.view.Gravity
+import android.view.View
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import androidx.viewpager2.widget.ViewPager2
+import com.btpj.lib_base.utils.DateUtil.getDateYearMonthStr
+import com.buddy.kredit.android.base.BaseActivity
+import com.github.gzuliyujiang.wheelpicker.DatePicker
+import com.github.gzuliyujiang.wheelpicker.annotation.DateMode
+import com.github.gzuliyujiang.wheelpicker.entity.DateEntity
+import com.google.android.material.tabs.TabLayoutMediator
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.ActivityBillRecordBinding
+import com.yxjk.healthexpertclient.ui.mine.fragment.BillRecordFragment
+import com.yxjk.healthexpertclient.ui.mine.fragment.BillRecordFragment.Companion.BILL_TYPE_ALL
+import com.yxjk.healthexpertclient.ui.mine.fragment.BillRecordFragment.Companion.BILL_TYPE_INCOME
+import com.yxjk.healthexpertclient.ui.mine.fragment.BillRecordFragment.Companion.BILL_TYPE_PAYMENT
+import com.yxjk.healthexpertclient.ui.mine.viewmodel.BillRecordViewModel
+import com.yxjk.healthexpertclient.view.viewpager.ViewPagerAdapter
+import kotlinx.coroutines.launch
+
+
+/**
+ * 账单明细
+ */
+class BillRecordActivity: BaseActivity<BillRecordViewModel, ActivityBillRecordBinding>(R.layout.activity_bill_record),
+    ViewPagerAdapter.OnCreateFragmentListener {
+    val dataPicker: DatePicker by lazy { DatePicker(this) }
+    var defaultData: DateEntity = DateEntity.today()
+    override fun initView(savedInstanceState: Bundle?) {
+        setToolBarRightText(getString(R.string.bill_record_date_select))
+        val tabs = arrayOf("全部", "收益记录", "提现记录")
+        //禁用预加载
+        mBinding.viewPager.offscreenPageLimit = ViewPager2.OFFSCREEN_PAGE_LIMIT_DEFAULT
+        mBinding.viewPager.adapter = ViewPagerAdapter(this, tabs, this)
+
+        var mediator = TabLayoutMediator(
+            mBinding.tabLayout, mBinding.viewPager, false, true
+        ) { tab, position -> //这里可以自定义TabView
+            val tabView = TextView(this@BillRecordActivity)
+            tabView.gravity = Gravity.CENTER
+            tabView.text = tabs[position]
+            val states = arrayOfNulls<IntArray>(2)
+            states[0] = intArrayOf(android.R.attr.state_selected)
+            states[1] = intArrayOf()
+            val colors = intArrayOf(
+                ContextCompat.getColor(this@BillRecordActivity, R.color.text_black_33),
+                ContextCompat.getColor(this@BillRecordActivity, R.color.text_black_66))
+            val colorStateList = ColorStateList (states, colors)
+            tabView.setTextColor(colorStateList)
+            tab.customView = tabView
+        }
+        //要执行这一句才是真正将两者绑定起来
+        mediator.attach()
+
+    }
+
+    override fun bindEvent() {
+
+    }
+    override fun createFragment(position: Int): Fragment {
+        when(position){
+            0 -> {
+                return BillRecordFragment.newInstance(BILL_TYPE_ALL)
+            }
+            1 -> {
+                return BillRecordFragment.newInstance(BILL_TYPE_INCOME)
+            }
+            2 -> {
+                return BillRecordFragment.newInstance(BILL_TYPE_PAYMENT)
+            }
+        }
+        return BillRecordFragment.newInstance(BILL_TYPE_ALL)
+    }
+
+    override fun onClick(v: View?) {
+        super.onClick(v)
+        when(v?.id){
+            R.id.tv_right -> {
+                showDatePicker()
+            }
+        }
+    }
+    private fun showDatePicker() {
+        dataPicker.setBackgroundResource(R.drawable.rectangle_top_round_corner20_white)
+        dataPicker.setTitle(R.string.bill_record_date_select)
+        var wheelLayout = dataPicker.wheelLayout
+        wheelLayout.setDateMode(DateMode.YEAR_MONTH)
+        wheelLayout.setRange(DateEntity.target(2020, 1, 1), DateEntity.today(), defaultData)
+        wheelLayout.setResetWhenLinkage(false)
+        dataPicker.setOnDatePickedListener { year, month, day ->
+            defaultData = DateEntity.target(year, month, day)
+            var dateStr = getDateYearMonthStr(defaultData.toTimeInMillis())
+            mBinding.toolbarLay.tvRight.text = dateStr
+            lifecycleScope.launch {
+                mViewModel.billDate.emit(dateStr)
+            }
+        }
+        if(!dataPicker.isShowing){
+            dataPicker.show()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/ConsultStatisticsActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/ConsultStatisticsActivity.kt
new file mode 100644
index 0000000..cb07546
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/ConsultStatisticsActivity.kt
@@ -0,0 +1,191 @@
+package com.yxjk.healthexpertclient.ui.mine
+
+import android.graphics.Color
+import android.os.Bundle
+import android.view.View
+import android.widget.AdapterView
+import android.widget.AdapterView.OnItemSelectedListener
+import android.widget.ArrayAdapter
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.btpj.lib_base.utils.DateUtil
+import com.buddy.kredit.android.base.BaseActivity
+import com.github.mikephil.charting.charts.PieChart
+import com.github.mikephil.charting.components.Description
+import com.github.mikephil.charting.components.Legend
+import com.github.mikephil.charting.data.PieData
+import com.github.mikephil.charting.data.PieDataSet
+import com.github.mikephil.charting.data.PieEntry
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.mine.ConsultTypeBean
+import com.yxjk.healthexpertclient.databinding.ActivityConsultStatisticsBinding
+import com.yxjk.healthexpertclient.ext.startBillRecordActivity
+import com.yxjk.healthexpertclient.ui.mine.utils.ConsultStatisticsFormatter
+import com.yxjk.healthexpertclient.ui.mine.viewmodel.ConsultStatisticsViewModel
+import com.yxjk.healthexpertclient.utils.CommonUtils
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/18 17:26
+ * @description 咨询统计
+ */
+class ConsultStatisticsActivity :
+    BaseActivity<ConsultStatisticsViewModel, ActivityConsultStatisticsBinding>(
+        R.layout.activity_consult_statistics
+    ) {
+    override fun initView(savedInstanceState: Bundle?) {
+    }
+
+    override fun createObserve() {
+        super.createObserve()
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.CREATED) {
+                mViewModel.consultTypeMonthList.collectLatest {
+                    var visibility = View.VISIBLE
+                    if (it.isNullOrEmpty()){
+                        visibility = View.VISIBLE
+                    }else{
+                        it.forEach { consultTypeBean ->
+                            if (consultTypeBean.total > 0){
+                                visibility = View.GONE
+                            }
+                        }
+                    }
+                    mBinding.tvNoDate.visibility = visibility
+                    if (it != null) {
+                        showPieChart(mBinding.pieChartView, it)
+                    }
+                }
+            }
+        }
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.CREATED) {
+                mViewModel.firstMonthList.collectLatest {
+                    setSpinnerData(it.toTypedArray())
+                }
+            }
+        }
+    }
+    override fun bindEvent() {
+        addClickViews(mBinding.clMoneyLay)
+    }
+
+    override fun onClick(v: View?) {
+        super.onClick(v)
+        when(v?.id){
+            R.id.cl_money_lay -> {
+                startBillRecordActivity(this@ConsultStatisticsActivity)
+            }
+        }
+    }
+    private fun setSpinnerData(array: Array<String>){
+        val adapter = ArrayAdapter(this@ConsultStatisticsActivity, R.layout.item_spinner_dropdown, array)
+        mBinding.spinnerMonth.adapter = adapter
+        mBinding.spinnerMonth.onItemSelectedListener = object : OnItemSelectedListener{
+            override fun onItemSelected(
+                parent: AdapterView<*>?,
+                view: View?,
+                position: Int,
+                id: Long
+            ) {
+                lifecycleScope.launch {
+                    if(mViewModel.firstMonthList.value != null && position < mViewModel.firstMonthList.value.size){
+                        mViewModel.date.emit(DateUtil.chineseDateToStrShortMonth(mViewModel.firstMonthList.value[position]))
+                        mViewModel.getConsultTypeMonthData()
+                    }
+                }
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+            }
+        }
+    }
+
+    private fun getPieChartData(list: MutableList<ConsultTypeBean>): List<PieEntry> {
+        var mPie: MutableList<PieEntry>  = mutableListOf()
+        var pieEntry: PieEntry
+        for (data in list) {
+            pieEntry = PieEntry(data.total.toFloat(), data.content_type)
+            mPie.add(pieEntry)
+        }
+        return mPie
+    }
+    private fun showPieChart(pieChart: PieChart, pieList: MutableList<ConsultTypeBean>) {
+        val dataSet = PieDataSet(getPieChartData(pieList), "")
+        // 设置颜色list
+        dataSet.colors = getPieColor(pieList)
+        val pieData = PieData(dataSet)
+
+        // 设置描述
+        val description = Description()
+        description.isEnabled = false
+        pieChart.description = description
+        //设置半透明圆环的半径, 0为透明
+        pieChart.transparentCircleRadius = 0f
+        //设置初始旋转角度
+        pieChart.rotationAngle = -12f
+        //数据连接线距图形片内部边界的距离，为百分数
+//        dataSet.valueLinePart1OffsetPercentage = 90f
+        dataSet.valueLinePart1Length = 0.5f
+        //设置连接线的颜色
+//        dataSet.valueLineColor = Color.LTGRAY
+        dataSet.isUsingSliceColorAsValueLineColor = true
+        // 连接线在饼状图外面
+        dataSet.yValuePosition = PieDataSet.ValuePosition.OUTSIDE_SLICE
+
+        // 设置饼块之间的间隔
+//        dataSet.sliceSpace = 1f
+        dataSet.isHighlightEnabled = true
+        // 显示图例
+        val legend = pieChart.legend
+        legend.isEnabled = true
+        legend.horizontalAlignment = Legend.LegendHorizontalAlignment.CENTER
+        legend.textSize = 10f                     //设置图例标签文本的大小
+        legend.textColor = R.color.text_black_33//设置图例标签文本的颜色
+        // 和四周相隔一段距离,显示数据
+        pieChart.setExtraOffsets(35f, 5f, 35f, 5f)
+        // 设置pieChart图表是否可以手动旋转
+        pieChart.isRotationEnabled = false
+        // 设置piecahrt图表点击Item高亮是否可用
+        pieChart.isHighlightPerTapEnabled = false
+        // 设置pieChart图表展示动画效果，动画运行1.4秒结束
+        pieChart.animateY(700)
+        //设置pieChart是否只显示饼图上百分比不显示文字
+        pieChart.setDrawEntryLabels(false)
+        //是否绘制PieChart内部中心文本
+        pieChart.setDrawCenterText(true)
+        pieChart.centerText = "咨询方式"
+//        pieChart.setCenterTextColor(R.color.text_black_33)
+//        pieChart.setCenterTextSize(14f)
+        // 绘制内容value，设置字体颜色大小
+        pieData.setDrawValues(true)
+        pieData.setValueFormatter(ConsultStatisticsFormatter())
+        pieData.setValueTextSize(10f)
+        pieData.setValueTextColor(Color.DKGRAY)
+        pieChart.data = pieData
+        // 更新 piechart 视图
+        pieChart.postInvalidate()
+    }
+    private fun getPieColor(list: MutableList<ConsultTypeBean>): ArrayList<Int>{
+        val colors = ArrayList<Int>()
+        for (index in list.indices) {
+            when(index){
+                0 -> {
+                    colors.add(Color.parseColor("#407FFF"))
+                }
+                1 -> {
+                    colors.add(Color.parseColor("#A682E6"))
+                }
+                else -> {
+                    colors.add(CommonUtils.getRandomColor())
+                }
+            }
+
+        }
+        return colors
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/CustomSchedulingActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/CustomSchedulingActivity.kt
new file mode 100644
index 0000000..73fc5d8
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/CustomSchedulingActivity.kt
@@ -0,0 +1,119 @@
+package com.yxjk.healthexpertclient.ui.mine
+
+import android.os.Bundle
+import android.view.View
+import androidx.core.view.ViewCompat
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.GridLayoutManager
+import com.btpj.lib_base.base.adapter.BaseCheckRecycleViewAdapter
+import com.buddy.kredit.android.base.BaseActivity
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.listener.OnItemClickListener
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.mine.SchedulingBean
+import com.yxjk.healthexpertclient.databinding.ActivityCustomSchedulingBinding
+import com.yxjk.healthexpertclient.ext.startSchedulingActivity
+import com.yxjk.healthexpertclient.ui.mine.adapter.CustomSchedulingAdapter
+import com.yxjk.healthexpertclient.ui.mine.viewmodel.CustomSchedulingViewModel
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/17 13:10
+ * @description 自定义排班
+ */
+class CustomSchedulingActivity: BaseActivity<CustomSchedulingViewModel, ActivityCustomSchedulingBinding>(
+    R.layout.activity_custom_scheduling), OnItemClickListener {
+    private val mAdapter: CustomSchedulingAdapter = CustomSchedulingAdapter()
+    override fun initView(savedInstanceState: Bundle?) {
+        mBinding.apply {
+            val gridLayoutManager = GridLayoutManager(this@CustomSchedulingActivity, 7)
+//            linearLayoutManager.orientation = HORIZONTAL
+            rvList.layoutManager = gridLayoutManager
+            ViewCompat.setNestedScrollingEnabled(rvList, false)
+        }
+        mAdapter.enabledCheckMode = true
+        mAdapter.singleMode = true
+        mAdapter.singleModeIsCanCancel = false
+        mAdapter.setOnItemClickListener(this@CustomSchedulingActivity)
+    }
+    override fun createObserve() {
+        super.createObserve()
+        mBinding.apply {
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.schedulingList.collectLatest { list ->
+                        if(list.isNullOrEmpty()){
+                            return@collectLatest
+                        }
+                        mAdapter.setNewInstance(list)
+                        if (rvList.adapter == null) {
+                            rvList.adapter = mAdapter
+                        }
+                        changeWeek(mAdapter, 0)
+                    }
+                }
+            }
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.showAudioVideoConsult.collectLatest { isShow ->
+                        if(mAdapter.currentCheckedPosition < 0||mAdapter.data.isNullOrEmpty()||mAdapter.currentCheckedPosition >= mAdapter.data.size){
+                            return@collectLatest
+                        }
+                        mAdapter.getItem(mAdapter.currentCheckedPosition).consultSwitchOn = isShow
+                    }
+                }
+            }
+        }
+
+    }
+    override fun bindEvent() {
+        addClickViews(mBinding.btnUnifyScheduling, mBinding.btnSubmit)
+    }
+
+    override fun onClick(v: View?) {
+        super.onClick(v)
+        when(v?.id){
+            R.id.btn_submit -> {
+                setLastAppointmentNum()
+                mViewModel.createDoctorScheduling()
+            }
+            R.id.btn_unify_scheduling -> {
+                startSchedulingActivity(this)
+                finish()
+            }
+        }
+    }
+    override fun onItemClick(adapter: BaseQuickAdapter<*, *>, view: View, position: Int) {
+        changeWeek(adapter, position)
+    }
+    private fun changeWeek(adapter: BaseQuickAdapter<*, *>,position: Int){
+        setLastAppointmentNum()
+        (adapter as BaseCheckRecycleViewAdapter).clickItem(position, false)
+        var schedulingBean: SchedulingBean = adapter.getItem(position) as SchedulingBean
+        lifecycleScope.launch {
+            mViewModel.showAudioVideoConsult.emit(schedulingBean.consultSwitchOn)
+        }
+        mBinding.apply {
+            schedulingBean.amNum?.let {
+                layConsultNumSetting.etMorningAppointmentsNumber.setText(it)
+            }
+            schedulingBean.pmNum?.let {
+                layConsultNumSetting.etAfternoonAppointmentsNumber.setText(it)
+            }
+        }
+    }
+    private fun setLastAppointmentNum(){
+        //mAdapter.currentCheckedPosition在clickItem之后才会被更改，所以此时相当于还是上一次选中的值
+        if(mAdapter.currentCheckedPosition < 0||mAdapter.data.isNullOrEmpty()||mAdapter.currentCheckedPosition >= mAdapter.data.size){
+            return
+        }
+        var schedulingBean: SchedulingBean = mAdapter.getItem(mAdapter.currentCheckedPosition)
+        schedulingBean.amNum = mBinding.layConsultNumSetting.etMorningAppointmentsNumber.text.toString().trim()
+        schedulingBean.pmNum = mBinding.layConsultNumSetting.etAfternoonAppointmentsNumber.text.toString().trim()
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/EditPasswordActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/EditPasswordActivity.kt
new file mode 100644
index 0000000..cbdbffb
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/EditPasswordActivity.kt
@@ -0,0 +1,78 @@
+package com.yxjk.healthexpertclient.ui.mine
+
+import android.os.Bundle
+import android.text.method.HideReturnsTransformationMethod
+import android.text.method.PasswordTransformationMethod
+import android.view.View
+import com.buddy.kredit.android.base.BaseActivity
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.ActivityEditPasswordBinding
+import com.yxjk.healthexpertclient.ui.mine.viewmodel.EditPasswordViewModel
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/22 17:06
+ * @description 修改密码
+ */
+class EditPasswordActivity: BaseActivity<EditPasswordViewModel, ActivityEditPasswordBinding>(R.layout.activity_edit_password) {
+    override fun initView(savedInstanceState: Bundle?) {
+
+    }
+
+    override fun bindEvent() {
+        mBinding.layOldPassword.loginIvEye.setOnClickListener {
+            mBinding?.let {
+                var selection=it.layOldPassword.evPasswordContent.selectionEnd
+                if (it.layOldPassword.evPasswordContent.transformationMethod== PasswordTransformationMethod.getInstance()){
+                    it.layOldPassword.evPasswordContent.setTransformationMethod(
+                        HideReturnsTransformationMethod.getInstance())
+                    it.layOldPassword.loginIvEye.setImageResource(R.mipmap.ic_password_show)
+                }else{
+                    it.layOldPassword.evPasswordContent.setTransformationMethod(PasswordTransformationMethod.getInstance())
+                    it.layOldPassword.loginIvEye.setImageResource(R.mipmap.ic_password_hind)
+                }
+                it.layOldPassword.evPasswordContent.setSelection(selection)
+            }
+        }
+        mBinding.layNewPassword.loginIvEye.setOnClickListener {
+            mBinding?.let {
+                var selection=it.layNewPassword.evPasswordContent.selectionEnd
+                if (it.layNewPassword.evPasswordContent.transformationMethod== PasswordTransformationMethod.getInstance()){
+                    it.layNewPassword.evPasswordContent.setTransformationMethod(
+                        HideReturnsTransformationMethod.getInstance())
+                    it.layNewPassword.loginIvEye.setImageResource(R.mipmap.ic_password_show)
+                }else{
+                    it.layNewPassword.evPasswordContent.setTransformationMethod(PasswordTransformationMethod.getInstance())
+                    it.layNewPassword.loginIvEye.setImageResource(R.mipmap.ic_password_hind)
+                }
+                it.layNewPassword.evPasswordContent.setSelection(selection)
+            }
+        }
+        mBinding.layConfirmPassword.loginIvEye.setOnClickListener {
+            mBinding?.let {
+                var selection=it.layConfirmPassword.evPasswordContent.selectionEnd
+                if (it.layConfirmPassword.evPasswordContent.transformationMethod== PasswordTransformationMethod.getInstance()){
+                    it.layConfirmPassword.evPasswordContent.setTransformationMethod(
+                        HideReturnsTransformationMethod.getInstance())
+                    it.layConfirmPassword.loginIvEye.setImageResource(R.mipmap.ic_password_show)
+                }else{
+                    it.layConfirmPassword.evPasswordContent.setTransformationMethod(PasswordTransformationMethod.getInstance())
+                    it.layConfirmPassword.loginIvEye.setImageResource(R.mipmap.ic_password_hind)
+                }
+                it.layConfirmPassword.evPasswordContent.setSelection(selection)
+            }
+        }
+        addClickViews(mBinding.btnSubmit)
+    }
+
+    override fun onClick(v: View?) {
+        super.onClick(v)
+        when(v?.id){
+            R.id.btn_submit -> {
+                mViewModel.submitEditPassword(successCall = {
+                    finish()
+                })
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/GoodAtDiseaseActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/GoodAtDiseaseActivity.kt
new file mode 100644
index 0000000..190084b
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/GoodAtDiseaseActivity.kt
@@ -0,0 +1,82 @@
+package com.yxjk.healthexpertclient.ui.mine
+
+import android.os.Bundle
+import android.view.View
+import androidx.core.view.ViewCompat
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.GridLayoutManager
+import com.btpj.lib_base.base.adapter.BaseCheckRecycleViewAdapter
+import com.buddy.kredit.android.base.BaseActivity
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.listener.OnItemClickListener
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.mine.DiseaseBean
+import com.yxjk.healthexpertclient.databinding.ActivityGoodAtDiseaseBinding
+import com.yxjk.healthexpertclient.event.AddGoodAtDiseaseEvent
+import com.yxjk.healthexpertclient.ui.mine.adapter.DiseaseAdapter
+import com.yxjk.healthexpertclient.ui.mine.viewmodel.GoodAtDiseaseViewModel
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import org.greenrobot.eventbus.EventBus
+
+/**
+ * @author nanfeifei
+ * @time 2023/6/25 18:04
+ * @description 添加擅长疾病
+ */
+class GoodAtDiseaseActivity: BaseActivity<GoodAtDiseaseViewModel, ActivityGoodAtDiseaseBinding>(R.layout.activity_good_at_disease),
+    OnItemClickListener {
+    private val mAdapter: DiseaseAdapter = DiseaseAdapter()
+    lateinit var departmentId: String
+    lateinit var currentDiseaseList: ArrayList<DiseaseBean>
+    override fun initView(savedInstanceState: Bundle?) {
+        departmentId = intent.extras?.getString("departmentId") ?: ""
+        currentDiseaseList = intent.extras?.getParcelableArrayList("currentDiseaseList") ?: arrayListOf()
+        setToolBarRightText(getString(R.string.dialog_add_disease_affirm))
+        mBinding.apply {
+            val gridLayoutManager = GridLayoutManager(this@GoodAtDiseaseActivity, 2)
+            rvList.layoutManager = gridLayoutManager
+            ViewCompat.setNestedScrollingEnabled(rvList, false)
+        }
+        mAdapter.enabledCheckMode = true
+        mAdapter.setOnItemClickListener(this@GoodAtDiseaseActivity)
+
+    }
+
+    override fun createObserve() {
+        super.createObserve()
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.CREATED) {
+                mViewModel.allDiseaseList.collectLatest { list ->
+                    mAdapter.setList(list)
+                    if (mBinding.rvList.adapter == null){
+                        mBinding.rvList.adapter = mAdapter
+                    }
+                }
+            }
+        }
+    }
+
+    override fun initData() {
+        super.initData()
+        mViewModel.getDoctorGoodAtDisease(departmentId, currentDiseaseList)
+    }
+    override fun bindEvent() {
+
+    }
+    override fun onClick(v: View?) {
+        super.onClick(v)
+        when(v?.id){
+            R.id.tv_right -> {
+                EventBus.getDefault().post(AddGoodAtDiseaseEvent(mAdapter.checkedItems.toMutableList()))
+                finish()
+            }
+        }
+    }
+    override fun onItemClick(adapter: BaseQuickAdapter<*, *>, view: View, position: Int) {
+        (adapter as BaseCheckRecycleViewAdapter).clickItem(position, false)
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/PersonInfoActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/PersonInfoActivity.kt
new file mode 100644
index 0000000..928600a
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/PersonInfoActivity.kt
@@ -0,0 +1,172 @@
+package com.yxjk.healthexpertclient.ui.mine
+
+import android.os.Bundle
+import android.view.View
+import androidx.core.view.ViewCompat
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.btpj.lib_base.ext.loadCircle
+import com.buddy.kredit.android.base.BaseActivity
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.listener.OnItemChildClickListener
+import com.google.android.flexbox.FlexboxLayoutManager
+import com.luck.picture.lib.basic.PictureSelectionModel
+import com.luck.picture.lib.basic.PictureSelector
+import com.luck.picture.lib.config.SelectMimeType
+import com.luck.picture.lib.config.SelectModeConfig
+import com.luck.picture.lib.entity.LocalMedia
+import com.luck.picture.lib.interfaces.OnResultCallbackListener
+import com.luck.picture.lib.utils.SandboxTransformUtils
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.mine.DoctorBean
+import com.yxjk.healthexpertclient.databinding.ActivityPersonInfoBinding
+import com.yxjk.healthexpertclient.event.AddGoodAtDiseaseEvent
+import com.yxjk.healthexpertclient.ext.startGoodAtDiseaseActivity
+import com.yxjk.healthexpertclient.ui.mine.adapter.AddDiseaseAdapter
+import com.yxjk.healthexpertclient.ui.mine.viewmodel.PersonInfoViewModel
+import com.yxjk.healthexpertclient.utils.AndroidBug5497Workaround
+import com.yxjk.healthexpertclient.utils.pictureSelector.GlideEngine
+import com.yxjk.healthexpertclient.utils.pictureSelector.ImageFileCompressEngine
+import com.yxjk.healthexpertclient.utils.pictureSelector.ImageFileCropEngine
+import com.yxjk.healthexpertclient.view.AddDiseaseDialog
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import java.io.File
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/22 19:34
+ * @description 个人信息
+ */
+class PersonInfoActivity: BaseActivity<PersonInfoViewModel, ActivityPersonInfoBinding>(R.layout.activity_person_info),
+     OnItemChildClickListener {
+    val mAdapter by lazy { AddDiseaseAdapter() }
+    val addDiseaseDialog by lazy { AddDiseaseDialog(this@PersonInfoActivity) }
+    override fun initView(savedInstanceState: Bundle?) {
+        AndroidBug5497Workaround.assistActivity(this)
+        mBinding.apply {
+            val flexboxLayoutManager = FlexboxLayoutManager(this@PersonInfoActivity)
+            rvDisease.layoutManager = flexboxLayoutManager
+            ViewCompat.setNestedScrollingEnabled(rvDisease, false)
+        }
+    }
+
+    override fun createObserve() {
+        super.createObserve()
+        mBinding.apply {
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED){
+                    mViewModel.doctorBean.collectLatest {
+                        setDoctorInfo(it)
+                    }
+                }
+            }
+
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.diseaseList.collectLatest { list ->
+                        mAdapter.setNewInstance(list)
+                        if (rvDisease.adapter == null) {
+                            mAdapter.setOnItemChildClickListener(this@PersonInfoActivity)
+                            rvDisease.adapter = mAdapter
+                        }
+                    }
+                }
+            }
+        }
+    }
+    private fun setDoctorInfo(doctorBean: DoctorBean){
+        mBinding.apply {
+
+        }
+    }
+    override fun bindEvent() {
+        addClickViews(mBinding.rlHeadImage, mBinding.btnAdd, mBinding.btnSave)
+        addDiseaseDialog.setOnSubmitClickListener(object : AddDiseaseDialog.OnSubmitClickListener{
+            override fun onSubmitClick(viewDialog: AddDiseaseDialog, inputText: String) {
+//                mAdapter.addData(inputText)
+            }
+
+            override fun onCloseClick(viewDialog: AddDiseaseDialog) {
+
+            }
+        })
+    }
+
+    override fun onClick(v: View?) {
+        super.onClick(v)
+        when(v?.id){
+            R.id.rl_head_image -> {
+                initPictureSelectorModel()
+                    .forResult(object : OnResultCallbackListener<LocalMedia?> {
+                        override fun onResult(result: ArrayList<LocalMedia?>?) {
+                            result?.get(0)
+                                ?.let {
+//                                    showLoading()
+                                    var path = getImagePath(it)
+                                    mBinding.ivHeadImg.loadCircle(
+                                        File(path))
+                                    mViewModel.uploadFile(path)
+                                }
+                        }
+
+                        override fun onCancel() {}
+                    })
+            }
+            R.id.btn_add -> {
+                startGoodAtDiseaseActivity(this, mViewModel.doctorBean.value.departmentId, mViewModel.diseaseList.value)
+//                addDiseaseDialog.show()
+            }
+            R.id.btn_save -> {
+                mViewModel.savePersonInfo()
+            }
+        }
+    }
+
+    override fun onItemChildClick(adapter: BaseQuickAdapter<*, *>, view: View, position: Int) {
+        when(view.id){
+            R.id.btn_delete -> {
+                mAdapter.removeAt(position)
+            }
+        }
+    }
+    fun getImagePath(localMedia: LocalMedia): String {
+        if(!localMedia.cutPath.isNullOrEmpty()){
+            return localMedia.cutPath
+        }
+        if (!localMedia.compressPath.isNullOrEmpty()) {
+            return localMedia.compressPath
+        }
+        if (!localMedia.sandboxPath.isNullOrEmpty()) {
+            return localMedia.sandboxPath
+        }
+        return localMedia.path
+    }
+    private fun initPictureSelectorModel(): PictureSelectionModel {
+        return PictureSelector.create(this)
+            .openGallery(SelectMimeType.TYPE_IMAGE)
+            .setSelectionMode(SelectModeConfig.SINGLE)
+            .setCropEngine(ImageFileCropEngine())
+            .setCompressEngine(ImageFileCompressEngine())
+            .setImageEngine(GlideEngine.createGlideEngine())
+            .setSandboxFileEngine { context, srcPath, mineType, call ->
+                if (call != null) {
+                    var sandboxPath =
+                        SandboxTransformUtils.copyPathToSandbox(context, srcPath, mineType)
+                    call.onCallback(srcPath, sandboxPath)
+                }
+            }
+    }
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onEvent(event: AddGoodAtDiseaseEvent) {
+        if(event == null){
+            return
+        }
+        lifecycleScope.launch {
+            mViewModel.diseaseList.emit(event.list)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/SchedulingActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/SchedulingActivity.kt
new file mode 100644
index 0000000..26efea4
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/SchedulingActivity.kt
@@ -0,0 +1,72 @@
+package com.yxjk.healthexpertclient.ui.mine
+
+import android.os.Bundle
+import android.view.View
+import androidx.core.view.ViewCompat
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.buddy.kredit.android.base.BaseActivity
+import com.buddy.kredit.android.view.SpaceItemDecoration
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.ActivitySchedulingBinding
+import com.yxjk.healthexpertclient.ext.startCustomSchedulingActivity
+import com.yxjk.healthexpertclient.ui.mine.adapter.NewSchedulingAdapter
+import com.yxjk.healthexpertclient.ui.mine.viewmodel.SchedulingViewModel
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/16 14:23
+ * @description 排班设置
+ */
+class SchedulingActivity: BaseActivity<SchedulingViewModel, ActivitySchedulingBinding>(R.layout.activity_scheduling) {
+    private val mAdapter: NewSchedulingAdapter = NewSchedulingAdapter()
+    override fun initView(savedInstanceState: Bundle?) {
+        mBinding.apply {
+            val linearLayoutManager = LinearLayoutManager(this@SchedulingActivity)
+            rvList.layoutManager = linearLayoutManager
+            rvList.addItemDecoration(SpaceItemDecoration(this@SchedulingActivity, 0, 8f))
+            ViewCompat.setNestedScrollingEnabled(rvList, false)
+        }
+    }
+    override fun createObserve() {
+        super.createObserve()
+        mBinding.apply {
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.schedulingList.collectLatest { list ->
+                        mAdapter.setList(list)
+                        if (rvList.adapter == null) {
+                            rvList.adapter = mAdapter
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    override fun initData() {
+        super.initData()
+    }
+    override fun bindEvent() {
+        mBinding.apply {
+            addClickViews(btnSubmit, btnCustomScheduling)
+        }
+    }
+
+    override fun onClick(v: View?) {
+        super.onClick(v)
+        when(v?.id){
+            R.id.btn_submit -> {
+                mViewModel.createDoctorScheduling()
+            }
+            R.id.btn_custom_scheduling -> {
+                startCustomSchedulingActivity(this)
+                finish()
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/SettingActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/SettingActivity.kt
new file mode 100644
index 0000000..077017a
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/SettingActivity.kt
@@ -0,0 +1,125 @@
+package com.yxjk.healthexpertclient.ui.mine
+
+import android.app.ProgressDialog
+import android.os.Bundle
+import android.view.View
+import android.view.Window
+import com.btpj.lib_base.data.local.DataStoreManager
+import com.btpj.lib_base.data.local.IpManager
+import com.btpj.lib_base.ext.jsonToBean
+import com.btpj.lib_base.utils.AppUtil
+import com.buddy.kredit.android.base.BaseActivity
+import com.yxjk.healthexpertclient.BuildConfig
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.AppUpdateBean
+import com.yxjk.healthexpertclient.databinding.ActivitySettingBinding
+import com.yxjk.healthexpertclient.ext.startWebActivity
+import com.yxjk.healthexpertclient.ui.mine.viewmodel.SettingViewModel
+import com.yxjk.healthexpertclient.view.LoadingProgressDialog
+import org.lzh.framework.updatepluginlib.UpdateBuilder
+import org.lzh.framework.updatepluginlib.base.UpdateParser
+import org.lzh.framework.updatepluginlib.model.Update
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/23 16:06
+ * @description  设置
+ */
+class SettingActivity: BaseActivity<SettingViewModel, ActivitySettingBinding>(R.layout.activity_setting) {
+    var dialog: LoadingProgressDialog? = null
+    override fun initView(savedInstanceState: Bundle?) {
+
+    }
+
+    override fun initData() {
+        super.initData()
+        createDialog()
+        var str=AppUtil.getAppVersionName(this)+"(${AppUtil.getAppVersionCode(this)})"
+        mBinding.tvVersion.text = getString(R.string.app_version, str)
+//        mBinding.tvAbout.text = getString(R.string.setting_about, getString(R.string.app_name))
+        initUpdateApp(false)
+    }
+
+    override fun bindEvent() {
+        addClickViews(mBinding.tvUserProtocol, mBinding.tvPrivacyPolicy, mBinding.tvAbout,mBinding.rlVersionUpdate)
+    }
+
+    override fun onClick(v: View?) {
+        super.onClick(v)
+        when(v?.id){
+            R.id.tv_user_protocol -> {
+                DataStoreManager.getUserAgreementUrl()?.let {
+                    if (it.isNotEmpty()) {
+                        startWebActivity(this@SettingActivity,it)
+                    }
+                }
+            }
+            R.id.tv_privacy_policy -> {
+                DataStoreManager.getPrivacyAgreementUrl()?.let {
+                    if (it.isNotEmpty()) {
+                        startWebActivity(this@SettingActivity,it)
+                    }
+                }
+            }
+            R.id.tv_about -> {
+
+            }
+            R.id.rl_version_update -> {
+                initUpdateApp(true)
+            }
+        }
+    }
+
+    private fun initUpdateApp(isClick:Boolean){
+        dialog?.show()
+        UpdateBuilder.create().setUpdateParser(object : UpdateParser() {
+            override fun parse(response: String?): Update {
+                val resultBean: AppUpdateBean? = response.jsonToBean(AppUpdateBean::class.java)
+                val update = Update()
+                if(resultBean == null){
+                    return update
+                }
+                runOnUiThread {
+                    dialog?.dismiss()
+                    if (resultBean.versionNo> BuildConfig.VERSION_CODE){
+                        mBinding?.tvVersionUpdate?.text="有新版本待更新"
+                    }else{
+                        mBinding?.tvVersionUpdate?.text="已是最新版本"
+                    }
+                }
+                if (!isClick) {
+                    return update
+                }
+
+                // 此apk包的下载地址
+                update.updateUrl =  IpManager.getImageBaseUrl()+resultBean.appUrl
+                // 此apk包的版本号(因接口只有在有更新时才会返回数据，而且没有返回云端APP版本号，故将当前APP版本号+1，传给更新框架用作判断有新版本)
+                update.versionCode = resultBean.versionNo ?: 0
+                // 此apk包的版本名称
+                update.versionName = resultBean.versionName
+                // 此apk包的更新内容
+                update.updateContent = resultBean.updateContent
+                // 此apk包是否为强制更新
+                if (resultBean != null) {
+                    update.isForced = 1 == resultBean.forced
+                }else{
+                    update.isForced = false
+                }
+                // 是否显示忽略此次版本更新按钮
+                update.isIgnore = 1 == resultBean.ignoreFlag
+                return update
+            }
+        }).check()
+    }
+
+    private fun createDialog() {
+        dialog = LoadingProgressDialog(
+            this@SettingActivity,
+            ProgressDialog.STYLE_SPINNER, "数据加载中"
+        )
+        dialog!!.requestWindowFeature(Window.FEATURE_NO_TITLE)
+        dialog!!.setCanceledOnTouchOutside(false)
+        dialog!!.setCancelable(false)
+        dialog!!.setMessage("请稍后...")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/SuspensionServiceActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/SuspensionServiceActivity.kt
new file mode 100644
index 0000000..bff5619
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/SuspensionServiceActivity.kt
@@ -0,0 +1,141 @@
+package com.yxjk.healthexpertclient.ui.mine
+
+import android.os.Bundle
+import android.view.View
+import androidx.databinding.DataBindingUtil
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import com.btpj.lib_base.ext.getEmptyView
+import com.btpj.lib_base.ext.initColors
+import com.buddy.kredit.android.base.BaseActivity
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.listener.OnItemChildClickListener
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.mine.SuspensionServiceBean
+import com.yxjk.healthexpertclient.databinding.ActivitySuspensionServiceBinding
+import com.yxjk.healthexpertclient.databinding.ViewFooterSuspensionServiceBinding
+import com.yxjk.healthexpertclient.event.SuspensionServiceEvent
+import com.yxjk.healthexpertclient.ext.startAddSuspensionAnnouncementActivity
+import com.yxjk.healthexpertclient.ui.mine.adapter.SuspensionServiceAdapter
+import com.yxjk.healthexpertclient.ui.mine.viewmodel.SuspensionServiceViewModel
+import com.timehop.stickyheadersrecyclerview.StickyRecyclerHeadersDecoration
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/17 14:26
+ * @description 暂停服务
+ */
+class SuspensionServiceActivity :
+    BaseActivity<SuspensionServiceViewModel, ActivitySuspensionServiceBinding>(R.layout.activity_suspension_service),
+    OnItemChildClickListener, SwipeRefreshLayout.OnRefreshListener {
+    private val mAdapter: SuspensionServiceAdapter = SuspensionServiceAdapter()
+    override fun initView(savedInstanceState: Bundle?) {
+        mBinding.apply {
+            swipeRefresh.initColors()
+            swipeRefresh.setOnRefreshListener(this@SuspensionServiceActivity)
+            val linearLayoutManager = LinearLayoutManager(this@SuspensionServiceActivity
+            )
+            rvList.layoutManager = linearLayoutManager
+            val headersDecor = StickyRecyclerHeadersDecoration(mAdapter)
+            rvList.addItemDecoration(headersDecor)
+        }
+    }
+
+    override fun createObserve() {
+        super.createObserve()
+        mBinding.apply {
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.suspensionServiceList.collectLatest { list ->
+                        if(list == null){
+                            return@collectLatest
+                        }
+                        if (mViewModel.isRefreshing.value) {
+                            mAdapter.setNewInstance(list)
+                        } else {
+                            mAdapter.addData(list)
+                        }
+                        mAdapter.loadMoreModule.loadMoreComplete()
+                        if (rvList.adapter == null) {
+                            mAdapter.setEmptyView(rvList.getEmptyView())
+                            mAdapter.setOnItemChildClickListener(this@SuspensionServiceActivity)
+//                            mAdapter.addFooterView(getFooterView())
+                            initLoadMore()
+                            rvList.adapter = mAdapter
+                        }
+                    }
+                }
+            }
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.isRefreshing.collectLatest {
+                        swipeRefresh.isRefreshing = it
+                    }
+                }
+            }
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.isLoadMoreEnd.collectLatest {
+                        mAdapter.loadMoreModule.loadMoreEnd(it)
+                    }
+                }
+            }
+        }
+    }
+
+
+    override fun bindEvent() {
+        addClickViews(mBinding.layOperate.btnAdd)
+    }
+    override fun onRefresh() {
+        mViewModel.getSuspensionServiceList(true)
+    }
+    private fun initLoadMore() {
+        mAdapter.loadMoreModule.setOnLoadMoreListener { mViewModel.getSuspensionServiceList(false) }
+        mAdapter.loadMoreModule.isAutoLoadMore = true
+        //当自动加载开启，同时数据不满一屏时，是否继续执行自动加载更多(默认为true)
+        mAdapter.loadMoreModule.isEnableLoadMoreIfNotFullPage = false
+    }
+
+    private fun getFooterView(): View{
+        val footerView: ViewFooterSuspensionServiceBinding =
+            DataBindingUtil.inflate(
+                layoutInflater,
+                R.layout.view_footer_suspension_service,
+                mBinding.rvList,
+                false
+            )
+        addClickViews(footerView.btnAdd)
+        return footerView.root
+    }
+
+    override fun onClick(v: View?) {
+        super.onClick(v)
+        when(v?.id){
+            R.id.btn_add -> {
+                startAddSuspensionAnnouncementActivity(this@SuspensionServiceActivity)
+            }
+        }
+    }
+
+    override fun onItemChildClick(adapter: BaseQuickAdapter<*, *>, view: View, position: Int) {
+        when(view?.id){
+            R.id.btn_status -> {
+                var suspensionServiceBean = adapter.getItem(position) as SuspensionServiceBean
+                if(suspensionServiceBean.serviceStatus == 0)
+                    suspensionServiceBean.id?.let { mViewModel.editSuspensionAnnouncement(it) }
+            }
+        }
+    }
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onEvent(event: SuspensionServiceEvent) {
+        onRefresh()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/WithDrawActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/WithDrawActivity.kt
new file mode 100644
index 0000000..06026c2
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/WithDrawActivity.kt
@@ -0,0 +1,31 @@
+package com.yxjk.healthexpertclient.ui.mine
+
+import android.os.Bundle
+import androidx.lifecycle.lifecycleScope
+import com.buddy.kredit.android.base.BaseActivity
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.ActivityWithDrawBinding
+import com.yxjk.healthexpertclient.ui.mine.viewmodel.WithDrawViewModel
+import kotlinx.coroutines.launch
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/22 16:17
+ * @description 提现详情
+ */
+class WithDrawActivity: BaseActivity<WithDrawViewModel, ActivityWithDrawBinding>(R.layout.activity_with_draw) {
+    override fun initView(savedInstanceState: Bundle?) {
+        val recordId = intent.extras?.getInt("recordId") ?: 0
+        lifecycleScope.launch {
+            mViewModel.recordId.emit(recordId)
+        }
+    }
+
+    override fun initData() {
+        super.initData()
+        mViewModel.getWithDrawDetail()
+    }
+    override fun bindEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/adapter/AddDiseaseAdapter.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/adapter/AddDiseaseAdapter.kt
new file mode 100644
index 0000000..29580a6
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/adapter/AddDiseaseAdapter.kt
@@ -0,0 +1,34 @@
+package com.yxjk.healthexpertclient.ui.mine.adapter
+
+import com.btpj.lib_base.base.adapter.BaseDataBindingAdapter
+import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.mine.DiseaseBean
+import com.yxjk.healthexpertclient.databinding.ItemRecycleAddDiseaseBinding
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/23 10:37
+ * @description
+ */
+class AddDiseaseAdapter: BaseDataBindingAdapter<DiseaseBean, ItemRecycleAddDiseaseBinding>(R.layout.item_recycle_add_disease) {
+
+    override fun bindViewClickListener(
+        viewHolder: BaseDataBindingHolder<ItemRecycleAddDiseaseBinding>,
+        viewType: Int
+    ) {
+        addChildClickViewIds(R.id.btn_delete)
+        super.bindViewClickListener(viewHolder, viewType)
+    }
+    override fun convert(
+        holder: BaseDataBindingHolder<ItemRecycleAddDiseaseBinding>,
+        item: DiseaseBean
+    ) {
+
+        val mBinding = holder.dataBinding
+        mBinding?.apply {
+
+            tvDisease.text = item.sicksName
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/adapter/BillRecordAdapter.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/adapter/BillRecordAdapter.kt
new file mode 100644
index 0000000..3af6872
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/adapter/BillRecordAdapter.kt
@@ -0,0 +1,21 @@
+package com.yxjk.healthexpertclient.ui.mine.adapter
+
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.module.LoadMoreModule
+import com.chad.library.adapter.base.viewholder.BaseViewHolder
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.mine.BillRecordBean
+import com.yxjk.healthexpertclient.utils.CommonUtils
+
+class BillRecordAdapter()  :
+    BaseQuickAdapter<BillRecordBean, BaseViewHolder>(
+        R.layout.item_recycle_bill_record
+    ), LoadMoreModule {
+    override fun convert(holder: BaseViewHolder, item: BillRecordBean) {
+        holder.setText(R.id.tv_title, item.operateTypeName)
+        holder.setText(R.id.tv_change_money, CommonUtils.getIncomeText(item.waterType, item.income))
+        holder.setTextColorRes(R.id.tv_change_money, CommonUtils.getIncomeTextColor(item.waterType))
+        holder.setText(R.id.tv_time, item.createTime)
+        holder.setText(R.id.tv_balance, context.getString(R.string.bill_record_balance, item.accountMoney))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/adapter/CustomSchedulingAdapter.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/adapter/CustomSchedulingAdapter.kt
new file mode 100644
index 0000000..8ae1c64
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/adapter/CustomSchedulingAdapter.kt
@@ -0,0 +1,23 @@
+package com.yxjk.healthexpertclient.ui.mine.adapter
+
+import com.btpj.lib_base.base.adapter.BaseCheckRecycleViewAdapter
+import com.btpj.lib_base.utils.DateUtil
+import com.chad.library.adapter.base.viewholder.BaseViewHolder
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.mine.SchedulingBean
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/17 11:21
+ * @description
+ */
+class CustomSchedulingAdapter():
+    BaseCheckRecycleViewAdapter<SchedulingBean, BaseViewHolder>(
+        R.layout.item_recycle_custom_scheduling,
+        null
+    ) {
+    override fun convert(holder: BaseViewHolder, item: SchedulingBean) {
+        holder.setText(R.id.cb_week, DateUtil.getWeekStrChinese(item.week))
+        handleCompoundButton(holder.getView(R.id.cb_week), item)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/adapter/DiseaseAdapter.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/adapter/DiseaseAdapter.kt
new file mode 100644
index 0000000..134266f
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/adapter/DiseaseAdapter.kt
@@ -0,0 +1,22 @@
+package com.yxjk.healthexpertclient.ui.mine.adapter
+
+import com.btpj.lib_base.base.adapter.BaseCheckRecycleViewAdapter
+import com.chad.library.adapter.base.viewholder.BaseViewHolder
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.mine.DiseaseBean
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/17 11:21
+ * @description
+ */
+class DiseaseAdapter():
+    BaseCheckRecycleViewAdapter<DiseaseBean, BaseViewHolder>(
+        R.layout.item_recycle_disease,
+        null
+    ) {
+    override fun convert(holder: BaseViewHolder, item: DiseaseBean) {
+        holder.setText(R.id.cb_disease, item.sicksName)
+        handleCompoundButton(holder.getView(R.id.cb_disease), item)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/adapter/NewSchedulingAdapter.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/adapter/NewSchedulingAdapter.kt
new file mode 100644
index 0000000..8060f28
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/adapter/NewSchedulingAdapter.kt
@@ -0,0 +1,39 @@
+package com.yxjk.healthexpertclient.ui.mine.adapter
+
+import com.btpj.lib_base.base.adapter.BaseDataBindingAdapter
+import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.yxjk.healthexpertclient.BR
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.mine.SchedulingBean
+import com.yxjk.healthexpertclient.databinding.ItemRecycleNewSchedulingBinding
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/17 11:21
+ * @description
+ */
+class NewSchedulingAdapter():
+    BaseDataBindingAdapter<SchedulingBean, ItemRecycleNewSchedulingBinding>(
+        R.layout.item_recycle_new_scheduling,
+        null
+    ) {
+    override fun onBindViewHolder(
+        holder: BaseDataBindingHolder<ItemRecycleNewSchedulingBinding>,
+        position: Int
+    ) {
+        super.onBindViewHolder(holder, position)
+        holder.setIsRecyclable(false) //禁止复用，这里没必要复用，固定7条
+    }
+    override fun convert(
+        holder: BaseDataBindingHolder<ItemRecycleNewSchedulingBinding>,
+        item: SchedulingBean
+    ) {
+        val mBinding = holder.dataBinding
+        mBinding?.apply {
+            mBinding.setVariable(BR.item, item)
+        }
+//        holder.setText(R.id.tv_week, DateUtil.getWeekStrChinese(item.week))
+//        holder.setText(R.id.et_morning_appointments_number, item.amNum)
+//        holder.setText(R.id.et_afternoon_appointments_number, item.pmNum)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/adapter/SchedulingAdapter.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/adapter/SchedulingAdapter.kt
new file mode 100644
index 0000000..0c0b129
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/adapter/SchedulingAdapter.kt
@@ -0,0 +1,79 @@
+package com.yxjk.healthexpertclient.ui.mine.adapter
+
+import com.btpj.lib_base.base.adapter.BaseDataBindingAdapter
+import com.btpj.lib_base.utils.DateUtil
+import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.mine.SchedulingBean
+import com.yxjk.healthexpertclient.databinding.ItemRecycleSchedulingBinding
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/16 16:18
+ * @description
+ */
+class SchedulingAdapter : BaseDataBindingAdapter<SchedulingBean, ItemRecycleSchedulingBinding>(
+    R.layout.item_recycle_scheduling
+) {
+    override fun convert(
+        holder: BaseDataBindingHolder<ItemRecycleSchedulingBinding>,
+        item: SchedulingBean
+    ) {
+        val mBinding = holder.dataBinding
+        mBinding?.apply {
+            tvWeek.text = DateUtil.getWeekStrChinese(item.week)
+            cbAll.setOnCheckedChangeListener { buttonView, isChecked ->
+                if (isChecked) {
+                    cbAfternoon.isChecked = false
+                    cbMorning.isChecked = false
+                    item.type = "2"
+                } else {
+                    item.type = "3"
+                }
+            }
+            cbMorning.setOnCheckedChangeListener { buttonView, isChecked ->
+                if (isChecked) {
+                    cbAfternoon.isChecked = false
+                    cbAll.isChecked = false
+                    item.type = "0"
+                } else {
+                    item.type = "3"
+                }
+            }
+            cbAfternoon.setOnCheckedChangeListener { buttonView, isChecked ->
+                if (isChecked) {
+                    cbMorning.isChecked = false
+                    cbAll.isChecked = false
+                    item.type = "1"
+                } else {
+                    item.type = "3"
+                }
+            }
+            when (item.type) {
+                "0" -> {
+                    cbMorning.isChecked = true
+                }
+
+                "1" -> {
+                    cbAfternoon.isChecked = true
+                }
+
+                "2" -> {
+                    cbAll.isChecked = true
+                }
+
+                "3" -> {
+                    cbMorning.isChecked = false
+                    cbAfternoon.isChecked = false
+                    cbAll.isChecked = false
+                }
+                else -> {
+                    cbMorning.isChecked = false
+                    cbAfternoon.isChecked = false
+                    cbAll.isChecked = false
+                }
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/adapter/SuspensionCauseAdapter.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/adapter/SuspensionCauseAdapter.kt
new file mode 100644
index 0000000..af5b2c0
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/adapter/SuspensionCauseAdapter.kt
@@ -0,0 +1,22 @@
+package com.yxjk.healthexpertclient.ui.mine.adapter
+
+import com.btpj.lib_base.base.adapter.BaseCheckRecycleViewAdapter
+import com.chad.library.adapter.base.viewholder.BaseViewHolder
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.mine.CommonSettingMenuBean
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/17 11:21
+ * @description
+ */
+class SuspensionCauseAdapter():
+    BaseCheckRecycleViewAdapter<CommonSettingMenuBean, BaseViewHolder>(
+        R.layout.item_recycle_cause,
+        null
+    ) {
+    override fun convert(holder: BaseViewHolder, item: CommonSettingMenuBean) {
+        holder.setText(R.id.cb_cause, item.text)
+        handleCompoundButton(holder.getView(R.id.cb_cause), item)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/adapter/SuspensionServiceAdapter.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/adapter/SuspensionServiceAdapter.kt
new file mode 100644
index 0000000..880c135
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/adapter/SuspensionServiceAdapter.kt
@@ -0,0 +1,84 @@
+package com.yxjk.healthexpertclient.ui.mine.adapter
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import androidx.core.content.ContextCompat
+import com.btpj.lib_base.utils.DateUtil
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.module.LoadMoreModule
+import com.chad.library.adapter.base.viewholder.BaseViewHolder
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.mine.SuspensionServiceBean
+import com.yxjk.healthexpertclient.utils.CommonUtils
+import com.timehop.stickyheadersrecyclerview.StickyRecyclerHeadersAdapter
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/17 14:26
+ * @description 暂停服务
+ */
+class SuspensionServiceAdapter :
+    BaseQuickAdapter<SuspensionServiceBean, BaseViewHolder>(
+        R.layout.item_recycle_suspension_service,
+        null
+    ), StickyRecyclerHeadersAdapter<SuspensionServiceAdapter.TitleViewHolder>, LoadMoreModule {
+    override fun bindViewClickListener(viewHolder: BaseViewHolder, viewType: Int) {
+        addChildClickViewIds(R.id.btn_status)
+        super.bindViewClickListener(viewHolder, viewType)
+    }
+    override fun convert(holder: BaseViewHolder, item: SuspensionServiceBean) {
+        holder.setText(
+            R.id.tv_suspension_time,
+            context.getString(
+                R.string.suspension_service_time,
+                DateUtil.getShortDateStr(item.startDayLong),
+                DateUtil.getShortDateStr(item.endDayLong)
+            )
+        )
+        holder.setText(
+            R.id.tv_suspension_cause, item.stopReason)
+        if (item.serviceStatus == 0) {
+            holder.getView<Button>(R.id.btn_status)
+                .setBackgroundResource(R.drawable.rectangle_round_corner5_theme)
+            holder.setText(
+                R.id.btn_status,
+                context.getString(R.string.suspension_service_start_consult)
+            )
+            holder.setTextColor(R.id.btn_status, ContextCompat.getColor(context, R.color.white))
+        } else if (item.serviceStatus == 1) {
+            holder.getView<Button>(R.id.btn_status).setBackgroundResource(0)
+            holder.setText(R.id.btn_status, context.getString(R.string.suspension_service_finish))
+            holder.setTextColor(R.id.btn_status, ContextCompat.getColor(context, R.color.text_black_66))
+        }
+        holder.setText(
+            R.id.tv_suspension_announcement,
+            context.getString(R.string.suspension_service_announcement, item.notice)
+        )
+    }
+
+    class TitleViewHolder(itemView: View) :BaseViewHolder(itemView) {
+        fun loadData(loanRecordBean: SuspensionServiceBean, position: Int){
+            this.setText(R.id.tv_header_title, DateUtil.getDateYearMonthChineseStr(loanRecordBean.startDayLong))
+        }
+    }
+
+    override fun getHeaderId(position: Int): Long {
+        return if(data.isNullOrEmpty() || position >= data.size) -1
+        else CommonUtils.getNumbers(DateUtil.getDateYearMonthStr(data[position].startDayLong))
+    }
+
+    override fun onCreateHeaderViewHolder(parent: ViewGroup?): TitleViewHolder {
+        val view: View = LayoutInflater.from(parent!!.context)
+            .inflate(R.layout.item_recycle_suspension_service_header, parent, false)
+        return TitleViewHolder(view)
+    }
+
+    override fun onBindHeaderViewHolder(holder: TitleViewHolder?, position: Int) {
+        if(data.isNullOrEmpty()||position >= data.size){
+            return
+        }
+        holder?.loadData(data[position], position)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/fragment/BillRecordFragment.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/fragment/BillRecordFragment.kt
new file mode 100644
index 0000000..32c4191
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/fragment/BillRecordFragment.kt
@@ -0,0 +1,146 @@
+package com.yxjk.healthexpertclient.ui.mine.fragment
+
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import com.btpj.lib_base.ext.getEmptyView
+import com.btpj.lib_base.ext.initColors
+import com.buddy.kredit.android.base.BaseFragment
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.listener.OnItemClickListener
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.mine.BillRecordBean
+import com.yxjk.healthexpertclient.databinding.FragmentBillListBinding
+import com.yxjk.healthexpertclient.ext.startWithDrawActivity
+import com.yxjk.healthexpertclient.ui.mine.adapter.BillRecordAdapter
+import com.yxjk.healthexpertclient.ui.mine.viewmodel.BillRecordFragmentViewModel
+import com.yxjk.healthexpertclient.ui.mine.viewmodel.BillRecordViewModel
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/22 17:06
+ * @description 账单明细
+ */
+class BillRecordFragment :
+    BaseFragment<BillRecordFragmentViewModel, FragmentBillListBinding>(R.layout.fragment_bill_list),
+    OnItemClickListener, SwipeRefreshLayout.OnRefreshListener {
+    companion object {
+        const val BILL_TYPE_ALL = 3
+        const val BILL_TYPE_INCOME = 1
+        const val BILL_TYPE_PAYMENT = 2
+        fun newInstance(billType: Int): Fragment {
+            val bundle = Bundle()
+            bundle.putInt("billType", billType)
+            val fragment = BillRecordFragment()
+            fragment.arguments = bundle
+            return fragment
+        }
+    }
+    var dateStr: String = ""
+    private val parentViewModel by activityViewModels<BillRecordViewModel>()
+
+    private val mAdapter: BillRecordAdapter = BillRecordAdapter()
+    override fun initView(view: View, savedInstanceState: Bundle?) {
+        getArgumentsParams()
+        mBinding.apply {
+            swipeRefresh.initColors()
+            swipeRefresh.setOnRefreshListener(this@BillRecordFragment)
+            val linearLayoutManager = LinearLayoutManager(requireContext())
+            rvList.layoutManager = linearLayoutManager
+        }
+
+    }
+
+    private fun getArgumentsParams() {
+        var billType = arguments?.getInt("billType") ?: BILL_TYPE_ALL
+        lifecycleScope.launch {
+            mViewModel.billType.emit(billType)
+        }
+    }
+
+    override fun createObserve() {
+        super.createObserve()
+        mBinding.apply {
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED){
+                    parentViewModel.billDate.collectLatest {
+                        dateStr = it
+                        onRefresh()
+                    }
+                }
+            }
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.billRecordList.collectLatest { list ->
+                        if(list == null){
+                            return@collectLatest
+                        }
+                        if (mViewModel.isRefreshing.value) {
+                            mAdapter.setNewInstance(list)
+                        } else {
+                            mAdapter.addData(list)
+                        }
+                        mAdapter.loadMoreModule.loadMoreComplete()
+                        if (rvList.adapter == null) {
+                            mAdapter.setEmptyView(rvList.getEmptyView())
+                            mAdapter.setOnItemClickListener(this@BillRecordFragment)
+                            initLoadMore()
+                            rvList.adapter = mAdapter
+                        }
+                    }
+                }
+            }
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.isRefreshing.collectLatest {
+                        swipeRefresh.isRefreshing = it
+                    }
+                }
+            }
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.isLoadMoreEnd.collectLatest {
+                        mAdapter.loadMoreModule.loadMoreEnd(it)
+                    }
+                }
+            }
+        }
+
+    }
+
+    override fun initData() {
+        super.initData()
+    }
+
+    override fun onRefresh() {
+        mViewModel.getConsultRecordList(true, dateStr)
+    }
+
+    private fun initLoadMore() {
+        mAdapter.loadMoreModule.setOnLoadMoreListener { mViewModel.getConsultRecordList(false, dateStr) }
+        mAdapter.loadMoreModule.isAutoLoadMore = true
+        //当自动加载开启，同时数据不满一屏时，是否继续执行自动加载更多(默认为true)
+        mAdapter.loadMoreModule.isEnableLoadMoreIfNotFullPage = false
+    }
+
+    override fun bindEvent() {
+    }
+
+    override fun onItemClick(adapter: BaseQuickAdapter<*, *>, view: View, position: Int) {
+        var billRecordBean = adapter.getItem(position) as BillRecordBean
+        if ("2" == billRecordBean.waterType){
+            val id = billRecordBean.id
+            startWithDrawActivity(requireContext(), id)
+        }
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/fragment/MineFragment.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/fragment/MineFragment.kt
new file mode 100644
index 0000000..cccebe1
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/fragment/MineFragment.kt
@@ -0,0 +1,135 @@
+package com.yxjk.healthexpertclient.ui.mine.fragment
+
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.btpj.lib_base.ext.loadCircle
+import com.buddy.kredit.android.base.BaseFragment
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.mine.DoctorBean
+import com.yxjk.healthexpertclient.databinding.FragmentMineBinding
+import com.yxjk.healthexpertclient.ext.startConsultStatisticsActivity
+import com.yxjk.healthexpertclient.ext.startEditPasswordActivity
+import com.yxjk.healthexpertclient.ext.startGroupChat
+import com.yxjk.healthexpertclient.ext.startLoginActivity
+import com.yxjk.healthexpertclient.ext.startPersonInfoActivity
+import com.yxjk.healthexpertclient.ext.startRetrievePassWordActivity
+import com.yxjk.healthexpertclient.ext.startSchedulingActivity
+import com.yxjk.healthexpertclient.ext.startSettingActivity
+import com.yxjk.healthexpertclient.ext.startSuspensionServiceActivity
+import com.yxjk.healthexpertclient.ui.im.utils.IMInputActionSettingUtils
+import com.yxjk.healthexpertclient.ui.main.viewmodel.MainViewModel
+import com.yxjk.healthexpertclient.ui.mine.viewmodel.MineViewModel
+import com.yxjk.healthexpertclient.utils.TUIUtils
+import com.yxjk.healthexpertclient.utils.orNullDefault
+import com.tencent.qcloud.tuikit.tuichat.bean.WorkBean
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/22 17:06
+ * @description 我的
+ */
+class MineFragment : BaseFragment<MineViewModel, FragmentMineBinding>(R.layout.fragment_mine) {
+
+    companion object {
+        fun newInstance() = MineFragment()
+    }
+    private val mainViewModel by activityViewModels<MainViewModel>()
+    override fun initView(view: View, savedInstanceState: Bundle?) {
+//        mBinding.tvVersion.text = getString(R.string.app_version, AppUtil.getAppVersionName(requireContext()))
+    }
+    override fun createObserve() {
+        super.createObserve()
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.CREATED){
+                mainViewModel.doctorBean.collectLatest {
+                    setDoctorInfo(it)
+                }
+            }
+        }
+        //目前已不使用，之前区分自定义排班和统一排班，现已整合
+//        lifecycleScope.launch {
+//            repeatOnLifecycle(Lifecycle.State.CREATED) {
+//                mViewModel.isCustomScheduling.collectLatest { isCustomScheduling ->
+//                    if(isCustomScheduling){
+//                        startCustomSchedulingActivity(requireContext())
+//                    }else{
+//                        startSchedulingActivity(requireContext())
+//                    }
+//                }
+//            }
+//        }
+    }
+    private fun setDoctorInfo(doctorBean: DoctorBean){
+        mBinding.apply {
+            tvDoctorName.text = doctorBean.doctorName.orNullDefault()
+            ivDoctorHead.loadCircle(doctorBean.photo)
+            tvProfessionalTitle.text = doctorBean.doctorTitle
+            tvHospital.text = doctorBean.resourceName.orNullDefault() + " " + if(doctorBean.departmentName.isNullOrEmpty()) "" else doctorBean.departmentName
+        }
+    }
+    override fun bindEvent() {
+        mBinding.apply {
+            addClickViews(
+                tvAssistant,
+                tvStatistics,
+                tvScheduling,
+                tvSuspensionService,
+                tvPersonalInfo,
+                tvAccountSecurity,
+                tvAboutUs,
+                btnLogout
+            )
+        }
+    }
+
+    override fun onClick(v: View?) {
+        mBinding.apply {
+            super.onClick(v)
+            when(v?.id){
+                R.id.tv_assistant -> {
+                    mainViewModel.submitAssistantConsultApply(successCall = {
+                        if (it == null){
+                            return@submitAssistantConsultApply
+                        }
+                        IMInputActionSettingUtils.createAssistantSetting()
+                        requireContext().startGroupChat(it.groupId, getString(R.string.title_assistant_consult), WorkBean(it.id, TUIUtils.WORK_TYPE_ASSISTANT))
+                    })
+                }
+                R.id.tv_statistics -> {
+                    startConsultStatisticsActivity(requireContext())
+                }
+                R.id.tv_scheduling -> {
+                    startSchedulingActivity(requireContext())
+//                    mViewModel.getSchedulingType()
+                }
+
+                R.id.tv_suspension_service -> {
+                    startSuspensionServiceActivity(requireContext())
+                }
+                R.id.tv_personal_info -> {
+                    startPersonInfoActivity(requireContext())
+                }
+                R.id.tv_account_security -> {
+                    startEditPasswordActivity(requireContext())
+//                    startRetrievePassWordActivity(requireContext())
+
+                }
+                R.id.tv_about_us -> { //设计图上叫关于我们，实际页面更像是设置，因为跳转进去还有个关于，命名回头确定了再说
+                    startSettingActivity(requireContext())
+                }
+                R.id.btn_logout -> {
+                    startLoginActivity(requireContext())
+//                    requireActivity().finish()
+                }
+
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/utils/ConsultStatisticsFormatter.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/utils/ConsultStatisticsFormatter.kt
new file mode 100644
index 0000000..9f8696c
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/utils/ConsultStatisticsFormatter.kt
@@ -0,0 +1,19 @@
+package com.yxjk.healthexpertclient.ui.mine.utils
+
+import com.github.mikephil.charting.data.PieEntry
+import com.github.mikephil.charting.formatter.ValueFormatter
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/19 10:28
+ * @description
+ */
+class ConsultStatisticsFormatter : ValueFormatter() {
+
+    override fun getPieLabel(value: Float, pieEntry: PieEntry?): String {
+        if(pieEntry != null){
+            return pieEntry.label + value.toInt()
+        }
+        return this.getPieLabel(value, pieEntry)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/AddSuspensionAnnouncementViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/AddSuspensionAnnouncementViewModel.kt
new file mode 100644
index 0000000..4692edb
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/AddSuspensionAnnouncementViewModel.kt
@@ -0,0 +1,88 @@
+package com.yxjk.healthexpertclient.ui.mine.viewmodel
+
+import com.btpj.lib_base.BaseApp
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.mine.CommonSettingMenuBean
+import com.yxjk.healthexpertclient.bean.mine.SuspensionServiceBean
+import com.yxjk.healthexpertclient.data.repository.MineRepository
+import com.yxjk.healthexpertclient.event.SuspensionServiceEvent
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import org.greenrobot.eventbus.EventBus
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/17 18:31
+ * @description
+ */
+class AddSuspensionAnnouncementViewModel : BaseViewModel() {
+    var causeList = MutableStateFlow(mutableListOf<CommonSettingMenuBean>())
+    var suspensionServiceBean = MutableStateFlow(SuspensionServiceBean())
+    var underwayConsult = MutableSharedFlow<String>()
+    var finishActivity = MutableStateFlow(false)
+    override fun init() {
+        getSuspensionCauseList()
+    }
+
+    private fun getSuspensionCauseList() {
+        launch(false, {
+            handleRequest(MineRepository.getSuspensionReasonList(), successBlock = {
+                it.result?.let { list -> causeList.emit(list) }
+            })
+        })
+    }
+
+    fun checkSuspensionAnnouncementContent(reasonList: List<CommonSettingMenuBean>) {
+        launch({
+            if (reasonList.isNullOrEmpty()) {
+                exception.value =
+                    Exception(BaseApp.appContext.getString(R.string.add_suspension_announcement_cause_tips))
+                return@launch
+            }
+            if (suspensionServiceBean.value.startDayLong <= 0.0 || suspensionServiceBean.value.endDayLong <= 0.0) {//选择只能选未来时间
+                exception.value =
+                    Exception(BaseApp.appContext.getString(R.string.add_suspension_announcement_time_tips))
+                return@launch
+            }
+            if (suspensionServiceBean.value.startDayLong > suspensionServiceBean.value.endDayLong) {
+                exception.value =
+                    Exception(BaseApp.appContext.getString(R.string.add_suspension_announcement_time_range_tips))
+                return@launch
+            }
+            if (suspensionServiceBean.value.notice.isNullOrEmpty()) {
+                exception.value =
+                    Exception(BaseApp.appContext.getString(R.string.add_suspension_announcement_explain_tips))
+                return@launch
+            }
+            suspensionServiceBean.value.stopReason = reasonList[0].text
+            handleRequest(
+                MineRepository.getDateRangeConsultNum(
+                    suspensionServiceBean.value.startDayLong,
+                    suspensionServiceBean.value.endDayLong
+                ), successBlock = {
+                    it.result?.let { num ->
+                        if(num.isNullOrEmpty()||"0" == num){
+                            addSuspensionAnnouncement()
+                            return@handleRequest
+                        }
+                        underwayConsult.emit(num)
+                    }
+                })
+        })
+    }
+
+    fun addSuspensionAnnouncement() {
+        launch({
+            handleRequest(
+                MineRepository.addSuspensionService(suspensionServiceBean.value),
+                successBlock = {
+                    toastMessage.emit(it.message)
+                    EventBus.getDefault().post(SuspensionServiceEvent())
+                    finishActivity.emit(true)
+                })
+        })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/BillRecordFragmentViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/BillRecordFragmentViewModel.kt
new file mode 100644
index 0000000..596a905
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/BillRecordFragmentViewModel.kt
@@ -0,0 +1,54 @@
+package com.yxjk.healthexpertclient.ui.mine.viewmodel
+
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.yxjk.healthexpertclient.bean.mine.BillRecordBean
+import com.yxjk.healthexpertclient.data.repository.MineRepository
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/31 17:47
+ * @description
+ */
+class BillRecordFragmentViewModel: BaseViewModel() {
+    var billRecordList = MutableStateFlow<MutableList<BillRecordBean>?>(null)
+    var billType = MutableStateFlow(0)
+    var pageIndex = MutableStateFlow(1)
+    var isRefreshing = MutableStateFlow(false)
+    var isLoadMoreEnd = MutableSharedFlow<Boolean>()
+    private val pageSize = 20
+    override fun init() {
+    }
+    fun getConsultRecordList(isRefresh: Boolean, date: String = ""){
+        launch(tryBlock = {
+            if(isRefresh){
+                isRefreshing.emit(true)
+                isLoadMoreEnd.emit(false)
+                pageIndex.emit(1)
+            }
+            handleRequest(MineRepository.getBillRecord(date, billType.value.toString(), pageIndex.value, pageSize), successBlock = {
+                if(it.result == null){
+                    isLoadMoreEnd.emit(true)
+                    billRecordList.emit(mutableListOf())
+                }else{
+                    if(it.result!!.records.isNullOrEmpty()){
+                        isLoadMoreEnd.emit(true)
+                        billRecordList.emit(mutableListOf())
+                    }else{
+                        billRecordList.emit(it.result!!.records)
+                        pageIndex.value++
+                        if(it.result!!.records.size < pageSize){
+                            isLoadMoreEnd.emit(true)
+                        }
+                    }
+                }
+
+            })
+        }, finallyBlock = {
+            isRefreshing.emit(false)
+        })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/BillRecordViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/BillRecordViewModel.kt
new file mode 100644
index 0000000..0359b38
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/BillRecordViewModel.kt
@@ -0,0 +1,11 @@
+package com.yxjk.healthexpertclient.ui.mine.viewmodel
+
+import com.btpj.lib_base.base.BaseViewModel
+import kotlinx.coroutines.flow.MutableStateFlow
+
+class BillRecordViewModel: BaseViewModel() {
+    var billDate = MutableStateFlow("")
+    override fun init() {
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/ConsultStatisticsViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/ConsultStatisticsViewModel.kt
new file mode 100644
index 0000000..2c26ad4
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/ConsultStatisticsViewModel.kt
@@ -0,0 +1,55 @@
+package com.yxjk.healthexpertclient.ui.mine.viewmodel
+
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.btpj.lib_base.utils.DateUtil
+import com.yxjk.healthexpertclient.bean.mine.ConsultStatisticsBean
+import com.yxjk.healthexpertclient.bean.mine.ConsultTypeBean
+import com.yxjk.healthexpertclient.data.repository.MineRepository
+import kotlinx.coroutines.flow.MutableStateFlow
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/18 17:26
+ * @description
+ */
+class ConsultStatisticsViewModel: BaseViewModel() {
+    var date = MutableStateFlow("")
+    var consultStatisticsBean = MutableStateFlow(ConsultStatisticsBean())
+    var consultTypeMonthList = MutableStateFlow<MutableList<ConsultTypeBean>?>(null)
+    var consultTypeAllList = MutableStateFlow(mutableListOf<ConsultTypeBean>())
+    var firstMonthList = MutableStateFlow(mutableListOf<String>())
+    override fun init() {
+        getFirstMonthList()
+        getConsultStatistics()
+//        getConsultTypeAllData()
+    }
+    private fun getConsultStatistics(){
+        launch({
+            handleRequest(MineRepository.getConsultStatistics(), successBlock = {
+                it.result?.let { it1 -> consultStatisticsBean.emit(it1) }
+            })
+        })
+    }
+    fun getConsultTypeMonthData(){
+        launch({
+            handleRequest(MineRepository.getConsultTypeData(date.value), successBlock = {
+                consultTypeMonthList.emit(it.result)
+                it.result?.let { it1 -> consultTypeAllList.emit(it1) }
+            })
+        })
+    }
+    private fun getConsultTypeAllData(){
+        launch({
+            handleRequest(MineRepository.getConsultTypeData(""), successBlock = {
+                it.result?.let { it1 -> consultTypeAllList.emit(it1) }
+            })
+        })
+    }
+    private fun getFirstMonthList(){
+        launch(false, {
+            firstMonthList.emit(DateUtil.getFirstMonthList())
+        })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/CustomSchedulingViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/CustomSchedulingViewModel.kt
new file mode 100644
index 0000000..8cdd4b9
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/CustomSchedulingViewModel.kt
@@ -0,0 +1,68 @@
+package com.yxjk.healthexpertclient.ui.mine.viewmodel
+
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.yxjk.healthexpertclient.bean.mine.SchedulingBean
+import com.yxjk.healthexpertclient.data.repository.MineRepository
+import kotlinx.coroutines.flow.MutableStateFlow
+
+class CustomSchedulingViewModel: BaseViewModel() {
+    var schedulingList = MutableStateFlow(mutableListOf<SchedulingBean>())
+    var tfJumpHoliday = MutableStateFlow(true)
+    var showAudioVideoConsult = MutableStateFlow(true)
+    override fun init() {
+        getSchedulingList()
+    }
+    fun getSchedulingList() {
+        launch({
+            handleRequest(
+                MineRepository.getDoctorScheduling(), successBlock = {
+                    it.result?.let {result ->
+                        if(result.list.isNullOrEmpty()){
+                            schedulingList.emit(getWeekList())
+                        }else{
+                            schedulingList.emit(result.list!!)
+                            tfJumpHoliday.emit("1" == result.tfJumpHoliday)
+                        }
+                    }
+                }
+            )
+        })
+    }
+
+    private fun getWeekList(): MutableList<SchedulingBean> {
+        var list = mutableListOf<SchedulingBean>()
+        var appraiseBean: SchedulingBean
+        for (week in 1..7) {
+            appraiseBean = SchedulingBean()
+            appraiseBean.week = week.toString()
+            list.add(appraiseBean)
+        }
+        return list
+    }
+    fun createDoctorScheduling(){
+        launch({
+            affirmAppointmentNum()
+            handleRequest(
+                MineRepository.createDoctorScheduling(schedulingList.value, tfJumpHoliday.value, showAudioVideoConsult.value, true), successBlock = {
+                    toastMessage.emit(it.message)
+                }
+            )
+        })
+    }
+    private fun affirmAppointmentNum(): MutableList<SchedulingBean>{
+        if(schedulingList.value.isNullOrEmpty()){
+            return mutableListOf()
+        }
+        for (schedulingBean in schedulingList.value){
+            if(!schedulingBean.consultSwitchOn){
+                schedulingBean.amNum = "0"
+                schedulingBean.pmNum = "0"
+            }
+            schedulingBean.tfJumpHoliday = if(tfJumpHoliday.value) "1" else "0"
+            schedulingBean.tfDefault = "1"
+        }
+        return schedulingList.value
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/EditPasswordViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/EditPasswordViewModel.kt
new file mode 100644
index 0000000..b83012a
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/EditPasswordViewModel.kt
@@ -0,0 +1,60 @@
+package com.yxjk.healthexpertclient.ui.mine.viewmodel
+
+import com.btpj.lib_base.BaseApp.Companion.appContext
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.encrypt
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.data.repository.MineRepository
+import com.yxjk.healthexpertclient.utils.CommonUtils
+import com.yxjk.healthexpertclient.utils.ConstantUtils
+import kotlinx.coroutines.flow.MutableStateFlow
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/22 17:05
+ * @description
+ */
+class EditPasswordViewModel: BaseViewModel() {
+    var oldPassword = MutableStateFlow("")
+    var newPassword = MutableStateFlow("")
+    var confirmPassword = MutableStateFlow("")
+    override fun init() {
+    }
+    fun submitEditPassword(successCall: () -> Unit = {}){
+        launch({
+            if(oldPassword.value.isNullOrEmpty()){
+                exception.value = Exception(appContext.getString(R.string.edit_password_old_password_title_hint))
+                return@launch
+            }
+            if(newPassword.value.isNullOrEmpty()){
+                exception.value = Exception(appContext.getString(R.string.edit_password_new_password_title_hint))
+                return@launch
+            }
+            if (newPassword.value.length < 12 || newPassword.value.length > 32 || !CommonUtils.isPasswordMatches(newPassword.value)){
+                exception.value = Exception(appContext.getString(R.string.edit_password_matches_hint))
+                return@launch
+            }
+            if(confirmPassword.value.isNullOrEmpty()){
+                exception.value = Exception(appContext.getString(R.string.edit_password_affirm_password_title_hint))
+                return@launch
+            }
+            if(newPassword.value != confirmPassword.value){
+                exception.value = Exception(appContext.getString(R.string.edit_password_affirm_password_diff_hint))
+                return@launch
+            }
+            CommonUtils.getUserInfo()?.let { userInfo ->
+                handleRequest(MineRepository.editPassword(
+                    userInfo.username,
+                    oldPassword.value.encrypt(ConstantUtils.RSA_PUBLIC_KEY),
+                    newPassword.value.encrypt(ConstantUtils.RSA_PUBLIC_KEY),
+                    confirmPassword.value.encrypt(ConstantUtils.RSA_PUBLIC_KEY)), successBlock = {
+                    toastMessage.emit(it.message)
+                    successCall.invoke()
+                })
+            }
+
+        })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/GoodAtDiseaseViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/GoodAtDiseaseViewModel.kt
new file mode 100644
index 0000000..8bb3ce3
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/GoodAtDiseaseViewModel.kt
@@ -0,0 +1,38 @@
+package com.yxjk.healthexpertclient.ui.mine.viewmodel
+
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.yxjk.healthexpertclient.bean.mine.DiseaseBean
+import com.yxjk.healthexpertclient.data.repository.MineRepository
+import kotlinx.coroutines.flow.MutableStateFlow
+
+/**
+ * @author nanfeifei
+ * @time 2023/6/25 18:05
+ * @description
+ */
+class GoodAtDiseaseViewModel: BaseViewModel() {
+    var allDiseaseList = MutableStateFlow(mutableListOf<DiseaseBean>())
+
+    override fun init() {
+
+    }
+    fun getDoctorGoodAtDisease(departmentId: String, currentDiseaseList: ArrayList<DiseaseBean>){
+        launch({
+            handleRequest(MineRepository.getDoctorGoodAtDisease(departmentId), successBlock = {
+                it.result?.let { it1 -> allDiseaseList.emit(checkedDefaultItem(it1, currentDiseaseList)) }
+            })
+        })
+    }
+    private fun checkedDefaultItem(allDiseaseList: MutableList<DiseaseBean>, currentDiseaseList: ArrayList<DiseaseBean>): MutableList<DiseaseBean>{
+        allDiseaseList.forEach {
+            currentDiseaseList.forEach { currentDisease ->
+                if (it.id == currentDisease.id){
+                    it.checked = true
+                }
+            }
+        }
+        return allDiseaseList
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/MineViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/MineViewModel.kt
new file mode 100644
index 0000000..6ca1dda
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/MineViewModel.kt
@@ -0,0 +1,28 @@
+package com.yxjk.healthexpertclient.ui.mine.viewmodel
+
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.yxjk.healthexpertclient.data.repository.MineRepository
+import kotlinx.coroutines.flow.MutableSharedFlow
+
+class MineViewModel: BaseViewModel() {
+    var isCustomScheduling = MutableSharedFlow<Boolean>()
+    override fun init() {
+
+    }
+    @Deprecated("排班已整合不再区分自定义还是统一，所以不再需要判断进入不同页面")
+    fun getSchedulingType() {
+        launch({
+            handleRequest(
+                MineRepository.getDoctorScheduling(), successBlock = {
+                    it.result?.let {result ->
+                        isCustomScheduling.emit("1" == result.tfDefault)
+                    }
+
+                }
+            )
+        })
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/PersonInfoViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/PersonInfoViewModel.kt
new file mode 100644
index 0000000..af7ba07
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/PersonInfoViewModel.kt
@@ -0,0 +1,89 @@
+package com.yxjk.healthexpertclient.ui.mine.viewmodel
+
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.yxjk.healthexpertclient.bean.mine.DiseaseBean
+import com.yxjk.healthexpertclient.bean.mine.DoctorBean
+import com.yxjk.healthexpertclient.data.repository.MineRepository
+import com.yxjk.healthexpertclient.event.DoctorEvent
+import kotlinx.coroutines.flow.MutableStateFlow
+import org.greenrobot.eventbus.EventBus
+import java.io.File
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/22 19:33
+ * @description
+ */
+class PersonInfoViewModel : BaseViewModel() {
+    var doctorBean = MutableStateFlow(DoctorBean())
+    var diseaseList = MutableStateFlow(mutableListOf<DiseaseBean>())
+    override fun init() {
+        getDoctorInfo()
+    }
+
+    fun uploadFile(path: String) {
+        launch({
+            handleRequest(
+                MineRepository.uploadFile(File(path)), successBlock = {
+                    it.result?.let { result ->
+                        uploadHeadImage(result.url)
+                    }
+                }
+            )
+        })
+    }
+    fun uploadHeadImage(url: String){
+        launch({
+            handleRequest(
+                MineRepository.uploadHeadImage(url), successBlock = {
+                    toastMessage.emit(it.message)
+                    EventBus.getDefault().post(DoctorEvent())
+                }
+            )
+        })
+    }
+
+    fun getDoctorInfo() {
+        launch({
+            handleRequest(MineRepository.getDoctorInfo(), successBlock = {
+                it.result?.let { result ->
+                    doctorBean.emit(result)
+                    result.goodAtSicknessName?.let { it1 -> diseaseList.emit(it1) }
+                }
+            })
+        })
+    }
+    @Deprecated("之前返回的是疾病名称字符串，现在已改成集合")
+    private fun getDiseaseList(diseaseStr: String?) {
+        if (diseaseStr.isNullOrEmpty()) {
+            return
+        }
+        launch(false, {
+            var list = diseaseStr.split(",")
+//            diseaseList.emit(list.toMutableList())
+        })
+    }
+
+
+    fun savePersonInfo() {
+        launch({
+            doctorBean.value.goodAtSickness = diseaseListToStr(diseaseList.value)
+            handleRequest(MineRepository.editDoctorInfo(doctorBean.value), successBlock = {
+                toastMessage.emit(it.message)
+            })
+        })
+    }
+
+    private fun diseaseListToStr(list: MutableList<DiseaseBean>): String {
+        var diseaseStr = ""
+        list.forEachIndexed { index, diseaseBean ->
+            diseaseStr += diseaseBean.id
+            if (index < list.size - 1){
+                diseaseStr +=  ","
+            }
+        }
+        return diseaseStr
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/SchedulingViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/SchedulingViewModel.kt
new file mode 100644
index 0000000..674dc97
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/SchedulingViewModel.kt
@@ -0,0 +1,92 @@
+package com.yxjk.healthexpertclient.ui.mine.viewmodel
+
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.yxjk.healthexpertclient.bean.mine.SchedulingBean
+import com.yxjk.healthexpertclient.data.repository.MineRepository
+import kotlinx.coroutines.flow.MutableStateFlow
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/16 14:25
+ * @description
+ */
+class SchedulingViewModel : BaseViewModel() {
+    var schedulingList = MutableStateFlow(mutableListOf<SchedulingBean>())
+    var tfJumpHoliday = MutableStateFlow(true)
+    var showAudioVideoConsult = MutableStateFlow(true)
+    var amMaxNum = MutableStateFlow("0")
+    var pmMaxNum = MutableStateFlow("0")
+    override fun init() {
+        getSchedulingList()
+    }
+
+    fun getSchedulingList() {
+        launch({
+            handleRequest(
+                MineRepository.getDoctorScheduling(), successBlock = {
+                    it.result?.let {result ->
+                        if(result.list.isNullOrEmpty()){
+                            schedulingList.emit(getWeekList())
+                        }else{
+                            schedulingList.emit(result.list!!)
+//                            result.list!![0].amNum?.let { it1 -> amMaxNum.emit(it1) }
+//                            result.list!![0].pmNum?.let { it1 -> pmMaxNum.emit(it1) }
+                            tfJumpHoliday.emit("1" == result.tfJumpHoliday)
+                            showAudioVideoConsult.emit("1" == result.audioStatus)
+                        }
+                    }
+
+                }
+            )
+        })
+    }
+
+    private fun getWeekList(): MutableList<SchedulingBean> {
+        var list = mutableListOf<SchedulingBean>()
+        var appraiseBean: SchedulingBean
+        for (week in 1..7) {
+            appraiseBean = SchedulingBean()
+            appraiseBean.week = week.toString()
+            list.add(appraiseBean)
+        }
+        return list
+    }
+    fun createDoctorScheduling(){
+        launch({
+            setAppointmentNum()
+            handleRequest(
+                MineRepository.createDoctorScheduling(schedulingList.value, tfJumpHoliday.value, showAudioVideoConsult.value, false), successBlock = {
+                    toastMessage.emit(it.message)
+                    getSchedulingList()
+                }
+            )
+        })
+    }
+    private fun setAppointmentNum(): MutableList<SchedulingBean>{
+        if(schedulingList.value.isNullOrEmpty()){
+            return mutableListOf()
+        }
+        for (schedulingBean in schedulingList.value){
+//            schedulingBean.amNum = amMaxNum.value
+//            schedulingBean.pmNum = pmMaxNum.value
+            if (schedulingBean.amNum.isNullOrEmpty()){
+                schedulingBean.amNum = "0"
+            }
+            if (schedulingBean.pmNum.isNullOrEmpty()){
+                schedulingBean.pmNum = "0"
+            }
+            if (schedulingBean.amNum!!.toInt() > 0 && schedulingBean.pmNum!!.toInt() > 0){
+                schedulingBean.type = "2"
+            }else if (schedulingBean.amNum!!.toInt() > 0){
+                schedulingBean.type = "0"
+            }else if (schedulingBean.pmNum!!.toInt() > 0){
+                schedulingBean.type = "1"
+            }
+            schedulingBean.tfJumpHoliday = if(tfJumpHoliday.value) "1" else "0"
+            schedulingBean.tfDefault = "0"
+        }
+        return schedulingList.value
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/SettingViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/SettingViewModel.kt
new file mode 100644
index 0000000..30aadc2
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/SettingViewModel.kt
@@ -0,0 +1,14 @@
+package com.yxjk.healthexpertclient.ui.mine.viewmodel
+
+import com.btpj.lib_base.base.BaseViewModel
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/23 16:05
+ * @description
+ */
+class SettingViewModel: BaseViewModel() {
+    override fun init() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/SuspensionServiceViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/SuspensionServiceViewModel.kt
new file mode 100644
index 0000000..98a825c
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/SuspensionServiceViewModel.kt
@@ -0,0 +1,55 @@
+package com.yxjk.healthexpertclient.ui.mine.viewmodel
+
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.yxjk.healthexpertclient.bean.mine.SuspensionServiceBean
+import com.yxjk.healthexpertclient.data.repository.MineRepository
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+
+class SuspensionServiceViewModel: BaseViewModel() {
+    var suspensionServiceList = MutableStateFlow<MutableList<SuspensionServiceBean>?>(null)
+    var pageIndex = MutableStateFlow(1)
+    var isRefreshing = MutableStateFlow(false)
+    var isLoadMoreEnd = MutableSharedFlow<Boolean>()
+    private val pageSize = 20
+    override fun init() {
+        getSuspensionServiceList(true)
+    }
+    fun getSuspensionServiceList(isRefresh: Boolean){
+        launch(tryBlock = {
+            if(isRefresh){
+                isRefreshing.emit(true)
+                isLoadMoreEnd.emit(false)
+                pageIndex.emit(1)
+            }
+            handleRequest(MineRepository.getSuspensionServiceList(pageIndex.value, pageSize), successBlock = {
+                if(it.result == null){
+                    isLoadMoreEnd.emit(true)
+                    suspensionServiceList.emit(mutableListOf())
+                }else{
+                    if(it.result!!.records.isNullOrEmpty()){
+                        isLoadMoreEnd.emit(true)
+                        suspensionServiceList.emit(mutableListOf())
+                    }else{
+                        suspensionServiceList.emit(it.result!!.records)
+                        pageIndex.value++
+                        if(it.result!!.records.size < pageSize){
+                            isLoadMoreEnd.emit(true)
+                        }
+                    }
+                }
+            })
+        }, finallyBlock = {
+            isRefreshing.emit(false)
+        })
+    }
+    fun editSuspensionAnnouncement(recordId: String){
+        launch({
+            handleRequest(MineRepository.stopSuspensionService(recordId), successBlock = {
+                getSuspensionServiceList(true)
+            })
+        })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/WithDrawViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/WithDrawViewModel.kt
new file mode 100644
index 0000000..532e935
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/mine/viewmodel/WithDrawViewModel.kt
@@ -0,0 +1,28 @@
+package com.yxjk.healthexpertclient.ui.mine.viewmodel
+
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.yxjk.healthexpertclient.bean.mine.BillRecordBean
+import com.yxjk.healthexpertclient.data.repository.MineRepository
+import kotlinx.coroutines.flow.MutableStateFlow
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/22 16:18
+ * @description
+ */
+class WithDrawViewModel: BaseViewModel() {
+    var recordId = MutableStateFlow(0)
+    var billRecordBean = MutableStateFlow(BillRecordBean())
+    override fun init() {
+
+    }
+    fun  getWithDrawDetail(){
+        launch({
+            handleRequest(MineRepository.getBillDetail(recordId.value.toString()), successBlock = {
+                it.result?.let { result -> billRecordBean.emit(result) }
+            })
+        })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/other/SimulateUserActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/other/SimulateUserActivity.kt
new file mode 100644
index 0000000..e10623a
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/other/SimulateUserActivity.kt
@@ -0,0 +1,144 @@
+package com.yxjk.healthexpertclient.ui.other
+
+import android.os.Bundle
+import android.view.View
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import com.btpj.lib_base.data.local.DataStoreManager
+import com.btpj.lib_base.ext.getEmptyView
+import com.btpj.lib_base.ext.initColors
+import com.btpj.lib_base.ext.jsonToBean
+import com.buddy.kredit.android.base.BaseActivity
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.listener.OnItemClickListener
+import com.google.gson.Gson
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.UserInfoBean
+import com.yxjk.healthexpertclient.bean.other.UserListBean
+import com.yxjk.healthexpertclient.databinding.ActivityMessageListBinding
+import com.yxjk.healthexpertclient.databinding.ActivitySumilateBinding
+import com.yxjk.healthexpertclient.ui.workbench.adapter.MessageListAdapter
+import com.yxjk.healthexpertclient.ui.workbench.viewmodel.MessageListViewModel
+import com.yxjk.healthexpertclient.utils.CommonUtils
+import com.yxjk.healthexpertclient.utils.orEmptyDefault
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+/**
+ * @author nanfeifei
+ * @time 2023/7/17 16:20
+ * @description
+ */
+class SimulateUserActivity: BaseActivity<SimulateUserViewModel, ActivitySumilateBinding>(R.layout.activity_sumilate),
+    SwipeRefreshLayout.OnRefreshListener, OnItemClickListener {
+    private val mAdapter: UserListAdapter = UserListAdapter()
+    var userName=""
+    override fun initView(savedInstanceState: Bundle?) {
+        mBinding.apply {
+            val linearLayoutManager = LinearLayoutManager(this@SimulateUserActivity
+            )
+            rvList.layoutManager = linearLayoutManager
+            csvSearch.initView("请输入模拟用户账号")
+            csvSearch.setOnSearchClickListener {
+                userName=it
+                onRefresh()
+            }
+
+            btnReset.setOnClickListener {
+                var bean2=DataStoreManager.getUserInfo2().jsonToBean(UserInfoBean::class.java)
+                CommonUtils.saveUserInfo(bean2)
+                mViewModel.restore()
+            }
+        }
+    }
+
+    override fun initData() {
+        super.initData()
+        mViewModel.fakeUser(){}
+    }
+    override fun createObserve() {
+        super.createObserve()
+        mBinding.apply {
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.userList.collectLatest { list ->
+                        list?.let {
+                            mAdapter.setNewInstance(list.records)
+                            mAdapter.notifyDataSetChanged()
+                            if (rvList.adapter == null) {
+                                mAdapter.setEmptyView(rvList.getEmptyView())
+                                mAdapter.setOnItemClickListener(this@SimulateUserActivity)
+//                                initLoadMore()
+                                rvList.adapter = mAdapter
+                            }
+                        }
+                    }
+                }
+            }
+
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.isSimuLateState.collectLatest { state ->
+                        if (state){
+                            mViewModel.fakeUser(){bean->
+                                var bean2= CommonUtils.getUserInfo()
+                                DataStoreManager.saveUserInfo2(Gson().toJson(bean2))
+                                bean2?.id=bean.id
+                                bean2?.orgCode=bean.orgCode
+//                                bean2?.birthday=bean.birthday
+                                bean2?.phone=bean.phone
+                                bean2?.idCard=bean.idCard
+//                            bean2?.workNo=bean.workNo
+                                if (bean2 != null) {
+                                    CommonUtils.saveUserInfo(bean2)
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.isResetState.collectLatest { state ->
+                        if (state){
+                            mBinding.tvUserName.text="当前模拟的用户:"
+                        }
+                    }
+                }
+            }
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.userBean.collectLatest { bean ->
+                        if (bean!=null&&bean.isReal){
+//                            mBinding.llUser.visibility=View.VISIBLE
+                            mBinding.tvUserName.text="当前模拟的用户:"+bean.realname.orEmptyDefault()
+                        }else{
+//                            mBinding.llUser.visibility=View.GONE
+                            mBinding.tvUserName.text="当前模拟的用户:--"
+                        }
+                    }
+                }
+            }
+        }
+    }
+    override fun bindEvent() {
+
+    }
+    private fun initLoadMore() {
+        mAdapter.loadMoreModule.setOnLoadMoreListener {  }
+        mAdapter.loadMoreModule.isAutoLoadMore = true
+        //当自动加载开启，同时数据不满一屏时，是否继续执行自动加载更多(默认为true)
+        mAdapter.loadMoreModule.isEnableLoadMoreIfNotFullPage = false
+    }
+    override fun onRefresh() {
+        mViewModel.getMessageList(userName)
+    }
+
+    override fun onItemClick(adapter: BaseQuickAdapter<*, *>, view: View, position: Int) {
+        var bean=mAdapter?.getItem(position) as UserListBean.RecordsDTO
+        mViewModel.simulateUser(bean.id)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/other/SimulateUserViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/other/SimulateUserViewModel.kt
new file mode 100644
index 0000000..8b58ec3
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/other/SimulateUserViewModel.kt
@@ -0,0 +1,104 @@
+package com.yxjk.healthexpertclient.ui.other
+
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.data.local.DataStoreManager
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.yxjk.healthexpertclient.bean.other.UserListBean
+import com.yxjk.healthexpertclient.bean.workbench.MessageBean
+import com.yxjk.healthexpertclient.data.repository.OtherRepository
+import com.yxjk.healthexpertclient.data.repository.WorkbenchRepository
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+
+/**
+ * @author nanfeifei
+ * @time 2023/7/17 16:19
+ * @description
+ */
+class SimulateUserViewModel: BaseViewModel() {
+    var userList = MutableSharedFlow<UserListBean>()
+    var userBean = MutableSharedFlow<UserListBean.RecordsDTO>()
+    var pageIndex = MutableStateFlow(1)
+    var isRefreshing = MutableStateFlow(false)
+    var isSimuLateState = MutableSharedFlow<Boolean>()
+    var isResetState = MutableStateFlow(false)
+    var isLoadMoreEnd = MutableSharedFlow<Boolean>()
+    var tokenOverdue = MutableSharedFlow<Boolean>()
+    private val pageSize = 20
+    override fun init() {
+        getMessageList("")
+    }
+    fun getMessageList(username: String){
+        launch(tryBlock = {
+            handleRequest(OtherRepository.getList(username), successBlock = {
+                if(it.result == null){
+
+                }else{
+                    userList.emit(it.result!!)
+                }
+            })
+        }, finallyBlock = {
+            isRefreshing.emit(false)
+        })
+    }
+
+    fun simulateUser(userid: String){
+        launch(tryBlock = {
+            handleRequest(OtherRepository.simulateUser(userid), successBlock = {
+                if (it.result == true){
+                    isSimuLateState.emit(true)
+                }else{
+                    isSimuLateState.emit(false)
+                }
+            })
+        }, finallyBlock = {
+            isRefreshing.emit(false)
+        })
+    }
+    fun fakeUser(method:(bean:UserListBean.RecordsDTO)->Unit){
+        launch(tryBlock = {
+            handleRequest(OtherRepository.fakeUser(), successBlock = {
+                if (it.result !=null){
+                    it.result!!.isReal=true
+                    method(it.result!!)
+                    userBean.emit(it.result!!)
+                }else{
+                    userBean.emit(UserListBean.RecordsDTO())
+                }
+            })
+        }, finallyBlock = {
+            isRefreshing.emit(false)
+        })
+    }
+    fun restore(){
+        launch(tryBlock = {
+            handleRequest(OtherRepository.restore(), successBlock = {
+                if (it.result == true){
+                    isResetState.emit(true)
+                }else{
+                    isResetState.emit(false)
+                }
+            })
+        }, finallyBlock = {
+            isRefreshing.emit(false)
+        })
+    }
+
+    /**
+     * token有效性
+     */
+    fun selectTokenExpire() {
+        launch(
+            {
+                handleRequest(
+                    OtherRepository.selectTokenExpire(DataStoreManager.getToken()),
+                    successBlock = {
+                        it.result?.let { result ->
+                            tokenOverdue.emit(result)
+                        }
+                    })
+            }
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/other/UserListAdapter.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/other/UserListAdapter.kt
new file mode 100644
index 0000000..f64f334
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/other/UserListAdapter.kt
@@ -0,0 +1,34 @@
+package com.yxjk.healthexpertclient.ui.other
+
+import com.btpj.lib_base.base.adapter.BaseDataBindingAdapter
+import com.btpj.lib_base.ext.loadRoundedImage
+import com.chad.library.adapter.base.module.LoadMoreModule
+import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.other.UserListBean
+import com.yxjk.healthexpertclient.bean.workbench.MessageBean
+import com.yxjk.healthexpertclient.databinding.ItemRecycleMessageBinding
+import com.yxjk.healthexpertclient.databinding.ItemUserListBinding
+
+/**
+ * @author nanfeifei
+ * @time 2023/7/17 16:40
+ * @description
+ */
+class UserListAdapter: BaseDataBindingAdapter<UserListBean.RecordsDTO, ItemUserListBinding>(
+    R.layout.item_user_list
+) {
+
+    override fun convert(
+        holder: BaseDataBindingHolder<ItemUserListBinding>,
+        item: UserListBean.RecordsDTO
+    ) {
+        val mBinding = holder.dataBinding
+        mBinding?.let {
+            it.tvAccount.text=item.username
+            it.tvName.text=item.realname
+            it.tvClass.text=item.sex_dictText
+            it.ivHead.loadRoundedImage(item.avatar,5.0f)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/ArchivesDetailActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/ArchivesDetailActivity.kt
new file mode 100644
index 0000000..7333bd0
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/ArchivesDetailActivity.kt
@@ -0,0 +1,142 @@
+package com.yxjk.healthexpertclient.ui.workbench
+
+import android.os.Bundle
+import android.view.View
+import androidx.core.view.ViewCompat
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.GridLayoutManager
+import com.buddy.kredit.android.base.BaseActivity
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.listener.OnItemClickListener
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.ImageBean
+import com.yxjk.healthexpertclient.bean.workbench.ConsultInfoBean
+import com.yxjk.healthexpertclient.databinding.ActivityArchivesDetailBinding
+import com.yxjk.healthexpertclient.ext.startBigImageActivity
+import com.yxjk.healthexpertclient.ui.main.adapter.ImageAdapter
+import com.yxjk.healthexpertclient.ui.workbench.viewmodel.ArchivesDetailViewModel
+import com.yxjk.healthexpertclient.utils.CommonUtils
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/4 18:50
+ * @description 档案详情
+ */
+class ArchivesDetailActivity :
+    BaseActivity<ArchivesDetailViewModel, ActivityArchivesDetailBinding>(R.layout.activity_archives_detail),
+    OnItemClickListener {
+    companion object {
+        const val maxImageNum = 9
+    }
+
+    private val imageAdapter by lazy { ImageAdapter(maxImageNum) }
+    private var archivesId: String = ""
+    override fun transparentStatusBar(): Boolean {
+        return true
+    }
+
+    override fun initView(savedInstanceState: Bundle?) {
+        archivesId = intent.extras?.getString("archivesId") ?: ""
+        mBinding.apply {
+            val gridLayoutManager = GridLayoutManager(this@ArchivesDetailActivity, 5)
+            layInspectionReport.rvList.layoutManager = gridLayoutManager
+            imageAdapter.setOnItemClickListener(this@ArchivesDetailActivity)
+            mBinding.layInspectionReport.rvList.adapter = imageAdapter
+            ViewCompat.setNestedScrollingEnabled(layInspectionReport.rvList, false)
+        }
+    }
+
+    override fun createObserve() {
+        super.createObserve()
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.CREATED) {
+                mViewModel.consultantBean.collectLatest {
+                    setConsultantInfo(it)
+                }
+            }
+        }
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.CREATED) {
+                mViewModel.imageList.collectLatest {
+                    if(it.isNullOrEmpty()){
+                        mBinding.layInspectionReport.root.visibility = View.GONE
+                    }else{
+                        mBinding.layInspectionReport.root.visibility = View.VISIBLE
+                        mBinding.layInspectionReport.tvImageNum.text = getString(
+                            R.string.archives_detail_question_image_list_num,
+                            it.size,
+                            maxImageNum
+                        )
+                        imageAdapter.setList(it)
+                    }
+
+                }
+            }
+        }
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.CREATED) {
+                mViewModel.answer.collectLatest {
+                    mBinding.viewBaseHealthyInfo.visibility =
+                        if (it.isNullOrEmpty()) View.GONE else View.VISIBLE
+                    mBinding.viewBaseHealthyInfo.setData(it)
+                }
+            }
+        }
+    }
+
+    override fun initData() {
+        super.initData()
+        mViewModel.getArchivesDetail(archivesId)
+    }
+
+    private fun setConsultantInfo(consultInfoBean: ConsultInfoBean?) {
+        consultInfoBean?.let {
+            mBinding.apply {
+                stvConsultPeopleInfo.setLeftTopString(
+                    getString(
+                        R.string.consult_information_consult_people_name,
+                        consultInfoBean.name
+                    )
+                )
+                stvConsultPeopleInfo.setCenterTopString(
+                    getString(
+                        R.string.consult_information_consult_people_gender,
+                        CommonUtils.getGenderText(consultInfoBean.gender)
+                    )
+                )
+                stvConsultPeopleInfo.setRightTopString(
+                    getString(
+                        R.string.consult_information_consult_people_age,
+                        consultInfoBean.age
+                    )
+                )
+                stvConsultPeopleInfo.setLeftBottomString(
+                    getString(
+                        R.string.consult_information_consult_people_height,
+                        if (consultInfoBean.height.isNullOrEmpty()) getString(R.string.string_empty) else consultInfoBean.height
+                    )
+                )
+                stvConsultPeopleInfo.setCenterBottomString(
+                    getString(
+                        R.string.consult_information_consult_people_weight,
+                        if (consultInfoBean.weight.isNullOrEmpty()) getString(R.string.string_empty) else consultInfoBean.weight
+                    )
+                )
+            }
+        }
+    }
+
+    override fun bindEvent() {
+    }
+
+    override fun onItemClick(adapter: BaseQuickAdapter<*, *>, view: View, position: Int) {
+        var bean = adapter.getItem(position) as ImageBean
+        bean?.let {
+            startBigImageActivity(bean.imageUrl)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/AudioVideoConsultActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/AudioVideoConsultActivity.kt
new file mode 100644
index 0000000..11c2cc1
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/AudioVideoConsultActivity.kt
@@ -0,0 +1,254 @@
+package com.yxjk.healthexpertclient.ui.workbench
+
+import android.os.Bundle
+import android.view.View
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.btpj.lib_base.utils.ToastUtil
+import com.buddy.kredit.android.base.BaseActivity
+import com.github.gzuliyujiang.wheelpicker.annotation.DateMode
+import com.github.gzuliyujiang.wheelpicker.entity.DateEntity
+import com.github.gzuliyujiang.wheelpicker.entity.DatimeEntity
+import com.github.gzuliyujiang.wheelpicker.entity.TimeEntity
+import com.github.gzuliyujiang.wheelpicker.impl.UnitDateFormatter
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.workbench.ConsultDetailBean
+import com.yxjk.healthexpertclient.databinding.ActivityConsultWaitConfirmBinding
+import com.yxjk.healthexpertclient.ext.dayOnAfter
+import com.yxjk.healthexpertclient.ext.groupCall
+import com.yxjk.healthexpertclient.ext.target
+import com.yxjk.healthexpertclient.ui.workbench.viewmodel.AudioVideoConsultViewModel
+import com.yxjk.healthexpertclient.view.ConsultInformationView
+import com.yxjk.healthexpertclient.view.DateTimeRangePicker
+import com.yxjk.healthexpertclient.view.RefuseExplainDialog
+import com.yxjk.healthexpertclient.view.TextViewDialog
+import com.tencent.qcloud.tuikit.TUICommonDefine
+import com.tencent.qcloud.tuikit.tuicallkit.event.CallBackEvent
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/5 9:26
+ * @description 音视频咨询详情
+ */
+class AudioVideoConsultActivity :
+    BaseActivity<AudioVideoConsultViewModel, ActivityConsultWaitConfirmBinding>(R.layout.activity_consult_wait_confirm) {
+    private val refuseExplainDialog by lazy { RefuseExplainDialog(this) }
+    private val dateTimeRangePicker: DateTimeRangePicker by lazy { DateTimeRangePicker(this) }
+    private val consultFinishDialog by lazy { TextViewDialog(this) }
+    var appointmentData: DatimeEntity = DatimeEntity.now()
+    companion object{
+        const val ACCEPT_APPOINTMENT_DATE_RANGE_ADD_DAY = 2
+        const val AGAIN_APPOINTMENT_DATE_RANGE_ADD_DAY = 6
+    }
+    override fun transparentStatusBar(): Boolean {
+        return true
+    }
+
+
+    override fun initView(savedInstanceState: Bundle?) {
+        val recordId = intent.extras?.getString("recordId") ?: ""
+        lifecycleScope.launch {
+            mViewModel.recordId.emit(recordId)
+        }
+    }
+
+    override fun createObserve() {
+        super.createObserve()
+        mBinding.apply {
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.consultDetailBean.collectLatest {
+                        setConsultInfo(it)
+                    }
+                }
+            }
+        }
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.CREATED) {
+                mViewModel.reasonList.collect {
+                    if (it.isNullOrEmpty()) {
+                        return@collect
+                    }
+                    refuseExplainDialog.setSpinnerData(it)
+                    refuseExplainDialog.show()
+                }
+            }
+        }
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.CREATED) {
+                mViewModel.physicalExaminationReportBean.collect {
+                    mBinding.viewConsultInformation.setPhysicalExaminationReport(it)
+                }
+            }
+        }
+    }
+
+    private fun setConsultInfo(consultDetailBean: ConsultDetailBean?) {
+        mBinding.apply {
+            consultDetailBean?.let { consultDetailBean ->
+                var consultRecordBean = consultDetailBean.conSession
+                consultRecordBean?.let {
+                    appointmentData.date = appointmentData.date.target(consultRecordBean.sessionDateLong ?: System.currentTimeMillis())
+                    var consultStatus = consultRecordBean.contentStatus
+                    when (consultStatus) {
+                        ConsultInformationView.ConsultStatus.WAIT_CONFIRM.status.toString() -> {
+                            clOperateLay.visibility = View.VISIBLE
+                            btnStart.visibility = View.GONE
+                        }
+
+                        ConsultInformationView.ConsultStatus.WAIT_START.status.toString()-> {
+                            clOperateLay.visibility = View.GONE
+                            btnStart.visibility = View.VISIBLE
+                        }
+                        ConsultInformationView.ConsultStatus.IN_CONSULTATION.status.toString()-> {
+                            clOperateLay.visibility = View.GONE
+                            btnStart.visibility = View.VISIBLE
+                        }
+
+                        ConsultInformationView.ConsultStatus.FINISH.status.toString() -> {
+                            clOperateLay.visibility = View.GONE
+                            btnStart.visibility = View.GONE
+                        }
+
+                        ConsultInformationView.ConsultStatus.REFUSE.status.toString() -> {
+                            clOperateLay.visibility = View.GONE
+                            btnStart.visibility = View.GONE
+                        }
+                        else ->{
+                            clOperateLay.visibility = View.GONE
+                            btnStart.visibility = View.GONE
+                        }
+                    }
+                    viewConsultInformation.setData(
+                        consultDetailBean,
+                        ConsultInformationView.ConsultType.AUDIO_AND_VIDEO
+                    )
+                }
+
+            }
+
+        }
+    }
+
+    override fun bindEvent() {
+
+        refuseExplainDialog.setOnSubmitClickListener(object :
+            RefuseExplainDialog.OnSubmitClickListener {
+            override fun onSubmitClick(
+                viewDialog: RefuseExplainDialog,
+                reasonType: String,
+                reasonExplain: String
+            ) {
+                mViewModel.refusalAudioVideoCall(reasonType, reasonExplain)
+            }
+
+            override fun onCloseClick(viewDialog: RefuseExplainDialog) {
+
+            }
+        })
+        addClickViews(mBinding.btnRefuse, mBinding.btnAccept, mBinding.btnStart)
+    }
+
+    private fun showDateTimeRangePicker(startData: DatimeEntity, endData: DatimeEntity, successCall: (Long, Long) -> Unit) {
+        dateTimeRangePicker.setBackgroundResource(R.drawable.rectangle_top_round_corner20_white)
+        dateTimeRangePicker.setTitle(R.string.consult_wait_confirm_dialog_date_time_range_title)
+        var wheelLayout = dateTimeRangePicker.wheelLayout
+        wheelLayout.setDateFormatter(UnitDateFormatter())
+        wheelLayout.setDateMode(DateMode.MONTH_DAY)
+        wheelLayout.setRange(startData, endData, startData)
+        wheelLayout.setResetWhenLinkage(false, false)
+        dateTimeRangePicker.setOnDateTimeRangePickedListener(object :
+            DateTimeRangePicker.OnDateTimeRangePickedListener {
+            override fun onDateTimeRangePicked(startTime: Long, endTime: Long) {
+                successCall.invoke(startTime, endTime)
+            }
+        })
+        dateTimeRangePicker.setOnDatimePickedListener { year, month, day, hour, minute, second ->
+            var dateTimeEntity = DatimeEntity()
+            dateTimeEntity.date = DateEntity.target(year, month, day)
+            dateTimeEntity.time = TimeEntity.target(hour, minute, second)
+            ToastUtil.showShort(
+                this@AudioVideoConsultActivity,
+                "" + year + month + day + hour + minute + second
+            )
+        }
+        if (!dateTimeRangePicker.isShowing) {
+            dateTimeRangePicker.show()
+        }
+    }
+
+    override fun onClick(v: View?) {
+        super.onClick(v)
+        when (v?.id) {
+            R.id.btn_refuse -> {
+                if (mViewModel.reasonList.value.isNullOrEmpty()) {
+                    mViewModel.getRefusalAudioVideoCallReason()
+                } else {
+                    refuseExplainDialog.show()
+                }
+            }
+
+            R.id.btn_accept -> {
+                showDateTimeRangePicker(
+                    appointmentData,
+                    appointmentData.dayOnAfter(ACCEPT_APPOINTMENT_DATE_RANGE_ADD_DAY),
+                    successCall = { startTime, endTime ->
+                        mViewModel.acceptAudioVideoCall(startTime, endTime)
+                    })
+            }
+            R.id.btn_start -> {
+                mViewModel.initiateAudioVideoCall(successCall = {
+                    this@AudioVideoConsultActivity.groupCall(it.groupId, it.member, callback = object : TUICommonDefine.Callback{
+                        override fun onSuccess() {
+
+                        }
+
+                        override fun onError(errCode: Int, errMsg: String?) {
+                            ToastUtil.showShort(this@AudioVideoConsultActivity, "errCode:"+errCode+"errMsg:"+errMsg)
+                        }
+                    })
+                })
+            }
+        }
+    }
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onEvent(event: CallBackEvent) {
+        if(event == null){
+            return
+        }
+        when(event.callStatus){
+            CallBackEvent.CALL_BEGIN -> {
+                mViewModel.audioVideoCallStart()
+            }
+            CallBackEvent.CALL_END -> {
+                mViewModel.audioVideoCallEnd()
+                showConsultFinishAffirmDialog()
+            }
+        }
+    }
+    private fun showConsultFinishAffirmDialog(){
+        consultFinishDialog.setContent(getString(R.string.dialog_consult_finish_content), 13f)
+        consultFinishDialog.setBtnText(getString(R.string.dialog_consult_finish_yes), 13f)
+        consultFinishDialog.setCancelBtnText(getString(R.string.dialog_consult_finish_no), 13f)
+        consultFinishDialog.setOnAffirmClickListener(object : TextViewDialog.OnAffirmClickListener{
+            override fun onAffirmClick(viewDialog: TextViewDialog) {
+                mViewModel.finishConsult()
+            }
+
+            override fun onCancelClick(viewDialog: TextViewDialog) {
+                showDateTimeRangePicker(
+                    DatimeEntity.now(),
+                    DatimeEntity.now().dayOnAfter(AGAIN_APPOINTMENT_DATE_RANGE_ADD_DAY),
+                    successCall = { startTime, endTime ->
+                        mViewModel.againAppointmentDateTime(startTime, endTime)
+                    })
+            }
+        })
+        consultFinishDialog.show()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/BaseHealthyInformationActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/BaseHealthyInformationActivity.kt
new file mode 100644
index 0000000..8a503ca
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/BaseHealthyInformationActivity.kt
@@ -0,0 +1,44 @@
+package com.yxjk.healthexpertclient.ui.workbench
+
+import android.os.Bundle
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.buddy.kredit.android.base.BaseActivity
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.ActivityBaseHealthyInformationBinding
+import com.yxjk.healthexpertclient.ui.workbench.viewmodel.BaseHealthyInformationViewModel
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/4 15:08
+ * @description 基础健康信息
+ */
+class BaseHealthyInformationActivity: BaseActivity<BaseHealthyInformationViewModel, ActivityBaseHealthyInformationBinding>(
+    R.layout.activity_base_healthy_information) {
+    lateinit var memberId: String
+    override fun initView(savedInstanceState: Bundle?) {
+        memberId = intent.extras?.getString(" ") ?: ""
+    }
+
+    override fun createObserve() {
+        super.createObserve()
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.CREATED) {
+                mViewModel.list.collectLatest {
+                    mBinding.viewBaseHealthyInfo.setData(it)
+                }
+            }
+        }
+    }
+
+    override fun initData() {
+        super.initData()
+        mViewModel.getBaseHealthInfo(memberId)
+    }
+    override fun bindEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/BigImageActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/BigImageActivity.kt
new file mode 100644
index 0000000..a54958f
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/BigImageActivity.kt
@@ -0,0 +1,36 @@
+package com.yxjk.healthexpertclient.ui.workbench
+
+import android.os.Bundle
+import com.btpj.lib_base.ext.load
+import com.buddy.kredit.android.base.BaseActivity
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.ActivityBigImageBinding
+import com.yxjk.healthexpertclient.ui.workbench.viewmodel.BigImageViewModel
+import java.io.File
+
+/**
+ * @author nanfeifei
+ * @time 2023/8/21 18:13
+ * @description 查看图片
+ */
+class BigImageActivity: BaseActivity<BigImageViewModel, ActivityBigImageBinding>(R.layout.activity_big_image) {
+    var isFilePath=false
+    var imageUrl=""
+    override fun initView(savedInstanceState: Bundle?) {
+        var bundle = intent.extras
+        bundle?.let {
+            isFilePath=it.getBoolean("isFilePath",false)
+            imageUrl=it.getString("imageUrl").toString()
+            if (isFilePath){
+                mBinding.ivImage.load(File(imageUrl))
+            }else{
+                mBinding.ivImage.load(imageUrl)
+            }
+        }
+
+    }
+
+    override fun bindEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/CheckUpDetailActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/CheckUpDetailActivity.kt
new file mode 100644
index 0000000..3b5a61d
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/CheckUpDetailActivity.kt
@@ -0,0 +1,172 @@
+package com.yxjk.healthexpertclient.ui.workbench
+
+import android.graphics.Color
+import android.os.Bundle
+import android.view.View
+import androidx.core.view.ViewCompat
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.buddy.kredit.android.base.BaseActivity
+import com.github.mikephil.charting.charts.PieChart
+import com.github.mikephil.charting.components.Description
+import com.github.mikephil.charting.components.Legend
+import com.github.mikephil.charting.data.PieData
+import com.github.mikephil.charting.data.PieDataSet
+import com.github.mikephil.charting.data.PieEntry
+import com.github.mikephil.charting.formatter.PercentFormatter
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.workbench.CheckItemBySfzhTotalBean
+import com.yxjk.healthexpertclient.databinding.ActivityCheckUpDetailBinding
+import com.yxjk.healthexpertclient.ui.workbench.adapter.CheckUpDetailAdapter
+import com.yxjk.healthexpertclient.ui.workbench.viewmodel.CheckUpDetailViewModel
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+/**
+ * 体检详情，主要逻辑从用户端复制，只是优化了代码结构
+ * @author nanfeifei
+ */
+class CheckUpDetailActivity :
+    BaseActivity<CheckUpDetailViewModel, ActivityCheckUpDetailBinding>(R.layout.activity_check_up_detail) {
+    private val mCheckUpDetailAdapter: CheckUpDetailAdapter by lazy { CheckUpDetailAdapter() }
+    lateinit var id: String
+    lateinit var year: String
+
+
+    override fun initView(savedInstanceState: Bundle?) {
+        var manager = LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
+        mBinding.checkUpRv.layoutManager = manager
+        ViewCompat.setNestedScrollingEnabled(mBinding.checkUpRv, false)
+    }
+
+    override fun createObserve() {
+        super.createObserve()
+        mBinding.apply {
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.checkItemBySfzhTotalBean.collectLatest {
+                        it?.let {
+                            tvName.text="姓名:  ${it.userName}"
+                            tvSex.text="性别:  ${it.sex_dictText}"
+                            tvCard.text="身份证号:  ${it.card}"
+                            tvBirthday.text="出生日期:  ${it.empBirthday}"
+                            tvCity.text="居住城市:  ${it.empNativeplace}"
+                            tvPhone.text="手机号码:  ${it.mobilePhone}"
+                            tvEmail.text="电子邮件:  ${it.email}"
+                            tvTime.text="体检日期:  ${it.medicalYear}"
+                            tvHospital.text="体检医院:  ${it.hospitalName}"
+                            if (it.conclusion.isNullOrEmpty()) {
+                                mBinding.checkUpResult.visibility=View.GONE
+                            }else{
+                                mBinding.checkUpResult.visibility=View.VISIBLE
+                                mBinding.checkUpResult.setRichTextStyle(0, it.conclusion)
+                            }
+
+                            if (it.suggest.isNullOrEmpty()) {
+                                mBinding.checkUpSuggest.visibility=View.GONE
+                            }else{
+                                mBinding.checkUpSuggest.visibility=View.VISIBLE
+                                mBinding.checkUpSuggest.setRichTextStyle(1, it.suggest)
+                            }
+                            llUserInfoRoot.visibility=View.VISIBLE
+                        }
+                    }
+                }
+            }
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.checkUpList.collectLatest {
+                        mCheckUpDetailAdapter.setList(it)
+                        if (mBinding.checkUpRv.adapter == null) {
+                            mBinding.checkUpRv.adapter = mCheckUpDetailAdapter
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    override fun initData() {
+        super.initData()
+        intent.extras?.let {
+            id = it.getString("id") ?: ""
+            year = it.getString("year") ?: ""
+            mViewModel.getPhysicalExaminationReportDetail(id)
+        }
+    }
+
+    override fun bindEvent() {
+
+    }
+
+    private fun getPieChartData(bean: CheckItemBySfzhTotalBean): List<PieEntry> {
+        var mPie: MutableList<PieEntry> = mutableListOf()
+        var pieEntry1 = PieEntry(bean.normalCount.toFloat(), "正常项(${bean.normalCount})")
+        var pieEntry2 = PieEntry(bean.unusualCount.toFloat(), "异常项(${bean.unusualCount})")
+        mPie.add(pieEntry1)
+        mPie.add(pieEntry2)
+        return mPie
+    }
+
+    private fun showPieChart(pieChart: PieChart, pieList: List<PieEntry>) {
+        pieChart.visibility = View.VISIBLE
+        val dataSet = PieDataSet(pieList, "")
+        // 设置颜色list
+        dataSet.colors = arrayOf(Color.parseColor("#F6C60A"), Color.parseColor("#2CC79E")).toList()
+        val pieData = PieData(dataSet)
+
+        // 设置描述
+        val description = Description()
+        description.isEnabled = false
+        pieChart.description = description
+        //设置半透明圆环的半径, 0为透明
+        pieChart.isDrawHoleEnabled = false
+        pieChart.transparentCircleRadius = 0f
+        pieChart.setUsePercentValues(true)
+        //设置初始旋转角度
+        pieChart.rotationAngle = -12f
+        //数据连接线距图形片内部边界的距离，为百分数
+//        dataSet.valueLinePart1OffsetPercentage = 90f
+//        dataSet.valueLinePart1Length = 0.5f
+        //设置连接线的颜色
+//        dataSet.valueLineColor = Color.LTGRAY
+//        dataSet.isUsingSliceColorAsValueLineColor = true
+        // 连接线在饼状图外面
+//        dataSet.yValuePosition = PieDataSet.ValuePosition.OUTSIDE_SLICE
+
+        // 设置饼块之间的间隔
+        dataSet.sliceSpace = 1f
+        dataSet.isHighlightEnabled = true
+        // 显示图例
+        val legend = pieChart.legend
+        legend.isEnabled = true
+        legend.verticalAlignment = Legend.LegendVerticalAlignment.TOP
+        legend.horizontalAlignment = Legend.LegendHorizontalAlignment.CENTER
+        legend.textSize = 10f                     //设置图例标签文本的大小
+        legend.textColor = R.color.text_black_33//设置图例标签文本的颜色
+        // 和四周相隔一段距离,显示数据
+        pieChart.setExtraOffsets(32f, 5f, 32f, 5f)
+        // 设置pieChart图表是否可以手动旋转
+        pieChart.isRotationEnabled = false
+        // 设置piecahrt图表点击Item高亮是否可用
+        pieChart.isHighlightPerTapEnabled = false
+        // 设置pieChart图表展示动画效果，动画运行1.4秒结束
+        pieChart.animateY(700)
+        //设置pieChart是否只显示饼图上百分比不显示文字
+        pieChart.setDrawEntryLabels(false)
+        //是否绘制PieChart内部中心文本
+        pieChart.setDrawCenterText(false)
+//        pieChart.setCenterTextColor(R.color.text_black_33)
+//        pieChart.setCenterTextSize(14f)
+        // 绘制内容value，设置字体颜色大小
+        pieData.setDrawValues(true)
+        pieData.setValueFormatter(PercentFormatter(pieChart))
+        pieData.setValueTextSize(12f)
+        pieData.setValueTextColor(Color.WHITE)
+        pieChart.data = pieData
+        // 更新 piechart 视图
+        pieChart.postInvalidate()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/ConsultFinishActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/ConsultFinishActivity.kt
new file mode 100644
index 0000000..de171b4
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/ConsultFinishActivity.kt
@@ -0,0 +1,49 @@
+package com.yxjk.healthexpertclient.ui.workbench
+
+import android.os.Bundle
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.buddy.kredit.android.base.BaseActivity
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.ActivityConsultFinishBinding
+import com.yxjk.healthexpertclient.ui.workbench.viewmodel.ConsultFinishViewModel
+import com.yxjk.healthexpertclient.view.ConsultInformationView
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/6 16:57
+ * @description 音视频咨询-已完成
+ */
+@Deprecated("音视频咨询详情不同状态已整合到ConsultWaitConfirmActivity")
+class ConsultFinishActivity :
+    BaseActivity<ConsultFinishViewModel, ActivityConsultFinishBinding>(R.layout.activity_consult_finish) {
+    override fun transparentStatusBar(): Boolean {
+        return true
+    }
+    override fun initView(savedInstanceState: Bundle?) {
+        val recordId = intent.extras?.getString("recordId") ?: ""
+        lifecycleScope.launch {
+            mViewModel.recordId.emit(recordId)
+        }
+    }
+
+    override fun createObserve() {
+        super.createObserve()
+        mBinding.apply {
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED){
+                    mViewModel.consultDetailBean.collectLatest {
+                        viewConsultInformation.setData(it,  ConsultInformationView.ConsultType.AUDIO_AND_VIDEO)
+                    }
+                }
+            }
+        }
+    }
+
+    override fun bindEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/ConsultHistoryActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/ConsultHistoryActivity.kt
new file mode 100644
index 0000000..43bf380
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/ConsultHistoryActivity.kt
@@ -0,0 +1,81 @@
+package com.yxjk.healthexpertclient.ui.workbench
+
+import android.os.Bundle
+import android.view.View
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import com.btpj.lib_base.ext.initColors
+import com.btpj.lib_base.utils.ToastUtil
+import com.buddy.kredit.android.base.BaseActivity
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.listener.OnItemClickListener
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.ActivityConsultHistoryBinding
+import com.yxjk.healthexpertclient.ui.workbench.adapter.ConsultHistoryAdapter
+import com.yxjk.healthexpertclient.ui.workbench.viewmodel.ConsultHistoryViewModel
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/5 9:26
+ * @description 咨询历史（某个用户的咨询历史）
+ */
+@Deprecated("功能舍弃")
+class ConsultHistoryActivity :
+    BaseActivity<ConsultHistoryViewModel, ActivityConsultHistoryBinding>(R.layout.activity_consult_history),
+    OnItemClickListener, SwipeRefreshLayout.OnRefreshListener {
+    private val mAdapter: ConsultHistoryAdapter = ConsultHistoryAdapter()
+    override fun initView(savedInstanceState: Bundle?) {
+        mBinding.apply {
+            swipeRefresh.initColors()
+            swipeRefresh.setOnRefreshListener(this@ConsultHistoryActivity)
+            val linearLayoutManager = LinearLayoutManager(this@ConsultHistoryActivity)
+            rvList.layoutManager = linearLayoutManager
+        }
+    }
+
+    override fun createObserve() {
+        super.createObserve()
+        mBinding.apply {
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.consultHistoryList.collectLatest { list ->
+                        loadComplete()
+                        mAdapter.setNewInstance(list)
+                        if (rvList.adapter == null) {
+                            mAdapter.setOnItemClickListener(this@ConsultHistoryActivity)
+                            rvList.adapter = mAdapter
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    override fun initData() {
+        super.initData()
+        onRefresh()
+    }
+    override fun onRefresh() {
+        mViewModel.getConsultHistoryList(true, "", "")
+    }
+    override fun bindEvent() {
+        mBinding.viewSearch.setOnSearchClickListener {
+            ToastUtil.showShort(this@ConsultHistoryActivity, it)
+        }
+
+    }
+
+    override fun onItemClick(adapter: BaseQuickAdapter<*, *>, view: View, position: Int) {
+        ToastUtil.showShort(this@ConsultHistoryActivity, "点击了"+position)
+    }
+    private fun loadComplete() {
+        mBinding.swipeRefresh.isRefreshing = false
+        mAdapter.loadMoreModule.isEnableLoadMore = true
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/ConsultRecordActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/ConsultRecordActivity.kt
new file mode 100644
index 0000000..a0c3169
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/ConsultRecordActivity.kt
@@ -0,0 +1,95 @@
+package com.yxjk.healthexpertclient.ui.workbench
+
+import android.content.res.ColorStateList
+import android.os.Bundle
+import android.view.Gravity
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
+import androidx.viewpager2.widget.ViewPager2
+import com.buddy.kredit.android.base.BaseActivity
+import com.google.android.material.tabs.TabLayout
+import com.google.android.material.tabs.TabLayoutMediator
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.ActivityConsultRecordBinding
+import com.yxjk.healthexpertclient.event.WorkbenchEvent
+import com.yxjk.healthexpertclient.ui.workbench.fragment.ConsultRecordGroupFragment
+import com.yxjk.healthexpertclient.ui.workbench.fragment.ConsultRecordGroupFragment.Companion.CONSULT_TYPE_AUDIO_VIDEO
+import com.yxjk.healthexpertclient.ui.workbench.fragment.ConsultRecordGroupFragment.Companion.CONSULT_TYPE_IMAGE_TEXT
+import com.yxjk.healthexpertclient.ui.workbench.viewmodel.ConsultRecordViewModel
+import com.yxjk.healthexpertclient.view.viewpager.ViewPagerAdapter
+import org.greenrobot.eventbus.EventBus
+
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/5 9:26
+ * @description 咨询记录（专家的所有咨询记录）
+ */
+class ConsultRecordActivity :
+    BaseActivity<ConsultRecordViewModel, ActivityConsultRecordBinding>(R.layout.activity_consult_record),
+    ViewPagerAdapter.OnCreateFragmentListener {
+    companion object { //定义时要跟数组下标对应
+        const val CONSULT_TYPE_IMAGE = 0
+        const val CONSULT_TYPE_VIDEO = 1
+    }
+
+    var consultModel: Int = CONSULT_TYPE_IMAGE
+    var consultIndex: Int = 0
+    override fun initView(savedInstanceState: Bundle?) {
+        val tabs = arrayOf(
+            getString(R.string.doctor_homepage_image_text_consult),
+            getString(R.string.doctor_homepage_audio_video_consult)
+        )
+        //禁用预加载
+        mBinding.viewPager.offscreenPageLimit = ViewPager2.OFFSCREEN_PAGE_LIMIT_DEFAULT
+        mBinding.viewPager.adapter = ViewPagerAdapter(this, tabs, this)
+        initTabLayout(mBinding.viewPager, mBinding.tabLayout, tabs)
+        consultModel = intent.extras?.getInt("consultModel") ?: CONSULT_TYPE_IMAGE
+        consultIndex = intent.extras?.getInt("consultIndex") ?: 0
+        mBinding.tabLayout.getTabAt(consultModel)?.select()
+
+    }
+
+    private fun initTabLayout(viewpager: ViewPager2, tabLayout: TabLayout, tabs: Array<String>) {
+        var mediator = TabLayoutMediator(
+            tabLayout, viewpager
+        ) { tab, position -> //这里可以自定义TabView
+            val tabView = TextView(this@ConsultRecordActivity)
+            tabView.gravity = Gravity.CENTER
+            tabView.text = tabs[position]
+            val states = arrayOfNulls<IntArray>(2)
+            states[0] = intArrayOf(android.R.attr.state_selected)
+            states[1] = intArrayOf()
+            val colors = intArrayOf(
+                ContextCompat.getColor(this@ConsultRecordActivity, R.color.text_black_33),
+                ContextCompat.getColor(this@ConsultRecordActivity, R.color.text_black_66))
+                val colorStateList = ColorStateList (states, colors)
+            tabView.setTextColor(colorStateList)
+            tab.customView = tabView
+        }
+        //要执行这一句才是真正将两者绑定起来
+        mediator.attach()
+    }
+
+    override fun bindEvent() {
+
+    }
+
+    override fun createFragment(position: Int): Fragment {
+        when(position){
+            0 -> {
+                return ConsultRecordGroupFragment.newInstance(CONSULT_TYPE_IMAGE_TEXT, consultIndex)
+            }
+            1 -> {
+                return ConsultRecordGroupFragment.newInstance(CONSULT_TYPE_AUDIO_VIDEO, consultIndex)
+            }
+        }
+        return ConsultRecordGroupFragment.newInstance(CONSULT_TYPE_IMAGE_TEXT, consultIndex)
+    }
+
+    override fun onDestroy() {
+        EventBus.getDefault().post(WorkbenchEvent())
+        super.onDestroy()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/ConsultWaitStartActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/ConsultWaitStartActivity.kt
new file mode 100644
index 0000000..bcc3857
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/ConsultWaitStartActivity.kt
@@ -0,0 +1,76 @@
+package com.yxjk.healthexpertclient.ui.workbench
+
+import android.os.Bundle
+import android.view.View
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.buddy.kredit.android.base.BaseActivity
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.ActivityConsultWaitStartBinding
+import com.yxjk.healthexpertclient.ui.workbench.viewmodel.ConsultWaitStartViewModel
+import com.yxjk.healthexpertclient.view.ConsultInformationView
+import com.yxjk.healthexpertclient.view.RefuseExplainDialog
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/6 17:26
+ * @description 音视频咨询-待开始
+ */
+@Deprecated("音视频咨询详情不同状态已整合到AudioVideoConsultActivity")
+class ConsultWaitStartActivity :
+    BaseActivity<ConsultWaitStartViewModel, ActivityConsultWaitStartBinding>(R.layout.activity_consult_wait_start) {
+    private val refuseExplainDialog by lazy { RefuseExplainDialog(this) }
+    override fun transparentStatusBar(): Boolean {
+        return true
+    }
+
+    override fun initView(savedInstanceState: Bundle?) {
+        val recordId = intent.extras?.getString("recordId") ?: ""
+        lifecycleScope.launch {
+            mViewModel.recordId.emit(recordId)
+        }
+    }
+    override fun createObserve() {
+        super.createObserve()
+        mBinding.apply {
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED){
+                    mViewModel.consultDetailBean.collectLatest {
+                        viewConsultInformation.setData(it,  ConsultInformationView.ConsultType.AUDIO_AND_VIDEO)
+                    }
+                }
+            }
+        }
+    }
+
+    override fun bindEvent() {
+        refuseExplainDialog.setOnSubmitClickListener(object : RefuseExplainDialog.OnSubmitClickListener{
+
+            override fun onSubmitClick(
+                viewDialog: RefuseExplainDialog,
+                reasonType: String,
+                reasonExplain: String
+            ) {
+            }
+
+            override fun onCloseClick(viewDialog: RefuseExplainDialog) {
+
+            }
+        })
+        addClickViews(mBinding.btnStart)
+    }
+
+    override fun onClick(v: View?) {
+        super.onClick(v)
+        when(v?.id){
+            R.id.btn_start -> {
+                if(!refuseExplainDialog.isShowing){
+                    refuseExplainDialog.show()
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/ImageTextConsultDetailActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/ImageTextConsultDetailActivity.kt
new file mode 100644
index 0000000..d43e777
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/ImageTextConsultDetailActivity.kt
@@ -0,0 +1,47 @@
+package com.yxjk.healthexpertclient.ui.workbench
+
+import android.os.Bundle
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.buddy.kredit.android.base.BaseActivity
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.ActivityConsultDetailBinding
+import com.yxjk.healthexpertclient.ui.workbench.viewmodel.ImageTextConsultViewModel
+import com.yxjk.healthexpertclient.view.ConsultInformationView
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/5 9:26
+ * @description 咨询详情
+ */
+class ImageTextConsultDetailActivity: BaseActivity<ImageTextConsultViewModel, ActivityConsultDetailBinding>(R.layout.activity_consult_detail) {
+    override fun transparentStatusBar(): Boolean {
+        return true
+    }
+
+    override fun createObserve() {
+        super.createObserve()
+        mBinding.apply {
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED){
+                    mViewModel.consultDetailBean.collectLatest {
+                        viewConsultInformation.setData(it,  ConsultInformationView.ConsultType.IMAGE_AND_TEXT)
+                    }
+                }
+            }
+        }
+    }
+    override fun initView(savedInstanceState: Bundle?) {
+        val recordId = intent.extras?.getString("recordId") ?: ""
+        lifecycleScope.launch {
+            mViewModel.recordId.emit(recordId)
+        }
+    }
+
+    override fun bindEvent() {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/MessageListActivity.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/MessageListActivity.kt
new file mode 100644
index 0000000..ba89b6a
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/MessageListActivity.kt
@@ -0,0 +1,94 @@
+package com.yxjk.healthexpertclient.ui.workbench
+
+import android.os.Bundle
+import android.view.View
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import com.btpj.lib_base.ext.getEmptyView
+import com.btpj.lib_base.ext.initColors
+import com.buddy.kredit.android.base.BaseActivity
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.listener.OnItemClickListener
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.ActivityMessageListBinding
+import com.yxjk.healthexpertclient.ui.workbench.adapter.MessageListAdapter
+import com.yxjk.healthexpertclient.ui.workbench.viewmodel.MessageListViewModel
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+/**
+ * @author nanfeifei
+ * @time 2023/7/17 16:20
+ * @description
+ */
+class MessageListActivity: BaseActivity<MessageListViewModel, ActivityMessageListBinding>(R.layout.activity_message_list),
+    SwipeRefreshLayout.OnRefreshListener, OnItemClickListener {
+    private val mAdapter: MessageListAdapter = MessageListAdapter()
+    override fun initView(savedInstanceState: Bundle?) {
+        mBinding.apply {
+            swipeRefresh.initColors()
+            swipeRefresh.setOnRefreshListener(this@MessageListActivity)
+            val linearLayoutManager = LinearLayoutManager(this@MessageListActivity
+            )
+            rvList.layoutManager = linearLayoutManager
+        }
+    }
+    override fun createObserve() {
+        super.createObserve()
+        mBinding.apply {
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.messageList.collectLatest { list ->
+                        list?.let {
+                            if (mViewModel.isRefreshing.value) {
+                                mAdapter.setNewInstance(list)
+                            } else {
+                                mAdapter.addData(list)
+                            }
+                            mAdapter.loadMoreModule.loadMoreComplete()
+                            if (rvList.adapter == null) {
+                                mAdapter.setEmptyView(rvList.getEmptyView())
+                                mAdapter.setOnItemClickListener(this@MessageListActivity)
+                                initLoadMore()
+                                rvList.adapter = mAdapter
+                            }
+                        }
+                    }
+                }
+            }
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.isRefreshing.collectLatest {
+                        swipeRefresh.isRefreshing = it
+                    }
+                }
+            }
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.isLoadMoreEnd.collectLatest {
+                        mAdapter.loadMoreModule.loadMoreEnd(it)
+                    }
+                }
+            }
+        }
+    }
+    override fun bindEvent() {
+
+    }
+    private fun initLoadMore() {
+        mAdapter.loadMoreModule.setOnLoadMoreListener { mViewModel.getMessageList(false) }
+        mAdapter.loadMoreModule.isAutoLoadMore = true
+        //当自动加载开启，同时数据不满一屏时，是否继续执行自动加载更多(默认为true)
+        mAdapter.loadMoreModule.isEnableLoadMoreIfNotFullPage = false
+    }
+    override fun onRefresh() {
+        mViewModel.getMessageList(true)
+    }
+
+    override fun onItemClick(adapter: BaseQuickAdapter<*, *>, view: View, position: Int) {
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/adapter/CheckUpDetailAdapter.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/adapter/CheckUpDetailAdapter.kt
new file mode 100644
index 0000000..ceceb15
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/adapter/CheckUpDetailAdapter.kt
@@ -0,0 +1,172 @@
+package com.yxjk.healthexpertclient.ui.workbench.adapter
+
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.viewholder.BaseViewHolder
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.workbench.CheckUpDetailListBean
+import com.yxjk.healthexpertclient.view.TextViewDialog
+
+class CheckUpDetailAdapter : BaseQuickAdapter<CheckUpDetailListBean, BaseViewHolder>(R.layout.item_check_up_detail) {
+    override fun convert(holder: BaseViewHolder, item: CheckUpDetailListBean) {
+        holder?.getView<TextView>(R.id.item_check_up_detail_title)?.let {
+            if (!item?.cqmc.isNullOrEmpty()) {
+                it.text = "${item?.cqmc}"
+                it.visibility = View.VISIBLE
+            } else {
+                it.text = ""
+                it.visibility = View.GONE
+            }
+        }
+//        holder?.getView<TextView>(R.id.item_check_up_detail_subtitle)?.let {
+//            it.text = "${item?.cqmcChild}"
+//        }
+//        holder?.getView<TextView>(R.id.item_check_up_detail_interpret)?.let {
+//            it.setOnClickListener {
+//                val intent = Intent(mContext, SeekDoctorActivity::class.java)
+//                mContext?.startActivity(intent)
+//            }
+//
+//        }
+        var mChildContainerLl =
+            holder?.getView<LinearLayout>(R.id.item_check_up_detail_form_container)
+        betterWay(item?.list, mChildContainerLl!!)
+    }
+
+    private fun betterWay(
+        childItemTitle: List<CheckUpDetailListBean.CheckUpDetailListChildBean>?,
+        mChildContainerLl: LinearLayout
+    ) {
+        childItemTitle?.let {
+            // 当有数据时才需要有孩子列表，否则移除容器内的所有孩子
+            if (it.isNotEmpty()) {
+                // 获取LinearLayout容器内的孩子数
+                var childCount = mChildContainerLl.childCount
+                // 当孩子数与数据条数相等时，直接复用当前条目
+                if (childCount == childItemTitle.size) {
+                    // 设置孩子条目数据
+                    setChildData(childItemTitle, mChildContainerLl)
+                    return;
+                }
+
+                // 当孩子数大于数据条数时，需要移除多余的孩子条目
+                if (childCount > childItemTitle.size) {
+                    // 获取多余的孩子条目数
+                    var spareChild = childCount - childItemTitle.size
+                    // 循环移除多余的孩子条目
+                    for (index in 0 until spareChild) {
+                        // 移除容器内的孩子条目后，无需对索引进行处理，容器内的孩子条目会自动向前移动
+                        var view = mChildContainerLl.getChildAt(0);
+                        mChildContainerLl.removeView(view);
+                    }
+                    // 设置孩子条目数据
+                    setChildData(childItemTitle, mChildContainerLl)
+                    return;
+                }
+
+                // 当孩子数小于数据条数时，需要进行addView操作
+                if (childCount < childItemTitle.size) {
+                    // 获取需要增加的孩子条目数
+                    var needChild = childItemTitle.size - childCount
+                    // 循环添加需要的孩子条目数
+                    for (index in 0 until needChild) {
+                        mChildContainerLl.addView(
+                            LayoutInflater.from(context).inflate(
+                                R.layout.item_check_up_detail_chaild,
+                                mChildContainerLl,
+                                false
+                            )
+                        );
+                    }
+                    // 设置孩子条目数据
+                    setChildData(childItemTitle, mChildContainerLl)
+                }
+            } else {
+                mChildContainerLl.removeAllViews();
+            }
+        }
+    }
+
+    private fun setChildData(
+        childItem: List<CheckUpDetailListBean.CheckUpDetailListChildBean>?,
+        mChildContainerLl: LinearLayout
+    ) {
+        childItem?.let {
+            for (index in 0 until it.size) {
+                // 获取容器内的孩子，无需重新解析布局
+                var inflate = mChildContainerLl.getChildAt(index)
+                var name = inflate.findViewById<TextView>(R.id.item_check_up_detail_form_child_name)
+                var result =
+                    inflate.findViewById<TextView>(R.id.item_check_up_detail_form_child_result)
+                var unit = inflate.findViewById<TextView>(R.id.item_check_up_detail_form_child_unit)
+                var visit =
+                    inflate.findViewById<TextView>(R.id.item_check_up_detail_form_child_visit)
+                if (it[index].cqmc.isNullOrEmpty()) {
+                    name.text = "/"
+                } else {
+                    name.text = it[index].cqmc
+                }
+                if (it[index].xmz.isNullOrEmpty()) {
+                    result.text = "/"
+                } else {
+                    if (it[index].xmz.length > 10) {
+                        result.text = "详情"
+                        var content = it[index].xmz
+                        result.setTextColor(context.resources.getColor(R.color.text_green_BD))
+                        result.background =
+                            context.getDrawable(R.drawable.bg_blue_background_shap_radius20)
+                        result.setOnClickListener {
+                            var dialog = TextViewDialog(context)
+                            dialog.setContent(content)
+                                .setContentStyle(Gravity.NO_GRAVITY)
+                                .setBtnText("确定")
+                                .setOnAffirmClickListener(object :
+                                    TextViewDialog.OnAffirmClickListener {
+                                    override fun onAffirmClick(viewDialog: TextViewDialog) {
+                                    }
+
+                                    override fun onCancelClick(viewDialog: TextViewDialog) {
+                                    }
+                                })
+                                .show()
+                        }
+                    } else {
+                        result.text = it[index].xmz
+                        result.setTextColor(context.resources.getColor(R.color.text_black_33))
+                        result.background = null
+                    }
+                }
+                if (it[index].xmdw.isNullOrEmpty()) {
+                    unit.text = "/"
+                } else {
+                    unit.text = it[index].xmdw
+                }
+                if (it[index].cqckz.isNullOrEmpty()) {
+                    visit.text = "/"
+                } else {
+                    visit.text = it[index].cqckz
+                }
+                if (it[index].exceptionFlag) {
+                    var redColor = ContextCompat.getColor(context, R.color.red)
+                    name.setTextColor(redColor)
+                    result.setTextColor(redColor)
+                    unit.setTextColor(redColor)
+                    visit.setTextColor(redColor)
+                } else {
+                    name.setTextColor(context.resources.getColor(R.color.text_black_33))
+                    result.setTextColor(context.resources.getColor(R.color.text_black_33))
+                    unit.setTextColor(context.resources.getColor(R.color.text_black_33))
+                    visit.setTextColor(context.resources.getColor(R.color.text_black_33))
+                }
+            }
+        }
+
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/adapter/ConsultHistoryAdapter.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/adapter/ConsultHistoryAdapter.kt
new file mode 100644
index 0000000..34d6216
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/adapter/ConsultHistoryAdapter.kt
@@ -0,0 +1,34 @@
+package com.yxjk.healthexpertclient.ui.workbench.adapter
+
+import com.btpj.lib_base.base.adapter.BaseDataBindingAdapter
+import com.chad.library.adapter.base.module.LoadMoreModule
+import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.workbench.ConsultRecordBean
+import com.yxjk.healthexpertclient.databinding.ItemRecycleConsultHistoryBinding
+
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/5 10:56
+ * @description 咨询历史
+ */
+@Deprecated("功能舍弃")
+class ConsultHistoryAdapter :
+    BaseDataBindingAdapter<ConsultRecordBean, ItemRecycleConsultHistoryBinding>(
+        R.layout.item_recycle_consult_history
+    ) , LoadMoreModule {
+
+
+    override fun convert(
+        holder: BaseDataBindingHolder<ItemRecycleConsultHistoryBinding>,
+        item: ConsultRecordBean
+    ) {
+        val mBinding = holder.dataBinding
+        mBinding?.apply {
+            tvConsultType.text = item.rejectReason
+            tvName.text = item.memberName
+            tvCreateTime.text = "2018"
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/adapter/ConsultRecordAdapter.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/adapter/ConsultRecordAdapter.kt
new file mode 100644
index 0000000..24f6c76
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/adapter/ConsultRecordAdapter.kt
@@ -0,0 +1,44 @@
+package com.yxjk.healthexpertclient.ui.workbench.adapter
+
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.module.LoadMoreModule
+import com.chad.library.adapter.base.viewholder.BaseViewHolder
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.workbench.ConsultRecordBean
+import com.yxjk.healthexpertclient.ui.workbench.fragment.ConsultRecordGroupFragment.Companion.CONSULT_TYPE_AUDIO_VIDEO
+import com.yxjk.healthexpertclient.ui.workbench.fragment.ConsultRecordGroupFragment.Companion.CONSULT_TYPE_IMAGE_TEXT
+import com.yxjk.healthexpertclient.utils.CommonUtils
+
+class ConsultRecordAdapter(private val consultType: Int, private val consultState: Int)  :
+    BaseQuickAdapter<ConsultRecordBean, BaseViewHolder>(
+        R.layout.item_recycle_consult_record
+    ), LoadMoreModule {
+    override fun convert(holder: BaseViewHolder, item: ConsultRecordBean) {
+        holder.setText(R.id.tv_name, item.memberName)
+        holder.setGone(R.id.tv_message_num, item.unreadCount == 0)
+        holder.setText(R.id.tv_message_num, item.unreadCount.toString())
+        if(item.contentType == CONSULT_TYPE_IMAGE_TEXT.toString()){
+            holder.setText(R.id.tv_time, item.createTime)
+            if (item.contentStatus == "1"){ //待确认
+                if (item.unreadCount > 0){
+                    holder.setGone(R.id.tv_message_num, false)
+                }
+                holder.setText(R.id.tv_message_num, item.unreadCount)
+            }
+        }else if(item.contentType == CONSULT_TYPE_AUDIO_VIDEO.toString()){
+            if (item.contentStatus == "1"){ //待确认
+                holder.setText(R.id.tv_time, item.createTime)
+            }else{
+                if (item.doctorStartTime.isNullOrEmpty()){
+                    holder.setText(R.id.tv_time, item.createTime)
+                }else{
+                    holder.setText(R.id.tv_time, item.doctorStartTime)
+                }
+
+            }
+        }
+
+        var gender = CommonUtils.getGenderText(item.memberSex)
+        holder.setText(R.id.tv_gender_age, context.getString(R.string.consult_record_gender_age, gender, item.memberAge))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/adapter/HealthInfoAdapter.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/adapter/HealthInfoAdapter.kt
new file mode 100644
index 0000000..a42c970
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/adapter/HealthInfoAdapter.kt
@@ -0,0 +1,30 @@
+package com.yxjk.healthexpertclient.ui.workbench.adapter
+
+import com.btpj.lib_base.base.adapter.BaseDataBindingAdapter
+import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.workbench.HealthInfoBean
+import com.yxjk.healthexpertclient.databinding.ItemRecycleHealthInfoBinding
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/25 18:01
+ * @description
+ */
+class HealthInfoAdapter: BaseDataBindingAdapter<HealthInfoBean, ItemRecycleHealthInfoBinding>(
+    R.layout.item_recycle_health_info
+) {
+
+    override fun convert(
+        holder: BaseDataBindingHolder<ItemRecycleHealthInfoBinding>,
+        item: HealthInfoBean
+    ) {
+        val mBinding = holder.dataBinding
+        mBinding?.let {
+            mBinding.stvHealthInfo.leftTextView.maxEms = 5
+            mBinding.stvHealthInfo.leftTextView.minEms = 5
+            mBinding.stvHealthInfo.setLeftString(context.getString(R.string.consult_information_health_info_format, item.answerKey))
+            mBinding.stvHealthInfo.setCenterString(item.answerValue)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/adapter/MessageListAdapter.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/adapter/MessageListAdapter.kt
new file mode 100644
index 0000000..728892a
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/adapter/MessageListAdapter.kt
@@ -0,0 +1,28 @@
+package com.yxjk.healthexpertclient.ui.workbench.adapter
+
+import com.btpj.lib_base.base.adapter.BaseDataBindingAdapter
+import com.chad.library.adapter.base.module.LoadMoreModule
+import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.workbench.MessageBean
+import com.yxjk.healthexpertclient.databinding.ItemRecycleMessageBinding
+
+/**
+ * @author nanfeifei
+ * @time 2023/7/17 16:40
+ * @description
+ */
+class MessageListAdapter: BaseDataBindingAdapter<MessageBean, ItemRecycleMessageBinding>(
+    R.layout.item_recycle_message
+), LoadMoreModule {
+
+    override fun convert(
+        holder: BaseDataBindingHolder<ItemRecycleMessageBinding>,
+        item: MessageBean
+    ) {
+        val mBinding = holder.dataBinding
+        mBinding?.let {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/fragment/ConsultRecordFragment.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/fragment/ConsultRecordFragment.kt
new file mode 100644
index 0000000..98dd475
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/fragment/ConsultRecordFragment.kt
@@ -0,0 +1,191 @@
+package com.yxjk.healthexpertclient.ui.workbench.fragment
+
+import android.os.Bundle
+import android.view.View
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import com.btpj.lib_base.ext.getEmptyView
+import com.btpj.lib_base.ext.initColors
+import com.buddy.kredit.android.base.BaseFragment
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.listener.OnItemClickListener
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.workbench.ConsultRecordBean
+import com.yxjk.healthexpertclient.databinding.FragmentConsultRecordBinding
+import com.yxjk.healthexpertclient.event.ConsultRecordEvent
+import com.yxjk.healthexpertclient.ext.startConsultWaitConfirmActivity
+import com.yxjk.healthexpertclient.ext.startGroupChat
+import com.yxjk.healthexpertclient.ui.im.utils.IMInputActionSettingUtils
+import com.yxjk.healthexpertclient.ui.workbench.adapter.ConsultRecordAdapter
+import com.yxjk.healthexpertclient.ui.workbench.fragment.ConsultRecordGroupFragment.Companion.CONSULT_TYPE_AUDIO_VIDEO
+import com.yxjk.healthexpertclient.ui.workbench.fragment.ConsultRecordGroupFragment.Companion.CONSULT_TYPE_IMAGE_TEXT
+import com.yxjk.healthexpertclient.ui.workbench.viewmodel.ConsultRecordViewModel
+import com.yxjk.healthexpertclient.utils.TUIUtils
+import com.tencent.qcloud.tuikit.tuichat.bean.WorkBean
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+
+
+class ConsultRecordFragment :
+    BaseFragment<ConsultRecordViewModel, FragmentConsultRecordBinding>(R.layout.fragment_consult_record),
+    OnItemClickListener, SwipeRefreshLayout.OnRefreshListener {
+    companion object {
+        fun newInstance(consultType: Int, consultIndex: Int): ConsultRecordFragment {
+            val bundle = Bundle()
+            bundle.putInt("consultType", consultType)
+            bundle.putInt("consultIndex", consultIndex)
+            val fragment = ConsultRecordFragment()
+            fragment.arguments = bundle
+            return fragment
+        }
+    }
+
+    private var consultType: Int = 0
+    private var consultIndex: Int = 0
+    private val mAdapter: ConsultRecordAdapter by lazy {
+        ConsultRecordAdapter(
+            consultType,
+            mViewModel.consultState.value
+        )
+    }
+
+    override fun initView(view: View, savedInstanceState: Bundle?) {
+        getArgumentsParams()
+        mBinding.apply {
+            swipeRefresh.initColors()
+            swipeRefresh.setOnRefreshListener(this@ConsultRecordFragment)
+            val linearLayoutManager = LinearLayoutManager(requireContext())
+            rvList.layoutManager = linearLayoutManager
+            //因带阴影的背景本身阴影有5dp，所有不需要另外设置间距
+//            rvList.addItemDecoration(SpaceItemDecoration(requireContext(), 0, 8f))
+        }
+
+    }
+
+    private fun getArgumentsParams() {
+        consultType = arguments?.getInt("consultType") ?: 0
+        consultIndex = arguments?.getInt("consultIndex") ?: 0
+        mViewModel.initConsultTypeAndStatus(consultType, consultIndex)
+    }
+
+    override fun createObserve() {
+        super.createObserve()
+        mBinding.apply {
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.consultRecordList.collectLatest { list ->
+                        if(list == null){
+                            return@collectLatest
+                        }
+                        if (mViewModel.isRefreshing.value) {
+                            mAdapter.setNewInstance(list)
+                        } else {
+                            mAdapter.addData(list)
+                        }
+                        mAdapter.loadMoreModule.loadMoreComplete()
+                        if (rvList.adapter == null) {
+                            mAdapter.setEmptyView(rvList.getEmptyView())
+                            mAdapter.setOnItemClickListener(this@ConsultRecordFragment)
+                            initLoadMore()
+                            rvList.adapter = mAdapter
+                        }
+                    }
+                }
+            }
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.isRefreshing.collectLatest {
+                        swipeRefresh.isRefreshing = it
+                    }
+                }
+            }
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED) {
+                    mViewModel.isLoadMoreEnd.collectLatest {
+                        mAdapter.loadMoreModule.loadMoreEnd(it)
+                    }
+                }
+            }
+        }
+
+    }
+
+    override fun initData() {
+        super.initData()
+        onRefresh()
+    }
+
+    override fun onRefresh() {
+        mViewModel.getConsultRecordList(true)
+    }
+
+    private fun initLoadMore() {
+        mAdapter.loadMoreModule.setOnLoadMoreListener { mViewModel.getConsultRecordList(false) }
+        mAdapter.loadMoreModule.isEnableLoadMore = true
+        mAdapter.loadMoreModule.isAutoLoadMore = true
+        //当自动加载开启，同时数据不满一屏时，是否继续执行自动加载更多(默认为true)
+        mAdapter.loadMoreModule.isEnableLoadMoreIfNotFullPage = true
+    }
+    override fun onDestroyView() {
+        super.onDestroyView()
+        mViewModel.removeListener()
+    }
+    override fun bindEvent() {
+    }
+
+    override fun onItemClick(adapter: BaseQuickAdapter<*, *>, view: View, position: Int) {
+        val consultRecordBean = (adapter.getItem(position) as ConsultRecordBean)
+        when (consultRecordBean.contentType) {
+            CONSULT_TYPE_IMAGE_TEXT.toString() -> {
+                startImageTextDetail(consultRecordBean)
+            }
+
+            CONSULT_TYPE_AUDIO_VIDEO.toString() -> {
+                startAudioVideoDetail(consultRecordBean)
+            }
+        }
+    }
+
+    private fun startImageTextDetail(consultRecordBean: ConsultRecordBean) {
+        if (consultRecordBean.contentStatus.isNullOrEmpty()){
+            return
+        }
+        var status = consultRecordBean.contentStatus.toInt()
+        IMInputActionSettingUtils.createImageTextConsultSetting(disableSendMessage = status > 3)
+        consultRecordBean.imId?.let {
+            requireContext().startGroupChat(
+                it,
+                consultRecordBean.memberName ?: getString(R.string.consult_type_image_text),
+                WorkBean(consultRecordBean.id ?: "", TUIUtils.WORK_TYPE_IMAGE_TEXT_CONSULT)
+            )
+        }
+        //目前没有图文详情，先跳转聊天页并屏蔽操作按钮，后续加上详情页使用页面逻辑，分别跳转不同页面
+//        if ("3" == consultRecordBean.contentStatus) { //contentStatus代表咨询进行中，跳转聊天页面，其他状态跳转详情
+//            consultRecordBean.imId?.let {
+//                requireContext().startGroupChat(
+//                    it,
+//                    consultRecordBean.memberName ?: getString(R.string.consult_type_image_text),
+//                    WorkBean(consultRecordBean.id ?: "", TUIUtils.WORK_TYPE_IMAGE_TEXT_CONSULT)
+//                )
+//            }
+//        } else {
+//            var id = consultRecordBean.id
+//            id?.let { startConsultDetailActivity(requireContext(), it) }
+//        }
+    }
+
+    private fun startAudioVideoDetail(consultRecordBean: ConsultRecordBean) {
+        var id = consultRecordBean.id
+        id?.let { startConsultWaitConfirmActivity(requireContext(), it) }
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onEvent(event: ConsultRecordEvent) {
+        onRefresh()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/fragment/ConsultRecordGroupFragment.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/fragment/ConsultRecordGroupFragment.kt
new file mode 100644
index 0000000..0b97e9d
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/fragment/ConsultRecordGroupFragment.kt
@@ -0,0 +1,88 @@
+package com.yxjk.healthexpertclient.ui.workbench.fragment
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.TextView
+import androidx.fragment.app.Fragment
+import androidx.viewpager2.widget.ViewPager2
+import com.buddy.kredit.android.base.BaseFragment
+import com.google.android.material.tabs.TabLayout
+import com.google.android.material.tabs.TabLayoutMediator
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.FragmentGroupConsultRecordBinding
+import com.yxjk.healthexpertclient.ui.workbench.viewmodel.ConsultRecordViewModel
+import com.yxjk.healthexpertclient.view.viewpager.ViewPagerAdapter
+
+
+class ConsultRecordGroupFragment :
+    BaseFragment<ConsultRecordViewModel, FragmentGroupConsultRecordBinding>(R.layout.fragment_group_consult_record),
+    ViewPagerAdapter.OnCreateFragmentListener {
+    companion object {
+        const val CONSULT_TYPE_IMAGE_TEXT = 1
+        const val CONSULT_TYPE_AUDIO_VIDEO = 2
+        fun newInstance(consultType: Int, consultIndex: Int): ConsultRecordGroupFragment {
+            val bundle = Bundle()
+            bundle.putInt("consultType", consultType)
+            bundle.putInt("consultIndex", consultIndex)
+            val fragment = ConsultRecordGroupFragment()
+            fragment.arguments = bundle
+            return fragment
+        }
+    }
+
+    private var consultType: Int = CONSULT_TYPE_IMAGE_TEXT
+    var consultIndex: Int = 0
+    lateinit var tabs: Array<String>
+    override fun initView(view: View, savedInstanceState: Bundle?) {
+        consultType = arguments?.getInt("consultType") ?: CONSULT_TYPE_IMAGE_TEXT
+        consultIndex = arguments?.getInt("consultIndex") ?: 0
+        initViewPager(mBinding.viewPager, consultType)
+        initTabLayout(mBinding.viewPager, mBinding.tabLayout, tabs)
+        mBinding.tabLayout.getTabAt(consultIndex)?.select()
+    }
+
+    private fun initViewPager(viewpager: ViewPager2, consultType: Int) {
+        when (consultType) {
+            CONSULT_TYPE_IMAGE_TEXT -> {
+                tabs = arrayOf(
+                    getString(R.string.consult_record_group_wait_reply),
+                    getString(R.string.consult_record_group_in_progress),
+                    getString(R.string.consult_record_group_have_finish)
+                )
+            }
+
+            CONSULT_TYPE_AUDIO_VIDEO -> {
+                tabs = arrayOf(
+                    getString(R.string.consult_record_group_waiting_affirm),
+                    getString(R.string.consult_record_group_in_progress),
+                    getString(R.string.consult_record_group_have_finish)
+                )
+            }
+        }
+        //禁用预加载
+        viewpager.offscreenPageLimit = ViewPager2.OFFSCREEN_PAGE_LIMIT_DEFAULT
+        viewpager.adapter = ViewPagerAdapter(this@ConsultRecordGroupFragment, tabs, this)
+    }
+
+    private fun initTabLayout(viewpager: ViewPager2, tabLayout: TabLayout, tabs: Array<String>) {
+        var mediator = TabLayoutMediator(
+            tabLayout, viewpager
+        ) { tab, position -> //这里可以自定义TabView
+            val tabView = LayoutInflater.from(requireContext())
+                .inflate(R.layout.item_tablayout_group_title, null) as TextView
+            tabView.text = tabs[position]
+            tab.customView = tabView
+        }
+        //要执行这一句才是真正将两者绑定起来
+        mediator.attach()
+    }
+
+    override fun bindEvent() {
+    }
+
+
+    override fun createFragment(position: Int): Fragment {
+        return ConsultRecordFragment.newInstance(consultType, position)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/fragment/WorkbenchFragment.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/fragment/WorkbenchFragment.kt
new file mode 100644
index 0000000..52595b6
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/fragment/WorkbenchFragment.kt
@@ -0,0 +1,176 @@
+package com.yxjk.healthexpertclient.ui.workbench.fragment
+
+import android.os.Bundle
+import android.os.SystemClock
+import android.view.View
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import com.btpj.lib_base.data.local.DataStoreManager
+import com.btpj.lib_base.ext.initColors
+import com.btpj.lib_base.ext.loadCircle
+import com.buddy.kredit.android.base.BaseFragment
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.mine.DoctorBean
+import com.yxjk.healthexpertclient.databinding.FragmentWorkbenchBinding
+import com.yxjk.healthexpertclient.event.WorkbenchEvent
+import com.yxjk.healthexpertclient.ext.loginIm
+import com.yxjk.healthexpertclient.ext.startConsultRecordActivity
+import com.yxjk.healthexpertclient.ext.startGroupChat
+import com.yxjk.healthexpertclient.ext.startMessageListActivity
+import com.yxjk.healthexpertclient.ext.startSimulateUserActivity
+import com.yxjk.healthexpertclient.ui.im.utils.IMInputActionSettingUtils
+import com.yxjk.healthexpertclient.ui.main.viewmodel.MainViewModel
+import com.yxjk.healthexpertclient.ui.workbench.ConsultRecordActivity
+import com.yxjk.healthexpertclient.ui.workbench.viewmodel.WorkbenchViewModel
+import com.yxjk.healthexpertclient.utils.CommonUtils
+import com.yxjk.healthexpertclient.utils.TUIUtils
+import com.yxjk.healthexpertclient.utils.orEmptyDefault
+import com.yxjk.healthexpertclient.utils.orNullDefault
+import com.tencent.qcloud.tuikit.tuichat.bean.WorkBean
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+
+class WorkbenchFragment :
+    BaseFragment<WorkbenchViewModel, FragmentWorkbenchBinding>(R.layout.fragment_workbench),
+    SwipeRefreshLayout.OnRefreshListener {
+    companion object {
+        fun newInstance() = WorkbenchFragment()
+    }
+    private val mainViewModel by activityViewModels<MainViewModel>()
+
+    var time: Long = 3000
+    var mCount = 5
+    var mLastTime = 0L
+    var mHits = LongArray(mCount)
+    override fun initView(view: View, savedInstanceState: Bundle?) {
+//        setToolBarRightText(getString(R.string.doctor_homepage_message))
+        mBinding.swipeRefresh.initColors()
+        mBinding.swipeRefresh.setOnRefreshListener(this@WorkbenchFragment)
+    }
+
+    override fun createObserve() {
+        super.createObserve()
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.CREATED){
+                mainViewModel.doctorBean.collectLatest {
+                    setDoctorInfo(it)
+                }
+            }
+        }
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.CREATED) {
+                mViewModel.isRefreshing.collectLatest {
+                    mBinding.swipeRefresh.isRefreshing = it
+                }
+            }
+        }
+    }
+
+    override fun initData() {
+        super.initData()
+        requireContext().loginIm {
+            mViewModel.getImageTextUnreadNum()
+        }
+    }
+    override fun onRefresh() {
+        mViewModel.getConsultNum()
+        mViewModel.getConsultAssistantInfo()
+        mViewModel.getAssistantUnreadNum()
+        mainViewModel.getDoctorInfo()
+    }
+    override fun onDestroyView() {
+        super.onDestroyView()
+        mViewModel.removeListener()
+    }
+    private fun setDoctorInfo(doctorBean: DoctorBean){
+        mBinding.apply {
+            tvDoctorName.text = doctorBean.doctorName.orNullDefault()
+            ivDoctorHead.loadCircle(doctorBean.photo)
+            tvProfessionalTitle.text = doctorBean.doctorTitle
+            tvHospital.text = doctorBean.resourceName.orNullDefault() + " " +if(doctorBean.departmentName.isNullOrEmpty()) "" else doctorBean.departmentName
+        }
+    }
+    override fun bindEvent() {
+        mBinding.apply {
+            addClickViews(
+                clImageTextConsultLay,
+                clAudioVideoConsultLay,
+                clAssistantConsultLay,
+                layImageTextConsultStatus.llLeftLay,
+                layImageTextConsultStatus.llCenterLay,
+                layImageTextConsultStatus.llRightLay,
+                layAudioVideoConsultStatus.llLeftLay,
+                layAudioVideoConsultStatus.llCenterLay,
+                layAudioVideoConsultStatus.llRightLay,
+                ivDoctorHead
+            )
+        }
+
+    }
+
+    override fun onClick(v: View?) {
+        super.onClick(v)
+        mBinding.apply {
+            when (v) {
+                clImageTextConsultLay -> {
+                    startConsultRecordActivity(requireContext(), ConsultRecordActivity.CONSULT_TYPE_IMAGE)
+                }
+                layImageTextConsultStatus.llLeftLay -> {
+                    startConsultRecordActivity(requireContext(), ConsultRecordActivity.CONSULT_TYPE_IMAGE, 0)
+                }
+                layImageTextConsultStatus.llCenterLay -> {
+                    startConsultRecordActivity(requireContext(), ConsultRecordActivity.CONSULT_TYPE_IMAGE, 1)
+                }
+                layImageTextConsultStatus.llRightLay -> {
+                    startConsultRecordActivity(requireContext(), ConsultRecordActivity.CONSULT_TYPE_IMAGE, 2)
+                }
+                clAudioVideoConsultLay -> {
+                    startConsultRecordActivity(requireContext(), ConsultRecordActivity.CONSULT_TYPE_VIDEO)
+                }
+                layAudioVideoConsultStatus.llLeftLay -> {
+                    startConsultRecordActivity(requireContext(), ConsultRecordActivity.CONSULT_TYPE_VIDEO, 0)
+                }
+                layAudioVideoConsultStatus.llCenterLay -> {
+                    startConsultRecordActivity(requireContext(), ConsultRecordActivity.CONSULT_TYPE_VIDEO, 1)
+                }
+                layAudioVideoConsultStatus.llRightLay -> {
+                    startConsultRecordActivity(requireContext(), ConsultRecordActivity.CONSULT_TYPE_VIDEO, 2)
+                }
+                clAssistantConsultLay -> {
+                    mainViewModel.submitAssistantConsultApply(successCall = {
+                        if (it == null){
+                            return@submitAssistantConsultApply
+                        }
+                        mViewModel.assistantGroupId = it.groupId
+                        IMInputActionSettingUtils.createAssistantSetting()
+                        requireContext().startGroupChat(it.groupId, getString(R.string.title_assistant_consult), WorkBean(it.id, TUIUtils.WORK_TYPE_ASSISTANT))
+                    })
+                }
+                toolbarLay.tvRight -> {
+                    startMessageListActivity(requireContext())
+                }
+                ivDoctorHead -> {
+                    if ("admin"==CommonUtils.getUserInfo()?.username) {
+                        mLastTime = System.currentTimeMillis()
+                        System.arraycopy(mHits, 1, mHits, 0, mHits.size - 1)
+                        mHits[mHits.size - 1] = SystemClock.uptimeMillis()
+                        if (mHits[0] >= (SystemClock.uptimeMillis() - time)) {
+                            //数组重新初始化
+                            mHits = LongArray(mCount)
+                            startSimulateUserActivity(requireContext())
+                        }
+                    }
+                }
+            }
+        }
+    }
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onEvent(event: WorkbenchEvent) {
+        onRefresh()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/ArchivesDetailViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/ArchivesDetailViewModel.kt
new file mode 100644
index 0000000..b994329
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/ArchivesDetailViewModel.kt
@@ -0,0 +1,54 @@
+package com.yxjk.healthexpertclient.ui.workbench.viewmodel
+
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.yxjk.healthexpertclient.bean.ImageBean
+import com.yxjk.healthexpertclient.bean.workbench.ArchivesBean
+import com.yxjk.healthexpertclient.bean.workbench.ConsultInfoBean
+import com.yxjk.healthexpertclient.bean.workbench.HealthInfoBean
+import com.yxjk.healthexpertclient.data.repository.WorkbenchRepository
+import kotlinx.coroutines.flow.MutableStateFlow
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/4 18:52
+ * @description
+ */
+class ArchivesDetailViewModel: BaseViewModel() {
+    var answer: MutableStateFlow<MutableList<HealthInfoBean>?> = MutableStateFlow(mutableListOf())
+    var archivesBean = MutableStateFlow<ArchivesBean?>(ArchivesBean())
+    var consultantBean = MutableStateFlow<ConsultInfoBean?>(ConsultInfoBean())
+    var imageList = MutableStateFlow(mutableListOf<ImageBean>())
+    override fun init() {
+
+    }
+    fun getArchivesDetail(archivesId: String){
+        launch({
+            handleRequest(WorkbenchRepository.getArchivesDetail(archivesId), successBlock = {
+                it.result?.let { result ->
+                    if (result.conMedicalRecordsDO != null){
+                        archivesBean.emit(result.conMedicalRecordsDO)
+                        imageList.emit(imageStrToImageList(result.conMedicalRecordsDO!!.image))
+                    }
+                    if(result.conFamilyMembersDO != null){
+                        consultantBean.emit(result.conFamilyMembersDO)
+                    }
+                    answer.emit(result.answer)
+                }
+            })
+        })
+    }
+    private fun imageStrToImageList(imageStr: String): MutableList<ImageBean> {
+        var imageList = mutableListOf<ImageBean>()
+        var list = imageStr.split(",")
+        var imageBean: ImageBean
+        list.forEach {
+            if (it.isNotEmpty()){
+                imageBean = ImageBean(it)
+                imageList.add(imageBean)
+            }
+        }
+        return imageList
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/AudioVideoConsultViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/AudioVideoConsultViewModel.kt
new file mode 100644
index 0000000..6e377aa
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/AudioVideoConsultViewModel.kt
@@ -0,0 +1,118 @@
+package com.yxjk.healthexpertclient.ui.workbench.viewmodel
+
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.yxjk.healthexpertclient.bean.workbench.AudioVideoCallBean
+import com.yxjk.healthexpertclient.bean.workbench.ConsultDetailBean
+import com.yxjk.healthexpertclient.bean.workbench.PhysicalExaminationReportBean
+import com.yxjk.healthexpertclient.bean.workbench.RefuseReasonBean
+import com.yxjk.healthexpertclient.data.repository.WorkbenchRepository
+import com.yxjk.healthexpertclient.event.ConsultRecordEvent
+import kotlinx.coroutines.flow.MutableStateFlow
+import org.greenrobot.eventbus.EventBus
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/6 13:57
+ * @description  音视频咨询详情
+ */
+class AudioVideoConsultViewModel: BaseViewModel() {
+    var recordId = MutableStateFlow("")
+    var consultDetailBean = MutableStateFlow<ConsultDetailBean?>(null)
+    var reasonList = MutableStateFlow(mutableListOf<RefuseReasonBean>())
+    var physicalExaminationReportBean = MutableStateFlow<PhysicalExaminationReportBean?>(null)
+    var callRecordId = ""
+    override fun init() {
+        getConsultDetail()
+    }
+    fun getConsultDetail() {
+        launch({
+            handleRequest(WorkbenchRepository.getAudioVideoConsultDetail(recordId.value), successBlock = {
+                it.result?.let {  result ->
+                    consultDetailBean.emit(result)
+                    result.conMedicalRecordsListDO?.let {
+                        if("1" == result.conMedicalRecordsListDO!!.tfPermission){
+                            result.conSession?.fromAccount?.let { idNo -> getPhysicalExaminationReport(idNo) }
+                        }
+                    }
+
+                }
+            })
+        })
+    }
+    private fun getPhysicalExaminationReport(userId: String){
+        if(userId.isNullOrEmpty()){
+            return
+        }
+        launch(false, {
+            handleRequest(WorkbenchRepository.getPhysicalExaminationReport(userId), successBlock = {
+                it.result?.let { data ->
+                    physicalExaminationReportBean.emit(data)
+                }
+
+            })
+        })
+    }
+    fun getRefusalAudioVideoCallReason(){
+        launch({
+            handleRequest(WorkbenchRepository.getRefusalAudioVideoCallReason(), successBlock = {
+                it.result?.let {  result ->
+                    reasonList.emit(result)
+                }
+            })
+        })
+    }
+    fun refusalAudioVideoCall(reasonType: String, rejectReason: String){
+        launch({
+            handleRequest(WorkbenchRepository.refusalAudioVideoCall(recordId.value, reasonType, rejectReason), successBlock = {
+                getConsultDetail()
+            })
+        })
+    }
+    fun acceptAudioVideoCall(startTime: Long, endTime: Long){
+        launch({
+            handleRequest(WorkbenchRepository.acceptAudioVideoCall(recordId.value, startTime, endTime), successBlock = {
+                getConsultDetail()
+                EventBus.getDefault().post(ConsultRecordEvent())
+            })
+        })
+    }
+    fun initiateAudioVideoCall(successCall: (AudioVideoCallBean) -> Unit = {}){
+        launch({
+            handleRequest(WorkbenchRepository.initiateAudioVideoCall(recordId.value), successBlock = {
+                getConsultDetail()
+                EventBus.getDefault().post(ConsultRecordEvent())
+                it.result?.let { it1 -> successCall.invoke(it1) }
+            })
+        })
+    }
+    fun finishConsult(){
+        launch({
+            handleRequest(WorkbenchRepository.finishConsult(recordId.value), successBlock = {
+                getConsultDetail()
+            })
+        })
+    }
+    fun againAppointmentDateTime(startTime: Long, endTime: Long){
+        launch({
+            handleRequest(WorkbenchRepository.againAppointmentDateTime(recordId.value, startTime, endTime), successBlock = {
+                getConsultDetail()
+            })
+        })
+    }
+    fun audioVideoCallStart(){
+        launch({
+            handleRequest(WorkbenchRepository.audioVideoCallStart(recordId.value), successBlock = {
+                it.result?.let { id ->
+                    callRecordId = id
+                }
+            })
+        })
+    }
+    fun audioVideoCallEnd(){
+        launch({
+            handleRequest(WorkbenchRepository.audioVideoCallEnd(callRecordId))
+        })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/BaseHealthyInformationViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/BaseHealthyInformationViewModel.kt
new file mode 100644
index 0000000..b0585c6
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/BaseHealthyInformationViewModel.kt
@@ -0,0 +1,24 @@
+package com.yxjk.healthexpertclient.ui.workbench.viewmodel
+
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.yxjk.healthexpertclient.bean.workbench.HealthInfoBean
+import com.yxjk.healthexpertclient.data.repository.WorkbenchRepository
+import kotlinx.coroutines.flow.MutableStateFlow
+
+class BaseHealthyInformationViewModel : BaseViewModel() {
+    var list = MutableStateFlow(mutableListOf<HealthInfoBean>())
+    override fun init() {
+    }
+
+    fun getBaseHealthInfo(memberId: String) {
+        launch({
+            handleRequest(WorkbenchRepository.getBaseHealthInfo(memberId), successBlock = {
+                it.result?.let { result ->
+                    list.emit(result)
+                }
+            })
+        })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/BigImageViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/BigImageViewModel.kt
new file mode 100644
index 0000000..25d5e6d
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/BigImageViewModel.kt
@@ -0,0 +1,13 @@
+package com.yxjk.healthexpertclient.ui.workbench.viewmodel
+
+import com.btpj.lib_base.base.BaseViewModel
+
+/**
+ * @author nanfeifei
+ * @time 2023/8/21 18:38
+ * @description
+ */
+class BigImageViewModel: BaseViewModel() {
+    override fun init() {
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/CheckUpDetailViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/CheckUpDetailViewModel.kt
new file mode 100644
index 0000000..585a147
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/CheckUpDetailViewModel.kt
@@ -0,0 +1,100 @@
+package com.yxjk.healthexpertclient.ui.workbench.viewmodel
+
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.yxjk.healthexpertclient.bean.workbench.CheckRecordUserInfoBean
+import com.yxjk.healthexpertclient.bean.workbench.CheckUpDetailListBean
+import com.yxjk.healthexpertclient.data.repository.WorkbenchRepository
+import kotlinx.coroutines.flow.MutableStateFlow
+
+/**
+ * @author nanfeifei
+ * @time 2023/6/29 10:00
+ * @description
+ */
+class CheckUpDetailViewModel : BaseViewModel() {
+    var checkItemBySfzhTotalBean = MutableStateFlow<CheckRecordUserInfoBean?>(null)
+    var checkUpList = MutableStateFlow<MutableList<CheckUpDetailListBean>?>(null)
+    override fun init() {
+
+    }
+
+    fun getPhysicalExaminationReportDetail(id: String) {
+        launch({
+            handleRequest(
+                WorkbenchRepository.getHistoryReportNoDetail(id),
+                successBlock = {
+                    it.result?.let{ data ->
+                        checkItemBySfzhTotalBean.emit(data)
+                        checkUpList.emit(resultListCovertCheckUpList(data))
+                    }
+                })
+        })
+    }
+
+    /**
+     * 重组数据（用户端体检模块复制过来的，不是我写的
+     */
+    private fun resultListCovertCheckUpList(it: CheckRecordUserInfoBean): MutableList<CheckUpDetailListBean> {
+
+        var newList = mutableListOf<CheckUpDetailListBean>()
+        var tag: String
+        if (it.resultItemResList != null && it.resultItemResList.size > 0) {
+            for (index in 0 until it.resultItemResList.size) {
+                if (it.resultItemResList[index].senResultRes != null && it.resultItemResList[index].senResultRes.size > 0) {
+                    tag = it.resultItemResList[index].analysisName
+                    for (position in 0 until it.resultItemResList[index].senResultRes.size) {
+                        var bean = CheckUpDetailListBean()
+                        bean.cqbh = it.resultItemResList[index].analysisId
+
+                        bean.cqbhBak = it.resultItemResList[index].analysisId
+                        var list =arrayListOf<CheckUpDetailListBean.CheckUpDetailListChildBean>()
+                        bean.cqbhChild = it.resultItemResList[index].senResultRes[position].uniItemClassId
+                        bean.cqmcChild = it.resultItemResList[index].senResultRes[position].uniItemClassName
+                        bean.cqbhBakChild = it.resultItemResList[index].senResultRes[position].uniItemClassId
+
+                        if (it.resultItemResList[index].senResultRes[position].thirdResultRes != null && it.resultItemResList[index].senResultRes[position].thirdResultRes.size > 0) {
+                            for (i in 0 until it.resultItemResList[index].senResultRes[position].thirdResultRes.size) {
+                                var childBean =
+                                    CheckUpDetailListBean.CheckUpDetailListChildBean()
+                                childBean.cqbh =
+                                    it.resultItemResList[index].senResultRes[position].thirdResultRes[i].id
+                                childBean.cqbhBak =
+                                    it.resultItemResList[index].senResultRes[position].thirdResultRes[i].id
+                                childBean.cqmc =
+                                    it.resultItemResList[index].senResultRes[position].thirdResultRes[i].peItemName
+                                childBean.cqckz =
+                                    it.resultItemResList[index].senResultRes[position].thirdResultRes[i].printContext
+                                childBean.xmz =
+                                    it.resultItemResList[index].senResultRes[position].thirdResultRes[i].peResult
+                                childBean.xmdw =
+                                    it.resultItemResList[index].senResultRes[position].thirdResultRes[i].unit
+                                var exceptionFlag=false
+                                if (it.resultItemResList[index].senResultRes[position].thirdResultRes[i].colour=="1"){
+                                    exceptionFlag=true
+                                }
+                                childBean.exceptionFlag=exceptionFlag
+                                list.add(childBean)
+
+                            }
+                        }
+                        if (list.size > 0) {
+                            if (tag.isNotEmpty()) {
+                                bean.cqmc = tag
+                                tag = ""
+                            }
+                            bean.list = list
+                            newList.add(bean)
+                        }
+
+                    }
+
+                }
+
+            }
+
+        }
+        return newList
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/ConsultFinishViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/ConsultFinishViewModel.kt
new file mode 100644
index 0000000..b59fa81
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/ConsultFinishViewModel.kt
@@ -0,0 +1,25 @@
+package com.yxjk.healthexpertclient.ui.workbench.viewmodel
+
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.yxjk.healthexpertclient.bean.workbench.ConsultDetailBean
+import com.yxjk.healthexpertclient.data.repository.WorkbenchRepository
+import kotlinx.coroutines.flow.MutableStateFlow
+@Deprecated("音视频咨询详情不同状态已整合到ConsultWaitConfirmActivity")
+class ConsultFinishViewModel: BaseViewModel() {
+    var recordId = MutableStateFlow("")
+    var consultDetailBean = MutableStateFlow(ConsultDetailBean())
+    override fun init() {
+        getConsultDetail()
+    }
+    fun getConsultDetail() {
+        launch({
+            handleRequest(WorkbenchRepository.getAudioVideoConsultDetail(recordId.value), successBlock = {
+                it.result?.let {  result ->
+                    consultDetailBean.emit(result)
+                }
+            })
+        })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/ConsultHistoryViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/ConsultHistoryViewModel.kt
new file mode 100644
index 0000000..f64015e
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/ConsultHistoryViewModel.kt
@@ -0,0 +1,38 @@
+package com.yxjk.healthexpertclient.ui.workbench.viewmodel
+
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.yxjk.healthexpertclient.bean.workbench.ConsultRecordBean
+import com.yxjk.healthexpertclient.data.repository.WorkbenchRepository
+import kotlinx.coroutines.flow.MutableStateFlow
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/5 9:27
+ * @description 咨询历史ViewModel
+ */
+@Deprecated("功能舍弃")
+class ConsultHistoryViewModel: BaseViewModel() {
+    var consultHistoryList = MutableStateFlow(mutableListOf<ConsultRecordBean>())
+    var pageIndex = MutableStateFlow(0)
+    private val pageSize = 20
+    override fun init() {
+
+    }
+    fun getConsultHistoryList(isRefresh: Boolean, memberId: String, searchKey: String){
+        launch({
+            if(isRefresh){
+                pageIndex.emit(0)
+            }
+            handleRequest(
+                WorkbenchRepository.getConsultHistory(memberId, searchKey, pageIndex.value, pageSize),
+                successBlock = {
+                    it.result?.let { list ->
+                        consultHistoryList.emit(list)
+                        pageIndex.value++
+                    }
+                })
+        })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/ConsultRecordViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/ConsultRecordViewModel.kt
new file mode 100644
index 0000000..a349d60
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/ConsultRecordViewModel.kt
@@ -0,0 +1,267 @@
+package com.yxjk.healthexpertclient.ui.workbench.viewmodel
+
+import android.util.Log
+import androidx.lifecycle.viewModelScope
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.yxjk.healthexpertclient.bean.workbench.ConsultRecordBean
+import com.yxjk.healthexpertclient.data.repository.WorkbenchRepository
+import com.yxjk.healthexpertclient.ui.workbench.fragment.ConsultRecordGroupFragment
+import com.tencent.imsdk.v2.V2TIMConversation
+import com.tencent.imsdk.v2.V2TIMConversationListFilter
+import com.tencent.imsdk.v2.V2TIMConversationListener
+import com.tencent.imsdk.v2.V2TIMConversationResult
+import com.tencent.imsdk.v2.V2TIMManager
+import com.tencent.imsdk.v2.V2TIMValueCallback
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+
+class ConsultRecordViewModel : BaseViewModel() {
+    var paramsIndex = MutableStateFlow(0)
+    var consultType = MutableStateFlow(0)
+    var consultState = MutableStateFlow(0)
+    var consultRecordList = MutableSharedFlow<MutableList<ConsultRecordBean>?>()
+    var pageIndex = MutableStateFlow(1)
+    var isRefreshing = MutableStateFlow(false)
+    var isLoadMoreEnd = MutableSharedFlow<Boolean>()
+    private val pageSize = 50
+    private var nextSeq: Long = 0
+    var v2TIMConversationListener = object :
+        V2TIMConversationListener() {
+        override fun onTotalUnreadMessageCountChanged(totalUnreadCount: Long) {
+            super.onTotalUnreadMessageCountChanged(totalUnreadCount)
+            getConsultRecordList(true)
+        }
+    }
+    companion object{
+        const val CONSULT_AUDIO_VIDEO_STATE_WAIT_CONFIRM = 1
+        const val CONSULT_AUDIO_VIDEO_STATE_WAIT_START = 2
+        const val CONSULT_AUDIO_VIDEO_STATE_FINISH = 3
+        const val CONSULT_IMAGE_TEXT_STATE_IN_PROGRESS = 1
+        const val CONSULT_IMAGE_TEXT_STATE_FINISH = 2
+        const val CONSULT_IMAGE_TEXT_STATE_WAIT_REPLY = 3
+    }
+    override fun init() {
+        V2TIMManager.getConversationManager().addConversationListener(v2TIMConversationListener)
+    }
+    fun removeListener(){
+        V2TIMManager.getConversationManager().removeConversationListener(v2TIMConversationListener)
+    }
+    fun initConsultTypeAndStatus(paramsConsultType: Int, paramsConsultIndex: Int){
+        var mConsultState = 0
+        when (paramsConsultType) {
+            ConsultRecordGroupFragment.CONSULT_TYPE_IMAGE_TEXT -> {
+                mConsultState = getImageTextState(paramsConsultIndex)
+                if(CONSULT_IMAGE_TEXT_STATE_WAIT_REPLY == mConsultState || CONSULT_IMAGE_TEXT_STATE_IN_PROGRESS == mConsultState){
+                    getIMUnreadNum()
+                }
+            }
+
+            ConsultRecordGroupFragment.CONSULT_TYPE_AUDIO_VIDEO -> {
+                mConsultState = getAudioVideoState(paramsConsultIndex)
+            }
+        }
+        viewModelScope.launch {
+            paramsIndex.emit(paramsConsultIndex)
+            consultType.emit(paramsConsultType)
+            consultState.emit(mConsultState)
+        }
+    }
+    private fun getImageTextState(position: Int): Int {
+        when (position) {
+            0 -> {
+                return CONSULT_IMAGE_TEXT_STATE_WAIT_REPLY
+            }
+
+            1 -> {
+                return CONSULT_IMAGE_TEXT_STATE_IN_PROGRESS
+            }
+
+            2 -> {
+                return CONSULT_IMAGE_TEXT_STATE_FINISH
+            }
+        }
+        return 0
+    }
+
+    private fun getAudioVideoState(position: Int): Int {
+        when (position) {
+            0 -> {
+                return CONSULT_AUDIO_VIDEO_STATE_WAIT_CONFIRM
+            }
+
+            1 -> {
+                return CONSULT_AUDIO_VIDEO_STATE_WAIT_START
+            }
+
+            2 -> {
+                return CONSULT_AUDIO_VIDEO_STATE_FINISH
+            }
+        }
+        return 0
+    }
+    /**
+     * 获取咨询列表
+     */
+    fun getConsultRecordList(isRefresh: Boolean) {
+        if (1 == consultType.value &&
+            (CONSULT_IMAGE_TEXT_STATE_IN_PROGRESS == consultState.value ||
+                    CONSULT_IMAGE_TEXT_STATE_WAIT_REPLY == consultState.value)) { //如果是图文咨询并且是咨询中的状态需单独去IM获取未读会话列表再匹配咨询列表，以获取未读消息数
+            getImageTextUnderwayConsultList(paramsIndex.value,isRefresh)
+            return
+        }
+        launch(tryBlock = {
+            if (isRefresh) {
+                isRefreshing.emit(true)
+                isLoadMoreEnd.emit(false)
+                pageIndex.emit(1)
+            }
+            handleRequest(
+                WorkbenchRepository.getConsultRecord(
+                    consultType.value.toString(),
+                    consultState.value.toString(),
+                    pageIndex.value,
+                    pageSize
+                ),
+                successBlock = {
+                    if (it.result.isNullOrEmpty()) {
+                        isLoadMoreEnd.emit(true)
+                        consultRecordList.emit(mutableListOf())
+                    } else {
+                        consultRecordList.emit(it.result!!)
+                        pageIndex.value++
+                        if (it.result!!.size < pageSize) {
+                            isLoadMoreEnd.emit(true)
+                        }
+                    }
+                })
+        }, finallyBlock = {
+            isRefreshing.emit(false)
+        })
+    }
+
+    /**
+     * 获取图文咨询进行中列表
+     */
+    private fun getImageTextUnderwayConsultList(tfReply: Int,isRefresh: Boolean) {
+        launch(tryBlock = {
+            if (isRefresh) {
+                isRefreshing.emit(true)
+                isLoadMoreEnd.emit(false)
+                pageIndex.emit(1)
+                nextSeq = 0
+            }
+            var v2TIMConversationList: MutableList<V2TIMConversation> =
+                withContext(Dispatchers.IO) {
+//                    var hasUnreadCount = CONSULT_IMAGE_TEXT_STATE_WAIT_REPLY == consultState.value  //待回复状态只查询包含未读消息数的会话列表
+                    getIMConversationList(false, nextSeq, pageSize)
+                }
+            val imIdList = mutableListOf<String>()
+            for (v2TIMConversation in v2TIMConversationList) {
+                Log.i("imsdk", "success showName:" + v2TIMConversation.showName)
+                imIdList.add(if (v2TIMConversation.groupID.isNullOrEmpty()) v2TIMConversation.userID else v2TIMConversation.groupID)
+            }
+            handleRequest(
+                WorkbenchRepository.getImageTextConsultRecord(tfReply,imIdList),
+                successBlock = {
+                    if (it.result.isNullOrEmpty()) {
+//                        isLoadMoreEnd.emit(true)
+                        consultRecordList.emit(mutableListOf())
+                    } else {
+                        setImageTextConsultListUnreadNum(it.result!!, v2TIMConversationList)
+                        consultRecordList.emit(it.result!!)
+                        pageIndex.value++
+                        if (it.result!!.size < pageSize) {
+//                            isLoadMoreEnd.emit(true)
+                        }
+                    }
+                })
+        }, finallyBlock = {
+            isRefreshing.emit(false)
+        })
+    }
+
+    /**
+     * 设置咨询列表中的未读消息数
+     * @param consultList 咨询列表
+     * @param v2TIMConversationList IM获取的会话列表
+     */
+    private fun setImageTextConsultListUnreadNum(
+        consultList: MutableList<ConsultRecordBean>,
+        v2TIMConversationList: MutableList<V2TIMConversation>
+    ) {
+        consultList.forEach { consultRecordBean ->
+            v2TIMConversationList.forEach { v2TIMConversation->
+                if (consultRecordBean.imId == v2TIMConversation.groupID||consultRecordBean.imId == v2TIMConversation.userID){
+                    consultRecordBean.unreadCount = v2TIMConversation.unreadCount
+                }
+            }
+        }
+    }
+
+    /**
+     * 获取IM会话列表
+     * @param pageStartNo 会话开始位置
+     * @param pageSize 每页请求的数量
+     */
+    private suspend fun getIMConversationList(
+        hasUnreadCount: Boolean = false,
+        pageStartNo: Long,
+        pageSize: Int
+    ): MutableList<V2TIMConversation> {
+        var conversationListAsync = CoroutineScope(Dispatchers.Default).async {
+            suspendCoroutine { async ->
+                val filter = V2TIMConversationListFilter()
+                filter.conversationType = V2TIMConversation.V2TIM_GROUP
+                filter.hasUnreadCount = hasUnreadCount  //true ：返回包含未读数的会话；false：返回所有会话
+                V2TIMManager.getConversationManager().getConversationListByFilter(
+                    filter,
+                    pageStartNo,
+                    pageSize,
+                    object : V2TIMValueCallback<V2TIMConversationResult> {
+                        override fun onSuccess(v2TIMConversationResult: V2TIMConversationResult) {
+                            nextSeq = v2TIMConversationResult.nextSeq
+                            viewModelScope.launch {
+                                isLoadMoreEnd.emit(v2TIMConversationResult.isFinished)
+                            }
+                            Log.i(
+                                "imsdk",
+                                "success nextSeq:" + nextSeq + ", isFinish:" + v2TIMConversationResult.isFinished
+                            )
+                            val v2TIMConversationList = v2TIMConversationResult.conversationList
+                            async.resume(v2TIMConversationList)
+                        }
+
+                        override fun onError(code: Int, desc: String) {
+                            Log.i("imsdk", "failure, code:$code, desc:$desc")
+                        }
+                    })
+            }
+        }
+        return conversationListAsync.await()
+    }
+
+    /**
+     * 目前主要为了出发未读消息变更监听
+     */
+    fun getIMUnreadNum(){
+        V2TIMManager.getConversationManager()
+            .getTotalUnreadMessageCount(object : V2TIMValueCallback<Long> {
+                override fun onSuccess(aLong: Long) {
+                }
+
+                override fun onError(code: Int, desc: String) {
+                    Log.i("imsdk", "failure, code:$code, desc:$desc")
+                }
+            })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/ConsultWaitStartViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/ConsultWaitStartViewModel.kt
new file mode 100644
index 0000000..ea5a633
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/ConsultWaitStartViewModel.kt
@@ -0,0 +1,31 @@
+package com.yxjk.healthexpertclient.ui.workbench.viewmodel
+
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.yxjk.healthexpertclient.bean.workbench.ConsultDetailBean
+import com.yxjk.healthexpertclient.data.repository.WorkbenchRepository
+import kotlinx.coroutines.flow.MutableStateFlow
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/6 13:57
+ * @description
+ */
+@Deprecated("音视频咨询详情不同状态已整合到ConsultWaitConfirmActivity")
+class ConsultWaitStartViewModel: BaseViewModel() {
+    var recordId = MutableStateFlow("")
+    var consultDetailBean = MutableStateFlow(ConsultDetailBean())
+    override fun init() {
+        getConsultDetail()
+    }
+    fun getConsultDetail() {
+        launch({
+            handleRequest(WorkbenchRepository.getAudioVideoConsultDetail(recordId.value), successBlock = {
+                it.result?.let {  result ->
+                    consultDetailBean.emit(result)
+                }
+            })
+        })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/ImageTextConsultViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/ImageTextConsultViewModel.kt
new file mode 100644
index 0000000..6baedf4
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/ImageTextConsultViewModel.kt
@@ -0,0 +1,27 @@
+package com.yxjk.healthexpertclient.ui.workbench.viewmodel
+
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.yxjk.healthexpertclient.bean.workbench.ConsultDetailBean
+import com.yxjk.healthexpertclient.data.repository.WorkbenchRepository
+import kotlinx.coroutines.flow.MutableStateFlow
+
+class ImageTextConsultViewModel : BaseViewModel() {
+    var recordId = MutableStateFlow("")
+    var consultDetailBean = MutableStateFlow(ConsultDetailBean())
+    override fun init() {
+        getConsultDetail()
+    }
+
+    fun getConsultDetail() {
+        launch({
+            handleRequest(WorkbenchRepository.getImageTextConsultDetail(recordId.value), successBlock = {
+                it.result?.let {  result ->
+                    consultDetailBean.emit(result)
+                }
+            })
+        })
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/MessageListViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/MessageListViewModel.kt
new file mode 100644
index 0000000..2f94d8f
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/MessageListViewModel.kt
@@ -0,0 +1,53 @@
+package com.yxjk.healthexpertclient.ui.workbench.viewmodel
+
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.yxjk.healthexpertclient.bean.workbench.MessageBean
+import com.yxjk.healthexpertclient.data.repository.WorkbenchRepository
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+
+/**
+ * @author nanfeifei
+ * @time 2023/7/17 16:19
+ * @description
+ */
+class MessageListViewModel: BaseViewModel() {
+    var messageList = MutableStateFlow<MutableList<MessageBean>?>(null)
+    var pageIndex = MutableStateFlow(1)
+    var isRefreshing = MutableStateFlow(false)
+    var isLoadMoreEnd = MutableSharedFlow<Boolean>()
+    private val pageSize = 20
+    override fun init() {
+        getMessageList(true)
+    }
+    fun getMessageList(isRefresh: Boolean){
+        launch(tryBlock = {
+            if(isRefresh){
+                isRefreshing.emit(true)
+                isLoadMoreEnd.emit(false)
+                pageIndex.emit(1)
+            }
+            handleRequest(WorkbenchRepository.getMessageList(pageIndex.value, pageSize), successBlock = {
+                if(it.result == null){
+                    isLoadMoreEnd.emit(true)
+                    messageList.emit(mutableListOf())
+                }else{
+                    if(it.result.isNullOrEmpty()){
+                        isLoadMoreEnd.emit(true)
+                        messageList.emit(mutableListOf())
+                    }else{
+                        messageList.emit(it.result!!)
+                        pageIndex.value++
+                        if(it.result!!.size < pageSize){
+                            isLoadMoreEnd.emit(true)
+                        }
+                    }
+                }
+            })
+        }, finallyBlock = {
+            isRefreshing.emit(false)
+        })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/WorkbenchViewModel.kt b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/WorkbenchViewModel.kt
new file mode 100644
index 0000000..7d125e2
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/ui/workbench/viewmodel/WorkbenchViewModel.kt
@@ -0,0 +1,124 @@
+package com.yxjk.healthexpertclient.ui.workbench.viewmodel
+
+import android.util.Log
+import androidx.lifecycle.viewModelScope
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.ext.handleRequest
+import com.btpj.lib_base.ext.launch
+import com.btpj.lib_base.utils.DateUtil
+import com.yxjk.healthexpertclient.bean.workbench.WorkBenchConsultNumBean
+import com.yxjk.healthexpertclient.data.repository.WorkbenchRepository
+import com.tencent.imsdk.v2.V2TIMConversation
+import com.tencent.imsdk.v2.V2TIMConversationListFilter
+import com.tencent.imsdk.v2.V2TIMConversationListener
+import com.tencent.imsdk.v2.V2TIMManager
+import com.tencent.imsdk.v2.V2TIMValueCallback
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.launch
+
+
+class WorkbenchViewModel: BaseViewModel() {
+    var imageTextUnreadNumStr = MutableStateFlow("")
+    var audioVideoUnreadNumStr = MutableStateFlow("")
+    var assistantUnreadNumStr = MutableStateFlow("")
+    var assistantUnreadMessageTime = MutableStateFlow("")
+    var workBenchConsultNumBean = MutableStateFlow(WorkBenchConsultNumBean())
+    var assistantGroupId: String = ""
+    var isRefreshing = MutableSharedFlow<Boolean>()
+    var v2TIMConversationListener = object :
+        V2TIMConversationListener() {
+        override fun onTotalUnreadMessageCountChanged(totalUnreadCount: Long) {
+            super.onTotalUnreadMessageCountChanged(totalUnreadCount)
+            getConsultNum()
+            getAssistantUnreadNum()
+        }
+    }
+    override fun init() {
+        getConsultNum()
+        getConsultAssistantInfo()
+//        getAudioVideoUnreadNum()
+        V2TIMManager.getConversationManager().addConversationListener(v2TIMConversationListener)
+    }
+    fun removeListener(){
+        V2TIMManager.getConversationManager().removeConversationListener(v2TIMConversationListener)
+    }
+
+    fun getImageTextUnreadNum(){
+        val filter = V2TIMConversationListFilter()
+//        filter.conversationType = V2TIMConversation.V2TIM_GROUP; //拉取群聊会话
+        V2TIMManager.getConversationManager()//目前主要为了出发未读消息变更监听
+            .getTotalUnreadMessageCount(object : V2TIMValueCallback<Long> {
+                override fun onSuccess(aLong: Long) {
+//                        viewModelScope.launch {
+//                            if(aLong > 0){
+//                                imageTextUnreadNumStr.emit(aLong.toString())
+//                            }else{
+//                                imageTextUnreadNumStr.emit("")
+//                            }
+//                        }
+                }
+
+                override fun onError(code: Int, desc: String) {
+                    Log.i("imsdk", "failure, code:$code, desc:$desc")
+                }
+            })
+    }
+
+    fun getAudioVideoUnreadNum(){
+        launch(false, {
+            handleRequest(WorkbenchRepository.getAudioVideoUnreadNum(), successBlock = {
+                it.result?.let { num ->
+                    if(num.isNullOrEmpty() || "0" == num){
+                        audioVideoUnreadNumStr.emit("")
+                    }else{
+                        audioVideoUnreadNumStr.emit(num)
+                    }
+                }
+            })
+        })
+    }
+    fun getConsultNum(){
+        launch(false, {
+            handleRequest(WorkbenchRepository.getWorkBenchConsultNum(), successBlock = {
+                it.result?.let { it1 -> workBenchConsultNumBean.emit(it1) }
+            })
+        }, finallyBlock = {
+            isRefreshing.emit(false)
+        })
+    }
+
+    fun getAssistantUnreadNum(){
+        V2TIMManager.getConversationManager()
+            .getConversation(String.format("group_%s", assistantGroupId)
+                , object : V2TIMValueCallback<V2TIMConversation?> {
+                override fun onSuccess(v2TIMConversation: V2TIMConversation?) {
+                    v2TIMConversation?.let {
+                        viewModelScope.launch {
+                            assistantUnreadNumStr.emit(v2TIMConversation.unreadCount.toString())
+                            var message = v2TIMConversation.lastMessage
+                            message?.let {
+                                assistantUnreadMessageTime.emit(
+                                    DateUtil.getTimeFromNow(
+                                        DateUtil.getLongDateStr(message.timestamp * 1000)))
+                            }
+                        }
+                    }
+                }
+
+                override fun onError(code: Int, desc: String) {
+                    Log.i("imsdk", "failure, code:$code, desc:$desc")
+                }
+            })
+
+    }
+    fun getConsultAssistantInfo(){
+        launch({
+            handleRequest(WorkbenchRepository.getConsultAssistantInfo(), successBlock = {
+                it.result?.let { result ->
+                    assistantGroupId = result
+                }
+            })
+        })
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/utils/AndroidBug5497Workaround.kt b/app/src/main/java/com/yxjk/healthexpertclient/utils/AndroidBug5497Workaround.kt
new file mode 100644
index 0000000..a090c66
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/utils/AndroidBug5497Workaround.kt
@@ -0,0 +1,58 @@
+package com.yxjk.healthexpertclient.utils
+
+import android.R
+import android.app.Activity
+import android.graphics.Rect
+import android.view.View
+import android.widget.FrameLayout
+
+/**
+ * @class describe
+ * @anthor nanfeifei email:18600752302@163.com
+ * @time 2019/8/5 15:37
+ */
+class AndroidBug5497Workaround private constructor(activity: Activity) {
+    private val mChildOfContent: View
+    private var usableHeightPrevious = 0
+    private val frameLayoutParams: FrameLayout.LayoutParams
+    private var initheight = 0
+    private fun possiblyResizeChildOfContent() {
+        val tempheight = mChildOfContent.height
+        if (initheight < tempheight) {
+            initheight = tempheight
+        }
+        val usableHeightNow = computeUsableHeight()
+        if (usableHeightNow != usableHeightPrevious) {
+            val usableHeightSansKeyboard = mChildOfContent.rootView.height
+            val heightDifference = usableHeightSansKeyboard - usableHeightNow
+            if (heightDifference > usableHeightSansKeyboard / 4) {
+                frameLayoutParams.height = usableHeightSansKeyboard - heightDifference
+            } else {
+                frameLayoutParams.height = initheight
+            }
+            mChildOfContent.requestLayout()
+            usableHeightPrevious = usableHeightNow
+        }
+    }
+
+    private fun computeUsableHeight(): Int {
+        val r = Rect()
+        mChildOfContent.getWindowVisibleDisplayFrame(r)
+        return r.bottom - r.top
+    }
+
+    companion object {
+        // For more information, see https://code.google.com/p/android/issues/detail?id=5497
+        // To use this class, simply invoke assistActivity() on an Activity that already has its content view set.
+        fun assistActivity(activity: Activity) {
+            AndroidBug5497Workaround(activity)
+        }
+    }
+
+    init {
+        val content = activity.findViewById<View>(R.id.content) as FrameLayout
+        mChildOfContent = content.getChildAt(0)
+        mChildOfContent.viewTreeObserver.addOnGlobalLayoutListener { possiblyResizeChildOfContent() }
+        frameLayoutParams = mChildOfContent.layoutParams as FrameLayout.LayoutParams
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/utils/AuthCodeCountDownTimer.kt b/app/src/main/java/com/yxjk/healthexpertclient/utils/AuthCodeCountDownTimer.kt
new file mode 100644
index 0000000..95175dd
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/utils/AuthCodeCountDownTimer.kt
@@ -0,0 +1,97 @@
+package com.yxjk.healthexpertclient.utils
+
+import android.os.CountDownTimer
+import android.text.TextUtils
+import android.widget.TextView
+import androidx.core.content.ContextCompat
+import com.btpj.lib_base.BaseApp.Companion.appContext
+import com.yxjk.healthexpertclient.R
+
+/**
+ * nanfeifei
+ * 2018/4/9 11:14
+ *
+ * @version 4.6.6
+ */
+class AuthCodeCountDownTimer(private val  authButton: TextView?, millisInFuture: Long, countDownInterval: Long) :
+    CountDownTimer(millisInFuture, countDownInterval) {
+    private var tickText: String? = null
+    private var finishText: String? = null
+    private var tickBackgroundResource = 0
+    private var finishBackgroundResource = 0
+    private var tickTextColor = 0
+    private var finishTextColor = 0
+
+
+
+    override fun onTick(millisUntilFinished: Long) {
+        if (TextUtils.isEmpty(tickText)) {
+            authButton?.text = appContext.getString(
+                R.string.auth_code_tick_text,
+                appContext.getString(R.string.auth_code_retry_send_auth_code),
+                appContext.getString(
+                    R.string.auth_code_count_down_timer, millisUntilFinished / 1000
+                )
+            )
+        } else {
+            authButton?.text = appContext.getString(
+                R.string.auth_code_tick_text,
+                tickText,
+                appContext.getString(
+                    R.string.auth_code_count_down_timer, millisUntilFinished / 1000
+                )
+            )
+        }
+        if (tickBackgroundResource == 0) {
+            authButton?.setBackgroundResource(R.drawable.rectangle_round_corner5_dark_grey)
+        } else {
+            authButton?.setBackgroundResource(tickBackgroundResource)
+        }
+        if (tickTextColor == 0) {
+            authButton?.setTextColor(
+                ContextCompat.getColor(
+                    appContext,
+                    R.color.white
+                )
+            )
+        } else {
+            authButton?.setTextColor(
+                ContextCompat.getColor(
+                    appContext,
+                    tickTextColor
+                )
+            )
+        }
+        authButton?.isClickable = false
+    }
+
+    override fun onFinish() {
+        if (TextUtils.isEmpty(finishText)) {
+            authButton?.text = appContext.getString(R.string.auth_code_get_auth_code)
+        } else {
+            authButton?.text = finishText
+        }
+        if (finishBackgroundResource == 0) {
+            authButton?.setBackgroundResource(R.drawable.rectangle_round_corner5_theme)
+        } else {
+            authButton?.setBackgroundResource(finishBackgroundResource)
+        }
+        if (finishTextColor == 0) {
+            authButton?.setTextColor(
+                ContextCompat.getColor(
+                    appContext,
+                    R.color.white
+                )
+            )
+        } else {
+            authButton?.setTextColor(
+                ContextCompat.getColor(
+                    appContext,
+                    finishTextColor
+                )
+            )
+        }
+        authButton?.isClickable = true
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/utils/BrandUtil.java b/app/src/main/java/com/yxjk/healthexpertclient/utils/BrandUtil.java
new file mode 100644
index 0000000..ee9d1be
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/utils/BrandUtil.java
@@ -0,0 +1,84 @@
+package com.yxjk.healthexpertclient.utils;
+
+import com.tencent.qcloud.tuicore.util.TUIBuild;
+
+public class BrandUtil {
+    /**
+     * Xiaomi device
+     */
+    public static boolean isBrandXiaoMi() {
+        return "xiaomi".equalsIgnoreCase(getBuildBrand())
+                || "xiaomi".equalsIgnoreCase(getBuildManufacturer());
+    }
+
+    /**
+     * huawei device
+     */
+    public static boolean isBrandHuawei() {
+        return "huawei".equalsIgnoreCase(getBuildBrand()) ||
+                "huawei".equalsIgnoreCase(getBuildManufacturer()) ||
+                "honor".equalsIgnoreCase(getBuildBrand());
+    }
+
+    /**
+     * meizu device
+     */
+    public static boolean isBrandMeizu() {
+        return "meizu".equalsIgnoreCase(getBuildBrand())
+                || "meizu".equalsIgnoreCase(getBuildManufacturer())
+                || "22c4185e".equalsIgnoreCase(getBuildBrand());
+    }
+
+    /**
+     * oppo device
+     *
+     * @return
+     */
+    public static boolean isBrandOppo() {
+        return "oppo".equalsIgnoreCase(getBuildBrand()) ||
+                "realme".equalsIgnoreCase(getBuildBrand()) ||
+                "oneplus".equalsIgnoreCase(getBuildBrand()) ||
+                "oppo".equalsIgnoreCase(getBuildManufacturer()) ||
+                "realme".equalsIgnoreCase(getBuildManufacturer()) ||
+                "oneplus".equalsIgnoreCase(getBuildManufacturer());
+    }
+
+    /**
+     * vivo device
+     *
+     * @return
+     */
+    public static boolean isBrandVivo() {
+        return "vivo".equalsIgnoreCase(getBuildBrand())
+                || "vivo".equalsIgnoreCase(getBuildManufacturer());
+    }
+
+    /**
+     * honor device
+     *
+     * @return
+     */
+    public static boolean isBrandHonor() {
+        return "honor".equalsIgnoreCase(getBuildBrand()) && "honor".equalsIgnoreCase(getBuildManufacturer());
+    }
+
+    public static String getBuildBrand() {
+        return TUIBuild.getBrand();
+    }
+
+    public static String getBuildManufacturer() {
+        return TUIBuild.getManufacturer();
+    }
+
+    public static String getBuildModel() {
+        return TUIBuild.getModel();
+    }
+
+    public static String getBuildVersionRelease() {
+        return TUIBuild.getVersion();
+    }
+
+    public static int getBuildVersionSDKInt() {
+        return TUIBuild.getVersionInt();
+    }
+}
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/utils/CommonUtils.kt b/app/src/main/java/com/yxjk/healthexpertclient/utils/CommonUtils.kt
new file mode 100644
index 0000000..eb13152
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/utils/CommonUtils.kt
@@ -0,0 +1,154 @@
+package com.yxjk.healthexpertclient.utils
+
+import android.graphics.Color
+import com.btpj.lib_base.BaseApp.Companion.appContext
+import com.btpj.lib_base.data.local.DataStoreManager
+import com.btpj.lib_base.ext.jsonToBean
+import com.btpj.lib_base.ext.toJson
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.UserInfoBean
+import com.yxjk.healthexpertclient.ext.logout
+import java.util.regex.Matcher
+import java.util.regex.Pattern
+import kotlin.random.Random
+import kotlin.random.asJavaRandom
+
+object CommonUtils {
+    fun saveUserInfo(userBean: UserInfoBean){
+        DataStoreManager.saveToken(userBean.userToken)
+        DataStoreManager.saveUserInfo(userBean.toJson())
+    }
+    fun getUserInfo(): UserInfoBean?{
+        return DataStoreManager.getUserInfo().jsonToBean(UserInfoBean::class.java)
+    }
+
+    fun clearUserInfo(){
+        DataStoreManager.saveToken("")
+        DataStoreManager.saveUserInfo("")
+        logout()
+    }
+    fun getRandomColor(): Int {
+        val rnd = Random.asJavaRandom()
+        return Color.argb(255, rnd.nextInt(256), rnd.nextInt(256), rnd.nextInt(256))
+    }
+    /**
+     * 截取字符串中数字并返回数字
+     */
+    fun getNumbers(content: String): Long {
+        var result = content.filter { it.isDigit() }
+        if(result.isNullOrEmpty()){
+            return -1
+        }else{
+            return result.toLong()
+        }
+    }
+    fun getConsultTypeText(type: String?): String {
+        return when(type){
+            "1" -> {
+                appContext.getString(R.string.consult_type_image_text)
+            }
+
+            "2" -> {
+                appContext.getString(R.string.consult_type_audio_video)
+            }
+
+            else -> {
+                ""
+            }
+        }
+    }
+    fun getGenderText(gender: String?): String{
+        return when(gender){
+            "1" -> {
+                appContext.getString(R.string.gender_woman)
+            }
+
+            "2" -> {
+                appContext.getString(R.string.gender_man)
+            }
+
+            else -> {
+                ""
+            }
+        }
+    }
+    fun getAmPmText(amPm: String?): String {
+        return when(amPm){
+            "0" -> {
+                appContext.getString(R.string.consult_time_am)
+            }
+
+            "1" -> {
+                appContext.getString(R.string.consult_time_pm)
+            }
+
+            else -> {
+                ""
+            }
+        }
+    }
+    fun getIncomeText(waterType: String, income: String): String{
+        return when(waterType){
+            "1" -> {
+                "+$income"
+            }
+
+            "2" -> {
+                "-$income"
+            }
+
+            else -> {
+                ""
+            }
+        }
+    }
+    fun getIncomeTextColor(waterType: String): Int{
+        return when(waterType){
+            "1" -> {
+                R.color.theme_color
+            }
+
+            "2" -> {
+                R.color.text_black_33
+            }
+
+            else -> {
+                R.color.text_black_33
+            }
+        }
+    }
+
+    /**
+     * 规则3：必须同时包含大小写字母及数字
+     * 是否包含
+     *
+     * @param str
+     * @return
+     */
+    fun isPasswordMatches(str: String): Boolean {
+        var isDigit = false //定义一个boolean值，用来表示是否包含数字
+        var isLowerCase = false //定义一个boolean值，用来表示是否包含字母
+        var isUpperCase = false
+        for (i in str.indices) {
+            if (Character.isDigit(str[i])) {   //用char包装类中的判断数字的方法判断每一个字符
+                isDigit = true
+            } else if (Character.isLowerCase(str[i])) {  //用char包装类中的判断字母的方法判断每一个字符
+                isLowerCase = true
+            } else if (Character.isUpperCase(str[i])) {
+                isUpperCase = true
+            }
+        }
+        val regex = "^[a-zA-Z0-9]+$"
+        return isDigit && isLowerCase && isUpperCase && isSpecialCharacter(str) && !str.matches(Regex(regex))
+    }
+    /**
+     * 判断字符串中是否包含特殊字符
+     */
+    fun isSpecialCharacter(str: String): Boolean{
+//        "!\\\"#\$%&'()*+,-./:;<=>?@\\\\]\\\\[^_`{|}~"
+        val speChat = "[`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~！@#￥%……&*（）——+|{}【】‘；：”“’。，、？]"
+        val pattern: Pattern = Pattern.compile(speChat)
+        val matcher: Matcher = pattern.matcher(str)
+        return matcher.find()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/utils/ConstantUtils.kt b/app/src/main/java/com/yxjk/healthexpertclient/utils/ConstantUtils.kt
new file mode 100644
index 0000000..cd411e3
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/utils/ConstantUtils.kt
@@ -0,0 +1,265 @@
+package com.yxjk.healthexpertclient.utils
+
+object ConstantUtils {
+    const val mIsDebug = false
+    const val IM_APP_ID = 1400805830
+    const val RSA_PUBLIC_KEY =
+        "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmZfR/bA9X3vp86y1aEpvwzXJYKRRF1fLau2+05/ZtaITLpV8bhkmSf3neSy/Q9gAdvG75Fr73E+GWE+K5b0BpvIS1jDGo319+PpZR39SaZTKZ27XFXrosmJTZutN79t819HS1VseleunHAFgMVufE9U5jP6LGzl/wbkSy01GhzwIDAQAB"
+    var  mPrivacy = "本平台由西安仁康信息科技有限公司开发和运维，平台深知个人信息对您的重要性，并会尽全力保护您的个人信息安全可靠。我们致力于维持您对我们的信任，恪守以下原则，保护您的个人信息：权责一致原则、目的明确原则、选择同意原则、最少够用原则、确保安全原则、主体参与原则、公开透明原则等。同时，我们承诺将采取相应的安全保护措施来保护您的个人信息。请在使用平台服务前，仔细阅读并了解本隐私权政策，我们将按照本政策收集、处理及披露您的信息。\n" +
+            "本政策将帮助您了解以下内容：\n" +
+            "1、定义\n" +
+            "2、我们可能收集的信息\n" +
+            "3、我们如何收集和使用您的个人信息\n" +
+            "4、我们如何使用 Cookie 和同类技术\n" +
+            "5、我们如何共享、转让、公开披露您的个人信息\n" +
+            "6、员工业务数据和公开信息\n" +
+            "7、我们如何保护您的个人信息\n" +
+            "8、您如何管理您的个人信息\n" +
+            "9、我们如何处理未成年人的个人信息\n" +
+            "10、本声明和政策如何更新\n" +
+            "11、如何联系我们\n" +
+            "一、定义\n" +
+            "1. 个人信息：\n" +
+            "指以电子或者其他方式记录的与已识别或者可识别的自然人有关的各种信息，不包括匿名化处理后的信息\n" +
+            "2. 个人健康信息\n" +
+            "指以电子或者其他方式记录的能够单独或者与其他信息结合识别特定自然人身份或者反映特定自然人活动情况的各种健康信息，一旦泄露或者非法使用，可能导致个人受到歧视或者人身、财产受到严重危害的个人信息，包括如姓名、出生日期、身份证件号码、体检信息、就医信息、住址、通讯联系方式、通信记录和内容、账号密码、行踪轨迹、民族、个人生物特征、医疗健康、金融账户、个人行踪、不满十四周岁未成年人信息等。\n" +
+            "3. 未成年人：指不满18周岁的自然人。\n" +
+            "4. 儿童：指不满14周岁的自然人。\n" +
+            "5. 设备信息\n" +
+            "包括设备标识符 (IMEI、IDFA、Android1D、MAC、OAID、IMSI、SIM 卡序列号 (ICCID) 、设备序列号及其他设备相关信息)，应用信息 (应用崩溃信息、通知开关状态、运行中进程、应用安装列表及其他应用相关信息) ，设备参数及系统信息(设备类型、设备型号、操作系统及硬件相关信息)，设备网络环境信息 (IP地址，WiFi信息，基站信息及其他网络相关信息)，蓝牙信息，广播组件通讯信息，运营商信息，传感器 (陀螺仪、重力传感器、加速度传感器、环境传感器、光学心率传感器)，剪切板。以产品实际采集情况为准。\n" +
+            "6. 业务数据\n" +
+            "不同于个人信息，是指平台员工利用平台的服务上传、下载、分发等通过平台的技术服务处理的数据。\n" +
+            "二、我们可能收集的信息\n" +
+            "我们提供服务时，可能会收集、储存和使用下列与个人有关的信息。如果您不提供相关信息，可能无法注册成为平台员工或无法享受平台的某些服务，或者无法达到相关服务拟达到的效果。\n" +
+            "2.1 与个人身份无关\n" +
+            "当您使用平台的服务时，我们可能收集和汇总诸如员工的来源途径、访问顺序、停留时间等信息，例如记录使用平台服务的每个员工的来源途径、浏览器软件等。\n" +
+            "2.2 与个人身份有关\n" +
+            "当您使用平台的服务时，我们可能收集和汇总或要求您提供有关个人身份的信息，例如：\n" +
+            "(1) 个人身份证明（包括身份证图片和身份证号、手机号、邮箱等）；\n" +
+            "(2) 个人补充信息（姓名、生日、籍贯、性别、兴趣爱好、学历、个人联系电话、住址、工作信息、婚姻状况、健康状况、；\n" +
+            "(3) 网络身份标识信息（包括系统账号、IP地址、电子邮箱地址及与前述有关的密码、口令、口令保护答案、个人数字证书等）；\n" +
+            "(4) 个人健康信息（包括：姓名、性别、出生日期、身高体重、就诊卡、所在城市，所患病症、患病时长、体检报告、住院记录、诊治情况、检验报告、体检报告、用药记录、以往病史、过敏信息、家族史、患病史等，和历史咨询记录。\n" +
+            "(5) 相机、相册（设备的相机功能，以拍摄照片或录制视频）；\n" +
+            "(6) 麦克风（通话、发送录音文件）；\n" +
+            "(7) 悬浮窗（在其他程序页面仍能保持应用内通话）；\n" +
+            "(8) 日历（访问用户的日历，以便将预约信息添加到日历中）；\n" +
+            "(9) 存储（访问设备存储器中的文件、照片和视频）；\n" +
+            "(10) 个人上网记录和日志信息（包括网站浏览记录、软件使用记录、点击记录、操作日志等）；\n" +
+            "(11) 设备信息（包括设备型号、设备MAC地址、操作系统类型、设备设置）；\n" +
+            "(12) 软件列表唯一设备识别码（如IMEI/android ID/IDFA/OPENUDID/GUID、SIM卡IMSI信息等在内的描述个人常用设备基本情况的信息）；\n" +
+            "(13) 拨打电话（唤起手机拨号界面并自动填充电话）\n" +
+            "(14) 个人位置信息（包括精准定位信息、经纬度等）；\n" +
+            "(15) 其他平台基于为您提供服务需要而收集或汇总的您的信息。\n" +
+            "三、我们如何收集和使用您的个人信息\n" +
+            "1. 您直接提供的信息：我们可能会收集您在专家端注册账号、申请或使用我们的服务时填写，通过现场交谈、电话、视频或其他联系方式与我们联系时所提供的信息，以及您在使用我们服务过程中产生的与您的交易和活动有关的信息。\n" +
+            "(1) 帮助您成为我们的一员\n" +
+            "您需要向平台提供真实姓名、邮箱、有效身份证件（包括但不限于身份证）的号码，以便于我们进行实名认证。您可以修改和补充您的昵称、性别、生日、职级、职称、学历、亲属、紧急联系人、工作信息（单位部门）、婚姻状况、健康类型、兴趣爱好以及您的实名认证等一系列相关信息相关信息，这些信息均属于您的“账号信息”。您补充的账户信息将有助于我们为您提供与您信息更匹配的相关业务服务（急救协助、医院体检、健康知识推送等）。如果您不提供这些信息，可能会影响您对平台部分核心业务功能的正常使用，如咨询专家等，但不会影响您进行基本的浏览、搜索。如果您不提供这些信息，将会影响您使用平台的部分功能，如咨询专家，但不会影响您使用平台服务的基本浏览、搜索功能。在您主动注销账号时，我们将根据相关法律法规的要求尽快使其匿名或删除您的个人信息。\n" +
+            "(2) 咨询专家\n" +
+            "为便于您能够咨询专家，您需提供真实姓名、手机号、身份证号码、性别、出生日期、身高体重等信息。为更好地向您提供咨询服务解决您的问题，更加精准、快速地向您推荐医生，我们可能需要您在健康咨询时提供个人健康信息，例如：病症、患病时长、检验报告、体检报告、医院就诊信息、诊治情况、用药记录、以往病史、过敏信息、家族史、患病史等。如您不提供上述信息，将会影响您使用部分健康咨询等功能，但不影响您使用平台产品或服务的基本浏览、搜索功能。应急救援\n" +
+            "(1) 您实名成为专家端的用户后，若您或您的朋友发生了意外事件，你可以通过查看系统内的相关医疗资源，并向平台发起帮助请求。在此过程中，我们可能会通过您的基本信息和聊天功能获取您的手机号、您的紧急联系人姓名和联系 电话，位置、姓名、性别、年龄、健康状况、事故详情介绍的图文、音视频沟通的信息。搜索\n" +
+            "(3) 搜索\n" +
+            "为了让您快速地找到您所需要的专家、知识文章、软件功能、医院等，我们可能会收集您使用我们的产品记录为您提供这些信息展示的最优方式。我们也会为了不断改进和优化上述的功能来使用您的上述个人信息。\n" +
+            "您也可以通过搜索来精准地找到您所需要的专家、医院、系统功能。我们会保留您的搜索内容以方便您重复输入或为您展示与您搜索内容相关联的产品或服务。\n" +
+            "(4) 应急救援\n" +
+            "您实名成为专家端的用户后，若您或您的朋友发生了意外事件，你可以通过查看系统内的相关医疗资源，并向平台发起帮助请求。在此过程中，我们可能会通过您的基本信息和聊天功能获取您的手机号、您的紧急联系人姓名和联系 电话，位置、姓名、性别、年龄、健康状况、事故详情介绍的图文、音视频沟通的信息。\n" +
+            "(5) 大病就医（挂号）\n" +
+            "为了帮您预约医院的专家，我们需要您在预约时提供个人基本信息：姓名、性别、年龄、预约医院、挂号类型、预约时间等基本信息；你可补充病况、就诊卡号、预约科室、医师来进一步享受更为准确的服务。\n" +
+            "(6) 体检预约、体检报告查看、体检指标分析\n" +
+            "为帮助您可以在APP预约体检服务，查看体检报告，并对您的相关指标进行分析。我们需要获取您的姓名、性别、年龄、健康状态、 工作信息（部门单位）。\n" +
+            "2. 我们在您使用服务过程中收集的信息\n" +
+            "为向您提供更契合您需求的页面展示和搜索结果、了解服务适配性、识别账号异常状态，我们会收集关于您使用的服务以及使用方式的信息并将这些信息进行关联，这些信息包括：\n" +
+            "设备信息：我们会根据您在软件安装及使用中授予的具体权限，接收并记录您所使用的设备相关信息（例如设备型号、操作系统版本、设备设置、唯一设备标识符等软硬件特征信息）、设备所在位置相关信息（例如IP 地址、GPS位置以及能够提供相关信息的Wi-Fi 接入点、蓝牙和基站等传感器信息）。\n" +
+            "日志信息：当您使用我们的网站或用户端提供的服务时，我们会自动收集您对我们服务的详细使用情况，作为有关网络日志保存。例如您的搜索查询内容、IP地址、浏览器的类型、电信运营商、使用的语言、访问日期和时间及您访问的网页记录等。\n" +
+            "请注意，单独的设备信息、日志信息等是无法识别特定自然人身份的信息。如果我们将这类非个人信息与其他信息结合用于识别特定自然人身份，或者将其与个人信息结合使用，则在结合使用期间，这类非个人信息将被视为个人信息，除取得您授权或法律法规另有规定外，我们会将该类个人信息做匿名化、去标识化处理。\n" +
+            "为展示您的健康信息，我们会收集您在使用我们服务过程中产生的健康咨询详情（包括但不限于图片、文字、视频、语音）、预约挂号记录、咨询记录、个人健康信息、检查检验、医生诊断结果等用于向您展示及便于您对信息进行管理。\n" +
+            "当您与我们联系时，我们可能会保存您的通信/通话记录和内容或您留下的联系方式等信息，以便与您联系或帮助您解决问题，或记录相关问题的处理方案及结果。\n" +
+            "3. 我们通过间接获得方式收集到的您的个人信息\n" +
+            "我们可能从第三方获取您授权共享的账户信息（头像、昵称、联系方式），并在您同意声明和政策后将您的第三方账户与您的账户绑定，使您可以通过第三方账户直接登录并使用平台服务。我们会将依据与第三方的约定、对个人信息来源的合法性进行确认后，在符合相关法律和法规规定的前提下，使用您的这些个人信息。\n" +
+            "如您拒绝提供上述信息或拒绝授权，可能无法使用我们的相应服务，或者无法展示相关信息，但不影响使用平台的健康咨询等核心服务。\n" +
+            "为您提供安全保障\n" +
+            "请注意，为向您提供更好的安全保障，您可以向我们提供姓名、身份证、就诊卡、邮箱等身份信息完成实名认证。如您拒绝提供上述信息，可能无法预约或咨询特定专家、继续可能存在风险的操作等，但不会影响您使用浏览、搜索等服务。\n" +
+            "为提高您使用我们提供服务的安全性，更好地预防钓鱼网站、欺诈、网络漏洞、计算机病毒、网络攻击、网络侵入等安全风险，更准确地识别违反法律法规或平台相关协议规则的情况，我们可能使用或整合您的账户信息、交易信息、设备信息、有关网络日志以及我们取得您授权或依据法律共享的信息，来进行身份验证、检测及防范安全事件，并依法采取必要的记录、审计、分析、处置措施。\n" +
+            "4. 其他用途\n" +
+            "我们将信息用于本声明和政策未载明的其他用途，或者将基于特定目的收集而来的信息用于其他目的时，会事先征求您的同意。\n" +
+            "5. 征得授权同意的例外\n" +
+            "根据相关法律法规规定，以下情形中收集您的个人信息无需征得您的授权同意：\n" +
+            "1、与国家安全、国防安全有关的；\n" +
+            "2、与公共安全、公共卫生、重大公共利益有关的；\n" +
+            "3、与犯罪侦查、起诉、审判和判决执行等有关的；\n" +
+            "4、出于维护个人信息主体或其他个人的生命、财产等重大合法权益但又很难得到您本人同意的；\n" +
+            "5、所收集的个人信息是您自行向社会公众公开的；\n" +
+            "6、从合法公开披露的信息中收集个人信息的，如合法的新闻报道、政府信息公开等渠道；\n" +
+            "7、根据您的要求签订合同所必需的；\n" +
+            "8、用于维护所提供的产品或服务的安全稳定运行所必需的，例如发现、处置产品或服务的故障；\n" +
+            "9、为合法的新闻报道所必需的；\n" +
+            "10、学术研究机构基于公共利益开展统计或学术研究所必要，且对外提供学术研究或描述的结果时，对结果中所包含的个人信息进行去标识化处理的；\n" +
+            "11、法律法规规定的其他情形。\n" +
+            "如我们停止平台的产品或服务，我们将及时停止继续收集您个人信息的活动，对所持有的个人信息进行删除或匿名化处理。\n" +
+            "6. 设备权限调用：在向您提供服务的过程中，为了实现特定的产品功能，我们会向您的设备系统申请调用以下设备权限，申请前我们会征询您的同意，您可以选择“允许”或者“禁止”权限申请。申请成功后，您可以随时进入手机“设置-权限管理”中关闭相应权限，不过权限关闭后有关产品功能可能无法正常使用，请您理解：\n" +
+            "(1) 位置\n" +
+            "您需要授权我们使用位置权限，以便于我们基于位置向您展示、推送急救资源，显示医院位置等信息。您在首次打开移动平台和使用相关业务时会看到弹窗提醒，询问您是否授权。\n" +
+            "(2) 通讯录\n" +
+            "在视话咨询时为保护医生和员工双方个人信息安全，我们提供中转电话服务。您需要授权我们使用通讯录权限，以便于我们对此电话进行标识。您在使用相应功能时会看到弹窗提醒，询问您是否授权。如您拒绝授权，可能无法正常在视话咨询中使用电话进行沟通。\n" +
+            "(3) 相机、相册\n" +
+            "您需要授权我们使用相机权限，以便于使用我们的核心业务功能，如在咨询中发送图片或视频通话。您在使用相应功能时会看到弹窗提醒，询问您是否授权。如您拒绝授权，可能无法正常在咨询中进行视频通话。\n" +
+            "(4) 通知栏\n" +
+            "您需要授权我们使用通知权限，以便于使用所有基于此权限实现的功能，如咨询状态、体检报告等各类消息提醒。您在首次打开移动平台时会看到弹窗提醒，询问您是否授权。如您拒绝授权，可能无法正常获取各类消息提醒。\n" +
+            "(5) 存储\n" +
+            "您需要授权我们使用存储权限，以便于在急救和咨询时候使用发送文件、图片、照片等功能，同时我们的移动平台可以写入、存储员工信息和日志等。您在首次打开移动平台和使用相应功能时会看到弹窗提醒，询问您是否授权。如您拒绝授权，可能无法正常使用使用移动平台。\n" +
+            "(6) 麦克风\n" +
+            "您需要授权我们使用麦克风权限，以便于使用我们的核心业务功能，如在咨询咨询中发送语音消息或视频通话。您在使用相应功能时会看到弹窗提醒，询问您是否授权。如您拒绝授权，可能无法正常在咨询中进行视频通话。\n" +
+            "(7) 悬浮窗\n" +
+            "您需要授权我们使用悬浮窗权限，当您在咨询/应急业务时正在进行语音/音视频通话时候您可切换APP继续使用手机其他功能。您在使用相应功能时会看到弹窗提醒，询问您是否授权。如您拒绝授权，可能无法正常在咨询中进行视频通话。\n" +
+            "设备权限 使用目的\n" +
+            "存储 聊天过程中发送和接收相关文件\n" +
+            "相机 应急请求和咨询专家业务聊天过程中发送图片\n" +
+            "相册 应急请求和咨询专家业务聊天过程中发送图片\n" +
+            "位置 用于向用户提供地图上的资源数据，聊天发送位置\n" +
+            "麦克风（音频） 与专家音视频交流、聊天语音输入，拍摄视频\n" +
+            "悬浮窗 在其他程序页面仍能保持应用内通话\n" +
+            "短信 获取验证码修改密码\n" +
+            "通知栏 对您在系统内使用的业务（如预约体检、专家咨询），及时进行通知\n" +
+            "拨打电话 在查看地图资源发起急救时候，跳转手机拨打电话\n" +
+            "日历 找专家进行咨询、预约专家，大病就医挂号医院，预约去医院体检的日期需访问日历\n" +
+            "请您注意，您开启以上权限即代表您授权我们可以收集和使用这些个人信息来实现上述的功能，您关闭权限即代表您取消了这些授权，则我们将不再继续收集和使用您的这些个人信息，也无法为您提供上述与这些授权所对应的功能。您关闭权限的决定不会影响此前基于您的授权所进行的个人信息的处理。除此以外，我们在相关业务功能中可能还需要您开启设备的其他访问权限，详细权限和使用目的如下：\n" +
+            "（1）android.permission.INTERNET（访问网络权限）：实现应用程序联网\n" +
+            "（2）android.permission.ACCESS_WIFI_STATE（获取WiFi状态权限）：监控网络变化，提示用户当前网络环境\n" +
+            "（3）android.permission.ACCESS_NETWORK_STATE（获取网络状态权限）：监控网络变化，提示用户当前网络环境\n" +
+            "（4）android.permission.VIBRATE（使用振动权限）：允许手机振动\n" +
+            "（5）android.permission.WAKE_LOCK（唤醒锁定权限）：允许程序在手机屏幕关闭后后台进程仍然运行，保持屏幕唤醒\n" +
+            "（6）android.permission.RESTART_PACKAGES（结束系统任务权限）：重新启动应用\n" +
+            "（7）android.permission.MODIFY_AUDIO_SETTINGS（修改声音设置权限）：修改全局音频设置，例如调节音量和用于输出的扬声器\n" +
+            "（8）android.permission.BLUETOOTH（使用蓝牙权限）：小程序蓝牙功能模块使用\n" +
+            "（9）(android.permission.BLUETOOTH_ADMIN)（蓝牙管理权限）：小程序蓝牙功能模块使用\n" +
+            "（10）android.permission.SYSTEM_ALERT_WINDOW（悬浮窗权限）：观看直播、短视频悬浮窗播放\n" +
+            "（11） android.permission.ACCESS_BACKGROUND_LOCATION（支持后台访问位置权限）：保持持续定位能力\n" +
+            "（12）android.permission.WRITE SYSTEM（读写系统设置权限）：允许应用读写系统设置项\n" +
+            "（13）android.permission.GET_TASKS（获取任务信息权限）：允许应用获取当前或最近运行的应用\n" +
+            "（14）android.permission.CHANGE_WIFI_STATE（改变WiFi状态权限）：允许应用改变WiFi状态\n" +
+            "（15）android.permission.CHANGE_NETWORK_STATE（改变网络连接状态）：允许应用改变网络连接状态\n" +
+            "四、我们如何使用 Cookie 和同类技术\n" +
+            "1. 4.1 Cookie\n" +
+            "为确保网站正常运转、为您获得更轻松的访问体验、向您推荐您可能感兴趣的内容，我们会在您的计算机或移动设备上存储名为 Cookie 的小数据文件。Cookie 通常包含标识符、站点名称以及一些号码和字符。借助于 Cookie，网站能够记住您的选择，提供个性化增强服务等。\n" +
+            "您可根据自己的偏好管理或删除Cookie。有关详情，请参见 AboutCookies.org。您可以清除计算机上保存的所有 Cookie，大部分网络浏览器都设有阻止 Cookie 的功能。但如果您这么做，则需要在每一次访问平台时更改员工设置。如需详细了解如何更改浏览器设置，请访问您使用的浏览器的相关设置页面。\n" +
+            "2. 4.2 网站信标和像素标签\n" +
+            "除 Cookie 外，我们还会在网站上使用网站信标和像素标签等其他同类技术。例如，我们向您发送的电子邮件可能含有链接至我们网站内容的地址链接，如果您点击该链接，我们则会跟踪此次点击，帮助我们了解您的服务偏好以便于我们主动改善服务体验。网站信标通常是一种嵌入到网站或电子邮件中的透明图像。借助于电子邮件中的像素标签，我们能够获知电子邮件是否被打开。\n" +
+            "五、我们如何共享、转让、公开披露您的个人信息\n" +
+            "1. 共享\n" +
+            "我们不会与平台服务提供者以外的任何公司、组织和个人分享您的个人信息，但以下情况除外：\n" +
+            "1、在获取明确同意的情况下共享：获得您的明确同意后，我们会与其他方共享您的个人信息。\n" +
+            "2、我们可能会根据法律法规规定，或按政府主管部门的强制性要求，对外共享您的个人信息。\n" +
+            "3、与授权合作机构共享：仅为实现本声明和政策中声明的目的，我们的某些服务将由授权合作机构提供。我们可能会与合作机构共享您的某些个人信息，以提供更好的服务和员工体验。我们仅会出于合法、正当、必要、特定、明确的目的共享您的个人信息，并且只会共享提供服务所必要的个人信息。我们的合作机构无权将共享的个人信息用于任何其他用途。\n" +
+            "目前，我们的授权合作机构包括以下类型：\n" +
+            "(1）分析服务类的授权合作机构。除非得到您的许可，否则我们不会将您的个人身份信息（指可以识别您身份的信息，例如姓名或电子邮箱，通过这些信息可以联系到您或识别您的身份）与提供分析服务的合作机构分享。我们会向这些合作机构提供有关其服务覆盖面和有效性的信息，而不会提供您的个人身份信息，或者我们将这些信息进行汇总，以便它不会识别您。\n" +
+            "(2）服务提供方和其他合作机构。我们将信息发送给支持我们业务的服务提供方和其他合作机构，这些支持包括提供技术基础设施服务、分析我们服务的使用方式、衡量服务的有效性、提供员工服务、支付便利或进行学术研究和调查。\n" +
+            "对我们与之共享个人信息的机构，我们会与其签署严格的保密协定，要求他们按照我们的说明、声明和政策以及其他任何相关的保密和安全措施来处理个人信息。\n" +
+            "2. .转让\n" +
+            "除以下情形外，我们不会将您的个人信息转让给任何公司、组织或个人：\n" +
+            "（1）事先获得您的明确同意的；\n" +
+            "（2）根据法律法规规定，或者政府主管部门、司法机关的强制要求必须对外转让的；\n" +
+            "（3）涉及公司合并、分立、解散、资产或业务转让、破产清算或类似的交易时，若涉及到您的个人信息转让，我们会要求新持有您个人信息的公司、组织或个人继续受本政策的约束，否则我们将要求该等公司、组织或个人重新取得您的授权同意。\n" +
+            "3. 公开披露\n" +
+            "除以下情形外，我们不会公开披露您的个人信息：\n" +
+            "（1）事先获得您的明确同意的；\n" +
+            "（2）根据法律法规规定，或者政府主管部门、司法机关的强制要求必须公开披露的。在符合法律法规的前提下，当我们收到上述披露信息的请求时，我们会要求必须出具与之相应的法律文件，如传票或调查函。我们坚信，对于要求我们提供的信息，应该在法律允许的范围内尽可能保持透明。我们对所有的请求都将进行慎重的审查，以确保其具备合法依据，且仅限于执法部门因特定调查目的且有合法权利获取的数据。\n" +
+            "4. 共享、转让、公开披露个人信息授权同意的例外\n" +
+            "根据相关法律法规的规定，在以下情形中，我们可以在不征得您的授权同意的情况下共享、转让、公开披露您的个人信息：\n" +
+            "A.与国家安全、国防安全有关的；\n" +
+            "B.与公共安全、公共卫生、重大公共利益有关的；C.与犯罪侦查、起诉、审判和判决执行等有关的；\n" +
+            "D.出于维护您或其他个人的生命、财产等重大合法权益但又很难得到本人同意的；\n" +
+            "E.您自行向社会公众公开的个人信息；\n" +
+            "F.从合法公开披露的信息中收集到的个人信息的，如合法的新闻报道、政府信息公开等渠道。\n" +
+            "G.法律法规规定的其他情形。\n" +
+            "根据法律规定，共享、转让经去标识化处理的个人信息，且确保数据接收方无法复原并重新识别个人信息主体的，不属于个人信息的对外共享、转让及公开披露行为，对此类数据的保存及处理将无需另行向您通知并征得您的同意。\n" +
+            "六、员工业务数据和公开信息\n" +
+            "不同于您的个人信息，对于员工业务数据和公开信息，平台将按如下方式处理：\n" +
+            "1. 员工业务数据\n" +
+            "1、您通过平台提供的服务，加工、存储、上传、下载、分发以及通过其他方式处理的数据，均为您的员工业务数据。平台作为服务提供者，只会严格执行您的指示处理您的业务数据，除按与您协商一致或执行明确的法律法规要求外，不对您的业务数据进行任何非授权的使用或披露。\n" +
+            "2、您应对您的员工业务数据来源及内容负责，平台提示您谨慎判断数据来源及内容的合法性。因您的员工业务数据内容违反法律法规、部门规章或国家政策而造成的全部结果及责任均由您自行承担。\n" +
+            "3、根据您与平台协商一致，平台在您选定的数据中心存储员工业务数据。我们恪守对员工的安全承诺，根据适用的法律保护员工存储在平台数据中心的数据。\n" +
+            "2. 公开信息\n" +
+            "1、公开信息是指您公开分享的任何信息，任何人都可以在使用和未使用平台服务期间查看或访问这些信息。例如您在社区、论坛发布的信息。\n" +
+            "2、为使用平台的服务，可能存在您必须公开分享的信息。\n" +
+            "七、我们如何保护您的个人信息\n" +
+            "1.我们已使用符合业界标准的安全防护措施保护您提供的个人信息，防止您的个人信息遭到未经授权访问、使用、修改、公开披露、损坏或丢失。我们会采取一切合理可行的措施，保护您的个人信息，比如：\n" +
+            "（1）我们设立了网络安全和个人信息保护机构，专门负责网络安全和个人信息保护事务；\n" +
+            "（2）我们的网络服务采取了传输层安全协议等加密技术，通过https等方式提供浏览服务，确保用户数据在传输过程中的安全；\n" +
+            "（3）我们采取MD5、SHA256等加密技术对您的个人信息进行加密存储，增强个人信息在使用中的安全性；\n" +
+            "（4）我们采用严格的数据访问权限控制和多重身份认证技术保护个人信息，避免数据被违规使用；\n" +
+            "（5）我们采用代码安全检查、数据访问日志分析技术进行个人信息安全审计；\n" +
+            "（6）我们建立了客户信息保护管理规定、客户信息分级分类管理规定、日常操作规程等一系列管理制度来规范个人信息的存储和使用；\n" +
+            "（7）我们定期举办信息安全和个人信息保护培训课程，加强员工对于个人信息保护重要性的认识；\n" +
+            "（8）我们与所有可能接触个人信息的员工签订了保密协议，对关键岗位人员进行背景审查，并建立了严格的访问权限控制、权限审批流程和监控、审计机制；\n" +
+            "（9）我们与所有可能接触用户个人信息的合作伙伴均签署了严格的保密协议或数据保护专用条款，并要求可能接触到您个人信息的所有人员履行相应的保密和数据保护义务。如果第三方合作伙伴未履行保密和数据保护义务，可能会被我们追究法律责任并被我们终止合作；\n" +
+            "2.我们已经通过了国家信息安全等级保护测评和备案，最高备案等级为二级。\n" +
+            "3.我们会采取一切合理可行的措施，确保未收集无关的个人信息。我们只会在达成本政策所述目的所需的期限内保留您的个人信息，除非需要延长保留期或者受到法律允许。\n" +
+            "4.互联网并非绝对安全的环境，而且电子邮件、即时通讯、社交软件等与其他用户的交流方式无法确定是否完全加密，我们强烈建议您不用通过此类方式发送个人信息。若确需使用，在使用此类工具时请使用复杂密码，并注意保护您的个人信息安全。我们将尽力保障您个人信息的安全性。如果我们的物理、技术、或管理防护设施遭到破坏，导致信息被非授权访问、公开披露、篡改、或毁坏，导致您的合法权益受损，我们将全力配合保护您的权益，并依法承担我们应承担的赔偿责任。\n" +
+            "5.在不幸发生个人信息安全事件后，我们将按照法律法规的要求及时向您告知安全事件的基本情况和可能的影响、我们已采取或将采取的处置措施、您可自主防范和降低风险的建议、对您的补救措施等。我们将及时将事件相关情况以邮件、信函、电话、推送通知等方式告知您，难以逐一告知时，我们会采取合理、有效的方式发布公告。同时，我们还将按照监管部门要求，主动上报个人信息安全事件的处置情况。\n" +
+            "八、您如何管理您的个人信息（您的权力）\n" +
+            "您可以通过以下方式访问及管理您的个人信息：\n" +
+            "8.1 访问您的个人信息\n" +
+            "您的账号信息：您可在“我的”中查询您的账户、姓名、性别、手机、身份证号、工作信息、健康类型、学历、工号、工种、住址，紧急联系人的姓名、电话等。\n" +
+            "您和您亲属的健康信息：您可在“咨询人管理”中查询您和您亲属手机号码、患者姓名、性别、出生日期、与患者的关系、身高体重、所在城市；健康信息：病症、患病时长、体检报告、住院记录、诊治情况、用药记录、以往病史、过敏信息、家族史、患病史等健康信息。\n" +
+            "您的订单、工单信息：您可在“我的-我的咨询”、“我的-我的应急工单”、“我的-大病就医工单”、“健康体检-体检预约”等各个业务的对应入口查看、评价订单和工单信息。\n" +
+            "您的体检报告：你可在“健康体检-体检报告”和“健康档案-健康现状”、“健康档案-体检数据分析”查看个人的体检报告详情和重点指标的分析。\n" +
+            "对于您在使用我们的产品或服务过程中向我们提供或产生的其他信息，只要我们不需要过多投入，我们会向您提供。您可以通过拨打我们的客服电话提出访问申请，我们将在30天内回复您的访问请求。\n" +
+            "对于您在使用我们服务过程中产生的其他个人信息，我们将根据本条“8.9 响应您的上述请求”中的相关安排向您提供。\n" +
+            "8.2 更正或补充您的个人信息\n" +
+            "当您发现我们处理的您的个人信息有误或者您需要更正该等信息时，您可以通过内设置的自动更正功能、电子邮件或者拨打客服电话等方式进行修改或更正。您如果需要更正其他个人信息，可通过联系人工客服向我们提出更正申请。\n" +
+            "可自主更正的信息：\n" +
+            "账号信息：您可在“我的”中更新您的头像，紧急联系人的姓名、电话等。\n" +
+            "您和您亲属的健康信息：您可在“咨询人管理”中更正您和您亲属手机号码、患者姓名、性别、出生日期、与患者的关系、身高体重、所在城市；健康信息：病症、患病时长、体检报告、住院记录、诊治情况、用药记录、以往病史、过敏信息、家族史、患病史等健康信息。\n" +
+            "8.3 删除您的个人信息\n" +
+            "您在我们的产品与/或服务页面中可以直接清除或删除的信息，包括浏览信息、紧急联系人信息、咨询人信息。\n" +
+            "在以下情形中，您可以向我们提出删除个人信息的请求：\n" +
+            "（1）如果我们处理个人信息的行为违反了法律法规的强制性规定；\n" +
+            "（2）如果我们收集、使用您的个人信息，却未征得您的同意（依法无需征得同意的情况除外）；\n" +
+            "（3）如果我们处理个人信息的行为违反了与您的约定；\n" +
+            "（4）如果您不再使用我们的产品或服务，或您注销了账号；\n" +
+            "（5）如果我们不再为您提供产品或服务。\n" +
+            "收到您的删除请求后，我们会根据您及相关法律法规的要求进行后续删除处理并向您反馈结果。若我们决定响应您的删除请求，我们还将同时通知从我们获得您的个人信息的实体，要求其及时删除，除非法律法规另有规定，或这些实体获得您的独立授权。\n" +
+            "当您从我们的服务中删除信息后，我们可能不会立即备份系统中删除相应的信息，但会在备份更新时删除这些信息。\n" +
+            "8.4 改变您授权同意的范围\n" +
+            "您可以通过删除信息、关闭设备功能、在平台中进行隐私设置等方式改变您授权我们继续收集个人信息的范围或撤回您的授权。\n" +
+            "请您理解，每个业务功能需要一些基本的个人信息才能得以完成（见本隐私权政策“我们如何收集和使用您的信息”）。当您收回同意后，我们将不再处理相应的个人信息。但您收回同意的决定，不会影响此前基于您的授权而开展的个人信息处理。\n" +
+            "8.5 个人信息主体注销账户\n" +
+            "在符合平台单项服务的服务协议约定条件及国家相关法律法规规定的情况下，您的该项平台服务帐号可能被注销或删除。当帐号注销或被删除后，与该帐号相关的、该单项服务项下的全部服务资料和数据将依照单项服务的服务协议约定删除或匿名化处理。\n" +
+            "8.6 约束信息系统自动决策\n" +
+            "在某些业务功能中，我们可能仅依据信息系统、算法等在内的非人工自动决策机制做出决定。如果这些决定显著影响您的合法权益，您有权要求我们做出解释，我们也将在不侵害平台保密或其他员工权益、社会公共利益的前提下提供申诉方法。\n" +
+            "8.7约束信息系统自动决策\n" +
+            "在某些业务功能中，我们可能仅依据信息系统、算法在内的非人工自动决策机制作出决定。如果这些决定显著影响您的合法权益，您有权要求我们作出解释，我们也将提供适当的救济方式。\n" +
+            "8.8举报和投诉\n" +
+            "如果您发现您的个人信息可能被泄露，或者我们的工作人员或合作伙伴在处理您的个人信息时有任何违法违规行为，您可以通过拨打客服热线或者发送电子邮件的方式向我们进行举报和投诉。\n" +
+            "8.9 响应您的上述请求\n" +
+            "为保障安全，您可能需要提供书面请求，或以其他方式证明您的身份。我们可能会先要求您验证自己的身份，然后再处理您的请求。我们将在15个工作日内做出答复。\n" +
+            "对于那些无端重复、需要过多技术手段（例如，需要开发新系统或从根本上改变现行惯例）、给他人合法权益带来风险或者非常不切实际的请求，我们可能会予以拒绝。\n" +
+            "在以下情形中，按照法律法规要求，我们将无法响应您的请求：\n" +
+            "(1) 与国家安全、国防安全有关的；\n" +
+            "(2) 与公共安全、公共卫生、重大公共利益有关的；\n" +
+            "(3) 与犯罪侦查、起诉、审判和执行判决等有关的；\n" +
+            "(4) 有充分证据表明个人信息主体存在主观恶意或滥用权利的；\n" +
+            "(5) 响应您的请求将导致您或其他个人、组织的合法权益受到严重损害的；\n" +
+            "(6) 涉及商业秘密的。\n" +
+            "九、我们如何处理未成年人的个人信息\n" +
+            "1．专家端非常重视对未成年人个人信息的保护。若您是18周岁以下的未成年人，在使用我们的产品与/或服务前，应事先取得您监护人的同意。专家端根据国家相关法律法规的规定保护未成年人的个人信息。\n" +
+            "2．我们不会主动直接向未成年人收集其个人信息。对于经监护人同意而收集未成年人个人信息的情况，我们只会在受到法律允许、监护人同意或者保护未成年人所必要的情况下使用、共享、转让或披露此信息。\n" +
+            "3．如果有事实证明未成年人在未取得监护人同意的情况下注册使用了我们的产品与/或服务，我们会与相关监护人协商，并设法尽快删除相关个人信息。\n" +
+            "十、本声明和政策如何更新\n" +
+            "我们的隐私政策可能变更。未经您明确同意，我们不会削减您按照声明和政策所应享有的权利。 我们会在本页面上发布对本声明和政策所做的任何变更。\n" +
+            "对于重大变更，我们还会提供更为显著的通知（包括我们会通过网站公示的方式进行通知甚至向您提供弹窗提示）。\n" +
+            "本声明和隐私所指的重大变更包括但不限于：\n" +
+            "1、 我们的服务模式发生重大变化。如处理个人信息的目的、处理的个人信息类型、个人信息的使用方式等；\n" +
+            "2、 我们在所有权结构、组织架构等方面发生重大变化。如业务调整等引起的所有者变更等；\n" +
+            "3、 个人信息共享或公开披露的主要对象发生变化；\n" +
+            "4、 您参与个人信息处理方面的权利及其行使方式发生重大变化；\n" +
+            "5、 我们负责处理个人信息安全的责任部门、联络方式等发生变化时；\n" +
+            "6、 个人信息安全影响评估报告表明存在高风险时。\n" +
+            "7、 我们还会将本声明和隐私的旧版本存档，供您查阅。\n" +
+            "十一、如何联系我们\n" +
+            "1.如果您对本政策有任何疑问、意见或建议，可通过以下方式与我们联系：\n" +
+            "（1）拨打客服热线电话029-86581752\n" +
+            "（2）发送电子邮件至123456789@qq.com\n" +
+            "（3）邮寄地址：陕西省西安市未央区未央路151号，收件人：陈天宇\n" +
+            "我们的客服部门将会同个人信息保护部门30天内进行回复，并协助解决您的问题。\n" +
+            "2.如果您对我们的回复不满意，特别是我们的个人信息处理行为损害了您的合法权益，您还可以通过以下外部途径寻求解决方式：向网信、工商、公安等监管部门进行投诉或举报。"
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/utils/CustomActivityManager.java b/app/src/main/java/com/yxjk/healthexpertclient/utils/CustomActivityManager.java
new file mode 100644
index 0000000..0f67910
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/utils/CustomActivityManager.java
@@ -0,0 +1,120 @@
+package com.yxjk.healthexpertclient.utils;
+
+import android.app.Activity;
+import android.content.Context;
+
+
+import java.util.Stack;
+
+public class CustomActivityManager {
+    public static Stack<Activity> activityStack;
+    private static CustomActivityManager instance;
+
+    private CustomActivityManager() {
+    }
+
+    public static CustomActivityManager getInstance() {
+        if (instance == null) {
+            synchronized (CustomActivityManager.class) {
+                if (instance == null) {
+                    instance = new CustomActivityManager();
+                }
+            }
+        }
+        return instance;
+    }
+
+    public void addActivity(Activity activity) {
+        if (activityStack == null) {
+            activityStack = new Stack<>();
+        }
+        activityStack.add(activity);
+    }
+
+    public Activity currentActivity() {
+        return activityStack.lastElement();
+    }
+
+    public boolean isActivityExist(Class<?> cls) {
+        for (Activity activity : activityStack) {
+            if (activity.getClass().equals(cls)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void finishActivity() {
+        Activity activity = activityStack.lastElement();
+        finishActivity(activity);
+    }
+
+    public void finishActivity(Activity activity) {
+        if (activity != null) {
+            activityStack.remove(activity);
+            activity.finish();
+            activity=null;
+        }
+    }
+
+    public void removeActivity(Activity activity) {
+        if (activity != null) {
+            activityStack.remove(activity);
+        }
+    }
+
+    public void removeOneActivity(String s) {
+        for (int i = 0; i < activityStack.size(); i++) {
+            if (activityStack.get(i).toString().contains(s)) {
+                activityStack.get(i).finish();
+                activityStack.remove(i);
+            }
+        }
+    }
+
+    public void printActivity() {
+        for (int i = 0; i < activityStack.size(); i++) {
+            System.out.println("当前栈中页面:"+activityStack.get(i).toString());
+        }
+    }
+
+    public void finishActivity(Class<?> cls) {
+        for (Activity activity : activityStack) {
+            if (activity.getClass().equals(cls)) {
+                finishActivity(activity);
+                return;
+            }
+        }
+    }
+
+    public void finishAllActivity() {
+        if (activityStack == null) return;
+        for (int i = 0, size = activityStack.size(); i < size; i++) {
+            if (null != activityStack.get(i)) {
+                activityStack.get(i).finish();
+            }
+        }
+        activityStack.clear();
+    }
+
+    public void finishAllActivity(Activity exceptAct) {
+        while (!activityStack.isEmpty()) {
+            Activity act = (Activity) activityStack.pop();
+            if (act != exceptAct) {
+                act.finish();
+            }
+        }
+        activityStack.push(exceptAct);
+    }
+
+    public void appExit(Context context) {
+        try {
+            finishAllActivity();
+            android.os.Process.killProcess(android.os.Process.myPid());
+            System.exit(0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/utils/DebuggerUtils.java b/app/src/main/java/com/yxjk/healthexpertclient/utils/DebuggerUtils.java
new file mode 100644
index 0000000..21a0f4a
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/utils/DebuggerUtils.java
@@ -0,0 +1,103 @@
+package com.yxjk.healthexpertclient.utils;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.os.Debug;
+
+
+import com.yxjk.healthexpertclient.BuildConfig;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.util.Locale;
+
+public class DebuggerUtils {
+        /**
+         * 判断当前应用是否是debug状态
+         */
+        public static boolean isDebuggable(Context context) {
+            try {
+                ApplicationInfo info = context.getApplicationInfo();
+                return (info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0;
+            } catch (Exception e) {
+                return false;
+            }
+        }
+
+        /**
+         * 检测是否在非Debug编译模式下，进行了调试操作，以防动态调试
+         *
+         * @param context
+         * @return
+         */
+        public static void checkDebuggableInNotDebugModel(Context context) {
+            //非Debug 编译，反调试检测
+            if (!BuildConfig.DEBUG) {
+                if (isDebuggable(context)) {
+                    System.exit(0);
+                }
+
+                Thread t = new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        while (true) {
+                            try {
+                                //每隔300ms检测一次
+                                Thread.sleep(300);
+                                //判断是否有调试器连接，是就退出
+                                if (Debug.isDebuggerConnected()) {
+                                    System.exit(0);
+                                }
+
+                                //判断是否被其他进程跟踪，是就退出
+                                if (isUnderTraced()) {
+                                    System.exit(0);
+                                }
+                            } catch (InterruptedException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                    }
+                }, "SafeGuardThread");
+                t.start();
+            }
+            if (isUnderTraced()) {
+                System.exit(0);
+            }
+
+        }
+
+        /**
+         * 当我们使用Ptrace方式跟踪一个进程时，目标进程会记录自己被谁跟踪，可以查看/proc/pid/status看到这个信息,而没有被调试的时候TracerPid为0
+         *
+         * @return
+         */
+        private static boolean isUnderTraced() {
+            String processStatusFilePath = String.format(Locale.US, "/proc/%d/status", android.os.Process.myPid());
+            File procInfoFile = new File(processStatusFilePath);
+            try {
+                BufferedReader b = new BufferedReader(new FileReader(procInfoFile));
+                String readLine;
+                while ((readLine = b.readLine()) != null) {
+                    if (readLine.contains("TracerPid")) {
+                        String[] arrays = readLine.split(":");
+                        if (arrays.length == 2) {
+                            int tracerPid = Integer.parseInt(arrays[1].trim());
+                            if (tracerPid != 0) {
+                                return true;
+                            }
+                        }
+                    }
+                }
+
+                b.close();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+            return false;
+        }
+
+    }
+
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/utils/DevicesInfoUtils.java b/app/src/main/java/com/yxjk/healthexpertclient/utils/DevicesInfoUtils.java
new file mode 100644
index 0000000..6ce94cc
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/utils/DevicesInfoUtils.java
@@ -0,0 +1,39 @@
+package com.yxjk.healthexpertclient.utils;
+
+public class DevicesInfoUtils {
+    /**
+     * 获取手机品牌
+     */
+    public static String getDeviceBrand() {
+        return android.os.Build.BRAND;
+    }
+
+    /**
+     * 获取手机型号
+     */
+    public static String getDeviceModel() {
+        return android.os.Build.MODEL;
+    }
+    /**
+     * 获取手机Android 版本
+     *
+     * @return
+     */
+    public static String getDeviceAndroidVersion() {
+        return android.os.Build.VERSION.RELEASE;
+    }
+    /**
+     *
+     *
+     * fingerprit 信息
+     * **/
+    public static String getDeviceFubgerprint() {
+        try {
+            return android.os.Build.FINGERPRINT;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        } finally {
+            return "";
+        }
+    }
+}
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/utils/GenerateTestUserSig.java b/app/src/main/java/com/yxjk/healthexpertclient/utils/GenerateTestUserSig.java
new file mode 100644
index 0000000..092ae8e
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/utils/GenerateTestUserSig.java
@@ -0,0 +1,257 @@
+package com.yxjk.healthexpertclient.utils;
+
+import android.text.TextUtils;
+import android.util.Base64;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+import java.util.zip.Deflater;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+
+/*
+ * Module:   GenerateTestUserSig
+ *
+ * Function: 用于生成测试用的 UserSig，UserSig 是腾讯云为其云服务设计的一种安全保护签名。
+ *           其计算方法是对 SDKAppID、UserID 和 EXPIRETIME 进行加密，加密算法为 HMAC-SHA256。
+ *
+ * Attention: 请不要将如下代码发布到您的线上正式版本的 App 中，原因如下：
+ *
+ *            本文件中的代码虽然能够正确计算出 UserSig，但仅适合快速调通 SDK 的基本功能，不适合线上产品，
+ *            这是因为客户端代码中的 SECRETKEY 很容易被反编译逆向破解，尤其是 Web 端的代码被破解的难度几乎为零。
+ *            一旦您的密钥泄露，攻击者就可以计算出正确的 UserSig 来盗用您的腾讯云流量。
+ *
+ *            正确的做法是将 UserSig 的计算代码和加密密钥放在您的业务服务器上，然后由 App 按需向您的服务器获取实时算出的 UserSig。
+ *            由于破解服务器的成本要高于破解客户端 App，所以服务器计算的方案能够更好地保护您的加密密钥。
+ *
+ * Reference：https://cloud.tencent.com/document/product/269/32688#Server
+ */
+
+/*
+ * Module: GenerateTestUserSig
+ *
+ * Function: Used to generate UserSig for testing. UserSig is a security signature designed by Tencent Cloud for its cloud services.
+ *           It is calculated based on SDKAppID, UserID, and EXPIRETIME using the HMAC-SHA256 encryption algorithm.
+ *
+ * Attention: Do not use the code below in your commercial application. This is because:
+ *
+ *            The code may be able to calculate UserSig correctly, but it is only for quick testing of the SDK’s basic features, not for commercial applications.
+ *            SECRETKEY in client code can be easily decompiled and reversed, especially on web.
+ *            Once your key is disclosed, attackers will be able to steal your Tencent Cloud traffic.
+ *
+ *            The correct method is to deploy the UserSig calculation code and encryption key on your project server so that your application can request from your server a UserSig that is calculated whenever one is needed.
+ *            Given that it is more difficult to hack a server than a client application, server-end calculation can better protect your key.
+ *
+ * Reference: https://intl.cloud.tencent.com/document/product/1047/34385
+ */
+public class GenerateTestUserSig {
+
+    /**
+     * 腾讯云 SDKAppId，需要替换为您自己账号下的 SDKAppId。
+     * <p>
+     * 进入腾讯云云通信[控制台](https://console.cloud.tencent.com/avc ) 创建应用，即可看到 SDKAppId，
+     * 它是腾讯云用于区分客户的唯一标识。
+     */
+
+    /**
+     * Tencent Cloud SDKAppID. Set it to the SDKAppID of your account.
+     * <p>
+     * You can view your SDKAppID after creating an application in the [Tencent Cloud IM console](https://console.intl.cloud.tencent.com/im).
+     * SDKAppID uniquely identifies a Tencent Cloud account.
+     */
+//    public static final int SDKAPPID = 1400791587;
+    public static final int SDKAPPID = 1400792728;
+
+    /**
+     * 签名过期时间，建议不要设置的过短
+     * <p>
+     * 时间单位：秒
+     * 默认时间：7 x 24 x 60 x 60 = 604800 = 7 天
+     */
+
+    /**
+     * Signature validity period, which should not be set too short
+     * <p>
+     * Time unit: second
+     * Default value: 604800 (7 days)
+     */
+    private static final int EXPIRETIME = 604800;
+
+
+    /**
+     * 计算签名用的加密密钥，获取步骤如下：
+     * <p>
+     * step1. 进入腾讯云云通信[控制台](https://console.cloud.tencent.com/avc ) ，如果还没有应用就创建一个，
+     * step2. 单击“应用配置”进入基础配置页面，并进一步找到“帐号体系集成”部分。
+     * step3. 点击“查看密钥”按钮，就可以看到计算 UserSig 使用的加密的密钥了，请将其拷贝并复制到如下的变量中
+     * <p>
+     * 注意：该方案仅适用于调试Demo，正式上线前请将 UserSig 计算代码和密钥迁移到您的后台服务器上，以避免加密密钥泄露导致的流量盗用。
+     * 文档：https://cloud.tencent.com/document/product/269/32688#Server
+     */
+
+    /**
+     * Follow the steps below to obtain the key required for UserSig calculation.
+     * <p>
+     * Step 1. Log in to the [Tencent Cloud IM console](https://console.intl.cloud.tencent.com/im), and create an application if you don’t have one.
+     * Step 2. Click Application Configuration to go to the basic configuration page and locate Account System Integration.
+     * Step 3. Click View Key to view the encrypted key used for UserSig calculation. Then copy and paste the key to the variable below.
+     * <p>
+     * Note: this method is for testing only. Before commercial launch, please migrate the UserSig calculation code and key to your backend server to prevent key disclosure and traffic stealing.
+     * Reference: https://intl.cloud.tencent.com/document/product/1047/34385
+     */
+//    private static final String SECRETKEY = "97ee9b2c6fee19a54d89491fa25c7964d7a665b0ec671fb77a7765add0d7b7dc";
+    private static final String SECRETKEY = "027a70fb8367fea81ee000d76705cfae184ccb82038004892f9de0b98b2c4785";
+
+    /**
+     * 计算 UserSig 签名
+     * <p>
+     * 函数内部使用 HMAC-SHA256 非对称加密算法，对 SDKAPPID、userId 和 EXPIRETIME 进行加密。
+     *
+     * @note: 请不要将如下代码发布到您的线上正式版本的 App 中，原因如下：
+     * <p>
+     * 本文件中的代码虽然能够正确计算出 UserSig，但仅适合快速调通 SDK 的基本功能，不适合线上产品，
+     * 这是因为客户端代码中的 SECRETKEY 很容易被反编译逆向破解，尤其是 Web 端的代码被破解的难度几乎为零。
+     * 一旦您的密钥泄露，攻击者就可以计算出正确的 UserSig 来盗用您的腾讯云流量。
+     * <p>
+     * 正确的做法是将 UserSig 的计算代码和加密密钥放在您的业务服务器上，然后由 App 按需向您的服务器获取实时算出的 UserSig。
+     * 由于破解服务器的成本要高于破解客户端 App，所以服务器计算的方案能够更好地保护您的加密密钥。
+     * <p>
+     * 文档：https://cloud.tencent.com/document/product/269/32688#Server
+     */
+
+    /**
+     * Calculate UserSig
+     * <p>
+     * The asymmetric encryption algorithm HMAC-SHA256 is used in the function to calculate UserSig based on SDKAppID, UserID, and EXPIRETIME.
+     *
+     * @note: Do not use the code below in your commercial application. This is because:
+     * <p>
+     * The code may be able to calculate UserSig correctly, but it is only for quick testing of the SDK’s basic features, not for commercial applications.
+     * SECRETKEY in client code can be easily decompiled and reversed, especially on web.
+     * Once your key is disclosed, attackers will be able to steal your Tencent Cloud traffic.
+     * <p>
+     * The correct method is to deploy the UserSig calculation code and encryption key on your project server so that your application can request from your server a UserSig that is calculated whenever one is needed.
+     * Given that it is more difficult to hack a server than a client application, server-end calculation can better protect your key.
+     * <p>
+     * Reference: https://intl.cloud.tencent.com/document/product/1047/34385
+     */
+    public static String genTestUserSig(String userId) {
+        return GenTLSSignature(SDKAPPID, userId, EXPIRETIME, null, SECRETKEY);
+    }
+
+    /**
+     * 生成 tls 票据
+     *
+     * @param sdkappid      应用的 appid
+     * @param userId        用户 id
+     * @param expire        有效期，单位是秒
+     * @param userbuf       默认填写null
+     * @param priKeyContent 生成 tls 票据使用的私钥内容
+     * @return 如果出错，会返回为空，或者有异常打印，成功返回有效的票据
+     */
+
+    /**
+     * Generate a TLS ticket
+     *
+     * @param sdkappid      AppID of the application
+     * @param userId        User ID
+     * @param expire        Validity period, in seconds
+     * @param userbuf       null by default
+     * @param priKeyContent Private key required for generating a TLS ticket
+     * @return If an error occurs, an empty string will be returned or exceptions printed. If the operation succeeds, a valid ticket will be returned.
+     */
+    private static String GenTLSSignature(long sdkappid, String userId, long expire, byte[] userbuf, String priKeyContent) {
+        if (TextUtils.isEmpty(priKeyContent)) {
+            return "";
+        }
+        long currTime = System.currentTimeMillis() / 1000;
+        JSONObject sigDoc = new JSONObject();
+        try {
+            sigDoc.put("TLS.ver", "2.0");
+            sigDoc.put("TLS.identifier", userId);
+            sigDoc.put("TLS.sdkappid", sdkappid);
+            sigDoc.put("TLS.expire", expire);
+            sigDoc.put("TLS.time", currTime);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        String base64UserBuf = null;
+        if (null != userbuf) {
+            base64UserBuf = Base64.encodeToString(userbuf, Base64.NO_WRAP);
+            try {
+                sigDoc.put("TLS.userbuf", base64UserBuf);
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+        }
+        String sig = hmacsha256(sdkappid, userId, currTime, expire, priKeyContent, base64UserBuf);
+        if (sig.length() == 0) {
+            return "";
+        }
+        try {
+            sigDoc.put("TLS.sig", sig);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        Deflater compressor = new Deflater();
+        compressor.setInput(sigDoc.toString().getBytes(Charset.forName("UTF-8")));
+        compressor.finish();
+        byte[] compressedBytes = new byte[2048];
+        int compressedBytesLength = compressor.deflate(compressedBytes);
+        compressor.end();
+        return new String(base64EncodeUrl(Arrays.copyOfRange(compressedBytes, 0, compressedBytesLength)));
+    }
+
+
+    private static String hmacsha256(long sdkappid, String userId, long currTime, long expire, String priKeyContent, String base64Userbuf) {
+        String contentToBeSigned = "TLS.identifier:" + userId + "\n"
+                + "TLS.sdkappid:" + sdkappid + "\n"
+                + "TLS.time:" + currTime + "\n"
+                + "TLS.expire:" + expire + "\n";
+        if (null != base64Userbuf) {
+            contentToBeSigned += "TLS.userbuf:" + base64Userbuf + "\n";
+        }
+        try {
+            byte[] byteKey = priKeyContent.getBytes("UTF-8");
+            Mac hmac = Mac.getInstance("HmacSHA256");
+            SecretKeySpec keySpec = new SecretKeySpec(byteKey, "HmacSHA256");
+            hmac.init(keySpec);
+            byte[] byteSig = hmac.doFinal(contentToBeSigned.getBytes("UTF-8"));
+            return new String(Base64.encode(byteSig, Base64.NO_WRAP));
+        } catch (UnsupportedEncodingException e) {
+            return "";
+        } catch (NoSuchAlgorithmException e) {
+            return "";
+        } catch (InvalidKeyException e) {
+            return "";
+        }
+    }
+
+    private static byte[] base64EncodeUrl(byte[] input) {
+        byte[] base64 = new String(Base64.encode(input, Base64.NO_WRAP)).getBytes();
+        for (int i = 0; i < base64.length; ++i)
+            switch (base64[i]) {
+                case '+':
+                    base64[i] = '*';
+                    break;
+                case '/':
+                    base64[i] = '-';
+                    break;
+                case '=':
+                    base64[i] = '_';
+                    break;
+                default:
+                    break;
+            }
+        return base64;
+    }
+
+}
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/utils/KotlinHelp.java b/app/src/main/java/com/yxjk/healthexpertclient/utils/KotlinHelp.java
new file mode 100644
index 0000000..2fb87ff
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/utils/KotlinHelp.java
@@ -0,0 +1,10 @@
+package com.yxjk.healthexpertclient.utils;
+
+import com.youth.banner.Banner;
+import com.youth.banner.adapter.BannerImageAdapter;
+
+public class KotlinHelp {
+    public Banner setBannerAdapterHelp(Banner banner, BannerImageAdapter bannerImageAdapter){
+        return banner.setAdapter(bannerImageAdapter);
+    }
+}
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/utils/NineGridViewImageLoader.kt b/app/src/main/java/com/yxjk/healthexpertclient/utils/NineGridViewImageLoader.kt
new file mode 100644
index 0000000..9bee134
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/utils/NineGridViewImageLoader.kt
@@ -0,0 +1,24 @@
+package com.yxjk.healthexpertclient.utils
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.widget.ImageView
+import com.btpj.lib_base.ext.load
+import com.lzy.ninegrid.NineGridView
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/15 10:27
+ * @description
+ */
+class NineGridViewImageLoader: NineGridView.ImageLoader {
+    override fun onDisplayImage(context: Context?, imageView: ImageView?, url: String?) {
+        if (url != null) {
+            imageView?.load(url, false)
+        }
+    }
+
+    override fun getCacheImage(url: String?): Bitmap? {
+        return null
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/utils/StatusbarUtil.kt b/app/src/main/java/com/yxjk/healthexpertclient/utils/StatusbarUtil.kt
new file mode 100644
index 0000000..bbf4630
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/utils/StatusbarUtil.kt
@@ -0,0 +1,103 @@
+package com.yxjk.healthexpertclient.utils
+
+import android.annotation.TargetApi
+import android.app.Activity
+import android.content.Context
+import android.graphics.Color
+import android.os.Build
+import android.view.View
+import androidx.annotation.ColorInt
+
+object StatusbarUtil {
+
+
+    /**
+     * 获取状态栏高度
+     */
+    fun getStatusBarHeight(context: Context): Int {
+        val resourceId = context.resources.getIdentifier("status_bar_height", "dimen", "android")
+        if (resourceId > 0) {
+            return context.resources.getDimensionPixelSize(resourceId)
+        }
+        return 0
+    }
+
+    /**
+     * 设置状态栏透明
+     *
+     */
+    fun setStatusBarTransparent(activity: Activity) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            activity.window.statusBarColor = Color.TRANSPARENT
+        }
+    }
+
+    /**
+     * 设置状态栏背景颜色
+     */
+    fun setStatusBarBgColor(activity: Activity, @ColorInt color: Int) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            activity.window.statusBarColor = color
+        }
+    }
+
+
+    /**
+     * 设置状态栏白色 和 图标黑色
+     */
+    fun lightMode(activity: Activity) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+
+            activity.window.statusBarColor = Color.WHITE  //白底
+
+            activity.window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR    //黑字
+        }
+    }
+
+    /**
+     *   设置状态栏颜色 和 图标颜色
+     *   backgroundColor  背景颜色
+     *   isIconBlack      图标+文本颜色    true 是黑色  false 白色
+     */
+    fun customColorMode(activity: Activity, backgroundColor: String, isIconBlack: Boolean) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+
+            activity.window.statusBarColor = Color.parseColor(backgroundColor)  //白底
+
+            if (isIconBlack) {
+                activity.window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR    //黑色图标+文字
+            } else {
+                activity.window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE  //白色图标+文字
+            }
+        }
+    }
+
+    /**
+     *  设置状态栏透明 是否全屏 图标颜色
+     *
+     *  isIconBlack   true 黑色黑标+文字  false白色
+     *
+     *  isFullScreen 是否是全屏 true全屏，可以实现沉浸式状态栏
+     */
+    fun transparentMode(activity: Activity, isIconBlack: Boolean, isFullScreen: Boolean = false) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+
+            activity.window.statusBarColor = Color.TRANSPARENT
+
+            if (isIconBlack) {
+                if (isFullScreen) {
+                    activity.window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN  //黑色图标+文字 全屏
+                } else {
+                    activity.window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR   //黑色图标+文字
+                }
+            } else {
+                if (isFullScreen) {
+                    activity.window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN //白色图标+文字  全屏
+                } else {
+                    activity.window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE
+                }
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/utils/StringExt.kt b/app/src/main/java/com/yxjk/healthexpertclient/utils/StringExt.kt
new file mode 100644
index 0000000..b3a938e
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/utils/StringExt.kt
@@ -0,0 +1,53 @@
+package com.yxjk.healthexpertclient.utils
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.text.Html
+import android.text.Spanned
+import android.widget.TextView
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import java.util.regex.Pattern
+
+/**
+ * String扩展类
+ * @author nanfeifie  2022/3/25
+ */
+fun String.toHtml(@SuppressLint("InlinedApi") flag: Int = Html.FROM_HTML_MODE_LEGACY): Spanned {
+    return if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
+        Html.fromHtml(this, flag)
+    } else {
+        Html.fromHtml(this)
+    }
+}
+
+
+/** 将对象转为JSON字符串 */
+fun Any?.toJson(): String {
+    return Gson().toJson(this)
+}
+/** 将对象转为key加密之后的字符串 */
+fun Any?.toEncryptJson(): String{
+    return GsonBuilder()
+        .create().toJson(this)
+}
+fun <T> String?.jsonToBean(clazz: Class<T>): T {
+    return GsonBuilder()
+        .create().fromJson(this, clazz)
+}
+
+
+fun String.formatToPassWord(): String = this.replace("[^a-zA-Z0-9]*".toRegex(), "")
+fun String.formatCheck(): Boolean {
+    var pattern=Pattern.compile("(?=.*[A-Z])(?=.*\\d)(?=.*[a-z])(?=.*\\d)[0-9A-Za-z]{8,16}")
+    return pattern.matcher(this).matches()
+}
+
+fun String.phoneCheck(): Boolean {
+    var pattern=Pattern.compile("^1[3-9]\\d{9}\$")
+    return pattern.matcher(this).matches()
+}
+
+inline fun String?.orEmptyDefault(): String = this ?: "--"
+inline fun String?.orNullDefault(): String = if (this==null) "--" else this
+inline fun String?.orEmptyDefaultValue(): String = this ?: ""
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/utils/StringUtils.java b/app/src/main/java/com/yxjk/healthexpertclient/utils/StringUtils.java
new file mode 100644
index 0000000..4a1237d
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/utils/StringUtils.java
@@ -0,0 +1,217 @@
+package com.yxjk.healthexpertclient.utils;
+
+import android.content.Context;
+import android.graphics.Typeface;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.style.AbsoluteSizeSpan;
+import android.text.style.ForegroundColorSpan;
+import android.text.style.StyleSpan;
+import android.view.View;
+import android.widget.TextView;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.regex.Pattern;
+
+public class StringUtils {
+    /**
+     * 说明:字体变色和大小同步改变
+     *
+     * @param context
+     * @param view
+     * @param content    控件显示的内容
+     * @param StartIndex 起始索引
+     * @param EndIndex   结束索引
+     * @param size       文字大小
+     * @param color      颜色
+     * @param isSynchro  是否同步改变(字体大小改变的时候,颜色是否改变)
+     */
+    public static void setSizeSpan(Context context, View view, String content, int StartIndex, int EndIndex, int size, int color, boolean isSynchro) {
+        TextView textView = (TextView) view;
+        SpannableStringBuilder spannable = new SpannableStringBuilder(content);
+        spannable.setSpan(new AbsoluteSizeSpan(size, true), StartIndex, EndIndex, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+        if (isSynchro) {
+            spannable.setSpan(new ForegroundColorSpan(color), StartIndex, EndIndex, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        } else {
+            spannable.setSpan(new ForegroundColorSpan(color), 0, EndIndex, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+        StyleSpan styleSpan = new StyleSpan(Typeface.BOLD);//粗体
+        spannable.setSpan(styleSpan, StartIndex, EndIndex, Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
+        textView.setText(spannable);
+    }
+
+    public static void setSizeSpanNoRmal(Context context, View view, String content, int StartIndex, int EndIndex, int size, int color, boolean isSynchro) {
+        TextView textView = (TextView) view;
+        SpannableStringBuilder spannable = new SpannableStringBuilder(content);
+//        spannable.setSpan(new AbsoluteSizeSpan(size, true), StartIndex, EndIndex, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+        if (isSynchro) {
+            spannable.setSpan(new ForegroundColorSpan(color), StartIndex, EndIndex, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        } else {
+            spannable.setSpan(new ForegroundColorSpan(color), 0, EndIndex, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+        StyleSpan styleSpan = new StyleSpan(Typeface.NORMAL);//粗体
+        spannable.setSpan(styleSpan, StartIndex, EndIndex, Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
+        textView.setText(spannable);
+    }
+
+    /**
+     * 改变部分文字大小
+     *
+     * @param context
+     * @param content
+     * @return
+     */
+    public static SpannableStringBuilder setSizeSpan(Context context, String content, int size, String sizeString, TextView view) {
+        int start = content.indexOf(sizeString);
+        int end = start + sizeString.length();
+        SpannableStringBuilder spannable = new SpannableStringBuilder(content);
+//        spannable.setSpan(new AbsoluteSizeSpan(DensityUtils.sp2px(context, size)), start, end, Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+        view.setText(spannable);
+        return spannable;
+    }
+
+    public static String getWeek(String pTime) {
+        String week = "";
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        Calendar c = Calendar.getInstance();
+        try {
+            c.setTime(format.parse(pTime));
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        if (c.get(Calendar.DAY_OF_WEEK) == 1) {
+            week += "周天";
+        }
+        if (c.get(Calendar.DAY_OF_WEEK) == 2) {
+            week += "周一";
+        }
+        if (c.get(Calendar.DAY_OF_WEEK) == 3) {
+            week += "周二";
+        }
+        if (c.get(Calendar.DAY_OF_WEEK) == 4) {
+            week += "周三";
+        }
+        if (c.get(Calendar.DAY_OF_WEEK) == 5) {
+            week += "周四";
+        }
+        if (c.get(Calendar.DAY_OF_WEEK) == 6) {
+            week += "周五";
+        }
+        if (c.get(Calendar.DAY_OF_WEEK) == 7) {
+            week += "周六";
+        }
+        return week;
+    }
+
+    public static String getConvertString(String name,String number,String norms) {
+        String nameStr = "";
+        String numberStr = "";
+        String normsStr = "";
+        nameStr = extracted(name);
+        numberStr = extracted2(number);
+        normsStr = extracted2(norms);
+        String convert = "　　"+nameStr + numberStr + normsStr + "\n";
+        return convert;
+    }
+
+    public static String getDottedLine(int number){
+        String str="　　";
+        for (int i = 0; i < number; i++) {
+            if (i==number-1) {
+                str=str+"\n";
+            }else{
+                str=str+"-";
+            }
+        }
+        return str;
+
+    }
+    public static String getTitleConvertString(String name,String number,String norms) {
+        String nameStr = "";
+        String numberStr = "";
+        String normsStr = "";
+        nameStr = extracted(name);
+        numberStr = extractedtitle(number);
+        normsStr = extracted(norms);
+        String convert = "　　"+nameStr + numberStr + norms + "\n";
+        return convert;
+    }
+    /****************************************************************************************************/
+
+    public static String extracted(String name) {
+        String[] strings = new String[]{"　", "　", "　", "　", "　", "　", "　", "　", "　", "　", "　", "　", "　", "　"};
+        char[] chars = name.toCharArray();
+        for (int i = 0; i < chars.length; i++) {
+            strings[i] = chars[i] + "";
+        }
+        String str2 = "";
+        for (int i = 0; i < strings.length; i++) {
+            str2 = str2 + strings[i];
+        }
+        return str2;
+    }
+
+    public static String extracted2(String name) {
+        String[] strings = new String[]{" ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " "};
+        char[] chars = name.toCharArray();
+        for (int i = 0; i < chars.length; i++) {
+            strings[i] = chars[i] + "";
+        }
+        String str2 = "";
+        for (int i = 0; i < strings.length; i++) {
+            str2 = str2 + strings[i];
+        }
+        return str2;
+    }
+
+    public static String extractedtitle(String name) {
+        String[] strings = new String[]{" ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " "};
+        char[] chars = name.toCharArray();
+        for (int i = 0; i < chars.length; i++) {
+            strings[i] = chars[i] + "";
+        }
+        String str2 = "";
+        for (int i = 0; i < strings.length; i++) {
+            str2 = str2 + strings[i];
+        }
+        return str2;
+    }
+
+    public static String separateString(String source, int startIndex, int step,char separator) {
+        int times = 0;
+        StringBuilder tmpBuilder = new StringBuilder(source);
+        for(int i = 0;i<tmpBuilder.length();i++){
+            if(i == startIndex + step * times + times){//if(i == 3 || i == 8){
+                if(separator != tmpBuilder.charAt(i)){
+                    tmpBuilder.insert(i, separator);
+                }
+                times++;
+            }else {
+                if(separator == tmpBuilder.charAt(i)){
+                    tmpBuilder.deleteCharAt(i);
+                    i=-1;
+                    times = 0;
+                }
+            }
+        }
+        return tmpBuilder.toString();
+    }
+
+    public static boolean isNumeric(String str){
+
+        Pattern pattern = Pattern.compile("[0-9]*");
+
+        return pattern.matcher(str).matches();
+
+    }
+    public static String covertString(String str){
+
+        Pattern pattern = Pattern.compile("@\"[^(\\x21-\\x7E)]\"");
+
+        return pattern.matcher(str).toString();
+
+    }
+}
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/utils/SystemHelper.java b/app/src/main/java/com/yxjk/healthexpertclient/utils/SystemHelper.java
new file mode 100644
index 0000000..a1a7732
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/utils/SystemHelper.java
@@ -0,0 +1,80 @@
+package com.yxjk.healthexpertclient.utils;
+
+
+import android.app.ActivityManager;
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.util.TypedValue;
+
+import java.util.List;
+
+public class SystemHelper {
+    /**
+     * 判断本地是否已经安装好了指定的应用程序包
+     *
+     * @param packageNameTarget ：待判断的 App 包名，如 微博 com.sina.weibo
+     * @return 已安装时返回 true,不存在时返回 false
+     */
+    public static boolean appIsExist(Context context, String packageNameTarget) {
+        if (!"".equals(packageNameTarget.trim())) {
+            PackageManager packageManager = context.getPackageManager();
+            List<PackageInfo> packageInfoList = packageManager.getInstalledPackages(PackageManager.MATCH_UNINSTALLED_PACKAGES);
+            for (PackageInfo packageInfo : packageInfoList) {
+                String packageNameSource = packageInfo.packageName;
+                if (packageNameSource.equals(packageNameTarget)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    public static int dp2pix(int dp) {
+        return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, Resources.getSystem().getDisplayMetrics());
+    }
+
+    /**
+     * 将本应用置顶到最前端
+     * 当本应用位于后台时，则将它切换到最前端
+     *
+     * @param context
+     */
+    public static void setTopApp(Context context) {
+        if (!isRunningForeground(context)) {
+            /**获取ActivityManager*/
+            ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+
+            /**获得当前运行的task(任务)*/
+            List<ActivityManager.RunningTaskInfo> taskInfoList = activityManager.getRunningTasks(100);
+            for (ActivityManager.RunningTaskInfo taskInfo : taskInfoList) {
+                /**找到本应用的 task，并将它切换到前台*/
+                if (taskInfo.topActivity.getPackageName().equals(context.getPackageName())) {
+                    activityManager.moveTaskToFront(taskInfo.id, 0);
+                    break;
+                }
+            }
+        }
+    }
+
+    /**
+     * 判断本应用是否已经位于最前端
+     *
+     * @param context
+     * @return 本应用已经位于最前端时，返回 true；否则返回 false
+     */
+    public static boolean isRunningForeground(Context context) {
+        ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+        List<ActivityManager.RunningAppProcessInfo> appProcessInfoList = activityManager.getRunningAppProcesses();
+        /**枚举进程*/
+        for (ActivityManager.RunningAppProcessInfo appProcessInfo : appProcessInfoList) {
+            if (appProcessInfo.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND) {
+                if (appProcessInfo.processName.equals(context.getApplicationInfo().processName)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+}
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/utils/TUIKitConstants.java b/app/src/main/java/com/yxjk/healthexpertclient/utils/TUIKitConstants.java
new file mode 100644
index 0000000..51bac04
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/utils/TUIKitConstants.java
@@ -0,0 +1,40 @@
+package com.yxjk.healthexpertclient.utils;
+public class TUIKitConstants {
+
+    public static final String LOGOUT = "logout";
+    public static final String USERINFO = "userInfo";
+
+    /**
+     * 1: 仅仅是一个带链接的文本消息
+     * 2: iOS支持的视频通话版本，后续已经不兼容
+     * 3: 未发布版本
+     * 4: Android/iOS/Web互通的视频通话版本
+     * 
+     * 1: Just a text message with a link
+     * 2: The video calling version supported by iOS is no longer compatible
+     * 3: unreleased version
+     * 4: Android/iOS/Web interoperable version for video call
+     */
+    public static final int JSON_VERSION_UNKNOWN = 0;
+    public static final int JSON_VERSION_1       = 1;
+    public static final int JSON_VERSION_4       = 4;
+    public static int version = JSON_VERSION_4;
+
+    public static final String BUSINESS_ID_CUSTOM_HELLO = "text_link";
+
+    public static class Selection {
+        public static final String SELECT_ALL = "select_all";
+        public static final String SELECT_FRIENDS = "select_friends";
+        public static final String CONTENT = "content";
+        public static final String TYPE = "type";
+        public static final String TITLE = "title";
+        public static final String INIT_CONTENT = "init_content";
+        public static final String DEFAULT_SELECT_ITEM_INDEX = "default_select_item_index";
+        public static final String LIST = "list";
+        public static final String LIMIT = "limit";
+        public static final int TYPE_TEXT = 1;
+        public static final int TYPE_LIST = 2;
+
+    }
+
+}
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/utils/TUIUtils.java b/app/src/main/java/com/yxjk/healthexpertclient/utils/TUIUtils.java
new file mode 100644
index 0000000..761e6d3
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/utils/TUIUtils.java
@@ -0,0 +1,84 @@
+package com.yxjk.healthexpertclient.utils;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.annotation.RequiresApi;
+
+import com.tencent.imsdk.BuildConfig;
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.interfaces.TUILoginConfig;
+import com.tencent.qcloud.tuicore.util.TUIBuild;
+import com.tencent.qcloud.tuikit.tuichat.bean.WorkBean;
+
+import java.util.Locale;
+
+
+public class TUIUtils {
+    public static final int WORK_TYPE_IMAGE_TEXT_CONSULT = 2;
+    public static final int WORK_TYPE_ASSISTANT = 3;
+    public static final String TAG = TUIUtils.class.getSimpleName();
+
+    public static void startActivity(String activityName, Bundle param) {
+        TUICore.startActivity(activityName, param);
+    }
+
+    public static void startChat(String chatId, String chatName, int chatType, WorkBean workBean) {
+        Bundle bundle = new Bundle();
+        bundle.putString(TUIConstants.TUIChat.CHAT_ID, chatId);
+        if(!TextUtils.isEmpty(chatId)){
+            bundle.putString(TUIConstants.TUIChat.CHAT_NAME, chatName);
+            bundle.putString(TUIConstants.TUIGroup.GROUP_NAME, chatName);
+        }
+        bundle.putInt(TUIConstants.TUIChat.CHAT_TYPE, chatType);
+        bundle.putSerializable(TUIConstants.TUIChat.WORK_BEAN, workBean);
+        if (chatType == V2TIMConversation.V2TIM_C2C) {
+            TUICore.startActivity(TUIConstants.TUIChat.C2C_CHAT_ACTIVITY_NAME, bundle);
+        } else if (chatType == V2TIMConversation.V2TIM_GROUP) {
+            bundle.putString(TUIConstants.TUIGroup.GROUP_ID, chatName);
+            TUICore.startActivity(TUIConstants.TUIChat.GROUP_CHAT_ACTIVITY_NAME, bundle);
+        }
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.N)
+    public static boolean isZh(Context context) {
+        Locale locale;
+        if (TUIBuild.getVersionInt() < Build.VERSION_CODES.N) {
+            locale = context.getResources().getConfiguration().locale;
+        } else {
+            locale = context.getResources().getConfiguration().getLocales().get(0);
+        }
+        String language = locale.getLanguage();
+        if (language.endsWith("zh"))
+            return true;
+        else
+            return false;
+    }
+
+    public static int getCurrentVersionCode(Context context) {
+        try {
+            return context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionCode;
+        } catch (PackageManager.NameNotFoundException ignored) {
+            Log.e(TAG, "getCurrentVersionCode exception= " + ignored);
+        }
+        return 0;
+    }
+
+
+
+    public static TUILoginConfig getLoginConfig() {
+        TUILoginConfig config = new TUILoginConfig();
+        if (BuildConfig.DEBUG) {
+            config.setLogLevel(TUILoginConfig.TUI_LOG_DEBUG);
+        }
+        return config;
+    }
+
+
+}
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/utils/pictureSelector/GlideEngine.java b/app/src/main/java/com/yxjk/healthexpertclient/utils/pictureSelector/GlideEngine.java
new file mode 100644
index 0000000..1651a74
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/utils/pictureSelector/GlideEngine.java
@@ -0,0 +1,109 @@
+package com.yxjk.healthexpertclient.utils.pictureSelector;
+
+import android.content.Context;
+import android.widget.ImageView;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.CenterCrop;
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
+import com.luck.picture.lib.engine.ImageEngine;
+import com.luck.picture.lib.utils.ActivityCompatHelper;
+import com.yxjk.healthexpertclient.R;
+
+/**
+ * @describe：PictureSelector库中Glide加载引擎
+ */
+public class GlideEngine implements ImageEngine {
+
+    /**
+     * 加载图片
+     *
+     * @param context   上下文
+     * @param url       资源url
+     * @param imageView 图片承载控件
+     */
+    @Override
+    public void loadImage(Context context, String url, ImageView imageView) {
+        if (!ActivityCompatHelper.assertValidRequest(context)) {
+            return;
+        }
+        Glide.with(context)
+                .load(url)
+                .into(imageView);
+    }
+
+    @Override
+    public void loadImage(Context context, ImageView imageView, String url, int maxWidth, int maxHeight) {
+        if (!ActivityCompatHelper.assertValidRequest(context)) {
+            return;
+        }
+        Glide.with(context)
+                .load(url)
+                .override(maxWidth, maxHeight)
+                .into(imageView);
+    }
+
+    /**
+     * 加载相册目录封面
+     *
+     * @param context   上下文
+     * @param url       图片路径
+     * @param imageView 承载图片ImageView
+     */
+    @Override
+    public void loadAlbumCover(Context context, String url, ImageView imageView) {
+        if (!ActivityCompatHelper.assertValidRequest(context)) {
+            return;
+        }
+        Glide.with(context)
+                .asBitmap()
+                .load(url)
+                .override(180, 180)
+                .sizeMultiplier(0.5f)
+                .transform(new CenterCrop(), new RoundedCorners(8))
+                .placeholder(R.drawable.ps_image_placeholder)
+                .into(imageView);
+    }
+
+
+    /**
+     * 加载图片列表图片
+     *
+     * @param context   上下文
+     * @param url       图片路径
+     * @param imageView 承载图片ImageView
+     */
+    @Override
+    public void loadGridImage(Context context, String url, ImageView imageView) {
+        if (!ActivityCompatHelper.assertValidRequest(context)) {
+            return;
+        }
+        Glide.with(context)
+                .load(url)
+                .override(200, 200)
+                .centerCrop()
+                .placeholder(R.drawable.ps_image_placeholder)
+                .into(imageView);
+    }
+
+    @Override
+    public void pauseRequests(Context context) {
+        Glide.with(context).pauseRequests();
+    }
+
+    @Override
+    public void resumeRequests(Context context) {
+        Glide.with(context).resumeRequests();
+    }
+
+    private GlideEngine() {
+    }
+
+    private static final class InstanceHolder {
+        static final GlideEngine instance = new GlideEngine();
+    }
+
+    public static GlideEngine createGlideEngine() {
+        return InstanceHolder.instance;
+    }
+}
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/utils/pictureSelector/ImageFileCompressEngine.kt b/app/src/main/java/com/yxjk/healthexpertclient/utils/pictureSelector/ImageFileCompressEngine.kt
new file mode 100644
index 0000000..2ab32b9
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/utils/pictureSelector/ImageFileCompressEngine.kt
@@ -0,0 +1,37 @@
+package com.yxjk.healthexpertclient.utils.pictureSelector
+
+import android.content.Context
+import android.net.Uri
+import com.luck.picture.lib.engine.CompressFileEngine
+import com.luck.picture.lib.interfaces.OnKeyValueResultCallbackListener
+import com.luck.picture.lib.utils.DateUtils
+import top.zibin.luban.Luban
+import top.zibin.luban.OnNewCompressListener
+import java.io.File
+
+class ImageFileCompressEngine : CompressFileEngine {
+    override fun onStartCompress(
+        context: Context,
+        source: java.util.ArrayList<Uri>,
+        call: OnKeyValueResultCallbackListener
+    ) {
+        Luban.with(context).load(source).ignoreBy(1000).setRenameListener { filePath ->
+            val indexOf = filePath.lastIndexOf(".")
+            val postfix = if (indexOf != -1) filePath.substring(indexOf) else ".jpg"
+            DateUtils.getCreateFileName("CMP_") + postfix
+        }.setCompressListener(object : OnNewCompressListener {
+            override fun onStart() {}
+            override fun onSuccess(source: String, compressFile: File) {
+                if (call != null) {
+                    call.onCallback(source, compressFile.absolutePath)
+                }
+            }
+
+            override fun onError(source: String, e: Throwable) {
+                if (call != null) {
+                    call.onCallback(source, null)
+                }
+            }
+        }).launch()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/utils/pictureSelector/ImageFileCropEngine.kt b/app/src/main/java/com/yxjk/healthexpertclient/utils/pictureSelector/ImageFileCropEngine.kt
new file mode 100644
index 0000000..96399a7
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/utils/pictureSelector/ImageFileCropEngine.kt
@@ -0,0 +1,71 @@
+package com.yxjk.healthexpertclient.utils.pictureSelector
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
+import android.net.Uri
+import android.widget.ImageView
+import androidx.annotation.Nullable
+import androidx.fragment.app.Fragment
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.target.CustomTarget
+import com.bumptech.glide.request.transition.Transition
+import com.luck.picture.lib.engine.CropFileEngine
+import com.yalantis.ucrop.UCrop
+import com.yalantis.ucrop.UCropImageEngine
+
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/23 14:05
+ * @description
+ */
+class ImageFileCropEngine: CropFileEngine {
+    override fun onStartCrop(
+        fragment: Fragment?,
+        srcUri: Uri?,
+        destinationUri: Uri?,
+        dataSource: ArrayList<String>?,
+        requestCode: Int
+    ) {
+        val options: UCrop.Options = UCrop.Options()
+        options.setHideBottomControls(true)
+        options.setFreeStyleCropEnabled(true)
+        options.setShowCropFrame(true)
+        options.setShowCropGrid(true)
+        options.setCircleDimmedLayer(true)
+        options.withAspectRatio(1f, 1f)
+        val uCrop = UCrop.of(srcUri!!, destinationUri!!, dataSource)
+        uCrop.withOptions(options)
+        uCrop.setImageEngine(object : UCropImageEngine {
+            override fun loadImage(context: Context, url: String?, imageView: ImageView) {
+
+                Glide.with(context).load(url).override(180, 180).into(imageView)
+            }
+
+            override fun loadImage(
+                context: Context,
+                url: Uri?,
+                maxWidth: Int,
+                maxHeight: Int,
+                call: UCropImageEngine.OnCallbackListener<Bitmap?>
+            ) {
+                Glide.with(context).asBitmap().load(url).override(maxWidth, maxHeight)
+                    .into(object : CustomTarget<Bitmap>() {
+
+                        override fun onResourceReady(
+                            resource: Bitmap,
+                            transition: Transition<in Bitmap?>?
+                        ) {
+                            call?.onCall(resource)
+                        }
+
+                        override fun onLoadCleared(@Nullable placeholder: Drawable?) {
+                            call?.onCall(null)
+                        }
+                    })
+            }
+        })
+        uCrop.start(fragment!!.requireActivity(), fragment!!, requestCode)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/utils/updateplugin/CheckUpdateAppVersion.kt b/app/src/main/java/com/yxjk/healthexpertclient/utils/updateplugin/CheckUpdateAppVersion.kt
new file mode 100644
index 0000000..6fab93b
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/utils/updateplugin/CheckUpdateAppVersion.kt
@@ -0,0 +1,34 @@
+package com.yxjk.healthexpertclient.utils.updateplugin
+
+import com.btpj.lib_base.ext.toJson
+import com.yxjk.healthexpertclient.data.repository.WorkbenchRepository
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.lzh.framework.updatepluginlib.base.CheckWorker
+import org.lzh.framework.updatepluginlib.model.CheckEntity
+
+class CheckUpdateAppVersion: CheckWorker() {
+    val appId = "1692477281287233537"
+    override fun useAsync(): Boolean {
+        return true
+    }
+    override fun check(entity: CheckEntity?): String {
+        return super.check(entity)
+    }
+
+    override fun asyncCheck(entity: CheckEntity?) {
+        CoroutineScope(Dispatchers.Unconfined).launch {
+            try {
+                var apiResponse = WorkbenchRepository.getAppUpdateInfo(appId)
+                if(apiResponse.success){
+                    onResponse(apiResponse.result.toJson())
+                }else{
+                    onError(Exception(apiResponse.message))
+                }
+            } catch (e: Exception) {
+                onError(e)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/utils/updateplugin/CustomFileChecker.kt b/app/src/main/java/com/yxjk/healthexpertclient/utils/updateplugin/CustomFileChecker.kt
new file mode 100644
index 0000000..fffa23e
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/utils/updateplugin/CustomFileChecker.kt
@@ -0,0 +1,114 @@
+package com.yxjk.healthexpertclient.utils.updateplugin
+
+import android.content.pm.PackageManager
+import android.text.TextUtils
+import org.lzh.framework.updatepluginlib.base.FileChecker
+import org.lzh.framework.updatepluginlib.util.ActivityManager
+import java.io.File
+import java.io.FileInputStream
+import java.io.IOException
+import java.io.InputStream
+import java.security.MessageDigest
+import java.util.Locale
+
+/**
+ * @author nanfeifei
+ * @time 2023/8/22 14:26
+ * @description  如需修改文件检查规则可用此类，并在UpdateConfig进行配置
+ */
+class CustomFileChecker: FileChecker() {
+
+    @Throws(Exception::class)
+    private fun check() {
+        if (!TextUtils.isEmpty(update.md5)) {
+            // 当md5值不为null时。使用md5进行检查
+            checkByMD5()
+        } else {
+            checkByPM()
+        }
+    }
+
+    private fun checkByPM() {
+        val context = ActivityManager.get().applicationContext
+        val packageManager = context.packageManager
+        val packageInfo =
+            packageManager.getPackageArchiveInfo(file.absolutePath, PackageManager.GET_ACTIVITIES)
+    }
+    @Throws(Exception::class)
+    private fun checkByMD5() {
+        val md5 = getMD5(file)
+        if (!update.md5.equals(md5, ignoreCase = true)) {
+            throw RuntimeException(
+                String.format(
+                    "The md5 not matched between apk and update entity. apk is %s but update is %s",
+                    md5, update.md5
+                )
+            )
+        }
+    }
+
+    override fun onCheckBeforeDownload(): Boolean {
+        return try {
+            check()
+            true
+        } catch (e: Exception) {
+            false
+        }
+    }
+
+    @Throws(Exception::class)
+    override fun onCheckBeforeInstall() {
+        try {
+            check()
+        } catch (e: Exception) {
+            // 检查失败。删除apk
+            file.delete()
+            throw e
+        }
+    }
+
+    @Throws(IOException::class)
+    private fun getMD5(file: File): String {
+        var md5str = ""
+        var `is`: InputStream? = null
+        try {
+            // 1 创建一个提供信息摘要算法的对象，初始化为md5算法对象
+            val md = MessageDigest.getInstance("MD5")
+            // 2 将消息变成byte数组
+            `is` = FileInputStream(file)
+            val buffer = ByteArray(8 * 1024)
+            var length = -1
+            while (`is`.read(buffer).also { length = it } != -1) {
+                md.update(buffer, 0, length)
+            }
+
+            // 3 计算后获得字节数组,这就是那128位了
+            val buff = md.digest()
+
+            // 4 把数组每一字节（一个字节占八位）换成16进制连成md5字符串
+            md5str = bytesToHex(buff)
+        } catch (e: Exception) {
+            e.printStackTrace()
+        } finally {
+            `is`?.close()
+        }
+        return md5str
+    }
+
+    private fun bytesToHex(bytes: ByteArray): String {
+        val md5str = StringBuffer()
+        // 把数组每一字节换成16进制连成md5字符串
+        var digital: Int
+        for (i in bytes.indices) {
+            digital = bytes[i].toInt()
+            if (digital < 0) {
+                digital += 256
+            }
+            if (digital < 16) {
+                md5str.append("0")
+            }
+            md5str.append(Integer.toHexString(digital))
+        }
+        return md5str.toString().uppercase(Locale.getDefault())
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/utils/updateplugin/CustomFileCreator.kt b/app/src/main/java/com/yxjk/healthexpertclient/utils/updateplugin/CustomFileCreator.kt
new file mode 100644
index 0000000..1b584c9
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/utils/updateplugin/CustomFileCreator.kt
@@ -0,0 +1,34 @@
+package com.yxjk.healthexpertclient.utils.updateplugin
+
+import org.lzh.framework.updatepluginlib.base.FileCreator
+import org.lzh.framework.updatepluginlib.model.Update
+import org.lzh.framework.updatepluginlib.util.ActivityManager
+import java.io.File
+
+/**
+ * @author nanfeifei
+ * @time 2023/8/22 13:26
+ * @description 如需修改文件保存路径或后缀名，并在UpdateConfig进行配置
+ */
+class CustomFileCreator: FileCreator() {
+    override fun create(update: Update?): File {
+        val cacheDir: File = getCacheDir()
+        cacheDir.mkdirs()
+        return File(cacheDir, "update_normal_" + update!!.versionName + ".apk")
+    }
+
+    override fun createForDaemon(update: Update?): File {
+        val cacheDir = getCacheDir()
+        cacheDir.mkdirs()
+        return File(cacheDir, "update_daemon_" + update!!.versionName + ".apk")
+    }
+    private fun getCacheDir(): File {
+        val context = ActivityManager.get().applicationContext
+        var cacheDir = context.externalCacheDir
+        if (cacheDir == null) {
+            cacheDir = context.cacheDir
+        }
+        cacheDir = File(cacheDir, "update")
+        return cacheDir
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/view/AddDiseaseDialog.kt b/app/src/main/java/com/yxjk/healthexpertclient/view/AddDiseaseDialog.kt
new file mode 100644
index 0000000..9c7468a
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/view/AddDiseaseDialog.kt
@@ -0,0 +1,73 @@
+package com.yxjk.healthexpertclient.view
+
+import android.app.AlertDialog
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.os.Build
+import android.os.Bundle
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.view.WindowManager
+import android.widget.LinearLayout
+import androidx.databinding.DataBindingUtil
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.DialogAddDiseaseBinding
+
+class AddDiseaseDialog constructor(context: Context
+) : AlertDialog(context) {
+    lateinit var onSubmitClickListener: OnSubmitClickListener
+    lateinit var binding: DialogAddDiseaseBinding
+    init {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            create()
+        } else {
+            onCreate(null)
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = DataBindingUtil.inflate(LayoutInflater.from(context),
+            R.layout.dialog_add_disease, null, false)
+        setContentView(binding.root)
+        window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))//设置dialog背景透明
+        window?.setLayout(context.resources.displayMetrics.widthPixels, LinearLayout.LayoutParams.WRAP_CONTENT);//设置对话框大小
+        window?.setGravity(Gravity.BOTTOM)
+        window?.clearFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM)
+        binding.btnAffirm.setOnClickListener{
+            this.cancel()
+            if(this::onSubmitClickListener.isInitialized){
+                var inputText = binding.etDisease.text.trim().toString()
+                if(!inputText.isNullOrEmpty()){
+                    binding.etDisease.text.clear()
+                    onSubmitClickListener?.onSubmitClick(this@AddDiseaseDialog, inputText)
+                }
+
+            }
+        }
+        binding.btnClose.setOnClickListener{
+            this.cancel()
+            if(this::onSubmitClickListener.isInitialized){
+                onSubmitClickListener?.onCloseClick(this@AddDiseaseDialog)
+            }
+        }
+
+    }
+
+    fun setOnSubmitClickListener(onSubmitClickListener: OnSubmitClickListener): AddDiseaseDialog{
+        this.onSubmitClickListener = onSubmitClickListener
+        return this
+    }
+    interface OnSubmitClickListener{
+        fun onSubmitClick(viewDialog: AddDiseaseDialog, inputText: String)
+        fun onCloseClick(viewDialog: AddDiseaseDialog)
+    }
+    fun setDialogTitle(title: String, titleSize: Float = 18f): AddDiseaseDialog{
+        binding.tvTitle.visibility = View.VISIBLE
+        binding.tvTitle.text = title
+        binding.tvTitle.textSize = titleSize
+        return this
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/view/BaseHealthyInformationView.kt b/app/src/main/java/com/yxjk/healthexpertclient/view/BaseHealthyInformationView.kt
new file mode 100644
index 0000000..a67ae04
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/view/BaseHealthyInformationView.kt
@@ -0,0 +1,34 @@
+package com.yxjk.healthexpertclient.view
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.btpj.lib_base.utils.ScreenUtil.dp2px
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.workbench.HealthInfoBean
+import com.yxjk.healthexpertclient.ui.workbench.adapter.HealthInfoAdapter
+
+
+class BaseHealthyInformationView: RecyclerView {
+    val mAdapter by lazy { HealthInfoAdapter() }
+    @JvmOverloads
+    constructor(context: Context, attrs : AttributeSet? = null,
+                defStyleAttr: Int = 0): super(context, attrs,defStyleAttr){
+    }
+    init {
+        val linearLayoutManager = LinearLayoutManager(context)
+        this.layoutManager = linearLayoutManager
+        this.background = context.getDrawable(R.drawable.rectangle_round_corner10_white)
+        this.elevation = dp2px(3f).toFloat()
+    }
+    fun setData(list: MutableList<HealthInfoBean>?){
+        if (list.isNullOrEmpty()) {
+            return
+        }
+        mAdapter.setList(list)
+        if (this.adapter == null) {
+            this.adapter = mAdapter
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/view/ConsultInformationView.kt b/app/src/main/java/com/yxjk/healthexpertclient/view/ConsultInformationView.kt
new file mode 100644
index 0000000..d626647
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/view/ConsultInformationView.kt
@@ -0,0 +1,360 @@
+package com.yxjk.healthexpertclient.view
+
+import android.content.Context
+import android.graphics.Paint
+import android.graphics.Typeface
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.LinearLayout
+import androidx.databinding.DataBindingUtil
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.btpj.lib_base.utils.DateUtil
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.workbench.ArchivesBean
+import com.yxjk.healthexpertclient.bean.workbench.CallTimeBean
+import com.yxjk.healthexpertclient.bean.workbench.ConsultDetailBean
+import com.yxjk.healthexpertclient.bean.workbench.ConsultInfoBean
+import com.yxjk.healthexpertclient.bean.workbench.ConsultRecordBean
+import com.yxjk.healthexpertclient.bean.workbench.HealthInfoBean
+import com.yxjk.healthexpertclient.bean.workbench.PhysicalExaminationReportBean
+import com.yxjk.healthexpertclient.databinding.ViewConsultInformationBinding
+import com.yxjk.healthexpertclient.ext.startArchivesDetailActivity
+import com.yxjk.healthexpertclient.ext.startCheckUpDetailActivity
+import com.yxjk.healthexpertclient.ui.workbench.adapter.HealthInfoAdapter
+import com.yxjk.healthexpertclient.utils.CommonUtils
+
+
+class ConsultInformationView : LinearLayout {
+    lateinit var mBinding: ViewConsultInformationBinding
+    val mAdapter by lazy { HealthInfoAdapter() }
+    private var archivesId: String? = ""
+    private var reportId: String? = ""
+    private var year: String? = ""
+    @JvmOverloads
+    constructor(
+        context: Context?, attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+    ) : super(context, attrs, defStyleAttr) {
+        if (isInEditMode) {
+            LayoutInflater.from(context).inflate(R.layout.view_consult_information, this, true)
+        } else {
+            mBinding = DataBindingUtil.inflate(
+                LayoutInflater.from(context),
+                R.layout.view_consult_information,
+                this,
+                true
+            )
+            val boldTypeface = Typeface.defaultFromStyle(Typeface.BOLD)
+            mBinding.stvArchives.leftTextView.typeface = boldTypeface
+            mBinding.stvPhysicalExaminationReport.leftTextView.typeface = boldTypeface
+            mBinding.stvAppointmentTime.leftTextView.typeface = boldTypeface
+            mBinding.stvRefuseCause.leftTextView.typeface = boldTypeface
+            mBinding.tvConsultPeopleInfoDetail.setOnClickListener {
+                context?.let { context ->
+                    if (archivesId.isNullOrEmpty()){
+                        return@let
+                    }
+                    startArchivesDetailActivity(context, archivesId!!)
+                }
+            }
+            val linearLayoutManager = LinearLayoutManager(context)
+            mBinding.rvHealthInfo.layoutManager = linearLayoutManager
+            mBinding.stvPhysicalExaminationReportInfo.rightTextView.setOnClickListener {
+                context?.let { context -> startCheckUpDetailActivity(context, reportId) }
+            }
+//            mBinding.stvConsultRecordInfo.rightTextView.setOnClickListener {
+//                context?.let { context -> startConsultHistoryActivity(context, 0) }
+//            }
+
+        }
+    }
+
+    enum class ConsultType(val type: Int) {
+        IMAGE_AND_TEXT(1),
+        AUDIO_AND_VIDEO(2)
+    }
+
+    enum class ConsultStatus(val status: Int) {
+        WAIT_CONFIRM(1),
+        WAIT_START(2),
+        IN_CONSULTATION(3), //（咨询中）已开始
+        WAIT_APPRAISE(4),
+        FINISH(5),
+        REFUSE(6),
+        CANCEL(7)
+    }
+
+    fun setData(consultDetailBean: ConsultDetailBean, consultType: ConsultType) {
+        mBinding.apply {
+            tvSubmitTime.text = context.getString(
+                R.string.consult_information_consult_submit_time,
+                DateUtil.getLongDateStr(consultDetailBean.createTime)
+            )
+            var consultInfoBean = consultDetailBean.conFamilyMembersDO
+            setConsultInfo(consultInfoBean)
+            var archivesBean = consultDetailBean.conMedicalRecordsListDO
+            setArchivesBean(archivesBean)
+            var healthInfoList = consultDetailBean.answer
+            setHealthInfo(healthInfoList)
+            if (consultDetailBean.idNo.isNullOrEmpty()) {//不为空时去请求体检报告，如果有数据再去显示
+                mBinding.stvPhysicalExaminationReport.visibility = View.GONE
+                mBinding.stvPhysicalExaminationReportInfo.visibility = View.GONE
+                mBinding.linePhysicalExaminationReport.visibility = View.GONE
+            }
+            when (consultType) {
+                ConsultType.IMAGE_AND_TEXT -> {
+                    mBinding.stvPhysicalExaminationReport.visibility = View.GONE
+                    mBinding.stvPhysicalExaminationReportInfo.visibility = View.GONE
+                    mBinding.linePhysicalExaminationReport.visibility = View.GONE
+                    showRefuseInfo(GONE)
+                    showAppointmentTime(GONE)
+                    showCallRecord(GONE)
+                    showConsultStartTime(GONE)
+                }
+
+                else -> {
+                    var consultRecordBean = consultDetailBean.conSession
+                    consultRecordBean?.let {
+
+                        var consultStatus = consultRecordBean.contentStatus
+                        when (consultStatus) {
+                            ConsultStatus.WAIT_CONFIRM.status.toString() -> {
+                                showRefuseInfo(GONE)
+                                showAppointmentTime(VISIBLE, consultRecordBean)
+                                showCallRecord(GONE)
+                                showConsultStartTime(GONE)
+                            }
+
+                            ConsultStatus.WAIT_START.status.toString() -> {
+                                showRefuseInfo(GONE)
+                                showAppointmentTime(VISIBLE, consultRecordBean)
+                                showCallRecord(GONE)
+                                var callTimeList = consultDetailBean.imList
+                                showCallRecord(GONE, callTimeList)
+                                showConsultStartTime(VISIBLE, consultRecordBean)
+                            }
+                            ConsultStatus.IN_CONSULTATION.status.toString()-> {
+                                showRefuseInfo(GONE)
+                                showAppointmentTime(VISIBLE, consultRecordBean)
+                                var callTimeList = consultDetailBean.imList
+                                showCallRecord(GONE, callTimeList)
+                                showConsultStartTime(VISIBLE, consultRecordBean)
+                            }
+
+                            ConsultStatus.WAIT_APPRAISE.status.toString(),
+                            ConsultStatus.FINISH.status.toString(),
+                            ConsultStatus.CANCEL.status.toString()-> {
+                                showRefuseInfo(GONE)
+                                showAppointmentTime(VISIBLE, consultRecordBean)
+                                var callTimeList = consultDetailBean.imList
+                                showCallRecord(VISIBLE, callTimeList)
+                                showConsultStartTime(GONE)
+                            }
+
+                            ConsultStatus.REFUSE.status.toString() -> {
+                                showRefuseInfo(VISIBLE, consultRecordBean)
+                                showAppointmentTime(VISIBLE, consultRecordBean)
+                                var callTimeList = consultDetailBean.imList
+                                showCallRecord(VISIBLE, callTimeList)
+                                showConsultStartTime(GONE)
+                            }
+                        }
+                    }
+                }
+            }
+
+        }
+    }
+
+    private fun showRefuseInfo(visibility: Int, consultRecordBean: ConsultRecordBean? = null) {
+        mBinding.stvRefuseCause.visibility = visibility
+        mBinding.rlRefuseRemark.visibility = visibility
+        if (visibility == VISIBLE) {
+            mBinding.stvAppointmentTime.rightTextView.paint.flags = Paint.STRIKE_THRU_TEXT_FLAG
+        } else {
+            mBinding.stvAppointmentTime.rightTextView.paint.flags = Paint.ANTI_ALIAS_FLAG
+        }
+        consultRecordBean?.let {
+            mBinding.stvRefuseCause.setRightString(consultRecordBean.reasonType)
+            mBinding.tvRefuseRemark.text = consultRecordBean.rejectReason
+        }
+    }
+
+    /**
+     * 设置咨询人信息
+     */
+    private fun setConsultInfo(consultInfoBean: ConsultInfoBean?) {
+        consultInfoBean?.let {
+            mBinding.apply {
+                stvConsultPeopleInfo.setLeftTopString(
+                    context.getString(
+                        R.string.consult_information_consult_people_name,
+                        consultInfoBean.name
+                    )
+                )
+                stvConsultPeopleInfo.setCenterTopString(
+                    context.getString(
+                        R.string.consult_information_consult_people_gender,
+                        CommonUtils.getGenderText(consultInfoBean.gender)
+                    )
+                )
+                stvConsultPeopleInfo.setRightTopString(
+                    context.getString(
+                        R.string.consult_information_consult_people_age,
+                        consultInfoBean.age
+                    )
+                )
+                stvConsultPeopleInfo.setLeftBottomString(
+                    context.getString(
+                        R.string.consult_information_consult_people_height,
+                        if (consultInfoBean.height.isNullOrEmpty()) context.getString(R.string.string_empty) else consultInfoBean.height
+                    )
+                )
+                stvConsultPeopleInfo.setCenterBottomString(
+                    context.getString(
+                        R.string.consult_information_consult_people_weight,
+                        if (consultInfoBean.weight.isNullOrEmpty()) context.getString(R.string.string_empty) else consultInfoBean.weight
+                    )
+                )
+            }
+        }
+    }
+
+    private fun setArchivesBean(archivesBean: ArchivesBean?) {
+        archivesBean?.let {
+            archivesId = archivesBean.id
+            mBinding.apply {
+                stvArchives.setRightString(if(archivesBean.updateTime.isNullOrEmpty()) "" else
+                    context.getString(
+                        R.string.consult_information_consult_people_create_time,
+                        archivesBean.updateTime
+                    )
+                )
+                tvArchivesExplain.text = context.getString(R.string.consult_information_consult_people_archives_explain, archivesBean.medicalDescribe)
+            }
+        }
+    }
+
+    private fun setHealthInfo(list: MutableList<HealthInfoBean>?) {
+        var isEmpty = list.isNullOrEmpty()
+        mBinding.tvHealthInfoTitle.visibility = if(isEmpty) GONE else VISIBLE
+        mBinding.lineHealthInfo.visibility = if(isEmpty) GONE else VISIBLE
+        mBinding.rvHealthInfo.visibility = if(isEmpty) GONE else VISIBLE
+        if (isEmpty) {
+            return
+        }
+        mAdapter.setNewInstance(list)
+        if (mBinding.rvHealthInfo.adapter == null) {
+            mBinding.rvHealthInfo.adapter = mAdapter
+        }
+    }
+
+    private fun showAppointmentTime(visibility: Int, consultRecordBean: ConsultRecordBean? = null) {
+        mBinding.lineAppointmentTime.visibility = visibility
+        mBinding.stvAppointmentTime.visibility = visibility
+        consultRecordBean?.let {
+            var dateStr = DateUtil.dateToStrShortChinese(consultRecordBean.sessionDateLong)
+            mBinding.stvAppointmentTime.setRightString(
+                dateStr + " " + DateUtil.getWeekStrChinese(consultRecordBean.week)
+                        + " " + CommonUtils.getAmPmText(consultRecordBean.amPm)
+            )
+        }
+    }
+
+    /**
+     * @param visibility 废弃
+     * @param callTimeList 通话记录列表
+     */
+    private fun showCallRecord(visibility: Int, callTimeList: MutableList<CallTimeBean>? = null) {
+        mBinding.tvCallRecordTitle.visibility = if (callTimeList.isNullOrEmpty()) GONE else VISIBLE
+        mBinding.tvCallRecord.visibility = if (callTimeList.isNullOrEmpty()) GONE else VISIBLE
+        if (callTimeList.isNullOrEmpty()) {
+            return
+        }
+        var callRecordStr = ""
+        var callTimeBean: CallTimeBean
+        for (index in callTimeList.indices) {
+            callTimeBean = callTimeList[index]
+            var startDateTime = DateUtil.getLongDateStr(callTimeBean.startTimLong)
+            when(callTimeBean.type){
+                "1" -> {
+                    var dateDayStr = callTimeBean.startTimLong?.let { DateUtil.getShortDateStr(it) } ?:""
+                    var startTime = DateUtil.dateToStrHour(callTimeBean.startTimLong)
+                    var endTime = DateUtil.dateToStrHour(callTimeBean.endTimeLong)
+                    callRecordStr += context.getString(
+                        R.string.consult_video_doctor_appointed_time,
+                        dateDayStr,
+                        startTime,
+                        endTime
+                    )
+                }
+                "2" -> {
+                    var timeDiff = DateUtil.dateDiff(callTimeBean.startTimLong, callTimeBean.endTimeLong)
+                    callRecordStr += context.getString(
+                        R.string.consult_video_call_duration,
+                        startDateTime,
+                        timeDiff
+                    )
+                }
+            }
+            if (index < callTimeList.size - 1) {
+                callRecordStr += "\n"
+            }
+        }
+        mBinding.tvCallRecord.text = callRecordStr
+    }
+
+    private fun showConsultStartTime(
+        visibility: Int,
+        consultRecordBean: ConsultRecordBean? = null
+    ) {
+        mBinding.llConsultStartTimeLay.visibility = visibility
+        consultRecordBean?.let {
+            var dateDayStr = DateUtil.dateToStrShortChinese(consultRecordBean.doctorStartTimeLong)
+            var startTime = DateUtil.dateToStrHour(consultRecordBean.doctorStartTimeLong)
+            var endTime = DateUtil.dateToStrHour(consultRecordBean.doctorEndTimeLong)
+            mBinding.tvConsultStartTime.text = context.getString(
+                R.string.consult_wait_start_video_call_start_time,
+                dateDayStr,
+                startTime,
+                endTime
+            )
+        }
+    }
+
+    fun setPhysicalExaminationReport(physicalExaminationReportBean: PhysicalExaminationReportBean?) {
+        if (physicalExaminationReportBean == null) {
+            mBinding.stvPhysicalExaminationReport.visibility = View.GONE
+            mBinding.stvPhysicalExaminationReportInfo.visibility = View.GONE
+            mBinding.linePhysicalExaminationReport.visibility = View.GONE
+        }
+        physicalExaminationReportBean?.let {
+            reportId = it.id
+            year = it.tjrq
+            mBinding.stvPhysicalExaminationReport.visibility = View.VISIBLE
+            mBinding.stvPhysicalExaminationReportInfo.visibility = View.VISIBLE
+            mBinding.linePhysicalExaminationReport.visibility = View.VISIBLE
+            if (it.insertdate.isNullOrEmpty()){
+                mBinding.stvPhysicalExaminationReport.setRightString("")
+            }else{
+                mBinding.stvPhysicalExaminationReport.setRightString(
+                    context.getString(
+                        R.string.consult_information_physical_examination_report_upload_time,
+                        it.insertdate
+                    )
+                )
+            }
+
+            mBinding.stvPhysicalExaminationReportInfo.setLeftString(
+                context.getString(
+                    R.string.consult_information_physical_examination_report_intro,
+                    it.tjrq,
+                    it.yymc
+                )
+            )
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/view/CustomDownloadNotifier.java b/app/src/main/java/com/yxjk/healthexpertclient/view/CustomDownloadNotifier.java
new file mode 100644
index 0000000..f86d801
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/view/CustomDownloadNotifier.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2017 Haoge
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.yxjk.healthexpertclient.view;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.view.Gravity;
+import android.view.Window;
+
+import androidx.annotation.NonNull;
+
+import org.lzh.framework.updatepluginlib.base.DownloadCallback;
+import org.lzh.framework.updatepluginlib.base.DownloadNotifier;
+import org.lzh.framework.updatepluginlib.model.Update;
+import org.lzh.framework.updatepluginlib.util.ActivityManager;
+import org.lzh.framework.updatepluginlib.util.SafeDialogHandle;
+
+import java.io.File;
+
+/**
+ * 默认使用的在检查到有更新时的通知创建器：创建一个弹窗提示用户当前有新版本需要更新。
+ *
+ * @author haoge
+ * @see CustomDownloadNotifier
+ */
+public class CustomDownloadNotifier extends DownloadNotifier {
+    @Override
+    public DownloadCallback create(Update update, Activity activity) {
+        LoadingProgressDialog dialog = new LoadingProgressDialog(activity,ProgressDialog.STYLE_SPINNER, "资源准备中...");
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setCanceledOnTouchOutside(false);
+        dialog.setCancelable(false);
+        dialog.setMessage("资源准备中...");
+        SafeDialogHandle.safeShowDialog(dialog);
+        return new DownloadCallback() {
+            @Override
+            public void onDownloadStart() {
+            }
+
+            @Override
+            public void onDownloadComplete(File file) {
+                SafeDialogHandle.safeDismissDialog(dialog);
+            }
+
+            @Override
+            public void onDownloadProgress(long current, long total) {
+                int percent = (int) (current * 1.0f / total * 100);
+                dialog.setMessageProgress("下载中("+percent+"%)");
+            }
+
+            @Override
+            public void onDownloadError(Throwable t) {
+                SafeDialogHandle.safeDismissDialog(dialog);
+                createRestartDialog();
+            }
+        };
+    }
+
+    private void createRestartDialog() {
+        String updateContent = "是否重新下载?";
+        TextViewDialog textViewDialog = new TextViewDialog(ActivityManager.get().topActivity());
+        textViewDialog.setDialogTitle("下载失败",18f);
+        textViewDialog.setContent(updateContent,14f);
+        textViewDialog.setContentStyle(Gravity.LEFT);
+        textViewDialog.setBtnText("确定",18f);
+        textViewDialog.setDialogCancelable(false);
+        if (!update.isForced()) {
+            textViewDialog.setCancelBtnText("退出",18f);
+        }
+        textViewDialog.setOnAffirmClickListener(new TextViewDialog.OnAffirmClickListener() {
+            @Override
+            public void onAffirmClick(@NonNull TextViewDialog viewDialog) {
+                restartDownload();
+            }
+
+            @Override
+            public void onCancelClick(@NonNull TextViewDialog viewDialog) {
+                if (update.isForced()) {
+                    ActivityManager.get().exit();
+                } else {
+                    viewDialog.dismiss();
+                }
+            }
+        });
+        textViewDialog.show();
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/view/CustomInstallNotifier.java b/app/src/main/java/com/yxjk/healthexpertclient/view/CustomInstallNotifier.java
new file mode 100644
index 0000000..a189956
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/view/CustomInstallNotifier.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2017 Haoge
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.yxjk.healthexpertclient.view;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.view.Gravity;
+
+import androidx.annotation.NonNull;
+
+import org.lzh.framework.updatepluginlib.base.CheckNotifier;
+import org.lzh.framework.updatepluginlib.base.InstallNotifier;
+import org.lzh.framework.updatepluginlib.util.SafeDialogHandle;
+
+/**
+ * 默认使用的在检查到有更新时的通知创建器：创建一个弹窗提示用户当前有新版本需要更新。
+ *
+ * @author haoge
+ * @see CheckNotifier
+ */
+public class CustomInstallNotifier extends InstallNotifier {
+    @Override
+    public Dialog create(Activity activity) {
+        String updateContent = "版本号: " + update.getVersionName()+"  安装资源已就绪";
+
+        TextViewDialog textViewDialog = new TextViewDialog(activity);
+        textViewDialog.setDialogTitle("新版本安装",18f);
+        textViewDialog.setContent(updateContent,14f);
+        textViewDialog.setContentStyle(Gravity.LEFT);
+        textViewDialog.setBtnText("立即安装",18f);
+        textViewDialog.setDialogCancelable(false);
+        if (!update.isForced()) {
+            textViewDialog.setCancelBtnText("取消",18f);
+        }
+        textViewDialog.setOnAffirmClickListener(new TextViewDialog.OnAffirmClickListener() {
+            @Override
+            public void onAffirmClick(@NonNull TextViewDialog viewDialog) {
+                sendToInstall();
+                SafeDialogHandle.safeDismissDialog((Dialog) viewDialog);
+            }
+
+            @Override
+            public void onCancelClick(@NonNull TextViewDialog viewDialog) {
+                sendCheckIgnore();
+                SafeDialogHandle.safeDismissDialog((Dialog) viewDialog);
+            }
+        });
+        return textViewDialog;
+    }
+}
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/view/CustomPasswordView.kt b/app/src/main/java/com/yxjk/healthexpertclient/view/CustomPasswordView.kt
new file mode 100644
index 0000000..905089b
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/view/CustomPasswordView.kt
@@ -0,0 +1,55 @@
+package com.yxjk.healthexpertclient.view
+
+import android.content.Context
+import android.text.Editable
+import android.text.TextUtils
+import android.text.TextWatcher
+import android.text.method.HideReturnsTransformationMethod
+import android.text.method.PasswordTransformationMethod
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.view.inputmethod.EditorInfo
+import android.widget.EditText
+import android.widget.RelativeLayout
+import android.widget.TextView
+import androidx.databinding.DataBindingUtil
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.CustomPasswordViewBinding
+
+class CustomPasswordView : RelativeLayout {
+
+    var mContext:Context?=null
+    lateinit var mBinding: CustomPasswordViewBinding
+    constructor(context: Context?,attrs : AttributeSet?): super(context, attrs,0){
+        mContext=context
+        if(isInEditMode){
+            LayoutInflater.from(context).inflate(R.layout.custom_password_view, this, true)
+        }else{
+            mBinding = DataBindingUtil.inflate(
+                LayoutInflater.from(context),
+                R.layout.custom_password_view, this,true)
+        }
+        mBinding.loginEtUserPassword.setTransformationMethod(PasswordTransformationMethod.getInstance())
+        mBinding.loginIvEye.setOnClickListener {
+            mBinding?.let {
+                var selection=it.loginEtUserPassword.selectionEnd
+                if (it.loginEtUserPassword.transformationMethod== PasswordTransformationMethod.getInstance()){
+                    it.loginEtUserPassword.setTransformationMethod(
+                        HideReturnsTransformationMethod.getInstance())
+                    it.loginIvEye.setImageResource(R.mipmap.ic_password_show)
+                }else{
+                    it.loginEtUserPassword.setTransformationMethod(PasswordTransformationMethod.getInstance())
+                    it.loginIvEye.setImageResource(R.mipmap.ic_password_hind)
+                }
+                it.loginEtUserPassword.setSelection(selection)
+            }
+        }
+    }
+    fun getInputContext():String{
+        return mBinding.loginEtUserPassword.text.toString().trim()
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/view/CustomRichTextView.kt b/app/src/main/java/com/yxjk/healthexpertclient/view/CustomRichTextView.kt
new file mode 100644
index 0000000..5555202
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/view/CustomRichTextView.kt
@@ -0,0 +1,134 @@
+package com.yxjk.healthexpertclient.view
+
+import android.content.Context
+import android.graphics.Color
+import android.os.Handler
+import android.os.Looper
+import android.os.Message
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewTreeObserver
+import android.widget.RelativeLayout
+import androidx.databinding.DataBindingUtil
+import com.btpj.lib_base.ext.toHtml
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.ViewCustomRichTextViewBinding
+import java.lang.ref.WeakReference
+
+/**
+ * 体检详情页的富文本展示
+ * @author nanfeifei copy userclient liangwenjie
+ */
+class CustomRichTextView : RelativeLayout {
+
+    var mContext: Context? = null
+    var mBinding: ViewCustomRichTextViewBinding
+    var isExpand=true //是否展开
+    var mTextContent=""
+    var mTextContent2=""
+
+    constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs, 0) {
+        mContext = context
+        mBinding = DataBindingUtil.inflate(
+            LayoutInflater.from(context),
+            R.layout.view_custom_rich_text_view, this, true
+        )
+        mBinding.customRichTextViewExpandRoot.setOnClickListener {
+            if (isExpand) {
+                isExpand = false
+                mBinding.customRichTextViewHint.text = mTextContent2
+                mBinding.customRichTextViewExpand.text = "展开"
+                mBinding.customRichTextViewIcon.setImageResource(R.drawable.ic_rich_down)
+            } else {
+                isExpand = true
+                mBinding.customRichTextViewHint.text = mTextContent.toHtml()
+                mBinding.customRichTextViewExpand.text = "收起"
+                mBinding.customRichTextViewIcon.setImageResource(R.drawable.ic_rich_up)
+            }
+        }
+    }
+
+    /**
+     * 0 体检结论  1体检建议
+     */
+    fun setRichTextStyle(type: Int, textdec: String) {
+        if (textdec.isNullOrEmpty()) {
+            return
+        }
+        mTextContent=textdec
+        mBinding.apply {
+            try {
+                when (type) {
+                    0 -> {
+                        customRichTextViewTag.setBackgroundColor(Color.parseColor("#DA180F"))
+                        customRichTextViewTitle.text = "体检结论"
+                    }
+                    1 -> {
+                        customRichTextViewTag.setBackgroundColor(Color.parseColor("#F6C60A"))
+                        customRichTextViewTitle.text = "体检建议"
+                    }
+                }
+//                mBinding.customRichTextViewHint.setImageDrawable(mContext?.getDrawable(resID))
+                mBinding.customRichTextViewHint.text = textdec.toHtml()
+
+                mBinding.customRichTextViewHint.viewTreeObserver.addOnPreDrawListener(object :
+                    ViewTreeObserver.OnPreDrawListener {
+                    override fun onPreDraw(): Boolean {
+                        var line = mBinding.customRichTextViewHint.lineCount
+                        mHandler.sendMessage(Message.obtain().apply {
+                            what = 0
+                            obj = line
+                        })
+                        mBinding.customRichTextViewHint.viewTreeObserver.removeOnPreDrawListener(
+                            this
+                        )
+                        return false
+                    }
+                })
+
+
+            } catch (e: Exception) {
+            }
+        }
+
+    }
+
+    private val mHandler = MyHandler(WeakReference(this))
+
+    private class MyHandler(val wrActivity: WeakReference<CustomRichTextView>) :
+        Handler(Looper.getMainLooper()) {
+        override fun handleMessage(msg: Message) {
+            super.handleMessage(msg)
+            wrActivity.get()?.run {
+                when (msg.what) {
+                    0 -> {
+                        var line = msg.obj as Int
+                        if (line > 3) {
+                            isExpand=false
+                            var layout=mBinding.customRichTextViewHint.layout
+                            for (index in 0 until 3){
+                                var str = mBinding.customRichTextViewHint.text
+                                mTextContent2 += str.substring(
+                                    layout.getLineStart(index),
+                                    layout.getLineEnd(index)
+                                )
+                            }
+
+
+                            mTextContent2 = mTextContent2.substring(0, mTextContent2.length - 3)+"..."
+                            mBinding.customRichTextViewHint.text = mTextContent2
+                            mBinding.customRichTextViewExpand.visibility = View.VISIBLE
+                            mBinding.customRichTextViewExpand.text = "展开"
+                            mBinding.customRichTextViewHint.maxLines = Int.MAX_VALUE
+                        } else {
+                            mBinding.customRichTextViewExpand.visibility = View.INVISIBLE
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/view/CustomSearchView.kt b/app/src/main/java/com/yxjk/healthexpertclient/view/CustomSearchView.kt
new file mode 100644
index 0000000..29aa9e9
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/view/CustomSearchView.kt
@@ -0,0 +1,53 @@
+package com.yxjk.healthexpertclient.view
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.inputmethod.EditorInfo
+import android.widget.EditText
+import android.widget.RelativeLayout
+import android.widget.TextView
+import androidx.databinding.DataBindingUtil
+import com.btpj.lib_base.utils.KeyboardUtil.hideSoftInput
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.CustomSearchViewBinding
+
+
+class CustomSearchView : RelativeLayout {
+
+    var mContext:Context?=null
+    lateinit var mBinding: CustomSearchViewBinding
+    constructor(context: Context?,attrs : AttributeSet?): super(context, attrs,0){
+        mContext=context
+        if(isInEditMode){
+            LayoutInflater.from(context).inflate(R.layout.custom_search_view, this, true)
+        }else{
+            mBinding = DataBindingUtil.inflate(
+                LayoutInflater.from(context),
+                R.layout.custom_search_view, this,true)
+        }
+
+    }
+    fun initView(hint:String){
+        mBinding.customSearchEt.hint="$hint"
+    }
+
+    fun setOnSearchClickListener(method: (searchContent:String) -> Unit){
+        mBinding.customSearchTv.setOnClickListener {
+            hideSoftInput(context, mBinding.customSearchEt)
+            var value=mBinding.customSearchEt.text.trim().toString()
+            method(value)
+        }
+        mBinding.customSearchEt.setOnEditorActionListener(TextView.OnEditorActionListener { v, actionId, event ->
+            if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+                //点击搜索的时候隐藏软键盘
+                hideSoftInput(context, v as EditText)
+                var value=mBinding.customSearchEt.text.trim().toString()
+                method(value)
+            }
+            false
+        })
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/view/CustomUpdateNotifier.java b/app/src/main/java/com/yxjk/healthexpertclient/view/CustomUpdateNotifier.java
new file mode 100644
index 0000000..d2f432b
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/view/CustomUpdateNotifier.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2017 Haoge
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.yxjk.healthexpertclient.view;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.view.Gravity;
+
+import androidx.annotation.NonNull;
+
+import org.lzh.framework.updatepluginlib.base.CheckNotifier;
+import org.lzh.framework.updatepluginlib.util.SafeDialogHandle;
+
+/**
+ * 默认使用的在检查到有更新时的通知创建器：创建一个弹窗提示用户当前有新版本需要更新。
+ *
+ * @author haoge
+ * @see CheckNotifier
+ */
+public class CustomUpdateNotifier extends CheckNotifier {
+    @Override
+    public Dialog create(Activity activity) {
+        String updateContent = "版本号: " + update.getVersionName() + "\n\n"
+                + update.getUpdateContent();
+
+        TextViewDialog textViewDialog = new TextViewDialog(activity);
+        textViewDialog.setDialogTitle("发现新版本",18f);
+        textViewDialog.setContent(updateContent,14f);
+        textViewDialog.setContentStyle(Gravity.LEFT);
+        textViewDialog.setBtnText("立即更新",18f);
+        textViewDialog.setDialogCancelable(false);
+        if (!update.isForced()) {
+            textViewDialog.setCancelBtnText("取消",18f);
+        }
+        textViewDialog.setOnAffirmClickListener(new TextViewDialog.OnAffirmClickListener() {
+            @Override
+            public void onAffirmClick(@NonNull TextViewDialog viewDialog) {
+                sendDownloadRequest();
+                SafeDialogHandle.safeDismissDialog((Dialog) viewDialog);
+            }
+
+            @Override
+            public void onCancelClick(@NonNull TextViewDialog viewDialog) {
+                sendUserCancel();
+                SafeDialogHandle.safeDismissDialog((Dialog) viewDialog);
+            }
+        });
+        return textViewDialog;
+    }
+}
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/view/DateTimeRangePicker.kt b/app/src/main/java/com/yxjk/healthexpertclient/view/DateTimeRangePicker.kt
new file mode 100644
index 0000000..cf79a6f
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/view/DateTimeRangePicker.kt
@@ -0,0 +1,152 @@
+package com.yxjk.healthexpertclient.view
+
+import android.app.Activity
+import android.view.View
+import android.widget.TextView
+import androidx.annotation.StyleRes
+import com.btpj.lib_base.utils.ToastUtil
+import com.github.gzuliyujiang.wheelpicker.DatimePicker
+import com.github.gzuliyujiang.wheelpicker.entity.DateEntity
+import com.github.gzuliyujiang.wheelpicker.entity.DatimeEntity
+import com.github.gzuliyujiang.wheelpicker.entity.TimeEntity
+import com.yxjk.healthexpertclient.R
+import java.text.SimpleDateFormat
+import java.util.Locale
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/26 13:41
+ * @description
+ */
+class DateTimeRangePicker: DatimePicker {
+    private lateinit var onDateTimeRangePickedListener: OnDateTimeRangePickedListener
+    private lateinit var startTime: DatimeEntity
+    private lateinit var endTime: DatimeEntity
+    lateinit var tvStartTime: TextView
+    lateinit var tvEndTime: TextView
+    constructor(context: Activity, @StyleRes themeResId: Int = 0): super(context, themeResId){
+
+    }
+
+    override fun createHeaderView(): View? {
+        var headerView = View.inflate(activity, R.layout.dialog_header_date_time_range, null)
+        tvStartTime = headerView.findViewById(R.id.tv_start_time)
+        tvEndTime = headerView.findViewById(R.id.tv_end_time)
+        tvStartTime.setOnClickListener(this)
+        tvEndTime.setOnClickListener(this)
+        tvStartTime.isActivated =true
+        tvEndTime.isActivated =false
+        return headerView
+    }
+
+    override fun initView() {
+        super.initView()
+        wheelLayout.timeWheelLayout.setTimeStep(1, 15, 1)
+        wheelLayout.timeWheelLayout.setCyclicEnabled(true)
+        wheelLayout.setOnDatimeSelectedListener { year, month, day, hour, minute, second ->
+            setStartTimeText()
+            setEndTimeText()
+        }
+    }
+
+    override fun onClick(v: View?) {
+        when(v?.id){
+            R.id.tv_start_time -> {
+                v.isActivated = true
+                tvEndTime.isActivated = false
+                setEndTimeText()
+            }
+            R.id.tv_end_time -> {
+                v.isActivated = true
+                tvStartTime.isActivated = false
+                setStartTimeText()
+            }
+            com.github.gzuliyujiang.dialog.R.id.dialog_modal_ok ->{
+                if(!this::startTime.isInitialized){
+                    ToastUtil.showShort(context, "请选择预计开始时间")
+                    return
+                }
+                if(!this::endTime.isInitialized){
+                    ToastUtil.showShort(context, "请选择预计结束时间")
+                    return
+                }
+                if (startTime == null || startTime.date == null || startTime.time == null){
+                    ToastUtil.showShort(context, "请选择预计开始时间")
+                    return
+                }
+                if (endTime == null || endTime.date == null || endTime.time == null){
+                    ToastUtil.showShort(context, "请选择预计结束时间")
+                    return
+                }
+                if (startTime.toTimeInMillis() > endTime.toTimeInMillis()){
+                    ToastUtil.showShort(context, "结束时间需要在开始时间之后")
+                    return
+                }
+                dismiss()
+            }
+        }
+        super.onClick(v)
+    }
+    private fun setStartTimeText(){
+        if(!this::startTime.isInitialized){
+            startTime = DatimeEntity()
+        }
+        if(tvStartTime.isActivated){
+            startTime.time = TimeEntity.target(wheelLayout.selectedHour, wheelLayout.selectedMinute, wheelLayout.selectedSecond)
+            startTime.date = DateEntity.target(wheelLayout.selectedYear, wheelLayout.selectedMonth, wheelLayout.selectedDay)
+            tvStartTime.text = getShortDateStr(startTime.toTimeInMillis())
+        }
+    }
+    private fun setEndTimeText(){
+        if(!this::endTime.isInitialized){
+            endTime = DatimeEntity()
+        }
+        if(tvEndTime.isActivated){
+            endTime.time = TimeEntity.target(wheelLayout.selectedHour, wheelLayout.selectedMinute, wheelLayout.selectedSecond)
+            endTime.date = DateEntity.target(wheelLayout.selectedYear, wheelLayout.selectedMonth, wheelLayout.selectedDay)
+            tvEndTime.text = getShortDateStr(endTime.toTimeInMillis())
+        }
+    }
+    override fun createTopLineView(): View? {
+        return null
+    }
+    private fun getShortDateStr(currentTimeMills: Long): String {
+        return SimpleDateFormat("MM月dd日 HH:mm", Locale.getDefault()).format(currentTimeMills)
+    }
+    override fun onCancel() {
+        super.onCancel()
+    }
+
+    override fun onOk() {
+        if(!this::startTime.isInitialized){
+            ToastUtil.showShort(context, "请选择预计开始时间")
+            return
+        }
+        if(!this::endTime.isInitialized){
+            ToastUtil.showShort(context, "请选择预计结束时间")
+            return
+        }
+        if (startTime == null || startTime.date == null || startTime.time == null){
+            ToastUtil.showShort(context, "请选择预计开始时间")
+            return
+        }
+        if (endTime == null || endTime.date == null || endTime.time == null){
+            ToastUtil.showShort(context, "请选择预计结束时间")
+            return
+        }
+        if (startTime.toTimeInMillis() > endTime.toTimeInMillis()){
+            ToastUtil.showShort(context, "结束时间需要在开始时间之后")
+            return
+        }
+        if(this::onDateTimeRangePickedListener.isInitialized){
+            onDateTimeRangePickedListener.onDateTimeRangePicked(startTime.toTimeInMillis(), endTime.toTimeInMillis())
+        }
+    }
+
+    fun setOnDateTimeRangePickedListener(onDateTimeRangePickedListener: OnDateTimeRangePickedListener){
+        this.onDateTimeRangePickedListener = onDateTimeRangePickedListener
+    }
+    interface OnDateTimeRangePickedListener{
+        fun onDateTimeRangePicked(startTime: Long, endTime: Long)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/view/LoadingProgressDialog.java b/app/src/main/java/com/yxjk/healthexpertclient/view/LoadingProgressDialog.java
new file mode 100644
index 0000000..23a34f3
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/view/LoadingProgressDialog.java
@@ -0,0 +1,110 @@
+package com.yxjk.healthexpertclient.view;
+
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.yxjk.healthexpertclient.R;
+
+
+/**
+ * 加载中Dialog
+ *
+ * @author lexyhp
+ */
+public class LoadingProgressDialog extends Dialog {
+
+
+    private TextView tips_loading_msg;
+    private int layoutResId;
+    private String message = null;
+    Context context;
+    View view = null;
+    ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.WRAP_CONTENT);
+    String contentmsg;
+    private ImageView mIvProgress;
+    private ProgressDrawable mProgressDrawable;
+
+    public LoadingProgressDialog(Context context, int themeResId, String content) {
+        super(context, R.style.MyLoadingDialog);
+        this.context = context;
+        this.contentmsg = content;
+        view = LayoutInflater.from(context).inflate(
+                R.layout.view_tips_loading, null);
+    }
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        this.setContentView(R.layout.view_tips_loading);
+        mIvProgress = (ImageView) findViewById(R.id.iv_progress);
+        mProgressDrawable = new ProgressDrawable();
+        mProgressDrawable.setColor(0xffffffff);
+        mIvProgress.setImageDrawable(mProgressDrawable);
+        tips_loading_msg = (TextView) findViewById(R.id.tips_loading_msg);
+        if (contentmsg.length() == 0) {
+            tips_loading_msg.setVisibility(View.GONE);
+        } else {
+            tips_loading_msg.setVisibility(View.VISIBLE);
+        }
+        tips_loading_msg.setText(this.contentmsg);
+    }
+
+    @Override
+    public void dismiss() {
+        super.dismiss();
+        if (mProgressDrawable != null) {
+            mProgressDrawable.stop();
+        }
+
+    }
+
+    @Override
+    public void show() {
+        if (!this.isShowing()) {
+            super.show();
+        }
+        if (tips_loading_msg != null) {
+            tips_loading_msg.setText(contentmsg);
+        }
+        if (mProgressDrawable != null) {
+            mProgressDrawable.start();
+        }
+    }
+
+    @Override
+    public void setOnDismissListener(OnDismissListener listener) {
+        super.setOnDismissListener(listener);
+    }
+
+    public void setMessage(String _message) {
+        contentmsg = _message;
+    }
+
+    public void setMessageProgress(String _message) {
+        contentmsg = _message;
+        if (tips_loading_msg != null) {
+            if (_message.length() == 0) {
+                tips_loading_msg.setVisibility(View.GONE);
+            } else {
+                tips_loading_msg.setVisibility(View.VISIBLE);
+                tips_loading_msg.setText(_message);
+            }
+        }
+    }
+
+    @Override
+    public void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        mProgressDrawable = null;
+    }
+
+}
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/view/PopupWindowRecycleView.kt b/app/src/main/java/com/yxjk/healthexpertclient/view/PopupWindowRecycleView.kt
new file mode 100644
index 0000000..35fd971
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/view/PopupWindowRecycleView.kt
@@ -0,0 +1,22 @@
+package com.yxjk.healthexpertclient.view
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.widget.PopupWindow
+import androidx.databinding.DataBindingUtil
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.PopupwindowRecycleViewBinding
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/6 14:39
+ * @description
+ */
+class PopupWindowRecycleView(val context: Context): PopupWindow() {
+
+    var mBinding: PopupwindowRecycleViewBinding = DataBindingUtil.inflate(LayoutInflater.from(context), R.layout.view_consult_information,null, false)
+    init {
+        this.isOutsideTouchable = false //是否可以
+        this.isClippingEnabled = false //背景透明化可以铺满全屏
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/view/PrivacyDialog.kt b/app/src/main/java/com/yxjk/healthexpertclient/view/PrivacyDialog.kt
new file mode 100644
index 0000000..5f06123
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/view/PrivacyDialog.kt
@@ -0,0 +1,88 @@
+package com.yxjk.healthexpertclient.view
+
+import android.app.AlertDialog
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.os.Build
+import android.os.Bundle
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.LinearLayout
+import androidx.databinding.DataBindingUtil
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.DialogPrivacyTextViewBinding
+
+open class PrivacyDialog constructor(context: Context
+) : AlertDialog(context) {
+    lateinit var mOnAffirmClickListener: OnAffirmClickListener
+    protected lateinit var binding: DialogPrivacyTextViewBinding
+    init {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            create()
+        } else {
+            onCreate(null)
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = DataBindingUtil.inflate(LayoutInflater.from(context),
+            R.layout.dialog_privacy_text_view, null, false)
+        setContentView(binding.root)
+        window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))//设置dialog背景透明
+        window?.setLayout(context.resources.displayMetrics.widthPixels * 21/25, context.resources.displayMetrics.heightPixels * 21/25);//设置对话框大小
+        binding.btnAffirm.setOnClickListener{
+            mOnAffirmClickListener?.onAffirmClick(this@PrivacyDialog)
+            this.cancel()
+        }
+        binding.btnCancel.setOnClickListener{
+            mOnAffirmClickListener?.onCancelClick(this@PrivacyDialog)
+            this.cancel()
+        }
+
+    }
+
+    fun setOnAffirmClickListener(onAffirmClickListener: OnAffirmClickListener): PrivacyDialog{
+        this.mOnAffirmClickListener = onAffirmClickListener
+        return this
+    }
+    interface OnAffirmClickListener{
+        fun onAffirmClick(viewDialog: PrivacyDialog)
+        fun onCancelClick(viewDialog: PrivacyDialog)
+    }
+    fun setDialogTitle(title: String, titleSize: Float = 18f): PrivacyDialog{
+        binding.tvTitle.visibility = View.VISIBLE
+        binding.tvTitle.text = title
+        binding.tvTitle.textSize = titleSize
+        return this
+    }
+    fun setContent(text: String, textSize: Float = 13f): PrivacyDialog{
+        binding.tvText.visibility = View.VISIBLE
+        binding.tvText.text = text
+        binding.tvText.textSize = textSize
+        return this
+    }
+    fun setContentStyle(gravity : Int): PrivacyDialog{
+        binding.tvText.gravity=gravity
+        return this
+    }
+    fun setBtnText(text: String, btnTextSize: Float = 18f): PrivacyDialog{
+        binding.btnAffirm.text = text
+        binding.btnAffirm.textSize = btnTextSize
+        return this
+    }
+    fun setCancelBtnText(text: String, btnTextSize: Float = 18f): PrivacyDialog{
+        binding.btnCancel.visibility = View.VISIBLE
+        binding.line2.visibility = View.VISIBLE
+        binding.btnCancel.text = text
+        binding.btnCancel.textSize = btnTextSize
+        return this
+    }
+
+    fun setDialogCancelable(flag:Boolean):PrivacyDialog{
+        setCancelable(flag)
+        return this
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/view/ProgressDrawable.java b/app/src/main/java/com/yxjk/healthexpertclient/view/ProgressDrawable.java
new file mode 100644
index 0000000..417ed7f
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/view/ProgressDrawable.java
@@ -0,0 +1,116 @@
+package com.yxjk.healthexpertclient.view;
+
+import android.animation.ValueAnimator;
+import android.graphics.Canvas;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PixelFormat;
+import android.graphics.Rect;
+import android.graphics.drawable.Animatable;
+import android.graphics.drawable.Drawable;
+import android.view.animation.LinearInterpolator;
+
+
+/**
+ * 旋转动画
+ */
+
+public class ProgressDrawable extends Drawable implements Animatable {
+
+    private int mProgressDegree = 0;
+    private ValueAnimator mValueAnimator;
+    private Path mPath = new Path();
+    private Paint mPaint = new Paint();
+
+    public ProgressDrawable() {
+        mPaint.setStyle(Paint.Style.FILL);
+        mPaint.setAntiAlias(true);
+        mPaint.setColor(0xffaaaaaa);
+        setupAnimators();
+    }
+
+    public void setColor(int color) {
+        mPaint.setColor(color);
+    }
+
+    //<editor-fold desc="Drawable">
+    @Override
+    public void draw(Canvas canvas) {
+        Rect bounds = getBounds();
+        int width = bounds.width();
+        int height = bounds.height();
+        canvas.save();
+        canvas.rotate(mProgressDegree, (width) / 2, (height) / 2);
+        final int r = Math.max(1, width / 20);
+        for (int i = 0; i < 12; i++) {
+            mPath.reset();
+            mPath.addCircle(width - r, height / 2, r, Path.Direction.CW);
+            mPath.addRect(width - 5 * r, height / 2 - r, width - r, height / 2 + r, Path.Direction.CW);
+            mPath.addCircle(width - 5 * r, height / 2, r, Path.Direction.CW);
+            mPaint.setAlpha((i+5) * 0x11);
+            canvas.rotate(30, (width) / 2, (height) / 2);
+            canvas.drawPath(mPath, mPaint);
+        }
+        canvas.restore();
+    }
+
+    @Override
+    public void setAlpha(int alpha) {
+        mPaint.setAlpha(alpha);
+    }
+
+    @Override
+    public void setColorFilter(ColorFilter cf) {
+        mPaint.setColorFilter(cf);
+    }
+
+    @Override
+    public int getOpacity() {
+        return PixelFormat.TRANSLUCENT;
+    }
+    //</editor-fold>
+
+    private void setupAnimators() {
+        mValueAnimator = ValueAnimator.ofInt(30, 3600);
+        mValueAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                int value = (int) animation.getAnimatedValue();
+                mProgressDegree = 30 * (value / 30);
+                invalidateSelf();
+            }
+        });
+        mValueAnimator.setDuration(10000);
+        mValueAnimator.setInterpolator(new LinearInterpolator());
+        mValueAnimator.setRepeatCount(ValueAnimator.INFINITE);
+        mValueAnimator.setRepeatMode(ValueAnimator.RESTART);
+    }
+
+    @Override
+    public void start() {
+        if (!mValueAnimator.isRunning()) {
+            mValueAnimator.start();
+        }
+    }
+
+    @Override
+    public void stop() {
+        if (mValueAnimator.isRunning()) {
+            mValueAnimator.cancel();
+        }
+    }
+
+    @Override
+    public boolean isRunning() {
+        return mValueAnimator.isRunning();
+    }
+
+    public int width() {
+        return getBounds().width();
+    }
+
+    public int height() {
+        return getBounds().height();
+    }
+}
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/view/RefuseExplainDialog.kt b/app/src/main/java/com/yxjk/healthexpertclient/view/RefuseExplainDialog.kt
new file mode 100644
index 0000000..504f001
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/view/RefuseExplainDialog.kt
@@ -0,0 +1,112 @@
+package com.yxjk.healthexpertclient.view
+
+import android.app.AlertDialog
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.os.Build
+import android.os.Bundle
+import android.text.TextUtils
+import android.view.LayoutInflater
+import android.view.View
+import android.view.WindowManager
+import android.widget.ArrayAdapter
+import android.widget.LinearLayout
+import androidx.databinding.DataBindingUtil
+import com.btpj.lib_base.utils.ToastUtil
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.bean.workbench.RefuseReasonBean
+import com.yxjk.healthexpertclient.databinding.DialogRefuseExplainBinding
+
+class RefuseExplainDialog constructor(context: Context
+) : AlertDialog(context) {
+    lateinit var onSubmitClickListener: OnSubmitClickListener
+    lateinit var binding: DialogRefuseExplainBinding
+    var reasonList: MutableList<RefuseReasonBean> = mutableListOf()
+    var spinnerPosition: Int = -1
+    init {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            create()
+        } else {
+            onCreate(null)
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = DataBindingUtil.inflate(LayoutInflater.from(context),
+            R.layout.dialog_refuse_explain, null, false)
+        setContentView(binding.root)
+        window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))//设置dialog背景透明
+        window?.setLayout(context.resources.displayMetrics.widthPixels * 280/375, LinearLayout.LayoutParams.WRAP_CONTENT);//设置对话框大小
+        window?.clearFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM)
+//        binding.spinnerReason.onItemSelectedListener = object : OnItemSelectedListener{
+//            override fun onItemSelected(
+//                parent: AdapterView<*>?,
+//                view: View?,
+//                position: Int,
+//                id: Long
+//            ) {
+//            }
+//
+//            override fun onNothingSelected(parent: AdapterView<*>?) {
+//            }
+//        }
+
+        binding.btnSubmit.setOnClickListener{
+            if(this::onSubmitClickListener.isInitialized){
+                spinnerPosition = binding.spinnerReason.selectedItemPosition
+                if(spinnerPosition>= 0 && spinnerPosition < reasonList.size){
+                    var remark = binding.etRemark.text.toString().trim()
+                    if(TextUtils.isEmpty(remark)){
+                        ToastUtil.showShort(context, R.string.dialog_refuse_explain_remark_hint)
+                        return@setOnClickListener
+                    }
+                    this.cancel()
+                    onSubmitClickListener?.onSubmitClick(this@RefuseExplainDialog, reasonList[spinnerPosition].value, remark)
+                }else{
+                    this.cancel()
+                }
+            }else{
+                this.cancel()
+            }
+        }
+        binding.btnClose.setOnClickListener{
+            this.cancel()
+            if(this::onSubmitClickListener.isInitialized){
+                onSubmitClickListener?.onCloseClick(this@RefuseExplainDialog)
+            }
+        }
+
+    }
+
+    fun setOnSubmitClickListener(onSubmitClickListener: OnSubmitClickListener): RefuseExplainDialog{
+        this.onSubmitClickListener = onSubmitClickListener
+        return this
+    }
+    interface OnSubmitClickListener{
+        fun onSubmitClick(viewDialog: RefuseExplainDialog, reasonType: String, reasonExplain: String)
+        fun onCloseClick(viewDialog: RefuseExplainDialog)
+    }
+    fun setDialogTitle(title: String, titleSize: Float = 18f): RefuseExplainDialog{
+        binding.tvTitle.visibility = View.VISIBLE
+        binding.tvTitle.text = title
+        binding.tvTitle.textSize = titleSize
+        return this
+    }
+    fun setSpinnerData(reasonList: MutableList<RefuseReasonBean>){
+        if(reasonList.isNullOrEmpty()){
+            return
+        }
+        this.reasonList = reasonList
+        val reasonArray = arrayOfNulls<String>(reasonList.size)
+        for(index in reasonList.indices){
+            reasonArray[index] = reasonList[index].text
+        }
+        val adapter = ArrayAdapter(context, R.layout.item_spinner_dropdown, reasonArray)
+        if(this::binding.isInitialized){
+            binding.spinnerReason.adapter = adapter
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/view/SpaceItemDecoration.kt b/app/src/main/java/com/yxjk/healthexpertclient/view/SpaceItemDecoration.kt
new file mode 100644
index 0000000..61a9dda
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/view/SpaceItemDecoration.kt
@@ -0,0 +1,121 @@
+package com.buddy.kredit.android.view
+
+import android.R
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Rect
+import android.graphics.drawable.Drawable
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView.ItemDecoration
+import com.buddy.kredit.android.view.SpaceItemDecoration
+import kotlin.jvm.JvmOverloads
+import androidx.annotation.DrawableRes
+import androidx.annotation.FloatRange
+import androidx.annotation.IntRange
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
+import androidx.core.view.ViewCompat
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.StaggeredGridLayoutManager
+import androidx.recyclerview.widget.OrientationHelper
+
+class SpaceItemDecoration : ItemDecoration {
+    private var mDivider: Drawable? = null
+    private var mSectionOffsetV = 0
+    private var mSectionOffsetH = 0
+    private var mDrawOver = true
+    private var withOffset = false
+
+    constructor(context: Context) {
+        val styledAttributes = context.obtainStyledAttributes(ATTRS)
+        mDivider = styledAttributes.getDrawable(0)
+        styledAttributes.recycle()
+    }
+
+    @JvmOverloads
+    constructor(
+        context: Context, @DrawableRes resId: Int,
+        @FloatRange(from = 0.0) sectionOffset: Float = 0f
+    ) : this(context, resId, sectionOffset, 0f) {
+    }
+
+    @SuppressLint("ResourceType")
+    constructor(
+        context: Context, @DrawableRes resId: Int,
+        @FloatRange(from = 0.0) sectionOffsetV: Float, @FloatRange(from = 0.0) sectionOffsetH: Float
+    ) {
+        if (resId > 0) mDivider = ContextCompat.getDrawable(context, resId)
+        mSectionOffsetV = (context.resources.displayMetrics.density * sectionOffsetV).toInt()
+        mSectionOffsetH = (context.resources.displayMetrics.density * sectionOffsetH).toInt()
+    }
+
+    fun withDrawOver(drawOver: Boolean): SpaceItemDecoration {
+        mDrawOver = drawOver
+        return this
+    }
+
+    override fun onDraw(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {
+        if (mDivider != null && !mDrawOver) {
+            draw(c, parent)
+        }
+    }
+
+    override fun onDrawOver(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {
+        if (mDivider != null && mDrawOver) {
+            draw(c, parent)
+        }
+    }
+
+    private fun draw(c: Canvas, parent: RecyclerView) {
+        val left = parent.paddingLeft
+        val right = parent.width - parent.paddingRight
+        val childCount = parent.childCount
+        for (i in 0 until childCount -1) {
+            val child = parent.getChildAt(i)
+            val params = child.layoutParams as RecyclerView.LayoutParams
+            val top = child.bottom + params.bottomMargin +
+                    Math.round(ViewCompat.getTranslationY(child))
+            val bottom =
+                top + if (mDivider!!.intrinsicHeight <= 0) 1 else mDivider!!.intrinsicHeight
+            mDivider!!.setBounds(left, top, right, bottom)
+            mDivider!!.draw(c)
+        }
+    }
+
+    fun withOffset(withOffset: Boolean): SpaceItemDecoration {
+        this.withOffset = withOffset
+        return this
+    }
+
+    /**
+     *
+     */
+    override fun getItemOffsets(
+        outRect: Rect,
+        view: View,
+        recyclerView: RecyclerView,
+        state: RecyclerView.State
+    ) {
+        if (getOrientation(recyclerView.layoutManager) == RecyclerView.VERTICAL) {
+            outRect[mSectionOffsetH, 0, mSectionOffsetH] = mSectionOffsetV
+        } else {
+            outRect[0, 0, mSectionOffsetV] = 0
+        }
+    }
+
+    companion object {
+        private val ATTRS = intArrayOf(
+            R.attr.listDivider
+        )
+
+        fun getOrientation(layoutManager: RecyclerView.LayoutManager?): Int {
+            if (layoutManager is LinearLayoutManager) {
+                return layoutManager.orientation
+            } else if (layoutManager is StaggeredGridLayoutManager) {
+                return layoutManager.orientation
+            }
+            return OrientationHelper.HORIZONTAL
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/view/SuspensionAnnouncementAffirmDialog.kt b/app/src/main/java/com/yxjk/healthexpertclient/view/SuspensionAnnouncementAffirmDialog.kt
new file mode 100644
index 0000000..c732271
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/view/SuspensionAnnouncementAffirmDialog.kt
@@ -0,0 +1,74 @@
+package com.yxjk.healthexpertclient.view
+
+import android.app.AlertDialog
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.os.Build
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.widget.LinearLayout
+import androidx.databinding.DataBindingUtil
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.DialogSuspensionAnnouncementAffirmBinding
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/18 10:57
+ * @description
+ */
+class SuspensionAnnouncementAffirmDialog constructor(context: Context
+) : AlertDialog(context) {
+    lateinit var onSubmitClickListener: OnSubmitClickListener
+    lateinit var binding: DialogSuspensionAnnouncementAffirmBinding
+    init {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            create()
+        } else {
+            onCreate(null)
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = DataBindingUtil.inflate(
+            LayoutInflater.from(context),
+            R.layout.dialog_suspension_announcement_affirm, null, false)
+        setContentView(binding.root)
+        window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))//设置dialog背景透明
+        window?.setLayout(context.resources.displayMetrics.widthPixels * 7/10, LinearLayout.LayoutParams.WRAP_CONTENT)//设置对话框大小
+        binding.btnAffirm.setOnClickListener{
+            this.cancel()
+            if(this::onSubmitClickListener.isInitialized){
+                onSubmitClickListener?.onSubmitClick(this@SuspensionAnnouncementAffirmDialog)
+            }
+        }
+        binding.btnCancel.setOnClickListener{
+            this.cancel()
+            if(this::onSubmitClickListener.isInitialized){
+                onSubmitClickListener?.onCloseClick(this@SuspensionAnnouncementAffirmDialog)
+            }
+        }
+        binding.btnClose.setOnClickListener {
+            this.cancel()
+            if(this::onSubmitClickListener.isInitialized){
+                onSubmitClickListener?.onCloseClick(this@SuspensionAnnouncementAffirmDialog)
+            }
+        }
+    }
+    fun setAudioVideoNum(numStr: String){
+        binding?.apply {
+            tvAudioVideo.text =
+                context.getString(R.string.dialog_suspension_announcement_affirm_audio_video, numStr)
+            tvTips.text = context.getString(R.string.dialog_suspension_announcement_affirm_tips, numStr)
+        }
+    }
+    fun setOnSubmitClickListener(onSubmitClickListener: OnSubmitClickListener): SuspensionAnnouncementAffirmDialog{
+        this.onSubmitClickListener = onSubmitClickListener
+        return this
+    }
+    interface OnSubmitClickListener{
+        fun onSubmitClick(viewDialog: SuspensionAnnouncementAffirmDialog)
+        fun onCloseClick(viewDialog: SuspensionAnnouncementAffirmDialog)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/view/TextViewDialog.kt b/app/src/main/java/com/yxjk/healthexpertclient/view/TextViewDialog.kt
new file mode 100644
index 0000000..dbe743b
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/view/TextViewDialog.kt
@@ -0,0 +1,88 @@
+package com.yxjk.healthexpertclient.view
+
+import android.app.AlertDialog
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.os.Build
+import android.os.Bundle
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.widget.LinearLayout
+import androidx.databinding.DataBindingUtil
+import com.yxjk.healthexpertclient.R
+import com.yxjk.healthexpertclient.databinding.DialogTextViewBinding
+
+open class TextViewDialog constructor(context: Context
+) : AlertDialog(context) {
+    lateinit var mOnAffirmClickListener: OnAffirmClickListener
+    protected lateinit var binding: DialogTextViewBinding
+    init {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            create()
+        } else {
+            onCreate(null)
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = DataBindingUtil.inflate(LayoutInflater.from(context),
+            R.layout.dialog_text_view, null, false)
+        setContentView(binding.root)
+        window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))//设置dialog背景透明
+        window?.setLayout(context.resources.displayMetrics.widthPixels * 21/25, LinearLayout.LayoutParams.WRAP_CONTENT);//设置对话框大小
+        binding.btnAffirm.setOnClickListener{
+            mOnAffirmClickListener?.onAffirmClick(this@TextViewDialog)
+            this.cancel()
+        }
+        binding.btnCancel.setOnClickListener{
+            mOnAffirmClickListener?.onCancelClick(this@TextViewDialog)
+            this.cancel()
+        }
+
+    }
+
+    fun setOnAffirmClickListener(onAffirmClickListener: OnAffirmClickListener): TextViewDialog{
+        this.mOnAffirmClickListener = onAffirmClickListener
+        return this
+    }
+    interface OnAffirmClickListener{
+        fun onAffirmClick(viewDialog: TextViewDialog)
+        fun onCancelClick(viewDialog: TextViewDialog)
+    }
+    fun setDialogTitle(title: String, titleSize: Float = 18f): TextViewDialog{
+        binding.tvTitle.visibility = View.VISIBLE
+        binding.tvTitle.text = title
+        binding.tvTitle.textSize = titleSize
+        return this
+    }
+    fun setContent(text: String, textSize: Float = 13f): TextViewDialog{
+        binding.tvText.visibility = View.VISIBLE
+        binding.tvText.text = text
+        binding.tvText.textSize = textSize
+        return this
+    }
+    fun setContentStyle(gravity : Int): TextViewDialog{
+        binding.tvText.gravity=gravity
+        return this
+    }
+    fun setBtnText(text: String, btnTextSize: Float = 18f): TextViewDialog{
+        binding.btnAffirm.text = text
+        binding.btnAffirm.textSize = btnTextSize
+        return this
+    }
+    fun setCancelBtnText(text: String, btnTextSize: Float = 18f): TextViewDialog{
+        binding.btnCancel.visibility = View.VISIBLE
+        binding.line2.visibility = View.VISIBLE
+        binding.btnCancel.text = text
+        binding.btnCancel.textSize = btnTextSize
+        return this
+    }
+
+    fun setDialogCancelable(flag:Boolean):TextViewDialog{
+        setCancelable(flag)
+        return this
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/view/bottomtab/HomeBottomTabLayout.kt b/app/src/main/java/com/yxjk/healthexpertclient/view/bottomtab/HomeBottomTabLayout.kt
new file mode 100644
index 0000000..6e49dbd
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/view/bottomtab/HomeBottomTabLayout.kt
@@ -0,0 +1,349 @@
+package com.moore.bottomtab
+
+import android.content.Context
+import android.content.res.TypedArray
+import android.text.TextUtils
+import android.util.AttributeSet
+import android.util.TypedValue
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewTreeObserver
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.fragment.app.FragmentManager
+import androidx.viewpager.widget.ViewPager
+import com.yxjk.healthexpertclient.R
+import java.io.IOException
+
+/**
+ * Created by moore on 2019/11/27.
+ */
+class HomeBottomTabLayout(context: Context, attrs: AttributeSet?) : LinearLayout(context, attrs),
+    View.OnClickListener {
+
+    private lateinit var mTabConfig: TabConfig
+
+    private var mFragmentList = ArrayList<Fragment?>()
+    private var mTabContainerList: ArrayList<ViewGroup>? = null
+
+    private var mOverSideTab = ArrayList<View>(1)
+    private var mCurrentSelectedIndex = 0
+    private var mViewPager: ViewPager? = null
+    private var mFragmentManager: FragmentManager? = null
+    private var mCallback: HomeBottomTabLayoutCallback? = null
+    private var mFragmentContainerId = -1
+    private var mViewPagerId = -1
+    private var isCurrentViewPager = false
+    private var mIsCanClickTab = true
+
+    init {
+        val array: TypedArray =
+            context.obtainStyledAttributes(attrs, R.styleable.HomeBottomTabLayout)
+        mFragmentContainerId = array.getResourceId(R.styleable.HomeBottomTabLayout_container_id, -1)
+        mViewPagerId = array.getResourceId(R.styleable.HomeBottomTabLayout_viewPager_id, -1)
+        val configFile = array.getString(R.styleable.HomeBottomTabLayout_config_file_name)
+        isCurrentViewPager = mViewPagerId != -1
+        array.recycle()
+
+        this.orientation = HORIZONTAL
+        this.clipChildren = false
+        mFragmentManager = (context as FragmentActivity).supportFragmentManager
+        configFile?.let {
+            try {
+                val tabConfigFileInputStream = context.assets.open(it)
+                mTabConfig =
+                    TabUtils.parseJsonToConfig(tabConfigFileInputStream)
+                        ?: throw IllegalArgumentException("配置文件错误，请检查")
+            } catch (e: IOException) {
+                throw IllegalArgumentException("请检查${it}是否存在于assets中！")
+            }
+        } ?: let {
+            throw IllegalArgumentException("请使用config_file_name设置配置文件名称！")
+        }
+        initTabs()
+    }
+
+    private fun initTabs() {
+        if (mTabConfig.tabs.isNullOrEmpty()) {
+            return
+        }
+        mTabContainerList = ArrayList(mTabConfig.tabs.size)
+        mTabConfig.tabs.forEach { tab ->
+            generateItemView(tab)
+            mFragmentList.add(null)
+        }
+        mOverSideTab.forEach {
+            viewTreeObserver.addOnGlobalLayoutListener(object :
+                ViewTreeObserver.OnGlobalLayoutListener {
+                override fun onGlobalLayout() {
+                    val layoutParams = it.layoutParams as MarginLayoutParams
+                    val height = (it.height * 2.5f).toInt()
+                    layoutParams.height = height
+                    layoutParams.width = height
+                    if (!mTabConfig.isTitleVisible) {
+                        layoutParams.setMargins(0, 0, 0, (it.height * 1.5f).toInt())
+                    }
+                    it.layoutParams = layoutParams
+                    viewTreeObserver.removeOnGlobalLayoutListener(this)
+                    mOverSideTab.remove(it)
+                }
+            })
+        }
+    }
+
+    fun initFirstTab(index: Int) {
+        if (index < 0 || index > mTabContainerList?.size ?: 0) {
+            throw IndexOutOfBoundsException("没有这么多tab，index值：$index")
+        }
+        if (mCallback == null) {
+            throw IllegalStateException("需要先设置callback获取对应的Fragment")
+        }
+        if (isCurrentViewPager) {
+            setupViewPager(index)
+        } else {
+            changeTab(index)
+        }
+    }
+
+    fun hideTab(index: Int) {
+        if (index < 0 || index > mTabContainerList?.size ?: 0) {
+            throw IndexOutOfBoundsException("没有这么多tab，index值：$index")
+        }
+        mTabContainerList?.get(index)?.visibility = View.GONE
+    }
+
+    fun selectByTag(tabTag: String) {
+        mTabConfig.tabs.forEachIndexed { index, tabConfig ->
+            if (tabTag == tabConfig.tabTag) {
+                changeTab(index)
+                return
+            }
+        }
+    }
+
+    fun getCurrentSelectedTag(): String {
+        return mTabConfig.tabs[mCurrentSelectedIndex].tabTag
+    }
+
+    fun getCurrentSelectedIndex(): Int {
+        return mCurrentSelectedIndex
+    }
+
+    fun getCurrentSelectedFragment(): Fragment? {
+        return mFragmentList[mCurrentSelectedIndex]
+    }
+
+    fun getFragmentByTag(tabTag: String): Fragment? {
+        return mFragmentManager?.findFragmentByTag(tabTag)
+    }
+
+    fun getFragmentList(): List<Fragment?>? {
+        return mFragmentList
+    }
+
+    fun setIsCanClickTab(isCanClick: Boolean) {
+        this.mIsCanClickTab = isCanClick
+    }
+
+    fun setUnreadTip(tag: String, countStr: String?, isShowCount: Boolean = true) {
+        mTabConfig.tabs.forEachIndexed { index, tabConfig ->
+            if (tag == tabConfig.tabTag) {
+                if (isShowCount) {
+                    val tvUnRead =
+                        mTabContainerList?.get(index)
+                            ?.findViewById<TextView>(R.id.TabItem_tvUnReadTip)
+                    tvUnRead?.visibility = View.VISIBLE
+                    tvUnRead?.text = countStr
+                } else {
+                    val viewPoint =
+                        mTabContainerList?.get(index)
+                            ?.findViewById<View>(R.id.TabItem_viewPoint)
+                    viewPoint?.visibility = View.VISIBLE
+                }
+                return
+            }
+        }
+    }
+
+    fun hideUnReadTip(tag: String) {
+        mTabConfig.tabs.forEachIndexed { index, tabConfig ->
+            if (tag == tabConfig.tabTag) {
+                mTabContainerList?.get(index)
+                    ?.findViewById<TextView>(R.id.TabItem_tvUnReadTip)?.visibility = View.GONE
+                mTabContainerList?.get(index)
+                    ?.findViewById<View>(R.id.TabItem_viewPoint)?.visibility = View.GONE
+                return
+            }
+        }
+    }
+
+    private fun setupViewPager(selectedIndex: Int) {
+        mViewPager = rootView.findViewById(mViewPagerId)
+        mTabConfig.tabs.forEachIndexed { index, itemConfig ->
+            mFragmentList[index] = mCallback!!.getFragmentByTag(itemConfig.tabTag)
+        }
+        val map = mFragmentList.map { it!! }
+        mFragmentManager?.let {
+            mViewPager?.adapter = TabFragmentPageAdapter(it, map)
+        }
+        mViewPager?.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
+            override fun onPageScrollStateChanged(state: Int) {
+
+            }
+
+            override fun onPageScrolled(
+                position: Int,
+                positionOffset: Float,
+                positionOffsetPixels: Int
+            ) {
+
+            }
+
+            override fun onPageSelected(position: Int) {
+                setTabSelected(position)
+            }
+        })
+        mViewPager?.currentItem = selectedIndex
+    }
+
+    override fun onClick(v: View?) {
+        if (!mIsCanClickTab) {
+            return
+        }
+        var tempIndex = 0
+        val tag = v?.tag as String
+        mTabContainerList?.forEachIndexed { index, viewGroup ->
+            if ((viewGroup.tag as String) == tag) {
+                tempIndex = index
+                return@forEachIndexed
+            }
+        }
+        changeTab(tempIndex)
+        mCallback?.onClickChangeTab(tempIndex, tag)
+    }
+
+    /**
+     * 切换tab操作，分两步
+     * 1、切换按钮状态
+     * 2、切换fragment
+     */
+    private fun changeTab(selectedIndex: Int) {
+        if (isCurrentViewPager) {
+            mViewPager?.currentItem = selectedIndex
+        } else {
+            //tab状态改变
+            setTabSelected(selectedIndex)
+            //fragment改变
+            setFragmentSelected(selectedIndex)
+        }
+        //更改当前下标
+        mCurrentSelectedIndex = selectedIndex
+    }
+
+    /**
+     * 切换按钮状态
+     */
+    private fun setTabSelected(selectedIndex: Int) {
+        mTabContainerList?.forEachIndexed { index, viewGroup ->
+            val ivIcon = viewGroup.findViewById<ImageView>(R.id.TabItem_ivIcon)
+            val tvName = viewGroup.findViewById<TextView>(R.id.TabItem_tvTitle)
+            val itemConfig = mTabConfig.tabs[index]
+            val textColor: Int
+            val iconResource: Int
+            val textSize: Float
+            if (index == selectedIndex) {
+                textColor = mTabConfig.tabSelectedColor
+                textSize = mTabConfig.tabSelectedTextSize.toFloat()
+                iconResource = TabUtils.getResourceDrawableId(context, itemConfig.iconSelected)
+                viewGroup.isEnabled = false
+            } else {
+                textColor = mTabConfig.tabNormalColor
+                textSize = mTabConfig.tabNormalTextSize.toFloat()
+                iconResource = TabUtils.getResourceDrawableId(context, itemConfig.iconNormal)
+                viewGroup.isEnabled = true
+            }
+            ivIcon.setImageResource(iconResource)
+            tvName.setTextColor(textColor)
+            tvName.setTextSize(TypedValue.COMPLEX_UNIT_DIP, textSize)
+        }
+    }
+
+    /**
+     * 切换fragment
+     */
+    private fun setFragmentSelected(selectedIndex: Int) {
+        val beginTransaction = mFragmentManager?.beginTransaction()
+        val itemConfig = mTabConfig.tabs[selectedIndex]
+        var fragmentByTag = mFragmentManager?.findFragmentByTag(itemConfig.tabTag)
+        val isFirstInit: Boolean
+        if (fragmentByTag == null) {
+            fragmentByTag = mCallback?.getFragmentByTag(itemConfig.tabTag)
+            mFragmentList[selectedIndex] = fragmentByTag
+            isFirstInit = true
+        } else {
+            isFirstInit = false
+        }
+        mFragmentList.forEach { fragment ->
+            if (fragment != null && fragment.isAdded) {
+                beginTransaction?.hide(fragment)
+            }
+        }
+        fragmentByTag?.let {
+            if (isFirstInit) {
+                beginTransaction?.add(mFragmentContainerId, fragmentByTag, itemConfig.tabTag)
+            } else {
+                beginTransaction?.show(fragmentByTag)
+            }
+        }
+        beginTransaction?.commitAllowingStateLoss()
+    }
+
+    private fun generateItemView(itemConfig: ItemConfig) {
+        val view: ViewGroup =
+            View.inflate(context, R.layout.bottom_tab_item_layout, null) as ViewGroup
+        val tvName = view.findViewById<TextView>(R.id.TabItem_tvTitle)
+        val ivIcon = view.findViewById<ImageView>(R.id.TabItem_ivIcon)
+        //tabTitle
+        if (mTabConfig.isTabNameResId) {
+            tvName.text = TabUtils.getStringByResId(context, itemConfig.tabName)
+        } else {
+            tvName.text = itemConfig.tabName
+        }
+        tvName.setTextSize(TypedValue.COMPLEX_UNIT_DIP, mTabConfig.tabNormalTextSize.toFloat())
+        tvName.setTextColor(mTabConfig.tabNormalColor)
+        //tabIcon
+        ivIcon.setImageResource(TabUtils.getResourceDrawableId(context, itemConfig.iconNormal))
+        //bg
+        itemConfig.itemBg.apply {
+            if (!TextUtils.isEmpty(this)) {
+                ivIcon.setBackgroundResource(TabUtils.getResourceDrawableId(context, this!!))
+            }
+        }
+        if (itemConfig.isOverSide) {
+            mOverSideTab.add(ivIcon)
+        }
+        if (!mTabConfig.isTitleVisible) {
+            tvName.visibility = View.GONE
+        }
+        val weight = if (itemConfig.isOverSide) 1.1f else 1f
+        val params = LayoutParams(0, ViewGroup.LayoutParams.MATCH_PARENT, weight)
+
+        view.setOnClickListener(this)
+        view.tag = itemConfig.tabTag
+        this.addView(view, params)
+        mTabContainerList?.add(view)
+    }
+
+    fun setHomeBottomTabLayoutCallback(homeBottomTabLayoutCallback: HomeBottomTabLayoutCallback?) {
+        this.mCallback = homeBottomTabLayoutCallback
+    }
+
+    interface HomeBottomTabLayoutCallback {
+        fun getFragmentByTag(tabTag: String): Fragment?
+
+        fun onClickChangeTab(selectedIndex: Int, selectedTag: String?)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/view/bottomtab/TabConfig.kt b/app/src/main/java/com/yxjk/healthexpertclient/view/bottomtab/TabConfig.kt
new file mode 100644
index 0000000..730ebe1
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/view/bottomtab/TabConfig.kt
@@ -0,0 +1,25 @@
+package com.moore.bottomtab
+
+import java.io.Serializable
+
+/**
+ * Created by moore on 2019/11/21.
+ */
+data class TabConfig(
+    var tabNormalColor: Int,
+    var tabSelectedColor: Int,
+    var tabNormalTextSize: Int,
+    var tabSelectedTextSize: Int,
+    var isTabNameResId: Boolean = true,
+    var isTitleVisible: Boolean = true,
+    var tabs: List<ItemConfig>
+) : Serializable
+
+data class ItemConfig(
+    var tabName: String,
+    var tabTag: String,
+    var iconNormal: String,
+    var iconSelected: String,
+    var isOverSide: Boolean = false,
+    var itemBg: String? = null
+) : Serializable
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/view/bottomtab/TabFragmentPageAdapter.kt b/app/src/main/java/com/yxjk/healthexpertclient/view/bottomtab/TabFragmentPageAdapter.kt
new file mode 100644
index 0000000..783b57b
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/view/bottomtab/TabFragmentPageAdapter.kt
@@ -0,0 +1,24 @@
+package com.moore.bottomtab
+
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentPagerAdapter
+
+/**
+ * @author moore
+ * @date 2020/9/3
+ */
+class TabFragmentPageAdapter(
+    fragmentManager: FragmentManager, private val fragments: List<Fragment>
+) : FragmentPagerAdapter(
+    fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT
+) {
+
+    override fun getItem(position: Int): Fragment {
+        return fragments[position]
+    }
+
+    override fun getCount(): Int {
+        return fragments.size
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/view/bottomtab/TabUtils.kt b/app/src/main/java/com/yxjk/healthexpertclient/view/bottomtab/TabUtils.kt
new file mode 100644
index 0000000..04842c2
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/view/bottomtab/TabUtils.kt
@@ -0,0 +1,119 @@
+package com.moore.bottomtab
+
+import android.content.Context
+import android.graphics.Color
+import android.text.TextUtils
+import org.json.JSONException
+import org.json.JSONObject
+import java.io.ByteArrayOutputStream
+import java.io.InputStream
+import java.util.regex.Pattern
+
+/**
+ * Created by moore on 2019/11/27.
+ */
+object TabUtils {
+    /**
+     * 检查颜色是否合法
+     */
+    fun isColorLegal(color: String): Boolean {
+        if (TextUtils.isEmpty(color)) {
+            return false
+        }
+        //#aabbcc
+        val matchRegix1 = "^#[0-9a-fA-F]{6}"
+        //#00aabbcc
+        val matchRegix2 = "^#[0-9a-fA-F]{8}"
+        //#ccc
+        val matchRegix3 = "^#[0-9a-fA-F]{3}"
+        //去匹配
+        val compile = Pattern.compile(matchRegix1)
+        if (compile.matcher(color).find()) {
+            return true
+        }
+        val compile1 = Pattern.compile(matchRegix2)
+        if (compile1.matcher(color).find()) {
+            return true
+        }
+        val compile2 = Pattern.compile(matchRegix3)
+        if (compile2.matcher(color).find()) {
+            return true
+        }
+        return false
+    }
+
+    fun parseJsonToConfig(inputStream: InputStream): TabConfig? {
+        val resultArray = ByteArrayOutputStream()
+        val temp = ByteArray(256)
+        var read = inputStream.read(temp)
+        while (read != -1) {
+            resultArray.write(temp, 0, read)
+            read = inputStream.read(temp)
+            resultArray.flush()
+        }
+        val readJson = resultArray.toString("utf-8")
+        inputStream.close()
+        resultArray.close()
+        if (readJson.isNotEmpty()) {
+            try {
+                val obj = JSONObject(readJson)
+                //颜色
+                val textColorNormal = obj.optString("textColorNormal")
+                val textColorSelected = obj.optString("textColorSelected")
+                val normalColor = if (isColorLegal(textColorNormal)) {
+                    Color.parseColor(textColorNormal)
+                } else {
+                    Color.BLACK
+                }
+                val selectedColor = if (isColorLegal(textColorSelected)) {
+                    Color.parseColor(textColorSelected)
+                } else {
+                    Color.GRAY
+                }
+                val textSizeNormal = obj.optInt("textSizeNormal", 14)
+                val textSizeSelected = obj.optInt("textSizeSelected", 14)
+                val isTabNameResId = obj.optBoolean("isNameResId", true)
+                val isTitleVisible = obj.optBoolean("isTitleVisible", true)
+                //标签
+                val itemList = ArrayList<ItemConfig>()
+                val tabs = obj.optJSONArray("tabs")
+                if (tabs != null && tabs.length() > 0) {
+                    for (i in 0 until tabs.length()) {
+                        val tabJson = tabs.optJSONObject(i)
+                        val tabName = tabJson.optString("tabName")
+                        val tabTag = tabJson.optString("tabTag")
+                        val tabIconNormal = tabJson.optString("iconNormal")
+                        val tabIconSelected = tabJson.optString("iconSelected")
+                        val isOverSide = tabJson.optBoolean("isOverSide", false)
+                        val tabItemConfig =
+                            ItemConfig(tabName, tabTag, tabIconNormal, tabIconSelected, isOverSide)
+                        val itemBg = tabJson.optString("itemBg", "")
+                        tabItemConfig.itemBg = itemBg
+                        itemList.add(tabItemConfig)
+                    }
+                }
+                return TabConfig(
+                    normalColor,
+                    selectedColor,
+                    textSizeNormal,
+                    textSizeSelected,
+                    isTabNameResId,
+                    isTitleVisible,
+                    itemList
+                )
+            } catch (e: JSONException) {
+                e.printStackTrace()
+            }
+        }
+        return null
+    }
+
+    fun getResourceDrawableId(context: Context, drawableName: String): Int {
+        return context.resources.getIdentifier(drawableName, "drawable", context.packageName)
+    }
+
+    fun getStringByResId(context: Context, strResId: String): String {
+        val resId = context.resources.getIdentifier(strResId, "string", context.packageName)
+        return context.resources.getString(resId)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/yxjk/healthexpertclient/view/viewpager/ViewPagerAdapter.kt b/app/src/main/java/com/yxjk/healthexpertclient/view/viewpager/ViewPagerAdapter.kt
new file mode 100644
index 0000000..4f7dd72
--- /dev/null
+++ b/app/src/main/java/com/yxjk/healthexpertclient/view/viewpager/ViewPagerAdapter.kt
@@ -0,0 +1,53 @@
+package com.yxjk.healthexpertclient.view.viewpager
+
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.fragment.app.FragmentManager
+import androidx.lifecycle.Lifecycle
+import androidx.viewpager2.adapter.FragmentStateAdapter
+
+class ViewPagerAdapter :
+    FragmentStateAdapter {
+    private var tabs: Array<String>
+    private var onCreateFragmentListener: OnCreateFragmentListener
+
+    constructor(
+        fa: FragmentActivity,
+        tabs: Array<String>,
+        onCreateFragmentListener: OnCreateFragmentListener
+    ) : super(fa) {
+        this.tabs = tabs
+        this.onCreateFragmentListener = onCreateFragmentListener
+    }
+    constructor(
+        fa: Fragment,
+        tabs: Array<String>,
+        onCreateFragmentListener: OnCreateFragmentListener
+    ) : super(fa) {
+        this.tabs = tabs
+        this.onCreateFragmentListener = onCreateFragmentListener
+    }
+    constructor(
+        fragmentManager: FragmentManager,
+        lifecycle: Lifecycle,
+        tabs: Array<String>,
+        onCreateFragmentListener: OnCreateFragmentListener
+    ) : super(fragmentManager, lifecycle) {
+        this.tabs = tabs
+        this.onCreateFragmentListener = onCreateFragmentListener
+    }
+
+    override fun getItemCount(): Int {
+        return tabs.size
+    }
+
+    override fun createFragment(position: Int): Fragment {
+        return onCreateFragmentListener.createFragment(position)
+    }
+
+    interface OnCreateFragmentListener {
+        fun createFragment(position: Int): Fragment
+
+    }
+
+}
diff --git a/app/src/main/res-im/layout/activity_select_location.xml b/app/src/main/res-im/layout/activity_select_location.xml
new file mode 100644
index 0000000..d5e49f7
--- /dev/null
+++ b/app/src/main/res-im/layout/activity_select_location.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <include
+            layout="@layout/view_toolbar_lay"
+            android:id="@+id/toolbar_lay"
+            app:title="@{@string/title_select_location}" />
+        <com.amap.api.maps.MapView
+            android:id="@+id/map_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@+id/toolbar_lay"/>
+<!--        <androidx.recyclerview.widget.RecyclerView-->
+<!--            android:id="@+id/rv_list"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:layout_below="@+id/toolbar_lay"/>-->
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-im/layout/activity_view_location.xml b/app/src/main/res-im/layout/activity_view_location.xml
new file mode 100644
index 0000000..a62d4c9
--- /dev/null
+++ b/app/src/main/res-im/layout/activity_view_location.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <include
+            layout="@layout/view_toolbar_lay"
+            android:id="@+id/toolbar_lay"
+            app:title="@{@string/title_view_location}" />
+        <com.amap.api.maps.MapView
+            android:id="@+id/map_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@+id/toolbar_lay"/>
+<!--        <androidx.recyclerview.widget.RecyclerView-->
+<!--            android:id="@+id/rv_list"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:layout_below="@+id/toolbar_lay"/>-->
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-im/layout/im_activity.xml b/app/src/main/res-im/layout/im_activity.xml
new file mode 100644
index 0000000..4c23fcd
--- /dev/null
+++ b/app/src/main/res-im/layout/im_activity.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clipChildren="false"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/main_title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true" />
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/view_pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/main_navigation_bar"
+        android:layout_below="@id/main_title_bar" />
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/main_navigation_bar"
+        android:layout_alignParentBottom="true"
+        app:cardElevation="10dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="65dp"
+            android:clipChildren="false"
+            android:background="@color/transparent"
+            android:orientation="horizontal">
+
+            <RelativeLayout
+                android:id="@+id/conversation_btn_group"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:onClick="tabClick">
+
+                <ImageView
+                    android:id="@+id/tab_conversation_icon"
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="8dp" />
+
+                <TextView
+                    android:id="@+id/conversation"
+                    android:layout_width="50dp"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/tab_conversation_icon"
+                    android:layout_centerInParent="true"
+                    android:gravity="center"
+                    android:text="@string/tab_conversation_tab_text"
+                    android:textSize="12sp" />
+
+                <com.tencent.qcloud.tuicore.component.UnreadCountTextView
+                    android:id="@+id/msg_total_unread"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
+                    android:layout_marginStart="-17dp"
+                    android:layout_marginTop="1dp"
+                    android:layout_toEndOf="@id/conversation"
+                    android:gravity="center"
+                    android:includeFontPadding="false"
+                    android:textColor="@color/white"
+                    android:minWidth="18.4dp"
+                    android:minHeight="18.4dp"
+                    android:textSize="13.6sp"
+                    android:visibility="gone" />
+
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/community_btn_group"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:visibility="gone"
+                android:onClick="tabClick">
+
+                <ImageView
+                    android:id="@+id/tab_community_icon"
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="8dp" />
+
+                <TextView
+                    android:id="@+id/tab_community_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/tab_community_icon"
+                    android:layout_centerInParent="true"
+                    android:gravity="center"
+                    android:text="@string/tab_community_tab_text"
+                    android:textSize="12sp" />
+
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/contact_btn_group"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:onClick="tabClick">
+
+                <ImageView
+                    android:id="@+id/tab_contact_icon"
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="8dp"/>
+
+                <TextView
+                    android:id="@+id/contact"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/tab_contact_icon"
+                    android:layout_centerInParent="true"
+                    android:gravity="center"
+                    android:text="@string/tab_contact_tab_text"
+                    android:textSize="12sp" />
+
+                <com.tencent.qcloud.tuicore.component.UnreadCountTextView
+                    android:id="@+id/new_friend_total_unread"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
+                    android:layout_marginStart="-8dp"
+                    android:layout_marginTop="1dp"
+                    android:layout_toEndOf="@id/contact"
+                    android:gravity="center"
+                    android:includeFontPadding="false"
+                    android:textColor="@color/white"
+                    android:minWidth="18.4dp"
+                    android:minHeight="18.4dp"
+                    android:textSize="13.6sp"
+                    android:visibility="gone" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/myself_btn_group"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:visibility="gone"
+                android:onClick="tabClick">
+
+                <ImageView
+                    android:id="@+id/tab_profile_icon"
+                    android:layout_width="32dp"
+                    android:layout_height="32dp"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="8dp"/>
+
+                <TextView
+                    android:id="@+id/mine"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/tab_profile_icon"
+                    android:layout_centerInParent="true"
+                    android:gravity="center"
+                    android:text="@string/tab_profile_tab_text"
+                    android:textSize="12sp" />
+
+            </RelativeLayout>
+        </LinearLayout>
+    </androidx.cardview.widget.CardView>
+</RelativeLayout>
diff --git a/app/src/main/res-im/layout/overseas_main_activity.xml b/app/src/main/res-im/layout/overseas_main_activity.xml
new file mode 100644
index 0000000..9c6670d
--- /dev/null
+++ b/app/src/main/res-im/layout/overseas_main_activity.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clipChildren="false"
+    android:orientation="vertical">
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/view_pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/main_navigation_bar"
+        android:layout_alignParentTop="true" />
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/main_navigation_bar"
+        android:background="#FFFFFFFF"
+        app:cardBackgroundColor="#FFFFFFFF"
+        android:layout_alignParentBottom="true"
+        app:cardElevation="10dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="65dp"
+            android:clipChildren="false"
+            android:background="@color/transparent"
+            android:orientation="horizontal">
+
+            <RelativeLayout
+                android:id="@+id/conversation_btn_group"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:onClick="tabClick">
+
+                <ImageView
+                    android:id="@+id/tab_conversation_icon"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="8dp"
+                    android:background="@drawable/demo_overseas_main_tab_conversation_selected" />
+
+                <TextView
+                    android:id="@+id/conversation"
+                    android:layout_width="50dp"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/tab_conversation_icon"
+                    android:layout_centerInParent="true"
+                    android:gravity="center"
+                    android:text="@string/demo_tab_overseas_conversation_tab_text"
+                    android:textColor="@color/demo_main_tab_text_selected_color_light"
+                    android:textSize="12sp" />
+
+                <com.tencent.qcloud.tuicore.component.UnreadCountTextView
+                    android:id="@+id/msg_total_unread"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
+                    android:layout_marginStart="-17dp"
+                    android:layout_marginTop="1dp"
+                    android:layout_toEndOf="@id/conversation"
+                    android:gravity="center"
+                    android:includeFontPadding="false"
+                    android:textColor="@color/white"
+                    android:minWidth="18.4dp"
+                    android:minHeight="18.4dp"
+                    android:textSize="13.6sp"
+                    android:visibility="gone" />
+
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/contact_btn_group"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:onClick="tabClick">
+
+                <ImageView
+                    android:id="@+id/tab_contact_icon"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="8dp"
+                    android:background="@drawable/demo_overseas_main_tab_contact_normal_bg" />
+
+                <TextView
+                    android:id="@+id/contact"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/tab_contact_icon"
+                    android:layout_centerInParent="true"
+                    android:gravity="center"
+                    android:text="@string/minimalist_tab_contacts_tab_text"
+                    android:textColor="@color/core_light_bg_secondary_text_color_light"
+                    android:textSize="12sp" />
+
+                <com.tencent.qcloud.tuicore.component.UnreadCountTextView
+                    android:id="@+id/new_friend_total_unread"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
+                    android:layout_marginStart="-8dp"
+                    android:layout_marginTop="1dp"
+                    android:layout_toEndOf="@id/contact"
+                    android:gravity="center"
+                    android:includeFontPadding="false"
+                    android:minWidth="18.4dp"
+                    android:minHeight="18.4dp"
+                    android:textColor="#FFFFFF"
+                    android:textSize="13.6sp"
+                    android:visibility="gone" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/myself_btn_group"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:onClick="tabClick">
+
+                <ImageView
+                    android:id="@+id/tab_profile_icon"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_centerHorizontal="true"
+                    android:layout_marginTop="8dp"
+                    android:background="@drawable/demo_overseas_main_tab_settings_normal_bg" />
+
+                <TextView
+                    android:id="@+id/mine"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/tab_profile_icon"
+                    android:layout_centerInParent="true"
+                    android:gravity="center"
+                    android:text="@string/minimalist_tab_settings_tab_text"
+                    android:textColor="@color/core_light_bg_secondary_text_color_light"
+                    android:textSize="12sp" />
+
+            </RelativeLayout>
+        </LinearLayout>
+    </androidx.cardview.widget.CardView>
+</RelativeLayout>
diff --git a/app/src/main/res-login/drawable-xxhdpi/ic_icon.png b/app/src/main/res-login/drawable-xxhdpi/ic_icon.png
new file mode 100644
index 0000000..f692f20
Binary files /dev/null and b/app/src/main/res-login/drawable-xxhdpi/ic_icon.png differ
diff --git a/app/src/main/res-login/drawable-xxhdpi/ic_icon_2.png b/app/src/main/res-login/drawable-xxhdpi/ic_icon_2.png
new file mode 100644
index 0000000..338f6e6
Binary files /dev/null and b/app/src/main/res-login/drawable-xxhdpi/ic_icon_2.png differ
diff --git a/app/src/main/res-login/drawable-xxhdpi/ic_login_bg.png b/app/src/main/res-login/drawable-xxhdpi/ic_login_bg.png
new file mode 100644
index 0000000..3df94e8
Binary files /dev/null and b/app/src/main/res-login/drawable-xxhdpi/ic_login_bg.png differ
diff --git a/app/src/main/res-login/drawable-xxhdpi/ic_login_green_select.png b/app/src/main/res-login/drawable-xxhdpi/ic_login_green_select.png
new file mode 100644
index 0000000..836b81c
Binary files /dev/null and b/app/src/main/res-login/drawable-xxhdpi/ic_login_green_select.png differ
diff --git a/app/src/main/res-login/drawable-xxhdpi/ic_login_name.png b/app/src/main/res-login/drawable-xxhdpi/ic_login_name.png
new file mode 100644
index 0000000..33cf585
Binary files /dev/null and b/app/src/main/res-login/drawable-xxhdpi/ic_login_name.png differ
diff --git a/app/src/main/res-login/drawable-xxhdpi/ic_login_no_select.png b/app/src/main/res-login/drawable-xxhdpi/ic_login_no_select.png
new file mode 100644
index 0000000..6a821f4
Binary files /dev/null and b/app/src/main/res-login/drawable-xxhdpi/ic_login_no_select.png differ
diff --git a/app/src/main/res-login/drawable/bg_grey_background_shap_radius23.xml b/app/src/main/res-login/drawable/bg_grey_background_shap_radius23.xml
new file mode 100644
index 0000000..2dacbb0
--- /dev/null
+++ b/app/src/main/res-login/drawable/bg_grey_background_shap_radius23.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+    <solid android:color="#EEEEEE" />
+    <corners android:radius="20dp" />
+    <!--<padding android:left="15dp"-->
+        <!--android:top="8dp"-->
+        <!--android:right="15dp"-->
+        <!--android:bottom="8dp"/>-->
+<!--    <size-->
+<!--        android:width="437dp"-->
+<!--        android:height="79dp" />-->
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res-login/drawable/bg_login_green_to_white.xml b/app/src/main/res-login/drawable/bg_login_green_to_white.xml
new file mode 100644
index 0000000..065a10f
--- /dev/null
+++ b/app/src/main/res-login/drawable/bg_login_green_to_white.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+    <gradient
+        android:angle="180"
+        android:endColor="#21BEBD"
+        android:startColor="#54ECCB"
+        />
+    <corners android:radius="@dimen/dp_20" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res-login/drawable/bg_white_bottom_right_angle_background_shap20.xml b/app/src/main/res-login/drawable/bg_white_bottom_right_angle_background_shap20.xml
new file mode 100644
index 0000000..aeb3304
--- /dev/null
+++ b/app/src/main/res-login/drawable/bg_white_bottom_right_angle_background_shap20.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+    <solid android:color="#FFFFFF" />
+    <corners android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_20"
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="0dp"
+        />
+    <!--<padding android:left="15dp"-->
+        <!--android:top="8dp"-->
+        <!--android:right="15dp"-->
+        <!--android:bottom="8dp"/>-->
+<!--    <size-->
+<!--        android:width="437dp"-->
+<!--        android:height="79dp" />-->
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res-login/layout/activity_login.xml b/app/src/main/res-login/layout/activity_login.xml
new file mode 100644
index 0000000..846af68
--- /dev/null
+++ b/app/src/main/res-login/layout/activity_login.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <variable
+            name="viewModel"
+            type="com.yxjk.healthexpertclient.ui.login.viewmodel.LoginViewModel" />
+    </data>
+
+    <RelativeLayout
+        android:id="@+id/login_root_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:id="@+id/login_view_bg"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:adjustViewBounds="true"
+            android:scaleType="fitXY"
+            android:src="@drawable/ic_login_bg" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="@dimen/dp_68"
+                android:layout_height="@dimen/dp_68"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="@dimen/dp_72"
+                android:src="@mipmap/ic_launcher" />
+
+            <ImageView
+                android:layout_width="@dimen/dp_110"
+                android:layout_height="@dimen/dp_24"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="@dimen/dp_20"
+                android:src="@drawable/ic_login_name" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="@dimen/dp_30"
+                android:background="@drawable/bg_white_bottom_right_angle_background_shap20"
+                android:orientation="vertical">
+
+                <EditText
+                    android:id="@+id/login_et_user_name"
+                    android:longClickable="false"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_40"
+                    android:layout_marginLeft="@dimen/dp_35"
+                    android:layout_marginTop="@dimen/dp_36"
+                    android:layout_marginRight="@dimen/dp_35"
+                    android:background="@drawable/bg_grey_background_shap_radius23"
+                    android:hint="@string/login_account_hint"
+                    android:maxLength="20"
+                    android:maxLines="1"
+                    android:paddingLeft="@dimen/dp_16"
+                    android:singleLine="true"
+                    android:textColor="@color/text_black_33"
+                    android:textColorHint="@color/text_black_99"
+                    android:textSize="@dimen/txt14" />
+
+                <com.yxjk.healthexpertclient.view.CustomPasswordView
+                    android:layout_marginTop="@dimen/dp_36"
+                    android:id="@+id/login_et_user_password"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+
+
+                <TextView
+                    android:id="@+id/login_submit"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_40"
+                    android:layout_marginLeft="@dimen/dp_36"
+                    android:layout_marginTop="@dimen/dp_40"
+                    android:layout_marginRight="@dimen/dp_36"
+                    android:background="@drawable/bg_login_green_to_white"
+                    android:gravity="center"
+                    android:text="@string/login_submit"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/txt14" />
+
+                <TextView
+                    android:id="@+id/login_retrieve_password"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/dp_10"
+                    android:text="@string/login_retrieve_password"
+                    android:textColor="@color/text_black_99"
+                    android:textSize="@dimen/txt14" />
+
+            </LinearLayout>
+
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/login_agreement_root"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_marginLeft="@dimen/dp_35"
+            android:layout_marginTop="@dimen/dp_14"
+            android:layout_marginRight="@dimen/dp_35"
+            android:layout_marginBottom="@dimen/dp_35"
+            android:orientation="horizontal">
+
+            <CheckBox
+                android:id="@+id/login_iv_read_state"
+                android:layout_width="@dimen/dp_18"
+                android:layout_height="@dimen/dp_18"
+                android:layout_marginTop="@dimen/dp_2"
+                android:button="@drawable/check_theme_style"
+                android:checked="@={viewModel.agreement}" />
+
+            <TextView
+                android:id="@+id/login_tv_agreement"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/dp_5"
+                android:lineSpacingExtra="@dimen/dp_8"
+                android:textColor="@color/text_black_99"
+                android:textSize="@dimen/txt12" />
+        </LinearLayout>
+    </RelativeLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-login/layout/activity_retrieve_password.xml b/app/src/main/res-login/layout/activity_retrieve_password.xml
new file mode 100644
index 0000000..4756f10
--- /dev/null
+++ b/app/src/main/res-login/layout/activity_retrieve_password.xml
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <include layout="@layout/view_toolbar_lay"
+            app:title="@{@string/title_retrieve_password}"
+            android:id="@+id/toolbar_lay"/>
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <LinearLayout
+                    android:id="@+id/ll_code_find"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <LinearLayout
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_60">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="手机号"
+                            android:textSize="@dimen/txt13"
+                            android:textColor="@color/text_black_66"
+                            android:layout_marginLeft="@dimen/dp_16"
+                            android:layout_gravity="center_vertical"
+                            />
+
+                        <EditText
+                            android:id="@+id/retrieve_phone"
+                            android:inputType="number"
+                            android:longClickable="false"
+                            android:layout_width="@dimen/dp_160"
+                            android:layout_height="@dimen/dp_40"
+                            android:textColor="@color/text_black_66"
+                            android:textSize="@dimen/txt13"
+                            android:background="@null"
+                            android:layout_marginLeft="@dimen/dp_60"
+                            android:layout_gravity="center_vertical"
+                            android:hint="请输入与账户绑定的手机号"
+                            />
+                    </LinearLayout>
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_1"
+                        android:background="#E0E0E0"
+                        android:layout_marginLeft="@dimen/dp_14"
+                        android:layout_marginRight="@dimen/dp_14"
+                        />
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_60">
+                        <TextView
+                            android:id="@+id/retrieve_check_code_name"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="验证码"
+                            android:layout_centerVertical="true"
+                            android:textSize="@dimen/txt13"
+                            android:textColor="@color/text_black_66"
+                            android:layout_marginLeft="@dimen/dp_16"
+                            android:layout_gravity="center_vertical"
+                            />
+
+                        <EditText
+                            android:inputType="number"
+                            android:longClickable="false"
+                            android:layout_toRightOf="@+id/retrieve_check_code_name"
+                            android:id="@+id/retrieve_check_code"
+                            android:layout_width="@dimen/dp_100"
+                            android:layout_height="@dimen/dp_40"
+                            android:textColor="@color/text_black_66"
+                            android:textSize="@dimen/txt13"
+                            android:maxLength="6"
+                            android:layout_centerVertical="true"
+                            android:background="@null"
+                            android:layout_marginLeft="@dimen/dp_60"
+                            android:layout_gravity="center_vertical"
+                            android:hint="请输入验证码"
+                            />
+
+                        <TextView
+                            android:id="@+id/retrieve_get_check_code"
+                            android:layout_alignParentRight="true"
+                            android:gravity="center_horizontal"
+                            android:layout_width="@dimen/dp_100"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_marginRight="@dimen/dp_16"
+                            android:text="获取验证码"
+                            android:textSize="@dimen/txt12"
+                            android:layout_gravity="center_vertical|right"
+                            android:layout_marginLeft="@dimen/dp_60"
+                            android:background="@drawable/bg_blue_background_shap_radius4"
+                            android:paddingBottom="@dimen/dp_8"
+                            android:paddingTop="@dimen/dp_8"
+                            android:textColor="@color/white"
+                            />
+                    </RelativeLayout>
+                </LinearLayout>
+                <LinearLayout
+                    android:id="@+id/ll_info_find"
+                    android:background="@color/white"
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <LinearLayout
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_60">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="用户姓名"
+                            android:textSize="@dimen/txt13"
+                            android:textColor="@color/text_black_66"
+                            android:layout_marginLeft="@dimen/dp_16"
+                            android:layout_gravity="center_vertical"
+                            />
+
+                        <EditText
+                            android:longClickable="false"
+                            android:id="@+id/tv_user_name"
+                            android:layout_width="@dimen/dp_160"
+                            android:layout_height="@dimen/dp_40"
+                            android:textColor="@color/text_black_66"
+                            android:textSize="@dimen/txt13"
+                            android:maxLines="1"
+                            android:singleLine="true"
+                            android:background="@null"
+                            android:layout_marginLeft="@dimen/dp_60"
+                            android:layout_gravity="center_vertical"
+                            android:hint="请输入用户姓名"
+                            />
+                    </LinearLayout>
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_1"
+                        android:background="#E0E0E0"
+                        android:layout_marginLeft="@dimen/dp_14"
+                        android:layout_marginRight="@dimen/dp_14"
+                        />
+                    <LinearLayout
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_60">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="身份证号"
+                            android:textSize="@dimen/txt13"
+                            android:textColor="@color/text_black_66"
+                            android:layout_marginLeft="@dimen/dp_16"
+                            android:layout_gravity="center_vertical"
+                            />
+
+                        <EditText
+                            android:longClickable="false"
+                            android:id="@+id/tv_user_id_card"
+                            android:layout_width="@dimen/dp_160"
+                            android:layout_height="@dimen/dp_40"
+                            android:textColor="@color/text_black_66"
+                            android:maxLines="1"
+                            android:singleLine="true"
+                            android:textSize="@dimen/txt13"
+                            android:background="@null"
+                            android:layout_marginLeft="@dimen/dp_60"
+                            android:layout_gravity="center_vertical"
+                            android:hint="请输入用户身份证号"
+                            android:maxLength="18"
+                            />
+                    </LinearLayout>
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_1"
+                        android:background="#E0E0E0"
+                        android:layout_marginLeft="@dimen/dp_14"
+                        android:layout_marginRight="@dimen/dp_14"
+                        />
+                    <LinearLayout
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_60">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="手机号&#12288;"
+                            android:textSize="@dimen/txt13"
+                            android:textColor="@color/text_black_66"
+                            android:layout_marginLeft="@dimen/dp_16"
+                            android:layout_gravity="center_vertical"
+                            />
+
+                        <EditText
+                            android:id="@+id/tv_user_phone"
+                            android:inputType="number"
+                            android:longClickable="false"
+                            android:layout_width="@dimen/dp_160"
+                            android:layout_height="@dimen/dp_40"
+                            android:textColor="@color/text_black_66"
+                            android:textSize="@dimen/txt13"
+                            android:background="@null"
+                            android:layout_marginLeft="@dimen/dp_60"
+                            android:layout_gravity="center_vertical"
+                            android:hint="请输入用户手机号"
+                            android:maxLength="11"
+                            />
+                    </LinearLayout>
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_1"
+                        android:background="#E0E0E0"
+                        android:layout_marginLeft="@dimen/dp_14"
+                        android:layout_marginRight="@dimen/dp_14"
+                        />
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/retrieve_confirm"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_40"
+                    android:text="确定"
+                    android:textColor="@color/white"
+                    android:background="@drawable/bg_blue_background_shap"
+                    android:layout_marginLeft="@dimen/dp_50"
+                    android:layout_marginRight="@dimen/dp_50"
+                    android:gravity="center"
+                    android:layout_marginTop="@dimen/dp_60"
+                    />
+
+            </LinearLayout>
+            <RadioGroup
+                android:id="@+id/radioGroup"
+                android:visibility="gone"
+                android:layout_alignParentBottom="true"
+                android:layout_marginBottom="@dimen/dp_50"
+                android:layout_centerHorizontal="true"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <RadioButton
+                    android:id="@+id/btn_info_find"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="用户信息找回"
+                    android:layout_marginRight="@dimen/dp_10"
+                    android:checked="true"/>
+
+                <RadioButton
+                    android:id="@+id/btn_code_find"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="验证码找回"/>
+            </RadioGroup>
+        </RelativeLayout>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-login/layout/custom_password_view.xml b/app/src/main/res-login/layout/custom_password_view.xml
new file mode 100644
index 0000000..2b27247
--- /dev/null
+++ b/app/src/main/res-login/layout/custom_password_view.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <EditText
+            android:id="@+id/login_et_user_password"
+            android:inputType="textPassword"
+            android:layout_width="match_parent"
+            android:longClickable="false"
+            android:maxLines="1"
+            android:maxLength="32"
+            android:singleLine="true"
+            android:layout_height="@dimen/dp_40"
+            android:layout_marginRight="@dimen/dp_35"
+            android:layout_marginLeft="@dimen/dp_35"
+            android:background="@drawable/bg_grey_background_shap_radius23"
+            android:paddingLeft="@dimen/dp_16"
+            android:paddingRight="@dimen/dp_25"
+            android:hint="请输入密码"
+            android:textColor="@color/text_black_33"
+            android:textColorHint="@color/text_black_99"
+            android:textSize="@dimen/txt14"
+            />
+        <ImageView
+            android:id="@+id/login_iv_eye"
+            android:layout_width="@dimen/dp_35"
+            android:layout_height="@dimen/dp_35"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="@dimen/dp_35"
+            android:src="@mipmap/ic_password_hind"
+            android:padding="10dp"
+            android:layout_centerVertical="true"/>
+    </RelativeLayout>
+</layout>
diff --git a/app/src/main/res-login/values/strings.xml b/app/src/main/res-login/values/strings.xml
new file mode 100644
index 0000000..138418c
--- /dev/null
+++ b/app/src/main/res-login/values/strings.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="MissingTranslation">
+    <!--登录-->
+    <string name="login_account_hint" >请输入用户名</string>
+    <string name="login_password_hint" >请输入密码</string>
+    <string name="login_submit" >登录</string>
+    <string name="login_retrieve_password" >找回密码</string>
+    <string name="login_privacy_agreement">已阅读并同意《用户协议》、《隐私政策》</string>
+    <!--找回密码-->
+    <string name="retrieve_password_mobile_hint">请输入手机号</string>
+    <string name="retrieve_password_mobile_format_error">手机号格式不正确</string>
+    <string name="retrieve_password_auth_code_hint">请输入验证码</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res-mine/drawable-xxhdpi/icon_mine_about_us.webp b/app/src/main/res-mine/drawable-xxhdpi/icon_mine_about_us.webp
new file mode 100644
index 0000000..10cd2ce
Binary files /dev/null and b/app/src/main/res-mine/drawable-xxhdpi/icon_mine_about_us.webp differ
diff --git a/app/src/main/res-mine/drawable-xxhdpi/icon_mine_account_security.webp b/app/src/main/res-mine/drawable-xxhdpi/icon_mine_account_security.webp
new file mode 100644
index 0000000..d7ba6cc
Binary files /dev/null and b/app/src/main/res-mine/drawable-xxhdpi/icon_mine_account_security.webp differ
diff --git a/app/src/main/res-mine/drawable-xxhdpi/icon_mine_assistant.webp b/app/src/main/res-mine/drawable-xxhdpi/icon_mine_assistant.webp
new file mode 100644
index 0000000..4fe23bf
Binary files /dev/null and b/app/src/main/res-mine/drawable-xxhdpi/icon_mine_assistant.webp differ
diff --git a/app/src/main/res-mine/drawable-xxhdpi/icon_mine_personal_info.webp b/app/src/main/res-mine/drawable-xxhdpi/icon_mine_personal_info.webp
new file mode 100644
index 0000000..dc60014
Binary files /dev/null and b/app/src/main/res-mine/drawable-xxhdpi/icon_mine_personal_info.webp differ
diff --git a/app/src/main/res-mine/drawable-xxhdpi/icon_mine_scheduling.webp b/app/src/main/res-mine/drawable-xxhdpi/icon_mine_scheduling.webp
new file mode 100644
index 0000000..6829460
Binary files /dev/null and b/app/src/main/res-mine/drawable-xxhdpi/icon_mine_scheduling.webp differ
diff --git a/app/src/main/res-mine/drawable-xxhdpi/icon_mine_statistics.webp b/app/src/main/res-mine/drawable-xxhdpi/icon_mine_statistics.webp
new file mode 100644
index 0000000..7ddd3d8
Binary files /dev/null and b/app/src/main/res-mine/drawable-xxhdpi/icon_mine_statistics.webp differ
diff --git a/app/src/main/res-mine/drawable-xxhdpi/icon_mine_suspension_service.webp b/app/src/main/res-mine/drawable-xxhdpi/icon_mine_suspension_service.webp
new file mode 100644
index 0000000..ffe8f6e
Binary files /dev/null and b/app/src/main/res-mine/drawable-xxhdpi/icon_mine_suspension_service.webp differ
diff --git a/app/src/main/res-mine/layout/activity_add_suspension_announcement.xml b/app/src/main/res-mine/layout/activity_add_suspension_announcement.xml
new file mode 100644
index 0000000..488b24b
--- /dev/null
+++ b/app/src/main/res-mine/layout/activity_add_suspension_announcement.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <variable
+            name="viewModel"
+            type="com.yxjk.healthexpertclient.ui.mine.viewmodel.AddSuspensionAnnouncementViewModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/theme_bg">
+        <include layout="@layout/view_toolbar_lay"
+            app:title="@{@string/title_add_suspension_announcement}"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@+id/scroll_view"
+            android:id="@+id/toolbar_lay"/>
+        <Button
+            android:id="@+id/btn_submit"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="wrap_content"
+            android:background="@drawable/rectangle_round_corner20_theme_stroke_white"
+            android:minHeight="@dimen/dp_0"
+            android:paddingVertical="@dimen/dp_10"
+            android:text="@string/add_suspension_announcement_submit"
+            android:textColor="@color/theme_color"
+            android:textSize="@dimen/sp_14"
+            android:outlineProvider="none"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/scroll_view"
+            app:layout_constraintWidth_percent="0.4"
+            android:layout_marginTop="@dimen/dp_30"
+            android:layout_marginBottom="@dimen/dp_21"/>
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/scroll_view"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="@dimen/dp_0"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintBottom_toTopOf="@+id/btn_submit"
+            app:layout_constraintTop_toBottomOf="@+id/toolbar_lay">
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_card"
+                    android:layout_marginHorizontal="@dimen/dp_10"
+                    android:layout_marginTop="@dimen/dp_5"
+                    android:padding="@dimen/dp_20">
+                    <TextView
+                        android:id="@+id/tv_cause_title"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        android:textColor="@color/text_black_33"
+                        android:textSize="@dimen/txt14"
+                        android:text="@string/add_suspension_announcement_cause"/>
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/rv_cause_list"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintLeft_toRightOf="@+id/tv_cause_title"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintRight_toRightOf="parent"
+                        android:layout_marginLeft="@dimen/dp_17"/>
+                    <TextView
+                        android:id="@+id/tv_time_title"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintTop_toTopOf="@+id/tv_start_time"
+                        app:layout_constraintBottom_toBottomOf="@+id/tv_start_time"
+                        android:textColor="@color/text_black_33"
+                        android:textSize="@dimen/txt14"
+                        android:text="@string/add_suspension_announcement_time"/>
+                    <TextView
+                        android:id="@+id/tv_start_time"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintLeft_toRightOf="@+id/tv_time_title"
+                        app:layout_constraintTop_toBottomOf="@+id/rv_cause_list"
+                        app:layout_constraintRight_toLeftOf="@+id/tv_time_cut"
+                        android:background="@drawable/rectangle_round_corner5_grey_stroke_white"
+                        android:layout_marginLeft="@dimen/dp_17"
+                        android:layout_marginTop="@dimen/dp_12"
+                        android:paddingVertical="@dimen/dp_10"
+                        android:paddingHorizontal="@dimen/dp_12"
+                        android:textColor="@color/text_black_33"
+                        android:textSize="@dimen/txt13"
+                        android:text="0000-00-00"/>
+                    <TextView
+                        android:id="@+id/tv_time_cut"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintLeft_toRightOf="@+id/tv_start_time"
+                        app:layout_constraintTop_toTopOf="@+id/tv_start_time"
+                        app:layout_constraintBottom_toBottomOf="@+id/tv_start_time"
+                        app:layout_constraintRight_toLeftOf="@+id/tv_end_time"
+                        android:layout_marginHorizontal="@dimen/dp_10"
+                        android:textColor="@color/text_black_33"
+                        android:textSize="@dimen/txt14"
+                        android:text="@string/add_suspension_announcement_cut"/>
+                    <TextView
+                        android:id="@+id/tv_end_time"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintLeft_toRightOf="@+id/tv_time_cut"
+                        app:layout_constraintTop_toTopOf="@+id/tv_start_time"
+                        app:layout_constraintRight_toRightOf="parent"
+                        android:background="@drawable/rectangle_round_corner5_grey_stroke_white"
+                        android:paddingVertical="@dimen/dp_10"
+                        android:paddingHorizontal="@dimen/dp_12"
+                        android:textColor="@color/text_black_33"
+                        android:textSize="@dimen/txt13"
+                        android:text="0000-00-00"/>
+                    <TextView
+                        android:id="@+id/tv_announcement_title"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/tv_start_time"
+                        app:layout_constraintRight_toRightOf="parent"
+                        android:layout_marginTop="@dimen/dp_22"
+                        android:textColor="@color/text_black_33"
+                        android:textSize="@dimen/txt14"
+                        android:text="@string/add_suspension_announcement_explain"/>
+                    <EditText
+                        android:id="@+id/et_announcement"
+                        android:layout_width="@dimen/dp_0"
+                        android:longClickable="false"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/rectangle_round_corner5_grey"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/tv_announcement_title"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        android:layout_marginBottom="@dimen/dp_5"
+                        android:layout_marginTop="@dimen/dp_15"
+                        android:gravity="top"
+                        android:padding="@dimen/dp_12"
+                        android:minHeight="@dimen/dp_180"
+                        android:textColor="@color/text_black_33"
+                        android:textSize="@dimen/txt14"
+                        android:textColorHint="@color/text_black_99"
+                        android:hint="@string/add_suspension_announcement_explain_tips"
+                        android:text="@={viewModel.suspensionServiceBean.notice}"/>
+
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </RelativeLayout>
+
+        </androidx.core.widget.NestedScrollView>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/activity_bill_record.xml b/app/src/main/res-mine/layout/activity_bill_record.xml
new file mode 100644
index 0000000..cc0ea4e
--- /dev/null
+++ b/app/src/main/res-mine/layout/activity_bill_record.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+        <include layout="@layout/view_toolbar_lay"
+            app:title="@{@string/title_bill_record}"
+            android:id="@+id/toolbar_lay"/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+            <com.google.android.material.tabs.TabLayout
+                android:id="@+id/tab_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:tabIndicatorFullWidth="false"
+                app:tabRippleColor="@android:color/transparent"
+                app:tabSelectedTextColor="@color/text_black_33"
+                app:tabTextColor="@color/text_black_66"
+                app:tabTextAppearance="@dimen/txt14"/>
+            <androidx.viewpager2.widget.ViewPager2
+                android:id="@+id/view_pager"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"/>
+
+        </LinearLayout>
+    </LinearLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/activity_consult_statistics.xml b/app/src/main/res-mine/layout/activity_consult_statistics.xml
new file mode 100644
index 0000000..7fd32d7
--- /dev/null
+++ b/app/src/main/res-mine/layout/activity_consult_statistics.xml
@@ -0,0 +1,315 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <variable
+            name="viewModel"
+            type="com.yxjk.healthexpertclient.ui.mine.viewmodel.ConsultStatisticsViewModel" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/theme_bg"
+        android:orientation="vertical">
+
+        <include
+            layout="@layout/view_toolbar_lay"
+            app:title="@{@string/title_consult_statistics}" />
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingVertical="@dimen/dp_10">
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/cl_money_lay"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/rectangle_round_corner10_green_gradient"
+                    android:layout_marginHorizontal="@dimen/dp_15"
+                    android:paddingTop="@dimen/dp_12"
+                    android:paddingBottom="@dimen/dp_20">
+                    <TextView
+                        android:id="@+id/tv_unsettled_income_title"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        android:layout_marginLeft="@dimen/dp_15"
+                        android:textSize="@dimen/txt12"
+                        android:textColor="@color/white"
+                        android:text="@string/consult_statistics_unsettled_income"/>
+                    <TextView
+                        android:id="@+id/tv_unsettled_income_money"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/tv_unsettled_income_title"
+                        android:layout_marginTop="@dimen/dp_22"
+                        android:includeFontPadding="false"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/txt24"
+                        android:text="@{'￥'+viewModel.consultStatisticsBean.unsettled}"/>
+                    <View
+                        android:id="@+id/line"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="@dimen/dp_1"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/tv_unsettled_income_money"
+                        android:layout_marginTop="@dimen/dp_24"
+                        android:background="@color/white"
+                        android:layout_marginHorizontal="@dimen/dp_21"/>
+                    <TextView
+                        android:id="@+id/tv_total_income_title"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/line"
+                        app:layout_constraintRight_toLeftOf="@+id/tv_settled_income_title"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:layout_marginLeft="@dimen/dp_21"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/txt12"
+                        android:text="@string/consult_statistics_total_income"/>
+                    <TextView
+                        android:id="@+id/tv_total_income_money"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintLeft_toLeftOf="@+id/tv_total_income_title"
+                        app:layout_constraintTop_toBottomOf="@+id/tv_total_income_title"
+                        app:layout_constraintRight_toLeftOf="@+id/tv_settled_income_title"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/txt16"
+                        android:text="@{'￥'+viewModel.consultStatisticsBean.sumIncome}"/>
+                    <TextView
+                        android:id="@+id/tv_settled_income_title"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintLeft_toRightOf="@+id/tv_total_income_title"
+                        app:layout_constraintTop_toTopOf="@+id/tv_total_income_title"
+                        app:layout_constraintRight_toRightOf="parent"
+                        android:layout_marginRight="@dimen/dp_21"
+                        android:gravity="right"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/txt12"
+                        android:text="@string/consult_statistics_settled_income"/>
+
+                    <TextView
+                        android:id="@+id/tv_settled_income_money"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintLeft_toRightOf="@+id/tv_total_income_money"
+                        app:layout_constraintTop_toTopOf="@+id/tv_total_income_money"
+                        app:layout_constraintRight_toRightOf="@+id/tv_settled_income_title"
+                        android:gravity="right"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/txt16"
+                        android:text="@{'￥'+viewModel.consultStatisticsBean.sumPaymentMoney}"/>
+                </androidx.constraintlayout.widget.ConstraintLayout>
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_10"
+                    android:layout_marginTop="@dimen/dp_10"
+                    android:background="@drawable/bg_card">
+
+                    <Spinner
+                        android:id="@+id/spinner_month"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"
+                        android:layout_marginLeft="@dimen/dp_9"
+                        android:layout_marginRight="@dimen/dp_15"
+                        android:background="@drawable/bg_spinner_transparent"
+                        android:overlapAnchor="false"
+                        android:spinnerMode="dropdown"
+                        android:paddingRight="@dimen/dp_16"
+                        android:textSize="@dimen/txt13"
+                        android:gravity="right"/>
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_toLeftOf="@+id/spinner_month"
+                        android:layout_marginLeft="@dimen/dp_16"
+                        android:layout_marginVertical="@dimen/dp_12"
+                        android:drawableLeft="@drawable/ic_month_statistics"
+                        android:drawablePadding="@dimen/dp_8"
+                        android:gravity="center_vertical"
+                        android:includeFontPadding="false"
+                        android:textColor="@color/text_black_33"
+                        android:textSize="@dimen/txt15"
+                        android:text="@string/consult_statistics_month_title"/>
+                </RelativeLayout>
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_card"
+                    android:layout_marginHorizontal="@dimen/dp_10"
+                    android:padding="@dimen/dp_20"
+                    android:orientation="vertical">
+                    <TextView
+                        android:id="@+id/tv_pie_chart_title"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:includeFontPadding="false"
+                        android:textColor="@color/text_black_33"
+                        android:textSize="@dimen/txt15"
+                        android:text="@string/consult_statistics_classify_title"/>
+                    <com.github.mikephil.charting.charts.PieChart
+                        android:id="@+id/pie_chart_view"
+                        android:layout_gravity="center"
+                        android:layout_marginTop="@dimen/dp_28"
+                        android:layout_below="@+id/tv_pie_chart_title"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_250" />
+                    <TextView
+                        android:id="@+id/tv_no_date"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_alignTop="@+id/pie_chart_view"
+                        android:layout_alignBottom="@+id/pie_chart_view"
+                        android:background="@color/white"
+                        android:gravity="center"
+                        android:textColor="@color/text_black_33"
+                        android:textSize="@dimen/txt14"
+                        android:text="@string/consult_statistics_classify_no_data"/>
+                </RelativeLayout>
+                <RelativeLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_10"
+                    android:background="@drawable/bg_card">
+                    <TextView
+                        android:id="@+id/tv_classify_detail"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:layout_alignBottom="@+id/tv_classify_title"
+                        android:layout_marginRight="@dimen/dp_25"
+                        android:layout_marginLeft="@dimen/dp_9"
+                        android:textSize="@dimen/txt12"
+                        android:textColor="@color/link_blue_color"
+                        android:text="@string/consult_statistics_classify_detail"
+                        android:visibility="gone"/>
+                    <TextView
+                        android:id="@+id/tv_classify_title"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_toLeftOf="@+id/tv_classify_detail"
+                        android:layout_marginLeft="@dimen/dp_16"
+                        android:layout_marginVertical="@dimen/dp_15"
+                        android:gravity="center_vertical"
+                        android:includeFontPadding="false"
+                        android:textColor="@color/text_black_33"
+                        android:textSize="@dimen/txt15"
+                        android:text="@string/consult_statistics_classify_title"/>
+                    <TableLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/tv_classify_title"
+                        android:layout_marginHorizontal="@dimen/dp_16"
+                        android:layout_marginBottom="@dimen/dp_28"
+                        android:background="@drawable/rectangle_gray_stroke_transparent"
+                        android:stretchColumns="*">
+                        <TableRow
+                            android:background="@color/grey15">
+                            <TextView
+                                android:layout_marginVertical="@dimen/dp_10"
+                                android:gravity="center"
+                                android:textColor="@color/text_black_33"
+                                android:textSize="@dimen/txt12"
+                                android:text="@string/consult_statistics_type"/>
+                            <TextView
+                                android:layout_marginVertical="@dimen/dp_10"
+                                android:gravity="center"
+                                android:textColor="@color/text_black_33"
+                                android:textSize="@dimen/txt12"
+                                android:text="@string/consult_statistics_under_way"/>
+                            <TextView
+                                android:layout_marginVertical="@dimen/dp_10"
+                                android:gravity="center"
+                                android:textColor="@color/text_black_33"
+                                android:textSize="@dimen/txt12"
+                                android:text="@string/consult_statistics_finish"/>
+                            <TextView
+                                android:layout_marginVertical="@dimen/dp_10"
+                                android:gravity="center"
+                                android:textColor="@color/text_black_33"
+                                android:textSize="@dimen/txt12"
+                                android:text="@string/consult_statistics_total"/>
+                        </TableRow>
+                        <TableRow>
+                            <TextView
+                                android:layout_marginVertical="@dimen/dp_10"
+                                android:gravity="center"
+                                android:textColor="@color/text_black_33"
+                                android:textSize="@dimen/txt12"
+                                android:text="@string/consult_statistics_type_image_text"/>
+                            <TextView
+                                android:layout_marginVertical="@dimen/dp_10"
+                                android:gravity="center"
+                                android:textColor="@color/text_black_33"
+                                android:textSize="@dimen/txt12"
+                                android:text="@{viewModel.consultTypeAllList.size()>0?String.valueOf(viewModel.consultTypeAllList.get(0).inProgress):@string/consult_statistics_default_value}"/>
+                            <TextView
+                                android:layout_marginVertical="@dimen/dp_10"
+                                android:gravity="center"
+                                android:textColor="@color/text_black_33"
+                                android:textSize="@dimen/txt12"
+                                android:text="@{viewModel.consultTypeAllList.size()>0?String.valueOf(viewModel.consultTypeAllList.get(0).completed):@string/consult_statistics_default_value}"/>
+                            <TextView
+                                android:layout_marginVertical="@dimen/dp_10"
+                                android:gravity="center"
+                                android:textColor="@color/text_black_33"
+                                android:textSize="@dimen/txt12"
+                                android:text="@{viewModel.consultTypeAllList.size()>0?String.valueOf(viewModel.consultTypeAllList.get(0).total):@string/consult_statistics_default_value}"/>
+
+                        </TableRow>
+                        <include layout="@layout/lay_cut_off_rule"
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/dp_1"/>
+                        <TableRow>
+                            <TextView
+                                android:layout_marginVertical="@dimen/dp_10"
+                                android:gravity="center"
+                                android:textColor="@color/text_black_33"
+                                android:textSize="@dimen/txt12"
+                                android:text="@string/consult_statistics_type_audio_video"/>
+                            <TextView
+                                android:layout_marginVertical="@dimen/dp_10"
+                                android:gravity="center"
+                                android:textColor="@color/text_black_33"
+                                android:textSize="@dimen/txt12"
+                                android:text="@{viewModel.consultTypeAllList.size()>1?String.valueOf(viewModel.consultTypeAllList.get(1).inProgress):@string/consult_statistics_default_value}"/>
+                            <TextView
+                                android:layout_marginVertical="@dimen/dp_10"
+                                android:gravity="center"
+                                android:textColor="@color/text_black_33"
+                                android:textSize="@dimen/txt12"
+                                android:text="@{viewModel.consultTypeAllList.size()>1?String.valueOf(viewModel.consultTypeAllList.get(1).completed):@string/consult_statistics_default_value}"/>
+                            <TextView
+                                android:layout_marginVertical="@dimen/dp_10"
+                                android:gravity="center"
+                                android:textColor="@color/text_black_33"
+                                android:textSize="@dimen/txt12"
+                                android:text="@{viewModel.consultTypeAllList.size()>1?String.valueOf(viewModel.consultTypeAllList.get(1).total):@string/consult_statistics_default_value}"/>
+
+                        </TableRow>
+                    </TableLayout>
+                </RelativeLayout>
+            </LinearLayout>
+        </ScrollView>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/activity_custom_scheduling.xml b/app/src/main/res-mine/layout/activity_custom_scheduling.xml
new file mode 100644
index 0000000..b913e60
--- /dev/null
+++ b/app/src/main/res-mine/layout/activity_custom_scheduling.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <variable
+            name="viewModel"
+            type="com.yxjk.healthexpertclient.ui.mine.viewmodel.CustomSchedulingViewModel" />
+    </data>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/theme_bg">
+        <include layout="@layout/view_toolbar_lay"
+            app:title="@{@string/title_custom_scheduling}"/>
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            >
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:paddingVertical="@dimen/dp_10"
+                android:orientation="vertical">
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_card_top"
+                    android:paddingTop="@dimen/dp_18"
+                    android:paddingBottom="@dimen/dp_12"
+                    android:paddingHorizontal="@dimen/dp_20"
+                    android:textColor="@color/text_black_33"
+                    android:textSize="@dimen/txt15"
+                    android:text="@string/custom_scheduling_sub_title"/>
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rv_list"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_card_bottom"
+                    android:paddingHorizontal="@dimen/dp_20"
+                    android:paddingBottom="@dimen/dp_18"
+                    android:clipToPadding="false"/>
+                <include layout="@layout/lay_audio_video_consult_setting"
+                    android:id="@+id/lay_consult_num_setting"
+                    app:showAudioVideoConsult="@={viewModel.showAudioVideoConsult}"/>
+
+                <Switch
+                    android:id="@+id/switch_audio_video"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_card"
+                    android:paddingHorizontal="@dimen/dp_20"
+                    android:paddingVertical="@dimen/dp_16"
+                    android:text="@string/custom_scheduling_skip_holiday"
+                    android:textColor="@color/text_black_33"
+                    android:textSize="@dimen/txt14"
+                    android:checked="@={viewModel.tfJumpHoliday}"/>
+                <Button
+                    android:id="@+id/btn_submit"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:minHeight="@dimen/dp_0"
+                    android:background="@drawable/rectangle_round_corner20_theme_stroke_white"
+                    android:layout_marginTop="@dimen/dp_42"
+                    android:paddingVertical="@dimen/dp_11"
+                    android:paddingHorizontal="@dimen/dp_46"
+                    android:stateListAnimator="@null"
+                    android:textColor="@color/theme_color"
+                    android:textSize="@dimen/txt14"
+                    android:text="@string/custom_scheduling_submit"/>
+                <!--可能会加切回统一排班，先不删除按钮，隐藏掉-->
+                <Button
+                    android:id="@+id/btn_unify_scheduling"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:minHeight="@dimen/dp_0"
+                    android:background="@drawable/bg_transparent"
+                    android:layout_marginBottom="@dimen/dp_24"
+                    android:paddingVertical="@dimen/dp_10"
+                    android:paddingHorizontal="@dimen/dp_46"
+                    android:stateListAnimator="@null"
+                    android:textColor="@color/theme_color"
+                    android:textSize="@dimen/txt14"
+                    android:text="@string/scheduling_unify_scheduling"
+                    android:visibility="visible"/>
+            </LinearLayout>
+
+        </androidx.core.widget.NestedScrollView>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/activity_edit_password.xml b/app/src/main/res-mine/layout/activity_edit_password.xml
new file mode 100644
index 0000000..6d3437b
--- /dev/null
+++ b/app/src/main/res-mine/layout/activity_edit_password.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <variable
+            name="viewModel"
+            type="com.yxjk.healthexpertclient.ui.mine.viewmodel.EditPasswordViewModel" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/toolbar_lay"
+            app:title="@{@string/title_edit_password}"
+            layout="@layout/view_toolbar_lay" />
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+                <include layout="@layout/view_input_password"
+                    app:title="@{@string/edit_password_old_password_title}"
+                    app:hint="@{@string/edit_password_old_password_title_hint}"
+                    android:id="@+id/lay_old_password"
+                    app:text="@={viewModel.oldPassword}"/>
+                <include layout="@layout/view_input_password"
+                    app:title="@{@string/edit_password_new_password_title}"
+                    app:hint="@{@string/edit_password_new_password_title_hint}"
+                    android:id="@+id/lay_new_password"
+                    app:text="@={viewModel.newPassword}"/>
+                <include layout="@layout/view_input_password"
+                    app:title="@{@string/edit_password_affirm_password_title}"
+                    app:hint="@{@string/edit_password_affirm_password_title_hint}"
+                    app:hideLine="@{true}"
+                    android:id="@+id/lay_confirm_password"
+                    app:text="@={viewModel.confirmPassword}"/>
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingHorizontal="@dimen/dp_16"
+                    android:paddingVertical="@dimen/dp_14"
+                    android:textSize="@dimen/txt13"
+                    android:textColor="@color/text_black_99"
+                    android:text="@string/edit_password_tips"/>
+                <Button
+                    android:id="@+id/btn_submit"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/rectangle_round_corner20_theme_stroke_white"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginHorizontal="@dimen/dp_48"
+                    android:minHeight="@dimen/dp_0"
+                    android:paddingVertical="@dimen/dp_10"
+                    android:text="@string/edit_password_submit"
+                    android:textColor="@color/theme_color"
+                    android:textSize="@dimen/sp_14"
+                    android:outlineProvider="none"
+                    android:layout_marginTop="@dimen/dp_30"
+                    android:layout_marginBottom="@dimen/dp_21"/>
+            </LinearLayout>
+        </ScrollView>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/activity_good_at_disease.xml b/app/src/main/res-mine/layout/activity_good_at_disease.xml
new file mode 100644
index 0000000..7d7828b
--- /dev/null
+++ b/app/src/main/res-mine/layout/activity_good_at_disease.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white">
+        <include layout="@layout/view_toolbar_lay"
+            app:title="@{@string/title_good_at_disease}"/>
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/dp_10"
+            android:layout_marginTop="@dimen/dp_5"/>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/activity_person_info.xml b/app/src/main/res-mine/layout/activity_person_info.xml
new file mode 100644
index 0000000..fc4b36c
--- /dev/null
+++ b/app/src/main/res-mine/layout/activity_person_info.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <variable
+            name="viewModel"
+            type="com.yxjk.healthexpertclient.ui.mine.viewmodel.PersonInfoViewModel" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/theme_bg"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/toolbar_lay"
+            layout="@layout/view_toolbar_lay"
+            app:hideLine="@{true}"
+            app:title="@{@string/title_person_info}" />
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+                <RelativeLayout
+                    android:id="@+id/rl_head_image"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingVertical="@dimen/dp_8"
+                    android:paddingHorizontal="@dimen/dp_16"
+                    android:background="@color/white">
+
+                    <ImageView
+                        android:id="@+id/iv_next"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/icon_more_small_gray"
+                        android:layout_alignParentRight="true"
+                        android:layout_centerVertical="true"/>
+                    <ImageView
+                        android:id="@+id/iv_head_img"
+                        android:layout_width="@dimen/dp_45"
+                        android:layout_height="@dimen/dp_45"
+                        android:layout_centerVertical="true"
+                        android:layout_marginHorizontal="@dimen/dp_10"
+                        android:layout_toLeftOf="@+id/iv_next"
+                        app:circleImageUrl="@{viewModel.doctorBean.photo}"/>
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_toLeftOf="@+id/iv_head_img"
+                        android:textColor="@color/text_black_66"
+                        android:textSize="@dimen/txt14"
+                        android:text="@string/person_info_head_img"/>
+
+                </RelativeLayout>
+                <include layout="@layout/view_person_info_item"
+                    app:title="@{@string/person_info_name}"
+                    app:content="@{viewModel.doctorBean.doctorName}"/>
+                <include layout="@layout/view_person_info_item"
+                    app:title="@{@string/person_info_hospital}"
+                    app:content="@{viewModel.doctorBean.resourceName}"/>
+                <include layout="@layout/view_person_info_item"
+                    app:title="@{@string/person_info_departments}"
+                    app:content="@{viewModel.doctorBean.departmentName}"/>
+                <include layout="@layout/view_person_info_item"
+                    app:title="@{@string/person_info_job_title}"
+                    app:content="@{viewModel.doctorBean.doctorTitle}"/>
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingHorizontal="@dimen/dp_14"
+                    android:layout_marginBottom="@dimen/dp_32"
+                    android:background="@color/white"
+                    android:layout_marginTop="@dimen/dp_10">
+                    <Button
+                        android:id="@+id/btn_add"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        android:paddingHorizontal="@dimen/dp_12"
+                        android:paddingVertical="@dimen/dp_7"
+                        android:layout_marginTop="@dimen/dp_15"
+                        android:minWidth="@dimen/dp_0"
+                        android:background="@drawable/rectangle_round_corner20_theme_stroke_white"
+                        android:text="@string/person_info_add"
+                        android:textColor="@color/theme_color"
+                        android:minHeight="@dimen/dp_0"/>
+                    <TextView
+                        android:id="@+id/tv_specialized_disease"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintBaseline_toBaselineOf="@+id/btn_add"
+                        android:textColor="@color/text_black_66"
+                        android:textSize="@dimen/txt14"
+                        android:text="@string/person_info_specialized_disease"/>
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/rv_disease"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/dp_6"
+                        app:layout_constraintLeft_toRightOf="@+id/tv_specialized_disease"
+                        app:layout_constraintRight_toLeftOf="@+id/btn_add"
+                        app:layout_constraintTop_toTopOf="parent"
+                        android:layout_marginHorizontal="@dimen/dp_16"
+                        android:minHeight="@dimen/dp_40"/>
+                    <TextView
+                        android:id="@+id/tv_personally_good"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/rv_disease"
+                        android:layout_marginTop="@dimen/dp_16"
+                        android:textColor="@color/text_black_66"
+                        android:textSize="@dimen/txt14"
+                        android:text="@string/person_info_personally_good"/>
+                    <EditText
+                        android:id="@+id/et_personally_good"
+                        android:longClickable="false"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/tv_personally_good"
+                        android:background="@drawable/rectangle_round_corner5_grey"
+                        android:layout_marginTop="@dimen/dp_15"
+                        android:minHeight="@dimen/dp_180"
+                        android:textColor="@color/text_black_33"
+                        android:textSize="@dimen/txt14"
+                        android:gravity="top"
+                        android:padding="@dimen/dp_12"
+                        android:hint="@string/person_info_personally_good_hint"
+                        android:text="@={viewModel.doctorBean.goodAt}"/>
+                    <TextView
+                        android:id="@+id/tv_personal_profile"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/et_personally_good"
+                        android:layout_marginTop="@dimen/dp_16"
+                        android:textColor="@color/text_black_66"
+                        android:textSize="@dimen/txt14"
+                        android:text="@string/person_info_personal_profile"/>
+                    <EditText
+                        android:id="@+id/et_personal_profile"
+                        android:longClickable="false"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/tv_personal_profile"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        android:background="@drawable/rectangle_round_corner5_grey"
+                        android:layout_marginTop="@dimen/dp_15"
+                        android:layout_marginBottom="@dimen/dp_32"
+                        android:minHeight="@dimen/dp_180"
+                        android:textColor="@color/text_black_33"
+                        android:textSize="@dimen/txt14"
+                        android:gravity="top"
+                        android:padding="@dimen/dp_12"
+                        android:hint="@string/person_info_personal_profile_hint"
+                        android:text="@={viewModel.doctorBean.experience}"/>
+                </androidx.constraintlayout.widget.ConstraintLayout>
+                <Button
+                    android:id="@+id/btn_save"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/rectangle_round_corner20_theme_stroke_white"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginHorizontal="@dimen/dp_48"
+                    android:minHeight="@dimen/dp_0"
+                    android:paddingVertical="@dimen/dp_10"
+                    android:text="@string/person_info_save"
+                    android:textColor="@color/theme_color"
+                    android:textSize="@dimen/sp_14"
+                    android:outlineProvider="none"
+                    android:layout_marginTop="@dimen/dp_27"
+                    android:layout_marginBottom="@dimen/dp_21"/>
+            </LinearLayout>
+        </ScrollView>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/activity_scheduling.xml b/app/src/main/res-mine/layout/activity_scheduling.xml
new file mode 100644
index 0000000..9c02717
--- /dev/null
+++ b/app/src/main/res-mine/layout/activity_scheduling.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <import type="android.view.View"/>
+        <variable
+            name="viewModel"
+            type="com.yxjk.healthexpertclient.ui.mine.viewmodel.SchedulingViewModel" />
+    </data>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/theme_bg">
+        <include layout="@layout/view_toolbar_lay"
+            app:title="@{@string/title_scheduling}"/>
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            >
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="@dimen/dp_10"
+                android:paddingVertical="@dimen/dp_10"
+                android:orientation="vertical">
+<!--                <include layout="@layout/lay_audio_video_consult_setting"-->
+<!--                    app:showAudioVideoConsult="@={viewModel.showAudioVideoConsult}"-->
+<!--                    app:amMaxNum="@={viewModel.amMaxNum}"-->
+<!--                    app:pmMaxNum="@={viewModel.pmMaxNum}"/>-->
+<!--                <TextView-->
+<!--                    android:layout_width="match_parent"-->
+<!--                    android:layout_height="wrap_content"-->
+<!--                    android:background="@drawable/bg_card_top"-->
+<!--                    android:paddingTop="@dimen/dp_18"-->
+<!--                    android:paddingBottom="@dimen/dp_12"-->
+<!--                    android:paddingHorizontal="@dimen/dp_20"-->
+<!--                    android:textColor="@color/text_black_33"-->
+<!--                    android:textSize="@dimen/txt15"-->
+<!--                    android:text="@string/scheduling_sub_title"-->
+<!--                    android:visibility="@{viewModel.showAudioVideoConsult?View.VISIBLE:View.GONE}"/>-->
+                <Switch
+                    android:id="@+id/switch_audio_video"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingHorizontal="@dimen/dp_20"
+                    android:paddingVertical="@dimen/dp_18"
+                    android:text="@string/scheduling_audio_video_consult"
+                    android:textColor="@color/text_black_33"
+                    android:textSize="@dimen/txt15"
+                    android:background="@drawable/bg_card_top"
+                    android:checked="@={viewModel.showAudioVideoConsult}"/>
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/rv_list"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_card_bottom"
+                    android:paddingHorizontal="@dimen/dp_20"
+                    android:paddingBottom="@dimen/dp_18"
+                    android:clipToPadding="false"/>
+                <Switch
+                    android:id="@+id/switch_jump_holiday"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_card"
+                    android:paddingHorizontal="@dimen/dp_20"
+                    android:paddingVertical="@dimen/dp_16"
+                    android:checked="@={viewModel.tfJumpHoliday}"
+                    android:text="@string/scheduling_skip_holiday"
+                    android:textColor="@color/text_black_33"
+                    android:textSize="@dimen/txt14"/>
+                <Button
+                    android:id="@+id/btn_submit"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:minHeight="@dimen/dp_0"
+                    android:background="@drawable/rectangle_round_corner20_theme_stroke_white"
+                    android:layout_marginTop="@dimen/dp_42"
+                    android:paddingVertical="@dimen/dp_11"
+                    android:paddingHorizontal="@dimen/dp_46"
+                    android:stateListAnimator="@null"
+                    android:textColor="@color/theme_color"
+                    android:textSize="@dimen/txt14"
+                    android:text="@string/scheduling_submit"/>
+                <Button
+                    android:id="@+id/btn_custom_scheduling"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:minHeight="@dimen/dp_0"
+                    android:background="@drawable/bg_transparent"
+                    android:layout_marginBottom="@dimen/dp_24"
+                    android:paddingVertical="@dimen/dp_10"
+                    android:paddingHorizontal="@dimen/dp_46"
+                    android:stateListAnimator="@null"
+                    android:textColor="@color/theme_color"
+                    android:textSize="@dimen/txt14"
+                    android:text="@string/scheduling_custom_scheduling"
+                    android:visibility="gone"/>
+            </LinearLayout>
+
+        </androidx.core.widget.NestedScrollView>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/activity_setting.xml b/app/src/main/res-mine/layout/activity_setting.xml
new file mode 100644
index 0000000..d1810ff
--- /dev/null
+++ b/app/src/main/res-mine/layout/activity_setting.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/theme_bg">
+
+        <include
+            android:id="@+id/toolbar_lay"
+            layout="@layout/view_toolbar_lay"
+            app:title="@{@string/title_setting}" />
+        <ScrollView
+            android:id="@+id/scroll_view"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="@dimen/dp_0"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/toolbar_lay"
+            app:layout_constraintBottom_toBottomOf="parent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+                <ImageView
+                    android:layout_width="@dimen/dp_100"
+                    android:layout_height="@dimen/dp_100"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/dp_80"
+                    android:src="@mipmap/ic_launcher"/>
+                <TextView
+                    android:id="@+id/tv_version"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:drawablePadding="@dimen/dp_6"
+                    android:gravity="center_vertical"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/ll_setting_lay"
+                    android:layout_gravity="center_horizontal"
+                    android:paddingVertical="@dimen/dp_14"
+                    tools:text="@string/mine_about_us"
+                    android:textColor="@color/text_black_99"
+                    android:textSize="@dimen/txt13" />
+                <TextView
+                    android:id="@+id/tv_user_protocol"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/rectangle_bottom_gray_stroke_white"
+                    android:layout_marginTop="@dimen/dp_15"
+                    android:padding="@dimen/dp_16"
+                    android:drawableRight="@drawable/icon_more_small_gray"
+                    android:textSize="@dimen/txt13"
+                    android:textColor="@color/text_black_33"
+                    android:text="@string/setting_user_protocol"/>
+                <TextView
+                    android:id="@+id/tv_privacy_policy"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/rectangle_bottom_gray_stroke_white"
+                    android:padding="@dimen/dp_16"
+                    android:drawableRight="@drawable/icon_more_small_gray"
+                    android:textSize="@dimen/txt13"
+                    android:textColor="@color/text_black_33"
+                    android:text="@string/setting_privacy_policy"/>
+                <RelativeLayout
+                    android:id="@+id/rl_version_update"
+                    android:background="@drawable/rectangle_bottom_gray_stroke_white"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:padding="@dimen/dp_16"
+                        android:textSize="@dimen/txt13"
+                        android:textColor="@color/text_black_33"
+                        android:text="检查更新"/>
+                    <TextView
+                        android:id="@+id/tv_version_update"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:padding="@dimen/dp_16"
+                        android:textSize="@dimen/txt13"
+                        android:textColor="@color/text_black_33"
+                        android:text="已是最新版本"/>
+                </RelativeLayout>
+                <RelativeLayout
+                    android:background="@color/white"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:padding="@dimen/dp_16"
+                        android:textSize="@dimen/txt13"
+                        android:textColor="@color/text_black_33"
+                        android:text="备案号"/>
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_alignParentRight="true"
+                        android:padding="@dimen/dp_16"
+                        android:textSize="@dimen/txt13"
+                        android:textColor="@color/text_black_33"
+                        android:text="陕ICP备15015572号-4A"/>
+                </RelativeLayout>
+
+                <TextView
+                    android:id="@+id/tv_about"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white"
+                    android:padding="@dimen/dp_16"
+                    android:drawableRight="@drawable/icon_more_small_gray"
+                    android:textSize="@dimen/txt14"
+                    android:textColor="@color/text_black_33"
+                    android:text="@string/setting_about"
+                    android:visibility="gone"/>
+            </LinearLayout>
+        </ScrollView>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/activity_suspension_service.xml b/app/src/main/res-mine/layout/activity_suspension_service.xml
new file mode 100644
index 0000000..c5179b1
--- /dev/null
+++ b/app/src/main/res-mine/layout/activity_suspension_service.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+
+    <RelativeLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/theme_bg">
+        <include layout="@layout/view_toolbar_lay"
+            app:title="@{@string/title_suspension_service}"/>
+        <include layout="@layout/view_footer_suspension_service"
+            android:id="@+id/lay_operate"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"/>
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/swipe_refresh"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/toolbar_lay"
+            android:layout_above="@+id/lay_operate">
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_list"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_5" />
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/activity_with_draw.xml b/app/src/main/res-mine/layout/activity_with_draw.xml
new file mode 100644
index 0000000..8fc6359
--- /dev/null
+++ b/app/src/main/res-mine/layout/activity_with_draw.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <variable
+            name="viewModel"
+            type="com.yxjk.healthexpertclient.ui.mine.viewmodel.WithDrawViewModel" />
+    </data>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/theme_bg">
+        <include layout="@layout/view_toolbar_lay"
+            app:title="@{@string/title_with_draw}"
+            app:hideLine="@{true}"
+            android:id="@+id/toolbar_lay"/>
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/theme_color"
+                    android:gravity="center_horizontal"
+                    android:orientation="vertical">
+                    <TextView
+                        android:id="@+id/tv_change_money"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/dp_32"
+                        android:textSize="@dimen/txt30"
+                        android:textColor="@color/white"
+                        android:text="@{viewModel.billRecordBean.income}"/>
+                    <TextView
+                        android:id="@+id/tv_actual_money"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/dp_16"
+                        android:textSize="@dimen/txt14"
+                        android:textColor="@color/white"
+                        android:text="@{@string/with_draw_account_money(viewModel.billRecordBean.accountMoney)}"/>
+                    <TextView
+                        android:id="@+id/tv_tips"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/dp_25"
+                        android:layout_marginBottom="@dimen/dp_72"
+                        android:textSize="@dimen/txt12"
+                        android:textColor="@color/white"
+                        android:text="@string/with_draw_tips"/>
+                </LinearLayout>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/bg_card"
+                    android:layout_marginTop="-50dp"
+                    android:layout_marginHorizontal="@dimen/dp_10"
+                    android:paddingVertical="@dimen/dp_17"
+                    android:paddingHorizontal="@dimen/dp_23"
+                    android:orientation="vertical">
+                    <include
+                        android:id="@+id/lay_serial_number"
+                        layout="@layout/view_with_draw_detail_item"
+                        app:title="@{@string/with_draw_serial_number}"
+                        app:content="@{String.valueOf(viewModel.billRecordBean.id)}"/>
+                    <include
+                        android:id="@+id/lay_with_draw_organization"
+                        layout="@layout/view_with_draw_detail_item"
+                        app:title="@{@string/with_draw_with_draw_organization}"
+                        app:content="@{viewModel.billRecordBean.withdrawalName}"/>
+                    <include
+                        android:id="@+id/lay_with_draw_type"
+                        layout="@layout/view_with_draw_detail_item"
+                        app:title="@{@string/with_draw_with_draw_type}"
+                        app:content="@{viewModel.billRecordBean.withdraw}"/>
+                    <include
+                        android:id="@+id/lay_shroff_account_number"
+                        layout="@layout/view_with_draw_detail_item"
+                        app:title="@{@string/with_draw_shroff_account_number}"
+                        app:content="@{viewModel.billRecordBean.paymentName+'\n'+viewModel.billRecordBean.paymentAccount}"/>
+                    <include
+                        android:id="@+id/lay_with_draw_money"
+                        layout="@layout/view_with_draw_detail_item"
+                        app:title="@{@string/with_draw_with_draw_money}"
+                        app:content="@{viewModel.billRecordBean.income}"/>
+                    <include
+                        android:id="@+id/lay_actual_money"
+                        layout="@layout/view_with_draw_detail_item"
+                        app:title="@{@string/with_draw_actual_money}"
+                        app:content="@{viewModel.billRecordBean.realityMoney}"/>
+                    <include
+                        android:id="@+id/lay_explain"
+                        layout="@layout/view_with_draw_detail_item"
+                        app:title="@{@string/with_draw_explain}"
+                        app:content="@{viewModel.billRecordBean.remarks}"/>
+                    <include
+                        android:id="@+id/lay_account_balance"
+                        layout="@layout/view_with_draw_detail_item"
+                        app:title="@{@string/with_draw_account_balance}"
+                        app:content="@{viewModel.billRecordBean.accountMoney}"/>
+                    <include
+                        android:id="@+id/lay_with_draw_time"
+                        layout="@layout/view_with_draw_detail_item"
+                        app:title="@{@string/with_draw_with_draw_time}"
+                        app:content="@{viewModel.billRecordBean.incomeTime}"/>
+                </LinearLayout>
+            </LinearLayout>
+        </ScrollView>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/dialog_add_disease.xml b/app/src/main/res-mine/layout/dialog_add_disease.xml
new file mode 100644
index 0000000..bd3d32e
--- /dev/null
+++ b/app/src/main/res-mine/layout/dialog_add_disease.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/rectangle_top_round_corner20_white">
+
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginHorizontal="@dimen/dp_15"
+            android:layout_marginTop="@dimen/dp_20"
+            android:textColor="@color/text_black_33"
+            android:textSize="@dimen/txt14"
+            android:text="@string/dialog_add_disease_title" />
+
+
+
+        <EditText
+            android:id="@+id/et_disease"
+            android:layout_width="@dimen/dp_0"
+            android:longClickable="false"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_title"
+            android:background="@drawable/rectangle_round_corner10_grey"
+            android:minHeight="@dimen/dp_90"
+            android:layout_marginHorizontal="@dimen/dp_15"
+            android:layout_marginTop="@dimen/dp_12"
+            android:paddingHorizontal="@dimen/dp_15"
+            android:paddingVertical="@dimen/dp_12"
+            android:gravity="top"
+            android:hint="@string/dialog_add_disease_hint"
+            android:textColor="@color/text_black_33"
+            android:textSize="@dimen/txt14" />
+
+
+
+        <Button
+            android:id="@+id/btn_affirm"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/et_disease"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:paddingVertical="@dimen/dp_14"
+            android:background="@drawable/rectangle_round_corner20_theme"
+            app:layout_constraintWidth_percent="0.747"
+            android:layout_marginTop="@dimen/dp_31"
+            android:layout_marginBottom="@dimen/dp_22"
+            android:minHeight="@dimen/dp_0"
+            android:enabled="true"
+            android:text="@string/dialog_add_disease_affirm"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            android:textSize="@dimen/txt13" />
+
+        <ImageButton
+            android:id="@+id/btn_close"
+            android:layout_width="@dimen/dp_42"
+            android:layout_height="@dimen/dp_42"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:background="@color/transparent"
+            android:padding="@dimen/dp_14"
+            android:src="@drawable/ic_close" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/dialog_suspension_announcement_affirm.xml b/app/src/main/res-mine/layout/dialog_suspension_announcement_affirm.xml
new file mode 100644
index 0000000..5dd86a5
--- /dev/null
+++ b/app/src/main/res-mine/layout/dialog_suspension_announcement_affirm.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/rectangle_round_corner10_white">
+
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginHorizontal="@dimen/dp_15"
+            android:layout_marginTop="@dimen/dp_20"
+            android:textColor="@color/text_black_33"
+            android:textSize="@dimen/txt14"
+            android:text="@string/dialog_suspension_announcement_affirm_title" />
+
+        <TextView
+            android:id="@+id/tv_sub_title"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_title"
+            android:layout_marginHorizontal="@dimen/dp_15"
+            android:layout_marginTop="@dimen/dp_16"
+            android:textColor="@color/text_black_66"
+            android:textSize="@dimen/txt14"
+            android:text="@string/dialog_suspension_announcement_affirm_subtitle" />
+
+        <LinearLayout
+            android:id="@+id/ll_appointment_num"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_sub_title"
+            android:layout_marginHorizontal="@dimen/dp_15"
+            android:layout_marginTop="@dimen/dp_9"
+            android:paddingVertical="@dimen/dp_15"
+            android:background="@drawable/rectangle_round_corner10_alpha94_theme"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_audio_video"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_30"
+                android:drawableLeft="@drawable/ic_consult_num_tag"
+                android:drawablePadding="@dimen/dp_4"
+                android:gravity="center_vertical"
+                android:textColor="@color/text_black_66"
+                android:textSize="@dimen/txt14"
+                android:text="@string/dialog_suspension_announcement_affirm_audio_video" />
+
+            <TextView
+                android:id="@+id/tv_image_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_30"
+                android:layout_marginTop="@dimen/dp_10"
+                android:drawableLeft="@drawable/ic_consult_num_tag"
+                android:drawablePadding="@dimen/dp_4"
+                android:gravity="center_vertical"
+                android:textColor="@color/text_black_66"
+                android:textSize="@dimen/txt14"
+                android:text="@string/dialog_suspension_announcement_affirm_audio_video"
+                android:visibility="gone"/>
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tv_tips"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/ll_appointment_num"
+            android:layout_marginHorizontal="@dimen/dp_15"
+            android:layout_marginTop="@dimen/dp_12"
+            android:textColor="@color/text_black_33"
+            android:textSize="@dimen/txt14"
+            android:text="@string/dialog_suspension_announcement_affirm_tips" />
+
+        <View
+            android:id="@+id/line1"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="@dimen/dp_1"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_tips"
+            android:layout_marginTop="@dimen/dp_27"
+            android:background="@color/line_grey_color" />
+
+        <Button
+            android:id="@+id/btn_cancel"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toLeftOf="@+id/line2"
+            app:layout_constraintTop_toBottomOf="@+id/line1"
+            android:paddingVertical="@dimen/dp_18"
+            android:background="@color/transparent"
+            android:enabled="true"
+            android:text="@string/dialog_suspension_announcement_affirm_cancel"
+            android:textAllCaps="false"
+            android:textColor="@color/text_black_66"
+            android:textSize="@dimen/txt13"
+            android:visibility="visible" />
+
+        <View
+            android:id="@+id/line2"
+            android:layout_width="@dimen/dp_1"
+            android:layout_height="@dimen/dp_0"
+            app:layout_constraintLeft_toRightOf="@+id/btn_cancel"
+            app:layout_constraintRight_toLeftOf="@+id/btn_affirm"
+            app:layout_constraintTop_toTopOf="@+id/btn_cancel"
+            app:layout_constraintBottom_toBottomOf="@+id/btn_cancel"
+            android:layout_marginVertical="@dimen/dp_8"
+            android:background="@color/line_grey_color"
+            android:visibility="visible" />
+
+        <Button
+            android:id="@+id/btn_affirm"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toRightOf="@+id/line2"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/line1"
+            android:paddingVertical="@dimen/dp_18"
+            android:background="@color/transparent"
+            android:enabled="true"
+            android:text="@string/dialog_suspension_announcement_affirm_submit"
+            android:textAllCaps="false"
+            android:textColor="@color/theme_color"
+            android:textSize="@dimen/txt13" />
+
+        <ImageButton
+            android:id="@+id/btn_close"
+            android:layout_width="@dimen/dp_42"
+            android:layout_height="@dimen/dp_42"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:background="@color/transparent"
+            android:padding="@dimen/dp_14"
+            android:src="@drawable/ic_close" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/fragment_bill_list.xml b/app/src/main/res-mine/layout/fragment_bill_list.xml
new file mode 100644
index 0000000..d863293
--- /dev/null
+++ b/app/src/main/res-mine/layout/fragment_bill_list.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+    </data>
+
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/swipe_refresh"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingVertical="@dimen/dp_5"
+                android:clipToPadding="false"/>
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/fragment_mine.xml b/app/src/main/res-mine/layout/fragment_mine.xml
new file mode 100644
index 0000000..5e9c906
--- /dev/null
+++ b/app/src/main/res-mine/layout/fragment_mine.xml
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/theme_bg">
+
+        <include
+            android:id="@+id/toolbar_lay"
+            layout="@layout/view_toolbar_lay"
+            app:title="@{@string/title_mine}" />
+
+        <ScrollView
+            android:id="@+id/scroll_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:scrollbars="none"
+            app:layout_constraintBottom_toTopOf="@+id/btn_logout"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/toolbar_lay"
+            app:layout_constraintVertical_bias="0.0">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingVertical="@dimen/dp_15"
+                android:paddingHorizontal="@dimen/dp_10">
+
+                <ImageView
+                    android:id="@+id/iv_doctor_head"
+                    android:layout_width="@dimen/dp_0"
+                    android:layout_height="@dimen/dp_0"
+                    app:layout_constraintDimensionRatio="1:1"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintWidth_percent="0.16"
+                    android:layout_marginRight="@dimen/dp_5"
+                    tools:src='@mipmap/ic_launcher' />
+
+                <TextView
+                    android:id="@+id/tv_doctor_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/text_black_33"
+                    android:textSize="@dimen/txt21"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toLeftOf="@+id/tv_professional_title"
+                    app:layout_constraintTop_toTopOf="parent"
+                    android:layout_marginLeft="@dimen/dp_5"
+                    tools:text="@string/app_name" />
+
+                <TextView
+                    android:id="@+id/tv_professional_title"
+                    android:layout_width="@dimen/dp_0"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/dp_12"
+                    android:layout_marginEnd="@dimen/dp_12"
+                    android:gravity="left"
+                    android:textColor="@color/text_black_33"
+                    android:textSize="@dimen/txt13"
+                    app:layout_constraintBaseline_toBaselineOf="@+id/tv_doctor_name"
+                    app:layout_constraintBottom_toBottomOf="@+id/tv_doctor_name"
+                    app:layout_constraintLeft_toRightOf="@+id/tv_doctor_name"
+                    app:layout_constraintRight_toLeftOf="@+id/iv_doctor_head"
+                    tools:text="@string/app_name" />
+
+                <TextView
+                    android:id="@+id/tv_hospital"
+                    android:layout_width="@dimen/dp_0"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/dp_16"
+                    android:layout_marginEnd="@dimen/dp_12"
+                    android:includeFontPadding="false"
+                    android:textColor="@color/text_black_33"
+                    android:textSize="@dimen/txt13"
+                    app:layout_constraintLeft_toLeftOf="@+id/tv_doctor_name"
+                    app:layout_constraintRight_toLeftOf="@+id/iv_doctor_head"
+                    app:layout_constraintTop_toBottomOf="@+id/tv_doctor_name"
+                    tools:text="@string/app_name" />
+
+                <LinearLayout
+                    android:id="@+id/ll_function_lay"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/dp_21"
+                    android:background="@drawable/bg_card"
+                    android:orientation="horizontal"
+                    android:paddingVertical="@dimen/dp_17"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/iv_doctor_head">
+
+                    <TextView
+                        android:id="@+id/tv_assistant"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:drawableTop="@drawable/icon_mine_assistant"
+                        android:drawablePadding="@dimen/dp_4"
+                        android:gravity="center"
+                        android:text="@string/mine_assistant"
+                        android:textColor="@color/text_black_33"
+                        android:textSize="@dimen/txt13" />
+
+                    <TextView
+                        android:id="@+id/tv_statistics"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:drawableTop="@drawable/icon_mine_statistics"
+                        android:drawablePadding="@dimen/dp_4"
+                        android:gravity="center"
+                        android:text="@string/mine_statistics"
+                        android:textColor="@color/text_black_33"
+                        android:textSize="@dimen/txt13" />
+
+                    <TextView
+                        android:id="@+id/tv_scheduling"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:drawableTop="@drawable/icon_mine_scheduling"
+                        android:drawablePadding="@dimen/dp_4"
+                        android:gravity="center"
+                        android:text="@string/mine_scheduling"
+                        android:textColor="@color/text_black_33"
+                        android:textSize="@dimen/txt13" />
+
+                    <TextView
+                        android:id="@+id/tv_suspension_service"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:drawableTop="@drawable/icon_mine_suspension_service"
+                        android:drawablePadding="@dimen/dp_4"
+                        android:gravity="center"
+                        android:text="@string/mine_suspension_service"
+                        android:textColor="@color/text_black_33"
+                        android:textSize="@dimen/txt13" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/ll_setting_lay"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/dp_10"
+                    android:background="@drawable/bg_card"
+                    android:orientation="vertical"
+                    android:paddingHorizontal="@dimen/dp_19"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/ll_function_lay">
+
+                    <TextView
+                        android:id="@+id/tv_personal_info"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/bg_white_bottom_gray_line"
+                        android:drawableLeft="@drawable/icon_mine_personal_info"
+                        android:drawableRight="@drawable/icon_more_small_gray"
+                        android:drawablePadding="@dimen/dp_6"
+                        android:gravity="center_vertical"
+                        android:paddingVertical="@dimen/dp_14"
+                        android:text="@string/mine_personal_info"
+                        android:textColor="@color/text_black_33"
+                        android:textSize="@dimen/txt13" />
+
+                    <TextView
+                        android:id="@+id/tv_account_security"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/bg_white_bottom_gray_line"
+                        android:drawableLeft="@drawable/icon_mine_account_security"
+                        android:drawableRight="@drawable/icon_more_small_gray"
+                        android:drawablePadding="@dimen/dp_6"
+                        android:gravity="center_vertical"
+                        android:paddingVertical="@dimen/dp_14"
+                        android:text="@string/mine_account_security"
+                        android:textColor="@color/text_black_33"
+                        android:textSize="@dimen/txt13" />
+
+                    <TextView
+                        android:id="@+id/tv_about_us"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@color/white"
+                        android:drawableLeft="@drawable/icon_mine_about_us"
+                        android:drawableRight="@drawable/icon_more_small_gray"
+                        android:drawablePadding="@dimen/dp_6"
+                        android:gravity="center_vertical"
+                        android:paddingVertical="@dimen/dp_14"
+                        android:text="@string/mine_about_us"
+                        android:textColor="@color/text_black_33"
+                        android:textSize="@dimen/txt13" />
+                </LinearLayout>
+                <TextView
+                    android:id="@+id/tv_version"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:drawablePadding="@dimen/dp_6"
+                    android:gravity="center_vertical"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/ll_setting_lay"
+                    android:paddingVertical="@dimen/dp_14"
+                    tools:text="@string/mine_about_us"
+                    android:textColor="@color/text_black_99"
+                    android:textSize="@dimen/txt13" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </ScrollView>
+
+        <Button
+            android:id="@+id/btn_logout"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:background="@drawable/rectangle_round_corner20_theme_stroke_white"
+            android:text="@string/mine_logout"
+            android:textColor="@color/theme_color"
+            android:minHeight="@dimen/dp_0"
+            android:outlineProvider="none"
+            android:textSize="@dimen/sp_14"
+            android:paddingVertical="@dimen/dp_12"
+            app:layout_constraintWidth_percent="0.35"
+            android:layout_marginBottom="@dimen/dp_10"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/item_recycle_add_disease.xml b/app/src/main/res-mine/layout/item_recycle_add_disease.xml
new file mode 100644
index 0000000..d367da1
--- /dev/null
+++ b/app/src/main/res-mine/layout/item_recycle_add_disease.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:descendantFocusability="blocksDescendants">
+
+        <TextView
+            android:id="@+id/tv_disease"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:background="@drawable/rectangle_round_corner5_grey_stroke_white"
+            android:paddingVertical="@dimen/dp_7"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:layout_marginHorizontal="@dimen/dp_5"
+            android:layout_marginTop="@dimen/dp_8"
+            android:button="@null"
+            android:gravity="center"
+            android:textSize="@dimen/txt13"
+            android:textColor="@color/color_suspension_cause_item_text"
+            tools:text="@string/app_name" />
+
+        <ImageButton
+            android:id="@+id/btn_delete"
+            android:layout_width="@dimen/dp_20"
+            android:layout_height="@dimen/dp_20"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:background="@color/transparent"
+            android:src="@drawable/ic_delete"
+            android:scaleType="centerCrop" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/item_recycle_bill_record.xml b/app/src/main/res-mine/layout/item_recycle_bill_record.xml
new file mode 100644
index 0000000..db2cb18
--- /dev/null
+++ b/app/src/main/res-mine/layout/item_recycle_bill_record.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@drawable/bg_card"
+    android:layout_marginHorizontal="@dimen/dp_10"
+    android:padding="@dimen/dp_23">
+    <TextView
+        android:id="@+id/tv_title"
+        android:layout_width="@dimen/dp_0"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/tv_change_money"
+        android:textSize="@dimen/txt14"
+        android:textColor="@color/text_black_33"
+        tools:text="@string/app_name"/>
+    <TextView
+        android:id="@+id/tv_change_money"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toRightOf="@+id/tv_title"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:textSize="@dimen/txt16"
+        android:textColor="@color/theme_color"
+        tools:text="22"/>
+    <TextView
+        android:id="@+id/tv_time"
+        android:layout_width="@dimen/dp_0"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_title"
+        app:layout_constraintRight_toLeftOf="@+id/tv_balance"
+        android:layout_marginRight="@dimen/dp_12"
+        android:layout_marginTop="@dimen/dp_16"
+        android:textSize="@dimen/txt12"
+        android:textColor="@color/text_black_99"
+        tools:text="@string/app_name"/>
+    <TextView
+        android:id="@+id/tv_balance"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_change_money"
+        android:layout_marginTop="@dimen/dp_9"
+        android:minWidth="@dimen/dp_14"
+        android:gravity="center"
+        android:textColor="@color/text_black_33"
+        android:textSize="@dimen/txt12"
+        tools:text="2"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/item_recycle_cause.xml b/app/src/main/res-mine/layout/item_recycle_cause.xml
new file mode 100644
index 0000000..8c551ae
--- /dev/null
+++ b/app/src/main/res-mine/layout/item_recycle_cause.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:descendantFocusability="blocksDescendants">
+    <CheckBox
+        android:id="@+id/cb_cause"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:background="@drawable/bg_suspension_cause_item"
+        android:paddingVertical="@dimen/dp_7"
+        android:paddingHorizontal="@dimen/dp_10"
+        android:layout_margin="@dimen/dp_5"
+        android:clickable="false"
+        android:focusable="false"
+        android:button="@null"
+        android:gravity="center"
+        android:textSize="@dimen/txt13"
+        android:textColor="@color/color_suspension_cause_item_text"
+        tools:text="@string/app_name"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/item_recycle_custom_scheduling.xml b/app/src/main/res-mine/layout/item_recycle_custom_scheduling.xml
new file mode 100644
index 0000000..b501eb9
--- /dev/null
+++ b/app/src/main/res-mine/layout/item_recycle_custom_scheduling.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:descendantFocusability="blocksDescendants">
+    <CheckBox
+        android:id="@+id/cb_week"
+        android:layout_width="@dimen/dp_0"
+        android:layout_height="@dimen/dp_0"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintDimensionRatio="1:1"
+        android:clickable="false"
+        android:focusable="false"
+        android:button="@null"
+        android:background="@drawable/bg_custom_scheduling_item"
+        android:gravity="center"
+        android:textSize="@dimen/txt13"
+        android:textColor="@color/color_custom_scheduling_item_text"
+        tools:text="@string/app_name"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/item_recycle_disease.xml b/app/src/main/res-mine/layout/item_recycle_disease.xml
new file mode 100644
index 0000000..e81e0ad
--- /dev/null
+++ b/app/src/main/res-mine/layout/item_recycle_disease.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:descendantFocusability="blocksDescendants">
+    <CheckBox
+        android:id="@+id/cb_disease"
+        android:layout_width="@dimen/dp_0"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:background="@drawable/bg_suspension_cause_item"
+        android:paddingVertical="@dimen/dp_7"
+        android:paddingHorizontal="@dimen/dp_10"
+        android:layout_margin="@dimen/dp_5"
+        android:includeFontPadding="false"
+        android:clickable="false"
+        android:focusable="false"
+        android:button="@null"
+        android:gravity="center"
+        android:textSize="@dimen/txt13"
+        android:textColor="@color/color_suspension_cause_item_text"
+        tools:text="@string/app_name"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/item_recycle_new_scheduling.xml b/app/src/main/res-mine/layout/item_recycle_new_scheduling.xml
new file mode 100644
index 0000000..807f992
--- /dev/null
+++ b/app/src/main/res-mine/layout/item_recycle_new_scheduling.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <import type="com.btpj.lib_base.utils.DateUtil"/>
+        <variable
+            name="item"
+            type="com.yxjk.healthexpertclient.bean.mine.SchedulingBean" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+
+        <LinearLayout
+            android:id="@+id/ll_time_period"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/rectangle_round_corner20_grey"
+            android:paddingHorizontal="@dimen/dp_18"
+            android:paddingVertical="@dimen/dp_5"
+            android:orientation="horizontal">
+            <TextView
+                android:id="@+id/tv_week"
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+                android:textSize="@dimen/txt13"
+                android:textColor="@color/text_black_33"
+                android:text="@{DateUtil.INSTANCE.getWeekStrChinese(item.week)}"/>
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="wrap_content"
+                android:layout_weight="2">
+                <TextView
+                    android:id="@+id/tv_morning_appointments_number_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintTop_toTopOf="@+id/et_morning_appointments_number"
+                    app:layout_constraintBottom_toBottomOf="@+id/et_morning_appointments_number"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    android:textSize="@dimen/txt13"
+                    android:textColor="@color/text_black_33"
+                    android:text="@string/scheduling_morning"/>
+
+                <EditText
+                    android:id="@+id/et_morning_appointments_number"
+                    android:longClickable="false"
+                    android:layout_width="@dimen/dp_38"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintLeft_toRightOf="@+id/tv_morning_appointments_number_title"
+                    app:layout_constraintRight_toLeftOf="@+id/tv_morning_appointments_number_unit"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    android:background="@drawable/rectangle_round_corner5_grey_stroke_white"
+                    android:layout_marginLeft="@dimen/dp_5"
+                    android:paddingVertical="@dimen/dp_8"
+                    android:gravity="center"
+                    android:inputType="number"
+                    android:textSize="@dimen/txt13"
+                    android:textColor="@color/text_black_33"
+                    android:text="@={item.amNum}"/>
+
+                <TextView
+                    android:id="@+id/tv_morning_appointments_number_unit"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintTop_toTopOf="@+id/et_morning_appointments_number"
+                    app:layout_constraintBottom_toBottomOf="@+id/et_morning_appointments_number"
+                    app:layout_constraintLeft_toRightOf="@+id/et_morning_appointments_number"
+                    android:layout_marginLeft="@dimen/dp_5"
+                    android:textSize="@dimen/txt13"
+                    android:textColor="@color/text_black_33"
+                    android:text="人"/>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="wrap_content"
+                android:layout_weight="2">
+                <TextView
+                    android:id="@+id/tv_afternoon_appointments_number_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintTop_toTopOf="@+id/et_afternoon_appointments_number"
+                    app:layout_constraintBottom_toBottomOf="@+id/et_afternoon_appointments_number"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    android:textSize="@dimen/txt13"
+                    android:textColor="@color/text_black_33"
+                    android:text="@string/scheduling_afternoon"/>
+
+                <EditText
+                    android:id="@+id/et_afternoon_appointments_number"
+                    android:longClickable="false"
+                    android:layout_width="@dimen/dp_38"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintLeft_toRightOf="@+id/tv_afternoon_appointments_number_title"
+                    android:background="@drawable/rectangle_round_corner5_grey_stroke_white"
+                    android:layout_marginLeft="@dimen/dp_5"
+                    android:paddingVertical="@dimen/dp_8"
+                    android:gravity="center"
+                    android:inputType="number"
+                    android:textSize="@dimen/txt13"
+                    android:textColor="@color/text_black_33"
+                    android:text="@={item.pmNum}"/>
+
+                <TextView
+                    android:id="@+id/tv_afternoon_appointments_number_unit"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintTop_toTopOf="@+id/et_afternoon_appointments_number"
+                    app:layout_constraintBottom_toBottomOf="@+id/et_afternoon_appointments_number"
+                    app:layout_constraintLeft_toRightOf="@+id/et_afternoon_appointments_number"
+                    android:layout_marginLeft="@dimen/dp_5"
+                    android:textSize="@dimen/txt13"
+                    android:textColor="@color/text_black_33"
+                    android:text="@string/scheduling_unit"/>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+        </LinearLayout>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/item_recycle_scheduling.xml b/app/src/main/res-mine/layout/item_recycle_scheduling.xml
new file mode 100644
index 0000000..cc55619
--- /dev/null
+++ b/app/src/main/res-mine/layout/item_recycle_scheduling.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <TextView
+            android:id="@+id/tv_week"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingVertical="@dimen/dp_10"
+            android:textSize="@dimen/txt14"
+            android:textColor="@color/text_black_33"
+            tools:text="周一"/>
+
+        <LinearLayout
+            android:id="@+id/ll_time_period"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/rectangle_round_corner20_grey"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_24"
+            android:paddingVertical="@dimen/dp_10"
+            android:orientation="horizontal">
+
+            <CheckBox
+                android:id="@+id/cb_all"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:button="@drawable/check_theme_style"
+                android:paddingLeft="@dimen/dp_6"
+                android:gravity="center_vertical"
+                android:text="@string/scheduling_all_day" />
+
+            <CheckBox
+                android:id="@+id/cb_morning"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:button="@drawable/check_theme_style"
+                android:paddingLeft="@dimen/dp_6"
+                android:gravity="center_vertical"
+                android:text="@string/scheduling_morning"
+                android:checked="false" />
+
+            <CheckBox
+                android:id="@+id/cb_afternoon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:button="@drawable/check_theme_style"
+                android:paddingLeft="@dimen/dp_6"
+                android:gravity="center_vertical"
+                android:text="@string/scheduling_afternoon"
+                android:checked="false" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/item_recycle_suspension_service.xml b/app/src/main/res-mine/layout/item_recycle_suspension_service.xml
new file mode 100644
index 0000000..7996592
--- /dev/null
+++ b/app/src/main/res-mine/layout/item_recycle_suspension_service.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:paddingHorizontal="@dimen/dp_10"
+    android:id="@+id/ll_header">
+    <com.fang.dashview.DashView
+        android:id="@+id/line"
+        android:layout_width="@dimen/dp_1"
+        android:layout_height="@dimen/dp_0"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/cl_suspension_info"
+        app:layout_constraintBottom_toBottomOf="@+id/cl_suspension_info"
+        android:layout_marginLeft="@dimen/dp_17"
+        app:dashWidth="2dp"
+        app:lineWidth="4dp"
+        app:lineColor="#FFBFBFBF"
+        app:dashOrientation="1"
+        app:lineHeight="1dp"
+        android:layerType="software"/>
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_suspension_info"
+        android:layout_width="@dimen/dp_0"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toRightOf="@+id/line"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginLeft="@dimen/dp_6"
+        android:background="@drawable/bg_card"
+        android:visibility="visible">
+        <Button
+            android:id="@+id/btn_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_suspension_announcement"
+            android:background="@drawable/rectangle_round_corner5_theme"
+            android:minHeight="@dimen/dp_0"
+            android:minWidth="@dimen/dp_0"
+            android:paddingVertical="@dimen/dp_6"
+            android:paddingHorizontal="@dimen/dp_10"
+            android:layout_marginTop="@dimen/dp_8"
+            android:layout_marginRight="@dimen/dp_12"
+            android:includeFontPadding="false"
+            android:textColor="@color/white"
+            android:textSize="@dimen/txt13"
+            tools:text="@string/app_name"/>
+        <TextView
+            android:id="@+id/tv_suspension_time"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginTop="@dimen/dp_16"
+            android:layout_marginLeft="@dimen/dp_13"
+            android:textColor="@color/text_black_66"
+            android:textSize="@dimen/txt13"
+            android:text="@string/suspension_service_time" />
+        <TextView
+            android:id="@+id/tv_suspension_cause_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toLeftOf="@+id/tv_suspension_cause"
+            app:layout_constraintTop_toTopOf="@+id/tv_suspension_cause"
+            app:layout_constraintBottom_toBottomOf="@+id/tv_suspension_cause"
+            android:layout_marginLeft="@dimen/dp_13"
+            android:textColor="@color/text_black_66"
+            android:textSize="@dimen/txt13"
+            android:text="@string/suspension_service_cause"/>
+        <TextView
+            android:id="@+id/tv_suspension_cause"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toRightOf="@+id/tv_suspension_cause_title"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_suspension_time"
+            android:layout_marginTop="@dimen/dp_12"
+            android:textColor="@color/text_black_66"
+            android:textSize="@dimen/txt13"
+            tools:text="@string/app_name"/>
+        <TextView
+            android:id="@+id/tv_suspension_announcement"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_suspension_cause"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginLeft="@dimen/dp_13"
+            android:layout_marginBottom="@dimen/dp_16"
+            android:textColor="@color/text_black_66"
+            android:textSize="@dimen/txt13"
+            android:text="@string/suspension_service_announcement"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/item_recycle_suspension_service_header.xml b/app/src/main/res-mine/layout/item_recycle_suspension_service_header.xml
new file mode 100644
index 0000000..f15e326
--- /dev/null
+++ b/app/src/main/res-mine/layout/item_recycle_suspension_service_header.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:paddingHorizontal="@dimen/dp_15"
+    android:paddingVertical="@dimen/dp_6"
+    android:background="@color/theme_bg"
+    android:id="@+id/ll_header">
+    <TextView
+        android:id="@+id/tv_header_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:textSize="@dimen/txt15"
+        android:textColor="@color/text_black_33"
+        tools:text="@string/app_name"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/lay_audio_video_consult_setting.xml b/app/src/main/res-mine/layout/lay_audio_video_consult_setting.xml
new file mode 100644
index 0000000..0ebfeb4
--- /dev/null
+++ b/app/src/main/res-mine/layout/lay_audio_video_consult_setting.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <import type="android.view.View"/>
+        <variable
+            name="showAudioVideoConsult"
+            type="java.lang.Boolean" />
+        <variable
+            name="amMaxNum"
+            type="java.lang.String" />
+        <variable
+            name="pmMaxNum"
+            type="java.lang.String" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_card"
+        android:paddingHorizontal="@dimen/dp_15"
+        android:paddingVertical="@dimen/dp_18">
+
+        <Switch
+            android:id="@+id/switch_audio_video"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:text="@string/scheduling_audio_video_consult"
+            android:textColor="@color/text_black_33"
+            android:textSize="@dimen/txt15"
+            android:checked="@={showAudioVideoConsult}"/>
+
+        <TextView
+            android:id="@+id/tv_morning_appointments_number_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="@+id/et_morning_appointments_number"
+            app:layout_constraintBottom_toBottomOf="@+id/et_morning_appointments_number"
+            app:layout_constraintLeft_toLeftOf="parent"
+            android:textSize="@dimen/txt14"
+            android:textColor="@color/text_black_33"
+            android:text="@string/scheduling_morning_max_appointment"
+            android:visibility="@{showAudioVideoConsult?View.VISIBLE:View.GONE}"/>
+
+        <EditText
+            android:id="@+id/et_morning_appointments_number"
+            android:longClickable="false"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@+id/switch_audio_video"
+            app:layout_constraintLeft_toRightOf="@+id/tv_morning_appointments_number_title"
+            android:background="@drawable/rectangle_round_corner5_grey_stroke_white"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:paddingVertical="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_15"
+            android:minWidth="@dimen/dp_58"
+            android:inputType="number"
+            android:textSize="@dimen/txt14"
+            android:textColor="@color/text_black_33"
+            android:text="@={amMaxNum}"
+            android:visibility="@{showAudioVideoConsult?View.VISIBLE:View.GONE}"/>
+
+        <TextView
+            android:id="@+id/tv_morning_appointments_number_unit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="@+id/et_morning_appointments_number"
+            app:layout_constraintBottom_toBottomOf="@+id/et_morning_appointments_number"
+            app:layout_constraintLeft_toRightOf="@+id/et_morning_appointments_number"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:textSize="@dimen/txt14"
+            android:textColor="@color/text_black_33"
+            android:text="人"
+            android:visibility="@{showAudioVideoConsult?View.VISIBLE:View.GONE}"/>
+
+        <TextView
+            android:id="@+id/tv_afternoon_appointments_number_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="@+id/et_afternoon_appointments_number"
+            app:layout_constraintBottom_toBottomOf="@+id/et_afternoon_appointments_number"
+            app:layout_constraintLeft_toLeftOf="parent"
+            android:textSize="@dimen/txt14"
+            android:textColor="@color/text_black_33"
+            android:text="@string/scheduling_afternoon_max_appointment"
+            android:visibility="@{showAudioVideoConsult?View.VISIBLE:View.GONE}"/>
+
+        <EditText
+            android:id="@+id/et_afternoon_appointments_number"
+            android:longClickable="false"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@+id/et_morning_appointments_number"
+            app:layout_constraintLeft_toRightOf="@+id/tv_afternoon_appointments_number_title"
+            android:background="@drawable/rectangle_round_corner5_grey_stroke_white"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginTop="@dimen/dp_10"
+            android:paddingVertical="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_15"
+            android:minWidth="@dimen/dp_58"
+            android:inputType="number"
+            android:textSize="@dimen/txt14"
+            android:textColor="@color/text_black_33"
+            android:text="@={pmMaxNum}"
+            android:visibility="@{showAudioVideoConsult?View.VISIBLE:View.GONE}"/>
+
+        <TextView
+            android:id="@+id/tv_afternoon_appointments_number_unit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="@+id/et_afternoon_appointments_number"
+            app:layout_constraintBottom_toBottomOf="@+id/et_afternoon_appointments_number"
+            app:layout_constraintLeft_toRightOf="@+id/et_afternoon_appointments_number"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:textSize="@dimen/txt14"
+            android:textColor="@color/text_black_33"
+            android:text="@string/scheduling_unit"
+            android:visibility="@{showAudioVideoConsult?View.VISIBLE:View.GONE}"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/view_footer_suspension_service.xml b/app/src/main/res-mine/layout/view_footer_suspension_service.xml
new file mode 100644
index 0000000..f493443
--- /dev/null
+++ b/app/src/main/res-mine/layout/view_footer_suspension_service.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <Button
+            android:id="@+id/btn_add"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="wrap_content"
+            android:background="@drawable/rectangle_round_corner20_theme_stroke_white"
+            android:minHeight="@dimen/dp_0"
+            android:paddingVertical="@dimen/dp_10"
+            android:text="@string/suspension_service_add"
+            android:textColor="@color/theme_color"
+            android:textSize="@dimen/sp_14"
+            android:outlineProvider="none"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintWidth_percent="0.4"
+            android:layout_marginVertical="@dimen/dp_21"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/view_input_password.xml b/app/src/main/res-mine/layout/view_input_password.xml
new file mode 100644
index 0000000..d1c85ce
--- /dev/null
+++ b/app/src/main/res-mine/layout/view_input_password.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <import type="android.view.View"/>
+        <variable
+            name="title"
+            type="java.lang.String" />
+        <variable
+            name="hint"
+            type="java.lang.String" />
+        <variable
+            name="text"
+            type="java.lang.String" />
+        <variable
+            name="hideLine"
+            type="java.lang.Boolean" />
+    </data>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingHorizontal="@dimen/dp_16"
+        android:background="@color/white">
+        <TextView
+            android:id="@+id/tv_password_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:minEms="6"
+            android:textColor="@color/text_black_66"
+            android:textSize="@dimen/txt14"
+            android:text="@{title}"/>
+        <EditText
+            android:id="@+id/ev_password_content"
+            android:longClickable="false"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@+id/tv_password_title"
+            android:layout_marginLeft="@dimen/dp_8"
+            android:background="@color/transparent"
+            android:paddingVertical="@dimen/dp_16"
+            android:gravity="left"
+            android:inputType="textPassword"
+            android:textColor="@color/text_black_33"
+            android:textSize="@dimen/txt14"
+            android:hint="@{hint}"
+            android:text="@={text}"/>
+        <ImageView
+            android:id="@+id/login_iv_eye"
+            android:layout_width="@dimen/dp_35"
+            android:layout_height="@dimen/dp_35"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="@dimen/dp_8"
+            android:src="@mipmap/ic_password_hind"
+            android:padding="10dp"
+            android:layout_centerVertical="true"/>
+        <include layout="@layout/lay_cut_off_rule"
+            android:visibility="@{hideLine?View.GONE:View.VISIBLE}"/>
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/view_person_info_item.xml b/app/src/main/res-mine/layout/view_person_info_item.xml
new file mode 100644
index 0000000..10631d5
--- /dev/null
+++ b/app/src/main/res-mine/layout/view_person_info_item.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <import type="android.view.View"/>
+        <variable
+            name="title"
+            type="java.lang.String" />
+        <variable
+            name="content"
+            type="java.lang.String" />
+        <variable
+            name="hideLine"
+            type="java.lang.Boolean" />
+    </data>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:paddingHorizontal="@dimen/dp_16">
+        <TextView
+            android:id="@+id/tv_item_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:textColor="@color/text_black_66"
+            android:textSize="@dimen/txt14"
+            android:text="@{title}"/>
+        <TextView
+            android:id="@+id/tv_item_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@+id/tv_item_title"
+            android:layout_marginLeft="@dimen/dp_8"
+            android:paddingVertical="@dimen/dp_15"
+            android:gravity="right"
+            android:textColor="@color/text_black_33"
+            android:textSize="@dimen/txt14"
+            android:text="@{content}"/>
+        <include layout="@layout/lay_cut_off_rule"
+            android:visibility="@{hideLine?View.GONE:View.VISIBLE}"/>
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/layout/view_with_draw_detail_item.xml b/app/src/main/res-mine/layout/view_with_draw_detail_item.xml
new file mode 100644
index 0000000..e08eab6
--- /dev/null
+++ b/app/src/main/res-mine/layout/view_with_draw_detail_item.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <variable
+            name="title"
+            type="java.lang.String" />
+        <variable
+            name="content"
+            type="java.lang.String" />
+    </data>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingVertical="@dimen/dp_13">
+        <TextView
+            android:id="@+id/tv_item_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/text_black_66"
+            android:textSize="@dimen/txt14"
+            android:text="@{title}"/>
+        <TextView
+            android:id="@+id/tv_item_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@+id/tv_item_title"
+            android:layout_marginLeft="@dimen/dp_8"
+            android:gravity="right"
+            android:textColor="@color/text_black_33"
+            android:textSize="@dimen/txt14"
+            android:text="@{content}"/>
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-mine/menu/menu_bill_record.xml b/app/src/main/res-mine/menu/menu_bill_record.xml
new file mode 100644
index 0000000..961e76c
--- /dev/null
+++ b/app/src/main/res-mine/menu/menu_bill_record.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="MissingDefaultResource">
+    <!--因没有设计规范，不同页面可能会有不同主题Toolbar，故未使用-->
+    <item
+        android:id="@+id/right_text"
+        android:title="按钮"
+        app:showAsAction="always" />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res-mine/values/strings.xml b/app/src/main/res-mine/values/strings.xml
new file mode 100644
index 0000000..4a7cb2f
--- /dev/null
+++ b/app/src/main/res-mine/values/strings.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="MissingTranslation">
+    <!--专家主页-->
+    <string name="mine_assistant" >小助手</string>
+    <string name="mine_statistics">咨询统计</string>
+    <string name="mine_scheduling">排班设置</string>
+    <string name="mine_suspension_service">暂停服务</string>
+    <string name="mine_personal_info">个人信息设置</string>
+    <string name="mine_account_security">账号安全设置（修改密码）</string>
+    <string name="mine_about_us">关于我们</string>
+    <string name="mine_logout">退出登录</string>
+    <!--排班设置-->
+    <string name="scheduling_sub_title">日期</string>
+    <string name="scheduling_morning_max_appointment">上午&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;最大可预约</string>
+    <string name="scheduling_afternoon_max_appointment">下午&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;最大可预约</string>
+    <string name="scheduling_morning">上午</string>
+    <string name="scheduling_afternoon">下午</string>
+    <string name="scheduling_all_day">全天</string>
+    <string name="scheduling_audio_video_consult">视频咨询</string>
+    <string name="scheduling_unit">人</string>
+    <string name="scheduling_skip_holiday">自动跳过法定节假日？</string>
+    <string name="scheduling_submit">生成排班</string>
+    <string name="scheduling_custom_scheduling">自定义排班</string>
+    <string name="scheduling_unify_scheduling">统一排班</string>
+    <!--自定义排班设置-->
+    <string name="custom_scheduling_sub_title">选择时间</string>
+    <string name="custom_scheduling_skip_holiday">自动跳过法定节假日？</string>
+    <string name="custom_scheduling_submit">生成排班</string>
+    <!--暂停服务-->
+    <string name="suspension_service_start_consult">恢复服务</string>
+    <string name="suspension_service_finish">已结束</string>
+    <string name="suspension_service_time" formatted="false">暂停时间：%s~%s</string>
+    <string name="suspension_service_cause">暂停原因：</string>
+    <string name="suspension_service_announcement">暂停公告：%s</string>
+    <string name="suspension_service_add">发布暂停公告</string>
+    <!--暂停服务公告-->
+    <string name="add_suspension_announcement_cause">暂停原因</string>
+    <string name="add_suspension_announcement_cause_tips">请选择暂停原因</string>
+    <string name="add_suspension_announcement_time">暂停时间</string>
+    <string name="add_suspension_announcement_time_tips">请选择暂停时间</string>
+    <string name="add_suspension_announcement_time_range_tips">暂停开始时间需要在结束时间之前</string>
+    <string name="add_suspension_announcement_start_time">开始时间</string>
+    <string name="add_suspension_announcement_end_time">结束时间</string>
+    <string name="add_suspension_announcement_explain">暂停公告</string>
+    <string name="add_suspension_announcement_explain_tips">请输入暂停公告</string>
+    <string name="add_suspension_announcement_explain_hint">多行输入...</string>
+    <string name="add_suspension_announcement_submit">发布</string>
+    <string name="add_suspension_announcement_cut">至</string>
+    <string name="add_suspension_announcement_birthday_format" formatted="false">%d-%d-%d</string>
+    <!--发布暂停公告确认弹窗-->
+    <string name="dialog_suspension_announcement_affirm_title">系统提示</string>
+    <string name="dialog_suspension_announcement_affirm_subtitle">您当前设置的暂停时间段有正在进行中的咨询：</string>
+    <string name="dialog_suspension_announcement_affirm_audio_video" formatted="false">视频咨询：%s</string>
+    <string name="dialog_suspension_announcement_affirm_image_text" formatted="false">图文咨询：%s</string>
+    <string name="dialog_suspension_announcement_affirm_tips" formatted="false">发布后，这%s个咨询将被系统自动取消，确认是否发布？</string>
+    <string name="dialog_suspension_announcement_affirm_cancel">取消</string>
+    <string name="dialog_suspension_announcement_affirm_submit">发布</string>
+    <!--咨询统计-->
+    <string name="consult_statistics_unsettled_income">未结算收益</string>
+    <string name="consult_statistics_total_income">累计总收益(税前)</string>
+    <string name="consult_statistics_settled_income">已结算(税前)</string>
+    <string name="consult_statistics_month_title">月度统计</string>
+    <string name="consult_statistics_classify_title">分类统计</string>
+    <string name="consult_statistics_classify_no_data">暂无数据</string>
+    <string name="consult_statistics_classify_detail">查看明细></string>
+    <string name="consult_statistics_type">类别</string>
+    <string name="consult_statistics_under_way">进行中</string>
+    <string name="consult_statistics_finish">已完成</string>
+    <string name="consult_statistics_total">合计</string>
+    <string name="consult_statistics_default_value">--</string>
+    <string name="consult_statistics_type_image_text">图文咨询</string>
+    <string name="consult_statistics_type_audio_video">视频咨询</string>
+    <!--账单明细-->
+    <string name="bill_record_balance" formatted="false">余额：%s</string>
+    <string name="bill_record_date_select">选择日期</string>
+    <!--提现详情-->
+    <string name="with_draw_account_money" formatted="false">到账：%s</string>
+    <string name="with_draw_tips">您的提现金额将会在3-5个工作日到账，请耐心等待</string>
+    <string name="with_draw_serial_number">流水号：</string>
+    <string name="with_draw_with_draw_organization">提现方：</string>
+    <string name="with_draw_with_draw_type">提现方式：</string>
+    <string name="with_draw_shroff_account_number">收款账号：</string>
+    <string name="with_draw_with_draw_money">提现金额：</string>
+    <string name="with_draw_actual_money">实际到账金额：</string>
+    <string name="with_draw_explain">提现说明：</string>
+    <string name="with_draw_account_balance">账户金额：</string>
+    <string name="with_draw_with_draw_time">提现时间：</string>
+    <!--修改密码-->
+    <string name="edit_password_old_password_title">原密码</string>
+    <string name="edit_password_old_password_title_hint">请输入原密码</string>
+    <string name="edit_password_new_password_title">新密码</string>
+    <string name="edit_password_new_password_title_hint">请输入新密码</string>
+    <string name="edit_password_affirm_password_title">确认密码</string>
+    <string name="edit_password_affirm_password_title_hint">再次输入新密码</string>
+    <string name="edit_password_affirm_password_diff_hint">两次密码不一致</string>
+    <string name="edit_password_tips">温馨提示：12-32位（包含数字、大写、小写字母、特殊字符）</string>
+    <string name="edit_password_matches_hint">密码需要为12-32位（包含数字、大写、小写字母、特殊字符）</string>
+    <string name="edit_password_submit">提交</string>
+    <!--个人信息-->
+    <string name="person_info_head_img">头像</string>
+    <string name="person_info_name">姓名</string>
+    <string name="person_info_hospital">医院</string>
+    <string name="person_info_departments">科室</string>
+    <string name="person_info_job_title">职称</string>
+    <string name="person_info_specialized_disease">擅长病种</string>
+    <string name="person_info_personally_good">个人擅长</string>
+    <string name="person_info_personally_good_hint">请输入个人擅长方向</string>
+    <string name="person_info_personal_profile">个人简介</string>
+    <string name="person_info_personal_profile_hint">请输入个人简介</string>
+    <string name="person_info_add">添加</string>
+    <string name="person_info_save">保存</string>
+    <!--添加擅长病种Dialog-->
+    <string name="dialog_add_disease_title">擅长病种</string>
+    <string name="dialog_add_disease_hint">请输入您擅长的病种</string>
+    <string name="dialog_add_disease_affirm">确定</string>
+    <!--设置-->
+    <string name="setting_user_protocol">用户协议</string>
+    <string name="setting_privacy_policy">隐私政策</string>
+    <string name="setting_about" formatted="false">关于%s</string>
+    <string name="setting_exit">退出</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res-other/layout/activity_sumilate.xml b/app/src/main/res-other/layout/activity_sumilate.xml
new file mode 100644
index 0000000..3ca5658
--- /dev/null
+++ b/app/src/main/res-other/layout/activity_sumilate.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+
+    <RelativeLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/theme_bg">
+        <include layout="@layout/view_toolbar_lay"
+            app:title="@{@string/title_message_list}"/>
+        <LinearLayout
+            android:id="@+id/ll_user"
+            android:orientation="vertical"
+            android:layout_below="@+id/toolbar_lay"
+            android:layout_margin="@dimen/dp_15"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <TextView
+                android:id="@+id/tv_user_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="当前模拟的用户:"
+                />
+            <Button
+                android:id="@+id/btn_reset"
+                android:layout_marginTop="@dimen/dp_20"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_40"
+                android:text="取消模拟"
+                />
+        </LinearLayout>
+
+        <com.yxjk.healthexpertclient.view.CustomSearchView
+            android:id="@+id/csv_search"
+            android:layout_below="@+id/ll_user"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+            <androidx.recyclerview.widget.RecyclerView
+                android:layout_below="@+id/csv_search"
+                android:id="@+id/rv_list"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_5" />
+
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-other/layout/item_user_list.xml b/app/src/main/res-other/layout/item_user_list.xml
new file mode 100644
index 0000000..d12fa59
--- /dev/null
+++ b/app/src/main/res-other/layout/item_user_list.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <LinearLayout
+        android:layout_marginLeft="@dimen/dp_15"
+        android:layout_marginRight="@dimen/dp_15"
+        android:layout_marginTop="@dimen/dp_5"
+        android:layout_marginBottom="@dimen/dp_5"
+        android:paddingTop="@dimen/dp_10"
+        android:paddingBottom="@dimen/dp_10"
+        android:background="@drawable/bg_white_background_shap"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <LinearLayout
+            android:gravity="center"
+            android:layout_width="@dimen/dp_80"
+            android:layout_height="match_parent">
+            <ImageView
+                android:id="@+id/iv_head"
+                android:layout_gravity="center"
+                android:layout_width="@dimen/dp_30"
+                android:layout_height="@dimen/dp_30"/>
+        </LinearLayout>
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <LinearLayout
+                android:orientation="horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:layout_height="wrap_content"
+                    android:text="用户账号"
+                    />
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:layout_height="wrap_content"
+                    android:text="用户名称"
+                    />
+                <TextView
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:layout_height="wrap_content"
+                    android:text="性别"
+                    />
+            </LinearLayout>
+            <LinearLayout
+                android:orientation="horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:elevation="@dimen/dp_3">
+                <TextView
+                    android:id="@+id/tv_account"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:layout_height="wrap_content"
+                    android:text="用户账号"
+                    />
+                <TextView
+                    android:id="@+id/tv_name"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:layout_height="wrap_content"
+                    android:text="用户名称"
+                    />
+                <TextView
+                    android:id="@+id/tv_class"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:layout_height="wrap_content"
+                    android:text="部门名称"
+                    />
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/drawable-xxhdpi/bg_operate_time.9.png b/app/src/main/res-workbench/drawable-xxhdpi/bg_operate_time.9.png
new file mode 100644
index 0000000..50e9dab
Binary files /dev/null and b/app/src/main/res-workbench/drawable-xxhdpi/bg_operate_time.9.png differ
diff --git a/app/src/main/res-workbench/drawable-xxhdpi/ic_rich_down.png b/app/src/main/res-workbench/drawable-xxhdpi/ic_rich_down.png
new file mode 100644
index 0000000..b3f08e3
Binary files /dev/null and b/app/src/main/res-workbench/drawable-xxhdpi/ic_rich_down.png differ
diff --git a/app/src/main/res-workbench/drawable-xxhdpi/ic_rich_up.png b/app/src/main/res-workbench/drawable-xxhdpi/ic_rich_up.png
new file mode 100644
index 0000000..3f781e7
Binary files /dev/null and b/app/src/main/res-workbench/drawable-xxhdpi/ic_rich_up.png differ
diff --git a/app/src/main/res-workbench/drawable-xxhdpi/icon_close.webp b/app/src/main/res-workbench/drawable-xxhdpi/icon_close.webp
new file mode 100644
index 0000000..cc07a06
Binary files /dev/null and b/app/src/main/res-workbench/drawable-xxhdpi/icon_close.webp differ
diff --git a/app/src/main/res-workbench/drawable-xxhdpi/icon_consult_assistant.webp b/app/src/main/res-workbench/drawable-xxhdpi/icon_consult_assistant.webp
new file mode 100644
index 0000000..90355fd
Binary files /dev/null and b/app/src/main/res-workbench/drawable-xxhdpi/icon_consult_assistant.webp differ
diff --git a/app/src/main/res-workbench/drawable-xxhdpi/icon_consult_image.png b/app/src/main/res-workbench/drawable-xxhdpi/icon_consult_image.png
new file mode 100644
index 0000000..4fc856c
Binary files /dev/null and b/app/src/main/res-workbench/drawable-xxhdpi/icon_consult_image.png differ
diff --git a/app/src/main/res-workbench/drawable-xxhdpi/icon_consult_info.webp b/app/src/main/res-workbench/drawable-xxhdpi/icon_consult_info.webp
new file mode 100644
index 0000000..d7d74ac
Binary files /dev/null and b/app/src/main/res-workbench/drawable-xxhdpi/icon_consult_info.webp differ
diff --git a/app/src/main/res-workbench/drawable-xxhdpi/icon_consult_video.png b/app/src/main/res-workbench/drawable-xxhdpi/icon_consult_video.png
new file mode 100644
index 0000000..278f9f8
Binary files /dev/null and b/app/src/main/res-workbench/drawable-xxhdpi/icon_consult_video.png differ
diff --git a/app/src/main/res-workbench/drawable-xxhdpi/icon_expansion.webp b/app/src/main/res-workbench/drawable-xxhdpi/icon_expansion.webp
new file mode 100644
index 0000000..87bde40
Binary files /dev/null and b/app/src/main/res-workbench/drawable-xxhdpi/icon_expansion.webp differ
diff --git a/app/src/main/res-workbench/drawable-xxhdpi/icon_time.webp b/app/src/main/res-workbench/drawable-xxhdpi/icon_time.webp
new file mode 100644
index 0000000..9c6208e
Binary files /dev/null and b/app/src/main/res-workbench/drawable-xxhdpi/icon_time.webp differ
diff --git a/app/src/main/res-workbench/drawable/bg_blue_background_shap_radius20.xml b/app/src/main/res-workbench/drawable/bg_blue_background_shap_radius20.xml
new file mode 100644
index 0000000..ba96e30
--- /dev/null
+++ b/app/src/main/res-workbench/drawable/bg_blue_background_shap_radius20.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+    <solid android:color="#21BEBD" />
+    <corners android:radius="@dimen/dp_12" />
+    <!--<padding android:left="15dp"-->
+        <!--android:top="8dp"-->
+        <!--android:right="15dp"-->
+        <!--android:bottom="8dp"/>-->
+<!--    <size-->
+<!--        android:width="437dp"-->
+<!--        android:height="79dp" />-->
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/drawable/bg_form_line.xml b/app/src/main/res-workbench/drawable/bg_form_line.xml
new file mode 100644
index 0000000..94ce073
--- /dev/null
+++ b/app/src/main/res-workbench/drawable/bg_form_line.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <item>
+        <shape>
+            <stroke
+                android:width="1dp"
+                android:color="#E0E0E0"/>
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <stroke
+                android:width="1dp"
+                android:color="#E0E0E0"/>
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <stroke
+                android:width="1dp"
+                android:color="#E0E0E0"/>
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <stroke
+                android:width="1dp"
+                android:color="#E0E0E0"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/activity_archives_detail.xml b/app/src/main/res-workbench/layout/activity_archives_detail.xml
new file mode 100644
index 0000000..4c577cd
--- /dev/null
+++ b/app/src/main/res-workbench/layout/activity_archives_detail.xml
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+        <import type="android.text.Html" />
+
+        <import type="android.view.View" />
+
+        <variable
+            name="viewModel"
+            type="com.yxjk.healthexpertclient.ui.workbench.viewmodel.ArchivesDetailViewModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/theme_bg"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="@dimen/dp_198"
+            android:adjustViewBounds="true"
+            android:scaleType="fitXY"
+            android:src="@drawable/bg_green_to_light_green"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <include
+            android:id="@+id/toolbar_lay"
+            layout="@layout/view_toolbar_lay"
+            app:isGradientBg="@{true}"
+            app:title="@{@string/title_record_detail}" />
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="@dimen/dp_0"
+            android:scrollbars="none"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/toolbar_lay">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingBottom="@dimen/dp_10">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/dp_5"
+                    android:layout_marginHorizontal="@dimen/dp_15"
+                    android:elevation="@dimen/dp_3">
+
+                    <TextView
+                        android:id="@+id/tv_consult_people_title"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/rectangle_round_top_left_corner8_white"
+                        android:drawableLeft="@drawable/icon_consult_info"
+                        android:drawablePadding="@dimen/dp_6"
+                        android:paddingVertical="@dimen/dp_10"
+                        android:paddingLeft="@dimen/dp_15"
+                        android:text="@string/consult_information_consult_people_title"
+                        android:textColor="@color/text_black_33"
+                        android:textSize="@dimen/txt14"
+                        android:textStyle="bold"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toLeftOf="@+id/tv_submit_time"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_goneMarginLeft="@dimen/dp_48" />
+
+                    <TextView
+                        android:id="@+id/tv_submit_time"
+                        android:layout_width="wrap_content"
+                        android:layout_height="@dimen/dp_0"
+                        android:background="@drawable/bg_operate_time"
+                        android:gravity="center_vertical"
+                        android:text="@{@string/archives_detail_create_time(viewModel.archivesBean.createTime)}"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/txt11"
+                        app:layout_constraintBottom_toBottomOf="@+id/tv_consult_people_title"
+                        app:layout_constraintLeft_toRightOf="@+id/tv_consult_people_title"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+                <com.allen.library.SuperTextView
+                    android:id="@+id/stv_consult_people_info"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_15"
+                    android:layout_marginBottom="@dimen/dp_5"
+                    android:elevation="@dimen/dp_3"
+                    android:background="@drawable/rectangle_round_bottom_corner10_white"
+                    android:paddingVertical="@dimen/dp_20"
+                    app:sCenterBottomTextColor="@color/text_black_33"
+                    app:sCenterBottomTextSize="@dimen/txt13"
+                    app:sCenterBottomTextString="@string/consult_information_consult_people_weight"
+                    app:sCenterTopTextColor="@color/text_black_33"
+                    app:sCenterTopTextSize="@dimen/txt13"
+                    app:sCenterTopTextString="@string/consult_information_consult_people_gender"
+                    app:sDividerLineType="none"
+                    app:sLeftBottomTextColor="@color/text_black_33"
+                    app:sLeftBottomTextSize="@dimen/txt13"
+                    app:sLeftBottomTextString="@string/consult_information_consult_people_height"
+                    app:sLeftTopTextColor="@color/text_black_33"
+                    app:sLeftTopTextSize="@dimen/txt13"
+                    app:sLeftTopTextString="@string/consult_information_consult_people_name"
+                    app:sLeftViewMarginLeft="@dimen/dp_15"
+                    app:sLeftViewGravity="left_center"
+                    app:sRightBottomTextString=" "
+                    app:sRightTopTextColor="@color/text_black_33"
+                    app:sRightTopTextSize="@dimen/txt13"
+                    app:sRightTopTextString="@string/consult_information_consult_people_age"
+                    app:sRightViewMarginRight="@dimen/dp_15"
+                    app:sUseRipple="false" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_15"
+                    android:layout_marginVertical="@dimen/dp_5"
+                    android:background="@drawable/rectangle_round_corner10_white"
+                    android:elevation="@dimen/dp_3"
+                    android:orientation="vertical"
+                    android:paddingBottom="@dimen/dp_20">
+                    <include
+                        android:id="@+id/lay_archives_name"
+                        layout="@layout/view_text_question"
+                        app:title="@{@string/archives_detail_archives_name}"
+                        app:minLines="@{1}"
+                        app:context="@={viewModel.archivesBean.recordsName}"/>
+                    <include
+                        android:id="@+id/lay_disease_duration"
+                        layout="@layout/view_choice_question"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        app:content="@{viewModel.archivesBean.haveTimeValue}"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:title="@{@string/archives_detail_question_disease_duration}" />
+
+                    <include
+                        android:id="@+id/lay_question_for_consult"
+                        layout="@layout/view_text_question"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        app:context="@={viewModel.archivesBean.medicalDescribe}"
+                        app:layout_constraintTop_toBottomOf="@+id/lay_disease_duration"
+                        app:minLines="@{3}"
+                        app:title="@{@string/archives_detail_question_for_consult}" />
+
+                    <include
+                        android:id="@+id/lay_inspection_report"
+                        layout="@layout/view_image_question"
+                        app:title="@{Html.fromHtml(@string/archives_detail_question_image_list)}" />
+
+                    <include
+                        android:id="@+id/lay_have_doctor"
+                        layout="@layout/view_choice_question"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        app:content="@{viewModel.archivesBean.tfLookValue}"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:title="@{@string/archives_detail_question_have_doctor}" />
+
+                    <LinearLayout
+                        android:id="@+id/ll_see_doctor_explain"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginHorizontal="@dimen/dp_10"
+                        android:layout_marginTop="@dimen/dp_10"
+                        android:background="@drawable/rectangle_round_corner10_grey"
+                        android:orientation="vertical"
+                        android:paddingHorizontal="@dimen/dp_15"
+                        android:paddingVertical="@dimen/dp_12"
+                        android:visibility="@{String.valueOf(1).equals(viewModel.archivesBean.tfLook)?View.VISIBLE:View.GONE}">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/archives_detail_hospital"
+                                android:textColor="@color/text_black_66"
+                                android:textSize="@dimen/txt13" />
+
+                            <TextView
+                                android:id="@+id/et_look_office"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:background="@null"
+                                android:text="@={viewModel.archivesBean.lookOffice}"
+                                android:textColor="@color/text_black_33"
+                                android:textSize="@dimen/txt13"
+                                tools:text="@string/app_name" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/dp_16"
+                            android:orientation="horizontal">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/archives_detail_disease"
+                                android:textColor="@color/text_black_66"
+                                android:textSize="@dimen/txt13" />
+
+                            <TextView
+                                android:id="@+id/et_look_medical_name"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:background="@null"
+                                android:text="@={viewModel.archivesBean.lookMedicalName}"
+                                android:textColor="@color/text_black_33"
+                                android:textSize="@dimen/txt13"
+                                tools:text="@string/app_name" />
+                        </LinearLayout>
+                    </LinearLayout>
+
+                    <include
+                        android:id="@+id/lay_question_for_help"
+                        layout="@layout/view_text_question"
+                        app:context="@={viewModel.archivesBean.desire}"
+                        app:minLines="@{3}"
+                        app:title="@{@string/archives_detail_question_for_help}" />
+                </LinearLayout>
+
+                <com.yxjk.healthexpertclient.view.BaseHealthyInformationView
+                    android:id="@+id/view_base_healthy_info"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/rectangle_round_corner10_white"
+                    android:layout_marginVertical="@dimen/dp_5"
+                    android:layout_marginHorizontal="@dimen/dp_15"
+                    android:paddingBottom="@dimen/dp_15"
+                    android:clipToPadding="false"/>
+            </LinearLayout>
+
+        </androidx.core.widget.NestedScrollView>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/activity_base_healthy_information.xml b/app/src/main/res-workbench/layout/activity_base_healthy_information.xml
new file mode 100644
index 0000000..9b3bf56
--- /dev/null
+++ b/app/src/main/res-workbench/layout/activity_base_healthy_information.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/theme_bg">
+        <include layout="@layout/view_toolbar_lay"
+            app:title="@{@string/title_base_healthy_information}"/>
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:scrollbars="none">
+            <com.yxjk.healthexpertclient.view.BaseHealthyInformationView
+                android:id="@+id/view_base_healthy_info"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_10"
+                android:layout_marginTop="@dimen/dp_5"/>
+        </ScrollView>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/activity_big_image.xml b/app/src/main/res-workbench/layout/activity_big_image.xml
new file mode 100644
index 0000000..99e1ba3
--- /dev/null
+++ b/app/src/main/res-workbench/layout/activity_big_image.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/theme_bg"
+        android:orientation="vertical">
+        <include layout="@layout/view_toolbar_lay"
+            app:title="@{@string/title_image}"/>
+        <ImageView
+            android:id="@+id/iv_image"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@color/black"
+            tools:src="@mipmap/ic_launcher"
+            android:scaleType="fitCenter"/>
+    </LinearLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/activity_check_up_detail.xml b/app/src/main/res-workbench/layout/activity_check_up_detail.xml
new file mode 100644
index 0000000..6f2e823
--- /dev/null
+++ b/app/src/main/res-workbench/layout/activity_check_up_detail.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <include layout="@layout/view_toolbar_lay"
+            app:title="@{@string/title_check_up_detail}"
+            android:id="@+id/toolbar_lay"/>
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <LinearLayout
+                    android:id="@+id/ll_user_info_root"
+                    android:orientation="vertical"
+                    android:visibility="gone"
+                    android:background="@color/white"
+                    android:layout_marginBottom="@dimen/dp_10"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:id="@+id/tv_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="@dimen/txt13"
+                        android:textColor="@color/text_black_33"
+                        android:layout_marginLeft="@dimen/dp_16"
+                        android:layout_marginTop="@dimen/dp_15"
+                        android:text="姓名:"
+                        />
+                    <TextView
+                        android:id="@+id/tv_sex"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="@dimen/txt13"
+                        android:textColor="@color/text_black_33"
+                        android:layout_marginLeft="@dimen/dp_16"
+                        android:layout_marginTop="@dimen/dp_15"
+                        android:text="性别:"
+                        />
+                    <TextView
+                        android:id="@+id/tv_card"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="@dimen/txt13"
+                        android:textColor="@color/text_black_33"
+                        android:layout_marginLeft="@dimen/dp_16"
+                        android:layout_marginTop="@dimen/dp_15"
+                        android:text="身份证号:"
+                        />
+                    <TextView
+                        android:id="@+id/tv_birthday"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="@dimen/txt13"
+                        android:textColor="@color/text_black_33"
+                        android:layout_marginLeft="@dimen/dp_16"
+                        android:layout_marginTop="@dimen/dp_15"
+                        android:text="出生日期:"
+                        />
+                    <TextView
+                        android:id="@+id/tv_city"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="@dimen/txt13"
+                        android:visibility="gone"
+                        android:textColor="@color/text_black_33"
+                        android:layout_marginLeft="@dimen/dp_16"
+                        android:layout_marginTop="@dimen/dp_15"
+                        android:text="居住城市:"
+                        />
+                    <TextView
+                        android:id="@+id/tv_phone"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="@dimen/txt13"
+                        android:visibility="gone"
+                        android:textColor="@color/text_black_33"
+                        android:layout_marginLeft="@dimen/dp_16"
+                        android:layout_marginTop="@dimen/dp_15"
+                        android:text="手机号码:"
+                        />
+                    <TextView
+                        android:id="@+id/tv_email"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="@dimen/txt13"
+                        android:visibility="gone"
+                        android:textColor="@color/text_black_33"
+                        android:layout_marginLeft="@dimen/dp_16"
+                        android:layout_marginTop="@dimen/dp_15"
+                        android:text="电子邮件:"
+                        />
+                    <TextView
+                        android:id="@+id/tv_time"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="@dimen/txt13"
+                        android:textColor="@color/text_black_33"
+                        android:layout_marginLeft="@dimen/dp_16"
+                        android:layout_marginTop="@dimen/dp_15"
+                        android:text="体检日期:"
+                        />
+                    <TextView
+                        android:id="@+id/tv_hospital"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textSize="@dimen/txt13"
+                        android:textColor="@color/text_black_33"
+                        android:layout_marginLeft="@dimen/dp_16"
+                        android:layout_marginTop="@dimen/dp_15"
+                        android:text="体检医院:"
+                        android:layout_marginBottom="@dimen/dp_10"
+                        />
+                </LinearLayout>
+                <com.yxjk.healthexpertclient.view.CustomRichTextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/check_up_result"
+                    android:visibility="gone"
+                    />
+
+                <com.yxjk.healthexpertclient.view.CustomRichTextView
+                    android:layout_marginTop="@dimen/dp_10"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/check_up_suggest"
+                    android:visibility="gone"
+                    />
+                <com.github.mikephil.charting.charts.PieChart
+                    android:id="@+id/pie_chart_view"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="@dimen/dp_10"
+                    android:paddingTop="@dimen/dp_10"
+                    android:background="@color/white"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_250"
+                    android:visibility="gone"/>
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/check_up_rv"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+            </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
+
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/activity_consult_detail.xml b/app/src/main/res-workbench/layout/activity_consult_detail.xml
new file mode 100644
index 0000000..5724c5b
--- /dev/null
+++ b/app/src/main/res-workbench/layout/activity_consult_detail.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <ImageView
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="@dimen/dp_204"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:scaleType="fitXY"
+            android:adjustViewBounds="true"
+            android:src="@drawable/bg_green_to_light_green"/>
+        <include layout="@layout/view_toolbar_lay"
+            app:title="@{@string/title_consult_detail}"
+            android:id="@+id/toolbar_lay"
+            app:isGradientBg="@{true}"/>
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="@dimen/dp_0"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/toolbar_lay"
+            app:layout_constraintBottom_toBottomOf="parent">
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <com.yxjk.healthexpertclient.view.ConsultInformationView
+                    android:id="@+id/view_consult_information"
+                    android:layout_width="@dimen/dp_0"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"/>
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </androidx.core.widget.NestedScrollView>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/activity_consult_finish.xml b/app/src/main/res-workbench/layout/activity_consult_finish.xml
new file mode 100644
index 0000000..fb6f95b
--- /dev/null
+++ b/app/src/main/res-workbench/layout/activity_consult_finish.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <ImageView
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="@dimen/dp_204"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:scaleType="fitXY"
+            android:adjustViewBounds="true"
+            android:src="@drawable/bg_green_to_light_green"/>
+        <include layout="@layout/view_toolbar_lay"
+            app:title="@{@string/title_consult_wait_confirm}"
+            android:id="@+id/toolbar_lay"
+            app:isGradientBg="@{true}"/>
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="@dimen/dp_0"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/toolbar_lay"
+            app:layout_constraintBottom_toBottomOf="parent">
+            <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+                <com.yxjk.healthexpertclient.view.ConsultInformationView
+                    android:id="@+id/view_consult_information"
+                    android:layout_width="@dimen/dp_0"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    android:layout_marginBottom="@dimen/dp_10"/>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </androidx.core.widget.NestedScrollView>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/activity_consult_history.xml b/app/src/main/res-workbench/layout/activity_consult_history.xml
new file mode 100644
index 0000000..f0ae9a2
--- /dev/null
+++ b/app/src/main/res-workbench/layout/activity_consult_history.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/theme_bg">
+        <include layout="@layout/view_toolbar_lay"
+            app:title="@{@string/title_consult_history}"/>
+        <com.yxjk.healthexpertclient.view.CustomSearchView
+            android:id="@+id/view_search"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/swipe_refresh"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/theme_bg">
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_list"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_5"/>
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/activity_consult_record.xml b/app/src/main/res-workbench/layout/activity_consult_record.xml
new file mode 100644
index 0000000..147a888
--- /dev/null
+++ b/app/src/main/res-workbench/layout/activity_consult_record.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/theme_bg"
+        android:orientation="vertical">
+        <include layout="@layout/view_toolbar_lay"
+            app:title="@{@string/title_consult_record}"/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+            <com.google.android.material.tabs.TabLayout
+                android:id="@+id/tab_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:tabBackground="@android:color/white"
+                app:tabIndicatorFullWidth="false"
+                app:tabRippleColor="@android:color/transparent"
+                app:tabSelectedTextColor="@color/text_black_33"
+                app:tabTextColor="@color/text_black_66"
+                app:tabTextAppearance="@dimen/txt14"/>
+            <androidx.viewpager2.widget.ViewPager2
+                android:id="@+id/view_pager"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:background="@color/theme_color"/>
+
+        </LinearLayout>
+    </LinearLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/activity_consult_wait_confirm.xml b/app/src/main/res-workbench/layout/activity_consult_wait_confirm.xml
new file mode 100644
index 0000000..dce9419
--- /dev/null
+++ b/app/src/main/res-workbench/layout/activity_consult_wait_confirm.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <ImageView
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="@dimen/dp_204"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:scaleType="fitXY"
+            android:adjustViewBounds="true"
+            android:src="@drawable/bg_green_to_light_green"/>
+        <include layout="@layout/view_toolbar_lay"
+            app:title="@{@string/title_consult_wait_confirm}"
+            android:id="@+id/toolbar_lay"
+            app:isGradientBg="@{true}"/>
+        <Button
+            android:id="@+id/btn_start"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="wrap_content"
+            android:background="@drawable/rectangle_round_corner20_theme_stroke_white"
+            android:text="@string/consult_wait_start_video_call"
+            android:textColor="@color/theme_color"
+            android:minHeight="@dimen/dp_0"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/scroll_view"
+            app:layout_constraintWidth_percent="0.4"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginVertical="@dimen/dp_26"
+            android:outlineProvider="none"
+            android:textSize="@dimen/txt14"
+            android:paddingVertical="@dimen/dp_11"
+            android:visibility="gone"/>
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/scroll_view"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="@dimen/dp_0"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/toolbar_lay"
+            app:layout_constraintBottom_toTopOf="@+id/btn_start">
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <com.yxjk.healthexpertclient.view.ConsultInformationView
+                    android:id="@+id/view_consult_information"
+                    android:layout_width="@dimen/dp_0"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toTopOf="@+id/cl_operate_lay"
+                    android:layout_marginBottom="@dimen/dp_10"/>
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/cl_operate_lay"
+                    android:layout_width="@dimen/dp_0"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/view_consult_information"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    android:visibility="gone">
+                    <Button
+                        android:id="@+id/btn_refuse"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/rectangle_round_corner20_theme_stroke_white"
+                        android:text="@string/consult_wait_confirm_refuse"
+                        android:textColor="@color/theme_color"
+                        android:minHeight="@dimen/dp_0"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toLeftOf="@+id/btn_accept"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintWidth_percent="0.4"
+                        android:layout_marginVertical="@dimen/dp_22"
+                        android:outlineProvider="none"
+                        android:textSize="@dimen/txt14"
+                        android:paddingVertical="@dimen/dp_11"/>
+                    <Button
+                        android:id="@+id/btn_accept"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/rectangle_round_corner20_theme"
+                        android:text="@string/consult_wait_confirm_accept"
+                        android:textColor="@color/white"
+                        android:minHeight="@dimen/dp_0"
+                        app:layout_constraintLeft_toRightOf="@+id/btn_refuse"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintWidth_percent="0.4"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        android:layout_marginLeft="@dimen/dp_10"
+                        android:layout_marginVertical="@dimen/dp_22"
+                        android:outlineProvider="none"
+                        android:textSize="@dimen/txt14"
+                        android:paddingVertical="@dimen/dp_11"/>
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </androidx.core.widget.NestedScrollView>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/activity_consult_wait_start.xml b/app/src/main/res-workbench/layout/activity_consult_wait_start.xml
new file mode 100644
index 0000000..c655759
--- /dev/null
+++ b/app/src/main/res-workbench/layout/activity_consult_wait_start.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <ImageView
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="@dimen/dp_204"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:scaleType="fitXY"
+            android:adjustViewBounds="true"
+            android:src="@drawable/bg_green_to_light_green"/>
+        <include layout="@layout/view_toolbar_lay"
+            app:title="@{@string/title_consult_wait_confirm}"
+            android:id="@+id/toolbar_lay"
+            app:isGradientBg="@{true}"/>
+        <Button
+            android:id="@+id/btn_start"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="wrap_content"
+            android:background="@drawable/rectangle_round_corner20_theme_stroke_white"
+            android:text="@string/consult_wait_start_video_call"
+            android:textColor="@color/theme_color"
+            android:minHeight="@dimen/dp_0"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/scroll_view"
+            app:layout_constraintWidth_percent="0.4"
+            android:layout_marginLeft="@dimen/dp_10"
+            android:layout_marginVertical="@dimen/dp_26"
+            android:outlineProvider="none"
+            android:textSize="@dimen/txt14"
+            android:paddingVertical="@dimen/dp_11"/>
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/scroll_view"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="@dimen/dp_0"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/toolbar_lay"
+            app:layout_constraintBottom_toTopOf="@+id/btn_start">
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <com.yxjk.healthexpertclient.view.ConsultInformationView
+                    android:id="@+id/view_consult_information"
+                    android:layout_width="@dimen/dp_0"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"/>
+
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </androidx.core.widget.NestedScrollView>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/activity_message_list.xml b/app/src/main/res-workbench/layout/activity_message_list.xml
new file mode 100644
index 0000000..8cf4ab8
--- /dev/null
+++ b/app/src/main/res-workbench/layout/activity_message_list.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+
+    <RelativeLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/theme_bg">
+        <include layout="@layout/view_toolbar_lay"
+            app:title="@{@string/title_message_list}"/>
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/swipe_refresh"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/toolbar_lay">
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_list"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_5" />
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/dialog_header_date_time_range.xml b/app/src/main/res-workbench/layout/dialog_header_date_time_range.xml
new file mode 100644
index 0000000..96b9696
--- /dev/null
+++ b/app/src/main/res-workbench/layout/dialog_header_date_time_range.xml
@@ -0,0 +1,112 @@
+<!--
+  ~ Copyright (c) 2016-present 贵州纳雍穿青人李裕江<1032694760@qq.com>
+  ~
+  ~ The software is licensed under the Mulan PSL v2.
+  ~ You can use this software according to the terms and conditions of the Mulan PSL v2.
+  ~ You may obtain a copy of Mulan PSL v2 at:
+  ~     http://license.coscl.org.cn/MulanPSL2
+  ~ THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
+  ~ IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
+  ~ PURPOSE.
+  ~ See the Mulan PSL v2 for more details.
+  -->
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/dialog_modal_cancel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:paddingStart="20dp"
+        android:paddingTop="15dp"
+        android:paddingEnd="20dp"
+        android:paddingBottom="15dp"
+        android:text="@android:string/cancel"
+        android:textColor="#FF333333"
+        android:textSize="15sp" />
+
+    <TextView
+        android:id="@+id/dialog_modal_title"
+        android:layout_width="@dimen/dp_0"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="@+id/dialog_modal_cancel"
+        app:layout_constraintBottom_toBottomOf="@+id/dialog_modal_cancel"
+        app:layout_constraintLeft_toRightOf="@+id/dialog_modal_cancel"
+        app:layout_constraintRight_toLeftOf="@+id/dialog_modal_ok"
+        android:layout_marginStart="60dp"
+        android:layout_marginEnd="60dp"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:paddingTop="10dp"
+        android:paddingBottom="10dp"
+        android:singleLine="true"
+        android:textColor="#FF666666"
+        android:textSize="14sp"
+        tools:text="@android:string/untitled" />
+
+    <TextView
+        android:id="@+id/dialog_modal_ok"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:paddingStart="20dp"
+        android:paddingTop="15dp"
+        android:paddingEnd="20dp"
+        android:paddingBottom="15dp"
+        android:text="@android:string/ok"
+        android:textColor="#FF0081FF"
+        android:textSize="15sp" />
+    <TextView
+        android:id="@+id/tv_start_time"
+        android:layout_width="@dimen/dp_0"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/dialog_modal_cancel"
+        app:layout_constraintRight_toLeftOf="@+id/tv_time_cut"
+        android:background="@drawable/bg_date_time_range_text"
+        android:drawableLeft="@drawable/icon_time"
+        android:drawablePadding="@dimen/dp_10"
+        android:layout_marginLeft="@dimen/dp_14"
+        android:paddingVertical="@dimen/dp_10"
+        android:paddingHorizontal="@dimen/dp_12"
+        android:hint="@string/consult_wait_confirm_dialog_date_time_start"
+        android:textColor="@color/text_black_33"
+        android:textSize="@dimen/txt13"
+        android:text=""/>
+    <TextView
+        android:id="@+id/tv_time_cut"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toRightOf="@+id/tv_start_time"
+        app:layout_constraintTop_toTopOf="@+id/tv_start_time"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_start_time"
+        app:layout_constraintRight_toLeftOf="@+id/tv_end_time"
+        android:layout_marginHorizontal="@dimen/dp_10"
+        android:textColor="@color/text_black_33"
+        android:textSize="@dimen/txt14"
+        android:text="@string/add_suspension_announcement_cut"/>
+    <TextView
+        android:id="@+id/tv_end_time"
+        android:layout_width="@dimen/dp_0"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toRightOf="@+id/tv_time_cut"
+        app:layout_constraintTop_toTopOf="@+id/tv_start_time"
+        app:layout_constraintRight_toRightOf="parent"
+        android:background="@drawable/bg_date_time_range_text"
+        android:drawableLeft="@drawable/icon_time"
+        android:layout_marginRight="@dimen/dp_14"
+        android:drawablePadding="@dimen/dp_10"
+        android:paddingVertical="@dimen/dp_10"
+        android:paddingHorizontal="@dimen/dp_12"
+        android:hint="@string/consult_wait_confirm_dialog_date_time_end"
+        android:textColor="@color/text_black_33"
+        android:textSize="@dimen/txt13"
+        android:text=""/>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res-workbench/layout/dialog_refuse_explain.xml b/app/src/main/res-workbench/layout/dialog_refuse_explain.xml
new file mode 100644
index 0000000..58b1587
--- /dev/null
+++ b/app/src/main/res-workbench/layout/dialog_refuse_explain.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/rectangle_round_corner10_white">
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginTop="@dimen/dp_20"
+            android:textColor="@color/text_black_33"
+            android:textSize="@dimen/txt14"
+            android:text="@string/dialog_refuse_explain_title"/>
+        <ImageButton
+            android:id="@+id/btn_close"
+            android:layout_width="@dimen/dp_40"
+            android:layout_height="@dimen/dp_40"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            android:background="@android:color/transparent"
+            android:padding="@dimen/dp_15"
+            android:src="@drawable/icon_close"/>
+        <TextView
+            android:id="@+id/tv_reason_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toLeftOf="@+id/spinner_reason"
+            app:layout_constraintTop_toTopOf="@+id/spinner_reason"
+            app:layout_constraintBottom_toBottomOf="@+id/spinner_reason"
+            android:layout_marginLeft="@dimen/dp_27"
+            android:textColor="@color/text_black_33"
+            android:textSize="@dimen/txt13"
+            android:text="@string/dialog_refuse_explain_reason_title"/>
+<!--        <LinearLayout-->
+<!--            android:id="@+id/ll_reason"-->
+<!--            android:layout_width="@dimen/dp_0"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            app:layout_constraintLeft_toRightOf="@+id/tv_reason_title"-->
+<!--            app:layout_constraintRight_toRightOf="parent"-->
+<!--            app:layout_constraintTop_toBottomOf="@+id/tv_title"-->
+<!--            android:background="@drawable/rectangle_round_corner5_grey_stroke_white"-->
+<!--            android:layout_marginTop="@dimen/dp_18"-->
+<!--            android:layout_marginRight="@dimen/dp_27"-->
+<!--            android:layout_marginLeft="@dimen/dp_9"-->
+<!--            android:orientation="horizontal"-->
+<!--            android:visibility="gone">-->
+
+<!--            <TextView-->
+<!--                android:id="@+id/tv_reason"-->
+<!--                android:layout_width="@dimen/dp_0"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_weight="1"-->
+<!--                android:paddingVertical="@dimen/dp_9"-->
+<!--                android:paddingLeft="@dimen/dp_12"-->
+<!--                android:textColor="@color/text_black_33"-->
+<!--                android:textSize="@dimen/txt13"-->
+<!--                tools:text="@string/app_name" />-->
+
+<!--            <ImageButton-->
+<!--                android:id="@+id/btn_expansion"-->
+<!--                android:layout_width="@dimen/dp_27"-->
+<!--                android:layout_height="@dimen/dp_21"-->
+<!--                android:padding="@dimen/dp_7"-->
+<!--                android:background="@android:color/transparent"-->
+<!--                android:src="@drawable/icon_expansion"-->
+<!--                android:layout_gravity="right|center_vertical"/>-->
+<!--        </LinearLayout>-->
+        <Spinner
+            android:id="@+id/spinner_reason"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="wrap_content"
+            android:overlapAnchor="false"
+            android:spinnerMode="dropdown"
+            android:background="@drawable/bg_spinner"
+            app:layout_constraintLeft_toRightOf="@+id/tv_reason_title"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_title"
+            android:layout_marginTop="@dimen/dp_18"
+            android:layout_marginRight="@dimen/dp_27"
+            android:layout_marginLeft="@dimen/dp_9"
+            android:textSize="@dimen/txt13"
+            />
+        <EditText
+            android:id="@+id/et_remark"
+            android:longClickable="false"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="wrap_content"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintLeft_toRightOf="@+id/tv_remark_title"
+            app:layout_constraintTop_toBottomOf="@+id/spinner_reason"
+            android:layout_marginTop="@dimen/dp_18"
+            android:layout_marginRight="@dimen/dp_27"
+            android:layout_marginLeft="@dimen/dp_9"
+            android:background="@drawable/rectangle_round_corner5_grey_stroke_white"
+            android:paddingHorizontal="@dimen/dp_12"
+            android:paddingVertical="@dimen/dp_9"
+            android:minHeight="@dimen/dp_130"
+            android:gravity="top"
+            android:textColor="@color/text_black_33"
+            android:textSize="@dimen/txt13"
+            android:hint="@string/dialog_refuse_explain_remark_hint"/>
+        <TextView
+            android:id="@+id/tv_remark_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toLeftOf="@+id/et_remark"
+            app:layout_constraintTop_toTopOf="@+id/et_remark"
+            app:layout_constraintBottom_toBottomOf="@+id/et_remark"
+            android:layout_marginLeft="@dimen/dp_27"
+            android:textColor="@color/text_black_33"
+            android:textSize="@dimen/txt13"
+            android:text="@string/dialog_refuse_explain_remark_title"/>
+        <Button
+            android:id="@+id/btn_submit"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="wrap_content"
+            android:background="@drawable/rectangle_round_corner20_theme"
+            android:text="@string/dialog_refuse_explain_submit"
+            android:textColor="@color/white"
+            android:minHeight="@dimen/dp_0"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/et_remark"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintWidth_percent="0.536"
+            android:layout_marginHorizontal="@dimen/dp_48"
+            android:layout_marginVertical="@dimen/dp_28"
+            android:outlineProvider="none"
+            android:textSize="@dimen/txt14"
+            android:paddingVertical="@dimen/dp_11"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/fragment_consult_record.xml b/app/src/main/res-workbench/layout/fragment_consult_record.xml
new file mode 100644
index 0000000..8753242
--- /dev/null
+++ b/app/src/main/res-workbench/layout/fragment_consult_record.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/theme_bg">
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/swipe_refresh"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/fragment_group_consult_record.xml b/app/src/main/res-workbench/layout/fragment_group_consult_record.xml
new file mode 100644
index 0000000..8353bdd
--- /dev/null
+++ b/app/src/main/res-workbench/layout/fragment_group_consult_record.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/theme_bg"
+        android:orientation="vertical">
+
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/tab_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:tabIndicatorFullWidth="false"
+            android:layout_marginTop="@dimen/dp_5"
+            app:tabRippleColor="@android:color/transparent"
+            app:tabSelectedTextColor="@color/white"
+            app:tabTextAppearance="@dimen/txt14"
+            app:tabTextColor="@color/text_black_33"
+            app:tabIndicatorHeight="@dimen/dp_0"
+            app:tabMode="scrollable"/>
+
+        <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/view_pager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+    </LinearLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/fragment_workbench.xml b/app/src/main/res-workbench/layout/fragment_workbench.xml
new file mode 100644
index 0000000..1a8f1a3
--- /dev/null
+++ b/app/src/main/res-workbench/layout/fragment_workbench.xml
@@ -0,0 +1,406 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <import type="android.text.TextUtils"/>
+        <import type="android.view.View"/>
+        <variable
+            name="viewModel"
+            type="com.yxjk.healthexpertclient.ui.workbench.viewmodel.WorkbenchViewModel" />
+    </data>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/theme_bg"
+        android:orientation="vertical">
+        <include
+            android:id="@+id/toolbar_lay"
+            layout="@layout/view_toolbar_lay"
+            app:title="@{@string/title_workbench}" />
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/swipe_refresh"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:scrollbars="none">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/cl_doctor_info"
+                    android:layout_width="@dimen/dp_0"
+                    android:layout_height="wrap_content"
+                    android:background="@color/theme_color"
+                    android:paddingLeft="@dimen/dp_16"
+                    android:paddingRight="@dimen/dp_24"
+                    android:paddingBottom="@dimen/dp_44"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <ImageView
+                        android:id="@+id/iv_doctor_head"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="@dimen/dp_0"
+                        app:layout_constraintDimensionRatio="1:1"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintWidth_percent="0.16"
+                        android:layout_marginTop="@dimen/dp_34"
+                        tools:src='@mipmap/ic_launcher' />
+
+                    <TextView
+                        android:id="@+id/tv_doctor_name"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/txt21"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toLeftOf="@+id/tv_professional_title"
+                        app:layout_constraintTop_toTopOf="@id/iv_doctor_head"
+                        android:layout_marginTop="@dimen/dp_9"
+                        tools:text="@string/app_name" />
+
+                    <TextView
+                        android:id="@+id/tv_professional_title"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/dp_12"
+                        android:layout_marginRight="@dimen/dp_12"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/txt13"
+                        app:layout_constraintBaseline_toBaselineOf="@+id/tv_doctor_name"
+                        app:layout_constraintBottom_toBottomOf="@+id/tv_doctor_name"
+                        app:layout_constraintLeft_toRightOf="@+id/tv_doctor_name"
+                        app:layout_constraintRight_toLeftOf="@+id/iv_doctor_head"
+                        android:includeFontPadding="false"
+                        android:gravity="left"
+                        tools:text="@string/app_name" />
+
+                    <TextView
+                        android:id="@+id/tv_hospital"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/dp_12"
+                        android:layout_marginRight="@dimen/dp_12"
+                        android:includeFontPadding="false"
+                        android:textColor="@color/white"
+                        android:textSize="@dimen/txt13"
+                        app:layout_constraintLeft_toLeftOf="@+id/tv_doctor_name"
+                        app:layout_constraintRight_toLeftOf="@+id/iv_doctor_head"
+                        app:layout_constraintTop_toBottomOf="@+id/tv_doctor_name"
+                        tools:text="@string/app_name" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/cl_consult_lay"
+                    android:layout_width="@dimen/dp_0"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="-15dp"
+                    android:layout_marginBottom="@dimen/dp_10"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/cl_doctor_info"
+                    app:layout_constraintBottom_toBottomOf="parent">
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/cl_image_text_consult_lay"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintBottom_toTopOf="@+id/cl_audio_video_consult_lay"
+                        android:background="@drawable/rectangle_round_corner10_white"
+                        android:elevation="@dimen/dp_3"
+                        android:layout_marginHorizontal="@dimen/dp_15"
+                        android:layout_marginVertical="@dimen/dp_5"
+                        android:paddingTop="@dimen/dp_24">
+                        <ImageView
+                            android:id="@+id/iv_image_text_consult"
+                            android:layout_width="@dimen/dp_0"
+                            android:layout_height="@dimen/dp_0"
+                            app:layout_constraintDimensionRatio="1:1"
+                            app:layout_constraintLeft_toLeftOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:layout_constraintWidth_percent="0.116"
+                            android:layout_marginLeft="@dimen/dp_20"
+                            android:src='@drawable/icon_consult_image' />
+
+                        <TextView
+                            android:id="@+id/tv_image_text_consult_time"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            app:layout_constraintRight_toRightOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            android:layout_marginRight="@dimen/dp_10"
+                            android:textColor="@color/text_black_99"
+                            android:textSize="@dimen/txt10"
+                            tools:text="@string/app_name"/>
+                        <TextView
+                            android:id="@+id/tv_image_text_consult_num"
+                            android:layout_width="wrap_content"
+                            android:layout_height="@dimen/dp_16"
+                            app:layout_constraintRight_toRightOf="@id/tv_image_text_consult_time"
+                            app:layout_constraintTop_toBottomOf="@+id/tv_image_text_consult_time"
+                            android:background="@drawable/rectangle_round_corner20_theme"
+                            android:layout_marginTop="@dimen/dp_3"
+                            android:minWidth="@dimen/dp_16"
+                            android:paddingHorizontal="@dimen/dp_2"
+                            android:gravity="center"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/txt10"
+                            android:visibility="gone"
+                            android:text="@{viewModel.imageTextUnreadNumStr}"/>
+
+                        <TextView
+                            android:id="@+id/tv_image_text_consult_title"
+                            android:layout_width="@dimen/dp_0"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/dp_12"
+                            android:layout_marginEnd="@dimen/dp_12"
+                            android:includeFontPadding="false"
+                            android:text="@string/doctor_homepage_image_text_consult"
+                            android:textColor="@color/text_black_33"
+                            android:textSize="@dimen/txt14"
+                            app:layout_constraintLeft_toRightOf="@+id/iv_image_text_consult"
+                            app:layout_constraintRight_toLeftOf="@+id/tv_image_text_consult_time"
+                            app:layout_constraintTop_toTopOf="@+id/iv_image_text_consult" />
+
+                        <TextView
+                            android:id="@+id/tv_image_text_consult_explain"
+                            android:layout_width="@dimen/dp_0"
+                            android:layout_height="wrap_content"
+                            android:paddingTop="@dimen/dp_6"
+                            android:textColor="@color/text_black_66"
+                            android:textSize="@dimen/txt11"
+                            android:includeFontPadding="false"
+                            app:layout_constraintLeft_toLeftOf="@id/tv_image_text_consult_title"
+                            app:layout_constraintRight_toRightOf="@+id/tv_image_text_consult_title"
+                            app:layout_constraintTop_toBottomOf="@+id/tv_image_text_consult_title"
+                            android:text="@string/doctor_homepage_image_text_consult_explain" />
+                        <androidx.constraintlayout.widget.Barrier
+                            android:id="@+id/barrier_image_text_consult"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            app:barrierDirection="bottom"
+                            app:constraint_referenced_ids="iv_image_text_consult,tv_image_text_consult_explain" />
+                        <include layout="@layout/lay_cut_off_rule"
+                            android:id="@+id/line_image_text_consult"
+                            android:layout_width="@dimen/dp_0"
+                            android:layout_height="@dimen/dp_0_5"
+                            android:layout_marginTop="@dimen/dp_24"
+                            app:layout_constraintTop_toBottomOf="@+id/barrier_image_text_consult"/>
+                        <include layout="@layout/lay_workbench_status"
+                            android:id="@+id/lay_image_text_consult_status"
+                            android:layout_width="@dimen/dp_0"
+                            android:layout_height="wrap_content"
+                            app:layout_constraintTop_toBottomOf="@+id/line_image_text_consult"
+                            app:layout_constraintLeft_toLeftOf="parent"
+                            app:layout_constraintRight_toRightOf="parent"
+                            app:leftText="@{@string/doctor_homepage_image_text_consult_wait_reply}"
+                            app:centerText="@{@string/doctor_homepage_image_text_consult_in_progress}"
+                            app:rightText="@{@string/doctor_homepage_image_text_consult_finish}"
+                            app:leftNum="@{viewModel.workBenchConsultNumBean.pictureUnReply}"
+                            app:centerNum="@{viewModel.workBenchConsultNumBean.pictureIng}"
+                            app:rightNum="@{viewModel.workBenchConsultNumBean.pictureFinish}"/>
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/cl_audio_video_consult_lay"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintTop_toBottomOf="@+id/cl_image_text_consult_lay"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintBottom_toTopOf="@+id/cl_assistant_consult_lay"
+                        android:background="@drawable/rectangle_round_corner10_white"
+                        android:elevation="@dimen/dp_3"
+                        android:layout_marginHorizontal="@dimen/dp_15"
+                        android:layout_marginVertical="@dimen/dp_5"
+                        android:paddingTop="@dimen/dp_24">
+                        <ImageView
+                            android:id="@+id/iv_audio_video_consult"
+                            android:layout_width="@dimen/dp_0"
+                            android:layout_height="@dimen/dp_0"
+                            app:layout_constraintDimensionRatio="1:1"
+                            app:layout_constraintLeft_toLeftOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:layout_constraintWidth_percent="0.116"
+                            android:layout_marginLeft="@dimen/dp_20"
+                            android:src='@drawable/icon_consult_video' />
+
+                        <TextView
+                            android:id="@+id/tv_audio_video_consult_time"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            app:layout_constraintRight_toRightOf="parent"
+                            app:layout_constraintTop_toTopOf="@id/iv_audio_video_consult"
+                            android:layout_marginRight="@dimen/dp_10"
+                            android:textColor="@color/text_black_99"
+                            android:textSize="@dimen/txt10"
+                            tools:text="@string/app_name"/>
+                        <TextView
+                            android:id="@+id/tv_audio_video_consult_num"
+                            android:layout_width="wrap_content"
+                            android:layout_height="@dimen/dp_16"
+                            app:layout_constraintRight_toRightOf="@id/tv_audio_video_consult_time"
+                            app:layout_constraintTop_toBottomOf="@+id/tv_audio_video_consult_time"
+                            android:background="@drawable/rectangle_round_corner20_theme"
+                            android:layout_marginTop="@dimen/dp_3"
+                            android:minWidth="@dimen/dp_16"
+                            android:paddingHorizontal="@dimen/dp_2"
+                            android:gravity="center"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/txt10"
+                            tools:visibility="@{TextUtils.isEmpty(viewModel.audioVideoUnreadNumStr)?View.GONE:View.VISIBLE}"
+                            android:visibility="gone"
+                            android:text="@{viewModel.audioVideoUnreadNumStr}"/>
+
+                        <TextView
+                            android:id="@+id/tv_audio_video_consult_title"
+                            android:layout_width="@dimen/dp_0"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/dp_12"
+                            android:layout_marginEnd="@dimen/dp_12"
+                            android:includeFontPadding="false"
+                            android:textColor="@color/text_black_33"
+                            android:textSize="@dimen/txt14"
+                            app:layout_constraintTop_toTopOf="@+id/iv_audio_video_consult"
+                            app:layout_constraintLeft_toRightOf="@+id/iv_audio_video_consult"
+                            app:layout_constraintRight_toLeftOf="@+id/tv_audio_video_consult_time"
+                            android:text="@string/doctor_homepage_audio_video_consult" />
+
+                        <TextView
+                            android:id="@+id/tv_audio_video_consult_explain"
+                            android:layout_width="@dimen/dp_0"
+                            android:layout_height="wrap_content"
+                            android:paddingTop="@dimen/dp_6"
+                            android:includeFontPadding="false"
+                            android:textColor="@color/text_black_66"
+                            android:textSize="@dimen/txt11"
+                            app:layout_constraintLeft_toLeftOf="@id/tv_audio_video_consult_title"
+                            app:layout_constraintRight_toRightOf="@+id/tv_audio_video_consult_title"
+                            app:layout_constraintTop_toBottomOf="@+id/tv_audio_video_consult_title"
+                            android:text="@string/doctor_homepage_audio_video_consult_explain" />
+                        <androidx.constraintlayout.widget.Barrier
+                            android:id="@+id/barrier_audio_video_consult"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            app:barrierDirection="bottom"
+                            app:constraint_referenced_ids="iv_audio_video_consult,tv_audio_video_consult_explain" />
+                        <include layout="@layout/lay_cut_off_rule"
+                            android:id="@+id/line_audio_video_consult"
+                            android:layout_width="@dimen/dp_0"
+                            android:layout_height="@dimen/dp_0_5"
+                            android:layout_marginTop="@dimen/dp_24"
+                            app:layout_constraintTop_toBottomOf="@+id/barrier_audio_video_consult"/>
+                        <include layout="@layout/lay_workbench_status"
+                            android:id="@+id/lay_audio_video_consult_status"
+                            android:layout_width="@dimen/dp_0"
+                            android:layout_height="wrap_content"
+                            app:layout_constraintTop_toBottomOf="@+id/line_audio_video_consult"
+                            app:layout_constraintLeft_toLeftOf="parent"
+                            app:layout_constraintRight_toRightOf="parent"
+                            app:leftText="@{@string/doctor_homepage_audio_video_consult_wait_affirm}"
+                            app:centerText="@{@string/doctor_homepage_audio_video_consult_in_progress}"
+                            app:rightText="@{@string/doctor_homepage_audio_video_consult_finish}"
+                            app:leftNum="@{viewModel.workBenchConsultNumBean.videoUnReply}"
+                            app:centerNum="@{viewModel.workBenchConsultNumBean.videoIng}"
+                            app:rightNum="@{viewModel.workBenchConsultNumBean.videoFinish}"/>
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/cl_assistant_consult_lay"
+                        android:layout_width="@dimen/dp_0"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintTop_toBottomOf="@+id/cl_audio_video_consult_lay"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        android:background="@drawable/rectangle_round_corner10_white"
+                        android:elevation="@dimen/dp_3"
+                        android:layout_marginHorizontal="@dimen/dp_15"
+                        android:layout_marginVertical="@dimen/dp_5"
+                        android:paddingVertical="@dimen/dp_24">
+                        <ImageView
+                            android:id="@+id/iv_assistant_consult"
+                            android:layout_width="@dimen/dp_0"
+                            android:layout_height="@dimen/dp_0"
+                            app:layout_constraintDimensionRatio="1:1"
+                            app:layout_constraintLeft_toLeftOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:layout_constraintWidth_percent="0.116"
+                            android:layout_marginLeft="@dimen/dp_20"
+                            android:src='@drawable/icon_consult_assistant' />
+
+                        <TextView
+                            android:id="@+id/tv_assistant_consult_time"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            app:layout_constraintRight_toRightOf="parent"
+                            app:layout_constraintTop_toTopOf="@id/iv_assistant_consult"
+                            android:layout_marginRight="@dimen/dp_10"
+                            android:textColor="@color/text_black_99"
+                            android:textSize="@dimen/txt10"
+                            android:text="@{viewModel.assistantUnreadMessageTime}"
+                            tools:text="@string/app_name"/>
+                        <TextView
+                            android:id="@+id/tv_assistant_consult_num"
+                            android:layout_width="wrap_content"
+                            android:layout_height="@dimen/dp_16"
+                            app:layout_constraintRight_toRightOf="@id/tv_assistant_consult_time"
+                            app:layout_constraintTop_toBottomOf="@+id/tv_assistant_consult_time"
+                            android:background="@drawable/rectangle_round_corner20_theme"
+                            android:layout_marginTop="@dimen/dp_3"
+                            android:minWidth="@dimen/dp_16"
+                            android:paddingHorizontal="@dimen/dp_2"
+                            android:gravity="center"
+                            android:textColor="@color/white"
+                            android:textSize="@dimen/txt10"
+                            android:visibility="gone"
+                            android:text=""/>
+
+                        <TextView
+                            android:id="@+id/tv_assistant_consult_title"
+                            android:layout_width="@dimen/dp_0"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/dp_12"
+                            android:layout_marginEnd="@dimen/dp_12"
+                            android:includeFontPadding="false"
+                            android:textColor="@color/text_black_33"
+                            android:textSize="@dimen/txt14"
+                            app:layout_constraintTop_toTopOf="@+id/iv_assistant_consult"
+                            app:layout_constraintLeft_toRightOf="@+id/iv_assistant_consult"
+                            app:layout_constraintRight_toLeftOf="@+id/tv_assistant_consult_time"
+                            android:text="@string/doctor_homepage_assistant_consult" />
+
+                        <TextView
+                            android:id="@+id/tv_assistant_consult_explain"
+                            android:layout_width="@dimen/dp_0"
+                            android:layout_height="wrap_content"
+                            android:paddingTop="@dimen/dp_6"
+                            android:includeFontPadding="false"
+                            android:textColor="@color/text_black_66"
+                            android:textSize="@dimen/txt11"
+                            app:layout_constraintLeft_toLeftOf="@id/tv_assistant_consult_title"
+                            app:layout_constraintRight_toRightOf="@+id/tv_assistant_consult_title"
+                            app:layout_constraintTop_toBottomOf="@+id/tv_assistant_consult_title"
+                            android:text="@string/doctor_homepage_assistant_consult_explain" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </ScrollView>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+    </LinearLayout>
+
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/item_check_up_detail.xml b/app/src/main/res-workbench/layout/item_check_up_detail.xml
new file mode 100644
index 0000000..11dccaf
--- /dev/null
+++ b/app/src/main/res-workbench/layout/item_check_up_detail.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_marginTop="@dimen/dp_10"
+    android:paddingLeft="@dimen/dp_16"
+    android:paddingRight="@dimen/dp_16"
+    android:background="@color/white"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:id="@+id/item_check_up_detail_title_ll"
+        android:orientation="horizontal"
+        android:layout_marginTop="@dimen/dp_16"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:id="@+id/item_check_up_detail_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="化学检查"
+            android:textStyle="bold"
+            android:textColor="@color/text_black_33"
+            android:textSize="@dimen/txt16"
+            />
+    </LinearLayout>
+
+    
+    <View
+        android:id="@+id/item_check_up_detail_tag"
+        android:layout_below="@+id/item_check_up_detail_title_ll"
+        android:layout_width="@dimen/dp_2"
+        android:layout_height="@dimen/dp_13"
+        android:background="@color/text_green_BD"
+        android:layout_marginTop="@dimen/dp_18"
+        />
+
+    <TextView
+        android:id="@+id/item_check_up_detail_subtitle"
+        android:layout_below="@+id/item_check_up_detail_title_ll"
+        android:layout_toRightOf="@+id/item_check_up_detail_tag"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="血常规"
+        android:textStyle="bold"
+        android:textColor="@color/text_black_33"
+        android:layout_marginLeft="@dimen/dp_10"
+        android:textSize="@dimen/txt16"
+        android:layout_marginTop="@dimen/dp_16"
+        android:visibility="gone"/>
+
+    <TextView
+        android:id="@+id/item_check_up_detail_interpret"
+        android:layout_below="@+id/item_check_up_detail_title_ll"
+        android:layout_alignParentRight="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="专家解读>"
+        android:textColor="#DA180F"
+        android:layout_marginLeft="@dimen/dp_10"
+        android:textSize="@dimen/txt16"
+        android:layout_marginTop="@dimen/dp_16"
+        android:visibility="gone"/>
+
+    <LinearLayout
+        android:id="@+id/item_check_up_detail_form_head"
+        android:layout_marginTop="@dimen/dp_12"
+        android:orientation="horizontal"
+        android:layout_below="@+id/item_check_up_detail_subtitle"
+        android:layout_width="match_parent"
+        android:background="#BF21BEBD"
+        android:layout_height="@dimen/dp_40">
+        <TextView
+            android:layout_width="0dp"
+            android:background="@drawable/bg_form_line"
+            android:layout_marginRight="-0.5dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.36"
+            android:text="名称"
+            android:textSize="@dimen/txt13"
+            android:textColor="@color/text_black_33"
+            android:gravity="center"
+            />
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:background="@drawable/bg_form_line"
+            android:layout_marginLeft="-0.5dp"
+            android:layout_marginRight="-0.5dp"
+            android:layout_weight="0.20"
+            android:text="结果"
+            android:textSize="@dimen/txt13"
+            android:textColor="@color/text_black_33"
+            android:gravity="center"
+            />
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:background="@drawable/bg_form_line"
+            android:layout_marginLeft="-0.5dp"
+            android:layout_marginRight="-0.5dp"
+            android:layout_weight="0.20"
+            android:text="单位"
+            android:textSize="@dimen/txt13"
+            android:textColor="@color/text_black_33"
+            android:gravity="center"
+            />
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:background="@drawable/bg_form_line"
+            android:layout_marginLeft="-0.5dp"
+            android:layout_weight="0.20"
+            android:text="参考值"
+            android:textSize="@dimen/txt13"
+            android:textColor="@color/text_black_33"
+            android:gravity="center"
+            />
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/item_check_up_detail_form_container"
+        android:layout_below="@+id/item_check_up_detail_form_head"
+        android:orientation="vertical"
+        android:layout_marginBottom="@dimen/dp_10"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/item_check_up_detail_chaild.xml b/app/src/main/res-workbench/layout/item_check_up_detail_chaild.xml
new file mode 100644
index 0000000..5591547
--- /dev/null
+++ b/app/src/main/res-workbench/layout/item_check_up_detail_chaild.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:ignore="MissingDefaultResource">
+    <LinearLayout
+        android:id="@+id/item_check_up_detail_form_child_root"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40">
+        <TextView
+            android:id="@+id/item_check_up_detail_form_child_name"
+            android:layout_width="0dp"
+            android:background="@drawable/bg_form_line"
+            android:layout_marginTop="-0.5dp"
+            android:layout_marginRight="-0.5dp"
+            android:layout_height="match_parent"
+            android:layout_weight="0.36"
+            android:text="名称"
+            android:textSize="@dimen/txt13"
+            android:textColor="@color/text_black_33"
+            android:gravity="center"
+            />
+        <LinearLayout
+            android:layout_weight="0.20"
+            android:layout_width="0dp"
+            android:gravity="center"
+            android:background="@drawable/bg_form_line"
+            android:layout_marginTop="-0.5dp"
+            android:layout_marginLeft="-0.5dp"
+            android:layout_height="match_parent">
+            <TextView
+                android:id="@+id/item_check_up_detail_form_child_result"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="结果"
+                android:padding="@dimen/dp_6"
+                android:textSize="@dimen/txt13"
+                android:textColor="@color/text_black_33"
+                />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/item_check_up_detail_form_child_unit"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:background="@drawable/bg_form_line"
+            android:layout_marginTop="-0.5dp"
+            android:layout_marginLeft="-0.5dp"
+            android:layout_marginRight="-0.5dp"
+            android:layout_weight="0.20"
+            android:text="单位"
+            android:textSize="@dimen/txt13"
+            android:textColor="@color/text_black_33"
+            android:gravity="center"
+            />
+        <TextView
+            android:id="@+id/item_check_up_detail_form_child_visit"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:background="@drawable/bg_form_line"
+            android:layout_marginTop="-0.5dp"
+            android:layout_marginLeft="-0.5dp"
+            android:layout_weight="0.20"
+            android:text="参考值"
+            android:textSize="@dimen/txt13"
+            android:textColor="@color/text_black_33"
+            android:gravity="center"
+            />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/item_recycle_consult_history.xml b/app/src/main/res-workbench/layout/item_recycle_consult_history.xml
new file mode 100644
index 0000000..b2a80b3
--- /dev/null
+++ b/app/src/main/res-workbench/layout/item_recycle_consult_history.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_card"
+        android:layout_marginHorizontal="@dimen/dp_10"
+        android:paddingTop="@dimen/dp_12"
+        android:paddingBottom="@dimen/dp_16"
+        android:paddingLeft="@dimen/dp_10"
+        android:paddingRight="@dimen/dp_15">
+        <TextView
+            android:id="@+id/tv_consult_type"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:background="@drawable/rectangle_round_corner5_theme_stroke_white"
+            android:paddingVertical="@dimen/dp_5"
+            android:paddingHorizontal="@dimen/dp_6"
+            android:textColor="@color/theme_color"
+            android:textSize="@dimen/txt11"
+            tools:text="@string/app_name"/>
+        <TextView
+            android:id="@+id/tv_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toRightOf="@+id/tv_consult_type"
+            app:layout_constraintBaseline_toBaselineOf="@+id/tv_consult_type"
+            android:paddingHorizontal="@dimen/dp_5"
+            android:textColor="@color/text_black_33"
+            android:textSize="@dimen/txt14"
+            tools:text="@string/app_name"/>
+        <TextView
+            android:id="@+id/tv_gender_age"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toRightOf="@+id/tv_name"
+            app:layout_constraintBaseline_toBaselineOf="@+id/tv_name"
+            android:textColor="@color/text_black_99"
+            android:textSize="@dimen/txt11"
+            tools:text="@string/app_name"/>
+        <TextView
+            android:id="@+id/tv_create_time"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_consult_type"
+            app:layout_constraintRight_toRightOf="parent"
+            android:paddingHorizontal="@dimen/dp_4"
+            android:layout_marginTop="@dimen/dp_12"
+            android:textColor="@color/text_black_99"
+            android:textSize="@dimen/txt13"
+            tools:text="@string/app_name"/>
+        <TextView
+            android:id="@+id/tv_consult_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            android:paddingHorizontal="@dimen/dp_4"
+            android:layout_marginTop="@dimen/dp_12"
+            android:textColor="@color/text_dark_green"
+            android:textSize="@dimen/txt15"
+            android:text="@string/consult_history_have_completed"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/item_recycle_consult_record.xml b/app/src/main/res-workbench/layout/item_recycle_consult_record.xml
new file mode 100644
index 0000000..17577e1
--- /dev/null
+++ b/app/src/main/res-workbench/layout/item_recycle_consult_record.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@drawable/bg_card"
+    android:layout_marginHorizontal="@dimen/dp_10"
+    android:paddingHorizontal="@dimen/dp_20"
+    android:paddingVertical="@dimen/dp_22">
+    <TextView
+        android:id="@+id/tv_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:textSize="@dimen/txt14"
+        android:textColor="@color/text_black_33"
+        tools:text="张三"/>
+    <TextView
+        android:id="@+id/tv_gender_age"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toRightOf="@+id/tv_name"
+        app:layout_constraintBaseline_toBaselineOf="@+id/tv_name"
+        android:textColor="@color/text_black_99"
+        android:textSize="@dimen/txt12"
+        tools:text="(男/35岁)"/>
+    <TextView
+        android:id="@+id/tv_time"
+        android:layout_width="@dimen/dp_0"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_name"
+        app:layout_constraintRight_toLeftOf="@+id/tv_message_num"
+        android:layout_marginRight="@dimen/dp_12"
+        android:layout_marginTop="@dimen/dp_14"
+        android:textSize="@dimen/txt13"
+        android:textColor="@color/text_black_99"
+        tools:text="2022.2.25"/>
+    <TextView
+        android:id="@+id/tv_message_num"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/dp_16"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:background="@drawable/rectangle_round_corner20_theme"
+        android:layout_marginTop="@dimen/dp_14"
+        android:minWidth="@dimen/dp_14"
+        android:gravity="center"
+        android:textColor="@color/white"
+        android:textSize="@dimen/txt10"
+        tools:text="2"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/item_recycle_health_info.xml b/app/src/main/res-workbench/layout/item_recycle_health_info.xml
new file mode 100644
index 0000000..bbfc514
--- /dev/null
+++ b/app/src/main/res-workbench/layout/item_recycle_health_info.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+
+    <com.allen.library.SuperTextView
+        android:id="@+id/stv_health_info"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_20"
+        app:sCenterTextColor="@color/text_black_33"
+        app:sCenterTextSize="@dimen/txt14"
+        app:sCenterTextString="@string/consult_information_consult_people_create_time"
+        app:sCenterViewGravity="left_center"
+        app:sDividerLineType="none"
+        app:sLeftTextColor="@color/text_black_66"
+        app:sLeftTextSize="@dimen/txt14"
+        app:sLeftTextString="@string/consult_information_consult_people_dietary_habit"
+        app:sLeftViewMarginLeft="@dimen/dp_15"
+        app:sLeftViewMarginRight="@dimen/dp_0"
+        app:sUseRipple="false" />
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/item_recycle_message.xml b/app/src/main/res-workbench/layout/item_recycle_message.xml
new file mode 100644
index 0000000..0c29b7a
--- /dev/null
+++ b/app/src/main/res-workbench/layout/item_recycle_message.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/dp_15"
+        android:layout_marginVertical="@dimen/dp_5"
+        android:elevation="@dimen/dp_3"
+        android:paddingHorizontal="@dimen/dp_22"
+        android:paddingVertical="@dimen/dp_15">
+        <TextView
+            android:id="@+id/tv_message_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="@color/text_black_33"
+            android:textSize="@dimen/txt14"
+            tools:text="@string/app_name"/>
+        <TextView
+            android:id="@+id/tv_message_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/tv_message_title"
+            android:layout_marginTop="@dimen/dp_9"
+            android:textColor="@color/text_black_66"
+            android:textSize="@dimen/txt13"
+            tools:text="@string/app_name"/>
+        <TextView
+            android:id="@+id/tv_message_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/tv_message_content"
+            android:layout_alignParentRight="true"
+            android:layout_marginTop="@dimen/dp_9"
+            android:textColor="@color/text_black_99"
+            android:textSize="@dimen/txt13"
+            tools:text="@string/app_name"/>
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/item_spinner_dropdown.xml b/app/src/main/res-workbench/layout/item_spinner_dropdown.xml
new file mode 100644
index 0000000..7a1d23e
--- /dev/null
+++ b/app/src/main/res-workbench/layout/item_spinner_dropdown.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@android:id/text1"
+    style="?android:attr/spinnerDropDownItemStyle"
+    android:singleLine="true"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:ellipsize="marquee"
+    android:paddingVertical="@dimen/dp_9"
+    android:gravity="right|center_vertical"
+    android:paddingLeft="@dimen/dp_12"
+    android:textSize="@dimen/txt13"
+    android:textColor="@color/text_black_33"
+    tools:ignore="MissingDefaultResource" />
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/item_tablayout_group_title.xml b/app/src/main/res-workbench/layout/item_tablayout_group_title.xml
new file mode 100644
index 0000000..80831e1
--- /dev/null
+++ b/app/src/main/res-workbench/layout/item_tablayout_group_title.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/bg_child_tab_layout_item"
+    android:paddingVertical="@dimen/dp_7"
+    android:paddingHorizontal="@dimen/dp_15"
+    android:includeFontPadding="false"
+    android:gravity="center"
+    android:textColor="@color/color_child_tab_layout_text"
+    android:textSize="@dimen/txt13"
+    android:id="@+id/tv_tab_layout">
+</TextView>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/lay_workbench_status.xml b/app/src/main/res-workbench/layout/lay_workbench_status.xml
new file mode 100644
index 0000000..44960a5
--- /dev/null
+++ b/app/src/main/res-workbench/layout/lay_workbench_status.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+        <import type="android.text.TextUtils"/>
+        <import type="android.view.View"/>
+        <variable
+            name="leftText"
+            type="java.lang.String" />
+        <variable
+            name="leftNum"
+            type="java.lang.String" />
+        <variable
+            name="centerText"
+            type="java.lang.String" />
+        <variable
+            name="centerNum"
+            type="java.lang.String" />
+        <variable
+            name="rightText"
+            type="java.lang.String" />
+        <variable
+            name="rightNum"
+            type="java.lang.String" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:id="@+id/ll_left_lay"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="horizontal"
+            android:gravity="center">
+
+            <TextView
+                android:id="@+id/tv_left"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="@dimen/dp_16"
+                android:textSize="@dimen/txt13"
+                android:textColor="@color/text_black_33"
+                android:text="@{leftText}" />
+
+            <TextView
+                android:id="@+id/tv_left_num"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_16"
+                android:background="@drawable/rectangle_round_corner20_theme"
+                android:layout_marginLeft="@dimen/dp_5"
+                android:minWidth="@dimen/dp_16"
+                android:paddingHorizontal="@dimen/dp_2"
+                android:gravity="center"
+                android:textColor="@color/white"
+                android:textSize="@dimen/txt10"
+                android:visibility="@{TextUtils.isEmpty(leftNum)||String.valueOf(0).equals(leftNum)?View.GONE:View.VISIBLE}"
+                android:text="@{leftNum}" />
+        </LinearLayout>
+        <View
+            android:layout_width="@dimen/dp_0_5"
+            android:layout_height="match_parent"
+            android:layout_marginVertical="@dimen/dp_9"
+            android:background="@color/line_grey_color"/>
+        <LinearLayout
+            android:id="@+id/ll_center_lay"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="horizontal"
+            android:gravity="center">
+
+            <TextView
+                android:id="@+id/tv_center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="@dimen/dp_16"
+                android:textSize="@dimen/txt13"
+                android:textColor="@color/text_black_33"
+                android:text="@{centerText}" />
+
+            <TextView
+                android:id="@+id/tv_center_num"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_16"
+                android:background="@drawable/rectangle_round_corner20_theme"
+                android:layout_marginLeft="@dimen/dp_5"
+                android:minWidth="@dimen/dp_16"
+                android:paddingHorizontal="@dimen/dp_2"
+                android:gravity="center"
+                android:textColor="@color/white"
+                android:textSize="@dimen/txt10"
+                android:visibility="@{TextUtils.isEmpty(centerNum)||String.valueOf(0).equals(centerNum)?View.GONE:View.VISIBLE}"
+                android:text="@{centerNum}" />
+        </LinearLayout>
+        <View
+            android:layout_width="@dimen/dp_0_5"
+            android:layout_height="match_parent"
+            android:layout_marginVertical="@dimen/dp_9"
+            android:background="@color/line_grey_color"/>
+        <LinearLayout
+            android:id="@+id/ll_right_lay"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="horizontal"
+            android:gravity="center">
+
+            <TextView
+                android:id="@+id/tv_right"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginVertical="@dimen/dp_16"
+                android:textSize="@dimen/txt13"
+                android:textColor="@color/text_black_33"
+                android:text="@{rightText}" />
+
+            <TextView
+                android:id="@+id/tv_right_num"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_16"
+                android:background="@drawable/rectangle_round_corner20_theme"
+                android:layout_marginLeft="@dimen/dp_5"
+                android:minWidth="@dimen/dp_16"
+                android:paddingHorizontal="@dimen/dp_2"
+                android:gravity="center"
+                android:textColor="@color/white"
+                android:textSize="@dimen/txt10"
+                android:visibility="@{TextUtils.isEmpty(rightNum)||String.valueOf(0).equals(rightNum)?View.GONE:View.VISIBLE}"
+                android:text="@{rightNum}" />
+        </LinearLayout>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/popupwindow_recycle_view.xml b/app/src/main/res-workbench/layout/popupwindow_recycle_view.xml
new file mode 100644
index 0000000..af3bbe5
--- /dev/null
+++ b/app/src/main/res-workbench/layout/popupwindow_recycle_view.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+    </data>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    </androidx.recyclerview.widget.RecyclerView>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/view_base_healthy_information.xml b/app/src/main/res-workbench/layout/view_base_healthy_information.xml
new file mode 100644
index 0000000..d4ed3fd
--- /dev/null
+++ b/app/src/main/res-workbench/layout/view_base_healthy_information.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_card"
+        android:paddingHorizontal="@dimen/dp_15">
+        <com.allen.library.SuperTextView
+            android:id="@+id/stv_dietary_habit"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:sCenterTextColor="@color/text_black_99"
+            app:sCenterTextSize="@dimen/txt14"
+            app:sCenterTextString="@string/consult_information_consult_people_create_time"
+            app:sCenterViewGravity="left_center"
+            app:sDividerLineType="bottom"
+            app:sLeftTextColor="@color/text_black_33"
+            app:sLeftTextSize="@dimen/txt14"
+            app:sLeftTextString="@string/consult_information_consult_people_dietary_habit"
+            app:sBottomDividerLineMarginLR="@dimen/dp_0"
+            android:paddingVertical="@dimen/dp_15"
+            app:sLeftViewMarginLeft="@dimen/dp_0"
+            app:sLeftViewMarginRight="@dimen/dp_0"
+            app:sUseRipple="false" />
+
+        <com.allen.library.SuperTextView
+            android:id="@+id/stv_tobacco_alcohol_habits"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:sCenterTextColor="@color/text_black_99"
+            app:sCenterTextSize="@dimen/txt14"
+            app:sCenterTextString="@string/consult_information_consult_people_create_time"
+            app:sCenterViewGravity="left_center"
+            app:sDividerLineType="bottom"
+            app:sLeftTextColor="@color/text_black_33"
+            app:sLeftTextSize="@dimen/txt14"
+            app:sLeftTextString="@string/consult_information_consult_people_tobacco_alcohol_habits"
+            app:sBottomDividerLineMarginLR="@dimen/dp_0"
+            android:paddingVertical="@dimen/dp_15"
+            app:sLeftViewMarginLeft="@dimen/dp_0"
+            app:sLeftViewMarginRight="@dimen/dp_0"
+            app:sUseRipple="false" />
+
+        <com.allen.library.SuperTextView
+            android:id="@+id/stv_past_history"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:sCenterTextColor="@color/text_black_99"
+            app:sCenterTextSize="@dimen/txt14"
+            app:sCenterTextString="@string/consult_information_consult_people_create_time"
+            app:sCenterViewGravity="left_center"
+            app:sDividerLineType="bottom"
+            app:sLeftTextColor="@color/text_black_33"
+            app:sLeftTextSize="@dimen/txt14"
+            app:sLeftTextString="@string/consult_information_consult_people_past_history"
+            app:sBottomDividerLineMarginLR="@dimen/dp_0"
+            android:paddingVertical="@dimen/dp_15"
+            app:sLeftViewMarginLeft="@dimen/dp_0"
+            app:sLeftViewMarginRight="@dimen/dp_0"
+            app:sUseRipple="false" />
+
+        <com.allen.library.SuperTextView
+            android:id="@+id/stv_family_history"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:sCenterTextColor="@color/text_black_99"
+            app:sCenterTextSize="@dimen/txt14"
+            app:sCenterTextString="@string/consult_information_consult_people_create_time"
+            app:sCenterViewGravity="left_center"
+            app:sDividerLineType="bottom"
+            app:sLeftTextColor="@color/text_black_33"
+            app:sLeftTextSize="@dimen/txt14"
+            app:sLeftTextString="@string/consult_information_consult_people_family_history"
+            app:sBottomDividerLineMarginLR="@dimen/dp_0"
+            android:paddingVertical="@dimen/dp_15"
+            app:sLeftViewMarginLeft="@dimen/dp_0"
+            app:sLeftViewMarginRight="@dimen/dp_0"
+            app:sUseRipple="false" />
+
+        <com.allen.library.SuperTextView
+            android:id="@+id/stv_allergy_history"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:sCenterTextColor="@color/text_black_99"
+            app:sCenterTextSize="@dimen/txt14"
+            app:sCenterTextString="@string/consult_information_consult_people_create_time"
+            app:sCenterViewGravity="left_center"
+            app:sDividerLineType="bottom"
+            app:sLeftTextColor="@color/text_black_33"
+            app:sLeftTextSize="@dimen/txt14"
+            app:sLeftTextString="@string/consult_information_consult_people_allergy_history"
+            app:sBottomDividerLineMarginLR="@dimen/dp_0"
+            android:paddingVertical="@dimen/dp_15"
+            app:sLeftViewMarginLeft="@dimen/dp_0"
+            app:sLeftViewMarginRight="@dimen/dp_0"
+            app:sUseRipple="false" />
+
+        <com.allen.library.SuperTextView
+            android:id="@+id/stv_medication_history"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:sCenterTextColor="@color/text_black_99"
+            app:sCenterTextSize="@dimen/txt14"
+            app:sCenterTextString="@string/consult_information_consult_people_create_time"
+            app:sCenterViewGravity="left_center"
+            app:sDividerLineType="none"
+            app:sLeftTextColor="@color/text_black_33"
+            app:sLeftTextSize="@dimen/txt14"
+            app:sLeftTextString="@string/consult_information_consult_people_medication_history"
+            app:sLeftViewMarginLeft="@dimen/dp_0"
+            app:sLeftViewMarginRight="@dimen/dp_0"
+            android:paddingVertical="@dimen/dp_15"
+            app:sUseRipple="false" />
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/view_choice_question.xml b/app/src/main/res-workbench/layout/view_choice_question.xml
new file mode 100644
index 0000000..4e4f820
--- /dev/null
+++ b/app/src/main/res-workbench/layout/view_choice_question.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    >
+
+    <data>
+        <variable
+            name="title"
+            type="java.lang.String" />
+        <variable
+            name="content"
+            type="java.lang.String" />
+    </data>
+
+    <merge>
+        <TextView
+            android:id="@+id/tv_problem_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:paddingTop="@dimen/dp_20"
+            android:paddingBottom="@dimen/dp_15"
+            android:textColor="@color/text_black_33"
+            android:textSize="@dimen/txt14"
+            android:textStyle="bold"
+            android:text="@{title}"
+            tools:text="@string/app_name"/>
+        <TextView
+            android:id="@+id/tv_problem_answer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/rectangle_grey_left_stroke_dark_grey"
+            android:paddingHorizontal="@dimen/dp_30"
+            android:paddingVertical="@dimen/dp_12"
+            android:textColor="@color/text_black_33"
+            android:textSize="@dimen/txt12"
+            android:text="@{content}"
+            tools:text="@string/app_name"/>
+    </merge>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/view_consult_information.xml b/app/src/main/res-workbench/layout/view_consult_information.xml
new file mode 100644
index 0000000..dbcdd3e
--- /dev/null
+++ b/app/src/main/res-workbench/layout/view_consult_information.xml
@@ -0,0 +1,336 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="TouchTargetSizeCheck">
+
+    <data></data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginHorizontal="@dimen/dp_10"
+        android:orientation="vertical">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/dp_5">
+
+            <TextView
+                android:id="@+id/tv_consult_people_title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:drawableLeft="@drawable/icon_consult_info"
+                android:drawablePadding="@dimen/dp_6"
+                android:paddingVertical="@dimen/dp_10"
+                android:paddingLeft="@dimen/dp_15"
+                android:background="@drawable/rectangle_round_top_left_corner8_white"
+                android:text="@string/consult_information_consult_people_title"
+                android:textColor="@color/text_black_33"
+                android:textSize="@dimen/txt14"
+                android:textStyle="bold"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toLeftOf="@+id/tv_submit_time"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_goneMarginLeft="@dimen/dp_48" />
+
+            <TextView
+                android:id="@+id/tv_submit_time"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_0"
+                android:background="@drawable/bg_operate_time"
+                android:gravity="center_vertical"
+                android:text="@string/app_name"
+                android:textSize="@dimen/txt11"
+                android:textColor="@color/white"
+                app:layout_constraintBottom_toBottomOf="@+id/tv_consult_people_title"
+                app:layout_constraintLeft_toRightOf="@+id/tv_consult_people_title"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_bottom_radius_card"
+            android:orientation="vertical">
+
+
+            <com.allen.library.SuperTextView
+                android:id="@+id/stv_consult_people_info"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_20"
+                app:sCenterBottomTextColor="@color/text_black_33"
+                app:sCenterBottomTextSize="@dimen/txt13"
+                app:sCenterBottomTextString="@string/consult_information_consult_people_weight"
+                app:sCenterTopTextColor="@color/text_black_33"
+                app:sCenterTopTextSize="@dimen/txt13"
+                app:sCenterTopTextString="@string/consult_information_consult_people_gender"
+                app:sDividerLineType="none"
+                app:sLeftBottomTextColor="@color/text_black_33"
+                app:sLeftBottomTextSize="@dimen/txt13"
+                app:sLeftBottomTextString="@string/consult_information_consult_people_height"
+                app:sLeftTopTextColor="@color/text_black_33"
+                app:sLeftTopTextSize="@dimen/txt13"
+                app:sLeftTopTextString="@string/consult_information_consult_people_name"
+                app:sLeftViewMarginLeft="@dimen/dp_15"
+                app:sLeftViewGravity="left_center"
+                app:sRightBottomTextString=" "
+                app:sRightTopTextColor="@color/text_black_33"
+                app:sRightTopTextSize="@dimen/txt13"
+                app:sRightTopTextString="@string/consult_information_consult_people_age"
+                app:sRightViewMarginRight="@dimen/dp_15"
+                app:sUseRipple="false" />
+            <include
+                android:id="@+id/line_appointment_time"
+                layout="@layout/lay_cut_off_rule"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_0_5"
+                android:layout_marginTop="@dimen/dp_15"
+                android:visibility="gone"/>
+
+            <com.allen.library.SuperTextView
+                android:id="@+id/stv_appointment_time"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_15"
+                app:sDividerLineType="none"
+                app:sLeftTextColor="@color/text_black_33"
+                app:sLeftTextSize="@dimen/txt14"
+                app:sLeftTextString="@string/consult_information_consult_appoinment_time"
+                app:sLeftViewMarginLeft="@dimen/dp_15"
+                app:sRightTextColor="@color/text_black_33"
+                app:sRightTextSize="@dimen/txt13"
+                app:sRightTextString=""
+                app:sRightViewMarginRight="@dimen/dp_15"
+                app:sUseRipple="false"
+                android:visibility="gone"/>
+            <com.allen.library.SuperTextView
+                android:id="@+id/stv_refuse_cause"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_15"
+                app:sDividerLineType="none"
+                app:sLeftTextColor="@color/text_black_33"
+                app:sLeftTextSize="@dimen/txt14"
+                app:sLeftTextString="@string/consult_information_consult_refuse_cause"
+                app:sLeftViewMarginLeft="@dimen/dp_15"
+                app:sRightTextColor="@color/text_black_33"
+                app:sRightTextSize="@dimen/txt13"
+                app:sRightTextString=""
+                app:sRightViewMarginRight="@dimen/dp_15"
+                app:sUseRipple="false"
+                android:visibility="gone"/>
+            <RelativeLayout
+                android:id="@+id/rl_refuse_remark"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_15"
+                android:layout_marginTop="@dimen/dp_15"
+                android:visibility="gone">
+                <TextView
+                    android:id="@+id/tv_refuse_remark_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/consult_information_consult_refuse_remark"
+                    android:textColor="@color/text_black_33"
+                    android:textSize="@dimen/txt14"
+                    android:textStyle="bold"/>
+                <TextView
+                    android:id="@+id/tv_refuse_remark"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_toRightOf="@+id/tv_refuse_remark_title"
+                    android:layout_marginLeft="@dimen/dp_34"
+                    android:gravity="right"
+                    tools:text="时间不合适时间不合适时间不合适时间不合适时间不合适时间不合适时间不合适时间不合适"
+                    android:textColor="@color/text_black_33"
+                    android:textSize="@dimen/txt13"/>
+            </RelativeLayout>
+            <TextView
+                android:id="@+id/tv_call_record_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_15"
+                android:layout_marginTop="@dimen/dp_21"
+                android:text="@string/consult_information_call_record"
+                android:textColor="@color/text_black_33"
+                android:textSize="@dimen/txt14"
+                android:textStyle="bold"
+                android:visibility="gone"/>
+            <TextView
+                android:id="@+id/tv_call_record"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_15"
+                android:layout_marginTop="@dimen/dp_16"
+                android:lineSpacingExtra="@dimen/dp_8"
+                android:textColor="@color/text_black_33"
+                android:textSize="@dimen/txt13"
+                android:visibility="gone"/>
+            <include
+                layout="@layout/lay_cut_off_rule"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_0_5"
+                android:layout_marginTop="@dimen/dp_15" />
+
+            <com.allen.library.SuperTextView
+                android:id="@+id/stv_archives"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_15"
+                app:sDividerLineType="none"
+                app:sLeftTextColor="@color/text_black_33"
+                app:sLeftTextSize="@dimen/txt14"
+                app:sLeftTextString="@string/consult_information_consult_people_record"
+                app:sLeftViewMarginLeft="@dimen/dp_15"
+                app:sRightTextColor="@color/text_black_99"
+                app:sRightTextSize="@dimen/txt12"
+                app:sRightTextString="@string/consult_information_consult_people_create_time"
+                app:sRightViewMarginRight="@dimen/dp_15"
+                app:sUseRipple="false" />
+
+            <TextView
+                android:id="@+id/tv_archives_explain"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_15"
+                android:layout_marginTop="@dimen/dp_15"
+                android:textColor="@color/text_black_33"
+                android:textSize="@dimen/txt13"
+                tools:text="@string/consult_information_consult_people_title" />
+
+            <TextView
+                android:id="@+id/tv_consult_people_info_detail"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_15"
+                android:layout_marginTop="@dimen/dp_15"
+                android:layout_marginBottom="@dimen/dp_15"
+                android:gravity="right"
+                android:text="@string/consult_information_see_detail"
+                android:textColor="@color/link_blue_color"
+                android:textSize="@dimen/txt12" />
+
+            <include
+                layout="@layout/lay_cut_off_rule"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_0_5"
+                android:id="@+id/line_health_info"/>
+
+            <TextView
+                android:id="@+id/tv_health_info_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_15"
+                android:layout_marginTop="@dimen/dp_21"
+                android:text="@string/consult_information_consult_people_health_information_title"
+                android:textColor="@color/text_black_33"
+                android:textSize="@dimen/txt14"
+                android:textStyle="bold" />
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_health_info"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:overScrollMode="never"
+                android:layout_marginBottom="@dimen/dp_22"/>
+
+            <include
+                android:id="@+id/line_physical_examination_report"
+                layout="@layout/lay_cut_off_rule"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                />
+
+            <TextView
+                android:id="@+id/tv_consult_record"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_15"
+                android:layout_marginTop="@dimen/dp_21"
+                android:text="@string/consult_information_consult_record_title"
+                android:textColor="@color/text_black_33"
+                android:textSize="@dimen/txt14"
+                android:textStyle="bold"
+                android:visibility="gone" />
+
+            <com.allen.library.SuperTextView
+                android:id="@+id/stv_consult_record_info"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_17"
+                android:visibility="gone"
+                app:sDividerLineType="none"
+                app:sLeftTextColor="@color/text_black_33"
+                app:sLeftTextSize="@dimen/txt13"
+                app:sLeftViewMarginLeft="@dimen/dp_15"
+                app:sRightTextColor="@color/link_blue_color"
+                app:sRightTextSize="@dimen/txt11"
+                app:sRightTextString="@string/consult_information_see_detail"
+                app:sRightViewMarginRight="@dimen/dp_15"
+                app:sUseRipple="false"
+                tools:sLeftTextString="@string/consult_information_consult_record_num" />
+
+            <com.allen.library.SuperTextView
+                android:id="@+id/stv_physical_examination_report"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_15"
+                app:sDividerLineType="none"
+                app:sLeftTextColor="@color/text_black_33"
+                app:sLeftTextSize="@dimen/txt14"
+                app:sLeftTextString="@string/consult_information_physical_examination_report_title"
+                app:sLeftViewMarginLeft="@dimen/dp_15"
+                app:sRightTextColor="@color/text_black_99"
+                app:sRightTextSize="@dimen/txt12"
+                app:sRightTextString="@string/consult_information_physical_examination_report_upload_time"
+                app:sRightViewMarginRight="@dimen/dp_15"
+                app:sUseRipple="false" />
+
+            <com.allen.library.SuperTextView
+                android:id="@+id/stv_physical_examination_report_info"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/dp_17"
+                android:layout_marginBottom="@dimen/dp_27"
+                app:sDividerLineType="none"
+                app:sLeftTextColor="@color/text_black_33"
+                app:sLeftTextSize="@dimen/txt13"
+                app:sLeftViewMarginLeft="@dimen/dp_15"
+                app:sRightTextColor="@color/link_blue_color"
+                app:sRightTextSize="@dimen/txt12"
+                app:sRightTextString="@string/consult_information_see_detail"
+                app:sRightViewMarginRight="@dimen/dp_15"
+                app:sUseRipple="false"
+                tools:sLeftTextString="@string/consult_information_physical_examination_report_title" />
+
+        </LinearLayout>
+        <LinearLayout
+            android:id="@+id/ll_consult_start_time_lay"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_card"
+            android:paddingVertical="@dimen/dp_31"
+            android:orientation="vertical">
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_15"
+                android:text="@string/consult_information_consult_start_time"
+                android:textColor="@color/text_black_33"
+                android:textSize="@dimen/txt14"
+                android:textStyle="bold" />
+            <TextView
+                android:id="@+id/tv_consult_start_time"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="@dimen/dp_15"
+                android:layout_marginTop="@dimen/dp_16"
+                tools:text="@string/app_name"
+                android:textColor="@color/text_black_33"
+                android:textSize="@dimen/txt13" />
+        </LinearLayout>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/view_custom_rich_text_view.xml b/app/src/main/res-workbench/layout/view_custom_rich_text_view.xml
new file mode 100644
index 0000000..0761a88
--- /dev/null
+++ b/app/src/main/res-workbench/layout/view_custom_rich_text_view.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <LinearLayout
+        android:orientation="vertical"
+        android:background="@color/white"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_marginLeft="@dimen/dp_15"
+            android:layout_marginTop="@dimen/dp_18"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <LinearLayout
+                android:orientation="horizontal"
+                android:gravity="center_vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+                <View
+                    android:id="@+id/custom_rich_text_view_tag"
+                    android:layout_width="@dimen/dp_2"
+                    android:layout_height="@dimen/dp_13"
+                    android:background="#DA180F"
+                    />
+                <TextView
+                    android:id="@+id/custom_rich_text_view_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="体检结论"
+                    android:textSize="@dimen/txt15"
+                    android:textColor="@color/text_black_33"
+                    android:textStyle="bold"
+                    android:layout_marginLeft="@dimen/dp_10"
+                    />
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/custom_rich_text_view_hint"
+                android:textSize="@dimen/txt13"
+                android:textColor="@color/text_black_66"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+            <RelativeLayout
+                android:id="@+id/custom_rich_text_view_expand_root"
+                android:gravity="center_horizontal"
+                android:orientation="horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_30">
+                <TextView
+                    android:id="@+id/custom_rich_text_view_expand"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:text="展开"
+                    />
+                <ImageView
+                    android:layout_toRightOf="@+id/custom_rich_text_view_expand"
+                    android:layout_centerVertical="true"
+                    android:id="@+id/custom_rich_text_view_icon"
+                    android:layout_marginLeft="@dimen/dp_6"
+                    android:layout_width="@dimen/dp_12"
+                    android:layout_height="@dimen/dp_6"
+                    android:src="@drawable/ic_rich_down"
+                    />
+            </RelativeLayout>
+
+
+        </LinearLayout>
+
+    </LinearLayout>
+</layout>
diff --git a/app/src/main/res-workbench/layout/view_image_question.xml b/app/src/main/res-workbench/layout/view_image_question.xml
new file mode 100644
index 0000000..22241bf
--- /dev/null
+++ b/app/src/main/res-workbench/layout/view_image_question.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <variable
+            name="title"
+            type="java.lang.CharSequence" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TextView
+            android:id="@+id/tv_problem_title"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toLeftOf="@+id/tv_image_num"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginHorizontal="@dimen/dp_10"
+            android:paddingTop="@dimen/dp_12"
+            android:paddingBottom="@dimen/dp_18"
+            android:textColor="@color/text_black_33"
+            android:textSize="@dimen/txt12"
+            android:textStyle="bold"
+            android:text="@{title}"
+            tools:text="@string/app_name"/>
+        <TextView
+            android:id="@+id/tv_image_num"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toRightOf="@+id/tv_problem_title"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintBaseline_toBaselineOf="@+id/tv_problem_title"
+            android:padding="@dimen/dp_12"
+            android:textColor="@color/text_black_99"
+            android:textSize="@dimen/txt12"
+            tools:text="@string/app_name"/>
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_list"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/dp_10"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_problem_title"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/layout/view_text_question.xml b/app/src/main/res-workbench/layout/view_text_question.xml
new file mode 100644
index 0000000..47814e0
--- /dev/null
+++ b/app/src/main/res-workbench/layout/view_text_question.xml
@@ -0,0 +1,47 @@
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <variable
+            name="title"
+            type="java.lang.String" />
+        <variable
+            name="context"
+            type="java.lang.String" />
+        <variable
+            name="hint"
+            type="java.lang.String" />
+        <variable
+            name="minLines"
+            type="java.lang.Integer" />
+    </data>
+
+    <merge>
+        <TextView
+            android:id="@+id/tv_problem_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:paddingVertical="@dimen/dp_15"
+            android:textColor="@color/text_black_33"
+            android:textSize="@dimen/txt14"
+            android:textStyle="bold"
+            android:text="@{title}"
+            tools:text="@string/app_name"/>
+        <TextView
+            android:id="@+id/tv_problem_answer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/rectangle_round_corner10_grey"
+            android:layout_marginHorizontal="@dimen/dp_10"
+            android:paddingHorizontal="@dimen/dp_15"
+            android:paddingVertical="@dimen/dp_12"
+            android:minLines="@{minLines}"
+            android:gravity="top"
+            android:hint="@{hint}"
+            android:textColor="@color/text_black_33"
+            android:textSize="@dimen/txt14"
+            android:text="@={context}"/>
+    </merge>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res-workbench/values/strings.xml b/app/src/main/res-workbench/values/strings.xml
new file mode 100644
index 0000000..99d276f
--- /dev/null
+++ b/app/src/main/res-workbench/values/strings.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="MissingTranslation">
+    <!--专家主页-->
+    <string name="doctor_homepage_image_text_consult" >图文咨询</string>
+    <string name="doctor_homepage_image_text_consult_explain">通过图片、文字的形式进行咨询</string>
+    <string name="doctor_homepage_image_text_consult_wait_reply" >待回复</string>
+    <string name="doctor_homepage_image_text_consult_in_progress" >进行中</string>
+    <string name="doctor_homepage_image_text_consult_finish" >已完成</string>
+    <string name="doctor_homepage_audio_video_consult_explain">通过语音视频电话的形式进行咨询</string>
+    <string name="doctor_homepage_audio_video_consult">视频咨询</string>
+    <string name="doctor_homepage_audio_video_consult_wait_affirm" >待确认</string>
+    <string name="doctor_homepage_audio_video_consult_in_progress" >进行中</string>
+    <string name="doctor_homepage_audio_video_consult_finish" >已完成</string>
+    <string name="doctor_homepage_assistant_consult">小助手</string>
+    <string name="doctor_homepage_assistant_consult_explain">联系小助手获取相关帮助和支持</string>
+    <string name="doctor_homepage_message">消息</string>
+    <!--咨询记录-->
+    <string name="consult_record_group_wait_reply">待回复</string>
+    <string name="consult_record_group_in_progress">进行中</string>
+    <string name="consult_record_group_waiting_start">待开始</string>
+    <string name="consult_record_group_waiting_affirm">待确认</string>
+    <string name="consult_record_group_have_finish">已完成</string>
+    <string name="consult_record_gender_man">男</string>
+    <string name="consult_record_gender_woman" >女</string>
+    <string name="consult_record_gender_age" formatted="false"> (%s/%s岁) </string>
+
+    <!--预约信息（确认/开始/咨询/评价/完成）-->
+    <string name="consult_information_time">预约时间</string>
+    <string name="consult_information_type">预约类型</string>
+    <string name="consult_information_start_time">开始时间</string>
+    <string name="consult_information_consult_people_title">咨询人信息</string>
+    <string name="consult_information_consult_people_name">姓名：%s</string>
+    <string name="consult_information_consult_people_gender">性别：%s</string>
+    <string name="consult_information_consult_people_age">年龄：%s</string>
+    <string name="consult_information_consult_people_height">身高：%s&#160;cm</string>
+    <string name="consult_information_consult_people_weight">体重：%s&#160;kg</string>
+    <string name="consult_information_consult_submit_time">提交时间：%s</string>
+    <string name="consult_information_consult_appoinment_time">预约时间</string>
+    <string name="consult_information_consult_refuse_cause">拒绝原因</string>
+    <string name="consult_information_consult_refuse_remark">拒绝备注</string>
+    <string name="consult_information_call_record">咨询记录</string>
+    <string name="consult_information_consult_people_record">档案</string>
+    <string name="consult_information_consult_people_create_time">更新时间：%s</string>
+    <string name="consult_information_consult_people_archives_explain" formatted="false">问题描述：%s</string>
+    <string name="consult_information_consult_people_health_information_title">基本健康信息</string>
+    <string name="consult_information_health_info_format" formatted="false">%s：</string>
+    <string name="consult_information_consult_people_dietary_habit">饮食习惯：</string>
+    <string name="consult_information_consult_people_tobacco_alcohol_habits">烟酒习惯：</string>
+    <string name="consult_information_consult_people_past_history">既往史：</string>
+    <string name="consult_information_consult_people_family_history">家族史：</string>
+    <string name="consult_information_consult_people_allergy_history">过敏史：</string>
+    <string name="consult_information_consult_people_medication_history">用药史：</string>
+    <string name="consult_information_consult_record_title">咨询记录</string>
+    <string name="consult_information_consult_record_num" formatted="false">本次咨询共有%d条消息记录</string>
+    <string name="consult_information_physical_examination_report_title">体检报告</string>
+    <string name="consult_information_physical_examination_report_upload_time" formatted="false">上传时间：%s</string>
+    <string name="consult_information_physical_examination_report_intro" formatted="false">%s&#160;&#160;&#160;&#160;%s</string>
+    <string name="consult_information_see_detail">查看详情></string>
+    <string name="consult_information_consult_start_time">咨询开始时间</string>
+
+    <!--历史记录-->
+    <string name="consult_history_gender_age" formatted="false"> (%s/%s岁) </string>
+    <string name="consult_history_have_completed">已完成</string>
+
+    <!--拒绝咨询Dialog-->
+    <string name="dialog_refuse_explain_title">拒绝原因</string>
+    <string name="dialog_refuse_explain_reason_title">原因：</string>
+    <string name="dialog_refuse_explain_remark_title">备注：</string>
+    <string name="dialog_refuse_explain_remark_hint">请输入拒绝原因详细说明</string>
+    <string name="dialog_refuse_explain_submit">提交</string>
+    <!--音视频咨询-待确认-->
+    <string name="consult_wait_confirm_refuse">拒绝</string>
+    <string name="consult_wait_confirm_accept">接受</string>
+    <string name="consult_wait_confirm_dialog_date_time_range_title">预计开始时间</string>
+    <string name="consult_wait_confirm_dialog_date_time_start">开始时间</string>
+    <string name="consult_wait_confirm_dialog_date_time_end">结束时间</string>
+    <!--音视频咨询-开始-->
+    <string name="consult_wait_start_video_call">视频通话</string>
+    <string name="consult_wait_start_video_call_start_time" formatted="false">%s&#160;&#160;&#160;&#160;%s~%s</string>
+    <!--确认咨询完成Dialog-->
+    <string name="dialog_consult_finish_content">本次咨询是否已完成？</string>
+    <string name="dialog_consult_finish_no">否</string>
+    <string name="dialog_consult_finish_yes">完成</string>
+
+    <!--档案详情-->
+    <string name="archives_detail_archives_name">1.档案名称</string>
+    <string name="archives_detail_question_disease_duration">2.本次问题持续多久了？</string>
+    <string name="archives_detail_question_disease_duration_hint">请选择本次问题持续时间</string>
+    <string name="archives_detail_question_for_consult">3.咨询人的问题</string>
+    <string name="archives_detail_question_for_consult_hint">请描述您的问题</string>
+    <string name="archives_detail_question_image_list" formatted="false">
+        <![CDATA[
+        上传报告或者患处照片<font color=\'#999999\'>（仅自己和医生可见）</font>
+        ]]>
+    </string>
+    <string name="archives_detail_question_image_list_num" formatted="false">%d/%d</string>
+    <string name="archives_detail_question_have_doctor">4.咨询人是否去医院就诊过？</string>
+    <string name="archives_detail_question_have_doctor_hint">是否去医院就诊过？</string>
+    <string name="archives_detail_question_for_help">5.咨询人期望得到的帮助？</string>
+    <string name="archives_detail_question_for_help_hint">请输入期望得到的帮助</string>
+    <string name="archives_detail_hospital">就诊医院及科室：</string>
+    <string name="archives_detail_hospital_hint">请输入就诊医院及科室</string>
+    <string name="archives_detail_disease">诊断的疾病名：</string>
+    <string name="archives_detail_create_time" formatted="false">生成时间：%s</string>
+    <string name="archives_detail_disease_hint">请输入诊断的疾病名</string>
+    <string name="consult_video_doctor_appointed_time" formatted="false">约定时间：%s&#160;&#160;&#160;&#160;%s~%s</string>
+    <string name="consult_video_call_duration" formatted="false">视频通话：%s&#160;&#160;&#160;&#160;时长：%s</string>
+    <string name="consult_time_am">上午</string>
+    <string name="consult_time_pm">下午</string>
+
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/color/color_child_tab_layout_text.xml b/app/src/main/res/color/color_child_tab_layout_text.xml
new file mode 100644
index 0000000..da1b52e
--- /dev/null
+++ b/app/src/main/res/color/color_child_tab_layout_text.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/white" android:state_selected="true" />
+    <item android:color="@color/text_black_33" android:state_selected="false"/>
+    <item android:color="@color/text_black_33"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/color_custom_scheduling_item_text.xml b/app/src/main/res/color/color_custom_scheduling_item_text.xml
new file mode 100644
index 0000000..74a6824
--- /dev/null
+++ b/app/src/main/res/color/color_custom_scheduling_item_text.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/white" android:state_checked="true"/>
+    <item android:color="@color/text_black_33" android:state_checked="false"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/color_state_menu_navi.xml b/app/src/main/res/color/color_state_menu_navi.xml
new file mode 100644
index 0000000..1d4c760
--- /dev/null
+++ b/app/src/main/res/color/color_state_menu_navi.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/theme_color" android:state_checked="true"/>
+    <item android:color="#888888" android:state_checked="false"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/color_state_menu_navi_text.xml b/app/src/main/res/color/color_state_menu_navi_text.xml
new file mode 100644
index 0000000..1d4c760
--- /dev/null
+++ b/app/src/main/res/color/color_state_menu_navi_text.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/theme_color" android:state_checked="true"/>
+    <item android:color="#888888" android:state_checked="false"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/color_suspension_cause_item_text.xml b/app/src/main/res/color/color_suspension_cause_item_text.xml
new file mode 100644
index 0000000..88229ce
--- /dev/null
+++ b/app/src/main/res/color/color_suspension_cause_item_text.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/theme_color" android:state_checked="true"/>
+    <item android:color="@color/text_black_33" android:state_checked="false"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/color_tab_layout_text.xml b/app/src/main/res/color/color_tab_layout_text.xml
new file mode 100644
index 0000000..1ff1846
--- /dev/null
+++ b/app/src/main/res/color/color_tab_layout_text.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/text_black_33" android:state_selected="true"/>
+    <item android:color="@color/text_black_66" android:state_selected="false"/>
+    <item android:color="@color/text_black_66"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 0000000..2b068d1
--- /dev/null
+++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-xxhdpi/bg_green_to_light_green.webp b/app/src/main/res/drawable-xxhdpi/bg_green_to_light_green.webp
new file mode 100644
index 0000000..a8a8c23
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/bg_green_to_light_green.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_close.webp b/app/src/main/res/drawable-xxhdpi/ic_close.webp
new file mode 100644
index 0000000..ded1d40
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_close.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_consult_num_tag.webp b/app/src/main/res/drawable-xxhdpi/ic_consult_num_tag.webp
new file mode 100644
index 0000000..4345825
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_consult_num_tag.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_default_archives_image.webp b/app/src/main/res/drawable-xxhdpi/ic_default_archives_image.webp
new file mode 100644
index 0000000..055919a
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_default_archives_image.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_delete.webp b/app/src/main/res/drawable-xxhdpi/ic_delete.webp
new file mode 100644
index 0000000..773a41c
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_delete.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_message.png b/app/src/main/res/drawable-xxhdpi/ic_message.png
new file mode 100644
index 0000000..713ce09
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_message.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_month_statistics.webp b/app/src/main/res/drawable-xxhdpi/ic_month_statistics.webp
new file mode 100644
index 0000000..860ed53
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_month_statistics.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_my_location.png b/app/src/main/res/drawable-xxhdpi/ic_my_location.png
new file mode 100644
index 0000000..537a124
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_my_location.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_search.webp b/app/src/main/res/drawable-xxhdpi/ic_search.webp
new file mode 100644
index 0000000..7e3a433
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_search.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_select_location.png b/app/src/main/res/drawable-xxhdpi/ic_select_location.png
new file mode 100644
index 0000000..3ebaf34
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_select_location.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_selected.webp b/app/src/main/res/drawable-xxhdpi/ic_selected.webp
new file mode 100644
index 0000000..b5c7e70
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_selected.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_unselected.webp b/app/src/main/res/drawable-xxhdpi/ic_unselected.webp
new file mode 100644
index 0000000..1e02441
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_unselected.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_back.webp b/app/src/main/res/drawable-xxhdpi/icon_back.webp
new file mode 100644
index 0000000..a3cbf03
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_back.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_image_add.webp b/app/src/main/res/drawable-xxhdpi/icon_image_add.webp
new file mode 100644
index 0000000..616d8ca
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_image_add.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_main_mine_normal.png b/app/src/main/res/drawable-xxhdpi/icon_main_mine_normal.png
new file mode 100644
index 0000000..c6e3738
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_main_mine_normal.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_main_mine_selected.webp b/app/src/main/res/drawable-xxhdpi/icon_main_mine_selected.webp
new file mode 100644
index 0000000..73d18a1
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_main_mine_selected.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_main_workbench_normal.webp b/app/src/main/res/drawable-xxhdpi/icon_main_workbench_normal.webp
new file mode 100644
index 0000000..2233f51
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_main_workbench_normal.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_main_workbench_selected.png b/app/src/main/res/drawable-xxhdpi/icon_main_workbench_selected.png
new file mode 100644
index 0000000..0bd3eb2
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_main_workbench_selected.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon_more_small_gray.webp b/app/src/main/res/drawable-xxhdpi/icon_more_small_gray.webp
new file mode 100644
index 0000000..8b044f6
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon_more_small_gray.webp differ
diff --git a/app/src/main/res/drawable/bg_80_white_background_shap.xml b/app/src/main/res/drawable/bg_80_white_background_shap.xml
new file mode 100644
index 0000000..f19879a
--- /dev/null
+++ b/app/src/main/res/drawable/bg_80_white_background_shap.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+    <solid android:color="#ccFFFFFF" />
+    <corners android:radius="7dp" />
+    <!--<padding android:left="15dp"-->
+        <!--android:top="8dp"-->
+        <!--android:right="15dp"-->
+        <!--android:bottom="8dp"/>-->
+<!--    <size-->
+<!--        android:width="437dp"-->
+<!--        android:height="79dp" />-->
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_blue_background_shap.xml b/app/src/main/res/drawable/bg_blue_background_shap.xml
new file mode 100644
index 0000000..4aac120
--- /dev/null
+++ b/app/src/main/res/drawable/bg_blue_background_shap.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+    <solid android:color="#21BEBD" />
+    <corners android:radius="@dimen/dp_20" />
+    <!--<padding android:left="15dp"-->
+        <!--android:top="8dp"-->
+        <!--android:right="15dp"-->
+        <!--android:bottom="8dp"/>-->
+<!--    <size-->
+<!--        android:width="437dp"-->
+<!--        android:height="79dp" />-->
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_blue_background_shap_radius4.xml b/app/src/main/res/drawable/bg_blue_background_shap_radius4.xml
new file mode 100644
index 0000000..d75d442
--- /dev/null
+++ b/app/src/main/res/drawable/bg_blue_background_shap_radius4.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+    <solid android:color="#21BEBD" />
+    <corners android:radius="@dimen/dp_4" />
+    <!--<padding android:left="15dp"-->
+        <!--android:top="8dp"-->
+        <!--android:right="15dp"-->
+        <!--android:bottom="8dp"/>-->
+<!--    <size-->
+<!--        android:width="437dp"-->
+<!--        android:height="79dp" />-->
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_bottom_radius_card.xml b/app/src/main/res/drawable/bg_bottom_radius_card.xml
new file mode 100644
index 0000000..392d380
--- /dev/null
+++ b/app/src/main/res/drawable/bg_bottom_radius_card.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 边 -->
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp" />
+            <solid android:color="#00CCCCCC" />
+            <corners android:bottomLeftRadius="@dimen/dp_8"
+                android:bottomRightRadius="@dimen/dp_8"
+                android:topLeftRadius="@dimen/dp_0"
+                android:topRightRadius="@dimen/dp_0"/>
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp" />
+            <solid android:color="#0DCCCCCC" />
+            <corners android:bottomLeftRadius="@dimen/dp_8"
+                android:bottomRightRadius="@dimen/dp_8"
+                android:topLeftRadius="@dimen/dp_0"
+                android:topRightRadius="@dimen/dp_0" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp" />
+            <solid android:color="#1ACCCCCC" />
+            <corners android:bottomLeftRadius="@dimen/dp_8"
+                android:bottomRightRadius="@dimen/dp_8"
+                android:topLeftRadius="@dimen/dp_0"
+                android:topRightRadius="@dimen/dp_0" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp" />
+            <solid android:color="#26CCCCCC" />
+            <corners android:radius="10dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp" />
+            <solid android:color="#33CCCCCC" />
+            <corners android:bottomLeftRadius="@dimen/dp_8"
+                android:bottomRightRadius="@dimen/dp_8"
+                android:topLeftRadius="@dimen/dp_0"
+                android:topRightRadius="@dimen/dp_0" />
+        </shape>
+    </item>
+    <!-- 中心背景 -->
+    <item>
+        <shape android:shape="rectangle"
+            android:useLevel="false">
+            <!-- 实心 -->
+            <solid android:color="#ffffff" />
+            <corners android:bottomLeftRadius="@dimen/dp_8"
+                android:bottomRightRadius="@dimen/dp_8"
+                android:topLeftRadius="@dimen/dp_0"
+                android:topRightRadius="@dimen/dp_0" />
+            <padding android:left="5dp"
+                android:right="5dp"
+                android:bottom="5dp"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_card.xml b/app/src/main/res/drawable/bg_card.xml
new file mode 100644
index 0000000..35923d8
--- /dev/null
+++ b/app/src/main/res/drawable/bg_card.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 边 -->
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="1dp" />
+            <solid android:color="#00CCCCCC" />
+            <corners android:radius="10dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="1dp" />
+            <solid android:color="#0DCCCCCC" />
+            <corners android:radius="10dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="1dp" />
+            <solid android:color="#1ACCCCCC" />
+            <corners android:radius="10dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="1dp" />
+            <solid android:color="#26CCCCCC" />
+            <corners android:radius="10dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="1dp" />
+            <solid android:color="#33CCCCCC" />
+            <corners android:radius="10dp" />
+        </shape>
+    </item>
+    <!-- 中心背景 -->
+    <item
+        >
+        <shape android:shape="rectangle">
+            <!-- 实心 -->
+            <solid android:color="#ffffff" />
+            <corners android:radius="10dp" />
+            <padding android:left="5dp"
+                android:right="5dp"
+                android:top="5dp"
+                android:bottom="5dp"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_card_bottom.xml b/app/src/main/res/drawable/bg_card_bottom.xml
new file mode 100644
index 0000000..eddc095
--- /dev/null
+++ b/app/src/main/res/drawable/bg_card_bottom.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 边 -->
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:left="1dp"
+                android:right="1dp"
+                android:bottom="1dp" />
+            <solid android:color="#00CCCCCC" />
+            <corners android:bottomLeftRadius="@dimen/dp_10"
+                android:bottomRightRadius="@dimen/dp_10"/>
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:left="1dp"
+                android:right="1dp"
+                android:bottom="1dp" />
+            <solid android:color="#0DCCCCCC" />
+            <corners android:bottomLeftRadius="@dimen/dp_10"
+                android:bottomRightRadius="@dimen/dp_10"/>
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:left="1dp"
+                android:right="1dp"
+                android:bottom="1dp" />
+            <solid android:color="#1ACCCCCC" />
+            <corners android:radius="10dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:left="1dp"
+                android:right="1dp"
+                android:bottom="1dp" />
+            <solid android:color="#26CCCCCC" />
+            <corners android:bottomLeftRadius="@dimen/dp_10"
+                android:bottomRightRadius="@dimen/dp_10"/>
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:left="1dp"
+                android:right="1dp"
+                android:bottom="1dp" />
+            <solid android:color="#33CCCCCC" />
+            <corners android:bottomLeftRadius="@dimen/dp_10"
+                android:bottomRightRadius="@dimen/dp_10"/>
+        </shape>
+    </item>
+    <!-- 中心背景 -->
+    <item>
+        <shape android:shape="rectangle"
+            android:useLevel="false">
+            <!-- 实心 -->
+            <solid android:color="#ffffff" />
+            <corners android:bottomLeftRadius="@dimen/dp_10"
+                android:bottomRightRadius="@dimen/dp_10"/>
+            <padding android:left="5dp"
+                android:right="5dp"
+                android:bottom="5dp"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_card_top.xml b/app/src/main/res/drawable/bg_card_top.xml
new file mode 100644
index 0000000..96904c9
--- /dev/null
+++ b/app/src/main/res/drawable/bg_card_top.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 边 -->
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:left="1dp"
+                android:right="1dp"
+                android:top="1dp" />
+            <solid android:color="#00CCCCCC" />
+            <corners android:topLeftRadius="@dimen/dp_10"
+                android:topRightRadius="@dimen/dp_10"/>
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:left="1dp"
+                android:right="1dp"
+                android:top="1dp" />
+            <solid android:color="#0DCCCCCC" />
+            <corners android:topLeftRadius="@dimen/dp_10"
+                android:topRightRadius="@dimen/dp_10"/>
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:left="1dp"
+                android:right="1dp"
+                android:top="1dp" />
+            <solid android:color="#1ACCCCCC" />
+            <corners android:radius="10dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:left="1dp"
+                android:right="1dp"
+                android:top="1dp" />
+            <solid android:color="#26CCCCCC" />
+            <corners android:topLeftRadius="@dimen/dp_10"
+                android:topRightRadius="@dimen/dp_10"/>
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:left="1dp"
+                android:right="1dp"
+                android:top="1dp" />
+            <solid android:color="#33CCCCCC" />
+            <corners android:topLeftRadius="@dimen/dp_10"
+                android:topRightRadius="@dimen/dp_10"/>
+        </shape>
+    </item>
+    <!-- 中心背景 -->
+    <item>
+        <shape android:shape="rectangle"
+            android:useLevel="false">
+            <!-- 实心 -->
+            <solid android:color="#ffffff" />
+            <corners android:topLeftRadius="@dimen/dp_10"
+                android:topRightRadius="@dimen/dp_10"/>
+            <padding android:left="5dp"
+                android:right="5dp"
+                android:top="5dp"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_child_tab_layout_item.xml b/app/src/main/res/drawable/bg_child_tab_layout_item.xml
new file mode 100644
index 0000000..c937ddb
--- /dev/null
+++ b/app/src/main/res/drawable/bg_child_tab_layout_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--    选中状态-->
+    <item android:drawable="@drawable/rectangle_round_corner20_theme" android:state_checked="true"/>
+    <item android:drawable="@drawable/rectangle_round_corner20_theme" android:state_selected="true"/>
+    <!--    默认状态-->
+    <item android:drawable="@drawable/rectangle_round_corner20_dark_grey"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_custom_scheduling_item.xml b/app/src/main/res/drawable/bg_custom_scheduling_item.xml
new file mode 100644
index 0000000..ee13aaf
--- /dev/null
+++ b/app/src/main/res/drawable/bg_custom_scheduling_item.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--    选中状态-->
+    <item android:drawable="@drawable/rectangle_round_corner3_green_gradient" android:state_checked="true"/>
+    <!--    默认状态-->
+    <item android:drawable="@drawable/rectangle_round_corner10_white"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_date_time_range_text.xml b/app/src/main/res/drawable/bg_date_time_range_text.xml
new file mode 100644
index 0000000..b9f0466
--- /dev/null
+++ b/app/src/main/res/drawable/bg_date_time_range_text.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--    选中状态-->
+    <item android:drawable="@drawable/rectangle_round_corner5_theme_stroke_white" android:state_activated="true"/>
+    <!--    不选中状态-->
+    <item android:drawable="@drawable/rectangle_round_corner5_grey_stroke_white" android:state_activated="false"/>
+    <!--    默认状态-->
+    <item android:drawable="@drawable/rectangle_round_corner5_grey_stroke_white"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_frame.xml b/app/src/main/res/drawable/bg_frame.xml
new file mode 100644
index 0000000..7f9ad4a
--- /dev/null
+++ b/app/src/main/res/drawable/bg_frame.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="1.0dip"
+    android:shape="rectangle"
+    android:useLevel="false">
+    <corners android:radius="8dp"/>
+    <stroke
+        android:width="1dp"
+        android:color="#DEDEDE " />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_frame_blue.xml b/app/src/main/res/drawable/bg_frame_blue.xml
new file mode 100644
index 0000000..c779586
--- /dev/null
+++ b/app/src/main/res/drawable/bg_frame_blue.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="1.0dip"
+    android:shape="rectangle"
+    android:useLevel="false">
+    <corners android:radius="8dp"/>
+    <stroke
+        android:width="1dp"
+        android:color="#21BEBD " />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_green_to_white.xml b/app/src/main/res/drawable/bg_green_to_white.xml
new file mode 100644
index 0000000..b06f8e3
--- /dev/null
+++ b/app/src/main/res/drawable/bg_green_to_white.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+    <gradient
+        android:angle="270"
+        android:endColor="#FFFFFF"
+        android:startColor="#54eccb"
+        />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_grey.xml b/app/src/main/res/drawable/bg_grey.xml
new file mode 100644
index 0000000..09393cd
--- /dev/null
+++ b/app/src/main/res/drawable/bg_grey.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+    <solid android:color="#EDEDED" />
+    <corners android:radius="7dp" />
+    <!--<padding android:left="15dp"-->
+    <!--android:top="8dp"-->
+    <!--android:right="15dp"-->
+    <!--android:bottom="8dp"/>-->
+    <!--    <size-->
+    <!--        android:width="437dp"-->
+    <!--        android:height="79dp" />-->
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_line_1.xml b/app/src/main/res/drawable/bg_line_1.xml
new file mode 100644
index 0000000..2c0596c
--- /dev/null
+++ b/app/src/main/res/drawable/bg_line_1.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <item
+        android:left="-2dp"
+        android:right="-2dp"
+        android:bottom="-2dp">
+        <shape>
+            <stroke
+                android:width="1dp"
+                android:color="#000000"/>
+        </shape>
+    </item>
+    <item
+        android:top="-2dp"
+        android:right="-2dp"
+        android:bottom="-2dp">
+        <shape>
+            <stroke
+                android:width="1dp"
+                android:color="#000000"/>
+        </shape>
+    </item>
+<!--    <item-->
+<!--        android:left="-2dp"-->
+<!--        android:top="-2dp"-->
+<!--        android:bottom="-2dp">-->
+<!--        <shape>-->
+<!--            <stroke-->
+<!--                android:width="1dp"-->
+<!--                android:color="#000000"/>-->
+<!--        </shape>-->
+<!--    </item>-->
+    <item
+        android:left="-2dp"
+        android:right="-2dp"
+        android:top="-2dp"
+        >
+        <shape>
+            <stroke
+                android:width="1dp"
+                android:color="#000000"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_line_all.xml b/app/src/main/res/drawable/bg_line_all.xml
new file mode 100644
index 0000000..3c09b5b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_line_all.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <item
+        android:left="-2dp"
+        android:right="-2dp"
+        android:bottom="-2dp">
+        <shape>
+            <stroke
+                android:width="1dp"
+                android:color="#000000"/>
+        </shape>
+    </item>
+    <item
+        android:top="-2dp"
+        android:right="-2dp"
+        android:bottom="-2dp">
+        <shape>
+            <stroke
+                android:width="1dp"
+                android:color="#000000"/>
+        </shape>
+    </item>
+    <item
+        android:left="-2dp"
+        android:top="-2dp"
+        android:bottom="-2dp">
+        <shape>
+            <stroke
+                android:width="1dp"
+                android:color="#000000"/>
+        </shape>
+    </item>
+    <item
+        android:left="-2dp"
+        android:right="-2dp"
+        android:top="-2dp"
+        >
+        <shape>
+            <stroke
+                android:width="1dp"
+                android:color="#000000"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_loading_shap.xml b/app/src/main/res/drawable/bg_loading_shap.xml
new file mode 100644
index 0000000..827bdf5
--- /dev/null
+++ b/app/src/main/res/drawable/bg_loading_shap.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+    <corners android:radius="8dp"/>
+    <solid android:color="#80000000"/>
+    <stroke android:color="#80000000"/>
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_orange_background_shap.xml b/app/src/main/res/drawable/bg_orange_background_shap.xml
new file mode 100644
index 0000000..125982c
--- /dev/null
+++ b/app/src/main/res/drawable/bg_orange_background_shap.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+    <solid android:color="#D66948" />
+    <corners android:radius="7dp" />
+    <!--<padding android:left="15dp"-->
+        <!--android:top="8dp"-->
+        <!--android:right="15dp"-->
+        <!--android:bottom="8dp"/>-->
+<!--    <size-->
+<!--        android:width="437dp"-->
+<!--        android:height="79dp" />-->
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_red_background_shap.xml b/app/src/main/res/drawable/bg_red_background_shap.xml
new file mode 100644
index 0000000..a687225
--- /dev/null
+++ b/app/src/main/res/drawable/bg_red_background_shap.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+    <solid android:color="#BD130B" />
+    <corners android:radius="7dp" />
+    <!--<padding android:left="15dp"-->
+        <!--android:top="8dp"-->
+        <!--android:right="15dp"-->
+        <!--android:bottom="8dp"/>-->
+<!--    <size-->
+<!--        android:width="437dp"-->
+<!--        android:height="79dp" />-->
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_red_to_white.xml b/app/src/main/res/drawable/bg_red_to_white.xml
new file mode 100644
index 0000000..ee5f881
--- /dev/null
+++ b/app/src/main/res/drawable/bg_red_to_white.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+    <gradient
+        android:angle="270"
+        android:endColor="#FFFFFF"
+        android:startColor="#BD130B"
+        />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_search_shap_radius23.xml b/app/src/main/res/drawable/bg_search_shap_radius23.xml
new file mode 100644
index 0000000..cb2dd53
--- /dev/null
+++ b/app/src/main/res/drawable/bg_search_shap_radius23.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+    <solid android:color="#F1F1F1" />
+    <corners android:radius="23dp" />
+    <!--<padding android:left="15dp"-->
+        <!--android:top="8dp"-->
+        <!--android:right="15dp"-->
+        <!--android:bottom="8dp"/>-->
+<!--    <size-->
+<!--        android:width="437dp"-->
+<!--        android:height="79dp" />-->
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_spinner.xml b/app/src/main/res/drawable/bg_spinner.xml
new file mode 100644
index 0000000..c4ebeab
--- /dev/null
+++ b/app/src/main/res/drawable/bg_spinner.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 第一组item：设置Spinner背景边框 -->
+    <item>
+        <shape
+            android:shape="rectangle"
+            android:useLevel="false">
+
+
+            <corners android:radius="@dimen/dp_5" />
+            <solid android:color="@color/white" />
+            <stroke
+                android:width="1dp"
+                android:color="#CCCCCC" />
+            <padding
+                android:left="@dimen/dp_5"
+                android:right="@dimen/dp_10" >
+            </padding>
+        </shape>
+        <!-- 第二组item：设置spinner箭头图片 -->
+    </item>
+    <item>
+        <bitmap
+            android:gravity="end"
+            android:src="@drawable/icon_expansion"
+            >
+        </bitmap>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_spinner_transparent.xml b/app/src/main/res/drawable/bg_spinner_transparent.xml
new file mode 100644
index 0000000..186fe08
--- /dev/null
+++ b/app/src/main/res/drawable/bg_spinner_transparent.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 第一组item：设置Spinner背景边框 -->
+    <item>
+        <shape
+            android:shape="rectangle">
+
+
+            <solid android:color="@color/white" />
+        </shape>
+        <!-- 第二组item：设置spinner箭头图片 -->
+    </item>
+    <item
+        >
+        <bitmap
+            android:gravity="end"
+            android:src="@drawable/icon_expansion"
+            >
+        </bitmap>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_suspension_cause_item.xml b/app/src/main/res/drawable/bg_suspension_cause_item.xml
new file mode 100644
index 0000000..c47293c
--- /dev/null
+++ b/app/src/main/res/drawable/bg_suspension_cause_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--    选中状态-->
+    <item android:drawable="@drawable/rectangle_round_corner20_theme_stroke_white" android:state_checked="true"/>
+    <item android:drawable="@drawable/rectangle_round_corner20_theme_stroke_white" android:state_selected="true"/>
+    <!--    默认状态-->
+    <item android:drawable="@drawable/rectangle_round_corner20_gray_stroke_transparent"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_toast_shape.xml b/app/src/main/res/drawable/bg_toast_shape.xml
new file mode 100644
index 0000000..86ede13
--- /dev/null
+++ b/app/src/main/res/drawable/bg_toast_shape.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <solid android:color="#000000" />
+
+    <corners android:radius="10px" />
+	
+    <padding
+        android:bottom="0dp"
+        android:left="0dp"
+        android:right="0dp"
+        android:top="0dp" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_toolbar.xml b/app/src/main/res/drawable/bg_toolbar.xml
new file mode 100644
index 0000000..8578c53
--- /dev/null
+++ b/app/src/main/res/drawable/bg_toolbar.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 连框颜色值 -->
+    <item>
+        <shape>
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+    <!-- 主体背景颜色值 -->
+    <item
+        android:bottom="@dimen/dp_0_5"><!--设置只有底部和右边有边框-->
+        <shape>
+            <solid android:color="@color/theme_color" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_transparent.xml b/app/src/main/res/drawable/bg_transparent.xml
new file mode 100644
index 0000000..7c335be
--- /dev/null
+++ b/app/src/main/res/drawable/bg_transparent.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="1.0dip"
+    android:shape="rectangle"
+    android:useLevel="false">
+    <solid android:color="@color/transparent" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_white_background_shap.xml b/app/src/main/res/drawable/bg_white_background_shap.xml
new file mode 100644
index 0000000..683f50d
--- /dev/null
+++ b/app/src/main/res/drawable/bg_white_background_shap.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+    <solid android:color="#FFFFFF" />
+    <corners android:radius="7dp" />
+    <!--<padding android:left="15dp"-->
+        <!--android:top="8dp"-->
+        <!--android:right="15dp"-->
+        <!--android:bottom="8dp"/>-->
+<!--    <size-->
+<!--        android:width="437dp"-->
+<!--        android:height="79dp" />-->
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_white_background_shap_radius14.xml b/app/src/main/res/drawable/bg_white_background_shap_radius14.xml
new file mode 100644
index 0000000..389b2c2
--- /dev/null
+++ b/app/src/main/res/drawable/bg_white_background_shap_radius14.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+    <solid android:color="#ccFFFFFF" />
+    <corners android:radius="14dp" />
+    <!--<padding android:left="15dp"-->
+        <!--android:top="8dp"-->
+        <!--android:right="15dp"-->
+        <!--android:bottom="8dp"/>-->
+<!--    <size-->
+<!--        android:width="437dp"-->
+<!--        android:height="79dp" />-->
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_white_background_shap_radius23.xml b/app/src/main/res/drawable/bg_white_background_shap_radius23.xml
new file mode 100644
index 0000000..e4f0fa7
--- /dev/null
+++ b/app/src/main/res/drawable/bg_white_background_shap_radius23.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+    <solid android:color="#ccFFFFFF" />
+    <corners android:radius="23dp" />
+    <!--<padding android:left="15dp"-->
+        <!--android:top="8dp"-->
+        <!--android:right="15dp"-->
+        <!--android:bottom="8dp"/>-->
+<!--    <size-->
+<!--        android:width="437dp"-->
+<!--        android:height="79dp" />-->
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_white_bottom_gray_line.xml b/app/src/main/res/drawable/bg_white_bottom_gray_line.xml
new file mode 100644
index 0000000..4bd8368
--- /dev/null
+++ b/app/src/main/res/drawable/bg_white_bottom_gray_line.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 连框颜色值 -->
+    <item>
+        <shape>
+            <solid android:color="@color/line_grey_color" />
+        </shape>
+    </item>
+    <!-- 主体背景颜色值 -->
+    <item
+        android:bottom="@dimen/dp_0_5"><!--设置只有底部和右边有边框-->
+        <shape>
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_white_bottom_right_angle_background_shap.xml b/app/src/main/res/drawable/bg_white_bottom_right_angle_background_shap.xml
new file mode 100644
index 0000000..6d4b693
--- /dev/null
+++ b/app/src/main/res/drawable/bg_white_bottom_right_angle_background_shap.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+    <solid android:color="#FFFFFF" />
+    <corners android:topLeftRadius="@dimen/dp_7"
+        android:topRightRadius="@dimen/dp_7"
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="0dp"
+        />
+    <!--<padding android:left="15dp"-->
+        <!--android:top="8dp"-->
+        <!--android:right="15dp"-->
+        <!--android:bottom="8dp"/>-->
+<!--    <size-->
+<!--        android:width="437dp"-->
+<!--        android:height="79dp" />-->
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_white_line.xml b/app/src/main/res/drawable/bg_white_line.xml
new file mode 100644
index 0000000..3b32024
--- /dev/null
+++ b/app/src/main/res/drawable/bg_white_line.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+    <solid android:color="#FFFFFF" />
+    <stroke
+        android:width="1dp"
+        android:color="#E0E0E0"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_white_right_angle_background_shap.xml b/app/src/main/res/drawable/bg_white_right_angle_background_shap.xml
new file mode 100644
index 0000000..8f08133
--- /dev/null
+++ b/app/src/main/res/drawable/bg_white_right_angle_background_shap.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+    <solid android:color="#FFFFFF" />
+    <!--<padding android:left="15dp"-->
+        <!--android:top="8dp"-->
+        <!--android:right="15dp"-->
+        <!--android:bottom="8dp"/>-->
+<!--    <size-->
+<!--        android:width="437dp"-->
+<!--        android:height="79dp" />-->
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_white_round.xml b/app/src/main/res/drawable/bg_white_round.xml
new file mode 100644
index 0000000..7741338
--- /dev/null
+++ b/app/src/main/res/drawable/bg_white_round.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid android:color="#FFFFFF"/>
+    <corners android:radius="16dp"/>
+<!--    <size-->
+<!--        android:width="15dp"-->
+<!--        android:height="15dp"></size>-->
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_white_stroke.xml b/app/src/main/res/drawable/bg_white_stroke.xml
new file mode 100644
index 0000000..f3915c5
--- /dev/null
+++ b/app/src/main/res/drawable/bg_white_stroke.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+    <solid android:color="#EDEDED" />
+    <corners android:radius="7dp" />
+
+    <!--<padding android:left="15dp"-->
+    <!--android:top="8dp"-->
+    <!--android:right="15dp"-->
+    <!--android:bottom="8dp"/>-->
+    <!--    <size-->
+    <!--        android:width="437dp"-->
+    <!--        android:height="79dp" />-->
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_white_top_right_angle_background_shap.xml b/app/src/main/res/drawable/bg_white_top_right_angle_background_shap.xml
new file mode 100644
index 0000000..bec7f9b
--- /dev/null
+++ b/app/src/main/res/drawable/bg_white_top_right_angle_background_shap.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+    <solid android:color="#FFFFFF" />
+    <corners android:topLeftRadius="0dp"
+        android:topRightRadius="0dp"
+        android:bottomLeftRadius="@dimen/dp_7"
+        android:bottomRightRadius="@dimen/dp_7"
+        />
+    <!--<padding android:left="15dp"-->
+        <!--android:top="8dp"-->
+        <!--android:right="15dp"-->
+        <!--android:bottom="8dp"/>-->
+<!--    <size-->
+<!--        android:width="437dp"-->
+<!--        android:height="79dp" />-->
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bottom_tab_red_point_bg.xml b/app/src/main/res/drawable/bottom_tab_red_point_bg.xml
new file mode 100644
index 0000000..04d28a6
--- /dev/null
+++ b/app/src/main/res/drawable/bottom_tab_red_point_bg.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#ff0000" />
+    <corners android:radius="15dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/check_theme_style.xml b/app/src/main/res/drawable/check_theme_style.xml
new file mode 100644
index 0000000..a4ca0f6
--- /dev/null
+++ b/app/src/main/res/drawable/check_theme_style.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!--    选中状态-->
+    <item android:drawable="@drawable/ic_selected" android:state_checked="true"/>
+    <!--    不选中状态-->
+    <item android:drawable="@drawable/ic_unselected" android:state_checked="false"/>
+    <!--    默认状态-->
+    <item android:drawable="@drawable/ic_unselected"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/demo_overseas_main_tab_contact_normal_bg.png b/app/src/main/res/drawable/demo_overseas_main_tab_contact_normal_bg.png
new file mode 100644
index 0000000..5b1029a
Binary files /dev/null and b/app/src/main/res/drawable/demo_overseas_main_tab_contact_normal_bg.png differ
diff --git a/app/src/main/res/drawable/demo_overseas_main_tab_contact_selected_bg.png b/app/src/main/res/drawable/demo_overseas_main_tab_contact_selected_bg.png
new file mode 100644
index 0000000..621d0ee
Binary files /dev/null and b/app/src/main/res/drawable/demo_overseas_main_tab_contact_selected_bg.png differ
diff --git a/app/src/main/res/drawable/demo_overseas_main_tab_conversation_normal.png b/app/src/main/res/drawable/demo_overseas_main_tab_conversation_normal.png
new file mode 100644
index 0000000..94277f6
Binary files /dev/null and b/app/src/main/res/drawable/demo_overseas_main_tab_conversation_normal.png differ
diff --git a/app/src/main/res/drawable/demo_overseas_main_tab_conversation_selected.png b/app/src/main/res/drawable/demo_overseas_main_tab_conversation_selected.png
new file mode 100644
index 0000000..179d6a0
Binary files /dev/null and b/app/src/main/res/drawable/demo_overseas_main_tab_conversation_selected.png differ
diff --git a/app/src/main/res/drawable/demo_overseas_main_tab_settings_normal_bg.png b/app/src/main/res/drawable/demo_overseas_main_tab_settings_normal_bg.png
new file mode 100644
index 0000000..6efc7ee
Binary files /dev/null and b/app/src/main/res/drawable/demo_overseas_main_tab_settings_normal_bg.png differ
diff --git a/app/src/main/res/drawable/demo_overseas_main_tab_settings_selected_bg.png b/app/src/main/res/drawable/demo_overseas_main_tab_settings_selected_bg.png
new file mode 100644
index 0000000..a43e608
Binary files /dev/null and b/app/src/main/res/drawable/demo_overseas_main_tab_settings_selected_bg.png differ
diff --git a/app/src/main/res/drawable/dotted_line_shape.xml b/app/src/main/res/drawable/dotted_line_shape.xml
new file mode 100644
index 0000000..b4f48ed
--- /dev/null
+++ b/app/src/main/res/drawable/dotted_line_shape.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <!--填充色-->
+    <solid android:color="@android:color/white" />
+
+    <!--圆角-->
+        <corners android:radius="12dp" />
+
+    <!--虚线边框-->
+    <stroke
+        android:width="1dp"
+        android:color="@android:color/black"
+        android:dashWidth="1dp"
+        android:dashGap="2dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_health_guidance.png b/app/src/main/res/drawable/ic_health_guidance.png
new file mode 100644
index 0000000..02bcba7
Binary files /dev/null and b/app/src/main/res/drawable/ic_health_guidance.png differ
diff --git a/app/src/main/res/drawable/ic_home_emergency_doctor.png b/app/src/main/res/drawable/ic_home_emergency_doctor.png
new file mode 100644
index 0000000..dbbd53a
Binary files /dev/null and b/app/src/main/res/drawable/ic_home_emergency_doctor.png differ
diff --git a/app/src/main/res/drawable/ic_home_health_checkup.png b/app/src/main/res/drawable/ic_home_health_checkup.png
new file mode 100644
index 0000000..cf31342
Binary files /dev/null and b/app/src/main/res/drawable/ic_home_health_checkup.png differ
diff --git a/app/src/main/res/drawable/ic_home_health_report.png b/app/src/main/res/drawable/ic_home_health_report.png
new file mode 100644
index 0000000..128d9de
Binary files /dev/null and b/app/src/main/res/drawable/ic_home_health_report.png differ
diff --git a/app/src/main/res/drawable/rectangle_bottom_gray_stroke_white.xml b/app/src/main/res/drawable/rectangle_bottom_gray_stroke_white.xml
new file mode 100644
index 0000000..e64d20b
--- /dev/null
+++ b/app/src/main/res/drawable/rectangle_bottom_gray_stroke_white.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+    <item>
+        <shape
+            android:shape="rectangle">
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+    <item
+        android:left="@dimen/dp_16"
+        android:right="@dimen/dp_16"
+        android:height="@dimen/dp_1"
+        android:gravity="bottom">
+        <shape
+            android:shape="rectangle">
+            <solid android:color="@color/line_grey_color" />
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangle_gray_stroke_transparent.xml b/app/src/main/res/drawable/rectangle_gray_stroke_transparent.xml
new file mode 100644
index 0000000..a25a4b6
--- /dev/null
+++ b/app/src/main/res/drawable/rectangle_gray_stroke_transparent.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="1.0dip"
+    android:shape="rectangle"
+    android:useLevel="false">
+
+
+    <solid android:color="@color/transparent" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/line_grey_color" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangle_grey_left_stroke_dark_grey.xml b/app/src/main/res/drawable/rectangle_grey_left_stroke_dark_grey.xml
new file mode 100644
index 0000000..eeeb2e2
--- /dev/null
+++ b/app/src/main/res/drawable/rectangle_grey_left_stroke_dark_grey.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+<item>
+    <shape>
+        <!--    边框颜色 -->
+        <solid android:color="#809999"/>
+    </shape>
+</item>
+<!-- 给View的上 左  右设置8dp的边框 -->
+<item android:left="@dimen/dp_3"  >
+    <shape>
+        <!--     View填充颜色 -->
+        <solid android:color="#F3F3F5" />
+    </shape>
+</item>
+
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangle_round_bottom_corner10_white.xml b/app/src/main/res/drawable/rectangle_round_bottom_corner10_white.xml
new file mode 100644
index 0000000..0bd2885
--- /dev/null
+++ b/app/src/main/res/drawable/rectangle_round_bottom_corner10_white.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="1.0dip"
+    android:shape="rectangle"
+    android:useLevel="false">
+    <corners android:bottomLeftRadius="@dimen/dp_10"
+           android:bottomRightRadius="@dimen/dp_10"/>
+    <solid android:color="@color/white" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangle_round_corner10_alpha94_theme.xml b/app/src/main/res/drawable/rectangle_round_corner10_alpha94_theme.xml
new file mode 100644
index 0000000..9ca7cb8
--- /dev/null
+++ b/app/src/main/res/drawable/rectangle_round_corner10_alpha94_theme.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="1.0dip"
+    android:shape="rectangle"
+    android:useLevel="false">
+    <corners android:radius="@dimen/dp_10" />
+    <solid android:color="#0d54eccb" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangle_round_corner10_green_gradient.xml b/app/src/main/res/drawable/rectangle_round_corner10_green_gradient.xml
new file mode 100644
index 0000000..8c5152b
--- /dev/null
+++ b/app/src/main/res/drawable/rectangle_round_corner10_green_gradient.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="1.0dip"
+    android:shape="rectangle"
+    android:useLevel="false">
+    <corners android:radius="@dimen/dp_3" />
+    <gradient
+        android:angle="225"
+        android:endColor="@color/theme_color"
+        android:startColor="#54ECCB"
+        />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangle_round_corner10_grey.xml b/app/src/main/res/drawable/rectangle_round_corner10_grey.xml
new file mode 100644
index 0000000..73052b2
--- /dev/null
+++ b/app/src/main/res/drawable/rectangle_round_corner10_grey.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="1.0dip"
+    android:shape="rectangle"
+    android:useLevel="false">
+    <corners android:radius="@dimen/dp_10" />
+    <solid android:color="#EFEFEF" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangle_round_corner10_white.xml b/app/src/main/res/drawable/rectangle_round_corner10_white.xml
new file mode 100644
index 0000000..9da1a53
--- /dev/null
+++ b/app/src/main/res/drawable/rectangle_round_corner10_white.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="1.0dip"
+    android:shape="rectangle"
+    android:useLevel="false">
+    <corners android:radius="@dimen/dp_10" />
+    <solid android:color="@color/white" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangle_round_corner20_dark_grey.xml b/app/src/main/res/drawable/rectangle_round_corner20_dark_grey.xml
new file mode 100644
index 0000000..356758e
--- /dev/null
+++ b/app/src/main/res/drawable/rectangle_round_corner20_dark_grey.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="1.0dip"
+    android:shape="rectangle"
+    android:useLevel="false">
+    <corners android:radius="@dimen/dp_20" />
+    <solid android:color="#DDDDDD" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangle_round_corner20_gray_stroke_transparent.xml b/app/src/main/res/drawable/rectangle_round_corner20_gray_stroke_transparent.xml
new file mode 100644
index 0000000..19ae9f7
--- /dev/null
+++ b/app/src/main/res/drawable/rectangle_round_corner20_gray_stroke_transparent.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="1.0dip"
+    android:shape="rectangle"
+    android:useLevel="false">
+
+
+    <corners android:radius="@dimen/dp_20" />
+    <solid android:color="@color/transparent" />
+    <stroke
+        android:width="1dp"
+        android:color="#BBBBBB" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangle_round_corner20_grey.xml b/app/src/main/res/drawable/rectangle_round_corner20_grey.xml
new file mode 100644
index 0000000..681f4dc
--- /dev/null
+++ b/app/src/main/res/drawable/rectangle_round_corner20_grey.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="1.0dip"
+    android:shape="rectangle"
+    android:useLevel="false">
+    <corners android:radius="@dimen/dp_20" />
+    <solid android:color="@color/theme_bg" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangle_round_corner20_theme.xml b/app/src/main/res/drawable/rectangle_round_corner20_theme.xml
new file mode 100644
index 0000000..51ffe16
--- /dev/null
+++ b/app/src/main/res/drawable/rectangle_round_corner20_theme.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="1.0dip"
+    android:shape="rectangle"
+    android:useLevel="false">
+    <corners android:radius="@dimen/dp_20" />
+    <solid android:color="@color/theme_color" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangle_round_corner20_theme_stroke_white.xml b/app/src/main/res/drawable/rectangle_round_corner20_theme_stroke_white.xml
new file mode 100644
index 0000000..730b619
--- /dev/null
+++ b/app/src/main/res/drawable/rectangle_round_corner20_theme_stroke_white.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="1.0dip"
+    android:shape="rectangle"
+    android:useLevel="false">
+
+
+    <corners android:radius="@dimen/dp_20" />
+    <solid android:color="@color/white" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/theme_color" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangle_round_corner3_green_gradient.xml b/app/src/main/res/drawable/rectangle_round_corner3_green_gradient.xml
new file mode 100644
index 0000000..e1dd9cd
--- /dev/null
+++ b/app/src/main/res/drawable/rectangle_round_corner3_green_gradient.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="1.0dip"
+    android:shape="rectangle"
+    android:useLevel="false">
+    <corners android:radius="@dimen/dp_3" />
+    <gradient
+        android:angle="270"
+        android:endColor="#21BEBD"
+        android:startColor="#54ECCB"
+        />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangle_round_corner5_dark_grey.xml b/app/src/main/res/drawable/rectangle_round_corner5_dark_grey.xml
new file mode 100644
index 0000000..bff611a
--- /dev/null
+++ b/app/src/main/res/drawable/rectangle_round_corner5_dark_grey.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="1.0dip"
+    android:shape="rectangle"
+    android:useLevel="false">
+    <corners android:radius="@dimen/dp_5" />
+    <solid android:color="#BBBBBB" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangle_round_corner5_grey.xml b/app/src/main/res/drawable/rectangle_round_corner5_grey.xml
new file mode 100644
index 0000000..a7fb872
--- /dev/null
+++ b/app/src/main/res/drawable/rectangle_round_corner5_grey.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="1.0dip"
+    android:shape="rectangle"
+    android:useLevel="false">
+    <corners android:radius="@dimen/dp_5" />
+    <solid android:color="@color/theme_bg" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangle_round_corner5_grey_stroke_white.xml b/app/src/main/res/drawable/rectangle_round_corner5_grey_stroke_white.xml
new file mode 100644
index 0000000..629f3ff
--- /dev/null
+++ b/app/src/main/res/drawable/rectangle_round_corner5_grey_stroke_white.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="1.0dip"
+    android:shape="rectangle"
+    android:useLevel="false">
+
+
+    <corners android:radius="@dimen/dp_5" />
+    <solid android:color="@color/white" />
+    <stroke
+        android:width="1dp"
+        android:color="#CCCCCC" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangle_round_corner5_theme.xml b/app/src/main/res/drawable/rectangle_round_corner5_theme.xml
new file mode 100644
index 0000000..5100985
--- /dev/null
+++ b/app/src/main/res/drawable/rectangle_round_corner5_theme.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="1.0dip"
+    android:shape="rectangle"
+    android:useLevel="false">
+    <corners android:radius="@dimen/dp_5" />
+    <solid android:color="@color/theme_color" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangle_round_corner5_theme_stroke_white.xml b/app/src/main/res/drawable/rectangle_round_corner5_theme_stroke_white.xml
new file mode 100644
index 0000000..17dcb39
--- /dev/null
+++ b/app/src/main/res/drawable/rectangle_round_corner5_theme_stroke_white.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="1.0dip"
+    android:shape="rectangle"
+    android:useLevel="false">
+
+
+    <corners android:radius="@dimen/dp_5" />
+    <solid android:color="@color/white" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/theme_color" />
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangle_round_top_left_corner8_white.xml b/app/src/main/res/drawable/rectangle_round_top_left_corner8_white.xml
new file mode 100644
index 0000000..3e059fe
--- /dev/null
+++ b/app/src/main/res/drawable/rectangle_round_top_left_corner8_white.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="1.0dip"
+    android:shape="rectangle"
+    android:useLevel="false">
+    <corners android:topLeftRadius="@dimen/dp_8"
+        android:topRightRadius="@dimen/dp_0"
+        android:bottomLeftRadius="@dimen/dp_0"
+        android:bottomRightRadius="@dimen/dp_0"/>
+    <solid android:color="@color/white" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangle_theme.xml b/app/src/main/res/drawable/rectangle_theme.xml
new file mode 100644
index 0000000..a2bc8fb
--- /dev/null
+++ b/app/src/main/res/drawable/rectangle_theme.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="1.0dip"
+    android:shape="rectangle"
+    android:useLevel="false">
+    <solid android:color="@color/theme_color" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangle_top_round_corner20_white.xml b/app/src/main/res/drawable/rectangle_top_round_corner20_white.xml
new file mode 100644
index 0000000..d17db0f
--- /dev/null
+++ b/app/src/main/res/drawable/rectangle_top_round_corner20_white.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="1.0dip"
+    android:shape="rectangle"
+    android:useLevel="false">
+
+
+    <solid android:color="@color/white" />
+    <corners android:topLeftRadius="@dimen/dp_20"
+        android:topRightRadius="@dimen/dp_7"
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="0dp"
+        />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
new file mode 100644
index 0000000..43e1f19
--- /dev/null
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <include
+            android:id="@+id/toolbar_lay"
+            layout="@layout/view_toolbar_lay"
+            app:title="@{@string/title_change_password}" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:id="@+id/ll_info_find"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_60"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="@dimen/dp_16"
+                            android:text="新密码    "
+                            android:textColor="@color/text_black_66"
+                            android:textSize="@dimen/txt13" />
+
+                        <EditText
+                            android:id="@+id/tv_new_password"
+                            android:inputType="textPassword"
+                            android:longClickable="false"
+                            android:layout_width="@dimen/dp_160"
+                            android:layout_height="@dimen/dp_40"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="@dimen/dp_60"
+                            android:background="@null"
+                            android:hint="请输入新密码"
+                            android:textColor="@color/text_black_66"
+                            android:textSize="@dimen/txt13" />
+                        <ImageView
+                            android:id="@+id/login_iv_eye"
+                            android:layout_width="@dimen/dp_35"
+                            android:layout_height="@dimen/dp_35"
+                            android:layout_gravity="center_vertical"
+                            android:layout_alignParentRight="true"
+                            android:layout_marginRight="@dimen/dp_8"
+                            android:src="@mipmap/ic_password_hind"
+                            android:padding="10dp"
+                            android:layout_centerVertical="true"/>
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_1"
+                        android:layout_marginLeft="@dimen/dp_14"
+                        android:layout_marginRight="@dimen/dp_14"
+                        android:background="#E0E0E0" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_60"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="@dimen/dp_16"
+                            android:text="确认密码"
+                            android:textColor="@color/text_black_66"
+                            android:textSize="@dimen/txt13" />
+
+                        <EditText
+                            android:id="@+id/tv_confirm_password"
+                            android:inputType="textPassword"
+                            android:layout_width="@dimen/dp_160"
+                            android:layout_height="@dimen/dp_40"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="@dimen/dp_60"
+                            android:background="@null"
+                            android:hint="请输入新密码"
+                            android:textColor="@color/text_black_66"
+                            android:textSize="@dimen/txt13" />
+                        <ImageView
+                            android:id="@+id/login_iv_eye2"
+                            android:layout_width="@dimen/dp_35"
+                            android:layout_height="@dimen/dp_35"
+                            android:layout_gravity="center_vertical"
+                            android:layout_alignParentRight="true"
+                            android:layout_marginRight="@dimen/dp_8"
+                            android:src="@mipmap/ic_password_hind"
+                            android:padding="10dp"
+                            android:layout_centerVertical="true"/>
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_1"
+                        android:layout_marginLeft="@dimen/dp_14"
+                        android:layout_marginRight="@dimen/dp_14"
+                        android:background="#E0E0E0" />
+                    <TextView
+                        android:layout_marginLeft="@dimen/dp_16"
+                        android:layout_marginRight="@dimen/dp_16"
+                        android:layout_marginTop="@dimen/dp_4"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/password_hint"
+                        />
+
+                    <TextView
+                        android:id="@+id/retrieve_confirm"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_40"
+                        android:layout_marginLeft="@dimen/dp_50"
+                        android:layout_marginTop="@dimen/dp_60"
+                        android:layout_marginRight="@dimen/dp_50"
+                        android:background="@drawable/bg_blue_background_shap"
+                        android:gravity="center"
+                        android:text="确定"
+                        android:textColor="@color/white" />
+
+                </LinearLayout>
+            </LinearLayout>
+        </RelativeLayout>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..f841b32
--- /dev/null
+++ b/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <FrameLayout
+            android:id="@+id/main_content_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@+id/bottom_navigation_view" />
+
+        <com.google.android.material.bottomnavigation.BottomNavigationView
+            android:id="@+id/bottom_navigation_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/bg_white_line"
+            style="@style/Widget.MaterialComponents.BottomNavigationView"
+            app:labelVisibilityMode="labeled"
+            app:itemRippleColor="@null"
+            app:itemIconSize="@dimen/dp_18"
+            app:itemPaddingTop="@dimen/dp_10"
+            app:itemIconTint="@color/color_state_menu_navi"
+            app:itemTextColor="@color/color_state_menu_navi_text"
+            app:menu="@menu/menu_bottom_nav"
+            android:layout_alignParentBottom="true" />
+
+
+    </RelativeLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_web.xml b/app/src/main/res/layout/activity_web.xml
new file mode 100644
index 0000000..95c5ca7
--- /dev/null
+++ b/app/src/main/res/layout/activity_web.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+
+<androidx.constraintlayout.widget.ConstraintLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/theme_bg">
+    <include android:id="@+id/toolbar_lay"
+        layout="@layout/view_toolbar_lay" />
+
+    <FrameLayout
+        android:id="@+id/fl_web"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar_lay"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_tab_item_layout.xml b/app/src/main/res/layout/bottom_tab_item_layout.xml
new file mode 100644
index 0000000..0be68ca
--- /dev/null
+++ b/app/src/main/res/layout/bottom_tab_item_layout.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/TabItem_ivIcon"
+        android:layout_width="@dimen/dp_24"
+        android:layout_height="@dimen/dp_24"
+        android:layout_marginBottom="3dp"
+        android:scaleType="centerInside"
+        android:layout_marginTop="@dimen/dp_10"
+        app:layout_constraintBottom_toTopOf="@id/TabItem_guideLine"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@drawable/main_home_tab_emergency_normal" />
+
+    <TextView
+        android:id="@+id/TabItem_tvTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="3dp"
+        android:layout_marginTop="@dimen/dp_3"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:text="首页" />
+
+    <View
+        android:id="@+id/TabItem_guideLine"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        app:layout_constraintTop_toTopOf="@id/TabItem_tvTitle" />
+
+    <View
+        android:id="@+id/TabItem_viewPoint"
+        android:layout_width="8dp"
+        android:layout_height="8dp"
+        android:background="@drawable/bottom_tab_red_point_bg"
+        android:visibility="gone"
+        app:layout_constraintLeft_toRightOf="@id/TabItem_ivIcon"
+        app:layout_constraintTop_toTopOf="@id/TabItem_ivIcon" />
+
+    <TextView
+        android:id="@+id/TabItem_tvUnReadTip"
+        style="@style/tab_msg_tip_style"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:visibility="gone"
+        app:layout_constraintLeft_toRightOf="@id/TabItem_ivIcon"
+        app:layout_constraintTop_toTopOf="@id/TabItem_ivIcon"
+        tools:text="99+" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/custom_search_view.xml b/app/src/main/res/layout/custom_search_view.xml
new file mode 100644
index 0000000..dd654ba
--- /dev/null
+++ b/app/src/main/res/layout/custom_search_view.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_50"
+        android:background="@color/white">
+
+        <LinearLayout
+            android:id="@+id/custom_ll_search"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_35"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="@dimen/dp_18"
+            android:layout_toLeftOf="@+id/custom_search_tv"
+            android:background="@drawable/bg_search_shap_radius23">
+
+            <ImageView
+                android:layout_width="@dimen/dp_15"
+                android:layout_height="@dimen/dp_15"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="@dimen/dp_17"
+                android:src="@drawable/ic_search" />
+
+            <EditText
+                android:id="@+id/custom_search_et"
+                android:longClickable="false"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="@dimen/dp_12"
+                android:background="@null"
+                android:gravity="center_vertical"
+                android:hint="@string/search_hint"
+                android:maxLines="1"
+                android:imeOptions="actionSearch"
+                android:singleLine="true"
+                android:textColor="@color/text_black_99"
+                android:textSize="@dimen/txt13" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/custom_search_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="@dimen/dp_22"
+            android:gravity="center_vertical"
+            android:paddingLeft="@dimen/dp_10"
+            android:text="@string/search_submit"
+            android:textColor="@color/text_black_99"
+            android:textSize="@dimen/txt13" />
+    </RelativeLayout>
+</layout>
diff --git a/app/src/main/res/layout/dialog_privacy_text_view.xml b/app/src/main/res/layout/dialog_privacy_text_view.xml
new file mode 100644
index 0000000..591221a
--- /dev/null
+++ b/app/src/main/res/layout/dialog_privacy_text_view.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/rectangle_round_corner10_white"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/tv_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginHorizontal="@dimen/dp_20"
+                android:layout_marginTop="@dimen/dp_30"
+                android:lineSpacingExtra="@dimen/dp_8"
+                android:textColor="@color/text_black_33"
+                android:textSize="@dimen/txt18"
+                android:visibility="invisible"
+                tools:text="@string/app_name" />
+
+            <ScrollView
+                android:id="@+id/sv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@+id/tv_title"
+                android:layout_marginBottom="@dimen/dp_60">
+
+                <TextView
+                    android:id="@+id/tv_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginHorizontal="@dimen/dp_20"
+                    android:layout_marginTop="@dimen/dp_14"
+                    android:gravity="center"
+                    android:lineSpacingExtra="@dimen/dp_4"
+                    android:paddingHorizontal="@dimen/dp_16"
+                    android:textColor="@color/text_black_33"
+                    android:textSize="@dimen/txt14"
+                    android:visibility="visible"
+                    app:layout_goneMarginTop="@dimen/dp_45"
+                    tools:ignore="WebViewLayout"
+                    tools:text="@string/app_name" />
+            </ScrollView>
+
+
+        </LinearLayout>
+
+        <View
+            android:id="@+id/line1"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_1"
+            android:layout_above="@+id/ll_bottom"
+            android:background="#E0E0E0" />
+
+        <LinearLayout
+            android:id="@+id/ll_bottom"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/btn_cancel"
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@color/transparent"
+                android:enabled="true"
+                android:paddingVertical="@dimen/dp_18"
+                android:text="@string/dialog_cancel"
+                android:textAllCaps="false"
+                android:textColor="@color/text_black_66"
+                android:textSize="@dimen/txt18"
+                android:visibility="gone"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toLeftOf="@+id/line2"
+                app:layout_constraintTop_toBottomOf="@+id/line1" />
+
+            <View
+                android:id="@+id/line2"
+                android:layout_width="@dimen/dp_1"
+                android:layout_height="match_parent"
+                android:layout_marginVertical="@dimen/dp_8"
+                android:background="#E0E0E0"
+                android:visibility="visible" />
+
+            <Button
+                android:id="@+id/btn_affirm"
+                android:layout_width="@dimen/dp_0"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@color/transparent"
+                android:enabled="true"
+                android:paddingVertical="@dimen/dp_18"
+                android:text="@string/dialog_confirm"
+                android:textAllCaps="false"
+                android:textColor="@color/theme_color"
+                android:textSize="@dimen/txt18"
+                app:layout_constraintLeft_toRightOf="@+id/line2"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/line1" />
+        </LinearLayout>
+
+
+    </RelativeLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_text_view.xml b/app/src/main/res/layout/dialog_text_view.xml
new file mode 100644
index 0000000..abc68c8
--- /dev/null
+++ b/app/src/main/res/layout/dialog_text_view.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/rectangle_round_corner10_white"
+        android:orientation="vertical">
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:layout_marginTop="@dimen/dp_30"
+            android:gravity="center"
+            android:lineSpacingExtra="@dimen/dp_8"
+            android:textColor="@color/text_black_33"
+            android:textSize="@dimen/txt18"
+            tools:text="@string/app_name"
+            android:visibility="gone"/>
+
+        <TextView
+            android:id="@+id/tv_text"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_title"
+            android:layout_marginHorizontal="@dimen/dp_20"
+            android:layout_marginTop="@dimen/dp_14"
+            android:paddingHorizontal="@dimen/dp_16"
+            app:layout_goneMarginTop="@dimen/dp_45"
+            android:gravity="center"
+            android:textColor="@color/text_black_33"
+            android:lineSpacingExtra="@dimen/dp_4"
+            android:textSize="@dimen/txt14"
+            tools:text="@string/app_name"
+            android:visibility="visible"/>
+        <View
+            android:id="@+id/line1"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="@dimen/dp_1"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_text"
+            android:layout_marginTop="@dimen/dp_30"
+            android:background="@color/line_grey_color"/>
+
+
+        <Button
+            android:id="@+id/btn_cancel"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toLeftOf="@+id/line2"
+            app:layout_constraintTop_toBottomOf="@+id/line1"
+            android:paddingVertical="@dimen/dp_18"
+            android:background="@color/transparent"
+            android:enabled="true"
+            android:text="@string/dialog_cancel"
+            android:textAllCaps="false"
+            android:textColor="@color/text_black_66"
+            android:textSize="@dimen/txt18"
+            android:visibility="gone"/>
+        <View
+            android:id="@+id/line2"
+            android:layout_width="@dimen/dp_1"
+            android:layout_height="@dimen/dp_0"
+            app:layout_constraintLeft_toRightOf="@+id/btn_cancel"
+            app:layout_constraintRight_toLeftOf="@+id/btn_affirm"
+            app:layout_constraintTop_toTopOf="@+id/btn_cancel"
+            app:layout_constraintBottom_toBottomOf="@+id/btn_cancel"
+            android:layout_marginVertical="@dimen/dp_8"
+            android:background="@color/line_grey_color"
+            android:visibility="gone"/>
+        <Button
+            android:id="@+id/btn_affirm"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toRightOf="@+id/line2"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/line1"
+            android:paddingVertical="@dimen/dp_18"
+            android:background="@color/transparent"
+            android:enabled="true"
+            android:text="@string/dialog_confirm"
+            android:textAllCaps="false"
+            android:textColor="@color/theme_color"
+            android:textSize="@dimen/txt18"/>
+        <TextView
+            android:id="@+id/tv_tips"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/btn_affirm"
+            android:layout_marginTop="@dimen/dp_10"
+            android:textColor="@color/text_black_66"
+            android:textSize="@dimen/txt13"
+            tools:text="@string/app_name"
+            android:visibility="gone"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_recycle_image.xml b/app/src/main/res/layout/item_recycle_image.xml
new file mode 100644
index 0000000..8045b22
--- /dev/null
+++ b/app/src/main/res/layout/item_recycle_image.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/iv_image"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="@dimen/dp_0"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_marginRight="@dimen/dp_6"
+            android:layout_marginTop="@dimen/dp_6"
+            app:layout_constraintDimensionRatio="1:1"
+            tools:src="@drawable/icon_consult_image" />
+
+        <ImageButton
+            android:id="@+id/btn_delete"
+            android:layout_width="@dimen/dp_20"
+            android:layout_height="@dimen/dp_20"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:background="@color/transparent"
+            android:src="@drawable/ic_delete"
+            android:scaleType="centerCrop" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/lay_cut_off_rule.xml b/app/src/main/res/layout/lay_cut_off_rule.xml
new file mode 100644
index 0000000..06db32d
--- /dev/null
+++ b/app/src/main/res/layout/lay_cut_off_rule.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<View xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:background="@color/line_grey_color"
+    app:layout_constraintLeft_toLeftOf="parent"
+    app:layout_constraintRight_toRightOf="parent"
+    android:layout_height="@dimen/dp_0_5">
+
+</View>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_tips_loading.xml b/app/src/main/res/layout/view_tips_loading.xml
new file mode 100644
index 0000000..25c690b
--- /dev/null
+++ b/app/src/main/res/layout/view_tips_loading.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:wheel="http://schemas.android.com/apk/res-auto"
+    android:layout_width="108dp"
+    android:layout_height="100dp"
+    android:layout_gravity="center"
+    android:background="@drawable/bg_loading_shap"
+    android:gravity="center">
+
+    <View
+        android:layout_width="128.0dip"
+        android:layout_height="120.0dip"
+        android:layout_centerInParent="true"
+        android:visibility="gone"
+        />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/iv_progress"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_gravity="center"
+            android:background="@android:color/transparent"
+            android:layout_marginBottom="10.0dip"
+            />
+
+        <TextView
+            android:id="@+id/tips_loading_msg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:layout_marginTop="6dp"
+            android:lineSpacingExtra="3.0dip"
+            android:textColor="#DEffffff"
+            android:textSize="14dp" />
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_toolbar_lay.xml b/app/src/main/res/layout/view_toolbar_lay.xml
new file mode 100644
index 0000000..8cd3c54
--- /dev/null
+++ b/app/src/main/res/layout/view_toolbar_lay.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+    <data>
+        <variable
+            name="title"
+            type="java.lang.String" />
+        <variable
+            name="isGradientBg"
+            type="java.lang.Boolean" />
+        <variable
+            name="hideLine"
+            type="java.lang.Boolean" />
+    </data>
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar_lay"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/title_bar_height"
+        android:background="@{isGradientBg?@drawable/bg_transparent:!hideLine?@drawable/bg_toolbar:@drawable/rectangle_theme}"
+        android:theme="@style/AppBarTheme">
+        <TextView
+            android:id="@+id/tv_right"
+            android:layout_width="wrap_content"
+            android:layout_height="?actionBarSize"
+            android:layout_gravity="right"
+            android:paddingRight="@dimen/dp_15"
+            android:gravity="center_vertical"
+            tools:text="@string/app_name"
+            android:textColor="@color/white"
+            android:textSize="@dimen/txt14"
+            android:visibility="gone"/>
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:paddingRight="@dimen/dp_8"
+            >
+            <ImageView
+                android:id="@+id/iv_right"
+                android:layout_width="?actionBarSize"
+                android:layout_height="?actionBarSize"
+                android:padding="@dimen/dp_12"
+                android:gravity="center_vertical"
+                tools:src="@drawable/ic_message"
+                android:visibility="visible"/>
+            <TextView
+                android:id="@+id/tv_right_num"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/dp_16"
+                android:background="@drawable/rectangle_round_corner20_theme"
+                android:layout_marginRight="@dimen/dp_6"
+                android:minWidth="@dimen/dp_16"
+                android:paddingHorizontal="@dimen/dp_2"
+                android:gravity="center"
+                android:textColor="@color/white"
+                android:textSize="@dimen/txt10"
+                android:visibility="gone"/>
+        </RelativeLayout>
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/white"
+            android:layout_gravity="center"
+            android:textSize="@dimen/txt18"
+            android:text="@{title}"
+            android:textStyle="bold"
+            tools:text="@string/app_name"/>
+
+    </androidx.appcompat.widget.Toolbar>
+</layout>
diff --git a/app/src/main/res/menu/menu_bottom_nav.xml b/app/src/main/res/menu/menu_bottom_nav.xml
new file mode 100644
index 0000000..3a347b8
--- /dev/null
+++ b/app/src/main/res/menu/menu_bottom_nav.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/menu_workbench"
+        android:checked="true"
+        android:icon="@drawable/icon_main_workbench_normal"
+        android:title="工作台" />
+
+    <item
+        android:id="@+id/menu_mine"
+        android:icon="@drawable/icon_main_mine_normal"
+        android:title="我的" />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-xhdpi/ic_guidance_doctor.png b/app/src/main/res/mipmap-xhdpi/ic_guidance_doctor.png
new file mode 100644
index 0000000..bcf393d
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_guidance_doctor.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_guidance_my_guidance.png b/app/src/main/res/mipmap-xhdpi/ic_guidance_my_guidance.png
new file mode 100644
index 0000000..b2fc359
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_guidance_my_guidance.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_guidance_second.png b/app/src/main/res/mipmap-xhdpi/ic_guidance_second.png
new file mode 100644
index 0000000..f9f416a
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_guidance_second.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_home_head_bg.png b/app/src/main/res/mipmap-xhdpi/ic_home_head_bg.png
new file mode 100644
index 0000000..4068170
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_home_head_bg.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_latest_news.png b/app/src/main/res/mipmap-xhdpi/ic_latest_news.png
new file mode 100644
index 0000000..954dce2
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_latest_news.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_more_info.png b/app/src/main/res/mipmap-xhdpi/ic_more_info.png
new file mode 100644
index 0000000..3106f7b
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_more_info.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_notice_no_read.png b/app/src/main/res/mipmap-xhdpi/ic_notice_no_read.png
new file mode 100644
index 0000000..f6f3ce2
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_notice_no_read.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_notice_read.png b/app/src/main/res/mipmap-xhdpi/ic_notice_read.png
new file mode 100644
index 0000000..f1f5b79
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_notice_read.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_number_add_able.webp b/app/src/main/res/mipmap-xhdpi/ic_number_add_able.webp
new file mode 100644
index 0000000..93a3940
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_number_add_able.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_number_lessen_able.webp b/app/src/main/res/mipmap-xhdpi/ic_number_lessen_able.webp
new file mode 100644
index 0000000..bb3e2e1
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_number_lessen_able.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_password_hind.png b/app/src/main/res/mipmap-xhdpi/ic_password_hind.png
new file mode 100644
index 0000000..ed4d56b
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_password_hind.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_password_show.png b/app/src/main/res/mipmap-xhdpi/ic_password_show.png
new file mode 100644
index 0000000..2d22fbb
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_password_show.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_right_more.png b/app/src/main/res/mipmap-xhdpi/ic_right_more.png
new file mode 100644
index 0000000..24e6337
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_right_more.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_search_icon.webp b/app/src/main/res/mipmap-xhdpi/ic_search_icon.webp
new file mode 100644
index 0000000..eabe919
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_search_icon.webp differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_user_head.png b/app/src/main/res/mipmap-xhdpi/ic_user_head.png
new file mode 100644
index 0000000..6170302
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_user_head.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/img_arrow_down.png b/app/src/main/res/mipmap-xhdpi/img_arrow_down.png
new file mode 100644
index 0000000..9ca47ec
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/img_arrow_down.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/img_arrow_right.png b/app/src/main/res/mipmap-xhdpi/img_arrow_right.png
new file mode 100644
index 0000000..4b8f9bf
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/img_arrow_right.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/img_eye_close.png b/app/src/main/res/mipmap-xhdpi/img_eye_close.png
new file mode 100644
index 0000000..aee2585
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/img_eye_close.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/img_eye_open.png b/app/src/main/res/mipmap-xhdpi/img_eye_open.png
new file mode 100644
index 0000000..7d27225
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/img_eye_open.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/login_img1.png b/app/src/main/res/mipmap-xhdpi/login_img1.png
new file mode 100644
index 0000000..ea29962
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/login_img1.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..7fd7fb1
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
new file mode 100644
index 0000000..55dc58b
--- /dev/null
+++ b/app/src/main/res/values/attrs.xml
@@ -0,0 +1,27 @@
+<resources>
+    <declare-styleable name="FullscreenAttrs">
+        <attr name="fullscreenBackgroundColor" format="color" />
+        <attr name="fullscreenTextColor" format="color" />
+    </declare-styleable>
+
+    <declare-styleable name="HomeBottomTabLayout">
+        <attr name="container_id" format="reference" />
+        <attr name="viewPager_id" format="reference" />
+        <attr name="config_file_name" format="string" />
+    </declare-styleable>
+
+    <declare-styleable name="NiceImageView">
+        <attr name="is_circle" format="boolean" />
+        <attr name="is_cover_src" format="boolean" />
+        <attr name="corner_radius" format="dimension" />
+        <attr name="corner_top_left_radius" format="dimension" />
+        <attr name="corner_top_right_radius" format="dimension" />
+        <attr name="corner_bottom_left_radius" format="dimension" />
+        <attr name="corner_bottom_right_radius" format="dimension" />
+        <attr name="border_width" format="dimension" />
+        <attr name="border_color" format="color" />
+        <attr name="inner_border_width" format="dimension" />
+        <attr name="inner_border_color" format="color" />
+        <attr name="mask_color" format="color" />
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000..f5af710
--- /dev/null
+++ b/app/src/main/res/values/colors.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="purple_200">#FFBB86FC</color>
+    <color name="purple_500">#FF6200EE</color>
+    <color name="purple_700">#FF3700B3</color>
+    <color name="teal_200">#FF03DAC5</color>
+    <color name="teal_700">#FF018786</color>
+    <color name="black">#FF000000</color>
+    <color name="black1">#41474D</color>
+    <color name="white">#FFFFFFFF</color>
+    <color name="red">#BD130B</color>
+    <color name="deepen_red">#BD130B</color>
+    <color name="transparent">#00FFFFFF</color>
+    <color name="theme_blue">#3F8CC2</color>
+    <color name="theme_background">#0A000000</color>
+    <color name="item_retail_background">#D66948</color>
+    <color name="item_retail_vip_background">#327DB2</color>
+    <color name="kwyboard_no_click">#659DC5</color>
+    <color name="keyboard_background">#DCE7EF</color>
+    <color name="item_tab_background">#ECC168</color>
+    <color name="input_hint_color">#E08E75</color>
+    <color name="line_devide_grey">#EAEAEA</color>
+    <color name="dialog_transparent">#55000000</color>
+    <color name="black65">#A6000000</color>
+    <color name="grey15">#26000000</color>
+    <color name="grey25">#40000000</color>
+    <color name="kwyboard_top_background">#F5F5F5</color>
+    <color name="orange100">#D66948</color>
+    <color name="black25">#A3000000</color>
+    <color name="goods_category_checked">#FF327DB2</color>
+
+
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+
+    <color name="colorCloudLight">#147AFF</color>
+    <color name="colorCloudLively">#FF8E82</color>
+    <color name="colorCloudSerious">#FF8E82</color>
+    <color name="colorShade">#33000000</color>
+
+    <color name="tab_text_selected_color">#006EFF</color>
+    <color name="tab_text_normal_color">#888888</color>
+    <color name="colorCloudShallow">#84C1FF</color>
+
+    <color name="colorActivityBackground">#ffffff</color>
+    <color name="colorDivider">#737373</color>
+    <color name="textSecond">#737373</color>
+    <color name="colorWhite">#ffffff</color>
+
+    <color name="btn_blue_standard_color">#338BFF</color>
+    <color name="item_split_color">#cccccc</color>
+
+    <color name="colorShallow">#9E9EA1</color>
+    <color name="line">#DDDDDD</color>
+    <!-- 积极按钮文本色值 -->
+    <color name="text_positive">#ffffff</color>
+    <color name="text_positive_hover">#ffffff</color>
+
+    <!-- 积极钮色值 -->
+    <color name="btn_positive">#00a4ff</color>
+    <color name="btn_positive_hover">#006eff</color>
+
+    <!-- 消极按钮背景色值 -->
+    <color name="btn_negative">#ffffff</color>
+    <color name="btn_negative_hover">#cc3428</color>
+
+    <!-- 消极按钮文本色值 -->
+    <color name="text_negative">#fb6155</color>
+    <color name="text_negative_hover">#FFFFFF</color>
+
+    <color name="font_blue">#066fff</color>
+    <color name="green">#70C160</color>
+    <color name="text_color_gray">#696969</color>
+    <color name="black_font_color">#181818</color>
+    <color name="text_tips_color">#A5A5A5</color>
+
+    <color name="text_gray1">#777777</color>
+    <color name="split_lint_color">#D9D9D9</color>
+
+    <color name="dialog_line_bg">#c6c6c6</color>
+    <color name="test_blue">#338BFF</color>
+    <color name="read_dot_bg">#f74c31</color>
+
+    <color name="demo_self_detail_icon_title_bg">#444444</color>
+
+    <color name="demo_title_bar_bg">#EBF0F6</color>
+    <color name="demo_navigate_bar_bg">#EBF0F6</color>
+    <color name="demo_popup_card_bg">#FFFFFF</color>
+    <color name="demo_popup_card_positive_normal_bg">#147AFF</color>
+    <color name="demo_popup_card_positive_pressed_bg">#B9D7FF</color>
+    <color name="demo_popup_card_line_bg">#E4E5E9</color>
+
+    <color name="demo_profile_bg">#E6E9EB</color>
+    <color name="demo_partTranslucent">#39000000</color>
+    <color name="demo_slide_bar_hint_color">#CCCCCC</color>
+
+    <color name="demo_theme_select_light_color">#FFC0E1FF</color>
+    <color name="demo_theme_select_lively_color">#FFF38787</color>
+    <color name="demo_theme_select_serious_color">#FF3371CD</color>
+
+    <color name="security_warning_color">#FF9500</color>
+    <color name="security_warning_text_color">#FF8C39</color>
+    <color name="security_warning_report_color">#006EFF</color>
+
+    <color name="demo_community_page_navigate_bar_color">#FFFFFFFF</color>
+    <color name="demo_community_page_status_bar_color">#EBECF0</color>
+    <color name="light_blue_600">#FF039BE5</color>
+    <color name="light_blue_900">#FF01579B</color>
+    <color name="light_blue_A200">#FF40C4FF</color>
+    <color name="light_blue_A400">#FF00B0FF</color>
+    <color name="black_overlay">#66000000</color>
+    <color name="theme_color">#21BEBD</color>
+    <color name="theme_bg">#EFEFEF</color>
+    <color name="line_grey_color">#E0E0E0</color>
+
+    <!--文本颜色-->
+    <color name="text_black_33">#333333</color>
+    <color name="text_black_66">#666666</color>
+    <color name="text_black_99">#999999</color>
+    <color name="link_blue_color">#3390FF</color>
+    <color name="text_dark_green">#16C716</color>
+    <color name="text_green_BD">#21BEBD</color>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/light_colors.xml b/app/src/main/res/values/light_colors.xml
new file mode 100644
index 0000000..87266ea
--- /dev/null
+++ b/app/src/main/res/values/light_colors.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="demo_main_tab_text_selected_color_light">#006EFF</color>
+    <color name="demo_navigate_bar_bg_light">#EBF0F6</color>
+
+    <color name="demo_login_theme_language_text_color_light">#444444</color>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000..f23ecb5
--- /dev/null
+++ b/app/src/main/res/values/strings.xml
@@ -0,0 +1,267 @@
+<resources xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="MissingTranslation">
+    <string name="app_name">专家端</string>
+    
+    <!--页面标题-->
+    <string name="title_workbench">健康专家库</string>
+    <string name="title_mine">我的</string>
+    <string name="title_consult_record">咨询记录</string>
+    <string name="title_image">图片</string>
+    <string name="title_consult_detail">咨询详情</string>
+    <string name="title_base_healthy_information">基本健康信息</string>
+    <string name="title_record_detail">档案详情</string>
+    <string name="title_consult_history">历史记录</string>
+    <string name="title_consult_wait_confirm">视频咨询</string>
+    <string name="title_scheduling">排班设置</string>
+    <string name="title_custom_scheduling">自定义排班</string>
+    <string name="title_suspension_service">暂停服务</string>
+    <string name="title_add_suspension_announcement">暂停服务公告</string>
+    <string name="title_consult_statistics">咨询统计</string>
+    <string name="title_bill_record">账单明细</string>
+    <string name="title_with_draw">提现详情</string>
+    <string name="title_edit_password">修改密码</string>
+    <string name="title_person_info">个人信息</string>
+    <string name="title_setting">关于我们</string>
+    <string name="title_web_view">网页</string>
+    <string name="title_retrieve_password">找回密码</string>
+    <string name="title_login">登录</string>
+    <string name="title_good_at_disease">擅长病种</string>
+    <string name="title_check_up_detail">体检详情</string>
+    <string name="title_assistant_consult">小助手</string>
+    <string name="title_view_location">位置</string>
+    <string name="title_message_list">消息</string>
+    <string name="title_select_location">选择位置</string>
+    // 登录相关
+    <string name="account" >用户名</string>
+    <string name="password">密码</string>
+
+
+    <string name="demo_login_country_or_region_label">国家/地区</string>
+    <string name="demo_area_code_title">选择国家或地区</string>
+    <string name="demo_language_title">选择语言</string>
+    <string name="demo_style_title">选择风格</string>
+    <string name="demo_login_chinese_mainland">中国大陆</string>
+    <string name="demo_login_mobile_phone_number">手机号</string>
+    <string name="demo_login_verification_code_label">验证码</string>
+    <string name="demo_search">搜索</string>
+
+    <string name="login_title">腾讯云即时通信IM</string>
+    <string name="login_sub_title">欢迎使用本 APP 体验腾讯云 IM 产品服务</string>
+    <string name="input_number">请输入手机号</string>
+    <string name="input_verification">请输入短信验证码</string>
+    <string name="verification_code">获取验证码</string>
+    <string name="button_login">登录</string>
+    <string name="password_login">密码登录</string>
+    <string name="official_website">访问官网</string>
+    <string name="debug_mode_summary">IM 帐号直接登录界面，此只在 Debug 模式下显示</string>
+    <string name="account_hint">任意非空字符即可，请参考类注释</string>
+
+    <string name="repeat_login_tip">您的帐号已在其它终端登录</string>
+    <string name="expired_login_tip">帐号已过期，请重新登录</string>
+    <string name="failed_login_tip">登录失败</string>
+
+    // "我"相关
+    <string name="profile">我</string>
+    <string name="modify_user_icon">头像</string>
+    <string name="modify_nick_name">昵称</string>
+    <string name="add_rule">加我为好友时</string>
+    <string name="allow_type_allow_any">允许任何人</string>
+    <string name="allow_type_deny_any">拒绝任何人</string>
+    <string name="allow_type_need_confirm">需要验证</string>
+    <string name="exit">退出登录</string>
+    <string name="about_im">关于腾讯云·IM</string>
+    <string name="modify_birthday">生日</string>
+    <string name="modify_gender">性别</string>
+    <string name="modify_signature">个性签名</string>
+    <string name="demo_no_status">暂无个性签名</string>
+    <string name="modify_account">账号</string>
+    <string name="cancel_account">注销账号</string>
+    <string name="cancel_account_alert_tip">您确定要注销账号吗？</string>
+    <string name="cancel_account_tip">注销后，您将无法使用当前账号，相关数据也将删除无法找回。当前账号 %s </string>
+    <string name="cancel_account_error_msg">注销失败,当前账号未查到token或手机号，请使用手机号登录。</string>
+    <string name="cancel_account_successful">注销成功</string>
+
+    <string name="self_infomation_collection_list">个人信息收集清单</string>
+    <string name="third_part_shared_list">第三方信息共享清单</string>
+
+
+    <string name="modify_theme">切换皮肤</string>
+    <string name="light_theme">轻快</string>
+    <string name="lively_theme">明媚</string>
+    <string name="serious_theme">深沉</string>
+    <string name="modify_language">切换语言</string>
+    <string name="modify_style">切换风格</string>
+    <string name="style_classic">经典版</string>
+    <string name="style_minimalist">简约版</string>
+
+    <string name="demo_language">简体中文</string>
+    <string name="demo_theme_light">轻快</string>
+    <string name="demo_signature_tag">个性签名：</string>
+    <string name="demo_account_tag">ID：</string>
+
+    <string name="demo_about_sdk_version">SDK版本</string>
+    <string name="demo_about_im">关于</string>
+    <string name="demo_contact_us">联系我们</string>
+
+    <string name="demo_self_detail_gender_male">男</string>
+    <string name="demo_self_detail_gender_female">女</string>
+    <string name="demo_self_detail_gender_unknown">未知</string>
+
+    <string name="demo_self_detail_modify_nickname">修改昵称</string>
+    <string name="demo_self_detail_modify_signature">修改个性签名</string>
+    <string name="demo_self_detail_modify_gender">修改性别</string>
+
+    <string name="demo_self_detail_modify_nickname_rule">仅限中文、字母、数字和下划线</string>
+
+    <string name="conversation_title">腾讯云·IM</string>
+    <string name="contact_title">通讯录</string>
+    <string name="add_friend">添加好友</string>
+    <string name="add_group">添加群聊</string>
+    <string name="start_conversation">发起会话</string>
+    <string name="create_group_chat">创建群聊</string>
+    <string name="create_chat_room">创建聊天室</string>
+    <string name="create_community">创建社群</string>
+    <string name="create_private_group">创建讨论组</string>
+
+
+    // 主页Tab相关
+    <string name="tab_contact_tab_text">通讯录</string>
+    <string name="tab_conversation_tab_text">消息</string>
+    <string name="demo_tab_overseas_conversation_tab_text">聊天</string>
+    <string name="tab_profile_tab_text">我</string>
+    <string name="minimalist_tab_settings_tab_text">设置</string>
+    <string name="minimalist_tab_contacts_tab_text">联系人</string>
+    <string name="tab_community_tab_text">社群</string>
+
+    <string name="test_excluded_from_unread_count_action">不计入未读数消息</string>
+
+    <string name="privacy_text">已同意《<a href="http://privacy.qq.com/">隐私政策</a>》</string>
+
+    <string name="no_support_msg">不支持的自定义消息</string>
+    <string name="live">的直播</string>
+    <string name="living">正在直播</string>
+    <string name="stop_live">结束直播</string>
+    <string name="http_error_invalid">用户名必须以字母开头、字母与数字组合3-23位</string>
+    <string name="http_error_user">用户已存在</string>
+    <string name="http_error_server">服务器错误</string>
+    <string name="http_error_no_user">用户不存在</string>
+    <string name="http_error_password">密码错误</string>
+    <string name="not_retry_more">不要频繁获取验证码</string>
+    <string name="input_phone">请填写正确的手机号</string>
+    <string name="verify_code_fail">获取验证码失败:</string>
+    <string name="send_verify_code">验证码已发送</string>
+    <string name="input_phone_code">请输入手机号和验证码</string>
+    <string name="login_fail_tip">登录失败:</string>
+    <string name="login_suc_tip">登录成功</string>
+    <string name="second">秒</string>
+    <string name="get_verify_code">获取验证码</string>
+    <string name="permission_tip">未全部授权，部分功能可能无法使用！</string>
+
+    <string name="logout_tip">您确定要退出登录么？</string>
+
+    <string name="online_fail">请求网络失败</string>
+    <string name="online">在线</string>
+    <string name="unknow_error">未知错误</string>
+    <string name="you_app">您的应用</string>
+    <string name="low_version"> 版本太低，不支持打开该离线消息</string>
+    <string name="call_timeout">本次通话已超时</string>
+    <string name="call_notification">音视频邀请消息通知</string>
+    <string name="background_tip">当程序处于后台时新的来电消息会通过通知栏提醒用户</string>
+    <string name="new_msg_notification">新普通消息通知</string>
+    <string name="new_msg">收到一条新消息</string>
+    <string name="call_nos">通话失去响应</string>
+    <string name="login_password_tips">1~16个字符（字母+数字）</string>
+    <string name="login_user_tips">字母开头，4~24个字母+数字</string>
+
+    <string name="login_agree_privacy_regulations">《隐私政策》</string>
+    <string name="login_agree_privacy_regulations_summary">《隐私政策摘要》</string>
+    <string name="login_agree_user_agreement">《用户协议》</string>
+    <string name="login_agree_self_infomation_collection_list">《个人信息收集清单》</string>
+    <string name="login_agree_third_part_shared_list">《第三方信息共享清单》</string>
+
+    <string name="im_privacy">隐私政策</string>
+    <string name="im_statement">免责声明</string>
+    <string name="im_user_agreement">用户协议</string>
+    <string name="im_statement_content">腾讯云IM APP（“本产品”）是由腾讯云提供的一款测试产品，腾讯云享有本产品的著作权和所有权。本产品仅用于功能体验，不得用于任何商业用途。为配合相关部门监管要求，严禁在使用中有任何色情、辱骂、暴恐、涉政等违法内容传播。</string>
+    <string name="im_privacy_tips">请先阅读并同意协议</string>
+    <string name="demo_im_privacy_dialog_tips">欢迎使用腾讯云即时通信 IM，为保护您的个人信息安全，我们更新了《隐私政策》，主要完善了收集用户信息的具体内容和目的、增加了第三方SDK使用等方面的内容。\n\n请您点击 《用户协议》、《隐私政策摘要》、《隐私政策》、《个人信息收集清单》和《第三方信息共享清单》并仔细阅读，如您同意以上内容，请点击“同意并继续”，开始使用我们的产品与服务！</string>
+    <string name="demo_im_privacy_agree">同意并继续</string>
+    <string name="demo_im_privacy_refuse_and_exit">不同意，退出</string>
+
+    <string name="get_verify_code_error">获取验证码错误，请刷新重试！(%d)</string>
+
+    <string name="modify_group_name">修改群名称</string>
+    <string name="input_tip">没有输入昵称，请重新填写</string>
+    <string name="call_time_out"> 通话超时</string>
+
+    <string name="mark_all_message_as_read_succ">清空未读成功</string>
+    <string name="mark_all_message_as_read_err_format">清空未读失败, %d, %s</string>
+
+    <string name="demo_profile_detail">详细资料</string>
+
+    <string name="demo_message_read_switch_title">消息阅读状态</string>
+    <string name="demo_message_read_switch_open_tip">该功能为旗舰版功能</string>
+    <string name="demo_message_read_switch_open_text">关闭后，您收发的消息均不带消息阅读状态，您将无法看到对方是否已读，同时对方也无法看到你是否已读。</string>
+    <string name="demo_message_read_switch_close_text">开启后，您在群聊中收发的消息均带有消息阅读状态，并且可以看到对方是否已读。与您单聊的好友若也开启了消息阅读状态，您与好友在单聊中收发的消息也将带有消息阅读状态。</string>
+
+    <string name="demo_choose_avatar">选择头像</string>
+
+    <!--  权限相关 start -->
+    <string name="demo_permission_mic_reason_title">%s申请获取麦克风权限</string>
+    <string name="demo_permission_mic_reason">为方便您发送语音消息，进行摄像和音视频通话，请允许我们访问麦克风。</string>
+    <string name="demo_permission_camera_reason_title">%s申请获取相机权限</string>
+    <string name="demo_permission_camera_reason">为方便您拍摄照片或视频以发送给朋友，以及进行视频通话，请允许我们访问摄像头。</string>
+    <string name="demo_permission_storage_reason_title">%s申请获取存储权限</string>
+    <string name="demo_permission_storage_reason">为方便您保存照片和视频到设备，请允许我们写入照片和视频到设备。</string>
+    <string name="demo_permission_mic_dialog_alert">在设置-应用-%s-权限中开启麦克风权限，以正常使用语音消息、摄像和音视频通话功能</string>
+    <string name="demo_permission_camera_dialog_alert">在设置-应用-%s-权限中开启相机权限，以正常使用拍照、摄像和视频通话功能</string>
+    <string name="demo_permission_storage_dialog_alert">在设置-应用-%s-权限中开启存储权限，以正常使用保存照片和视频功能</string>
+    <!--  权限相关 end -->
+
+    <string name="upgrade_sure">立即升级</string>
+    <string name="demo_user_status_switch_title">显示在线状态</string>
+    <string name="demo_user_status_switch_on_text">关闭后，您将不可以在会话列表和通讯录中看到好友在线或离线的状态提示。</string>
+    <string name="demo_user_status_switch_off_text">开启后，您将可以在会话列表和通讯录中看到好友在线或离线的状态提示。</string>
+    <string name="demo_user_status">在线状态</string>
+    <string name="demo_i_know">我知道了</string>
+    <string name="demo_no_more_reminders">不再提醒</string>
+    <string name="demo_im_flagship">旗舰版</string>
+    <string name="demo_buying_guidelines">价格说明</string>
+    <string name="demo_im_flagship_edition_update_tip">%s功能为IM旗舰版功能，购买旗舰版套餐包后可使用，详见价格说明。</string>
+    <string name="demo_buying_tips">该功能为旗舰版功能</string>
+
+    <string name="chat_security_warning">【安全提示】本 APP 仅用于体验腾讯云即时通信 IM 产品功能，不可用于业务洽谈与拓展。请勿轻信汇款、中奖等涉及钱款的信息，勿轻易拨打陌生电话，谨防上当受骗。</string>
+    <string name="chat_security_warning_report">点此举报</string>
+    <string name="dummy_button">Dummy Button</string>
+    <string name="dummy_content">DUMMY\nCONTENT</string>
+
+    <!--搜索-->
+    <string name="search_hint">请输入关键字</string>
+    <string name="search_submit">搜索</string>
+    <!--验证码发送-->
+    <string name="auth_code_get_auth_code">获取验证码</string>
+    <string name="auth_code_retry_send_auth_code">重新发送</string>
+    <string name="auth_code_count_down_timer" formatted="false">(%ds)</string>
+    <string name="auth_code_tick_text" formatted="false">%s%s</string>
+
+    <!--咨询类型-->
+    <string name="consult_type_image_text">图文咨询</string>
+    <string name="consult_type_audio_video">视频咨询</string>
+
+    <!--性别-->
+    <string name="gender_man" >男</string>
+    <string name="gender_woman" >女</string>
+
+    <!--Dialog-->
+    <string name="dialog_confirm">确定</string>
+    <string name="dialog_cancel">取消</string>
+    <!--缺省内容-->
+    <string name="string_empty">--</string>
+
+    <!--版本名称-->
+    <string name="app_version" formatted="false">v&#160;%s</string>
+    <!--选择位置-->
+    <string name="select_location_send">发送</string>
+    <string name="password_hint">温馨提示:密码需要为12-32位（包含数字、大写、小写字母、特殊字符）</string>
+    <string name="title_change_password">修改密码</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
new file mode 100644
index 0000000..c940f8c
--- /dev/null
+++ b/app/src/main/res/values/style.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--加载框-->
+    <style name="MyLoadingDialog" parent="@android:style/Theme.Dialog">
+        <item name="android:windowFrame">@null</item><!--边框-->
+        <item name="android:windowIsFloating">true</item><!--是否浮现在activity之上-->
+        <item name="android:windowIsTranslucent">true</item><!--半透明-->
+        <item name="android:windowNoTitle">true</item><!--无标题-->
+        <item name="android:windowBackground">@android:color/transparent</item><!--背景透明-->
+        <item name="android:backgroundDimEnabled">false</item><!--模糊-->
+    </style>
+
+    <style name="MyDialog" parent="@android:style/Theme.Dialog">
+        <item name="android:windowFrame">@null</item><!--边框-->
+        <item name="android:windowIsFloating">true</item><!--是否浮现在activity之上-->
+        <item name="android:windowIsTranslucent">true</item><!--半透明-->
+        <item name="android:windowNoTitle">true</item><!--无标题-->
+        <item name="android:windowBackground">@color/dialog_transparent</item><!--背景透明-->
+        <item name="android:backgroundDimEnabled">false</item><!--模糊-->
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
new file mode 100644
index 0000000..16f8d73
--- /dev/null
+++ b/app/src/main/res/values/styles.xml
@@ -0,0 +1,18 @@
+<resources>
+    <style name="Widget.Theme.HearthyClients.ButtonBar.Fullscreen" parent="">
+        <item name="android:background">@color/black_overlay</item>
+        <item name="android:buttonBarStyle">?android:attr/buttonBarStyle</item>
+    </style>
+
+    <style name="tab_msg_tip_style">
+        <item name="android:textColor">#ffffff</item>
+        <item name="android:paddingStart">5dp</item>
+        <item name="android:paddingEnd">5dp</item>
+        <item name="android:textSize">9sp</item>
+        <item name="android:minHeight">15dp</item>
+        <item name="android:minWidth">15dp</item>
+        <item name="android:background">@drawable/bottom_tab_red_point_bg</item>
+    </style>
+
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
new file mode 100644
index 0000000..2f09105
--- /dev/null
+++ b/app/src/main/res/values/themes.xml
@@ -0,0 +1,47 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Theme.HearthyClients" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/theme_color</item>
+        <item name="colorPrimaryVariant">@color/theme_color</item>
+        <item name="colorOnPrimary">@color/white</item>
+        <item name="colorAccent">@color/theme_color</item>
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/theme_color</item>
+        <item name="colorSecondaryVariant">@color/theme_color</item>
+        <item name="colorOnSecondary">@color/theme_color</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <!-- Customize your theme here. -->
+    </style>
+    <style name="ThemeOverlay.HearthyClients.FullscreenContainer" parent="">
+        <item name="fullscreenBackgroundColor">@color/light_blue_600</item>
+        <item name="fullscreenTextColor">@color/light_blue_A200</item>
+    </style>
+
+    <style name="Theme.HearthyClients2" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowTranslucentNavigation">false</item>
+        <item name="android:windowTranslucentStatus">false</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+
+    <!-- 左边的箭头指示-->
+    <style name="leftDrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
+        <item name="spinBars">true</item>
+        <item name="color">@color/black</item>
+    </style>
+    <style name="AppBarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
+        <!-- 标题颜色-->
+        <item name="android:textColorPrimary">@color/white</item>
+        <!-- 溢出菜单图标颜色-->
+        <item name="colorControlNormal">@color/white</item>
+        <!--MenuItem字体颜色-->
+        <item name="actionMenuTextColor">@color/white</item>
+        
+        <!-- 左边箭头 -->
+        <item name="drawerArrowStyle">@style/leftDrawerArrowStyle</item>
+        <!-- 菜单项点击selector-->
+        <item name="actionBarItemBackground">@drawable/abc_item_background_holo_dark</item>
+
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml
new file mode 100644
index 0000000..b847cef
--- /dev/null
+++ b/app/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <domain-config cleartextTrafficPermitted="true">
+        <!-- 设置的url 为 http 连接（下小节将介绍），需要将此 url，如 proxy.example.com 添加到 domain-config 中 -->
+        <domain includeSubdomains="true">cqyt.dev.yg.dt.io</domain>
+    </domain-config>
+    <base-config cleartextTrafficPermitted="true">
+        <trust-anchors>
+            <certificates src="system" overridePins="true" />
+            <certificates src="user" overridePins="true" />
+        </trust-anchors>
+    </base-config>
+</network-security-config>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..e0bfd48
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,20 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    ext.kotlin_version = '1.9.0'
+    dependencies {
+        // 增加Android Gradle插件版本号配置
+        classpath 'com.android.tools.build:gradle:7.2.2'
+        // hms，若不集成华为厂商通道，可直接跳过
+//        classpath 'com.huawei.agconnect:agcp:1.9.1.300'
+    }
+}
+plugins {
+    id 'com.android.application' version '7.2.2' apply false
+    id 'com.android.library' version '7.2.2' apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.0' apply false
+    id 'org.jetbrains.kotlin.jvm' version '1.8.20' apply false
+}
+apply from: 'config.gradle'
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
\ No newline at end of file
diff --git a/config.gradle b/config.gradle
new file mode 100644
index 0000000..39882d8
--- /dev/null
+++ b/config.gradle
@@ -0,0 +1,194 @@
+ext {
+    minSdkVersion = 21
+    targetSdkVersion = 32
+    compileSdkVersion = 32
+    versionCode = 13
+    versionName = "1.0.23"
+    //Dependencies
+    junitVersion = "4.12"
+    lifecycleVersion = "2.6.0-alpha01"
+    glideVersion = "4.13.0"
+    recycleViewVersion = "1.2.1"
+    appcompatVersion = "1.5.0"
+    materialVersion = "1.5.0-alpha04"
+    rxPermissions = "0.10.2"
+    archCore = "2.1.0"
+    agentWebVersion = "v5.0.0-alpha.1-androidx"
+    immersionbar = "3.2.2"
+    coroutinesVersion = "1.6.4"
+    pictureselector = "v3.10.8"
+    androidPicker = "4.1.11"
+    materialDialogs = "3.3.0"
+    jPushVersion = "5.0.0"
+    androidxDeps = [
+            "appcompat"              : "androidx.appcompat:appcompat:$appcompatVersion",
+            "multidex"               : "androidx.multidex:multidex:2.0.1",
+            "vectordrawable"         : "androidx.vectordrawable:vectordrawable:1.1.0",
+            "vectordrawable-animated": "androidx.vectordrawable:vectordrawable-animated:1.1.0",
+            "annotation"             : "androidx.annotation:annotation:1.2.0",
+            "material"               : "com.google.android.material:material:$materialVersion",
+            "core-common"            : "androidx.arch.core:core-common:$archCore",
+            "core-testing"           : "androidx.arch.core:core-testing:$archCore",
+            "core-runtime"           : "androidx.arch.core:core-runtime:$archCore",
+            "coreKtx"                      : "androidx.core:core-ktx:1.8.0",
+            //协程
+            "coroutines-core"      : "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion",
+            "coroutines-android"     :     "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion",
+
+            //RecycleView
+            "recyclerview"           : "androidx.recyclerview:recyclerview:$recycleViewVersion"
+
+    ]
+    jetpackDeps = [
+            // Lifecycles only (without ViewModel or LiveData)
+            "runtime"        : "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion",
+            // Saved state module for ViewModel
+            "savedstate"     : "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycleVersion",
+            // Annotation processor
+            "lifecycle-compiler"       : "androidx.lifecycle:lifecycle-compiler:$lifecycleVersion",
+            // alternately - if using Java8, use the following instead of lifecycle-compiler
+            "common-java8"   : "androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion",
+            // optional - helpers for implementing LifecycleOwner in a Service
+            "service"        : "androidx.lifecycle:lifecycle-service:$lifecycleVersion",
+            // optional - ProcessLifecycleOwner provides a lifecycle for the whole application process
+            "process"        : "androidx.lifecycle:lifecycle-process:$lifecycleVersion",
+            // optional - ReactiveStreams support for LiveData
+            "reactivestreams": "androidx.lifecycle:lifecycle-reactivestreams-ktx:$lifecycleVersion",
+            "viewModelKtx"                 : "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion",
+            "liveDataKtx"                  : "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion",
+            "activityKtx"                  : "androidx.activity:activity-ktx:1.2.3",
+            "exifinterface"     :    "androidx.exifinterface:exifinterface:1.3.6",
+            //ViewPager2
+            "viewpager2"             : "androidx.viewpager2:viewpager2:1.0.0",
+            // CardView
+            "cardview"               : "androidx.cardview:cardview:1.0.0",
+            // google官方的flex布局
+            "flexbox"        : "com.google.android.flexbox:flexbox:3.0.0",
+            /*dataStore库*/
+            "datastore"    :    "androidx.datastore:datastore-preferences:1.0.0",
+            /*数据库*/
+            "room-ktx"   :   "androidx.room:room-ktx:2.2.5",
+            "room-compiler"  :   "androidx.room:room-compiler:2.2.5",
+            /*activity拓展库，因compileSdkVersion为32，所以使用1.5.1版本，需要升级更高版本的话需同时升级compileSdkVersion版本*/
+            "activity"   :     "androidx.activity:activity-ktx:1.5.1",
+            "fragment"   :     "androidx.fragment:fragment-ktx:1.5.5"
+    ]
+    glideDeps = [
+            "glide"   : "com.github.bumptech.glide:glide:$glideVersion",
+            "compiler": "com.github.bumptech.glide:compiler:$glideVersion"
+    ]
+    agentWebDeps = [
+            "agentweb-core"       : "com.github.Justson.AgentWeb:agentweb-core:$agentWebVersion",
+            "agentweb-filechooser": "com.github.Justson.AgentWeb:agentweb-filechooser:$agentWebVersion",
+            "Downloader"          : "com.github.Justson:Downloader:v5.0.0-androidx"
+    ]
+    networkDeps = [
+           //retrofit请求框架
+            "retrofit"           : "com.squareup.retrofit2:retrofit:2.9.0",
+            "converter-moshi"     :   "com.squareup.retrofit2:converter-moshi:2.9.0",
+            //Gson转换
+            "converterGson"      : "com.squareup.retrofit2:converter-gson:2.9.0",
+           //okhttp3 日志拦截器
+           "loggingInterceptor" : "com.squareup.okhttp3:logging-interceptor:4.8.0",
+           //okhttp3 缓存
+           "PersistentCookieJar": "com.github.franmontiel:PersistentCookieJar:v1.0.1"
+    ]
+    mapDeps = [
+            //高德地图
+            "map3d"  :   "com.amap.api:3dmap:latest.integration",
+//            "location"  :   "com.amap.api:location:latest.integration",
+    ]
+//    jPushDeps = [
+//            "jpush"   :   "cn.jiguang.sdk:jpush:$jPushVersion",
+//            // 接入华为厂商
+//            "hms-push"   :   "com.huawei.hms:push:6.11.0.300",
+//            "huawei-plugin"   :   "cn.jiguang.sdk.plugin:huawei:$jPushVersion",
+//            // 接入 VIVO 厂商
+//            "vivo-plugin"   :   "cn.jiguang.sdk.plugin:vivo:$jPushVersion",
+//            // 接入小米厂商
+//            "xiaomi-plugin"   :   "cn.jiguang.sdk.plugin:xiaomi:$jPushVersion",
+//            // 接入 OPPO 厂商
+//            "oppo-plugin"   :   "cn.jiguang.sdk.plugin:oppo:$jPushVersion",
+//            //以下为 OPPO 3.1.0 aar需要依赖
+//            "gson"   :   "com.google.code.gson:gson:2.6.2",
+//            "commons-codec"   :   "commons-codec:commons-codec:1.6",
+//            // 接入荣耀厂商
+//            "honor-plugin"   :   "cn.jiguang.sdk.plugin:honor:$jPushVersion",
+//    ]
+    commonDeps = [
+            /*下拉刷新*/
+            "swiperefreshlayout"           : "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0",
+            /*EventBus*/
+            "eventbus"                     : "org.greenrobot:eventbus:3.1.1",
+            /*BaseRecyclerViewAdapterHelper*/
+            "BaseRecyclerViewAdapterHelper": "com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.10",
+            // immersionbar基础依赖包，必须要依赖
+            "immersionbar"                 : "com.geyifeng.immersionbar:immersionbar:$immersionbar",
+            // fragment快速实现（可选）
+            "immersionbar-ktx"             : "com.geyifeng.immersionbar:immersionbar-ktx:$immersionbar",
+            //多图片选择器 基础 (必须)
+            "pictureselector"              : "io.github.lucksiege:pictureselector:$pictureselector",
+            // 图片压缩 (按需引入)
+            "compress"              : "io.github.lucksiege:compress:$pictureselector",
+            // 图片裁剪 (按需引入)
+            "ucrop"              : "io.github.lucksiege:ucrop:$pictureselector",
+            //检查更新
+            "UpdatePlugin"                 : "com.github.yjfnypeu:UpdatePlugin:3.1.3",
+//            // 屏幕适配https://github.com/JessYanCoding/AndroidAutoSize
+//            "AndroidAutoSize"              : 'com.github.JessYanCoding:AndroidAutoSize:v1.2.1',
+
+            "assent": "com.afollestad:assent:2.3.1",
+            "dots_indicator": "com.afollestad:viewpagerdots:1.0.0",
+            "date_picker": "com.afollestad:date-picker:0.6.1",
+            //图片轮播控件
+            "banner"                       : "io.github.youth5201314:banner:2.2.2",
+            //满足日常大部分布局样式的TextView
+            "SuperTextView"     :      "com.github.lygttpod:SuperTextView:2.4.6",
+            //动态权限申请
+            "permissionx"   :   "com.guolindev.permissionx:permissionx:1.7.1",
+            //recyclerview分组，顶部浮动
+            "stickyheadersrecyclerview" : "com.timehop.stickyheadersrecyclerview:library:0.4.3@aar",
+            //圆形ImageView
+            "RoundImageView"    :      "com.github.xiaofeidev:round:1.1.1",
+            //小红点
+            "badgeview" : "q.rorbin:badgeview:1.1.3",
+            //log打印工具
+            "logger" : "com.orhanobut:logger:2.2.0",
+            //首页框架
+            "MarqueeView" : "com.sunfusheng:MarqueeView:1.4.0",
+            //加密数据库
+            "android-database-sqlcipher" : "net.zetetic:android-database-sqlcipher:4.3.0@aar",
+            // material风格功能强大的Dialog
+            "materialDialogsCore"          : "com.afollestad.material-dialogs:core:$materialDialogs",
+            "materialDialogsLifecycle"     : "com.afollestad.material-dialogs:lifecycle:$materialDialogs",
+            "materialDialogsbottomsheets"  : "com.afollestad.material-dialogs:bottomsheets:$materialDialogs",
+            /*日期和时间选择器*/
+            "CalendarPicker"   :   "com.github.gzu-liyujiang.AndroidPicker:CalendarPicker:$androidPicker",
+            /*基础通用选择器*/
+            "AndroidPicker"   :   "com.github.gzu-liyujiang.AndroidPicker:Common:$androidPicker",
+            /*滚轮选择器的滚轮控件*/
+            "WheelPicker"   :   "com.github.gzu-liyujiang.AndroidPicker:WheelPicker:$androidPicker",
+            /*滚轮选择器的滚轮控件*/
+            "WheelView"   :   "com.github.gzu-liyujiang.AndroidPicker:WheelView:$androidPicker",
+            //图表
+            "MPAndroidChart"  :   "com.github.PhilJay:MPAndroidChart:v3.1.0",
+            /*虚线*/
+            "dashview"  :  "com.fang:dashview:v1.0.0"
+
+    ]
+
+    androidxLibs = androidxDeps.values()
+    jetpackLibs = jetpackDeps.values()
+    glideLibs = glideDeps.values()
+    agentWebLibs = agentWebDeps.values()
+    networkLibs = networkDeps.values()
+    mapLibs = mapDeps.values()
+//    jPushLibs = jPushDeps.values()
+    commonLibs = commonDeps.values()
+
+    annotationProcessorLibs = [
+            jetpackDeps["lifecycle-compiler"],
+            jetpackDeps["room-compiler"],
+            glideDeps["compiler"]
+    ]
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..98bed16
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,21 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app"s APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Automatically convert third-party libraries to use AndroidX
+android.enableJetifier=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..e708b1c
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..f6a0211
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Thu Sep 29 16:01:33 CST 2022
+distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
new file mode 100644
index 0000000..4f906e0
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..107acd3
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/keystore.properties b/keystore.properties
new file mode 100644
index 0000000..5a6e11a
--- /dev/null
+++ b/keystore.properties
@@ -0,0 +1,4 @@
+storePassword=jiankang1308
+keyPassword=jiankang1308
+keyAlias=jiankang
+storeFile=hearthExpertClients.jks
\ No newline at end of file
diff --git a/lib_base/.gitignore b/lib_base/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/lib_base/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/lib_base/build.gradle b/lib_base/build.gradle
new file mode 100644
index 0000000..fd12c1a
--- /dev/null
+++ b/lib_base/build.gradle
@@ -0,0 +1,70 @@
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+    id 'kotlin-kapt'
+    id 'org.jetbrains.kotlin.android'
+}
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdk rootProject.ext.compileSdkVersion
+
+    defaultConfig {
+        minSdk rootProject.ext.minSdkVersion
+        targetSdk rootProject.ext.targetSdkVersion
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        debug {
+            minifyEnabled false // 开启混淆
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+    buildFeatures {
+        dataBinding true
+    }
+    namespace 'com.btpj.lib_base'
+
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
+    api project(path: ':rsalibrary')
+    configurations {
+        all*.exclude group: 'com.google.guava', module: 'listenablefuture'
+    }
+    testImplementation 'junit:junit:4.13.2'
+
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+    //androidx
+    implementation rootProject.ext.androidxLibs
+    // ViewModel and LiveData
+    implementation rootProject.ext.jetpackLibs
+    /* annotationProcessor */
+    kapt rootProject.ext.annotationProcessorLibs
+    /*网络请求相关*/
+    implementation rootProject.ext.networkLibs
+    /*Glide*/
+    implementation rootProject.ext.glideLibs
+    /*AgentWeb*/
+    implementation rootProject.ext.agentWebLibs
+    // 其他包
+    implementation rootProject.ext.commonLibs
+}
\ No newline at end of file
diff --git a/lib_base/proguard-rules.pro b/lib_base/proguard-rules.pro
new file mode 100644
index 0000000..aba0d3f
--- /dev/null
+++ b/lib_base/proguard-rules.pro
@@ -0,0 +1,148 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
+
+############## 对于一些基本指令的添加start ##################
+# 代码混淆压缩比，在0~7之间，默认为5，一般不做修改
+-optimizationpasses 5
+# 混合时不使用大小写混合，混合后的类名为小写
+-dontusemixedcaseclassnames
+# 指定不去忽略非公共库的类
+-dontskipnonpubliclibraryclasses
+# 这句话能够使我们的项目混淆后产生映射文件
+# 包含有类名->混淆后类名的映射关系
+-verbose
+# 指定不去忽略非公共库的类成员
+-dontskipnonpubliclibraryclassmembers
+# 不做预校验，preverify是proguard的四个步骤之一，Android不需要preverify，去掉这一步能够加快混淆速度。
+-dontpreverify
+# 忽略警告
+-ignorewarnings
+# 保留Annotation不混淆
+-keepattributes *Annotation*,InnerClasses
+# 避免混淆泛型
+-keepattributes Signature
+# 抛出异常时保留代码行号
+-keepattributes SourceFile,LineNumberTable
+# 指定混淆是采用的算法，后面的参数是一个过滤器
+# 这个过滤器是谷歌推荐的算法，一般不做更改
+-optimizations !code/simplification/cast,!field/*,!class/merging/*
+############### 对于一些基本指令的添加end #########################
+
+
+############### Android开发中一些需要保留的公共部分start ##################
+# 保留我们使用的四大组件，自定义的Application等等这些类不被混淆,因为这些子类都有可能被外部调用
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Application
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+-keep public class * extends android.view.View
+# 保留support下的所有类及其内部类
+-keep class android.support.** {*;}
+# 保留继承的
+-keep public class * extends android.support.v4.**
+-keep public class * extends android.support.v7.**
+-keep public class * extends android.support.annotation.**
+# Androidx的混淆
+-keep class com.google.android.material.** {*;}
+-keep class androidx.** {*;}
+-keep public class * extends androidx.**
+-keep interface androidx.** {*;}
+-dontwarn com.google.android.material.**
+-dontnote com.google.android.material.**
+-dontwarn androidx.**
+# 保留R下面的资源
+-keep class **.R$* {*;}
+# 保留本地native方法不被混淆
+-keepclasseswithmembernames class * { native <methods>;}
+# 保留在Activity中的方法参数是view的方法，
+# 这样以来我们在layout中写的onClick就不会被影响
+-keepclassmembers class * extends android.app.Activity{ public void *(android.view.View);}
+# 保留枚举类不被混淆
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+# 保留我们自定义控件（继承自View）不被混淆
+-keep public class * extends android.view.View{
+    *** get*();
+    void set*(***);
+    public <init>(android.content.Context);
+    public <init>(android.content.Context, android.util.AttributeSet);
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+}
+# 保留Parcelable序列化类不被混淆
+-keep class * implements android.os.Parcelable { public static final android.os.Parcelable$Creator *;}
+# 保留Serializable序列化的类不被混淆
+-keepnames class * implements java.io.Serializable
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    private static final java.io.ObjectStreamField[] serialPersistentFields;
+    !static !transient <fields>;
+    !private <fields>;
+    !private <methods>;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+    java.lang.Object writeReplace();
+    java.lang.Object readResolve();
+}
+# 对于带有回调函数的onXXEvent、**On*Listener的，不能被混淆
+-keepclassmembers class * {
+    void *(**On*Event);
+    void *(**On*Listener);
+}
+
+# 所有实体类不能混淆 model文件夹下的所有实体类不能混淆
+-keep class com.btpj.lib_base.data.bean.** {*;}
+-keep class com.btpj.wanandroid.data.** {*;}
+############### Android开发中一些需要保留的公共部分end ##################
+
+
+############### 第三方库中的混淆规则start ##############################
+#  BaseRecyclerViewAdapterHelper混淆
+-keep public class * extends com.chad.library.adapter.base.viewholder.BaseViewHolder
+-keep public class * extends com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+-keepclassmembers class com.chad.library.adapter.base.viewholder.BaseDataBindingHolder {
+public void *(android.view.View);
+}
+-keepclassmembers class * extends com.chad.library.adapter.base.viewholder.BaseDataBindingHolder {
+public void *(android.view.View);
+}
+
+# Glide混淆
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep class * extends com.bumptech.glide.module.AppGlideModule {
+ <init>(...);
+}
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
+  **[] $VALUES;
+  public *;
+}
+-keep class com.bumptech.glide.load.data.ParcelFileDescriptorRewinder$InternalRewinder {
+  *** rewind();
+}
+
+# bugly混淆
+-dontwarn com.tencent.bugly.**
+-keep public class com.tencent.bugly.**{*;}
\ No newline at end of file
diff --git a/lib_base/src/androidTest/java/com/btpj/lib_base/ExampleInstrumentedTest.kt b/lib_base/src/androidTest/java/com/btpj/lib_base/ExampleInstrumentedTest.kt
new file mode 100644
index 0000000..92c0aa4
--- /dev/null
+++ b/lib_base/src/androidTest/java/com/btpj/lib_base/ExampleInstrumentedTest.kt
@@ -0,0 +1,22 @@
+package com.btpj.lib_base
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.btpj.lib_base.test", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/AndroidManifest.xml b/lib_base/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..a05bbb4
--- /dev/null
+++ b/lib_base/src/main/AndroidManifest.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+</manifest>
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/BaseApp.kt b/lib_base/src/main/java/com/btpj/lib_base/BaseApp.kt
new file mode 100644
index 0000000..a98cd07
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/BaseApp.kt
@@ -0,0 +1,50 @@
+package com.btpj.lib_base
+
+import android.app.Application
+import android.content.Context
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelStore
+import androidx.lifecycle.ViewModelStoreOwner
+import com.btpj.lib_base.data.local.DataStoreManager
+import com.btpj.lib_base.data.local.IpManager
+import kotlin.properties.Delegates
+
+/**
+ * Application基类
+ *
+ * @author nanfeifei  2022/3/21
+ */
+open class BaseApp : Application(), ViewModelStoreOwner {
+
+    private lateinit var mAppViewModelStore: ViewModelStore
+    private var mFactory: ViewModelProvider.Factory? = null
+
+    companion object {
+        var appContext: Context by Delegates.notNull()
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        IpManager.initialize(this)
+        DataStoreManager.initialize(this)
+        appContext = applicationContext
+        mAppViewModelStore = ViewModelStore()
+
+    }
+
+    /** 获取一个全局的ViewModel */
+    fun getAppViewModelProvider(): ViewModelProvider {
+        return ViewModelProvider(this, getAppFactory())
+    }
+
+    private fun getAppFactory(): ViewModelProvider.Factory {
+        if (mFactory == null) {
+            mFactory = ViewModelProvider.AndroidViewModelFactory.getInstance(this)
+        }
+        return mFactory as ViewModelProvider.Factory
+    }
+
+    override fun getViewModelStore(): ViewModelStore {
+        return mAppViewModelStore
+    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/base/BaseVMBActivity.kt b/lib_base/src/main/java/com/btpj/lib_base/base/BaseVMBActivity.kt
new file mode 100644
index 0000000..62faa85
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/base/BaseVMBActivity.kt
@@ -0,0 +1,296 @@
+package com.btpj.lib_base.base
+
+import android.content.res.Configuration
+import android.content.res.Resources
+import android.os.Bundle
+import android.view.View
+import android.widget.TextView
+import androidx.appcompat.app.ActionBar
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.ViewDataBinding
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.btpj.lib_base.BR
+import com.btpj.lib_base.R
+import com.btpj.lib_base.base.BaseViewModel.Companion.LOADING_STATE_HIDE
+import com.btpj.lib_base.base.BaseViewModel.Companion.LOADING_STATE_SHOW
+import com.btpj.lib_base.event.LoginEvent
+import com.btpj.lib_base.ext.hideLoading
+import com.btpj.lib_base.ext.showLoading
+import com.btpj.lib_base.utils.LogUtil
+import com.btpj.lib_base.utils.StatusBarUtil
+import com.btpj.lib_base.utils.ToastUtil
+import com.gyf.immersionbar.ktx.immersionBar
+import kotlinx.coroutines.launch
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import retrofit2.HttpException
+import java.io.IOException
+import java.lang.reflect.ParameterizedType
+import java.net.ConnectException
+import java.net.SocketTimeoutException
+import java.net.UnknownHostException
+
+/**
+ * 封装了ViewModel和DataBinding的Activity基类
+ *
+ * @author nanfeifei  2021/11/23
+ */
+abstract class BaseVMBActivity<VM : BaseViewModel, B : ViewDataBinding>(private val contentViewResId: Int) :
+    AppCompatActivity(), View.OnClickListener {
+
+    lateinit var mViewModel: VM
+    lateinit var mBinding: B
+    var toolbar: Toolbar? = null
+    /**
+     * 重写getResources()方法，让APP的字体不受系统设置字体大小影响
+     */
+    override fun getResources(): Resources? {
+        val config = Configuration()
+        config.setToDefaults()
+        createConfigurationContext(config)
+        return super.getResources()
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        EventBus.getDefault().register(this)
+        initViewModel()
+        initDataBinding()
+        initImmersionBar()
+        createObserve()
+        initView(savedInstanceState)
+        bindEvent()
+        initData()
+        mViewModel.init()
+    }
+
+    open fun initImmersionBar() {
+        setTransparentStatusBar(transparentStatusBar(), statusBarDarkFont())
+        initToolBar()
+    }
+
+    /**
+     *
+     * @param isTransparent
+     * @param isStatusBarDarkFont
+     */
+    open fun setTransparentStatusBar(isTransparent: Boolean, isStatusBarDarkFont: Boolean) {
+        immersionBar {
+//            reset()
+            titleBar(getToolBar())
+            if (isTransparent) {
+                statusBarColor(android.R.color.transparent)
+                    .fitsSystemWindows(false) //解决状态栏和布局重叠问题
+            } else {
+                statusBarColor(R.color.theme_color)
+                    .fitsSystemWindows(true) //解决状态栏和布局重叠问题
+            }
+            if (isStatusBarDarkFont) {
+                statusBarDarkFont(
+                    true,
+                    0.2f
+                ) //原理：如果当前设备支持状态栏字体变色，会设置状态栏字体为黑色，如果当前设备不支持状态栏字体变色，会使当前状态栏加上透明度，否则不执行透明度
+            } else {
+                statusBarDarkFont(false, 0.2f)
+            }
+        }
+    }
+
+    private fun initToolBar() {
+        toolbar = getToolBar()
+        toolbar?.title = ""
+        toolbar?.navigationIcon = getDrawable(R.drawable.icon_back)
+        setSupportActionBar(toolbar)
+        val actionBar: ActionBar? = supportActionBar
+        actionBar?.setDisplayHomeAsUpEnabled(true)
+        if (transparentStatusBar()) {
+            fitTransparentStatusBar(toolbar)
+
+        }
+        toolbar?.setNavigationOnClickListener {
+            onBackEvent()
+//            finish()
+        }
+    }
+    fun setToolBarRightText(text: CharSequence){
+        var tvRight = findViewById<TextView>(R.id.tv_right)
+        tvRight?.let {
+            tvRight.visibility = View.VISIBLE
+            tvRight.text = text
+            tvRight.setOnClickListener(this)
+        }
+    }
+    fun fitTransparentStatusBar(view: View?){
+        view?.let {
+            var statusHeight = StatusBarUtil.getStatusBarHeight(this@BaseVMBActivity)
+            it.setPadding(0, statusHeight,
+                0, 0)
+            var height: Int = it.layoutParams?.height ?: 0
+            it.layoutParams.height = height + statusHeight
+
+        }
+    }
+    override fun onBackPressed() {
+        super.onBackPressed()
+    }
+
+    open fun onBackEvent() {
+        super.onBackPressed()
+    }
+    open fun getToolBar(): Toolbar? {
+        return findViewById<Toolbar>(R.id.toolbar_lay)
+    }
+
+    /**
+     * 是否是透明状态栏
+     */
+    open fun transparentStatusBar(): Boolean {
+        return false
+    }
+
+    /** 状态栏是否是深色*/
+    open fun statusBarDarkFont(): Boolean {
+        return true
+    }
+
+    /** ViewModel初始化 */
+    @Suppress("UNCHECKED_CAST")
+    open fun initViewModel() {
+        // 这里利用反射获取泛型中第一个参数ViewModel
+        val type: Class<VM> =
+            (this.javaClass.genericSuperclass as ParameterizedType).actualTypeArguments[0] as Class<VM>
+        mViewModel = ViewModelProvider(this)[type]
+
+    }
+
+    /** DataBinding初始化 */
+    private fun initDataBinding() {
+        mBinding = DataBindingUtil.setContentView(this, contentViewResId)
+        mBinding.apply {
+            // 需绑定lifecycleOwner到activity,xml绑定的数据才会随着liveData数据源的改变而改变
+            lifecycleOwner = this@BaseVMBActivity
+            setVariable(BR.viewModel, mViewModel)
+        }
+    }
+
+    /** View相关初始化 */
+    abstract fun initView(savedInstanceState: Bundle?)
+
+    /**
+     * 事件监听
+     */
+    protected abstract fun bindEvent()
+
+    /**
+     * 初始化数据
+     */
+    open fun initData() {}
+
+    fun showToast(message: String?) {
+        if (message != null && message.isNotEmpty()) {
+            ToastUtil.showShort(
+                this@BaseVMBActivity, message)
+        }
+    }
+
+    /** 提供编写LiveData监听逻辑的方法 */
+    open fun createObserve() {
+
+        mViewModel.apply {
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED){
+                    toastMessage.collect{ message ->
+                        message?.let {
+                            ToastUtil.showShort(
+                                this@BaseVMBActivity, message)
+                        }
+                    }
+                }
+            }
+            loadingDialog.observe(this@BaseVMBActivity){
+                when(it){
+                    LOADING_STATE_SHOW -> {
+                        showLoading()
+                    }
+
+                    LOADING_STATE_HIDE -> {
+                        hideLoading()
+                    }
+                }
+            }
+            // 全局服务器请求错误监听
+            exception.observe(this@BaseVMBActivity) {
+                requestError(it.message)
+                LogUtil.e("Network error：${it.message}")
+                when (it) {
+                    is SocketTimeoutException -> ToastUtil.showShort(
+                        this@BaseVMBActivity,
+                        getString(R.string.request_time_out)
+                    )
+
+                    is ConnectException, is UnknownHostException -> ToastUtil.showShort(
+                        this@BaseVMBActivity,
+                        getString(R.string.network_error)
+                    )
+                    is HttpException -> {
+                        if(it.code() != 401){
+                            ToastUtil.showShort(
+                                this@BaseVMBActivity, it.message ?: getString(R.string.response_error)
+                            )
+                        }
+                    }
+                    is IOException -> {}
+                    else -> ToastUtil.showShort(
+                        this@BaseVMBActivity, it.message ?: getString(R.string.response_error)
+                    )
+                }
+            }
+
+            // 全局服务器返回的错误信息监听
+            errorResponse.observe(this@BaseVMBActivity) {
+                requestError(it?.message)
+                it?.message?.run {
+                    ToastUtil.showShort(this@BaseVMBActivity, this)
+                }
+            }
+        }
+    }
+
+    /** 提供一个请求错误的方法,用于像关闭加载框,显示错误布局之类的 */
+    open fun requestError(msg: String?) {
+        mViewModel.loadingDialog.value = LOADING_STATE_HIDE
+    }
+
+    fun addClickViews(vararg views: View) {
+        for (view in views) {
+            view.setOnClickListener(this)
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        hideLoading()
+        EventBus.getDefault().unregister(this)
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onEvent(event: LoginEvent) {
+        loginStateChange(event.isLogin)
+    }
+
+    /**
+     * 登录状态发生变化
+     */
+    open fun loginStateChange(isLogin: Boolean) {
+
+    }
+
+    override fun onClick(v: View?) {
+    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/base/BaseVMBFragment.kt b/lib_base/src/main/java/com/btpj/lib_base/base/BaseVMBFragment.kt
new file mode 100644
index 0000000..7d2c236
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/base/BaseVMBFragment.kt
@@ -0,0 +1,229 @@
+package com.btpj.lib_base.base
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.ViewDataBinding
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.btpj.lib_base.BR
+import com.btpj.lib_base.R
+import com.btpj.lib_base.base.BaseViewModel.Companion.LOADING_STATE_HIDE
+import com.btpj.lib_base.base.BaseViewModel.Companion.LOADING_STATE_SHOW
+import com.btpj.lib_base.event.LoginEvent
+import com.btpj.lib_base.ext.hideLoading
+import com.btpj.lib_base.ext.showLoading
+import com.btpj.lib_base.utils.LogUtil
+import com.btpj.lib_base.utils.ToastUtil
+import kotlinx.coroutines.launch
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import retrofit2.HttpException
+import java.io.IOException
+import java.lang.reflect.ParameterizedType
+import java.net.ConnectException
+import java.net.SocketTimeoutException
+import java.net.UnknownHostException
+
+/**
+ * 封装了ViewModel和DataBinding的Fragment基类
+ *
+ * @author LTP  2021/11/23
+ */
+abstract class BaseVMBFragment<VM : BaseViewModel, B : ViewDataBinding>(private val contentViewResId: Int) :
+    Fragment(), View.OnClickListener {
+
+    /** 是否第一次加载 */
+    private var mIsFirstLoading = true
+
+    protected lateinit var mViewModel: VM
+    protected lateinit var mBinding: B
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        mBinding = DataBindingUtil.inflate(inflater, contentViewResId, container, false)
+        return mBinding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        if (!EventBus.getDefault().isRegistered(this)) {
+            EventBus.getDefault().register(this)
+        }
+        mIsFirstLoading = true
+        initViewModel()
+        initView(view, savedInstanceState)
+        setupDataBinding()
+        createObserve()
+        bindEvent()
+        initData()
+        mViewModel.init()
+    }
+    fun setToolBarRightText(text: CharSequence){
+        var tvRight = mBinding.root.findViewById<TextView>(R.id.tv_right)
+        tvRight?.let {
+            tvRight.visibility = View.VISIBLE
+            tvRight.text = text
+            tvRight.setOnClickListener(this)
+        }
+    }
+    fun setToolBarRightImage(imageRes: Int){
+        var ivRight = mBinding.root.findViewById<ImageView>(R.id.iv_right)
+        ivRight?.let {
+            ivRight.visibility = View.VISIBLE
+            ivRight.setImageResource(imageRes)
+            ivRight.setOnClickListener(this)
+        }
+    }
+    /** ViewModel初始化 */
+    @Suppress("UNCHECKED_CAST")
+    open fun initViewModel() {
+        // 这里利用反射获取泛型中第一个参数ViewModel
+        val type: Class<VM> =
+            (this.javaClass.genericSuperclass as ParameterizedType).actualTypeArguments[0] as Class<VM>
+        mViewModel = ViewModelProvider(this)[type]
+
+    }
+
+    /** DataBinding相关设置 */
+    private fun setupDataBinding() {
+        mBinding.apply {
+            // 需绑定lifecycleOwner到Fragment,xml绑定的数据才会随着liveData数据源的改变而改变
+            lifecycleOwner = viewLifecycleOwner
+            setVariable(BR.viewModel, mViewModel)
+        }
+    }
+
+    /** View相关初始化 */
+    abstract fun initView(view: View, savedInstanceState: Bundle?)
+
+    /**
+     * 事件监听
+     */
+    protected abstract fun bindEvent()
+
+    /**
+     * 初始化数据
+     */
+    open fun initData() {}
+    override fun onResume() {
+        super.onResume()
+        if (lifecycle.currentState == Lifecycle.State.STARTED && mIsFirstLoading) {
+            lazyLoadData()
+            mIsFirstLoading = false
+        }
+    }
+
+    /** 数据懒加载 */
+    open fun lazyLoadData() {}
+
+    /** 提供编写LiveData监听逻辑的方法 */
+    open fun createObserve() {
+        mViewModel.apply {
+
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.CREATED){
+                    toastMessage.collect{ message ->
+                        message?.let {
+                            ToastUtil.showShort(
+                                requireContext(), message)
+                        }
+                    }
+                }
+            }
+            loadingDialog.observe(viewLifecycleOwner){
+                when(it){
+                    LOADING_STATE_SHOW -> {
+                        showLoading()
+                    }
+
+                    LOADING_STATE_HIDE -> {
+                        hideLoading()
+                    }
+                }
+            }
+            // 全局服务器请求错误监听
+            exception.observe(viewLifecycleOwner) {
+                requestError(it.message)
+                LogUtil.e("Network error：${it.message}")
+                when (it) {
+                    is SocketTimeoutException -> ToastUtil.showShort(
+                        requireContext(),
+                        getString(R.string.request_time_out)
+                    )
+
+                    is ConnectException, is UnknownHostException -> ToastUtil.showShort(
+                        requireContext(),
+                        getString(R.string.network_error)
+                    )
+                    is HttpException -> {
+                        if(it.code() != 401){
+                            ToastUtil.showShort(
+                                requireContext(), it.message ?: getString(R.string.response_error)
+                            )
+                        }
+                    }
+                    is IOException -> {}
+                    else -> ToastUtil.showShort(
+                        requireContext(), it.message ?: getString(R.string.response_error)
+                    )
+                }
+            }
+
+            // 全局服务器返回的错误信息监听
+            errorResponse.observe(viewLifecycleOwner) {
+                requestError(it?.message)
+                it?.message?.run {
+                    ToastUtil.showShort(requireContext(), this)
+                }
+            }
+        }
+    }
+
+    /** 提供一个请求错误的方法,用于像关闭加载框之类的 */
+    open fun requestError(msg: String? = null) {
+        mViewModel.loadingDialog.value = LOADING_STATE_HIDE
+    }
+
+    override fun onDestroyView() {
+        mBinding == null
+        super.onDestroyView()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        if (!EventBus.getDefault().isRegistered(this)) {
+            EventBus.getDefault().unregister(this)
+        }
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onEvent(event: LoginEvent) {
+        loginStateChange(event.isLogin)
+    }
+
+    open fun loginStateChange(isLogin: Boolean) {
+
+    }
+
+    fun addClickViews(vararg views: View) {
+        for (view in views) {
+            view.setOnClickListener(this)
+        }
+    }
+
+    override fun onClick(v: View?) {
+
+    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/base/BaseViewModel.kt b/lib_base/src/main/java/com/btpj/lib_base/base/BaseViewModel.kt
new file mode 100644
index 0000000..5475d38
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/base/BaseViewModel.kt
@@ -0,0 +1,28 @@
+package com.btpj.lib_base.base
+
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import com.btpj.lib_base.data.bean.ApiResponse
+import kotlinx.coroutines.flow.MutableStateFlow
+
+/**
+ * ViewModel基类
+ * @author LTP  2021/11/23
+ */
+abstract class BaseViewModel : ViewModel() {
+    companion object{
+        const val LOADING_STATE_SHOW = 1
+        const val LOADING_STATE_HIDE = 2
+    }
+    /** 加载框控制 */
+    var loadingDialog = MutableLiveData<Int>()
+    /** 请求异常（服务器请求失败，譬如：服务器连接超时等） */
+    val exception = MutableLiveData<Exception>()
+
+    /** 请求服务器返回错误（服务器请求成功但status错误，譬如：登录过期等） */
+    val errorResponse = MutableLiveData<ApiResponse<*>?>()
+    var toastMessage = MutableStateFlow<String?>(null)
+    /** 界面启动时要进行的初始化逻辑，如网络请求,数据初始化等 */
+    abstract fun init()
+
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/base/adapter/BaseCheckRecycleViewAdapter.kt b/lib_base/src/main/java/com/btpj/lib_base/base/adapter/BaseCheckRecycleViewAdapter.kt
new file mode 100644
index 0000000..9c41ad0
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/base/adapter/BaseCheckRecycleViewAdapter.kt
@@ -0,0 +1,206 @@
+package com.btpj.lib_base.base.adapter
+
+import android.view.View
+import android.widget.CompoundButton
+import androidx.annotation.LayoutRes
+import com.btpj.lib_base.base.adapter.BaseCheckRecycleViewAdapter.CheckItem
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.entity.MultiItemEntity
+import com.chad.library.adapter.base.viewholder.BaseViewHolder
+
+/**
+ * 封装adapter
+ *
+ * @param <T>
+</T> */
+abstract class BaseCheckRecycleViewAdapter<T : CheckItem, VH : BaseViewHolder>
+     @JvmOverloads constructor(@LayoutRes private val layoutResId: Int, data: MutableList<T>? = null
+     ) : BaseQuickAdapter<T , VH>(layoutResId, data) {
+    /**
+     * 判定是否已激活选择模式
+     */
+    var enabledCheckMode //激活选择模式
+            = false
+    /**
+     * 是否是单选模式
+     */
+    /**
+     * 设置单选模式，默认是复选模式
+     */
+    var singleMode //单选模式
+            = false
+    /**
+     * 单选模式选中后是否可取消选中项
+     * @param isCancel true为可取消，false为不可取消（必须有一项被选中）
+     */
+    var singleModeIsCanCancel //单选模式选中后是否可取消选中项
+            = false
+    var currentCheckedPosition = -1
+    private var secondCheckedPosition = -1
+
+
+
+
+    /**
+     * 处理复选框
+     */
+    fun handleCompoundButton(compoundButton: CompoundButton, t: T) {
+        compoundButton.isChecked = t!!.checked
+        compoundButton.visibility =
+            if (enabledCheckMode) View.VISIBLE else View.GONE
+    }
+
+    /**
+     * 激活选择模式
+     */
+    fun enableCheckMode() {
+        if (enabledCheckMode) {
+            return
+        }
+        enabledCheckMode = true
+        notifyDataSetChanged()
+    }
+
+    /**
+     * 取消选择模式
+     */
+    fun cancelCheckMode() {
+        if (!enabledCheckMode) {
+            return
+        }
+        enabledCheckMode = false
+        for (item in data) {
+            item!!.checked = false
+        }
+        notifyDataSetChanged()
+    }
+
+    /**
+     * 点击了某一项
+     *
+     * @return true：已经激活了选择模式并且设置成功；false：尚未激活选择模式并且设置失败
+     */
+    fun clickItem(position: Int, isSecond: Boolean): Boolean {
+        var position = position
+        return if (enabledCheckMode) {
+            if (position < data.size) {
+                if (singleMode) {
+                    if (isSecond) {
+                        if (secondCheckedPosition == -1) {
+                            val item: T = data[position]
+                            item!!.checked = true
+                        } else if (secondCheckedPosition == position) {
+                            if (singleModeIsCanCancel) {
+                                val item: T = data.get(position)
+                                item!!.checked = !item.checked
+                            }
+                        } else {
+                            if (currentCheckedPosition < data.size) {
+                                data[currentCheckedPosition].checked = false
+                            }
+                            data.get(position).checked = true
+                        }
+                        secondCheckedPosition = position
+                    } else {
+                        secondCheckedPosition = -1
+                        if (currentCheckedPosition == -1) {
+                            val item: T = data[position]
+                            item!!.checked = !item.checked
+                        } else if (currentCheckedPosition == position) {
+                            if (singleModeIsCanCancel) {
+                                val item: T = data.get(position)
+                                item!!.checked = !item.checked
+                            }
+                        } else {
+                            if (currentCheckedPosition < data.size) {
+                                data[currentCheckedPosition].checked = false
+                            }
+                            data[position].checked = true
+                        }
+                        currentCheckedPosition = position
+                    }
+                } else {
+                    val item: T = data.get(position)
+                    item!!.checked = !item.checked
+                }
+                notifyDataSetChanged()
+            }
+            true
+        } else {
+            false
+        }
+    }
+
+    /**
+     * 全选
+     *
+     * @return true：已经激活了选择模式并且设置成功；false：尚未激活选择模式并且设置失败
+     */
+    fun checkAll(checked: Boolean): Boolean {
+        return if (enabledCheckMode) {
+            for (i in 0 until data.size) {
+                val item: T = data[i]
+                item!!.checked = checked
+            }
+            notifyDataSetChanged()
+            if (!checked) {
+                currentCheckedPosition = -1
+                secondCheckedPosition = -1
+            }
+            true
+        } else {
+            false
+        }
+    }
+
+    /**
+     * 获取选中的项
+     */
+    val checkedItems: List<T>
+        get() {
+            val checkedItems: MutableList<T> = ArrayList()
+            for (item in data) {
+                if (item!!.checked) {
+                    checkedItems.add(item)
+                }
+            }
+            return checkedItems
+        }
+
+    /**
+     * 获取集合中选中的项
+     */
+    fun getCheckedItems(list: List<T>): List<T> {
+        val checkedItems: MutableList<T> = ArrayList()
+        for (item in list) {
+            if (item!!.checked) {
+                checkedItems.add(item)
+            }
+        }
+        return checkedItems
+    }
+
+    /**
+     * 删除选中的项
+     */
+    fun deleteCheckedItems(): List<T> {
+        val checkedItems: MutableList<T> = ArrayList()
+        val iterator: MutableIterator<T> = data.iterator()
+        var item: T
+        while (iterator.hasNext()) {
+            item = iterator.next()
+            if (item!!.checked) {
+                checkedItems.add(item)
+                iterator.remove()
+            }
+        }
+        notifyDataSetChanged()
+        currentCheckedPosition = -1
+        secondCheckedPosition = -1
+        return checkedItems
+    }
+
+    interface CheckItem : MultiItemEntity {
+        var checked: Boolean
+    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/base/adapter/BaseDataBindingAdapter.kt b/lib_base/src/main/java/com/btpj/lib_base/base/adapter/BaseDataBindingAdapter.kt
new file mode 100644
index 0000000..33b76cc
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/base/adapter/BaseDataBindingAdapter.kt
@@ -0,0 +1,24 @@
+package com.btpj.lib_base.base.adapter
+
+import android.view.ViewGroup
+import androidx.annotation.LayoutRes
+import androidx.databinding.ViewDataBinding
+import com.chad.library.adapter.base.BaseQuickAdapter
+import com.chad.library.adapter.base.util.getItemView
+import com.chad.library.adapter.base.viewholder.BaseDataBindingHolder
+
+/**
+ * @author nanfeifei
+ * @time 2023/5/5 14:07
+ * @description 基于第三方库BaseRecyclerViewAdapterHelper拓展使用DataBinding的Adapter
+ */
+abstract class BaseDataBindingAdapter<T, BD : ViewDataBinding>
+@JvmOverloads constructor(@LayoutRes private val layoutResId: Int, data: MutableList<T>? = null
+) : BaseQuickAdapter<T, BaseDataBindingHolder<BD>>(layoutResId, data) {
+    override fun onCreateDefViewHolder(
+        parent: ViewGroup,
+        viewType: Int
+    ): BaseDataBindingHolder<BD> {
+        return BaseDataBindingHolder(parent.getItemView(layoutResId))
+    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/bean/ApiResponse.kt b/lib_base/src/main/java/com/btpj/lib_base/data/bean/ApiResponse.kt
new file mode 100644
index 0000000..19a2c50
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/data/bean/ApiResponse.kt
@@ -0,0 +1,16 @@
+package com.btpj.lib_base.data.bean
+
+/**
+ * 接口返回外层封装实体
+ *
+ * @author LTP  2022/3/22
+ */
+data class ApiResponse<T>(
+    var result: T?,
+    var code: Int,
+    val message: String?,
+    val success: Boolean,
+    val timestamp: Long,
+    val ok: Boolean,
+    val data: T?
+)
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/bean/PageResponse.kt b/lib_base/src/main/java/com/btpj/lib_base/data/bean/PageResponse.kt
new file mode 100644
index 0000000..939bfed
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/data/bean/PageResponse.kt
@@ -0,0 +1,16 @@
+package com.btpj.lib_base.data.bean
+
+/**
+ * 分页实体
+ *
+ * @author LTP  2022/3/22
+ */
+data class PageResponse<T>(
+    val curPage: Int,
+    val datas: List<T>,
+    val offset: Int,
+    val over: Boolean,
+    val pageCount: Int,
+    val size: Int,
+    val total: Int
+)
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/local/DataStoreManager.kt b/lib_base/src/main/java/com/btpj/lib_base/data/local/DataStoreManager.kt
new file mode 100644
index 0000000..0e5c0bb
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/data/local/DataStoreManager.kt
@@ -0,0 +1,221 @@
+package com.btpj.lib_base.data.local
+
+import android.content.Context
+import android.util.Log
+import com.btpj.lib_base.utils.DataStoreUtils
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+object DataStoreManager {
+    private const val TAG = "CommonSPUtils"
+    private const val KEY_TOKEN = "token"
+    private const val KEY_OPEN_APP = "openApp"
+    private const val KEY_PRIVACY_POLICY = "isAgree"
+    private const val KEY_PRIVACY_AGREEMENT_URL = "privacyAgreementUrl"
+    private const val KEY_USER_AGREEMENT_URL = "userAgreementUrl"
+    private const val KEY_USER_ID = "userId"
+    private const val KEY_USER_INFO = "userInfo"
+    private const val KEY_USER_INFO2 = "userInfo2"
+    private const val KEY_FCM_TOKEN = "fcmToken"
+    private const val KEY_PRIVACY = "privacy"
+    private const val KEY_APP_INSTANCE_ID = "appInstanceId"
+    private const val KEY_USER_LAW_URL = "userLawUrl"
+    private lateinit var dataStore: DataStoreUtils
+    fun initialize(context: Context?) {
+        if (context == null) {
+            Log.w(TAG, "initialize: context is null")
+            return
+        }
+        context?.apply {
+            dataStore = DataStoreUtils.init(this)
+        }
+    }
+
+    /** 保存弹窗隐私隐私是否同意 */
+    fun savePrivacyState(isAgree: Boolean) {
+        CoroutineScope(Dispatchers.IO).launch {
+            dataStore?.putData(KEY_PRIVACY, isAgree)
+        }
+    }
+
+    /** 是否弹窗已同意隐私协议 */
+    fun isPrivacyState(): Boolean {
+        return if (DataStoreManager::dataStore.isInitialized) {
+            dataStore.getSyncData(KEY_PRIVACY, false)
+        } else {
+            return false
+        }
+    }
+
+    /**
+     * 已打开APP，保持状态
+     */
+    fun setOpenApp(openApp: Boolean){
+        CoroutineScope(Dispatchers.IO).launch {
+            dataStore?.putData(KEY_OPEN_APP, openApp)
+        }
+    }
+    /**
+     * 是否是第一次打开APP
+     */
+    fun isOpenApp(): Boolean{
+        return if (DataStoreManager::dataStore.isInitialized) {
+            dataStore.getSyncData(KEY_OPEN_APP, false)
+        }else{
+            return false
+        }
+    }
+    /** 保存隐私隐私是否同意 */ 
+    fun saveAgreePrivacyPolicyStatus(isAgree: Boolean){
+        CoroutineScope(Dispatchers.IO).launch {
+            dataStore?.putData(KEY_PRIVACY_POLICY, isAgree)
+        }
+    }
+    /** 是否已同意隐私协议 */ 
+    fun isAgreePrivacyPolicyStatus(): Boolean {
+        return if (DataStoreManager::dataStore.isInitialized) {
+            dataStore.getSyncData(KEY_PRIVACY_POLICY, false)
+        }else{
+            return false
+        }
+    }
+    /** 保持Token信息 */ 
+    fun saveToken(token: String){
+        dataStore?.putSyncData(KEY_TOKEN, token)
+    }
+    /** 获取Token信息 */ 
+    fun getToken(): String{
+        var token = if (DataStoreManager::dataStore.isInitialized) {
+            dataStore.getSyncData(KEY_TOKEN, "")
+        }else{
+            ""
+        }
+        return token
+    }
+    /** 保持FcmToken信息 */
+    fun saveFcmToken(fcmToken: String){
+        dataStore?.putSyncData(KEY_FCM_TOKEN, fcmToken)
+    }
+    /** 获取FcmToken信息 */
+    fun getFcmToken(): String{
+        var fcmToken = if (DataStoreManager::dataStore.isInitialized) {
+            dataStore.getSyncData(KEY_FCM_TOKEN, "")
+        }else{
+            ""
+        }
+        return fcmToken
+    }
+    /** 保持FcmToken信息 */
+    fun saveAppInstanceId(appInstanceId: String){
+        dataStore?.putSyncData(KEY_APP_INSTANCE_ID, appInstanceId)
+    }
+    /** 获取FcmToken信息 */
+    fun getAppInstanceId(): String{
+        var appInstanceId = if (DataStoreManager::dataStore.isInitialized) {
+            dataStore.getSyncData(KEY_APP_INSTANCE_ID, "")
+        }else{
+            ""
+        }
+        return appInstanceId
+    }
+    /** 保存User信息 */
+    fun saveUserInfo(userInfo: String){
+        dataStore?.putSyncData(KEY_USER_INFO, userInfo)
+    }
+    /** 保存备份User信息 */
+    fun saveUserInfo2(userInfo: String) {
+        dataStore?.putSyncData(KEY_USER_INFO2, userInfo)
+    }
+    /** 获取User信息 */ 
+    fun getUserInfo(): String{
+        var userInfo = if (DataStoreManager::dataStore.isInitialized) {
+            dataStore.getSyncData(KEY_USER_INFO, "")
+        }else{
+            ""
+        }
+        return userInfo
+    }/** 获取User信息 */
+    fun getUserInfo2(): String{
+        var userInfo = if (DataStoreManager::dataStore.isInitialized) {
+            dataStore.getSyncData(KEY_USER_INFO2, "")
+        }else{
+            ""
+        }
+        return userInfo
+    }
+    fun isLogin(): Boolean {
+        return getToken().isNotEmpty()
+    }
+
+    /**
+     * 保存隐私协议地址
+     */
+    fun savePrivacyAgreementUrl(url: String){
+        dataStore?.putSyncData(KEY_PRIVACY_AGREEMENT_URL, url)
+    }
+
+    /**
+     * 获取隐私协议地址
+     */
+    fun getPrivacyAgreementUrl(): String? {
+        return if(DataStoreManager::dataStore.isInitialized){
+            dataStore.getSyncData(KEY_PRIVACY_AGREEMENT_URL, "")
+        }else{
+            ""
+        }
+    }
+    /**
+     * 保存用户协议地址
+     */
+    fun saveUserAgreementUrl(url: String){
+        dataStore?.putSyncData(KEY_USER_AGREEMENT_URL, url)
+    }
+    /**
+     * 获取用户协议地址
+     */
+    fun getUserAgreementUrl(): String? {
+        return if (DataStoreManager::dataStore.isInitialized){
+            dataStore?.getSyncData(KEY_USER_AGREEMENT_URL, "")
+        }else{
+            ""
+        }
+    }
+    /**
+     * 保存用户协议地址
+     */
+    fun savePermissionAgreementUrl(url: String){
+        dataStore?.putSyncData(KEY_USER_AGREEMENT_URL, url)
+    }
+    /**
+     * 获取用户协议地址
+     */
+    fun getPermissionAgreementUrl(): String? {
+        return if (DataStoreManager::dataStore.isInitialized){
+            dataStore?.getSyncData(KEY_USER_AGREEMENT_URL, "")
+        }else{
+            ""
+        }
+    }
+
+    fun saveLawUrl(url: String) {
+        dataStore?.putSyncData(KEY_USER_LAW_URL, url)
+    }
+    fun getLawUrl(): String? {
+        return if (DataStoreManager::dataStore.isInitialized) {
+            dataStore?.getSyncData(KEY_USER_LAW_URL, "")
+        } else {
+            ""
+        }
+    }
+    fun saveUserId(userId: Int){
+        dataStore?.putSyncData(KEY_USER_ID, userId)
+    }
+    fun getUserId(): Int? {
+        return if (DataStoreManager::dataStore.isInitialized){
+            dataStore?.getSyncData(KEY_USER_ID, 0)
+        }else{
+            return 0
+        }
+    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/local/IpManager.kt b/lib_base/src/main/java/com/btpj/lib_base/data/local/IpManager.kt
new file mode 100644
index 0000000..7b63dcf
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/data/local/IpManager.kt
@@ -0,0 +1,119 @@
+package com.btpj.lib_base.data.local
+
+import android.content.Context
+import android.util.Log
+import com.btpj.lib_base.utils.DataStoreUtils
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.launch
+
+
+/**
+ * 服务器地址管理
+ * 这个项目用不到,放在这里提供一个模板
+ *
+ * @author LTP 2022/4/8
+ */
+object IpManager {
+    private const val TAG = "IpManager"
+
+    /** 常用的IP */
+    private const val DEBUG_DEFAULT_IP_ADDRESS_REMOTE = "http://cqyt.dev.yg.dt.io/"     // 开发环境
+    private const val TEST_DEFAULT_IP_ADDRESS_REMOTE = "https://starry.test.icdat.cn/"     // 测试环境
+//    private const val TEST_DEFAULT_IP_ADDRESS_REMOTE = "https://quarry-api.yg.icdat.cn/"     // 测试环境
+    private const val PRODUCT_DEFAULT_IP_ADDRESS_REMOTE = "https://health-api.tzgl.shuziweidao.com/"     // 线上环境
+
+    private const val DEBUG_H5_ADDRESS_REMOTE = "http://cms.dev.yg.dt.io"     // 开发环境
+    private const val TEST_H5_ADDRESS_REMOTE = "https://starry.out.icdat.cn"     // 测试环境
+    private const val PRODUCT_H5_ADDRESS_REMOTE = "https://console.shuziweidao.com"     // 线上环境
+
+
+    private const val KEY_IP_SET = "data_ip_set"
+    private const val KEY_DEFAULT_IP_AND_PORT = "data_default_ip_and_port"
+    private lateinit var dataStore: DataStoreUtils
+
+    val baseUrlType: BaseUrlType = BaseUrlType.PRODUCT
+    fun initialize(context: Context?) {
+        if (context == null) {
+            Log.w(TAG, "initialize: context is null")
+            return
+        }
+        context.apply {
+            dataStore = DataStoreUtils.init(this)
+        }
+    }
+    enum class BaseUrlType(val type: Int) {
+        DEBUG(1),
+        TEST(2),
+        PRODUCT(3)
+    }
+    private fun getBaseUrl(baseUrlType: BaseUrlType = BaseUrlType.DEBUG): String{
+        return when(baseUrlType){
+            BaseUrlType.DEBUG -> {
+                DEBUG_DEFAULT_IP_ADDRESS_REMOTE
+            }
+            BaseUrlType.TEST -> {
+                TEST_DEFAULT_IP_ADDRESS_REMOTE
+            }
+            BaseUrlType.PRODUCT -> {
+                PRODUCT_DEFAULT_IP_ADDRESS_REMOTE
+            }
+        }
+    }
+
+    fun getH5BaseUrl(baseUrlType: BaseUrlType = BaseUrlType.DEBUG): String {
+        return when (baseUrlType) {
+            BaseUrlType.DEBUG -> {
+                DEBUG_H5_ADDRESS_REMOTE
+            }
+
+            BaseUrlType.TEST -> {
+                TEST_H5_ADDRESS_REMOTE
+            }
+
+            BaseUrlType.PRODUCT -> {
+                PRODUCT_H5_ADDRESS_REMOTE
+            }
+        }
+    }
+
+    /**
+     * 保存默认IP
+     *
+     * @param ip 要保存为默认的IP
+     */
+    fun saveDefaultIP(ip: String) {
+        dataStore.putSyncData(KEY_DEFAULT_IP_AND_PORT, ip)
+    }
+
+    /** 获取默认IP */
+
+    fun getDefaultIP(): String {
+        var ip= getBaseUrl(baseUrlType)
+        CoroutineScope(Dispatchers.Unconfined).launch {
+            val flowDefaultIp = dataStore.getData(KEY_DEFAULT_IP_AND_PORT, ip)
+            flowDefaultIp.collect{
+                ip = it
+            }
+        }
+        return ip
+    }
+
+    /** 存储使用过的IP集 */
+    fun saveIPSet(ipSet: MutableSet<String>) {
+        dataStore.putSyncData(KEY_IP_SET, ipSet)
+    }
+
+    /** 获取使用过的IP集 */
+    fun getIPSet(): Flow<Set<String>> {
+        return dataStore.getData(
+            KEY_IP_SET, setOf(
+                PRODUCT_DEFAULT_IP_ADDRESS_REMOTE
+            )
+        )
+    }
+    fun getImageBaseUrl(): String{
+        return getDefaultIP() + "file/show/"
+    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/data/network/OtherRepository.kt b/lib_base/src/main/java/com/btpj/lib_base/data/network/OtherRepository.kt
new file mode 100644
index 0000000..a4338bf
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/data/network/OtherRepository.kt
@@ -0,0 +1,71 @@
+package com.btpj.lib_base.data.network
+
+import com.btpj.lib_base.data.bean.ApiResponse
+import com.btpj.lib_base.http.BaseRepository
+import com.btpj.lib_base.http.RetrofitManager
+import com.btpj.lib_base.http.api.OtherAPi
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import okhttp3.ResponseBody
+
+object OtherRepository : BaseRepository(), OtherAPi {
+    private val service by lazy { RetrofitManager.getService(OtherAPi::class.java) }
+    override suspend fun getOther(url: String): ApiResponse<JsonElement> {
+        return apiCall { service.getOther(url) }
+    }
+//    override suspend fun getBlock(): ApiResponse<Boolean> {
+//        return apiCall { service.getBlock() }
+//    }
+//
+//    override suspend fun getBlockList(): ApiResponse<String> {
+//        return apiCall { service.getBlock() }
+//    }
+//
+//    override suspend fun getCoupon(): ApiResponse<String> {
+//        return apiCall { service.getBlock() }
+//    }
+//
+//    override suspend fun getFans(): ApiResponse<String> {
+//        return apiCall { service.getBlock() }
+//    }
+//
+//    override suspend fun getLike(): ApiResponse<String> {
+//        return apiCall { service.getBlock() }
+//    }
+//
+//    override suspend fun getRegister(): ApiResponse<String> {
+//        return apiCall { service.getBlock() }
+//    }
+//
+//    override suspend fun getVideoBlock(): ApiResponse<String> {
+//        return apiCall { service.getBlock() }
+//    }
+//
+//    override suspend fun getVideoDown(): ApiResponse<String> {
+//        TODO("Not yet implemented")
+//    }
+//
+//    override suspend fun getVideoIn(): ApiResponse<String> {
+//        TODO("Not yet implemented")
+//    }
+//
+//    override suspend fun getVideoInfo() {
+//        TODO("Not yet implemented")
+//    }
+//
+//    override suspend fun getVideoLike(): ApiResponse<String> {
+//        TODO("Not yet implemented")
+//    }
+//
+//    override suspend fun getVideoList(): ApiResponse<String> {
+//        TODO("Not yet implemented")
+//    }
+//
+//    override suspend fun getVideoOut(): ApiResponse<String> {
+//        TODO("Not yet implemented")
+//    }
+//
+//    override suspend fun getVideoUpload(): ApiResponse<String> {
+//        TODO("Not yet implemented")
+//    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/event/LoginEvent.kt b/lib_base/src/main/java/com/btpj/lib_base/event/LoginEvent.kt
new file mode 100644
index 0000000..431d7e4
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/event/LoginEvent.kt
@@ -0,0 +1,5 @@
+package com.btpj.lib_base.event
+
+class LoginEvent(var isLogin: Boolean) {
+
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/ext/BaseViewModelExt.kt b/lib_base/src/main/java/com/btpj/lib_base/ext/BaseViewModelExt.kt
new file mode 100644
index 0000000..ba56dba
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/ext/BaseViewModelExt.kt
@@ -0,0 +1,80 @@
+package com.btpj.lib_base.ext
+
+import androidx.lifecycle.viewModelScope
+import com.btpj.lib_base.base.BaseViewModel
+import com.btpj.lib_base.base.BaseViewModel.Companion.LOADING_STATE_HIDE
+import com.btpj.lib_base.base.BaseViewModel.Companion.LOADING_STATE_SHOW
+import com.btpj.lib_base.data.bean.ApiResponse
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.launch
+
+/**
+ * BaseViewModel的一些扩展方法
+ *
+ * @author nanfeifie  2022/3/22
+ */
+
+/**
+ * 启动协程，封装了viewModelScope.launch
+ *
+ * @param showDialog 是否显示加载框
+ * @param tryBlock try语句运行的函数
+ * @param catchBlock catch语句运行的函数，可以用来做一些网络异常等的处理，默认空实现
+ * @param finallyBlock finally语句运行的函数，可以用来做一些资源回收等，默认空实现
+ */
+fun BaseViewModel.launch(
+    showDialog: Boolean,
+    tryBlock: suspend CoroutineScope.() -> Unit,
+    catchBlock: suspend CoroutineScope.() -> Unit = {},
+    finallyBlock: suspend CoroutineScope.() -> Unit = {}
+) {
+    // 默认是执行在主线程，相当于launch(Dispatchers.Main)
+    viewModelScope.launch {
+        try {
+            if(showDialog){
+                loadingDialog.value = LOADING_STATE_SHOW
+            }
+            tryBlock()
+        } catch (e: Exception) {
+            exception.value = e
+            catchBlock()
+        } finally {
+            finallyBlock()
+        }
+    }
+}
+fun BaseViewModel.launch(
+    tryBlock: suspend CoroutineScope.() -> Unit,
+    catchBlock: suspend CoroutineScope.() -> Unit = {},
+    finallyBlock: suspend CoroutineScope.() -> Unit = {}
+) {
+    launch(true, tryBlock, catchBlock, finallyBlock)
+}
+/**
+ * 请求结果处理
+ *
+ * @param response ApiResponse
+ * @param successBlock 服务器请求成功返回成功码的执行回调，默认空实现
+ * @param errorBlock 服务器请求成功返回错误码的执行回调，默认返回false的空实现，函数返回值true:拦截统一错误处理，false:不拦截
+ */
+suspend fun <T> BaseViewModel.handleRequest(
+    response: ApiResponse<T>,
+    successBlock: suspend CoroutineScope.(response: ApiResponse<T>) -> Unit = {},
+    errorBlock: suspend CoroutineScope.(response: ApiResponse<T>) -> Boolean = { false }
+) {
+    coroutineScope {
+        if(response.success||response.ok){
+            loadingDialog.value = LOADING_STATE_HIDE
+            successBlock(response)
+        }else{
+//            when (response.code) {
+//                else -> { // 服务器返回的其他错误码
+            if (!errorBlock(response)) {
+                // 只有errorBlock返回false不拦截处理时，才去统一提醒错误提示
+                errorResponse.value = response
+            }
+//                }
+        }
+    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/ext/BindingViewExt.kt b/lib_base/src/main/java/com/btpj/lib_base/ext/BindingViewExt.kt
new file mode 100644
index 0000000..e1445ed
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/ext/BindingViewExt.kt
@@ -0,0 +1,34 @@
+package com.btpj.lib_base.ext
+
+import android.widget.ImageView
+import androidx.databinding.BindingAdapter
+import com.btpj.lib_base.widgets.TitleLayout
+
+/**
+ * DataBinding的自定义属性
+ * @author nanfeifie  2022/4/2
+ */
+
+@BindingAdapter("imageUrl")
+fun ImageView.setImageUrl(url: String) {
+    load(url)
+}
+
+/**
+ * ImageView设置圆形图片
+ * @author LTP  2022/4/2
+ */
+@BindingAdapter("circleImageUrl")
+fun ImageView.setCircleImageUrl(url: String?) {
+    loadCircle(url)
+}
+
+/**
+ * 这里使用DataBinding的自定义属性方式而不是直接用TitleLayout的app:titleText，
+ * 是因为TitleLayout里定义的setTitleText方法返回值是TitleLayout对象而不是void，
+ * 不想去改TitleLayout里定义的setTitleText方法所以就用DataBinding的自定义属性
+ */
+@BindingAdapter("titleText")
+fun TitleLayout.setTitle(titleText: String?) {
+    this.setTitleText(titleText ?: "")
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/ext/StringExt.kt b/lib_base/src/main/java/com/btpj/lib_base/ext/StringExt.kt
new file mode 100644
index 0000000..6dab6ba
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/ext/StringExt.kt
@@ -0,0 +1,42 @@
+package com.btpj.lib_base.ext
+
+import android.annotation.SuppressLint
+import android.text.Html
+import android.text.Spanned
+import com.baileren.rsalibrary.RSACipherStrategy
+import com.google.gson.GsonBuilder
+import java.util.regex.Pattern
+
+/**
+ * String扩展类
+ * @author nanfeifie  2022/3/25
+ */
+fun String.toHtml(@SuppressLint("InlinedApi") flag: Int = Html.FROM_HTML_MODE_LEGACY): Spanned {
+    return if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
+        Html.fromHtml(this, flag)
+    } else {
+        Html.fromHtml(this)
+    }
+}
+
+/** 将对象转为JSON字符串 */
+fun Any?.toJson(): String {
+    return GsonBuilder().create().toJson(this)
+}
+/** 将对象转为key加密之后的字符串 */
+fun Any?.toEncryptJson(): String{
+    return GsonBuilder()
+        .create().toJson(this)
+}
+fun <T> String?.jsonToBean(clazz: Class<T>): T {
+    return GsonBuilder()
+        .create().fromJson(this, clazz)
+}
+fun String.isMobile(): Boolean {
+    var pattern= Pattern.compile("^1[3-9]\\d{9}\$")
+    return pattern.matcher(this).matches()
+}
+fun String.encrypt(publicKey: String): String{
+    var rsaCipherStrategy = RSACipherStrategy()
+    return rsaCipherStrategy.encrypt(publicKey, this)
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/ext/ViewExt.kt b/lib_base/src/main/java/com/btpj/lib_base/ext/ViewExt.kt
new file mode 100644
index 0000000..825e377
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/ext/ViewExt.kt
@@ -0,0 +1,365 @@
+package com.btpj.lib_base.ext
+
+import android.annotation.SuppressLint
+import android.graphics.Bitmap
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.annotation.DrawableRes
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.RecyclerView
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.customview.customView
+import com.afollestad.materialdialogs.customview.getCustomView
+import com.afollestad.materialdialogs.lifecycle.lifecycleOwner
+import com.btpj.lib_base.R
+import com.btpj.lib_base.data.local.IpManager
+import com.btpj.lib_base.utils.ScreenUtil
+import com.btpj.lib_base.utils.ScreenUtil.dp2px
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.MultiTransformation
+import com.bumptech.glide.load.resource.bitmap.CenterCrop
+import com.bumptech.glide.load.resource.bitmap.CircleCrop
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners
+import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
+import com.bumptech.glide.request.RequestOptions
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import java.io.File
+
+fun addImageBaseUrl(url: String?): String?{
+    if (url != null) {
+        if(url.startsWith("http")){
+            return url
+        }
+    }else {
+        return null
+    }
+    return IpManager.getImageBaseUrl() + url.replace("\\","/")
+}
+
+/**
+ * ImageView利用Glide加载图片
+ * @param url 图片url（可远程可本地）
+ * @param showPlaceholder 是否展示placeholder，默认为true
+ */
+fun ImageView.load(url: String, showPlaceholder: Boolean = true, @DrawableRes defaultResId: Int = 0) {
+    if (showPlaceholder) {
+        val options = RequestOptions().transform()
+        if (defaultResId == 0) {
+            options.placeholder(R.drawable.ic_default)
+                .error(R.drawable.ic_default)
+        }
+        Glide.with(context).load(addImageBaseUrl(url))
+            .apply(options)
+            .into(this)
+    } else {
+        Glide.with(context).load(addImageBaseUrl(url))
+            .into(this)
+    }
+}
+/**
+ * ImageView利用Glide加载图片
+ * @param url 图片url（可远程可本地）
+ * @param showPlaceholder 是否展示placeholder，默认为true
+ */
+fun ImageView.load(file: File, showPlaceholder: Boolean = true, @DrawableRes defaultResId: Int = 0) {
+    Glide.with(context).load(file)
+        .transition(DrawableTransitionOptions.withCrossFade(500))
+        .into(this)
+}
+/**
+ * ImageView利用Glide加载图片
+ * @param resourceId 本地图片资源Id
+ * @param showPlaceholder 是否展示placeholder，默认为false
+ */
+fun ImageView.load(@DrawableRes resourceId: Int, showPlaceholder: Boolean = false, @DrawableRes defaultResId: Int = 0) {
+    Glide.with(context).load(resourceId)
+        .into(this)
+}
+
+/**
+ * ImageView利用Glide加载圆形图片
+ * @param url 图片url（可远程可本地）
+ */
+fun ImageView.loadCircle(url: String?, @DrawableRes defaultResId: Int = 0) {
+    val options = RequestOptions
+        .bitmapTransform(CircleCrop())
+    if (defaultResId == 0) {
+        options.placeholder(R.drawable.ic_default_head_img)
+            .error(R.drawable.ic_default_head_img)
+    }
+    Glide.with(context).load(addImageBaseUrl(url))
+        .apply(options)
+        .into(this)
+}
+
+/**
+ * ImageView利用Glide加载圆形图片
+ * @param url 图片url（可远程可本地）
+ */
+fun ImageView.loadCircle(file: File, @DrawableRes defaultResId: Int = 0) {
+    val options = RequestOptions
+        .bitmapTransform(CircleCrop())
+    if (defaultResId == 0) {
+        options.placeholder(R.drawable.ic_default_head_img)
+            .error(R.drawable.ic_default_head_img)
+    }
+    Glide.with(context).load(file)
+        .apply(options)
+        .into(this)
+}
+
+/**
+ * ImageView利用Glide加载圆形图片
+ * @param resourceId 本地图片资源Id
+ */
+fun ImageView.loadCircle(@DrawableRes resourceId: Int) {
+    Glide.with(context).load(resourceId)
+//        .placeholder(R.drawable.ic_default_img)
+        .apply(RequestOptions.bitmapTransform(CircleCrop()))
+        .into(this)
+}
+
+/**
+ * 加载图片到ImageView
+ * @param imageUrl  图片地址
+ * @param imageView  View
+ * @param placeholder  占位图
+ */
+fun ImageView.loadRoundedImage(
+    url: String?,
+    roundingRadius: Float,
+    @DrawableRes defaultResId: Int = 0
+) {
+    //设置图片圆角角度
+    val roundedCorners = RoundedCorners(dp2px(roundingRadius))
+    val multiTransformation: MultiTransformation<Bitmap> = MultiTransformation(
+        CenterCrop(), roundedCorners
+    )
+    val options = RequestOptions
+        .bitmapTransform(multiTransformation)
+    if (defaultResId == 0) {
+        options.placeholder(R.drawable.ic_default)
+            .error(R.drawable.ic_default)
+    }
+    Glide.with(context)
+        .load(addImageBaseUrl(url))
+        .apply(options)
+        .into(this)
+}
+/**
+ * 加载图片到ImageView
+ * @param imageUrl  图片地址
+ * @param imageView  View
+ * @param placeholder  占位图
+ */
+fun ImageView.loadRoundedImage(
+    file: File,
+    roundingRadius: Float
+) {
+
+    //设置图片圆角角度
+    val roundedCorners = RoundedCorners(dp2px(roundingRadius))
+    val multiTransformation: MultiTransformation<Bitmap> = MultiTransformation(
+        CenterCrop(), roundedCorners
+    )
+    val options = RequestOptions
+        .bitmapTransform(multiTransformation)
+    Glide.with(context)
+        .load(file)
+        .apply(options)
+        .into(this)
+}
+/**
+ * 加载图片到ImageView
+ * @param imageUrl  图片地址
+ * @param imageView  View
+ * @param placeholder  占位图
+ */
+fun ImageView.loadRoundedImage(
+    imageRes: Int,
+    roundingRadius: Float
+) {
+    //设置图片圆角角度
+    val roundedCorners = RoundedCorners(dp2px(roundingRadius))
+    val multiTransformation: MultiTransformation<Bitmap> = MultiTransformation(
+        CenterCrop(), roundedCorners
+    )
+    val options = RequestOptions
+        .bitmapTransform(multiTransformation)
+    if (imageRes != 0) {
+        Glide.with(context)
+            .load(imageRes)
+            .apply(options)
+            .into(this)
+    }
+}
+
+/**
+ * SwipeRefreshLayout设置加载主题颜色
+ * @author LTP  2022/3/24
+ */
+fun SwipeRefreshLayout.initColors() {
+    setColorSchemeResources( R.color.theme_color
+    )
+}
+
+/**
+ * RecyclerView列表为空时的显示视图
+ */
+fun RecyclerView.getEmptyView(message: String = context.getString(R.string.list_is_empty)): View {
+    return LayoutInflater.from(context)
+        .inflate(R.layout.layout_empty, parent as ViewGroup, false).apply {
+            findViewById<TextView>(R.id.tv_empty).text = message
+//            findViewById<TextView>(R.id.tv_empty).setOnClickListener {
+//                refreshCall.invoke()
+//            }
+        }
+}
+
+/**
+ * 初始化普通的toolbar 只设置标题
+ *
+ * @param titleStr 标题
+ */
+fun Toolbar.initTitle(titleStr: String = "") {
+    title = titleStr
+}
+
+/**
+ * 初始化返回键
+ *
+ * @param backImg 返回键资源路径
+ * @param onBack 返回事件
+ */
+fun Toolbar.initClose(
+    backImg: Int = R.drawable.ic_back,
+    onBack: () -> Unit
+) {
+    setNavigationIcon(backImg)
+    setNavigationOnClickListener { onBack() }
+}
+
+/**
+ * Activity上显示AlertDialog
+ *
+ * @param message AlertDialog内容信息
+ * @param title AlertDialog标题，默认为 "温馨提示"
+ * @param positiveButtonText AlertDialog右侧按键内容 默认为 "确定"
+ * @param positiveAction AlertDialog点击右侧按键的行为 默认是空方法
+ * @param negativeButtonText AlertDialog左侧按键内容 默认为 "取消"
+ * @param negativeAction AlertDialog点击左侧按键的行为 默认是空方法
+ */
+fun AppCompatActivity.showDialog(
+    message: String,
+    title: String = "Tips",
+    positiveButtonText: String = "Confirm",
+    positiveAction: () -> Unit = {},
+    negativeButtonText: String = "Cancel",
+    negativeAction: () -> Unit = {}
+) {
+    MaterialDialog(this)
+        .cancelable(true)
+        .lifecycleOwner(this)
+        .show {
+            title(text = title)
+            message(text = message)
+            positiveButton(text = positiveButtonText) { positiveAction.invoke() }
+            negativeButton(text = negativeButtonText) { negativeAction.invoke() }
+        }
+}
+
+/**
+ * Fragment上显示AlertDialog
+ *
+ * @param message AlertDialog内容信息
+ * @param title AlertDialog标题，默认为 "温馨提示"
+ * @param positiveButtonText AlertDialog右侧按键内容 默认为 "确定"
+ * @param positiveAction AlertDialog点击右侧按键的行为 默认是空方法
+ * @param negativeButtonText AlertDialog左侧按键内容 默认为 "取消"
+ * @param negativeAction AlertDialog点击左侧按键的行为 默认是空方法
+ */
+fun Fragment.showDialog(
+    message: String,
+    title: String = "Tips",
+    positiveButtonText: String = "Confirm",
+    positiveAction: () -> Unit = {},
+    negativeButtonText: String = "Cancel",
+    negativeAction: () -> Unit = {}
+) {
+    MaterialDialog(requireContext())
+        .cancelable(true)
+        .lifecycleOwner(viewLifecycleOwner)
+        .show {
+            title(text = title)
+            message(text = message)
+            positiveButton(text = positiveButtonText) { positiveAction.invoke() }
+            negativeButton(text = negativeButtonText) { negativeAction.invoke() }
+        }
+}
+
+/** 加载框 */
+@SuppressLint("StaticFieldLeak")
+private var mLoadingDialog: MaterialDialog? = null
+
+/** 打开加载框 */
+fun AppCompatActivity.showLoading(message: String = "加载中") {
+    if (!this.isFinishing) {
+        if (mLoadingDialog == null) {
+            mLoadingDialog = MaterialDialog(this)
+                .cancelable(true)
+                .cancelOnTouchOutside(false)
+                .cornerRadius(6f)
+                .customView(R.layout.dialog_loading)
+                .maxWidth(literal = ScreenUtil.dp2px(120f))
+                .lifecycleOwner(this)
+            mLoadingDialog?.getCustomView()?.run {
+                this.findViewById<TextView>(R.id.tv_loadingMsg).text = message
+            }
+        }
+        mLoadingDialog?.show()
+    }
+}
+
+/** 打开加载框 */
+fun Fragment.showLoading(message: String = "加载中") {
+    if (!this.isRemoving&& this.isAdded) {
+        if (mLoadingDialog == null) {
+            mLoadingDialog = MaterialDialog(requireContext())
+                .cancelable(true)
+                .cancelOnTouchOutside(false)
+                .cornerRadius(6f)
+                .customView(R.layout.dialog_loading)
+                .maxWidth(literal = ScreenUtil.dp2px(120f))
+                .lifecycleOwner(this)
+            mLoadingDialog?.getCustomView()?.run {
+                this.findViewById<TextView>(R.id.tv_loadingMsg).text = message
+            }
+        }
+        mLoadingDialog?.show()
+    }
+}
+
+/** 隐藏Loading加载框 */
+fun hideLoading() {
+    mLoadingDialog?.cancel()
+    mLoadingDialog = null
+}
+
+/**
+ * 处理BottomNavigationView中的tab长按出现toast的问题
+ *
+ * @param ids tab项的id集
+ */
+fun BottomNavigationView.clearLongClickToast(ids: MutableList<Int>) {
+    val bottomNavigationView: ViewGroup = getChildAt(0) as ViewGroup
+    for (position in 0 until ids.size) {
+        bottomNavigationView.getChildAt(position).findViewById<View>(ids[position])
+            .setOnLongClickListener { true }
+    }
+}
diff --git a/lib_base/src/main/java/com/btpj/lib_base/http/BaseRepository.kt b/lib_base/src/main/java/com/btpj/lib_base/http/BaseRepository.kt
new file mode 100644
index 0000000..ed5b5bc
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/http/BaseRepository.kt
@@ -0,0 +1,18 @@
+package com.btpj.lib_base.http
+
+import com.btpj.lib_base.data.bean.ApiResponse
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+/**
+ * Repository数据仓库基类，主要用于协程的调用
+ *
+ * @author LTP  2022/3/23
+ */
+open class BaseRepository {
+
+    suspend fun <T> apiCall(api: suspend () -> ApiResponse<T>): ApiResponse<T> {
+        return withContext(Dispatchers.IO) {
+            api.invoke() }
+    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/http/RetrofitManager.kt b/lib_base/src/main/java/com/btpj/lib_base/http/RetrofitManager.kt
new file mode 100644
index 0000000..ab0898c
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/http/RetrofitManager.kt
@@ -0,0 +1,94 @@
+package com.btpj.lib_base.http
+
+import com.btpj.lib_base.BaseApp.Companion.appContext
+import com.btpj.lib_base.data.local.IpManager
+import com.btpj.lib_base.http.interceptor.CustomSignInterceptor
+import com.btpj.lib_base.http.interceptor.logInterceptor
+import com.btpj.lib_base.utils.LogUtil
+import com.franmontiel.persistentcookiejar.PersistentCookieJar
+import com.franmontiel.persistentcookiejar.cache.SetCookieCache
+import com.franmontiel.persistentcookiejar.persistence.SharedPrefsCookiePersistor
+import okhttp3.Authenticator
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.OkHttpClient
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import java.util.concurrent.TimeUnit
+
+/**
+ * Retrofit管理类
+ *
+ * @author nanfeifei  2022/3/21
+ */
+object RetrofitManager {
+    /** 请求超时时间 */
+    private const val TIME_OUT_SECONDS = 1
+
+    /** 请求cookie */
+    val cookieJar: PersistentCookieJar by lazy {
+        PersistentCookieJar(
+            SetCookieCache(),
+            SharedPrefsCookiePersistor(appContext)
+        )
+    }
+
+    /** 请求根地址 */
+    val BASE_URL = IpManager.getDefaultIP()
+
+    /** OkHttpClient相关配置 */
+    private val client: OkHttpClient
+        get() = OkHttpClient.Builder()
+            .addInterceptor(CustomSignInterceptor())
+            // 请求过滤器
+            .addInterceptor(logInterceptor)
+            .authenticator(Authenticator.JAVA_NET_AUTHENTICATOR)
+//            .authenticator(object : Authenticator{
+//                override fun authenticate(route: Route?, response: Response): Request? {
+//                    println("Authenticating for response: $response")
+//                    println("Challenges: " + response.challenges())
+//                    val credential: String = Credentials.basic("jesse", "password1")
+//                    return response.request.newBuilder()
+//                        .header("Authorization", credential)
+//                        .build();
+//                }
+//            })
+            //设置缓存配置,缓存最大10M,设置了缓存之后可缓存请求的数据到data/data/包名/cache/net_cache目录中
+//            .cache(Cache(File(appContext.cacheDir, "net_cache"), 10 * 1024 * 1024))
+//            //添加缓存拦截器 可传入缓存天数
+//            .addInterceptor(CacheInterceptor(30))
+            // 请求超时时间
+            .connectTimeout(TIME_OUT_SECONDS.toLong(), TimeUnit.MINUTES)
+            .readTimeout(TIME_OUT_SECONDS.toLong(), TimeUnit.MINUTES)
+            .readTimeout(TIME_OUT_SECONDS.toLong(), TimeUnit.MINUTES)
+            .cookieJar(cookieJar)
+            .build()
+    /**
+     * Retrofit相关配置
+     */
+    private fun initRetrofit(client: OkHttpClient, baseUrl: String?): Retrofit{
+        return Retrofit.Builder()
+            .client(client)
+            // 使用Moshi更适合Kotlin
+            .addConverterFactory(GsonConverterFactory.create())
+            .baseUrl(baseUrl ?: BASE_URL)
+            .build()
+    }
+
+    private val retrofit: Retrofit by lazy {
+        initRetrofit(client, BASE_URL)
+    }
+
+    fun <T> getService(serviceClass: Class<T>, baseUrl: String? = null): T {
+        LogUtil.d(BASE_URL)
+        if(retrofit!= null && baseUrl.isNullOrEmpty()){
+            return retrofit.create(serviceClass)
+        }
+        return initRetrofit(client, baseUrl).create(serviceClass)
+    }
+
+    fun String.toRequestBody(): RequestBody {
+        return toRequestBody("application/json; charset=utf-8".toMediaTypeOrNull())
+    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/http/api/OtherAPi.kt b/lib_base/src/main/java/com/btpj/lib_base/http/api/OtherAPi.kt
new file mode 100644
index 0000000..7db1fd0
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/http/api/OtherAPi.kt
@@ -0,0 +1,86 @@
+package com.btpj.lib_base.http.api
+
+import com.btpj.lib_base.data.bean.ApiResponse
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import okhttp3.ResponseBody
+import retrofit2.http.Headers
+import retrofit2.http.POST
+import retrofit2.http.Url
+
+interface OtherAPi {
+    @Headers("Content-Type: application/json")
+    @POST
+    suspend fun getOther(@Url url: String)
+            : ApiResponse<JsonElement>
+
+//    @Headers("Content-Type: application/json")
+//    @POST("/customer/customer/block")
+//    suspend fun getBlock()
+//            : ApiResponse<Boolean>
+//
+//    @Headers("Content-Type: application/json")
+//    @POST("/customer/customer/block/list")
+//    suspend fun getBlockList()
+//            : ApiResponse<String>
+//
+//    @Headers("Content-Type: application/json")
+//    @POST("/customer/customer/coupon")
+//    suspend fun getCoupon()
+//            : ApiResponse<String>
+//
+//    @Headers("Content-Type: application/json")
+//    @POST("/customer/customer/fans")
+//    suspend fun getFans()
+//            : ApiResponse<String>
+//
+//    @Headers("Content-Type: application/json")
+//    @POST("/customer/customer/like")
+//    suspend fun getLike()
+//            : ApiResponse<String>
+//
+//    @Headers("Content-Type: application/json")
+//    @POST("/customer/customer/register")
+//    suspend fun getRegister()
+//            : ApiResponse<String>
+//
+//    @Headers("Content-Type: application/json")
+//    @POST("/customer/video/block")
+//    suspend fun getVideoBlock()
+//            : ApiResponse<String>
+//
+//    @Headers("Content-Type: application/json")
+//    @POST("/customer/video/down")
+//    suspend fun getVideoDown()
+//            : ApiResponse<String>
+//
+//    @Headers("Content-Type: application/json")
+//    @POST("/customer/video/in")
+//    suspend fun getVideoIn()
+//            : ApiResponse<String>
+//
+//    @Headers("Content-Type: application/json")
+//    @POST("/customer/video/info")
+//    suspend fun getVideoInfo()
+//
+//
+//    @Headers("Content-Type: application/json")
+//    @POST("/customer/video/like")
+//    suspend fun getVideoLike()
+//            : ApiResponse<String>
+//
+//    @Headers("Content-Type: application/json")
+//    @POST("/customer/video/list")
+//    suspend fun getVideoList()
+//            : ApiResponse<String>
+//
+//    @Headers("Content-Type: application/json")
+//    @POST("/customer/video/out")
+//    suspend fun getVideoOut()
+//            : ApiResponse<String>
+//
+//    @Headers("Content-Type: application/json")
+//    @POST("/customer/video/upload")
+//    suspend fun getVideoUpload()
+//            : ApiResponse<String>
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/http/factory/GsonConverterFactory.java b/lib_base/src/main/java/com/btpj/lib_base/http/factory/GsonConverterFactory.java
new file mode 100644
index 0000000..ab43cf4
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/http/factory/GsonConverterFactory.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2015 Square, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.btpj.lib_base.http.factory;
+
+import com.google.gson.Gson;
+import com.google.gson.TypeAdapter;
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import okhttp3.RequestBody;
+import okhttp3.ResponseBody;
+import retrofit2.Converter;
+import retrofit2.Retrofit;
+
+/**
+ * A {@linkplain Converter.Factory converter} which uses Gson for JSON.
+ *
+ * <p>Because Gson is so flexible in the types it supports, this converter assumes that it can
+ * handle all types. If you are mixing JSON serialization with something else (such as protocol
+ * buffers), you must {@linkplain Retrofit.Builder#addConverterFactory(Converter.Factory) add this
+ * instance} last to allow the other converters a chance to see their types.
+ */
+public final class GsonConverterFactory extends Converter.Factory {
+    /**
+     * Create an instance using a default {@link Gson} instance for conversion. Encoding to JSON and
+     * decoding from JSON (when no charset is specified by a header) will use UTF-8.
+     */
+    public static GsonConverterFactory create() {
+        return create();
+    }
+
+    /**
+     * Create an instance using {@code gson} for conversion. Encoding to JSON and decoding from JSON
+     * (when no charset is specified by a header) will use UTF-8.
+     */
+    @SuppressWarnings("ConstantConditions") // Guarding public API nullability.
+    public static GsonConverterFactory create(Gson gson) {
+        if (gson == null) throw new NullPointerException("gson == null");
+        return new GsonConverterFactory(gson);
+    }
+
+    private final Gson gson;
+
+    private GsonConverterFactory(Gson gson) {
+        this.gson = gson;
+    }
+
+    @Override
+    public Converter<ResponseBody, ?> responseBodyConverter(
+            Type type, Annotation[] annotations, Retrofit retrofit) {
+        TypeAdapter<?> adapter = gson.getAdapter(TypeToken.get(type));
+        return new GsonResponseBodyConverter<>(gson, adapter);
+    }
+
+    @Override
+    public Converter<?, RequestBody> requestBodyConverter(
+            Type type,
+            Annotation[] parameterAnnotations,
+            Annotation[] methodAnnotations,
+            Retrofit retrofit) {
+        TypeAdapter<?> adapter = gson.getAdapter(TypeToken.get(type));
+        return new GsonRequestBodyConverter<>(gson, adapter);
+    }
+}
diff --git a/lib_base/src/main/java/com/btpj/lib_base/http/factory/GsonRequestBodyConverter.java b/lib_base/src/main/java/com/btpj/lib_base/http/factory/GsonRequestBodyConverter.java
new file mode 100644
index 0000000..204ab76
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/http/factory/GsonRequestBodyConverter.java
@@ -0,0 +1,38 @@
+package com.btpj.lib_base.http.factory;
+
+import com.google.gson.Gson;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonWriter;
+
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.charset.Charset;
+
+import okhttp3.MediaType;
+import okhttp3.RequestBody;
+import okio.Buffer;
+import retrofit2.Converter;
+
+public final class GsonRequestBodyConverter<T> implements Converter<T, RequestBody> {
+    private static final MediaType MEDIA_TYPE = MediaType.get("application/json; charset=UTF-8");
+    private static final Charset UTF_8 = Charset.forName("UTF-8");
+
+    private final Gson gson;
+    private final TypeAdapter<T> adapter;
+
+    public GsonRequestBodyConverter(Gson gson, TypeAdapter<T> adapter) {
+        this.gson = gson;
+        this.adapter = adapter;
+    }
+
+    @Override
+    public RequestBody convert(T value) throws IOException {
+        Buffer buffer = new Buffer();
+        Writer writer = new OutputStreamWriter(buffer.outputStream(), UTF_8);
+        JsonWriter jsonWriter = gson.newJsonWriter(writer);
+        adapter.write(jsonWriter, value);
+        jsonWriter.close();
+        return RequestBody.create(MEDIA_TYPE, buffer.readByteString());
+    }
+}
diff --git a/lib_base/src/main/java/com/btpj/lib_base/http/factory/GsonResponseBodyConverter.java b/lib_base/src/main/java/com/btpj/lib_base/http/factory/GsonResponseBodyConverter.java
new file mode 100644
index 0000000..2aa7308
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/http/factory/GsonResponseBodyConverter.java
@@ -0,0 +1,39 @@
+package com.btpj.lib_base.http.factory;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonIOException;
+import com.google.gson.JsonParser;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+
+import java.io.IOException;
+
+import okhttp3.ResponseBody;
+import retrofit2.Converter;
+
+public final class GsonResponseBodyConverter<T> implements Converter<ResponseBody, T> {
+    private final Gson gson;
+    private final TypeAdapter<T> adapter;
+
+    public GsonResponseBodyConverter(Gson gson, TypeAdapter<T> adapter) {
+        this.gson = gson;
+        this.adapter = adapter;
+    }
+
+    @Override
+    public T convert(ResponseBody value) throws IOException {
+        JsonReader jsonReader = gson.newJsonReader(value.charStream());
+        try {
+            JsonElement parse = new JsonParser().parse(jsonReader);
+            T result = adapter.fromJsonTree(parse);
+            if (jsonReader.peek() != JsonToken.END_DOCUMENT) {
+                throw new JsonIOException("JSON document was not fully consumed.");
+            }
+            return result;
+        } finally {
+            value.close();
+        }
+    }
+}
diff --git a/lib_base/src/main/java/com/btpj/lib_base/http/interceptor/BaseCustomDynamicInterceptor.kt b/lib_base/src/main/java/com/btpj/lib_base/http/interceptor/BaseCustomDynamicInterceptor.kt
new file mode 100644
index 0000000..a3ae406
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/http/interceptor/BaseCustomDynamicInterceptor.kt
@@ -0,0 +1,228 @@
+/*
+ * Copyright (C) 2017 zhouyou(478319399@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.btpj.lib_base.http.interceptor
+
+import com.orhanobut.logger.Logger
+import okhttp3.*
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.MultipartBody.Part.Companion.createFormData
+import okhttp3.RequestBody.Companion.toRequestBody
+import okio.Buffer
+import java.io.IOException
+import java.io.UnsupportedEncodingException
+import java.net.URLDecoder
+import java.net.URLEncoder
+import java.util.*
+
+/**
+ *
+ * 描述：动态拦截器
+ * 主要功能是针对参数：<br></br>
+ * 1.可以获取到全局公共参数和局部参数，统一进行签名sign<br></br>
+ * 2.可以自定义动态添加参数，类似时间戳timestamp是动态变化的，token（登录了才有），参数签名等<br></br>
+ * 3.参数值是经过UTF-8编码的<br></br>
+ * 4.默认提供询问是否动态签名（签名需要自定义），动态添加时间戳等<br></br>
+ * 作者： nanfeifei<br></br>
+ * 日期： 2017/5/3 15:32 <br></br>
+ * 版本： v1.0<br></br>
+ */
+abstract class BaseCustomDynamicInterceptor : Interceptor {
+    private var httpUrl: HttpUrl? = null
+
+    @Throws(IOException::class)
+    override fun intercept(chain: Interceptor.Chain): Response {
+        var request: Request = chain.request()
+        var newBuilder: Request.Builder = request.newBuilder()
+        getHttpUrl(request.url)?.let { newBuilder = newBuilder.url(it) }
+        request = dynamicHeader(newBuilder).build()
+        if (request.method == "GET") {
+            httpUrl = parseUrl(request.url.toUrl().toString()).toHttpUrlOrNull()
+            request = addGetParamsSign(request)
+        } else if (request.method == "POST") {
+            httpUrl = request.url
+            request = addPostParamsSign(request)
+        }
+        var response = chain.proceed(request)
+        return response
+    }
+
+    private fun getHttpUrl(httpUrl: HttpUrl): HttpUrl? {
+        var oldUri = httpUrl.toUri()
+        Logger.d(oldUri.path)
+
+        return httpUrl
+    }
+
+    //get 添加签名和公共动态参数
+    @Throws(UnsupportedEncodingException::class)
+    private fun addGetParamsSign(request: Request): Request {
+        var request = request
+        var httpUrl: HttpUrl = request.url
+        val newBuilder: HttpUrl.Builder = httpUrl.newBuilder()
+
+        //获取原有的参数
+        val nameSet: Set<String> = httpUrl.queryParameterNames
+        val nameList = ArrayList<String>()
+        nameList.addAll(nameSet)
+        val oldparams = TreeMap<String, String>()
+        for (i in nameList.indices) {
+
+            val value: String = if (httpUrl.queryParameterValues(nameList[i]) != null
+                && httpUrl.queryParameterValues(nameList[i]).isNotEmpty()
+            )
+                httpUrl.queryParameterValues(nameList[i])[0].toString() else ""
+            oldparams[nameList[i]] = value
+        }
+        val nameKeys = listOf(nameList).toString()
+        //拼装新的参数
+        val newParams = dynamic(oldparams)
+        for ((key, value) in newParams) {
+            val urlValue = URLEncoder.encode(value, Charsets.UTF_8.name())
+            //原来的URl: https://xxx.xxx.xxx/app/chairdressing/skinAnalyzePower/skinTestResult?appId=10101
+            if (!nameKeys.contains(key)) { //避免重复添加
+                newBuilder.addQueryParameter(key, urlValue)
+            }
+        }
+        httpUrl = newBuilder.build()
+        request = request.newBuilder().url(httpUrl).build()
+        return request
+    }
+
+    //post 添加签名和公共动态参数
+    @Throws(UnsupportedEncodingException::class)
+    private fun addPostParamsSign(request: Request): Request {
+        var request = request
+        if (request.body is FormBody) {
+            val bodyBuilder = FormBody.Builder()
+            var formBody: FormBody? = request.body as FormBody?
+
+            //原有的参数
+            val oldparams = TreeMap<String, String>()
+            if (formBody != null) {
+                for (i in 0 until formBody.size) {
+                    oldparams[formBody.encodedName(i)] = formBody.encodedValue(i)
+                }
+            }
+
+            //拼装新的参数
+            val newParams = dynamic(oldparams)
+            //Logc.i("======post请求参数===========");
+            for ((key, value1) in newParams) {
+                val value = URLDecoder.decode(value1, Charsets.UTF_8.name())
+                bodyBuilder.addEncoded(key, value)
+                //Logc.i(entry.getKey() + " -> " + value);
+            }
+            formBody = bodyBuilder.build()
+            request = request.newBuilder().post(formBody).build()
+        } else if (request.body is MultipartBody) {
+            var multipartBody: MultipartBody? = request.body as MultipartBody?
+            val bodyBuilder: MultipartBody.Builder =
+                MultipartBody.Builder().setType(MultipartBody.FORM)
+            val oldparts: List<MultipartBody.Part> = multipartBody?.parts ?: ArrayList()
+
+            //拼装新的参数
+            val newparts: MutableList<MultipartBody.Part> = ArrayList<MultipartBody.Part>()
+            newparts.addAll(oldparts)
+            val oldparams = TreeMap<String, String>()
+            val newParams = dynamic(oldparams)
+            for ((key, value) in newParams) {
+                val part: MultipartBody.Part = createFormData(key, value)
+                newparts.add(part)
+            }
+            for (part in newparts) {
+                bodyBuilder.addPart(part)
+            }
+            multipartBody = bodyBuilder.build()
+            request = request.newBuilder().post(multipartBody).build()
+        } else if (isPlainJson(request.body!!.contentType())) {
+            var oldJsonStr = bodyToString(request)
+            val postJsonStr = dynamicJson(oldJsonStr)
+            val requestBody: RequestBody =
+                postJsonStr.toRequestBody(request.body!!.contentType())
+            request = request.newBuilder().post(requestBody).build()
+        }
+        return request
+    }
+
+    //解析前：https://xxx.xxx.xxx/app/chairdressing/skinAnalyzePower/skinTestResult?appId=10101
+    //解析后：https://xxx.xxx.xxx/app/chairdressing/skinAnalyzePower/skinTestResult
+    private fun parseUrl(url: String): String {
+        var url = url
+        if ("" != url && url.contains("?")) { // 如果URL不是空字符串
+            url = url.substring(0, url.indexOf('?'))
+        }
+        return url
+    }
+
+    /**
+     * 将提交内容转化为字符串
+     * @param request
+     * @return
+     */
+    private fun bodyToString(request: Request): String? {
+        try {
+            val copy = request.newBuilder().build()
+            val buffer = Buffer()
+            copy.body!!.writeTo(buffer)
+            return buffer.readUtf8()
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+        return null
+    }
+
+    /**
+     * 动态处理Header
+     *
+     * @param builder
+     * @return 返回新的参数集合
+     */
+    abstract fun dynamicHeader(builder: Request.Builder): Request.Builder
+
+    /**
+     * 动态处理参数(不包含Json形式)
+     *
+     * @param dynamicMap
+     * @return 返回新的参数集合
+     */
+    abstract fun dynamic(dynamicMap: TreeMap<String, String>?): TreeMap<String, String>
+
+    /**
+     * 动态处理参数（Json形式）
+     *
+     * @param json
+     * @return 返回新的参数集合
+     */
+    abstract fun dynamicJson(json: String?): String
+
+    companion object {
+        /**
+         * 判断提交内容是不是json格式
+         * @param mediaType
+         * @return
+         */
+        fun isPlainJson(mediaType: MediaType?): Boolean {
+            if (mediaType == null) return false
+            var subtype = mediaType.subtype
+            if (subtype != null) {
+                subtype = subtype.lowercase(Locale.getDefault())
+                if (subtype.contains("json")) //
+                    return true
+            }
+            return false
+        }
+    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/http/interceptor/CacheInterceptor.kt b/lib_base/src/main/java/com/btpj/lib_base/http/interceptor/CacheInterceptor.kt
new file mode 100644
index 0000000..cd82a7b
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/http/interceptor/CacheInterceptor.kt
@@ -0,0 +1,39 @@
+package com.btpj.lib_base.http.interceptor
+
+import com.btpj.lib_base.BaseApp.Companion.appContext
+import com.btpj.lib_base.utils.NetworkUtil
+import okhttp3.CacheControl
+import okhttp3.Interceptor
+import okhttp3.Response
+
+/**
+ * 缓存拦截器,用于无网情况下传递header直接拉取之前缓存的数据
+ * @param day 缓存天数
+ *
+ * @author nanfeifei 2022/4/14
+ */
+class CacheInterceptor(private var day: Int = 7) : Interceptor {
+    override fun intercept(chain: Interceptor.Chain): Response {
+        var request = chain.request()
+        if (!NetworkUtil.isNetworkAvailable(appContext)) {
+            request = request.newBuilder()
+                .cacheControl(CacheControl.FORCE_CACHE)
+                .build()
+        }
+        val response = chain.proceed(request)
+        if (!NetworkUtil.isNetworkAvailable(appContext)) {
+            val maxAge = 60 * 60
+            response.newBuilder()
+                .removeHeader("Pragma")
+                .header("Cache-Control", "public, max-age=$maxAge")
+                .build()
+        } else {
+            val maxStale = 60 * 60 * 24 * day
+            response.newBuilder()
+                .removeHeader("Pragma")
+                .header("Cache-Control", "public, only-if-cached, max-stale=$maxStale")
+                .build()
+        }
+        return response
+    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/http/interceptor/CustomSignInterceptor.kt b/lib_base/src/main/java/com/btpj/lib_base/http/interceptor/CustomSignInterceptor.kt
new file mode 100644
index 0000000..38a99f9
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/http/interceptor/CustomSignInterceptor.kt
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2017 zhouyou(478319399@qq.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.btpj.lib_base.http.interceptor
+
+import android.text.TextUtils
+import com.btpj.lib_base.data.local.DataStoreManager
+import com.btpj.lib_base.ext.toJson
+import com.btpj.lib_base.utils.LogUtil
+import com.google.gson.JsonObject
+import com.google.gson.JsonParser
+import okhttp3.Request
+import java.util.TreeMap
+
+
+/**
+ *
+ * 描述：对参数进行签名、添加token、时间戳处理的拦截器
+ * 主要功能说明：<br></br>
+ * 因为参数签名没办法统一，签名的规则不一样，签名加密的方式也不同有MD5、BASE64等等，只提供自己能够扩展的能力。<br></br>
+ * 作者： nanfeifei<br></br>
+ * 日期： 2017/5/4 15:21 <br></br>
+ * 版本： v1.0<br></br>
+ */
+class CustomSignInterceptor : BaseCustomDynamicInterceptor() {
+    companion object{
+        const val BODY_NO_ENCODE = "bodyNoEncode"
+    }
+    override fun dynamicHeader(builder: Request.Builder): Request.Builder {
+//        builder.addHeader("Content-Type", "application/json")
+        builder.addHeader("X-Access-Token", DataStoreManager.getToken())
+        return builder
+    }
+
+    override fun dynamic(dynamicMap: TreeMap<String, String>?): TreeMap<String, String> {
+        //dynamicMap:是原有的全局参数+局部参数
+//        dynamicMap?.set("marketId".asEncode(), marketId.toString())  //示例
+        return dynamicMap!! //dynamicMap:是原有的全局参数+局部参数+新增的动态参数
+    }
+
+    override fun dynamicJson(json: String?): String {
+        var jsonObj: Any = if(TextUtils.isEmpty(json)){
+            JsonObject()
+        }else{
+            JsonParser.parseString(json).asJsonObject
+        }
+        json?.let { LogUtil.d(it) }
+        if(jsonObj is JsonObject){
+//            jsonObj.addProperty("marketId".asEncode(), marketId) //示例
+            return if(jsonObj.has(BODY_NO_ENCODE)){
+                jsonObj.remove(BODY_NO_ENCODE)
+                encrypt(jsonObj.toJson(), false)
+            }else{
+                jsonObj.remove(BODY_NO_ENCODE)
+                encrypt(jsonObj.toJson(), true)
+            }
+        }else{
+            return json!!
+        }
+    }
+
+    /**
+     * @param requestJson 请求字符串
+     * @param isBodySign Body是否加密，无要求直接返回即可
+     */
+    private fun encrypt(requestJson: String, isBodySign: Boolean): String {
+        LogUtil.d(requestJson)
+        return requestJson
+    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/http/interceptor/LogInterceptor.kt b/lib_base/src/main/java/com/btpj/lib_base/http/interceptor/LogInterceptor.kt
new file mode 100644
index 0000000..82f5788
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/http/interceptor/LogInterceptor.kt
@@ -0,0 +1,16 @@
+package com.btpj.lib_base.http.interceptor
+
+import com.btpj.lib_base.BuildConfig
+import com.btpj.lib_base.utils.LogUtil
+import okhttp3.logging.HttpLoggingInterceptor
+
+/**
+ * okhttp 日志拦截器
+ * @author nanfeifei  2022/3/21
+ */
+val logInterceptor = HttpLoggingInterceptor(object : HttpLoggingInterceptor.Logger {
+    override fun log(message: String) {
+        // 使用自己的日志工具接管
+        LogUtil.d(message)
+    }
+}).setLevel(if (BuildConfig.DEBUG) HttpLoggingInterceptor.Level.BODY else HttpLoggingInterceptor.Level.BASIC)
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/utils/AppUtil.kt b/lib_base/src/main/java/com/btpj/lib_base/utils/AppUtil.kt
new file mode 100644
index 0000000..64eb1e6
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/utils/AppUtil.kt
@@ -0,0 +1,27 @@
+package com.btpj.lib_base.utils
+
+import android.content.Context
+import android.os.Build
+
+/**
+ * APP常用工具类，包括获取版本号等
+ *
+ * @author nanfeifei  2022/4/12
+ */
+object AppUtil {
+
+    /** 获取版本号名称 */
+    fun getAppVersionName(context: Context): String {
+        val packageInfo =
+            context.applicationContext.packageManager.getPackageInfo(context.packageName, 0)
+        return packageInfo.versionName
+    }
+
+    /** 获取版本号 */
+    fun getAppVersionCode(context: Context): Long {
+        val packageInfo =
+            context.applicationContext.packageManager.getPackageInfo(context.packageName, 0)
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) packageInfo.longVersionCode
+        else packageInfo.versionCode.toLong()
+    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/utils/CacheUtil.kt b/lib_base/src/main/java/com/btpj/lib_base/utils/CacheUtil.kt
new file mode 100644
index 0000000..de666fb
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/utils/CacheUtil.kt
@@ -0,0 +1,117 @@
+package com.btpj.lib_base.utils
+
+
+import android.content.Context
+import android.os.Environment
+import androidx.appcompat.app.AppCompatActivity
+import java.io.File
+import java.math.BigDecimal
+
+object CacheUtil {
+    /**
+     * 获取APP缓存大小
+     */
+    fun getTotalCacheSize(context: Context): String {
+        var cacheSize = getFolderSize(context.cacheDir)
+        if (Environment.getExternalStorageState() == Environment.MEDIA_MOUNTED) {
+            cacheSize += getFolderSize(context.externalCacheDir)
+        }
+        return getFormatSize(cacheSize.toDouble())
+    }
+
+    /**
+     * 清除缓存
+     */
+    fun clearAllCache(activity: AppCompatActivity?) {
+        activity?.let {
+            deleteDir(it.cacheDir)
+            if (Environment.getExternalStorageState() == Environment.MEDIA_MOUNTED) {
+                if (it.externalCacheDir == null) {
+                    ToastUtil.showLong(activity, "Cache clearing failure")
+                }
+                return
+            }
+            it.externalCacheDir?.let { file ->
+                if (deleteDir(file)) {
+                    ToastUtil.showLong(activity, "Clearing cache succeeded")
+                }
+            }
+        }
+    }
+
+}
+
+/**
+ * 删除文件
+ *
+ * @param file File
+ */
+private fun deleteDir(file: File): Boolean {
+    if (file.isDirectory) {
+        val children = file.list()
+        for (i in children.indices) {
+            val success = deleteDir(File(file, children[i]))
+            if (!success) {
+                return false
+            }
+        }
+    }
+    return file.delete()
+}
+
+/**
+ * 获取文件
+ * Context.getExternalFilesDir() --> SDCard/Android/data/你的应用的包名/files/
+ * 目录，一般放一些长时间保存的数据
+ * Context.getExternalCacheDir() -->
+ * SDCard/Android/data/你的应用包名/cache/目录，一般存放临时缓存数据
+ */
+fun getFolderSize(file: File?): Long {
+    var size: Long = 0
+    file?.run {
+        try {
+            val fileList = listFiles()
+            for (i in fileList.indices) {
+                // 如果下面还有文件
+                size += if (fileList[i].isDirectory) {
+                    getFolderSize(fileList[i])
+                } else {
+                    fileList[i].length()
+                }
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+    return size
+}
+
+/**
+ * 格式化缓存单位
+ */
+fun getFormatSize(size: Double): String {
+    val kiloByte = size / 1024
+    if (kiloByte < 1) {
+        return size.toString() + "B"
+    }
+    val megaByte = kiloByte / 1024
+    if (megaByte < 1) {
+        val result1 = BigDecimal(kiloByte.toString())
+        return result1.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString() + "KB"
+    }
+
+    val gigaByte = megaByte / 1024
+    if (gigaByte < 1) {
+        val result2 = BigDecimal(megaByte.toString())
+        return result2.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString() + "MB"
+    }
+
+    val teraBytes = gigaByte / 1024
+    if (teraBytes < 1) {
+        val result3 = BigDecimal(gigaByte.toString())
+        return result3.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString() + "GB"
+    }
+
+    val result4 = BigDecimal(teraBytes)
+    return result4.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString() + "TB"
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/utils/CommonUtil.kt b/lib_base/src/main/java/com/btpj/lib_base/utils/CommonUtil.kt
new file mode 100644
index 0000000..d4aac74
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/utils/CommonUtil.kt
@@ -0,0 +1,31 @@
+package com.btpj.lib_base.utils
+
+import android.graphics.Color
+import java.util.*
+
+/**
+ * 一些额外的工具类，不好分类的那种
+ *
+ * @author LTP  2022/4/7
+ */
+object CommonUtil {
+
+    /** 判断String是否为空或空串，主要提供给xml中dataBinding用 */
+    @JvmStatic
+    fun isEmpty(str: String?): Boolean {
+        return str?.isEmpty() ?: true
+    }
+
+    /** 获取随机rgb颜色值 */
+    fun randomColor(): Int {
+        Random().run {
+            //0-190, 如果颜色值过大,就越接近白色,就看不清了,所以需要限定范围
+            val red = nextInt(190)
+            val green = nextInt(190)
+            val blue = nextInt(190)
+            //使用rgb混合生成一种新的颜色,Color.rgb生成的是一个int数
+            return Color.rgb(red, green, blue)
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/utils/DataStoreUtils.kt b/lib_base/src/main/java/com/btpj/lib_base/utils/DataStoreUtils.kt
new file mode 100644
index 0000000..2696f72
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/utils/DataStoreUtils.kt
@@ -0,0 +1,272 @@
+package com.btpj.lib_base.utils
+
+import android.content.Context
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.*
+import androidx.datastore.preferences.preferencesDataStore
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.runBlocking
+import java.io.IOException
+/**
+ *
+ * 异步获取数据
+ * [getData] [readBooleanFlow] [readFloatFlow] [readIntFlow] [readLongFlow] [readStringFlow]
+ * 同步获取数据
+ * [getSyncData] [readBooleanData] [readFloatData] [readIntData] [readLongData] [readStringData]
+ *
+ * 异步写入数据
+ * [putData] [saveBooleanData] [saveFloatData] [saveIntData] [saveLongData] [saveStringData]
+ * 同步写入数据
+ * [putSyncData] [saveSyncBooleanData] [saveSyncFloatData] [saveSyncIntData] [saveSyncLongData] [saveSyncStringData]
+ *
+ * 异步清除数据
+ * [clear]
+ * 同步清除数据
+ * [clearSync]
+ *
+ * 描述：DataStore 工具类
+ *
+ */
+val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "HearthExpertClients")
+
+object DataStoreUtils {
+
+    private lateinit var dataStore: DataStore<Preferences>
+
+    /**
+     * init Context
+     * @param context Context
+     */
+    fun init(context: Context): DataStoreUtils {
+        dataStore = context.dataStore
+        return this
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    fun <U> getSyncData(key: String, default: U): U {
+        val res = when (default) {
+            is Long -> readLongData(key, default)
+            is String -> readStringData(key, default)
+            is Int -> readIntData(key, default)
+            is Boolean -> readBooleanData(key, default)
+            is Float -> readFloatData(key, default)
+            else -> throw IllegalArgumentException("This type can be saved into DataStore")
+        }
+        return res as U
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    fun <U> getData(key: String, default: U): Flow<U> {
+        val data = when (default) {
+            is Long -> readLongFlow(key, default)
+            is String -> readStringFlow(key, default)
+            is Int -> readIntFlow(key, default)
+            is Boolean -> readBooleanFlow(key, default)
+            is Float -> readFloatFlow(key, default)
+            else -> throw IllegalArgumentException("This type can be saved into DataStore")
+        }
+        return data as Flow<U>
+    }
+
+    suspend fun <U> putData(key: String, value: U) {
+        when (value) {
+            is Long -> saveLongData(key, value)
+            is String -> saveStringData(key, value)
+            is Int -> saveIntData(key, value)
+            is Boolean -> saveBooleanData(key, value)
+            is Float -> saveFloatData(key, value)
+            else -> throw IllegalArgumentException("This type can be saved into DataStore")
+        }
+    }
+
+    fun <U> putSyncData(key: String, value: U) {
+        when (value) {
+            is Long -> saveSyncLongData(key, value)
+            is String -> saveSyncStringData(key, value)
+            is Int -> saveSyncIntData(key, value)
+            is Boolean -> saveSyncBooleanData(key, value)
+            is Float -> saveSyncFloatData(key, value)
+            else -> throw IllegalArgumentException("This type can be saved into DataStore")
+        }
+    }
+
+    private fun readBooleanFlow(key: String, default: Boolean = false): Flow<Boolean> =
+        dataStore.data
+            .catch {
+                //当读取数据遇到错误时，如果是 `IOException` 异常，发送一个 emptyPreferences 来重新使用
+                //但是如果是其他的异常，最好将它抛出去，不要隐藏问题
+                if (it is IOException) {
+                    it.printStackTrace()
+                    emit(emptyPreferences())
+                } else {
+                    throw it
+                }
+            }.map {
+                it[booleanPreferencesKey(key)] ?: default
+            }
+
+    private fun readBooleanData(key: String, default: Boolean = false): Boolean {
+        var value = false
+        runBlocking {
+            dataStore.data.first {
+                value = it[booleanPreferencesKey(key)] ?: default
+                true
+            }
+        }
+        return value
+    }
+
+    private fun readIntFlow(key: String, default: Int = 0): Flow<Int> =
+        dataStore.data
+            .catch {
+                if (it is IOException) {
+                    it.printStackTrace()
+                    emit(emptyPreferences())
+                } else {
+                    throw it
+                }
+            }.map {
+                it[intPreferencesKey(key)] ?: default
+            }
+
+    fun readIntData(key: String, default: Int = 0): Int {
+        var value = 0
+        runBlocking {
+            dataStore.data.first {
+                value = it[intPreferencesKey(key)] ?: default
+                true
+            }
+        }
+        return value
+    }
+
+    private fun readStringFlow(key: String, default: String = ""): Flow<String> =
+        dataStore.data
+            .catch {
+                if (it is IOException) {
+                    it.printStackTrace()
+                    emit(emptyPreferences())
+                } else {
+                    throw it
+                }
+            }.map {
+                it[stringPreferencesKey(key)] ?: default
+            }
+
+    private fun readStringData(key: String, default: String = ""): String {
+        var value = ""
+        runBlocking {
+            dataStore.data.first {
+                value = it[stringPreferencesKey(key)] ?: default
+                true
+            }
+        }
+        return value
+    }
+
+    private fun readFloatFlow(key: String, default: Float = 0f): Flow<Float> =
+        dataStore.data
+            .catch {
+                if (it is IOException) {
+                    it.printStackTrace()
+                    emit(emptyPreferences())
+                } else {
+                    throw it
+                }
+            }.map {
+                it[floatPreferencesKey(key)] ?: default
+            }
+
+    private fun readFloatData(key: String, default: Float = 0f): Float {
+        var value = 0f
+        runBlocking {
+            dataStore.data.first {
+                value = it[floatPreferencesKey(key)] ?: default
+                true
+            }
+        }
+        return value
+    }
+
+    private fun readLongFlow(key: String, default: Long = 0L): Flow<Long> =
+        dataStore.data
+            .catch {
+                if (it is IOException) {
+                    it.printStackTrace()
+                    emit(emptyPreferences())
+                } else {
+                    throw it
+                }
+            }.map {
+                it[longPreferencesKey(key)] ?: default
+            }
+
+    private fun readLongData(key: String, default: Long = 0L): Long {
+        var value = 0L
+        runBlocking {
+            dataStore.data.first {
+                value = it[longPreferencesKey(key)] ?: default
+                true
+            }
+        }
+        return value
+    }
+
+    suspend fun saveBooleanData(key: String, value: Boolean) {
+        dataStore.edit { mutablePreferences ->
+            mutablePreferences[booleanPreferencesKey(key)] = value
+        }
+    }
+
+    private fun saveSyncBooleanData(key: String, value: Boolean) =
+        runBlocking { saveBooleanData(key, value) }
+
+    private suspend fun saveIntData(key: String, value: Int) {
+        dataStore.edit { mutablePreferences ->
+            mutablePreferences[intPreferencesKey(key)] = value
+        }
+    }
+
+    private fun saveSyncIntData(key: String, value: Int) = runBlocking { saveIntData(key, value) }
+
+    private suspend fun saveStringData(key: String, value: String) {
+        dataStore.edit { mutablePreferences ->
+            mutablePreferences[stringPreferencesKey(key)] = value
+        }
+    }
+
+    private fun saveSyncStringData(key: String, value: String) = runBlocking { saveStringData(key, value) }
+
+    private suspend fun saveFloatData(key: String, value: Float) {
+        dataStore.edit { mutablePreferences ->
+            mutablePreferences[floatPreferencesKey(key)] = value
+        }
+    }
+
+    private fun saveSyncFloatData(key: String, value: Float) = runBlocking { saveFloatData(key, value) }
+
+    private suspend fun saveLongData(key: String, value: Long) {
+        dataStore.edit { mutablePreferences ->
+            mutablePreferences[longPreferencesKey(key)] = value
+        }
+    }
+
+    private fun saveSyncLongData(key: String, value: Long) = runBlocking { saveLongData(key, value) }
+
+    suspend fun clear() {
+        dataStore.edit {
+            it.clear()
+        }
+    }
+
+    fun clearSync() {
+        runBlocking {
+            dataStore.edit {
+                it.clear()
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/utils/DateUtil.kt b/lib_base/src/main/java/com/btpj/lib_base/utils/DateUtil.kt
new file mode 100644
index 0000000..3f1a075
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/utils/DateUtil.kt
@@ -0,0 +1,741 @@
+package com.btpj.lib_base.utils
+
+import android.text.TextUtils
+import java.text.ParseException
+import java.text.ParsePosition
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import java.util.Date
+import java.util.GregorianCalendar
+import java.util.Locale
+
+/**
+ * 时间处理工具类
+ *
+ * @author nanfeifei 2017/9/4
+ */
+object DateUtil {
+
+    /**
+     * 获得当前年
+     *
+     * @return 当前年
+     */
+    val nowYear: String
+        get() {
+            val currentTime = Date()
+            val dateString =
+                SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()).format(currentTime)
+            return dateString.substring(0, 4)
+        }
+
+    /**
+     * 获得当前月
+     *
+     * @return 当前月
+     */
+    val nowMonth: String
+        get() {
+            val currentTime = Date()
+            val dateString =
+                SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()).format(currentTime)
+            return dateString.substring(5, 7)
+        }
+
+    /**
+     * 获得当前日
+     *
+     * @return 当前日
+     */
+    val nowDay: String
+        get() {
+            val currentTime = Date()
+            val dateString =
+                SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()).format(currentTime)
+            return dateString.substring(8, 10)
+        }
+
+    /**
+     * 获得当前时
+     *
+     * @return 当前时
+     */
+    val nowHour: String
+        get() {
+            val currentTime = Date()
+            val dateString =
+                SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()).format(currentTime)
+            return dateString.substring(11, 13)
+        }
+
+    /**
+     * 获得当前分
+     *
+     * @return 当前分
+     */
+    val nowMinute: String
+        get() {
+            val currentTime = Date()
+            val dateString =
+                SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()).format(currentTime)
+            return dateString.substring(14, 16)
+        }
+
+    /**
+     * 获取yyyy-MM-dd型生日时间的年
+     *
+     * @param dayStr yyyy-MM-dd型生日时间
+     * @return yyyy-MM-dd型生日时间的年
+     */
+    fun getBirthdayYear(dayStr: String?): Int {
+        return try {
+            dayStr!!.split("-")[0].toInt()
+        } catch (e: Exception) {
+            nowYear.toInt()
+        }
+    }
+
+    /**
+     * 获取yyyy-MM-dd型生日时间的月
+     *
+     * @param dayStr yyyy-MM-dd型生日时间
+     * @return yyyy-MM-dd型生日时间的月
+     */
+    fun getBirthdayMonth(dayStr: String?): Int {
+        return try {
+            dayStr!!.split("-")[1].toInt() - 1
+        } catch (e: Exception) {
+            nowMonth.toInt() - 1
+        }
+    }
+
+    /**
+     * 获取yyyy-MM-dd型生日时间的日
+     *
+     * @param dayStr yyyy-MM-dd型生日时间
+     * @return yyyy-MM-dd型生日时间的日
+     */
+    fun getBirthdayDay(dayStr: String?): Int {
+        return try {
+            dayStr!!.split("-")[2].toInt()
+        } catch (e: Exception) {
+            nowDay.toInt()
+        }
+    }
+
+    /**
+     * 将短日期转为长日期（例如2018-9-8变成2018-09-08）
+     *
+     * @param dateStr 短日期 (如2018-9-8)
+     * @return 长日期 (如2018-09-08)
+     */
+    fun shortDateStrToLong(dateStr: String): String {
+        val strArray = dateStr.split("-".toRegex(), 3).toTypedArray()
+        val year = strArray[0]
+        val month = if (strArray[1].toInt() > 9) strArray[1] else "0${strArray[1]}"
+        val day = if (strArray[2].toInt() > 9) strArray[2] else "0${strArray[2]}"
+        return "$year-$month-$day"
+    }
+
+    /**
+     * 获取当前时间(yyyy-MM-dd)
+     *
+     * @return yyyy-MM-dd
+     */
+    fun getNowDayString(): String {
+        return SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(Date())
+    }
+
+    /**
+     * 将时间对象转换为年月日时间格式的字符串 yyyy-MM-dd
+     *
+     * @param dateDate 时间对象
+     * @return 中时间格式的字符串 yyyy-MM-dd
+     */
+    fun dateToStrDay(dateDate: Date): String {
+        return SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(dateDate)
+    }
+
+    /**
+     * 获取现在时间
+     *
+     * @return 返回字符串格式 yyyy-MM-dd HH:mm:ss
+     */
+    val nowStringDateLong: String
+        get() = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()).format(Date())
+
+    /**
+     * 获取以现在时间命名的文件名
+     *
+     * @return 返回字符串文件名 yyyyMMddHHmmss
+     */
+    val nowDateFileName: String
+        get() {
+            val formatter = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault())
+            return formatter.format(Date())
+        }
+
+    /**
+     * 获取现在时间
+     *
+     * @return 返回短时间字符串格式yyyy-MM-dd
+     */
+    val nowStringDateShort: String
+        get() = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(Date())
+
+    /**
+     * 获取现在时间 小时:分;秒 HH:mm:ss
+     *
+     * @return 返回短时间字符串格式HH:mm:ss
+     */
+    val nowTimeShort: String
+        get() = SimpleDateFormat("HH:mm:ss", Locale.getDefault()).format(Date())
+
+
+    /**
+     * 得到现在时间
+     *
+     * @return 字符串 yyyyMMdd HHmmss
+     */
+    val stringToday: String
+        get() {
+            val currentTime = Date()
+            val formatter = SimpleDateFormat("yyyyMMdd HHmmss", Locale.getDefault())
+            return formatter.format(currentTime)
+        }
+
+    /**
+     * 获取指定时间值(long)对应的日期yyyy-MM-dd
+     *
+     * @param currentTimeMills 指定时间值(long)
+     * @return 指定时间值(long)对应的日期
+     */
+    fun getShortDateStr(currentTimeMills: Long): String {
+        return SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(currentTimeMills)
+    }
+    /**
+     * 获取指定时间值(long)对应的日期MM-dd
+     *
+     * @param currentTimeMills 指定时间值(long)
+     * @return 指定时间值(long)对应的日期
+     */
+    fun getMonthDayStr(currentTimeMills: Long): String {
+        return SimpleDateFormat("MM-dd", Locale.getDefault()).format(currentTimeMills)
+    }
+    /**
+     * 获取指定时间值(long)对应的日期yyyy-MM
+     *
+     * @param currentTimeMills 指定时间值(long)
+     * @return 指定时间值(long)对应的日期
+     */
+    fun getDateYearMonthStr(currentTimeMills: Long): String {
+        return SimpleDateFormat("yyyy-MM", Locale.getDefault()).format(currentTimeMills)
+    }
+    /**
+     * 获取指定时间值(long)对应的日期yyyy年MM月
+     *
+     * @param currentTimeMills 指定时间值(long)
+     * @return 指定时间值(long)对应的日期
+     */
+    fun getDateYearMonthChineseStr(currentTimeMills: Long): String {
+        return SimpleDateFormat("yyyy年MM月", Locale.getDefault()).format(currentTimeMills)
+    }
+    /**
+     * 获取指定时间值(long)对应的日期yyyy-MM-dd HH:mm:ss
+     *
+     * @param timeMills 指定时间值(long)
+     * @return 指定时间值(long)对应的日期
+     */
+    @JvmStatic
+    fun getLongDateStr(timeMills: Long?): String {
+        if (timeMills == null) {
+            return ""
+        }
+        return SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()).format(timeMills)
+    }
+
+    /**
+     * 将时间对象转换为长时间格式的字符串 yyyy-MM-dd HH:mm:ss
+     *
+     * @param dateDate Date时间对象
+     * @return 时间格式为 yyyy-MM-dd HH:mm:ss 的字符串
+     */
+    fun dateToStrLong(dateDate: Date): String {
+        return SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()).format(dateDate)
+    }
+
+    /**
+     * 将中文日期改为短时间格式的字符串 yyyy-MM
+     * @param dateStr yyyy年MM月
+     */
+    fun chineseDateToStrShortMonth(dateStr: String): String{
+        var date = SimpleDateFormat("yyyy年MM月", Locale.getDefault()).parse(dateStr)
+        return SimpleDateFormat("yyyy-MM", Locale.getDefault()).format(date)
+    }
+    /**
+     * 将时间对象转换为中时间格式的字符串 yyyy-MM-dd HH:mm
+     *
+     * @param dateDate 时间对象
+     * @return 中时间格式的字符串 yyyy-MM-dd HH:mm
+     */
+    fun dateToStrMiddle(dateDate: Date): String {
+        return SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault()).format(dateDate)
+    }
+
+    /**
+     * 将时间对象转换为短时间格式的字符串 yyyy-MM-dd
+     *
+     * @param dateDate 时间对象
+     * @return 短时间格式的字符串 yyyy-MM-dd
+     */
+    fun dateToStrShort(dateDate: Date): String {
+        return SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(dateDate)
+    }
+
+    /**
+     * 将时间对象转换为短时间格式的字符串 yyyy年MM月dd日
+     *
+     * @param date 时间戳
+     * @return 短时间格式的字符串 yyyy年MM月dd日
+     */
+    fun dateToStrShortChinese(date: Long?): String {
+        if (date == null) {
+            return ""
+        }
+        return SimpleDateFormat("yyyy年MM月dd日", Locale.getDefault()).format(Date(date))
+    }
+
+    /**
+     * 获取指定时间值(long)对应的年份yyyy
+     *
+     * @param dateDate 时间对象
+     * @return 对应的年份yyyy
+     */
+    fun dateToStrYear(dateDate: Date): String {
+        return SimpleDateFormat("yyyy", Locale.getDefault()).format(dateDate)
+    }
+
+    /**
+     * 将时间对象转换为HH:mm时间格式的字符串
+     *
+     * @param dateDate 时间对象
+     * @return 短时间格式的字符串 HH:mm
+     */
+    fun dateToStrHour(dateDate: Date): String {
+        return SimpleDateFormat("HH:mm").format(dateDate)
+    }
+
+    /**
+     * 将时间对象转换为HH:mm时间格式的字符串
+     *
+     * @param date 时间戳
+     * @return 短时间格式的字符串 HH:mm
+     */
+    fun dateToStrHour(date: Long?): String {
+        if (date == null) {
+            return ""
+        }
+        return SimpleDateFormat("HH:mm").format(Date(date))
+    }
+
+    /**
+     * 获取一个月的最后一天
+     *
+     * @param dateStr 日期
+     * @return 日期所在月的最后一天
+     */
+    fun getEndDateOfMonth(dateStr: String): String {// yyyy-MM-dd
+        val strArray = dateStr.split("-".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+        var str = strArray[0] + "-" + strArray[1] + "-"
+        val month = strArray[1]
+
+        val mon = Integer.parseInt(month)
+        str += if (mon == 1 || mon == 3 || mon == 5 || mon == 7 || mon == 8 || mon == 10 || mon == 12) {
+            "31"
+        } else if (mon == 4 || mon == 6 || mon == 9 || mon == 11) {
+            "30"
+        } else {
+            if (isLeapYear(dateStr)) {
+                "29"
+            } else {
+                "28"
+            }
+        }
+        return str
+    }
+
+    /**
+     * 将长时间格式字符串yyyy-MM-dd HH:mm:ss 转换为时间
+     *
+     * @param strDate yyyy-MM-dd HH:mm:ss
+     * @return Date类型的时间
+     */
+    fun strToDateLong(strDate: String?): Date {
+        val pos = ParsePosition(0)
+        return SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()).parse(strDate, pos)
+    }
+
+    /**
+     * 将长时间格式字符串转换为时间 yyyy-MM-dd HH:mm:ss
+     *
+     * @param strDate
+     * @return
+     */
+    fun strToDateMiddle(strDate: String): Date {
+        val pos = ParsePosition(0)
+        return SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault()).parse(strDate, pos)
+    }
+
+    /**
+     * 将短时间格式字符串转换为时间 yyyy-MM-dd
+     *
+     * @param strDate yyyy-MM-dd的短时间格式
+     * @return 短时间格式字符串转换的时间
+     */
+    fun strToDateShort(strDate: String): Date {
+        val pos = ParsePosition(0)
+        return SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).parse(strDate, pos)
+    }
+
+    /**
+     * 获取与当前时间(yyyy-MM-dd HH:mm:ss)的间隔毫秒值
+     *
+     * @param dateStr 要比较的时间String (yyyy-MM-dd HH:mm:ss)
+     */
+    fun getMinutesSpaceFromNow(dateStr: String): Long {
+        val date = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault()).parse(dateStr)
+        return date.time - Date().time
+    }
+
+    /**
+     * 两个时间之间的间隔天数
+     *
+     * @param date1 yyyy-MM-dd
+     * @param date2 yyyy-MM-dd
+     * @return 间隔天数
+     */
+    fun getDaySpace(date1: String?, date2: String?): Long {
+        if (date1 == null || "" == date1) {
+            return 0
+        }
+        if (date2 == null || "" == date2) {
+            return 0
+        }
+        return try {
+            // 转换为标准时间
+            val date = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).parse(date1)
+            val myDate = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).parse(date2)
+            (date.time - myDate.time) / (24 * 60 * 60 * 1000)
+        } catch (e: Exception) {
+            e.printStackTrace()
+            0
+        }
+    }
+
+    /**
+     * 修改时间格式(例：2018-12-04 19:08:03 改为 12-04 19：08)
+     *
+     * @param timeStr 要修改的时间
+     */
+    fun long2MiddleDateStr(timeStr: String?): String {
+        return when {
+            timeStr.isNullOrEmpty() -> "--"
+            timeStr.length > 7 -> timeStr.substring(5, 16)
+            else -> timeStr
+        }
+    }
+
+    /**
+     * 将长时间格式变为短时间格式(例：2018-12-04 19:08:03 改为 2018-12-04)
+     *
+     * @param timeStr 要修改的时间 yyyy-MM-dd HH:mm:ss
+     *
+     * @return 修改后的时间yyyy-MM-dd（报错返回本身或null返回"--"）
+     */
+    fun long2ShortDateStr(timeStr: String?): String {
+        return try {
+            timeStr!!.substring(0, 10)
+        } catch (e: Exception) {
+            timeStr ?: "--"
+        }
+    }
+
+    /**
+     * 获取时间特殊显示，当为当天时显示HH:mm,昨天是显示昨天，否则显示日期（收发文列表中使用）
+     *
+     * @param dateStr yyyy-MM-dd HH:mm:ss的字符串时间格式
+     * @return 当为当天时显示HH:mm,昨天是显示昨天，否则显示具体日期
+     */
+    fun getTimeFromNow(dateStr: String): String {
+        return if (dateStr.length > 16) {
+            val nowDateStr = nowStringDateShort
+            val date = dateStr.substring(0, 10)
+            when {
+                getDaySpace(nowDateStr, date) == 0L -> // 当天显示HH:mm即可
+                    dateStr.substring(11, 16)
+
+                getDaySpace(nowDateStr, date) == 1L -> "昨天"
+                else -> date
+            }
+        } else {
+            dateStr
+        }
+    }
+
+    /**
+     * 根据用户传入的时间表示格式，返回当前时间的格式 如果是yyyyMMdd，注意字母y不能大写。
+     *
+     * @param format yyyyMMddhhmmss
+     * @return
+     */
+    fun getUserDate(format: String): String {
+        val currentTime = Date()
+        val formatter = SimpleDateFormat(format, Locale.getDefault())
+        return formatter.format(currentTime)
+    }
+
+    /**
+     * 得到二个日期间的间隔天数
+     *
+     * @param startDateStr 开始时间 yyyy-MM-dd
+     * @param endDateStr 结束时间 yyyy-MM-dd
+     *
+     * @return 间格的天数（null表示时间格式不正确）
+     */
+    fun getTwoDay(startDateStr: String, endDateStr: String): Int? {
+        val day: Int
+        try {
+            val startDate = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).parse(startDateStr)
+            val endDate = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).parse(endDateStr)
+            day = ((endDate.time - startDate.time) / (24 * 60 * 60 * 1000)).toInt()
+        } catch (e: Exception) {
+            return null
+        }
+
+        return day
+    }
+
+    /**
+     * 获取某年某月是否含某一天如果含则返回此天不含则返回当月的最后一天
+     *
+     * @param year  某年
+     * @param month 某月
+     * @param day   检测所含的天
+     * @return 获取某年某月是否含某一天如果含则返回此天不含则返回当月的最后一天
+     */
+    fun getCurrentDayInEveryMonth(year: Int, month: Int, day: Int): Int {
+        return try {
+            var endDateOfMonth = getEndDateOfMonth("$year-$month-$day")
+            endDateOfMonth =
+                endDateOfMonth.substring(endDateOfMonth.length - 2, endDateOfMonth.length)
+            if (day > 0 && day < Integer.parseInt(endDateOfMonth)) {
+                day
+            } else {
+                Integer.parseInt(endDateOfMonth)
+            }
+        } catch (e: NumberFormatException) {
+            e.printStackTrace()
+            1
+        }
+
+    }
+
+    /**
+     * 得到一个时间延后或前移几天的时间,nowdate(dd-MM-yyyy)为时间,delay为前移或后延的天数
+     * 印度格式使用需注意
+     */
+    fun getNextDay(nowDate: String, delay: String): String {
+        return try {
+            val mDate: String
+            val d = strToDateShort(nowDate)
+            val myTime = d.time / 1000 + Integer.parseInt(delay) * 24 * 60 * 60
+            d.time = myTime * 1000
+            mDate = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(d)
+            mDate
+        } catch (e: Exception) {
+            ""
+        }
+
+    }
+
+    /**
+     * 功能：<br></br> 距离现在几天的时间是多少
+     * 获得一个时间字符串，格式为：dd-MM-yyyy
+     * day  如果为整数，表示未来时间
+     * 如果为负数，表示过去时间
+     * 印度格式，使用需注意
+     *
+     * @author Tony
+     * @version 2016年11月29日 上午11:02:56 <br></br>
+     */
+    fun getFromNow(day: Int): String {
+        val date = Date()
+        val dateTime = date.time / 1000 + day * 24 * 60 * 60
+        date.time = dateTime * 1000
+        return SimpleDateFormat("dd-MM-yyyy", Locale.getDefault()).format(date)
+    }
+
+    /**
+     * 判断是否润年
+     *
+     * @param ddate
+     * @return
+     */
+    fun isLeapYear(ddate: String): Boolean {
+        val d = strToDateShort(ddate)
+        val gc = Calendar.getInstance() as GregorianCalendar
+        gc.time = d
+        val year = gc.get(Calendar.YEAR)
+        return year % 400 == 0 || year % 4 == 0 && year % 100 != 0
+    }
+
+    /**
+     * 返回当前日期所在周或所在周后weekOffSet周的日期集合
+     *
+     * @param weekOffSet 周偏移，上周为-1，本周为0，下周为1，以此类推
+     */
+    fun getWeekList(weekOffSet: Int): ArrayList<String> {
+        val dateList: ArrayList<String> = ArrayList()
+        // Locale.FRANCE是由于法国第一天是周一最后一天是周日
+        val calendar = Calendar.getInstance(Locale.FRANCE)
+        val format = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
+        calendar.time = Date()
+        calendar.add(Calendar.WEEK_OF_YEAR, weekOffSet)
+        calendar.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY)
+        dateList.add(format.format(calendar.time))
+        calendar.set(Calendar.DAY_OF_WEEK, Calendar.TUESDAY)
+        dateList.add(format.format(calendar.time))
+        calendar.set(Calendar.DAY_OF_WEEK, Calendar.WEDNESDAY)
+        dateList.add(format.format(calendar.time))
+        calendar.set(Calendar.DAY_OF_WEEK, Calendar.THURSDAY)
+        dateList.add(format.format(calendar.time))
+        calendar.set(Calendar.DAY_OF_WEEK, Calendar.FRIDAY)
+        dateList.add(format.format(calendar.time))
+        calendar.set(Calendar.DAY_OF_WEEK, Calendar.SATURDAY)
+        dateList.add(format.format(calendar.time))
+        calendar.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY)
+        dateList.add(format.format(calendar.time))
+        return dateList
+    }
+    /**
+     * 返回当前日期前12个月或月份集合，包含当月
+     *
+     */
+    fun getFirstMonthList(): ArrayList<String> {
+        val dateList: ArrayList<String> = ArrayList()
+        // Locale.FRANCE是由于法国第一天是周一最后一天是周日
+        val calendar = Calendar.getInstance()
+        val format = SimpleDateFormat("yyyy年MM月", Locale.getDefault())
+        calendar.time = Date()
+        //如果是31号通过month-1得到的值为本月1号，故设置成1号
+        calendar.set(Calendar.DAY_OF_MONTH, 1)
+        for(index in 0 until 11){
+            if (index > 0){
+                calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) - 1)
+            }
+            var date = format.format(calendar.time)
+            dateList.add(date)
+        }
+        return dateList
+    }
+    /**
+     * 获取yyyy-MM-dd类型的时间字符串在日历上显示的日期（如2017-08-02显示为2）
+     *
+     * @param dateStr yyyy-MM-dd类型的时间字符串
+     */
+    fun getDayInCalendar(dateStr: String): String {
+        return try {
+            val day = dateStr.substring(dateStr.length - 2, dateStr.length)
+            if (day.substring(0, 1) == "0") day.substring(1, 2) else day
+        } catch (e: Exception) {
+            ""
+        }
+    }
+
+    /**
+     * 根据一个日期，返回是星期几的字符串
+     *
+     * @param date 日期 yyyy-MM-dd
+     * @return 对应的星期几
+     */
+    fun getWeek(date: String): String {
+        // 再转换为时间
+        val d = strToDateShort(date)
+        val c = Calendar.getInstance()
+        c.time = d
+        return SimpleDateFormat("EEEE", Locale.getDefault()).format(c.time)
+    }
+
+    fun getWeekStr(sdate: String): String {
+        var str: String
+        str = getWeek(sdate)
+        when (str) {
+            "1" -> str = "Sunday"
+            "2" -> str = "Monday"
+            "3" -> str = "Tuesday"
+            "4" -> str = "Wednesday"
+            "5" -> str = "Thursday"
+            "6" -> str = "Friday"
+            "7" -> str = "Saturday"
+        }
+        return str
+    }
+    fun getWeekStrChinese(week: String?): String {
+        if(TextUtils.isEmpty(week)){
+            return ""
+        }
+        var str: String = ""
+        when (week) {
+            "1" -> str = "周一"
+            "2" -> str = "周二"
+            "3" -> str = "周三"
+            "4" -> str = "周四"
+            "5" -> str = "周五"
+            "6" -> str = "周六"
+            "7" -> str = "周日"
+        }
+        return str
+    }
+
+    /**
+     * 获取上个月的今天
+     *
+     * @return yyyy-MM-dd
+     */
+    fun getLastMonthDayDateString(): String {
+        val calendar = Calendar.getInstance()
+        calendar.time = Date()
+        calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) - 1)  // 设置为上个月
+        return SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()).format(calendar.time)
+    }
+    fun dateDiff(startTime: Long?, endTime: Long?): String {
+        if(startTime == null || endTime == null){
+            return ""
+        }
+        val nd = (1000 * 24 * 60 * 60).toLong() // 一天的毫秒数
+        val nh = (1000 * 60 * 60).toLong() // 一小时的毫秒数
+        val nm = (1000 * 60).toLong() // 一分钟的毫秒数
+        val ns: Long = 1000 // 一秒钟的毫秒数
+        val diff: Long
+        try {
+            // 获得两个时间的毫秒时间差异
+            diff = endTime - startTime
+            val hour = diff / nh // 计算差多少小时
+            val min = diff % nh / nm // 计算差多少分钟
+            val sec = diff % nh % nm / ns // 计算差多少秒
+//            val hourStr = if (hour < 9) "0$hour" else hour.toString() + ""
+//            val minStr = if (min < 9) "0$min" else min.toString() + ""
+//            val secStr = if (sec < 9) "0$sec" else sec.toString() + ""
+            return if(hour > 0){
+                ""+hour+"小时"+min+"分"+sec+"秒"
+            }else if(min > 0){
+                ""+min+"分"+sec+"秒"
+            }else{
+                ""+sec+"秒"
+            }
+        } catch (e: ParseException) {
+            e.printStackTrace()
+        }
+        return ""
+    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/utils/DeviceInfoUtils.kt b/lib_base/src/main/java/com/btpj/lib_base/utils/DeviceInfoUtils.kt
new file mode 100644
index 0000000..ec8cb84
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/utils/DeviceInfoUtils.kt
@@ -0,0 +1,257 @@
+package com.btpj.lib_base.utils
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.os.Build
+import android.os.SystemClock
+import android.telephony.*
+import android.util.Log
+import com.btpj.lib_base.BaseApp.Companion.appContext
+import com.google.android.gms.ads.identifier.AdvertisingIdClient
+import com.google.android.gms.common.GooglePlayServicesNotAvailableException
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.withContext
+import java.io.BufferedReader
+import java.io.IOException
+import java.io.InputStream
+import java.io.InputStreamReader
+import java.net.*
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+
+object DeviceInfoUtils {
+
+
+    /**
+     * 获取设备名称
+     */
+    fun getDeviceModel(): String {
+        return Build.MODEL
+    }
+
+    /**
+     * 调用时需要先申请ACCESS_FINE_LOCATION，需注意
+     */
+
+    suspend fun getDbm(): Int {
+        try {
+            var dbm: Int
+            val mTelephonyManager =
+                appContext.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
+//        val cellInfoList: List<CellInfo>? = mTelephonyManager.allCellInfo
+//        if (cellInfoList != null) {
+//            for (cellInfo in cellInfoList) {
+//                if (cellInfo is CellInfoCdma) {
+//                    return cellInfo.cellSignalStrength.dbm
+//                }
+//                if (cellInfo is CellInfoGsm) {
+//                    return cellInfo.cellSignalStrength.dbm
+//                }
+//                if (cellInfo is CellInfoLte) {
+//                    return cellInfo.cellSignalStrength.dbm
+//                }
+//                if (cellInfo is CellInfoWcdma) {
+//                    return cellInfo.cellSignalStrength.dbm
+//                }
+//
+//            }
+//        }
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                var dbmSAsync = CoroutineScope(Dispatchers.Default).async {
+                    suspendCoroutine<Int> { dbmSAsync ->
+                        mTelephonyManager.registerTelephonyCallback(
+                            appContext.mainExecutor,
+                            object : TelephonyCallback(),
+                                TelephonyCallback.SignalStrengthsListener {
+                                override fun onSignalStrengthsChanged(signalStrength: SignalStrength) {
+                                    var cellSignalStrengths = signalStrength.cellSignalStrengths
+                                    if (!cellSignalStrengths.isNullOrEmpty()) {
+                                        dbm = cellSignalStrengths[0].dbm
+                                        mTelephonyManager.unregisterTelephonyCallback(this)
+                                        dbmSAsync.resume(dbm)
+                                    }else{
+                                        dbmSAsync.resume(0)
+                                    }
+                                }
+                            })
+                    }
+                }
+                return dbmSAsync.await()
+            } else {
+                var dbmAsync = CoroutineScope(Dispatchers.Default).async {
+                    suspendCoroutine<Int> { dbmAsync ->
+                        mTelephonyManager.listen(object : PhoneStateListener() {
+                            override fun onSignalStrengthChanged(asu: Int) {
+                                super.onSignalStrengthChanged(asu)
+                                dbm = -113 + 2 * asu
+                                mTelephonyManager.listen(this, PhoneStateListener.LISTEN_NONE)
+                                dbmAsync.resume(dbm)
+                            }
+                        }, PhoneStateListener.LISTEN_CALL_STATE)
+                    }
+                }
+                return dbmAsync.await()
+            }
+        } catch (e: Exception) {
+            LogUtil.e("getDbm", e.message ?: e.toString())
+            return 0
+        }
+
+        return 0
+    }
+
+    @SuppressLint("MissingPermission")
+    fun getDbmNeedPermission(): Int {
+        try {
+            var dbm: Int
+            val mTelephonyManager =
+                appContext.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
+            val cellInfoList: List<CellInfo?> = mTelephonyManager.allCellInfo
+            if (cellInfoList != null) {
+                for (cellInfo in cellInfoList) {
+                    if (cellInfo is CellInfoCdma) {
+                        return cellInfo.cellSignalStrength.dbm
+                    }
+                    if (cellInfo is CellInfoGsm) {
+                        return cellInfo.cellSignalStrength.dbm
+                    }
+                    if (cellInfo is CellInfoLte) {
+                        return cellInfo.cellSignalStrength.dbm
+                    }
+                    if (cellInfo is CellInfoWcdma) {
+                        return cellInfo.cellSignalStrength.dbm
+                    }
+
+                }
+            }
+        } catch (e: Exception) {
+            LogUtil.e("getDbm", e.message ?: e.toString())
+            return 0
+        }
+        return 0
+    }
+
+    /**
+     * 判断是否包含SIM卡
+     *
+     * @return 状态
+     */
+    private fun hasSimCard(context: Context): Boolean {
+        val telMgr: TelephonyManager =
+            context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
+        val simState: Int = telMgr.simState
+        var result = true
+        when (simState) {
+            TelephonyManager.SIM_STATE_ABSENT, TelephonyManager.SIM_STATE_UNKNOWN -> result =
+                false // 没有SIM卡
+        }
+        return result
+    }
+
+
+    //获取 GAID
+    suspend fun getGAID(): String {
+        var gaid = ""
+        gaid = withContext(Dispatchers.IO) {
+            var adInfo: AdvertisingIdClient.Info? = null
+            try {
+                adInfo = AdvertisingIdClient.getAdvertisingIdInfo(appContext)
+            } catch (e: IOException) {
+                // Unrecoverable error connecting to Google Play services (e.g.,
+                // the old version of the service doesn't support getting AdvertisingId).
+                Log.e("getGAID", "IOException")
+            } catch (e: GooglePlayServicesNotAvailableException) {
+                // Google Play services is not available entirely.
+                Log.e("getGAID", "GooglePlayServicesNotAvailableException")
+            } catch (e: Exception) {
+                Log.e("getGAID", "Exception:$e")
+                // Encountered a recoverable error connecting to Google Play services.
+            }
+            adInfo?.id ?: ""
+        }
+        return gaid
+    }
+
+    fun getMac(): String? {
+        return MacUtil.getMac()
+    }
+
+    fun getSerialNumber(): String {
+//        val tm: TelephonyManager? =
+//            appContext.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager?
+        return Build.SERIAL
+    }
+
+    fun getElapsedRealtime(): Long {
+        return SystemClock.elapsedRealtime()
+    }
+
+    suspend fun getIP(): String {
+//        try {
+//            val en = NetworkInterface.getNetworkInterfaces()
+//            while (en.hasMoreElements()) {
+//                val intf = en.nextElement()
+//                val enumIpAddr = intf.inetAddresses
+//                while (enumIpAddr.hasMoreElements()) {
+//                    val inetAddress = enumIpAddr.nextElement()
+//                    if (!inetAddress.isLoopbackAddress && inetAddress is Inet4Address) {
+//                        // return inetAddress.getAddress().toString();
+//                        return inetAddress.hostAddress.toString()
+//                    }
+//                }
+//            }
+//        } catch (ex: SocketException) {
+//            Log.e("BaseScanTvDeviceClient", "获取本机IP false =" + ex.toString())
+//        }
+        var ip = withContext(Dispatchers.IO) {
+            getNetIp()
+        }
+        return ip
+    }
+
+    /**
+     * 获取外网IP地址
+     * @return
+     */
+    fun getNetIp(): String {
+        var line: String? = ""
+        var infoUrl: URL? = null
+        var inStream: InputStream? = null
+        try {
+            infoUrl = URL("http://whatismyip.akamai.com/")
+            val connection = infoUrl.openConnection()
+            val httpConnection = connection as HttpURLConnection
+            val responseCode = httpConnection.responseCode
+            if (responseCode == HttpURLConnection.HTTP_OK) {
+                inStream = httpConnection.inputStream
+                val reader = BufferedReader(InputStreamReader(inStream, "utf-8"))
+                val strber = java.lang.StringBuilder()
+                do {
+                    line = reader.readLine()
+                    if (line != null) {
+                        strber.append(line)
+                    } else {
+                        break
+                    }
+                } while (true)
+                inStream.close()
+                connection.disconnect()
+                line = strber.substring(0)
+            }
+        } catch (e: MalformedURLException) {
+            e.printStackTrace()
+        } catch (e: IOException) {
+            e.printStackTrace()
+        } catch (e: Exception) {
+            e.printStackTrace()
+        } finally {
+            if (line == null) {
+                return ""
+            }
+            return line
+        }
+    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/utils/GsonUtil.kt b/lib_base/src/main/java/com/btpj/lib_base/utils/GsonUtil.kt
new file mode 100644
index 0000000..2b9903f
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/utils/GsonUtil.kt
@@ -0,0 +1,31 @@
+package com.btpj.lib_base.utils
+
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import java.lang.reflect.Type
+
+
+class  GsonUtil {
+    private var gson: Gson = GsonBuilder().create()
+
+    companion object {
+        private var gsonUtil: GsonUtil? = null
+            get() {
+                if (field == null) {
+                    field = GsonUtil()
+                }
+                return field
+            }
+        fun get(): GsonUtil {
+            return gsonUtil!!
+        }
+    }
+
+    fun strToBean(json: String, typeOfT: Type): Any{
+        return gson.fromJson(json, typeOfT)
+    }
+    fun beanToStr(src: Any, typeOfT: Type): String{
+        return gson.toJson(src, typeOfT)
+    }
+
+}
diff --git a/lib_base/src/main/java/com/btpj/lib_base/utils/KeyboardUtil.kt b/lib_base/src/main/java/com/btpj/lib_base/utils/KeyboardUtil.kt
new file mode 100644
index 0000000..4d68e35
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/utils/KeyboardUtil.kt
@@ -0,0 +1,161 @@
+package com.btpj.lib_base.utils
+
+import android.app.Activity
+import android.content.Context
+import android.util.Log
+import android.view.View
+import android.view.inputmethod.InputMethodManager
+import android.widget.EditText
+
+/**
+ * 键盘相关工具类,借鉴https://github.com/vondear/RxTools
+ *
+ * @author nanfeifei
+ */
+object KeyboardUtil {
+
+    /**
+     * 避免输入法面板遮挡
+     *
+     * 在manifest.xml中activity中设置
+     *
+     * android:windowSoftInputMode="stateVisible|adjustResize"
+     */
+
+    /**
+     * 动态隐藏软键盘
+     *
+     * @param activity activity
+     */
+    fun hideSoftInput(activity: Activity) {
+        val view = activity.window.peekDecorView()
+        if (view != null) {
+            val inputManger =
+                activity.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+            inputManger.hideSoftInputFromWindow(view.windowToken, 0)
+        }
+    }
+
+    /**
+     * 点击隐藏软键盘
+     *
+     * @param activity
+     * @param view
+     */
+    fun hideKeyboard(activity: Activity, view: View) {
+        val imm = activity.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+        imm.hideSoftInputFromWindow(view.windowToken, 0)
+    }
+
+    /**
+     * 动态隐藏软键盘
+     *
+     * @param context 上下文
+     * @param edit    输入框
+     */
+    fun hideSoftInput(context: Context, edit: EditText) {
+        edit.clearFocus()
+        val inputManger =
+            context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+        inputManger.hideSoftInputFromWindow(edit.windowToken, 0)
+    }
+
+    /**
+     * 点击屏幕空白区域隐藏软键盘（方法1）
+     *
+     * 在onTouch中处理，未获焦点则隐藏
+     *
+     * 参照以下注释代码
+     */
+    fun clickBlankArea2HideSoftInput0() {
+        Log.i("tips", "U should copy the following code.")
+        /*
+        @Override
+        public boolean onTouchEvent (MotionEvent event){
+            if (null != this.getCurrentFocus()) {
+                InputMethodManager mInputMethodManager = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
+                return mInputMethodManager.hideSoftInputFromWindow(this.getCurrentFocus().getWindowToken(), 0);
+            }
+            return super.onTouchEvent(event);
+        }
+        */
+    }
+
+    /**
+     * 点击屏幕空白区域隐藏软键盘（方法2）
+     *
+     * 根据EditText所在坐标和用户点击的坐标相对比，来判断是否隐藏键盘
+     *
+     * 需重写dispatchTouchEvent
+     *
+     * 参照以下注释代码
+     */
+    fun clickBlankArea2HideSoftInput1() {
+        Log.i("tips", "U should copy the following code.")
+        /*
+        @Override
+        public boolean dispatchTouchEvent(MotionEvent ev) {
+            if (ev.getAction() == MotionEvent.ACTION_DOWN) {
+                View v = getCurrentFocus();
+                if (isShouldHideKeyboard(v, ev)) {
+                    hideKeyboard(v.getWindowToken());
+                }
+            }
+            return super.dispatchTouchEvent(ev);
+        }
+
+        // 根据EditText所在坐标和用户点击的坐标相对比，来判断是否隐藏键盘
+        private boolean isShouldHideKeyboard(View v, MotionEvent event) {
+            if (v != null && (v instanceof EditText)) {
+                int[] l = {0, 0};
+                v.getLocationInWindow(l);
+                int left = l[0],
+                        top = l[1],
+                        bottom = top + v.getHeight(),
+                        right = left + v.getWidth();
+                return !(event.getX() > left && event.getX() < right
+                        && event.getY() > top && event.getY() < bottom);
+            }
+            return false;
+        }
+
+        // 获取InputMethodManager，隐藏软键盘
+        private void hideKeyboard(IBinder token) {
+            if (token != null) {
+                InputMethodManager im = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+                im.hideSoftInputFromWindow(token, InputMethodManager.HIDE_NOT_ALWAYS);
+            }
+        }
+        */
+    }
+
+    /**
+     * 动态显示软键盘
+     *
+     * @param context 上下文
+     * @param edit    输入框
+     */
+    fun showSoftInput(context: Context, edit: EditText) {
+        edit.isFocusable = true
+        edit.isFocusableInTouchMode = true
+        edit.requestFocus()
+        val inputManager =
+            context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+        inputManager.showSoftInput(edit, 0)
+    }
+
+    /**
+     * 切换键盘显示与否状态
+     *
+     * @param context 上下文
+     * @param edit    输入框
+     */
+    fun toggleSoftInput(context: Context, edit: EditText) {
+        edit.isFocusable = true
+        edit.isFocusableInTouchMode = true
+        edit.requestFocus()
+        val inputManager =
+            context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+        inputManager.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0)
+    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/utils/LogUtil.kt b/lib_base/src/main/java/com/btpj/lib_base/utils/LogUtil.kt
new file mode 100644
index 0000000..f2219da
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/utils/LogUtil.kt
@@ -0,0 +1,139 @@
+package com.btpj.lib_base.utils
+
+import android.util.Log
+
+/**
+ * 日志打印工具类
+ *
+ * @author nanfeifei  2018/3/26
+ */
+object LogUtil {
+
+    /** 是否是调试状态，即是否打印日志 */
+    private var isDebug = true
+    private var tag = "BTPJ"
+
+    /**
+     * 设置调试状态（以便实现是否打印日志，可以在application的onCreate函数里面初始化）
+     *
+     * @param isDebug   true: 调试状态即打印所有日志
+     *                false: 上线状态即关闭所有日志的打印
+     */
+    fun isDebug(isDebug: Boolean) {
+        this.isDebug = isDebug
+    }
+
+    /**
+     * 设置打印日志的Tag
+     *
+     * @param tag 打印日志的Tag
+     */
+    fun setTag(tag: String) {
+        this.tag = tag
+    }
+
+    /**
+     * 打印VERBOSE类型的日志
+     *
+     * @param tag 打印的Tag
+     * @param msg 打印的信息
+     */
+    fun v(tag: String, msg: String) {
+        if (isDebug) {
+            Log.v(tag, msg)
+        }
+    }
+
+    /**
+     * 打印VERBOSE类型的日志
+     *
+     * @param msg 打印的信息
+     */
+    fun v(msg: String) {
+        v(msg)
+    }
+
+    /**
+     * 打印DEBUG类型的日志
+     *
+     * @param tag 打印的Tag
+     * @param msg 打印的信息
+     */
+    fun d(tag: String, msg: String) {
+        if (isDebug) {
+            Log.d(tag, msg)
+        }
+    }
+
+    /**
+     * 打印DEBUG类型的日志
+     *
+     * @param msg 打印的信息
+     */
+    fun d(msg: String) {
+        d(tag, msg)
+    }
+
+    /**
+     * 打印INFO类型的日志
+     *
+     * @param tag 打印的Tag
+     * @param msg 打印的信息
+     */
+    fun i(tag: String, msg: String) {
+        if (isDebug) {
+            Log.i(tag, msg)
+        }
+    }
+
+    /**
+     * 打印INFO类型的日志
+     *
+     * @param msg 打印的信息
+     */
+    fun i(msg: String) {
+        i(tag, msg)
+    }
+
+    /**
+     * 打印WARN类型的日志
+     *
+     * @param tag 打印的Tag
+     * @param msg 打印的信息
+     */
+    fun w(tag: String, msg: String) {
+        if (isDebug) {
+            Log.w(tag, msg)
+        }
+    }
+
+    /**
+     * 打印WARN类型的日志
+     *
+     * @param msg 打印的信息
+     */
+    fun w(msg: String) {
+        w(tag, msg)
+    }
+
+    /**
+     * 打印ERROR类型的日志
+     *
+     * @param tag 打印的Tag
+     * @param msg 打印的信息
+     */
+    fun e(tag: String, msg: String) {
+        if (isDebug) {
+            Log.e(tag, msg)
+        }
+    }
+
+    /**
+     * 打印ERROR类型的日志
+     *
+     * @param msg 打印的信息
+     */
+    fun e(msg: String) {
+        e(tag, msg)
+    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/utils/MacUtil.kt b/lib_base/src/main/java/com/btpj/lib_base/utils/MacUtil.kt
new file mode 100644
index 0000000..89b0a1b
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/utils/MacUtil.kt
@@ -0,0 +1,107 @@
+package com.btpj.lib_base.utils
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.net.wifi.WifiInfo
+import android.net.wifi.WifiManager
+import android.os.Build
+import com.btpj.lib_base.BaseApp.Companion.appContext
+import java.io.IOException
+import java.io.InputStreamReader
+import java.io.LineNumberReader
+import java.net.NetworkInterface
+import java.util.*
+
+object MacUtil {
+    /**
+     * Android 6.0 之前（不包括6.0）获取mac地址
+     * 必须的权限 <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"></uses-permission>
+     * @param context * @return
+     */
+    @SuppressLint("MissingPermission")
+    private fun getMacDefault(context: Context?): String? {
+        var mac = "0"
+        if (context == null) {
+            return mac
+        }
+        val wifi: WifiManager = context.getSystemService(Context.WIFI_SERVICE) as WifiManager
+        var info: WifiInfo? = null
+        try {
+            info = wifi.connectionInfo
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+        if (info == null) {
+            return null
+        }
+        mac = info.macAddress
+        return mac
+    }
+
+    /**
+     * Android 6.0-Android 7.0 获取mac地址
+     */
+    private fun getMacAddress(): String? {
+        var macSerial: String? = null
+        var str = "0"
+        try {
+            val pp = Runtime.getRuntime().exec("cat/sys/class/net/wlan0/address")
+            val ir = InputStreamReader(pp.inputStream)
+            val input = LineNumberReader(ir)
+            while (null != str) {
+                str = input.readLine()
+                if (str != null) {
+                    macSerial = str.trim { it <= ' ' } //去空格
+                    break
+                }
+            }
+        } catch (ex: IOException) {
+            // 赋予默认值
+            ex.printStackTrace()
+        }
+        return macSerial
+    }
+
+    /**
+     * Android 7.0之后获取Mac地址
+     * 遍历循环所有的网络接口，找到接口是 wlan0
+     * 必须的权限 <uses-permission android:name="android.permission.INTERNET"></uses-permission>
+     * @return
+     */
+    private fun getMacFromHardware(): String? {
+        try {
+            val all: List<NetworkInterface> =
+                Collections.list(NetworkInterface.getNetworkInterfaces())
+            for (nif in all) {
+                if (!nif.name.equals("wlan0", true)) continue
+                val macBytes: ByteArray = nif.hardwareAddress ?: return null
+                val res1 = StringBuilder()
+                for (b in macBytes) {
+                    res1.append(String.format("%02X:", b))
+                }
+                if (res1.isNotEmpty()) {
+                    res1.deleteCharAt(res1.length - 1)
+                }
+                return res1.toString()
+            }
+        } catch (ex: Exception) {
+            ex.printStackTrace()
+        }
+        return null
+    }
+
+    fun getMac(): String? {
+        var mac: String? = "0"
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            mac = getMacDefault(appContext)
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
+            mac = getMacAddress()
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            mac = getMacFromHardware()
+        }
+        if (mac == null || mac == "") {
+            mac = "0"
+        }
+        return mac
+    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/utils/NetworkUtil.kt b/lib_base/src/main/java/com/btpj/lib_base/utils/NetworkUtil.kt
new file mode 100644
index 0000000..1e1508e
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/utils/NetworkUtil.kt
@@ -0,0 +1,47 @@
+package com.btpj.lib_base.utils
+
+import android.content.Context
+import android.content.Context.WIFI_SERVICE
+import android.net.ConnectivityManager
+import android.net.wifi.WifiManager
+import androidx.core.content.ContextCompat.getSystemService
+import com.btpj.lib_base.BaseApp.Companion.appContext
+
+
+/**
+ * 网络工具类
+ *
+ * @author nanfeifei 2022/4/14
+ */
+object NetworkUtil {
+    /**
+     * 网络是否可用
+     *
+     * @param context Context
+     * @return  网络是否可用
+     */
+    fun isNetworkAvailable(context: Context): Boolean {
+        val manager =
+            context.applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        return manager.activeNetworkInfo?.isAvailable == true
+    }
+
+
+    /**
+     * 是否连接Wifi
+     *
+     * @param context
+     * @return boolean
+     */
+    fun isWifi(context: Context): Boolean {
+        val connectivityManager = context
+            .getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        val activeNetInfo = connectivityManager.activeNetworkInfo
+        return activeNetInfo?.type == ConnectivityManager.TYPE_WIFI
+    }
+    fun getWifiNum(): Int{
+        val wifiManager: WifiManager = appContext.getSystemService(WIFI_SERVICE) as WifiManager
+        var scanResults = wifiManager.scanResults
+        return scanResults.size
+    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/utils/ScreenUtil.kt b/lib_base/src/main/java/com/btpj/lib_base/utils/ScreenUtil.kt
new file mode 100644
index 0000000..298614a
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/utils/ScreenUtil.kt
@@ -0,0 +1,110 @@
+package com.btpj.lib_base.utils
+
+import android.app.Activity
+import android.content.Context
+import android.content.res.Resources
+import android.util.DisplayMetrics
+import android.util.TypedValue
+
+/**
+ * 屏幕、尺寸相关工具类
+ *
+ * @author nanfeifei  2018/8/6
+ */
+object ScreenUtil {
+
+    /**
+     * dp转px，也可以使用resources.getDimension(R.dimen.xxx).toInt()
+     *
+     * @param dpVal 要转换的dp值
+     *
+     * @return dp转换为px后的值
+     */
+    fun dp2px(dpVal: Float): Int {
+        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dpVal, Resources.getSystem().displayMetrics).toInt()
+    }
+
+    /**
+     * sp转px
+     *
+     * @param spVal 要转换的sp值
+     *
+     * @return sp转换为px后的值
+     */
+    fun sp2px(spVal: Float): Int {
+        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, spVal, Resources.getSystem().displayMetrics).toInt()
+    }
+
+    /**
+     * px转dp
+     *
+     * @param pxVal 要转换的px值
+     *
+     * @return px转换为dp后的值
+     */
+    fun px2dp(pxVal: Float): Float {
+        return pxVal / Resources.getSystem().displayMetrics.density
+    }
+
+    /**
+     * px转sp
+     *
+     * @param context Context
+     * @param pxVal 要转换的px值
+     *
+     * @return px转换为sp后的值
+     */
+    fun px2sp(pxVal: Float): Float {
+        return pxVal / Resources.getSystem().displayMetrics.scaledDensity
+    }
+
+    /**
+     * 获取屏幕的宽度(px)
+     *
+     * @param context Context
+     */
+    fun getScreenWidth(): Int {
+        return Resources.getSystem().displayMetrics.widthPixels
+    }
+
+    /**
+     * 获取屏幕的高度(px)
+     *
+     * @param context Context
+     */
+    fun getScreenHeight(): Int {
+        return Resources.getSystem().displayMetrics.heightPixels
+    }
+
+    /**
+     * 获取屏幕的屏幕密度
+     *
+     * @param context Context
+     */
+    fun getScreenDensity(): Float {
+        return Resources.getSystem().displayMetrics.density
+    }
+
+
+    /**
+     * 通过反射，获取包含虚拟键的整体屏幕高度
+     *
+     * @return 包含虚拟键的整体屏幕高度
+     */
+    fun getScreenRealHeight(activity: Activity): Int {
+        var dpi = 0
+        val display = activity.windowManager.defaultDisplay
+        val dm = DisplayMetrics()
+        val c: Class<*>
+        try {
+            c = Class.forName("android.view.Display")
+            val method = c.getMethod("getRealMetrics", DisplayMetrics::class.java)
+            method.invoke(display, dm)
+            dpi = dm.heightPixels
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+
+        return dpi
+    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/utils/StatusBarUtil.kt b/lib_base/src/main/java/com/btpj/lib_base/utils/StatusBarUtil.kt
new file mode 100644
index 0000000..26f1448
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/utils/StatusBarUtil.kt
@@ -0,0 +1,84 @@
+package com.btpj.lib_base.utils
+
+import android.app.Activity
+import android.content.Context
+import android.os.Build
+import android.view.View
+import android.view.WindowManager
+import androidx.annotation.ColorInt
+import com.btpj.lib_base.R
+
+/**
+ * 屏幕相关工具类
+ *   1.设置沉浸式任务栏
+ *
+ * @author nanfeifei 16/9/21.
+ */
+object StatusBarUtil {
+
+    /**
+     * 模拟沉浸式状态栏，本质上是通过设置状态栏的颜色，可设置为与toolbar相同达到沉浸式的效果
+     *
+     * @param activity 要设置的Activity
+     */
+    fun setImmersionStatus(activity: Activity) {
+        // 透明状态栏
+        activity.window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
+        activity.window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
+        activity.window.statusBarColor = activity.resources.getColor(R.color.purple_500)
+    }
+
+    /**
+     * 设置无状态栏，直接干掉顶部的状态栏，但要注意例如一些actionbar会自动顶到最上方需要适配
+     *
+     * @param activity 要设置的Activity
+     */
+    fun setNoStatus(activity: Activity) {
+        // 透明状态栏
+        activity.window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
+    }
+
+    /**
+     * 设置状态栏颜色
+     *
+     * @param activity       需要设置的activity
+     * @param color          状态栏颜色值
+     */
+    fun setStatusBarColor(activity: Activity, @ColorInt color: Int) {
+        activity.window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
+        activity.window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
+        activity.window.addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION)
+        activity.window.statusBarColor = color
+    }
+
+    /**
+     * 设置Android6.0上状态栏的字体颜色为黑色
+     *
+     * @param activity Activity
+     */
+    fun setStatusBarLightMode(activity: Activity) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            activity.window.decorView.systemUiVisibility =
+                View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+        }
+    }
+
+    /**
+     * 设置Android6.0上状态栏的字体颜色为黑色
+     *
+     * @param activity Activity
+     */
+    fun setStatusBarDarkMode(activity: Activity) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            activity.window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+        }
+    }
+
+    /**
+     * 获取手机状态栏的高度
+     */
+    fun getStatusBarHeight(context: Context): Int {
+        val resourceId = context.resources.getIdentifier("status_bar_height", "dimen", "android")
+        return context.resources.getDimensionPixelSize(resourceId)
+    }
+}
diff --git a/lib_base/src/main/java/com/btpj/lib_base/utils/ToastUtil.kt b/lib_base/src/main/java/com/btpj/lib_base/utils/ToastUtil.kt
new file mode 100644
index 0000000..bc1902f
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/utils/ToastUtil.kt
@@ -0,0 +1,69 @@
+package com.btpj.lib_base.utils
+
+import android.content.Context
+import android.view.Gravity
+import android.widget.Toast
+import androidx.annotation.StringRes
+
+/**
+ * Toast封装工具类
+ * 注：不知咋回事，设置Toast为静态LeakCanary就报内存泄漏，即使设置成context.applicationContext
+ *
+ * @author nanfeifei  2018/3/26
+ */
+object ToastUtil {
+
+    /**
+     * 显示短时间的Toast
+     *
+     * @param context Context
+     * @param msg 显示的消息
+     */
+    fun showShort(context: Context, msg: String) {
+        if(msg.isNullOrEmpty()){
+            return
+        }
+        Toast.makeText(context.applicationContext, msg, Toast.LENGTH_SHORT).show()
+    }
+    fun showShort(context: Context, @StringRes resId: Int) {
+        Toast.makeText(context.applicationContext, resId, Toast.LENGTH_SHORT).show()
+    }
+    /**
+     * 显示长时间的Toast
+     *
+     * @param context Context
+     * @param msg 显示的消息
+     */
+    fun showLong(context: Context, msg: String) {
+        if(msg.isNullOrEmpty()){
+            return
+        }
+        Toast.makeText(context.applicationContext, msg, Toast.LENGTH_LONG).show()
+    }
+
+    /**
+     * 居中显示短时间的Toast
+     *
+     * @param context Context
+     * @param msg 显示的消息
+     */
+    fun showShortInCenter(context: Context, msg: String) {
+        Toast.makeText(context.applicationContext, msg, Toast.LENGTH_SHORT).apply {
+            setGravity(Gravity.CENTER, 0, 0)
+            show()
+        }
+    }
+
+    /**
+     * 居中显示短时间的Toast
+     *
+     * @param context Context
+     * @param msg 显示的消息
+     */
+    fun showLongInCenter(context: Context, msg: String) {
+        Toast.makeText(context.applicationContext, msg, Toast.LENGTH_LONG).apply {
+            setGravity(Gravity.CENTER, 0, 0)
+            show()
+        }
+    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/widgets/FlowLayout.kt b/lib_base/src/main/java/com/btpj/lib_base/widgets/FlowLayout.kt
new file mode 100644
index 0000000..6c1484b
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/widgets/FlowLayout.kt
@@ -0,0 +1,421 @@
+package com.btpj.lib_base.widgets
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.util.AttributeSet
+import android.view.Gravity
+import android.view.View
+import android.view.ViewGroup
+import com.btpj.lib_base.R
+import kotlin.math.max
+import kotlin.math.min
+
+/**
+ * 流式布局
+ *
+ * @author nanfeifei  2018/5/4
+ */
+class FlowLayout(context: Context, attrs: AttributeSet?) : ViewGroup(context, attrs) {
+
+    /** 水平间距 */
+    private var mChildHorizontalSpacing = 0
+
+    /** 垂直间距 */
+    private var mChildVerticalSpacing = 0
+
+    /** 对齐方式，目前支持 [Gravity.CENTER_HORIZONTAL], [Gravity.LEFT] 和 [Gravity.RIGHT] */
+    private var mGravity: Int = 0
+
+    private var mMaxMode = LINES
+    private var mMaximum = Integer.MAX_VALUE
+
+    companion object {
+        private const val LINES = 0
+        private const val NUMBER = 1
+    }
+
+    /** 每一行的item数目，下标表示行下标，在onMeasured的时候计算得出，供onLayout去使用 */
+    private lateinit var mItemNumberInEachLine: IntArray
+
+    /** 每一行的item的宽度和（包括item直接的间距），下标表示行下标 */
+    private lateinit var mWidthSumInEachLine: IntArray
+
+    /** onMeasure过程中实际参与measure的子View个数 */
+    private var measuredChildCount: Int = 0
+
+    init {
+        val typeArray = context.obtainStyledAttributes(attrs, R.styleable.FlowLayout)
+        mChildHorizontalSpacing =
+            typeArray.getDimensionPixelSize(R.styleable.FlowLayout_childHorizontalSpacing, 0)
+        mChildVerticalSpacing =
+            typeArray.getDimensionPixelSize(R.styleable.FlowLayout_childVerticalSpacing, 0)
+        mGravity = typeArray.getInteger(R.styleable.FlowLayout_android_gravity, Gravity.START)
+        val maxLines = typeArray.getInt(R.styleable.FlowLayout_android_maxLines, -1)
+        if (maxLines >= 0) {
+            setMaxLines(maxLines)
+        }
+        val maxNumber = typeArray.getInt(R.styleable.FlowLayout_maxNumber, -1)
+        if (maxNumber >= 0) {
+            setMaxNumber(maxNumber)
+        }
+        typeArray.recycle()
+    }
+
+    @SuppressLint("DrawAllocation", "SwitchIntDef")
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        val widthSpecMode = MeasureSpec.getMode(widthMeasureSpec)
+        val widthSpecSize = MeasureSpec.getSize(widthMeasureSpec)
+        val heightSpecMode = MeasureSpec.getMode(heightMeasureSpec)
+        val heightSpecSize = MeasureSpec.getSize(heightMeasureSpec)
+        var maxLineHeight = 0
+        var resultWidth: Int
+        val resultHeight: Int
+        val count = childCount
+        mItemNumberInEachLine = IntArray(count)
+        mWidthSumInEachLine = IntArray(count)
+        var lineIndex = 0
+
+        // 若FlowLayout指定了MATCH_PARENT或固定宽度，则需要使子View换行
+        if (widthSpecMode == MeasureSpec.EXACTLY) {
+            resultWidth = widthSpecSize
+            measuredChildCount = 0
+            // 下一个子View的position
+            var childPositionX = paddingLeft
+            var childPositionY = paddingTop
+            // 子View的Right最大可达到的x坐标
+            val childMaxRight = widthSpecSize - paddingRight
+
+            for (i in 0 until count) {
+                if (mMaxMode == NUMBER && measuredChildCount >= mMaximum) {
+                    // 超出最多数量，则不再继续
+                    break
+                } else if (mMaxMode == LINES && lineIndex >= mMaximum) {
+                    // 超出最多行数，则不再继续
+                    break
+                }
+
+                val child = getChildAt(i)
+                if (child.visibility == View.GONE) {
+                    continue
+                }
+
+                val childLayoutParams = child.layoutParams
+                val childWidthMeasureSpec = getChildMeasureSpec(
+                    widthMeasureSpec,
+                    paddingLeft + paddingRight,
+                    childLayoutParams.width
+                )
+                val childHeightMeasureSpec = getChildMeasureSpec(
+                    heightMeasureSpec,
+                    paddingTop + paddingBottom,
+                    childLayoutParams.height
+                )
+                child.measure(childWidthMeasureSpec, childHeightMeasureSpec)
+
+                val childWidth = child.measuredWidth
+                maxLineHeight = max(maxLineHeight, child.measuredHeight)
+                // 需要换行
+                if (childPositionX + childWidth > childMaxRight) {
+                    // 如果换行后超出最大行数，则不再继续
+                    if (mMaxMode == LINES) {
+                        if (lineIndex + 1 >= mMaximum) {
+                            break
+                        }
+                    }
+                    // 后面每次加item都会加上一个space，这样的话每行都会为最后一个item多加一次space，所以在这里减一次
+                    mWidthSumInEachLine[lineIndex] -= mChildHorizontalSpacing
+                    lineIndex++ // 换行
+                    childPositionX = paddingLeft // 下一行第一个item的x
+                    childPositionY += maxLineHeight + mChildVerticalSpacing // 下一行第一个item的y
+                }
+                mItemNumberInEachLine[lineIndex]++
+                mWidthSumInEachLine[lineIndex] += childWidth + mChildHorizontalSpacing
+                childPositionX += childWidth + mChildHorizontalSpacing
+                measuredChildCount++
+            }
+            // 如果最后一个item不是刚好在行末（即lineCount最后没有+1，也就是mWidthSumInEachLine[lineCount]非0），则要减去最后一个item的space
+            if (mWidthSumInEachLine.isNotEmpty() && mWidthSumInEachLine[lineIndex] > 0) {
+                mWidthSumInEachLine[lineIndex] -= mChildHorizontalSpacing
+            }
+            resultHeight = when (heightSpecMode) {
+                MeasureSpec.UNSPECIFIED -> childPositionY + maxLineHeight + paddingBottom
+                MeasureSpec.AT_MOST -> min(
+                    childPositionY + maxLineHeight + paddingBottom,
+                    heightSpecSize
+                )
+                else -> heightSpecSize
+            }
+        } else {
+            // 不计算换行，直接一行铺开
+            resultWidth = paddingLeft + paddingRight
+            measuredChildCount = 0
+
+            for (i in 0 until count) {
+                if (mMaxMode == NUMBER) {
+                    // 超出最多数量，则不再继续
+                    if (measuredChildCount > mMaximum) {
+                        break
+                    }
+                } else if (mMaxMode == LINES) {
+                    // 超出最大行数，则不再继续
+                    if (1 > mMaximum) {
+                        break
+                    }
+                }
+                val child = getChildAt(i)
+                if (child.visibility == View.GONE) {
+                    continue
+                }
+                val childLayoutParams = child.layoutParams
+                val childWidthMeasureSpec = getChildMeasureSpec(
+                    widthMeasureSpec,
+                    paddingLeft + paddingRight,
+                    childLayoutParams.width
+                )
+                val childHeightMeasureSpec = getChildMeasureSpec(
+                    heightMeasureSpec,
+                    paddingTop + paddingBottom,
+                    childLayoutParams.height
+                )
+                child.measure(childWidthMeasureSpec, childHeightMeasureSpec)
+                resultWidth += child.measuredWidth
+                maxLineHeight = max(maxLineHeight, child.measuredHeight)
+                measuredChildCount++
+            }
+            if (measuredChildCount > 0) {
+                resultWidth += mChildHorizontalSpacing * (measuredChildCount - 1)
+            }
+            resultHeight = maxLineHeight + paddingTop + paddingBottom
+            if (mItemNumberInEachLine.isNotEmpty()) {
+                mItemNumberInEachLine[lineIndex] = count
+            }
+            if (mWidthSumInEachLine.isNotEmpty()) {
+                mWidthSumInEachLine[0] = resultWidth
+            }
+        }
+        setMeasuredDimension(resultWidth, resultHeight)
+    }
+
+    override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {
+        val width = right - left
+        // 按照不同gravity使用不同的布局，默认是left
+        when (mGravity and Gravity.HORIZONTAL_GRAVITY_MASK) {
+            Gravity.START -> layoutWithGravityLeft(width)
+            Gravity.END -> layoutWithGravityRight(width)
+            Gravity.CENTER_HORIZONTAL -> layoutWithGravityCenterHorizontal(width)
+            else -> layoutWithGravityLeft(width)
+        }
+    }
+
+    /**
+     * 将子View靠左布局
+     */
+    private fun layoutWithGravityLeft(parentWidth: Int) {
+        val childMaxRight = parentWidth - paddingRight
+        var childPositionX = paddingLeft
+        var childPositionY = paddingTop
+        var lineHeight = 0
+        val childCount = childCount
+        val childCountToLayout = min(childCount, measuredChildCount)
+        for (i in 0 until childCountToLayout) {
+            val child = getChildAt(i)
+            if (child.visibility == View.GONE) {
+                continue
+            }
+            val childWidth = child.measuredWidth
+            val childHeight = child.measuredHeight
+            lineHeight = max(lineHeight, childHeight)
+            if (childPositionX + childWidth > childMaxRight) {
+                childPositionX = paddingLeft
+                childPositionY += lineHeight + mChildVerticalSpacing
+                lineHeight = 0
+            }
+            child.layout(
+                childPositionX,
+                childPositionY,
+                childPositionX + childWidth,
+                childPositionY + childHeight
+            )
+            childPositionX += childWidth + mChildHorizontalSpacing
+        }
+
+        // 如果布局的子View少于childCount，则表示有一些子View不需要布局
+        if (measuredChildCount < childCount) {
+            for (i in measuredChildCount until childCount) {
+                val child = getChildAt(i)
+                if (child.visibility == View.GONE) {
+                    continue
+                }
+                child.layout(0, 0, 0, 0)
+            }
+        }
+    }
+
+    /**
+     * 将子View居中布局
+     */
+    private fun layoutWithGravityCenterHorizontal(parentWidth: Int) {
+        var nextChildIndex = 0
+        var nextChildPositionX: Int
+        var nextChildPositionY = paddingTop
+        var lineHeight = 0
+
+        // 遍历每一行
+        for (i in mItemNumberInEachLine.indices) {
+            // 如果这一行已经没item了，则退出循环
+            if (mItemNumberInEachLine[i] == 0) {
+                break
+            }
+
+            if (nextChildIndex > measuredChildCount - 1) {
+                break
+            }
+
+            // 遍历该行内的元素，布局每个元素
+            nextChildPositionX =
+                (parentWidth - paddingLeft - paddingRight - mWidthSumInEachLine[i]) / 2 + paddingLeft // 子 View 的最小 x 值
+            for (j in nextChildIndex until nextChildIndex + mItemNumberInEachLine[i]) {
+                val childView = getChildAt(j)
+                if (childView.visibility == View.GONE) {
+                    continue
+                }
+                val childWidth = childView.measuredWidth
+                val childHeight = childView.measuredHeight
+                childView.layout(
+                    nextChildPositionX,
+                    nextChildPositionY,
+                    nextChildPositionX + childWidth,
+                    nextChildPositionY + childHeight
+                )
+                lineHeight = max(lineHeight, childHeight)
+                nextChildPositionX += childWidth + mChildHorizontalSpacing
+            }
+
+            // 一行结束了，整理一下，准备下一行
+            nextChildPositionY += lineHeight + mChildVerticalSpacing
+            nextChildIndex += mItemNumberInEachLine[i]
+            lineHeight = 0
+        }
+
+        val childCount = childCount
+        if (measuredChildCount < childCount) {
+            for (i in measuredChildCount until childCount) {
+                val childView = getChildAt(i)
+                if (childView.visibility == View.GONE) {
+                    continue
+                }
+                childView.layout(0, 0, 0, 0)
+            }
+        }
+    }
+
+    /**
+     * 将子View靠右布局
+     */
+    private fun layoutWithGravityRight(parentWidth: Int) {
+        var nextChildIndex = 0
+        var nextChildPositionX: Int
+        var nextChildPositionY = paddingTop
+        var lineHeight = 0
+
+        // 遍历每一行
+        for (i in mItemNumberInEachLine.indices) {
+            // 如果这一行已经没item了，则退出循环
+            if (mItemNumberInEachLine[i] == 0) {
+                break
+            }
+
+            if (nextChildIndex > measuredChildCount - 1) {
+                break
+            }
+
+            // 遍历该行内的元素，布局每个元素
+            nextChildPositionX =
+                parentWidth - paddingRight - mWidthSumInEachLine[i] // 初始值为子 View 的最小 x 值
+            for (j in nextChildIndex until nextChildIndex + mItemNumberInEachLine[i]) {
+                val childView = getChildAt(j)
+                if (childView.visibility == View.GONE) {
+                    continue
+                }
+                val childWidth = childView.measuredWidth
+                val childHeight = childView.measuredHeight
+                childView.layout(
+                    nextChildPositionX,
+                    nextChildPositionY,
+                    nextChildPositionX + childWidth,
+                    nextChildPositionY + childHeight
+                )
+                lineHeight = max(lineHeight, childHeight)
+                nextChildPositionX += childWidth + mChildHorizontalSpacing
+            }
+
+            // 一行结束了，整理一下，准备下一行
+            nextChildPositionY += lineHeight + mChildVerticalSpacing
+            nextChildIndex += mItemNumberInEachLine[i]
+            lineHeight = 0
+        }
+
+        val childCount = childCount
+        if (measuredChildCount < childCount) {
+            for (i in measuredChildCount until childCount) {
+                val childView = getChildAt(i)
+                if (childView.visibility == View.GONE) {
+                    continue
+                }
+                childView.layout(0, 0, 0, 0)
+            }
+        }
+    }
+
+    /**
+     * 设置子 View 的对齐方式，目前支持 [Gravity.CENTER_HORIZONTAL], [Gravity.LEFT] 和 [Gravity.RIGHT]
+     */
+    fun setGravity(gravity: Int) {
+        if (mGravity != gravity) {
+            mGravity = gravity
+            requestLayout()
+        }
+    }
+
+    fun getGravity(): Int {
+        return mGravity
+    }
+
+    /**
+     * 获取最多可显示的行数
+     *
+     * @return 没有限制时返回-1
+     */
+    fun getMaxLines(): Int {
+        return if (mMaxMode == LINES) mMaximum else -1
+    }
+
+    /**
+     * 设置最多可显示的行数
+     *
+     * @param maxLines 最多可显示的行数
+     */
+    fun setMaxLines(maxLines: Int) {
+        mMaximum = maxLines
+        mMaxMode = LINES
+        requestLayout()
+    }
+
+    /**
+     * 获取最多可显示的子View个数
+     */
+    fun getMaxNumber(): Int {
+        return if (mMaxMode == NUMBER) mMaximum else -1
+    }
+
+    /**
+     * 设置最多可显示的子View个数
+     *
+     * @param maxNumber 最多可显示的子View个数
+     */
+    fun setMaxNumber(maxNumber: Int) {
+        mMaximum = maxNumber
+        mMaxMode = NUMBER
+        requestLayout()
+    }
+}
\ No newline at end of file
diff --git a/lib_base/src/main/java/com/btpj/lib_base/widgets/TitleLayout.kt b/lib_base/src/main/java/com/btpj/lib_base/widgets/TitleLayout.kt
new file mode 100644
index 0000000..d4fa9df
--- /dev/null
+++ b/lib_base/src/main/java/com/btpj/lib_base/widgets/TitleLayout.kt
@@ -0,0 +1,259 @@
+package com.btpj.lib_base.widgets
+
+import android.app.Activity
+import android.content.Context
+import android.util.AttributeSet
+import android.util.TypedValue
+import android.view.LayoutInflater
+import android.view.View
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.ContextCompat
+import androidx.databinding.DataBindingUtil
+import com.btpj.lib_base.R
+import com.btpj.lib_base.databinding.LayoutTitleBinding
+import com.btpj.lib_base.utils.ScreenUtil
+
+/**
+ * 封装的Title标题栏
+ * 比Toolbar更好用,当然没有Toolbar那么强大,不过通常的功能均能更好的满足,不满足的再用Toolbar就行了
+ *
+ * @author nanfeifei 16/9/19.
+ */
+class TitleLayout(context: Context, attrs: AttributeSet) : ConstraintLayout(context, attrs) {
+
+    private var mBinding: LayoutTitleBinding
+
+    init {
+        // 自定义TitleLayout的相关属性
+        val typedArray = context.obtainStyledAttributes(attrs, R.styleable.TitleLayout)
+        val titleBackgroundColor = typedArray.getColor(
+            R.styleable.TitleLayout_titleBackgroundColor,
+            ContextCompat.getColor(context, R.color.purple_500)
+        )
+        val backIconRes =
+            typedArray.getResourceId(R.styleable.TitleLayout_backIconRes, R.drawable.ic_back)
+        val isShowBack = typedArray.getBoolean(R.styleable.TitleLayout_isShowBack, true)
+        val titleTextColor = typedArray.getColor(
+            R.styleable.TitleLayout_titleTextColor,
+            ContextCompat.getColor(context, R.color._ffffff)
+        )
+        val titleTextSize = typedArray.getDimensionPixelSize(
+            R.styleable.TitleLayout_titleTextSize,
+            ScreenUtil.sp2px(20f)
+        )
+        val titleText = typedArray.getString(R.styleable.TitleLayout_titleText)
+        typedArray.recycle()
+
+        // 自定义TitleLayout的布局
+        mBinding = DataBindingUtil.inflate(
+            LayoutInflater.from(context),
+            R.layout.layout_title,
+            this,
+            true
+        )
+
+        // 设置TitleLayout的背景色
+        mBinding.clTitleBar.setBackgroundColor(titleBackgroundColor)
+
+        // TitleBar的返回键
+        mBinding.ivBack.apply {
+            visibility = if (isShowBack) View.VISIBLE else View.GONE
+            setImageResource(backIconRes)
+            setOnClickListener { (context as Activity).onBackPressed() }
+        }
+
+        // TitleBar的标题文本
+        mBinding.tvTitleText.apply {
+            setTextColor(titleTextColor)
+            setTextSize(TypedValue.COMPLEX_UNIT_PX, titleTextSize.toFloat())
+            text = titleText
+            isSelected = true
+        }
+    }
+
+    /**
+     * 设置返回键图标
+     *
+     * @param resId 返回键图标Id
+     */
+    fun setBackIcon(resId: Int): TitleLayout {
+        mBinding.ivBack.setImageResource(resId)
+        return this
+    }
+
+    /**
+     * 设置Title背景色
+     *
+     * @param titleBackgroundColor Title背景色
+     */
+    fun setTitleBackgroundColor(titleBackgroundColor: Int): TitleLayout {
+        mBinding.clTitleBar.setBackgroundColor(titleBackgroundColor)
+        return this
+    }
+
+    /**
+     * 设置Title左侧的返回键是否显示
+     *
+     * @param isVisible Title左侧的返回键是否显示
+     */
+    fun setBackVisible(isVisible: Boolean): TitleLayout {
+        mBinding.ivBack.visibility = if (isVisible) View.VISIBLE else View.GONE
+        return this
+    }
+
+    /**
+     * 设置Title中间的标题文本名
+     *
+     * @param titleText Title中间的标题文本名
+     */
+    fun setTitleText(titleText: String): TitleLayout {
+        mBinding.tvTitleText.text = titleText
+        return this
+    }
+
+    /**
+     * 设置Title中间的标题文本颜色
+     *
+     * @param titleTextColor Title中间的标题文本颜色
+     */
+    fun setTitleTextColor(titleTextColor: Int): TitleLayout {
+        mBinding.tvTitleText.setTextColor(titleTextColor)
+        return this
+    }
+
+    /**
+     * 设置Title中间的标题文本大小
+     *
+     * @param titleTextSize Title中间的标题文本大小
+     */
+    fun setTitleTextSize(titleTextSize: Int): TitleLayout {
+        mBinding.tvTitleText.setTextSize(TypedValue.COMPLEX_UNIT_PX, titleTextSize.toFloat())
+        return this
+    }
+
+    /**
+     * 设置Title右测的TextView编辑菜单
+     *
+     * @param text            Title右测的TextView编辑菜单文本
+     * @param onClickListener 菜单点击回调
+     */
+    fun setRightView(text: String, onClickListener: OnClickListener): TitleLayout {
+        mBinding.apply {
+            ivMenu.visibility = View.GONE
+            tvMenu.apply {
+                visibility = View.VISIBLE
+                this.text = text
+                setOnClickListener(onClickListener)
+            }
+        }
+        return this
+    }
+
+    /**
+     * 设置Title右测的TextView编辑菜单
+     *
+     * @param rightViewBackground   Title右测的TextView背景色
+     */
+    fun setRightViewBackground(rightViewBackground: Int): TitleLayout {
+        mBinding.apply {
+            ivMenu.visibility = View.GONE
+            tvMenu.apply {
+                visibility = View.VISIBLE
+                setBackgroundColor(rightViewBackground)
+            }
+        }
+        return this
+    }
+
+    /**
+     * 设置Title右测的TextView编辑菜单
+     *
+     * @param text            Title右测的TextView编辑菜单文本
+     * @param textColor       Title右测的TextView编辑菜单文本颜色
+     * @param onClickListener 菜单点击回调
+     */
+    fun setRightView(text: String, textColor: Int, onClickListener: OnClickListener): TitleLayout {
+        mBinding.apply {
+            ivMenu.visibility = View.GONE
+                .apply {
+                    tvMenu.apply {
+                        visibility = View.VISIBLE
+                        this.text = text
+                        setTextColor(textColor)
+                        setOnClickListener(onClickListener)
+                    }
+                }
+        }
+        return this
+    }
+
+    /**
+     * 设置Title右测的TextView编辑菜单
+     *
+     * @param text            Title右测的TextView编辑菜单文本
+     */
+    fun setRightView(text: String): TitleLayout {
+        mBinding.apply {
+            ivMenu.visibility = View.GONE
+                .apply {
+                    tvMenu.apply {
+                        visibility = View.VISIBLE
+                        this.text = text
+                    }
+                }
+        }
+        return this
+    }
+
+    /**
+     * 设置Title右测的ImageView编辑菜单
+     *
+     * @param imageRes        Title右测的ImageView编辑菜单ImageViewResource
+     * @param onClickListener 菜单点击回调
+     */
+    fun setRightView(imageRes: Int, onClickListener: OnClickListener): TitleLayout {
+        mBinding.apply {
+            tvMenu.visibility = View.GONE
+            ivMenu.apply {
+                visibility = View.VISIBLE
+                setImageResource(imageRes)
+                setOnClickListener(onClickListener)
+            }
+        }
+        return this
+    }
+
+    /**
+     * 设置Title右测的ImageView编辑菜单
+     *
+     * @param imageRes        Title右测的ImageView编辑菜单ImageViewResource
+     */
+    fun setRightView(imageRes: Int): TitleLayout {
+        mBinding.apply {
+            tvMenu.visibility = View.GONE
+            ivMenu.apply {
+                visibility = View.VISIBLE
+                setImageResource(imageRes)
+            }
+        }
+        return this
+    }
+
+    /**
+     * 设置Title右侧的菜单上的提示红点是否显示
+     *
+     * @param isVisible 红点是否显示
+     */
+    fun setRedViewVisible(isVisible: Boolean): TitleLayout {
+        mBinding.viewRed.visibility = if (isVisible) View.VISIBLE else View.INVISIBLE
+        return this
+    }
+
+    /**
+     * 设置左键的点击事件
+     */
+    fun setLeftOnclick(l: OnClickListener): TitleLayout {
+        mBinding.ivBack.setOnClickListener(l)
+        return this
+    }
+}
diff --git a/lib_base/src/main/res/drawable-xxhdpi/ic_default.jpg b/lib_base/src/main/res/drawable-xxhdpi/ic_default.jpg
new file mode 100644
index 0000000..a669319
Binary files /dev/null and b/lib_base/src/main/res/drawable-xxhdpi/ic_default.jpg differ
diff --git a/lib_base/src/main/res/drawable-xxhdpi/ic_default_head_img.webp b/lib_base/src/main/res/drawable-xxhdpi/ic_default_head_img.webp
new file mode 100644
index 0000000..793c482
Binary files /dev/null and b/lib_base/src/main/res/drawable-xxhdpi/ic_default_head_img.webp differ
diff --git a/lib_base/src/main/res/drawable-xxhdpi/icon_back.webp b/lib_base/src/main/res/drawable-xxhdpi/icon_back.webp
new file mode 100644
index 0000000..a3cbf03
Binary files /dev/null and b/lib_base/src/main/res/drawable-xxhdpi/icon_back.webp differ
diff --git a/lib_base/src/main/res/drawable-xxhdpi/image_default_empty.webp b/lib_base/src/main/res/drawable-xxhdpi/image_default_empty.webp
new file mode 100644
index 0000000..6ec8570
Binary files /dev/null and b/lib_base/src/main/res/drawable-xxhdpi/image_default_empty.webp differ
diff --git a/lib_base/src/main/res/drawable/bg_circle_red.xml b/lib_base/src/main/res/drawable/bg_circle_red.xml
new file mode 100644
index 0000000..27088ab
--- /dev/null
+++ b/lib_base/src/main/res/drawable/bg_circle_red.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@color/_ff4a57" />
+    <size
+        android:width="2dp"
+        android:height="2dp" />
+</shape>
+
+
+
+
diff --git a/lib_base/src/main/res/drawable/ic_back.xml b/lib_base/src/main/res/drawable/ic_back.xml
new file mode 100644
index 0000000..68ef217
--- /dev/null
+++ b/lib_base/src/main/res/drawable/ic_back.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M477.87,157.87c17.07,-17.07 17.07,-42.67 0,-59.73s-42.67,-17.07 -59.73,0L40.53,465.07C14.93,490.67 14.93,531.2 40.53,554.67c0,0 125.87,123.73 379.73,371.2 17.07,17.07 44.8,17.07 59.73,0 17.07,-17.07 17.07,-44.8 0,-59.73L115.2,512l362.67,-354.13z" />
+</vector>
diff --git a/lib_base/src/main/res/drawable/ic_default_img.xml b/lib_base/src/main/res/drawable/ic_default_img.xml
new file mode 100644
index 0000000..6b3161d
--- /dev/null
+++ b/lib_base/src/main/res/drawable/ic_default_img.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="@color/_eeeeee"
+        android:pathData="M853.34,106.66a128,128 0,0 1,128 128v554.69a128,128 0,0 1,-128 128L170.66,917.34a128,128 0,0 1,-128 -128L42.66,234.66a128,128 0,0 1,128 -128h682.69zM698.88,516.35l-2.37,2.98 -111.04,149.89a117.34,117.34 0,0 1,-153.73 31.33l-4.48,-2.78 -83.62,-54.37a53.34,53.34 0,0 0,-66.88 7.1l-2.56,2.75 -152.8,176.96c10.98,13.22 27.2,21.95 45.5,23.04l3.74,0.1h682.69a64,64 0,0 0,63.87 -60.26l0.13,-3.74v-155.97l-143.26,-122.78a53.34,53.34 0,0 0,-75.2 5.76zM853.34,170.66L170.66,170.66a64,64 0,0 0,-63.87 60.26l-0.13,3.74v514.66l119.14,-137.89a117.34,117.34 0,0 1,148.22 -24.48l4.51,2.82 83.62,54.34c22.59,14.72 52.42,10.14 69.66,-10.11l2.24,-2.88 111.04,-149.86a117.34,117.34 0,0 1,164.13 -24.45l3.3,2.56 3.2,2.62 101.6,87.07L917.31,234.66a64,64 0,0 0,-60.22 -63.87l-3.74,-0.13zM277.34,320a64,64 0,1 1,0 128,64 64,0 0,1 0,-128z" />
+</vector>
diff --git a/lib_base/src/main/res/drawable/ic_list_empty.xml b/lib_base/src/main/res/drawable/ic_list_empty.xml
new file mode 100644
index 0000000..5a6aa5f
--- /dev/null
+++ b/lib_base/src/main/res/drawable/ic_list_empty.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="64dp"
+    android:height="64dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+    <path
+        android:fillColor="#FF999999"
+        android:pathData="M968.35,519.52v422.96c0,15.58 -11.13,26.71 -26.71,26.71L80.14,969.19c-15.58,0 -28.94,-11.13 -28.94,-26.71L51.2,519.52h291.62c6.68,35.62 22.26,71.24 51.2,97.95C425.18,648.64 467.48,664.22 512,664.22s84.59,-17.81 117.98,-46.75c26.71,-26.71 44.52,-60.1 51.2,-97.95h287.17zM658.92,470.55c-13.36,0 -22.26,11.13 -22.26,24.49 0,66.78 -55.65,122.43 -122.43,122.43S391.79,561.82 391.79,495.04c0,-13.36 -11.13,-24.49 -22.26,-24.49L93.5,470.55l146.92,-133.57L785.81,336.98L930.5,470.55L658.92,470.55zM1010.64,472.78L814.75,292.46c-4.45,-6.68 -13.36,-8.9 -22.26,-8.9L231.51,283.56c-8.9,0 -17.81,4.45 -22.26,8.9L11.13,472.78C4.45,479.45 0,490.58 0,499.49v440.77c0,44.52 35.62,80.14 80.14,80.14h861.49c44.52,0 80.14,-35.62 80.14,-80.14L1021.77,499.49c2.23,-8.9 -4.45,-20.03 -11.13,-26.71zM589.91,768.85c2.23,11.13 11.13,15.58 31.17,13.36 33.39,-6.68 48.97,-2.23 57.88,-4.45 8.9,-4.45 11.13,-17.81 -4.45,-22.26 -15.58,-6.68 -33.39,2.22 -35.62,-2.23 -2.23,-2.23 4.45,-8.9 17.81,-11.13 15.58,-4.45 31.17,-4.45 28.94,-15.58 -4.45,-15.58 -26.71,-17.81 -44.52,-13.36 -22.26,2.23 -55.65,28.94 -51.2,55.65zM380.66,710.97c-15.58,-4.45 -37.84,-2.23 -44.52,13.36 -2.23,8.9 13.36,11.13 28.94,15.58 11.13,2.23 17.81,8.9 17.81,11.13 -2.23,4.45 -20.03,-4.45 -35.62,2.23 -15.58,6.68 -13.36,20.03 -4.45,22.26 8.9,4.45 24.49,0 57.88,4.45 17.81,2.23 28.94,-2.23 31.17,-13.36 4.45,-24.49 -28.94,-51.2 -51.2,-55.65zM512,831.18c-31.17,0 -55.65,24.49 -55.65,55.65 0,6.68 4.45,11.13 11.13,11.13s11.13,-4.45 11.13,-11.13c0,-17.81 15.58,-33.39 33.39,-33.39 20.03,0 33.39,15.58 33.39,33.39 0,6.68 4.45,11.13 11.13,11.13s11.13,-4.45 11.13,-11.13c0,-31.17 -24.49,-55.65 -55.65,-55.65zM456.35,889.06v-2.23,2.23z"
+        tools:ignore="VectorPath" />
+    <path
+        android:fillColor="#FF999999"
+        android:pathData="M968.35,519.52v422.96c0,15.58 -11.13,26.71 -26.71,26.71L80.14,969.19c-15.58,0 -28.94,-11.13 -28.94,-26.71L51.2,519.52h291.62c6.68,35.62 22.26,71.24 51.2,97.95C425.18,648.64 467.48,664.22 512,664.22s84.59,-17.81 117.98,-46.75c26.71,-26.71 44.52,-60.1 51.2,-97.95h287.17zM658.92,470.55c-13.36,0 -22.26,11.13 -22.26,24.49 0,66.78 -55.65,122.43 -122.43,122.43S391.79,561.82 391.79,495.04c0,-13.36 -11.13,-24.49 -22.26,-24.49L93.5,470.55l146.92,-133.57L785.81,336.98L930.5,470.55L658.92,470.55zM1010.64,472.78L814.75,292.46c-4.45,-6.68 -13.36,-8.9 -22.26,-8.9L231.51,283.56c-8.9,0 -17.81,4.45 -22.26,8.9L11.13,472.78C4.45,479.45 0,490.58 0,499.49v440.77c0,44.52 35.62,80.14 80.14,80.14h861.49c44.52,0 80.14,-35.62 80.14,-80.14L1021.77,499.49c2.23,-8.9 -4.45,-20.03 -11.13,-26.71zM589.91,768.85c2.23,11.13 11.13,15.58 31.17,13.36 33.39,-6.68 48.97,-2.23 57.88,-4.45 8.9,-4.45 11.13,-17.81 -4.45,-22.26 -15.58,-6.68 -33.39,2.22 -35.62,-2.23 -2.23,-2.23 4.45,-8.9 17.81,-11.13 15.58,-4.45 31.17,-4.45 28.94,-15.58 -4.45,-15.58 -26.71,-17.81 -44.52,-13.36 -22.26,2.23 -55.65,28.94 -51.2,55.65zM380.66,710.97c-15.58,-4.45 -37.84,-2.23 -44.52,13.36 -2.23,8.9 13.36,11.13 28.94,15.58 11.13,2.23 17.81,8.9 17.81,11.13 -2.23,4.45 -20.03,-4.45 -35.62,2.23 -15.58,6.68 -13.36,20.03 -4.45,22.26 8.9,4.45 24.49,0 57.88,4.45 17.81,2.23 28.94,-2.23 31.17,-13.36 4.45,-24.49 -28.94,-51.2 -51.2,-55.65zM512,831.18c-31.17,0 -55.65,24.49 -55.65,55.65 0,6.68 4.45,11.13 11.13,11.13s11.13,-4.45 11.13,-11.13c0,-17.81 15.58,-33.39 33.39,-33.39 20.03,0 33.39,15.58 33.39,33.39 0,6.68 4.45,11.13 11.13,11.13s11.13,-4.45 11.13,-11.13c0,-31.17 -24.49,-55.65 -55.65,-55.65zM456.35,889.06v-2.23,2.23zM727.93,193.67c-4.45,-4.45 -6.68,-11.13 -6.68,-15.58 0,-6.68 2.23,-13.36 6.68,-17.81l84.59,-86.82c8.9,-8.9 24.49,-8.9 33.39,0s8.9,24.49 0,33.39l-84.59,86.82c-4.45,4.45 -8.9,6.68 -15.58,6.68 -6.68,0 -13.36,-2.23 -17.81,-6.68m-231.51,-31.17c-4.45,-4.45 -6.68,-11.13 -6.68,-17.81l-2.23,-120.21C487.51,11.13 498.64,0 509.77,0c13.36,0 24.49,8.9 24.49,22.26l2.23,120.21c0,8.9 -4.45,17.81 -13.36,22.26 -8.9,4.45 -17.81,2.23 -26.71,-2.23m-244.87,35.62l-89.04,-82.36c-8.9,-8.9 -8.9,-24.49 0,-33.39 8.9,-8.9 24.49,-8.9 33.39,0l89.04,82.36c8.9,8.9 8.9,24.49 0,33.39 -8.9,8.9 -24.49,8.9 -33.39,0"
+        tools:ignore="VectorPath" />
+</vector>
diff --git a/lib_base/src/main/res/layout/dialog_loading.xml b/lib_base/src/main/res/layout/dialog_loading.xml
new file mode 100644
index 0000000..ebbee0f
--- /dev/null
+++ b/lib_base/src/main/res/layout/dialog_loading.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:cardBackgroundColor="@color/_ffffff"
+    app:cardCornerRadius="6dp">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="100dp"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <ProgressBar
+            android:id="@+id/progressBar"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_marginLeft="24dp"
+            android:layout_marginRight="24dp"
+            android:indeterminateTint="@color/theme_color"
+            android:indeterminateTintMode="src_atop" />
+
+        <TextView
+            android:id="@+id/tv_loadingMsg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:gravity="center"
+            android:text="@string/request_web"
+            android:textColor="#333"
+            android:textSize="16sp" />
+    </LinearLayout>
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/lib_base/src/main/res/layout/layout_empty.xml b/lib_base/src/main/res/layout/layout_empty.xml
new file mode 100644
index 0000000..1ad1361
--- /dev/null
+++ b/lib_base/src/main/res/layout/layout_empty.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="100dp">
+
+    <TextView
+        android:id="@+id/tv_empty"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:drawablePadding="36dp"
+        android:gravity="center"
+        android:text="@string/list_is_empty"
+        android:textColor="@color/_666666"
+        android:textSize="14sp"
+        app:drawableTopCompat="@drawable/image_default_empty" />
+
+</FrameLayout>
+
+
+
diff --git a/lib_base/src/main/res/layout/layout_title.xml b/lib_base/src/main/res/layout/layout_title.xml
new file mode 100644
index 0000000..ed57e39
--- /dev/null
+++ b/lib_base/src/main/res/layout/layout_title.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?><!--通用的TitleBar布局 -->
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <!-- 这个布局加入dataBinding纯粹是为了让BR生成viewModel的Variable
+         以便BaseVMBActivity中调用mBinding.setVariable(BR.viewModel, mViewModel)
+         而不用实际使用的Activity(继承自BaseVMBActivity)每次都调用一遍-->
+        <variable
+            name="viewModel"
+            type="com.btpj.lib_base.base.BaseViewModel" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_titleBar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@color/purple_500">
+
+        <ImageView
+            android:id="@+id/iv_back"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:background="?android:attr/selectableItemBackground"
+            android:contentDescription="@null"
+            android:paddingStart="10dp"
+            android:paddingEnd="30dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:srcCompat="@drawable/ic_back" />
+
+        <ImageView
+            android:id="@+id/iv_menu"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:background="?android:attr/selectableItemBackground"
+            android:contentDescription="@null"
+            android:paddingStart="20dp"
+            android:paddingEnd="15dp"
+            android:src="@android:drawable/ic_menu_add"
+            android:textColor="@color/_ffffff"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="@+id/iv_back"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/iv_back" />
+
+        <TextView
+            android:id="@+id/tv_menu"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:background="?android:attr/selectableItemBackground"
+            android:gravity="center"
+            android:maxEms="7"
+            android:paddingStart="15dp"
+            android:paddingEnd="15dp"
+            android:singleLine="true"
+            android:textColor="@color/_ffffff"
+            android:textSize="14sp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="@+id/iv_back"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/iv_back"
+            tools:text="Edit" />
+
+        <TextView
+            android:id="@+id/tv_titleText"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:ellipsize="marquee"
+            android:gravity="center"
+            android:marqueeRepeatLimit="marquee_forever"
+            android:paddingStart="40dp"
+            android:paddingEnd="28dp"
+            android:singleLine="true"
+            android:textColor="@color/_ffffff"
+            android:textSize="20sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            tools:text="Title" />
+
+        <View
+            android:id="@+id/view_red"
+            android:layout_width="10dp"
+            android:layout_height="10dp"
+            android:layout_marginEnd="14dp"
+            android:layout_marginBottom="14dp"
+            android:background="@drawable/bg_circle_red"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="@+id/iv_back"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/iv_back" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/lib_base/src/main/res/values/attrs.xml b/lib_base/src/main/res/values/attrs.xml
new file mode 100644
index 0000000..af97146
--- /dev/null
+++ b/lib_base/src/main/res/values/attrs.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--自定义的标题栏相关属性-->
+    <declare-styleable name="TitleLayout">
+        <!--标题栏背景颜色（默认蓝色）-->
+        <attr name="titleBackgroundColor" format="color" />
+        <!--是否显示标题栏左侧的返回键(默认显示)-->
+        <attr name="isShowBack" format="boolean" />
+        <!--标题栏左侧的返回键的图标-->
+        <attr name="backIconRes" format="reference" />
+        <!--标题栏标题文本颜色（默认白色）-->
+        <attr name="titleTextColor" format="color" />
+        <!--标题栏标题文本大小-->
+        <attr name="titleTextSize" format="dimension" />
+        <!--标题栏标题文本-->
+        <attr name="titleText" format="string" />
+    </declare-styleable>
+
+    <!--FlowLayout流式布局-->
+    <declare-styleable name="FlowLayout">
+        <attr name="android:gravity" />
+        <attr name="android:maxLines" format="integer" />
+        <attr name="childHorizontalSpacing" format="dimension" />
+        <attr name="childVerticalSpacing" format="dimension" />
+        <attr name="maxNumber" format="integer" />
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/lib_base/src/main/res/values/colors.xml b/lib_base/src/main/res/values/colors.xml
new file mode 100644
index 0000000..e441b54
--- /dev/null
+++ b/lib_base/src/main/res/values/colors.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">@color/white</color>
+    <color name="colorPrimaryDark">@color/white</color>
+    <color name="colorAccent">#FF6121</color>
+
+    <color name="theme_color">#54eccb</color>
+    <color name="theme_bg">#EFEFEF</color>
+    <color name="purple_200">#FFBB86FC</color>
+    <color name="purple_500">#FF6200EE</color>
+    <color name="purple_700">#FF3700B3</color>
+    <color name="teal_200">#FF03DAC5</color>
+    <color name="teal_700">#FF018786</color>
+    <color name="black">#FF000000</color>
+
+    <color name="_333333">#333333</color>
+    <color name="_3700B3">#3700B3</color>
+    <color name="_4cd2f5">#4CD2F5</color>
+    <color name="_6200EE">#6200EE</color>
+    <color name="_666666">#666666</color>
+    <color name="_669900">#669900</color>
+    <color name="_797979">#797979</color>
+    <color name="_84749C">#84749C</color>
+    <color name="_999999">#999999</color>
+    <color name="_a0a0a0">#a0a0a0</color>
+    <color name="_cccccc">#cccccc</color>
+    <color name="_d8d8d8">#d8d8d8</color>
+    <color name="_e91e63">#e91e63</color>
+    <color name="_eeeeee">#eeeeee</color>
+    <color name="_f0f0f0">#f0f0f0</color>
+    <color name="_f5f5f5">#f5f5f5</color>
+    <color name="_ff4a57">#ff4a57</color>
+    <color name="_ffffff">#ffffff</color>
+
+
+</resources>
\ No newline at end of file
diff --git a/lib_base/src/main/res/values/dimens.xml b/lib_base/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..b288e41
--- /dev/null
+++ b/lib_base/src/main/res/values/dimens.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+
+    <dimen name="title_bar_height">48dp</dimen>
+
+</resources>
\ No newline at end of file
diff --git a/lib_base/src/main/res/values/ids.xml b/lib_base/src/main/res/values/ids.xml
new file mode 100644
index 0000000..477621e
--- /dev/null
+++ b/lib_base/src/main/res/values/ids.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="toolbar_lay" type="id"/>
+    <item name="tv_right" type="id"/>
+    <item name="iv_right" type="id"/>
+</resources>
\ No newline at end of file
diff --git a/lib_base/src/main/res/values/strings.xml b/lib_base/src/main/res/values/strings.xml
new file mode 100644
index 0000000..d9d9de6
--- /dev/null
+++ b/lib_base/src/main/res/values/strings.xml
@@ -0,0 +1,7 @@
+<resources>
+    <string name="list_is_empty">暂无数据</string>
+    <string name="response_error">网络连接异常</string>
+    <string name="network_error">网络连接异常</string>
+    <string name="request_time_out">网络请求超时</string>
+    <string name="request_web">加载中…</string>
+</resources>
\ No newline at end of file
diff --git a/lib_base/src/main/res/values/styles.xml b/lib_base/src/main/res/values/styles.xml
new file mode 100644
index 0000000..f11f745
--- /dev/null
+++ b/lib_base/src/main/res/values/styles.xml
@@ -0,0 +1,3 @@
+<resources>
+
+</resources>
diff --git a/lib_base/src/test/java/com/btpj/lib_base/ExampleUnitTest.kt b/lib_base/src/test/java/com/btpj/lib_base/ExampleUnitTest.kt
new file mode 100644
index 0000000..98b0796
--- /dev/null
+++ b/lib_base/src/test/java/com/btpj/lib_base/ExampleUnitTest.kt
@@ -0,0 +1,20 @@
+package com.btpj.lib_base
+
+import org.junit.Test
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+//        var str = CustomerEncryptUtil.decode("A1BDBDB9F3E6E6F8F8FCE7FBFAF1E7FDFFE7FCF1F3FBF9F9F9FB")
+//        print(str)
+//        var str2 = CustomerEncryptUtil.decode("488EE17C1EA2A84A769746DCEDF0DEB31193DC46B7FE825493652A380FDB1A89DD8A382A4D3BE001E0751F89BA444B5916D023C0F7D4A944DC4FD8A95809B758")
+//        print(str2)
+//        var list = mutableListOf<Int>(10, 20, 30)
+//        print("list contains="+list.contains(50)+" ")
+    }
+}
\ No newline at end of file
diff --git a/ninegridview/.gitignore b/ninegridview/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/ninegridview/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/ninegridview/build.gradle b/ninegridview/build.gradle
new file mode 100644
index 0000000..cc87e46
--- /dev/null
+++ b/ninegridview/build.gradle
@@ -0,0 +1,27 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 32
+
+    defaultConfig {
+        minSdkVersion 16
+        targetSdkVersion 32
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.annotation:annotation:1.2.0'
+    implementation 'com.github.chrisbanes.photoview:library:1.2.4'
+}
+
+//apply from: '../bintray.gradle'
\ No newline at end of file
diff --git a/ninegridview/proguard-rules.pro b/ninegridview/proguard-rules.pro
new file mode 100644
index 0000000..f727142
--- /dev/null
+++ b/ninegridview/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in E:\Android\SDK/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/ninegridview/src/main/AndroidManifest.xml b/ninegridview/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..8076e81
--- /dev/null
+++ b/ninegridview/src/main/AndroidManifest.xml
@@ -0,0 +1,15 @@
+<manifest
+    package="com.lzy.ninegrid"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+
+    <application>
+        <activity
+            android:name="com.lzy.ninegrid.preview.ImagePreviewActivity"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
+    </application>
+
+</manifest>
diff --git a/ninegridview/src/main/java/com/lzy/ninegrid/ImageInfo.java b/ninegridview/src/main/java/com/lzy/ninegrid/ImageInfo.java
new file mode 100644
index 0000000..bbf03f7
--- /dev/null
+++ b/ninegridview/src/main/java/com/lzy/ninegrid/ImageInfo.java
@@ -0,0 +1,86 @@
+package com.lzy.ninegrid;
+
+import java.io.Serializable;
+
+/**
+ * ================================================
+ * 作    者：廖子尧
+ * 版    本：1.0
+ * 创建日期：2016/3/21
+ * 描    述：
+ * 修订历史：
+ * ================================================
+ */
+public class ImageInfo implements Serializable {
+    public String thumbnailUrl;
+    public String bigImageUrl;
+    public int imageViewHeight;
+    public int imageViewWidth;
+    public int imageViewX;
+    public int imageViewY;
+
+    public String getThumbnailUrl() {
+        if (thumbnailUrl==null||thumbnailUrl.length()==0) {
+            if (bigImageUrl!=null&&bigImageUrl.length()>0) {
+                return bigImageUrl;
+            }
+        }
+        return thumbnailUrl;
+    }
+
+    public void setThumbnailUrl(String thumbnailUrl) {
+        this.thumbnailUrl = thumbnailUrl;
+    }
+
+    public String getBigImageUrl() {
+        return bigImageUrl;
+    }
+
+    public void setBigImageUrl(String bigImageUrl) {
+        this.bigImageUrl = bigImageUrl;
+    }
+
+    public int getImageViewHeight() {
+        return imageViewHeight;
+    }
+
+    public void setImageViewHeight(int imageViewHeight) {
+        this.imageViewHeight = imageViewHeight;
+    }
+
+    public int getImageViewWidth() {
+        return imageViewWidth;
+    }
+
+    public void setImageViewWidth(int imageViewWidth) {
+        this.imageViewWidth = imageViewWidth;
+    }
+
+    public int getImageViewX() {
+        return imageViewX;
+    }
+
+    public void setImageViewX(int imageViewX) {
+        this.imageViewX = imageViewX;
+    }
+
+    public int getImageViewY() {
+        return imageViewY;
+    }
+
+    public void setImageViewY(int imageViewY) {
+        this.imageViewY = imageViewY;
+    }
+
+    @Override
+    public String toString() {
+        return "ImageInfo{" +
+                "imageViewY=" + imageViewY +
+                ", imageViewX=" + imageViewX +
+                ", imageViewWidth=" + imageViewWidth +
+                ", imageViewHeight=" + imageViewHeight +
+                ", bigImageUrl='" + bigImageUrl + '\'' +
+                ", thumbnailUrl='" + thumbnailUrl + '\'' +
+                '}';
+    }
+}
diff --git a/ninegridview/src/main/java/com/lzy/ninegrid/NineGridView.java b/ninegridview/src/main/java/com/lzy/ninegrid/NineGridView.java
new file mode 100644
index 0000000..063e5a5
--- /dev/null
+++ b/ninegridview/src/main/java/com/lzy/ninegrid/NineGridView.java
@@ -0,0 +1,252 @@
+package com.lzy.ninegrid;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.util.TypedValue;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class NineGridView extends ViewGroup {
+
+    public static final int MODE_FILL = 0;          //填充模式，类似于微信
+    public static final int MODE_GRID = 1;          //网格模式，类似于QQ，4张图会 2X2布局
+
+    private static ImageLoader mImageLoader;        //全局的图片加载器(必须设置,否者不显示图片)
+
+    private int singleImageSize = 250;              // 单张图片时的最大大小,单位dp
+    private float singleImageRatio = 1.0f;          // 单张图片的宽高比(宽/高)
+    private int maxImageSize = 9;                   // 最大显示的图片数
+    private int gridSpacing = 3;                    // 宫格间距，单位dp
+    private int mode = MODE_FILL;                   // 默认使用fill模式
+
+    private int columnCount;    // 列数
+    private int rowCount;       // 行数
+    private int gridWidth;      // 宫格宽度
+    private int gridHeight;     // 宫格高度
+
+    private List<ImageView> imageViews;
+    private List<ImageInfo> mImageInfo;
+    private NineGridViewAdapter mAdapter;
+
+    public NineGridView(Context context) {
+        this(context, null);
+    }
+
+    public NineGridView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public NineGridView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+
+        DisplayMetrics dm = context.getResources().getDisplayMetrics();
+        gridSpacing = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, gridSpacing, dm);
+        singleImageSize = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, singleImageSize, dm);
+
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.NineGridView);
+        gridSpacing = (int) a.getDimension(R.styleable.NineGridView_ngv_gridSpacing, gridSpacing);
+        singleImageSize = a.getDimensionPixelSize(R.styleable.NineGridView_ngv_singleImageSize, singleImageSize);
+        singleImageRatio = a.getFloat(R.styleable.NineGridView_ngv_singleImageRatio, singleImageRatio);
+        maxImageSize = a.getInt(R.styleable.NineGridView_ngv_maxSize, maxImageSize);
+        mode = a.getInt(R.styleable.NineGridView_ngv_mode, mode);
+        a.recycle();
+
+        imageViews = new ArrayList<>();
+    }
+
+    public void setColumnCount(int columnCount) {
+        this.columnCount = columnCount;
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        int width = MeasureSpec.getSize(widthMeasureSpec);
+        int height = 0;
+        int totalWidth = width - getPaddingLeft() - getPaddingRight();
+        if (mImageInfo != null && mImageInfo.size() > 0) {
+            if (mImageInfo.size() == 1) {
+                gridWidth = singleImageSize > totalWidth ? totalWidth : singleImageSize;
+                gridHeight = (int) (gridWidth / singleImageRatio);
+                //矫正图片显示区域大小，不允许超过最大显示范围
+                if (gridHeight > singleImageSize) {
+                    float ratio = singleImageSize * 1.0f / gridHeight;
+                    gridWidth = (int) (gridWidth * ratio);
+                    gridHeight = singleImageSize;
+                }
+            } else {
+                gridWidth = gridHeight = (totalWidth - gridSpacing * (columnCount - 1)) / columnCount;
+//                //这里无论是几张图片，宽高都按总宽度的 1/3
+//                gridWidth = gridHeight = (totalWidth - gridSpacing * 2) / 3;
+            }
+            width = gridWidth * columnCount + gridSpacing * (columnCount - 1) + getPaddingLeft() + getPaddingRight();
+            height = gridHeight * rowCount + gridSpacing * (rowCount - 1) + getPaddingTop() + getPaddingBottom();
+        }
+        setMeasuredDimension(width, height);
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        if (mImageInfo == null) return;
+        int childrenCount = mImageInfo.size();
+        for (int i = 0; i < childrenCount; i++) {
+            ImageView childrenView = (ImageView) getChildAt(i);
+            
+            int rowNum = i / columnCount;
+            int columnNum = i % columnCount;
+            int left = (gridWidth + gridSpacing) * columnNum + getPaddingLeft();
+            int top = (gridHeight + gridSpacing) * rowNum + getPaddingTop();
+            int right = left + gridWidth;
+            int bottom = top + gridHeight;
+            childrenView.layout(left, top, right, bottom);
+            
+            if (mImageLoader != null) {
+                if (mImageInfo.get(i).thumbnailUrl!=null&&mImageInfo.get(i).thumbnailUrl.length()>0) {
+                    mImageLoader.onDisplayImage(getContext(), childrenView, mImageInfo.get(i).thumbnailUrl);
+                }else{
+                    mImageLoader.onDisplayImage(getContext(), childrenView, mImageInfo.get(i).bigImageUrl);
+                }
+
+            }
+        }
+    }
+
+    /** 设置适配器 */
+    public void setAdapter(@NonNull NineGridViewAdapter adapter) {
+        mAdapter = adapter;
+        List<ImageInfo> imageInfo = adapter.getImageInfo();
+
+        if (imageInfo == null || imageInfo.isEmpty()) {
+            setVisibility(GONE);
+            return;
+        } else {
+            setVisibility(VISIBLE);
+        }
+
+        int imageCount = imageInfo.size();
+        if (maxImageSize > 0 && imageCount > maxImageSize) {
+            imageInfo = imageInfo.subList(0, maxImageSize);
+            imageCount = imageInfo.size();   //再次获取图片数量
+        }
+        if(columnCount == 0){
+            columnCount = 3;
+        }
+        //默认是3列显示，行数根据图片的数量决定
+        rowCount = imageCount / columnCount + (imageCount % columnCount == 0 ? 0 : 1);
+//        columnCount = 3;
+        //grid模式下，显示4张使用2X2模式
+        if (mode == MODE_GRID) {
+            if (imageCount == 4) {
+                rowCount = 2;
+                columnCount = 2;
+            }
+        }
+
+        //保证View的复用，避免重复创建
+        if (mImageInfo == null) {
+            for (int i = 0; i < imageCount; i++) {
+                ImageView iv = getImageView(i);
+                if (iv == null) return;
+                addView(iv, generateDefaultLayoutParams());
+            }
+        } else {
+            int oldViewCount = mImageInfo.size();
+            int newViewCount = imageCount;
+            if (oldViewCount > newViewCount) {
+                removeViews(newViewCount, oldViewCount - newViewCount);
+            } else if (oldViewCount < newViewCount) {
+                for (int i = oldViewCount; i < newViewCount; i++) {
+                    ImageView iv = getImageView(i);
+                    if (iv == null) return;
+                    addView(iv, generateDefaultLayoutParams());
+                }
+            }
+        }
+        //修改最后一个条目，决定是否显示更多
+        if (adapter.getImageInfo().size() > maxImageSize) {
+            View child = getChildAt(maxImageSize - 1);
+            if (child instanceof NineGridViewWrapper) {
+                NineGridViewWrapper imageView = (NineGridViewWrapper) child;
+                imageView.setMoreNum(adapter.getImageInfo().size() - maxImageSize);
+            }
+        }
+        mImageInfo = imageInfo;
+        requestLayout();
+    }
+
+    /** 获得 ImageView 保证了 ImageView 的重用 */
+    private ImageView getImageView(final int position) {
+        ImageView imageView;
+        if (position < imageViews.size()) {
+            imageView = imageViews.get(position);
+        } else {
+            imageView = mAdapter.generateImageView(getContext());
+            imageView.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    mAdapter.onImageItemClick(getContext(), NineGridView.this, position, mAdapter.getImageInfo());
+                }
+            });
+            imageViews.add(imageView);
+        }
+        return imageView;
+    }
+
+    /** 设置宫格间距 */
+    public void setGridSpacing(int spacing) {
+        gridSpacing = spacing;
+    }
+
+    /** 设置只有一张图片时的宽 */
+    public void setSingleImageSize(int maxImageSize) {
+        singleImageSize = maxImageSize;
+    }
+
+    /** 设置只有一张图片时的宽高比 */
+    public void setSingleImageRatio(float ratio) {
+        singleImageRatio = ratio;
+    }
+
+    /** 设置最大图片数 */
+    public void setMaxSize(int maxSize) {
+        maxImageSize = maxSize;
+    }
+
+    public int getMaxSize() {
+        return maxImageSize;
+    }
+
+    public static void setImageLoader(ImageLoader imageLoader) {
+        mImageLoader = imageLoader;
+    }
+
+    public static ImageLoader getImageLoader() {
+        return mImageLoader;
+    }
+
+    public interface ImageLoader {
+        /**
+         * 需要子类实现该方法，以确定如何加载和显示图片,并且设置给NineGridView
+         *
+         * @param context   上下文
+         * @param imageView 需要展示图片的ImageView
+         * @param url       图片地址
+         */
+        void onDisplayImage(Context context, ImageView imageView, String url);
+
+        /**
+         * @param url 图片的地址
+         * @return 当前框架的本地缓存图片
+         */
+        Bitmap getCacheImage(String url);
+    }
+}
diff --git a/ninegridview/src/main/java/com/lzy/ninegrid/NineGridViewAdapter.java b/ninegridview/src/main/java/com/lzy/ninegrid/NineGridViewAdapter.java
new file mode 100644
index 0000000..378aad9
--- /dev/null
+++ b/ninegridview/src/main/java/com/lzy/ninegrid/NineGridViewAdapter.java
@@ -0,0 +1,51 @@
+package com.lzy.ninegrid;
+
+import android.content.Context;
+import android.widget.ImageView;
+
+import java.io.Serializable;
+import java.util.List;
+
+public abstract class NineGridViewAdapter implements Serializable {
+
+    protected Context context;
+    private List<ImageInfo> imageInfo;
+
+    public NineGridViewAdapter(Context context, List<ImageInfo> imageInfo) {
+        this.context = context;
+        this.imageInfo = imageInfo;
+    }
+
+    /**
+     * 如果要实现图片点击的逻辑，重写此方法即可
+     *
+     * @param context      上下文
+     * @param nineGridView 九宫格控件
+     * @param index        当前点击图片的的索引
+     * @param imageInfo    图片地址的数据集合
+     */
+    protected void onImageItemClick(Context context, NineGridView nineGridView, int index, List<ImageInfo> imageInfo) {
+    }
+
+    /**
+     * 生成ImageView容器的方式，默认使用NineGridImageViewWrapper类，即点击图片后，图片会有蒙板效果
+     * 如果需要自定义图片展示效果，重写此方法即可
+     *
+     * @param context 上下文
+     * @return 生成的 ImageView
+     */
+    protected ImageView generateImageView(Context context) {
+        NineGridViewWrapper imageView = new NineGridViewWrapper(context);
+        imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
+        imageView.setImageResource(R.drawable.ic_default_color);
+        return imageView;
+    }
+
+    public List<ImageInfo> getImageInfo() {
+        return imageInfo;
+    }
+
+    public void setImageInfoList(List<ImageInfo> imageInfo) {
+        this.imageInfo = imageInfo;
+    }
+}
\ No newline at end of file
diff --git a/ninegridview/src/main/java/com/lzy/ninegrid/NineGridViewWrapper.java b/ninegridview/src/main/java/com/lzy/ninegrid/NineGridViewWrapper.java
new file mode 100644
index 0000000..1d81667
--- /dev/null
+++ b/ninegridview/src/main/java/com/lzy/ninegrid/NineGridViewWrapper.java
@@ -0,0 +1,138 @@
+package com.lzy.ninegrid;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.text.TextPaint;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.MotionEvent;
+import android.widget.ImageView;
+
+import androidx.core.view.ViewCompat;
+
+public class NineGridViewWrapper extends ImageView {
+
+    private int moreNum = 0;              //显示更多的数量
+    private int maskColor = 0x88000000;   //默认的遮盖颜色
+    private float textSize = 35;          //显示文字的大小单位sp
+    private int textColor = 0xFFFFFFFF;   //显示文字的颜色
+
+    private TextPaint textPaint;              //文字的画笔
+    private String msg = "";                  //要绘制的文字
+
+    public NineGridViewWrapper(Context context) {
+        this(context, null);
+    }
+
+    public NineGridViewWrapper(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public NineGridViewWrapper(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+
+        //转化单位
+        textSize = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, textSize, getContext().getResources().getDisplayMetrics());
+
+        textPaint = new TextPaint();
+        textPaint.setTextAlign(Paint.Align.CENTER);  //文字居中对齐
+        textPaint.setAntiAlias(true);                //抗锯齿
+        textPaint.setTextSize(textSize);             //设置文字大小
+        textPaint.setColor(textColor);               //设置文字颜色
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        if (moreNum > 0) {
+            canvas.drawColor(maskColor);
+            float baseY = getHeight() / 2 - (textPaint.ascent() + textPaint.descent()) / 2;
+            canvas.drawText(msg, getWidth() / 2, baseY, textPaint);
+        }
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                Drawable drawable = getDrawable();
+                if (drawable != null) {
+                    /**
+                     * 默认情况下，所有的从同一资源（R.drawable.XXX）加载来的drawable实例都共享一个共用的状态，
+                     * 如果你更改一个实例的状态，其他所有的实例都会收到相同的通知。
+                     * 使用使 mutate 可以让这个drawable变得状态不定。这个操作不能还原（变为不定后就不能变为原来的状态）。
+                     * 一个状态不定的drawable可以保证它不与其他任何一个drawabe共享它的状态。
+                     * 此处应该是要使用的 mutate()，但是在部分手机上会出现点击后变白的现象，所以没有使用
+                     * 目前这种解决方案没有问题
+                     */
+//                    drawable.mutate().setColorFilter(Color.GRAY, PorterDuff.Mode.MULTIPLY);
+                    drawable.setColorFilter(Color.GRAY, PorterDuff.Mode.MULTIPLY);
+                    ViewCompat.postInvalidateOnAnimation(this);
+                }
+                break;
+            case MotionEvent.ACTION_MOVE:
+                break;
+            case MotionEvent.ACTION_CANCEL:
+            case MotionEvent.ACTION_UP:
+                Drawable drawableUp = getDrawable();
+                if (drawableUp != null) {
+//                    drawableUp.mutate().clearColorFilter();
+                    drawableUp.clearColorFilter();
+                    ViewCompat.postInvalidateOnAnimation(this);
+                }
+                break;
+        }
+
+        return super.onTouchEvent(event);
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        setImageDrawable(null);
+    }
+
+    public int getMoreNum() {
+        return moreNum;
+    }
+
+    public void setMoreNum(int moreNum) {
+        this.moreNum = moreNum;
+        msg = "+" + moreNum;
+        invalidate();
+    }
+
+    public int getMaskColor() {
+        return maskColor;
+    }
+
+    public void setMaskColor(int maskColor) {
+        this.maskColor = maskColor;
+        invalidate();
+    }
+
+    public float getTextSize() {
+        return textSize;
+    }
+
+    public void setTextSize(float textSize) {
+        this.textSize = textSize;
+        textPaint.setTextSize(textSize);
+        invalidate();
+    }
+
+    public int getTextColor() {
+        return textColor;
+    }
+
+    public void setTextColor(int textColor) {
+        this.textColor = textColor;
+        textPaint.setColor(textColor);
+        invalidate();
+    }
+}
\ No newline at end of file
diff --git a/ninegridview/src/main/java/com/lzy/ninegrid/preview/HackyViewPager.java b/ninegridview/src/main/java/com/lzy/ninegrid/preview/HackyViewPager.java
new file mode 100644
index 0000000..91208ed
--- /dev/null
+++ b/ninegridview/src/main/java/com/lzy/ninegrid/preview/HackyViewPager.java
@@ -0,0 +1,39 @@
+package com.lzy.ninegrid.preview;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+
+import androidx.viewpager.widget.ViewPager;
+
+/** 修复图片在ViewPager控件中缩放报错的BUG */
+public class HackyViewPager extends ViewPager {
+
+    public HackyViewPager(Context context) {
+        super(context);
+    }
+
+    public HackyViewPager(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent ev) {
+        try {
+            return super.onTouchEvent(ev);
+        } catch (IllegalArgumentException ex) {
+            ex.printStackTrace();
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        try {
+            return super.onInterceptTouchEvent(ev);
+        } catch (IllegalArgumentException ex) {
+            ex.printStackTrace();
+        }
+        return false;
+    }
+}
diff --git a/ninegridview/src/main/java/com/lzy/ninegrid/preview/ImagePreviewActivity.java b/ninegridview/src/main/java/com/lzy/ninegrid/preview/ImagePreviewActivity.java
new file mode 100644
index 0000000..dc1f4c3
--- /dev/null
+++ b/ninegridview/src/main/java/com/lzy/ninegrid/preview/ImagePreviewActivity.java
@@ -0,0 +1,233 @@
+package com.lzy.ninegrid.preview;
+
+import android.animation.Animator;
+import android.animation.ValueAnimator;
+import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.util.DisplayMetrics;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.viewpager.widget.ViewPager;
+
+import com.lzy.ninegrid.ImageInfo;
+import com.lzy.ninegrid.R;
+
+import java.util.List;
+
+public class ImagePreviewActivity extends Activity implements ViewTreeObserver.OnPreDrawListener {
+
+    public static final String IMAGE_INFO = "IMAGE_INFO";
+    public static final String CURRENT_ITEM = "CURRENT_ITEM";
+    public static final int ANIMATE_DURATION = 200;
+
+    private RelativeLayout rootView;
+
+    private ImagePreviewAdapter imagePreviewAdapter;
+    private List<ImageInfo> imageInfo;
+    private int currentItem;
+    private int imageHeight;
+    private int imageWidth;
+    private int screenWidth;
+    private int screenHeight;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_preview);
+
+        ViewPager viewPager = (ViewPager) findViewById(R.id.viewPager);
+        final TextView tv_pager = (TextView) findViewById(R.id.tv_pager);
+        rootView = (RelativeLayout) findViewById(R.id.rootView);
+
+        DisplayMetrics metric = new DisplayMetrics();
+        getWindowManager().getDefaultDisplay().getMetrics(metric);
+        screenWidth = metric.widthPixels;
+        screenHeight = metric.heightPixels;
+
+        Intent intent = getIntent();
+        imageInfo = (List<ImageInfo>) intent.getSerializableExtra(IMAGE_INFO);
+        currentItem = intent.getIntExtra(CURRENT_ITEM, 0);
+
+        imagePreviewAdapter = new ImagePreviewAdapter(this, imageInfo);
+        viewPager.setAdapter(imagePreviewAdapter);
+        viewPager.setCurrentItem(currentItem);
+        viewPager.getViewTreeObserver().addOnPreDrawListener(this);
+        viewPager.addOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
+            @Override
+            public void onPageSelected(int position) {
+                currentItem = position;
+                tv_pager.setText(String.format(getString(R.string.select), currentItem + 1, imageInfo.size()));
+            }
+        });
+        tv_pager.setText(String.format(getString(R.string.select), currentItem + 1, imageInfo.size()));
+    }
+
+    @Override
+    public void onBackPressed() {
+        finishActivityAnim();
+    }
+
+    /** 绘制前开始动画 */
+    @Override
+    public boolean onPreDraw() {
+        rootView.getViewTreeObserver().removeOnPreDrawListener(this);
+        final View view = imagePreviewAdapter.getPrimaryItem();
+        final ImageView imageView = imagePreviewAdapter.getPrimaryImageView();
+        computeImageWidthAndHeight(imageView);
+
+        final ImageInfo imageData = imageInfo.get(currentItem);
+        final float vx = imageData.imageViewWidth * 1.0f / imageWidth;
+        final float vy = imageData.imageViewHeight * 1.0f / imageHeight;
+        ValueAnimator valueAnimator = ValueAnimator.ofFloat(0, 1.0f);
+        valueAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                long duration = animation.getDuration();
+                long playTime = animation.getCurrentPlayTime();
+                float fraction = duration > 0 ? (float) playTime / duration : 1f;
+                if (fraction > 1) fraction = 1;
+                view.setTranslationX(evaluateInt(fraction, imageData.imageViewX + imageData.imageViewWidth / 2 - imageView.getWidth() / 2, 0));
+                view.setTranslationY(evaluateInt(fraction, imageData.imageViewY + imageData.imageViewHeight / 2 - imageView.getHeight() / 2, 0));
+                view.setScaleX(evaluateFloat(fraction, vx, 1));
+                view.setScaleY(evaluateFloat(fraction, vy, 1));
+                view.setAlpha(fraction);
+                rootView.setBackgroundColor(evaluateArgb(fraction, Color.TRANSPARENT, Color.BLACK));
+            }
+        });
+        addIntoListener(valueAnimator);
+        valueAnimator.setDuration(ANIMATE_DURATION);
+        valueAnimator.start();
+        return true;
+    }
+
+    /** activity的退场动画 */
+    public void finishActivityAnim() {
+        final View view = imagePreviewAdapter.getPrimaryItem();
+        final ImageView imageView = imagePreviewAdapter.getPrimaryImageView();
+        computeImageWidthAndHeight(imageView);
+
+        final ImageInfo imageData = imageInfo.get(currentItem);
+        final float vx = imageData.imageViewWidth * 1.0f / imageWidth;
+        final float vy = imageData.imageViewHeight * 1.0f / imageHeight;
+        final ValueAnimator valueAnimator = ValueAnimator.ofFloat(0, 1.0f);
+        valueAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                long duration = animation.getDuration();
+                long playTime = animation.getCurrentPlayTime();
+                float fraction = duration > 0 ? (float) playTime / duration : 1f;
+                if (fraction > 1) fraction = 1;
+                view.setTranslationX(evaluateInt(fraction, 0, imageData.imageViewX + imageData.imageViewWidth / 2 - imageView.getWidth() / 2));
+                view.setTranslationY(evaluateInt(fraction, 0, imageData.imageViewY + imageData.imageViewHeight / 2 - imageView.getHeight() / 2));
+                view.setScaleX(evaluateFloat(fraction, 1, vx));
+                view.setScaleY(evaluateFloat(fraction, 1, vy));
+                view.setAlpha(1 - fraction);
+                rootView.setBackgroundColor(evaluateArgb(fraction, Color.BLACK, Color.TRANSPARENT));
+            }
+        });
+        addOutListener(valueAnimator);
+        valueAnimator.setDuration(ANIMATE_DURATION);
+        valueAnimator.start();
+    }
+
+    /** 计算图片的宽高 */
+    private void computeImageWidthAndHeight(ImageView imageView) {
+
+        // 获取真实大小
+        Drawable drawable = imageView.getDrawable();
+        int intrinsicHeight = drawable.getIntrinsicHeight();
+        int intrinsicWidth = drawable.getIntrinsicWidth();
+        // 计算出与屏幕的比例，用于比较以宽的比例为准还是高的比例为准，因为很多时候不是高度没充满，就是宽度没充满
+        float h = screenHeight * 1.0f / intrinsicHeight;
+        float w = screenWidth * 1.0f / intrinsicWidth;
+        if (h > w) h = w;
+        else w = h;
+
+        // 得出当宽高至少有一个充满的时候图片对应的宽高
+        imageHeight = (int) (intrinsicHeight * h);
+        imageWidth = (int) (intrinsicWidth * w);
+    }
+
+    /** 进场动画过程监听 */
+    private void addIntoListener(ValueAnimator valueAnimator) {
+        valueAnimator.addListener(new Animator.AnimatorListener() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+                rootView.setBackgroundColor(0x0);
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animation) {
+            }
+
+            @Override
+            public void onAnimationRepeat(Animator animation) {
+            }
+        });
+    }
+
+    /** 退场动画过程监听 */
+    private void addOutListener(ValueAnimator valueAnimator) {
+        valueAnimator.addListener(new Animator.AnimatorListener() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+                rootView.setBackgroundColor(0x0);
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                finish();
+                overridePendingTransition(0, 0);
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animation) {
+            }
+
+            @Override
+            public void onAnimationRepeat(Animator animation) {
+            }
+        });
+    }
+
+    /** Integer 估值器 */
+    public Integer evaluateInt(float fraction, Integer startValue, Integer endValue) {
+        int startInt = startValue;
+        return (int) (startInt + fraction * (endValue - startInt));
+    }
+
+    /** Float 估值器 */
+    public Float evaluateFloat(float fraction, Number startValue, Number endValue) {
+        float startFloat = startValue.floatValue();
+        return startFloat + fraction * (endValue.floatValue() - startFloat);
+    }
+
+    /** Argb 估值器 */
+    public int evaluateArgb(float fraction, int startValue, int endValue) {
+        int startA = (startValue >> 24) & 0xff;
+        int startR = (startValue >> 16) & 0xff;
+        int startG = (startValue >> 8) & 0xff;
+        int startB = startValue & 0xff;
+
+        int endA = (endValue >> 24) & 0xff;
+        int endR = (endValue >> 16) & 0xff;
+        int endG = (endValue >> 8) & 0xff;
+        int endB = endValue & 0xff;
+
+        return (startA + (int) (fraction * (endA - startA))) << 24//
+                | (startR + (int) (fraction * (endR - startR))) << 16//
+                | (startG + (int) (fraction * (endG - startG))) << 8//
+                | (startB + (int) (fraction * (endB - startB)));
+    }
+}
diff --git a/ninegridview/src/main/java/com/lzy/ninegrid/preview/ImagePreviewAdapter.java b/ninegridview/src/main/java/com/lzy/ninegrid/preview/ImagePreviewAdapter.java
new file mode 100644
index 0000000..3fc280e
--- /dev/null
+++ b/ninegridview/src/main/java/com/lzy/ninegrid/preview/ImagePreviewAdapter.java
@@ -0,0 +1,128 @@
+package com.lzy.ninegrid.preview;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+
+import androidx.annotation.NonNull;
+import androidx.viewpager.widget.PagerAdapter;
+
+import com.lzy.ninegrid.ImageInfo;
+import com.lzy.ninegrid.NineGridView;
+import com.lzy.ninegrid.R;
+
+import java.util.List;
+
+import uk.co.senab.photoview.PhotoView;
+import uk.co.senab.photoview.PhotoViewAttacher;
+
+/**
+ * ================================================
+ * 作    者：廖子尧
+ * 版    本：1.0
+ * 创建日期：2016/3/21
+ * 描    述：
+ * 修订历史：
+ * ================================================
+ */
+public class ImagePreviewAdapter extends PagerAdapter implements PhotoViewAttacher.OnPhotoTapListener {
+
+    private List<ImageInfo> imageInfo;
+    private Context context;
+    private View currentView;
+
+    public ImagePreviewAdapter(Context context, @NonNull List<ImageInfo> imageInfo) {
+        super();
+        this.imageInfo = imageInfo;
+        this.context = context;
+    }
+
+    @Override
+    public int getCount() {
+        return imageInfo.size();
+    }
+
+    @Override
+    public boolean isViewFromObject(View view, Object object) {
+        return view == object;
+    }
+
+    @Override
+    public void setPrimaryItem(ViewGroup container, int position, Object object) {
+        super.setPrimaryItem(container, position, object);
+        currentView = (View) object;
+    }
+
+    public View getPrimaryItem() {
+        return currentView;
+    }
+
+    public ImageView getPrimaryImageView() {
+        return (ImageView) currentView.findViewById(R.id.pv);
+    }
+
+    @Override
+    public Object instantiateItem(ViewGroup container, int position) {
+        View view = LayoutInflater.from(context).inflate(R.layout.item_photoview, container, false);
+        final ProgressBar pb = (ProgressBar) view.findViewById(R.id.pb);
+        final PhotoView imageView = (PhotoView) view.findViewById(R.id.pv);
+
+        ImageInfo info = this.imageInfo.get(position);
+        imageView.setOnPhotoTapListener(this);
+        showExcessPic(info, imageView);
+
+        //如果需要加载的loading,需要自己改写,不能使用这个方法
+        NineGridView.getImageLoader().onDisplayImage(view.getContext(), imageView, info.bigImageUrl);
+
+//        pb.setVisibility(View.VISIBLE);
+//        Glide.with(context).load(info.bigImageUrl)//
+//                .placeholder(R.drawable.ic_default_image)//
+//                .error(R.drawable.ic_default_image)//
+//                .diskCacheStrategy(DiskCacheStrategy.ALL)//
+//                .listener(new RequestListener<String, GlideDrawable>() {
+//                    @Override
+//                    public boolean onException(Exception e, String model, Target<GlideDrawable> target, boolean isFirstResource) {
+//                        pb.setVisibility(View.GONE);
+//                        return false;
+//                    }
+//
+//                    @Override
+//                    public boolean onResourceReady(GlideDrawable resource, String model, Target<GlideDrawable> target, boolean isFromMemoryCache, boolean isFirstResource) {
+//                        pb.setVisibility(View.GONE);
+//                        return false;
+//                    }
+//                }).into(imageView);
+
+        container.addView(view);
+        return view;
+    }
+
+    /** 展示过度图片 */
+    private void showExcessPic(ImageInfo imageInfo, PhotoView imageView) {
+        //先获取大图的缓存图片
+        Bitmap cacheImage = NineGridView.getImageLoader().getCacheImage(imageInfo.bigImageUrl);
+        //如果大图的缓存不存在,在获取小图的缓存
+        if (cacheImage == null) cacheImage = NineGridView.getImageLoader().getCacheImage(imageInfo.thumbnailUrl);
+        //如果没有任何缓存,使用默认图片,否者使用缓存
+        if (cacheImage == null) {
+            imageView.setImageResource(R.drawable.ic_default_color);
+        } else {
+            imageView.setImageBitmap(cacheImage);
+        }
+    }
+
+    @Override
+    public void destroyItem(ViewGroup container, int position, Object object) {
+        container.removeView((View) object);
+    }
+
+    /** 单击屏幕关闭 */
+    @Override
+    public void onPhotoTap(View view, float x, float y) {
+        ((ImagePreviewActivity) context).finishActivityAnim();
+    }
+}
\ No newline at end of file
diff --git a/ninegridview/src/main/java/com/lzy/ninegrid/preview/NineGridViewClickAdapter.java b/ninegridview/src/main/java/com/lzy/ninegrid/preview/NineGridViewClickAdapter.java
new file mode 100644
index 0000000..d50f9d4
--- /dev/null
+++ b/ninegridview/src/main/java/com/lzy/ninegrid/preview/NineGridViewClickAdapter.java
@@ -0,0 +1,77 @@
+package com.lzy.ninegrid.preview;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import com.lzy.ninegrid.ImageInfo;
+import com.lzy.ninegrid.NineGridView;
+import com.lzy.ninegrid.NineGridViewAdapter;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * ================================================
+ * 作    者：廖子尧
+ * 版    本：1.0
+ * 创建日期：2016/3/21
+ * 描    述：
+ * 修订历史：
+ * ================================================
+ */
+public class NineGridViewClickAdapter extends NineGridViewAdapter {
+
+    private int statusHeight;
+
+    public NineGridViewClickAdapter(Context context, List<ImageInfo> imageInfo) {
+        super(context, imageInfo);
+        statusHeight = getStatusHeight(context);
+    }
+
+    @Override
+    protected void onImageItemClick(Context context, NineGridView nineGridView, int index, List<ImageInfo> imageInfo) {
+        for (int i = 0; i < imageInfo.size(); i++) {
+            ImageInfo info = imageInfo.get(i);
+            View imageView;
+            if (i < nineGridView.getMaxSize()) {
+                imageView = nineGridView.getChildAt(i);
+            } else {
+                //如果图片的数量大于显示的数量，则超过部分的返回动画统一退回到最后一个图片的位置
+                imageView = nineGridView.getChildAt(nineGridView.getMaxSize() - 1);
+            }
+            info.imageViewWidth = imageView.getWidth();
+            info.imageViewHeight = imageView.getHeight();
+            int[] points = new int[2];
+            imageView.getLocationInWindow(points);
+            info.imageViewX = points[0];
+            info.imageViewY = points[1] - statusHeight;
+        }
+
+        Intent intent = new Intent(context, ImagePreviewActivity.class);
+        Bundle bundle = new Bundle();
+        bundle.putSerializable(ImagePreviewActivity.IMAGE_INFO, (Serializable) imageInfo);
+        bundle.putInt(ImagePreviewActivity.CURRENT_ITEM, index);
+        intent.putExtras(bundle);
+        context.startActivity(intent);
+        ((Activity) context).overridePendingTransition(0, 0);
+    }
+
+    /**
+     * 获得状态栏的高度
+     */
+    public int getStatusHeight(Context context) {
+        int statusHeight = -1;
+        try {
+            Class<?> clazz = Class.forName("com.android.internal.R$dimen");
+            Object object = clazz.newInstance();
+            int height = Integer.parseInt(clazz.getField("status_bar_height").get(object).toString());
+            statusHeight = context.getResources().getDimensionPixelSize(height);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return statusHeight;
+    }
+}
diff --git a/ninegridview/src/main/res/drawable/ic_default_color.xml b/ninegridview/src/main/res/drawable/ic_default_color.xml
new file mode 100644
index 0000000..173d436
--- /dev/null
+++ b/ninegridview/src/main/res/drawable/ic_default_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="@color/ic_default_bg_color"/>
+</shape>
\ No newline at end of file
diff --git a/ninegridview/src/main/res/layout/activity_preview.xml b/ninegridview/src/main/res/layout/activity_preview.xml
new file mode 100644
index 0000000..bb1df95
--- /dev/null
+++ b/ninegridview/src/main/res/layout/activity_preview.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    android:id="@+id/rootView"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.lzy.ninegrid.preview.HackyViewPager
+        android:id="@+id/viewPager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <TextView
+        android:id="@+id/tv_pager"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="20dp"
+        android:text="1/4"
+        android:textColor="#ffffff"
+        android:textSize="20sp"/>
+</RelativeLayout>
diff --git a/ninegridview/src/main/res/layout/item_photoview.xml b/ninegridview/src/main/res/layout/item_photoview.xml
new file mode 100644
index 0000000..43e8114
--- /dev/null
+++ b/ninegridview/src/main/res/layout/item_photoview.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
+
+    <uk.co.senab.photoview.PhotoView
+        android:id="@+id/pv"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <ProgressBar
+        android:id="@+id/pb"
+        style="@style/Widget.AppCompat.ProgressBar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="gone"/>
+</FrameLayout>
diff --git a/ninegridview/src/main/res/values/attrs.xml b/ninegridview/src/main/res/values/attrs.xml
new file mode 100644
index 0000000..eb3a84f
--- /dev/null
+++ b/ninegridview/src/main/res/values/attrs.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="NineGridView">
+        <attr name="ngv_singleImageSize" format="dimension"/>
+        <attr name="ngv_singleImageRatio" format="float"/>
+        <attr name="ngv_gridSpacing" format="dimension"/>
+        <attr name="ngv_maxSize" format="integer"/>
+        <attr name="ngv_mode" format="enum">
+            <enum name="fill" value="0"/>
+            <enum name="grid" value="1"/>
+        </attr>
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/ninegridview/src/main/res/values/colors.xml b/ninegridview/src/main/res/values/colors.xml
new file mode 100644
index 0000000..78b6e9b
--- /dev/null
+++ b/ninegridview/src/main/res/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_default_bg_color">#33000000</color>
+</resources>
\ No newline at end of file
diff --git a/ninegridview/src/main/res/values/strings.xml b/ninegridview/src/main/res/values/strings.xml
new file mode 100644
index 0000000..4a1c152
--- /dev/null
+++ b/ninegridview/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="select">%1$s/%2$s</string>
+</resources>
\ No newline at end of file
diff --git a/rsalibrary/.gitignore b/rsalibrary/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/rsalibrary/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/rsalibrary/build.gradle b/rsalibrary/build.gradle
new file mode 100644
index 0000000..6196d7b
--- /dev/null
+++ b/rsalibrary/build.gradle
@@ -0,0 +1,30 @@
+apply plugin: 'com.android.library'
+android {
+  compileSdkVersion rootProject.compileSdkVersion
+
+  defaultConfig {
+    minSdkVersion rootProject.minSdkVersion
+    targetSdkVersion rootProject.targetSdkVersion
+
+      testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+  }
+//  buildTypes {
+//    release {
+//      minifyEnabled false
+//      proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+//    }
+//  }
+}
+task makeJar(type: Copy) {
+  delete 'build/libs/rsalibrary.jar' //删除已经存在的jar包
+  from('build/intermediates/bundles/debug/')//从该目录下加载要打包的文件
+  into('build/libs/')//jar包的保存目录
+  include('classes.jar')//设置过滤，只打包classes文件
+  rename('classes.jar', 'rsalibrary.jar')//重命名，mylibrary.jar 根据自己的需求设置
+}
+makeJar.dependsOn(build)
+dependencies {
+  implementation fileTree(dir: 'libs', include: ['*.jar'])
+  androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+  testImplementation 'junit:junit:4.13.2'
+}
diff --git a/rsalibrary/proguard-rules.pro b/rsalibrary/proguard-rules.pro
new file mode 100644
index 0000000..750fd19
--- /dev/null
+++ b/rsalibrary/proguard-rules.pro
@@ -0,0 +1,25 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\Users\liqy\AppData\Local\Android\Sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/rsalibrary/src/androidTest/java/com/baileren/rsalibrary/ExampleInstrumentedTest.java b/rsalibrary/src/androidTest/java/com/baileren/rsalibrary/ExampleInstrumentedTest.java
new file mode 100644
index 0000000..3a716d7
--- /dev/null
+++ b/rsalibrary/src/androidTest/java/com/baileren/rsalibrary/ExampleInstrumentedTest.java
@@ -0,0 +1,24 @@
+package com.baileren.rsalibrary;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumentation 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.baileren.rsalibrary.test", appContext.getPackageName());
+  }
+}
diff --git a/rsalibrary/src/main/AndroidManifest.xml b/rsalibrary/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..c17a3ec
--- /dev/null
+++ b/rsalibrary/src/main/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+
+    package="com.baileren.rsalibrary"
+>
+
+  <application android:allowBackup="true"
+      android:label="@string/app_name"
+      android:supportsRtl="true"
+  >
+
+  </application>
+
+</manifest>
diff --git a/rsalibrary/src/main/java/com/baileren/rsalibrary/AESCipherStrategy.java b/rsalibrary/src/main/java/com/baileren/rsalibrary/AESCipherStrategy.java
new file mode 100644
index 0000000..cd9a903
--- /dev/null
+++ b/rsalibrary/src/main/java/com/baileren/rsalibrary/AESCipherStrategy.java
@@ -0,0 +1,222 @@
+package com.baileren.rsalibrary;
+
+import java.io.UnsupportedEncodingException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+
+/**
+ * Author :nanfeifei
+ * DATA : 2017-12-05
+ * DES :
+ * Android端的加密思路需要4步：
+ * 1.生成AES密钥；
+ * 2.使用RSA公钥加密刚刚生成的AES密钥；
+ * 3.再使用第1步生成的AES密钥，通过AES加密需要提交给服务端的数据；
+ * 4.将第2与第3生成的内容传给服务端。
+ *
+ * JAVA服务端的解密思路只需3步：
+ * 1.获取到客户端传过来的AES密钥密文和内容密文；
+ * 2.使用RSA私钥解密从客户端拿到的AES密钥密文；
+ * 3.再使用第2步解密出来的明文密钥，通过AES解密内容的密文。
+ */
+
+public class AESCipherStrategy {
+    // /** 算法/模式/填充 **/ECB模式可改为CBC或者更安全，
+    private static final String CipherMode = "AES/ECB/ISO10126Padding";
+    // private static final String CipherMode = "AES";
+
+    /**
+     * 生成一个AES密钥对象
+     *
+     * @return
+     */
+    public static SecretKeySpec generateKey() {
+        try {
+            KeyGenerator kgen = KeyGenerator.getInstance("AES");
+            kgen.init(128, new SecureRandom());  //256的长度更佳
+            SecretKey secretKey = kgen.generateKey();
+            byte[] enCodeFormat = secretKey.getEncoded();
+            SecretKeySpec key = new SecretKeySpec(enCodeFormat, "AES");
+            return key;
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 生成一个AES密钥字符串
+     *
+     * @return
+     */
+    public static String generateKeyString() {
+        return byte2hex(generateKey().getEncoded());
+    }
+
+    /**
+     * 加密字节数据
+     *
+     * @param content
+     * @param key
+     * @return
+     */
+    public static byte[] encrypt(byte[] content, byte[] key) {
+        try {
+            Cipher cipher = Cipher.getInstance(CipherMode);
+            cipher.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(key, "AES"));
+            byte[] result = cipher.doFinal(content);
+            return result;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 通过byte[]类型的密钥加密String
+     *
+     * @param content
+     * @param key
+     * @return 16进制密文字符串
+     */
+    public static String encrypt(String content, byte[] key) {
+        try {
+            Cipher cipher = Cipher.getInstance(CipherMode);
+            cipher.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(key, "AES"));
+            byte[] data = cipher.doFinal(content.getBytes("UTF-8"));
+            String result = byte2hex(data);
+            return result;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 通过String类型的密钥加密String
+     *
+     * @param content
+     * @param key
+     * @return 16进制密文字符串
+     */
+    public static String encrypt(String content, String key) {
+        byte[] data = null;
+        try {
+            data = content.getBytes("UTF-8");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        data = encrypt(data, key.getBytes());
+        String result = Base64.encode(data);
+        return result;
+    }
+
+    /**
+     * 通过byte[]类型的密钥解密byte[]
+     *
+     * @param content
+     * @param key
+     * @return
+     */
+    public static byte[] decrypt(byte[] content, byte[] key) {
+        try {
+            Cipher cipher = Cipher.getInstance(CipherMode);
+            cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(key, "AES"));
+            byte[] result = cipher.doFinal(content);
+            return result;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 通过String类型的密钥 解密String类型的密文
+     *
+     * @param content
+     * @param key
+     * @return
+     */
+    public static String decrypt(String content, String key) {
+        byte[] data = null;
+        try {
+            data = Base64.decode(content);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        data = decrypt(data,key.getBytes());
+        if (data == null)
+            return null;
+        String result = null;
+        try {
+            result = new String(data, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    /**
+     * 通过byte[]类型的密钥 解密String类型的密文
+     *
+     * @param content
+     * @param key
+     * @return
+     */
+    public static String decrypt(String content, byte[] key) {
+        try {
+            Cipher cipher = Cipher.getInstance(CipherMode);
+            cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(key, "AES"));
+            byte[] data = cipher.doFinal(hex2byte(content));
+            return new String(data, "UTF-8");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 字节数组转成16进制字符串
+     *
+     * @param b
+     * @return
+     */
+    public static String byte2hex(byte[] b) { // 一个字节的数，
+        StringBuffer sb = new StringBuffer(b.length * 2);
+        String tmp = "";
+        for (int n = 0; n < b.length; n++) {
+            // 整数转成十六进制表示
+            tmp = (Integer.toHexString(b[n] & 0XFF));
+            if (tmp.length() == 1) {
+                sb.append("0");
+            }
+            sb.append(tmp);
+        }
+        return sb.toString().toUpperCase(); // 转成大写
+    }
+
+    /**
+     * 将hex字符串转换成字节数组
+     *
+     * @param inputString
+     * @return
+     */
+    private static byte[] hex2byte(String inputString) {
+        if (inputString == null || inputString.length() < 2) {
+            return new byte[0];
+        }
+        inputString = inputString.toLowerCase();
+        int l = inputString.length() / 2;
+        byte[] result = new byte[l];
+        for (int i = 0; i < l; ++i) {
+            String tmp = inputString.substring(2 * i, 2 * i + 2);
+            result[i] = (byte) (Integer.parseInt(tmp, 16) & 0xFF);
+        }
+        return result;
+    }
+}
diff --git a/rsalibrary/src/main/java/com/baileren/rsalibrary/Base64.java b/rsalibrary/src/main/java/com/baileren/rsalibrary/Base64.java
new file mode 100644
index 0000000..d7262fa
--- /dev/null
+++ b/rsalibrary/src/main/java/com/baileren/rsalibrary/Base64.java
@@ -0,0 +1,254 @@
+package com.baileren.rsalibrary;
+
+final class Base64 {
+
+  private static final int BASELENGTH = 128;
+  private static final int LOOKUPLENGTH = 64;
+  private static final int TWENTYFOURBITGROUP = 24;
+  private static final int EIGHTBIT = 8;
+  private static final int SIXTEENBIT = 16;
+  private static final int FOURBYTE = 4;
+  private static final int SIGN = -128;
+  private static char PAD = '=';
+  private static byte[] base64Alphabet = new byte[BASELENGTH];
+  private static char[] lookUpBase64Alphabet = new char[LOOKUPLENGTH];
+
+  static {
+    for (int i = 0; i < BASELENGTH; ++i) {
+      base64Alphabet[i] = -1;
+    }
+    for (int i = 'Z'; i >= 'A'; i--) {
+      base64Alphabet[i] = (byte) (i - 'A');
+    }
+    for (int i = 'z'; i >= 'a'; i--) {
+      base64Alphabet[i] = (byte) (i - 'a' + 26);
+    }
+
+    for (int i = '9'; i >= '0'; i--) {
+      base64Alphabet[i] = (byte) (i - '0' + 52);
+    }
+
+    base64Alphabet['+'] = 62;
+    base64Alphabet['/'] = 63;
+
+    for (int i = 0; i <= 25; i++) {
+      lookUpBase64Alphabet[i] = (char) ('A' + i);
+    }
+
+    for (int i = 26, j = 0; i <= 51; i++, j++) {
+      lookUpBase64Alphabet[i] = (char) ('a' + j);
+    }
+
+    for (int i = 52, j = 0; i <= 61; i++, j++) {
+      lookUpBase64Alphabet[i] = (char) ('0' + j);
+    }
+    lookUpBase64Alphabet[62] = (char) '+';
+    lookUpBase64Alphabet[63] = (char) '/';
+  }
+
+  private static boolean isWhiteSpace(char octect) {
+    return (octect == 0x20 || octect == 0xd || octect == 0xa || octect == 0x9);
+  }
+
+  private static boolean isPad(char octect) {
+    return (octect == PAD);
+  }
+
+  private static boolean isData(char octect) {
+    return (octect < BASELENGTH && base64Alphabet[octect] != -1);
+  }
+
+  /**
+   * Encodes hex octects into Base64
+   *
+   * @param binaryData Array containing binaryData
+   * @return Encoded Base64 array
+   */
+  static String encode(byte[] binaryData) {
+
+    if (binaryData == null) {
+      return null;
+    }
+
+    int lengthDataBits = binaryData.length * EIGHTBIT;
+    if (lengthDataBits == 0) {
+      return "";
+    }
+
+    int fewerThan24bits = lengthDataBits % TWENTYFOURBITGROUP;
+    int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP;
+    int numberQuartet = fewerThan24bits != 0 ? numberTriplets + 1 : numberTriplets;
+    char encodedData[] = null;
+
+    encodedData = new char[numberQuartet * 4];
+
+    byte k = 0, l = 0, b1 = 0, b2 = 0, b3 = 0;
+
+    int encodedIndex = 0;
+    int dataIndex = 0;
+
+    for (int i = 0; i < numberTriplets; i++) {
+      b1 = binaryData[dataIndex++];
+      b2 = binaryData[dataIndex++];
+      b3 = binaryData[dataIndex++];
+
+      l = (byte) (b2 & 0x0f);
+      k = (byte) (b1 & 0x03);
+
+      byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
+      byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0);
+      byte val3 = ((b3 & SIGN) == 0) ? (byte) (b3 >> 6) : (byte) ((b3) >> 6 ^ 0xfc);
+
+      encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
+      encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)];
+      encodedData[encodedIndex++] = lookUpBase64Alphabet[(l << 2) | val3];
+      encodedData[encodedIndex++] = lookUpBase64Alphabet[b3 & 0x3f];
+    }
+
+    // form integral number of 6-bit groups
+    if (fewerThan24bits == EIGHTBIT) {
+      b1 = binaryData[dataIndex];
+      k = (byte) (b1 & 0x03);
+
+      byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
+      encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
+      encodedData[encodedIndex++] = lookUpBase64Alphabet[k << 4];
+      encodedData[encodedIndex++] = PAD;
+      encodedData[encodedIndex++] = PAD;
+    } else if (fewerThan24bits == SIXTEENBIT) {
+      b1 = binaryData[dataIndex];
+      b2 = binaryData[dataIndex + 1];
+      l = (byte) (b2 & 0x0f);
+      k = (byte) (b1 & 0x03);
+
+      byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
+      byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0);
+
+      encodedData[encodedIndex++] = lookUpBase64Alphabet[val1];
+      encodedData[encodedIndex++] = lookUpBase64Alphabet[val2 | (k << 4)];
+      encodedData[encodedIndex++] = lookUpBase64Alphabet[l << 2];
+      encodedData[encodedIndex++] = PAD;
+    }
+    return new String(encodedData);
+  }
+
+  /**
+   * Decodes Base64 data into octects
+   *
+   * @param encoded string containing Base64 data
+   * @return Array containind decoded data.
+   */
+  static byte[] decode(String encoded) {
+
+    if (encoded == null) {
+      return null;
+    }
+
+    char[] base64Data = encoded.toCharArray();
+    // remove white spaces
+    int len = removeWhiteSpace(base64Data);
+
+    if (len % FOURBYTE != 0) {
+      return null;// should be divisible by four
+    }
+
+    int numberQuadruple = (len / FOURBYTE);
+
+    if (numberQuadruple == 0) {
+      return new byte[0];
+    }
+
+    byte decodedData[] = null;
+    byte b1 = 0, b2 = 0, b3 = 0, b4 = 0;
+    char d1 = 0, d2 = 0, d3 = 0, d4 = 0;
+
+    int i = 0;
+    int encodedIndex = 0;
+    int dataIndex = 0;
+    decodedData = new byte[(numberQuadruple) * 3];
+
+    for (; i < numberQuadruple - 1; i++) {
+
+      if (!isData((d1 = base64Data[dataIndex++]))
+          || !isData((d2 = base64Data[dataIndex++]))
+          || !isData((d3 = base64Data[dataIndex++]))
+          || !isData((d4 = base64Data[dataIndex++]))) {
+        return null;
+      }// if found "no data" just return null
+
+      b1 = base64Alphabet[d1];
+      b2 = base64Alphabet[d2];
+      b3 = base64Alphabet[d3];
+      b4 = base64Alphabet[d4];
+
+      decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
+      decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
+      decodedData[encodedIndex++] = (byte) (b3 << 6 | b4);
+    }
+
+    if (!isData((d1 = base64Data[dataIndex++])) || !isData((d2 = base64Data[dataIndex++]))) {
+      return null;// if found "no data" just return null
+    }
+
+    b1 = base64Alphabet[d1];
+    b2 = base64Alphabet[d2];
+
+    d3 = base64Data[dataIndex++];
+    d4 = base64Data[dataIndex++];
+    if (!isData((d3)) || !isData((d4))) {// Check if they are PAD characters
+      if (isPad(d3) && isPad(d4)) {
+        if ((b2 & 0xf) != 0)// last 4 bits should be zero
+        {
+          return null;
+        }
+        byte[] tmp = new byte[i * 3 + 1];
+        System.arraycopy(decodedData, 0, tmp, 0, i * 3);
+        tmp[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
+        return tmp;
+      } else if (!isPad(d3) && isPad(d4)) {
+        b3 = base64Alphabet[d3];
+        if ((b3 & 0x3) != 0)// last 2 bits should be zero
+        {
+          return null;
+        }
+        byte[] tmp = new byte[i * 3 + 2];
+        System.arraycopy(decodedData, 0, tmp, 0, i * 3);
+        tmp[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
+        tmp[encodedIndex] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
+        return tmp;
+      } else {
+        return null;
+      }
+    } else { // No PAD e.g 3cQl
+      b3 = base64Alphabet[d3];
+      b4 = base64Alphabet[d4];
+      decodedData[encodedIndex++] = (byte) (b1 << 2 | b2 >> 4);
+      decodedData[encodedIndex++] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
+      decodedData[encodedIndex++] = (byte) (b3 << 6 | b4);
+    }
+
+    return decodedData;
+  }
+
+  /**
+   * remove WhiteSpace from MIME containing encoded Base64 data.
+   *
+   * @param data the byte array of base64 data (with WS)
+   * @return the new length
+   */
+  private static int removeWhiteSpace(char[] data) {
+    if (data == null) {
+      return 0;
+    }
+
+    // count characters that's not whitespace
+    int newSize = 0;
+    int len = data.length;
+    for (int i = 0; i < len; i++) {
+      if (!isWhiteSpace(data[i])) {
+        data[newSize++] = data[i];
+      }
+    }
+    return newSize;
+  }
+}
diff --git a/rsalibrary/src/main/java/com/baileren/rsalibrary/CipherStrategy.java b/rsalibrary/src/main/java/com/baileren/rsalibrary/CipherStrategy.java
new file mode 100644
index 0000000..0d586d1
--- /dev/null
+++ b/rsalibrary/src/main/java/com/baileren/rsalibrary/CipherStrategy.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2015 Rocko (http://rocko.xyz) <rocko.zxp@gmail.com>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.baileren.rsalibrary;
+
+
+/**
+ * 加解密处理的抽象接口
+ */
+public abstract class CipherStrategy {
+
+	public final static String CHARSET = "UTF-8";
+
+	/**
+	 * 将加密内容的 Base64 编码转换为二进制内容
+	 * @param str
+	 * @return
+	 */
+	public byte[] decodeConvert(String str) {
+		return Base64.decode(str);
+	}
+
+	/**
+	 * 对加密后的二进制结果转换为 Base64 编码
+	 * @param bytes
+	 * @return
+	 */
+	public String encodeConvert(byte[] bytes) {
+		return Base64.encode(bytes);
+	}
+
+	/**
+	 * 对字符串进行加密
+	 *
+	 * @param content 需要加密的字符串
+	 * @return
+	 */
+	public abstract String encrypt(String content);
+
+	/**
+	 * 对字符串进行解密
+	 *
+	 * @param encryptContent 加密内容的 Base64 编码
+	 * @return
+	 */
+	public abstract String decrypt(String encryptContent);
+	/**
+	 * 对字符串进行解密
+	 *
+	 * @param encryptContent 加密内容的 Base64 编码
+	 * @return
+	 */
+	public abstract byte[] decryptByte(String encryptContent);
+	/**
+	 * 对字符串进行解密
+	 *
+	 * @param encryptContent 加密内容的 Base64 编码
+	 * @return
+	 */
+	public abstract String decryptStr(String encryptContent, String charsetName);
+	// 文件、流等
+}
diff --git a/rsalibrary/src/main/java/com/baileren/rsalibrary/RSACipherStrategy.java b/rsalibrary/src/main/java/com/baileren/rsalibrary/RSACipherStrategy.java
new file mode 100644
index 0000000..990bb2e
--- /dev/null
+++ b/rsalibrary/src/main/java/com/baileren/rsalibrary/RSACipherStrategy.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2015 Rocko (http://rocko.xyz) <rocko.zxp@gmail.com>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.baileren.rsalibrary;
+
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+
+public class RSACipherStrategy extends CipherStrategy {
+
+	private PublicKey mPublicKey;
+	private PrivateKey mPrivateKey;
+
+	public void initPublicKey(String publicKeyContentStr) {
+		try {
+			mPublicKey = RSAUtils.loadPublicKey(publicKeyContentStr);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void initPublicKey(InputStream publicKeyIs) {
+		try {
+			mPublicKey = RSAUtils.loadPublicKey(publicKeyIs);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void initPrivateKey(String privateKeyContentStr) {
+		try {
+			mPrivateKey = RSAUtils.loadPrivateKey(privateKeyContentStr);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void initPrivateKey(InputStream privateIs) {
+		try {
+			mPrivateKey = RSAUtils.loadPrivateKey(privateIs);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	public String encrypt(String content) {
+		if (mPublicKey == null) {
+			throw new NullPointerException("PublicKey is null, please init it first");
+		}
+		byte[] encryptByte = RSAUtils.encryptData(content.getBytes(), mPublicKey);
+
+		return encodeConvert(encryptByte);
+	}
+
+	@Override
+	public String decrypt(String encryptContent) {
+		if (mPrivateKey == null) {
+			throw new NullPointerException("PrivateKey is null, please init it first");
+		}
+		String string = "";
+		byte[] encryptByte = decodeConvert(encryptContent);
+		byte[] decryptByte = RSAUtils.decryptData(encryptByte, mPrivateKey);
+		try {
+			string = new String(decryptByte,"utf-8");
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		return string;
+	}
+
+	@Override public String decryptStr(String encryptContent, String charsetName) {
+		if (mPrivateKey == null) {
+			throw new NullPointerException("PrivateKey is null, please init it first");
+		}
+		String string = "";
+		byte[] encryptByte = decodeConvert(encryptContent);
+		byte[] decryptByte = RSAUtils.decryptData(encryptByte, mPrivateKey);
+		try {
+			string = new String(decryptByte,charsetName);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		return string;
+	}
+	@Override public byte[] decryptByte(String encryptContent) {
+		if (mPrivateKey == null) {
+			throw new NullPointerException("PrivateKey is null, please init it first");
+		}
+		byte[] encryptByte = decodeConvert(encryptContent);
+		byte[] decryptByte = RSAUtils.decryptData(encryptByte, mPrivateKey);
+		return decryptByte;
+	}
+	/**
+	 * 加密
+	 */
+	public String encrypt(String publicKey, String sourceContent) {
+		// rsa 公钥加密
+		initPublicKey(publicKey);
+		return encrypt(sourceContent);
+	}
+
+	/**
+	 * 解密
+	 */
+	public String decrypt(String privateKey, String sourceContent) {
+		// rsa 私钥解密
+		initPrivateKey(privateKey);
+
+		return decrypt(sourceContent);
+	}
+	/**
+	 * 解密
+	 */
+	public byte[] decryptByte(String privateKey, String sourceContent) {
+		// rsa 私钥解密
+		initPrivateKey(privateKey);
+
+		return decryptByte(sourceContent);
+	}
+	/**
+	 * 解密
+	 */
+	public String decrypt(String privateKey, String sourceContent, String charsetName) {
+		// rsa 私钥解密
+		initPrivateKey(privateKey);
+
+		return decryptStr(sourceContent, charsetName);
+	}
+}
diff --git a/rsalibrary/src/main/java/com/baileren/rsalibrary/RSAUtils.java b/rsalibrary/src/main/java/com/baileren/rsalibrary/RSAUtils.java
new file mode 100644
index 0000000..c55c9dd
--- /dev/null
+++ b/rsalibrary/src/main/java/com/baileren/rsalibrary/RSAUtils.java
@@ -0,0 +1,328 @@
+/*
+ * Copyright 2015 Rocko (http://rocko.xyz) <rocko.zxp@gmail.com>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.baileren.rsalibrary;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.math.BigInteger;
+import java.security.KeyFactory;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.RSAPublicKeySpec;
+import java.security.spec.X509EncodedKeySpec;
+import javax.crypto.Cipher;
+
+/**
+ * @author nanfeifei
+ * @date 2017年8月22日 下午1:44:23
+ */
+public final class RSAUtils
+{
+	private final static String KEY_PAIR = "RSA";
+	private final static String CIPHER = "RSA/ECB/PKCS1Padding";
+
+	/**
+	 * 随机生成RSA密钥对(默认密钥长度为1024)
+	 * 
+	 * @return
+	 */
+	public static KeyPair generateRSAKeyPair()
+	{
+		return generateRSAKeyPair(1024);
+	}
+
+	/**
+	 * 随机生成RSA密钥对
+	 * 
+	 * @param keyLength
+	 *            密钥长度，范围：512～2048<br>
+	 *            一般1024
+	 * @return
+	 */
+	public static KeyPair generateRSAKeyPair(int keyLength)
+	{
+		try
+		{
+			KeyPairGenerator kpg = KeyPairGenerator.getInstance(KEY_PAIR);
+			kpg.initialize(keyLength);
+			return kpg.genKeyPair();
+		} catch (NoSuchAlgorithmException e)
+		{
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+	/**
+	 * 用公钥加密 <br>
+	 * 每次加密的字节数，不能超过密钥的长度值减去11
+	 * 
+	 * @param data
+	 *            需加密数据的byte数据
+	 * @param publicKey
+	 *            公钥
+	 * @return 加密后的byte型数据
+	 */
+	public static byte[] encryptData(byte[] data, PublicKey publicKey)
+	{
+		try
+		{
+			Cipher cipher = Cipher.getInstance(CIPHER);
+			// 编码前设定编码方式及密钥
+			cipher.init(Cipher.ENCRYPT_MODE, publicKey);
+			// 传入编码数据并返回编码结果
+			return cipher.doFinal(data);
+		} catch (Exception e)
+		{
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+	/**
+	 * 用私钥解密
+	 * 
+	 * @param encryptedData
+	 *            经过encryptedData()加密返回的byte数据
+	 * @param privateKey
+	 *            私钥
+	 * @return
+	 */
+	public static byte[] decryptData(byte[] encryptedData, PrivateKey privateKey)
+	{
+		try
+		{
+			Cipher cipher = Cipher.getInstance(CIPHER);
+			cipher.init(Cipher.DECRYPT_MODE, privateKey);
+			return cipher.doFinal(encryptedData);
+		} catch (Exception e)
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * 通过公钥byte[](publicKey.getEncoded())将公钥还原，适用于RSA算法
+	 * 
+	 * @param keyBytes
+	 * @return
+	 * @throws NoSuchAlgorithmException
+	 * @throws InvalidKeySpecException
+	 */
+	public static PublicKey getPublicKey(byte[] keyBytes) throws NoSuchAlgorithmException,
+      InvalidKeySpecException
+	{
+		X509EncodedKeySpec keySpec = new X509EncodedKeySpec(keyBytes);
+		KeyFactory keyFactory = KeyFactory.getInstance(KEY_PAIR);
+		PublicKey publicKey = keyFactory.generatePublic(keySpec);
+		return publicKey;
+	}
+
+	/**
+	 * 通过私钥byte[]将公钥还原，适用于RSA算法
+	 * 
+	 * @param keyBytes
+	 * @return
+	 * @throws NoSuchAlgorithmException
+	 * @throws InvalidKeySpecException
+	 */
+	public static PrivateKey getPrivateKey(byte[] keyBytes) throws NoSuchAlgorithmException,
+      InvalidKeySpecException
+	{
+		PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(keyBytes);
+		KeyFactory keyFactory = KeyFactory.getInstance(KEY_PAIR);
+		PrivateKey privateKey = keyFactory.generatePrivate(keySpec);
+		return privateKey;
+	}
+
+	/**
+	 * 使用N、e值还原公钥
+	 * 
+	 * @param modulus
+	 * @param publicExponent
+	 * @return
+	 * @throws NoSuchAlgorithmException
+	 * @throws InvalidKeySpecException
+	 */
+	public static PublicKey getPublicKey(String modulus, String publicExponent)
+			throws NoSuchAlgorithmException, InvalidKeySpecException
+	{
+		BigInteger bigIntModulus = new BigInteger(modulus);
+		BigInteger bigIntPrivateExponent = new BigInteger(publicExponent);
+		RSAPublicKeySpec keySpec = new RSAPublicKeySpec(bigIntModulus, bigIntPrivateExponent);
+		KeyFactory keyFactory = KeyFactory.getInstance(KEY_PAIR);
+		PublicKey publicKey = keyFactory.generatePublic(keySpec);
+		return publicKey;
+	}
+
+	/**
+	 * 使用N、d值还原私钥
+	 * 
+	 * @param modulus
+	 * @param privateExponent
+	 * @return
+	 * @throws NoSuchAlgorithmException
+	 * @throws InvalidKeySpecException
+	 */
+	public static PrivateKey getPrivateKey(String modulus, String privateExponent)
+			throws NoSuchAlgorithmException, InvalidKeySpecException
+	{
+		BigInteger bigIntModulus = new BigInteger(modulus);
+		BigInteger bigIntPrivateExponent = new BigInteger(privateExponent);
+		RSAPublicKeySpec keySpec = new RSAPublicKeySpec(bigIntModulus, bigIntPrivateExponent);
+		KeyFactory keyFactory = KeyFactory.getInstance(KEY_PAIR);
+		PrivateKey privateKey = keyFactory.generatePrivate(keySpec);
+		return privateKey;
+	}
+
+	/**
+	 * 从字符串中加载公钥
+	 * 
+	 * @param publicKeyStr
+	 *            公钥数据字符串
+	 * @throws Exception
+	 *             加载公钥时产生的异常
+	 */
+	public static PublicKey loadPublicKey(String publicKeyStr) throws Exception
+	{
+		try
+		{
+			byte[] buffer = Base64.decode(publicKeyStr);
+			KeyFactory keyFactory = KeyFactory.getInstance(KEY_PAIR);
+			X509EncodedKeySpec keySpec = new X509EncodedKeySpec(buffer);
+			return keyFactory.generatePublic(keySpec);
+		} catch (NoSuchAlgorithmException e)
+		{
+			throw new Exception("无此算法");
+		} catch (InvalidKeySpecException e)
+		{
+			throw new Exception("公钥非法");
+		} catch (NullPointerException e)
+		{
+			throw new Exception("公钥数据为空");
+		}
+	}
+
+	/**
+	 * 从字符串中加载私钥<br>
+	 * 加载时使用的是PKCS8EncodedKeySpec（PKCS#8编码的Key指令）。
+	 * 
+	 * @param privateKeyStr
+	 * @return
+	 * @throws Exception
+	 */
+	public static PrivateKey loadPrivateKey(String privateKeyStr) throws Exception
+	{
+		try
+		{
+			byte[] buffer = Base64.decode(privateKeyStr);
+			// X509EncodedKeySpec keySpec = new X509EncodedKeySpec(buffer);
+			PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(buffer);
+			KeyFactory keyFactory = KeyFactory.getInstance(KEY_PAIR);
+			return keyFactory.generatePrivate(keySpec);
+		} catch (NoSuchAlgorithmException e)
+		{
+			throw new Exception("无此算法");
+		} catch (InvalidKeySpecException e)
+		{
+			throw new Exception("私钥非法");
+		} catch (NullPointerException e)
+		{
+			throw new Exception("私钥数据为空");
+		}
+	}
+
+	/**
+	 * 从文件中输入流中加载公钥
+	 * 
+	 * @param in
+	 *            公钥输入流
+	 * @throws Exception
+	 *             加载公钥时产生的异常
+	 */
+	public static PublicKey loadPublicKey(InputStream in) throws Exception
+	{
+		try
+		{
+			return loadPublicKey(readKey(in));
+		} catch (IOException e)
+		{
+			throw new Exception("公钥数据流读取错误");
+		} catch (NullPointerException e)
+		{
+			throw new Exception("公钥输入流为空");
+		}
+	}
+
+	/**
+	 * 从文件中加载私钥
+	 * 
+	 * @param
+	 * @return 是否成功
+	 * @throws Exception
+	 */
+	public static PrivateKey loadPrivateKey(InputStream in) throws Exception
+	{
+		try
+		{
+			return loadPrivateKey(readKey(in));
+		} catch (IOException e)
+		{
+			throw new Exception("私钥数据读取错误");
+		} catch (NullPointerException e)
+		{
+			throw new Exception("私钥输入流为空");
+		}
+	}
+
+	/**
+	 * 读取密钥信息
+	 *  --------------------
+	 *  	CONTENT
+	 *  --------------------
+	 * @param in
+	 * @return
+	 * @throws IOException
+	 */
+	private static String readKey(InputStream in) throws IOException
+	{
+		BufferedReader br = new BufferedReader(new InputStreamReader(in));
+		String readLine = null;
+		StringBuilder sb = new StringBuilder();
+		while ((readLine = br.readLine()) != null)
+		{
+			if (readLine.charAt(0) == '-')
+			{
+				continue;
+			} else
+			{
+				sb.append(readLine);
+				sb.append('\r');
+			}
+		}
+
+		return sb.toString();
+	}
+
+}
diff --git a/rsalibrary/src/main/res/values/strings.xml b/rsalibrary/src/main/res/values/strings.xml
new file mode 100644
index 0000000..6462645
--- /dev/null
+++ b/rsalibrary/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+  <string name="app_name">RSALibrary</string>
+</resources>
diff --git a/rsalibrary/src/test/java/com/baileren/rsalibrary/ExampleUnitTest.java b/rsalibrary/src/test/java/com/baileren/rsalibrary/ExampleUnitTest.java
new file mode 100644
index 0000000..528632d
--- /dev/null
+++ b/rsalibrary/src/test/java/com/baileren/rsalibrary/ExampleUnitTest.java
@@ -0,0 +1,21 @@
+package com.baileren.rsalibrary;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+  @Test public void addition_isCorrect() throws Exception {
+    assertEquals(4, 2 + 2);
+    RSACipherStrategy A = new RSACipherStrategy();
+    String aa = A.encrypt(
+            "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmZfR/bA9X3vp86y1aEpvwzXJYKRRF1fLau2+05/ZtaITLpV8bhkmSf3neSy/Q9gAdvG75Fr73E+GWE+K5b0BpvIS1jDGo319+PpZR39SaZTKZ27XFXrosmJTZutN79t819HS1VseleunHAFgMVufE9U5jP6LGzl/wbkSy01GhzwIDAQAB",
+            "Aa123456");
+    System.out.print(aa);
+  }
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..edd0e12
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,57 @@
+pluginManagement {
+    repositories {
+        // hms， 若不集成华为厂商通道，可直接跳过
+//        maven { url 'https://developer.huawei.com/repo/' }
+        maven { url 'https://jitpack.io' }
+        maven { url 'https://maven.aliyun.com/repository/central' }
+        maven { url 'https://maven.aliyun.com/repository/public' }
+        maven { url 'https://maven.aliyun.com/repository/apache-snapshots' }
+        maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
+    repositories {
+        // hms， 若不集成华为厂商通道，可直接跳过
+//        maven { url 'https://developer.huawei.com/repo/' }
+        maven { url 'https://jitpack.io' }
+        maven { url 'https://maven.aliyun.com/repository/central' }
+        maven { url "https://maven.aliyun.com/repository/public" }
+        maven { url 'https://maven.aliyun.com/repository/apache-snapshots' }
+        maven { url 'https://maven.aliyun.com/repository/gradle-plugin' }
+        google()
+        mavenCentral()
+        jcenter() // Warning: this repository is going to shut down soon
+    }
+}
+include ':app'
+include ':system:base_resource'
+include ':system:video'
+//project(':systemLib').projectDir =file('D:/android Project/Healthycq/system')
+
+// 引入内部组件通信模块 (必要模块)
+include ':system:tuicore'
+//project(':tuicore').projectDir = new File(settingsDir, '../TUIKit/TUICore/tuicore')
+// 引入聊天功能模块 (基础功能模块)
+//project(':tuichat').projectDir = new File(settingsDir, '../TUIKit/TUIChat/tuichat')
+// 引入关系链功能模块 (基础功能模块)
+include ':system:tuicontact'
+//project(':tuicontact').projectDir = new File(settingsDir, '../TUIKit/TUIContact/tuicontact')
+// 引入会话功能模块 (基础功能模块)
+include ':system:tuiconversation'
+//project(':tuiconversation').projectDir = new File(settingsDir, '../TUIKit/TUIConversation/tuiconversation')
+// 引入群组功能模块
+include ':system:tuigroup'
+//project(':tuigroup').projectDir = new File(settingsDir, '../TUIKit/TUIGroup/tuigroup')
+// 引入音视频通话功能模块
+include ':system:tuicallkit'
+//project(':tuicallkit').projectDir = new File(settingsDir, '../TUIKit/TUICallKit/tuicallkit')
+include ':lib_base'
+include ':ninegridview'
+include ':system:tuichat'
+//include ':system:tuicallkit-7.3.4358'
+//include ':system:tuicore-7.3.4358'
+include ':rsalibrary'
diff --git a/system/base_resource/.gitignore b/system/base_resource/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/system/base_resource/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/system/base_resource/build.gradle b/system/base_resource/build.gradle
new file mode 100644
index 0000000..0b6dfb9
--- /dev/null
+++ b/system/base_resource/build.gradle
@@ -0,0 +1,36 @@
+plugins {
+    id 'com.android.library'
+}
+
+android {
+    compileSdk rootProject.ext.compileSdkVersion
+
+    defaultConfig {
+        minSdk rootProject.ext.minSdkVersion
+        targetSdk rootProject.ext.targetSdkVersion
+        versionCode rootProject.ext.versionCode
+        versionName rootProject.ext.versionName
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+
+        vectorDrawables.useSupportLibrary = true
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+}
+
+dependencies {
+
+
+
+}
\ No newline at end of file
diff --git a/system/base_resource/consumer-rules.pro b/system/base_resource/consumer-rules.pro
new file mode 100644
index 0000000..e69de29
diff --git a/system/base_resource/proguard-rules.pro b/system/base_resource/proguard-rules.pro
new file mode 100644
index 0000000..481bb43
--- /dev/null
+++ b/system/base_resource/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/system/base_resource/src/main/AndroidManifest.xml b/system/base_resource/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..dff058e
--- /dev/null
+++ b/system/base_resource/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.sw.basic">
+
+</manifest>
\ No newline at end of file
diff --git a/system/base_resource/src/main/res/drawable/dialog_update.xml b/system/base_resource/src/main/res/drawable/dialog_update.xml
new file mode 100644
index 0000000..953019e
--- /dev/null
+++ b/system/base_resource/src/main/res/drawable/dialog_update.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <corners android:radius="5dp"/>
+    <solid android:color="@color/white"/>
+</shape>
\ No newline at end of file
diff --git a/system/base_resource/src/main/res/drawable/dialog_waiting.xml b/system/base_resource/src/main/res/drawable/dialog_waiting.xml
new file mode 100644
index 0000000..e15a0f3
--- /dev/null
+++ b/system/base_resource/src/main/res/drawable/dialog_waiting.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <corners android:radius="5dp"/>
+    <solid android:color="@color/black"/>
+</shape>
\ No newline at end of file
diff --git a/system/base_resource/src/main/res/drawable/shape_bottom_line.xml b/system/base_resource/src/main/res/drawable/shape_bottom_line.xml
new file mode 100644
index 0000000..36d2482
--- /dev/null
+++ b/system/base_resource/src/main/res/drawable/shape_bottom_line.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 连框颜色值 -->
+    <item>
+        <shape>
+            <solid android:color="@color/colorTopLineGray" />
+        </shape>
+    </item>
+    <!-- 主体背景颜色值 -->
+    <item android:bottom="1dp">
+        <shape>
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/system/base_resource/src/main/res/values/colors.xml b/system/base_resource/src/main/res/values/colors.xml
new file mode 100644
index 0000000..fd02301
--- /dev/null
+++ b/system/base_resource/src/main/res/values/colors.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="dialogColorAccent">#FF1385FA</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+    <color name="transparent">#00000000</color>
+    <color name="c_home_menu_item_bg">#1F1F29</color>
+    <color name="colorTopLineGray">#E9E9E9</color>
+
+
+    <color name="black_3">#FF333333</color>
+    <color name="black_6">#FF666666</color>
+    <color name="black_9">#FF999999</color>
+</resources>
\ No newline at end of file
diff --git a/system/base_resource/src/main/res/values/dimens.xml b/system/base_resource/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..8af8eb4
--- /dev/null
+++ b/system/base_resource/src/main/res/values/dimens.xml
@@ -0,0 +1,428 @@
+<resources>
+    <dimen name="txt5">5sp</dimen>
+    <dimen name="txt6">6sp</dimen>
+    <dimen name="txt7">7sp</dimen>
+    <dimen name="txt8">8sp</dimen>
+    <dimen name="txt9">9sp</dimen>
+    <dimen name="txt10">10sp</dimen>
+    <dimen name="txt11">11sp</dimen>
+    <dimen name="txt12">12sp</dimen>
+    <dimen name="txt13">13sp</dimen>
+    <dimen name="txt14">14sp</dimen>
+    <dimen name="txt15">15sp</dimen>
+    <dimen name="txt16">16sp</dimen>
+    <dimen name="txt17">17sp</dimen>
+    <dimen name="txt18">18sp</dimen>
+    <dimen name="txt19">19sp</dimen>
+    <dimen name="txt20">20sp</dimen>
+    <dimen name="txt21">21sp</dimen>
+    <dimen name="txt22">22sp</dimen>
+    <dimen name="txt24">24sp</dimen>
+    <dimen name="txt26">26sp</dimen>
+    <dimen name="txt28">28sp</dimen>
+    <dimen name="txt30">30sp</dimen>
+    <dimen name="txt32">32sp</dimen>
+    <dimen name="txt34">34sp</dimen>
+
+
+
+    <!-- Your custom size defind by references, can be writted in anywhere, any module, any values/*.xml, for example: -->
+    <dimen name="card_common_margin_left">@dimen/dp_15</dimen>
+
+    <!-- dp and sp values, must be defind in this file! -->
+    <!-- view size,you can add if there is no one -->
+    <dimen name="dp_m_60">-60dp</dimen>
+    <dimen name="dp_m_30">-30dp</dimen>
+    <dimen name="dp_m_20">-20dp</dimen>
+    <dimen name="dp_m_12">-12dp</dimen>
+    <dimen name="dp_m_10">-10dp</dimen>
+    <dimen name="dp_m_8">-8dp</dimen>
+    <dimen name="dp_m_5">-5dp</dimen>
+    <dimen name="dp_m_2">-2dp</dimen>
+    <dimen name="dp_m_1">-1dp</dimen>
+    <dimen name="dp_0">0dp</dimen>
+    <dimen name="dp_0_1">0.1dp</dimen>
+    <dimen name="dp_0_5">0.5dp</dimen>
+    <dimen name="dp_1">1dp</dimen>
+    <dimen name="dp_1_5">1.5dp</dimen>
+    <dimen name="dp_2">2dp</dimen>
+    <dimen name="dp_2_5">2.5dp</dimen>
+    <dimen name="dp_3">3dp</dimen>
+    <dimen name="dp_3_5">3.5dp</dimen>
+    <dimen name="dp_4">4dp</dimen>
+    <dimen name="dp_4_5">4.5dp</dimen>
+    <dimen name="dp_5">5dp</dimen>
+    <dimen name="dp_6">6dp</dimen>
+    <dimen name="dp_7">7dp</dimen>
+    <dimen name="dp_7_5">7.5dp</dimen>
+    <dimen name="dp_8">8dp</dimen>
+    <dimen name="dp_9">9dp</dimen>
+    <dimen name="dp_10">10dp</dimen>
+    <dimen name="dp_11">11dp</dimen>
+    <dimen name="dp_12">12dp</dimen>
+    <dimen name="dp_13">13dp</dimen>
+    <dimen name="dp_14">14dp</dimen>
+    <dimen name="dp_15">15dp</dimen>
+    <dimen name="dp_16">16dp</dimen>
+    <dimen name="dp_17">17dp</dimen>
+    <dimen name="dp_18">18dp</dimen>
+    <dimen name="dp_19">19dp</dimen>
+    <dimen name="dp_20">20dp</dimen>
+    <dimen name="dp_21">21dp</dimen>
+    <dimen name="dp_22">22dp</dimen>
+    <dimen name="dp_23">23dp</dimen>
+    <dimen name="dp_24">24dp</dimen>
+    <dimen name="dp_25">25dp</dimen>
+    <dimen name="dp_26">26dp</dimen>
+    <dimen name="dp_27">27dp</dimen>
+    <dimen name="dp_28">28dp</dimen>
+    <dimen name="dp_29">29dp</dimen>
+    <dimen name="dp_30">30dp</dimen>
+    <dimen name="dp_31">31dp</dimen>
+    <dimen name="dp_32">32dp</dimen>
+    <dimen name="dp_33">33dp</dimen>
+    <dimen name="dp_34">34dp</dimen>
+    <dimen name="dp_35">35dp</dimen>
+    <dimen name="dp_36">36dp</dimen>
+    <dimen name="dp_37">37dp</dimen>
+    <dimen name="dp_38">38dp</dimen>
+    <dimen name="dp_39">39dp</dimen>
+    <dimen name="dp_40">40dp</dimen>
+    <dimen name="dp_41">41dp</dimen>
+    <dimen name="dp_42">42dp</dimen>
+    <dimen name="dp_43">43dp</dimen>
+    <dimen name="dp_44">44dp</dimen>
+    <dimen name="dp_45">45dp</dimen>
+    <dimen name="dp_46">46dp</dimen>
+    <dimen name="dp_47">47dp</dimen>
+    <dimen name="dp_48">48dp</dimen>
+    <dimen name="dp_49">49dp</dimen>
+    <dimen name="dp_50">50dp</dimen>
+    <dimen name="dp_51">51dp</dimen>
+    <dimen name="dp_52">52dp</dimen>
+    <dimen name="dp_53">53dp</dimen>
+    <dimen name="dp_54">54dp</dimen>
+    <dimen name="dp_55">55dp</dimen>
+    <dimen name="dp_56">56dp</dimen>
+    <dimen name="dp_57">57dp</dimen>
+    <dimen name="dp_58">58dp</dimen>
+    <dimen name="dp_59">59dp</dimen>
+    <dimen name="dp_60">60dp</dimen>
+    <dimen name="dp_61">61dp</dimen>
+    <dimen name="dp_62">62dp</dimen>
+    <dimen name="dp_63">63dp</dimen>
+    <dimen name="dp_64">64dp</dimen>
+    <dimen name="dp_65">65dp</dimen>
+    <dimen name="dp_66">66dp</dimen>
+    <dimen name="dp_67">67dp</dimen>
+    <dimen name="dp_68">68dp</dimen>
+    <dimen name="dp_69">69dp</dimen>
+    <dimen name="dp_70">70dp</dimen>
+    <dimen name="dp_71">71dp</dimen>
+    <dimen name="dp_72">72dp</dimen>
+    <dimen name="dp_73">73dp</dimen>
+    <dimen name="dp_74">74dp</dimen>
+    <dimen name="dp_75">75dp</dimen>
+    <dimen name="dp_76">76dp</dimen>
+    <dimen name="dp_77">77dp</dimen>
+    <dimen name="dp_78">78dp</dimen>
+    <dimen name="dp_79">79dp</dimen>
+    <dimen name="dp_80">80dp</dimen>
+    <dimen name="dp_81">81dp</dimen>
+    <dimen name="dp_82">82dp</dimen>
+    <dimen name="dp_83">83dp</dimen>
+    <dimen name="dp_84">84dp</dimen>
+    <dimen name="dp_85">85dp</dimen>
+    <dimen name="dp_86">86dp</dimen>
+    <dimen name="dp_87">87dp</dimen>
+    <dimen name="dp_88">88dp</dimen>
+    <dimen name="dp_89">89dp</dimen>
+    <dimen name="dp_90">90dp</dimen>
+    <dimen name="dp_91">91dp</dimen>
+    <dimen name="dp_92">92dp</dimen>
+    <dimen name="dp_93">93dp</dimen>
+    <dimen name="dp_94">94dp</dimen>
+    <dimen name="dp_95">95dp</dimen>
+    <dimen name="dp_96">96dp</dimen>
+    <dimen name="dp_97">97dp</dimen>
+    <dimen name="dp_98">98dp</dimen>
+    <dimen name="dp_99">99dp</dimen>
+    <dimen name="dp_100">100dp</dimen>
+    <dimen name="dp_101">101dp</dimen>
+    <dimen name="dp_102">102dp</dimen>
+    <dimen name="dp_103">103dp</dimen>
+    <dimen name="dp_104">104dp</dimen>
+    <dimen name="dp_104_5">104.5dp</dimen>
+    <dimen name="dp_105">105dp</dimen>
+    <dimen name="dp_106">106dp</dimen>
+    <dimen name="dp_107">107dp</dimen>
+    <dimen name="dp_108">108dp</dimen>
+    <dimen name="dp_109">109dp</dimen>
+    <dimen name="dp_110">110dp</dimen>
+    <dimen name="dp_111">111dp</dimen>
+    <dimen name="dp_112">112dp</dimen>
+    <dimen name="dp_113">113dp</dimen>
+    <dimen name="dp_114">114dp</dimen>
+    <dimen name="dp_115">115dp</dimen>
+    <dimen name="dp_116">116dp</dimen>
+    <dimen name="dp_117">117dp</dimen>
+    <dimen name="dp_118">118dp</dimen>
+    <dimen name="dp_119">119dp</dimen>
+    <dimen name="dp_120">120dp</dimen>
+    <dimen name="dp_121">121dp</dimen>
+    <dimen name="dp_122">122dp</dimen>
+    <dimen name="dp_123">123dp</dimen>
+    <dimen name="dp_124">124dp</dimen>
+    <dimen name="dp_125">125dp</dimen>
+    <dimen name="dp_126">126dp</dimen>
+    <dimen name="dp_127">127dp</dimen>
+    <dimen name="dp_128">128dp</dimen>
+    <dimen name="dp_129">129dp</dimen>
+    <dimen name="dp_130">130dp</dimen>
+    <dimen name="dp_131">131dp</dimen>
+    <dimen name="dp_132">132dp</dimen>
+    <dimen name="dp_133">133dp</dimen>
+    <dimen name="dp_134">134dp</dimen>
+    <dimen name="dp_134_5">134.5dp</dimen>
+    <dimen name="dp_135">135dp</dimen>
+    <dimen name="dp_136">136dp</dimen>
+    <dimen name="dp_137">137dp</dimen>
+    <dimen name="dp_138">138dp</dimen>
+    <dimen name="dp_139">139dp</dimen>
+    <dimen name="dp_140">140dp</dimen>
+    <dimen name="dp_141">141dp</dimen>
+    <dimen name="dp_142">142dp</dimen>
+    <dimen name="dp_143">143dp</dimen>
+    <dimen name="dp_144">144dp</dimen>
+    <dimen name="dp_145">145dp</dimen>
+    <dimen name="dp_146">146dp</dimen>
+    <dimen name="dp_147">147dp</dimen>
+    <dimen name="dp_148">148dp</dimen>
+    <dimen name="dp_149">149dp</dimen>
+    <dimen name="dp_150">150dp</dimen>
+    <dimen name="dp_151">151dp</dimen>
+    <dimen name="dp_152">152dp</dimen>
+    <dimen name="dp_153">153dp</dimen>
+    <dimen name="dp_154">154dp</dimen>
+    <dimen name="dp_155">155dp</dimen>
+    <dimen name="dp_156">156dp</dimen>
+    <dimen name="dp_157">157dp</dimen>
+    <dimen name="dp_158">158dp</dimen>
+    <dimen name="dp_159">159dp</dimen>
+    <dimen name="dp_160">160dp</dimen>
+    <dimen name="dp_161">161dp</dimen>
+    <dimen name="dp_162">162dp</dimen>
+    <dimen name="dp_163">163dp</dimen>
+    <dimen name="dp_164">164dp</dimen>
+    <dimen name="dp_165">165dp</dimen>
+    <dimen name="dp_166">166dp</dimen>
+    <dimen name="dp_167">167dp</dimen>
+    <dimen name="dp_168">168dp</dimen>
+    <dimen name="dp_169">169dp</dimen>
+    <dimen name="dp_170">170dp</dimen>
+    <dimen name="dp_171">171dp</dimen>
+    <dimen name="dp_172">172dp</dimen>
+    <dimen name="dp_173">173dp</dimen>
+    <dimen name="dp_174">174dp</dimen>
+    <dimen name="dp_175">175dp</dimen>
+    <dimen name="dp_176">176dp</dimen>
+    <dimen name="dp_177">177dp</dimen>
+    <dimen name="dp_178">178dp</dimen>
+    <dimen name="dp_179">179dp</dimen>
+    <dimen name="dp_180">180dp</dimen>
+    <dimen name="dp_181">181dp</dimen>
+    <dimen name="dp_182">182dp</dimen>
+    <dimen name="dp_183">183dp</dimen>
+    <dimen name="dp_184">184dp</dimen>
+    <dimen name="dp_185">185dp</dimen>
+    <dimen name="dp_186">186dp</dimen>
+    <dimen name="dp_187">187dp</dimen>
+    <dimen name="dp_188">188dp</dimen>
+    <dimen name="dp_189">189dp</dimen>
+    <dimen name="dp_190">190dp</dimen>
+    <dimen name="dp_191">191dp</dimen>
+    <dimen name="dp_191_25">191.25dp</dimen>
+    <dimen name="dp_192">192dp</dimen>
+    <dimen name="dp_193">193dp</dimen>
+    <dimen name="dp_194">194dp</dimen>
+    <dimen name="dp_195">195dp</dimen>
+    <dimen name="dp_196">196dp</dimen>
+    <dimen name="dp_197">197dp</dimen>
+    <dimen name="dp_198">198dp</dimen>
+    <dimen name="dp_199">199dp</dimen>
+    <dimen name="dp_200">200dp</dimen>
+    <dimen name="dp_201">201dp</dimen>
+    <dimen name="dp_202">202dp</dimen>
+    <dimen name="dp_203">203dp</dimen>
+    <dimen name="dp_204">204dp</dimen>
+    <dimen name="dp_205">205dp</dimen>
+    <dimen name="dp_206">206dp</dimen>
+    <dimen name="dp_207">207dp</dimen>
+    <dimen name="dp_208">208dp</dimen>
+    <dimen name="dp_209">209dp</dimen>
+    <dimen name="dp_210">210dp</dimen>
+    <dimen name="dp_211">211dp</dimen>
+    <dimen name="dp_212">212dp</dimen>
+    <dimen name="dp_213">213dp</dimen>
+    <dimen name="dp_214">214dp</dimen>
+    <dimen name="dp_215">215dp</dimen>
+    <dimen name="dp_216">216dp</dimen>
+    <dimen name="dp_217">217dp</dimen>
+    <dimen name="dp_218">218dp</dimen>
+    <dimen name="dp_219">219dp</dimen>
+    <dimen name="dp_220">220dp</dimen>
+    <dimen name="dp_221">221dp</dimen>
+    <dimen name="dp_222">222dp</dimen>
+    <dimen name="dp_223">223dp</dimen>
+    <dimen name="dp_224">224dp</dimen>
+    <dimen name="dp_225">225dp</dimen>
+    <dimen name="dp_226">226dp</dimen>
+    <dimen name="dp_227">227dp</dimen>
+    <dimen name="dp_228">228dp</dimen>
+    <dimen name="dp_229">229dp</dimen>
+    <dimen name="dp_230">230dp</dimen>
+    <dimen name="dp_231">231dp</dimen>
+    <dimen name="dp_232">232dp</dimen>
+    <dimen name="dp_233">233dp</dimen>
+    <dimen name="dp_234">234dp</dimen>
+    <dimen name="dp_235">235dp</dimen>
+    <dimen name="dp_236">236dp</dimen>
+    <dimen name="dp_237">237dp</dimen>
+    <dimen name="dp_238">238dp</dimen>
+    <dimen name="dp_239">239dp</dimen>
+    <dimen name="dp_240">240dp</dimen>
+    <dimen name="dp_241">241dp</dimen>
+    <dimen name="dp_242">242dp</dimen>
+    <dimen name="dp_243">243dp</dimen>
+    <dimen name="dp_244">244dp</dimen>
+    <dimen name="dp_245">245dp</dimen>
+    <dimen name="dp_246">246dp</dimen>
+    <dimen name="dp_247">247dp</dimen>
+    <dimen name="dp_248">248dp</dimen>
+    <dimen name="dp_249">249dp</dimen>
+    <dimen name="dp_250">250dp</dimen>
+    <dimen name="dp_251">251dp</dimen>
+    <dimen name="dp_252">252dp</dimen>
+    <dimen name="dp_253">253dp</dimen>
+    <dimen name="dp_254">254dp</dimen>
+    <dimen name="dp_255">255dp</dimen>
+    <dimen name="dp_256">256dp</dimen>
+    <dimen name="dp_257">257dp</dimen>
+    <dimen name="dp_258">258dp</dimen>
+    <dimen name="dp_259">259dp</dimen>
+    <dimen name="dp_260">260dp</dimen>
+    <dimen name="dp_261">261dp</dimen>
+    <dimen name="dp_262">262dp</dimen>
+    <dimen name="dp_263">263dp</dimen>
+    <dimen name="dp_264">264dp</dimen>
+    <dimen name="dp_265">265dp</dimen>
+    <dimen name="dp_266">266dp</dimen>
+    <dimen name="dp_267">267dp</dimen>
+    <dimen name="dp_268">268dp</dimen>
+    <dimen name="dp_269">269dp</dimen>
+    <dimen name="dp_270">270dp</dimen>
+    <dimen name="dp_271">271dp</dimen>
+    <dimen name="dp_272">272dp</dimen>
+    <dimen name="dp_273">273dp</dimen>
+    <dimen name="dp_274">274dp</dimen>
+    <dimen name="dp_275">275dp</dimen>
+    <dimen name="dp_276">276dp</dimen>
+    <dimen name="dp_277">277dp</dimen>
+    <dimen name="dp_278">278dp</dimen>
+    <dimen name="dp_279">279dp</dimen>
+    <dimen name="dp_280">280dp</dimen>
+    <dimen name="dp_281">281dp</dimen>
+    <dimen name="dp_282">282dp</dimen>
+    <dimen name="dp_283">283dp</dimen>
+    <dimen name="dp_284">284dp</dimen>
+    <dimen name="dp_285">285dp</dimen>
+    <dimen name="dp_286">286dp</dimen>
+    <dimen name="dp_287">287dp</dimen>
+    <dimen name="dp_288">288dp</dimen>
+    <dimen name="dp_289">289dp</dimen>
+    <dimen name="dp_290">290dp</dimen>
+    <dimen name="dp_291">291dp</dimen>
+    <dimen name="dp_292">292dp</dimen>
+    <dimen name="dp_293">293dp</dimen>
+    <dimen name="dp_294">294dp</dimen>
+    <dimen name="dp_295">295dp</dimen>
+    <dimen name="dp_296">296dp</dimen>
+    <dimen name="dp_297">297dp</dimen>
+    <dimen name="dp_298">298dp</dimen>
+    <dimen name="dp_299">299dp</dimen>
+    <dimen name="dp_300">300dp</dimen>
+    <dimen name="dp_301">301dp</dimen>
+    <dimen name="dp_302">302dp</dimen>
+    <dimen name="dp_303">303dp</dimen>
+    <dimen name="dp_304">304dp</dimen>
+    <dimen name="dp_305">305dp</dimen>
+    <dimen name="dp_306">306dp</dimen>
+    <dimen name="dp_307">307dp</dimen>
+    <dimen name="dp_308">308dp</dimen>
+    <dimen name="dp_309">309dp</dimen>
+    <dimen name="dp_310">310dp</dimen>
+    <dimen name="dp_311">311dp</dimen>
+    <dimen name="dp_312">312dp</dimen>
+    <dimen name="dp_313">313dp</dimen>
+    <dimen name="dp_314">314dp</dimen>
+    <dimen name="dp_315">315dp</dimen>
+    <dimen name="dp_316">316dp</dimen>
+    <dimen name="dp_317">317dp</dimen>
+    <dimen name="dp_318">318dp</dimen>
+    <dimen name="dp_319">319dp</dimen>
+    <dimen name="dp_320">320dp</dimen>
+    <dimen name="dp_321">321dp</dimen>
+    <dimen name="dp_322">322dp</dimen>
+    <dimen name="dp_323">323dp</dimen>
+    <dimen name="dp_324">324dp</dimen>
+    <dimen name="dp_325">325dp</dimen>
+    <dimen name="dp_326">326dp</dimen>
+    <dimen name="dp_327">327dp</dimen>
+    <dimen name="dp_328">328dp</dimen>
+    <dimen name="dp_329">329dp</dimen>
+    <dimen name="dp_330">330dp</dimen>
+    <dimen name="dp_331">331dp</dimen>
+    <dimen name="dp_332">332dp</dimen>
+    <dimen name="dp_333">333dp</dimen>
+    <dimen name="dp_334">334dp</dimen>
+    <dimen name="dp_335">335dp</dimen>
+    <dimen name="dp_336">336dp</dimen>
+    <dimen name="dp_337">337dp</dimen>
+    <dimen name="dp_338">338dp</dimen>
+    <dimen name="dp_339">339dp</dimen>
+    <dimen name="dp_340">340dp</dimen>
+    <dimen name="dp_341">341dp</dimen>
+    <dimen name="dp_342">342dp</dimen>
+    <dimen name="dp_343">343dp</dimen>
+    <dimen name="dp_344">344dp</dimen>
+    <dimen name="dp_345">345dp</dimen>
+    <dimen name="dp_346">346dp</dimen>
+    <dimen name="dp_347">347dp</dimen>
+    <dimen name="dp_348">348dp</dimen>
+    <dimen name="dp_349">349dp</dimen>
+    <dimen name="dp_350">350dp</dimen>
+    <dimen name="dp_351">351dp</dimen>
+    <dimen name="dp_352">352dp</dimen>
+    <dimen name="dp_353">353dp</dimen>
+    <dimen name="dp_354">354dp</dimen>
+    <dimen name="dp_355">355dp</dimen>
+    <dimen name="dp_356">356dp</dimen>
+    <dimen name="dp_357">357dp</dimen>
+    <dimen name="dp_358">358dp</dimen>
+    <dimen name="dp_359">359dp</dimen>
+    <dimen name="dp_360">360dp</dimen>
+    <dimen name="dp_365">365dp</dimen>
+    <dimen name="dp_370">370dp</dimen>
+    <dimen name="dp_400">400dp</dimen>
+    <dimen name="dp_410">410dp</dimen>
+    <dimen name="dp_422">422dp</dimen>
+    <dimen name="dp_472">472dp</dimen>
+    <dimen name="dp_500">500dp</dimen>
+    <dimen name="dp_600">600dp</dimen>
+    <dimen name="dp_640">640dp</dimen>
+    <dimen name="dp_650">650dp</dimen>
+    <dimen name="dp_710">710dp</dimen>
+    <dimen name="dp_720">720dp</dimen>
+
+    <dimen name="title_bar_height">@dimen/dp_48</dimen>
+</resources>
\ No newline at end of file
diff --git a/system/base_resource/src/main/res/values/strings.xml b/system/base_resource/src/main/res/values/strings.xml
new file mode 100644
index 0000000..6b30d8d
--- /dev/null
+++ b/system/base_resource/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+
+</resources>
\ No newline at end of file
diff --git a/system/base_resource/src/main/res/values/styles.xml b/system/base_resource/src/main/res/values/styles.xml
new file mode 100644
index 0000000..91a0350
--- /dev/null
+++ b/system/base_resource/src/main/res/values/styles.xml
@@ -0,0 +1,15 @@
+<resources>
+
+    <!--圆角Dialog-->
+    <style name="MyDialog" parent="@android:style/Theme.Dialog">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:backgroundDimEnabled">true</item>
+        <item name="android:backgroundDimAmount">0.6</item>
+    </style>
+
+</resources>
diff --git a/system/base_resource/src/main/res/xml/file_paths.xml b/system/base_resource/src/main/res/xml/file_paths.xml
new file mode 100644
index 0000000..6a4e16e
--- /dev/null
+++ b/system/base_resource/src/main/res/xml/file_paths.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <files-path
+        name="files-path"
+        path="." />
+    <cache-path
+        name="cache-path"
+        path="." />
+    <external-path
+        name="external_storage_root"
+        path="." />
+    <external-files-path
+        name="external_file_path"
+        path="." />
+    <external-cache-path
+        name="external_cache_path"
+        path="." />
+    <!--配置root-path。这样子可以读取到sd卡和一些应用分身的目录，否则微信分身保存的图片，就会导致 java.lang.IllegalArgumentException: Failed to find configured root that contains /storage/emulated/999/tencent/MicroMsg/WeiXin/export1544062754693.jpg-->
+    <root-path
+        name="root-path"
+        path="" />
+</paths>
\ No newline at end of file
diff --git a/system/base_resource/src/main/res/xml/network_security_config.xml b/system/base_resource/src/main/res/xml/network_security_config.xml
new file mode 100644
index 0000000..dca93c0
--- /dev/null
+++ b/system/base_resource/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true" />
+</network-security-config>
\ No newline at end of file
diff --git a/system/basic/.gitignore b/system/basic/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/system/basic/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/system/basic/build.gradle b/system/basic/build.gradle
new file mode 100644
index 0000000..af80a6a
--- /dev/null
+++ b/system/basic/build.gradle
@@ -0,0 +1,41 @@
+plugins {
+    id 'com.android.library'
+}
+
+android {
+    compileSdkVersion 30
+    buildToolsVersion "7.0.0"
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 33
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+
+        vectorDrawables.useSupportLibrary = true
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    buildFeatures {
+        viewBinding true
+    }
+}
+
+dependencies {
+
+
+
+}
\ No newline at end of file
diff --git a/system/basic/consumer-rules.pro b/system/basic/consumer-rules.pro
new file mode 100644
index 0000000..e69de29
diff --git a/system/basic/proguard-rules.pro b/system/basic/proguard-rules.pro
new file mode 100644
index 0000000..481bb43
--- /dev/null
+++ b/system/basic/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/system/basic/src/main/AndroidManifest.xml b/system/basic/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..dff058e
--- /dev/null
+++ b/system/basic/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.sw.basic">
+
+</manifest>
\ No newline at end of file
diff --git a/system/basic/src/main/res/drawable/dialog_update.xml b/system/basic/src/main/res/drawable/dialog_update.xml
new file mode 100644
index 0000000..953019e
--- /dev/null
+++ b/system/basic/src/main/res/drawable/dialog_update.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <corners android:radius="5dp"/>
+    <solid android:color="@color/white"/>
+</shape>
\ No newline at end of file
diff --git a/system/basic/src/main/res/drawable/dialog_waiting.xml b/system/basic/src/main/res/drawable/dialog_waiting.xml
new file mode 100644
index 0000000..e15a0f3
--- /dev/null
+++ b/system/basic/src/main/res/drawable/dialog_waiting.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <corners android:radius="5dp"/>
+    <solid android:color="@color/black"/>
+</shape>
\ No newline at end of file
diff --git a/system/basic/src/main/res/drawable/shape_bottom_line.xml b/system/basic/src/main/res/drawable/shape_bottom_line.xml
new file mode 100644
index 0000000..36d2482
--- /dev/null
+++ b/system/basic/src/main/res/drawable/shape_bottom_line.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- 连框颜色值 -->
+    <item>
+        <shape>
+            <solid android:color="@color/colorTopLineGray" />
+        </shape>
+    </item>
+    <!-- 主体背景颜色值 -->
+    <item android:bottom="1dp">
+        <shape>
+            <solid android:color="@color/white" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/system/basic/src/main/res/values-sw1024dp/dimens.xml b/system/basic/src/main/res/values-sw1024dp/dimens.xml
new file mode 100644
index 0000000..1eabef0
--- /dev/null
+++ b/system/basic/src/main/res/values-sw1024dp/dimens.xml
@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+
+    <dimen name="txt5">10.6667sp</dimen>
+
+    <dimen name="txt6">12.8000sp</dimen>
+
+    <dimen name="txt7">14.9333sp</dimen>
+
+    <dimen name="txt8">17.0667sp</dimen>
+
+    <dimen name="txt9">19.2000sp</dimen>
+
+    <dimen name="txt10">21.3333sp</dimen>
+
+    <dimen name="txt11">23.4667sp</dimen>
+
+    <dimen name="txt12">25.6000sp</dimen>
+
+    <dimen name="txt13">27.7333sp</dimen>
+
+    <dimen name="txt14">29.8667sp</dimen>
+
+    <dimen name="txt15">32.0000sp</dimen>
+
+    <dimen name="txt16">34.1333sp</dimen>
+
+    <dimen name="txt17">36.2667sp</dimen>
+
+    <dimen name="txt18">38.4000sp</dimen>
+
+    <dimen name="txt19">40.5333sp</dimen>
+
+    <dimen name="txt20">42.6667sp</dimen>
+
+    <dimen name="txt21">44.8000sp</dimen>
+
+    <dimen name="txt22">46.9333sp</dimen>
+
+    <dimen name="txt24">51.2000sp</dimen>
+
+    <dimen name="txt26">55.4667sp</dimen>
+
+    <dimen name="txt28">59.7333sp</dimen>
+
+    <dimen name="txt30">64.0000sp</dimen>
+
+    <dimen name="txt32">68.2667sp</dimen>
+
+    <dimen name="txt34">72.5333sp</dimen>
+
+    <dimen name="card_common_margin_left">@dimen/dp_15</dimen>
+
+    <dimen name="dp_m_60">-128.0000dp</dimen>
+
+    <dimen name="dp_m_30">-64.0000dp</dimen>
+
+    <dimen name="dp_m_20">-42.6667dp</dimen>
+
+    <dimen name="dp_m_12">-25.6000dp</dimen>
+
+    <dimen name="dp_m_10">-21.3333dp</dimen>
+
+    <dimen name="dp_m_8">-17.0667dp</dimen>
+
+    <dimen name="dp_m_5">-10.6667dp</dimen>
+
+    <dimen name="dp_m_2">-4.2667dp</dimen>
+
+    <dimen name="dp_m_1">-2.1333dp</dimen>
+
+    <dimen name="dp_0">0.0000dp</dimen>
+
+    <dimen name="dp_0_1">0.2133dp</dimen>
+
+    <dimen name="dp_0_5">1.0667dp</dimen>
+
+    <dimen name="dp_1">2.1333dp</dimen>
+
+    <dimen name="dp_1_5">3.2000dp</dimen>
+
+    <dimen name="dp_2">4.2667dp</dimen>
+
+    <dimen name="dp_2_5">5.3333dp</dimen>
+
+    <dimen name="dp_3">6.4000dp</dimen>
+
+    <dimen name="dp_3_5">7.4667dp</dimen>
+
+    <dimen name="dp_4">8.5333dp</dimen>
+
+    <dimen name="dp_4_5">9.6000dp</dimen>
+
+    <dimen name="dp_5">10.6667dp</dimen>
+
+    <dimen name="dp_6">12.8000dp</dimen>
+
+    <dimen name="dp_7">14.9333dp</dimen>
+
+    <dimen name="dp_7_5">16.0000dp</dimen>
+
+    <dimen name="dp_8">17.0667dp</dimen>
+
+    <dimen name="dp_9">19.2000dp</dimen>
+
+    <dimen name="dp_10">21.3333dp</dimen>
+
+    <dimen name="dp_11">23.4667dp</dimen>
+
+    <dimen name="dp_12">25.6000dp</dimen>
+
+    <dimen name="dp_13">27.7333dp</dimen>
+
+    <dimen name="dp_14">29.8667dp</dimen>
+
+    <dimen name="dp_15">32.0000dp</dimen>
+
+    <dimen name="dp_16">34.1333dp</dimen>
+
+    <dimen name="dp_17">36.2667dp</dimen>
+
+    <dimen name="dp_18">38.4000dp</dimen>
+
+    <dimen name="dp_19">40.5333dp</dimen>
+
+    <dimen name="dp_20">42.6667dp</dimen>
+
+    <dimen name="dp_21">44.8000dp</dimen>
+
+    <dimen name="dp_22">46.9333dp</dimen>
+
+    <dimen name="dp_23">49.0667dp</dimen>
+
+    <dimen name="dp_24">51.2000dp</dimen>
+
+    <dimen name="dp_25">53.3333dp</dimen>
+
+    <dimen name="dp_26">55.4667dp</dimen>
+
+    <dimen name="dp_27">57.6000dp</dimen>
+
+    <dimen name="dp_28">59.7333dp</dimen>
+
+    <dimen name="dp_29">61.8667dp</dimen>
+
+    <dimen name="dp_30">64.0000dp</dimen>
+
+    <dimen name="dp_31">66.1333dp</dimen>
+
+    <dimen name="dp_32">68.2667dp</dimen>
+
+    <dimen name="dp_33">70.4000dp</dimen>
+
+    <dimen name="dp_34">72.5333dp</dimen>
+
+    <dimen name="dp_35">74.6667dp</dimen>
+
+    <dimen name="dp_36">76.8000dp</dimen>
+
+    <dimen name="dp_37">78.9333dp</dimen>
+
+    <dimen name="dp_38">81.0667dp</dimen>
+
+    <dimen name="dp_39">83.2000dp</dimen>
+
+    <dimen name="dp_40">85.3333dp</dimen>
+
+    <dimen name="dp_41">87.4667dp</dimen>
+
+    <dimen name="dp_42">89.6000dp</dimen>
+
+    <dimen name="dp_43">91.7333dp</dimen>
+
+    <dimen name="dp_44">93.8667dp</dimen>
+
+    <dimen name="dp_45">96.0000dp</dimen>
+
+    <dimen name="dp_46">98.1333dp</dimen>
+
+    <dimen name="dp_47">100.2667dp</dimen>
+
+    <dimen name="dp_48">102.4000dp</dimen>
+
+    <dimen name="dp_49">104.5333dp</dimen>
+
+    <dimen name="dp_50">106.6667dp</dimen>
+
+    <dimen name="dp_51">108.8000dp</dimen>
+
+    <dimen name="dp_52">110.9333dp</dimen>
+
+    <dimen name="dp_53">113.0667dp</dimen>
+
+    <dimen name="dp_54">115.2000dp</dimen>
+
+    <dimen name="dp_55">117.3333dp</dimen>
+
+    <dimen name="dp_56">119.4667dp</dimen>
+
+    <dimen name="dp_57">121.6000dp</dimen>
+
+    <dimen name="dp_58">123.7333dp</dimen>
+
+    <dimen name="dp_59">125.8667dp</dimen>
+
+    <dimen name="dp_60">128.0000dp</dimen>
+
+    <dimen name="dp_61">130.1333dp</dimen>
+
+    <dimen name="dp_62">132.2667dp</dimen>
+
+    <dimen name="dp_63">134.4000dp</dimen>
+
+    <dimen name="dp_64">136.5333dp</dimen>
+
+    <dimen name="dp_65">138.6667dp</dimen>
+
+    <dimen name="dp_66">140.8000dp</dimen>
+
+    <dimen name="dp_67">142.9333dp</dimen>
+
+    <dimen name="dp_68">145.0667dp</dimen>
+
+    <dimen name="dp_69">147.2000dp</dimen>
+
+    <dimen name="dp_70">149.3333dp</dimen>
+
+    <dimen name="dp_71">151.4667dp</dimen>
+
+    <dimen name="dp_72">153.6000dp</dimen>
+
+    <dimen name="dp_73">155.7333dp</dimen>
+
+    <dimen name="dp_74">157.8667dp</dimen>
+
+    <dimen name="dp_75">160.0000dp</dimen>
+
+    <dimen name="dp_76">162.1333dp</dimen>
+
+    <dimen name="dp_77">164.2667dp</dimen>
+
+    <dimen name="dp_78">166.4000dp</dimen>
+
+    <dimen name="dp_79">168.5333dp</dimen>
+
+    <dimen name="dp_80">170.6667dp</dimen>
+
+    <dimen name="dp_81">172.8000dp</dimen>
+
+    <dimen name="dp_82">174.9333dp</dimen>
+
+    <dimen name="dp_83">177.0667dp</dimen>
+
+    <dimen name="dp_84">179.2000dp</dimen>
+
+    <dimen name="dp_85">181.3333dp</dimen>
+
+    <dimen name="dp_86">183.4667dp</dimen>
+
+    <dimen name="dp_87">185.6000dp</dimen>
+
+    <dimen name="dp_88">187.7333dp</dimen>
+
+    <dimen name="dp_89">189.8667dp</dimen>
+
+    <dimen name="dp_90">192.0000dp</dimen>
+
+    <dimen name="dp_91">194.1333dp</dimen>
+
+    <dimen name="dp_92">196.2667dp</dimen>
+
+    <dimen name="dp_93">198.4000dp</dimen>
+
+    <dimen name="dp_94">200.5333dp</dimen>
+
+    <dimen name="dp_95">202.6667dp</dimen>
+
+    <dimen name="dp_96">204.8000dp</dimen>
+
+    <dimen name="dp_97">206.9333dp</dimen>
+
+    <dimen name="dp_98">209.0667dp</dimen>
+
+    <dimen name="dp_99">211.2000dp</dimen>
+
+    <dimen name="dp_100">213.3333dp</dimen>
+
+    <dimen name="dp_101">215.4667dp</dimen>
+
+    <dimen name="dp_102">217.6000dp</dimen>
+
+    <dimen name="dp_103">219.7333dp</dimen>
+
+    <dimen name="dp_104">221.8667dp</dimen>
+
+    <dimen name="dp_104_5">222.9333dp</dimen>
+
+    <dimen name="dp_105">224.0000dp</dimen>
+
+    <dimen name="dp_106">226.1333dp</dimen>
+
+    <dimen name="dp_107">228.2667dp</dimen>
+
+    <dimen name="dp_108">230.4000dp</dimen>
+
+    <dimen name="dp_109">232.5333dp</dimen>
+
+    <dimen name="dp_110">234.6667dp</dimen>
+
+    <dimen name="dp_111">236.8000dp</dimen>
+
+    <dimen name="dp_112">238.9333dp</dimen>
+
+    <dimen name="dp_113">241.0667dp</dimen>
+
+    <dimen name="dp_114">243.2000dp</dimen>
+
+    <dimen name="dp_115">245.3333dp</dimen>
+
+    <dimen name="dp_116">247.4667dp</dimen>
+
+    <dimen name="dp_117">249.6000dp</dimen>
+
+    <dimen name="dp_118">251.7333dp</dimen>
+
+    <dimen name="dp_119">253.8667dp</dimen>
+
+    <dimen name="dp_120">256.0000dp</dimen>
+
+    <dimen name="dp_121">258.1333dp</dimen>
+
+    <dimen name="dp_122">260.2667dp</dimen>
+
+    <dimen name="dp_123">262.4000dp</dimen>
+
+    <dimen name="dp_124">264.5333dp</dimen>
+
+    <dimen name="dp_125">266.6667dp</dimen>
+
+    <dimen name="dp_126">268.8000dp</dimen>
+
+    <dimen name="dp_127">270.9333dp</dimen>
+
+    <dimen name="dp_128">273.0667dp</dimen>
+
+    <dimen name="dp_129">275.2000dp</dimen>
+
+    <dimen name="dp_130">277.3333dp</dimen>
+
+    <dimen name="dp_131">279.4667dp</dimen>
+
+    <dimen name="dp_132">281.6000dp</dimen>
+
+    <dimen name="dp_133">283.7333dp</dimen>
+
+    <dimen name="dp_134">285.8667dp</dimen>
+
+    <dimen name="dp_134_5">286.9333dp</dimen>
+
+    <dimen name="dp_135">288.0000dp</dimen>
+
+    <dimen name="dp_136">290.1333dp</dimen>
+
+    <dimen name="dp_137">292.2667dp</dimen>
+
+    <dimen name="dp_138">294.4000dp</dimen>
+
+    <dimen name="dp_139">296.5333dp</dimen>
+
+    <dimen name="dp_140">298.6667dp</dimen>
+
+    <dimen name="dp_141">300.8000dp</dimen>
+
+    <dimen name="dp_142">302.9333dp</dimen>
+
+    <dimen name="dp_143">305.0667dp</dimen>
+
+    <dimen name="dp_144">307.2000dp</dimen>
+
+    <dimen name="dp_145">309.3333dp</dimen>
+
+    <dimen name="dp_146">311.4667dp</dimen>
+
+    <dimen name="dp_147">313.6000dp</dimen>
+
+    <dimen name="dp_148">315.7333dp</dimen>
+
+    <dimen name="dp_149">317.8667dp</dimen>
+
+    <dimen name="dp_150">320.0000dp</dimen>
+
+    <dimen name="dp_151">322.1333dp</dimen>
+
+    <dimen name="dp_152">324.2667dp</dimen>
+
+    <dimen name="dp_153">326.4000dp</dimen>
+
+    <dimen name="dp_154">328.5333dp</dimen>
+
+    <dimen name="dp_155">330.6667dp</dimen>
+
+    <dimen name="dp_156">332.8000dp</dimen>
+
+    <dimen name="dp_157">334.9333dp</dimen>
+
+    <dimen name="dp_158">337.0667dp</dimen>
+
+    <dimen name="dp_159">339.2000dp</dimen>
+
+    <dimen name="dp_160">341.3333dp</dimen>
+
+    <dimen name="dp_161">343.4667dp</dimen>
+
+    <dimen name="dp_162">345.6000dp</dimen>
+
+    <dimen name="dp_163">347.7333dp</dimen>
+
+    <dimen name="dp_164">349.8667dp</dimen>
+
+    <dimen name="dp_165">352.0000dp</dimen>
+
+    <dimen name="dp_166">354.1333dp</dimen>
+
+    <dimen name="dp_167">356.2667dp</dimen>
+
+    <dimen name="dp_168">358.4000dp</dimen>
+
+    <dimen name="dp_169">360.5333dp</dimen>
+
+    <dimen name="dp_170">362.6667dp</dimen>
+
+    <dimen name="dp_171">364.8000dp</dimen>
+
+    <dimen name="dp_172">366.9333dp</dimen>
+
+    <dimen name="dp_173">369.0667dp</dimen>
+
+    <dimen name="dp_174">371.2000dp</dimen>
+
+    <dimen name="dp_175">373.3333dp</dimen>
+
+    <dimen name="dp_176">375.4667dp</dimen>
+
+    <dimen name="dp_177">377.6000dp</dimen>
+
+    <dimen name="dp_178">379.7333dp</dimen>
+
+    <dimen name="dp_179">381.8667dp</dimen>
+
+    <dimen name="dp_180">384.0000dp</dimen>
+
+    <dimen name="dp_181">386.1333dp</dimen>
+
+    <dimen name="dp_182">388.2667dp</dimen>
+
+    <dimen name="dp_183">390.4000dp</dimen>
+
+    <dimen name="dp_184">392.5333dp</dimen>
+
+    <dimen name="dp_185">394.6667dp</dimen>
+
+    <dimen name="dp_186">396.8000dp</dimen>
+
+    <dimen name="dp_187">398.9333dp</dimen>
+
+    <dimen name="dp_188">401.0667dp</dimen>
+
+    <dimen name="dp_189">403.2000dp</dimen>
+
+    <dimen name="dp_190">405.3333dp</dimen>
+
+    <dimen name="dp_191">407.4667dp</dimen>
+
+    <dimen name="dp_191_25">408.0000dp</dimen>
+
+    <dimen name="dp_192">409.6000dp</dimen>
+
+    <dimen name="dp_193">411.7333dp</dimen>
+
+    <dimen name="dp_194">413.8667dp</dimen>
+
+    <dimen name="dp_195">416.0000dp</dimen>
+
+    <dimen name="dp_196">418.1333dp</dimen>
+
+    <dimen name="dp_197">420.2667dp</dimen>
+
+    <dimen name="dp_198">422.4000dp</dimen>
+
+    <dimen name="dp_199">424.5333dp</dimen>
+
+    <dimen name="dp_200">426.6667dp</dimen>
+
+    <dimen name="dp_201">428.8000dp</dimen>
+
+    <dimen name="dp_202">430.9333dp</dimen>
+
+    <dimen name="dp_203">433.0667dp</dimen>
+
+    <dimen name="dp_204">435.2000dp</dimen>
+
+    <dimen name="dp_205">437.3333dp</dimen>
+
+    <dimen name="dp_206">439.4667dp</dimen>
+
+    <dimen name="dp_207">441.6000dp</dimen>
+
+    <dimen name="dp_208">443.7333dp</dimen>
+
+    <dimen name="dp_209">445.8667dp</dimen>
+
+    <dimen name="dp_210">448.0000dp</dimen>
+
+    <dimen name="dp_211">450.1333dp</dimen>
+
+    <dimen name="dp_212">452.2667dp</dimen>
+
+    <dimen name="dp_213">454.4000dp</dimen>
+
+    <dimen name="dp_214">456.5333dp</dimen>
+
+    <dimen name="dp_215">458.6667dp</dimen>
+
+    <dimen name="dp_216">460.8000dp</dimen>
+
+    <dimen name="dp_217">462.9333dp</dimen>
+
+    <dimen name="dp_218">465.0667dp</dimen>
+
+    <dimen name="dp_219">467.2000dp</dimen>
+
+    <dimen name="dp_220">469.3333dp</dimen>
+
+    <dimen name="dp_221">471.4667dp</dimen>
+
+    <dimen name="dp_222">473.6000dp</dimen>
+
+    <dimen name="dp_223">475.7333dp</dimen>
+
+    <dimen name="dp_224">477.8667dp</dimen>
+
+    <dimen name="dp_225">480.0000dp</dimen>
+
+    <dimen name="dp_226">482.1333dp</dimen>
+
+    <dimen name="dp_227">484.2667dp</dimen>
+
+    <dimen name="dp_228">486.4000dp</dimen>
+
+    <dimen name="dp_229">488.5333dp</dimen>
+
+    <dimen name="dp_230">490.6667dp</dimen>
+
+    <dimen name="dp_231">492.8000dp</dimen>
+
+    <dimen name="dp_232">494.9333dp</dimen>
+
+    <dimen name="dp_233">497.0667dp</dimen>
+
+    <dimen name="dp_234">499.2000dp</dimen>
+
+    <dimen name="dp_235">501.3333dp</dimen>
+
+    <dimen name="dp_236">503.4667dp</dimen>
+
+    <dimen name="dp_237">505.6000dp</dimen>
+
+    <dimen name="dp_238">507.7333dp</dimen>
+
+    <dimen name="dp_239">509.8667dp</dimen>
+
+    <dimen name="dp_240">512.0000dp</dimen>
+
+    <dimen name="dp_241">514.1333dp</dimen>
+
+    <dimen name="dp_242">516.2667dp</dimen>
+
+    <dimen name="dp_243">518.4000dp</dimen>
+
+    <dimen name="dp_244">520.5333dp</dimen>
+
+    <dimen name="dp_245">522.6667dp</dimen>
+
+    <dimen name="dp_246">524.8000dp</dimen>
+
+    <dimen name="dp_247">526.9333dp</dimen>
+
+    <dimen name="dp_248">529.0667dp</dimen>
+
+    <dimen name="dp_249">531.2000dp</dimen>
+
+    <dimen name="dp_250">533.3333dp</dimen>
+
+    <dimen name="dp_251">535.4667dp</dimen>
+
+    <dimen name="dp_252">537.6000dp</dimen>
+
+    <dimen name="dp_253">539.7333dp</dimen>
+
+    <dimen name="dp_254">541.8667dp</dimen>
+
+    <dimen name="dp_255">544.0000dp</dimen>
+
+    <dimen name="dp_256">546.1333dp</dimen>
+
+    <dimen name="dp_257">548.2667dp</dimen>
+
+    <dimen name="dp_258">550.4000dp</dimen>
+
+    <dimen name="dp_259">552.5333dp</dimen>
+
+    <dimen name="dp_260">554.6667dp</dimen>
+
+    <dimen name="dp_261">556.8000dp</dimen>
+
+    <dimen name="dp_262">558.9333dp</dimen>
+
+    <dimen name="dp_263">561.0667dp</dimen>
+
+    <dimen name="dp_264">563.2000dp</dimen>
+
+    <dimen name="dp_265">565.3333dp</dimen>
+
+    <dimen name="dp_266">567.4667dp</dimen>
+
+    <dimen name="dp_267">569.6000dp</dimen>
+
+    <dimen name="dp_268">571.7333dp</dimen>
+
+    <dimen name="dp_269">573.8667dp</dimen>
+
+    <dimen name="dp_270">576.0000dp</dimen>
+
+    <dimen name="dp_271">578.1333dp</dimen>
+
+    <dimen name="dp_272">580.2667dp</dimen>
+
+    <dimen name="dp_273">582.4000dp</dimen>
+
+    <dimen name="dp_274">584.5333dp</dimen>
+
+    <dimen name="dp_275">586.6667dp</dimen>
+
+    <dimen name="dp_276">588.8000dp</dimen>
+
+    <dimen name="dp_277">590.9333dp</dimen>
+
+    <dimen name="dp_278">593.0667dp</dimen>
+
+    <dimen name="dp_279">595.2000dp</dimen>
+
+    <dimen name="dp_280">597.3333dp</dimen>
+
+    <dimen name="dp_281">599.4667dp</dimen>
+
+    <dimen name="dp_282">601.6000dp</dimen>
+
+    <dimen name="dp_283">603.7333dp</dimen>
+
+    <dimen name="dp_284">605.8667dp</dimen>
+
+    <dimen name="dp_285">608.0000dp</dimen>
+
+    <dimen name="dp_286">610.1333dp</dimen>
+
+    <dimen name="dp_287">612.2667dp</dimen>
+
+    <dimen name="dp_288">614.4000dp</dimen>
+
+    <dimen name="dp_289">616.5333dp</dimen>
+
+    <dimen name="dp_290">618.6667dp</dimen>
+
+    <dimen name="dp_291">620.8000dp</dimen>
+
+    <dimen name="dp_292">622.9333dp</dimen>
+
+    <dimen name="dp_293">625.0667dp</dimen>
+
+    <dimen name="dp_294">627.2000dp</dimen>
+
+    <dimen name="dp_295">629.3333dp</dimen>
+
+    <dimen name="dp_296">631.4667dp</dimen>
+
+    <dimen name="dp_297">633.6000dp</dimen>
+
+    <dimen name="dp_298">635.7333dp</dimen>
+
+    <dimen name="dp_299">637.8667dp</dimen>
+
+    <dimen name="dp_300">640.0000dp</dimen>
+
+    <dimen name="dp_301">642.1333dp</dimen>
+
+    <dimen name="dp_302">644.2667dp</dimen>
+
+    <dimen name="dp_303">646.4000dp</dimen>
+
+    <dimen name="dp_304">648.5333dp</dimen>
+
+    <dimen name="dp_305">650.6667dp</dimen>
+
+    <dimen name="dp_306">652.8000dp</dimen>
+
+    <dimen name="dp_307">654.9333dp</dimen>
+
+    <dimen name="dp_308">657.0667dp</dimen>
+
+    <dimen name="dp_309">659.2000dp</dimen>
+
+    <dimen name="dp_310">661.3333dp</dimen>
+
+    <dimen name="dp_311">663.4667dp</dimen>
+
+    <dimen name="dp_312">665.6000dp</dimen>
+
+    <dimen name="dp_313">667.7333dp</dimen>
+
+    <dimen name="dp_314">669.8667dp</dimen>
+
+    <dimen name="dp_315">672.0000dp</dimen>
+
+    <dimen name="dp_316">674.1333dp</dimen>
+
+    <dimen name="dp_317">676.2667dp</dimen>
+
+    <dimen name="dp_318">678.4000dp</dimen>
+
+    <dimen name="dp_319">680.5333dp</dimen>
+
+    <dimen name="dp_320">682.6667dp</dimen>
+
+    <dimen name="dp_321">684.8000dp</dimen>
+
+    <dimen name="dp_322">686.9333dp</dimen>
+
+    <dimen name="dp_323">689.0667dp</dimen>
+
+    <dimen name="dp_324">691.2000dp</dimen>
+
+    <dimen name="dp_325">693.3333dp</dimen>
+
+    <dimen name="dp_326">695.4667dp</dimen>
+
+    <dimen name="dp_327">697.6000dp</dimen>
+
+    <dimen name="dp_328">699.7333dp</dimen>
+
+    <dimen name="dp_329">701.8667dp</dimen>
+
+    <dimen name="dp_330">704.0000dp</dimen>
+
+    <dimen name="dp_331">706.1333dp</dimen>
+
+    <dimen name="dp_332">708.2667dp</dimen>
+
+    <dimen name="dp_333">710.4000dp</dimen>
+
+    <dimen name="dp_334">712.5333dp</dimen>
+
+    <dimen name="dp_335">714.6667dp</dimen>
+
+    <dimen name="dp_336">716.8000dp</dimen>
+
+    <dimen name="dp_337">718.9333dp</dimen>
+
+    <dimen name="dp_338">721.0667dp</dimen>
+
+    <dimen name="dp_339">723.2000dp</dimen>
+
+    <dimen name="dp_340">725.3333dp</dimen>
+
+    <dimen name="dp_341">727.4667dp</dimen>
+
+    <dimen name="dp_342">729.6000dp</dimen>
+
+    <dimen name="dp_343">731.7333dp</dimen>
+
+    <dimen name="dp_344">733.8667dp</dimen>
+
+    <dimen name="dp_345">736.0000dp</dimen>
+
+    <dimen name="dp_346">738.1333dp</dimen>
+
+    <dimen name="dp_347">740.2667dp</dimen>
+
+    <dimen name="dp_348">742.4000dp</dimen>
+
+    <dimen name="dp_349">744.5333dp</dimen>
+
+    <dimen name="dp_350">746.6667dp</dimen>
+
+    <dimen name="dp_351">748.8000dp</dimen>
+
+    <dimen name="dp_352">750.9333dp</dimen>
+
+    <dimen name="dp_353">753.0667dp</dimen>
+
+    <dimen name="dp_354">755.2000dp</dimen>
+
+    <dimen name="dp_355">757.3333dp</dimen>
+
+    <dimen name="dp_356">759.4667dp</dimen>
+
+    <dimen name="dp_357">761.6000dp</dimen>
+
+    <dimen name="dp_358">763.7333dp</dimen>
+
+    <dimen name="dp_359">765.8667dp</dimen>
+
+    <dimen name="dp_360">768.0000dp</dimen>
+
+    <dimen name="dp_365">778.6667dp</dimen>
+
+    <dimen name="dp_370">789.3333dp</dimen>
+
+    <dimen name="dp_400">853.3333dp</dimen>
+
+    <dimen name="dp_410">874.6667dp</dimen>
+
+    <dimen name="dp_422">900.2667dp</dimen>
+
+    <dimen name="dp_472">1006.9333dp</dimen>
+
+    <dimen name="dp_500">1066.6667dp</dimen>
+
+    <dimen name="dp_600">1280.0000dp</dimen>
+
+    <dimen name="dp_640">1365.3333dp</dimen>
+
+    <dimen name="dp_650">1386.6667dp</dimen>
+
+    <dimen name="dp_710">1514.6667dp</dimen>
+
+    <dimen name="dp_720">1536.0000dp</dimen>
+
+
+</resources>
diff --git a/system/basic/src/main/res/values-sw1280dp/dimens.xml b/system/basic/src/main/res/values-sw1280dp/dimens.xml
new file mode 100644
index 0000000..a8575f4
--- /dev/null
+++ b/system/basic/src/main/res/values-sw1280dp/dimens.xml
@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+
+    <dimen name="txt5">13.3333sp</dimen>
+
+    <dimen name="txt6">16.0000sp</dimen>
+
+    <dimen name="txt7">18.6667sp</dimen>
+
+    <dimen name="txt8">21.3333sp</dimen>
+
+    <dimen name="txt9">24.0000sp</dimen>
+
+    <dimen name="txt10">26.6667sp</dimen>
+
+    <dimen name="txt11">29.3333sp</dimen>
+
+    <dimen name="txt12">32.0000sp</dimen>
+
+    <dimen name="txt13">34.6667sp</dimen>
+
+    <dimen name="txt14">37.3333sp</dimen>
+
+    <dimen name="txt15">40.0000sp</dimen>
+
+    <dimen name="txt16">42.6667sp</dimen>
+
+    <dimen name="txt17">45.3333sp</dimen>
+
+    <dimen name="txt18">48.0000sp</dimen>
+
+    <dimen name="txt19">50.6667sp</dimen>
+
+    <dimen name="txt20">53.3333sp</dimen>
+
+    <dimen name="txt21">56.0000sp</dimen>
+
+    <dimen name="txt22">58.6667sp</dimen>
+
+    <dimen name="txt24">64.0000sp</dimen>
+
+    <dimen name="txt26">69.3333sp</dimen>
+
+    <dimen name="txt28">74.6667sp</dimen>
+
+    <dimen name="txt30">80.0000sp</dimen>
+
+    <dimen name="txt32">85.3333sp</dimen>
+
+    <dimen name="txt34">90.6667sp</dimen>
+
+    <dimen name="card_common_margin_left">@dimen/dp_15</dimen>
+
+    <dimen name="dp_m_60">-160.0000dp</dimen>
+
+    <dimen name="dp_m_30">-80.0000dp</dimen>
+
+    <dimen name="dp_m_20">-53.3333dp</dimen>
+
+    <dimen name="dp_m_12">-32.0000dp</dimen>
+
+    <dimen name="dp_m_10">-26.6667dp</dimen>
+
+    <dimen name="dp_m_8">-21.3333dp</dimen>
+
+    <dimen name="dp_m_5">-13.3333dp</dimen>
+
+    <dimen name="dp_m_2">-5.3333dp</dimen>
+
+    <dimen name="dp_m_1">-2.6667dp</dimen>
+
+    <dimen name="dp_0">0.0000dp</dimen>
+
+    <dimen name="dp_0_1">0.2667dp</dimen>
+
+    <dimen name="dp_0_5">1.3333dp</dimen>
+
+    <dimen name="dp_1">2.6667dp</dimen>
+
+    <dimen name="dp_1_5">4.0000dp</dimen>
+
+    <dimen name="dp_2">5.3333dp</dimen>
+
+    <dimen name="dp_2_5">6.6667dp</dimen>
+
+    <dimen name="dp_3">8.0000dp</dimen>
+
+    <dimen name="dp_3_5">9.3333dp</dimen>
+
+    <dimen name="dp_4">10.6667dp</dimen>
+
+    <dimen name="dp_4_5">12.0000dp</dimen>
+
+    <dimen name="dp_5">13.3333dp</dimen>
+
+    <dimen name="dp_6">16.0000dp</dimen>
+
+    <dimen name="dp_7">18.6667dp</dimen>
+
+    <dimen name="dp_7_5">20.0000dp</dimen>
+
+    <dimen name="dp_8">21.3333dp</dimen>
+
+    <dimen name="dp_9">24.0000dp</dimen>
+
+    <dimen name="dp_10">26.6667dp</dimen>
+
+    <dimen name="dp_11">29.3333dp</dimen>
+
+    <dimen name="dp_12">32.0000dp</dimen>
+
+    <dimen name="dp_13">34.6667dp</dimen>
+
+    <dimen name="dp_14">37.3333dp</dimen>
+
+    <dimen name="dp_15">40.0000dp</dimen>
+
+    <dimen name="dp_16">42.6667dp</dimen>
+
+    <dimen name="dp_17">45.3333dp</dimen>
+
+    <dimen name="dp_18">48.0000dp</dimen>
+
+    <dimen name="dp_19">50.6667dp</dimen>
+
+    <dimen name="dp_20">53.3333dp</dimen>
+
+    <dimen name="dp_21">56.0000dp</dimen>
+
+    <dimen name="dp_22">58.6667dp</dimen>
+
+    <dimen name="dp_23">61.3333dp</dimen>
+
+    <dimen name="dp_24">64.0000dp</dimen>
+
+    <dimen name="dp_25">66.6667dp</dimen>
+
+    <dimen name="dp_26">69.3333dp</dimen>
+
+    <dimen name="dp_27">72.0000dp</dimen>
+
+    <dimen name="dp_28">74.6667dp</dimen>
+
+    <dimen name="dp_29">77.3333dp</dimen>
+
+    <dimen name="dp_30">80.0000dp</dimen>
+
+    <dimen name="dp_31">82.6667dp</dimen>
+
+    <dimen name="dp_32">85.3333dp</dimen>
+
+    <dimen name="dp_33">88.0000dp</dimen>
+
+    <dimen name="dp_34">90.6667dp</dimen>
+
+    <dimen name="dp_35">93.3333dp</dimen>
+
+    <dimen name="dp_36">96.0000dp</dimen>
+
+    <dimen name="dp_37">98.6667dp</dimen>
+
+    <dimen name="dp_38">101.3333dp</dimen>
+
+    <dimen name="dp_39">104.0000dp</dimen>
+
+    <dimen name="dp_40">106.6667dp</dimen>
+
+    <dimen name="dp_41">109.3333dp</dimen>
+
+    <dimen name="dp_42">112.0000dp</dimen>
+
+    <dimen name="dp_43">114.6667dp</dimen>
+
+    <dimen name="dp_44">117.3333dp</dimen>
+
+    <dimen name="dp_45">120.0000dp</dimen>
+
+    <dimen name="dp_46">122.6667dp</dimen>
+
+    <dimen name="dp_47">125.3333dp</dimen>
+
+    <dimen name="dp_48">128.0000dp</dimen>
+
+    <dimen name="dp_49">130.6667dp</dimen>
+
+    <dimen name="dp_50">133.3333dp</dimen>
+
+    <dimen name="dp_51">136.0000dp</dimen>
+
+    <dimen name="dp_52">138.6667dp</dimen>
+
+    <dimen name="dp_53">141.3333dp</dimen>
+
+    <dimen name="dp_54">144.0000dp</dimen>
+
+    <dimen name="dp_55">146.6667dp</dimen>
+
+    <dimen name="dp_56">149.3333dp</dimen>
+
+    <dimen name="dp_57">152.0000dp</dimen>
+
+    <dimen name="dp_58">154.6667dp</dimen>
+
+    <dimen name="dp_59">157.3333dp</dimen>
+
+    <dimen name="dp_60">160.0000dp</dimen>
+
+    <dimen name="dp_61">162.6667dp</dimen>
+
+    <dimen name="dp_62">165.3333dp</dimen>
+
+    <dimen name="dp_63">168.0000dp</dimen>
+
+    <dimen name="dp_64">170.6667dp</dimen>
+
+    <dimen name="dp_65">173.3333dp</dimen>
+
+    <dimen name="dp_66">176.0000dp</dimen>
+
+    <dimen name="dp_67">178.6667dp</dimen>
+
+    <dimen name="dp_68">181.3333dp</dimen>
+
+    <dimen name="dp_69">184.0000dp</dimen>
+
+    <dimen name="dp_70">186.6667dp</dimen>
+
+    <dimen name="dp_71">189.3333dp</dimen>
+
+    <dimen name="dp_72">192.0000dp</dimen>
+
+    <dimen name="dp_73">194.6667dp</dimen>
+
+    <dimen name="dp_74">197.3333dp</dimen>
+
+    <dimen name="dp_75">200.0000dp</dimen>
+
+    <dimen name="dp_76">202.6667dp</dimen>
+
+    <dimen name="dp_77">205.3333dp</dimen>
+
+    <dimen name="dp_78">208.0000dp</dimen>
+
+    <dimen name="dp_79">210.6667dp</dimen>
+
+    <dimen name="dp_80">213.3333dp</dimen>
+
+    <dimen name="dp_81">216.0000dp</dimen>
+
+    <dimen name="dp_82">218.6667dp</dimen>
+
+    <dimen name="dp_83">221.3333dp</dimen>
+
+    <dimen name="dp_84">224.0000dp</dimen>
+
+    <dimen name="dp_85">226.6667dp</dimen>
+
+    <dimen name="dp_86">229.3333dp</dimen>
+
+    <dimen name="dp_87">232.0000dp</dimen>
+
+    <dimen name="dp_88">234.6667dp</dimen>
+
+    <dimen name="dp_89">237.3333dp</dimen>
+
+    <dimen name="dp_90">240.0000dp</dimen>
+
+    <dimen name="dp_91">242.6667dp</dimen>
+
+    <dimen name="dp_92">245.3333dp</dimen>
+
+    <dimen name="dp_93">248.0000dp</dimen>
+
+    <dimen name="dp_94">250.6667dp</dimen>
+
+    <dimen name="dp_95">253.3333dp</dimen>
+
+    <dimen name="dp_96">256.0000dp</dimen>
+
+    <dimen name="dp_97">258.6667dp</dimen>
+
+    <dimen name="dp_98">261.3333dp</dimen>
+
+    <dimen name="dp_99">264.0000dp</dimen>
+
+    <dimen name="dp_100">266.6667dp</dimen>
+
+    <dimen name="dp_101">269.3333dp</dimen>
+
+    <dimen name="dp_102">272.0000dp</dimen>
+
+    <dimen name="dp_103">274.6667dp</dimen>
+
+    <dimen name="dp_104">277.3333dp</dimen>
+
+    <dimen name="dp_104_5">278.6667dp</dimen>
+
+    <dimen name="dp_105">280.0000dp</dimen>
+
+    <dimen name="dp_106">282.6667dp</dimen>
+
+    <dimen name="dp_107">285.3333dp</dimen>
+
+    <dimen name="dp_108">288.0000dp</dimen>
+
+    <dimen name="dp_109">290.6667dp</dimen>
+
+    <dimen name="dp_110">293.3333dp</dimen>
+
+    <dimen name="dp_111">296.0000dp</dimen>
+
+    <dimen name="dp_112">298.6667dp</dimen>
+
+    <dimen name="dp_113">301.3333dp</dimen>
+
+    <dimen name="dp_114">304.0000dp</dimen>
+
+    <dimen name="dp_115">306.6667dp</dimen>
+
+    <dimen name="dp_116">309.3333dp</dimen>
+
+    <dimen name="dp_117">312.0000dp</dimen>
+
+    <dimen name="dp_118">314.6667dp</dimen>
+
+    <dimen name="dp_119">317.3333dp</dimen>
+
+    <dimen name="dp_120">320.0000dp</dimen>
+
+    <dimen name="dp_121">322.6667dp</dimen>
+
+    <dimen name="dp_122">325.3333dp</dimen>
+
+    <dimen name="dp_123">328.0000dp</dimen>
+
+    <dimen name="dp_124">330.6667dp</dimen>
+
+    <dimen name="dp_125">333.3333dp</dimen>
+
+    <dimen name="dp_126">336.0000dp</dimen>
+
+    <dimen name="dp_127">338.6667dp</dimen>
+
+    <dimen name="dp_128">341.3333dp</dimen>
+
+    <dimen name="dp_129">344.0000dp</dimen>
+
+    <dimen name="dp_130">346.6667dp</dimen>
+
+    <dimen name="dp_131">349.3333dp</dimen>
+
+    <dimen name="dp_132">352.0000dp</dimen>
+
+    <dimen name="dp_133">354.6667dp</dimen>
+
+    <dimen name="dp_134">357.3333dp</dimen>
+
+    <dimen name="dp_134_5">358.6667dp</dimen>
+
+    <dimen name="dp_135">360.0000dp</dimen>
+
+    <dimen name="dp_136">362.6667dp</dimen>
+
+    <dimen name="dp_137">365.3333dp</dimen>
+
+    <dimen name="dp_138">368.0000dp</dimen>
+
+    <dimen name="dp_139">370.6667dp</dimen>
+
+    <dimen name="dp_140">373.3333dp</dimen>
+
+    <dimen name="dp_141">376.0000dp</dimen>
+
+    <dimen name="dp_142">378.6667dp</dimen>
+
+    <dimen name="dp_143">381.3333dp</dimen>
+
+    <dimen name="dp_144">384.0000dp</dimen>
+
+    <dimen name="dp_145">386.6667dp</dimen>
+
+    <dimen name="dp_146">389.3333dp</dimen>
+
+    <dimen name="dp_147">392.0000dp</dimen>
+
+    <dimen name="dp_148">394.6667dp</dimen>
+
+    <dimen name="dp_149">397.3333dp</dimen>
+
+    <dimen name="dp_150">400.0000dp</dimen>
+
+    <dimen name="dp_151">402.6667dp</dimen>
+
+    <dimen name="dp_152">405.3333dp</dimen>
+
+    <dimen name="dp_153">408.0000dp</dimen>
+
+    <dimen name="dp_154">410.6667dp</dimen>
+
+    <dimen name="dp_155">413.3333dp</dimen>
+
+    <dimen name="dp_156">416.0000dp</dimen>
+
+    <dimen name="dp_157">418.6667dp</dimen>
+
+    <dimen name="dp_158">421.3333dp</dimen>
+
+    <dimen name="dp_159">424.0000dp</dimen>
+
+    <dimen name="dp_160">426.6667dp</dimen>
+
+    <dimen name="dp_161">429.3333dp</dimen>
+
+    <dimen name="dp_162">432.0000dp</dimen>
+
+    <dimen name="dp_163">434.6667dp</dimen>
+
+    <dimen name="dp_164">437.3333dp</dimen>
+
+    <dimen name="dp_165">440.0000dp</dimen>
+
+    <dimen name="dp_166">442.6667dp</dimen>
+
+    <dimen name="dp_167">445.3333dp</dimen>
+
+    <dimen name="dp_168">448.0000dp</dimen>
+
+    <dimen name="dp_169">450.6667dp</dimen>
+
+    <dimen name="dp_170">453.3333dp</dimen>
+
+    <dimen name="dp_171">456.0000dp</dimen>
+
+    <dimen name="dp_172">458.6667dp</dimen>
+
+    <dimen name="dp_173">461.3333dp</dimen>
+
+    <dimen name="dp_174">464.0000dp</dimen>
+
+    <dimen name="dp_175">466.6667dp</dimen>
+
+    <dimen name="dp_176">469.3333dp</dimen>
+
+    <dimen name="dp_177">472.0000dp</dimen>
+
+    <dimen name="dp_178">474.6667dp</dimen>
+
+    <dimen name="dp_179">477.3333dp</dimen>
+
+    <dimen name="dp_180">480.0000dp</dimen>
+
+    <dimen name="dp_181">482.6667dp</dimen>
+
+    <dimen name="dp_182">485.3333dp</dimen>
+
+    <dimen name="dp_183">488.0000dp</dimen>
+
+    <dimen name="dp_184">490.6667dp</dimen>
+
+    <dimen name="dp_185">493.3333dp</dimen>
+
+    <dimen name="dp_186">496.0000dp</dimen>
+
+    <dimen name="dp_187">498.6667dp</dimen>
+
+    <dimen name="dp_188">501.3333dp</dimen>
+
+    <dimen name="dp_189">504.0000dp</dimen>
+
+    <dimen name="dp_190">506.6667dp</dimen>
+
+    <dimen name="dp_191">509.3333dp</dimen>
+
+    <dimen name="dp_191_25">510.0000dp</dimen>
+
+    <dimen name="dp_192">512.0000dp</dimen>
+
+    <dimen name="dp_193">514.6667dp</dimen>
+
+    <dimen name="dp_194">517.3333dp</dimen>
+
+    <dimen name="dp_195">520.0000dp</dimen>
+
+    <dimen name="dp_196">522.6667dp</dimen>
+
+    <dimen name="dp_197">525.3333dp</dimen>
+
+    <dimen name="dp_198">528.0000dp</dimen>
+
+    <dimen name="dp_199">530.6667dp</dimen>
+
+    <dimen name="dp_200">533.3333dp</dimen>
+
+    <dimen name="dp_201">536.0000dp</dimen>
+
+    <dimen name="dp_202">538.6667dp</dimen>
+
+    <dimen name="dp_203">541.3333dp</dimen>
+
+    <dimen name="dp_204">544.0000dp</dimen>
+
+    <dimen name="dp_205">546.6667dp</dimen>
+
+    <dimen name="dp_206">549.3333dp</dimen>
+
+    <dimen name="dp_207">552.0000dp</dimen>
+
+    <dimen name="dp_208">554.6667dp</dimen>
+
+    <dimen name="dp_209">557.3333dp</dimen>
+
+    <dimen name="dp_210">560.0000dp</dimen>
+
+    <dimen name="dp_211">562.6667dp</dimen>
+
+    <dimen name="dp_212">565.3333dp</dimen>
+
+    <dimen name="dp_213">568.0000dp</dimen>
+
+    <dimen name="dp_214">570.6667dp</dimen>
+
+    <dimen name="dp_215">573.3333dp</dimen>
+
+    <dimen name="dp_216">576.0000dp</dimen>
+
+    <dimen name="dp_217">578.6667dp</dimen>
+
+    <dimen name="dp_218">581.3333dp</dimen>
+
+    <dimen name="dp_219">584.0000dp</dimen>
+
+    <dimen name="dp_220">586.6667dp</dimen>
+
+    <dimen name="dp_221">589.3333dp</dimen>
+
+    <dimen name="dp_222">592.0000dp</dimen>
+
+    <dimen name="dp_223">594.6667dp</dimen>
+
+    <dimen name="dp_224">597.3333dp</dimen>
+
+    <dimen name="dp_225">600.0000dp</dimen>
+
+    <dimen name="dp_226">602.6667dp</dimen>
+
+    <dimen name="dp_227">605.3333dp</dimen>
+
+    <dimen name="dp_228">608.0000dp</dimen>
+
+    <dimen name="dp_229">610.6667dp</dimen>
+
+    <dimen name="dp_230">613.3333dp</dimen>
+
+    <dimen name="dp_231">616.0000dp</dimen>
+
+    <dimen name="dp_232">618.6667dp</dimen>
+
+    <dimen name="dp_233">621.3333dp</dimen>
+
+    <dimen name="dp_234">624.0000dp</dimen>
+
+    <dimen name="dp_235">626.6667dp</dimen>
+
+    <dimen name="dp_236">629.3333dp</dimen>
+
+    <dimen name="dp_237">632.0000dp</dimen>
+
+    <dimen name="dp_238">634.6667dp</dimen>
+
+    <dimen name="dp_239">637.3333dp</dimen>
+
+    <dimen name="dp_240">640.0000dp</dimen>
+
+    <dimen name="dp_241">642.6667dp</dimen>
+
+    <dimen name="dp_242">645.3333dp</dimen>
+
+    <dimen name="dp_243">648.0000dp</dimen>
+
+    <dimen name="dp_244">650.6667dp</dimen>
+
+    <dimen name="dp_245">653.3333dp</dimen>
+
+    <dimen name="dp_246">656.0000dp</dimen>
+
+    <dimen name="dp_247">658.6667dp</dimen>
+
+    <dimen name="dp_248">661.3333dp</dimen>
+
+    <dimen name="dp_249">664.0000dp</dimen>
+
+    <dimen name="dp_250">666.6667dp</dimen>
+
+    <dimen name="dp_251">669.3333dp</dimen>
+
+    <dimen name="dp_252">672.0000dp</dimen>
+
+    <dimen name="dp_253">674.6667dp</dimen>
+
+    <dimen name="dp_254">677.3333dp</dimen>
+
+    <dimen name="dp_255">680.0000dp</dimen>
+
+    <dimen name="dp_256">682.6667dp</dimen>
+
+    <dimen name="dp_257">685.3333dp</dimen>
+
+    <dimen name="dp_258">688.0000dp</dimen>
+
+    <dimen name="dp_259">690.6667dp</dimen>
+
+    <dimen name="dp_260">693.3333dp</dimen>
+
+    <dimen name="dp_261">696.0000dp</dimen>
+
+    <dimen name="dp_262">698.6667dp</dimen>
+
+    <dimen name="dp_263">701.3333dp</dimen>
+
+    <dimen name="dp_264">704.0000dp</dimen>
+
+    <dimen name="dp_265">706.6667dp</dimen>
+
+    <dimen name="dp_266">709.3333dp</dimen>
+
+    <dimen name="dp_267">712.0000dp</dimen>
+
+    <dimen name="dp_268">714.6667dp</dimen>
+
+    <dimen name="dp_269">717.3333dp</dimen>
+
+    <dimen name="dp_270">720.0000dp</dimen>
+
+    <dimen name="dp_271">722.6667dp</dimen>
+
+    <dimen name="dp_272">725.3333dp</dimen>
+
+    <dimen name="dp_273">728.0000dp</dimen>
+
+    <dimen name="dp_274">730.6667dp</dimen>
+
+    <dimen name="dp_275">733.3333dp</dimen>
+
+    <dimen name="dp_276">736.0000dp</dimen>
+
+    <dimen name="dp_277">738.6667dp</dimen>
+
+    <dimen name="dp_278">741.3333dp</dimen>
+
+    <dimen name="dp_279">744.0000dp</dimen>
+
+    <dimen name="dp_280">746.6667dp</dimen>
+
+    <dimen name="dp_281">749.3333dp</dimen>
+
+    <dimen name="dp_282">752.0000dp</dimen>
+
+    <dimen name="dp_283">754.6667dp</dimen>
+
+    <dimen name="dp_284">757.3333dp</dimen>
+
+    <dimen name="dp_285">760.0000dp</dimen>
+
+    <dimen name="dp_286">762.6667dp</dimen>
+
+    <dimen name="dp_287">765.3333dp</dimen>
+
+    <dimen name="dp_288">768.0000dp</dimen>
+
+    <dimen name="dp_289">770.6667dp</dimen>
+
+    <dimen name="dp_290">773.3333dp</dimen>
+
+    <dimen name="dp_291">776.0000dp</dimen>
+
+    <dimen name="dp_292">778.6667dp</dimen>
+
+    <dimen name="dp_293">781.3333dp</dimen>
+
+    <dimen name="dp_294">784.0000dp</dimen>
+
+    <dimen name="dp_295">786.6667dp</dimen>
+
+    <dimen name="dp_296">789.3333dp</dimen>
+
+    <dimen name="dp_297">792.0000dp</dimen>
+
+    <dimen name="dp_298">794.6667dp</dimen>
+
+    <dimen name="dp_299">797.3333dp</dimen>
+
+    <dimen name="dp_300">800.0000dp</dimen>
+
+    <dimen name="dp_301">802.6667dp</dimen>
+
+    <dimen name="dp_302">805.3333dp</dimen>
+
+    <dimen name="dp_303">808.0000dp</dimen>
+
+    <dimen name="dp_304">810.6667dp</dimen>
+
+    <dimen name="dp_305">813.3333dp</dimen>
+
+    <dimen name="dp_306">816.0000dp</dimen>
+
+    <dimen name="dp_307">818.6667dp</dimen>
+
+    <dimen name="dp_308">821.3333dp</dimen>
+
+    <dimen name="dp_309">824.0000dp</dimen>
+
+    <dimen name="dp_310">826.6667dp</dimen>
+
+    <dimen name="dp_311">829.3333dp</dimen>
+
+    <dimen name="dp_312">832.0000dp</dimen>
+
+    <dimen name="dp_313">834.6667dp</dimen>
+
+    <dimen name="dp_314">837.3333dp</dimen>
+
+    <dimen name="dp_315">840.0000dp</dimen>
+
+    <dimen name="dp_316">842.6667dp</dimen>
+
+    <dimen name="dp_317">845.3333dp</dimen>
+
+    <dimen name="dp_318">848.0000dp</dimen>
+
+    <dimen name="dp_319">850.6667dp</dimen>
+
+    <dimen name="dp_320">853.3333dp</dimen>
+
+    <dimen name="dp_321">856.0000dp</dimen>
+
+    <dimen name="dp_322">858.6667dp</dimen>
+
+    <dimen name="dp_323">861.3333dp</dimen>
+
+    <dimen name="dp_324">864.0000dp</dimen>
+
+    <dimen name="dp_325">866.6667dp</dimen>
+
+    <dimen name="dp_326">869.3333dp</dimen>
+
+    <dimen name="dp_327">872.0000dp</dimen>
+
+    <dimen name="dp_328">874.6667dp</dimen>
+
+    <dimen name="dp_329">877.3333dp</dimen>
+
+    <dimen name="dp_330">880.0000dp</dimen>
+
+    <dimen name="dp_331">882.6667dp</dimen>
+
+    <dimen name="dp_332">885.3333dp</dimen>
+
+    <dimen name="dp_333">888.0000dp</dimen>
+
+    <dimen name="dp_334">890.6667dp</dimen>
+
+    <dimen name="dp_335">893.3333dp</dimen>
+
+    <dimen name="dp_336">896.0000dp</dimen>
+
+    <dimen name="dp_337">898.6667dp</dimen>
+
+    <dimen name="dp_338">901.3333dp</dimen>
+
+    <dimen name="dp_339">904.0000dp</dimen>
+
+    <dimen name="dp_340">906.6667dp</dimen>
+
+    <dimen name="dp_341">909.3333dp</dimen>
+
+    <dimen name="dp_342">912.0000dp</dimen>
+
+    <dimen name="dp_343">914.6667dp</dimen>
+
+    <dimen name="dp_344">917.3333dp</dimen>
+
+    <dimen name="dp_345">920.0000dp</dimen>
+
+    <dimen name="dp_346">922.6667dp</dimen>
+
+    <dimen name="dp_347">925.3333dp</dimen>
+
+    <dimen name="dp_348">928.0000dp</dimen>
+
+    <dimen name="dp_349">930.6667dp</dimen>
+
+    <dimen name="dp_350">933.3333dp</dimen>
+
+    <dimen name="dp_351">936.0000dp</dimen>
+
+    <dimen name="dp_352">938.6667dp</dimen>
+
+    <dimen name="dp_353">941.3333dp</dimen>
+
+    <dimen name="dp_354">944.0000dp</dimen>
+
+    <dimen name="dp_355">946.6667dp</dimen>
+
+    <dimen name="dp_356">949.3333dp</dimen>
+
+    <dimen name="dp_357">952.0000dp</dimen>
+
+    <dimen name="dp_358">954.6667dp</dimen>
+
+    <dimen name="dp_359">957.3333dp</dimen>
+
+    <dimen name="dp_360">960.0000dp</dimen>
+
+    <dimen name="dp_365">973.3333dp</dimen>
+
+    <dimen name="dp_370">986.6667dp</dimen>
+
+    <dimen name="dp_400">1066.6667dp</dimen>
+
+    <dimen name="dp_410">1093.3333dp</dimen>
+
+    <dimen name="dp_422">1125.3333dp</dimen>
+
+    <dimen name="dp_472">1258.6667dp</dimen>
+
+    <dimen name="dp_500">1333.3333dp</dimen>
+
+    <dimen name="dp_600">1600.0000dp</dimen>
+
+    <dimen name="dp_640">1706.6667dp</dimen>
+
+    <dimen name="dp_650">1733.3333dp</dimen>
+
+    <dimen name="dp_710">1893.3333dp</dimen>
+
+    <dimen name="dp_720">1920.0000dp</dimen>
+
+
+</resources>
diff --git a/system/basic/src/main/res/values-sw1365dp/dimens.xml b/system/basic/src/main/res/values-sw1365dp/dimens.xml
new file mode 100644
index 0000000..bc36f03
--- /dev/null
+++ b/system/basic/src/main/res/values-sw1365dp/dimens.xml
@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+
+    <dimen name="txt5">14.2188sp</dimen>
+
+    <dimen name="txt6">17.0625sp</dimen>
+
+    <dimen name="txt7">19.9062sp</dimen>
+
+    <dimen name="txt8">22.7500sp</dimen>
+
+    <dimen name="txt9">25.5938sp</dimen>
+
+    <dimen name="txt10">28.4375sp</dimen>
+
+    <dimen name="txt11">31.2812sp</dimen>
+
+    <dimen name="txt12">34.1250sp</dimen>
+
+    <dimen name="txt13">36.9688sp</dimen>
+
+    <dimen name="txt14">39.8125sp</dimen>
+
+    <dimen name="txt15">42.6562sp</dimen>
+
+    <dimen name="txt16">45.5000sp</dimen>
+
+    <dimen name="txt17">48.3438sp</dimen>
+
+    <dimen name="txt18">51.1875sp</dimen>
+
+    <dimen name="txt19">54.0312sp</dimen>
+
+    <dimen name="txt20">56.8750sp</dimen>
+
+    <dimen name="txt21">59.7188sp</dimen>
+
+    <dimen name="txt22">62.5625sp</dimen>
+
+    <dimen name="txt24">68.2500sp</dimen>
+
+    <dimen name="txt26">73.9375sp</dimen>
+
+    <dimen name="txt28">79.6250sp</dimen>
+
+    <dimen name="txt30">85.3125sp</dimen>
+
+    <dimen name="txt32">91.0000sp</dimen>
+
+    <dimen name="txt34">96.6875sp</dimen>
+
+    <dimen name="card_common_margin_left">@dimen/dp_15</dimen>
+
+    <dimen name="dp_m_60">-170.6250dp</dimen>
+
+    <dimen name="dp_m_30">-85.3125dp</dimen>
+
+    <dimen name="dp_m_20">-56.8750dp</dimen>
+
+    <dimen name="dp_m_12">-34.1250dp</dimen>
+
+    <dimen name="dp_m_10">-28.4375dp</dimen>
+
+    <dimen name="dp_m_8">-22.7500dp</dimen>
+
+    <dimen name="dp_m_5">-14.2188dp</dimen>
+
+    <dimen name="dp_m_2">-5.6875dp</dimen>
+
+    <dimen name="dp_m_1">-2.8438dp</dimen>
+
+    <dimen name="dp_0">0.0000dp</dimen>
+
+    <dimen name="dp_0_1">0.2844dp</dimen>
+
+    <dimen name="dp_0_5">1.4219dp</dimen>
+
+    <dimen name="dp_1">2.8438dp</dimen>
+
+    <dimen name="dp_1_5">4.2656dp</dimen>
+
+    <dimen name="dp_2">5.6875dp</dimen>
+
+    <dimen name="dp_2_5">7.1094dp</dimen>
+
+    <dimen name="dp_3">8.5312dp</dimen>
+
+    <dimen name="dp_3_5">9.9531dp</dimen>
+
+    <dimen name="dp_4">11.3750dp</dimen>
+
+    <dimen name="dp_4_5">12.7969dp</dimen>
+
+    <dimen name="dp_5">14.2188dp</dimen>
+
+    <dimen name="dp_6">17.0625dp</dimen>
+
+    <dimen name="dp_7">19.9062dp</dimen>
+
+    <dimen name="dp_7_5">21.3281dp</dimen>
+
+    <dimen name="dp_8">22.7500dp</dimen>
+
+    <dimen name="dp_9">25.5938dp</dimen>
+
+    <dimen name="dp_10">28.4375dp</dimen>
+
+    <dimen name="dp_11">31.2812dp</dimen>
+
+    <dimen name="dp_12">34.1250dp</dimen>
+
+    <dimen name="dp_13">36.9688dp</dimen>
+
+    <dimen name="dp_14">39.8125dp</dimen>
+
+    <dimen name="dp_15">42.6562dp</dimen>
+
+    <dimen name="dp_16">45.5000dp</dimen>
+
+    <dimen name="dp_17">48.3438dp</dimen>
+
+    <dimen name="dp_18">51.1875dp</dimen>
+
+    <dimen name="dp_19">54.0312dp</dimen>
+
+    <dimen name="dp_20">56.8750dp</dimen>
+
+    <dimen name="dp_21">59.7188dp</dimen>
+
+    <dimen name="dp_22">62.5625dp</dimen>
+
+    <dimen name="dp_23">65.4062dp</dimen>
+
+    <dimen name="dp_24">68.2500dp</dimen>
+
+    <dimen name="dp_25">71.0938dp</dimen>
+
+    <dimen name="dp_26">73.9375dp</dimen>
+
+    <dimen name="dp_27">76.7812dp</dimen>
+
+    <dimen name="dp_28">79.6250dp</dimen>
+
+    <dimen name="dp_29">82.4688dp</dimen>
+
+    <dimen name="dp_30">85.3125dp</dimen>
+
+    <dimen name="dp_31">88.1562dp</dimen>
+
+    <dimen name="dp_32">91.0000dp</dimen>
+
+    <dimen name="dp_33">93.8438dp</dimen>
+
+    <dimen name="dp_34">96.6875dp</dimen>
+
+    <dimen name="dp_35">99.5312dp</dimen>
+
+    <dimen name="dp_36">102.3750dp</dimen>
+
+    <dimen name="dp_37">105.2188dp</dimen>
+
+    <dimen name="dp_38">108.0625dp</dimen>
+
+    <dimen name="dp_39">110.9062dp</dimen>
+
+    <dimen name="dp_40">113.7500dp</dimen>
+
+    <dimen name="dp_41">116.5938dp</dimen>
+
+    <dimen name="dp_42">119.4375dp</dimen>
+
+    <dimen name="dp_43">122.2812dp</dimen>
+
+    <dimen name="dp_44">125.1250dp</dimen>
+
+    <dimen name="dp_45">127.9688dp</dimen>
+
+    <dimen name="dp_46">130.8125dp</dimen>
+
+    <dimen name="dp_47">133.6562dp</dimen>
+
+    <dimen name="dp_48">136.5000dp</dimen>
+
+    <dimen name="dp_49">139.3438dp</dimen>
+
+    <dimen name="dp_50">142.1875dp</dimen>
+
+    <dimen name="dp_51">145.0312dp</dimen>
+
+    <dimen name="dp_52">147.8750dp</dimen>
+
+    <dimen name="dp_53">150.7188dp</dimen>
+
+    <dimen name="dp_54">153.5625dp</dimen>
+
+    <dimen name="dp_55">156.4062dp</dimen>
+
+    <dimen name="dp_56">159.2500dp</dimen>
+
+    <dimen name="dp_57">162.0938dp</dimen>
+
+    <dimen name="dp_58">164.9375dp</dimen>
+
+    <dimen name="dp_59">167.7812dp</dimen>
+
+    <dimen name="dp_60">170.6250dp</dimen>
+
+    <dimen name="dp_61">173.4688dp</dimen>
+
+    <dimen name="dp_62">176.3125dp</dimen>
+
+    <dimen name="dp_63">179.1562dp</dimen>
+
+    <dimen name="dp_64">182.0000dp</dimen>
+
+    <dimen name="dp_65">184.8438dp</dimen>
+
+    <dimen name="dp_66">187.6875dp</dimen>
+
+    <dimen name="dp_67">190.5312dp</dimen>
+
+    <dimen name="dp_68">193.3750dp</dimen>
+
+    <dimen name="dp_69">196.2188dp</dimen>
+
+    <dimen name="dp_70">199.0625dp</dimen>
+
+    <dimen name="dp_71">201.9062dp</dimen>
+
+    <dimen name="dp_72">204.7500dp</dimen>
+
+    <dimen name="dp_73">207.5938dp</dimen>
+
+    <dimen name="dp_74">210.4375dp</dimen>
+
+    <dimen name="dp_75">213.2812dp</dimen>
+
+    <dimen name="dp_76">216.1250dp</dimen>
+
+    <dimen name="dp_77">218.9688dp</dimen>
+
+    <dimen name="dp_78">221.8125dp</dimen>
+
+    <dimen name="dp_79">224.6562dp</dimen>
+
+    <dimen name="dp_80">227.5000dp</dimen>
+
+    <dimen name="dp_81">230.3438dp</dimen>
+
+    <dimen name="dp_82">233.1875dp</dimen>
+
+    <dimen name="dp_83">236.0312dp</dimen>
+
+    <dimen name="dp_84">238.8750dp</dimen>
+
+    <dimen name="dp_85">241.7188dp</dimen>
+
+    <dimen name="dp_86">244.5625dp</dimen>
+
+    <dimen name="dp_87">247.4062dp</dimen>
+
+    <dimen name="dp_88">250.2500dp</dimen>
+
+    <dimen name="dp_89">253.0938dp</dimen>
+
+    <dimen name="dp_90">255.9375dp</dimen>
+
+    <dimen name="dp_91">258.7812dp</dimen>
+
+    <dimen name="dp_92">261.6250dp</dimen>
+
+    <dimen name="dp_93">264.4688dp</dimen>
+
+    <dimen name="dp_94">267.3125dp</dimen>
+
+    <dimen name="dp_95">270.1562dp</dimen>
+
+    <dimen name="dp_96">273.0000dp</dimen>
+
+    <dimen name="dp_97">275.8438dp</dimen>
+
+    <dimen name="dp_98">278.6875dp</dimen>
+
+    <dimen name="dp_99">281.5312dp</dimen>
+
+    <dimen name="dp_100">284.3750dp</dimen>
+
+    <dimen name="dp_101">287.2188dp</dimen>
+
+    <dimen name="dp_102">290.0625dp</dimen>
+
+    <dimen name="dp_103">292.9062dp</dimen>
+
+    <dimen name="dp_104">295.7500dp</dimen>
+
+    <dimen name="dp_104_5">297.1719dp</dimen>
+
+    <dimen name="dp_105">298.5938dp</dimen>
+
+    <dimen name="dp_106">301.4375dp</dimen>
+
+    <dimen name="dp_107">304.2812dp</dimen>
+
+    <dimen name="dp_108">307.1250dp</dimen>
+
+    <dimen name="dp_109">309.9688dp</dimen>
+
+    <dimen name="dp_110">312.8125dp</dimen>
+
+    <dimen name="dp_111">315.6562dp</dimen>
+
+    <dimen name="dp_112">318.5000dp</dimen>
+
+    <dimen name="dp_113">321.3438dp</dimen>
+
+    <dimen name="dp_114">324.1875dp</dimen>
+
+    <dimen name="dp_115">327.0312dp</dimen>
+
+    <dimen name="dp_116">329.8750dp</dimen>
+
+    <dimen name="dp_117">332.7188dp</dimen>
+
+    <dimen name="dp_118">335.5625dp</dimen>
+
+    <dimen name="dp_119">338.4062dp</dimen>
+
+    <dimen name="dp_120">341.2500dp</dimen>
+
+    <dimen name="dp_121">344.0938dp</dimen>
+
+    <dimen name="dp_122">346.9375dp</dimen>
+
+    <dimen name="dp_123">349.7812dp</dimen>
+
+    <dimen name="dp_124">352.6250dp</dimen>
+
+    <dimen name="dp_125">355.4688dp</dimen>
+
+    <dimen name="dp_126">358.3125dp</dimen>
+
+    <dimen name="dp_127">361.1562dp</dimen>
+
+    <dimen name="dp_128">364.0000dp</dimen>
+
+    <dimen name="dp_129">366.8438dp</dimen>
+
+    <dimen name="dp_130">369.6875dp</dimen>
+
+    <dimen name="dp_131">372.5312dp</dimen>
+
+    <dimen name="dp_132">375.3750dp</dimen>
+
+    <dimen name="dp_133">378.2188dp</dimen>
+
+    <dimen name="dp_134">381.0625dp</dimen>
+
+    <dimen name="dp_134_5">382.4844dp</dimen>
+
+    <dimen name="dp_135">383.9062dp</dimen>
+
+    <dimen name="dp_136">386.7500dp</dimen>
+
+    <dimen name="dp_137">389.5938dp</dimen>
+
+    <dimen name="dp_138">392.4375dp</dimen>
+
+    <dimen name="dp_139">395.2812dp</dimen>
+
+    <dimen name="dp_140">398.1250dp</dimen>
+
+    <dimen name="dp_141">400.9688dp</dimen>
+
+    <dimen name="dp_142">403.8125dp</dimen>
+
+    <dimen name="dp_143">406.6562dp</dimen>
+
+    <dimen name="dp_144">409.5000dp</dimen>
+
+    <dimen name="dp_145">412.3438dp</dimen>
+
+    <dimen name="dp_146">415.1875dp</dimen>
+
+    <dimen name="dp_147">418.0312dp</dimen>
+
+    <dimen name="dp_148">420.8750dp</dimen>
+
+    <dimen name="dp_149">423.7188dp</dimen>
+
+    <dimen name="dp_150">426.5625dp</dimen>
+
+    <dimen name="dp_151">429.4062dp</dimen>
+
+    <dimen name="dp_152">432.2500dp</dimen>
+
+    <dimen name="dp_153">435.0938dp</dimen>
+
+    <dimen name="dp_154">437.9375dp</dimen>
+
+    <dimen name="dp_155">440.7812dp</dimen>
+
+    <dimen name="dp_156">443.6250dp</dimen>
+
+    <dimen name="dp_157">446.4688dp</dimen>
+
+    <dimen name="dp_158">449.3125dp</dimen>
+
+    <dimen name="dp_159">452.1562dp</dimen>
+
+    <dimen name="dp_160">455.0000dp</dimen>
+
+    <dimen name="dp_161">457.8438dp</dimen>
+
+    <dimen name="dp_162">460.6875dp</dimen>
+
+    <dimen name="dp_163">463.5312dp</dimen>
+
+    <dimen name="dp_164">466.3750dp</dimen>
+
+    <dimen name="dp_165">469.2188dp</dimen>
+
+    <dimen name="dp_166">472.0625dp</dimen>
+
+    <dimen name="dp_167">474.9062dp</dimen>
+
+    <dimen name="dp_168">477.7500dp</dimen>
+
+    <dimen name="dp_169">480.5938dp</dimen>
+
+    <dimen name="dp_170">483.4375dp</dimen>
+
+    <dimen name="dp_171">486.2812dp</dimen>
+
+    <dimen name="dp_172">489.1250dp</dimen>
+
+    <dimen name="dp_173">491.9688dp</dimen>
+
+    <dimen name="dp_174">494.8125dp</dimen>
+
+    <dimen name="dp_175">497.6562dp</dimen>
+
+    <dimen name="dp_176">500.5000dp</dimen>
+
+    <dimen name="dp_177">503.3438dp</dimen>
+
+    <dimen name="dp_178">506.1875dp</dimen>
+
+    <dimen name="dp_179">509.0312dp</dimen>
+
+    <dimen name="dp_180">511.8750dp</dimen>
+
+    <dimen name="dp_181">514.7188dp</dimen>
+
+    <dimen name="dp_182">517.5625dp</dimen>
+
+    <dimen name="dp_183">520.4062dp</dimen>
+
+    <dimen name="dp_184">523.2500dp</dimen>
+
+    <dimen name="dp_185">526.0938dp</dimen>
+
+    <dimen name="dp_186">528.9375dp</dimen>
+
+    <dimen name="dp_187">531.7812dp</dimen>
+
+    <dimen name="dp_188">534.6250dp</dimen>
+
+    <dimen name="dp_189">537.4688dp</dimen>
+
+    <dimen name="dp_190">540.3125dp</dimen>
+
+    <dimen name="dp_191">543.1562dp</dimen>
+
+    <dimen name="dp_191_25">543.8672dp</dimen>
+
+    <dimen name="dp_192">546.0000dp</dimen>
+
+    <dimen name="dp_193">548.8438dp</dimen>
+
+    <dimen name="dp_194">551.6875dp</dimen>
+
+    <dimen name="dp_195">554.5312dp</dimen>
+
+    <dimen name="dp_196">557.3750dp</dimen>
+
+    <dimen name="dp_197">560.2188dp</dimen>
+
+    <dimen name="dp_198">563.0625dp</dimen>
+
+    <dimen name="dp_199">565.9062dp</dimen>
+
+    <dimen name="dp_200">568.7500dp</dimen>
+
+    <dimen name="dp_201">571.5938dp</dimen>
+
+    <dimen name="dp_202">574.4375dp</dimen>
+
+    <dimen name="dp_203">577.2812dp</dimen>
+
+    <dimen name="dp_204">580.1250dp</dimen>
+
+    <dimen name="dp_205">582.9688dp</dimen>
+
+    <dimen name="dp_206">585.8125dp</dimen>
+
+    <dimen name="dp_207">588.6562dp</dimen>
+
+    <dimen name="dp_208">591.5000dp</dimen>
+
+    <dimen name="dp_209">594.3438dp</dimen>
+
+    <dimen name="dp_210">597.1875dp</dimen>
+
+    <dimen name="dp_211">600.0312dp</dimen>
+
+    <dimen name="dp_212">602.8750dp</dimen>
+
+    <dimen name="dp_213">605.7188dp</dimen>
+
+    <dimen name="dp_214">608.5625dp</dimen>
+
+    <dimen name="dp_215">611.4062dp</dimen>
+
+    <dimen name="dp_216">614.2500dp</dimen>
+
+    <dimen name="dp_217">617.0938dp</dimen>
+
+    <dimen name="dp_218">619.9375dp</dimen>
+
+    <dimen name="dp_219">622.7812dp</dimen>
+
+    <dimen name="dp_220">625.6250dp</dimen>
+
+    <dimen name="dp_221">628.4688dp</dimen>
+
+    <dimen name="dp_222">631.3125dp</dimen>
+
+    <dimen name="dp_223">634.1562dp</dimen>
+
+    <dimen name="dp_224">637.0000dp</dimen>
+
+    <dimen name="dp_225">639.8438dp</dimen>
+
+    <dimen name="dp_226">642.6875dp</dimen>
+
+    <dimen name="dp_227">645.5312dp</dimen>
+
+    <dimen name="dp_228">648.3750dp</dimen>
+
+    <dimen name="dp_229">651.2188dp</dimen>
+
+    <dimen name="dp_230">654.0625dp</dimen>
+
+    <dimen name="dp_231">656.9062dp</dimen>
+
+    <dimen name="dp_232">659.7500dp</dimen>
+
+    <dimen name="dp_233">662.5938dp</dimen>
+
+    <dimen name="dp_234">665.4375dp</dimen>
+
+    <dimen name="dp_235">668.2812dp</dimen>
+
+    <dimen name="dp_236">671.1250dp</dimen>
+
+    <dimen name="dp_237">673.9688dp</dimen>
+
+    <dimen name="dp_238">676.8125dp</dimen>
+
+    <dimen name="dp_239">679.6562dp</dimen>
+
+    <dimen name="dp_240">682.5000dp</dimen>
+
+    <dimen name="dp_241">685.3438dp</dimen>
+
+    <dimen name="dp_242">688.1875dp</dimen>
+
+    <dimen name="dp_243">691.0312dp</dimen>
+
+    <dimen name="dp_244">693.8750dp</dimen>
+
+    <dimen name="dp_245">696.7188dp</dimen>
+
+    <dimen name="dp_246">699.5625dp</dimen>
+
+    <dimen name="dp_247">702.4062dp</dimen>
+
+    <dimen name="dp_248">705.2500dp</dimen>
+
+    <dimen name="dp_249">708.0938dp</dimen>
+
+    <dimen name="dp_250">710.9375dp</dimen>
+
+    <dimen name="dp_251">713.7812dp</dimen>
+
+    <dimen name="dp_252">716.6250dp</dimen>
+
+    <dimen name="dp_253">719.4688dp</dimen>
+
+    <dimen name="dp_254">722.3125dp</dimen>
+
+    <dimen name="dp_255">725.1562dp</dimen>
+
+    <dimen name="dp_256">728.0000dp</dimen>
+
+    <dimen name="dp_257">730.8438dp</dimen>
+
+    <dimen name="dp_258">733.6875dp</dimen>
+
+    <dimen name="dp_259">736.5312dp</dimen>
+
+    <dimen name="dp_260">739.3750dp</dimen>
+
+    <dimen name="dp_261">742.2188dp</dimen>
+
+    <dimen name="dp_262">745.0625dp</dimen>
+
+    <dimen name="dp_263">747.9062dp</dimen>
+
+    <dimen name="dp_264">750.7500dp</dimen>
+
+    <dimen name="dp_265">753.5938dp</dimen>
+
+    <dimen name="dp_266">756.4375dp</dimen>
+
+    <dimen name="dp_267">759.2812dp</dimen>
+
+    <dimen name="dp_268">762.1250dp</dimen>
+
+    <dimen name="dp_269">764.9688dp</dimen>
+
+    <dimen name="dp_270">767.8125dp</dimen>
+
+    <dimen name="dp_271">770.6562dp</dimen>
+
+    <dimen name="dp_272">773.5000dp</dimen>
+
+    <dimen name="dp_273">776.3438dp</dimen>
+
+    <dimen name="dp_274">779.1875dp</dimen>
+
+    <dimen name="dp_275">782.0312dp</dimen>
+
+    <dimen name="dp_276">784.8750dp</dimen>
+
+    <dimen name="dp_277">787.7188dp</dimen>
+
+    <dimen name="dp_278">790.5625dp</dimen>
+
+    <dimen name="dp_279">793.4062dp</dimen>
+
+    <dimen name="dp_280">796.2500dp</dimen>
+
+    <dimen name="dp_281">799.0938dp</dimen>
+
+    <dimen name="dp_282">801.9375dp</dimen>
+
+    <dimen name="dp_283">804.7812dp</dimen>
+
+    <dimen name="dp_284">807.6250dp</dimen>
+
+    <dimen name="dp_285">810.4688dp</dimen>
+
+    <dimen name="dp_286">813.3125dp</dimen>
+
+    <dimen name="dp_287">816.1562dp</dimen>
+
+    <dimen name="dp_288">819.0000dp</dimen>
+
+    <dimen name="dp_289">821.8438dp</dimen>
+
+    <dimen name="dp_290">824.6875dp</dimen>
+
+    <dimen name="dp_291">827.5312dp</dimen>
+
+    <dimen name="dp_292">830.3750dp</dimen>
+
+    <dimen name="dp_293">833.2188dp</dimen>
+
+    <dimen name="dp_294">836.0625dp</dimen>
+
+    <dimen name="dp_295">838.9062dp</dimen>
+
+    <dimen name="dp_296">841.7500dp</dimen>
+
+    <dimen name="dp_297">844.5938dp</dimen>
+
+    <dimen name="dp_298">847.4375dp</dimen>
+
+    <dimen name="dp_299">850.2812dp</dimen>
+
+    <dimen name="dp_300">853.1250dp</dimen>
+
+    <dimen name="dp_301">855.9688dp</dimen>
+
+    <dimen name="dp_302">858.8125dp</dimen>
+
+    <dimen name="dp_303">861.6562dp</dimen>
+
+    <dimen name="dp_304">864.5000dp</dimen>
+
+    <dimen name="dp_305">867.3438dp</dimen>
+
+    <dimen name="dp_306">870.1875dp</dimen>
+
+    <dimen name="dp_307">873.0312dp</dimen>
+
+    <dimen name="dp_308">875.8750dp</dimen>
+
+    <dimen name="dp_309">878.7188dp</dimen>
+
+    <dimen name="dp_310">881.5625dp</dimen>
+
+    <dimen name="dp_311">884.4062dp</dimen>
+
+    <dimen name="dp_312">887.2500dp</dimen>
+
+    <dimen name="dp_313">890.0938dp</dimen>
+
+    <dimen name="dp_314">892.9375dp</dimen>
+
+    <dimen name="dp_315">895.7812dp</dimen>
+
+    <dimen name="dp_316">898.6250dp</dimen>
+
+    <dimen name="dp_317">901.4688dp</dimen>
+
+    <dimen name="dp_318">904.3125dp</dimen>
+
+    <dimen name="dp_319">907.1562dp</dimen>
+
+    <dimen name="dp_320">910.0000dp</dimen>
+
+    <dimen name="dp_321">912.8438dp</dimen>
+
+    <dimen name="dp_322">915.6875dp</dimen>
+
+    <dimen name="dp_323">918.5312dp</dimen>
+
+    <dimen name="dp_324">921.3750dp</dimen>
+
+    <dimen name="dp_325">924.2188dp</dimen>
+
+    <dimen name="dp_326">927.0625dp</dimen>
+
+    <dimen name="dp_327">929.9062dp</dimen>
+
+    <dimen name="dp_328">932.7500dp</dimen>
+
+    <dimen name="dp_329">935.5938dp</dimen>
+
+    <dimen name="dp_330">938.4375dp</dimen>
+
+    <dimen name="dp_331">941.2812dp</dimen>
+
+    <dimen name="dp_332">944.1250dp</dimen>
+
+    <dimen name="dp_333">946.9688dp</dimen>
+
+    <dimen name="dp_334">949.8125dp</dimen>
+
+    <dimen name="dp_335">952.6562dp</dimen>
+
+    <dimen name="dp_336">955.5000dp</dimen>
+
+    <dimen name="dp_337">958.3438dp</dimen>
+
+    <dimen name="dp_338">961.1875dp</dimen>
+
+    <dimen name="dp_339">964.0312dp</dimen>
+
+    <dimen name="dp_340">966.8750dp</dimen>
+
+    <dimen name="dp_341">969.7188dp</dimen>
+
+    <dimen name="dp_342">972.5625dp</dimen>
+
+    <dimen name="dp_343">975.4062dp</dimen>
+
+    <dimen name="dp_344">978.2500dp</dimen>
+
+    <dimen name="dp_345">981.0938dp</dimen>
+
+    <dimen name="dp_346">983.9375dp</dimen>
+
+    <dimen name="dp_347">986.7812dp</dimen>
+
+    <dimen name="dp_348">989.6250dp</dimen>
+
+    <dimen name="dp_349">992.4688dp</dimen>
+
+    <dimen name="dp_350">995.3125dp</dimen>
+
+    <dimen name="dp_351">998.1562dp</dimen>
+
+    <dimen name="dp_352">1001.0000dp</dimen>
+
+    <dimen name="dp_353">1003.8438dp</dimen>
+
+    <dimen name="dp_354">1006.6875dp</dimen>
+
+    <dimen name="dp_355">1009.5312dp</dimen>
+
+    <dimen name="dp_356">1012.3750dp</dimen>
+
+    <dimen name="dp_357">1015.2188dp</dimen>
+
+    <dimen name="dp_358">1018.0625dp</dimen>
+
+    <dimen name="dp_359">1020.9062dp</dimen>
+
+    <dimen name="dp_360">1023.7500dp</dimen>
+
+    <dimen name="dp_365">1037.9688dp</dimen>
+
+    <dimen name="dp_370">1052.1875dp</dimen>
+
+    <dimen name="dp_400">1137.5000dp</dimen>
+
+    <dimen name="dp_410">1165.9375dp</dimen>
+
+    <dimen name="dp_422">1200.0625dp</dimen>
+
+    <dimen name="dp_472">1342.2500dp</dimen>
+
+    <dimen name="dp_500">1421.8750dp</dimen>
+
+    <dimen name="dp_600">1706.2500dp</dimen>
+
+    <dimen name="dp_640">1820.0000dp</dimen>
+
+    <dimen name="dp_650">1848.4375dp</dimen>
+
+    <dimen name="dp_710">2019.0625dp</dimen>
+
+    <dimen name="dp_720">2047.5000dp</dimen>
+
+
+</resources>
diff --git a/system/basic/src/main/res/values-sw240dp/dimens.xml b/system/basic/src/main/res/values-sw240dp/dimens.xml
new file mode 100644
index 0000000..acbafcb
--- /dev/null
+++ b/system/basic/src/main/res/values-sw240dp/dimens.xml
@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+
+    <dimen name="txt5">2.5000sp</dimen>
+
+    <dimen name="txt6">3.0000sp</dimen>
+
+    <dimen name="txt7">3.5000sp</dimen>
+
+    <dimen name="txt8">4.0000sp</dimen>
+
+    <dimen name="txt9">4.5000sp</dimen>
+
+    <dimen name="txt10">5.0000sp</dimen>
+
+    <dimen name="txt11">5.5000sp</dimen>
+
+    <dimen name="txt12">6.0000sp</dimen>
+
+    <dimen name="txt13">6.5000sp</dimen>
+
+    <dimen name="txt14">7.0000sp</dimen>
+
+    <dimen name="txt15">7.5000sp</dimen>
+
+    <dimen name="txt16">8.0000sp</dimen>
+
+    <dimen name="txt17">8.5000sp</dimen>
+
+    <dimen name="txt18">9.0000sp</dimen>
+
+    <dimen name="txt19">9.5000sp</dimen>
+
+    <dimen name="txt20">10.0000sp</dimen>
+
+    <dimen name="txt21">10.5000sp</dimen>
+
+    <dimen name="txt22">11.0000sp</dimen>
+
+    <dimen name="txt24">12.0000sp</dimen>
+
+    <dimen name="txt26">13.0000sp</dimen>
+
+    <dimen name="txt28">14.0000sp</dimen>
+
+    <dimen name="txt30">15.0000sp</dimen>
+
+    <dimen name="txt32">16.0000sp</dimen>
+
+    <dimen name="txt34">17.0000sp</dimen>
+
+    <dimen name="card_common_margin_left">@dimen/dp_15</dimen>
+
+    <dimen name="dp_m_60">-30.0000dp</dimen>
+
+    <dimen name="dp_m_30">-15.0000dp</dimen>
+
+    <dimen name="dp_m_20">-10.0000dp</dimen>
+
+    <dimen name="dp_m_12">-6.0000dp</dimen>
+
+    <dimen name="dp_m_10">-5.0000dp</dimen>
+
+    <dimen name="dp_m_8">-4.0000dp</dimen>
+
+    <dimen name="dp_m_5">-2.5000dp</dimen>
+
+    <dimen name="dp_m_2">-1.0000dp</dimen>
+
+    <dimen name="dp_m_1">-0.5000dp</dimen>
+
+    <dimen name="dp_0">0.0000dp</dimen>
+
+    <dimen name="dp_0_1">0.0500dp</dimen>
+
+    <dimen name="dp_0_5">0.2500dp</dimen>
+
+    <dimen name="dp_1">0.5000dp</dimen>
+
+    <dimen name="dp_1_5">0.7500dp</dimen>
+
+    <dimen name="dp_2">1.0000dp</dimen>
+
+    <dimen name="dp_2_5">1.2500dp</dimen>
+
+    <dimen name="dp_3">1.5000dp</dimen>
+
+    <dimen name="dp_3_5">1.7500dp</dimen>
+
+    <dimen name="dp_4">2.0000dp</dimen>
+
+    <dimen name="dp_4_5">2.2500dp</dimen>
+
+    <dimen name="dp_5">2.5000dp</dimen>
+
+    <dimen name="dp_6">3.0000dp</dimen>
+
+    <dimen name="dp_7">3.5000dp</dimen>
+
+    <dimen name="dp_7_5">3.7500dp</dimen>
+
+    <dimen name="dp_8">4.0000dp</dimen>
+
+    <dimen name="dp_9">4.5000dp</dimen>
+
+    <dimen name="dp_10">5.0000dp</dimen>
+
+    <dimen name="dp_11">5.5000dp</dimen>
+
+    <dimen name="dp_12">6.0000dp</dimen>
+
+    <dimen name="dp_13">6.5000dp</dimen>
+
+    <dimen name="dp_14">7.0000dp</dimen>
+
+    <dimen name="dp_15">7.5000dp</dimen>
+
+    <dimen name="dp_16">8.0000dp</dimen>
+
+    <dimen name="dp_17">8.5000dp</dimen>
+
+    <dimen name="dp_18">9.0000dp</dimen>
+
+    <dimen name="dp_19">9.5000dp</dimen>
+
+    <dimen name="dp_20">10.0000dp</dimen>
+
+    <dimen name="dp_21">10.5000dp</dimen>
+
+    <dimen name="dp_22">11.0000dp</dimen>
+
+    <dimen name="dp_23">11.5000dp</dimen>
+
+    <dimen name="dp_24">12.0000dp</dimen>
+
+    <dimen name="dp_25">12.5000dp</dimen>
+
+    <dimen name="dp_26">13.0000dp</dimen>
+
+    <dimen name="dp_27">13.5000dp</dimen>
+
+    <dimen name="dp_28">14.0000dp</dimen>
+
+    <dimen name="dp_29">14.5000dp</dimen>
+
+    <dimen name="dp_30">15.0000dp</dimen>
+
+    <dimen name="dp_31">15.5000dp</dimen>
+
+    <dimen name="dp_32">16.0000dp</dimen>
+
+    <dimen name="dp_33">16.5000dp</dimen>
+
+    <dimen name="dp_34">17.0000dp</dimen>
+
+    <dimen name="dp_35">17.5000dp</dimen>
+
+    <dimen name="dp_36">18.0000dp</dimen>
+
+    <dimen name="dp_37">18.5000dp</dimen>
+
+    <dimen name="dp_38">19.0000dp</dimen>
+
+    <dimen name="dp_39">19.5000dp</dimen>
+
+    <dimen name="dp_40">20.0000dp</dimen>
+
+    <dimen name="dp_41">20.5000dp</dimen>
+
+    <dimen name="dp_42">21.0000dp</dimen>
+
+    <dimen name="dp_43">21.5000dp</dimen>
+
+    <dimen name="dp_44">22.0000dp</dimen>
+
+    <dimen name="dp_45">22.5000dp</dimen>
+
+    <dimen name="dp_46">23.0000dp</dimen>
+
+    <dimen name="dp_47">23.5000dp</dimen>
+
+    <dimen name="dp_48">24.0000dp</dimen>
+
+    <dimen name="dp_49">24.5000dp</dimen>
+
+    <dimen name="dp_50">25.0000dp</dimen>
+
+    <dimen name="dp_51">25.5000dp</dimen>
+
+    <dimen name="dp_52">26.0000dp</dimen>
+
+    <dimen name="dp_53">26.5000dp</dimen>
+
+    <dimen name="dp_54">27.0000dp</dimen>
+
+    <dimen name="dp_55">27.5000dp</dimen>
+
+    <dimen name="dp_56">28.0000dp</dimen>
+
+    <dimen name="dp_57">28.5000dp</dimen>
+
+    <dimen name="dp_58">29.0000dp</dimen>
+
+    <dimen name="dp_59">29.5000dp</dimen>
+
+    <dimen name="dp_60">30.0000dp</dimen>
+
+    <dimen name="dp_61">30.5000dp</dimen>
+
+    <dimen name="dp_62">31.0000dp</dimen>
+
+    <dimen name="dp_63">31.5000dp</dimen>
+
+    <dimen name="dp_64">32.0000dp</dimen>
+
+    <dimen name="dp_65">32.5000dp</dimen>
+
+    <dimen name="dp_66">33.0000dp</dimen>
+
+    <dimen name="dp_67">33.5000dp</dimen>
+
+    <dimen name="dp_68">34.0000dp</dimen>
+
+    <dimen name="dp_69">34.5000dp</dimen>
+
+    <dimen name="dp_70">35.0000dp</dimen>
+
+    <dimen name="dp_71">35.5000dp</dimen>
+
+    <dimen name="dp_72">36.0000dp</dimen>
+
+    <dimen name="dp_73">36.5000dp</dimen>
+
+    <dimen name="dp_74">37.0000dp</dimen>
+
+    <dimen name="dp_75">37.5000dp</dimen>
+
+    <dimen name="dp_76">38.0000dp</dimen>
+
+    <dimen name="dp_77">38.5000dp</dimen>
+
+    <dimen name="dp_78">39.0000dp</dimen>
+
+    <dimen name="dp_79">39.5000dp</dimen>
+
+    <dimen name="dp_80">40.0000dp</dimen>
+
+    <dimen name="dp_81">40.5000dp</dimen>
+
+    <dimen name="dp_82">41.0000dp</dimen>
+
+    <dimen name="dp_83">41.5000dp</dimen>
+
+    <dimen name="dp_84">42.0000dp</dimen>
+
+    <dimen name="dp_85">42.5000dp</dimen>
+
+    <dimen name="dp_86">43.0000dp</dimen>
+
+    <dimen name="dp_87">43.5000dp</dimen>
+
+    <dimen name="dp_88">44.0000dp</dimen>
+
+    <dimen name="dp_89">44.5000dp</dimen>
+
+    <dimen name="dp_90">45.0000dp</dimen>
+
+    <dimen name="dp_91">45.5000dp</dimen>
+
+    <dimen name="dp_92">46.0000dp</dimen>
+
+    <dimen name="dp_93">46.5000dp</dimen>
+
+    <dimen name="dp_94">47.0000dp</dimen>
+
+    <dimen name="dp_95">47.5000dp</dimen>
+
+    <dimen name="dp_96">48.0000dp</dimen>
+
+    <dimen name="dp_97">48.5000dp</dimen>
+
+    <dimen name="dp_98">49.0000dp</dimen>
+
+    <dimen name="dp_99">49.5000dp</dimen>
+
+    <dimen name="dp_100">50.0000dp</dimen>
+
+    <dimen name="dp_101">50.5000dp</dimen>
+
+    <dimen name="dp_102">51.0000dp</dimen>
+
+    <dimen name="dp_103">51.5000dp</dimen>
+
+    <dimen name="dp_104">52.0000dp</dimen>
+
+    <dimen name="dp_104_5">52.2500dp</dimen>
+
+    <dimen name="dp_105">52.5000dp</dimen>
+
+    <dimen name="dp_106">53.0000dp</dimen>
+
+    <dimen name="dp_107">53.5000dp</dimen>
+
+    <dimen name="dp_108">54.0000dp</dimen>
+
+    <dimen name="dp_109">54.5000dp</dimen>
+
+    <dimen name="dp_110">55.0000dp</dimen>
+
+    <dimen name="dp_111">55.5000dp</dimen>
+
+    <dimen name="dp_112">56.0000dp</dimen>
+
+    <dimen name="dp_113">56.5000dp</dimen>
+
+    <dimen name="dp_114">57.0000dp</dimen>
+
+    <dimen name="dp_115">57.5000dp</dimen>
+
+    <dimen name="dp_116">58.0000dp</dimen>
+
+    <dimen name="dp_117">58.5000dp</dimen>
+
+    <dimen name="dp_118">59.0000dp</dimen>
+
+    <dimen name="dp_119">59.5000dp</dimen>
+
+    <dimen name="dp_120">60.0000dp</dimen>
+
+    <dimen name="dp_121">60.5000dp</dimen>
+
+    <dimen name="dp_122">61.0000dp</dimen>
+
+    <dimen name="dp_123">61.5000dp</dimen>
+
+    <dimen name="dp_124">62.0000dp</dimen>
+
+    <dimen name="dp_125">62.5000dp</dimen>
+
+    <dimen name="dp_126">63.0000dp</dimen>
+
+    <dimen name="dp_127">63.5000dp</dimen>
+
+    <dimen name="dp_128">64.0000dp</dimen>
+
+    <dimen name="dp_129">64.5000dp</dimen>
+
+    <dimen name="dp_130">65.0000dp</dimen>
+
+    <dimen name="dp_131">65.5000dp</dimen>
+
+    <dimen name="dp_132">66.0000dp</dimen>
+
+    <dimen name="dp_133">66.5000dp</dimen>
+
+    <dimen name="dp_134">67.0000dp</dimen>
+
+    <dimen name="dp_134_5">67.2500dp</dimen>
+
+    <dimen name="dp_135">67.5000dp</dimen>
+
+    <dimen name="dp_136">68.0000dp</dimen>
+
+    <dimen name="dp_137">68.5000dp</dimen>
+
+    <dimen name="dp_138">69.0000dp</dimen>
+
+    <dimen name="dp_139">69.5000dp</dimen>
+
+    <dimen name="dp_140">70.0000dp</dimen>
+
+    <dimen name="dp_141">70.5000dp</dimen>
+
+    <dimen name="dp_142">71.0000dp</dimen>
+
+    <dimen name="dp_143">71.5000dp</dimen>
+
+    <dimen name="dp_144">72.0000dp</dimen>
+
+    <dimen name="dp_145">72.5000dp</dimen>
+
+    <dimen name="dp_146">73.0000dp</dimen>
+
+    <dimen name="dp_147">73.5000dp</dimen>
+
+    <dimen name="dp_148">74.0000dp</dimen>
+
+    <dimen name="dp_149">74.5000dp</dimen>
+
+    <dimen name="dp_150">75.0000dp</dimen>
+
+    <dimen name="dp_151">75.5000dp</dimen>
+
+    <dimen name="dp_152">76.0000dp</dimen>
+
+    <dimen name="dp_153">76.5000dp</dimen>
+
+    <dimen name="dp_154">77.0000dp</dimen>
+
+    <dimen name="dp_155">77.5000dp</dimen>
+
+    <dimen name="dp_156">78.0000dp</dimen>
+
+    <dimen name="dp_157">78.5000dp</dimen>
+
+    <dimen name="dp_158">79.0000dp</dimen>
+
+    <dimen name="dp_159">79.5000dp</dimen>
+
+    <dimen name="dp_160">80.0000dp</dimen>
+
+    <dimen name="dp_161">80.5000dp</dimen>
+
+    <dimen name="dp_162">81.0000dp</dimen>
+
+    <dimen name="dp_163">81.5000dp</dimen>
+
+    <dimen name="dp_164">82.0000dp</dimen>
+
+    <dimen name="dp_165">82.5000dp</dimen>
+
+    <dimen name="dp_166">83.0000dp</dimen>
+
+    <dimen name="dp_167">83.5000dp</dimen>
+
+    <dimen name="dp_168">84.0000dp</dimen>
+
+    <dimen name="dp_169">84.5000dp</dimen>
+
+    <dimen name="dp_170">85.0000dp</dimen>
+
+    <dimen name="dp_171">85.5000dp</dimen>
+
+    <dimen name="dp_172">86.0000dp</dimen>
+
+    <dimen name="dp_173">86.5000dp</dimen>
+
+    <dimen name="dp_174">87.0000dp</dimen>
+
+    <dimen name="dp_175">87.5000dp</dimen>
+
+    <dimen name="dp_176">88.0000dp</dimen>
+
+    <dimen name="dp_177">88.5000dp</dimen>
+
+    <dimen name="dp_178">89.0000dp</dimen>
+
+    <dimen name="dp_179">89.5000dp</dimen>
+
+    <dimen name="dp_180">90.0000dp</dimen>
+
+    <dimen name="dp_181">90.5000dp</dimen>
+
+    <dimen name="dp_182">91.0000dp</dimen>
+
+    <dimen name="dp_183">91.5000dp</dimen>
+
+    <dimen name="dp_184">92.0000dp</dimen>
+
+    <dimen name="dp_185">92.5000dp</dimen>
+
+    <dimen name="dp_186">93.0000dp</dimen>
+
+    <dimen name="dp_187">93.5000dp</dimen>
+
+    <dimen name="dp_188">94.0000dp</dimen>
+
+    <dimen name="dp_189">94.5000dp</dimen>
+
+    <dimen name="dp_190">95.0000dp</dimen>
+
+    <dimen name="dp_191">95.5000dp</dimen>
+
+    <dimen name="dp_191_25">95.6250dp</dimen>
+
+    <dimen name="dp_192">96.0000dp</dimen>
+
+    <dimen name="dp_193">96.5000dp</dimen>
+
+    <dimen name="dp_194">97.0000dp</dimen>
+
+    <dimen name="dp_195">97.5000dp</dimen>
+
+    <dimen name="dp_196">98.0000dp</dimen>
+
+    <dimen name="dp_197">98.5000dp</dimen>
+
+    <dimen name="dp_198">99.0000dp</dimen>
+
+    <dimen name="dp_199">99.5000dp</dimen>
+
+    <dimen name="dp_200">100.0000dp</dimen>
+
+    <dimen name="dp_201">100.5000dp</dimen>
+
+    <dimen name="dp_202">101.0000dp</dimen>
+
+    <dimen name="dp_203">101.5000dp</dimen>
+
+    <dimen name="dp_204">102.0000dp</dimen>
+
+    <dimen name="dp_205">102.5000dp</dimen>
+
+    <dimen name="dp_206">103.0000dp</dimen>
+
+    <dimen name="dp_207">103.5000dp</dimen>
+
+    <dimen name="dp_208">104.0000dp</dimen>
+
+    <dimen name="dp_209">104.5000dp</dimen>
+
+    <dimen name="dp_210">105.0000dp</dimen>
+
+    <dimen name="dp_211">105.5000dp</dimen>
+
+    <dimen name="dp_212">106.0000dp</dimen>
+
+    <dimen name="dp_213">106.5000dp</dimen>
+
+    <dimen name="dp_214">107.0000dp</dimen>
+
+    <dimen name="dp_215">107.5000dp</dimen>
+
+    <dimen name="dp_216">108.0000dp</dimen>
+
+    <dimen name="dp_217">108.5000dp</dimen>
+
+    <dimen name="dp_218">109.0000dp</dimen>
+
+    <dimen name="dp_219">109.5000dp</dimen>
+
+    <dimen name="dp_220">110.0000dp</dimen>
+
+    <dimen name="dp_221">110.5000dp</dimen>
+
+    <dimen name="dp_222">111.0000dp</dimen>
+
+    <dimen name="dp_223">111.5000dp</dimen>
+
+    <dimen name="dp_224">112.0000dp</dimen>
+
+    <dimen name="dp_225">112.5000dp</dimen>
+
+    <dimen name="dp_226">113.0000dp</dimen>
+
+    <dimen name="dp_227">113.5000dp</dimen>
+
+    <dimen name="dp_228">114.0000dp</dimen>
+
+    <dimen name="dp_229">114.5000dp</dimen>
+
+    <dimen name="dp_230">115.0000dp</dimen>
+
+    <dimen name="dp_231">115.5000dp</dimen>
+
+    <dimen name="dp_232">116.0000dp</dimen>
+
+    <dimen name="dp_233">116.5000dp</dimen>
+
+    <dimen name="dp_234">117.0000dp</dimen>
+
+    <dimen name="dp_235">117.5000dp</dimen>
+
+    <dimen name="dp_236">118.0000dp</dimen>
+
+    <dimen name="dp_237">118.5000dp</dimen>
+
+    <dimen name="dp_238">119.0000dp</dimen>
+
+    <dimen name="dp_239">119.5000dp</dimen>
+
+    <dimen name="dp_240">120.0000dp</dimen>
+
+    <dimen name="dp_241">120.5000dp</dimen>
+
+    <dimen name="dp_242">121.0000dp</dimen>
+
+    <dimen name="dp_243">121.5000dp</dimen>
+
+    <dimen name="dp_244">122.0000dp</dimen>
+
+    <dimen name="dp_245">122.5000dp</dimen>
+
+    <dimen name="dp_246">123.0000dp</dimen>
+
+    <dimen name="dp_247">123.5000dp</dimen>
+
+    <dimen name="dp_248">124.0000dp</dimen>
+
+    <dimen name="dp_249">124.5000dp</dimen>
+
+    <dimen name="dp_250">125.0000dp</dimen>
+
+    <dimen name="dp_251">125.5000dp</dimen>
+
+    <dimen name="dp_252">126.0000dp</dimen>
+
+    <dimen name="dp_253">126.5000dp</dimen>
+
+    <dimen name="dp_254">127.0000dp</dimen>
+
+    <dimen name="dp_255">127.5000dp</dimen>
+
+    <dimen name="dp_256">128.0000dp</dimen>
+
+    <dimen name="dp_257">128.5000dp</dimen>
+
+    <dimen name="dp_258">129.0000dp</dimen>
+
+    <dimen name="dp_259">129.5000dp</dimen>
+
+    <dimen name="dp_260">130.0000dp</dimen>
+
+    <dimen name="dp_261">130.5000dp</dimen>
+
+    <dimen name="dp_262">131.0000dp</dimen>
+
+    <dimen name="dp_263">131.5000dp</dimen>
+
+    <dimen name="dp_264">132.0000dp</dimen>
+
+    <dimen name="dp_265">132.5000dp</dimen>
+
+    <dimen name="dp_266">133.0000dp</dimen>
+
+    <dimen name="dp_267">133.5000dp</dimen>
+
+    <dimen name="dp_268">134.0000dp</dimen>
+
+    <dimen name="dp_269">134.5000dp</dimen>
+
+    <dimen name="dp_270">135.0000dp</dimen>
+
+    <dimen name="dp_271">135.5000dp</dimen>
+
+    <dimen name="dp_272">136.0000dp</dimen>
+
+    <dimen name="dp_273">136.5000dp</dimen>
+
+    <dimen name="dp_274">137.0000dp</dimen>
+
+    <dimen name="dp_275">137.5000dp</dimen>
+
+    <dimen name="dp_276">138.0000dp</dimen>
+
+    <dimen name="dp_277">138.5000dp</dimen>
+
+    <dimen name="dp_278">139.0000dp</dimen>
+
+    <dimen name="dp_279">139.5000dp</dimen>
+
+    <dimen name="dp_280">140.0000dp</dimen>
+
+    <dimen name="dp_281">140.5000dp</dimen>
+
+    <dimen name="dp_282">141.0000dp</dimen>
+
+    <dimen name="dp_283">141.5000dp</dimen>
+
+    <dimen name="dp_284">142.0000dp</dimen>
+
+    <dimen name="dp_285">142.5000dp</dimen>
+
+    <dimen name="dp_286">143.0000dp</dimen>
+
+    <dimen name="dp_287">143.5000dp</dimen>
+
+    <dimen name="dp_288">144.0000dp</dimen>
+
+    <dimen name="dp_289">144.5000dp</dimen>
+
+    <dimen name="dp_290">145.0000dp</dimen>
+
+    <dimen name="dp_291">145.5000dp</dimen>
+
+    <dimen name="dp_292">146.0000dp</dimen>
+
+    <dimen name="dp_293">146.5000dp</dimen>
+
+    <dimen name="dp_294">147.0000dp</dimen>
+
+    <dimen name="dp_295">147.5000dp</dimen>
+
+    <dimen name="dp_296">148.0000dp</dimen>
+
+    <dimen name="dp_297">148.5000dp</dimen>
+
+    <dimen name="dp_298">149.0000dp</dimen>
+
+    <dimen name="dp_299">149.5000dp</dimen>
+
+    <dimen name="dp_300">150.0000dp</dimen>
+
+    <dimen name="dp_301">150.5000dp</dimen>
+
+    <dimen name="dp_302">151.0000dp</dimen>
+
+    <dimen name="dp_303">151.5000dp</dimen>
+
+    <dimen name="dp_304">152.0000dp</dimen>
+
+    <dimen name="dp_305">152.5000dp</dimen>
+
+    <dimen name="dp_306">153.0000dp</dimen>
+
+    <dimen name="dp_307">153.5000dp</dimen>
+
+    <dimen name="dp_308">154.0000dp</dimen>
+
+    <dimen name="dp_309">154.5000dp</dimen>
+
+    <dimen name="dp_310">155.0000dp</dimen>
+
+    <dimen name="dp_311">155.5000dp</dimen>
+
+    <dimen name="dp_312">156.0000dp</dimen>
+
+    <dimen name="dp_313">156.5000dp</dimen>
+
+    <dimen name="dp_314">157.0000dp</dimen>
+
+    <dimen name="dp_315">157.5000dp</dimen>
+
+    <dimen name="dp_316">158.0000dp</dimen>
+
+    <dimen name="dp_317">158.5000dp</dimen>
+
+    <dimen name="dp_318">159.0000dp</dimen>
+
+    <dimen name="dp_319">159.5000dp</dimen>
+
+    <dimen name="dp_320">160.0000dp</dimen>
+
+    <dimen name="dp_321">160.5000dp</dimen>
+
+    <dimen name="dp_322">161.0000dp</dimen>
+
+    <dimen name="dp_323">161.5000dp</dimen>
+
+    <dimen name="dp_324">162.0000dp</dimen>
+
+    <dimen name="dp_325">162.5000dp</dimen>
+
+    <dimen name="dp_326">163.0000dp</dimen>
+
+    <dimen name="dp_327">163.5000dp</dimen>
+
+    <dimen name="dp_328">164.0000dp</dimen>
+
+    <dimen name="dp_329">164.5000dp</dimen>
+
+    <dimen name="dp_330">165.0000dp</dimen>
+
+    <dimen name="dp_331">165.5000dp</dimen>
+
+    <dimen name="dp_332">166.0000dp</dimen>
+
+    <dimen name="dp_333">166.5000dp</dimen>
+
+    <dimen name="dp_334">167.0000dp</dimen>
+
+    <dimen name="dp_335">167.5000dp</dimen>
+
+    <dimen name="dp_336">168.0000dp</dimen>
+
+    <dimen name="dp_337">168.5000dp</dimen>
+
+    <dimen name="dp_338">169.0000dp</dimen>
+
+    <dimen name="dp_339">169.5000dp</dimen>
+
+    <dimen name="dp_340">170.0000dp</dimen>
+
+    <dimen name="dp_341">170.5000dp</dimen>
+
+    <dimen name="dp_342">171.0000dp</dimen>
+
+    <dimen name="dp_343">171.5000dp</dimen>
+
+    <dimen name="dp_344">172.0000dp</dimen>
+
+    <dimen name="dp_345">172.5000dp</dimen>
+
+    <dimen name="dp_346">173.0000dp</dimen>
+
+    <dimen name="dp_347">173.5000dp</dimen>
+
+    <dimen name="dp_348">174.0000dp</dimen>
+
+    <dimen name="dp_349">174.5000dp</dimen>
+
+    <dimen name="dp_350">175.0000dp</dimen>
+
+    <dimen name="dp_351">175.5000dp</dimen>
+
+    <dimen name="dp_352">176.0000dp</dimen>
+
+    <dimen name="dp_353">176.5000dp</dimen>
+
+    <dimen name="dp_354">177.0000dp</dimen>
+
+    <dimen name="dp_355">177.5000dp</dimen>
+
+    <dimen name="dp_356">178.0000dp</dimen>
+
+    <dimen name="dp_357">178.5000dp</dimen>
+
+    <dimen name="dp_358">179.0000dp</dimen>
+
+    <dimen name="dp_359">179.5000dp</dimen>
+
+    <dimen name="dp_360">180.0000dp</dimen>
+
+    <dimen name="dp_365">182.5000dp</dimen>
+
+    <dimen name="dp_370">185.0000dp</dimen>
+
+    <dimen name="dp_400">200.0000dp</dimen>
+
+    <dimen name="dp_410">205.0000dp</dimen>
+
+    <dimen name="dp_422">211.0000dp</dimen>
+
+    <dimen name="dp_472">236.0000dp</dimen>
+
+    <dimen name="dp_500">250.0000dp</dimen>
+
+    <dimen name="dp_600">300.0000dp</dimen>
+
+    <dimen name="dp_640">320.0000dp</dimen>
+
+    <dimen name="dp_650">325.0000dp</dimen>
+
+    <dimen name="dp_710">355.0000dp</dimen>
+
+    <dimen name="dp_720">360.0000dp</dimen>
+
+
+</resources>
diff --git a/system/basic/src/main/res/values-sw320dp/dimens.xml b/system/basic/src/main/res/values-sw320dp/dimens.xml
new file mode 100644
index 0000000..3ace150
--- /dev/null
+++ b/system/basic/src/main/res/values-sw320dp/dimens.xml
@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+
+    <dimen name="txt5">3.3333sp</dimen>
+
+    <dimen name="txt6">4.0000sp</dimen>
+
+    <dimen name="txt7">4.6667sp</dimen>
+
+    <dimen name="txt8">5.3333sp</dimen>
+
+    <dimen name="txt9">6.0000sp</dimen>
+
+    <dimen name="txt10">6.6667sp</dimen>
+
+    <dimen name="txt11">7.3333sp</dimen>
+
+    <dimen name="txt12">8.0000sp</dimen>
+
+    <dimen name="txt13">8.6667sp</dimen>
+
+    <dimen name="txt14">9.3333sp</dimen>
+
+    <dimen name="txt15">10.0000sp</dimen>
+
+    <dimen name="txt16">10.6667sp</dimen>
+
+    <dimen name="txt17">11.3333sp</dimen>
+
+    <dimen name="txt18">12.0000sp</dimen>
+
+    <dimen name="txt19">12.6667sp</dimen>
+
+    <dimen name="txt20">13.3333sp</dimen>
+
+    <dimen name="txt21">14.0000sp</dimen>
+
+    <dimen name="txt22">14.6667sp</dimen>
+
+    <dimen name="txt24">16.0000sp</dimen>
+
+    <dimen name="txt26">17.3333sp</dimen>
+
+    <dimen name="txt28">18.6667sp</dimen>
+
+    <dimen name="txt30">20.0000sp</dimen>
+
+    <dimen name="txt32">21.3333sp</dimen>
+
+    <dimen name="txt34">22.6667sp</dimen>
+
+    <dimen name="card_common_margin_left">@dimen/dp_15</dimen>
+
+    <dimen name="dp_m_60">-40.0000dp</dimen>
+
+    <dimen name="dp_m_30">-20.0000dp</dimen>
+
+    <dimen name="dp_m_20">-13.3333dp</dimen>
+
+    <dimen name="dp_m_12">-8.0000dp</dimen>
+
+    <dimen name="dp_m_10">-6.6667dp</dimen>
+
+    <dimen name="dp_m_8">-5.3333dp</dimen>
+
+    <dimen name="dp_m_5">-3.3333dp</dimen>
+
+    <dimen name="dp_m_2">-1.3333dp</dimen>
+
+    <dimen name="dp_m_1">-0.6667dp</dimen>
+
+    <dimen name="dp_0">0.0000dp</dimen>
+
+    <dimen name="dp_0_1">0.0667dp</dimen>
+
+    <dimen name="dp_0_5">0.3333dp</dimen>
+
+    <dimen name="dp_1">0.6667dp</dimen>
+
+    <dimen name="dp_1_5">1.0000dp</dimen>
+
+    <dimen name="dp_2">1.3333dp</dimen>
+
+    <dimen name="dp_2_5">1.6667dp</dimen>
+
+    <dimen name="dp_3">2.0000dp</dimen>
+
+    <dimen name="dp_3_5">2.3333dp</dimen>
+
+    <dimen name="dp_4">2.6667dp</dimen>
+
+    <dimen name="dp_4_5">3.0000dp</dimen>
+
+    <dimen name="dp_5">3.3333dp</dimen>
+
+    <dimen name="dp_6">4.0000dp</dimen>
+
+    <dimen name="dp_7">4.6667dp</dimen>
+
+    <dimen name="dp_7_5">5.0000dp</dimen>
+
+    <dimen name="dp_8">5.3333dp</dimen>
+
+    <dimen name="dp_9">6.0000dp</dimen>
+
+    <dimen name="dp_10">6.6667dp</dimen>
+
+    <dimen name="dp_11">7.3333dp</dimen>
+
+    <dimen name="dp_12">8.0000dp</dimen>
+
+    <dimen name="dp_13">8.6667dp</dimen>
+
+    <dimen name="dp_14">9.3333dp</dimen>
+
+    <dimen name="dp_15">10.0000dp</dimen>
+
+    <dimen name="dp_16">10.6667dp</dimen>
+
+    <dimen name="dp_17">11.3333dp</dimen>
+
+    <dimen name="dp_18">12.0000dp</dimen>
+
+    <dimen name="dp_19">12.6667dp</dimen>
+
+    <dimen name="dp_20">13.3333dp</dimen>
+
+    <dimen name="dp_21">14.0000dp</dimen>
+
+    <dimen name="dp_22">14.6667dp</dimen>
+
+    <dimen name="dp_23">15.3333dp</dimen>
+
+    <dimen name="dp_24">16.0000dp</dimen>
+
+    <dimen name="dp_25">16.6667dp</dimen>
+
+    <dimen name="dp_26">17.3333dp</dimen>
+
+    <dimen name="dp_27">18.0000dp</dimen>
+
+    <dimen name="dp_28">18.6667dp</dimen>
+
+    <dimen name="dp_29">19.3333dp</dimen>
+
+    <dimen name="dp_30">20.0000dp</dimen>
+
+    <dimen name="dp_31">20.6667dp</dimen>
+
+    <dimen name="dp_32">21.3333dp</dimen>
+
+    <dimen name="dp_33">22.0000dp</dimen>
+
+    <dimen name="dp_34">22.6667dp</dimen>
+
+    <dimen name="dp_35">23.3333dp</dimen>
+
+    <dimen name="dp_36">24.0000dp</dimen>
+
+    <dimen name="dp_37">24.6667dp</dimen>
+
+    <dimen name="dp_38">25.3333dp</dimen>
+
+    <dimen name="dp_39">26.0000dp</dimen>
+
+    <dimen name="dp_40">26.6667dp</dimen>
+
+    <dimen name="dp_41">27.3333dp</dimen>
+
+    <dimen name="dp_42">28.0000dp</dimen>
+
+    <dimen name="dp_43">28.6667dp</dimen>
+
+    <dimen name="dp_44">29.3333dp</dimen>
+
+    <dimen name="dp_45">30.0000dp</dimen>
+
+    <dimen name="dp_46">30.6667dp</dimen>
+
+    <dimen name="dp_47">31.3333dp</dimen>
+
+    <dimen name="dp_48">32.0000dp</dimen>
+
+    <dimen name="dp_49">32.6667dp</dimen>
+
+    <dimen name="dp_50">33.3333dp</dimen>
+
+    <dimen name="dp_51">34.0000dp</dimen>
+
+    <dimen name="dp_52">34.6667dp</dimen>
+
+    <dimen name="dp_53">35.3333dp</dimen>
+
+    <dimen name="dp_54">36.0000dp</dimen>
+
+    <dimen name="dp_55">36.6667dp</dimen>
+
+    <dimen name="dp_56">37.3333dp</dimen>
+
+    <dimen name="dp_57">38.0000dp</dimen>
+
+    <dimen name="dp_58">38.6667dp</dimen>
+
+    <dimen name="dp_59">39.3333dp</dimen>
+
+    <dimen name="dp_60">40.0000dp</dimen>
+
+    <dimen name="dp_61">40.6667dp</dimen>
+
+    <dimen name="dp_62">41.3333dp</dimen>
+
+    <dimen name="dp_63">42.0000dp</dimen>
+
+    <dimen name="dp_64">42.6667dp</dimen>
+
+    <dimen name="dp_65">43.3333dp</dimen>
+
+    <dimen name="dp_66">44.0000dp</dimen>
+
+    <dimen name="dp_67">44.6667dp</dimen>
+
+    <dimen name="dp_68">45.3333dp</dimen>
+
+    <dimen name="dp_69">46.0000dp</dimen>
+
+    <dimen name="dp_70">46.6667dp</dimen>
+
+    <dimen name="dp_71">47.3333dp</dimen>
+
+    <dimen name="dp_72">48.0000dp</dimen>
+
+    <dimen name="dp_73">48.6667dp</dimen>
+
+    <dimen name="dp_74">49.3333dp</dimen>
+
+    <dimen name="dp_75">50.0000dp</dimen>
+
+    <dimen name="dp_76">50.6667dp</dimen>
+
+    <dimen name="dp_77">51.3333dp</dimen>
+
+    <dimen name="dp_78">52.0000dp</dimen>
+
+    <dimen name="dp_79">52.6667dp</dimen>
+
+    <dimen name="dp_80">53.3333dp</dimen>
+
+    <dimen name="dp_81">54.0000dp</dimen>
+
+    <dimen name="dp_82">54.6667dp</dimen>
+
+    <dimen name="dp_83">55.3333dp</dimen>
+
+    <dimen name="dp_84">56.0000dp</dimen>
+
+    <dimen name="dp_85">56.6667dp</dimen>
+
+    <dimen name="dp_86">57.3333dp</dimen>
+
+    <dimen name="dp_87">58.0000dp</dimen>
+
+    <dimen name="dp_88">58.6667dp</dimen>
+
+    <dimen name="dp_89">59.3333dp</dimen>
+
+    <dimen name="dp_90">60.0000dp</dimen>
+
+    <dimen name="dp_91">60.6667dp</dimen>
+
+    <dimen name="dp_92">61.3333dp</dimen>
+
+    <dimen name="dp_93">62.0000dp</dimen>
+
+    <dimen name="dp_94">62.6667dp</dimen>
+
+    <dimen name="dp_95">63.3333dp</dimen>
+
+    <dimen name="dp_96">64.0000dp</dimen>
+
+    <dimen name="dp_97">64.6667dp</dimen>
+
+    <dimen name="dp_98">65.3333dp</dimen>
+
+    <dimen name="dp_99">66.0000dp</dimen>
+
+    <dimen name="dp_100">66.6667dp</dimen>
+
+    <dimen name="dp_101">67.3333dp</dimen>
+
+    <dimen name="dp_102">68.0000dp</dimen>
+
+    <dimen name="dp_103">68.6667dp</dimen>
+
+    <dimen name="dp_104">69.3333dp</dimen>
+
+    <dimen name="dp_104_5">69.6667dp</dimen>
+
+    <dimen name="dp_105">70.0000dp</dimen>
+
+    <dimen name="dp_106">70.6667dp</dimen>
+
+    <dimen name="dp_107">71.3333dp</dimen>
+
+    <dimen name="dp_108">72.0000dp</dimen>
+
+    <dimen name="dp_109">72.6667dp</dimen>
+
+    <dimen name="dp_110">73.3333dp</dimen>
+
+    <dimen name="dp_111">74.0000dp</dimen>
+
+    <dimen name="dp_112">74.6667dp</dimen>
+
+    <dimen name="dp_113">75.3333dp</dimen>
+
+    <dimen name="dp_114">76.0000dp</dimen>
+
+    <dimen name="dp_115">76.6667dp</dimen>
+
+    <dimen name="dp_116">77.3333dp</dimen>
+
+    <dimen name="dp_117">78.0000dp</dimen>
+
+    <dimen name="dp_118">78.6667dp</dimen>
+
+    <dimen name="dp_119">79.3333dp</dimen>
+
+    <dimen name="dp_120">80.0000dp</dimen>
+
+    <dimen name="dp_121">80.6667dp</dimen>
+
+    <dimen name="dp_122">81.3333dp</dimen>
+
+    <dimen name="dp_123">82.0000dp</dimen>
+
+    <dimen name="dp_124">82.6667dp</dimen>
+
+    <dimen name="dp_125">83.3333dp</dimen>
+
+    <dimen name="dp_126">84.0000dp</dimen>
+
+    <dimen name="dp_127">84.6667dp</dimen>
+
+    <dimen name="dp_128">85.3333dp</dimen>
+
+    <dimen name="dp_129">86.0000dp</dimen>
+
+    <dimen name="dp_130">86.6667dp</dimen>
+
+    <dimen name="dp_131">87.3333dp</dimen>
+
+    <dimen name="dp_132">88.0000dp</dimen>
+
+    <dimen name="dp_133">88.6667dp</dimen>
+
+    <dimen name="dp_134">89.3333dp</dimen>
+
+    <dimen name="dp_134_5">89.6667dp</dimen>
+
+    <dimen name="dp_135">90.0000dp</dimen>
+
+    <dimen name="dp_136">90.6667dp</dimen>
+
+    <dimen name="dp_137">91.3333dp</dimen>
+
+    <dimen name="dp_138">92.0000dp</dimen>
+
+    <dimen name="dp_139">92.6667dp</dimen>
+
+    <dimen name="dp_140">93.3333dp</dimen>
+
+    <dimen name="dp_141">94.0000dp</dimen>
+
+    <dimen name="dp_142">94.6667dp</dimen>
+
+    <dimen name="dp_143">95.3333dp</dimen>
+
+    <dimen name="dp_144">96.0000dp</dimen>
+
+    <dimen name="dp_145">96.6667dp</dimen>
+
+    <dimen name="dp_146">97.3333dp</dimen>
+
+    <dimen name="dp_147">98.0000dp</dimen>
+
+    <dimen name="dp_148">98.6667dp</dimen>
+
+    <dimen name="dp_149">99.3333dp</dimen>
+
+    <dimen name="dp_150">100.0000dp</dimen>
+
+    <dimen name="dp_151">100.6667dp</dimen>
+
+    <dimen name="dp_152">101.3333dp</dimen>
+
+    <dimen name="dp_153">102.0000dp</dimen>
+
+    <dimen name="dp_154">102.6667dp</dimen>
+
+    <dimen name="dp_155">103.3333dp</dimen>
+
+    <dimen name="dp_156">104.0000dp</dimen>
+
+    <dimen name="dp_157">104.6667dp</dimen>
+
+    <dimen name="dp_158">105.3333dp</dimen>
+
+    <dimen name="dp_159">106.0000dp</dimen>
+
+    <dimen name="dp_160">106.6667dp</dimen>
+
+    <dimen name="dp_161">107.3333dp</dimen>
+
+    <dimen name="dp_162">108.0000dp</dimen>
+
+    <dimen name="dp_163">108.6667dp</dimen>
+
+    <dimen name="dp_164">109.3333dp</dimen>
+
+    <dimen name="dp_165">110.0000dp</dimen>
+
+    <dimen name="dp_166">110.6667dp</dimen>
+
+    <dimen name="dp_167">111.3333dp</dimen>
+
+    <dimen name="dp_168">112.0000dp</dimen>
+
+    <dimen name="dp_169">112.6667dp</dimen>
+
+    <dimen name="dp_170">113.3333dp</dimen>
+
+    <dimen name="dp_171">114.0000dp</dimen>
+
+    <dimen name="dp_172">114.6667dp</dimen>
+
+    <dimen name="dp_173">115.3333dp</dimen>
+
+    <dimen name="dp_174">116.0000dp</dimen>
+
+    <dimen name="dp_175">116.6667dp</dimen>
+
+    <dimen name="dp_176">117.3333dp</dimen>
+
+    <dimen name="dp_177">118.0000dp</dimen>
+
+    <dimen name="dp_178">118.6667dp</dimen>
+
+    <dimen name="dp_179">119.3333dp</dimen>
+
+    <dimen name="dp_180">120.0000dp</dimen>
+
+    <dimen name="dp_181">120.6667dp</dimen>
+
+    <dimen name="dp_182">121.3333dp</dimen>
+
+    <dimen name="dp_183">122.0000dp</dimen>
+
+    <dimen name="dp_184">122.6667dp</dimen>
+
+    <dimen name="dp_185">123.3333dp</dimen>
+
+    <dimen name="dp_186">124.0000dp</dimen>
+
+    <dimen name="dp_187">124.6667dp</dimen>
+
+    <dimen name="dp_188">125.3333dp</dimen>
+
+    <dimen name="dp_189">126.0000dp</dimen>
+
+    <dimen name="dp_190">126.6667dp</dimen>
+
+    <dimen name="dp_191">127.3333dp</dimen>
+
+    <dimen name="dp_191_25">127.5000dp</dimen>
+
+    <dimen name="dp_192">128.0000dp</dimen>
+
+    <dimen name="dp_193">128.6667dp</dimen>
+
+    <dimen name="dp_194">129.3333dp</dimen>
+
+    <dimen name="dp_195">130.0000dp</dimen>
+
+    <dimen name="dp_196">130.6667dp</dimen>
+
+    <dimen name="dp_197">131.3333dp</dimen>
+
+    <dimen name="dp_198">132.0000dp</dimen>
+
+    <dimen name="dp_199">132.6667dp</dimen>
+
+    <dimen name="dp_200">133.3333dp</dimen>
+
+    <dimen name="dp_201">134.0000dp</dimen>
+
+    <dimen name="dp_202">134.6667dp</dimen>
+
+    <dimen name="dp_203">135.3333dp</dimen>
+
+    <dimen name="dp_204">136.0000dp</dimen>
+
+    <dimen name="dp_205">136.6667dp</dimen>
+
+    <dimen name="dp_206">137.3333dp</dimen>
+
+    <dimen name="dp_207">138.0000dp</dimen>
+
+    <dimen name="dp_208">138.6667dp</dimen>
+
+    <dimen name="dp_209">139.3333dp</dimen>
+
+    <dimen name="dp_210">140.0000dp</dimen>
+
+    <dimen name="dp_211">140.6667dp</dimen>
+
+    <dimen name="dp_212">141.3333dp</dimen>
+
+    <dimen name="dp_213">142.0000dp</dimen>
+
+    <dimen name="dp_214">142.6667dp</dimen>
+
+    <dimen name="dp_215">143.3333dp</dimen>
+
+    <dimen name="dp_216">144.0000dp</dimen>
+
+    <dimen name="dp_217">144.6667dp</dimen>
+
+    <dimen name="dp_218">145.3333dp</dimen>
+
+    <dimen name="dp_219">146.0000dp</dimen>
+
+    <dimen name="dp_220">146.6667dp</dimen>
+
+    <dimen name="dp_221">147.3333dp</dimen>
+
+    <dimen name="dp_222">148.0000dp</dimen>
+
+    <dimen name="dp_223">148.6667dp</dimen>
+
+    <dimen name="dp_224">149.3333dp</dimen>
+
+    <dimen name="dp_225">150.0000dp</dimen>
+
+    <dimen name="dp_226">150.6667dp</dimen>
+
+    <dimen name="dp_227">151.3333dp</dimen>
+
+    <dimen name="dp_228">152.0000dp</dimen>
+
+    <dimen name="dp_229">152.6667dp</dimen>
+
+    <dimen name="dp_230">153.3333dp</dimen>
+
+    <dimen name="dp_231">154.0000dp</dimen>
+
+    <dimen name="dp_232">154.6667dp</dimen>
+
+    <dimen name="dp_233">155.3333dp</dimen>
+
+    <dimen name="dp_234">156.0000dp</dimen>
+
+    <dimen name="dp_235">156.6667dp</dimen>
+
+    <dimen name="dp_236">157.3333dp</dimen>
+
+    <dimen name="dp_237">158.0000dp</dimen>
+
+    <dimen name="dp_238">158.6667dp</dimen>
+
+    <dimen name="dp_239">159.3333dp</dimen>
+
+    <dimen name="dp_240">160.0000dp</dimen>
+
+    <dimen name="dp_241">160.6667dp</dimen>
+
+    <dimen name="dp_242">161.3333dp</dimen>
+
+    <dimen name="dp_243">162.0000dp</dimen>
+
+    <dimen name="dp_244">162.6667dp</dimen>
+
+    <dimen name="dp_245">163.3333dp</dimen>
+
+    <dimen name="dp_246">164.0000dp</dimen>
+
+    <dimen name="dp_247">164.6667dp</dimen>
+
+    <dimen name="dp_248">165.3333dp</dimen>
+
+    <dimen name="dp_249">166.0000dp</dimen>
+
+    <dimen name="dp_250">166.6667dp</dimen>
+
+    <dimen name="dp_251">167.3333dp</dimen>
+
+    <dimen name="dp_252">168.0000dp</dimen>
+
+    <dimen name="dp_253">168.6667dp</dimen>
+
+    <dimen name="dp_254">169.3333dp</dimen>
+
+    <dimen name="dp_255">170.0000dp</dimen>
+
+    <dimen name="dp_256">170.6667dp</dimen>
+
+    <dimen name="dp_257">171.3333dp</dimen>
+
+    <dimen name="dp_258">172.0000dp</dimen>
+
+    <dimen name="dp_259">172.6667dp</dimen>
+
+    <dimen name="dp_260">173.3333dp</dimen>
+
+    <dimen name="dp_261">174.0000dp</dimen>
+
+    <dimen name="dp_262">174.6667dp</dimen>
+
+    <dimen name="dp_263">175.3333dp</dimen>
+
+    <dimen name="dp_264">176.0000dp</dimen>
+
+    <dimen name="dp_265">176.6667dp</dimen>
+
+    <dimen name="dp_266">177.3333dp</dimen>
+
+    <dimen name="dp_267">178.0000dp</dimen>
+
+    <dimen name="dp_268">178.6667dp</dimen>
+
+    <dimen name="dp_269">179.3333dp</dimen>
+
+    <dimen name="dp_270">180.0000dp</dimen>
+
+    <dimen name="dp_271">180.6667dp</dimen>
+
+    <dimen name="dp_272">181.3333dp</dimen>
+
+    <dimen name="dp_273">182.0000dp</dimen>
+
+    <dimen name="dp_274">182.6667dp</dimen>
+
+    <dimen name="dp_275">183.3333dp</dimen>
+
+    <dimen name="dp_276">184.0000dp</dimen>
+
+    <dimen name="dp_277">184.6667dp</dimen>
+
+    <dimen name="dp_278">185.3333dp</dimen>
+
+    <dimen name="dp_279">186.0000dp</dimen>
+
+    <dimen name="dp_280">186.6667dp</dimen>
+
+    <dimen name="dp_281">187.3333dp</dimen>
+
+    <dimen name="dp_282">188.0000dp</dimen>
+
+    <dimen name="dp_283">188.6667dp</dimen>
+
+    <dimen name="dp_284">189.3333dp</dimen>
+
+    <dimen name="dp_285">190.0000dp</dimen>
+
+    <dimen name="dp_286">190.6667dp</dimen>
+
+    <dimen name="dp_287">191.3333dp</dimen>
+
+    <dimen name="dp_288">192.0000dp</dimen>
+
+    <dimen name="dp_289">192.6667dp</dimen>
+
+    <dimen name="dp_290">193.3333dp</dimen>
+
+    <dimen name="dp_291">194.0000dp</dimen>
+
+    <dimen name="dp_292">194.6667dp</dimen>
+
+    <dimen name="dp_293">195.3333dp</dimen>
+
+    <dimen name="dp_294">196.0000dp</dimen>
+
+    <dimen name="dp_295">196.6667dp</dimen>
+
+    <dimen name="dp_296">197.3333dp</dimen>
+
+    <dimen name="dp_297">198.0000dp</dimen>
+
+    <dimen name="dp_298">198.6667dp</dimen>
+
+    <dimen name="dp_299">199.3333dp</dimen>
+
+    <dimen name="dp_300">200.0000dp</dimen>
+
+    <dimen name="dp_301">200.6667dp</dimen>
+
+    <dimen name="dp_302">201.3333dp</dimen>
+
+    <dimen name="dp_303">202.0000dp</dimen>
+
+    <dimen name="dp_304">202.6667dp</dimen>
+
+    <dimen name="dp_305">203.3333dp</dimen>
+
+    <dimen name="dp_306">204.0000dp</dimen>
+
+    <dimen name="dp_307">204.6667dp</dimen>
+
+    <dimen name="dp_308">205.3333dp</dimen>
+
+    <dimen name="dp_309">206.0000dp</dimen>
+
+    <dimen name="dp_310">206.6667dp</dimen>
+
+    <dimen name="dp_311">207.3333dp</dimen>
+
+    <dimen name="dp_312">208.0000dp</dimen>
+
+    <dimen name="dp_313">208.6667dp</dimen>
+
+    <dimen name="dp_314">209.3333dp</dimen>
+
+    <dimen name="dp_315">210.0000dp</dimen>
+
+    <dimen name="dp_316">210.6667dp</dimen>
+
+    <dimen name="dp_317">211.3333dp</dimen>
+
+    <dimen name="dp_318">212.0000dp</dimen>
+
+    <dimen name="dp_319">212.6667dp</dimen>
+
+    <dimen name="dp_320">213.3333dp</dimen>
+
+    <dimen name="dp_321">214.0000dp</dimen>
+
+    <dimen name="dp_322">214.6667dp</dimen>
+
+    <dimen name="dp_323">215.3333dp</dimen>
+
+    <dimen name="dp_324">216.0000dp</dimen>
+
+    <dimen name="dp_325">216.6667dp</dimen>
+
+    <dimen name="dp_326">217.3333dp</dimen>
+
+    <dimen name="dp_327">218.0000dp</dimen>
+
+    <dimen name="dp_328">218.6667dp</dimen>
+
+    <dimen name="dp_329">219.3333dp</dimen>
+
+    <dimen name="dp_330">220.0000dp</dimen>
+
+    <dimen name="dp_331">220.6667dp</dimen>
+
+    <dimen name="dp_332">221.3333dp</dimen>
+
+    <dimen name="dp_333">222.0000dp</dimen>
+
+    <dimen name="dp_334">222.6667dp</dimen>
+
+    <dimen name="dp_335">223.3333dp</dimen>
+
+    <dimen name="dp_336">224.0000dp</dimen>
+
+    <dimen name="dp_337">224.6667dp</dimen>
+
+    <dimen name="dp_338">225.3333dp</dimen>
+
+    <dimen name="dp_339">226.0000dp</dimen>
+
+    <dimen name="dp_340">226.6667dp</dimen>
+
+    <dimen name="dp_341">227.3333dp</dimen>
+
+    <dimen name="dp_342">228.0000dp</dimen>
+
+    <dimen name="dp_343">228.6667dp</dimen>
+
+    <dimen name="dp_344">229.3333dp</dimen>
+
+    <dimen name="dp_345">230.0000dp</dimen>
+
+    <dimen name="dp_346">230.6667dp</dimen>
+
+    <dimen name="dp_347">231.3333dp</dimen>
+
+    <dimen name="dp_348">232.0000dp</dimen>
+
+    <dimen name="dp_349">232.6667dp</dimen>
+
+    <dimen name="dp_350">233.3333dp</dimen>
+
+    <dimen name="dp_351">234.0000dp</dimen>
+
+    <dimen name="dp_352">234.6667dp</dimen>
+
+    <dimen name="dp_353">235.3333dp</dimen>
+
+    <dimen name="dp_354">236.0000dp</dimen>
+
+    <dimen name="dp_355">236.6667dp</dimen>
+
+    <dimen name="dp_356">237.3333dp</dimen>
+
+    <dimen name="dp_357">238.0000dp</dimen>
+
+    <dimen name="dp_358">238.6667dp</dimen>
+
+    <dimen name="dp_359">239.3333dp</dimen>
+
+    <dimen name="dp_360">240.0000dp</dimen>
+
+    <dimen name="dp_365">243.3333dp</dimen>
+
+    <dimen name="dp_370">246.6667dp</dimen>
+
+    <dimen name="dp_400">266.6667dp</dimen>
+
+    <dimen name="dp_410">273.3333dp</dimen>
+
+    <dimen name="dp_422">281.3333dp</dimen>
+
+    <dimen name="dp_472">314.6667dp</dimen>
+
+    <dimen name="dp_500">333.3333dp</dimen>
+
+    <dimen name="dp_600">400.0000dp</dimen>
+
+    <dimen name="dp_640">426.6667dp</dimen>
+
+    <dimen name="dp_650">433.3333dp</dimen>
+
+    <dimen name="dp_710">473.3333dp</dimen>
+
+    <dimen name="dp_720">480.0000dp</dimen>
+
+
+</resources>
diff --git a/system/basic/src/main/res/values-sw384dp/dimens.xml b/system/basic/src/main/res/values-sw384dp/dimens.xml
new file mode 100644
index 0000000..6d96540
--- /dev/null
+++ b/system/basic/src/main/res/values-sw384dp/dimens.xml
@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+
+    <dimen name="txt5">4.0000sp</dimen>
+
+    <dimen name="txt6">4.8000sp</dimen>
+
+    <dimen name="txt7">5.6000sp</dimen>
+
+    <dimen name="txt8">6.4000sp</dimen>
+
+    <dimen name="txt9">7.2000sp</dimen>
+
+    <dimen name="txt10">8.0000sp</dimen>
+
+    <dimen name="txt11">8.8000sp</dimen>
+
+    <dimen name="txt12">9.6000sp</dimen>
+
+    <dimen name="txt13">10.4000sp</dimen>
+
+    <dimen name="txt14">11.2000sp</dimen>
+
+    <dimen name="txt15">12.0000sp</dimen>
+
+    <dimen name="txt16">12.8000sp</dimen>
+
+    <dimen name="txt17">13.6000sp</dimen>
+
+    <dimen name="txt18">14.4000sp</dimen>
+
+    <dimen name="txt19">15.2000sp</dimen>
+
+    <dimen name="txt20">16.0000sp</dimen>
+
+    <dimen name="txt21">16.8000sp</dimen>
+
+    <dimen name="txt22">17.6000sp</dimen>
+
+    <dimen name="txt24">19.2000sp</dimen>
+
+    <dimen name="txt26">20.8000sp</dimen>
+
+    <dimen name="txt28">22.4000sp</dimen>
+
+    <dimen name="txt30">24.0000sp</dimen>
+
+    <dimen name="txt32">25.6000sp</dimen>
+
+    <dimen name="txt34">27.2000sp</dimen>
+
+    <dimen name="card_common_margin_left">@dimen/dp_15</dimen>
+
+    <dimen name="dp_m_60">-48.0000dp</dimen>
+
+    <dimen name="dp_m_30">-24.0000dp</dimen>
+
+    <dimen name="dp_m_20">-16.0000dp</dimen>
+
+    <dimen name="dp_m_12">-9.6000dp</dimen>
+
+    <dimen name="dp_m_10">-8.0000dp</dimen>
+
+    <dimen name="dp_m_8">-6.4000dp</dimen>
+
+    <dimen name="dp_m_5">-4.0000dp</dimen>
+
+    <dimen name="dp_m_2">-1.6000dp</dimen>
+
+    <dimen name="dp_m_1">-0.8000dp</dimen>
+
+    <dimen name="dp_0">0.0000dp</dimen>
+
+    <dimen name="dp_0_1">0.0800dp</dimen>
+
+    <dimen name="dp_0_5">0.4000dp</dimen>
+
+    <dimen name="dp_1">0.8000dp</dimen>
+
+    <dimen name="dp_1_5">1.2000dp</dimen>
+
+    <dimen name="dp_2">1.6000dp</dimen>
+
+    <dimen name="dp_2_5">2.0000dp</dimen>
+
+    <dimen name="dp_3">2.4000dp</dimen>
+
+    <dimen name="dp_3_5">2.8000dp</dimen>
+
+    <dimen name="dp_4">3.2000dp</dimen>
+
+    <dimen name="dp_4_5">3.6000dp</dimen>
+
+    <dimen name="dp_5">4.0000dp</dimen>
+
+    <dimen name="dp_6">4.8000dp</dimen>
+
+    <dimen name="dp_7">5.6000dp</dimen>
+
+    <dimen name="dp_7_5">6.0000dp</dimen>
+
+    <dimen name="dp_8">6.4000dp</dimen>
+
+    <dimen name="dp_9">7.2000dp</dimen>
+
+    <dimen name="dp_10">8.0000dp</dimen>
+
+    <dimen name="dp_11">8.8000dp</dimen>
+
+    <dimen name="dp_12">9.6000dp</dimen>
+
+    <dimen name="dp_13">10.4000dp</dimen>
+
+    <dimen name="dp_14">11.2000dp</dimen>
+
+    <dimen name="dp_15">12.0000dp</dimen>
+
+    <dimen name="dp_16">12.8000dp</dimen>
+
+    <dimen name="dp_17">13.6000dp</dimen>
+
+    <dimen name="dp_18">14.4000dp</dimen>
+
+    <dimen name="dp_19">15.2000dp</dimen>
+
+    <dimen name="dp_20">16.0000dp</dimen>
+
+    <dimen name="dp_21">16.8000dp</dimen>
+
+    <dimen name="dp_22">17.6000dp</dimen>
+
+    <dimen name="dp_23">18.4000dp</dimen>
+
+    <dimen name="dp_24">19.2000dp</dimen>
+
+    <dimen name="dp_25">20.0000dp</dimen>
+
+    <dimen name="dp_26">20.8000dp</dimen>
+
+    <dimen name="dp_27">21.6000dp</dimen>
+
+    <dimen name="dp_28">22.4000dp</dimen>
+
+    <dimen name="dp_29">23.2000dp</dimen>
+
+    <dimen name="dp_30">24.0000dp</dimen>
+
+    <dimen name="dp_31">24.8000dp</dimen>
+
+    <dimen name="dp_32">25.6000dp</dimen>
+
+    <dimen name="dp_33">26.4000dp</dimen>
+
+    <dimen name="dp_34">27.2000dp</dimen>
+
+    <dimen name="dp_35">28.0000dp</dimen>
+
+    <dimen name="dp_36">28.8000dp</dimen>
+
+    <dimen name="dp_37">29.6000dp</dimen>
+
+    <dimen name="dp_38">30.4000dp</dimen>
+
+    <dimen name="dp_39">31.2000dp</dimen>
+
+    <dimen name="dp_40">32.0000dp</dimen>
+
+    <dimen name="dp_41">32.8000dp</dimen>
+
+    <dimen name="dp_42">33.6000dp</dimen>
+
+    <dimen name="dp_43">34.4000dp</dimen>
+
+    <dimen name="dp_44">35.2000dp</dimen>
+
+    <dimen name="dp_45">36.0000dp</dimen>
+
+    <dimen name="dp_46">36.8000dp</dimen>
+
+    <dimen name="dp_47">37.6000dp</dimen>
+
+    <dimen name="dp_48">38.4000dp</dimen>
+
+    <dimen name="dp_49">39.2000dp</dimen>
+
+    <dimen name="dp_50">40.0000dp</dimen>
+
+    <dimen name="dp_51">40.8000dp</dimen>
+
+    <dimen name="dp_52">41.6000dp</dimen>
+
+    <dimen name="dp_53">42.4000dp</dimen>
+
+    <dimen name="dp_54">43.2000dp</dimen>
+
+    <dimen name="dp_55">44.0000dp</dimen>
+
+    <dimen name="dp_56">44.8000dp</dimen>
+
+    <dimen name="dp_57">45.6000dp</dimen>
+
+    <dimen name="dp_58">46.4000dp</dimen>
+
+    <dimen name="dp_59">47.2000dp</dimen>
+
+    <dimen name="dp_60">48.0000dp</dimen>
+
+    <dimen name="dp_61">48.8000dp</dimen>
+
+    <dimen name="dp_62">49.6000dp</dimen>
+
+    <dimen name="dp_63">50.4000dp</dimen>
+
+    <dimen name="dp_64">51.2000dp</dimen>
+
+    <dimen name="dp_65">52.0000dp</dimen>
+
+    <dimen name="dp_66">52.8000dp</dimen>
+
+    <dimen name="dp_67">53.6000dp</dimen>
+
+    <dimen name="dp_68">54.4000dp</dimen>
+
+    <dimen name="dp_69">55.2000dp</dimen>
+
+    <dimen name="dp_70">56.0000dp</dimen>
+
+    <dimen name="dp_71">56.8000dp</dimen>
+
+    <dimen name="dp_72">57.6000dp</dimen>
+
+    <dimen name="dp_73">58.4000dp</dimen>
+
+    <dimen name="dp_74">59.2000dp</dimen>
+
+    <dimen name="dp_75">60.0000dp</dimen>
+
+    <dimen name="dp_76">60.8000dp</dimen>
+
+    <dimen name="dp_77">61.6000dp</dimen>
+
+    <dimen name="dp_78">62.4000dp</dimen>
+
+    <dimen name="dp_79">63.2000dp</dimen>
+
+    <dimen name="dp_80">64.0000dp</dimen>
+
+    <dimen name="dp_81">64.8000dp</dimen>
+
+    <dimen name="dp_82">65.6000dp</dimen>
+
+    <dimen name="dp_83">66.4000dp</dimen>
+
+    <dimen name="dp_84">67.2000dp</dimen>
+
+    <dimen name="dp_85">68.0000dp</dimen>
+
+    <dimen name="dp_86">68.8000dp</dimen>
+
+    <dimen name="dp_87">69.6000dp</dimen>
+
+    <dimen name="dp_88">70.4000dp</dimen>
+
+    <dimen name="dp_89">71.2000dp</dimen>
+
+    <dimen name="dp_90">72.0000dp</dimen>
+
+    <dimen name="dp_91">72.8000dp</dimen>
+
+    <dimen name="dp_92">73.6000dp</dimen>
+
+    <dimen name="dp_93">74.4000dp</dimen>
+
+    <dimen name="dp_94">75.2000dp</dimen>
+
+    <dimen name="dp_95">76.0000dp</dimen>
+
+    <dimen name="dp_96">76.8000dp</dimen>
+
+    <dimen name="dp_97">77.6000dp</dimen>
+
+    <dimen name="dp_98">78.4000dp</dimen>
+
+    <dimen name="dp_99">79.2000dp</dimen>
+
+    <dimen name="dp_100">80.0000dp</dimen>
+
+    <dimen name="dp_101">80.8000dp</dimen>
+
+    <dimen name="dp_102">81.6000dp</dimen>
+
+    <dimen name="dp_103">82.4000dp</dimen>
+
+    <dimen name="dp_104">83.2000dp</dimen>
+
+    <dimen name="dp_104_5">83.6000dp</dimen>
+
+    <dimen name="dp_105">84.0000dp</dimen>
+
+    <dimen name="dp_106">84.8000dp</dimen>
+
+    <dimen name="dp_107">85.6000dp</dimen>
+
+    <dimen name="dp_108">86.4000dp</dimen>
+
+    <dimen name="dp_109">87.2000dp</dimen>
+
+    <dimen name="dp_110">88.0000dp</dimen>
+
+    <dimen name="dp_111">88.8000dp</dimen>
+
+    <dimen name="dp_112">89.6000dp</dimen>
+
+    <dimen name="dp_113">90.4000dp</dimen>
+
+    <dimen name="dp_114">91.2000dp</dimen>
+
+    <dimen name="dp_115">92.0000dp</dimen>
+
+    <dimen name="dp_116">92.8000dp</dimen>
+
+    <dimen name="dp_117">93.6000dp</dimen>
+
+    <dimen name="dp_118">94.4000dp</dimen>
+
+    <dimen name="dp_119">95.2000dp</dimen>
+
+    <dimen name="dp_120">96.0000dp</dimen>
+
+    <dimen name="dp_121">96.8000dp</dimen>
+
+    <dimen name="dp_122">97.6000dp</dimen>
+
+    <dimen name="dp_123">98.4000dp</dimen>
+
+    <dimen name="dp_124">99.2000dp</dimen>
+
+    <dimen name="dp_125">100.0000dp</dimen>
+
+    <dimen name="dp_126">100.8000dp</dimen>
+
+    <dimen name="dp_127">101.6000dp</dimen>
+
+    <dimen name="dp_128">102.4000dp</dimen>
+
+    <dimen name="dp_129">103.2000dp</dimen>
+
+    <dimen name="dp_130">104.0000dp</dimen>
+
+    <dimen name="dp_131">104.8000dp</dimen>
+
+    <dimen name="dp_132">105.6000dp</dimen>
+
+    <dimen name="dp_133">106.4000dp</dimen>
+
+    <dimen name="dp_134">107.2000dp</dimen>
+
+    <dimen name="dp_134_5">107.6000dp</dimen>
+
+    <dimen name="dp_135">108.0000dp</dimen>
+
+    <dimen name="dp_136">108.8000dp</dimen>
+
+    <dimen name="dp_137">109.6000dp</dimen>
+
+    <dimen name="dp_138">110.4000dp</dimen>
+
+    <dimen name="dp_139">111.2000dp</dimen>
+
+    <dimen name="dp_140">112.0000dp</dimen>
+
+    <dimen name="dp_141">112.8000dp</dimen>
+
+    <dimen name="dp_142">113.6000dp</dimen>
+
+    <dimen name="dp_143">114.4000dp</dimen>
+
+    <dimen name="dp_144">115.2000dp</dimen>
+
+    <dimen name="dp_145">116.0000dp</dimen>
+
+    <dimen name="dp_146">116.8000dp</dimen>
+
+    <dimen name="dp_147">117.6000dp</dimen>
+
+    <dimen name="dp_148">118.4000dp</dimen>
+
+    <dimen name="dp_149">119.2000dp</dimen>
+
+    <dimen name="dp_150">120.0000dp</dimen>
+
+    <dimen name="dp_151">120.8000dp</dimen>
+
+    <dimen name="dp_152">121.6000dp</dimen>
+
+    <dimen name="dp_153">122.4000dp</dimen>
+
+    <dimen name="dp_154">123.2000dp</dimen>
+
+    <dimen name="dp_155">124.0000dp</dimen>
+
+    <dimen name="dp_156">124.8000dp</dimen>
+
+    <dimen name="dp_157">125.6000dp</dimen>
+
+    <dimen name="dp_158">126.4000dp</dimen>
+
+    <dimen name="dp_159">127.2000dp</dimen>
+
+    <dimen name="dp_160">128.0000dp</dimen>
+
+    <dimen name="dp_161">128.8000dp</dimen>
+
+    <dimen name="dp_162">129.6000dp</dimen>
+
+    <dimen name="dp_163">130.4000dp</dimen>
+
+    <dimen name="dp_164">131.2000dp</dimen>
+
+    <dimen name="dp_165">132.0000dp</dimen>
+
+    <dimen name="dp_166">132.8000dp</dimen>
+
+    <dimen name="dp_167">133.6000dp</dimen>
+
+    <dimen name="dp_168">134.4000dp</dimen>
+
+    <dimen name="dp_169">135.2000dp</dimen>
+
+    <dimen name="dp_170">136.0000dp</dimen>
+
+    <dimen name="dp_171">136.8000dp</dimen>
+
+    <dimen name="dp_172">137.6000dp</dimen>
+
+    <dimen name="dp_173">138.4000dp</dimen>
+
+    <dimen name="dp_174">139.2000dp</dimen>
+
+    <dimen name="dp_175">140.0000dp</dimen>
+
+    <dimen name="dp_176">140.8000dp</dimen>
+
+    <dimen name="dp_177">141.6000dp</dimen>
+
+    <dimen name="dp_178">142.4000dp</dimen>
+
+    <dimen name="dp_179">143.2000dp</dimen>
+
+    <dimen name="dp_180">144.0000dp</dimen>
+
+    <dimen name="dp_181">144.8000dp</dimen>
+
+    <dimen name="dp_182">145.6000dp</dimen>
+
+    <dimen name="dp_183">146.4000dp</dimen>
+
+    <dimen name="dp_184">147.2000dp</dimen>
+
+    <dimen name="dp_185">148.0000dp</dimen>
+
+    <dimen name="dp_186">148.8000dp</dimen>
+
+    <dimen name="dp_187">149.6000dp</dimen>
+
+    <dimen name="dp_188">150.4000dp</dimen>
+
+    <dimen name="dp_189">151.2000dp</dimen>
+
+    <dimen name="dp_190">152.0000dp</dimen>
+
+    <dimen name="dp_191">152.8000dp</dimen>
+
+    <dimen name="dp_191_25">153.0000dp</dimen>
+
+    <dimen name="dp_192">153.6000dp</dimen>
+
+    <dimen name="dp_193">154.4000dp</dimen>
+
+    <dimen name="dp_194">155.2000dp</dimen>
+
+    <dimen name="dp_195">156.0000dp</dimen>
+
+    <dimen name="dp_196">156.8000dp</dimen>
+
+    <dimen name="dp_197">157.6000dp</dimen>
+
+    <dimen name="dp_198">158.4000dp</dimen>
+
+    <dimen name="dp_199">159.2000dp</dimen>
+
+    <dimen name="dp_200">160.0000dp</dimen>
+
+    <dimen name="dp_201">160.8000dp</dimen>
+
+    <dimen name="dp_202">161.6000dp</dimen>
+
+    <dimen name="dp_203">162.4000dp</dimen>
+
+    <dimen name="dp_204">163.2000dp</dimen>
+
+    <dimen name="dp_205">164.0000dp</dimen>
+
+    <dimen name="dp_206">164.8000dp</dimen>
+
+    <dimen name="dp_207">165.6000dp</dimen>
+
+    <dimen name="dp_208">166.4000dp</dimen>
+
+    <dimen name="dp_209">167.2000dp</dimen>
+
+    <dimen name="dp_210">168.0000dp</dimen>
+
+    <dimen name="dp_211">168.8000dp</dimen>
+
+    <dimen name="dp_212">169.6000dp</dimen>
+
+    <dimen name="dp_213">170.4000dp</dimen>
+
+    <dimen name="dp_214">171.2000dp</dimen>
+
+    <dimen name="dp_215">172.0000dp</dimen>
+
+    <dimen name="dp_216">172.8000dp</dimen>
+
+    <dimen name="dp_217">173.6000dp</dimen>
+
+    <dimen name="dp_218">174.4000dp</dimen>
+
+    <dimen name="dp_219">175.2000dp</dimen>
+
+    <dimen name="dp_220">176.0000dp</dimen>
+
+    <dimen name="dp_221">176.8000dp</dimen>
+
+    <dimen name="dp_222">177.6000dp</dimen>
+
+    <dimen name="dp_223">178.4000dp</dimen>
+
+    <dimen name="dp_224">179.2000dp</dimen>
+
+    <dimen name="dp_225">180.0000dp</dimen>
+
+    <dimen name="dp_226">180.8000dp</dimen>
+
+    <dimen name="dp_227">181.6000dp</dimen>
+
+    <dimen name="dp_228">182.4000dp</dimen>
+
+    <dimen name="dp_229">183.2000dp</dimen>
+
+    <dimen name="dp_230">184.0000dp</dimen>
+
+    <dimen name="dp_231">184.8000dp</dimen>
+
+    <dimen name="dp_232">185.6000dp</dimen>
+
+    <dimen name="dp_233">186.4000dp</dimen>
+
+    <dimen name="dp_234">187.2000dp</dimen>
+
+    <dimen name="dp_235">188.0000dp</dimen>
+
+    <dimen name="dp_236">188.8000dp</dimen>
+
+    <dimen name="dp_237">189.6000dp</dimen>
+
+    <dimen name="dp_238">190.4000dp</dimen>
+
+    <dimen name="dp_239">191.2000dp</dimen>
+
+    <dimen name="dp_240">192.0000dp</dimen>
+
+    <dimen name="dp_241">192.8000dp</dimen>
+
+    <dimen name="dp_242">193.6000dp</dimen>
+
+    <dimen name="dp_243">194.4000dp</dimen>
+
+    <dimen name="dp_244">195.2000dp</dimen>
+
+    <dimen name="dp_245">196.0000dp</dimen>
+
+    <dimen name="dp_246">196.8000dp</dimen>
+
+    <dimen name="dp_247">197.6000dp</dimen>
+
+    <dimen name="dp_248">198.4000dp</dimen>
+
+    <dimen name="dp_249">199.2000dp</dimen>
+
+    <dimen name="dp_250">200.0000dp</dimen>
+
+    <dimen name="dp_251">200.8000dp</dimen>
+
+    <dimen name="dp_252">201.6000dp</dimen>
+
+    <dimen name="dp_253">202.4000dp</dimen>
+
+    <dimen name="dp_254">203.2000dp</dimen>
+
+    <dimen name="dp_255">204.0000dp</dimen>
+
+    <dimen name="dp_256">204.8000dp</dimen>
+
+    <dimen name="dp_257">205.6000dp</dimen>
+
+    <dimen name="dp_258">206.4000dp</dimen>
+
+    <dimen name="dp_259">207.2000dp</dimen>
+
+    <dimen name="dp_260">208.0000dp</dimen>
+
+    <dimen name="dp_261">208.8000dp</dimen>
+
+    <dimen name="dp_262">209.6000dp</dimen>
+
+    <dimen name="dp_263">210.4000dp</dimen>
+
+    <dimen name="dp_264">211.2000dp</dimen>
+
+    <dimen name="dp_265">212.0000dp</dimen>
+
+    <dimen name="dp_266">212.8000dp</dimen>
+
+    <dimen name="dp_267">213.6000dp</dimen>
+
+    <dimen name="dp_268">214.4000dp</dimen>
+
+    <dimen name="dp_269">215.2000dp</dimen>
+
+    <dimen name="dp_270">216.0000dp</dimen>
+
+    <dimen name="dp_271">216.8000dp</dimen>
+
+    <dimen name="dp_272">217.6000dp</dimen>
+
+    <dimen name="dp_273">218.4000dp</dimen>
+
+    <dimen name="dp_274">219.2000dp</dimen>
+
+    <dimen name="dp_275">220.0000dp</dimen>
+
+    <dimen name="dp_276">220.8000dp</dimen>
+
+    <dimen name="dp_277">221.6000dp</dimen>
+
+    <dimen name="dp_278">222.4000dp</dimen>
+
+    <dimen name="dp_279">223.2000dp</dimen>
+
+    <dimen name="dp_280">224.0000dp</dimen>
+
+    <dimen name="dp_281">224.8000dp</dimen>
+
+    <dimen name="dp_282">225.6000dp</dimen>
+
+    <dimen name="dp_283">226.4000dp</dimen>
+
+    <dimen name="dp_284">227.2000dp</dimen>
+
+    <dimen name="dp_285">228.0000dp</dimen>
+
+    <dimen name="dp_286">228.8000dp</dimen>
+
+    <dimen name="dp_287">229.6000dp</dimen>
+
+    <dimen name="dp_288">230.4000dp</dimen>
+
+    <dimen name="dp_289">231.2000dp</dimen>
+
+    <dimen name="dp_290">232.0000dp</dimen>
+
+    <dimen name="dp_291">232.8000dp</dimen>
+
+    <dimen name="dp_292">233.6000dp</dimen>
+
+    <dimen name="dp_293">234.4000dp</dimen>
+
+    <dimen name="dp_294">235.2000dp</dimen>
+
+    <dimen name="dp_295">236.0000dp</dimen>
+
+    <dimen name="dp_296">236.8000dp</dimen>
+
+    <dimen name="dp_297">237.6000dp</dimen>
+
+    <dimen name="dp_298">238.4000dp</dimen>
+
+    <dimen name="dp_299">239.2000dp</dimen>
+
+    <dimen name="dp_300">240.0000dp</dimen>
+
+    <dimen name="dp_301">240.8000dp</dimen>
+
+    <dimen name="dp_302">241.6000dp</dimen>
+
+    <dimen name="dp_303">242.4000dp</dimen>
+
+    <dimen name="dp_304">243.2000dp</dimen>
+
+    <dimen name="dp_305">244.0000dp</dimen>
+
+    <dimen name="dp_306">244.8000dp</dimen>
+
+    <dimen name="dp_307">245.6000dp</dimen>
+
+    <dimen name="dp_308">246.4000dp</dimen>
+
+    <dimen name="dp_309">247.2000dp</dimen>
+
+    <dimen name="dp_310">248.0000dp</dimen>
+
+    <dimen name="dp_311">248.8000dp</dimen>
+
+    <dimen name="dp_312">249.6000dp</dimen>
+
+    <dimen name="dp_313">250.4000dp</dimen>
+
+    <dimen name="dp_314">251.2000dp</dimen>
+
+    <dimen name="dp_315">252.0000dp</dimen>
+
+    <dimen name="dp_316">252.8000dp</dimen>
+
+    <dimen name="dp_317">253.6000dp</dimen>
+
+    <dimen name="dp_318">254.4000dp</dimen>
+
+    <dimen name="dp_319">255.2000dp</dimen>
+
+    <dimen name="dp_320">256.0000dp</dimen>
+
+    <dimen name="dp_321">256.8000dp</dimen>
+
+    <dimen name="dp_322">257.6000dp</dimen>
+
+    <dimen name="dp_323">258.4000dp</dimen>
+
+    <dimen name="dp_324">259.2000dp</dimen>
+
+    <dimen name="dp_325">260.0000dp</dimen>
+
+    <dimen name="dp_326">260.8000dp</dimen>
+
+    <dimen name="dp_327">261.6000dp</dimen>
+
+    <dimen name="dp_328">262.4000dp</dimen>
+
+    <dimen name="dp_329">263.2000dp</dimen>
+
+    <dimen name="dp_330">264.0000dp</dimen>
+
+    <dimen name="dp_331">264.8000dp</dimen>
+
+    <dimen name="dp_332">265.6000dp</dimen>
+
+    <dimen name="dp_333">266.4000dp</dimen>
+
+    <dimen name="dp_334">267.2000dp</dimen>
+
+    <dimen name="dp_335">268.0000dp</dimen>
+
+    <dimen name="dp_336">268.8000dp</dimen>
+
+    <dimen name="dp_337">269.6000dp</dimen>
+
+    <dimen name="dp_338">270.4000dp</dimen>
+
+    <dimen name="dp_339">271.2000dp</dimen>
+
+    <dimen name="dp_340">272.0000dp</dimen>
+
+    <dimen name="dp_341">272.8000dp</dimen>
+
+    <dimen name="dp_342">273.6000dp</dimen>
+
+    <dimen name="dp_343">274.4000dp</dimen>
+
+    <dimen name="dp_344">275.2000dp</dimen>
+
+    <dimen name="dp_345">276.0000dp</dimen>
+
+    <dimen name="dp_346">276.8000dp</dimen>
+
+    <dimen name="dp_347">277.6000dp</dimen>
+
+    <dimen name="dp_348">278.4000dp</dimen>
+
+    <dimen name="dp_349">279.2000dp</dimen>
+
+    <dimen name="dp_350">280.0000dp</dimen>
+
+    <dimen name="dp_351">280.8000dp</dimen>
+
+    <dimen name="dp_352">281.6000dp</dimen>
+
+    <dimen name="dp_353">282.4000dp</dimen>
+
+    <dimen name="dp_354">283.2000dp</dimen>
+
+    <dimen name="dp_355">284.0000dp</dimen>
+
+    <dimen name="dp_356">284.8000dp</dimen>
+
+    <dimen name="dp_357">285.6000dp</dimen>
+
+    <dimen name="dp_358">286.4000dp</dimen>
+
+    <dimen name="dp_359">287.2000dp</dimen>
+
+    <dimen name="dp_360">288.0000dp</dimen>
+
+    <dimen name="dp_365">292.0000dp</dimen>
+
+    <dimen name="dp_370">296.0000dp</dimen>
+
+    <dimen name="dp_400">320.0000dp</dimen>
+
+    <dimen name="dp_410">328.0000dp</dimen>
+
+    <dimen name="dp_422">337.6000dp</dimen>
+
+    <dimen name="dp_472">377.6000dp</dimen>
+
+    <dimen name="dp_500">400.0000dp</dimen>
+
+    <dimen name="dp_600">480.0000dp</dimen>
+
+    <dimen name="dp_640">512.0000dp</dimen>
+
+    <dimen name="dp_650">520.0000dp</dimen>
+
+    <dimen name="dp_710">568.0000dp</dimen>
+
+    <dimen name="dp_720">576.0000dp</dimen>
+
+
+</resources>
diff --git a/system/basic/src/main/res/values-sw392dp/dimens.xml b/system/basic/src/main/res/values-sw392dp/dimens.xml
new file mode 100644
index 0000000..59ce9c6
--- /dev/null
+++ b/system/basic/src/main/res/values-sw392dp/dimens.xml
@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+
+    <dimen name="txt5">4.0833sp</dimen>
+
+    <dimen name="txt6">4.9000sp</dimen>
+
+    <dimen name="txt7">5.7167sp</dimen>
+
+    <dimen name="txt8">6.5333sp</dimen>
+
+    <dimen name="txt9">7.3500sp</dimen>
+
+    <dimen name="txt10">8.1667sp</dimen>
+
+    <dimen name="txt11">8.9833sp</dimen>
+
+    <dimen name="txt12">9.8000sp</dimen>
+
+    <dimen name="txt13">10.6167sp</dimen>
+
+    <dimen name="txt14">11.4333sp</dimen>
+
+    <dimen name="txt15">12.2500sp</dimen>
+
+    <dimen name="txt16">13.0667sp</dimen>
+
+    <dimen name="txt17">13.8833sp</dimen>
+
+    <dimen name="txt18">14.7000sp</dimen>
+
+    <dimen name="txt19">15.5167sp</dimen>
+
+    <dimen name="txt20">16.3333sp</dimen>
+
+    <dimen name="txt21">17.1500sp</dimen>
+
+    <dimen name="txt22">17.9667sp</dimen>
+
+    <dimen name="txt24">19.6000sp</dimen>
+
+    <dimen name="txt26">21.2333sp</dimen>
+
+    <dimen name="txt28">22.8667sp</dimen>
+
+    <dimen name="txt30">24.5000sp</dimen>
+
+    <dimen name="txt32">26.1333sp</dimen>
+
+    <dimen name="txt34">27.7667sp</dimen>
+
+    <dimen name="card_common_margin_left">@dimen/dp_15</dimen>
+
+    <dimen name="dp_m_60">-49.0000dp</dimen>
+
+    <dimen name="dp_m_30">-24.5000dp</dimen>
+
+    <dimen name="dp_m_20">-16.3333dp</dimen>
+
+    <dimen name="dp_m_12">-9.8000dp</dimen>
+
+    <dimen name="dp_m_10">-8.1667dp</dimen>
+
+    <dimen name="dp_m_8">-6.5333dp</dimen>
+
+    <dimen name="dp_m_5">-4.0833dp</dimen>
+
+    <dimen name="dp_m_2">-1.6333dp</dimen>
+
+    <dimen name="dp_m_1">-0.8167dp</dimen>
+
+    <dimen name="dp_0">0.0000dp</dimen>
+
+    <dimen name="dp_0_1">0.0817dp</dimen>
+
+    <dimen name="dp_0_5">0.4083dp</dimen>
+
+    <dimen name="dp_1">0.8167dp</dimen>
+
+    <dimen name="dp_1_5">1.2250dp</dimen>
+
+    <dimen name="dp_2">1.6333dp</dimen>
+
+    <dimen name="dp_2_5">2.0417dp</dimen>
+
+    <dimen name="dp_3">2.4500dp</dimen>
+
+    <dimen name="dp_3_5">2.8583dp</dimen>
+
+    <dimen name="dp_4">3.2667dp</dimen>
+
+    <dimen name="dp_4_5">3.6750dp</dimen>
+
+    <dimen name="dp_5">4.0833dp</dimen>
+
+    <dimen name="dp_6">4.9000dp</dimen>
+
+    <dimen name="dp_7">5.7167dp</dimen>
+
+    <dimen name="dp_7_5">6.1250dp</dimen>
+
+    <dimen name="dp_8">6.5333dp</dimen>
+
+    <dimen name="dp_9">7.3500dp</dimen>
+
+    <dimen name="dp_10">8.1667dp</dimen>
+
+    <dimen name="dp_11">8.9833dp</dimen>
+
+    <dimen name="dp_12">9.8000dp</dimen>
+
+    <dimen name="dp_13">10.6167dp</dimen>
+
+    <dimen name="dp_14">11.4333dp</dimen>
+
+    <dimen name="dp_15">12.2500dp</dimen>
+
+    <dimen name="dp_16">13.0667dp</dimen>
+
+    <dimen name="dp_17">13.8833dp</dimen>
+
+    <dimen name="dp_18">14.7000dp</dimen>
+
+    <dimen name="dp_19">15.5167dp</dimen>
+
+    <dimen name="dp_20">16.3333dp</dimen>
+
+    <dimen name="dp_21">17.1500dp</dimen>
+
+    <dimen name="dp_22">17.9667dp</dimen>
+
+    <dimen name="dp_23">18.7833dp</dimen>
+
+    <dimen name="dp_24">19.6000dp</dimen>
+
+    <dimen name="dp_25">20.4167dp</dimen>
+
+    <dimen name="dp_26">21.2333dp</dimen>
+
+    <dimen name="dp_27">22.0500dp</dimen>
+
+    <dimen name="dp_28">22.8667dp</dimen>
+
+    <dimen name="dp_29">23.6833dp</dimen>
+
+    <dimen name="dp_30">24.5000dp</dimen>
+
+    <dimen name="dp_31">25.3167dp</dimen>
+
+    <dimen name="dp_32">26.1333dp</dimen>
+
+    <dimen name="dp_33">26.9500dp</dimen>
+
+    <dimen name="dp_34">27.7667dp</dimen>
+
+    <dimen name="dp_35">28.5833dp</dimen>
+
+    <dimen name="dp_36">29.4000dp</dimen>
+
+    <dimen name="dp_37">30.2167dp</dimen>
+
+    <dimen name="dp_38">31.0333dp</dimen>
+
+    <dimen name="dp_39">31.8500dp</dimen>
+
+    <dimen name="dp_40">32.6667dp</dimen>
+
+    <dimen name="dp_41">33.4833dp</dimen>
+
+    <dimen name="dp_42">34.3000dp</dimen>
+
+    <dimen name="dp_43">35.1167dp</dimen>
+
+    <dimen name="dp_44">35.9333dp</dimen>
+
+    <dimen name="dp_45">36.7500dp</dimen>
+
+    <dimen name="dp_46">37.5667dp</dimen>
+
+    <dimen name="dp_47">38.3833dp</dimen>
+
+    <dimen name="dp_48">39.2000dp</dimen>
+
+    <dimen name="dp_49">40.0167dp</dimen>
+
+    <dimen name="dp_50">40.8333dp</dimen>
+
+    <dimen name="dp_51">41.6500dp</dimen>
+
+    <dimen name="dp_52">42.4667dp</dimen>
+
+    <dimen name="dp_53">43.2833dp</dimen>
+
+    <dimen name="dp_54">44.1000dp</dimen>
+
+    <dimen name="dp_55">44.9167dp</dimen>
+
+    <dimen name="dp_56">45.7333dp</dimen>
+
+    <dimen name="dp_57">46.5500dp</dimen>
+
+    <dimen name="dp_58">47.3667dp</dimen>
+
+    <dimen name="dp_59">48.1833dp</dimen>
+
+    <dimen name="dp_60">49.0000dp</dimen>
+
+    <dimen name="dp_61">49.8167dp</dimen>
+
+    <dimen name="dp_62">50.6333dp</dimen>
+
+    <dimen name="dp_63">51.4500dp</dimen>
+
+    <dimen name="dp_64">52.2667dp</dimen>
+
+    <dimen name="dp_65">53.0833dp</dimen>
+
+    <dimen name="dp_66">53.9000dp</dimen>
+
+    <dimen name="dp_67">54.7167dp</dimen>
+
+    <dimen name="dp_68">55.5333dp</dimen>
+
+    <dimen name="dp_69">56.3500dp</dimen>
+
+    <dimen name="dp_70">57.1667dp</dimen>
+
+    <dimen name="dp_71">57.9833dp</dimen>
+
+    <dimen name="dp_72">58.8000dp</dimen>
+
+    <dimen name="dp_73">59.6167dp</dimen>
+
+    <dimen name="dp_74">60.4333dp</dimen>
+
+    <dimen name="dp_75">61.2500dp</dimen>
+
+    <dimen name="dp_76">62.0667dp</dimen>
+
+    <dimen name="dp_77">62.8833dp</dimen>
+
+    <dimen name="dp_78">63.7000dp</dimen>
+
+    <dimen name="dp_79">64.5167dp</dimen>
+
+    <dimen name="dp_80">65.3333dp</dimen>
+
+    <dimen name="dp_81">66.1500dp</dimen>
+
+    <dimen name="dp_82">66.9667dp</dimen>
+
+    <dimen name="dp_83">67.7833dp</dimen>
+
+    <dimen name="dp_84">68.6000dp</dimen>
+
+    <dimen name="dp_85">69.4167dp</dimen>
+
+    <dimen name="dp_86">70.2333dp</dimen>
+
+    <dimen name="dp_87">71.0500dp</dimen>
+
+    <dimen name="dp_88">71.8667dp</dimen>
+
+    <dimen name="dp_89">72.6833dp</dimen>
+
+    <dimen name="dp_90">73.5000dp</dimen>
+
+    <dimen name="dp_91">74.3167dp</dimen>
+
+    <dimen name="dp_92">75.1333dp</dimen>
+
+    <dimen name="dp_93">75.9500dp</dimen>
+
+    <dimen name="dp_94">76.7667dp</dimen>
+
+    <dimen name="dp_95">77.5833dp</dimen>
+
+    <dimen name="dp_96">78.4000dp</dimen>
+
+    <dimen name="dp_97">79.2167dp</dimen>
+
+    <dimen name="dp_98">80.0333dp</dimen>
+
+    <dimen name="dp_99">80.8500dp</dimen>
+
+    <dimen name="dp_100">81.6667dp</dimen>
+
+    <dimen name="dp_101">82.4833dp</dimen>
+
+    <dimen name="dp_102">83.3000dp</dimen>
+
+    <dimen name="dp_103">84.1167dp</dimen>
+
+    <dimen name="dp_104">84.9333dp</dimen>
+
+    <dimen name="dp_104_5">85.3417dp</dimen>
+
+    <dimen name="dp_105">85.7500dp</dimen>
+
+    <dimen name="dp_106">86.5667dp</dimen>
+
+    <dimen name="dp_107">87.3833dp</dimen>
+
+    <dimen name="dp_108">88.2000dp</dimen>
+
+    <dimen name="dp_109">89.0167dp</dimen>
+
+    <dimen name="dp_110">89.8333dp</dimen>
+
+    <dimen name="dp_111">90.6500dp</dimen>
+
+    <dimen name="dp_112">91.4667dp</dimen>
+
+    <dimen name="dp_113">92.2833dp</dimen>
+
+    <dimen name="dp_114">93.1000dp</dimen>
+
+    <dimen name="dp_115">93.9167dp</dimen>
+
+    <dimen name="dp_116">94.7333dp</dimen>
+
+    <dimen name="dp_117">95.5500dp</dimen>
+
+    <dimen name="dp_118">96.3667dp</dimen>
+
+    <dimen name="dp_119">97.1833dp</dimen>
+
+    <dimen name="dp_120">98.0000dp</dimen>
+
+    <dimen name="dp_121">98.8167dp</dimen>
+
+    <dimen name="dp_122">99.6333dp</dimen>
+
+    <dimen name="dp_123">100.4500dp</dimen>
+
+    <dimen name="dp_124">101.2667dp</dimen>
+
+    <dimen name="dp_125">102.0833dp</dimen>
+
+    <dimen name="dp_126">102.9000dp</dimen>
+
+    <dimen name="dp_127">103.7167dp</dimen>
+
+    <dimen name="dp_128">104.5333dp</dimen>
+
+    <dimen name="dp_129">105.3500dp</dimen>
+
+    <dimen name="dp_130">106.1667dp</dimen>
+
+    <dimen name="dp_131">106.9833dp</dimen>
+
+    <dimen name="dp_132">107.8000dp</dimen>
+
+    <dimen name="dp_133">108.6167dp</dimen>
+
+    <dimen name="dp_134">109.4333dp</dimen>
+
+    <dimen name="dp_134_5">109.8417dp</dimen>
+
+    <dimen name="dp_135">110.2500dp</dimen>
+
+    <dimen name="dp_136">111.0667dp</dimen>
+
+    <dimen name="dp_137">111.8833dp</dimen>
+
+    <dimen name="dp_138">112.7000dp</dimen>
+
+    <dimen name="dp_139">113.5167dp</dimen>
+
+    <dimen name="dp_140">114.3333dp</dimen>
+
+    <dimen name="dp_141">115.1500dp</dimen>
+
+    <dimen name="dp_142">115.9667dp</dimen>
+
+    <dimen name="dp_143">116.7833dp</dimen>
+
+    <dimen name="dp_144">117.6000dp</dimen>
+
+    <dimen name="dp_145">118.4167dp</dimen>
+
+    <dimen name="dp_146">119.2333dp</dimen>
+
+    <dimen name="dp_147">120.0500dp</dimen>
+
+    <dimen name="dp_148">120.8667dp</dimen>
+
+    <dimen name="dp_149">121.6833dp</dimen>
+
+    <dimen name="dp_150">122.5000dp</dimen>
+
+    <dimen name="dp_151">123.3167dp</dimen>
+
+    <dimen name="dp_152">124.1333dp</dimen>
+
+    <dimen name="dp_153">124.9500dp</dimen>
+
+    <dimen name="dp_154">125.7667dp</dimen>
+
+    <dimen name="dp_155">126.5833dp</dimen>
+
+    <dimen name="dp_156">127.4000dp</dimen>
+
+    <dimen name="dp_157">128.2167dp</dimen>
+
+    <dimen name="dp_158">129.0333dp</dimen>
+
+    <dimen name="dp_159">129.8500dp</dimen>
+
+    <dimen name="dp_160">130.6667dp</dimen>
+
+    <dimen name="dp_161">131.4833dp</dimen>
+
+    <dimen name="dp_162">132.3000dp</dimen>
+
+    <dimen name="dp_163">133.1167dp</dimen>
+
+    <dimen name="dp_164">133.9333dp</dimen>
+
+    <dimen name="dp_165">134.7500dp</dimen>
+
+    <dimen name="dp_166">135.5667dp</dimen>
+
+    <dimen name="dp_167">136.3833dp</dimen>
+
+    <dimen name="dp_168">137.2000dp</dimen>
+
+    <dimen name="dp_169">138.0167dp</dimen>
+
+    <dimen name="dp_170">138.8333dp</dimen>
+
+    <dimen name="dp_171">139.6500dp</dimen>
+
+    <dimen name="dp_172">140.4667dp</dimen>
+
+    <dimen name="dp_173">141.2833dp</dimen>
+
+    <dimen name="dp_174">142.1000dp</dimen>
+
+    <dimen name="dp_175">142.9167dp</dimen>
+
+    <dimen name="dp_176">143.7333dp</dimen>
+
+    <dimen name="dp_177">144.5500dp</dimen>
+
+    <dimen name="dp_178">145.3667dp</dimen>
+
+    <dimen name="dp_179">146.1833dp</dimen>
+
+    <dimen name="dp_180">147.0000dp</dimen>
+
+    <dimen name="dp_181">147.8167dp</dimen>
+
+    <dimen name="dp_182">148.6333dp</dimen>
+
+    <dimen name="dp_183">149.4500dp</dimen>
+
+    <dimen name="dp_184">150.2667dp</dimen>
+
+    <dimen name="dp_185">151.0833dp</dimen>
+
+    <dimen name="dp_186">151.9000dp</dimen>
+
+    <dimen name="dp_187">152.7167dp</dimen>
+
+    <dimen name="dp_188">153.5333dp</dimen>
+
+    <dimen name="dp_189">154.3500dp</dimen>
+
+    <dimen name="dp_190">155.1667dp</dimen>
+
+    <dimen name="dp_191">155.9833dp</dimen>
+
+    <dimen name="dp_191_25">156.1875dp</dimen>
+
+    <dimen name="dp_192">156.8000dp</dimen>
+
+    <dimen name="dp_193">157.6167dp</dimen>
+
+    <dimen name="dp_194">158.4333dp</dimen>
+
+    <dimen name="dp_195">159.2500dp</dimen>
+
+    <dimen name="dp_196">160.0667dp</dimen>
+
+    <dimen name="dp_197">160.8833dp</dimen>
+
+    <dimen name="dp_198">161.7000dp</dimen>
+
+    <dimen name="dp_199">162.5167dp</dimen>
+
+    <dimen name="dp_200">163.3333dp</dimen>
+
+    <dimen name="dp_201">164.1500dp</dimen>
+
+    <dimen name="dp_202">164.9667dp</dimen>
+
+    <dimen name="dp_203">165.7833dp</dimen>
+
+    <dimen name="dp_204">166.6000dp</dimen>
+
+    <dimen name="dp_205">167.4167dp</dimen>
+
+    <dimen name="dp_206">168.2333dp</dimen>
+
+    <dimen name="dp_207">169.0500dp</dimen>
+
+    <dimen name="dp_208">169.8667dp</dimen>
+
+    <dimen name="dp_209">170.6833dp</dimen>
+
+    <dimen name="dp_210">171.5000dp</dimen>
+
+    <dimen name="dp_211">172.3167dp</dimen>
+
+    <dimen name="dp_212">173.1333dp</dimen>
+
+    <dimen name="dp_213">173.9500dp</dimen>
+
+    <dimen name="dp_214">174.7667dp</dimen>
+
+    <dimen name="dp_215">175.5833dp</dimen>
+
+    <dimen name="dp_216">176.4000dp</dimen>
+
+    <dimen name="dp_217">177.2167dp</dimen>
+
+    <dimen name="dp_218">178.0333dp</dimen>
+
+    <dimen name="dp_219">178.8500dp</dimen>
+
+    <dimen name="dp_220">179.6667dp</dimen>
+
+    <dimen name="dp_221">180.4833dp</dimen>
+
+    <dimen name="dp_222">181.3000dp</dimen>
+
+    <dimen name="dp_223">182.1167dp</dimen>
+
+    <dimen name="dp_224">182.9333dp</dimen>
+
+    <dimen name="dp_225">183.7500dp</dimen>
+
+    <dimen name="dp_226">184.5667dp</dimen>
+
+    <dimen name="dp_227">185.3833dp</dimen>
+
+    <dimen name="dp_228">186.2000dp</dimen>
+
+    <dimen name="dp_229">187.0167dp</dimen>
+
+    <dimen name="dp_230">187.8333dp</dimen>
+
+    <dimen name="dp_231">188.6500dp</dimen>
+
+    <dimen name="dp_232">189.4667dp</dimen>
+
+    <dimen name="dp_233">190.2833dp</dimen>
+
+    <dimen name="dp_234">191.1000dp</dimen>
+
+    <dimen name="dp_235">191.9167dp</dimen>
+
+    <dimen name="dp_236">192.7333dp</dimen>
+
+    <dimen name="dp_237">193.5500dp</dimen>
+
+    <dimen name="dp_238">194.3667dp</dimen>
+
+    <dimen name="dp_239">195.1833dp</dimen>
+
+    <dimen name="dp_240">196.0000dp</dimen>
+
+    <dimen name="dp_241">196.8167dp</dimen>
+
+    <dimen name="dp_242">197.6333dp</dimen>
+
+    <dimen name="dp_243">198.4500dp</dimen>
+
+    <dimen name="dp_244">199.2667dp</dimen>
+
+    <dimen name="dp_245">200.0833dp</dimen>
+
+    <dimen name="dp_246">200.9000dp</dimen>
+
+    <dimen name="dp_247">201.7167dp</dimen>
+
+    <dimen name="dp_248">202.5333dp</dimen>
+
+    <dimen name="dp_249">203.3500dp</dimen>
+
+    <dimen name="dp_250">204.1667dp</dimen>
+
+    <dimen name="dp_251">204.9833dp</dimen>
+
+    <dimen name="dp_252">205.8000dp</dimen>
+
+    <dimen name="dp_253">206.6167dp</dimen>
+
+    <dimen name="dp_254">207.4333dp</dimen>
+
+    <dimen name="dp_255">208.2500dp</dimen>
+
+    <dimen name="dp_256">209.0667dp</dimen>
+
+    <dimen name="dp_257">209.8833dp</dimen>
+
+    <dimen name="dp_258">210.7000dp</dimen>
+
+    <dimen name="dp_259">211.5167dp</dimen>
+
+    <dimen name="dp_260">212.3333dp</dimen>
+
+    <dimen name="dp_261">213.1500dp</dimen>
+
+    <dimen name="dp_262">213.9667dp</dimen>
+
+    <dimen name="dp_263">214.7833dp</dimen>
+
+    <dimen name="dp_264">215.6000dp</dimen>
+
+    <dimen name="dp_265">216.4167dp</dimen>
+
+    <dimen name="dp_266">217.2333dp</dimen>
+
+    <dimen name="dp_267">218.0500dp</dimen>
+
+    <dimen name="dp_268">218.8667dp</dimen>
+
+    <dimen name="dp_269">219.6833dp</dimen>
+
+    <dimen name="dp_270">220.5000dp</dimen>
+
+    <dimen name="dp_271">221.3167dp</dimen>
+
+    <dimen name="dp_272">222.1333dp</dimen>
+
+    <dimen name="dp_273">222.9500dp</dimen>
+
+    <dimen name="dp_274">223.7667dp</dimen>
+
+    <dimen name="dp_275">224.5833dp</dimen>
+
+    <dimen name="dp_276">225.4000dp</dimen>
+
+    <dimen name="dp_277">226.2167dp</dimen>
+
+    <dimen name="dp_278">227.0333dp</dimen>
+
+    <dimen name="dp_279">227.8500dp</dimen>
+
+    <dimen name="dp_280">228.6667dp</dimen>
+
+    <dimen name="dp_281">229.4833dp</dimen>
+
+    <dimen name="dp_282">230.3000dp</dimen>
+
+    <dimen name="dp_283">231.1167dp</dimen>
+
+    <dimen name="dp_284">231.9333dp</dimen>
+
+    <dimen name="dp_285">232.7500dp</dimen>
+
+    <dimen name="dp_286">233.5667dp</dimen>
+
+    <dimen name="dp_287">234.3833dp</dimen>
+
+    <dimen name="dp_288">235.2000dp</dimen>
+
+    <dimen name="dp_289">236.0167dp</dimen>
+
+    <dimen name="dp_290">236.8333dp</dimen>
+
+    <dimen name="dp_291">237.6500dp</dimen>
+
+    <dimen name="dp_292">238.4667dp</dimen>
+
+    <dimen name="dp_293">239.2833dp</dimen>
+
+    <dimen name="dp_294">240.1000dp</dimen>
+
+    <dimen name="dp_295">240.9167dp</dimen>
+
+    <dimen name="dp_296">241.7333dp</dimen>
+
+    <dimen name="dp_297">242.5500dp</dimen>
+
+    <dimen name="dp_298">243.3667dp</dimen>
+
+    <dimen name="dp_299">244.1833dp</dimen>
+
+    <dimen name="dp_300">245.0000dp</dimen>
+
+    <dimen name="dp_301">245.8167dp</dimen>
+
+    <dimen name="dp_302">246.6333dp</dimen>
+
+    <dimen name="dp_303">247.4500dp</dimen>
+
+    <dimen name="dp_304">248.2667dp</dimen>
+
+    <dimen name="dp_305">249.0833dp</dimen>
+
+    <dimen name="dp_306">249.9000dp</dimen>
+
+    <dimen name="dp_307">250.7167dp</dimen>
+
+    <dimen name="dp_308">251.5333dp</dimen>
+
+    <dimen name="dp_309">252.3500dp</dimen>
+
+    <dimen name="dp_310">253.1667dp</dimen>
+
+    <dimen name="dp_311">253.9833dp</dimen>
+
+    <dimen name="dp_312">254.8000dp</dimen>
+
+    <dimen name="dp_313">255.6167dp</dimen>
+
+    <dimen name="dp_314">256.4333dp</dimen>
+
+    <dimen name="dp_315">257.2500dp</dimen>
+
+    <dimen name="dp_316">258.0667dp</dimen>
+
+    <dimen name="dp_317">258.8833dp</dimen>
+
+    <dimen name="dp_318">259.7000dp</dimen>
+
+    <dimen name="dp_319">260.5167dp</dimen>
+
+    <dimen name="dp_320">261.3333dp</dimen>
+
+    <dimen name="dp_321">262.1500dp</dimen>
+
+    <dimen name="dp_322">262.9667dp</dimen>
+
+    <dimen name="dp_323">263.7833dp</dimen>
+
+    <dimen name="dp_324">264.6000dp</dimen>
+
+    <dimen name="dp_325">265.4167dp</dimen>
+
+    <dimen name="dp_326">266.2333dp</dimen>
+
+    <dimen name="dp_327">267.0500dp</dimen>
+
+    <dimen name="dp_328">267.8667dp</dimen>
+
+    <dimen name="dp_329">268.6833dp</dimen>
+
+    <dimen name="dp_330">269.5000dp</dimen>
+
+    <dimen name="dp_331">270.3167dp</dimen>
+
+    <dimen name="dp_332">271.1333dp</dimen>
+
+    <dimen name="dp_333">271.9500dp</dimen>
+
+    <dimen name="dp_334">272.7667dp</dimen>
+
+    <dimen name="dp_335">273.5833dp</dimen>
+
+    <dimen name="dp_336">274.4000dp</dimen>
+
+    <dimen name="dp_337">275.2167dp</dimen>
+
+    <dimen name="dp_338">276.0333dp</dimen>
+
+    <dimen name="dp_339">276.8500dp</dimen>
+
+    <dimen name="dp_340">277.6667dp</dimen>
+
+    <dimen name="dp_341">278.4833dp</dimen>
+
+    <dimen name="dp_342">279.3000dp</dimen>
+
+    <dimen name="dp_343">280.1167dp</dimen>
+
+    <dimen name="dp_344">280.9333dp</dimen>
+
+    <dimen name="dp_345">281.7500dp</dimen>
+
+    <dimen name="dp_346">282.5667dp</dimen>
+
+    <dimen name="dp_347">283.3833dp</dimen>
+
+    <dimen name="dp_348">284.2000dp</dimen>
+
+    <dimen name="dp_349">285.0167dp</dimen>
+
+    <dimen name="dp_350">285.8333dp</dimen>
+
+    <dimen name="dp_351">286.6500dp</dimen>
+
+    <dimen name="dp_352">287.4667dp</dimen>
+
+    <dimen name="dp_353">288.2833dp</dimen>
+
+    <dimen name="dp_354">289.1000dp</dimen>
+
+    <dimen name="dp_355">289.9167dp</dimen>
+
+    <dimen name="dp_356">290.7333dp</dimen>
+
+    <dimen name="dp_357">291.5500dp</dimen>
+
+    <dimen name="dp_358">292.3667dp</dimen>
+
+    <dimen name="dp_359">293.1833dp</dimen>
+
+    <dimen name="dp_360">294.0000dp</dimen>
+
+    <dimen name="dp_365">298.0833dp</dimen>
+
+    <dimen name="dp_370">302.1667dp</dimen>
+
+    <dimen name="dp_400">326.6667dp</dimen>
+
+    <dimen name="dp_410">334.8333dp</dimen>
+
+    <dimen name="dp_422">344.6333dp</dimen>
+
+    <dimen name="dp_472">385.4667dp</dimen>
+
+    <dimen name="dp_500">408.3333dp</dimen>
+
+    <dimen name="dp_600">490.0000dp</dimen>
+
+    <dimen name="dp_640">522.6667dp</dimen>
+
+    <dimen name="dp_650">530.8333dp</dimen>
+
+    <dimen name="dp_710">579.8333dp</dimen>
+
+    <dimen name="dp_720">588.0000dp</dimen>
+
+
+</resources>
diff --git a/system/basic/src/main/res/values-sw400dp/dimens.xml b/system/basic/src/main/res/values-sw400dp/dimens.xml
new file mode 100644
index 0000000..c61e0d5
--- /dev/null
+++ b/system/basic/src/main/res/values-sw400dp/dimens.xml
@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+
+    <dimen name="txt5">4.1667sp</dimen>
+
+    <dimen name="txt6">5.0000sp</dimen>
+
+    <dimen name="txt7">5.8333sp</dimen>
+
+    <dimen name="txt8">6.6667sp</dimen>
+
+    <dimen name="txt9">7.5000sp</dimen>
+
+    <dimen name="txt10">8.3333sp</dimen>
+
+    <dimen name="txt11">9.1667sp</dimen>
+
+    <dimen name="txt12">10.0000sp</dimen>
+
+    <dimen name="txt13">10.8333sp</dimen>
+
+    <dimen name="txt14">11.6667sp</dimen>
+
+    <dimen name="txt15">12.5000sp</dimen>
+
+    <dimen name="txt16">13.3333sp</dimen>
+
+    <dimen name="txt17">14.1667sp</dimen>
+
+    <dimen name="txt18">15.0000sp</dimen>
+
+    <dimen name="txt19">15.8333sp</dimen>
+
+    <dimen name="txt20">16.6667sp</dimen>
+
+    <dimen name="txt21">17.5000sp</dimen>
+
+    <dimen name="txt22">18.3333sp</dimen>
+
+    <dimen name="txt24">20.0000sp</dimen>
+
+    <dimen name="txt26">21.6667sp</dimen>
+
+    <dimen name="txt28">23.3333sp</dimen>
+
+    <dimen name="txt30">25.0000sp</dimen>
+
+    <dimen name="txt32">26.6667sp</dimen>
+
+    <dimen name="txt34">28.3333sp</dimen>
+
+    <dimen name="card_common_margin_left">@dimen/dp_15</dimen>
+
+    <dimen name="dp_m_60">-50.0000dp</dimen>
+
+    <dimen name="dp_m_30">-25.0000dp</dimen>
+
+    <dimen name="dp_m_20">-16.6667dp</dimen>
+
+    <dimen name="dp_m_12">-10.0000dp</dimen>
+
+    <dimen name="dp_m_10">-8.3333dp</dimen>
+
+    <dimen name="dp_m_8">-6.6667dp</dimen>
+
+    <dimen name="dp_m_5">-4.1667dp</dimen>
+
+    <dimen name="dp_m_2">-1.6667dp</dimen>
+
+    <dimen name="dp_m_1">-0.8333dp</dimen>
+
+    <dimen name="dp_0">0.0000dp</dimen>
+
+    <dimen name="dp_0_1">0.0833dp</dimen>
+
+    <dimen name="dp_0_5">0.4167dp</dimen>
+
+    <dimen name="dp_1">0.8333dp</dimen>
+
+    <dimen name="dp_1_5">1.2500dp</dimen>
+
+    <dimen name="dp_2">1.6667dp</dimen>
+
+    <dimen name="dp_2_5">2.0833dp</dimen>
+
+    <dimen name="dp_3">2.5000dp</dimen>
+
+    <dimen name="dp_3_5">2.9167dp</dimen>
+
+    <dimen name="dp_4">3.3333dp</dimen>
+
+    <dimen name="dp_4_5">3.7500dp</dimen>
+
+    <dimen name="dp_5">4.1667dp</dimen>
+
+    <dimen name="dp_6">5.0000dp</dimen>
+
+    <dimen name="dp_7">5.8333dp</dimen>
+
+    <dimen name="dp_7_5">6.2500dp</dimen>
+
+    <dimen name="dp_8">6.6667dp</dimen>
+
+    <dimen name="dp_9">7.5000dp</dimen>
+
+    <dimen name="dp_10">8.3333dp</dimen>
+
+    <dimen name="dp_11">9.1667dp</dimen>
+
+    <dimen name="dp_12">10.0000dp</dimen>
+
+    <dimen name="dp_13">10.8333dp</dimen>
+
+    <dimen name="dp_14">11.6667dp</dimen>
+
+    <dimen name="dp_15">12.5000dp</dimen>
+
+    <dimen name="dp_16">13.3333dp</dimen>
+
+    <dimen name="dp_17">14.1667dp</dimen>
+
+    <dimen name="dp_18">15.0000dp</dimen>
+
+    <dimen name="dp_19">15.8333dp</dimen>
+
+    <dimen name="dp_20">16.6667dp</dimen>
+
+    <dimen name="dp_21">17.5000dp</dimen>
+
+    <dimen name="dp_22">18.3333dp</dimen>
+
+    <dimen name="dp_23">19.1667dp</dimen>
+
+    <dimen name="dp_24">20.0000dp</dimen>
+
+    <dimen name="dp_25">20.8333dp</dimen>
+
+    <dimen name="dp_26">21.6667dp</dimen>
+
+    <dimen name="dp_27">22.5000dp</dimen>
+
+    <dimen name="dp_28">23.3333dp</dimen>
+
+    <dimen name="dp_29">24.1667dp</dimen>
+
+    <dimen name="dp_30">25.0000dp</dimen>
+
+    <dimen name="dp_31">25.8333dp</dimen>
+
+    <dimen name="dp_32">26.6667dp</dimen>
+
+    <dimen name="dp_33">27.5000dp</dimen>
+
+    <dimen name="dp_34">28.3333dp</dimen>
+
+    <dimen name="dp_35">29.1667dp</dimen>
+
+    <dimen name="dp_36">30.0000dp</dimen>
+
+    <dimen name="dp_37">30.8333dp</dimen>
+
+    <dimen name="dp_38">31.6667dp</dimen>
+
+    <dimen name="dp_39">32.5000dp</dimen>
+
+    <dimen name="dp_40">33.3333dp</dimen>
+
+    <dimen name="dp_41">34.1667dp</dimen>
+
+    <dimen name="dp_42">35.0000dp</dimen>
+
+    <dimen name="dp_43">35.8333dp</dimen>
+
+    <dimen name="dp_44">36.6667dp</dimen>
+
+    <dimen name="dp_45">37.5000dp</dimen>
+
+    <dimen name="dp_46">38.3333dp</dimen>
+
+    <dimen name="dp_47">39.1667dp</dimen>
+
+    <dimen name="dp_48">40.0000dp</dimen>
+
+    <dimen name="dp_49">40.8333dp</dimen>
+
+    <dimen name="dp_50">41.6667dp</dimen>
+
+    <dimen name="dp_51">42.5000dp</dimen>
+
+    <dimen name="dp_52">43.3333dp</dimen>
+
+    <dimen name="dp_53">44.1667dp</dimen>
+
+    <dimen name="dp_54">45.0000dp</dimen>
+
+    <dimen name="dp_55">45.8333dp</dimen>
+
+    <dimen name="dp_56">46.6667dp</dimen>
+
+    <dimen name="dp_57">47.5000dp</dimen>
+
+    <dimen name="dp_58">48.3333dp</dimen>
+
+    <dimen name="dp_59">49.1667dp</dimen>
+
+    <dimen name="dp_60">50.0000dp</dimen>
+
+    <dimen name="dp_61">50.8333dp</dimen>
+
+    <dimen name="dp_62">51.6667dp</dimen>
+
+    <dimen name="dp_63">52.5000dp</dimen>
+
+    <dimen name="dp_64">53.3333dp</dimen>
+
+    <dimen name="dp_65">54.1667dp</dimen>
+
+    <dimen name="dp_66">55.0000dp</dimen>
+
+    <dimen name="dp_67">55.8333dp</dimen>
+
+    <dimen name="dp_68">56.6667dp</dimen>
+
+    <dimen name="dp_69">57.5000dp</dimen>
+
+    <dimen name="dp_70">58.3333dp</dimen>
+
+    <dimen name="dp_71">59.1667dp</dimen>
+
+    <dimen name="dp_72">60.0000dp</dimen>
+
+    <dimen name="dp_73">60.8333dp</dimen>
+
+    <dimen name="dp_74">61.6667dp</dimen>
+
+    <dimen name="dp_75">62.5000dp</dimen>
+
+    <dimen name="dp_76">63.3333dp</dimen>
+
+    <dimen name="dp_77">64.1667dp</dimen>
+
+    <dimen name="dp_78">65.0000dp</dimen>
+
+    <dimen name="dp_79">65.8333dp</dimen>
+
+    <dimen name="dp_80">66.6667dp</dimen>
+
+    <dimen name="dp_81">67.5000dp</dimen>
+
+    <dimen name="dp_82">68.3333dp</dimen>
+
+    <dimen name="dp_83">69.1667dp</dimen>
+
+    <dimen name="dp_84">70.0000dp</dimen>
+
+    <dimen name="dp_85">70.8333dp</dimen>
+
+    <dimen name="dp_86">71.6667dp</dimen>
+
+    <dimen name="dp_87">72.5000dp</dimen>
+
+    <dimen name="dp_88">73.3333dp</dimen>
+
+    <dimen name="dp_89">74.1667dp</dimen>
+
+    <dimen name="dp_90">75.0000dp</dimen>
+
+    <dimen name="dp_91">75.8333dp</dimen>
+
+    <dimen name="dp_92">76.6667dp</dimen>
+
+    <dimen name="dp_93">77.5000dp</dimen>
+
+    <dimen name="dp_94">78.3333dp</dimen>
+
+    <dimen name="dp_95">79.1667dp</dimen>
+
+    <dimen name="dp_96">80.0000dp</dimen>
+
+    <dimen name="dp_97">80.8333dp</dimen>
+
+    <dimen name="dp_98">81.6667dp</dimen>
+
+    <dimen name="dp_99">82.5000dp</dimen>
+
+    <dimen name="dp_100">83.3333dp</dimen>
+
+    <dimen name="dp_101">84.1667dp</dimen>
+
+    <dimen name="dp_102">85.0000dp</dimen>
+
+    <dimen name="dp_103">85.8333dp</dimen>
+
+    <dimen name="dp_104">86.6667dp</dimen>
+
+    <dimen name="dp_104_5">87.0833dp</dimen>
+
+    <dimen name="dp_105">87.5000dp</dimen>
+
+    <dimen name="dp_106">88.3333dp</dimen>
+
+    <dimen name="dp_107">89.1667dp</dimen>
+
+    <dimen name="dp_108">90.0000dp</dimen>
+
+    <dimen name="dp_109">90.8333dp</dimen>
+
+    <dimen name="dp_110">91.6667dp</dimen>
+
+    <dimen name="dp_111">92.5000dp</dimen>
+
+    <dimen name="dp_112">93.3333dp</dimen>
+
+    <dimen name="dp_113">94.1667dp</dimen>
+
+    <dimen name="dp_114">95.0000dp</dimen>
+
+    <dimen name="dp_115">95.8333dp</dimen>
+
+    <dimen name="dp_116">96.6667dp</dimen>
+
+    <dimen name="dp_117">97.5000dp</dimen>
+
+    <dimen name="dp_118">98.3333dp</dimen>
+
+    <dimen name="dp_119">99.1667dp</dimen>
+
+    <dimen name="dp_120">100.0000dp</dimen>
+
+    <dimen name="dp_121">100.8333dp</dimen>
+
+    <dimen name="dp_122">101.6667dp</dimen>
+
+    <dimen name="dp_123">102.5000dp</dimen>
+
+    <dimen name="dp_124">103.3333dp</dimen>
+
+    <dimen name="dp_125">104.1667dp</dimen>
+
+    <dimen name="dp_126">105.0000dp</dimen>
+
+    <dimen name="dp_127">105.8333dp</dimen>
+
+    <dimen name="dp_128">106.6667dp</dimen>
+
+    <dimen name="dp_129">107.5000dp</dimen>
+
+    <dimen name="dp_130">108.3333dp</dimen>
+
+    <dimen name="dp_131">109.1667dp</dimen>
+
+    <dimen name="dp_132">110.0000dp</dimen>
+
+    <dimen name="dp_133">110.8333dp</dimen>
+
+    <dimen name="dp_134">111.6667dp</dimen>
+
+    <dimen name="dp_134_5">112.0833dp</dimen>
+
+    <dimen name="dp_135">112.5000dp</dimen>
+
+    <dimen name="dp_136">113.3333dp</dimen>
+
+    <dimen name="dp_137">114.1667dp</dimen>
+
+    <dimen name="dp_138">115.0000dp</dimen>
+
+    <dimen name="dp_139">115.8333dp</dimen>
+
+    <dimen name="dp_140">116.6667dp</dimen>
+
+    <dimen name="dp_141">117.5000dp</dimen>
+
+    <dimen name="dp_142">118.3333dp</dimen>
+
+    <dimen name="dp_143">119.1667dp</dimen>
+
+    <dimen name="dp_144">120.0000dp</dimen>
+
+    <dimen name="dp_145">120.8333dp</dimen>
+
+    <dimen name="dp_146">121.6667dp</dimen>
+
+    <dimen name="dp_147">122.5000dp</dimen>
+
+    <dimen name="dp_148">123.3333dp</dimen>
+
+    <dimen name="dp_149">124.1667dp</dimen>
+
+    <dimen name="dp_150">125.0000dp</dimen>
+
+    <dimen name="dp_151">125.8333dp</dimen>
+
+    <dimen name="dp_152">126.6667dp</dimen>
+
+    <dimen name="dp_153">127.5000dp</dimen>
+
+    <dimen name="dp_154">128.3333dp</dimen>
+
+    <dimen name="dp_155">129.1667dp</dimen>
+
+    <dimen name="dp_156">130.0000dp</dimen>
+
+    <dimen name="dp_157">130.8333dp</dimen>
+
+    <dimen name="dp_158">131.6667dp</dimen>
+
+    <dimen name="dp_159">132.5000dp</dimen>
+
+    <dimen name="dp_160">133.3333dp</dimen>
+
+    <dimen name="dp_161">134.1667dp</dimen>
+
+    <dimen name="dp_162">135.0000dp</dimen>
+
+    <dimen name="dp_163">135.8333dp</dimen>
+
+    <dimen name="dp_164">136.6667dp</dimen>
+
+    <dimen name="dp_165">137.5000dp</dimen>
+
+    <dimen name="dp_166">138.3333dp</dimen>
+
+    <dimen name="dp_167">139.1667dp</dimen>
+
+    <dimen name="dp_168">140.0000dp</dimen>
+
+    <dimen name="dp_169">140.8333dp</dimen>
+
+    <dimen name="dp_170">141.6667dp</dimen>
+
+    <dimen name="dp_171">142.5000dp</dimen>
+
+    <dimen name="dp_172">143.3333dp</dimen>
+
+    <dimen name="dp_173">144.1667dp</dimen>
+
+    <dimen name="dp_174">145.0000dp</dimen>
+
+    <dimen name="dp_175">145.8333dp</dimen>
+
+    <dimen name="dp_176">146.6667dp</dimen>
+
+    <dimen name="dp_177">147.5000dp</dimen>
+
+    <dimen name="dp_178">148.3333dp</dimen>
+
+    <dimen name="dp_179">149.1667dp</dimen>
+
+    <dimen name="dp_180">150.0000dp</dimen>
+
+    <dimen name="dp_181">150.8333dp</dimen>
+
+    <dimen name="dp_182">151.6667dp</dimen>
+
+    <dimen name="dp_183">152.5000dp</dimen>
+
+    <dimen name="dp_184">153.3333dp</dimen>
+
+    <dimen name="dp_185">154.1667dp</dimen>
+
+    <dimen name="dp_186">155.0000dp</dimen>
+
+    <dimen name="dp_187">155.8333dp</dimen>
+
+    <dimen name="dp_188">156.6667dp</dimen>
+
+    <dimen name="dp_189">157.5000dp</dimen>
+
+    <dimen name="dp_190">158.3333dp</dimen>
+
+    <dimen name="dp_191">159.1667dp</dimen>
+
+    <dimen name="dp_191_25">159.3750dp</dimen>
+
+    <dimen name="dp_192">160.0000dp</dimen>
+
+    <dimen name="dp_193">160.8333dp</dimen>
+
+    <dimen name="dp_194">161.6667dp</dimen>
+
+    <dimen name="dp_195">162.5000dp</dimen>
+
+    <dimen name="dp_196">163.3333dp</dimen>
+
+    <dimen name="dp_197">164.1667dp</dimen>
+
+    <dimen name="dp_198">165.0000dp</dimen>
+
+    <dimen name="dp_199">165.8333dp</dimen>
+
+    <dimen name="dp_200">166.6667dp</dimen>
+
+    <dimen name="dp_201">167.5000dp</dimen>
+
+    <dimen name="dp_202">168.3333dp</dimen>
+
+    <dimen name="dp_203">169.1667dp</dimen>
+
+    <dimen name="dp_204">170.0000dp</dimen>
+
+    <dimen name="dp_205">170.8333dp</dimen>
+
+    <dimen name="dp_206">171.6667dp</dimen>
+
+    <dimen name="dp_207">172.5000dp</dimen>
+
+    <dimen name="dp_208">173.3333dp</dimen>
+
+    <dimen name="dp_209">174.1667dp</dimen>
+
+    <dimen name="dp_210">175.0000dp</dimen>
+
+    <dimen name="dp_211">175.8333dp</dimen>
+
+    <dimen name="dp_212">176.6667dp</dimen>
+
+    <dimen name="dp_213">177.5000dp</dimen>
+
+    <dimen name="dp_214">178.3333dp</dimen>
+
+    <dimen name="dp_215">179.1667dp</dimen>
+
+    <dimen name="dp_216">180.0000dp</dimen>
+
+    <dimen name="dp_217">180.8333dp</dimen>
+
+    <dimen name="dp_218">181.6667dp</dimen>
+
+    <dimen name="dp_219">182.5000dp</dimen>
+
+    <dimen name="dp_220">183.3333dp</dimen>
+
+    <dimen name="dp_221">184.1667dp</dimen>
+
+    <dimen name="dp_222">185.0000dp</dimen>
+
+    <dimen name="dp_223">185.8333dp</dimen>
+
+    <dimen name="dp_224">186.6667dp</dimen>
+
+    <dimen name="dp_225">187.5000dp</dimen>
+
+    <dimen name="dp_226">188.3333dp</dimen>
+
+    <dimen name="dp_227">189.1667dp</dimen>
+
+    <dimen name="dp_228">190.0000dp</dimen>
+
+    <dimen name="dp_229">190.8333dp</dimen>
+
+    <dimen name="dp_230">191.6667dp</dimen>
+
+    <dimen name="dp_231">192.5000dp</dimen>
+
+    <dimen name="dp_232">193.3333dp</dimen>
+
+    <dimen name="dp_233">194.1667dp</dimen>
+
+    <dimen name="dp_234">195.0000dp</dimen>
+
+    <dimen name="dp_235">195.8333dp</dimen>
+
+    <dimen name="dp_236">196.6667dp</dimen>
+
+    <dimen name="dp_237">197.5000dp</dimen>
+
+    <dimen name="dp_238">198.3333dp</dimen>
+
+    <dimen name="dp_239">199.1667dp</dimen>
+
+    <dimen name="dp_240">200.0000dp</dimen>
+
+    <dimen name="dp_241">200.8333dp</dimen>
+
+    <dimen name="dp_242">201.6667dp</dimen>
+
+    <dimen name="dp_243">202.5000dp</dimen>
+
+    <dimen name="dp_244">203.3333dp</dimen>
+
+    <dimen name="dp_245">204.1667dp</dimen>
+
+    <dimen name="dp_246">205.0000dp</dimen>
+
+    <dimen name="dp_247">205.8333dp</dimen>
+
+    <dimen name="dp_248">206.6667dp</dimen>
+
+    <dimen name="dp_249">207.5000dp</dimen>
+
+    <dimen name="dp_250">208.3333dp</dimen>
+
+    <dimen name="dp_251">209.1667dp</dimen>
+
+    <dimen name="dp_252">210.0000dp</dimen>
+
+    <dimen name="dp_253">210.8333dp</dimen>
+
+    <dimen name="dp_254">211.6667dp</dimen>
+
+    <dimen name="dp_255">212.5000dp</dimen>
+
+    <dimen name="dp_256">213.3333dp</dimen>
+
+    <dimen name="dp_257">214.1667dp</dimen>
+
+    <dimen name="dp_258">215.0000dp</dimen>
+
+    <dimen name="dp_259">215.8333dp</dimen>
+
+    <dimen name="dp_260">216.6667dp</dimen>
+
+    <dimen name="dp_261">217.5000dp</dimen>
+
+    <dimen name="dp_262">218.3333dp</dimen>
+
+    <dimen name="dp_263">219.1667dp</dimen>
+
+    <dimen name="dp_264">220.0000dp</dimen>
+
+    <dimen name="dp_265">220.8333dp</dimen>
+
+    <dimen name="dp_266">221.6667dp</dimen>
+
+    <dimen name="dp_267">222.5000dp</dimen>
+
+    <dimen name="dp_268">223.3333dp</dimen>
+
+    <dimen name="dp_269">224.1667dp</dimen>
+
+    <dimen name="dp_270">225.0000dp</dimen>
+
+    <dimen name="dp_271">225.8333dp</dimen>
+
+    <dimen name="dp_272">226.6667dp</dimen>
+
+    <dimen name="dp_273">227.5000dp</dimen>
+
+    <dimen name="dp_274">228.3333dp</dimen>
+
+    <dimen name="dp_275">229.1667dp</dimen>
+
+    <dimen name="dp_276">230.0000dp</dimen>
+
+    <dimen name="dp_277">230.8333dp</dimen>
+
+    <dimen name="dp_278">231.6667dp</dimen>
+
+    <dimen name="dp_279">232.5000dp</dimen>
+
+    <dimen name="dp_280">233.3333dp</dimen>
+
+    <dimen name="dp_281">234.1667dp</dimen>
+
+    <dimen name="dp_282">235.0000dp</dimen>
+
+    <dimen name="dp_283">235.8333dp</dimen>
+
+    <dimen name="dp_284">236.6667dp</dimen>
+
+    <dimen name="dp_285">237.5000dp</dimen>
+
+    <dimen name="dp_286">238.3333dp</dimen>
+
+    <dimen name="dp_287">239.1667dp</dimen>
+
+    <dimen name="dp_288">240.0000dp</dimen>
+
+    <dimen name="dp_289">240.8333dp</dimen>
+
+    <dimen name="dp_290">241.6667dp</dimen>
+
+    <dimen name="dp_291">242.5000dp</dimen>
+
+    <dimen name="dp_292">243.3333dp</dimen>
+
+    <dimen name="dp_293">244.1667dp</dimen>
+
+    <dimen name="dp_294">245.0000dp</dimen>
+
+    <dimen name="dp_295">245.8333dp</dimen>
+
+    <dimen name="dp_296">246.6667dp</dimen>
+
+    <dimen name="dp_297">247.5000dp</dimen>
+
+    <dimen name="dp_298">248.3333dp</dimen>
+
+    <dimen name="dp_299">249.1667dp</dimen>
+
+    <dimen name="dp_300">250.0000dp</dimen>
+
+    <dimen name="dp_301">250.8333dp</dimen>
+
+    <dimen name="dp_302">251.6667dp</dimen>
+
+    <dimen name="dp_303">252.5000dp</dimen>
+
+    <dimen name="dp_304">253.3333dp</dimen>
+
+    <dimen name="dp_305">254.1667dp</dimen>
+
+    <dimen name="dp_306">255.0000dp</dimen>
+
+    <dimen name="dp_307">255.8333dp</dimen>
+
+    <dimen name="dp_308">256.6667dp</dimen>
+
+    <dimen name="dp_309">257.5000dp</dimen>
+
+    <dimen name="dp_310">258.3333dp</dimen>
+
+    <dimen name="dp_311">259.1667dp</dimen>
+
+    <dimen name="dp_312">260.0000dp</dimen>
+
+    <dimen name="dp_313">260.8333dp</dimen>
+
+    <dimen name="dp_314">261.6667dp</dimen>
+
+    <dimen name="dp_315">262.5000dp</dimen>
+
+    <dimen name="dp_316">263.3333dp</dimen>
+
+    <dimen name="dp_317">264.1667dp</dimen>
+
+    <dimen name="dp_318">265.0000dp</dimen>
+
+    <dimen name="dp_319">265.8333dp</dimen>
+
+    <dimen name="dp_320">266.6667dp</dimen>
+
+    <dimen name="dp_321">267.5000dp</dimen>
+
+    <dimen name="dp_322">268.3333dp</dimen>
+
+    <dimen name="dp_323">269.1667dp</dimen>
+
+    <dimen name="dp_324">270.0000dp</dimen>
+
+    <dimen name="dp_325">270.8333dp</dimen>
+
+    <dimen name="dp_326">271.6667dp</dimen>
+
+    <dimen name="dp_327">272.5000dp</dimen>
+
+    <dimen name="dp_328">273.3333dp</dimen>
+
+    <dimen name="dp_329">274.1667dp</dimen>
+
+    <dimen name="dp_330">275.0000dp</dimen>
+
+    <dimen name="dp_331">275.8333dp</dimen>
+
+    <dimen name="dp_332">276.6667dp</dimen>
+
+    <dimen name="dp_333">277.5000dp</dimen>
+
+    <dimen name="dp_334">278.3333dp</dimen>
+
+    <dimen name="dp_335">279.1667dp</dimen>
+
+    <dimen name="dp_336">280.0000dp</dimen>
+
+    <dimen name="dp_337">280.8333dp</dimen>
+
+    <dimen name="dp_338">281.6667dp</dimen>
+
+    <dimen name="dp_339">282.5000dp</dimen>
+
+    <dimen name="dp_340">283.3333dp</dimen>
+
+    <dimen name="dp_341">284.1667dp</dimen>
+
+    <dimen name="dp_342">285.0000dp</dimen>
+
+    <dimen name="dp_343">285.8333dp</dimen>
+
+    <dimen name="dp_344">286.6667dp</dimen>
+
+    <dimen name="dp_345">287.5000dp</dimen>
+
+    <dimen name="dp_346">288.3333dp</dimen>
+
+    <dimen name="dp_347">289.1667dp</dimen>
+
+    <dimen name="dp_348">290.0000dp</dimen>
+
+    <dimen name="dp_349">290.8333dp</dimen>
+
+    <dimen name="dp_350">291.6667dp</dimen>
+
+    <dimen name="dp_351">292.5000dp</dimen>
+
+    <dimen name="dp_352">293.3333dp</dimen>
+
+    <dimen name="dp_353">294.1667dp</dimen>
+
+    <dimen name="dp_354">295.0000dp</dimen>
+
+    <dimen name="dp_355">295.8333dp</dimen>
+
+    <dimen name="dp_356">296.6667dp</dimen>
+
+    <dimen name="dp_357">297.5000dp</dimen>
+
+    <dimen name="dp_358">298.3333dp</dimen>
+
+    <dimen name="dp_359">299.1667dp</dimen>
+
+    <dimen name="dp_360">300.0000dp</dimen>
+
+    <dimen name="dp_365">304.1667dp</dimen>
+
+    <dimen name="dp_370">308.3333dp</dimen>
+
+    <dimen name="dp_400">333.3333dp</dimen>
+
+    <dimen name="dp_410">341.6667dp</dimen>
+
+    <dimen name="dp_422">351.6667dp</dimen>
+
+    <dimen name="dp_472">393.3333dp</dimen>
+
+    <dimen name="dp_500">416.6667dp</dimen>
+
+    <dimen name="dp_600">500.0000dp</dimen>
+
+    <dimen name="dp_640">533.3333dp</dimen>
+
+    <dimen name="dp_650">541.6667dp</dimen>
+
+    <dimen name="dp_710">591.6667dp</dimen>
+
+    <dimen name="dp_720">600.0000dp</dimen>
+
+
+</resources>
diff --git a/system/basic/src/main/res/values-sw410dp/dimens.xml b/system/basic/src/main/res/values-sw410dp/dimens.xml
new file mode 100644
index 0000000..42a33f1
--- /dev/null
+++ b/system/basic/src/main/res/values-sw410dp/dimens.xml
@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+
+    <dimen name="txt5">4.2708sp</dimen>
+
+    <dimen name="txt6">5.1250sp</dimen>
+
+    <dimen name="txt7">5.9792sp</dimen>
+
+    <dimen name="txt8">6.8333sp</dimen>
+
+    <dimen name="txt9">7.6875sp</dimen>
+
+    <dimen name="txt10">8.5417sp</dimen>
+
+    <dimen name="txt11">9.3958sp</dimen>
+
+    <dimen name="txt12">10.2500sp</dimen>
+
+    <dimen name="txt13">11.1042sp</dimen>
+
+    <dimen name="txt14">11.9583sp</dimen>
+
+    <dimen name="txt15">12.8125sp</dimen>
+
+    <dimen name="txt16">13.6667sp</dimen>
+
+    <dimen name="txt17">14.5208sp</dimen>
+
+    <dimen name="txt18">15.3750sp</dimen>
+
+    <dimen name="txt19">16.2292sp</dimen>
+
+    <dimen name="txt20">17.0833sp</dimen>
+
+    <dimen name="txt21">17.9375sp</dimen>
+
+    <dimen name="txt22">18.7917sp</dimen>
+
+    <dimen name="txt24">20.5000sp</dimen>
+
+    <dimen name="txt26">22.2083sp</dimen>
+
+    <dimen name="txt28">23.9167sp</dimen>
+
+    <dimen name="txt30">25.6250sp</dimen>
+
+    <dimen name="txt32">27.3333sp</dimen>
+
+    <dimen name="txt34">29.0417sp</dimen>
+
+    <dimen name="card_common_margin_left">@dimen/dp_15</dimen>
+
+    <dimen name="dp_m_60">-51.2500dp</dimen>
+
+    <dimen name="dp_m_30">-25.6250dp</dimen>
+
+    <dimen name="dp_m_20">-17.0833dp</dimen>
+
+    <dimen name="dp_m_12">-10.2500dp</dimen>
+
+    <dimen name="dp_m_10">-8.5417dp</dimen>
+
+    <dimen name="dp_m_8">-6.8333dp</dimen>
+
+    <dimen name="dp_m_5">-4.2708dp</dimen>
+
+    <dimen name="dp_m_2">-1.7083dp</dimen>
+
+    <dimen name="dp_m_1">-0.8542dp</dimen>
+
+    <dimen name="dp_0">0.0000dp</dimen>
+
+    <dimen name="dp_0_1">0.0854dp</dimen>
+
+    <dimen name="dp_0_5">0.4271dp</dimen>
+
+    <dimen name="dp_1">0.8542dp</dimen>
+
+    <dimen name="dp_1_5">1.2812dp</dimen>
+
+    <dimen name="dp_2">1.7083dp</dimen>
+
+    <dimen name="dp_2_5">2.1354dp</dimen>
+
+    <dimen name="dp_3">2.5625dp</dimen>
+
+    <dimen name="dp_3_5">2.9896dp</dimen>
+
+    <dimen name="dp_4">3.4167dp</dimen>
+
+    <dimen name="dp_4_5">3.8438dp</dimen>
+
+    <dimen name="dp_5">4.2708dp</dimen>
+
+    <dimen name="dp_6">5.1250dp</dimen>
+
+    <dimen name="dp_7">5.9792dp</dimen>
+
+    <dimen name="dp_7_5">6.4062dp</dimen>
+
+    <dimen name="dp_8">6.8333dp</dimen>
+
+    <dimen name="dp_9">7.6875dp</dimen>
+
+    <dimen name="dp_10">8.5417dp</dimen>
+
+    <dimen name="dp_11">9.3958dp</dimen>
+
+    <dimen name="dp_12">10.2500dp</dimen>
+
+    <dimen name="dp_13">11.1042dp</dimen>
+
+    <dimen name="dp_14">11.9583dp</dimen>
+
+    <dimen name="dp_15">12.8125dp</dimen>
+
+    <dimen name="dp_16">13.6667dp</dimen>
+
+    <dimen name="dp_17">14.5208dp</dimen>
+
+    <dimen name="dp_18">15.3750dp</dimen>
+
+    <dimen name="dp_19">16.2292dp</dimen>
+
+    <dimen name="dp_20">17.0833dp</dimen>
+
+    <dimen name="dp_21">17.9375dp</dimen>
+
+    <dimen name="dp_22">18.7917dp</dimen>
+
+    <dimen name="dp_23">19.6458dp</dimen>
+
+    <dimen name="dp_24">20.5000dp</dimen>
+
+    <dimen name="dp_25">21.3542dp</dimen>
+
+    <dimen name="dp_26">22.2083dp</dimen>
+
+    <dimen name="dp_27">23.0625dp</dimen>
+
+    <dimen name="dp_28">23.9167dp</dimen>
+
+    <dimen name="dp_29">24.7708dp</dimen>
+
+    <dimen name="dp_30">25.6250dp</dimen>
+
+    <dimen name="dp_31">26.4792dp</dimen>
+
+    <dimen name="dp_32">27.3333dp</dimen>
+
+    <dimen name="dp_33">28.1875dp</dimen>
+
+    <dimen name="dp_34">29.0417dp</dimen>
+
+    <dimen name="dp_35">29.8958dp</dimen>
+
+    <dimen name="dp_36">30.7500dp</dimen>
+
+    <dimen name="dp_37">31.6042dp</dimen>
+
+    <dimen name="dp_38">32.4583dp</dimen>
+
+    <dimen name="dp_39">33.3125dp</dimen>
+
+    <dimen name="dp_40">34.1667dp</dimen>
+
+    <dimen name="dp_41">35.0208dp</dimen>
+
+    <dimen name="dp_42">35.8750dp</dimen>
+
+    <dimen name="dp_43">36.7292dp</dimen>
+
+    <dimen name="dp_44">37.5833dp</dimen>
+
+    <dimen name="dp_45">38.4375dp</dimen>
+
+    <dimen name="dp_46">39.2917dp</dimen>
+
+    <dimen name="dp_47">40.1458dp</dimen>
+
+    <dimen name="dp_48">41.0000dp</dimen>
+
+    <dimen name="dp_49">41.8542dp</dimen>
+
+    <dimen name="dp_50">42.7083dp</dimen>
+
+    <dimen name="dp_51">43.5625dp</dimen>
+
+    <dimen name="dp_52">44.4167dp</dimen>
+
+    <dimen name="dp_53">45.2708dp</dimen>
+
+    <dimen name="dp_54">46.1250dp</dimen>
+
+    <dimen name="dp_55">46.9792dp</dimen>
+
+    <dimen name="dp_56">47.8333dp</dimen>
+
+    <dimen name="dp_57">48.6875dp</dimen>
+
+    <dimen name="dp_58">49.5417dp</dimen>
+
+    <dimen name="dp_59">50.3958dp</dimen>
+
+    <dimen name="dp_60">51.2500dp</dimen>
+
+    <dimen name="dp_61">52.1042dp</dimen>
+
+    <dimen name="dp_62">52.9583dp</dimen>
+
+    <dimen name="dp_63">53.8125dp</dimen>
+
+    <dimen name="dp_64">54.6667dp</dimen>
+
+    <dimen name="dp_65">55.5208dp</dimen>
+
+    <dimen name="dp_66">56.3750dp</dimen>
+
+    <dimen name="dp_67">57.2292dp</dimen>
+
+    <dimen name="dp_68">58.0833dp</dimen>
+
+    <dimen name="dp_69">58.9375dp</dimen>
+
+    <dimen name="dp_70">59.7917dp</dimen>
+
+    <dimen name="dp_71">60.6458dp</dimen>
+
+    <dimen name="dp_72">61.5000dp</dimen>
+
+    <dimen name="dp_73">62.3542dp</dimen>
+
+    <dimen name="dp_74">63.2083dp</dimen>
+
+    <dimen name="dp_75">64.0625dp</dimen>
+
+    <dimen name="dp_76">64.9167dp</dimen>
+
+    <dimen name="dp_77">65.7708dp</dimen>
+
+    <dimen name="dp_78">66.6250dp</dimen>
+
+    <dimen name="dp_79">67.4792dp</dimen>
+
+    <dimen name="dp_80">68.3333dp</dimen>
+
+    <dimen name="dp_81">69.1875dp</dimen>
+
+    <dimen name="dp_82">70.0417dp</dimen>
+
+    <dimen name="dp_83">70.8958dp</dimen>
+
+    <dimen name="dp_84">71.7500dp</dimen>
+
+    <dimen name="dp_85">72.6042dp</dimen>
+
+    <dimen name="dp_86">73.4583dp</dimen>
+
+    <dimen name="dp_87">74.3125dp</dimen>
+
+    <dimen name="dp_88">75.1667dp</dimen>
+
+    <dimen name="dp_89">76.0208dp</dimen>
+
+    <dimen name="dp_90">76.8750dp</dimen>
+
+    <dimen name="dp_91">77.7292dp</dimen>
+
+    <dimen name="dp_92">78.5833dp</dimen>
+
+    <dimen name="dp_93">79.4375dp</dimen>
+
+    <dimen name="dp_94">80.2917dp</dimen>
+
+    <dimen name="dp_95">81.1458dp</dimen>
+
+    <dimen name="dp_96">82.0000dp</dimen>
+
+    <dimen name="dp_97">82.8542dp</dimen>
+
+    <dimen name="dp_98">83.7083dp</dimen>
+
+    <dimen name="dp_99">84.5625dp</dimen>
+
+    <dimen name="dp_100">85.4167dp</dimen>
+
+    <dimen name="dp_101">86.2708dp</dimen>
+
+    <dimen name="dp_102">87.1250dp</dimen>
+
+    <dimen name="dp_103">87.9792dp</dimen>
+
+    <dimen name="dp_104">88.8333dp</dimen>
+
+    <dimen name="dp_104_5">89.2604dp</dimen>
+
+    <dimen name="dp_105">89.6875dp</dimen>
+
+    <dimen name="dp_106">90.5417dp</dimen>
+
+    <dimen name="dp_107">91.3958dp</dimen>
+
+    <dimen name="dp_108">92.2500dp</dimen>
+
+    <dimen name="dp_109">93.1042dp</dimen>
+
+    <dimen name="dp_110">93.9583dp</dimen>
+
+    <dimen name="dp_111">94.8125dp</dimen>
+
+    <dimen name="dp_112">95.6667dp</dimen>
+
+    <dimen name="dp_113">96.5208dp</dimen>
+
+    <dimen name="dp_114">97.3750dp</dimen>
+
+    <dimen name="dp_115">98.2292dp</dimen>
+
+    <dimen name="dp_116">99.0833dp</dimen>
+
+    <dimen name="dp_117">99.9375dp</dimen>
+
+    <dimen name="dp_118">100.7917dp</dimen>
+
+    <dimen name="dp_119">101.6458dp</dimen>
+
+    <dimen name="dp_120">102.5000dp</dimen>
+
+    <dimen name="dp_121">103.3542dp</dimen>
+
+    <dimen name="dp_122">104.2083dp</dimen>
+
+    <dimen name="dp_123">105.0625dp</dimen>
+
+    <dimen name="dp_124">105.9167dp</dimen>
+
+    <dimen name="dp_125">106.7708dp</dimen>
+
+    <dimen name="dp_126">107.6250dp</dimen>
+
+    <dimen name="dp_127">108.4792dp</dimen>
+
+    <dimen name="dp_128">109.3333dp</dimen>
+
+    <dimen name="dp_129">110.1875dp</dimen>
+
+    <dimen name="dp_130">111.0417dp</dimen>
+
+    <dimen name="dp_131">111.8958dp</dimen>
+
+    <dimen name="dp_132">112.7500dp</dimen>
+
+    <dimen name="dp_133">113.6042dp</dimen>
+
+    <dimen name="dp_134">114.4583dp</dimen>
+
+    <dimen name="dp_134_5">114.8854dp</dimen>
+
+    <dimen name="dp_135">115.3125dp</dimen>
+
+    <dimen name="dp_136">116.1667dp</dimen>
+
+    <dimen name="dp_137">117.0208dp</dimen>
+
+    <dimen name="dp_138">117.8750dp</dimen>
+
+    <dimen name="dp_139">118.7292dp</dimen>
+
+    <dimen name="dp_140">119.5833dp</dimen>
+
+    <dimen name="dp_141">120.4375dp</dimen>
+
+    <dimen name="dp_142">121.2917dp</dimen>
+
+    <dimen name="dp_143">122.1458dp</dimen>
+
+    <dimen name="dp_144">123.0000dp</dimen>
+
+    <dimen name="dp_145">123.8542dp</dimen>
+
+    <dimen name="dp_146">124.7083dp</dimen>
+
+    <dimen name="dp_147">125.5625dp</dimen>
+
+    <dimen name="dp_148">126.4167dp</dimen>
+
+    <dimen name="dp_149">127.2708dp</dimen>
+
+    <dimen name="dp_150">128.1250dp</dimen>
+
+    <dimen name="dp_151">128.9792dp</dimen>
+
+    <dimen name="dp_152">129.8333dp</dimen>
+
+    <dimen name="dp_153">130.6875dp</dimen>
+
+    <dimen name="dp_154">131.5417dp</dimen>
+
+    <dimen name="dp_155">132.3958dp</dimen>
+
+    <dimen name="dp_156">133.2500dp</dimen>
+
+    <dimen name="dp_157">134.1042dp</dimen>
+
+    <dimen name="dp_158">134.9583dp</dimen>
+
+    <dimen name="dp_159">135.8125dp</dimen>
+
+    <dimen name="dp_160">136.6667dp</dimen>
+
+    <dimen name="dp_161">137.5208dp</dimen>
+
+    <dimen name="dp_162">138.3750dp</dimen>
+
+    <dimen name="dp_163">139.2292dp</dimen>
+
+    <dimen name="dp_164">140.0833dp</dimen>
+
+    <dimen name="dp_165">140.9375dp</dimen>
+
+    <dimen name="dp_166">141.7917dp</dimen>
+
+    <dimen name="dp_167">142.6458dp</dimen>
+
+    <dimen name="dp_168">143.5000dp</dimen>
+
+    <dimen name="dp_169">144.3542dp</dimen>
+
+    <dimen name="dp_170">145.2083dp</dimen>
+
+    <dimen name="dp_171">146.0625dp</dimen>
+
+    <dimen name="dp_172">146.9167dp</dimen>
+
+    <dimen name="dp_173">147.7708dp</dimen>
+
+    <dimen name="dp_174">148.6250dp</dimen>
+
+    <dimen name="dp_175">149.4792dp</dimen>
+
+    <dimen name="dp_176">150.3333dp</dimen>
+
+    <dimen name="dp_177">151.1875dp</dimen>
+
+    <dimen name="dp_178">152.0417dp</dimen>
+
+    <dimen name="dp_179">152.8958dp</dimen>
+
+    <dimen name="dp_180">153.7500dp</dimen>
+
+    <dimen name="dp_181">154.6042dp</dimen>
+
+    <dimen name="dp_182">155.4583dp</dimen>
+
+    <dimen name="dp_183">156.3125dp</dimen>
+
+    <dimen name="dp_184">157.1667dp</dimen>
+
+    <dimen name="dp_185">158.0208dp</dimen>
+
+    <dimen name="dp_186">158.8750dp</dimen>
+
+    <dimen name="dp_187">159.7292dp</dimen>
+
+    <dimen name="dp_188">160.5833dp</dimen>
+
+    <dimen name="dp_189">161.4375dp</dimen>
+
+    <dimen name="dp_190">162.2917dp</dimen>
+
+    <dimen name="dp_191">163.1458dp</dimen>
+
+    <dimen name="dp_191_25">163.3594dp</dimen>
+
+    <dimen name="dp_192">164.0000dp</dimen>
+
+    <dimen name="dp_193">164.8542dp</dimen>
+
+    <dimen name="dp_194">165.7083dp</dimen>
+
+    <dimen name="dp_195">166.5625dp</dimen>
+
+    <dimen name="dp_196">167.4167dp</dimen>
+
+    <dimen name="dp_197">168.2708dp</dimen>
+
+    <dimen name="dp_198">169.1250dp</dimen>
+
+    <dimen name="dp_199">169.9792dp</dimen>
+
+    <dimen name="dp_200">170.8333dp</dimen>
+
+    <dimen name="dp_201">171.6875dp</dimen>
+
+    <dimen name="dp_202">172.5417dp</dimen>
+
+    <dimen name="dp_203">173.3958dp</dimen>
+
+    <dimen name="dp_204">174.2500dp</dimen>
+
+    <dimen name="dp_205">175.1042dp</dimen>
+
+    <dimen name="dp_206">175.9583dp</dimen>
+
+    <dimen name="dp_207">176.8125dp</dimen>
+
+    <dimen name="dp_208">177.6667dp</dimen>
+
+    <dimen name="dp_209">178.5208dp</dimen>
+
+    <dimen name="dp_210">179.3750dp</dimen>
+
+    <dimen name="dp_211">180.2292dp</dimen>
+
+    <dimen name="dp_212">181.0833dp</dimen>
+
+    <dimen name="dp_213">181.9375dp</dimen>
+
+    <dimen name="dp_214">182.7917dp</dimen>
+
+    <dimen name="dp_215">183.6458dp</dimen>
+
+    <dimen name="dp_216">184.5000dp</dimen>
+
+    <dimen name="dp_217">185.3542dp</dimen>
+
+    <dimen name="dp_218">186.2083dp</dimen>
+
+    <dimen name="dp_219">187.0625dp</dimen>
+
+    <dimen name="dp_220">187.9167dp</dimen>
+
+    <dimen name="dp_221">188.7708dp</dimen>
+
+    <dimen name="dp_222">189.6250dp</dimen>
+
+    <dimen name="dp_223">190.4792dp</dimen>
+
+    <dimen name="dp_224">191.3333dp</dimen>
+
+    <dimen name="dp_225">192.1875dp</dimen>
+
+    <dimen name="dp_226">193.0417dp</dimen>
+
+    <dimen name="dp_227">193.8958dp</dimen>
+
+    <dimen name="dp_228">194.7500dp</dimen>
+
+    <dimen name="dp_229">195.6042dp</dimen>
+
+    <dimen name="dp_230">196.4583dp</dimen>
+
+    <dimen name="dp_231">197.3125dp</dimen>
+
+    <dimen name="dp_232">198.1667dp</dimen>
+
+    <dimen name="dp_233">199.0208dp</dimen>
+
+    <dimen name="dp_234">199.8750dp</dimen>
+
+    <dimen name="dp_235">200.7292dp</dimen>
+
+    <dimen name="dp_236">201.5833dp</dimen>
+
+    <dimen name="dp_237">202.4375dp</dimen>
+
+    <dimen name="dp_238">203.2917dp</dimen>
+
+    <dimen name="dp_239">204.1458dp</dimen>
+
+    <dimen name="dp_240">205.0000dp</dimen>
+
+    <dimen name="dp_241">205.8542dp</dimen>
+
+    <dimen name="dp_242">206.7083dp</dimen>
+
+    <dimen name="dp_243">207.5625dp</dimen>
+
+    <dimen name="dp_244">208.4167dp</dimen>
+
+    <dimen name="dp_245">209.2708dp</dimen>
+
+    <dimen name="dp_246">210.1250dp</dimen>
+
+    <dimen name="dp_247">210.9792dp</dimen>
+
+    <dimen name="dp_248">211.8333dp</dimen>
+
+    <dimen name="dp_249">212.6875dp</dimen>
+
+    <dimen name="dp_250">213.5417dp</dimen>
+
+    <dimen name="dp_251">214.3958dp</dimen>
+
+    <dimen name="dp_252">215.2500dp</dimen>
+
+    <dimen name="dp_253">216.1042dp</dimen>
+
+    <dimen name="dp_254">216.9583dp</dimen>
+
+    <dimen name="dp_255">217.8125dp</dimen>
+
+    <dimen name="dp_256">218.6667dp</dimen>
+
+    <dimen name="dp_257">219.5208dp</dimen>
+
+    <dimen name="dp_258">220.3750dp</dimen>
+
+    <dimen name="dp_259">221.2292dp</dimen>
+
+    <dimen name="dp_260">222.0833dp</dimen>
+
+    <dimen name="dp_261">222.9375dp</dimen>
+
+    <dimen name="dp_262">223.7917dp</dimen>
+
+    <dimen name="dp_263">224.6458dp</dimen>
+
+    <dimen name="dp_264">225.5000dp</dimen>
+
+    <dimen name="dp_265">226.3542dp</dimen>
+
+    <dimen name="dp_266">227.2083dp</dimen>
+
+    <dimen name="dp_267">228.0625dp</dimen>
+
+    <dimen name="dp_268">228.9167dp</dimen>
+
+    <dimen name="dp_269">229.7708dp</dimen>
+
+    <dimen name="dp_270">230.6250dp</dimen>
+
+    <dimen name="dp_271">231.4792dp</dimen>
+
+    <dimen name="dp_272">232.3333dp</dimen>
+
+    <dimen name="dp_273">233.1875dp</dimen>
+
+    <dimen name="dp_274">234.0417dp</dimen>
+
+    <dimen name="dp_275">234.8958dp</dimen>
+
+    <dimen name="dp_276">235.7500dp</dimen>
+
+    <dimen name="dp_277">236.6042dp</dimen>
+
+    <dimen name="dp_278">237.4583dp</dimen>
+
+    <dimen name="dp_279">238.3125dp</dimen>
+
+    <dimen name="dp_280">239.1667dp</dimen>
+
+    <dimen name="dp_281">240.0208dp</dimen>
+
+    <dimen name="dp_282">240.8750dp</dimen>
+
+    <dimen name="dp_283">241.7292dp</dimen>
+
+    <dimen name="dp_284">242.5833dp</dimen>
+
+    <dimen name="dp_285">243.4375dp</dimen>
+
+    <dimen name="dp_286">244.2917dp</dimen>
+
+    <dimen name="dp_287">245.1458dp</dimen>
+
+    <dimen name="dp_288">246.0000dp</dimen>
+
+    <dimen name="dp_289">246.8542dp</dimen>
+
+    <dimen name="dp_290">247.7083dp</dimen>
+
+    <dimen name="dp_291">248.5625dp</dimen>
+
+    <dimen name="dp_292">249.4167dp</dimen>
+
+    <dimen name="dp_293">250.2708dp</dimen>
+
+    <dimen name="dp_294">251.1250dp</dimen>
+
+    <dimen name="dp_295">251.9792dp</dimen>
+
+    <dimen name="dp_296">252.8333dp</dimen>
+
+    <dimen name="dp_297">253.6875dp</dimen>
+
+    <dimen name="dp_298">254.5417dp</dimen>
+
+    <dimen name="dp_299">255.3958dp</dimen>
+
+    <dimen name="dp_300">256.2500dp</dimen>
+
+    <dimen name="dp_301">257.1042dp</dimen>
+
+    <dimen name="dp_302">257.9583dp</dimen>
+
+    <dimen name="dp_303">258.8125dp</dimen>
+
+    <dimen name="dp_304">259.6667dp</dimen>
+
+    <dimen name="dp_305">260.5208dp</dimen>
+
+    <dimen name="dp_306">261.3750dp</dimen>
+
+    <dimen name="dp_307">262.2292dp</dimen>
+
+    <dimen name="dp_308">263.0833dp</dimen>
+
+    <dimen name="dp_309">263.9375dp</dimen>
+
+    <dimen name="dp_310">264.7917dp</dimen>
+
+    <dimen name="dp_311">265.6458dp</dimen>
+
+    <dimen name="dp_312">266.5000dp</dimen>
+
+    <dimen name="dp_313">267.3542dp</dimen>
+
+    <dimen name="dp_314">268.2083dp</dimen>
+
+    <dimen name="dp_315">269.0625dp</dimen>
+
+    <dimen name="dp_316">269.9167dp</dimen>
+
+    <dimen name="dp_317">270.7708dp</dimen>
+
+    <dimen name="dp_318">271.6250dp</dimen>
+
+    <dimen name="dp_319">272.4792dp</dimen>
+
+    <dimen name="dp_320">273.3333dp</dimen>
+
+    <dimen name="dp_321">274.1875dp</dimen>
+
+    <dimen name="dp_322">275.0417dp</dimen>
+
+    <dimen name="dp_323">275.8958dp</dimen>
+
+    <dimen name="dp_324">276.7500dp</dimen>
+
+    <dimen name="dp_325">277.6042dp</dimen>
+
+    <dimen name="dp_326">278.4583dp</dimen>
+
+    <dimen name="dp_327">279.3125dp</dimen>
+
+    <dimen name="dp_328">280.1667dp</dimen>
+
+    <dimen name="dp_329">281.0208dp</dimen>
+
+    <dimen name="dp_330">281.8750dp</dimen>
+
+    <dimen name="dp_331">282.7292dp</dimen>
+
+    <dimen name="dp_332">283.5833dp</dimen>
+
+    <dimen name="dp_333">284.4375dp</dimen>
+
+    <dimen name="dp_334">285.2917dp</dimen>
+
+    <dimen name="dp_335">286.1458dp</dimen>
+
+    <dimen name="dp_336">287.0000dp</dimen>
+
+    <dimen name="dp_337">287.8542dp</dimen>
+
+    <dimen name="dp_338">288.7083dp</dimen>
+
+    <dimen name="dp_339">289.5625dp</dimen>
+
+    <dimen name="dp_340">290.4167dp</dimen>
+
+    <dimen name="dp_341">291.2708dp</dimen>
+
+    <dimen name="dp_342">292.1250dp</dimen>
+
+    <dimen name="dp_343">292.9792dp</dimen>
+
+    <dimen name="dp_344">293.8333dp</dimen>
+
+    <dimen name="dp_345">294.6875dp</dimen>
+
+    <dimen name="dp_346">295.5417dp</dimen>
+
+    <dimen name="dp_347">296.3958dp</dimen>
+
+    <dimen name="dp_348">297.2500dp</dimen>
+
+    <dimen name="dp_349">298.1042dp</dimen>
+
+    <dimen name="dp_350">298.9583dp</dimen>
+
+    <dimen name="dp_351">299.8125dp</dimen>
+
+    <dimen name="dp_352">300.6667dp</dimen>
+
+    <dimen name="dp_353">301.5208dp</dimen>
+
+    <dimen name="dp_354">302.3750dp</dimen>
+
+    <dimen name="dp_355">303.2292dp</dimen>
+
+    <dimen name="dp_356">304.0833dp</dimen>
+
+    <dimen name="dp_357">304.9375dp</dimen>
+
+    <dimen name="dp_358">305.7917dp</dimen>
+
+    <dimen name="dp_359">306.6458dp</dimen>
+
+    <dimen name="dp_360">307.5000dp</dimen>
+
+    <dimen name="dp_365">311.7708dp</dimen>
+
+    <dimen name="dp_370">316.0417dp</dimen>
+
+    <dimen name="dp_400">341.6667dp</dimen>
+
+    <dimen name="dp_410">350.2083dp</dimen>
+
+    <dimen name="dp_422">360.4583dp</dimen>
+
+    <dimen name="dp_472">403.1667dp</dimen>
+
+    <dimen name="dp_500">427.0833dp</dimen>
+
+    <dimen name="dp_600">512.5000dp</dimen>
+
+    <dimen name="dp_640">546.6667dp</dimen>
+
+    <dimen name="dp_650">555.2083dp</dimen>
+
+    <dimen name="dp_710">606.4583dp</dimen>
+
+    <dimen name="dp_720">615.0000dp</dimen>
+
+
+</resources>
diff --git a/system/basic/src/main/res/values-sw411dp/dimens.xml b/system/basic/src/main/res/values-sw411dp/dimens.xml
new file mode 100644
index 0000000..07e24e4
--- /dev/null
+++ b/system/basic/src/main/res/values-sw411dp/dimens.xml
@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+
+    <dimen name="txt5">4.2812sp</dimen>
+
+    <dimen name="txt6">5.1375sp</dimen>
+
+    <dimen name="txt7">5.9937sp</dimen>
+
+    <dimen name="txt8">6.8500sp</dimen>
+
+    <dimen name="txt9">7.7062sp</dimen>
+
+    <dimen name="txt10">8.5625sp</dimen>
+
+    <dimen name="txt11">9.4187sp</dimen>
+
+    <dimen name="txt12">10.2750sp</dimen>
+
+    <dimen name="txt13">11.1312sp</dimen>
+
+    <dimen name="txt14">11.9875sp</dimen>
+
+    <dimen name="txt15">12.8438sp</dimen>
+
+    <dimen name="txt16">13.7000sp</dimen>
+
+    <dimen name="txt17">14.5562sp</dimen>
+
+    <dimen name="txt18">15.4125sp</dimen>
+
+    <dimen name="txt19">16.2688sp</dimen>
+
+    <dimen name="txt20">17.1250sp</dimen>
+
+    <dimen name="txt21">17.9812sp</dimen>
+
+    <dimen name="txt22">18.8375sp</dimen>
+
+    <dimen name="txt24">20.5500sp</dimen>
+
+    <dimen name="txt26">22.2625sp</dimen>
+
+    <dimen name="txt28">23.9750sp</dimen>
+
+    <dimen name="txt30">25.6875sp</dimen>
+
+    <dimen name="txt32">27.4000sp</dimen>
+
+    <dimen name="txt34">29.1125sp</dimen>
+
+    <dimen name="card_common_margin_left">@dimen/dp_15</dimen>
+
+    <dimen name="dp_m_60">-51.3750dp</dimen>
+
+    <dimen name="dp_m_30">-25.6875dp</dimen>
+
+    <dimen name="dp_m_20">-17.1250dp</dimen>
+
+    <dimen name="dp_m_12">-10.2750dp</dimen>
+
+    <dimen name="dp_m_10">-8.5625dp</dimen>
+
+    <dimen name="dp_m_8">-6.8500dp</dimen>
+
+    <dimen name="dp_m_5">-4.2812dp</dimen>
+
+    <dimen name="dp_m_2">-1.7125dp</dimen>
+
+    <dimen name="dp_m_1">-0.8562dp</dimen>
+
+    <dimen name="dp_0">0.0000dp</dimen>
+
+    <dimen name="dp_0_1">0.0856dp</dimen>
+
+    <dimen name="dp_0_5">0.4281dp</dimen>
+
+    <dimen name="dp_1">0.8562dp</dimen>
+
+    <dimen name="dp_1_5">1.2844dp</dimen>
+
+    <dimen name="dp_2">1.7125dp</dimen>
+
+    <dimen name="dp_2_5">2.1406dp</dimen>
+
+    <dimen name="dp_3">2.5687dp</dimen>
+
+    <dimen name="dp_3_5">2.9969dp</dimen>
+
+    <dimen name="dp_4">3.4250dp</dimen>
+
+    <dimen name="dp_4_5">3.8531dp</dimen>
+
+    <dimen name="dp_5">4.2812dp</dimen>
+
+    <dimen name="dp_6">5.1375dp</dimen>
+
+    <dimen name="dp_7">5.9937dp</dimen>
+
+    <dimen name="dp_7_5">6.4219dp</dimen>
+
+    <dimen name="dp_8">6.8500dp</dimen>
+
+    <dimen name="dp_9">7.7062dp</dimen>
+
+    <dimen name="dp_10">8.5625dp</dimen>
+
+    <dimen name="dp_11">9.4187dp</dimen>
+
+    <dimen name="dp_12">10.2750dp</dimen>
+
+    <dimen name="dp_13">11.1312dp</dimen>
+
+    <dimen name="dp_14">11.9875dp</dimen>
+
+    <dimen name="dp_15">12.8438dp</dimen>
+
+    <dimen name="dp_16">13.7000dp</dimen>
+
+    <dimen name="dp_17">14.5562dp</dimen>
+
+    <dimen name="dp_18">15.4125dp</dimen>
+
+    <dimen name="dp_19">16.2688dp</dimen>
+
+    <dimen name="dp_20">17.1250dp</dimen>
+
+    <dimen name="dp_21">17.9812dp</dimen>
+
+    <dimen name="dp_22">18.8375dp</dimen>
+
+    <dimen name="dp_23">19.6937dp</dimen>
+
+    <dimen name="dp_24">20.5500dp</dimen>
+
+    <dimen name="dp_25">21.4062dp</dimen>
+
+    <dimen name="dp_26">22.2625dp</dimen>
+
+    <dimen name="dp_27">23.1187dp</dimen>
+
+    <dimen name="dp_28">23.9750dp</dimen>
+
+    <dimen name="dp_29">24.8312dp</dimen>
+
+    <dimen name="dp_30">25.6875dp</dimen>
+
+    <dimen name="dp_31">26.5437dp</dimen>
+
+    <dimen name="dp_32">27.4000dp</dimen>
+
+    <dimen name="dp_33">28.2562dp</dimen>
+
+    <dimen name="dp_34">29.1125dp</dimen>
+
+    <dimen name="dp_35">29.9688dp</dimen>
+
+    <dimen name="dp_36">30.8250dp</dimen>
+
+    <dimen name="dp_37">31.6812dp</dimen>
+
+    <dimen name="dp_38">32.5375dp</dimen>
+
+    <dimen name="dp_39">33.3937dp</dimen>
+
+    <dimen name="dp_40">34.2500dp</dimen>
+
+    <dimen name="dp_41">35.1062dp</dimen>
+
+    <dimen name="dp_42">35.9625dp</dimen>
+
+    <dimen name="dp_43">36.8188dp</dimen>
+
+    <dimen name="dp_44">37.6750dp</dimen>
+
+    <dimen name="dp_45">38.5312dp</dimen>
+
+    <dimen name="dp_46">39.3875dp</dimen>
+
+    <dimen name="dp_47">40.2437dp</dimen>
+
+    <dimen name="dp_48">41.1000dp</dimen>
+
+    <dimen name="dp_49">41.9562dp</dimen>
+
+    <dimen name="dp_50">42.8125dp</dimen>
+
+    <dimen name="dp_51">43.6687dp</dimen>
+
+    <dimen name="dp_52">44.5250dp</dimen>
+
+    <dimen name="dp_53">45.3812dp</dimen>
+
+    <dimen name="dp_54">46.2375dp</dimen>
+
+    <dimen name="dp_55">47.0938dp</dimen>
+
+    <dimen name="dp_56">47.9500dp</dimen>
+
+    <dimen name="dp_57">48.8062dp</dimen>
+
+    <dimen name="dp_58">49.6625dp</dimen>
+
+    <dimen name="dp_59">50.5187dp</dimen>
+
+    <dimen name="dp_60">51.3750dp</dimen>
+
+    <dimen name="dp_61">52.2312dp</dimen>
+
+    <dimen name="dp_62">53.0875dp</dimen>
+
+    <dimen name="dp_63">53.9437dp</dimen>
+
+    <dimen name="dp_64">54.8000dp</dimen>
+
+    <dimen name="dp_65">55.6562dp</dimen>
+
+    <dimen name="dp_66">56.5125dp</dimen>
+
+    <dimen name="dp_67">57.3687dp</dimen>
+
+    <dimen name="dp_68">58.2250dp</dimen>
+
+    <dimen name="dp_69">59.0812dp</dimen>
+
+    <dimen name="dp_70">59.9375dp</dimen>
+
+    <dimen name="dp_71">60.7937dp</dimen>
+
+    <dimen name="dp_72">61.6500dp</dimen>
+
+    <dimen name="dp_73">62.5062dp</dimen>
+
+    <dimen name="dp_74">63.3625dp</dimen>
+
+    <dimen name="dp_75">64.2188dp</dimen>
+
+    <dimen name="dp_76">65.0750dp</dimen>
+
+    <dimen name="dp_77">65.9312dp</dimen>
+
+    <dimen name="dp_78">66.7875dp</dimen>
+
+    <dimen name="dp_79">67.6437dp</dimen>
+
+    <dimen name="dp_80">68.5000dp</dimen>
+
+    <dimen name="dp_81">69.3563dp</dimen>
+
+    <dimen name="dp_82">70.2125dp</dimen>
+
+    <dimen name="dp_83">71.0687dp</dimen>
+
+    <dimen name="dp_84">71.9250dp</dimen>
+
+    <dimen name="dp_85">72.7812dp</dimen>
+
+    <dimen name="dp_86">73.6375dp</dimen>
+
+    <dimen name="dp_87">74.4937dp</dimen>
+
+    <dimen name="dp_88">75.3500dp</dimen>
+
+    <dimen name="dp_89">76.2062dp</dimen>
+
+    <dimen name="dp_90">77.0625dp</dimen>
+
+    <dimen name="dp_91">77.9188dp</dimen>
+
+    <dimen name="dp_92">78.7750dp</dimen>
+
+    <dimen name="dp_93">79.6312dp</dimen>
+
+    <dimen name="dp_94">80.4875dp</dimen>
+
+    <dimen name="dp_95">81.3438dp</dimen>
+
+    <dimen name="dp_96">82.2000dp</dimen>
+
+    <dimen name="dp_97">83.0562dp</dimen>
+
+    <dimen name="dp_98">83.9125dp</dimen>
+
+    <dimen name="dp_99">84.7687dp</dimen>
+
+    <dimen name="dp_100">85.6250dp</dimen>
+
+    <dimen name="dp_101">86.4812dp</dimen>
+
+    <dimen name="dp_102">87.3375dp</dimen>
+
+    <dimen name="dp_103">88.1937dp</dimen>
+
+    <dimen name="dp_104">89.0500dp</dimen>
+
+    <dimen name="dp_104_5">89.4781dp</dimen>
+
+    <dimen name="dp_105">89.9062dp</dimen>
+
+    <dimen name="dp_106">90.7625dp</dimen>
+
+    <dimen name="dp_107">91.6187dp</dimen>
+
+    <dimen name="dp_108">92.4750dp</dimen>
+
+    <dimen name="dp_109">93.3312dp</dimen>
+
+    <dimen name="dp_110">94.1875dp</dimen>
+
+    <dimen name="dp_111">95.0437dp</dimen>
+
+    <dimen name="dp_112">95.9000dp</dimen>
+
+    <dimen name="dp_113">96.7562dp</dimen>
+
+    <dimen name="dp_114">97.6125dp</dimen>
+
+    <dimen name="dp_115">98.4688dp</dimen>
+
+    <dimen name="dp_116">99.3250dp</dimen>
+
+    <dimen name="dp_117">100.1812dp</dimen>
+
+    <dimen name="dp_118">101.0375dp</dimen>
+
+    <dimen name="dp_119">101.8937dp</dimen>
+
+    <dimen name="dp_120">102.7500dp</dimen>
+
+    <dimen name="dp_121">103.6062dp</dimen>
+
+    <dimen name="dp_122">104.4625dp</dimen>
+
+    <dimen name="dp_123">105.3187dp</dimen>
+
+    <dimen name="dp_124">106.1750dp</dimen>
+
+    <dimen name="dp_125">107.0312dp</dimen>
+
+    <dimen name="dp_126">107.8875dp</dimen>
+
+    <dimen name="dp_127">108.7437dp</dimen>
+
+    <dimen name="dp_128">109.6000dp</dimen>
+
+    <dimen name="dp_129">110.4562dp</dimen>
+
+    <dimen name="dp_130">111.3125dp</dimen>
+
+    <dimen name="dp_131">112.1687dp</dimen>
+
+    <dimen name="dp_132">113.0250dp</dimen>
+
+    <dimen name="dp_133">113.8812dp</dimen>
+
+    <dimen name="dp_134">114.7375dp</dimen>
+
+    <dimen name="dp_134_5">115.1656dp</dimen>
+
+    <dimen name="dp_135">115.5938dp</dimen>
+
+    <dimen name="dp_136">116.4500dp</dimen>
+
+    <dimen name="dp_137">117.3062dp</dimen>
+
+    <dimen name="dp_138">118.1625dp</dimen>
+
+    <dimen name="dp_139">119.0187dp</dimen>
+
+    <dimen name="dp_140">119.8750dp</dimen>
+
+    <dimen name="dp_141">120.7312dp</dimen>
+
+    <dimen name="dp_142">121.5875dp</dimen>
+
+    <dimen name="dp_143">122.4437dp</dimen>
+
+    <dimen name="dp_144">123.3000dp</dimen>
+
+    <dimen name="dp_145">124.1562dp</dimen>
+
+    <dimen name="dp_146">125.0125dp</dimen>
+
+    <dimen name="dp_147">125.8687dp</dimen>
+
+    <dimen name="dp_148">126.7250dp</dimen>
+
+    <dimen name="dp_149">127.5812dp</dimen>
+
+    <dimen name="dp_150">128.4375dp</dimen>
+
+    <dimen name="dp_151">129.2937dp</dimen>
+
+    <dimen name="dp_152">130.1500dp</dimen>
+
+    <dimen name="dp_153">131.0062dp</dimen>
+
+    <dimen name="dp_154">131.8625dp</dimen>
+
+    <dimen name="dp_155">132.7188dp</dimen>
+
+    <dimen name="dp_156">133.5750dp</dimen>
+
+    <dimen name="dp_157">134.4313dp</dimen>
+
+    <dimen name="dp_158">135.2875dp</dimen>
+
+    <dimen name="dp_159">136.1437dp</dimen>
+
+    <dimen name="dp_160">137.0000dp</dimen>
+
+    <dimen name="dp_161">137.8562dp</dimen>
+
+    <dimen name="dp_162">138.7125dp</dimen>
+
+    <dimen name="dp_163">139.5687dp</dimen>
+
+    <dimen name="dp_164">140.4250dp</dimen>
+
+    <dimen name="dp_165">141.2812dp</dimen>
+
+    <dimen name="dp_166">142.1375dp</dimen>
+
+    <dimen name="dp_167">142.9938dp</dimen>
+
+    <dimen name="dp_168">143.8500dp</dimen>
+
+    <dimen name="dp_169">144.7062dp</dimen>
+
+    <dimen name="dp_170">145.5625dp</dimen>
+
+    <dimen name="dp_171">146.4187dp</dimen>
+
+    <dimen name="dp_172">147.2750dp</dimen>
+
+    <dimen name="dp_173">148.1312dp</dimen>
+
+    <dimen name="dp_174">148.9875dp</dimen>
+
+    <dimen name="dp_175">149.8438dp</dimen>
+
+    <dimen name="dp_176">150.7000dp</dimen>
+
+    <dimen name="dp_177">151.5563dp</dimen>
+
+    <dimen name="dp_178">152.4125dp</dimen>
+
+    <dimen name="dp_179">153.2687dp</dimen>
+
+    <dimen name="dp_180">154.1250dp</dimen>
+
+    <dimen name="dp_181">154.9812dp</dimen>
+
+    <dimen name="dp_182">155.8375dp</dimen>
+
+    <dimen name="dp_183">156.6937dp</dimen>
+
+    <dimen name="dp_184">157.5500dp</dimen>
+
+    <dimen name="dp_185">158.4062dp</dimen>
+
+    <dimen name="dp_186">159.2625dp</dimen>
+
+    <dimen name="dp_187">160.1188dp</dimen>
+
+    <dimen name="dp_188">160.9750dp</dimen>
+
+    <dimen name="dp_189">161.8312dp</dimen>
+
+    <dimen name="dp_190">162.6875dp</dimen>
+
+    <dimen name="dp_191">163.5437dp</dimen>
+
+    <dimen name="dp_191_25">163.7578dp</dimen>
+
+    <dimen name="dp_192">164.4000dp</dimen>
+
+    <dimen name="dp_193">165.2562dp</dimen>
+
+    <dimen name="dp_194">166.1125dp</dimen>
+
+    <dimen name="dp_195">166.9688dp</dimen>
+
+    <dimen name="dp_196">167.8250dp</dimen>
+
+    <dimen name="dp_197">168.6812dp</dimen>
+
+    <dimen name="dp_198">169.5375dp</dimen>
+
+    <dimen name="dp_199">170.3937dp</dimen>
+
+    <dimen name="dp_200">171.2500dp</dimen>
+
+    <dimen name="dp_201">172.1062dp</dimen>
+
+    <dimen name="dp_202">172.9625dp</dimen>
+
+    <dimen name="dp_203">173.8187dp</dimen>
+
+    <dimen name="dp_204">174.6750dp</dimen>
+
+    <dimen name="dp_205">175.5312dp</dimen>
+
+    <dimen name="dp_206">176.3875dp</dimen>
+
+    <dimen name="dp_207">177.2437dp</dimen>
+
+    <dimen name="dp_208">178.1000dp</dimen>
+
+    <dimen name="dp_209">178.9562dp</dimen>
+
+    <dimen name="dp_210">179.8125dp</dimen>
+
+    <dimen name="dp_211">180.6687dp</dimen>
+
+    <dimen name="dp_212">181.5250dp</dimen>
+
+    <dimen name="dp_213">182.3812dp</dimen>
+
+    <dimen name="dp_214">183.2375dp</dimen>
+
+    <dimen name="dp_215">184.0938dp</dimen>
+
+    <dimen name="dp_216">184.9500dp</dimen>
+
+    <dimen name="dp_217">185.8062dp</dimen>
+
+    <dimen name="dp_218">186.6625dp</dimen>
+
+    <dimen name="dp_219">187.5187dp</dimen>
+
+    <dimen name="dp_220">188.3750dp</dimen>
+
+    <dimen name="dp_221">189.2312dp</dimen>
+
+    <dimen name="dp_222">190.0875dp</dimen>
+
+    <dimen name="dp_223">190.9437dp</dimen>
+
+    <dimen name="dp_224">191.8000dp</dimen>
+
+    <dimen name="dp_225">192.6562dp</dimen>
+
+    <dimen name="dp_226">193.5125dp</dimen>
+
+    <dimen name="dp_227">194.3687dp</dimen>
+
+    <dimen name="dp_228">195.2250dp</dimen>
+
+    <dimen name="dp_229">196.0812dp</dimen>
+
+    <dimen name="dp_230">196.9375dp</dimen>
+
+    <dimen name="dp_231">197.7937dp</dimen>
+
+    <dimen name="dp_232">198.6500dp</dimen>
+
+    <dimen name="dp_233">199.5062dp</dimen>
+
+    <dimen name="dp_234">200.3625dp</dimen>
+
+    <dimen name="dp_235">201.2188dp</dimen>
+
+    <dimen name="dp_236">202.0750dp</dimen>
+
+    <dimen name="dp_237">202.9312dp</dimen>
+
+    <dimen name="dp_238">203.7875dp</dimen>
+
+    <dimen name="dp_239">204.6437dp</dimen>
+
+    <dimen name="dp_240">205.5000dp</dimen>
+
+    <dimen name="dp_241">206.3562dp</dimen>
+
+    <dimen name="dp_242">207.2125dp</dimen>
+
+    <dimen name="dp_243">208.0687dp</dimen>
+
+    <dimen name="dp_244">208.9250dp</dimen>
+
+    <dimen name="dp_245">209.7812dp</dimen>
+
+    <dimen name="dp_246">210.6375dp</dimen>
+
+    <dimen name="dp_247">211.4937dp</dimen>
+
+    <dimen name="dp_248">212.3500dp</dimen>
+
+    <dimen name="dp_249">213.2062dp</dimen>
+
+    <dimen name="dp_250">214.0625dp</dimen>
+
+    <dimen name="dp_251">214.9187dp</dimen>
+
+    <dimen name="dp_252">215.7750dp</dimen>
+
+    <dimen name="dp_253">216.6312dp</dimen>
+
+    <dimen name="dp_254">217.4875dp</dimen>
+
+    <dimen name="dp_255">218.3438dp</dimen>
+
+    <dimen name="dp_256">219.2000dp</dimen>
+
+    <dimen name="dp_257">220.0562dp</dimen>
+
+    <dimen name="dp_258">220.9125dp</dimen>
+
+    <dimen name="dp_259">221.7687dp</dimen>
+
+    <dimen name="dp_260">222.6250dp</dimen>
+
+    <dimen name="dp_261">223.4812dp</dimen>
+
+    <dimen name="dp_262">224.3375dp</dimen>
+
+    <dimen name="dp_263">225.1937dp</dimen>
+
+    <dimen name="dp_264">226.0500dp</dimen>
+
+    <dimen name="dp_265">226.9062dp</dimen>
+
+    <dimen name="dp_266">227.7625dp</dimen>
+
+    <dimen name="dp_267">228.6187dp</dimen>
+
+    <dimen name="dp_268">229.4750dp</dimen>
+
+    <dimen name="dp_269">230.3312dp</dimen>
+
+    <dimen name="dp_270">231.1875dp</dimen>
+
+    <dimen name="dp_271">232.0437dp</dimen>
+
+    <dimen name="dp_272">232.9000dp</dimen>
+
+    <dimen name="dp_273">233.7562dp</dimen>
+
+    <dimen name="dp_274">234.6125dp</dimen>
+
+    <dimen name="dp_275">235.4688dp</dimen>
+
+    <dimen name="dp_276">236.3250dp</dimen>
+
+    <dimen name="dp_277">237.1812dp</dimen>
+
+    <dimen name="dp_278">238.0375dp</dimen>
+
+    <dimen name="dp_279">238.8937dp</dimen>
+
+    <dimen name="dp_280">239.7500dp</dimen>
+
+    <dimen name="dp_281">240.6062dp</dimen>
+
+    <dimen name="dp_282">241.4625dp</dimen>
+
+    <dimen name="dp_283">242.3187dp</dimen>
+
+    <dimen name="dp_284">243.1750dp</dimen>
+
+    <dimen name="dp_285">244.0312dp</dimen>
+
+    <dimen name="dp_286">244.8875dp</dimen>
+
+    <dimen name="dp_287">245.7437dp</dimen>
+
+    <dimen name="dp_288">246.6000dp</dimen>
+
+    <dimen name="dp_289">247.4562dp</dimen>
+
+    <dimen name="dp_290">248.3125dp</dimen>
+
+    <dimen name="dp_291">249.1687dp</dimen>
+
+    <dimen name="dp_292">250.0250dp</dimen>
+
+    <dimen name="dp_293">250.8812dp</dimen>
+
+    <dimen name="dp_294">251.7375dp</dimen>
+
+    <dimen name="dp_295">252.5938dp</dimen>
+
+    <dimen name="dp_296">253.4500dp</dimen>
+
+    <dimen name="dp_297">254.3062dp</dimen>
+
+    <dimen name="dp_298">255.1625dp</dimen>
+
+    <dimen name="dp_299">256.0188dp</dimen>
+
+    <dimen name="dp_300">256.8750dp</dimen>
+
+    <dimen name="dp_301">257.7312dp</dimen>
+
+    <dimen name="dp_302">258.5875dp</dimen>
+
+    <dimen name="dp_303">259.4437dp</dimen>
+
+    <dimen name="dp_304">260.3000dp</dimen>
+
+    <dimen name="dp_305">261.1562dp</dimen>
+
+    <dimen name="dp_306">262.0125dp</dimen>
+
+    <dimen name="dp_307">262.8687dp</dimen>
+
+    <dimen name="dp_308">263.7250dp</dimen>
+
+    <dimen name="dp_309">264.5813dp</dimen>
+
+    <dimen name="dp_310">265.4375dp</dimen>
+
+    <dimen name="dp_311">266.2937dp</dimen>
+
+    <dimen name="dp_312">267.1500dp</dimen>
+
+    <dimen name="dp_313">268.0062dp</dimen>
+
+    <dimen name="dp_314">268.8625dp</dimen>
+
+    <dimen name="dp_315">269.7188dp</dimen>
+
+    <dimen name="dp_316">270.5750dp</dimen>
+
+    <dimen name="dp_317">271.4312dp</dimen>
+
+    <dimen name="dp_318">272.2875dp</dimen>
+
+    <dimen name="dp_319">273.1438dp</dimen>
+
+    <dimen name="dp_320">274.0000dp</dimen>
+
+    <dimen name="dp_321">274.8562dp</dimen>
+
+    <dimen name="dp_322">275.7125dp</dimen>
+
+    <dimen name="dp_323">276.5687dp</dimen>
+
+    <dimen name="dp_324">277.4250dp</dimen>
+
+    <dimen name="dp_325">278.2812dp</dimen>
+
+    <dimen name="dp_326">279.1375dp</dimen>
+
+    <dimen name="dp_327">279.9937dp</dimen>
+
+    <dimen name="dp_328">280.8500dp</dimen>
+
+    <dimen name="dp_329">281.7063dp</dimen>
+
+    <dimen name="dp_330">282.5625dp</dimen>
+
+    <dimen name="dp_331">283.4187dp</dimen>
+
+    <dimen name="dp_332">284.2750dp</dimen>
+
+    <dimen name="dp_333">285.1312dp</dimen>
+
+    <dimen name="dp_334">285.9875dp</dimen>
+
+    <dimen name="dp_335">286.8438dp</dimen>
+
+    <dimen name="dp_336">287.7000dp</dimen>
+
+    <dimen name="dp_337">288.5562dp</dimen>
+
+    <dimen name="dp_338">289.4125dp</dimen>
+
+    <dimen name="dp_339">290.2688dp</dimen>
+
+    <dimen name="dp_340">291.1250dp</dimen>
+
+    <dimen name="dp_341">291.9812dp</dimen>
+
+    <dimen name="dp_342">292.8375dp</dimen>
+
+    <dimen name="dp_343">293.6937dp</dimen>
+
+    <dimen name="dp_344">294.5500dp</dimen>
+
+    <dimen name="dp_345">295.4062dp</dimen>
+
+    <dimen name="dp_346">296.2625dp</dimen>
+
+    <dimen name="dp_347">297.1187dp</dimen>
+
+    <dimen name="dp_348">297.9750dp</dimen>
+
+    <dimen name="dp_349">298.8313dp</dimen>
+
+    <dimen name="dp_350">299.6875dp</dimen>
+
+    <dimen name="dp_351">300.5437dp</dimen>
+
+    <dimen name="dp_352">301.4000dp</dimen>
+
+    <dimen name="dp_353">302.2562dp</dimen>
+
+    <dimen name="dp_354">303.1125dp</dimen>
+
+    <dimen name="dp_355">303.9688dp</dimen>
+
+    <dimen name="dp_356">304.8250dp</dimen>
+
+    <dimen name="dp_357">305.6812dp</dimen>
+
+    <dimen name="dp_358">306.5375dp</dimen>
+
+    <dimen name="dp_359">307.3938dp</dimen>
+
+    <dimen name="dp_360">308.2500dp</dimen>
+
+    <dimen name="dp_365">312.5312dp</dimen>
+
+    <dimen name="dp_370">316.8125dp</dimen>
+
+    <dimen name="dp_400">342.5000dp</dimen>
+
+    <dimen name="dp_410">351.0625dp</dimen>
+
+    <dimen name="dp_422">361.3375dp</dimen>
+
+    <dimen name="dp_472">404.1500dp</dimen>
+
+    <dimen name="dp_500">428.1250dp</dimen>
+
+    <dimen name="dp_600">513.7500dp</dimen>
+
+    <dimen name="dp_640">548.0000dp</dimen>
+
+    <dimen name="dp_650">556.5625dp</dimen>
+
+    <dimen name="dp_710">607.9375dp</dimen>
+
+    <dimen name="dp_720">616.5000dp</dimen>
+
+
+</resources>
diff --git a/system/basic/src/main/res/values-sw432dp/dimens.xml b/system/basic/src/main/res/values-sw432dp/dimens.xml
new file mode 100644
index 0000000..592d2b3
--- /dev/null
+++ b/system/basic/src/main/res/values-sw432dp/dimens.xml
@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+
+    <dimen name="txt5">4.5000sp</dimen>
+
+    <dimen name="txt6">5.4000sp</dimen>
+
+    <dimen name="txt7">6.3000sp</dimen>
+
+    <dimen name="txt8">7.2000sp</dimen>
+
+    <dimen name="txt9">8.1000sp</dimen>
+
+    <dimen name="txt10">9.0000sp</dimen>
+
+    <dimen name="txt11">9.9000sp</dimen>
+
+    <dimen name="txt12">10.8000sp</dimen>
+
+    <dimen name="txt13">11.7000sp</dimen>
+
+    <dimen name="txt14">12.6000sp</dimen>
+
+    <dimen name="txt15">13.5000sp</dimen>
+
+    <dimen name="txt16">14.4000sp</dimen>
+
+    <dimen name="txt17">15.3000sp</dimen>
+
+    <dimen name="txt18">16.2000sp</dimen>
+
+    <dimen name="txt19">17.1000sp</dimen>
+
+    <dimen name="txt20">18.0000sp</dimen>
+
+    <dimen name="txt21">18.9000sp</dimen>
+
+    <dimen name="txt22">19.8000sp</dimen>
+
+    <dimen name="txt24">21.6000sp</dimen>
+
+    <dimen name="txt26">23.4000sp</dimen>
+
+    <dimen name="txt28">25.2000sp</dimen>
+
+    <dimen name="txt30">27.0000sp</dimen>
+
+    <dimen name="txt32">28.8000sp</dimen>
+
+    <dimen name="txt34">30.6000sp</dimen>
+
+    <dimen name="card_common_margin_left">@dimen/dp_15</dimen>
+
+    <dimen name="dp_m_60">-54.0000dp</dimen>
+
+    <dimen name="dp_m_30">-27.0000dp</dimen>
+
+    <dimen name="dp_m_20">-18.0000dp</dimen>
+
+    <dimen name="dp_m_12">-10.8000dp</dimen>
+
+    <dimen name="dp_m_10">-9.0000dp</dimen>
+
+    <dimen name="dp_m_8">-7.2000dp</dimen>
+
+    <dimen name="dp_m_5">-4.5000dp</dimen>
+
+    <dimen name="dp_m_2">-1.8000dp</dimen>
+
+    <dimen name="dp_m_1">-0.9000dp</dimen>
+
+    <dimen name="dp_0">0.0000dp</dimen>
+
+    <dimen name="dp_0_1">0.0900dp</dimen>
+
+    <dimen name="dp_0_5">0.4500dp</dimen>
+
+    <dimen name="dp_1">0.9000dp</dimen>
+
+    <dimen name="dp_1_5">1.3500dp</dimen>
+
+    <dimen name="dp_2">1.8000dp</dimen>
+
+    <dimen name="dp_2_5">2.2500dp</dimen>
+
+    <dimen name="dp_3">2.7000dp</dimen>
+
+    <dimen name="dp_3_5">3.1500dp</dimen>
+
+    <dimen name="dp_4">3.6000dp</dimen>
+
+    <dimen name="dp_4_5">4.0500dp</dimen>
+
+    <dimen name="dp_5">4.5000dp</dimen>
+
+    <dimen name="dp_6">5.4000dp</dimen>
+
+    <dimen name="dp_7">6.3000dp</dimen>
+
+    <dimen name="dp_7_5">6.7500dp</dimen>
+
+    <dimen name="dp_8">7.2000dp</dimen>
+
+    <dimen name="dp_9">8.1000dp</dimen>
+
+    <dimen name="dp_10">9.0000dp</dimen>
+
+    <dimen name="dp_11">9.9000dp</dimen>
+
+    <dimen name="dp_12">10.8000dp</dimen>
+
+    <dimen name="dp_13">11.7000dp</dimen>
+
+    <dimen name="dp_14">12.6000dp</dimen>
+
+    <dimen name="dp_15">13.5000dp</dimen>
+
+    <dimen name="dp_16">14.4000dp</dimen>
+
+    <dimen name="dp_17">15.3000dp</dimen>
+
+    <dimen name="dp_18">16.2000dp</dimen>
+
+    <dimen name="dp_19">17.1000dp</dimen>
+
+    <dimen name="dp_20">18.0000dp</dimen>
+
+    <dimen name="dp_21">18.9000dp</dimen>
+
+    <dimen name="dp_22">19.8000dp</dimen>
+
+    <dimen name="dp_23">20.7000dp</dimen>
+
+    <dimen name="dp_24">21.6000dp</dimen>
+
+    <dimen name="dp_25">22.5000dp</dimen>
+
+    <dimen name="dp_26">23.4000dp</dimen>
+
+    <dimen name="dp_27">24.3000dp</dimen>
+
+    <dimen name="dp_28">25.2000dp</dimen>
+
+    <dimen name="dp_29">26.1000dp</dimen>
+
+    <dimen name="dp_30">27.0000dp</dimen>
+
+    <dimen name="dp_31">27.9000dp</dimen>
+
+    <dimen name="dp_32">28.8000dp</dimen>
+
+    <dimen name="dp_33">29.7000dp</dimen>
+
+    <dimen name="dp_34">30.6000dp</dimen>
+
+    <dimen name="dp_35">31.5000dp</dimen>
+
+    <dimen name="dp_36">32.4000dp</dimen>
+
+    <dimen name="dp_37">33.3000dp</dimen>
+
+    <dimen name="dp_38">34.2000dp</dimen>
+
+    <dimen name="dp_39">35.1000dp</dimen>
+
+    <dimen name="dp_40">36.0000dp</dimen>
+
+    <dimen name="dp_41">36.9000dp</dimen>
+
+    <dimen name="dp_42">37.8000dp</dimen>
+
+    <dimen name="dp_43">38.7000dp</dimen>
+
+    <dimen name="dp_44">39.6000dp</dimen>
+
+    <dimen name="dp_45">40.5000dp</dimen>
+
+    <dimen name="dp_46">41.4000dp</dimen>
+
+    <dimen name="dp_47">42.3000dp</dimen>
+
+    <dimen name="dp_48">43.2000dp</dimen>
+
+    <dimen name="dp_49">44.1000dp</dimen>
+
+    <dimen name="dp_50">45.0000dp</dimen>
+
+    <dimen name="dp_51">45.9000dp</dimen>
+
+    <dimen name="dp_52">46.8000dp</dimen>
+
+    <dimen name="dp_53">47.7000dp</dimen>
+
+    <dimen name="dp_54">48.6000dp</dimen>
+
+    <dimen name="dp_55">49.5000dp</dimen>
+
+    <dimen name="dp_56">50.4000dp</dimen>
+
+    <dimen name="dp_57">51.3000dp</dimen>
+
+    <dimen name="dp_58">52.2000dp</dimen>
+
+    <dimen name="dp_59">53.1000dp</dimen>
+
+    <dimen name="dp_60">54.0000dp</dimen>
+
+    <dimen name="dp_61">54.9000dp</dimen>
+
+    <dimen name="dp_62">55.8000dp</dimen>
+
+    <dimen name="dp_63">56.7000dp</dimen>
+
+    <dimen name="dp_64">57.6000dp</dimen>
+
+    <dimen name="dp_65">58.5000dp</dimen>
+
+    <dimen name="dp_66">59.4000dp</dimen>
+
+    <dimen name="dp_67">60.3000dp</dimen>
+
+    <dimen name="dp_68">61.2000dp</dimen>
+
+    <dimen name="dp_69">62.1000dp</dimen>
+
+    <dimen name="dp_70">63.0000dp</dimen>
+
+    <dimen name="dp_71">63.9000dp</dimen>
+
+    <dimen name="dp_72">64.8000dp</dimen>
+
+    <dimen name="dp_73">65.7000dp</dimen>
+
+    <dimen name="dp_74">66.6000dp</dimen>
+
+    <dimen name="dp_75">67.5000dp</dimen>
+
+    <dimen name="dp_76">68.4000dp</dimen>
+
+    <dimen name="dp_77">69.3000dp</dimen>
+
+    <dimen name="dp_78">70.2000dp</dimen>
+
+    <dimen name="dp_79">71.1000dp</dimen>
+
+    <dimen name="dp_80">72.0000dp</dimen>
+
+    <dimen name="dp_81">72.9000dp</dimen>
+
+    <dimen name="dp_82">73.8000dp</dimen>
+
+    <dimen name="dp_83">74.7000dp</dimen>
+
+    <dimen name="dp_84">75.6000dp</dimen>
+
+    <dimen name="dp_85">76.5000dp</dimen>
+
+    <dimen name="dp_86">77.4000dp</dimen>
+
+    <dimen name="dp_87">78.3000dp</dimen>
+
+    <dimen name="dp_88">79.2000dp</dimen>
+
+    <dimen name="dp_89">80.1000dp</dimen>
+
+    <dimen name="dp_90">81.0000dp</dimen>
+
+    <dimen name="dp_91">81.9000dp</dimen>
+
+    <dimen name="dp_92">82.8000dp</dimen>
+
+    <dimen name="dp_93">83.7000dp</dimen>
+
+    <dimen name="dp_94">84.6000dp</dimen>
+
+    <dimen name="dp_95">85.5000dp</dimen>
+
+    <dimen name="dp_96">86.4000dp</dimen>
+
+    <dimen name="dp_97">87.3000dp</dimen>
+
+    <dimen name="dp_98">88.2000dp</dimen>
+
+    <dimen name="dp_99">89.1000dp</dimen>
+
+    <dimen name="dp_100">90.0000dp</dimen>
+
+    <dimen name="dp_101">90.9000dp</dimen>
+
+    <dimen name="dp_102">91.8000dp</dimen>
+
+    <dimen name="dp_103">92.7000dp</dimen>
+
+    <dimen name="dp_104">93.6000dp</dimen>
+
+    <dimen name="dp_104_5">94.0500dp</dimen>
+
+    <dimen name="dp_105">94.5000dp</dimen>
+
+    <dimen name="dp_106">95.4000dp</dimen>
+
+    <dimen name="dp_107">96.3000dp</dimen>
+
+    <dimen name="dp_108">97.2000dp</dimen>
+
+    <dimen name="dp_109">98.1000dp</dimen>
+
+    <dimen name="dp_110">99.0000dp</dimen>
+
+    <dimen name="dp_111">99.9000dp</dimen>
+
+    <dimen name="dp_112">100.8000dp</dimen>
+
+    <dimen name="dp_113">101.7000dp</dimen>
+
+    <dimen name="dp_114">102.6000dp</dimen>
+
+    <dimen name="dp_115">103.5000dp</dimen>
+
+    <dimen name="dp_116">104.4000dp</dimen>
+
+    <dimen name="dp_117">105.3000dp</dimen>
+
+    <dimen name="dp_118">106.2000dp</dimen>
+
+    <dimen name="dp_119">107.1000dp</dimen>
+
+    <dimen name="dp_120">108.0000dp</dimen>
+
+    <dimen name="dp_121">108.9000dp</dimen>
+
+    <dimen name="dp_122">109.8000dp</dimen>
+
+    <dimen name="dp_123">110.7000dp</dimen>
+
+    <dimen name="dp_124">111.6000dp</dimen>
+
+    <dimen name="dp_125">112.5000dp</dimen>
+
+    <dimen name="dp_126">113.4000dp</dimen>
+
+    <dimen name="dp_127">114.3000dp</dimen>
+
+    <dimen name="dp_128">115.2000dp</dimen>
+
+    <dimen name="dp_129">116.1000dp</dimen>
+
+    <dimen name="dp_130">117.0000dp</dimen>
+
+    <dimen name="dp_131">117.9000dp</dimen>
+
+    <dimen name="dp_132">118.8000dp</dimen>
+
+    <dimen name="dp_133">119.7000dp</dimen>
+
+    <dimen name="dp_134">120.6000dp</dimen>
+
+    <dimen name="dp_134_5">121.0500dp</dimen>
+
+    <dimen name="dp_135">121.5000dp</dimen>
+
+    <dimen name="dp_136">122.4000dp</dimen>
+
+    <dimen name="dp_137">123.3000dp</dimen>
+
+    <dimen name="dp_138">124.2000dp</dimen>
+
+    <dimen name="dp_139">125.1000dp</dimen>
+
+    <dimen name="dp_140">126.0000dp</dimen>
+
+    <dimen name="dp_141">126.9000dp</dimen>
+
+    <dimen name="dp_142">127.8000dp</dimen>
+
+    <dimen name="dp_143">128.7000dp</dimen>
+
+    <dimen name="dp_144">129.6000dp</dimen>
+
+    <dimen name="dp_145">130.5000dp</dimen>
+
+    <dimen name="dp_146">131.4000dp</dimen>
+
+    <dimen name="dp_147">132.3000dp</dimen>
+
+    <dimen name="dp_148">133.2000dp</dimen>
+
+    <dimen name="dp_149">134.1000dp</dimen>
+
+    <dimen name="dp_150">135.0000dp</dimen>
+
+    <dimen name="dp_151">135.9000dp</dimen>
+
+    <dimen name="dp_152">136.8000dp</dimen>
+
+    <dimen name="dp_153">137.7000dp</dimen>
+
+    <dimen name="dp_154">138.6000dp</dimen>
+
+    <dimen name="dp_155">139.5000dp</dimen>
+
+    <dimen name="dp_156">140.4000dp</dimen>
+
+    <dimen name="dp_157">141.3000dp</dimen>
+
+    <dimen name="dp_158">142.2000dp</dimen>
+
+    <dimen name="dp_159">143.1000dp</dimen>
+
+    <dimen name="dp_160">144.0000dp</dimen>
+
+    <dimen name="dp_161">144.9000dp</dimen>
+
+    <dimen name="dp_162">145.8000dp</dimen>
+
+    <dimen name="dp_163">146.7000dp</dimen>
+
+    <dimen name="dp_164">147.6000dp</dimen>
+
+    <dimen name="dp_165">148.5000dp</dimen>
+
+    <dimen name="dp_166">149.4000dp</dimen>
+
+    <dimen name="dp_167">150.3000dp</dimen>
+
+    <dimen name="dp_168">151.2000dp</dimen>
+
+    <dimen name="dp_169">152.1000dp</dimen>
+
+    <dimen name="dp_170">153.0000dp</dimen>
+
+    <dimen name="dp_171">153.9000dp</dimen>
+
+    <dimen name="dp_172">154.8000dp</dimen>
+
+    <dimen name="dp_173">155.7000dp</dimen>
+
+    <dimen name="dp_174">156.6000dp</dimen>
+
+    <dimen name="dp_175">157.5000dp</dimen>
+
+    <dimen name="dp_176">158.4000dp</dimen>
+
+    <dimen name="dp_177">159.3000dp</dimen>
+
+    <dimen name="dp_178">160.2000dp</dimen>
+
+    <dimen name="dp_179">161.1000dp</dimen>
+
+    <dimen name="dp_180">162.0000dp</dimen>
+
+    <dimen name="dp_181">162.9000dp</dimen>
+
+    <dimen name="dp_182">163.8000dp</dimen>
+
+    <dimen name="dp_183">164.7000dp</dimen>
+
+    <dimen name="dp_184">165.6000dp</dimen>
+
+    <dimen name="dp_185">166.5000dp</dimen>
+
+    <dimen name="dp_186">167.4000dp</dimen>
+
+    <dimen name="dp_187">168.3000dp</dimen>
+
+    <dimen name="dp_188">169.2000dp</dimen>
+
+    <dimen name="dp_189">170.1000dp</dimen>
+
+    <dimen name="dp_190">171.0000dp</dimen>
+
+    <dimen name="dp_191">171.9000dp</dimen>
+
+    <dimen name="dp_191_25">172.1250dp</dimen>
+
+    <dimen name="dp_192">172.8000dp</dimen>
+
+    <dimen name="dp_193">173.7000dp</dimen>
+
+    <dimen name="dp_194">174.6000dp</dimen>
+
+    <dimen name="dp_195">175.5000dp</dimen>
+
+    <dimen name="dp_196">176.4000dp</dimen>
+
+    <dimen name="dp_197">177.3000dp</dimen>
+
+    <dimen name="dp_198">178.2000dp</dimen>
+
+    <dimen name="dp_199">179.1000dp</dimen>
+
+    <dimen name="dp_200">180.0000dp</dimen>
+
+    <dimen name="dp_201">180.9000dp</dimen>
+
+    <dimen name="dp_202">181.8000dp</dimen>
+
+    <dimen name="dp_203">182.7000dp</dimen>
+
+    <dimen name="dp_204">183.6000dp</dimen>
+
+    <dimen name="dp_205">184.5000dp</dimen>
+
+    <dimen name="dp_206">185.4000dp</dimen>
+
+    <dimen name="dp_207">186.3000dp</dimen>
+
+    <dimen name="dp_208">187.2000dp</dimen>
+
+    <dimen name="dp_209">188.1000dp</dimen>
+
+    <dimen name="dp_210">189.0000dp</dimen>
+
+    <dimen name="dp_211">189.9000dp</dimen>
+
+    <dimen name="dp_212">190.8000dp</dimen>
+
+    <dimen name="dp_213">191.7000dp</dimen>
+
+    <dimen name="dp_214">192.6000dp</dimen>
+
+    <dimen name="dp_215">193.5000dp</dimen>
+
+    <dimen name="dp_216">194.4000dp</dimen>
+
+    <dimen name="dp_217">195.3000dp</dimen>
+
+    <dimen name="dp_218">196.2000dp</dimen>
+
+    <dimen name="dp_219">197.1000dp</dimen>
+
+    <dimen name="dp_220">198.0000dp</dimen>
+
+    <dimen name="dp_221">198.9000dp</dimen>
+
+    <dimen name="dp_222">199.8000dp</dimen>
+
+    <dimen name="dp_223">200.7000dp</dimen>
+
+    <dimen name="dp_224">201.6000dp</dimen>
+
+    <dimen name="dp_225">202.5000dp</dimen>
+
+    <dimen name="dp_226">203.4000dp</dimen>
+
+    <dimen name="dp_227">204.3000dp</dimen>
+
+    <dimen name="dp_228">205.2000dp</dimen>
+
+    <dimen name="dp_229">206.1000dp</dimen>
+
+    <dimen name="dp_230">207.0000dp</dimen>
+
+    <dimen name="dp_231">207.9000dp</dimen>
+
+    <dimen name="dp_232">208.8000dp</dimen>
+
+    <dimen name="dp_233">209.7000dp</dimen>
+
+    <dimen name="dp_234">210.6000dp</dimen>
+
+    <dimen name="dp_235">211.5000dp</dimen>
+
+    <dimen name="dp_236">212.4000dp</dimen>
+
+    <dimen name="dp_237">213.3000dp</dimen>
+
+    <dimen name="dp_238">214.2000dp</dimen>
+
+    <dimen name="dp_239">215.1000dp</dimen>
+
+    <dimen name="dp_240">216.0000dp</dimen>
+
+    <dimen name="dp_241">216.9000dp</dimen>
+
+    <dimen name="dp_242">217.8000dp</dimen>
+
+    <dimen name="dp_243">218.7000dp</dimen>
+
+    <dimen name="dp_244">219.6000dp</dimen>
+
+    <dimen name="dp_245">220.5000dp</dimen>
+
+    <dimen name="dp_246">221.4000dp</dimen>
+
+    <dimen name="dp_247">222.3000dp</dimen>
+
+    <dimen name="dp_248">223.2000dp</dimen>
+
+    <dimen name="dp_249">224.1000dp</dimen>
+
+    <dimen name="dp_250">225.0000dp</dimen>
+
+    <dimen name="dp_251">225.9000dp</dimen>
+
+    <dimen name="dp_252">226.8000dp</dimen>
+
+    <dimen name="dp_253">227.7000dp</dimen>
+
+    <dimen name="dp_254">228.6000dp</dimen>
+
+    <dimen name="dp_255">229.5000dp</dimen>
+
+    <dimen name="dp_256">230.4000dp</dimen>
+
+    <dimen name="dp_257">231.3000dp</dimen>
+
+    <dimen name="dp_258">232.2000dp</dimen>
+
+    <dimen name="dp_259">233.1000dp</dimen>
+
+    <dimen name="dp_260">234.0000dp</dimen>
+
+    <dimen name="dp_261">234.9000dp</dimen>
+
+    <dimen name="dp_262">235.8000dp</dimen>
+
+    <dimen name="dp_263">236.7000dp</dimen>
+
+    <dimen name="dp_264">237.6000dp</dimen>
+
+    <dimen name="dp_265">238.5000dp</dimen>
+
+    <dimen name="dp_266">239.4000dp</dimen>
+
+    <dimen name="dp_267">240.3000dp</dimen>
+
+    <dimen name="dp_268">241.2000dp</dimen>
+
+    <dimen name="dp_269">242.1000dp</dimen>
+
+    <dimen name="dp_270">243.0000dp</dimen>
+
+    <dimen name="dp_271">243.9000dp</dimen>
+
+    <dimen name="dp_272">244.8000dp</dimen>
+
+    <dimen name="dp_273">245.7000dp</dimen>
+
+    <dimen name="dp_274">246.6000dp</dimen>
+
+    <dimen name="dp_275">247.5000dp</dimen>
+
+    <dimen name="dp_276">248.4000dp</dimen>
+
+    <dimen name="dp_277">249.3000dp</dimen>
+
+    <dimen name="dp_278">250.2000dp</dimen>
+
+    <dimen name="dp_279">251.1000dp</dimen>
+
+    <dimen name="dp_280">252.0000dp</dimen>
+
+    <dimen name="dp_281">252.9000dp</dimen>
+
+    <dimen name="dp_282">253.8000dp</dimen>
+
+    <dimen name="dp_283">254.7000dp</dimen>
+
+    <dimen name="dp_284">255.6000dp</dimen>
+
+    <dimen name="dp_285">256.5000dp</dimen>
+
+    <dimen name="dp_286">257.4000dp</dimen>
+
+    <dimen name="dp_287">258.3000dp</dimen>
+
+    <dimen name="dp_288">259.2000dp</dimen>
+
+    <dimen name="dp_289">260.1000dp</dimen>
+
+    <dimen name="dp_290">261.0000dp</dimen>
+
+    <dimen name="dp_291">261.9000dp</dimen>
+
+    <dimen name="dp_292">262.8000dp</dimen>
+
+    <dimen name="dp_293">263.7000dp</dimen>
+
+    <dimen name="dp_294">264.6000dp</dimen>
+
+    <dimen name="dp_295">265.5000dp</dimen>
+
+    <dimen name="dp_296">266.4000dp</dimen>
+
+    <dimen name="dp_297">267.3000dp</dimen>
+
+    <dimen name="dp_298">268.2000dp</dimen>
+
+    <dimen name="dp_299">269.1000dp</dimen>
+
+    <dimen name="dp_300">270.0000dp</dimen>
+
+    <dimen name="dp_301">270.9000dp</dimen>
+
+    <dimen name="dp_302">271.8000dp</dimen>
+
+    <dimen name="dp_303">272.7000dp</dimen>
+
+    <dimen name="dp_304">273.6000dp</dimen>
+
+    <dimen name="dp_305">274.5000dp</dimen>
+
+    <dimen name="dp_306">275.4000dp</dimen>
+
+    <dimen name="dp_307">276.3000dp</dimen>
+
+    <dimen name="dp_308">277.2000dp</dimen>
+
+    <dimen name="dp_309">278.1000dp</dimen>
+
+    <dimen name="dp_310">279.0000dp</dimen>
+
+    <dimen name="dp_311">279.9000dp</dimen>
+
+    <dimen name="dp_312">280.8000dp</dimen>
+
+    <dimen name="dp_313">281.7000dp</dimen>
+
+    <dimen name="dp_314">282.6000dp</dimen>
+
+    <dimen name="dp_315">283.5000dp</dimen>
+
+    <dimen name="dp_316">284.4000dp</dimen>
+
+    <dimen name="dp_317">285.3000dp</dimen>
+
+    <dimen name="dp_318">286.2000dp</dimen>
+
+    <dimen name="dp_319">287.1000dp</dimen>
+
+    <dimen name="dp_320">288.0000dp</dimen>
+
+    <dimen name="dp_321">288.9000dp</dimen>
+
+    <dimen name="dp_322">289.8000dp</dimen>
+
+    <dimen name="dp_323">290.7000dp</dimen>
+
+    <dimen name="dp_324">291.6000dp</dimen>
+
+    <dimen name="dp_325">292.5000dp</dimen>
+
+    <dimen name="dp_326">293.4000dp</dimen>
+
+    <dimen name="dp_327">294.3000dp</dimen>
+
+    <dimen name="dp_328">295.2000dp</dimen>
+
+    <dimen name="dp_329">296.1000dp</dimen>
+
+    <dimen name="dp_330">297.0000dp</dimen>
+
+    <dimen name="dp_331">297.9000dp</dimen>
+
+    <dimen name="dp_332">298.8000dp</dimen>
+
+    <dimen name="dp_333">299.7000dp</dimen>
+
+    <dimen name="dp_334">300.6000dp</dimen>
+
+    <dimen name="dp_335">301.5000dp</dimen>
+
+    <dimen name="dp_336">302.4000dp</dimen>
+
+    <dimen name="dp_337">303.3000dp</dimen>
+
+    <dimen name="dp_338">304.2000dp</dimen>
+
+    <dimen name="dp_339">305.1000dp</dimen>
+
+    <dimen name="dp_340">306.0000dp</dimen>
+
+    <dimen name="dp_341">306.9000dp</dimen>
+
+    <dimen name="dp_342">307.8000dp</dimen>
+
+    <dimen name="dp_343">308.7000dp</dimen>
+
+    <dimen name="dp_344">309.6000dp</dimen>
+
+    <dimen name="dp_345">310.5000dp</dimen>
+
+    <dimen name="dp_346">311.4000dp</dimen>
+
+    <dimen name="dp_347">312.3000dp</dimen>
+
+    <dimen name="dp_348">313.2000dp</dimen>
+
+    <dimen name="dp_349">314.1000dp</dimen>
+
+    <dimen name="dp_350">315.0000dp</dimen>
+
+    <dimen name="dp_351">315.9000dp</dimen>
+
+    <dimen name="dp_352">316.8000dp</dimen>
+
+    <dimen name="dp_353">317.7000dp</dimen>
+
+    <dimen name="dp_354">318.6000dp</dimen>
+
+    <dimen name="dp_355">319.5000dp</dimen>
+
+    <dimen name="dp_356">320.4000dp</dimen>
+
+    <dimen name="dp_357">321.3000dp</dimen>
+
+    <dimen name="dp_358">322.2000dp</dimen>
+
+    <dimen name="dp_359">323.1000dp</dimen>
+
+    <dimen name="dp_360">324.0000dp</dimen>
+
+    <dimen name="dp_365">328.5000dp</dimen>
+
+    <dimen name="dp_370">333.0000dp</dimen>
+
+    <dimen name="dp_400">360.0000dp</dimen>
+
+    <dimen name="dp_410">369.0000dp</dimen>
+
+    <dimen name="dp_422">379.8000dp</dimen>
+
+    <dimen name="dp_472">424.8000dp</dimen>
+
+    <dimen name="dp_500">450.0000dp</dimen>
+
+    <dimen name="dp_600">540.0000dp</dimen>
+
+    <dimen name="dp_640">576.0000dp</dimen>
+
+    <dimen name="dp_650">585.0000dp</dimen>
+
+    <dimen name="dp_710">639.0000dp</dimen>
+
+    <dimen name="dp_720">648.0000dp</dimen>
+
+
+</resources>
diff --git a/system/basic/src/main/res/values-sw480dp/dimens.xml b/system/basic/src/main/res/values-sw480dp/dimens.xml
new file mode 100644
index 0000000..f660a8c
--- /dev/null
+++ b/system/basic/src/main/res/values-sw480dp/dimens.xml
@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+
+    <dimen name="txt5">5.0000sp</dimen>
+
+    <dimen name="txt6">6.0000sp</dimen>
+
+    <dimen name="txt7">7.0000sp</dimen>
+
+    <dimen name="txt8">8.0000sp</dimen>
+
+    <dimen name="txt9">9.0000sp</dimen>
+
+    <dimen name="txt10">10.0000sp</dimen>
+
+    <dimen name="txt11">11.0000sp</dimen>
+
+    <dimen name="txt12">12.0000sp</dimen>
+
+    <dimen name="txt13">13.0000sp</dimen>
+
+    <dimen name="txt14">14.0000sp</dimen>
+
+    <dimen name="txt15">15.0000sp</dimen>
+
+    <dimen name="txt16">16.0000sp</dimen>
+
+    <dimen name="txt17">17.0000sp</dimen>
+
+    <dimen name="txt18">18.0000sp</dimen>
+
+    <dimen name="txt19">19.0000sp</dimen>
+
+    <dimen name="txt20">20.0000sp</dimen>
+
+    <dimen name="txt21">21.0000sp</dimen>
+
+    <dimen name="txt22">22.0000sp</dimen>
+
+    <dimen name="txt24">24.0000sp</dimen>
+
+    <dimen name="txt26">26.0000sp</dimen>
+
+    <dimen name="txt28">28.0000sp</dimen>
+
+    <dimen name="txt30">30.0000sp</dimen>
+
+    <dimen name="txt32">32.0000sp</dimen>
+
+    <dimen name="txt34">34.0000sp</dimen>
+
+    <dimen name="card_common_margin_left">@dimen/dp_15</dimen>
+
+    <dimen name="dp_m_60">-60.0000dp</dimen>
+
+    <dimen name="dp_m_30">-30.0000dp</dimen>
+
+    <dimen name="dp_m_20">-20.0000dp</dimen>
+
+    <dimen name="dp_m_12">-12.0000dp</dimen>
+
+    <dimen name="dp_m_10">-10.0000dp</dimen>
+
+    <dimen name="dp_m_8">-8.0000dp</dimen>
+
+    <dimen name="dp_m_5">-5.0000dp</dimen>
+
+    <dimen name="dp_m_2">-2.0000dp</dimen>
+
+    <dimen name="dp_m_1">-1.0000dp</dimen>
+
+    <dimen name="dp_0">0.0000dp</dimen>
+
+    <dimen name="dp_0_1">0.1000dp</dimen>
+
+    <dimen name="dp_0_5">0.5000dp</dimen>
+
+    <dimen name="dp_1">1.0000dp</dimen>
+
+    <dimen name="dp_1_5">1.5000dp</dimen>
+
+    <dimen name="dp_2">2.0000dp</dimen>
+
+    <dimen name="dp_2_5">2.5000dp</dimen>
+
+    <dimen name="dp_3">3.0000dp</dimen>
+
+    <dimen name="dp_3_5">3.5000dp</dimen>
+
+    <dimen name="dp_4">4.0000dp</dimen>
+
+    <dimen name="dp_4_5">4.5000dp</dimen>
+
+    <dimen name="dp_5">5.0000dp</dimen>
+
+    <dimen name="dp_6">6.0000dp</dimen>
+
+    <dimen name="dp_7">7.0000dp</dimen>
+
+    <dimen name="dp_7_5">7.5000dp</dimen>
+
+    <dimen name="dp_8">8.0000dp</dimen>
+
+    <dimen name="dp_9">9.0000dp</dimen>
+
+    <dimen name="dp_10">10.0000dp</dimen>
+
+    <dimen name="dp_11">11.0000dp</dimen>
+
+    <dimen name="dp_12">12.0000dp</dimen>
+
+    <dimen name="dp_13">13.0000dp</dimen>
+
+    <dimen name="dp_14">14.0000dp</dimen>
+
+    <dimen name="dp_15">15.0000dp</dimen>
+
+    <dimen name="dp_16">16.0000dp</dimen>
+
+    <dimen name="dp_17">17.0000dp</dimen>
+
+    <dimen name="dp_18">18.0000dp</dimen>
+
+    <dimen name="dp_19">19.0000dp</dimen>
+
+    <dimen name="dp_20">20.0000dp</dimen>
+
+    <dimen name="dp_21">21.0000dp</dimen>
+
+    <dimen name="dp_22">22.0000dp</dimen>
+
+    <dimen name="dp_23">23.0000dp</dimen>
+
+    <dimen name="dp_24">24.0000dp</dimen>
+
+    <dimen name="dp_25">25.0000dp</dimen>
+
+    <dimen name="dp_26">26.0000dp</dimen>
+
+    <dimen name="dp_27">27.0000dp</dimen>
+
+    <dimen name="dp_28">28.0000dp</dimen>
+
+    <dimen name="dp_29">29.0000dp</dimen>
+
+    <dimen name="dp_30">30.0000dp</dimen>
+
+    <dimen name="dp_31">31.0000dp</dimen>
+
+    <dimen name="dp_32">32.0000dp</dimen>
+
+    <dimen name="dp_33">33.0000dp</dimen>
+
+    <dimen name="dp_34">34.0000dp</dimen>
+
+    <dimen name="dp_35">35.0000dp</dimen>
+
+    <dimen name="dp_36">36.0000dp</dimen>
+
+    <dimen name="dp_37">37.0000dp</dimen>
+
+    <dimen name="dp_38">38.0000dp</dimen>
+
+    <dimen name="dp_39">39.0000dp</dimen>
+
+    <dimen name="dp_40">40.0000dp</dimen>
+
+    <dimen name="dp_41">41.0000dp</dimen>
+
+    <dimen name="dp_42">42.0000dp</dimen>
+
+    <dimen name="dp_43">43.0000dp</dimen>
+
+    <dimen name="dp_44">44.0000dp</dimen>
+
+    <dimen name="dp_45">45.0000dp</dimen>
+
+    <dimen name="dp_46">46.0000dp</dimen>
+
+    <dimen name="dp_47">47.0000dp</dimen>
+
+    <dimen name="dp_48">48.0000dp</dimen>
+
+    <dimen name="dp_49">49.0000dp</dimen>
+
+    <dimen name="dp_50">50.0000dp</dimen>
+
+    <dimen name="dp_51">51.0000dp</dimen>
+
+    <dimen name="dp_52">52.0000dp</dimen>
+
+    <dimen name="dp_53">53.0000dp</dimen>
+
+    <dimen name="dp_54">54.0000dp</dimen>
+
+    <dimen name="dp_55">55.0000dp</dimen>
+
+    <dimen name="dp_56">56.0000dp</dimen>
+
+    <dimen name="dp_57">57.0000dp</dimen>
+
+    <dimen name="dp_58">58.0000dp</dimen>
+
+    <dimen name="dp_59">59.0000dp</dimen>
+
+    <dimen name="dp_60">60.0000dp</dimen>
+
+    <dimen name="dp_61">61.0000dp</dimen>
+
+    <dimen name="dp_62">62.0000dp</dimen>
+
+    <dimen name="dp_63">63.0000dp</dimen>
+
+    <dimen name="dp_64">64.0000dp</dimen>
+
+    <dimen name="dp_65">65.0000dp</dimen>
+
+    <dimen name="dp_66">66.0000dp</dimen>
+
+    <dimen name="dp_67">67.0000dp</dimen>
+
+    <dimen name="dp_68">68.0000dp</dimen>
+
+    <dimen name="dp_69">69.0000dp</dimen>
+
+    <dimen name="dp_70">70.0000dp</dimen>
+
+    <dimen name="dp_71">71.0000dp</dimen>
+
+    <dimen name="dp_72">72.0000dp</dimen>
+
+    <dimen name="dp_73">73.0000dp</dimen>
+
+    <dimen name="dp_74">74.0000dp</dimen>
+
+    <dimen name="dp_75">75.0000dp</dimen>
+
+    <dimen name="dp_76">76.0000dp</dimen>
+
+    <dimen name="dp_77">77.0000dp</dimen>
+
+    <dimen name="dp_78">78.0000dp</dimen>
+
+    <dimen name="dp_79">79.0000dp</dimen>
+
+    <dimen name="dp_80">80.0000dp</dimen>
+
+    <dimen name="dp_81">81.0000dp</dimen>
+
+    <dimen name="dp_82">82.0000dp</dimen>
+
+    <dimen name="dp_83">83.0000dp</dimen>
+
+    <dimen name="dp_84">84.0000dp</dimen>
+
+    <dimen name="dp_85">85.0000dp</dimen>
+
+    <dimen name="dp_86">86.0000dp</dimen>
+
+    <dimen name="dp_87">87.0000dp</dimen>
+
+    <dimen name="dp_88">88.0000dp</dimen>
+
+    <dimen name="dp_89">89.0000dp</dimen>
+
+    <dimen name="dp_90">90.0000dp</dimen>
+
+    <dimen name="dp_91">91.0000dp</dimen>
+
+    <dimen name="dp_92">92.0000dp</dimen>
+
+    <dimen name="dp_93">93.0000dp</dimen>
+
+    <dimen name="dp_94">94.0000dp</dimen>
+
+    <dimen name="dp_95">95.0000dp</dimen>
+
+    <dimen name="dp_96">96.0000dp</dimen>
+
+    <dimen name="dp_97">97.0000dp</dimen>
+
+    <dimen name="dp_98">98.0000dp</dimen>
+
+    <dimen name="dp_99">99.0000dp</dimen>
+
+    <dimen name="dp_100">100.0000dp</dimen>
+
+    <dimen name="dp_101">101.0000dp</dimen>
+
+    <dimen name="dp_102">102.0000dp</dimen>
+
+    <dimen name="dp_103">103.0000dp</dimen>
+
+    <dimen name="dp_104">104.0000dp</dimen>
+
+    <dimen name="dp_104_5">104.5000dp</dimen>
+
+    <dimen name="dp_105">105.0000dp</dimen>
+
+    <dimen name="dp_106">106.0000dp</dimen>
+
+    <dimen name="dp_107">107.0000dp</dimen>
+
+    <dimen name="dp_108">108.0000dp</dimen>
+
+    <dimen name="dp_109">109.0000dp</dimen>
+
+    <dimen name="dp_110">110.0000dp</dimen>
+
+    <dimen name="dp_111">111.0000dp</dimen>
+
+    <dimen name="dp_112">112.0000dp</dimen>
+
+    <dimen name="dp_113">113.0000dp</dimen>
+
+    <dimen name="dp_114">114.0000dp</dimen>
+
+    <dimen name="dp_115">115.0000dp</dimen>
+
+    <dimen name="dp_116">116.0000dp</dimen>
+
+    <dimen name="dp_117">117.0000dp</dimen>
+
+    <dimen name="dp_118">118.0000dp</dimen>
+
+    <dimen name="dp_119">119.0000dp</dimen>
+
+    <dimen name="dp_120">120.0000dp</dimen>
+
+    <dimen name="dp_121">121.0000dp</dimen>
+
+    <dimen name="dp_122">122.0000dp</dimen>
+
+    <dimen name="dp_123">123.0000dp</dimen>
+
+    <dimen name="dp_124">124.0000dp</dimen>
+
+    <dimen name="dp_125">125.0000dp</dimen>
+
+    <dimen name="dp_126">126.0000dp</dimen>
+
+    <dimen name="dp_127">127.0000dp</dimen>
+
+    <dimen name="dp_128">128.0000dp</dimen>
+
+    <dimen name="dp_129">129.0000dp</dimen>
+
+    <dimen name="dp_130">130.0000dp</dimen>
+
+    <dimen name="dp_131">131.0000dp</dimen>
+
+    <dimen name="dp_132">132.0000dp</dimen>
+
+    <dimen name="dp_133">133.0000dp</dimen>
+
+    <dimen name="dp_134">134.0000dp</dimen>
+
+    <dimen name="dp_134_5">134.5000dp</dimen>
+
+    <dimen name="dp_135">135.0000dp</dimen>
+
+    <dimen name="dp_136">136.0000dp</dimen>
+
+    <dimen name="dp_137">137.0000dp</dimen>
+
+    <dimen name="dp_138">138.0000dp</dimen>
+
+    <dimen name="dp_139">139.0000dp</dimen>
+
+    <dimen name="dp_140">140.0000dp</dimen>
+
+    <dimen name="dp_141">141.0000dp</dimen>
+
+    <dimen name="dp_142">142.0000dp</dimen>
+
+    <dimen name="dp_143">143.0000dp</dimen>
+
+    <dimen name="dp_144">144.0000dp</dimen>
+
+    <dimen name="dp_145">145.0000dp</dimen>
+
+    <dimen name="dp_146">146.0000dp</dimen>
+
+    <dimen name="dp_147">147.0000dp</dimen>
+
+    <dimen name="dp_148">148.0000dp</dimen>
+
+    <dimen name="dp_149">149.0000dp</dimen>
+
+    <dimen name="dp_150">150.0000dp</dimen>
+
+    <dimen name="dp_151">151.0000dp</dimen>
+
+    <dimen name="dp_152">152.0000dp</dimen>
+
+    <dimen name="dp_153">153.0000dp</dimen>
+
+    <dimen name="dp_154">154.0000dp</dimen>
+
+    <dimen name="dp_155">155.0000dp</dimen>
+
+    <dimen name="dp_156">156.0000dp</dimen>
+
+    <dimen name="dp_157">157.0000dp</dimen>
+
+    <dimen name="dp_158">158.0000dp</dimen>
+
+    <dimen name="dp_159">159.0000dp</dimen>
+
+    <dimen name="dp_160">160.0000dp</dimen>
+
+    <dimen name="dp_161">161.0000dp</dimen>
+
+    <dimen name="dp_162">162.0000dp</dimen>
+
+    <dimen name="dp_163">163.0000dp</dimen>
+
+    <dimen name="dp_164">164.0000dp</dimen>
+
+    <dimen name="dp_165">165.0000dp</dimen>
+
+    <dimen name="dp_166">166.0000dp</dimen>
+
+    <dimen name="dp_167">167.0000dp</dimen>
+
+    <dimen name="dp_168">168.0000dp</dimen>
+
+    <dimen name="dp_169">169.0000dp</dimen>
+
+    <dimen name="dp_170">170.0000dp</dimen>
+
+    <dimen name="dp_171">171.0000dp</dimen>
+
+    <dimen name="dp_172">172.0000dp</dimen>
+
+    <dimen name="dp_173">173.0000dp</dimen>
+
+    <dimen name="dp_174">174.0000dp</dimen>
+
+    <dimen name="dp_175">175.0000dp</dimen>
+
+    <dimen name="dp_176">176.0000dp</dimen>
+
+    <dimen name="dp_177">177.0000dp</dimen>
+
+    <dimen name="dp_178">178.0000dp</dimen>
+
+    <dimen name="dp_179">179.0000dp</dimen>
+
+    <dimen name="dp_180">180.0000dp</dimen>
+
+    <dimen name="dp_181">181.0000dp</dimen>
+
+    <dimen name="dp_182">182.0000dp</dimen>
+
+    <dimen name="dp_183">183.0000dp</dimen>
+
+    <dimen name="dp_184">184.0000dp</dimen>
+
+    <dimen name="dp_185">185.0000dp</dimen>
+
+    <dimen name="dp_186">186.0000dp</dimen>
+
+    <dimen name="dp_187">187.0000dp</dimen>
+
+    <dimen name="dp_188">188.0000dp</dimen>
+
+    <dimen name="dp_189">189.0000dp</dimen>
+
+    <dimen name="dp_190">190.0000dp</dimen>
+
+    <dimen name="dp_191">191.0000dp</dimen>
+
+    <dimen name="dp_191_25">191.2500dp</dimen>
+
+    <dimen name="dp_192">192.0000dp</dimen>
+
+    <dimen name="dp_193">193.0000dp</dimen>
+
+    <dimen name="dp_194">194.0000dp</dimen>
+
+    <dimen name="dp_195">195.0000dp</dimen>
+
+    <dimen name="dp_196">196.0000dp</dimen>
+
+    <dimen name="dp_197">197.0000dp</dimen>
+
+    <dimen name="dp_198">198.0000dp</dimen>
+
+    <dimen name="dp_199">199.0000dp</dimen>
+
+    <dimen name="dp_200">200.0000dp</dimen>
+
+    <dimen name="dp_201">201.0000dp</dimen>
+
+    <dimen name="dp_202">202.0000dp</dimen>
+
+    <dimen name="dp_203">203.0000dp</dimen>
+
+    <dimen name="dp_204">204.0000dp</dimen>
+
+    <dimen name="dp_205">205.0000dp</dimen>
+
+    <dimen name="dp_206">206.0000dp</dimen>
+
+    <dimen name="dp_207">207.0000dp</dimen>
+
+    <dimen name="dp_208">208.0000dp</dimen>
+
+    <dimen name="dp_209">209.0000dp</dimen>
+
+    <dimen name="dp_210">210.0000dp</dimen>
+
+    <dimen name="dp_211">211.0000dp</dimen>
+
+    <dimen name="dp_212">212.0000dp</dimen>
+
+    <dimen name="dp_213">213.0000dp</dimen>
+
+    <dimen name="dp_214">214.0000dp</dimen>
+
+    <dimen name="dp_215">215.0000dp</dimen>
+
+    <dimen name="dp_216">216.0000dp</dimen>
+
+    <dimen name="dp_217">217.0000dp</dimen>
+
+    <dimen name="dp_218">218.0000dp</dimen>
+
+    <dimen name="dp_219">219.0000dp</dimen>
+
+    <dimen name="dp_220">220.0000dp</dimen>
+
+    <dimen name="dp_221">221.0000dp</dimen>
+
+    <dimen name="dp_222">222.0000dp</dimen>
+
+    <dimen name="dp_223">223.0000dp</dimen>
+
+    <dimen name="dp_224">224.0000dp</dimen>
+
+    <dimen name="dp_225">225.0000dp</dimen>
+
+    <dimen name="dp_226">226.0000dp</dimen>
+
+    <dimen name="dp_227">227.0000dp</dimen>
+
+    <dimen name="dp_228">228.0000dp</dimen>
+
+    <dimen name="dp_229">229.0000dp</dimen>
+
+    <dimen name="dp_230">230.0000dp</dimen>
+
+    <dimen name="dp_231">231.0000dp</dimen>
+
+    <dimen name="dp_232">232.0000dp</dimen>
+
+    <dimen name="dp_233">233.0000dp</dimen>
+
+    <dimen name="dp_234">234.0000dp</dimen>
+
+    <dimen name="dp_235">235.0000dp</dimen>
+
+    <dimen name="dp_236">236.0000dp</dimen>
+
+    <dimen name="dp_237">237.0000dp</dimen>
+
+    <dimen name="dp_238">238.0000dp</dimen>
+
+    <dimen name="dp_239">239.0000dp</dimen>
+
+    <dimen name="dp_240">240.0000dp</dimen>
+
+    <dimen name="dp_241">241.0000dp</dimen>
+
+    <dimen name="dp_242">242.0000dp</dimen>
+
+    <dimen name="dp_243">243.0000dp</dimen>
+
+    <dimen name="dp_244">244.0000dp</dimen>
+
+    <dimen name="dp_245">245.0000dp</dimen>
+
+    <dimen name="dp_246">246.0000dp</dimen>
+
+    <dimen name="dp_247">247.0000dp</dimen>
+
+    <dimen name="dp_248">248.0000dp</dimen>
+
+    <dimen name="dp_249">249.0000dp</dimen>
+
+    <dimen name="dp_250">250.0000dp</dimen>
+
+    <dimen name="dp_251">251.0000dp</dimen>
+
+    <dimen name="dp_252">252.0000dp</dimen>
+
+    <dimen name="dp_253">253.0000dp</dimen>
+
+    <dimen name="dp_254">254.0000dp</dimen>
+
+    <dimen name="dp_255">255.0000dp</dimen>
+
+    <dimen name="dp_256">256.0000dp</dimen>
+
+    <dimen name="dp_257">257.0000dp</dimen>
+
+    <dimen name="dp_258">258.0000dp</dimen>
+
+    <dimen name="dp_259">259.0000dp</dimen>
+
+    <dimen name="dp_260">260.0000dp</dimen>
+
+    <dimen name="dp_261">261.0000dp</dimen>
+
+    <dimen name="dp_262">262.0000dp</dimen>
+
+    <dimen name="dp_263">263.0000dp</dimen>
+
+    <dimen name="dp_264">264.0000dp</dimen>
+
+    <dimen name="dp_265">265.0000dp</dimen>
+
+    <dimen name="dp_266">266.0000dp</dimen>
+
+    <dimen name="dp_267">267.0000dp</dimen>
+
+    <dimen name="dp_268">268.0000dp</dimen>
+
+    <dimen name="dp_269">269.0000dp</dimen>
+
+    <dimen name="dp_270">270.0000dp</dimen>
+
+    <dimen name="dp_271">271.0000dp</dimen>
+
+    <dimen name="dp_272">272.0000dp</dimen>
+
+    <dimen name="dp_273">273.0000dp</dimen>
+
+    <dimen name="dp_274">274.0000dp</dimen>
+
+    <dimen name="dp_275">275.0000dp</dimen>
+
+    <dimen name="dp_276">276.0000dp</dimen>
+
+    <dimen name="dp_277">277.0000dp</dimen>
+
+    <dimen name="dp_278">278.0000dp</dimen>
+
+    <dimen name="dp_279">279.0000dp</dimen>
+
+    <dimen name="dp_280">280.0000dp</dimen>
+
+    <dimen name="dp_281">281.0000dp</dimen>
+
+    <dimen name="dp_282">282.0000dp</dimen>
+
+    <dimen name="dp_283">283.0000dp</dimen>
+
+    <dimen name="dp_284">284.0000dp</dimen>
+
+    <dimen name="dp_285">285.0000dp</dimen>
+
+    <dimen name="dp_286">286.0000dp</dimen>
+
+    <dimen name="dp_287">287.0000dp</dimen>
+
+    <dimen name="dp_288">288.0000dp</dimen>
+
+    <dimen name="dp_289">289.0000dp</dimen>
+
+    <dimen name="dp_290">290.0000dp</dimen>
+
+    <dimen name="dp_291">291.0000dp</dimen>
+
+    <dimen name="dp_292">292.0000dp</dimen>
+
+    <dimen name="dp_293">293.0000dp</dimen>
+
+    <dimen name="dp_294">294.0000dp</dimen>
+
+    <dimen name="dp_295">295.0000dp</dimen>
+
+    <dimen name="dp_296">296.0000dp</dimen>
+
+    <dimen name="dp_297">297.0000dp</dimen>
+
+    <dimen name="dp_298">298.0000dp</dimen>
+
+    <dimen name="dp_299">299.0000dp</dimen>
+
+    <dimen name="dp_300">300.0000dp</dimen>
+
+    <dimen name="dp_301">301.0000dp</dimen>
+
+    <dimen name="dp_302">302.0000dp</dimen>
+
+    <dimen name="dp_303">303.0000dp</dimen>
+
+    <dimen name="dp_304">304.0000dp</dimen>
+
+    <dimen name="dp_305">305.0000dp</dimen>
+
+    <dimen name="dp_306">306.0000dp</dimen>
+
+    <dimen name="dp_307">307.0000dp</dimen>
+
+    <dimen name="dp_308">308.0000dp</dimen>
+
+    <dimen name="dp_309">309.0000dp</dimen>
+
+    <dimen name="dp_310">310.0000dp</dimen>
+
+    <dimen name="dp_311">311.0000dp</dimen>
+
+    <dimen name="dp_312">312.0000dp</dimen>
+
+    <dimen name="dp_313">313.0000dp</dimen>
+
+    <dimen name="dp_314">314.0000dp</dimen>
+
+    <dimen name="dp_315">315.0000dp</dimen>
+
+    <dimen name="dp_316">316.0000dp</dimen>
+
+    <dimen name="dp_317">317.0000dp</dimen>
+
+    <dimen name="dp_318">318.0000dp</dimen>
+
+    <dimen name="dp_319">319.0000dp</dimen>
+
+    <dimen name="dp_320">320.0000dp</dimen>
+
+    <dimen name="dp_321">321.0000dp</dimen>
+
+    <dimen name="dp_322">322.0000dp</dimen>
+
+    <dimen name="dp_323">323.0000dp</dimen>
+
+    <dimen name="dp_324">324.0000dp</dimen>
+
+    <dimen name="dp_325">325.0000dp</dimen>
+
+    <dimen name="dp_326">326.0000dp</dimen>
+
+    <dimen name="dp_327">327.0000dp</dimen>
+
+    <dimen name="dp_328">328.0000dp</dimen>
+
+    <dimen name="dp_329">329.0000dp</dimen>
+
+    <dimen name="dp_330">330.0000dp</dimen>
+
+    <dimen name="dp_331">331.0000dp</dimen>
+
+    <dimen name="dp_332">332.0000dp</dimen>
+
+    <dimen name="dp_333">333.0000dp</dimen>
+
+    <dimen name="dp_334">334.0000dp</dimen>
+
+    <dimen name="dp_335">335.0000dp</dimen>
+
+    <dimen name="dp_336">336.0000dp</dimen>
+
+    <dimen name="dp_337">337.0000dp</dimen>
+
+    <dimen name="dp_338">338.0000dp</dimen>
+
+    <dimen name="dp_339">339.0000dp</dimen>
+
+    <dimen name="dp_340">340.0000dp</dimen>
+
+    <dimen name="dp_341">341.0000dp</dimen>
+
+    <dimen name="dp_342">342.0000dp</dimen>
+
+    <dimen name="dp_343">343.0000dp</dimen>
+
+    <dimen name="dp_344">344.0000dp</dimen>
+
+    <dimen name="dp_345">345.0000dp</dimen>
+
+    <dimen name="dp_346">346.0000dp</dimen>
+
+    <dimen name="dp_347">347.0000dp</dimen>
+
+    <dimen name="dp_348">348.0000dp</dimen>
+
+    <dimen name="dp_349">349.0000dp</dimen>
+
+    <dimen name="dp_350">350.0000dp</dimen>
+
+    <dimen name="dp_351">351.0000dp</dimen>
+
+    <dimen name="dp_352">352.0000dp</dimen>
+
+    <dimen name="dp_353">353.0000dp</dimen>
+
+    <dimen name="dp_354">354.0000dp</dimen>
+
+    <dimen name="dp_355">355.0000dp</dimen>
+
+    <dimen name="dp_356">356.0000dp</dimen>
+
+    <dimen name="dp_357">357.0000dp</dimen>
+
+    <dimen name="dp_358">358.0000dp</dimen>
+
+    <dimen name="dp_359">359.0000dp</dimen>
+
+    <dimen name="dp_360">360.0000dp</dimen>
+
+    <dimen name="dp_365">365.0000dp</dimen>
+
+    <dimen name="dp_370">370.0000dp</dimen>
+
+    <dimen name="dp_400">400.0000dp</dimen>
+
+    <dimen name="dp_410">410.0000dp</dimen>
+
+    <dimen name="dp_422">422.0000dp</dimen>
+
+    <dimen name="dp_472">472.0000dp</dimen>
+
+    <dimen name="dp_500">500.0000dp</dimen>
+
+    <dimen name="dp_600">600.0000dp</dimen>
+
+    <dimen name="dp_640">640.0000dp</dimen>
+
+    <dimen name="dp_650">650.0000dp</dimen>
+
+    <dimen name="dp_710">710.0000dp</dimen>
+
+    <dimen name="dp_720">720.0000dp</dimen>
+
+
+</resources>
diff --git a/system/basic/src/main/res/values-sw533dp/dimens.xml b/system/basic/src/main/res/values-sw533dp/dimens.xml
new file mode 100644
index 0000000..8ab477b
--- /dev/null
+++ b/system/basic/src/main/res/values-sw533dp/dimens.xml
@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+
+    <dimen name="txt5">5.5521sp</dimen>
+
+    <dimen name="txt6">6.6625sp</dimen>
+
+    <dimen name="txt7">7.7729sp</dimen>
+
+    <dimen name="txt8">8.8833sp</dimen>
+
+    <dimen name="txt9">9.9937sp</dimen>
+
+    <dimen name="txt10">11.1042sp</dimen>
+
+    <dimen name="txt11">12.2146sp</dimen>
+
+    <dimen name="txt12">13.3250sp</dimen>
+
+    <dimen name="txt13">14.4354sp</dimen>
+
+    <dimen name="txt14">15.5458sp</dimen>
+
+    <dimen name="txt15">16.6562sp</dimen>
+
+    <dimen name="txt16">17.7667sp</dimen>
+
+    <dimen name="txt17">18.8771sp</dimen>
+
+    <dimen name="txt18">19.9875sp</dimen>
+
+    <dimen name="txt19">21.0979sp</dimen>
+
+    <dimen name="txt20">22.2083sp</dimen>
+
+    <dimen name="txt21">23.3187sp</dimen>
+
+    <dimen name="txt22">24.4292sp</dimen>
+
+    <dimen name="txt24">26.6500sp</dimen>
+
+    <dimen name="txt26">28.8708sp</dimen>
+
+    <dimen name="txt28">31.0917sp</dimen>
+
+    <dimen name="txt30">33.3125sp</dimen>
+
+    <dimen name="txt32">35.5333sp</dimen>
+
+    <dimen name="txt34">37.7542sp</dimen>
+
+    <dimen name="card_common_margin_left">@dimen/dp_15</dimen>
+
+    <dimen name="dp_m_60">-66.6250dp</dimen>
+
+    <dimen name="dp_m_30">-33.3125dp</dimen>
+
+    <dimen name="dp_m_20">-22.2083dp</dimen>
+
+    <dimen name="dp_m_12">-13.3250dp</dimen>
+
+    <dimen name="dp_m_10">-11.1042dp</dimen>
+
+    <dimen name="dp_m_8">-8.8833dp</dimen>
+
+    <dimen name="dp_m_5">-5.5521dp</dimen>
+
+    <dimen name="dp_m_2">-2.2208dp</dimen>
+
+    <dimen name="dp_m_1">-1.1104dp</dimen>
+
+    <dimen name="dp_0">0.0000dp</dimen>
+
+    <dimen name="dp_0_1">0.1110dp</dimen>
+
+    <dimen name="dp_0_5">0.5552dp</dimen>
+
+    <dimen name="dp_1">1.1104dp</dimen>
+
+    <dimen name="dp_1_5">1.6656dp</dimen>
+
+    <dimen name="dp_2">2.2208dp</dimen>
+
+    <dimen name="dp_2_5">2.7760dp</dimen>
+
+    <dimen name="dp_3">3.3312dp</dimen>
+
+    <dimen name="dp_3_5">3.8865dp</dimen>
+
+    <dimen name="dp_4">4.4417dp</dimen>
+
+    <dimen name="dp_4_5">4.9969dp</dimen>
+
+    <dimen name="dp_5">5.5521dp</dimen>
+
+    <dimen name="dp_6">6.6625dp</dimen>
+
+    <dimen name="dp_7">7.7729dp</dimen>
+
+    <dimen name="dp_7_5">8.3281dp</dimen>
+
+    <dimen name="dp_8">8.8833dp</dimen>
+
+    <dimen name="dp_9">9.9937dp</dimen>
+
+    <dimen name="dp_10">11.1042dp</dimen>
+
+    <dimen name="dp_11">12.2146dp</dimen>
+
+    <dimen name="dp_12">13.3250dp</dimen>
+
+    <dimen name="dp_13">14.4354dp</dimen>
+
+    <dimen name="dp_14">15.5458dp</dimen>
+
+    <dimen name="dp_15">16.6562dp</dimen>
+
+    <dimen name="dp_16">17.7667dp</dimen>
+
+    <dimen name="dp_17">18.8771dp</dimen>
+
+    <dimen name="dp_18">19.9875dp</dimen>
+
+    <dimen name="dp_19">21.0979dp</dimen>
+
+    <dimen name="dp_20">22.2083dp</dimen>
+
+    <dimen name="dp_21">23.3187dp</dimen>
+
+    <dimen name="dp_22">24.4292dp</dimen>
+
+    <dimen name="dp_23">25.5396dp</dimen>
+
+    <dimen name="dp_24">26.6500dp</dimen>
+
+    <dimen name="dp_25">27.7604dp</dimen>
+
+    <dimen name="dp_26">28.8708dp</dimen>
+
+    <dimen name="dp_27">29.9812dp</dimen>
+
+    <dimen name="dp_28">31.0917dp</dimen>
+
+    <dimen name="dp_29">32.2021dp</dimen>
+
+    <dimen name="dp_30">33.3125dp</dimen>
+
+    <dimen name="dp_31">34.4229dp</dimen>
+
+    <dimen name="dp_32">35.5333dp</dimen>
+
+    <dimen name="dp_33">36.6437dp</dimen>
+
+    <dimen name="dp_34">37.7542dp</dimen>
+
+    <dimen name="dp_35">38.8646dp</dimen>
+
+    <dimen name="dp_36">39.9750dp</dimen>
+
+    <dimen name="dp_37">41.0854dp</dimen>
+
+    <dimen name="dp_38">42.1958dp</dimen>
+
+    <dimen name="dp_39">43.3062dp</dimen>
+
+    <dimen name="dp_40">44.4167dp</dimen>
+
+    <dimen name="dp_41">45.5271dp</dimen>
+
+    <dimen name="dp_42">46.6375dp</dimen>
+
+    <dimen name="dp_43">47.7479dp</dimen>
+
+    <dimen name="dp_44">48.8583dp</dimen>
+
+    <dimen name="dp_45">49.9688dp</dimen>
+
+    <dimen name="dp_46">51.0792dp</dimen>
+
+    <dimen name="dp_47">52.1896dp</dimen>
+
+    <dimen name="dp_48">53.3000dp</dimen>
+
+    <dimen name="dp_49">54.4104dp</dimen>
+
+    <dimen name="dp_50">55.5208dp</dimen>
+
+    <dimen name="dp_51">56.6312dp</dimen>
+
+    <dimen name="dp_52">57.7417dp</dimen>
+
+    <dimen name="dp_53">58.8521dp</dimen>
+
+    <dimen name="dp_54">59.9625dp</dimen>
+
+    <dimen name="dp_55">61.0729dp</dimen>
+
+    <dimen name="dp_56">62.1833dp</dimen>
+
+    <dimen name="dp_57">63.2937dp</dimen>
+
+    <dimen name="dp_58">64.4042dp</dimen>
+
+    <dimen name="dp_59">65.5146dp</dimen>
+
+    <dimen name="dp_60">66.6250dp</dimen>
+
+    <dimen name="dp_61">67.7354dp</dimen>
+
+    <dimen name="dp_62">68.8458dp</dimen>
+
+    <dimen name="dp_63">69.9562dp</dimen>
+
+    <dimen name="dp_64">71.0667dp</dimen>
+
+    <dimen name="dp_65">72.1771dp</dimen>
+
+    <dimen name="dp_66">73.2875dp</dimen>
+
+    <dimen name="dp_67">74.3979dp</dimen>
+
+    <dimen name="dp_68">75.5083dp</dimen>
+
+    <dimen name="dp_69">76.6187dp</dimen>
+
+    <dimen name="dp_70">77.7292dp</dimen>
+
+    <dimen name="dp_71">78.8396dp</dimen>
+
+    <dimen name="dp_72">79.9500dp</dimen>
+
+    <dimen name="dp_73">81.0604dp</dimen>
+
+    <dimen name="dp_74">82.1708dp</dimen>
+
+    <dimen name="dp_75">83.2812dp</dimen>
+
+    <dimen name="dp_76">84.3917dp</dimen>
+
+    <dimen name="dp_77">85.5021dp</dimen>
+
+    <dimen name="dp_78">86.6125dp</dimen>
+
+    <dimen name="dp_79">87.7229dp</dimen>
+
+    <dimen name="dp_80">88.8333dp</dimen>
+
+    <dimen name="dp_81">89.9437dp</dimen>
+
+    <dimen name="dp_82">91.0542dp</dimen>
+
+    <dimen name="dp_83">92.1646dp</dimen>
+
+    <dimen name="dp_84">93.2750dp</dimen>
+
+    <dimen name="dp_85">94.3854dp</dimen>
+
+    <dimen name="dp_86">95.4958dp</dimen>
+
+    <dimen name="dp_87">96.6062dp</dimen>
+
+    <dimen name="dp_88">97.7167dp</dimen>
+
+    <dimen name="dp_89">98.8271dp</dimen>
+
+    <dimen name="dp_90">99.9375dp</dimen>
+
+    <dimen name="dp_91">101.0479dp</dimen>
+
+    <dimen name="dp_92">102.1583dp</dimen>
+
+    <dimen name="dp_93">103.2687dp</dimen>
+
+    <dimen name="dp_94">104.3792dp</dimen>
+
+    <dimen name="dp_95">105.4896dp</dimen>
+
+    <dimen name="dp_96">106.6000dp</dimen>
+
+    <dimen name="dp_97">107.7104dp</dimen>
+
+    <dimen name="dp_98">108.8208dp</dimen>
+
+    <dimen name="dp_99">109.9312dp</dimen>
+
+    <dimen name="dp_100">111.0417dp</dimen>
+
+    <dimen name="dp_101">112.1521dp</dimen>
+
+    <dimen name="dp_102">113.2625dp</dimen>
+
+    <dimen name="dp_103">114.3729dp</dimen>
+
+    <dimen name="dp_104">115.4833dp</dimen>
+
+    <dimen name="dp_104_5">116.0385dp</dimen>
+
+    <dimen name="dp_105">116.5938dp</dimen>
+
+    <dimen name="dp_106">117.7042dp</dimen>
+
+    <dimen name="dp_107">118.8146dp</dimen>
+
+    <dimen name="dp_108">119.9250dp</dimen>
+
+    <dimen name="dp_109">121.0354dp</dimen>
+
+    <dimen name="dp_110">122.1458dp</dimen>
+
+    <dimen name="dp_111">123.2562dp</dimen>
+
+    <dimen name="dp_112">124.3667dp</dimen>
+
+    <dimen name="dp_113">125.4771dp</dimen>
+
+    <dimen name="dp_114">126.5875dp</dimen>
+
+    <dimen name="dp_115">127.6979dp</dimen>
+
+    <dimen name="dp_116">128.8083dp</dimen>
+
+    <dimen name="dp_117">129.9187dp</dimen>
+
+    <dimen name="dp_118">131.0292dp</dimen>
+
+    <dimen name="dp_119">132.1396dp</dimen>
+
+    <dimen name="dp_120">133.2500dp</dimen>
+
+    <dimen name="dp_121">134.3604dp</dimen>
+
+    <dimen name="dp_122">135.4708dp</dimen>
+
+    <dimen name="dp_123">136.5812dp</dimen>
+
+    <dimen name="dp_124">137.6917dp</dimen>
+
+    <dimen name="dp_125">138.8021dp</dimen>
+
+    <dimen name="dp_126">139.9125dp</dimen>
+
+    <dimen name="dp_127">141.0229dp</dimen>
+
+    <dimen name="dp_128">142.1333dp</dimen>
+
+    <dimen name="dp_129">143.2438dp</dimen>
+
+    <dimen name="dp_130">144.3542dp</dimen>
+
+    <dimen name="dp_131">145.4646dp</dimen>
+
+    <dimen name="dp_132">146.5750dp</dimen>
+
+    <dimen name="dp_133">147.6854dp</dimen>
+
+    <dimen name="dp_134">148.7958dp</dimen>
+
+    <dimen name="dp_134_5">149.3510dp</dimen>
+
+    <dimen name="dp_135">149.9062dp</dimen>
+
+    <dimen name="dp_136">151.0167dp</dimen>
+
+    <dimen name="dp_137">152.1271dp</dimen>
+
+    <dimen name="dp_138">153.2375dp</dimen>
+
+    <dimen name="dp_139">154.3479dp</dimen>
+
+    <dimen name="dp_140">155.4583dp</dimen>
+
+    <dimen name="dp_141">156.5687dp</dimen>
+
+    <dimen name="dp_142">157.6792dp</dimen>
+
+    <dimen name="dp_143">158.7896dp</dimen>
+
+    <dimen name="dp_144">159.9000dp</dimen>
+
+    <dimen name="dp_145">161.0104dp</dimen>
+
+    <dimen name="dp_146">162.1208dp</dimen>
+
+    <dimen name="dp_147">163.2312dp</dimen>
+
+    <dimen name="dp_148">164.3417dp</dimen>
+
+    <dimen name="dp_149">165.4521dp</dimen>
+
+    <dimen name="dp_150">166.5625dp</dimen>
+
+    <dimen name="dp_151">167.6729dp</dimen>
+
+    <dimen name="dp_152">168.7833dp</dimen>
+
+    <dimen name="dp_153">169.8937dp</dimen>
+
+    <dimen name="dp_154">171.0042dp</dimen>
+
+    <dimen name="dp_155">172.1146dp</dimen>
+
+    <dimen name="dp_156">173.2250dp</dimen>
+
+    <dimen name="dp_157">174.3354dp</dimen>
+
+    <dimen name="dp_158">175.4458dp</dimen>
+
+    <dimen name="dp_159">176.5562dp</dimen>
+
+    <dimen name="dp_160">177.6667dp</dimen>
+
+    <dimen name="dp_161">178.7771dp</dimen>
+
+    <dimen name="dp_162">179.8875dp</dimen>
+
+    <dimen name="dp_163">180.9979dp</dimen>
+
+    <dimen name="dp_164">182.1083dp</dimen>
+
+    <dimen name="dp_165">183.2188dp</dimen>
+
+    <dimen name="dp_166">184.3292dp</dimen>
+
+    <dimen name="dp_167">185.4396dp</dimen>
+
+    <dimen name="dp_168">186.5500dp</dimen>
+
+    <dimen name="dp_169">187.6604dp</dimen>
+
+    <dimen name="dp_170">188.7708dp</dimen>
+
+    <dimen name="dp_171">189.8812dp</dimen>
+
+    <dimen name="dp_172">190.9917dp</dimen>
+
+    <dimen name="dp_173">192.1021dp</dimen>
+
+    <dimen name="dp_174">193.2125dp</dimen>
+
+    <dimen name="dp_175">194.3229dp</dimen>
+
+    <dimen name="dp_176">195.4333dp</dimen>
+
+    <dimen name="dp_177">196.5437dp</dimen>
+
+    <dimen name="dp_178">197.6542dp</dimen>
+
+    <dimen name="dp_179">198.7646dp</dimen>
+
+    <dimen name="dp_180">199.8750dp</dimen>
+
+    <dimen name="dp_181">200.9854dp</dimen>
+
+    <dimen name="dp_182">202.0958dp</dimen>
+
+    <dimen name="dp_183">203.2062dp</dimen>
+
+    <dimen name="dp_184">204.3167dp</dimen>
+
+    <dimen name="dp_185">205.4271dp</dimen>
+
+    <dimen name="dp_186">206.5375dp</dimen>
+
+    <dimen name="dp_187">207.6479dp</dimen>
+
+    <dimen name="dp_188">208.7583dp</dimen>
+
+    <dimen name="dp_189">209.8687dp</dimen>
+
+    <dimen name="dp_190">210.9792dp</dimen>
+
+    <dimen name="dp_191">212.0896dp</dimen>
+
+    <dimen name="dp_191_25">212.3672dp</dimen>
+
+    <dimen name="dp_192">213.2000dp</dimen>
+
+    <dimen name="dp_193">214.3104dp</dimen>
+
+    <dimen name="dp_194">215.4208dp</dimen>
+
+    <dimen name="dp_195">216.5312dp</dimen>
+
+    <dimen name="dp_196">217.6417dp</dimen>
+
+    <dimen name="dp_197">218.7521dp</dimen>
+
+    <dimen name="dp_198">219.8625dp</dimen>
+
+    <dimen name="dp_199">220.9729dp</dimen>
+
+    <dimen name="dp_200">222.0833dp</dimen>
+
+    <dimen name="dp_201">223.1937dp</dimen>
+
+    <dimen name="dp_202">224.3042dp</dimen>
+
+    <dimen name="dp_203">225.4146dp</dimen>
+
+    <dimen name="dp_204">226.5250dp</dimen>
+
+    <dimen name="dp_205">227.6354dp</dimen>
+
+    <dimen name="dp_206">228.7458dp</dimen>
+
+    <dimen name="dp_207">229.8562dp</dimen>
+
+    <dimen name="dp_208">230.9667dp</dimen>
+
+    <dimen name="dp_209">232.0771dp</dimen>
+
+    <dimen name="dp_210">233.1875dp</dimen>
+
+    <dimen name="dp_211">234.2979dp</dimen>
+
+    <dimen name="dp_212">235.4083dp</dimen>
+
+    <dimen name="dp_213">236.5187dp</dimen>
+
+    <dimen name="dp_214">237.6292dp</dimen>
+
+    <dimen name="dp_215">238.7396dp</dimen>
+
+    <dimen name="dp_216">239.8500dp</dimen>
+
+    <dimen name="dp_217">240.9604dp</dimen>
+
+    <dimen name="dp_218">242.0708dp</dimen>
+
+    <dimen name="dp_219">243.1812dp</dimen>
+
+    <dimen name="dp_220">244.2917dp</dimen>
+
+    <dimen name="dp_221">245.4021dp</dimen>
+
+    <dimen name="dp_222">246.5125dp</dimen>
+
+    <dimen name="dp_223">247.6229dp</dimen>
+
+    <dimen name="dp_224">248.7333dp</dimen>
+
+    <dimen name="dp_225">249.8438dp</dimen>
+
+    <dimen name="dp_226">250.9542dp</dimen>
+
+    <dimen name="dp_227">252.0646dp</dimen>
+
+    <dimen name="dp_228">253.1750dp</dimen>
+
+    <dimen name="dp_229">254.2854dp</dimen>
+
+    <dimen name="dp_230">255.3958dp</dimen>
+
+    <dimen name="dp_231">256.5062dp</dimen>
+
+    <dimen name="dp_232">257.6167dp</dimen>
+
+    <dimen name="dp_233">258.7271dp</dimen>
+
+    <dimen name="dp_234">259.8375dp</dimen>
+
+    <dimen name="dp_235">260.9479dp</dimen>
+
+    <dimen name="dp_236">262.0583dp</dimen>
+
+    <dimen name="dp_237">263.1687dp</dimen>
+
+    <dimen name="dp_238">264.2792dp</dimen>
+
+    <dimen name="dp_239">265.3896dp</dimen>
+
+    <dimen name="dp_240">266.5000dp</dimen>
+
+    <dimen name="dp_241">267.6104dp</dimen>
+
+    <dimen name="dp_242">268.7208dp</dimen>
+
+    <dimen name="dp_243">269.8313dp</dimen>
+
+    <dimen name="dp_244">270.9417dp</dimen>
+
+    <dimen name="dp_245">272.0521dp</dimen>
+
+    <dimen name="dp_246">273.1625dp</dimen>
+
+    <dimen name="dp_247">274.2729dp</dimen>
+
+    <dimen name="dp_248">275.3833dp</dimen>
+
+    <dimen name="dp_249">276.4937dp</dimen>
+
+    <dimen name="dp_250">277.6042dp</dimen>
+
+    <dimen name="dp_251">278.7146dp</dimen>
+
+    <dimen name="dp_252">279.8250dp</dimen>
+
+    <dimen name="dp_253">280.9354dp</dimen>
+
+    <dimen name="dp_254">282.0458dp</dimen>
+
+    <dimen name="dp_255">283.1562dp</dimen>
+
+    <dimen name="dp_256">284.2667dp</dimen>
+
+    <dimen name="dp_257">285.3771dp</dimen>
+
+    <dimen name="dp_258">286.4875dp</dimen>
+
+    <dimen name="dp_259">287.5979dp</dimen>
+
+    <dimen name="dp_260">288.7083dp</dimen>
+
+    <dimen name="dp_261">289.8187dp</dimen>
+
+    <dimen name="dp_262">290.9292dp</dimen>
+
+    <dimen name="dp_263">292.0396dp</dimen>
+
+    <dimen name="dp_264">293.1500dp</dimen>
+
+    <dimen name="dp_265">294.2604dp</dimen>
+
+    <dimen name="dp_266">295.3708dp</dimen>
+
+    <dimen name="dp_267">296.4812dp</dimen>
+
+    <dimen name="dp_268">297.5917dp</dimen>
+
+    <dimen name="dp_269">298.7021dp</dimen>
+
+    <dimen name="dp_270">299.8125dp</dimen>
+
+    <dimen name="dp_271">300.9229dp</dimen>
+
+    <dimen name="dp_272">302.0333dp</dimen>
+
+    <dimen name="dp_273">303.1438dp</dimen>
+
+    <dimen name="dp_274">304.2542dp</dimen>
+
+    <dimen name="dp_275">305.3646dp</dimen>
+
+    <dimen name="dp_276">306.4750dp</dimen>
+
+    <dimen name="dp_277">307.5854dp</dimen>
+
+    <dimen name="dp_278">308.6958dp</dimen>
+
+    <dimen name="dp_279">309.8062dp</dimen>
+
+    <dimen name="dp_280">310.9167dp</dimen>
+
+    <dimen name="dp_281">312.0271dp</dimen>
+
+    <dimen name="dp_282">313.1375dp</dimen>
+
+    <dimen name="dp_283">314.2479dp</dimen>
+
+    <dimen name="dp_284">315.3583dp</dimen>
+
+    <dimen name="dp_285">316.4688dp</dimen>
+
+    <dimen name="dp_286">317.5792dp</dimen>
+
+    <dimen name="dp_287">318.6896dp</dimen>
+
+    <dimen name="dp_288">319.8000dp</dimen>
+
+    <dimen name="dp_289">320.9104dp</dimen>
+
+    <dimen name="dp_290">322.0208dp</dimen>
+
+    <dimen name="dp_291">323.1312dp</dimen>
+
+    <dimen name="dp_292">324.2417dp</dimen>
+
+    <dimen name="dp_293">325.3521dp</dimen>
+
+    <dimen name="dp_294">326.4625dp</dimen>
+
+    <dimen name="dp_295">327.5729dp</dimen>
+
+    <dimen name="dp_296">328.6833dp</dimen>
+
+    <dimen name="dp_297">329.7937dp</dimen>
+
+    <dimen name="dp_298">330.9042dp</dimen>
+
+    <dimen name="dp_299">332.0146dp</dimen>
+
+    <dimen name="dp_300">333.1250dp</dimen>
+
+    <dimen name="dp_301">334.2354dp</dimen>
+
+    <dimen name="dp_302">335.3458dp</dimen>
+
+    <dimen name="dp_303">336.4562dp</dimen>
+
+    <dimen name="dp_304">337.5667dp</dimen>
+
+    <dimen name="dp_305">338.6771dp</dimen>
+
+    <dimen name="dp_306">339.7875dp</dimen>
+
+    <dimen name="dp_307">340.8979dp</dimen>
+
+    <dimen name="dp_308">342.0083dp</dimen>
+
+    <dimen name="dp_309">343.1187dp</dimen>
+
+    <dimen name="dp_310">344.2292dp</dimen>
+
+    <dimen name="dp_311">345.3396dp</dimen>
+
+    <dimen name="dp_312">346.4500dp</dimen>
+
+    <dimen name="dp_313">347.5604dp</dimen>
+
+    <dimen name="dp_314">348.6708dp</dimen>
+
+    <dimen name="dp_315">349.7812dp</dimen>
+
+    <dimen name="dp_316">350.8917dp</dimen>
+
+    <dimen name="dp_317">352.0021dp</dimen>
+
+    <dimen name="dp_318">353.1125dp</dimen>
+
+    <dimen name="dp_319">354.2229dp</dimen>
+
+    <dimen name="dp_320">355.3333dp</dimen>
+
+    <dimen name="dp_321">356.4437dp</dimen>
+
+    <dimen name="dp_322">357.5542dp</dimen>
+
+    <dimen name="dp_323">358.6646dp</dimen>
+
+    <dimen name="dp_324">359.7750dp</dimen>
+
+    <dimen name="dp_325">360.8854dp</dimen>
+
+    <dimen name="dp_326">361.9958dp</dimen>
+
+    <dimen name="dp_327">363.1062dp</dimen>
+
+    <dimen name="dp_328">364.2167dp</dimen>
+
+    <dimen name="dp_329">365.3271dp</dimen>
+
+    <dimen name="dp_330">366.4375dp</dimen>
+
+    <dimen name="dp_331">367.5479dp</dimen>
+
+    <dimen name="dp_332">368.6583dp</dimen>
+
+    <dimen name="dp_333">369.7687dp</dimen>
+
+    <dimen name="dp_334">370.8792dp</dimen>
+
+    <dimen name="dp_335">371.9896dp</dimen>
+
+    <dimen name="dp_336">373.1000dp</dimen>
+
+    <dimen name="dp_337">374.2104dp</dimen>
+
+    <dimen name="dp_338">375.3208dp</dimen>
+
+    <dimen name="dp_339">376.4312dp</dimen>
+
+    <dimen name="dp_340">377.5417dp</dimen>
+
+    <dimen name="dp_341">378.6521dp</dimen>
+
+    <dimen name="dp_342">379.7625dp</dimen>
+
+    <dimen name="dp_343">380.8729dp</dimen>
+
+    <dimen name="dp_344">381.9833dp</dimen>
+
+    <dimen name="dp_345">383.0938dp</dimen>
+
+    <dimen name="dp_346">384.2042dp</dimen>
+
+    <dimen name="dp_347">385.3146dp</dimen>
+
+    <dimen name="dp_348">386.4250dp</dimen>
+
+    <dimen name="dp_349">387.5354dp</dimen>
+
+    <dimen name="dp_350">388.6458dp</dimen>
+
+    <dimen name="dp_351">389.7562dp</dimen>
+
+    <dimen name="dp_352">390.8667dp</dimen>
+
+    <dimen name="dp_353">391.9771dp</dimen>
+
+    <dimen name="dp_354">393.0875dp</dimen>
+
+    <dimen name="dp_355">394.1979dp</dimen>
+
+    <dimen name="dp_356">395.3083dp</dimen>
+
+    <dimen name="dp_357">396.4187dp</dimen>
+
+    <dimen name="dp_358">397.5292dp</dimen>
+
+    <dimen name="dp_359">398.6396dp</dimen>
+
+    <dimen name="dp_360">399.7500dp</dimen>
+
+    <dimen name="dp_365">405.3021dp</dimen>
+
+    <dimen name="dp_370">410.8542dp</dimen>
+
+    <dimen name="dp_400">444.1667dp</dimen>
+
+    <dimen name="dp_410">455.2708dp</dimen>
+
+    <dimen name="dp_422">468.5958dp</dimen>
+
+    <dimen name="dp_472">524.1167dp</dimen>
+
+    <dimen name="dp_500">555.2083dp</dimen>
+
+    <dimen name="dp_600">666.2500dp</dimen>
+
+    <dimen name="dp_640">710.6667dp</dimen>
+
+    <dimen name="dp_650">721.7708dp</dimen>
+
+    <dimen name="dp_710">788.3958dp</dimen>
+
+    <dimen name="dp_720">799.5000dp</dimen>
+
+
+</resources>
diff --git a/system/basic/src/main/res/values-sw592dp/dimens.xml b/system/basic/src/main/res/values-sw592dp/dimens.xml
new file mode 100644
index 0000000..72f2017
--- /dev/null
+++ b/system/basic/src/main/res/values-sw592dp/dimens.xml
@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+
+    <dimen name="txt5">6.1667sp</dimen>
+
+    <dimen name="txt6">7.4000sp</dimen>
+
+    <dimen name="txt7">8.6333sp</dimen>
+
+    <dimen name="txt8">9.8667sp</dimen>
+
+    <dimen name="txt9">11.1000sp</dimen>
+
+    <dimen name="txt10">12.3333sp</dimen>
+
+    <dimen name="txt11">13.5667sp</dimen>
+
+    <dimen name="txt12">14.8000sp</dimen>
+
+    <dimen name="txt13">16.0333sp</dimen>
+
+    <dimen name="txt14">17.2667sp</dimen>
+
+    <dimen name="txt15">18.5000sp</dimen>
+
+    <dimen name="txt16">19.7333sp</dimen>
+
+    <dimen name="txt17">20.9667sp</dimen>
+
+    <dimen name="txt18">22.2000sp</dimen>
+
+    <dimen name="txt19">23.4333sp</dimen>
+
+    <dimen name="txt20">24.6667sp</dimen>
+
+    <dimen name="txt21">25.9000sp</dimen>
+
+    <dimen name="txt22">27.1333sp</dimen>
+
+    <dimen name="txt24">29.6000sp</dimen>
+
+    <dimen name="txt26">32.0667sp</dimen>
+
+    <dimen name="txt28">34.5333sp</dimen>
+
+    <dimen name="txt30">37.0000sp</dimen>
+
+    <dimen name="txt32">39.4667sp</dimen>
+
+    <dimen name="txt34">41.9333sp</dimen>
+
+    <dimen name="card_common_margin_left">@dimen/dp_15</dimen>
+
+    <dimen name="dp_m_60">-74.0000dp</dimen>
+
+    <dimen name="dp_m_30">-37.0000dp</dimen>
+
+    <dimen name="dp_m_20">-24.6667dp</dimen>
+
+    <dimen name="dp_m_12">-14.8000dp</dimen>
+
+    <dimen name="dp_m_10">-12.3333dp</dimen>
+
+    <dimen name="dp_m_8">-9.8667dp</dimen>
+
+    <dimen name="dp_m_5">-6.1667dp</dimen>
+
+    <dimen name="dp_m_2">-2.4667dp</dimen>
+
+    <dimen name="dp_m_1">-1.2333dp</dimen>
+
+    <dimen name="dp_0">0.0000dp</dimen>
+
+    <dimen name="dp_0_1">0.1233dp</dimen>
+
+    <dimen name="dp_0_5">0.6167dp</dimen>
+
+    <dimen name="dp_1">1.2333dp</dimen>
+
+    <dimen name="dp_1_5">1.8500dp</dimen>
+
+    <dimen name="dp_2">2.4667dp</dimen>
+
+    <dimen name="dp_2_5">3.0833dp</dimen>
+
+    <dimen name="dp_3">3.7000dp</dimen>
+
+    <dimen name="dp_3_5">4.3167dp</dimen>
+
+    <dimen name="dp_4">4.9333dp</dimen>
+
+    <dimen name="dp_4_5">5.5500dp</dimen>
+
+    <dimen name="dp_5">6.1667dp</dimen>
+
+    <dimen name="dp_6">7.4000dp</dimen>
+
+    <dimen name="dp_7">8.6333dp</dimen>
+
+    <dimen name="dp_7_5">9.2500dp</dimen>
+
+    <dimen name="dp_8">9.8667dp</dimen>
+
+    <dimen name="dp_9">11.1000dp</dimen>
+
+    <dimen name="dp_10">12.3333dp</dimen>
+
+    <dimen name="dp_11">13.5667dp</dimen>
+
+    <dimen name="dp_12">14.8000dp</dimen>
+
+    <dimen name="dp_13">16.0333dp</dimen>
+
+    <dimen name="dp_14">17.2667dp</dimen>
+
+    <dimen name="dp_15">18.5000dp</dimen>
+
+    <dimen name="dp_16">19.7333dp</dimen>
+
+    <dimen name="dp_17">20.9667dp</dimen>
+
+    <dimen name="dp_18">22.2000dp</dimen>
+
+    <dimen name="dp_19">23.4333dp</dimen>
+
+    <dimen name="dp_20">24.6667dp</dimen>
+
+    <dimen name="dp_21">25.9000dp</dimen>
+
+    <dimen name="dp_22">27.1333dp</dimen>
+
+    <dimen name="dp_23">28.3667dp</dimen>
+
+    <dimen name="dp_24">29.6000dp</dimen>
+
+    <dimen name="dp_25">30.8333dp</dimen>
+
+    <dimen name="dp_26">32.0667dp</dimen>
+
+    <dimen name="dp_27">33.3000dp</dimen>
+
+    <dimen name="dp_28">34.5333dp</dimen>
+
+    <dimen name="dp_29">35.7667dp</dimen>
+
+    <dimen name="dp_30">37.0000dp</dimen>
+
+    <dimen name="dp_31">38.2333dp</dimen>
+
+    <dimen name="dp_32">39.4667dp</dimen>
+
+    <dimen name="dp_33">40.7000dp</dimen>
+
+    <dimen name="dp_34">41.9333dp</dimen>
+
+    <dimen name="dp_35">43.1667dp</dimen>
+
+    <dimen name="dp_36">44.4000dp</dimen>
+
+    <dimen name="dp_37">45.6333dp</dimen>
+
+    <dimen name="dp_38">46.8667dp</dimen>
+
+    <dimen name="dp_39">48.1000dp</dimen>
+
+    <dimen name="dp_40">49.3333dp</dimen>
+
+    <dimen name="dp_41">50.5667dp</dimen>
+
+    <dimen name="dp_42">51.8000dp</dimen>
+
+    <dimen name="dp_43">53.0333dp</dimen>
+
+    <dimen name="dp_44">54.2667dp</dimen>
+
+    <dimen name="dp_45">55.5000dp</dimen>
+
+    <dimen name="dp_46">56.7333dp</dimen>
+
+    <dimen name="dp_47">57.9667dp</dimen>
+
+    <dimen name="dp_48">59.2000dp</dimen>
+
+    <dimen name="dp_49">60.4333dp</dimen>
+
+    <dimen name="dp_50">61.6667dp</dimen>
+
+    <dimen name="dp_51">62.9000dp</dimen>
+
+    <dimen name="dp_52">64.1333dp</dimen>
+
+    <dimen name="dp_53">65.3667dp</dimen>
+
+    <dimen name="dp_54">66.6000dp</dimen>
+
+    <dimen name="dp_55">67.8333dp</dimen>
+
+    <dimen name="dp_56">69.0667dp</dimen>
+
+    <dimen name="dp_57">70.3000dp</dimen>
+
+    <dimen name="dp_58">71.5333dp</dimen>
+
+    <dimen name="dp_59">72.7667dp</dimen>
+
+    <dimen name="dp_60">74.0000dp</dimen>
+
+    <dimen name="dp_61">75.2333dp</dimen>
+
+    <dimen name="dp_62">76.4667dp</dimen>
+
+    <dimen name="dp_63">77.7000dp</dimen>
+
+    <dimen name="dp_64">78.9333dp</dimen>
+
+    <dimen name="dp_65">80.1667dp</dimen>
+
+    <dimen name="dp_66">81.4000dp</dimen>
+
+    <dimen name="dp_67">82.6333dp</dimen>
+
+    <dimen name="dp_68">83.8667dp</dimen>
+
+    <dimen name="dp_69">85.1000dp</dimen>
+
+    <dimen name="dp_70">86.3333dp</dimen>
+
+    <dimen name="dp_71">87.5667dp</dimen>
+
+    <dimen name="dp_72">88.8000dp</dimen>
+
+    <dimen name="dp_73">90.0333dp</dimen>
+
+    <dimen name="dp_74">91.2667dp</dimen>
+
+    <dimen name="dp_75">92.5000dp</dimen>
+
+    <dimen name="dp_76">93.7333dp</dimen>
+
+    <dimen name="dp_77">94.9667dp</dimen>
+
+    <dimen name="dp_78">96.2000dp</dimen>
+
+    <dimen name="dp_79">97.4333dp</dimen>
+
+    <dimen name="dp_80">98.6667dp</dimen>
+
+    <dimen name="dp_81">99.9000dp</dimen>
+
+    <dimen name="dp_82">101.1333dp</dimen>
+
+    <dimen name="dp_83">102.3667dp</dimen>
+
+    <dimen name="dp_84">103.6000dp</dimen>
+
+    <dimen name="dp_85">104.8333dp</dimen>
+
+    <dimen name="dp_86">106.0667dp</dimen>
+
+    <dimen name="dp_87">107.3000dp</dimen>
+
+    <dimen name="dp_88">108.5333dp</dimen>
+
+    <dimen name="dp_89">109.7667dp</dimen>
+
+    <dimen name="dp_90">111.0000dp</dimen>
+
+    <dimen name="dp_91">112.2333dp</dimen>
+
+    <dimen name="dp_92">113.4667dp</dimen>
+
+    <dimen name="dp_93">114.7000dp</dimen>
+
+    <dimen name="dp_94">115.9333dp</dimen>
+
+    <dimen name="dp_95">117.1667dp</dimen>
+
+    <dimen name="dp_96">118.4000dp</dimen>
+
+    <dimen name="dp_97">119.6333dp</dimen>
+
+    <dimen name="dp_98">120.8667dp</dimen>
+
+    <dimen name="dp_99">122.1000dp</dimen>
+
+    <dimen name="dp_100">123.3333dp</dimen>
+
+    <dimen name="dp_101">124.5667dp</dimen>
+
+    <dimen name="dp_102">125.8000dp</dimen>
+
+    <dimen name="dp_103">127.0333dp</dimen>
+
+    <dimen name="dp_104">128.2667dp</dimen>
+
+    <dimen name="dp_104_5">128.8833dp</dimen>
+
+    <dimen name="dp_105">129.5000dp</dimen>
+
+    <dimen name="dp_106">130.7333dp</dimen>
+
+    <dimen name="dp_107">131.9667dp</dimen>
+
+    <dimen name="dp_108">133.2000dp</dimen>
+
+    <dimen name="dp_109">134.4333dp</dimen>
+
+    <dimen name="dp_110">135.6667dp</dimen>
+
+    <dimen name="dp_111">136.9000dp</dimen>
+
+    <dimen name="dp_112">138.1333dp</dimen>
+
+    <dimen name="dp_113">139.3667dp</dimen>
+
+    <dimen name="dp_114">140.6000dp</dimen>
+
+    <dimen name="dp_115">141.8333dp</dimen>
+
+    <dimen name="dp_116">143.0667dp</dimen>
+
+    <dimen name="dp_117">144.3000dp</dimen>
+
+    <dimen name="dp_118">145.5333dp</dimen>
+
+    <dimen name="dp_119">146.7667dp</dimen>
+
+    <dimen name="dp_120">148.0000dp</dimen>
+
+    <dimen name="dp_121">149.2333dp</dimen>
+
+    <dimen name="dp_122">150.4667dp</dimen>
+
+    <dimen name="dp_123">151.7000dp</dimen>
+
+    <dimen name="dp_124">152.9333dp</dimen>
+
+    <dimen name="dp_125">154.1667dp</dimen>
+
+    <dimen name="dp_126">155.4000dp</dimen>
+
+    <dimen name="dp_127">156.6333dp</dimen>
+
+    <dimen name="dp_128">157.8667dp</dimen>
+
+    <dimen name="dp_129">159.1000dp</dimen>
+
+    <dimen name="dp_130">160.3333dp</dimen>
+
+    <dimen name="dp_131">161.5667dp</dimen>
+
+    <dimen name="dp_132">162.8000dp</dimen>
+
+    <dimen name="dp_133">164.0333dp</dimen>
+
+    <dimen name="dp_134">165.2667dp</dimen>
+
+    <dimen name="dp_134_5">165.8833dp</dimen>
+
+    <dimen name="dp_135">166.5000dp</dimen>
+
+    <dimen name="dp_136">167.7333dp</dimen>
+
+    <dimen name="dp_137">168.9667dp</dimen>
+
+    <dimen name="dp_138">170.2000dp</dimen>
+
+    <dimen name="dp_139">171.4333dp</dimen>
+
+    <dimen name="dp_140">172.6667dp</dimen>
+
+    <dimen name="dp_141">173.9000dp</dimen>
+
+    <dimen name="dp_142">175.1333dp</dimen>
+
+    <dimen name="dp_143">176.3667dp</dimen>
+
+    <dimen name="dp_144">177.6000dp</dimen>
+
+    <dimen name="dp_145">178.8333dp</dimen>
+
+    <dimen name="dp_146">180.0667dp</dimen>
+
+    <dimen name="dp_147">181.3000dp</dimen>
+
+    <dimen name="dp_148">182.5333dp</dimen>
+
+    <dimen name="dp_149">183.7667dp</dimen>
+
+    <dimen name="dp_150">185.0000dp</dimen>
+
+    <dimen name="dp_151">186.2333dp</dimen>
+
+    <dimen name="dp_152">187.4667dp</dimen>
+
+    <dimen name="dp_153">188.7000dp</dimen>
+
+    <dimen name="dp_154">189.9333dp</dimen>
+
+    <dimen name="dp_155">191.1667dp</dimen>
+
+    <dimen name="dp_156">192.4000dp</dimen>
+
+    <dimen name="dp_157">193.6333dp</dimen>
+
+    <dimen name="dp_158">194.8667dp</dimen>
+
+    <dimen name="dp_159">196.1000dp</dimen>
+
+    <dimen name="dp_160">197.3333dp</dimen>
+
+    <dimen name="dp_161">198.5667dp</dimen>
+
+    <dimen name="dp_162">199.8000dp</dimen>
+
+    <dimen name="dp_163">201.0333dp</dimen>
+
+    <dimen name="dp_164">202.2667dp</dimen>
+
+    <dimen name="dp_165">203.5000dp</dimen>
+
+    <dimen name="dp_166">204.7333dp</dimen>
+
+    <dimen name="dp_167">205.9667dp</dimen>
+
+    <dimen name="dp_168">207.2000dp</dimen>
+
+    <dimen name="dp_169">208.4333dp</dimen>
+
+    <dimen name="dp_170">209.6667dp</dimen>
+
+    <dimen name="dp_171">210.9000dp</dimen>
+
+    <dimen name="dp_172">212.1333dp</dimen>
+
+    <dimen name="dp_173">213.3667dp</dimen>
+
+    <dimen name="dp_174">214.6000dp</dimen>
+
+    <dimen name="dp_175">215.8333dp</dimen>
+
+    <dimen name="dp_176">217.0667dp</dimen>
+
+    <dimen name="dp_177">218.3000dp</dimen>
+
+    <dimen name="dp_178">219.5333dp</dimen>
+
+    <dimen name="dp_179">220.7667dp</dimen>
+
+    <dimen name="dp_180">222.0000dp</dimen>
+
+    <dimen name="dp_181">223.2333dp</dimen>
+
+    <dimen name="dp_182">224.4667dp</dimen>
+
+    <dimen name="dp_183">225.7000dp</dimen>
+
+    <dimen name="dp_184">226.9333dp</dimen>
+
+    <dimen name="dp_185">228.1667dp</dimen>
+
+    <dimen name="dp_186">229.4000dp</dimen>
+
+    <dimen name="dp_187">230.6333dp</dimen>
+
+    <dimen name="dp_188">231.8667dp</dimen>
+
+    <dimen name="dp_189">233.1000dp</dimen>
+
+    <dimen name="dp_190">234.3333dp</dimen>
+
+    <dimen name="dp_191">235.5667dp</dimen>
+
+    <dimen name="dp_191_25">235.8750dp</dimen>
+
+    <dimen name="dp_192">236.8000dp</dimen>
+
+    <dimen name="dp_193">238.0333dp</dimen>
+
+    <dimen name="dp_194">239.2667dp</dimen>
+
+    <dimen name="dp_195">240.5000dp</dimen>
+
+    <dimen name="dp_196">241.7333dp</dimen>
+
+    <dimen name="dp_197">242.9667dp</dimen>
+
+    <dimen name="dp_198">244.2000dp</dimen>
+
+    <dimen name="dp_199">245.4333dp</dimen>
+
+    <dimen name="dp_200">246.6667dp</dimen>
+
+    <dimen name="dp_201">247.9000dp</dimen>
+
+    <dimen name="dp_202">249.1333dp</dimen>
+
+    <dimen name="dp_203">250.3667dp</dimen>
+
+    <dimen name="dp_204">251.6000dp</dimen>
+
+    <dimen name="dp_205">252.8333dp</dimen>
+
+    <dimen name="dp_206">254.0667dp</dimen>
+
+    <dimen name="dp_207">255.3000dp</dimen>
+
+    <dimen name="dp_208">256.5333dp</dimen>
+
+    <dimen name="dp_209">257.7667dp</dimen>
+
+    <dimen name="dp_210">259.0000dp</dimen>
+
+    <dimen name="dp_211">260.2333dp</dimen>
+
+    <dimen name="dp_212">261.4667dp</dimen>
+
+    <dimen name="dp_213">262.7000dp</dimen>
+
+    <dimen name="dp_214">263.9333dp</dimen>
+
+    <dimen name="dp_215">265.1667dp</dimen>
+
+    <dimen name="dp_216">266.4000dp</dimen>
+
+    <dimen name="dp_217">267.6333dp</dimen>
+
+    <dimen name="dp_218">268.8667dp</dimen>
+
+    <dimen name="dp_219">270.1000dp</dimen>
+
+    <dimen name="dp_220">271.3333dp</dimen>
+
+    <dimen name="dp_221">272.5667dp</dimen>
+
+    <dimen name="dp_222">273.8000dp</dimen>
+
+    <dimen name="dp_223">275.0333dp</dimen>
+
+    <dimen name="dp_224">276.2667dp</dimen>
+
+    <dimen name="dp_225">277.5000dp</dimen>
+
+    <dimen name="dp_226">278.7333dp</dimen>
+
+    <dimen name="dp_227">279.9667dp</dimen>
+
+    <dimen name="dp_228">281.2000dp</dimen>
+
+    <dimen name="dp_229">282.4333dp</dimen>
+
+    <dimen name="dp_230">283.6667dp</dimen>
+
+    <dimen name="dp_231">284.9000dp</dimen>
+
+    <dimen name="dp_232">286.1333dp</dimen>
+
+    <dimen name="dp_233">287.3667dp</dimen>
+
+    <dimen name="dp_234">288.6000dp</dimen>
+
+    <dimen name="dp_235">289.8333dp</dimen>
+
+    <dimen name="dp_236">291.0667dp</dimen>
+
+    <dimen name="dp_237">292.3000dp</dimen>
+
+    <dimen name="dp_238">293.5333dp</dimen>
+
+    <dimen name="dp_239">294.7667dp</dimen>
+
+    <dimen name="dp_240">296.0000dp</dimen>
+
+    <dimen name="dp_241">297.2333dp</dimen>
+
+    <dimen name="dp_242">298.4667dp</dimen>
+
+    <dimen name="dp_243">299.7000dp</dimen>
+
+    <dimen name="dp_244">300.9333dp</dimen>
+
+    <dimen name="dp_245">302.1667dp</dimen>
+
+    <dimen name="dp_246">303.4000dp</dimen>
+
+    <dimen name="dp_247">304.6333dp</dimen>
+
+    <dimen name="dp_248">305.8667dp</dimen>
+
+    <dimen name="dp_249">307.1000dp</dimen>
+
+    <dimen name="dp_250">308.3333dp</dimen>
+
+    <dimen name="dp_251">309.5667dp</dimen>
+
+    <dimen name="dp_252">310.8000dp</dimen>
+
+    <dimen name="dp_253">312.0333dp</dimen>
+
+    <dimen name="dp_254">313.2667dp</dimen>
+
+    <dimen name="dp_255">314.5000dp</dimen>
+
+    <dimen name="dp_256">315.7333dp</dimen>
+
+    <dimen name="dp_257">316.9667dp</dimen>
+
+    <dimen name="dp_258">318.2000dp</dimen>
+
+    <dimen name="dp_259">319.4333dp</dimen>
+
+    <dimen name="dp_260">320.6667dp</dimen>
+
+    <dimen name="dp_261">321.9000dp</dimen>
+
+    <dimen name="dp_262">323.1333dp</dimen>
+
+    <dimen name="dp_263">324.3667dp</dimen>
+
+    <dimen name="dp_264">325.6000dp</dimen>
+
+    <dimen name="dp_265">326.8333dp</dimen>
+
+    <dimen name="dp_266">328.0667dp</dimen>
+
+    <dimen name="dp_267">329.3000dp</dimen>
+
+    <dimen name="dp_268">330.5333dp</dimen>
+
+    <dimen name="dp_269">331.7667dp</dimen>
+
+    <dimen name="dp_270">333.0000dp</dimen>
+
+    <dimen name="dp_271">334.2333dp</dimen>
+
+    <dimen name="dp_272">335.4667dp</dimen>
+
+    <dimen name="dp_273">336.7000dp</dimen>
+
+    <dimen name="dp_274">337.9333dp</dimen>
+
+    <dimen name="dp_275">339.1667dp</dimen>
+
+    <dimen name="dp_276">340.4000dp</dimen>
+
+    <dimen name="dp_277">341.6333dp</dimen>
+
+    <dimen name="dp_278">342.8667dp</dimen>
+
+    <dimen name="dp_279">344.1000dp</dimen>
+
+    <dimen name="dp_280">345.3333dp</dimen>
+
+    <dimen name="dp_281">346.5667dp</dimen>
+
+    <dimen name="dp_282">347.8000dp</dimen>
+
+    <dimen name="dp_283">349.0333dp</dimen>
+
+    <dimen name="dp_284">350.2667dp</dimen>
+
+    <dimen name="dp_285">351.5000dp</dimen>
+
+    <dimen name="dp_286">352.7333dp</dimen>
+
+    <dimen name="dp_287">353.9667dp</dimen>
+
+    <dimen name="dp_288">355.2000dp</dimen>
+
+    <dimen name="dp_289">356.4333dp</dimen>
+
+    <dimen name="dp_290">357.6667dp</dimen>
+
+    <dimen name="dp_291">358.9000dp</dimen>
+
+    <dimen name="dp_292">360.1333dp</dimen>
+
+    <dimen name="dp_293">361.3667dp</dimen>
+
+    <dimen name="dp_294">362.6000dp</dimen>
+
+    <dimen name="dp_295">363.8333dp</dimen>
+
+    <dimen name="dp_296">365.0667dp</dimen>
+
+    <dimen name="dp_297">366.3000dp</dimen>
+
+    <dimen name="dp_298">367.5333dp</dimen>
+
+    <dimen name="dp_299">368.7667dp</dimen>
+
+    <dimen name="dp_300">370.0000dp</dimen>
+
+    <dimen name="dp_301">371.2333dp</dimen>
+
+    <dimen name="dp_302">372.4667dp</dimen>
+
+    <dimen name="dp_303">373.7000dp</dimen>
+
+    <dimen name="dp_304">374.9333dp</dimen>
+
+    <dimen name="dp_305">376.1667dp</dimen>
+
+    <dimen name="dp_306">377.4000dp</dimen>
+
+    <dimen name="dp_307">378.6333dp</dimen>
+
+    <dimen name="dp_308">379.8667dp</dimen>
+
+    <dimen name="dp_309">381.1000dp</dimen>
+
+    <dimen name="dp_310">382.3333dp</dimen>
+
+    <dimen name="dp_311">383.5667dp</dimen>
+
+    <dimen name="dp_312">384.8000dp</dimen>
+
+    <dimen name="dp_313">386.0333dp</dimen>
+
+    <dimen name="dp_314">387.2667dp</dimen>
+
+    <dimen name="dp_315">388.5000dp</dimen>
+
+    <dimen name="dp_316">389.7333dp</dimen>
+
+    <dimen name="dp_317">390.9667dp</dimen>
+
+    <dimen name="dp_318">392.2000dp</dimen>
+
+    <dimen name="dp_319">393.4333dp</dimen>
+
+    <dimen name="dp_320">394.6667dp</dimen>
+
+    <dimen name="dp_321">395.9000dp</dimen>
+
+    <dimen name="dp_322">397.1333dp</dimen>
+
+    <dimen name="dp_323">398.3667dp</dimen>
+
+    <dimen name="dp_324">399.6000dp</dimen>
+
+    <dimen name="dp_325">400.8333dp</dimen>
+
+    <dimen name="dp_326">402.0667dp</dimen>
+
+    <dimen name="dp_327">403.3000dp</dimen>
+
+    <dimen name="dp_328">404.5333dp</dimen>
+
+    <dimen name="dp_329">405.7667dp</dimen>
+
+    <dimen name="dp_330">407.0000dp</dimen>
+
+    <dimen name="dp_331">408.2333dp</dimen>
+
+    <dimen name="dp_332">409.4667dp</dimen>
+
+    <dimen name="dp_333">410.7000dp</dimen>
+
+    <dimen name="dp_334">411.9333dp</dimen>
+
+    <dimen name="dp_335">413.1667dp</dimen>
+
+    <dimen name="dp_336">414.4000dp</dimen>
+
+    <dimen name="dp_337">415.6333dp</dimen>
+
+    <dimen name="dp_338">416.8667dp</dimen>
+
+    <dimen name="dp_339">418.1000dp</dimen>
+
+    <dimen name="dp_340">419.3333dp</dimen>
+
+    <dimen name="dp_341">420.5667dp</dimen>
+
+    <dimen name="dp_342">421.8000dp</dimen>
+
+    <dimen name="dp_343">423.0333dp</dimen>
+
+    <dimen name="dp_344">424.2667dp</dimen>
+
+    <dimen name="dp_345">425.5000dp</dimen>
+
+    <dimen name="dp_346">426.7333dp</dimen>
+
+    <dimen name="dp_347">427.9667dp</dimen>
+
+    <dimen name="dp_348">429.2000dp</dimen>
+
+    <dimen name="dp_349">430.4333dp</dimen>
+
+    <dimen name="dp_350">431.6667dp</dimen>
+
+    <dimen name="dp_351">432.9000dp</dimen>
+
+    <dimen name="dp_352">434.1333dp</dimen>
+
+    <dimen name="dp_353">435.3667dp</dimen>
+
+    <dimen name="dp_354">436.6000dp</dimen>
+
+    <dimen name="dp_355">437.8333dp</dimen>
+
+    <dimen name="dp_356">439.0667dp</dimen>
+
+    <dimen name="dp_357">440.3000dp</dimen>
+
+    <dimen name="dp_358">441.5333dp</dimen>
+
+    <dimen name="dp_359">442.7667dp</dimen>
+
+    <dimen name="dp_360">444.0000dp</dimen>
+
+    <dimen name="dp_365">450.1667dp</dimen>
+
+    <dimen name="dp_370">456.3333dp</dimen>
+
+    <dimen name="dp_400">493.3333dp</dimen>
+
+    <dimen name="dp_410">505.6667dp</dimen>
+
+    <dimen name="dp_422">520.4667dp</dimen>
+
+    <dimen name="dp_472">582.1333dp</dimen>
+
+    <dimen name="dp_500">616.6667dp</dimen>
+
+    <dimen name="dp_600">740.0000dp</dimen>
+
+    <dimen name="dp_640">789.3333dp</dimen>
+
+    <dimen name="dp_650">801.6667dp</dimen>
+
+    <dimen name="dp_710">875.6667dp</dimen>
+
+    <dimen name="dp_720">888.0000dp</dimen>
+
+
+</resources>
diff --git a/system/basic/src/main/res/values-sw600dp/dimens.xml b/system/basic/src/main/res/values-sw600dp/dimens.xml
new file mode 100644
index 0000000..46b6e80
--- /dev/null
+++ b/system/basic/src/main/res/values-sw600dp/dimens.xml
@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+
+    <dimen name="txt5">6.2500sp</dimen>
+
+    <dimen name="txt6">7.5000sp</dimen>
+
+    <dimen name="txt7">8.7500sp</dimen>
+
+    <dimen name="txt8">10.0000sp</dimen>
+
+    <dimen name="txt9">11.2500sp</dimen>
+
+    <dimen name="txt10">12.5000sp</dimen>
+
+    <dimen name="txt11">13.7500sp</dimen>
+
+    <dimen name="txt12">15.0000sp</dimen>
+
+    <dimen name="txt13">16.2500sp</dimen>
+
+    <dimen name="txt14">17.5000sp</dimen>
+
+    <dimen name="txt15">18.7500sp</dimen>
+
+    <dimen name="txt16">20.0000sp</dimen>
+
+    <dimen name="txt17">21.2500sp</dimen>
+
+    <dimen name="txt18">22.5000sp</dimen>
+
+    <dimen name="txt19">23.7500sp</dimen>
+
+    <dimen name="txt20">25.0000sp</dimen>
+
+    <dimen name="txt21">26.2500sp</dimen>
+
+    <dimen name="txt22">27.5000sp</dimen>
+
+    <dimen name="txt24">30.0000sp</dimen>
+
+    <dimen name="txt26">32.5000sp</dimen>
+
+    <dimen name="txt28">35.0000sp</dimen>
+
+    <dimen name="txt30">37.5000sp</dimen>
+
+    <dimen name="txt32">40.0000sp</dimen>
+
+    <dimen name="txt34">42.5000sp</dimen>
+
+    <dimen name="card_common_margin_left">@dimen/dp_15</dimen>
+
+    <dimen name="dp_m_60">-75.0000dp</dimen>
+
+    <dimen name="dp_m_30">-37.5000dp</dimen>
+
+    <dimen name="dp_m_20">-25.0000dp</dimen>
+
+    <dimen name="dp_m_12">-15.0000dp</dimen>
+
+    <dimen name="dp_m_10">-12.5000dp</dimen>
+
+    <dimen name="dp_m_8">-10.0000dp</dimen>
+
+    <dimen name="dp_m_5">-6.2500dp</dimen>
+
+    <dimen name="dp_m_2">-2.5000dp</dimen>
+
+    <dimen name="dp_m_1">-1.2500dp</dimen>
+
+    <dimen name="dp_0">0.0000dp</dimen>
+
+    <dimen name="dp_0_1">0.1250dp</dimen>
+
+    <dimen name="dp_0_5">0.6250dp</dimen>
+
+    <dimen name="dp_1">1.2500dp</dimen>
+
+    <dimen name="dp_1_5">1.8750dp</dimen>
+
+    <dimen name="dp_2">2.5000dp</dimen>
+
+    <dimen name="dp_2_5">3.1250dp</dimen>
+
+    <dimen name="dp_3">3.7500dp</dimen>
+
+    <dimen name="dp_3_5">4.3750dp</dimen>
+
+    <dimen name="dp_4">5.0000dp</dimen>
+
+    <dimen name="dp_4_5">5.6250dp</dimen>
+
+    <dimen name="dp_5">6.2500dp</dimen>
+
+    <dimen name="dp_6">7.5000dp</dimen>
+
+    <dimen name="dp_7">8.7500dp</dimen>
+
+    <dimen name="dp_7_5">9.3750dp</dimen>
+
+    <dimen name="dp_8">10.0000dp</dimen>
+
+    <dimen name="dp_9">11.2500dp</dimen>
+
+    <dimen name="dp_10">12.5000dp</dimen>
+
+    <dimen name="dp_11">13.7500dp</dimen>
+
+    <dimen name="dp_12">15.0000dp</dimen>
+
+    <dimen name="dp_13">16.2500dp</dimen>
+
+    <dimen name="dp_14">17.5000dp</dimen>
+
+    <dimen name="dp_15">18.7500dp</dimen>
+
+    <dimen name="dp_16">20.0000dp</dimen>
+
+    <dimen name="dp_17">21.2500dp</dimen>
+
+    <dimen name="dp_18">22.5000dp</dimen>
+
+    <dimen name="dp_19">23.7500dp</dimen>
+
+    <dimen name="dp_20">25.0000dp</dimen>
+
+    <dimen name="dp_21">26.2500dp</dimen>
+
+    <dimen name="dp_22">27.5000dp</dimen>
+
+    <dimen name="dp_23">28.7500dp</dimen>
+
+    <dimen name="dp_24">30.0000dp</dimen>
+
+    <dimen name="dp_25">31.2500dp</dimen>
+
+    <dimen name="dp_26">32.5000dp</dimen>
+
+    <dimen name="dp_27">33.7500dp</dimen>
+
+    <dimen name="dp_28">35.0000dp</dimen>
+
+    <dimen name="dp_29">36.2500dp</dimen>
+
+    <dimen name="dp_30">37.5000dp</dimen>
+
+    <dimen name="dp_31">38.7500dp</dimen>
+
+    <dimen name="dp_32">40.0000dp</dimen>
+
+    <dimen name="dp_33">41.2500dp</dimen>
+
+    <dimen name="dp_34">42.5000dp</dimen>
+
+    <dimen name="dp_35">43.7500dp</dimen>
+
+    <dimen name="dp_36">45.0000dp</dimen>
+
+    <dimen name="dp_37">46.2500dp</dimen>
+
+    <dimen name="dp_38">47.5000dp</dimen>
+
+    <dimen name="dp_39">48.7500dp</dimen>
+
+    <dimen name="dp_40">50.0000dp</dimen>
+
+    <dimen name="dp_41">51.2500dp</dimen>
+
+    <dimen name="dp_42">52.5000dp</dimen>
+
+    <dimen name="dp_43">53.7500dp</dimen>
+
+    <dimen name="dp_44">55.0000dp</dimen>
+
+    <dimen name="dp_45">56.2500dp</dimen>
+
+    <dimen name="dp_46">57.5000dp</dimen>
+
+    <dimen name="dp_47">58.7500dp</dimen>
+
+    <dimen name="dp_48">60.0000dp</dimen>
+
+    <dimen name="dp_49">61.2500dp</dimen>
+
+    <dimen name="dp_50">62.5000dp</dimen>
+
+    <dimen name="dp_51">63.7500dp</dimen>
+
+    <dimen name="dp_52">65.0000dp</dimen>
+
+    <dimen name="dp_53">66.2500dp</dimen>
+
+    <dimen name="dp_54">67.5000dp</dimen>
+
+    <dimen name="dp_55">68.7500dp</dimen>
+
+    <dimen name="dp_56">70.0000dp</dimen>
+
+    <dimen name="dp_57">71.2500dp</dimen>
+
+    <dimen name="dp_58">72.5000dp</dimen>
+
+    <dimen name="dp_59">73.7500dp</dimen>
+
+    <dimen name="dp_60">75.0000dp</dimen>
+
+    <dimen name="dp_61">76.2500dp</dimen>
+
+    <dimen name="dp_62">77.5000dp</dimen>
+
+    <dimen name="dp_63">78.7500dp</dimen>
+
+    <dimen name="dp_64">80.0000dp</dimen>
+
+    <dimen name="dp_65">81.2500dp</dimen>
+
+    <dimen name="dp_66">82.5000dp</dimen>
+
+    <dimen name="dp_67">83.7500dp</dimen>
+
+    <dimen name="dp_68">85.0000dp</dimen>
+
+    <dimen name="dp_69">86.2500dp</dimen>
+
+    <dimen name="dp_70">87.5000dp</dimen>
+
+    <dimen name="dp_71">88.7500dp</dimen>
+
+    <dimen name="dp_72">90.0000dp</dimen>
+
+    <dimen name="dp_73">91.2500dp</dimen>
+
+    <dimen name="dp_74">92.5000dp</dimen>
+
+    <dimen name="dp_75">93.7500dp</dimen>
+
+    <dimen name="dp_76">95.0000dp</dimen>
+
+    <dimen name="dp_77">96.2500dp</dimen>
+
+    <dimen name="dp_78">97.5000dp</dimen>
+
+    <dimen name="dp_79">98.7500dp</dimen>
+
+    <dimen name="dp_80">100.0000dp</dimen>
+
+    <dimen name="dp_81">101.2500dp</dimen>
+
+    <dimen name="dp_82">102.5000dp</dimen>
+
+    <dimen name="dp_83">103.7500dp</dimen>
+
+    <dimen name="dp_84">105.0000dp</dimen>
+
+    <dimen name="dp_85">106.2500dp</dimen>
+
+    <dimen name="dp_86">107.5000dp</dimen>
+
+    <dimen name="dp_87">108.7500dp</dimen>
+
+    <dimen name="dp_88">110.0000dp</dimen>
+
+    <dimen name="dp_89">111.2500dp</dimen>
+
+    <dimen name="dp_90">112.5000dp</dimen>
+
+    <dimen name="dp_91">113.7500dp</dimen>
+
+    <dimen name="dp_92">115.0000dp</dimen>
+
+    <dimen name="dp_93">116.2500dp</dimen>
+
+    <dimen name="dp_94">117.5000dp</dimen>
+
+    <dimen name="dp_95">118.7500dp</dimen>
+
+    <dimen name="dp_96">120.0000dp</dimen>
+
+    <dimen name="dp_97">121.2500dp</dimen>
+
+    <dimen name="dp_98">122.5000dp</dimen>
+
+    <dimen name="dp_99">123.7500dp</dimen>
+
+    <dimen name="dp_100">125.0000dp</dimen>
+
+    <dimen name="dp_101">126.2500dp</dimen>
+
+    <dimen name="dp_102">127.5000dp</dimen>
+
+    <dimen name="dp_103">128.7500dp</dimen>
+
+    <dimen name="dp_104">130.0000dp</dimen>
+
+    <dimen name="dp_104_5">130.6250dp</dimen>
+
+    <dimen name="dp_105">131.2500dp</dimen>
+
+    <dimen name="dp_106">132.5000dp</dimen>
+
+    <dimen name="dp_107">133.7500dp</dimen>
+
+    <dimen name="dp_108">135.0000dp</dimen>
+
+    <dimen name="dp_109">136.2500dp</dimen>
+
+    <dimen name="dp_110">137.5000dp</dimen>
+
+    <dimen name="dp_111">138.7500dp</dimen>
+
+    <dimen name="dp_112">140.0000dp</dimen>
+
+    <dimen name="dp_113">141.2500dp</dimen>
+
+    <dimen name="dp_114">142.5000dp</dimen>
+
+    <dimen name="dp_115">143.7500dp</dimen>
+
+    <dimen name="dp_116">145.0000dp</dimen>
+
+    <dimen name="dp_117">146.2500dp</dimen>
+
+    <dimen name="dp_118">147.5000dp</dimen>
+
+    <dimen name="dp_119">148.7500dp</dimen>
+
+    <dimen name="dp_120">150.0000dp</dimen>
+
+    <dimen name="dp_121">151.2500dp</dimen>
+
+    <dimen name="dp_122">152.5000dp</dimen>
+
+    <dimen name="dp_123">153.7500dp</dimen>
+
+    <dimen name="dp_124">155.0000dp</dimen>
+
+    <dimen name="dp_125">156.2500dp</dimen>
+
+    <dimen name="dp_126">157.5000dp</dimen>
+
+    <dimen name="dp_127">158.7500dp</dimen>
+
+    <dimen name="dp_128">160.0000dp</dimen>
+
+    <dimen name="dp_129">161.2500dp</dimen>
+
+    <dimen name="dp_130">162.5000dp</dimen>
+
+    <dimen name="dp_131">163.7500dp</dimen>
+
+    <dimen name="dp_132">165.0000dp</dimen>
+
+    <dimen name="dp_133">166.2500dp</dimen>
+
+    <dimen name="dp_134">167.5000dp</dimen>
+
+    <dimen name="dp_134_5">168.1250dp</dimen>
+
+    <dimen name="dp_135">168.7500dp</dimen>
+
+    <dimen name="dp_136">170.0000dp</dimen>
+
+    <dimen name="dp_137">171.2500dp</dimen>
+
+    <dimen name="dp_138">172.5000dp</dimen>
+
+    <dimen name="dp_139">173.7500dp</dimen>
+
+    <dimen name="dp_140">175.0000dp</dimen>
+
+    <dimen name="dp_141">176.2500dp</dimen>
+
+    <dimen name="dp_142">177.5000dp</dimen>
+
+    <dimen name="dp_143">178.7500dp</dimen>
+
+    <dimen name="dp_144">180.0000dp</dimen>
+
+    <dimen name="dp_145">181.2500dp</dimen>
+
+    <dimen name="dp_146">182.5000dp</dimen>
+
+    <dimen name="dp_147">183.7500dp</dimen>
+
+    <dimen name="dp_148">185.0000dp</dimen>
+
+    <dimen name="dp_149">186.2500dp</dimen>
+
+    <dimen name="dp_150">187.5000dp</dimen>
+
+    <dimen name="dp_151">188.7500dp</dimen>
+
+    <dimen name="dp_152">190.0000dp</dimen>
+
+    <dimen name="dp_153">191.2500dp</dimen>
+
+    <dimen name="dp_154">192.5000dp</dimen>
+
+    <dimen name="dp_155">193.7500dp</dimen>
+
+    <dimen name="dp_156">195.0000dp</dimen>
+
+    <dimen name="dp_157">196.2500dp</dimen>
+
+    <dimen name="dp_158">197.5000dp</dimen>
+
+    <dimen name="dp_159">198.7500dp</dimen>
+
+    <dimen name="dp_160">200.0000dp</dimen>
+
+    <dimen name="dp_161">201.2500dp</dimen>
+
+    <dimen name="dp_162">202.5000dp</dimen>
+
+    <dimen name="dp_163">203.7500dp</dimen>
+
+    <dimen name="dp_164">205.0000dp</dimen>
+
+    <dimen name="dp_165">206.2500dp</dimen>
+
+    <dimen name="dp_166">207.5000dp</dimen>
+
+    <dimen name="dp_167">208.7500dp</dimen>
+
+    <dimen name="dp_168">210.0000dp</dimen>
+
+    <dimen name="dp_169">211.2500dp</dimen>
+
+    <dimen name="dp_170">212.5000dp</dimen>
+
+    <dimen name="dp_171">213.7500dp</dimen>
+
+    <dimen name="dp_172">215.0000dp</dimen>
+
+    <dimen name="dp_173">216.2500dp</dimen>
+
+    <dimen name="dp_174">217.5000dp</dimen>
+
+    <dimen name="dp_175">218.7500dp</dimen>
+
+    <dimen name="dp_176">220.0000dp</dimen>
+
+    <dimen name="dp_177">221.2500dp</dimen>
+
+    <dimen name="dp_178">222.5000dp</dimen>
+
+    <dimen name="dp_179">223.7500dp</dimen>
+
+    <dimen name="dp_180">225.0000dp</dimen>
+
+    <dimen name="dp_181">226.2500dp</dimen>
+
+    <dimen name="dp_182">227.5000dp</dimen>
+
+    <dimen name="dp_183">228.7500dp</dimen>
+
+    <dimen name="dp_184">230.0000dp</dimen>
+
+    <dimen name="dp_185">231.2500dp</dimen>
+
+    <dimen name="dp_186">232.5000dp</dimen>
+
+    <dimen name="dp_187">233.7500dp</dimen>
+
+    <dimen name="dp_188">235.0000dp</dimen>
+
+    <dimen name="dp_189">236.2500dp</dimen>
+
+    <dimen name="dp_190">237.5000dp</dimen>
+
+    <dimen name="dp_191">238.7500dp</dimen>
+
+    <dimen name="dp_191_25">239.0625dp</dimen>
+
+    <dimen name="dp_192">240.0000dp</dimen>
+
+    <dimen name="dp_193">241.2500dp</dimen>
+
+    <dimen name="dp_194">242.5000dp</dimen>
+
+    <dimen name="dp_195">243.7500dp</dimen>
+
+    <dimen name="dp_196">245.0000dp</dimen>
+
+    <dimen name="dp_197">246.2500dp</dimen>
+
+    <dimen name="dp_198">247.5000dp</dimen>
+
+    <dimen name="dp_199">248.7500dp</dimen>
+
+    <dimen name="dp_200">250.0000dp</dimen>
+
+    <dimen name="dp_201">251.2500dp</dimen>
+
+    <dimen name="dp_202">252.5000dp</dimen>
+
+    <dimen name="dp_203">253.7500dp</dimen>
+
+    <dimen name="dp_204">255.0000dp</dimen>
+
+    <dimen name="dp_205">256.2500dp</dimen>
+
+    <dimen name="dp_206">257.5000dp</dimen>
+
+    <dimen name="dp_207">258.7500dp</dimen>
+
+    <dimen name="dp_208">260.0000dp</dimen>
+
+    <dimen name="dp_209">261.2500dp</dimen>
+
+    <dimen name="dp_210">262.5000dp</dimen>
+
+    <dimen name="dp_211">263.7500dp</dimen>
+
+    <dimen name="dp_212">265.0000dp</dimen>
+
+    <dimen name="dp_213">266.2500dp</dimen>
+
+    <dimen name="dp_214">267.5000dp</dimen>
+
+    <dimen name="dp_215">268.7500dp</dimen>
+
+    <dimen name="dp_216">270.0000dp</dimen>
+
+    <dimen name="dp_217">271.2500dp</dimen>
+
+    <dimen name="dp_218">272.5000dp</dimen>
+
+    <dimen name="dp_219">273.7500dp</dimen>
+
+    <dimen name="dp_220">275.0000dp</dimen>
+
+    <dimen name="dp_221">276.2500dp</dimen>
+
+    <dimen name="dp_222">277.5000dp</dimen>
+
+    <dimen name="dp_223">278.7500dp</dimen>
+
+    <dimen name="dp_224">280.0000dp</dimen>
+
+    <dimen name="dp_225">281.2500dp</dimen>
+
+    <dimen name="dp_226">282.5000dp</dimen>
+
+    <dimen name="dp_227">283.7500dp</dimen>
+
+    <dimen name="dp_228">285.0000dp</dimen>
+
+    <dimen name="dp_229">286.2500dp</dimen>
+
+    <dimen name="dp_230">287.5000dp</dimen>
+
+    <dimen name="dp_231">288.7500dp</dimen>
+
+    <dimen name="dp_232">290.0000dp</dimen>
+
+    <dimen name="dp_233">291.2500dp</dimen>
+
+    <dimen name="dp_234">292.5000dp</dimen>
+
+    <dimen name="dp_235">293.7500dp</dimen>
+
+    <dimen name="dp_236">295.0000dp</dimen>
+
+    <dimen name="dp_237">296.2500dp</dimen>
+
+    <dimen name="dp_238">297.5000dp</dimen>
+
+    <dimen name="dp_239">298.7500dp</dimen>
+
+    <dimen name="dp_240">300.0000dp</dimen>
+
+    <dimen name="dp_241">301.2500dp</dimen>
+
+    <dimen name="dp_242">302.5000dp</dimen>
+
+    <dimen name="dp_243">303.7500dp</dimen>
+
+    <dimen name="dp_244">305.0000dp</dimen>
+
+    <dimen name="dp_245">306.2500dp</dimen>
+
+    <dimen name="dp_246">307.5000dp</dimen>
+
+    <dimen name="dp_247">308.7500dp</dimen>
+
+    <dimen name="dp_248">310.0000dp</dimen>
+
+    <dimen name="dp_249">311.2500dp</dimen>
+
+    <dimen name="dp_250">312.5000dp</dimen>
+
+    <dimen name="dp_251">313.7500dp</dimen>
+
+    <dimen name="dp_252">315.0000dp</dimen>
+
+    <dimen name="dp_253">316.2500dp</dimen>
+
+    <dimen name="dp_254">317.5000dp</dimen>
+
+    <dimen name="dp_255">318.7500dp</dimen>
+
+    <dimen name="dp_256">320.0000dp</dimen>
+
+    <dimen name="dp_257">321.2500dp</dimen>
+
+    <dimen name="dp_258">322.5000dp</dimen>
+
+    <dimen name="dp_259">323.7500dp</dimen>
+
+    <dimen name="dp_260">325.0000dp</dimen>
+
+    <dimen name="dp_261">326.2500dp</dimen>
+
+    <dimen name="dp_262">327.5000dp</dimen>
+
+    <dimen name="dp_263">328.7500dp</dimen>
+
+    <dimen name="dp_264">330.0000dp</dimen>
+
+    <dimen name="dp_265">331.2500dp</dimen>
+
+    <dimen name="dp_266">332.5000dp</dimen>
+
+    <dimen name="dp_267">333.7500dp</dimen>
+
+    <dimen name="dp_268">335.0000dp</dimen>
+
+    <dimen name="dp_269">336.2500dp</dimen>
+
+    <dimen name="dp_270">337.5000dp</dimen>
+
+    <dimen name="dp_271">338.7500dp</dimen>
+
+    <dimen name="dp_272">340.0000dp</dimen>
+
+    <dimen name="dp_273">341.2500dp</dimen>
+
+    <dimen name="dp_274">342.5000dp</dimen>
+
+    <dimen name="dp_275">343.7500dp</dimen>
+
+    <dimen name="dp_276">345.0000dp</dimen>
+
+    <dimen name="dp_277">346.2500dp</dimen>
+
+    <dimen name="dp_278">347.5000dp</dimen>
+
+    <dimen name="dp_279">348.7500dp</dimen>
+
+    <dimen name="dp_280">350.0000dp</dimen>
+
+    <dimen name="dp_281">351.2500dp</dimen>
+
+    <dimen name="dp_282">352.5000dp</dimen>
+
+    <dimen name="dp_283">353.7500dp</dimen>
+
+    <dimen name="dp_284">355.0000dp</dimen>
+
+    <dimen name="dp_285">356.2500dp</dimen>
+
+    <dimen name="dp_286">357.5000dp</dimen>
+
+    <dimen name="dp_287">358.7500dp</dimen>
+
+    <dimen name="dp_288">360.0000dp</dimen>
+
+    <dimen name="dp_289">361.2500dp</dimen>
+
+    <dimen name="dp_290">362.5000dp</dimen>
+
+    <dimen name="dp_291">363.7500dp</dimen>
+
+    <dimen name="dp_292">365.0000dp</dimen>
+
+    <dimen name="dp_293">366.2500dp</dimen>
+
+    <dimen name="dp_294">367.5000dp</dimen>
+
+    <dimen name="dp_295">368.7500dp</dimen>
+
+    <dimen name="dp_296">370.0000dp</dimen>
+
+    <dimen name="dp_297">371.2500dp</dimen>
+
+    <dimen name="dp_298">372.5000dp</dimen>
+
+    <dimen name="dp_299">373.7500dp</dimen>
+
+    <dimen name="dp_300">375.0000dp</dimen>
+
+    <dimen name="dp_301">376.2500dp</dimen>
+
+    <dimen name="dp_302">377.5000dp</dimen>
+
+    <dimen name="dp_303">378.7500dp</dimen>
+
+    <dimen name="dp_304">380.0000dp</dimen>
+
+    <dimen name="dp_305">381.2500dp</dimen>
+
+    <dimen name="dp_306">382.5000dp</dimen>
+
+    <dimen name="dp_307">383.7500dp</dimen>
+
+    <dimen name="dp_308">385.0000dp</dimen>
+
+    <dimen name="dp_309">386.2500dp</dimen>
+
+    <dimen name="dp_310">387.5000dp</dimen>
+
+    <dimen name="dp_311">388.7500dp</dimen>
+
+    <dimen name="dp_312">390.0000dp</dimen>
+
+    <dimen name="dp_313">391.2500dp</dimen>
+
+    <dimen name="dp_314">392.5000dp</dimen>
+
+    <dimen name="dp_315">393.7500dp</dimen>
+
+    <dimen name="dp_316">395.0000dp</dimen>
+
+    <dimen name="dp_317">396.2500dp</dimen>
+
+    <dimen name="dp_318">397.5000dp</dimen>
+
+    <dimen name="dp_319">398.7500dp</dimen>
+
+    <dimen name="dp_320">400.0000dp</dimen>
+
+    <dimen name="dp_321">401.2500dp</dimen>
+
+    <dimen name="dp_322">402.5000dp</dimen>
+
+    <dimen name="dp_323">403.7500dp</dimen>
+
+    <dimen name="dp_324">405.0000dp</dimen>
+
+    <dimen name="dp_325">406.2500dp</dimen>
+
+    <dimen name="dp_326">407.5000dp</dimen>
+
+    <dimen name="dp_327">408.7500dp</dimen>
+
+    <dimen name="dp_328">410.0000dp</dimen>
+
+    <dimen name="dp_329">411.2500dp</dimen>
+
+    <dimen name="dp_330">412.5000dp</dimen>
+
+    <dimen name="dp_331">413.7500dp</dimen>
+
+    <dimen name="dp_332">415.0000dp</dimen>
+
+    <dimen name="dp_333">416.2500dp</dimen>
+
+    <dimen name="dp_334">417.5000dp</dimen>
+
+    <dimen name="dp_335">418.7500dp</dimen>
+
+    <dimen name="dp_336">420.0000dp</dimen>
+
+    <dimen name="dp_337">421.2500dp</dimen>
+
+    <dimen name="dp_338">422.5000dp</dimen>
+
+    <dimen name="dp_339">423.7500dp</dimen>
+
+    <dimen name="dp_340">425.0000dp</dimen>
+
+    <dimen name="dp_341">426.2500dp</dimen>
+
+    <dimen name="dp_342">427.5000dp</dimen>
+
+    <dimen name="dp_343">428.7500dp</dimen>
+
+    <dimen name="dp_344">430.0000dp</dimen>
+
+    <dimen name="dp_345">431.2500dp</dimen>
+
+    <dimen name="dp_346">432.5000dp</dimen>
+
+    <dimen name="dp_347">433.7500dp</dimen>
+
+    <dimen name="dp_348">435.0000dp</dimen>
+
+    <dimen name="dp_349">436.2500dp</dimen>
+
+    <dimen name="dp_350">437.5000dp</dimen>
+
+    <dimen name="dp_351">438.7500dp</dimen>
+
+    <dimen name="dp_352">440.0000dp</dimen>
+
+    <dimen name="dp_353">441.2500dp</dimen>
+
+    <dimen name="dp_354">442.5000dp</dimen>
+
+    <dimen name="dp_355">443.7500dp</dimen>
+
+    <dimen name="dp_356">445.0000dp</dimen>
+
+    <dimen name="dp_357">446.2500dp</dimen>
+
+    <dimen name="dp_358">447.5000dp</dimen>
+
+    <dimen name="dp_359">448.7500dp</dimen>
+
+    <dimen name="dp_360">450.0000dp</dimen>
+
+    <dimen name="dp_365">456.2500dp</dimen>
+
+    <dimen name="dp_370">462.5000dp</dimen>
+
+    <dimen name="dp_400">500.0000dp</dimen>
+
+    <dimen name="dp_410">512.5000dp</dimen>
+
+    <dimen name="dp_422">527.5000dp</dimen>
+
+    <dimen name="dp_472">590.0000dp</dimen>
+
+    <dimen name="dp_500">625.0000dp</dimen>
+
+    <dimen name="dp_600">750.0000dp</dimen>
+
+    <dimen name="dp_640">800.0000dp</dimen>
+
+    <dimen name="dp_650">812.5000dp</dimen>
+
+    <dimen name="dp_710">887.5000dp</dimen>
+
+    <dimen name="dp_720">900.0000dp</dimen>
+
+
+</resources>
diff --git a/system/basic/src/main/res/values-sw640dp/dimens.xml b/system/basic/src/main/res/values-sw640dp/dimens.xml
new file mode 100644
index 0000000..201e167
--- /dev/null
+++ b/system/basic/src/main/res/values-sw640dp/dimens.xml
@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+
+    <dimen name="txt5">6.6667sp</dimen>
+
+    <dimen name="txt6">8.0000sp</dimen>
+
+    <dimen name="txt7">9.3333sp</dimen>
+
+    <dimen name="txt8">10.6667sp</dimen>
+
+    <dimen name="txt9">12.0000sp</dimen>
+
+    <dimen name="txt10">13.3333sp</dimen>
+
+    <dimen name="txt11">14.6667sp</dimen>
+
+    <dimen name="txt12">16.0000sp</dimen>
+
+    <dimen name="txt13">17.3333sp</dimen>
+
+    <dimen name="txt14">18.6667sp</dimen>
+
+    <dimen name="txt15">20.0000sp</dimen>
+
+    <dimen name="txt16">21.3333sp</dimen>
+
+    <dimen name="txt17">22.6667sp</dimen>
+
+    <dimen name="txt18">24.0000sp</dimen>
+
+    <dimen name="txt19">25.3333sp</dimen>
+
+    <dimen name="txt20">26.6667sp</dimen>
+
+    <dimen name="txt21">28.0000sp</dimen>
+
+    <dimen name="txt22">29.3333sp</dimen>
+
+    <dimen name="txt24">32.0000sp</dimen>
+
+    <dimen name="txt26">34.6667sp</dimen>
+
+    <dimen name="txt28">37.3333sp</dimen>
+
+    <dimen name="txt30">40.0000sp</dimen>
+
+    <dimen name="txt32">42.6667sp</dimen>
+
+    <dimen name="txt34">45.3333sp</dimen>
+
+    <dimen name="card_common_margin_left">@dimen/dp_15</dimen>
+
+    <dimen name="dp_m_60">-80.0000dp</dimen>
+
+    <dimen name="dp_m_30">-40.0000dp</dimen>
+
+    <dimen name="dp_m_20">-26.6667dp</dimen>
+
+    <dimen name="dp_m_12">-16.0000dp</dimen>
+
+    <dimen name="dp_m_10">-13.3333dp</dimen>
+
+    <dimen name="dp_m_8">-10.6667dp</dimen>
+
+    <dimen name="dp_m_5">-6.6667dp</dimen>
+
+    <dimen name="dp_m_2">-2.6667dp</dimen>
+
+    <dimen name="dp_m_1">-1.3333dp</dimen>
+
+    <dimen name="dp_0">0.0000dp</dimen>
+
+    <dimen name="dp_0_1">0.1333dp</dimen>
+
+    <dimen name="dp_0_5">0.6667dp</dimen>
+
+    <dimen name="dp_1">1.3333dp</dimen>
+
+    <dimen name="dp_1_5">2.0000dp</dimen>
+
+    <dimen name="dp_2">2.6667dp</dimen>
+
+    <dimen name="dp_2_5">3.3333dp</dimen>
+
+    <dimen name="dp_3">4.0000dp</dimen>
+
+    <dimen name="dp_3_5">4.6667dp</dimen>
+
+    <dimen name="dp_4">5.3333dp</dimen>
+
+    <dimen name="dp_4_5">6.0000dp</dimen>
+
+    <dimen name="dp_5">6.6667dp</dimen>
+
+    <dimen name="dp_6">8.0000dp</dimen>
+
+    <dimen name="dp_7">9.3333dp</dimen>
+
+    <dimen name="dp_7_5">10.0000dp</dimen>
+
+    <dimen name="dp_8">10.6667dp</dimen>
+
+    <dimen name="dp_9">12.0000dp</dimen>
+
+    <dimen name="dp_10">13.3333dp</dimen>
+
+    <dimen name="dp_11">14.6667dp</dimen>
+
+    <dimen name="dp_12">16.0000dp</dimen>
+
+    <dimen name="dp_13">17.3333dp</dimen>
+
+    <dimen name="dp_14">18.6667dp</dimen>
+
+    <dimen name="dp_15">20.0000dp</dimen>
+
+    <dimen name="dp_16">21.3333dp</dimen>
+
+    <dimen name="dp_17">22.6667dp</dimen>
+
+    <dimen name="dp_18">24.0000dp</dimen>
+
+    <dimen name="dp_19">25.3333dp</dimen>
+
+    <dimen name="dp_20">26.6667dp</dimen>
+
+    <dimen name="dp_21">28.0000dp</dimen>
+
+    <dimen name="dp_22">29.3333dp</dimen>
+
+    <dimen name="dp_23">30.6667dp</dimen>
+
+    <dimen name="dp_24">32.0000dp</dimen>
+
+    <dimen name="dp_25">33.3333dp</dimen>
+
+    <dimen name="dp_26">34.6667dp</dimen>
+
+    <dimen name="dp_27">36.0000dp</dimen>
+
+    <dimen name="dp_28">37.3333dp</dimen>
+
+    <dimen name="dp_29">38.6667dp</dimen>
+
+    <dimen name="dp_30">40.0000dp</dimen>
+
+    <dimen name="dp_31">41.3333dp</dimen>
+
+    <dimen name="dp_32">42.6667dp</dimen>
+
+    <dimen name="dp_33">44.0000dp</dimen>
+
+    <dimen name="dp_34">45.3333dp</dimen>
+
+    <dimen name="dp_35">46.6667dp</dimen>
+
+    <dimen name="dp_36">48.0000dp</dimen>
+
+    <dimen name="dp_37">49.3333dp</dimen>
+
+    <dimen name="dp_38">50.6667dp</dimen>
+
+    <dimen name="dp_39">52.0000dp</dimen>
+
+    <dimen name="dp_40">53.3333dp</dimen>
+
+    <dimen name="dp_41">54.6667dp</dimen>
+
+    <dimen name="dp_42">56.0000dp</dimen>
+
+    <dimen name="dp_43">57.3333dp</dimen>
+
+    <dimen name="dp_44">58.6667dp</dimen>
+
+    <dimen name="dp_45">60.0000dp</dimen>
+
+    <dimen name="dp_46">61.3333dp</dimen>
+
+    <dimen name="dp_47">62.6667dp</dimen>
+
+    <dimen name="dp_48">64.0000dp</dimen>
+
+    <dimen name="dp_49">65.3333dp</dimen>
+
+    <dimen name="dp_50">66.6667dp</dimen>
+
+    <dimen name="dp_51">68.0000dp</dimen>
+
+    <dimen name="dp_52">69.3333dp</dimen>
+
+    <dimen name="dp_53">70.6667dp</dimen>
+
+    <dimen name="dp_54">72.0000dp</dimen>
+
+    <dimen name="dp_55">73.3333dp</dimen>
+
+    <dimen name="dp_56">74.6667dp</dimen>
+
+    <dimen name="dp_57">76.0000dp</dimen>
+
+    <dimen name="dp_58">77.3333dp</dimen>
+
+    <dimen name="dp_59">78.6667dp</dimen>
+
+    <dimen name="dp_60">80.0000dp</dimen>
+
+    <dimen name="dp_61">81.3333dp</dimen>
+
+    <dimen name="dp_62">82.6667dp</dimen>
+
+    <dimen name="dp_63">84.0000dp</dimen>
+
+    <dimen name="dp_64">85.3333dp</dimen>
+
+    <dimen name="dp_65">86.6667dp</dimen>
+
+    <dimen name="dp_66">88.0000dp</dimen>
+
+    <dimen name="dp_67">89.3333dp</dimen>
+
+    <dimen name="dp_68">90.6667dp</dimen>
+
+    <dimen name="dp_69">92.0000dp</dimen>
+
+    <dimen name="dp_70">93.3333dp</dimen>
+
+    <dimen name="dp_71">94.6667dp</dimen>
+
+    <dimen name="dp_72">96.0000dp</dimen>
+
+    <dimen name="dp_73">97.3333dp</dimen>
+
+    <dimen name="dp_74">98.6667dp</dimen>
+
+    <dimen name="dp_75">100.0000dp</dimen>
+
+    <dimen name="dp_76">101.3333dp</dimen>
+
+    <dimen name="dp_77">102.6667dp</dimen>
+
+    <dimen name="dp_78">104.0000dp</dimen>
+
+    <dimen name="dp_79">105.3333dp</dimen>
+
+    <dimen name="dp_80">106.6667dp</dimen>
+
+    <dimen name="dp_81">108.0000dp</dimen>
+
+    <dimen name="dp_82">109.3333dp</dimen>
+
+    <dimen name="dp_83">110.6667dp</dimen>
+
+    <dimen name="dp_84">112.0000dp</dimen>
+
+    <dimen name="dp_85">113.3333dp</dimen>
+
+    <dimen name="dp_86">114.6667dp</dimen>
+
+    <dimen name="dp_87">116.0000dp</dimen>
+
+    <dimen name="dp_88">117.3333dp</dimen>
+
+    <dimen name="dp_89">118.6667dp</dimen>
+
+    <dimen name="dp_90">120.0000dp</dimen>
+
+    <dimen name="dp_91">121.3333dp</dimen>
+
+    <dimen name="dp_92">122.6667dp</dimen>
+
+    <dimen name="dp_93">124.0000dp</dimen>
+
+    <dimen name="dp_94">125.3333dp</dimen>
+
+    <dimen name="dp_95">126.6667dp</dimen>
+
+    <dimen name="dp_96">128.0000dp</dimen>
+
+    <dimen name="dp_97">129.3333dp</dimen>
+
+    <dimen name="dp_98">130.6667dp</dimen>
+
+    <dimen name="dp_99">132.0000dp</dimen>
+
+    <dimen name="dp_100">133.3333dp</dimen>
+
+    <dimen name="dp_101">134.6667dp</dimen>
+
+    <dimen name="dp_102">136.0000dp</dimen>
+
+    <dimen name="dp_103">137.3333dp</dimen>
+
+    <dimen name="dp_104">138.6667dp</dimen>
+
+    <dimen name="dp_104_5">139.3333dp</dimen>
+
+    <dimen name="dp_105">140.0000dp</dimen>
+
+    <dimen name="dp_106">141.3333dp</dimen>
+
+    <dimen name="dp_107">142.6667dp</dimen>
+
+    <dimen name="dp_108">144.0000dp</dimen>
+
+    <dimen name="dp_109">145.3333dp</dimen>
+
+    <dimen name="dp_110">146.6667dp</dimen>
+
+    <dimen name="dp_111">148.0000dp</dimen>
+
+    <dimen name="dp_112">149.3333dp</dimen>
+
+    <dimen name="dp_113">150.6667dp</dimen>
+
+    <dimen name="dp_114">152.0000dp</dimen>
+
+    <dimen name="dp_115">153.3333dp</dimen>
+
+    <dimen name="dp_116">154.6667dp</dimen>
+
+    <dimen name="dp_117">156.0000dp</dimen>
+
+    <dimen name="dp_118">157.3333dp</dimen>
+
+    <dimen name="dp_119">158.6667dp</dimen>
+
+    <dimen name="dp_120">160.0000dp</dimen>
+
+    <dimen name="dp_121">161.3333dp</dimen>
+
+    <dimen name="dp_122">162.6667dp</dimen>
+
+    <dimen name="dp_123">164.0000dp</dimen>
+
+    <dimen name="dp_124">165.3333dp</dimen>
+
+    <dimen name="dp_125">166.6667dp</dimen>
+
+    <dimen name="dp_126">168.0000dp</dimen>
+
+    <dimen name="dp_127">169.3333dp</dimen>
+
+    <dimen name="dp_128">170.6667dp</dimen>
+
+    <dimen name="dp_129">172.0000dp</dimen>
+
+    <dimen name="dp_130">173.3333dp</dimen>
+
+    <dimen name="dp_131">174.6667dp</dimen>
+
+    <dimen name="dp_132">176.0000dp</dimen>
+
+    <dimen name="dp_133">177.3333dp</dimen>
+
+    <dimen name="dp_134">178.6667dp</dimen>
+
+    <dimen name="dp_134_5">179.3333dp</dimen>
+
+    <dimen name="dp_135">180.0000dp</dimen>
+
+    <dimen name="dp_136">181.3333dp</dimen>
+
+    <dimen name="dp_137">182.6667dp</dimen>
+
+    <dimen name="dp_138">184.0000dp</dimen>
+
+    <dimen name="dp_139">185.3333dp</dimen>
+
+    <dimen name="dp_140">186.6667dp</dimen>
+
+    <dimen name="dp_141">188.0000dp</dimen>
+
+    <dimen name="dp_142">189.3333dp</dimen>
+
+    <dimen name="dp_143">190.6667dp</dimen>
+
+    <dimen name="dp_144">192.0000dp</dimen>
+
+    <dimen name="dp_145">193.3333dp</dimen>
+
+    <dimen name="dp_146">194.6667dp</dimen>
+
+    <dimen name="dp_147">196.0000dp</dimen>
+
+    <dimen name="dp_148">197.3333dp</dimen>
+
+    <dimen name="dp_149">198.6667dp</dimen>
+
+    <dimen name="dp_150">200.0000dp</dimen>
+
+    <dimen name="dp_151">201.3333dp</dimen>
+
+    <dimen name="dp_152">202.6667dp</dimen>
+
+    <dimen name="dp_153">204.0000dp</dimen>
+
+    <dimen name="dp_154">205.3333dp</dimen>
+
+    <dimen name="dp_155">206.6667dp</dimen>
+
+    <dimen name="dp_156">208.0000dp</dimen>
+
+    <dimen name="dp_157">209.3333dp</dimen>
+
+    <dimen name="dp_158">210.6667dp</dimen>
+
+    <dimen name="dp_159">212.0000dp</dimen>
+
+    <dimen name="dp_160">213.3333dp</dimen>
+
+    <dimen name="dp_161">214.6667dp</dimen>
+
+    <dimen name="dp_162">216.0000dp</dimen>
+
+    <dimen name="dp_163">217.3333dp</dimen>
+
+    <dimen name="dp_164">218.6667dp</dimen>
+
+    <dimen name="dp_165">220.0000dp</dimen>
+
+    <dimen name="dp_166">221.3333dp</dimen>
+
+    <dimen name="dp_167">222.6667dp</dimen>
+
+    <dimen name="dp_168">224.0000dp</dimen>
+
+    <dimen name="dp_169">225.3333dp</dimen>
+
+    <dimen name="dp_170">226.6667dp</dimen>
+
+    <dimen name="dp_171">228.0000dp</dimen>
+
+    <dimen name="dp_172">229.3333dp</dimen>
+
+    <dimen name="dp_173">230.6667dp</dimen>
+
+    <dimen name="dp_174">232.0000dp</dimen>
+
+    <dimen name="dp_175">233.3333dp</dimen>
+
+    <dimen name="dp_176">234.6667dp</dimen>
+
+    <dimen name="dp_177">236.0000dp</dimen>
+
+    <dimen name="dp_178">237.3333dp</dimen>
+
+    <dimen name="dp_179">238.6667dp</dimen>
+
+    <dimen name="dp_180">240.0000dp</dimen>
+
+    <dimen name="dp_181">241.3333dp</dimen>
+
+    <dimen name="dp_182">242.6667dp</dimen>
+
+    <dimen name="dp_183">244.0000dp</dimen>
+
+    <dimen name="dp_184">245.3333dp</dimen>
+
+    <dimen name="dp_185">246.6667dp</dimen>
+
+    <dimen name="dp_186">248.0000dp</dimen>
+
+    <dimen name="dp_187">249.3333dp</dimen>
+
+    <dimen name="dp_188">250.6667dp</dimen>
+
+    <dimen name="dp_189">252.0000dp</dimen>
+
+    <dimen name="dp_190">253.3333dp</dimen>
+
+    <dimen name="dp_191">254.6667dp</dimen>
+
+    <dimen name="dp_191_25">255.0000dp</dimen>
+
+    <dimen name="dp_192">256.0000dp</dimen>
+
+    <dimen name="dp_193">257.3333dp</dimen>
+
+    <dimen name="dp_194">258.6667dp</dimen>
+
+    <dimen name="dp_195">260.0000dp</dimen>
+
+    <dimen name="dp_196">261.3333dp</dimen>
+
+    <dimen name="dp_197">262.6667dp</dimen>
+
+    <dimen name="dp_198">264.0000dp</dimen>
+
+    <dimen name="dp_199">265.3333dp</dimen>
+
+    <dimen name="dp_200">266.6667dp</dimen>
+
+    <dimen name="dp_201">268.0000dp</dimen>
+
+    <dimen name="dp_202">269.3333dp</dimen>
+
+    <dimen name="dp_203">270.6667dp</dimen>
+
+    <dimen name="dp_204">272.0000dp</dimen>
+
+    <dimen name="dp_205">273.3333dp</dimen>
+
+    <dimen name="dp_206">274.6667dp</dimen>
+
+    <dimen name="dp_207">276.0000dp</dimen>
+
+    <dimen name="dp_208">277.3333dp</dimen>
+
+    <dimen name="dp_209">278.6667dp</dimen>
+
+    <dimen name="dp_210">280.0000dp</dimen>
+
+    <dimen name="dp_211">281.3333dp</dimen>
+
+    <dimen name="dp_212">282.6667dp</dimen>
+
+    <dimen name="dp_213">284.0000dp</dimen>
+
+    <dimen name="dp_214">285.3333dp</dimen>
+
+    <dimen name="dp_215">286.6667dp</dimen>
+
+    <dimen name="dp_216">288.0000dp</dimen>
+
+    <dimen name="dp_217">289.3333dp</dimen>
+
+    <dimen name="dp_218">290.6667dp</dimen>
+
+    <dimen name="dp_219">292.0000dp</dimen>
+
+    <dimen name="dp_220">293.3333dp</dimen>
+
+    <dimen name="dp_221">294.6667dp</dimen>
+
+    <dimen name="dp_222">296.0000dp</dimen>
+
+    <dimen name="dp_223">297.3333dp</dimen>
+
+    <dimen name="dp_224">298.6667dp</dimen>
+
+    <dimen name="dp_225">300.0000dp</dimen>
+
+    <dimen name="dp_226">301.3333dp</dimen>
+
+    <dimen name="dp_227">302.6667dp</dimen>
+
+    <dimen name="dp_228">304.0000dp</dimen>
+
+    <dimen name="dp_229">305.3333dp</dimen>
+
+    <dimen name="dp_230">306.6667dp</dimen>
+
+    <dimen name="dp_231">308.0000dp</dimen>
+
+    <dimen name="dp_232">309.3333dp</dimen>
+
+    <dimen name="dp_233">310.6667dp</dimen>
+
+    <dimen name="dp_234">312.0000dp</dimen>
+
+    <dimen name="dp_235">313.3333dp</dimen>
+
+    <dimen name="dp_236">314.6667dp</dimen>
+
+    <dimen name="dp_237">316.0000dp</dimen>
+
+    <dimen name="dp_238">317.3333dp</dimen>
+
+    <dimen name="dp_239">318.6667dp</dimen>
+
+    <dimen name="dp_240">320.0000dp</dimen>
+
+    <dimen name="dp_241">321.3333dp</dimen>
+
+    <dimen name="dp_242">322.6667dp</dimen>
+
+    <dimen name="dp_243">324.0000dp</dimen>
+
+    <dimen name="dp_244">325.3333dp</dimen>
+
+    <dimen name="dp_245">326.6667dp</dimen>
+
+    <dimen name="dp_246">328.0000dp</dimen>
+
+    <dimen name="dp_247">329.3333dp</dimen>
+
+    <dimen name="dp_248">330.6667dp</dimen>
+
+    <dimen name="dp_249">332.0000dp</dimen>
+
+    <dimen name="dp_250">333.3333dp</dimen>
+
+    <dimen name="dp_251">334.6667dp</dimen>
+
+    <dimen name="dp_252">336.0000dp</dimen>
+
+    <dimen name="dp_253">337.3333dp</dimen>
+
+    <dimen name="dp_254">338.6667dp</dimen>
+
+    <dimen name="dp_255">340.0000dp</dimen>
+
+    <dimen name="dp_256">341.3333dp</dimen>
+
+    <dimen name="dp_257">342.6667dp</dimen>
+
+    <dimen name="dp_258">344.0000dp</dimen>
+
+    <dimen name="dp_259">345.3333dp</dimen>
+
+    <dimen name="dp_260">346.6667dp</dimen>
+
+    <dimen name="dp_261">348.0000dp</dimen>
+
+    <dimen name="dp_262">349.3333dp</dimen>
+
+    <dimen name="dp_263">350.6667dp</dimen>
+
+    <dimen name="dp_264">352.0000dp</dimen>
+
+    <dimen name="dp_265">353.3333dp</dimen>
+
+    <dimen name="dp_266">354.6667dp</dimen>
+
+    <dimen name="dp_267">356.0000dp</dimen>
+
+    <dimen name="dp_268">357.3333dp</dimen>
+
+    <dimen name="dp_269">358.6667dp</dimen>
+
+    <dimen name="dp_270">360.0000dp</dimen>
+
+    <dimen name="dp_271">361.3333dp</dimen>
+
+    <dimen name="dp_272">362.6667dp</dimen>
+
+    <dimen name="dp_273">364.0000dp</dimen>
+
+    <dimen name="dp_274">365.3333dp</dimen>
+
+    <dimen name="dp_275">366.6667dp</dimen>
+
+    <dimen name="dp_276">368.0000dp</dimen>
+
+    <dimen name="dp_277">369.3333dp</dimen>
+
+    <dimen name="dp_278">370.6667dp</dimen>
+
+    <dimen name="dp_279">372.0000dp</dimen>
+
+    <dimen name="dp_280">373.3333dp</dimen>
+
+    <dimen name="dp_281">374.6667dp</dimen>
+
+    <dimen name="dp_282">376.0000dp</dimen>
+
+    <dimen name="dp_283">377.3333dp</dimen>
+
+    <dimen name="dp_284">378.6667dp</dimen>
+
+    <dimen name="dp_285">380.0000dp</dimen>
+
+    <dimen name="dp_286">381.3333dp</dimen>
+
+    <dimen name="dp_287">382.6667dp</dimen>
+
+    <dimen name="dp_288">384.0000dp</dimen>
+
+    <dimen name="dp_289">385.3333dp</dimen>
+
+    <dimen name="dp_290">386.6667dp</dimen>
+
+    <dimen name="dp_291">388.0000dp</dimen>
+
+    <dimen name="dp_292">389.3333dp</dimen>
+
+    <dimen name="dp_293">390.6667dp</dimen>
+
+    <dimen name="dp_294">392.0000dp</dimen>
+
+    <dimen name="dp_295">393.3333dp</dimen>
+
+    <dimen name="dp_296">394.6667dp</dimen>
+
+    <dimen name="dp_297">396.0000dp</dimen>
+
+    <dimen name="dp_298">397.3333dp</dimen>
+
+    <dimen name="dp_299">398.6667dp</dimen>
+
+    <dimen name="dp_300">400.0000dp</dimen>
+
+    <dimen name="dp_301">401.3333dp</dimen>
+
+    <dimen name="dp_302">402.6667dp</dimen>
+
+    <dimen name="dp_303">404.0000dp</dimen>
+
+    <dimen name="dp_304">405.3333dp</dimen>
+
+    <dimen name="dp_305">406.6667dp</dimen>
+
+    <dimen name="dp_306">408.0000dp</dimen>
+
+    <dimen name="dp_307">409.3333dp</dimen>
+
+    <dimen name="dp_308">410.6667dp</dimen>
+
+    <dimen name="dp_309">412.0000dp</dimen>
+
+    <dimen name="dp_310">413.3333dp</dimen>
+
+    <dimen name="dp_311">414.6667dp</dimen>
+
+    <dimen name="dp_312">416.0000dp</dimen>
+
+    <dimen name="dp_313">417.3333dp</dimen>
+
+    <dimen name="dp_314">418.6667dp</dimen>
+
+    <dimen name="dp_315">420.0000dp</dimen>
+
+    <dimen name="dp_316">421.3333dp</dimen>
+
+    <dimen name="dp_317">422.6667dp</dimen>
+
+    <dimen name="dp_318">424.0000dp</dimen>
+
+    <dimen name="dp_319">425.3333dp</dimen>
+
+    <dimen name="dp_320">426.6667dp</dimen>
+
+    <dimen name="dp_321">428.0000dp</dimen>
+
+    <dimen name="dp_322">429.3333dp</dimen>
+
+    <dimen name="dp_323">430.6667dp</dimen>
+
+    <dimen name="dp_324">432.0000dp</dimen>
+
+    <dimen name="dp_325">433.3333dp</dimen>
+
+    <dimen name="dp_326">434.6667dp</dimen>
+
+    <dimen name="dp_327">436.0000dp</dimen>
+
+    <dimen name="dp_328">437.3333dp</dimen>
+
+    <dimen name="dp_329">438.6667dp</dimen>
+
+    <dimen name="dp_330">440.0000dp</dimen>
+
+    <dimen name="dp_331">441.3333dp</dimen>
+
+    <dimen name="dp_332">442.6667dp</dimen>
+
+    <dimen name="dp_333">444.0000dp</dimen>
+
+    <dimen name="dp_334">445.3333dp</dimen>
+
+    <dimen name="dp_335">446.6667dp</dimen>
+
+    <dimen name="dp_336">448.0000dp</dimen>
+
+    <dimen name="dp_337">449.3333dp</dimen>
+
+    <dimen name="dp_338">450.6667dp</dimen>
+
+    <dimen name="dp_339">452.0000dp</dimen>
+
+    <dimen name="dp_340">453.3333dp</dimen>
+
+    <dimen name="dp_341">454.6667dp</dimen>
+
+    <dimen name="dp_342">456.0000dp</dimen>
+
+    <dimen name="dp_343">457.3333dp</dimen>
+
+    <dimen name="dp_344">458.6667dp</dimen>
+
+    <dimen name="dp_345">460.0000dp</dimen>
+
+    <dimen name="dp_346">461.3333dp</dimen>
+
+    <dimen name="dp_347">462.6667dp</dimen>
+
+    <dimen name="dp_348">464.0000dp</dimen>
+
+    <dimen name="dp_349">465.3333dp</dimen>
+
+    <dimen name="dp_350">466.6667dp</dimen>
+
+    <dimen name="dp_351">468.0000dp</dimen>
+
+    <dimen name="dp_352">469.3333dp</dimen>
+
+    <dimen name="dp_353">470.6667dp</dimen>
+
+    <dimen name="dp_354">472.0000dp</dimen>
+
+    <dimen name="dp_355">473.3333dp</dimen>
+
+    <dimen name="dp_356">474.6667dp</dimen>
+
+    <dimen name="dp_357">476.0000dp</dimen>
+
+    <dimen name="dp_358">477.3333dp</dimen>
+
+    <dimen name="dp_359">478.6667dp</dimen>
+
+    <dimen name="dp_360">480.0000dp</dimen>
+
+    <dimen name="dp_365">486.6667dp</dimen>
+
+    <dimen name="dp_370">493.3333dp</dimen>
+
+    <dimen name="dp_400">533.3333dp</dimen>
+
+    <dimen name="dp_410">546.6667dp</dimen>
+
+    <dimen name="dp_422">562.6667dp</dimen>
+
+    <dimen name="dp_472">629.3333dp</dimen>
+
+    <dimen name="dp_500">666.6667dp</dimen>
+
+    <dimen name="dp_600">800.0000dp</dimen>
+
+    <dimen name="dp_640">853.3333dp</dimen>
+
+    <dimen name="dp_650">866.6667dp</dimen>
+
+    <dimen name="dp_710">946.6667dp</dimen>
+
+    <dimen name="dp_720">960.0000dp</dimen>
+
+
+</resources>
diff --git a/system/basic/src/main/res/values-sw662dp/dimens.xml b/system/basic/src/main/res/values-sw662dp/dimens.xml
new file mode 100644
index 0000000..b20512e
--- /dev/null
+++ b/system/basic/src/main/res/values-sw662dp/dimens.xml
@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+
+    <dimen name="txt5">6.8958sp</dimen>
+
+    <dimen name="txt6">8.2750sp</dimen>
+
+    <dimen name="txt7">9.6542sp</dimen>
+
+    <dimen name="txt8">11.0333sp</dimen>
+
+    <dimen name="txt9">12.4125sp</dimen>
+
+    <dimen name="txt10">13.7917sp</dimen>
+
+    <dimen name="txt11">15.1708sp</dimen>
+
+    <dimen name="txt12">16.5500sp</dimen>
+
+    <dimen name="txt13">17.9292sp</dimen>
+
+    <dimen name="txt14">19.3083sp</dimen>
+
+    <dimen name="txt15">20.6875sp</dimen>
+
+    <dimen name="txt16">22.0667sp</dimen>
+
+    <dimen name="txt17">23.4458sp</dimen>
+
+    <dimen name="txt18">24.8250sp</dimen>
+
+    <dimen name="txt19">26.2042sp</dimen>
+
+    <dimen name="txt20">27.5833sp</dimen>
+
+    <dimen name="txt21">28.9625sp</dimen>
+
+    <dimen name="txt22">30.3417sp</dimen>
+
+    <dimen name="txt24">33.1000sp</dimen>
+
+    <dimen name="txt26">35.8583sp</dimen>
+
+    <dimen name="txt28">38.6167sp</dimen>
+
+    <dimen name="txt30">41.3750sp</dimen>
+
+    <dimen name="txt32">44.1333sp</dimen>
+
+    <dimen name="txt34">46.8917sp</dimen>
+
+    <dimen name="card_common_margin_left">@dimen/dp_15</dimen>
+
+    <dimen name="dp_m_60">-82.7500dp</dimen>
+
+    <dimen name="dp_m_30">-41.3750dp</dimen>
+
+    <dimen name="dp_m_20">-27.5833dp</dimen>
+
+    <dimen name="dp_m_12">-16.5500dp</dimen>
+
+    <dimen name="dp_m_10">-13.7917dp</dimen>
+
+    <dimen name="dp_m_8">-11.0333dp</dimen>
+
+    <dimen name="dp_m_5">-6.8958dp</dimen>
+
+    <dimen name="dp_m_2">-2.7583dp</dimen>
+
+    <dimen name="dp_m_1">-1.3792dp</dimen>
+
+    <dimen name="dp_0">0.0000dp</dimen>
+
+    <dimen name="dp_0_1">0.1379dp</dimen>
+
+    <dimen name="dp_0_5">0.6896dp</dimen>
+
+    <dimen name="dp_1">1.3792dp</dimen>
+
+    <dimen name="dp_1_5">2.0688dp</dimen>
+
+    <dimen name="dp_2">2.7583dp</dimen>
+
+    <dimen name="dp_2_5">3.4479dp</dimen>
+
+    <dimen name="dp_3">4.1375dp</dimen>
+
+    <dimen name="dp_3_5">4.8271dp</dimen>
+
+    <dimen name="dp_4">5.5167dp</dimen>
+
+    <dimen name="dp_4_5">6.2062dp</dimen>
+
+    <dimen name="dp_5">6.8958dp</dimen>
+
+    <dimen name="dp_6">8.2750dp</dimen>
+
+    <dimen name="dp_7">9.6542dp</dimen>
+
+    <dimen name="dp_7_5">10.3438dp</dimen>
+
+    <dimen name="dp_8">11.0333dp</dimen>
+
+    <dimen name="dp_9">12.4125dp</dimen>
+
+    <dimen name="dp_10">13.7917dp</dimen>
+
+    <dimen name="dp_11">15.1708dp</dimen>
+
+    <dimen name="dp_12">16.5500dp</dimen>
+
+    <dimen name="dp_13">17.9292dp</dimen>
+
+    <dimen name="dp_14">19.3083dp</dimen>
+
+    <dimen name="dp_15">20.6875dp</dimen>
+
+    <dimen name="dp_16">22.0667dp</dimen>
+
+    <dimen name="dp_17">23.4458dp</dimen>
+
+    <dimen name="dp_18">24.8250dp</dimen>
+
+    <dimen name="dp_19">26.2042dp</dimen>
+
+    <dimen name="dp_20">27.5833dp</dimen>
+
+    <dimen name="dp_21">28.9625dp</dimen>
+
+    <dimen name="dp_22">30.3417dp</dimen>
+
+    <dimen name="dp_23">31.7208dp</dimen>
+
+    <dimen name="dp_24">33.1000dp</dimen>
+
+    <dimen name="dp_25">34.4792dp</dimen>
+
+    <dimen name="dp_26">35.8583dp</dimen>
+
+    <dimen name="dp_27">37.2375dp</dimen>
+
+    <dimen name="dp_28">38.6167dp</dimen>
+
+    <dimen name="dp_29">39.9958dp</dimen>
+
+    <dimen name="dp_30">41.3750dp</dimen>
+
+    <dimen name="dp_31">42.7542dp</dimen>
+
+    <dimen name="dp_32">44.1333dp</dimen>
+
+    <dimen name="dp_33">45.5125dp</dimen>
+
+    <dimen name="dp_34">46.8917dp</dimen>
+
+    <dimen name="dp_35">48.2708dp</dimen>
+
+    <dimen name="dp_36">49.6500dp</dimen>
+
+    <dimen name="dp_37">51.0292dp</dimen>
+
+    <dimen name="dp_38">52.4083dp</dimen>
+
+    <dimen name="dp_39">53.7875dp</dimen>
+
+    <dimen name="dp_40">55.1667dp</dimen>
+
+    <dimen name="dp_41">56.5458dp</dimen>
+
+    <dimen name="dp_42">57.9250dp</dimen>
+
+    <dimen name="dp_43">59.3042dp</dimen>
+
+    <dimen name="dp_44">60.6833dp</dimen>
+
+    <dimen name="dp_45">62.0625dp</dimen>
+
+    <dimen name="dp_46">63.4417dp</dimen>
+
+    <dimen name="dp_47">64.8208dp</dimen>
+
+    <dimen name="dp_48">66.2000dp</dimen>
+
+    <dimen name="dp_49">67.5792dp</dimen>
+
+    <dimen name="dp_50">68.9583dp</dimen>
+
+    <dimen name="dp_51">70.3375dp</dimen>
+
+    <dimen name="dp_52">71.7167dp</dimen>
+
+    <dimen name="dp_53">73.0958dp</dimen>
+
+    <dimen name="dp_54">74.4750dp</dimen>
+
+    <dimen name="dp_55">75.8542dp</dimen>
+
+    <dimen name="dp_56">77.2333dp</dimen>
+
+    <dimen name="dp_57">78.6125dp</dimen>
+
+    <dimen name="dp_58">79.9917dp</dimen>
+
+    <dimen name="dp_59">81.3708dp</dimen>
+
+    <dimen name="dp_60">82.7500dp</dimen>
+
+    <dimen name="dp_61">84.1292dp</dimen>
+
+    <dimen name="dp_62">85.5083dp</dimen>
+
+    <dimen name="dp_63">86.8875dp</dimen>
+
+    <dimen name="dp_64">88.2667dp</dimen>
+
+    <dimen name="dp_65">89.6458dp</dimen>
+
+    <dimen name="dp_66">91.0250dp</dimen>
+
+    <dimen name="dp_67">92.4042dp</dimen>
+
+    <dimen name="dp_68">93.7833dp</dimen>
+
+    <dimen name="dp_69">95.1625dp</dimen>
+
+    <dimen name="dp_70">96.5417dp</dimen>
+
+    <dimen name="dp_71">97.9208dp</dimen>
+
+    <dimen name="dp_72">99.3000dp</dimen>
+
+    <dimen name="dp_73">100.6792dp</dimen>
+
+    <dimen name="dp_74">102.0583dp</dimen>
+
+    <dimen name="dp_75">103.4375dp</dimen>
+
+    <dimen name="dp_76">104.8167dp</dimen>
+
+    <dimen name="dp_77">106.1958dp</dimen>
+
+    <dimen name="dp_78">107.5750dp</dimen>
+
+    <dimen name="dp_79">108.9542dp</dimen>
+
+    <dimen name="dp_80">110.3333dp</dimen>
+
+    <dimen name="dp_81">111.7125dp</dimen>
+
+    <dimen name="dp_82">113.0917dp</dimen>
+
+    <dimen name="dp_83">114.4708dp</dimen>
+
+    <dimen name="dp_84">115.8500dp</dimen>
+
+    <dimen name="dp_85">117.2292dp</dimen>
+
+    <dimen name="dp_86">118.6083dp</dimen>
+
+    <dimen name="dp_87">119.9875dp</dimen>
+
+    <dimen name="dp_88">121.3667dp</dimen>
+
+    <dimen name="dp_89">122.7458dp</dimen>
+
+    <dimen name="dp_90">124.1250dp</dimen>
+
+    <dimen name="dp_91">125.5042dp</dimen>
+
+    <dimen name="dp_92">126.8833dp</dimen>
+
+    <dimen name="dp_93">128.2625dp</dimen>
+
+    <dimen name="dp_94">129.6417dp</dimen>
+
+    <dimen name="dp_95">131.0208dp</dimen>
+
+    <dimen name="dp_96">132.4000dp</dimen>
+
+    <dimen name="dp_97">133.7792dp</dimen>
+
+    <dimen name="dp_98">135.1583dp</dimen>
+
+    <dimen name="dp_99">136.5375dp</dimen>
+
+    <dimen name="dp_100">137.9167dp</dimen>
+
+    <dimen name="dp_101">139.2958dp</dimen>
+
+    <dimen name="dp_102">140.6750dp</dimen>
+
+    <dimen name="dp_103">142.0542dp</dimen>
+
+    <dimen name="dp_104">143.4333dp</dimen>
+
+    <dimen name="dp_104_5">144.1229dp</dimen>
+
+    <dimen name="dp_105">144.8125dp</dimen>
+
+    <dimen name="dp_106">146.1917dp</dimen>
+
+    <dimen name="dp_107">147.5708dp</dimen>
+
+    <dimen name="dp_108">148.9500dp</dimen>
+
+    <dimen name="dp_109">150.3292dp</dimen>
+
+    <dimen name="dp_110">151.7083dp</dimen>
+
+    <dimen name="dp_111">153.0875dp</dimen>
+
+    <dimen name="dp_112">154.4667dp</dimen>
+
+    <dimen name="dp_113">155.8458dp</dimen>
+
+    <dimen name="dp_114">157.2250dp</dimen>
+
+    <dimen name="dp_115">158.6042dp</dimen>
+
+    <dimen name="dp_116">159.9833dp</dimen>
+
+    <dimen name="dp_117">161.3625dp</dimen>
+
+    <dimen name="dp_118">162.7417dp</dimen>
+
+    <dimen name="dp_119">164.1208dp</dimen>
+
+    <dimen name="dp_120">165.5000dp</dimen>
+
+    <dimen name="dp_121">166.8792dp</dimen>
+
+    <dimen name="dp_122">168.2583dp</dimen>
+
+    <dimen name="dp_123">169.6375dp</dimen>
+
+    <dimen name="dp_124">171.0167dp</dimen>
+
+    <dimen name="dp_125">172.3958dp</dimen>
+
+    <dimen name="dp_126">173.7750dp</dimen>
+
+    <dimen name="dp_127">175.1542dp</dimen>
+
+    <dimen name="dp_128">176.5333dp</dimen>
+
+    <dimen name="dp_129">177.9125dp</dimen>
+
+    <dimen name="dp_130">179.2917dp</dimen>
+
+    <dimen name="dp_131">180.6708dp</dimen>
+
+    <dimen name="dp_132">182.0500dp</dimen>
+
+    <dimen name="dp_133">183.4292dp</dimen>
+
+    <dimen name="dp_134">184.8083dp</dimen>
+
+    <dimen name="dp_134_5">185.4979dp</dimen>
+
+    <dimen name="dp_135">186.1875dp</dimen>
+
+    <dimen name="dp_136">187.5667dp</dimen>
+
+    <dimen name="dp_137">188.9458dp</dimen>
+
+    <dimen name="dp_138">190.3250dp</dimen>
+
+    <dimen name="dp_139">191.7042dp</dimen>
+
+    <dimen name="dp_140">193.0833dp</dimen>
+
+    <dimen name="dp_141">194.4625dp</dimen>
+
+    <dimen name="dp_142">195.8417dp</dimen>
+
+    <dimen name="dp_143">197.2208dp</dimen>
+
+    <dimen name="dp_144">198.6000dp</dimen>
+
+    <dimen name="dp_145">199.9792dp</dimen>
+
+    <dimen name="dp_146">201.3583dp</dimen>
+
+    <dimen name="dp_147">202.7375dp</dimen>
+
+    <dimen name="dp_148">204.1167dp</dimen>
+
+    <dimen name="dp_149">205.4958dp</dimen>
+
+    <dimen name="dp_150">206.8750dp</dimen>
+
+    <dimen name="dp_151">208.2542dp</dimen>
+
+    <dimen name="dp_152">209.6333dp</dimen>
+
+    <dimen name="dp_153">211.0125dp</dimen>
+
+    <dimen name="dp_154">212.3917dp</dimen>
+
+    <dimen name="dp_155">213.7708dp</dimen>
+
+    <dimen name="dp_156">215.1500dp</dimen>
+
+    <dimen name="dp_157">216.5292dp</dimen>
+
+    <dimen name="dp_158">217.9083dp</dimen>
+
+    <dimen name="dp_159">219.2875dp</dimen>
+
+    <dimen name="dp_160">220.6667dp</dimen>
+
+    <dimen name="dp_161">222.0458dp</dimen>
+
+    <dimen name="dp_162">223.4250dp</dimen>
+
+    <dimen name="dp_163">224.8042dp</dimen>
+
+    <dimen name="dp_164">226.1833dp</dimen>
+
+    <dimen name="dp_165">227.5625dp</dimen>
+
+    <dimen name="dp_166">228.9417dp</dimen>
+
+    <dimen name="dp_167">230.3208dp</dimen>
+
+    <dimen name="dp_168">231.7000dp</dimen>
+
+    <dimen name="dp_169">233.0792dp</dimen>
+
+    <dimen name="dp_170">234.4583dp</dimen>
+
+    <dimen name="dp_171">235.8375dp</dimen>
+
+    <dimen name="dp_172">237.2167dp</dimen>
+
+    <dimen name="dp_173">238.5958dp</dimen>
+
+    <dimen name="dp_174">239.9750dp</dimen>
+
+    <dimen name="dp_175">241.3542dp</dimen>
+
+    <dimen name="dp_176">242.7333dp</dimen>
+
+    <dimen name="dp_177">244.1125dp</dimen>
+
+    <dimen name="dp_178">245.4917dp</dimen>
+
+    <dimen name="dp_179">246.8708dp</dimen>
+
+    <dimen name="dp_180">248.2500dp</dimen>
+
+    <dimen name="dp_181">249.6292dp</dimen>
+
+    <dimen name="dp_182">251.0083dp</dimen>
+
+    <dimen name="dp_183">252.3875dp</dimen>
+
+    <dimen name="dp_184">253.7667dp</dimen>
+
+    <dimen name="dp_185">255.1458dp</dimen>
+
+    <dimen name="dp_186">256.5250dp</dimen>
+
+    <dimen name="dp_187">257.9042dp</dimen>
+
+    <dimen name="dp_188">259.2833dp</dimen>
+
+    <dimen name="dp_189">260.6625dp</dimen>
+
+    <dimen name="dp_190">262.0417dp</dimen>
+
+    <dimen name="dp_191">263.4208dp</dimen>
+
+    <dimen name="dp_191_25">263.7656dp</dimen>
+
+    <dimen name="dp_192">264.8000dp</dimen>
+
+    <dimen name="dp_193">266.1792dp</dimen>
+
+    <dimen name="dp_194">267.5583dp</dimen>
+
+    <dimen name="dp_195">268.9375dp</dimen>
+
+    <dimen name="dp_196">270.3167dp</dimen>
+
+    <dimen name="dp_197">271.6958dp</dimen>
+
+    <dimen name="dp_198">273.0750dp</dimen>
+
+    <dimen name="dp_199">274.4542dp</dimen>
+
+    <dimen name="dp_200">275.8333dp</dimen>
+
+    <dimen name="dp_201">277.2125dp</dimen>
+
+    <dimen name="dp_202">278.5917dp</dimen>
+
+    <dimen name="dp_203">279.9708dp</dimen>
+
+    <dimen name="dp_204">281.3500dp</dimen>
+
+    <dimen name="dp_205">282.7292dp</dimen>
+
+    <dimen name="dp_206">284.1083dp</dimen>
+
+    <dimen name="dp_207">285.4875dp</dimen>
+
+    <dimen name="dp_208">286.8667dp</dimen>
+
+    <dimen name="dp_209">288.2458dp</dimen>
+
+    <dimen name="dp_210">289.6250dp</dimen>
+
+    <dimen name="dp_211">291.0042dp</dimen>
+
+    <dimen name="dp_212">292.3833dp</dimen>
+
+    <dimen name="dp_213">293.7625dp</dimen>
+
+    <dimen name="dp_214">295.1417dp</dimen>
+
+    <dimen name="dp_215">296.5208dp</dimen>
+
+    <dimen name="dp_216">297.9000dp</dimen>
+
+    <dimen name="dp_217">299.2792dp</dimen>
+
+    <dimen name="dp_218">300.6583dp</dimen>
+
+    <dimen name="dp_219">302.0375dp</dimen>
+
+    <dimen name="dp_220">303.4167dp</dimen>
+
+    <dimen name="dp_221">304.7958dp</dimen>
+
+    <dimen name="dp_222">306.1750dp</dimen>
+
+    <dimen name="dp_223">307.5542dp</dimen>
+
+    <dimen name="dp_224">308.9333dp</dimen>
+
+    <dimen name="dp_225">310.3125dp</dimen>
+
+    <dimen name="dp_226">311.6917dp</dimen>
+
+    <dimen name="dp_227">313.0708dp</dimen>
+
+    <dimen name="dp_228">314.4500dp</dimen>
+
+    <dimen name="dp_229">315.8292dp</dimen>
+
+    <dimen name="dp_230">317.2083dp</dimen>
+
+    <dimen name="dp_231">318.5875dp</dimen>
+
+    <dimen name="dp_232">319.9667dp</dimen>
+
+    <dimen name="dp_233">321.3458dp</dimen>
+
+    <dimen name="dp_234">322.7250dp</dimen>
+
+    <dimen name="dp_235">324.1042dp</dimen>
+
+    <dimen name="dp_236">325.4833dp</dimen>
+
+    <dimen name="dp_237">326.8625dp</dimen>
+
+    <dimen name="dp_238">328.2417dp</dimen>
+
+    <dimen name="dp_239">329.6208dp</dimen>
+
+    <dimen name="dp_240">331.0000dp</dimen>
+
+    <dimen name="dp_241">332.3792dp</dimen>
+
+    <dimen name="dp_242">333.7583dp</dimen>
+
+    <dimen name="dp_243">335.1375dp</dimen>
+
+    <dimen name="dp_244">336.5167dp</dimen>
+
+    <dimen name="dp_245">337.8958dp</dimen>
+
+    <dimen name="dp_246">339.2750dp</dimen>
+
+    <dimen name="dp_247">340.6542dp</dimen>
+
+    <dimen name="dp_248">342.0333dp</dimen>
+
+    <dimen name="dp_249">343.4125dp</dimen>
+
+    <dimen name="dp_250">344.7917dp</dimen>
+
+    <dimen name="dp_251">346.1708dp</dimen>
+
+    <dimen name="dp_252">347.5500dp</dimen>
+
+    <dimen name="dp_253">348.9292dp</dimen>
+
+    <dimen name="dp_254">350.3083dp</dimen>
+
+    <dimen name="dp_255">351.6875dp</dimen>
+
+    <dimen name="dp_256">353.0667dp</dimen>
+
+    <dimen name="dp_257">354.4458dp</dimen>
+
+    <dimen name="dp_258">355.8250dp</dimen>
+
+    <dimen name="dp_259">357.2042dp</dimen>
+
+    <dimen name="dp_260">358.5833dp</dimen>
+
+    <dimen name="dp_261">359.9625dp</dimen>
+
+    <dimen name="dp_262">361.3417dp</dimen>
+
+    <dimen name="dp_263">362.7208dp</dimen>
+
+    <dimen name="dp_264">364.1000dp</dimen>
+
+    <dimen name="dp_265">365.4792dp</dimen>
+
+    <dimen name="dp_266">366.8583dp</dimen>
+
+    <dimen name="dp_267">368.2375dp</dimen>
+
+    <dimen name="dp_268">369.6167dp</dimen>
+
+    <dimen name="dp_269">370.9958dp</dimen>
+
+    <dimen name="dp_270">372.3750dp</dimen>
+
+    <dimen name="dp_271">373.7542dp</dimen>
+
+    <dimen name="dp_272">375.1333dp</dimen>
+
+    <dimen name="dp_273">376.5125dp</dimen>
+
+    <dimen name="dp_274">377.8917dp</dimen>
+
+    <dimen name="dp_275">379.2708dp</dimen>
+
+    <dimen name="dp_276">380.6500dp</dimen>
+
+    <dimen name="dp_277">382.0292dp</dimen>
+
+    <dimen name="dp_278">383.4083dp</dimen>
+
+    <dimen name="dp_279">384.7875dp</dimen>
+
+    <dimen name="dp_280">386.1667dp</dimen>
+
+    <dimen name="dp_281">387.5458dp</dimen>
+
+    <dimen name="dp_282">388.9250dp</dimen>
+
+    <dimen name="dp_283">390.3042dp</dimen>
+
+    <dimen name="dp_284">391.6833dp</dimen>
+
+    <dimen name="dp_285">393.0625dp</dimen>
+
+    <dimen name="dp_286">394.4417dp</dimen>
+
+    <dimen name="dp_287">395.8208dp</dimen>
+
+    <dimen name="dp_288">397.2000dp</dimen>
+
+    <dimen name="dp_289">398.5792dp</dimen>
+
+    <dimen name="dp_290">399.9583dp</dimen>
+
+    <dimen name="dp_291">401.3375dp</dimen>
+
+    <dimen name="dp_292">402.7167dp</dimen>
+
+    <dimen name="dp_293">404.0958dp</dimen>
+
+    <dimen name="dp_294">405.4750dp</dimen>
+
+    <dimen name="dp_295">406.8542dp</dimen>
+
+    <dimen name="dp_296">408.2333dp</dimen>
+
+    <dimen name="dp_297">409.6125dp</dimen>
+
+    <dimen name="dp_298">410.9917dp</dimen>
+
+    <dimen name="dp_299">412.3708dp</dimen>
+
+    <dimen name="dp_300">413.7500dp</dimen>
+
+    <dimen name="dp_301">415.1292dp</dimen>
+
+    <dimen name="dp_302">416.5083dp</dimen>
+
+    <dimen name="dp_303">417.8875dp</dimen>
+
+    <dimen name="dp_304">419.2667dp</dimen>
+
+    <dimen name="dp_305">420.6458dp</dimen>
+
+    <dimen name="dp_306">422.0250dp</dimen>
+
+    <dimen name="dp_307">423.4042dp</dimen>
+
+    <dimen name="dp_308">424.7833dp</dimen>
+
+    <dimen name="dp_309">426.1625dp</dimen>
+
+    <dimen name="dp_310">427.5417dp</dimen>
+
+    <dimen name="dp_311">428.9208dp</dimen>
+
+    <dimen name="dp_312">430.3000dp</dimen>
+
+    <dimen name="dp_313">431.6792dp</dimen>
+
+    <dimen name="dp_314">433.0583dp</dimen>
+
+    <dimen name="dp_315">434.4375dp</dimen>
+
+    <dimen name="dp_316">435.8167dp</dimen>
+
+    <dimen name="dp_317">437.1958dp</dimen>
+
+    <dimen name="dp_318">438.5750dp</dimen>
+
+    <dimen name="dp_319">439.9542dp</dimen>
+
+    <dimen name="dp_320">441.3333dp</dimen>
+
+    <dimen name="dp_321">442.7125dp</dimen>
+
+    <dimen name="dp_322">444.0917dp</dimen>
+
+    <dimen name="dp_323">445.4708dp</dimen>
+
+    <dimen name="dp_324">446.8500dp</dimen>
+
+    <dimen name="dp_325">448.2292dp</dimen>
+
+    <dimen name="dp_326">449.6083dp</dimen>
+
+    <dimen name="dp_327">450.9875dp</dimen>
+
+    <dimen name="dp_328">452.3667dp</dimen>
+
+    <dimen name="dp_329">453.7458dp</dimen>
+
+    <dimen name="dp_330">455.1250dp</dimen>
+
+    <dimen name="dp_331">456.5042dp</dimen>
+
+    <dimen name="dp_332">457.8833dp</dimen>
+
+    <dimen name="dp_333">459.2625dp</dimen>
+
+    <dimen name="dp_334">460.6417dp</dimen>
+
+    <dimen name="dp_335">462.0208dp</dimen>
+
+    <dimen name="dp_336">463.4000dp</dimen>
+
+    <dimen name="dp_337">464.7792dp</dimen>
+
+    <dimen name="dp_338">466.1583dp</dimen>
+
+    <dimen name="dp_339">467.5375dp</dimen>
+
+    <dimen name="dp_340">468.9167dp</dimen>
+
+    <dimen name="dp_341">470.2958dp</dimen>
+
+    <dimen name="dp_342">471.6750dp</dimen>
+
+    <dimen name="dp_343">473.0542dp</dimen>
+
+    <dimen name="dp_344">474.4333dp</dimen>
+
+    <dimen name="dp_345">475.8125dp</dimen>
+
+    <dimen name="dp_346">477.1917dp</dimen>
+
+    <dimen name="dp_347">478.5708dp</dimen>
+
+    <dimen name="dp_348">479.9500dp</dimen>
+
+    <dimen name="dp_349">481.3292dp</dimen>
+
+    <dimen name="dp_350">482.7083dp</dimen>
+
+    <dimen name="dp_351">484.0875dp</dimen>
+
+    <dimen name="dp_352">485.4667dp</dimen>
+
+    <dimen name="dp_353">486.8458dp</dimen>
+
+    <dimen name="dp_354">488.2250dp</dimen>
+
+    <dimen name="dp_355">489.6042dp</dimen>
+
+    <dimen name="dp_356">490.9833dp</dimen>
+
+    <dimen name="dp_357">492.3625dp</dimen>
+
+    <dimen name="dp_358">493.7417dp</dimen>
+
+    <dimen name="dp_359">495.1208dp</dimen>
+
+    <dimen name="dp_360">496.5000dp</dimen>
+
+    <dimen name="dp_365">503.3958dp</dimen>
+
+    <dimen name="dp_370">510.2917dp</dimen>
+
+    <dimen name="dp_400">551.6667dp</dimen>
+
+    <dimen name="dp_410">565.4583dp</dimen>
+
+    <dimen name="dp_422">582.0083dp</dimen>
+
+    <dimen name="dp_472">650.9667dp</dimen>
+
+    <dimen name="dp_500">689.5833dp</dimen>
+
+    <dimen name="dp_600">827.5000dp</dimen>
+
+    <dimen name="dp_640">882.6667dp</dimen>
+
+    <dimen name="dp_650">896.4583dp</dimen>
+
+    <dimen name="dp_710">979.2083dp</dimen>
+
+    <dimen name="dp_720">993.0000dp</dimen>
+
+
+</resources>
diff --git a/system/basic/src/main/res/values-sw720dp/dimens.xml b/system/basic/src/main/res/values-sw720dp/dimens.xml
new file mode 100644
index 0000000..8c29a19
--- /dev/null
+++ b/system/basic/src/main/res/values-sw720dp/dimens.xml
@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+
+    <dimen name="txt5">7.5000sp</dimen>
+
+    <dimen name="txt6">9.0000sp</dimen>
+
+    <dimen name="txt7">10.5000sp</dimen>
+
+    <dimen name="txt8">12.0000sp</dimen>
+
+    <dimen name="txt9">13.5000sp</dimen>
+
+    <dimen name="txt10">15.0000sp</dimen>
+
+    <dimen name="txt11">16.5000sp</dimen>
+
+    <dimen name="txt12">18.0000sp</dimen>
+
+    <dimen name="txt13">19.5000sp</dimen>
+
+    <dimen name="txt14">21.0000sp</dimen>
+
+    <dimen name="txt15">22.5000sp</dimen>
+
+    <dimen name="txt16">24.0000sp</dimen>
+
+    <dimen name="txt17">25.5000sp</dimen>
+
+    <dimen name="txt18">27.0000sp</dimen>
+
+    <dimen name="txt19">28.5000sp</dimen>
+
+    <dimen name="txt20">30.0000sp</dimen>
+
+    <dimen name="txt21">31.5000sp</dimen>
+
+    <dimen name="txt22">33.0000sp</dimen>
+
+    <dimen name="txt24">36.0000sp</dimen>
+
+    <dimen name="txt26">39.0000sp</dimen>
+
+    <dimen name="txt28">42.0000sp</dimen>
+
+    <dimen name="txt30">45.0000sp</dimen>
+
+    <dimen name="txt32">48.0000sp</dimen>
+
+    <dimen name="txt34">51.0000sp</dimen>
+
+    <dimen name="card_common_margin_left">@dimen/dp_15</dimen>
+
+    <dimen name="dp_m_60">-90.0000dp</dimen>
+
+    <dimen name="dp_m_30">-45.0000dp</dimen>
+
+    <dimen name="dp_m_20">-30.0000dp</dimen>
+
+    <dimen name="dp_m_12">-18.0000dp</dimen>
+
+    <dimen name="dp_m_10">-15.0000dp</dimen>
+
+    <dimen name="dp_m_8">-12.0000dp</dimen>
+
+    <dimen name="dp_m_5">-7.5000dp</dimen>
+
+    <dimen name="dp_m_2">-3.0000dp</dimen>
+
+    <dimen name="dp_m_1">-1.5000dp</dimen>
+
+    <dimen name="dp_0">0.0000dp</dimen>
+
+    <dimen name="dp_0_1">0.1500dp</dimen>
+
+    <dimen name="dp_0_5">0.7500dp</dimen>
+
+    <dimen name="dp_1">1.5000dp</dimen>
+
+    <dimen name="dp_1_5">2.2500dp</dimen>
+
+    <dimen name="dp_2">3.0000dp</dimen>
+
+    <dimen name="dp_2_5">3.7500dp</dimen>
+
+    <dimen name="dp_3">4.5000dp</dimen>
+
+    <dimen name="dp_3_5">5.2500dp</dimen>
+
+    <dimen name="dp_4">6.0000dp</dimen>
+
+    <dimen name="dp_4_5">6.7500dp</dimen>
+
+    <dimen name="dp_5">7.5000dp</dimen>
+
+    <dimen name="dp_6">9.0000dp</dimen>
+
+    <dimen name="dp_7">10.5000dp</dimen>
+
+    <dimen name="dp_7_5">11.2500dp</dimen>
+
+    <dimen name="dp_8">12.0000dp</dimen>
+
+    <dimen name="dp_9">13.5000dp</dimen>
+
+    <dimen name="dp_10">15.0000dp</dimen>
+
+    <dimen name="dp_11">16.5000dp</dimen>
+
+    <dimen name="dp_12">18.0000dp</dimen>
+
+    <dimen name="dp_13">19.5000dp</dimen>
+
+    <dimen name="dp_14">21.0000dp</dimen>
+
+    <dimen name="dp_15">22.5000dp</dimen>
+
+    <dimen name="dp_16">24.0000dp</dimen>
+
+    <dimen name="dp_17">25.5000dp</dimen>
+
+    <dimen name="dp_18">27.0000dp</dimen>
+
+    <dimen name="dp_19">28.5000dp</dimen>
+
+    <dimen name="dp_20">30.0000dp</dimen>
+
+    <dimen name="dp_21">31.5000dp</dimen>
+
+    <dimen name="dp_22">33.0000dp</dimen>
+
+    <dimen name="dp_23">34.5000dp</dimen>
+
+    <dimen name="dp_24">36.0000dp</dimen>
+
+    <dimen name="dp_25">37.5000dp</dimen>
+
+    <dimen name="dp_26">39.0000dp</dimen>
+
+    <dimen name="dp_27">40.5000dp</dimen>
+
+    <dimen name="dp_28">42.0000dp</dimen>
+
+    <dimen name="dp_29">43.5000dp</dimen>
+
+    <dimen name="dp_30">45.0000dp</dimen>
+
+    <dimen name="dp_31">46.5000dp</dimen>
+
+    <dimen name="dp_32">48.0000dp</dimen>
+
+    <dimen name="dp_33">49.5000dp</dimen>
+
+    <dimen name="dp_34">51.0000dp</dimen>
+
+    <dimen name="dp_35">52.5000dp</dimen>
+
+    <dimen name="dp_36">54.0000dp</dimen>
+
+    <dimen name="dp_37">55.5000dp</dimen>
+
+    <dimen name="dp_38">57.0000dp</dimen>
+
+    <dimen name="dp_39">58.5000dp</dimen>
+
+    <dimen name="dp_40">60.0000dp</dimen>
+
+    <dimen name="dp_41">61.5000dp</dimen>
+
+    <dimen name="dp_42">63.0000dp</dimen>
+
+    <dimen name="dp_43">64.5000dp</dimen>
+
+    <dimen name="dp_44">66.0000dp</dimen>
+
+    <dimen name="dp_45">67.5000dp</dimen>
+
+    <dimen name="dp_46">69.0000dp</dimen>
+
+    <dimen name="dp_47">70.5000dp</dimen>
+
+    <dimen name="dp_48">72.0000dp</dimen>
+
+    <dimen name="dp_49">73.5000dp</dimen>
+
+    <dimen name="dp_50">75.0000dp</dimen>
+
+    <dimen name="dp_51">76.5000dp</dimen>
+
+    <dimen name="dp_52">78.0000dp</dimen>
+
+    <dimen name="dp_53">79.5000dp</dimen>
+
+    <dimen name="dp_54">81.0000dp</dimen>
+
+    <dimen name="dp_55">82.5000dp</dimen>
+
+    <dimen name="dp_56">84.0000dp</dimen>
+
+    <dimen name="dp_57">85.5000dp</dimen>
+
+    <dimen name="dp_58">87.0000dp</dimen>
+
+    <dimen name="dp_59">88.5000dp</dimen>
+
+    <dimen name="dp_60">90.0000dp</dimen>
+
+    <dimen name="dp_61">91.5000dp</dimen>
+
+    <dimen name="dp_62">93.0000dp</dimen>
+
+    <dimen name="dp_63">94.5000dp</dimen>
+
+    <dimen name="dp_64">96.0000dp</dimen>
+
+    <dimen name="dp_65">97.5000dp</dimen>
+
+    <dimen name="dp_66">99.0000dp</dimen>
+
+    <dimen name="dp_67">100.5000dp</dimen>
+
+    <dimen name="dp_68">102.0000dp</dimen>
+
+    <dimen name="dp_69">103.5000dp</dimen>
+
+    <dimen name="dp_70">105.0000dp</dimen>
+
+    <dimen name="dp_71">106.5000dp</dimen>
+
+    <dimen name="dp_72">108.0000dp</dimen>
+
+    <dimen name="dp_73">109.5000dp</dimen>
+
+    <dimen name="dp_74">111.0000dp</dimen>
+
+    <dimen name="dp_75">112.5000dp</dimen>
+
+    <dimen name="dp_76">114.0000dp</dimen>
+
+    <dimen name="dp_77">115.5000dp</dimen>
+
+    <dimen name="dp_78">117.0000dp</dimen>
+
+    <dimen name="dp_79">118.5000dp</dimen>
+
+    <dimen name="dp_80">120.0000dp</dimen>
+
+    <dimen name="dp_81">121.5000dp</dimen>
+
+    <dimen name="dp_82">123.0000dp</dimen>
+
+    <dimen name="dp_83">124.5000dp</dimen>
+
+    <dimen name="dp_84">126.0000dp</dimen>
+
+    <dimen name="dp_85">127.5000dp</dimen>
+
+    <dimen name="dp_86">129.0000dp</dimen>
+
+    <dimen name="dp_87">130.5000dp</dimen>
+
+    <dimen name="dp_88">132.0000dp</dimen>
+
+    <dimen name="dp_89">133.5000dp</dimen>
+
+    <dimen name="dp_90">135.0000dp</dimen>
+
+    <dimen name="dp_91">136.5000dp</dimen>
+
+    <dimen name="dp_92">138.0000dp</dimen>
+
+    <dimen name="dp_93">139.5000dp</dimen>
+
+    <dimen name="dp_94">141.0000dp</dimen>
+
+    <dimen name="dp_95">142.5000dp</dimen>
+
+    <dimen name="dp_96">144.0000dp</dimen>
+
+    <dimen name="dp_97">145.5000dp</dimen>
+
+    <dimen name="dp_98">147.0000dp</dimen>
+
+    <dimen name="dp_99">148.5000dp</dimen>
+
+    <dimen name="dp_100">150.0000dp</dimen>
+
+    <dimen name="dp_101">151.5000dp</dimen>
+
+    <dimen name="dp_102">153.0000dp</dimen>
+
+    <dimen name="dp_103">154.5000dp</dimen>
+
+    <dimen name="dp_104">156.0000dp</dimen>
+
+    <dimen name="dp_104_5">156.7500dp</dimen>
+
+    <dimen name="dp_105">157.5000dp</dimen>
+
+    <dimen name="dp_106">159.0000dp</dimen>
+
+    <dimen name="dp_107">160.5000dp</dimen>
+
+    <dimen name="dp_108">162.0000dp</dimen>
+
+    <dimen name="dp_109">163.5000dp</dimen>
+
+    <dimen name="dp_110">165.0000dp</dimen>
+
+    <dimen name="dp_111">166.5000dp</dimen>
+
+    <dimen name="dp_112">168.0000dp</dimen>
+
+    <dimen name="dp_113">169.5000dp</dimen>
+
+    <dimen name="dp_114">171.0000dp</dimen>
+
+    <dimen name="dp_115">172.5000dp</dimen>
+
+    <dimen name="dp_116">174.0000dp</dimen>
+
+    <dimen name="dp_117">175.5000dp</dimen>
+
+    <dimen name="dp_118">177.0000dp</dimen>
+
+    <dimen name="dp_119">178.5000dp</dimen>
+
+    <dimen name="dp_120">180.0000dp</dimen>
+
+    <dimen name="dp_121">181.5000dp</dimen>
+
+    <dimen name="dp_122">183.0000dp</dimen>
+
+    <dimen name="dp_123">184.5000dp</dimen>
+
+    <dimen name="dp_124">186.0000dp</dimen>
+
+    <dimen name="dp_125">187.5000dp</dimen>
+
+    <dimen name="dp_126">189.0000dp</dimen>
+
+    <dimen name="dp_127">190.5000dp</dimen>
+
+    <dimen name="dp_128">192.0000dp</dimen>
+
+    <dimen name="dp_129">193.5000dp</dimen>
+
+    <dimen name="dp_130">195.0000dp</dimen>
+
+    <dimen name="dp_131">196.5000dp</dimen>
+
+    <dimen name="dp_132">198.0000dp</dimen>
+
+    <dimen name="dp_133">199.5000dp</dimen>
+
+    <dimen name="dp_134">201.0000dp</dimen>
+
+    <dimen name="dp_134_5">201.7500dp</dimen>
+
+    <dimen name="dp_135">202.5000dp</dimen>
+
+    <dimen name="dp_136">204.0000dp</dimen>
+
+    <dimen name="dp_137">205.5000dp</dimen>
+
+    <dimen name="dp_138">207.0000dp</dimen>
+
+    <dimen name="dp_139">208.5000dp</dimen>
+
+    <dimen name="dp_140">210.0000dp</dimen>
+
+    <dimen name="dp_141">211.5000dp</dimen>
+
+    <dimen name="dp_142">213.0000dp</dimen>
+
+    <dimen name="dp_143">214.5000dp</dimen>
+
+    <dimen name="dp_144">216.0000dp</dimen>
+
+    <dimen name="dp_145">217.5000dp</dimen>
+
+    <dimen name="dp_146">219.0000dp</dimen>
+
+    <dimen name="dp_147">220.5000dp</dimen>
+
+    <dimen name="dp_148">222.0000dp</dimen>
+
+    <dimen name="dp_149">223.5000dp</dimen>
+
+    <dimen name="dp_150">225.0000dp</dimen>
+
+    <dimen name="dp_151">226.5000dp</dimen>
+
+    <dimen name="dp_152">228.0000dp</dimen>
+
+    <dimen name="dp_153">229.5000dp</dimen>
+
+    <dimen name="dp_154">231.0000dp</dimen>
+
+    <dimen name="dp_155">232.5000dp</dimen>
+
+    <dimen name="dp_156">234.0000dp</dimen>
+
+    <dimen name="dp_157">235.5000dp</dimen>
+
+    <dimen name="dp_158">237.0000dp</dimen>
+
+    <dimen name="dp_159">238.5000dp</dimen>
+
+    <dimen name="dp_160">240.0000dp</dimen>
+
+    <dimen name="dp_161">241.5000dp</dimen>
+
+    <dimen name="dp_162">243.0000dp</dimen>
+
+    <dimen name="dp_163">244.5000dp</dimen>
+
+    <dimen name="dp_164">246.0000dp</dimen>
+
+    <dimen name="dp_165">247.5000dp</dimen>
+
+    <dimen name="dp_166">249.0000dp</dimen>
+
+    <dimen name="dp_167">250.5000dp</dimen>
+
+    <dimen name="dp_168">252.0000dp</dimen>
+
+    <dimen name="dp_169">253.5000dp</dimen>
+
+    <dimen name="dp_170">255.0000dp</dimen>
+
+    <dimen name="dp_171">256.5000dp</dimen>
+
+    <dimen name="dp_172">258.0000dp</dimen>
+
+    <dimen name="dp_173">259.5000dp</dimen>
+
+    <dimen name="dp_174">261.0000dp</dimen>
+
+    <dimen name="dp_175">262.5000dp</dimen>
+
+    <dimen name="dp_176">264.0000dp</dimen>
+
+    <dimen name="dp_177">265.5000dp</dimen>
+
+    <dimen name="dp_178">267.0000dp</dimen>
+
+    <dimen name="dp_179">268.5000dp</dimen>
+
+    <dimen name="dp_180">270.0000dp</dimen>
+
+    <dimen name="dp_181">271.5000dp</dimen>
+
+    <dimen name="dp_182">273.0000dp</dimen>
+
+    <dimen name="dp_183">274.5000dp</dimen>
+
+    <dimen name="dp_184">276.0000dp</dimen>
+
+    <dimen name="dp_185">277.5000dp</dimen>
+
+    <dimen name="dp_186">279.0000dp</dimen>
+
+    <dimen name="dp_187">280.5000dp</dimen>
+
+    <dimen name="dp_188">282.0000dp</dimen>
+
+    <dimen name="dp_189">283.5000dp</dimen>
+
+    <dimen name="dp_190">285.0000dp</dimen>
+
+    <dimen name="dp_191">286.5000dp</dimen>
+
+    <dimen name="dp_191_25">286.8750dp</dimen>
+
+    <dimen name="dp_192">288.0000dp</dimen>
+
+    <dimen name="dp_193">289.5000dp</dimen>
+
+    <dimen name="dp_194">291.0000dp</dimen>
+
+    <dimen name="dp_195">292.5000dp</dimen>
+
+    <dimen name="dp_196">294.0000dp</dimen>
+
+    <dimen name="dp_197">295.5000dp</dimen>
+
+    <dimen name="dp_198">297.0000dp</dimen>
+
+    <dimen name="dp_199">298.5000dp</dimen>
+
+    <dimen name="dp_200">300.0000dp</dimen>
+
+    <dimen name="dp_201">301.5000dp</dimen>
+
+    <dimen name="dp_202">303.0000dp</dimen>
+
+    <dimen name="dp_203">304.5000dp</dimen>
+
+    <dimen name="dp_204">306.0000dp</dimen>
+
+    <dimen name="dp_205">307.5000dp</dimen>
+
+    <dimen name="dp_206">309.0000dp</dimen>
+
+    <dimen name="dp_207">310.5000dp</dimen>
+
+    <dimen name="dp_208">312.0000dp</dimen>
+
+    <dimen name="dp_209">313.5000dp</dimen>
+
+    <dimen name="dp_210">315.0000dp</dimen>
+
+    <dimen name="dp_211">316.5000dp</dimen>
+
+    <dimen name="dp_212">318.0000dp</dimen>
+
+    <dimen name="dp_213">319.5000dp</dimen>
+
+    <dimen name="dp_214">321.0000dp</dimen>
+
+    <dimen name="dp_215">322.5000dp</dimen>
+
+    <dimen name="dp_216">324.0000dp</dimen>
+
+    <dimen name="dp_217">325.5000dp</dimen>
+
+    <dimen name="dp_218">327.0000dp</dimen>
+
+    <dimen name="dp_219">328.5000dp</dimen>
+
+    <dimen name="dp_220">330.0000dp</dimen>
+
+    <dimen name="dp_221">331.5000dp</dimen>
+
+    <dimen name="dp_222">333.0000dp</dimen>
+
+    <dimen name="dp_223">334.5000dp</dimen>
+
+    <dimen name="dp_224">336.0000dp</dimen>
+
+    <dimen name="dp_225">337.5000dp</dimen>
+
+    <dimen name="dp_226">339.0000dp</dimen>
+
+    <dimen name="dp_227">340.5000dp</dimen>
+
+    <dimen name="dp_228">342.0000dp</dimen>
+
+    <dimen name="dp_229">343.5000dp</dimen>
+
+    <dimen name="dp_230">345.0000dp</dimen>
+
+    <dimen name="dp_231">346.5000dp</dimen>
+
+    <dimen name="dp_232">348.0000dp</dimen>
+
+    <dimen name="dp_233">349.5000dp</dimen>
+
+    <dimen name="dp_234">351.0000dp</dimen>
+
+    <dimen name="dp_235">352.5000dp</dimen>
+
+    <dimen name="dp_236">354.0000dp</dimen>
+
+    <dimen name="dp_237">355.5000dp</dimen>
+
+    <dimen name="dp_238">357.0000dp</dimen>
+
+    <dimen name="dp_239">358.5000dp</dimen>
+
+    <dimen name="dp_240">360.0000dp</dimen>
+
+    <dimen name="dp_241">361.5000dp</dimen>
+
+    <dimen name="dp_242">363.0000dp</dimen>
+
+    <dimen name="dp_243">364.5000dp</dimen>
+
+    <dimen name="dp_244">366.0000dp</dimen>
+
+    <dimen name="dp_245">367.5000dp</dimen>
+
+    <dimen name="dp_246">369.0000dp</dimen>
+
+    <dimen name="dp_247">370.5000dp</dimen>
+
+    <dimen name="dp_248">372.0000dp</dimen>
+
+    <dimen name="dp_249">373.5000dp</dimen>
+
+    <dimen name="dp_250">375.0000dp</dimen>
+
+    <dimen name="dp_251">376.5000dp</dimen>
+
+    <dimen name="dp_252">378.0000dp</dimen>
+
+    <dimen name="dp_253">379.5000dp</dimen>
+
+    <dimen name="dp_254">381.0000dp</dimen>
+
+    <dimen name="dp_255">382.5000dp</dimen>
+
+    <dimen name="dp_256">384.0000dp</dimen>
+
+    <dimen name="dp_257">385.5000dp</dimen>
+
+    <dimen name="dp_258">387.0000dp</dimen>
+
+    <dimen name="dp_259">388.5000dp</dimen>
+
+    <dimen name="dp_260">390.0000dp</dimen>
+
+    <dimen name="dp_261">391.5000dp</dimen>
+
+    <dimen name="dp_262">393.0000dp</dimen>
+
+    <dimen name="dp_263">394.5000dp</dimen>
+
+    <dimen name="dp_264">396.0000dp</dimen>
+
+    <dimen name="dp_265">397.5000dp</dimen>
+
+    <dimen name="dp_266">399.0000dp</dimen>
+
+    <dimen name="dp_267">400.5000dp</dimen>
+
+    <dimen name="dp_268">402.0000dp</dimen>
+
+    <dimen name="dp_269">403.5000dp</dimen>
+
+    <dimen name="dp_270">405.0000dp</dimen>
+
+    <dimen name="dp_271">406.5000dp</dimen>
+
+    <dimen name="dp_272">408.0000dp</dimen>
+
+    <dimen name="dp_273">409.5000dp</dimen>
+
+    <dimen name="dp_274">411.0000dp</dimen>
+
+    <dimen name="dp_275">412.5000dp</dimen>
+
+    <dimen name="dp_276">414.0000dp</dimen>
+
+    <dimen name="dp_277">415.5000dp</dimen>
+
+    <dimen name="dp_278">417.0000dp</dimen>
+
+    <dimen name="dp_279">418.5000dp</dimen>
+
+    <dimen name="dp_280">420.0000dp</dimen>
+
+    <dimen name="dp_281">421.5000dp</dimen>
+
+    <dimen name="dp_282">423.0000dp</dimen>
+
+    <dimen name="dp_283">424.5000dp</dimen>
+
+    <dimen name="dp_284">426.0000dp</dimen>
+
+    <dimen name="dp_285">427.5000dp</dimen>
+
+    <dimen name="dp_286">429.0000dp</dimen>
+
+    <dimen name="dp_287">430.5000dp</dimen>
+
+    <dimen name="dp_288">432.0000dp</dimen>
+
+    <dimen name="dp_289">433.5000dp</dimen>
+
+    <dimen name="dp_290">435.0000dp</dimen>
+
+    <dimen name="dp_291">436.5000dp</dimen>
+
+    <dimen name="dp_292">438.0000dp</dimen>
+
+    <dimen name="dp_293">439.5000dp</dimen>
+
+    <dimen name="dp_294">441.0000dp</dimen>
+
+    <dimen name="dp_295">442.5000dp</dimen>
+
+    <dimen name="dp_296">444.0000dp</dimen>
+
+    <dimen name="dp_297">445.5000dp</dimen>
+
+    <dimen name="dp_298">447.0000dp</dimen>
+
+    <dimen name="dp_299">448.5000dp</dimen>
+
+    <dimen name="dp_300">450.0000dp</dimen>
+
+    <dimen name="dp_301">451.5000dp</dimen>
+
+    <dimen name="dp_302">453.0000dp</dimen>
+
+    <dimen name="dp_303">454.5000dp</dimen>
+
+    <dimen name="dp_304">456.0000dp</dimen>
+
+    <dimen name="dp_305">457.5000dp</dimen>
+
+    <dimen name="dp_306">459.0000dp</dimen>
+
+    <dimen name="dp_307">460.5000dp</dimen>
+
+    <dimen name="dp_308">462.0000dp</dimen>
+
+    <dimen name="dp_309">463.5000dp</dimen>
+
+    <dimen name="dp_310">465.0000dp</dimen>
+
+    <dimen name="dp_311">466.5000dp</dimen>
+
+    <dimen name="dp_312">468.0000dp</dimen>
+
+    <dimen name="dp_313">469.5000dp</dimen>
+
+    <dimen name="dp_314">471.0000dp</dimen>
+
+    <dimen name="dp_315">472.5000dp</dimen>
+
+    <dimen name="dp_316">474.0000dp</dimen>
+
+    <dimen name="dp_317">475.5000dp</dimen>
+
+    <dimen name="dp_318">477.0000dp</dimen>
+
+    <dimen name="dp_319">478.5000dp</dimen>
+
+    <dimen name="dp_320">480.0000dp</dimen>
+
+    <dimen name="dp_321">481.5000dp</dimen>
+
+    <dimen name="dp_322">483.0000dp</dimen>
+
+    <dimen name="dp_323">484.5000dp</dimen>
+
+    <dimen name="dp_324">486.0000dp</dimen>
+
+    <dimen name="dp_325">487.5000dp</dimen>
+
+    <dimen name="dp_326">489.0000dp</dimen>
+
+    <dimen name="dp_327">490.5000dp</dimen>
+
+    <dimen name="dp_328">492.0000dp</dimen>
+
+    <dimen name="dp_329">493.5000dp</dimen>
+
+    <dimen name="dp_330">495.0000dp</dimen>
+
+    <dimen name="dp_331">496.5000dp</dimen>
+
+    <dimen name="dp_332">498.0000dp</dimen>
+
+    <dimen name="dp_333">499.5000dp</dimen>
+
+    <dimen name="dp_334">501.0000dp</dimen>
+
+    <dimen name="dp_335">502.5000dp</dimen>
+
+    <dimen name="dp_336">504.0000dp</dimen>
+
+    <dimen name="dp_337">505.5000dp</dimen>
+
+    <dimen name="dp_338">507.0000dp</dimen>
+
+    <dimen name="dp_339">508.5000dp</dimen>
+
+    <dimen name="dp_340">510.0000dp</dimen>
+
+    <dimen name="dp_341">511.5000dp</dimen>
+
+    <dimen name="dp_342">513.0000dp</dimen>
+
+    <dimen name="dp_343">514.5000dp</dimen>
+
+    <dimen name="dp_344">516.0000dp</dimen>
+
+    <dimen name="dp_345">517.5000dp</dimen>
+
+    <dimen name="dp_346">519.0000dp</dimen>
+
+    <dimen name="dp_347">520.5000dp</dimen>
+
+    <dimen name="dp_348">522.0000dp</dimen>
+
+    <dimen name="dp_349">523.5000dp</dimen>
+
+    <dimen name="dp_350">525.0000dp</dimen>
+
+    <dimen name="dp_351">526.5000dp</dimen>
+
+    <dimen name="dp_352">528.0000dp</dimen>
+
+    <dimen name="dp_353">529.5000dp</dimen>
+
+    <dimen name="dp_354">531.0000dp</dimen>
+
+    <dimen name="dp_355">532.5000dp</dimen>
+
+    <dimen name="dp_356">534.0000dp</dimen>
+
+    <dimen name="dp_357">535.5000dp</dimen>
+
+    <dimen name="dp_358">537.0000dp</dimen>
+
+    <dimen name="dp_359">538.5000dp</dimen>
+
+    <dimen name="dp_360">540.0000dp</dimen>
+
+    <dimen name="dp_365">547.5000dp</dimen>
+
+    <dimen name="dp_370">555.0000dp</dimen>
+
+    <dimen name="dp_400">600.0000dp</dimen>
+
+    <dimen name="dp_410">615.0000dp</dimen>
+
+    <dimen name="dp_422">633.0000dp</dimen>
+
+    <dimen name="dp_472">708.0000dp</dimen>
+
+    <dimen name="dp_500">750.0000dp</dimen>
+
+    <dimen name="dp_600">900.0000dp</dimen>
+
+    <dimen name="dp_640">960.0000dp</dimen>
+
+    <dimen name="dp_650">975.0000dp</dimen>
+
+    <dimen name="dp_710">1065.0000dp</dimen>
+
+    <dimen name="dp_720">1080.0000dp</dimen>
+
+
+</resources>
diff --git a/system/basic/src/main/res/values-sw768dp/dimens.xml b/system/basic/src/main/res/values-sw768dp/dimens.xml
new file mode 100644
index 0000000..925372d
--- /dev/null
+++ b/system/basic/src/main/res/values-sw768dp/dimens.xml
@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+
+    <dimen name="txt5">8.0000sp</dimen>
+
+    <dimen name="txt6">9.6000sp</dimen>
+
+    <dimen name="txt7">11.2000sp</dimen>
+
+    <dimen name="txt8">12.8000sp</dimen>
+
+    <dimen name="txt9">14.4000sp</dimen>
+
+    <dimen name="txt10">16.0000sp</dimen>
+
+    <dimen name="txt11">17.6000sp</dimen>
+
+    <dimen name="txt12">19.2000sp</dimen>
+
+    <dimen name="txt13">20.8000sp</dimen>
+
+    <dimen name="txt14">22.4000sp</dimen>
+
+    <dimen name="txt15">24.0000sp</dimen>
+
+    <dimen name="txt16">25.6000sp</dimen>
+
+    <dimen name="txt17">27.2000sp</dimen>
+
+    <dimen name="txt18">28.8000sp</dimen>
+
+    <dimen name="txt19">30.4000sp</dimen>
+
+    <dimen name="txt20">32.0000sp</dimen>
+
+    <dimen name="txt21">33.6000sp</dimen>
+
+    <dimen name="txt22">35.2000sp</dimen>
+
+    <dimen name="txt24">38.4000sp</dimen>
+
+    <dimen name="txt26">41.6000sp</dimen>
+
+    <dimen name="txt28">44.8000sp</dimen>
+
+    <dimen name="txt30">48.0000sp</dimen>
+
+    <dimen name="txt32">51.2000sp</dimen>
+
+    <dimen name="txt34">54.4000sp</dimen>
+
+    <dimen name="card_common_margin_left">@dimen/dp_15</dimen>
+
+    <dimen name="dp_m_60">-96.0000dp</dimen>
+
+    <dimen name="dp_m_30">-48.0000dp</dimen>
+
+    <dimen name="dp_m_20">-32.0000dp</dimen>
+
+    <dimen name="dp_m_12">-19.2000dp</dimen>
+
+    <dimen name="dp_m_10">-16.0000dp</dimen>
+
+    <dimen name="dp_m_8">-12.8000dp</dimen>
+
+    <dimen name="dp_m_5">-8.0000dp</dimen>
+
+    <dimen name="dp_m_2">-3.2000dp</dimen>
+
+    <dimen name="dp_m_1">-1.6000dp</dimen>
+
+    <dimen name="dp_0">0.0000dp</dimen>
+
+    <dimen name="dp_0_1">0.1600dp</dimen>
+
+    <dimen name="dp_0_5">0.8000dp</dimen>
+
+    <dimen name="dp_1">1.6000dp</dimen>
+
+    <dimen name="dp_1_5">2.4000dp</dimen>
+
+    <dimen name="dp_2">3.2000dp</dimen>
+
+    <dimen name="dp_2_5">4.0000dp</dimen>
+
+    <dimen name="dp_3">4.8000dp</dimen>
+
+    <dimen name="dp_3_5">5.6000dp</dimen>
+
+    <dimen name="dp_4">6.4000dp</dimen>
+
+    <dimen name="dp_4_5">7.2000dp</dimen>
+
+    <dimen name="dp_5">8.0000dp</dimen>
+
+    <dimen name="dp_6">9.6000dp</dimen>
+
+    <dimen name="dp_7">11.2000dp</dimen>
+
+    <dimen name="dp_7_5">12.0000dp</dimen>
+
+    <dimen name="dp_8">12.8000dp</dimen>
+
+    <dimen name="dp_9">14.4000dp</dimen>
+
+    <dimen name="dp_10">16.0000dp</dimen>
+
+    <dimen name="dp_11">17.6000dp</dimen>
+
+    <dimen name="dp_12">19.2000dp</dimen>
+
+    <dimen name="dp_13">20.8000dp</dimen>
+
+    <dimen name="dp_14">22.4000dp</dimen>
+
+    <dimen name="dp_15">24.0000dp</dimen>
+
+    <dimen name="dp_16">25.6000dp</dimen>
+
+    <dimen name="dp_17">27.2000dp</dimen>
+
+    <dimen name="dp_18">28.8000dp</dimen>
+
+    <dimen name="dp_19">30.4000dp</dimen>
+
+    <dimen name="dp_20">32.0000dp</dimen>
+
+    <dimen name="dp_21">33.6000dp</dimen>
+
+    <dimen name="dp_22">35.2000dp</dimen>
+
+    <dimen name="dp_23">36.8000dp</dimen>
+
+    <dimen name="dp_24">38.4000dp</dimen>
+
+    <dimen name="dp_25">40.0000dp</dimen>
+
+    <dimen name="dp_26">41.6000dp</dimen>
+
+    <dimen name="dp_27">43.2000dp</dimen>
+
+    <dimen name="dp_28">44.8000dp</dimen>
+
+    <dimen name="dp_29">46.4000dp</dimen>
+
+    <dimen name="dp_30">48.0000dp</dimen>
+
+    <dimen name="dp_31">49.6000dp</dimen>
+
+    <dimen name="dp_32">51.2000dp</dimen>
+
+    <dimen name="dp_33">52.8000dp</dimen>
+
+    <dimen name="dp_34">54.4000dp</dimen>
+
+    <dimen name="dp_35">56.0000dp</dimen>
+
+    <dimen name="dp_36">57.6000dp</dimen>
+
+    <dimen name="dp_37">59.2000dp</dimen>
+
+    <dimen name="dp_38">60.8000dp</dimen>
+
+    <dimen name="dp_39">62.4000dp</dimen>
+
+    <dimen name="dp_40">64.0000dp</dimen>
+
+    <dimen name="dp_41">65.6000dp</dimen>
+
+    <dimen name="dp_42">67.2000dp</dimen>
+
+    <dimen name="dp_43">68.8000dp</dimen>
+
+    <dimen name="dp_44">70.4000dp</dimen>
+
+    <dimen name="dp_45">72.0000dp</dimen>
+
+    <dimen name="dp_46">73.6000dp</dimen>
+
+    <dimen name="dp_47">75.2000dp</dimen>
+
+    <dimen name="dp_48">76.8000dp</dimen>
+
+    <dimen name="dp_49">78.4000dp</dimen>
+
+    <dimen name="dp_50">80.0000dp</dimen>
+
+    <dimen name="dp_51">81.6000dp</dimen>
+
+    <dimen name="dp_52">83.2000dp</dimen>
+
+    <dimen name="dp_53">84.8000dp</dimen>
+
+    <dimen name="dp_54">86.4000dp</dimen>
+
+    <dimen name="dp_55">88.0000dp</dimen>
+
+    <dimen name="dp_56">89.6000dp</dimen>
+
+    <dimen name="dp_57">91.2000dp</dimen>
+
+    <dimen name="dp_58">92.8000dp</dimen>
+
+    <dimen name="dp_59">94.4000dp</dimen>
+
+    <dimen name="dp_60">96.0000dp</dimen>
+
+    <dimen name="dp_61">97.6000dp</dimen>
+
+    <dimen name="dp_62">99.2000dp</dimen>
+
+    <dimen name="dp_63">100.8000dp</dimen>
+
+    <dimen name="dp_64">102.4000dp</dimen>
+
+    <dimen name="dp_65">104.0000dp</dimen>
+
+    <dimen name="dp_66">105.6000dp</dimen>
+
+    <dimen name="dp_67">107.2000dp</dimen>
+
+    <dimen name="dp_68">108.8000dp</dimen>
+
+    <dimen name="dp_69">110.4000dp</dimen>
+
+    <dimen name="dp_70">112.0000dp</dimen>
+
+    <dimen name="dp_71">113.6000dp</dimen>
+
+    <dimen name="dp_72">115.2000dp</dimen>
+
+    <dimen name="dp_73">116.8000dp</dimen>
+
+    <dimen name="dp_74">118.4000dp</dimen>
+
+    <dimen name="dp_75">120.0000dp</dimen>
+
+    <dimen name="dp_76">121.6000dp</dimen>
+
+    <dimen name="dp_77">123.2000dp</dimen>
+
+    <dimen name="dp_78">124.8000dp</dimen>
+
+    <dimen name="dp_79">126.4000dp</dimen>
+
+    <dimen name="dp_80">128.0000dp</dimen>
+
+    <dimen name="dp_81">129.6000dp</dimen>
+
+    <dimen name="dp_82">131.2000dp</dimen>
+
+    <dimen name="dp_83">132.8000dp</dimen>
+
+    <dimen name="dp_84">134.4000dp</dimen>
+
+    <dimen name="dp_85">136.0000dp</dimen>
+
+    <dimen name="dp_86">137.6000dp</dimen>
+
+    <dimen name="dp_87">139.2000dp</dimen>
+
+    <dimen name="dp_88">140.8000dp</dimen>
+
+    <dimen name="dp_89">142.4000dp</dimen>
+
+    <dimen name="dp_90">144.0000dp</dimen>
+
+    <dimen name="dp_91">145.6000dp</dimen>
+
+    <dimen name="dp_92">147.2000dp</dimen>
+
+    <dimen name="dp_93">148.8000dp</dimen>
+
+    <dimen name="dp_94">150.4000dp</dimen>
+
+    <dimen name="dp_95">152.0000dp</dimen>
+
+    <dimen name="dp_96">153.6000dp</dimen>
+
+    <dimen name="dp_97">155.2000dp</dimen>
+
+    <dimen name="dp_98">156.8000dp</dimen>
+
+    <dimen name="dp_99">158.4000dp</dimen>
+
+    <dimen name="dp_100">160.0000dp</dimen>
+
+    <dimen name="dp_101">161.6000dp</dimen>
+
+    <dimen name="dp_102">163.2000dp</dimen>
+
+    <dimen name="dp_103">164.8000dp</dimen>
+
+    <dimen name="dp_104">166.4000dp</dimen>
+
+    <dimen name="dp_104_5">167.2000dp</dimen>
+
+    <dimen name="dp_105">168.0000dp</dimen>
+
+    <dimen name="dp_106">169.6000dp</dimen>
+
+    <dimen name="dp_107">171.2000dp</dimen>
+
+    <dimen name="dp_108">172.8000dp</dimen>
+
+    <dimen name="dp_109">174.4000dp</dimen>
+
+    <dimen name="dp_110">176.0000dp</dimen>
+
+    <dimen name="dp_111">177.6000dp</dimen>
+
+    <dimen name="dp_112">179.2000dp</dimen>
+
+    <dimen name="dp_113">180.8000dp</dimen>
+
+    <dimen name="dp_114">182.4000dp</dimen>
+
+    <dimen name="dp_115">184.0000dp</dimen>
+
+    <dimen name="dp_116">185.6000dp</dimen>
+
+    <dimen name="dp_117">187.2000dp</dimen>
+
+    <dimen name="dp_118">188.8000dp</dimen>
+
+    <dimen name="dp_119">190.4000dp</dimen>
+
+    <dimen name="dp_120">192.0000dp</dimen>
+
+    <dimen name="dp_121">193.6000dp</dimen>
+
+    <dimen name="dp_122">195.2000dp</dimen>
+
+    <dimen name="dp_123">196.8000dp</dimen>
+
+    <dimen name="dp_124">198.4000dp</dimen>
+
+    <dimen name="dp_125">200.0000dp</dimen>
+
+    <dimen name="dp_126">201.6000dp</dimen>
+
+    <dimen name="dp_127">203.2000dp</dimen>
+
+    <dimen name="dp_128">204.8000dp</dimen>
+
+    <dimen name="dp_129">206.4000dp</dimen>
+
+    <dimen name="dp_130">208.0000dp</dimen>
+
+    <dimen name="dp_131">209.6000dp</dimen>
+
+    <dimen name="dp_132">211.2000dp</dimen>
+
+    <dimen name="dp_133">212.8000dp</dimen>
+
+    <dimen name="dp_134">214.4000dp</dimen>
+
+    <dimen name="dp_134_5">215.2000dp</dimen>
+
+    <dimen name="dp_135">216.0000dp</dimen>
+
+    <dimen name="dp_136">217.6000dp</dimen>
+
+    <dimen name="dp_137">219.2000dp</dimen>
+
+    <dimen name="dp_138">220.8000dp</dimen>
+
+    <dimen name="dp_139">222.4000dp</dimen>
+
+    <dimen name="dp_140">224.0000dp</dimen>
+
+    <dimen name="dp_141">225.6000dp</dimen>
+
+    <dimen name="dp_142">227.2000dp</dimen>
+
+    <dimen name="dp_143">228.8000dp</dimen>
+
+    <dimen name="dp_144">230.4000dp</dimen>
+
+    <dimen name="dp_145">232.0000dp</dimen>
+
+    <dimen name="dp_146">233.6000dp</dimen>
+
+    <dimen name="dp_147">235.2000dp</dimen>
+
+    <dimen name="dp_148">236.8000dp</dimen>
+
+    <dimen name="dp_149">238.4000dp</dimen>
+
+    <dimen name="dp_150">240.0000dp</dimen>
+
+    <dimen name="dp_151">241.6000dp</dimen>
+
+    <dimen name="dp_152">243.2000dp</dimen>
+
+    <dimen name="dp_153">244.8000dp</dimen>
+
+    <dimen name="dp_154">246.4000dp</dimen>
+
+    <dimen name="dp_155">248.0000dp</dimen>
+
+    <dimen name="dp_156">249.6000dp</dimen>
+
+    <dimen name="dp_157">251.2000dp</dimen>
+
+    <dimen name="dp_158">252.8000dp</dimen>
+
+    <dimen name="dp_159">254.4000dp</dimen>
+
+    <dimen name="dp_160">256.0000dp</dimen>
+
+    <dimen name="dp_161">257.6000dp</dimen>
+
+    <dimen name="dp_162">259.2000dp</dimen>
+
+    <dimen name="dp_163">260.8000dp</dimen>
+
+    <dimen name="dp_164">262.4000dp</dimen>
+
+    <dimen name="dp_165">264.0000dp</dimen>
+
+    <dimen name="dp_166">265.6000dp</dimen>
+
+    <dimen name="dp_167">267.2000dp</dimen>
+
+    <dimen name="dp_168">268.8000dp</dimen>
+
+    <dimen name="dp_169">270.4000dp</dimen>
+
+    <dimen name="dp_170">272.0000dp</dimen>
+
+    <dimen name="dp_171">273.6000dp</dimen>
+
+    <dimen name="dp_172">275.2000dp</dimen>
+
+    <dimen name="dp_173">276.8000dp</dimen>
+
+    <dimen name="dp_174">278.4000dp</dimen>
+
+    <dimen name="dp_175">280.0000dp</dimen>
+
+    <dimen name="dp_176">281.6000dp</dimen>
+
+    <dimen name="dp_177">283.2000dp</dimen>
+
+    <dimen name="dp_178">284.8000dp</dimen>
+
+    <dimen name="dp_179">286.4000dp</dimen>
+
+    <dimen name="dp_180">288.0000dp</dimen>
+
+    <dimen name="dp_181">289.6000dp</dimen>
+
+    <dimen name="dp_182">291.2000dp</dimen>
+
+    <dimen name="dp_183">292.8000dp</dimen>
+
+    <dimen name="dp_184">294.4000dp</dimen>
+
+    <dimen name="dp_185">296.0000dp</dimen>
+
+    <dimen name="dp_186">297.6000dp</dimen>
+
+    <dimen name="dp_187">299.2000dp</dimen>
+
+    <dimen name="dp_188">300.8000dp</dimen>
+
+    <dimen name="dp_189">302.4000dp</dimen>
+
+    <dimen name="dp_190">304.0000dp</dimen>
+
+    <dimen name="dp_191">305.6000dp</dimen>
+
+    <dimen name="dp_191_25">306.0000dp</dimen>
+
+    <dimen name="dp_192">307.2000dp</dimen>
+
+    <dimen name="dp_193">308.8000dp</dimen>
+
+    <dimen name="dp_194">310.4000dp</dimen>
+
+    <dimen name="dp_195">312.0000dp</dimen>
+
+    <dimen name="dp_196">313.6000dp</dimen>
+
+    <dimen name="dp_197">315.2000dp</dimen>
+
+    <dimen name="dp_198">316.8000dp</dimen>
+
+    <dimen name="dp_199">318.4000dp</dimen>
+
+    <dimen name="dp_200">320.0000dp</dimen>
+
+    <dimen name="dp_201">321.6000dp</dimen>
+
+    <dimen name="dp_202">323.2000dp</dimen>
+
+    <dimen name="dp_203">324.8000dp</dimen>
+
+    <dimen name="dp_204">326.4000dp</dimen>
+
+    <dimen name="dp_205">328.0000dp</dimen>
+
+    <dimen name="dp_206">329.6000dp</dimen>
+
+    <dimen name="dp_207">331.2000dp</dimen>
+
+    <dimen name="dp_208">332.8000dp</dimen>
+
+    <dimen name="dp_209">334.4000dp</dimen>
+
+    <dimen name="dp_210">336.0000dp</dimen>
+
+    <dimen name="dp_211">337.6000dp</dimen>
+
+    <dimen name="dp_212">339.2000dp</dimen>
+
+    <dimen name="dp_213">340.8000dp</dimen>
+
+    <dimen name="dp_214">342.4000dp</dimen>
+
+    <dimen name="dp_215">344.0000dp</dimen>
+
+    <dimen name="dp_216">345.6000dp</dimen>
+
+    <dimen name="dp_217">347.2000dp</dimen>
+
+    <dimen name="dp_218">348.8000dp</dimen>
+
+    <dimen name="dp_219">350.4000dp</dimen>
+
+    <dimen name="dp_220">352.0000dp</dimen>
+
+    <dimen name="dp_221">353.6000dp</dimen>
+
+    <dimen name="dp_222">355.2000dp</dimen>
+
+    <dimen name="dp_223">356.8000dp</dimen>
+
+    <dimen name="dp_224">358.4000dp</dimen>
+
+    <dimen name="dp_225">360.0000dp</dimen>
+
+    <dimen name="dp_226">361.6000dp</dimen>
+
+    <dimen name="dp_227">363.2000dp</dimen>
+
+    <dimen name="dp_228">364.8000dp</dimen>
+
+    <dimen name="dp_229">366.4000dp</dimen>
+
+    <dimen name="dp_230">368.0000dp</dimen>
+
+    <dimen name="dp_231">369.6000dp</dimen>
+
+    <dimen name="dp_232">371.2000dp</dimen>
+
+    <dimen name="dp_233">372.8000dp</dimen>
+
+    <dimen name="dp_234">374.4000dp</dimen>
+
+    <dimen name="dp_235">376.0000dp</dimen>
+
+    <dimen name="dp_236">377.6000dp</dimen>
+
+    <dimen name="dp_237">379.2000dp</dimen>
+
+    <dimen name="dp_238">380.8000dp</dimen>
+
+    <dimen name="dp_239">382.4000dp</dimen>
+
+    <dimen name="dp_240">384.0000dp</dimen>
+
+    <dimen name="dp_241">385.6000dp</dimen>
+
+    <dimen name="dp_242">387.2000dp</dimen>
+
+    <dimen name="dp_243">388.8000dp</dimen>
+
+    <dimen name="dp_244">390.4000dp</dimen>
+
+    <dimen name="dp_245">392.0000dp</dimen>
+
+    <dimen name="dp_246">393.6000dp</dimen>
+
+    <dimen name="dp_247">395.2000dp</dimen>
+
+    <dimen name="dp_248">396.8000dp</dimen>
+
+    <dimen name="dp_249">398.4000dp</dimen>
+
+    <dimen name="dp_250">400.0000dp</dimen>
+
+    <dimen name="dp_251">401.6000dp</dimen>
+
+    <dimen name="dp_252">403.2000dp</dimen>
+
+    <dimen name="dp_253">404.8000dp</dimen>
+
+    <dimen name="dp_254">406.4000dp</dimen>
+
+    <dimen name="dp_255">408.0000dp</dimen>
+
+    <dimen name="dp_256">409.6000dp</dimen>
+
+    <dimen name="dp_257">411.2000dp</dimen>
+
+    <dimen name="dp_258">412.8000dp</dimen>
+
+    <dimen name="dp_259">414.4000dp</dimen>
+
+    <dimen name="dp_260">416.0000dp</dimen>
+
+    <dimen name="dp_261">417.6000dp</dimen>
+
+    <dimen name="dp_262">419.2000dp</dimen>
+
+    <dimen name="dp_263">420.8000dp</dimen>
+
+    <dimen name="dp_264">422.4000dp</dimen>
+
+    <dimen name="dp_265">424.0000dp</dimen>
+
+    <dimen name="dp_266">425.6000dp</dimen>
+
+    <dimen name="dp_267">427.2000dp</dimen>
+
+    <dimen name="dp_268">428.8000dp</dimen>
+
+    <dimen name="dp_269">430.4000dp</dimen>
+
+    <dimen name="dp_270">432.0000dp</dimen>
+
+    <dimen name="dp_271">433.6000dp</dimen>
+
+    <dimen name="dp_272">435.2000dp</dimen>
+
+    <dimen name="dp_273">436.8000dp</dimen>
+
+    <dimen name="dp_274">438.4000dp</dimen>
+
+    <dimen name="dp_275">440.0000dp</dimen>
+
+    <dimen name="dp_276">441.6000dp</dimen>
+
+    <dimen name="dp_277">443.2000dp</dimen>
+
+    <dimen name="dp_278">444.8000dp</dimen>
+
+    <dimen name="dp_279">446.4000dp</dimen>
+
+    <dimen name="dp_280">448.0000dp</dimen>
+
+    <dimen name="dp_281">449.6000dp</dimen>
+
+    <dimen name="dp_282">451.2000dp</dimen>
+
+    <dimen name="dp_283">452.8000dp</dimen>
+
+    <dimen name="dp_284">454.4000dp</dimen>
+
+    <dimen name="dp_285">456.0000dp</dimen>
+
+    <dimen name="dp_286">457.6000dp</dimen>
+
+    <dimen name="dp_287">459.2000dp</dimen>
+
+    <dimen name="dp_288">460.8000dp</dimen>
+
+    <dimen name="dp_289">462.4000dp</dimen>
+
+    <dimen name="dp_290">464.0000dp</dimen>
+
+    <dimen name="dp_291">465.6000dp</dimen>
+
+    <dimen name="dp_292">467.2000dp</dimen>
+
+    <dimen name="dp_293">468.8000dp</dimen>
+
+    <dimen name="dp_294">470.4000dp</dimen>
+
+    <dimen name="dp_295">472.0000dp</dimen>
+
+    <dimen name="dp_296">473.6000dp</dimen>
+
+    <dimen name="dp_297">475.2000dp</dimen>
+
+    <dimen name="dp_298">476.8000dp</dimen>
+
+    <dimen name="dp_299">478.4000dp</dimen>
+
+    <dimen name="dp_300">480.0000dp</dimen>
+
+    <dimen name="dp_301">481.6000dp</dimen>
+
+    <dimen name="dp_302">483.2000dp</dimen>
+
+    <dimen name="dp_303">484.8000dp</dimen>
+
+    <dimen name="dp_304">486.4000dp</dimen>
+
+    <dimen name="dp_305">488.0000dp</dimen>
+
+    <dimen name="dp_306">489.6000dp</dimen>
+
+    <dimen name="dp_307">491.2000dp</dimen>
+
+    <dimen name="dp_308">492.8000dp</dimen>
+
+    <dimen name="dp_309">494.4000dp</dimen>
+
+    <dimen name="dp_310">496.0000dp</dimen>
+
+    <dimen name="dp_311">497.6000dp</dimen>
+
+    <dimen name="dp_312">499.2000dp</dimen>
+
+    <dimen name="dp_313">500.8000dp</dimen>
+
+    <dimen name="dp_314">502.4000dp</dimen>
+
+    <dimen name="dp_315">504.0000dp</dimen>
+
+    <dimen name="dp_316">505.6000dp</dimen>
+
+    <dimen name="dp_317">507.2000dp</dimen>
+
+    <dimen name="dp_318">508.8000dp</dimen>
+
+    <dimen name="dp_319">510.4000dp</dimen>
+
+    <dimen name="dp_320">512.0000dp</dimen>
+
+    <dimen name="dp_321">513.6000dp</dimen>
+
+    <dimen name="dp_322">515.2000dp</dimen>
+
+    <dimen name="dp_323">516.8000dp</dimen>
+
+    <dimen name="dp_324">518.4000dp</dimen>
+
+    <dimen name="dp_325">520.0000dp</dimen>
+
+    <dimen name="dp_326">521.6000dp</dimen>
+
+    <dimen name="dp_327">523.2000dp</dimen>
+
+    <dimen name="dp_328">524.8000dp</dimen>
+
+    <dimen name="dp_329">526.4000dp</dimen>
+
+    <dimen name="dp_330">528.0000dp</dimen>
+
+    <dimen name="dp_331">529.6000dp</dimen>
+
+    <dimen name="dp_332">531.2000dp</dimen>
+
+    <dimen name="dp_333">532.8000dp</dimen>
+
+    <dimen name="dp_334">534.4000dp</dimen>
+
+    <dimen name="dp_335">536.0000dp</dimen>
+
+    <dimen name="dp_336">537.6000dp</dimen>
+
+    <dimen name="dp_337">539.2000dp</dimen>
+
+    <dimen name="dp_338">540.8000dp</dimen>
+
+    <dimen name="dp_339">542.4000dp</dimen>
+
+    <dimen name="dp_340">544.0000dp</dimen>
+
+    <dimen name="dp_341">545.6000dp</dimen>
+
+    <dimen name="dp_342">547.2000dp</dimen>
+
+    <dimen name="dp_343">548.8000dp</dimen>
+
+    <dimen name="dp_344">550.4000dp</dimen>
+
+    <dimen name="dp_345">552.0000dp</dimen>
+
+    <dimen name="dp_346">553.6000dp</dimen>
+
+    <dimen name="dp_347">555.2000dp</dimen>
+
+    <dimen name="dp_348">556.8000dp</dimen>
+
+    <dimen name="dp_349">558.4000dp</dimen>
+
+    <dimen name="dp_350">560.0000dp</dimen>
+
+    <dimen name="dp_351">561.6000dp</dimen>
+
+    <dimen name="dp_352">563.2000dp</dimen>
+
+    <dimen name="dp_353">564.8000dp</dimen>
+
+    <dimen name="dp_354">566.4000dp</dimen>
+
+    <dimen name="dp_355">568.0000dp</dimen>
+
+    <dimen name="dp_356">569.6000dp</dimen>
+
+    <dimen name="dp_357">571.2000dp</dimen>
+
+    <dimen name="dp_358">572.8000dp</dimen>
+
+    <dimen name="dp_359">574.4000dp</dimen>
+
+    <dimen name="dp_360">576.0000dp</dimen>
+
+    <dimen name="dp_365">584.0000dp</dimen>
+
+    <dimen name="dp_370">592.0000dp</dimen>
+
+    <dimen name="dp_400">640.0000dp</dimen>
+
+    <dimen name="dp_410">656.0000dp</dimen>
+
+    <dimen name="dp_422">675.2000dp</dimen>
+
+    <dimen name="dp_472">755.2000dp</dimen>
+
+    <dimen name="dp_500">800.0000dp</dimen>
+
+    <dimen name="dp_600">960.0000dp</dimen>
+
+    <dimen name="dp_640">1024.0000dp</dimen>
+
+    <dimen name="dp_650">1040.0000dp</dimen>
+
+    <dimen name="dp_710">1136.0000dp</dimen>
+
+    <dimen name="dp_720">1152.0000dp</dimen>
+
+
+</resources>
diff --git a/system/basic/src/main/res/values-sw800dp/dimens.xml b/system/basic/src/main/res/values-sw800dp/dimens.xml
new file mode 100644
index 0000000..210a690
--- /dev/null
+++ b/system/basic/src/main/res/values-sw800dp/dimens.xml
@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+
+    <dimen name="txt5">8.3333sp</dimen>
+
+    <dimen name="txt6">10.0000sp</dimen>
+
+    <dimen name="txt7">11.6667sp</dimen>
+
+    <dimen name="txt8">13.3333sp</dimen>
+
+    <dimen name="txt9">15.0000sp</dimen>
+
+    <dimen name="txt10">16.6667sp</dimen>
+
+    <dimen name="txt11">18.3333sp</dimen>
+
+    <dimen name="txt12">20.0000sp</dimen>
+
+    <dimen name="txt13">21.6667sp</dimen>
+
+    <dimen name="txt14">23.3333sp</dimen>
+
+    <dimen name="txt15">25.0000sp</dimen>
+
+    <dimen name="txt16">26.6667sp</dimen>
+
+    <dimen name="txt17">28.3333sp</dimen>
+
+    <dimen name="txt18">30.0000sp</dimen>
+
+    <dimen name="txt19">31.6667sp</dimen>
+
+    <dimen name="txt20">33.3333sp</dimen>
+
+    <dimen name="txt21">35.0000sp</dimen>
+
+    <dimen name="txt22">36.6667sp</dimen>
+
+    <dimen name="txt24">40.0000sp</dimen>
+
+    <dimen name="txt26">43.3333sp</dimen>
+
+    <dimen name="txt28">46.6667sp</dimen>
+
+    <dimen name="txt30">50.0000sp</dimen>
+
+    <dimen name="txt32">53.3333sp</dimen>
+
+    <dimen name="txt34">56.6667sp</dimen>
+
+    <dimen name="card_common_margin_left">@dimen/dp_15</dimen>
+
+    <dimen name="dp_m_60">-100.0000dp</dimen>
+
+    <dimen name="dp_m_30">-50.0000dp</dimen>
+
+    <dimen name="dp_m_20">-33.3333dp</dimen>
+
+    <dimen name="dp_m_12">-20.0000dp</dimen>
+
+    <dimen name="dp_m_10">-16.6667dp</dimen>
+
+    <dimen name="dp_m_8">-13.3333dp</dimen>
+
+    <dimen name="dp_m_5">-8.3333dp</dimen>
+
+    <dimen name="dp_m_2">-3.3333dp</dimen>
+
+    <dimen name="dp_m_1">-1.6667dp</dimen>
+
+    <dimen name="dp_0">0.0000dp</dimen>
+
+    <dimen name="dp_0_1">0.1667dp</dimen>
+
+    <dimen name="dp_0_5">0.8333dp</dimen>
+
+    <dimen name="dp_1">1.6667dp</dimen>
+
+    <dimen name="dp_1_5">2.5000dp</dimen>
+
+    <dimen name="dp_2">3.3333dp</dimen>
+
+    <dimen name="dp_2_5">4.1667dp</dimen>
+
+    <dimen name="dp_3">5.0000dp</dimen>
+
+    <dimen name="dp_3_5">5.8333dp</dimen>
+
+    <dimen name="dp_4">6.6667dp</dimen>
+
+    <dimen name="dp_4_5">7.5000dp</dimen>
+
+    <dimen name="dp_5">8.3333dp</dimen>
+
+    <dimen name="dp_6">10.0000dp</dimen>
+
+    <dimen name="dp_7">11.6667dp</dimen>
+
+    <dimen name="dp_7_5">12.5000dp</dimen>
+
+    <dimen name="dp_8">13.3333dp</dimen>
+
+    <dimen name="dp_9">15.0000dp</dimen>
+
+    <dimen name="dp_10">16.6667dp</dimen>
+
+    <dimen name="dp_11">18.3333dp</dimen>
+
+    <dimen name="dp_12">20.0000dp</dimen>
+
+    <dimen name="dp_13">21.6667dp</dimen>
+
+    <dimen name="dp_14">23.3333dp</dimen>
+
+    <dimen name="dp_15">25.0000dp</dimen>
+
+    <dimen name="dp_16">26.6667dp</dimen>
+
+    <dimen name="dp_17">28.3333dp</dimen>
+
+    <dimen name="dp_18">30.0000dp</dimen>
+
+    <dimen name="dp_19">31.6667dp</dimen>
+
+    <dimen name="dp_20">33.3333dp</dimen>
+
+    <dimen name="dp_21">35.0000dp</dimen>
+
+    <dimen name="dp_22">36.6667dp</dimen>
+
+    <dimen name="dp_23">38.3333dp</dimen>
+
+    <dimen name="dp_24">40.0000dp</dimen>
+
+    <dimen name="dp_25">41.6667dp</dimen>
+
+    <dimen name="dp_26">43.3333dp</dimen>
+
+    <dimen name="dp_27">45.0000dp</dimen>
+
+    <dimen name="dp_28">46.6667dp</dimen>
+
+    <dimen name="dp_29">48.3333dp</dimen>
+
+    <dimen name="dp_30">50.0000dp</dimen>
+
+    <dimen name="dp_31">51.6667dp</dimen>
+
+    <dimen name="dp_32">53.3333dp</dimen>
+
+    <dimen name="dp_33">55.0000dp</dimen>
+
+    <dimen name="dp_34">56.6667dp</dimen>
+
+    <dimen name="dp_35">58.3333dp</dimen>
+
+    <dimen name="dp_36">60.0000dp</dimen>
+
+    <dimen name="dp_37">61.6667dp</dimen>
+
+    <dimen name="dp_38">63.3333dp</dimen>
+
+    <dimen name="dp_39">65.0000dp</dimen>
+
+    <dimen name="dp_40">66.6667dp</dimen>
+
+    <dimen name="dp_41">68.3333dp</dimen>
+
+    <dimen name="dp_42">70.0000dp</dimen>
+
+    <dimen name="dp_43">71.6667dp</dimen>
+
+    <dimen name="dp_44">73.3333dp</dimen>
+
+    <dimen name="dp_45">75.0000dp</dimen>
+
+    <dimen name="dp_46">76.6667dp</dimen>
+
+    <dimen name="dp_47">78.3333dp</dimen>
+
+    <dimen name="dp_48">80.0000dp</dimen>
+
+    <dimen name="dp_49">81.6667dp</dimen>
+
+    <dimen name="dp_50">83.3333dp</dimen>
+
+    <dimen name="dp_51">85.0000dp</dimen>
+
+    <dimen name="dp_52">86.6667dp</dimen>
+
+    <dimen name="dp_53">88.3333dp</dimen>
+
+    <dimen name="dp_54">90.0000dp</dimen>
+
+    <dimen name="dp_55">91.6667dp</dimen>
+
+    <dimen name="dp_56">93.3333dp</dimen>
+
+    <dimen name="dp_57">95.0000dp</dimen>
+
+    <dimen name="dp_58">96.6667dp</dimen>
+
+    <dimen name="dp_59">98.3333dp</dimen>
+
+    <dimen name="dp_60">100.0000dp</dimen>
+
+    <dimen name="dp_61">101.6667dp</dimen>
+
+    <dimen name="dp_62">103.3333dp</dimen>
+
+    <dimen name="dp_63">105.0000dp</dimen>
+
+    <dimen name="dp_64">106.6667dp</dimen>
+
+    <dimen name="dp_65">108.3333dp</dimen>
+
+    <dimen name="dp_66">110.0000dp</dimen>
+
+    <dimen name="dp_67">111.6667dp</dimen>
+
+    <dimen name="dp_68">113.3333dp</dimen>
+
+    <dimen name="dp_69">115.0000dp</dimen>
+
+    <dimen name="dp_70">116.6667dp</dimen>
+
+    <dimen name="dp_71">118.3333dp</dimen>
+
+    <dimen name="dp_72">120.0000dp</dimen>
+
+    <dimen name="dp_73">121.6667dp</dimen>
+
+    <dimen name="dp_74">123.3333dp</dimen>
+
+    <dimen name="dp_75">125.0000dp</dimen>
+
+    <dimen name="dp_76">126.6667dp</dimen>
+
+    <dimen name="dp_77">128.3333dp</dimen>
+
+    <dimen name="dp_78">130.0000dp</dimen>
+
+    <dimen name="dp_79">131.6667dp</dimen>
+
+    <dimen name="dp_80">133.3333dp</dimen>
+
+    <dimen name="dp_81">135.0000dp</dimen>
+
+    <dimen name="dp_82">136.6667dp</dimen>
+
+    <dimen name="dp_83">138.3333dp</dimen>
+
+    <dimen name="dp_84">140.0000dp</dimen>
+
+    <dimen name="dp_85">141.6667dp</dimen>
+
+    <dimen name="dp_86">143.3333dp</dimen>
+
+    <dimen name="dp_87">145.0000dp</dimen>
+
+    <dimen name="dp_88">146.6667dp</dimen>
+
+    <dimen name="dp_89">148.3333dp</dimen>
+
+    <dimen name="dp_90">150.0000dp</dimen>
+
+    <dimen name="dp_91">151.6667dp</dimen>
+
+    <dimen name="dp_92">153.3333dp</dimen>
+
+    <dimen name="dp_93">155.0000dp</dimen>
+
+    <dimen name="dp_94">156.6667dp</dimen>
+
+    <dimen name="dp_95">158.3333dp</dimen>
+
+    <dimen name="dp_96">160.0000dp</dimen>
+
+    <dimen name="dp_97">161.6667dp</dimen>
+
+    <dimen name="dp_98">163.3333dp</dimen>
+
+    <dimen name="dp_99">165.0000dp</dimen>
+
+    <dimen name="dp_100">166.6667dp</dimen>
+
+    <dimen name="dp_101">168.3333dp</dimen>
+
+    <dimen name="dp_102">170.0000dp</dimen>
+
+    <dimen name="dp_103">171.6667dp</dimen>
+
+    <dimen name="dp_104">173.3333dp</dimen>
+
+    <dimen name="dp_104_5">174.1667dp</dimen>
+
+    <dimen name="dp_105">175.0000dp</dimen>
+
+    <dimen name="dp_106">176.6667dp</dimen>
+
+    <dimen name="dp_107">178.3333dp</dimen>
+
+    <dimen name="dp_108">180.0000dp</dimen>
+
+    <dimen name="dp_109">181.6667dp</dimen>
+
+    <dimen name="dp_110">183.3333dp</dimen>
+
+    <dimen name="dp_111">185.0000dp</dimen>
+
+    <dimen name="dp_112">186.6667dp</dimen>
+
+    <dimen name="dp_113">188.3333dp</dimen>
+
+    <dimen name="dp_114">190.0000dp</dimen>
+
+    <dimen name="dp_115">191.6667dp</dimen>
+
+    <dimen name="dp_116">193.3333dp</dimen>
+
+    <dimen name="dp_117">195.0000dp</dimen>
+
+    <dimen name="dp_118">196.6667dp</dimen>
+
+    <dimen name="dp_119">198.3333dp</dimen>
+
+    <dimen name="dp_120">200.0000dp</dimen>
+
+    <dimen name="dp_121">201.6667dp</dimen>
+
+    <dimen name="dp_122">203.3333dp</dimen>
+
+    <dimen name="dp_123">205.0000dp</dimen>
+
+    <dimen name="dp_124">206.6667dp</dimen>
+
+    <dimen name="dp_125">208.3333dp</dimen>
+
+    <dimen name="dp_126">210.0000dp</dimen>
+
+    <dimen name="dp_127">211.6667dp</dimen>
+
+    <dimen name="dp_128">213.3333dp</dimen>
+
+    <dimen name="dp_129">215.0000dp</dimen>
+
+    <dimen name="dp_130">216.6667dp</dimen>
+
+    <dimen name="dp_131">218.3333dp</dimen>
+
+    <dimen name="dp_132">220.0000dp</dimen>
+
+    <dimen name="dp_133">221.6667dp</dimen>
+
+    <dimen name="dp_134">223.3333dp</dimen>
+
+    <dimen name="dp_134_5">224.1667dp</dimen>
+
+    <dimen name="dp_135">225.0000dp</dimen>
+
+    <dimen name="dp_136">226.6667dp</dimen>
+
+    <dimen name="dp_137">228.3333dp</dimen>
+
+    <dimen name="dp_138">230.0000dp</dimen>
+
+    <dimen name="dp_139">231.6667dp</dimen>
+
+    <dimen name="dp_140">233.3333dp</dimen>
+
+    <dimen name="dp_141">235.0000dp</dimen>
+
+    <dimen name="dp_142">236.6667dp</dimen>
+
+    <dimen name="dp_143">238.3333dp</dimen>
+
+    <dimen name="dp_144">240.0000dp</dimen>
+
+    <dimen name="dp_145">241.6667dp</dimen>
+
+    <dimen name="dp_146">243.3333dp</dimen>
+
+    <dimen name="dp_147">245.0000dp</dimen>
+
+    <dimen name="dp_148">246.6667dp</dimen>
+
+    <dimen name="dp_149">248.3333dp</dimen>
+
+    <dimen name="dp_150">250.0000dp</dimen>
+
+    <dimen name="dp_151">251.6667dp</dimen>
+
+    <dimen name="dp_152">253.3333dp</dimen>
+
+    <dimen name="dp_153">255.0000dp</dimen>
+
+    <dimen name="dp_154">256.6667dp</dimen>
+
+    <dimen name="dp_155">258.3333dp</dimen>
+
+    <dimen name="dp_156">260.0000dp</dimen>
+
+    <dimen name="dp_157">261.6667dp</dimen>
+
+    <dimen name="dp_158">263.3333dp</dimen>
+
+    <dimen name="dp_159">265.0000dp</dimen>
+
+    <dimen name="dp_160">266.6667dp</dimen>
+
+    <dimen name="dp_161">268.3333dp</dimen>
+
+    <dimen name="dp_162">270.0000dp</dimen>
+
+    <dimen name="dp_163">271.6667dp</dimen>
+
+    <dimen name="dp_164">273.3333dp</dimen>
+
+    <dimen name="dp_165">275.0000dp</dimen>
+
+    <dimen name="dp_166">276.6667dp</dimen>
+
+    <dimen name="dp_167">278.3333dp</dimen>
+
+    <dimen name="dp_168">280.0000dp</dimen>
+
+    <dimen name="dp_169">281.6667dp</dimen>
+
+    <dimen name="dp_170">283.3333dp</dimen>
+
+    <dimen name="dp_171">285.0000dp</dimen>
+
+    <dimen name="dp_172">286.6667dp</dimen>
+
+    <dimen name="dp_173">288.3333dp</dimen>
+
+    <dimen name="dp_174">290.0000dp</dimen>
+
+    <dimen name="dp_175">291.6667dp</dimen>
+
+    <dimen name="dp_176">293.3333dp</dimen>
+
+    <dimen name="dp_177">295.0000dp</dimen>
+
+    <dimen name="dp_178">296.6667dp</dimen>
+
+    <dimen name="dp_179">298.3333dp</dimen>
+
+    <dimen name="dp_180">300.0000dp</dimen>
+
+    <dimen name="dp_181">301.6667dp</dimen>
+
+    <dimen name="dp_182">303.3333dp</dimen>
+
+    <dimen name="dp_183">305.0000dp</dimen>
+
+    <dimen name="dp_184">306.6667dp</dimen>
+
+    <dimen name="dp_185">308.3333dp</dimen>
+
+    <dimen name="dp_186">310.0000dp</dimen>
+
+    <dimen name="dp_187">311.6667dp</dimen>
+
+    <dimen name="dp_188">313.3333dp</dimen>
+
+    <dimen name="dp_189">315.0000dp</dimen>
+
+    <dimen name="dp_190">316.6667dp</dimen>
+
+    <dimen name="dp_191">318.3333dp</dimen>
+
+    <dimen name="dp_191_25">318.7500dp</dimen>
+
+    <dimen name="dp_192">320.0000dp</dimen>
+
+    <dimen name="dp_193">321.6667dp</dimen>
+
+    <dimen name="dp_194">323.3333dp</dimen>
+
+    <dimen name="dp_195">325.0000dp</dimen>
+
+    <dimen name="dp_196">326.6667dp</dimen>
+
+    <dimen name="dp_197">328.3333dp</dimen>
+
+    <dimen name="dp_198">330.0000dp</dimen>
+
+    <dimen name="dp_199">331.6667dp</dimen>
+
+    <dimen name="dp_200">333.3333dp</dimen>
+
+    <dimen name="dp_201">335.0000dp</dimen>
+
+    <dimen name="dp_202">336.6667dp</dimen>
+
+    <dimen name="dp_203">338.3333dp</dimen>
+
+    <dimen name="dp_204">340.0000dp</dimen>
+
+    <dimen name="dp_205">341.6667dp</dimen>
+
+    <dimen name="dp_206">343.3333dp</dimen>
+
+    <dimen name="dp_207">345.0000dp</dimen>
+
+    <dimen name="dp_208">346.6667dp</dimen>
+
+    <dimen name="dp_209">348.3333dp</dimen>
+
+    <dimen name="dp_210">350.0000dp</dimen>
+
+    <dimen name="dp_211">351.6667dp</dimen>
+
+    <dimen name="dp_212">353.3333dp</dimen>
+
+    <dimen name="dp_213">355.0000dp</dimen>
+
+    <dimen name="dp_214">356.6667dp</dimen>
+
+    <dimen name="dp_215">358.3333dp</dimen>
+
+    <dimen name="dp_216">360.0000dp</dimen>
+
+    <dimen name="dp_217">361.6667dp</dimen>
+
+    <dimen name="dp_218">363.3333dp</dimen>
+
+    <dimen name="dp_219">365.0000dp</dimen>
+
+    <dimen name="dp_220">366.6667dp</dimen>
+
+    <dimen name="dp_221">368.3333dp</dimen>
+
+    <dimen name="dp_222">370.0000dp</dimen>
+
+    <dimen name="dp_223">371.6667dp</dimen>
+
+    <dimen name="dp_224">373.3333dp</dimen>
+
+    <dimen name="dp_225">375.0000dp</dimen>
+
+    <dimen name="dp_226">376.6667dp</dimen>
+
+    <dimen name="dp_227">378.3333dp</dimen>
+
+    <dimen name="dp_228">380.0000dp</dimen>
+
+    <dimen name="dp_229">381.6667dp</dimen>
+
+    <dimen name="dp_230">383.3333dp</dimen>
+
+    <dimen name="dp_231">385.0000dp</dimen>
+
+    <dimen name="dp_232">386.6667dp</dimen>
+
+    <dimen name="dp_233">388.3333dp</dimen>
+
+    <dimen name="dp_234">390.0000dp</dimen>
+
+    <dimen name="dp_235">391.6667dp</dimen>
+
+    <dimen name="dp_236">393.3333dp</dimen>
+
+    <dimen name="dp_237">395.0000dp</dimen>
+
+    <dimen name="dp_238">396.6667dp</dimen>
+
+    <dimen name="dp_239">398.3333dp</dimen>
+
+    <dimen name="dp_240">400.0000dp</dimen>
+
+    <dimen name="dp_241">401.6667dp</dimen>
+
+    <dimen name="dp_242">403.3333dp</dimen>
+
+    <dimen name="dp_243">405.0000dp</dimen>
+
+    <dimen name="dp_244">406.6667dp</dimen>
+
+    <dimen name="dp_245">408.3333dp</dimen>
+
+    <dimen name="dp_246">410.0000dp</dimen>
+
+    <dimen name="dp_247">411.6667dp</dimen>
+
+    <dimen name="dp_248">413.3333dp</dimen>
+
+    <dimen name="dp_249">415.0000dp</dimen>
+
+    <dimen name="dp_250">416.6667dp</dimen>
+
+    <dimen name="dp_251">418.3333dp</dimen>
+
+    <dimen name="dp_252">420.0000dp</dimen>
+
+    <dimen name="dp_253">421.6667dp</dimen>
+
+    <dimen name="dp_254">423.3333dp</dimen>
+
+    <dimen name="dp_255">425.0000dp</dimen>
+
+    <dimen name="dp_256">426.6667dp</dimen>
+
+    <dimen name="dp_257">428.3333dp</dimen>
+
+    <dimen name="dp_258">430.0000dp</dimen>
+
+    <dimen name="dp_259">431.6667dp</dimen>
+
+    <dimen name="dp_260">433.3333dp</dimen>
+
+    <dimen name="dp_261">435.0000dp</dimen>
+
+    <dimen name="dp_262">436.6667dp</dimen>
+
+    <dimen name="dp_263">438.3333dp</dimen>
+
+    <dimen name="dp_264">440.0000dp</dimen>
+
+    <dimen name="dp_265">441.6667dp</dimen>
+
+    <dimen name="dp_266">443.3333dp</dimen>
+
+    <dimen name="dp_267">445.0000dp</dimen>
+
+    <dimen name="dp_268">446.6667dp</dimen>
+
+    <dimen name="dp_269">448.3333dp</dimen>
+
+    <dimen name="dp_270">450.0000dp</dimen>
+
+    <dimen name="dp_271">451.6667dp</dimen>
+
+    <dimen name="dp_272">453.3333dp</dimen>
+
+    <dimen name="dp_273">455.0000dp</dimen>
+
+    <dimen name="dp_274">456.6667dp</dimen>
+
+    <dimen name="dp_275">458.3333dp</dimen>
+
+    <dimen name="dp_276">460.0000dp</dimen>
+
+    <dimen name="dp_277">461.6667dp</dimen>
+
+    <dimen name="dp_278">463.3333dp</dimen>
+
+    <dimen name="dp_279">465.0000dp</dimen>
+
+    <dimen name="dp_280">466.6667dp</dimen>
+
+    <dimen name="dp_281">468.3333dp</dimen>
+
+    <dimen name="dp_282">470.0000dp</dimen>
+
+    <dimen name="dp_283">471.6667dp</dimen>
+
+    <dimen name="dp_284">473.3333dp</dimen>
+
+    <dimen name="dp_285">475.0000dp</dimen>
+
+    <dimen name="dp_286">476.6667dp</dimen>
+
+    <dimen name="dp_287">478.3333dp</dimen>
+
+    <dimen name="dp_288">480.0000dp</dimen>
+
+    <dimen name="dp_289">481.6667dp</dimen>
+
+    <dimen name="dp_290">483.3333dp</dimen>
+
+    <dimen name="dp_291">485.0000dp</dimen>
+
+    <dimen name="dp_292">486.6667dp</dimen>
+
+    <dimen name="dp_293">488.3333dp</dimen>
+
+    <dimen name="dp_294">490.0000dp</dimen>
+
+    <dimen name="dp_295">491.6667dp</dimen>
+
+    <dimen name="dp_296">493.3333dp</dimen>
+
+    <dimen name="dp_297">495.0000dp</dimen>
+
+    <dimen name="dp_298">496.6667dp</dimen>
+
+    <dimen name="dp_299">498.3333dp</dimen>
+
+    <dimen name="dp_300">500.0000dp</dimen>
+
+    <dimen name="dp_301">501.6667dp</dimen>
+
+    <dimen name="dp_302">503.3333dp</dimen>
+
+    <dimen name="dp_303">505.0000dp</dimen>
+
+    <dimen name="dp_304">506.6667dp</dimen>
+
+    <dimen name="dp_305">508.3333dp</dimen>
+
+    <dimen name="dp_306">510.0000dp</dimen>
+
+    <dimen name="dp_307">511.6667dp</dimen>
+
+    <dimen name="dp_308">513.3333dp</dimen>
+
+    <dimen name="dp_309">515.0000dp</dimen>
+
+    <dimen name="dp_310">516.6667dp</dimen>
+
+    <dimen name="dp_311">518.3333dp</dimen>
+
+    <dimen name="dp_312">520.0000dp</dimen>
+
+    <dimen name="dp_313">521.6667dp</dimen>
+
+    <dimen name="dp_314">523.3333dp</dimen>
+
+    <dimen name="dp_315">525.0000dp</dimen>
+
+    <dimen name="dp_316">526.6667dp</dimen>
+
+    <dimen name="dp_317">528.3333dp</dimen>
+
+    <dimen name="dp_318">530.0000dp</dimen>
+
+    <dimen name="dp_319">531.6667dp</dimen>
+
+    <dimen name="dp_320">533.3333dp</dimen>
+
+    <dimen name="dp_321">535.0000dp</dimen>
+
+    <dimen name="dp_322">536.6667dp</dimen>
+
+    <dimen name="dp_323">538.3333dp</dimen>
+
+    <dimen name="dp_324">540.0000dp</dimen>
+
+    <dimen name="dp_325">541.6667dp</dimen>
+
+    <dimen name="dp_326">543.3333dp</dimen>
+
+    <dimen name="dp_327">545.0000dp</dimen>
+
+    <dimen name="dp_328">546.6667dp</dimen>
+
+    <dimen name="dp_329">548.3333dp</dimen>
+
+    <dimen name="dp_330">550.0000dp</dimen>
+
+    <dimen name="dp_331">551.6667dp</dimen>
+
+    <dimen name="dp_332">553.3333dp</dimen>
+
+    <dimen name="dp_333">555.0000dp</dimen>
+
+    <dimen name="dp_334">556.6667dp</dimen>
+
+    <dimen name="dp_335">558.3333dp</dimen>
+
+    <dimen name="dp_336">560.0000dp</dimen>
+
+    <dimen name="dp_337">561.6667dp</dimen>
+
+    <dimen name="dp_338">563.3333dp</dimen>
+
+    <dimen name="dp_339">565.0000dp</dimen>
+
+    <dimen name="dp_340">566.6667dp</dimen>
+
+    <dimen name="dp_341">568.3333dp</dimen>
+
+    <dimen name="dp_342">570.0000dp</dimen>
+
+    <dimen name="dp_343">571.6667dp</dimen>
+
+    <dimen name="dp_344">573.3333dp</dimen>
+
+    <dimen name="dp_345">575.0000dp</dimen>
+
+    <dimen name="dp_346">576.6667dp</dimen>
+
+    <dimen name="dp_347">578.3333dp</dimen>
+
+    <dimen name="dp_348">580.0000dp</dimen>
+
+    <dimen name="dp_349">581.6667dp</dimen>
+
+    <dimen name="dp_350">583.3333dp</dimen>
+
+    <dimen name="dp_351">585.0000dp</dimen>
+
+    <dimen name="dp_352">586.6667dp</dimen>
+
+    <dimen name="dp_353">588.3333dp</dimen>
+
+    <dimen name="dp_354">590.0000dp</dimen>
+
+    <dimen name="dp_355">591.6667dp</dimen>
+
+    <dimen name="dp_356">593.3333dp</dimen>
+
+    <dimen name="dp_357">595.0000dp</dimen>
+
+    <dimen name="dp_358">596.6667dp</dimen>
+
+    <dimen name="dp_359">598.3333dp</dimen>
+
+    <dimen name="dp_360">600.0000dp</dimen>
+
+    <dimen name="dp_365">608.3333dp</dimen>
+
+    <dimen name="dp_370">616.6667dp</dimen>
+
+    <dimen name="dp_400">666.6667dp</dimen>
+
+    <dimen name="dp_410">683.3333dp</dimen>
+
+    <dimen name="dp_422">703.3333dp</dimen>
+
+    <dimen name="dp_472">786.6667dp</dimen>
+
+    <dimen name="dp_500">833.3333dp</dimen>
+
+    <dimen name="dp_600">1000.0000dp</dimen>
+
+    <dimen name="dp_640">1066.6667dp</dimen>
+
+    <dimen name="dp_650">1083.3333dp</dimen>
+
+    <dimen name="dp_710">1183.3333dp</dimen>
+
+    <dimen name="dp_720">1200.0000dp</dimen>
+
+
+</resources>
diff --git a/system/basic/src/main/res/values-sw811dp/dimens.xml b/system/basic/src/main/res/values-sw811dp/dimens.xml
new file mode 100644
index 0000000..ca29acf
--- /dev/null
+++ b/system/basic/src/main/res/values-sw811dp/dimens.xml
@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+
+    <dimen name="txt5">8.4479sp</dimen>
+
+    <dimen name="txt6">10.1375sp</dimen>
+
+    <dimen name="txt7">11.8271sp</dimen>
+
+    <dimen name="txt8">13.5167sp</dimen>
+
+    <dimen name="txt9">15.2063sp</dimen>
+
+    <dimen name="txt10">16.8958sp</dimen>
+
+    <dimen name="txt11">18.5854sp</dimen>
+
+    <dimen name="txt12">20.2750sp</dimen>
+
+    <dimen name="txt13">21.9646sp</dimen>
+
+    <dimen name="txt14">23.6542sp</dimen>
+
+    <dimen name="txt15">25.3438sp</dimen>
+
+    <dimen name="txt16">27.0333sp</dimen>
+
+    <dimen name="txt17">28.7229sp</dimen>
+
+    <dimen name="txt18">30.4125sp</dimen>
+
+    <dimen name="txt19">32.1021sp</dimen>
+
+    <dimen name="txt20">33.7917sp</dimen>
+
+    <dimen name="txt21">35.4813sp</dimen>
+
+    <dimen name="txt22">37.1708sp</dimen>
+
+    <dimen name="txt24">40.5500sp</dimen>
+
+    <dimen name="txt26">43.9292sp</dimen>
+
+    <dimen name="txt28">47.3083sp</dimen>
+
+    <dimen name="txt30">50.6875sp</dimen>
+
+    <dimen name="txt32">54.0667sp</dimen>
+
+    <dimen name="txt34">57.4458sp</dimen>
+
+    <dimen name="card_common_margin_left">@dimen/dp_15</dimen>
+
+    <dimen name="dp_m_60">-101.3750dp</dimen>
+
+    <dimen name="dp_m_30">-50.6875dp</dimen>
+
+    <dimen name="dp_m_20">-33.7917dp</dimen>
+
+    <dimen name="dp_m_12">-20.2750dp</dimen>
+
+    <dimen name="dp_m_10">-16.8958dp</dimen>
+
+    <dimen name="dp_m_8">-13.5167dp</dimen>
+
+    <dimen name="dp_m_5">-8.4479dp</dimen>
+
+    <dimen name="dp_m_2">-3.3792dp</dimen>
+
+    <dimen name="dp_m_1">-1.6896dp</dimen>
+
+    <dimen name="dp_0">0.0000dp</dimen>
+
+    <dimen name="dp_0_1">0.1690dp</dimen>
+
+    <dimen name="dp_0_5">0.8448dp</dimen>
+
+    <dimen name="dp_1">1.6896dp</dimen>
+
+    <dimen name="dp_1_5">2.5344dp</dimen>
+
+    <dimen name="dp_2">3.3792dp</dimen>
+
+    <dimen name="dp_2_5">4.2240dp</dimen>
+
+    <dimen name="dp_3">5.0688dp</dimen>
+
+    <dimen name="dp_3_5">5.9135dp</dimen>
+
+    <dimen name="dp_4">6.7583dp</dimen>
+
+    <dimen name="dp_4_5">7.6031dp</dimen>
+
+    <dimen name="dp_5">8.4479dp</dimen>
+
+    <dimen name="dp_6">10.1375dp</dimen>
+
+    <dimen name="dp_7">11.8271dp</dimen>
+
+    <dimen name="dp_7_5">12.6719dp</dimen>
+
+    <dimen name="dp_8">13.5167dp</dimen>
+
+    <dimen name="dp_9">15.2063dp</dimen>
+
+    <dimen name="dp_10">16.8958dp</dimen>
+
+    <dimen name="dp_11">18.5854dp</dimen>
+
+    <dimen name="dp_12">20.2750dp</dimen>
+
+    <dimen name="dp_13">21.9646dp</dimen>
+
+    <dimen name="dp_14">23.6542dp</dimen>
+
+    <dimen name="dp_15">25.3438dp</dimen>
+
+    <dimen name="dp_16">27.0333dp</dimen>
+
+    <dimen name="dp_17">28.7229dp</dimen>
+
+    <dimen name="dp_18">30.4125dp</dimen>
+
+    <dimen name="dp_19">32.1021dp</dimen>
+
+    <dimen name="dp_20">33.7917dp</dimen>
+
+    <dimen name="dp_21">35.4813dp</dimen>
+
+    <dimen name="dp_22">37.1708dp</dimen>
+
+    <dimen name="dp_23">38.8604dp</dimen>
+
+    <dimen name="dp_24">40.5500dp</dimen>
+
+    <dimen name="dp_25">42.2396dp</dimen>
+
+    <dimen name="dp_26">43.9292dp</dimen>
+
+    <dimen name="dp_27">45.6188dp</dimen>
+
+    <dimen name="dp_28">47.3083dp</dimen>
+
+    <dimen name="dp_29">48.9979dp</dimen>
+
+    <dimen name="dp_30">50.6875dp</dimen>
+
+    <dimen name="dp_31">52.3771dp</dimen>
+
+    <dimen name="dp_32">54.0667dp</dimen>
+
+    <dimen name="dp_33">55.7563dp</dimen>
+
+    <dimen name="dp_34">57.4458dp</dimen>
+
+    <dimen name="dp_35">59.1354dp</dimen>
+
+    <dimen name="dp_36">60.8250dp</dimen>
+
+    <dimen name="dp_37">62.5146dp</dimen>
+
+    <dimen name="dp_38">64.2042dp</dimen>
+
+    <dimen name="dp_39">65.8937dp</dimen>
+
+    <dimen name="dp_40">67.5833dp</dimen>
+
+    <dimen name="dp_41">69.2729dp</dimen>
+
+    <dimen name="dp_42">70.9625dp</dimen>
+
+    <dimen name="dp_43">72.6521dp</dimen>
+
+    <dimen name="dp_44">74.3417dp</dimen>
+
+    <dimen name="dp_45">76.0312dp</dimen>
+
+    <dimen name="dp_46">77.7208dp</dimen>
+
+    <dimen name="dp_47">79.4104dp</dimen>
+
+    <dimen name="dp_48">81.1000dp</dimen>
+
+    <dimen name="dp_49">82.7896dp</dimen>
+
+    <dimen name="dp_50">84.4792dp</dimen>
+
+    <dimen name="dp_51">86.1688dp</dimen>
+
+    <dimen name="dp_52">87.8583dp</dimen>
+
+    <dimen name="dp_53">89.5479dp</dimen>
+
+    <dimen name="dp_54">91.2375dp</dimen>
+
+    <dimen name="dp_55">92.9271dp</dimen>
+
+    <dimen name="dp_56">94.6167dp</dimen>
+
+    <dimen name="dp_57">96.3063dp</dimen>
+
+    <dimen name="dp_58">97.9958dp</dimen>
+
+    <dimen name="dp_59">99.6854dp</dimen>
+
+    <dimen name="dp_60">101.3750dp</dimen>
+
+    <dimen name="dp_61">103.0646dp</dimen>
+
+    <dimen name="dp_62">104.7542dp</dimen>
+
+    <dimen name="dp_63">106.4438dp</dimen>
+
+    <dimen name="dp_64">108.1333dp</dimen>
+
+    <dimen name="dp_65">109.8229dp</dimen>
+
+    <dimen name="dp_66">111.5125dp</dimen>
+
+    <dimen name="dp_67">113.2021dp</dimen>
+
+    <dimen name="dp_68">114.8917dp</dimen>
+
+    <dimen name="dp_69">116.5813dp</dimen>
+
+    <dimen name="dp_70">118.2708dp</dimen>
+
+    <dimen name="dp_71">119.9604dp</dimen>
+
+    <dimen name="dp_72">121.6500dp</dimen>
+
+    <dimen name="dp_73">123.3396dp</dimen>
+
+    <dimen name="dp_74">125.0292dp</dimen>
+
+    <dimen name="dp_75">126.7188dp</dimen>
+
+    <dimen name="dp_76">128.4083dp</dimen>
+
+    <dimen name="dp_77">130.0979dp</dimen>
+
+    <dimen name="dp_78">131.7875dp</dimen>
+
+    <dimen name="dp_79">133.4771dp</dimen>
+
+    <dimen name="dp_80">135.1667dp</dimen>
+
+    <dimen name="dp_81">136.8563dp</dimen>
+
+    <dimen name="dp_82">138.5458dp</dimen>
+
+    <dimen name="dp_83">140.2354dp</dimen>
+
+    <dimen name="dp_84">141.9250dp</dimen>
+
+    <dimen name="dp_85">143.6146dp</dimen>
+
+    <dimen name="dp_86">145.3042dp</dimen>
+
+    <dimen name="dp_87">146.9938dp</dimen>
+
+    <dimen name="dp_88">148.6833dp</dimen>
+
+    <dimen name="dp_89">150.3729dp</dimen>
+
+    <dimen name="dp_90">152.0625dp</dimen>
+
+    <dimen name="dp_91">153.7521dp</dimen>
+
+    <dimen name="dp_92">155.4417dp</dimen>
+
+    <dimen name="dp_93">157.1313dp</dimen>
+
+    <dimen name="dp_94">158.8208dp</dimen>
+
+    <dimen name="dp_95">160.5104dp</dimen>
+
+    <dimen name="dp_96">162.2000dp</dimen>
+
+    <dimen name="dp_97">163.8896dp</dimen>
+
+    <dimen name="dp_98">165.5792dp</dimen>
+
+    <dimen name="dp_99">167.2688dp</dimen>
+
+    <dimen name="dp_100">168.9583dp</dimen>
+
+    <dimen name="dp_101">170.6479dp</dimen>
+
+    <dimen name="dp_102">172.3375dp</dimen>
+
+    <dimen name="dp_103">174.0271dp</dimen>
+
+    <dimen name="dp_104">175.7167dp</dimen>
+
+    <dimen name="dp_104_5">176.5615dp</dimen>
+
+    <dimen name="dp_105">177.4062dp</dimen>
+
+    <dimen name="dp_106">179.0958dp</dimen>
+
+    <dimen name="dp_107">180.7854dp</dimen>
+
+    <dimen name="dp_108">182.4750dp</dimen>
+
+    <dimen name="dp_109">184.1646dp</dimen>
+
+    <dimen name="dp_110">185.8542dp</dimen>
+
+    <dimen name="dp_111">187.5438dp</dimen>
+
+    <dimen name="dp_112">189.2333dp</dimen>
+
+    <dimen name="dp_113">190.9229dp</dimen>
+
+    <dimen name="dp_114">192.6125dp</dimen>
+
+    <dimen name="dp_115">194.3021dp</dimen>
+
+    <dimen name="dp_116">195.9917dp</dimen>
+
+    <dimen name="dp_117">197.6813dp</dimen>
+
+    <dimen name="dp_118">199.3708dp</dimen>
+
+    <dimen name="dp_119">201.0604dp</dimen>
+
+    <dimen name="dp_120">202.7500dp</dimen>
+
+    <dimen name="dp_121">204.4396dp</dimen>
+
+    <dimen name="dp_122">206.1292dp</dimen>
+
+    <dimen name="dp_123">207.8188dp</dimen>
+
+    <dimen name="dp_124">209.5083dp</dimen>
+
+    <dimen name="dp_125">211.1979dp</dimen>
+
+    <dimen name="dp_126">212.8875dp</dimen>
+
+    <dimen name="dp_127">214.5771dp</dimen>
+
+    <dimen name="dp_128">216.2667dp</dimen>
+
+    <dimen name="dp_129">217.9563dp</dimen>
+
+    <dimen name="dp_130">219.6458dp</dimen>
+
+    <dimen name="dp_131">221.3354dp</dimen>
+
+    <dimen name="dp_132">223.0250dp</dimen>
+
+    <dimen name="dp_133">224.7146dp</dimen>
+
+    <dimen name="dp_134">226.4042dp</dimen>
+
+    <dimen name="dp_134_5">227.2490dp</dimen>
+
+    <dimen name="dp_135">228.0938dp</dimen>
+
+    <dimen name="dp_136">229.7833dp</dimen>
+
+    <dimen name="dp_137">231.4729dp</dimen>
+
+    <dimen name="dp_138">233.1625dp</dimen>
+
+    <dimen name="dp_139">234.8521dp</dimen>
+
+    <dimen name="dp_140">236.5417dp</dimen>
+
+    <dimen name="dp_141">238.2313dp</dimen>
+
+    <dimen name="dp_142">239.9208dp</dimen>
+
+    <dimen name="dp_143">241.6104dp</dimen>
+
+    <dimen name="dp_144">243.3000dp</dimen>
+
+    <dimen name="dp_145">244.9896dp</dimen>
+
+    <dimen name="dp_146">246.6792dp</dimen>
+
+    <dimen name="dp_147">248.3688dp</dimen>
+
+    <dimen name="dp_148">250.0583dp</dimen>
+
+    <dimen name="dp_149">251.7479dp</dimen>
+
+    <dimen name="dp_150">253.4375dp</dimen>
+
+    <dimen name="dp_151">255.1271dp</dimen>
+
+    <dimen name="dp_152">256.8167dp</dimen>
+
+    <dimen name="dp_153">258.5063dp</dimen>
+
+    <dimen name="dp_154">260.1958dp</dimen>
+
+    <dimen name="dp_155">261.8854dp</dimen>
+
+    <dimen name="dp_156">263.5750dp</dimen>
+
+    <dimen name="dp_157">265.2646dp</dimen>
+
+    <dimen name="dp_158">266.9542dp</dimen>
+
+    <dimen name="dp_159">268.6438dp</dimen>
+
+    <dimen name="dp_160">270.3333dp</dimen>
+
+    <dimen name="dp_161">272.0229dp</dimen>
+
+    <dimen name="dp_162">273.7125dp</dimen>
+
+    <dimen name="dp_163">275.4021dp</dimen>
+
+    <dimen name="dp_164">277.0917dp</dimen>
+
+    <dimen name="dp_165">278.7812dp</dimen>
+
+    <dimen name="dp_166">280.4708dp</dimen>
+
+    <dimen name="dp_167">282.1604dp</dimen>
+
+    <dimen name="dp_168">283.8500dp</dimen>
+
+    <dimen name="dp_169">285.5396dp</dimen>
+
+    <dimen name="dp_170">287.2292dp</dimen>
+
+    <dimen name="dp_171">288.9188dp</dimen>
+
+    <dimen name="dp_172">290.6083dp</dimen>
+
+    <dimen name="dp_173">292.2979dp</dimen>
+
+    <dimen name="dp_174">293.9875dp</dimen>
+
+    <dimen name="dp_175">295.6771dp</dimen>
+
+    <dimen name="dp_176">297.3667dp</dimen>
+
+    <dimen name="dp_177">299.0563dp</dimen>
+
+    <dimen name="dp_178">300.7458dp</dimen>
+
+    <dimen name="dp_179">302.4354dp</dimen>
+
+    <dimen name="dp_180">304.1250dp</dimen>
+
+    <dimen name="dp_181">305.8146dp</dimen>
+
+    <dimen name="dp_182">307.5042dp</dimen>
+
+    <dimen name="dp_183">309.1938dp</dimen>
+
+    <dimen name="dp_184">310.8833dp</dimen>
+
+    <dimen name="dp_185">312.5729dp</dimen>
+
+    <dimen name="dp_186">314.2625dp</dimen>
+
+    <dimen name="dp_187">315.9521dp</dimen>
+
+    <dimen name="dp_188">317.6417dp</dimen>
+
+    <dimen name="dp_189">319.3313dp</dimen>
+
+    <dimen name="dp_190">321.0208dp</dimen>
+
+    <dimen name="dp_191">322.7104dp</dimen>
+
+    <dimen name="dp_191_25">323.1328dp</dimen>
+
+    <dimen name="dp_192">324.4000dp</dimen>
+
+    <dimen name="dp_193">326.0896dp</dimen>
+
+    <dimen name="dp_194">327.7792dp</dimen>
+
+    <dimen name="dp_195">329.4688dp</dimen>
+
+    <dimen name="dp_196">331.1583dp</dimen>
+
+    <dimen name="dp_197">332.8479dp</dimen>
+
+    <dimen name="dp_198">334.5375dp</dimen>
+
+    <dimen name="dp_199">336.2271dp</dimen>
+
+    <dimen name="dp_200">337.9167dp</dimen>
+
+    <dimen name="dp_201">339.6063dp</dimen>
+
+    <dimen name="dp_202">341.2958dp</dimen>
+
+    <dimen name="dp_203">342.9854dp</dimen>
+
+    <dimen name="dp_204">344.6750dp</dimen>
+
+    <dimen name="dp_205">346.3646dp</dimen>
+
+    <dimen name="dp_206">348.0542dp</dimen>
+
+    <dimen name="dp_207">349.7438dp</dimen>
+
+    <dimen name="dp_208">351.4333dp</dimen>
+
+    <dimen name="dp_209">353.1229dp</dimen>
+
+    <dimen name="dp_210">354.8125dp</dimen>
+
+    <dimen name="dp_211">356.5021dp</dimen>
+
+    <dimen name="dp_212">358.1917dp</dimen>
+
+    <dimen name="dp_213">359.8813dp</dimen>
+
+    <dimen name="dp_214">361.5708dp</dimen>
+
+    <dimen name="dp_215">363.2604dp</dimen>
+
+    <dimen name="dp_216">364.9500dp</dimen>
+
+    <dimen name="dp_217">366.6396dp</dimen>
+
+    <dimen name="dp_218">368.3292dp</dimen>
+
+    <dimen name="dp_219">370.0188dp</dimen>
+
+    <dimen name="dp_220">371.7083dp</dimen>
+
+    <dimen name="dp_221">373.3979dp</dimen>
+
+    <dimen name="dp_222">375.0875dp</dimen>
+
+    <dimen name="dp_223">376.7771dp</dimen>
+
+    <dimen name="dp_224">378.4667dp</dimen>
+
+    <dimen name="dp_225">380.1562dp</dimen>
+
+    <dimen name="dp_226">381.8458dp</dimen>
+
+    <dimen name="dp_227">383.5354dp</dimen>
+
+    <dimen name="dp_228">385.2250dp</dimen>
+
+    <dimen name="dp_229">386.9146dp</dimen>
+
+    <dimen name="dp_230">388.6042dp</dimen>
+
+    <dimen name="dp_231">390.2938dp</dimen>
+
+    <dimen name="dp_232">391.9833dp</dimen>
+
+    <dimen name="dp_233">393.6729dp</dimen>
+
+    <dimen name="dp_234">395.3625dp</dimen>
+
+    <dimen name="dp_235">397.0521dp</dimen>
+
+    <dimen name="dp_236">398.7417dp</dimen>
+
+    <dimen name="dp_237">400.4313dp</dimen>
+
+    <dimen name="dp_238">402.1208dp</dimen>
+
+    <dimen name="dp_239">403.8104dp</dimen>
+
+    <dimen name="dp_240">405.5000dp</dimen>
+
+    <dimen name="dp_241">407.1896dp</dimen>
+
+    <dimen name="dp_242">408.8792dp</dimen>
+
+    <dimen name="dp_243">410.5688dp</dimen>
+
+    <dimen name="dp_244">412.2583dp</dimen>
+
+    <dimen name="dp_245">413.9479dp</dimen>
+
+    <dimen name="dp_246">415.6375dp</dimen>
+
+    <dimen name="dp_247">417.3271dp</dimen>
+
+    <dimen name="dp_248">419.0167dp</dimen>
+
+    <dimen name="dp_249">420.7063dp</dimen>
+
+    <dimen name="dp_250">422.3958dp</dimen>
+
+    <dimen name="dp_251">424.0854dp</dimen>
+
+    <dimen name="dp_252">425.7750dp</dimen>
+
+    <dimen name="dp_253">427.4646dp</dimen>
+
+    <dimen name="dp_254">429.1542dp</dimen>
+
+    <dimen name="dp_255">430.8438dp</dimen>
+
+    <dimen name="dp_256">432.5333dp</dimen>
+
+    <dimen name="dp_257">434.2229dp</dimen>
+
+    <dimen name="dp_258">435.9125dp</dimen>
+
+    <dimen name="dp_259">437.6021dp</dimen>
+
+    <dimen name="dp_260">439.2917dp</dimen>
+
+    <dimen name="dp_261">440.9813dp</dimen>
+
+    <dimen name="dp_262">442.6708dp</dimen>
+
+    <dimen name="dp_263">444.3604dp</dimen>
+
+    <dimen name="dp_264">446.0500dp</dimen>
+
+    <dimen name="dp_265">447.7396dp</dimen>
+
+    <dimen name="dp_266">449.4292dp</dimen>
+
+    <dimen name="dp_267">451.1188dp</dimen>
+
+    <dimen name="dp_268">452.8083dp</dimen>
+
+    <dimen name="dp_269">454.4979dp</dimen>
+
+    <dimen name="dp_270">456.1875dp</dimen>
+
+    <dimen name="dp_271">457.8771dp</dimen>
+
+    <dimen name="dp_272">459.5667dp</dimen>
+
+    <dimen name="dp_273">461.2563dp</dimen>
+
+    <dimen name="dp_274">462.9458dp</dimen>
+
+    <dimen name="dp_275">464.6354dp</dimen>
+
+    <dimen name="dp_276">466.3250dp</dimen>
+
+    <dimen name="dp_277">468.0146dp</dimen>
+
+    <dimen name="dp_278">469.7042dp</dimen>
+
+    <dimen name="dp_279">471.3938dp</dimen>
+
+    <dimen name="dp_280">473.0833dp</dimen>
+
+    <dimen name="dp_281">474.7729dp</dimen>
+
+    <dimen name="dp_282">476.4625dp</dimen>
+
+    <dimen name="dp_283">478.1521dp</dimen>
+
+    <dimen name="dp_284">479.8417dp</dimen>
+
+    <dimen name="dp_285">481.5313dp</dimen>
+
+    <dimen name="dp_286">483.2208dp</dimen>
+
+    <dimen name="dp_287">484.9104dp</dimen>
+
+    <dimen name="dp_288">486.6000dp</dimen>
+
+    <dimen name="dp_289">488.2896dp</dimen>
+
+    <dimen name="dp_290">489.9792dp</dimen>
+
+    <dimen name="dp_291">491.6688dp</dimen>
+
+    <dimen name="dp_292">493.3583dp</dimen>
+
+    <dimen name="dp_293">495.0479dp</dimen>
+
+    <dimen name="dp_294">496.7375dp</dimen>
+
+    <dimen name="dp_295">498.4271dp</dimen>
+
+    <dimen name="dp_296">500.1167dp</dimen>
+
+    <dimen name="dp_297">501.8063dp</dimen>
+
+    <dimen name="dp_298">503.4958dp</dimen>
+
+    <dimen name="dp_299">505.1854dp</dimen>
+
+    <dimen name="dp_300">506.8750dp</dimen>
+
+    <dimen name="dp_301">508.5646dp</dimen>
+
+    <dimen name="dp_302">510.2542dp</dimen>
+
+    <dimen name="dp_303">511.9438dp</dimen>
+
+    <dimen name="dp_304">513.6333dp</dimen>
+
+    <dimen name="dp_305">515.3229dp</dimen>
+
+    <dimen name="dp_306">517.0125dp</dimen>
+
+    <dimen name="dp_307">518.7021dp</dimen>
+
+    <dimen name="dp_308">520.3917dp</dimen>
+
+    <dimen name="dp_309">522.0813dp</dimen>
+
+    <dimen name="dp_310">523.7708dp</dimen>
+
+    <dimen name="dp_311">525.4604dp</dimen>
+
+    <dimen name="dp_312">527.1500dp</dimen>
+
+    <dimen name="dp_313">528.8396dp</dimen>
+
+    <dimen name="dp_314">530.5292dp</dimen>
+
+    <dimen name="dp_315">532.2188dp</dimen>
+
+    <dimen name="dp_316">533.9083dp</dimen>
+
+    <dimen name="dp_317">535.5979dp</dimen>
+
+    <dimen name="dp_318">537.2875dp</dimen>
+
+    <dimen name="dp_319">538.9771dp</dimen>
+
+    <dimen name="dp_320">540.6667dp</dimen>
+
+    <dimen name="dp_321">542.3563dp</dimen>
+
+    <dimen name="dp_322">544.0458dp</dimen>
+
+    <dimen name="dp_323">545.7354dp</dimen>
+
+    <dimen name="dp_324">547.4250dp</dimen>
+
+    <dimen name="dp_325">549.1146dp</dimen>
+
+    <dimen name="dp_326">550.8042dp</dimen>
+
+    <dimen name="dp_327">552.4937dp</dimen>
+
+    <dimen name="dp_328">554.1833dp</dimen>
+
+    <dimen name="dp_329">555.8729dp</dimen>
+
+    <dimen name="dp_330">557.5625dp</dimen>
+
+    <dimen name="dp_331">559.2521dp</dimen>
+
+    <dimen name="dp_332">560.9417dp</dimen>
+
+    <dimen name="dp_333">562.6313dp</dimen>
+
+    <dimen name="dp_334">564.3208dp</dimen>
+
+    <dimen name="dp_335">566.0104dp</dimen>
+
+    <dimen name="dp_336">567.7000dp</dimen>
+
+    <dimen name="dp_337">569.3896dp</dimen>
+
+    <dimen name="dp_338">571.0792dp</dimen>
+
+    <dimen name="dp_339">572.7688dp</dimen>
+
+    <dimen name="dp_340">574.4583dp</dimen>
+
+    <dimen name="dp_341">576.1479dp</dimen>
+
+    <dimen name="dp_342">577.8375dp</dimen>
+
+    <dimen name="dp_343">579.5271dp</dimen>
+
+    <dimen name="dp_344">581.2167dp</dimen>
+
+    <dimen name="dp_345">582.9062dp</dimen>
+
+    <dimen name="dp_346">584.5958dp</dimen>
+
+    <dimen name="dp_347">586.2854dp</dimen>
+
+    <dimen name="dp_348">587.9750dp</dimen>
+
+    <dimen name="dp_349">589.6646dp</dimen>
+
+    <dimen name="dp_350">591.3542dp</dimen>
+
+    <dimen name="dp_351">593.0438dp</dimen>
+
+    <dimen name="dp_352">594.7333dp</dimen>
+
+    <dimen name="dp_353">596.4229dp</dimen>
+
+    <dimen name="dp_354">598.1125dp</dimen>
+
+    <dimen name="dp_355">599.8021dp</dimen>
+
+    <dimen name="dp_356">601.4917dp</dimen>
+
+    <dimen name="dp_357">603.1813dp</dimen>
+
+    <dimen name="dp_358">604.8708dp</dimen>
+
+    <dimen name="dp_359">606.5604dp</dimen>
+
+    <dimen name="dp_360">608.2500dp</dimen>
+
+    <dimen name="dp_365">616.6979dp</dimen>
+
+    <dimen name="dp_370">625.1458dp</dimen>
+
+    <dimen name="dp_400">675.8333dp</dimen>
+
+    <dimen name="dp_410">692.7292dp</dimen>
+
+    <dimen name="dp_422">713.0042dp</dimen>
+
+    <dimen name="dp_472">797.4833dp</dimen>
+
+    <dimen name="dp_500">844.7917dp</dimen>
+
+    <dimen name="dp_600">1013.7500dp</dimen>
+
+    <dimen name="dp_640">1081.3333dp</dimen>
+
+    <dimen name="dp_650">1098.2292dp</dimen>
+
+    <dimen name="dp_710">1199.6042dp</dimen>
+
+    <dimen name="dp_720">1216.5000dp</dimen>
+
+
+</resources>
diff --git a/system/basic/src/main/res/values-sw820dp/dimens.xml b/system/basic/src/main/res/values-sw820dp/dimens.xml
new file mode 100644
index 0000000..7dc7f70
--- /dev/null
+++ b/system/basic/src/main/res/values-sw820dp/dimens.xml
@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+
+    <dimen name="txt5">8.5417sp</dimen>
+
+    <dimen name="txt6">10.2500sp</dimen>
+
+    <dimen name="txt7">11.9583sp</dimen>
+
+    <dimen name="txt8">13.6667sp</dimen>
+
+    <dimen name="txt9">15.3750sp</dimen>
+
+    <dimen name="txt10">17.0833sp</dimen>
+
+    <dimen name="txt11">18.7917sp</dimen>
+
+    <dimen name="txt12">20.5000sp</dimen>
+
+    <dimen name="txt13">22.2083sp</dimen>
+
+    <dimen name="txt14">23.9167sp</dimen>
+
+    <dimen name="txt15">25.6250sp</dimen>
+
+    <dimen name="txt16">27.3333sp</dimen>
+
+    <dimen name="txt17">29.0417sp</dimen>
+
+    <dimen name="txt18">30.7500sp</dimen>
+
+    <dimen name="txt19">32.4583sp</dimen>
+
+    <dimen name="txt20">34.1667sp</dimen>
+
+    <dimen name="txt21">35.8750sp</dimen>
+
+    <dimen name="txt22">37.5833sp</dimen>
+
+    <dimen name="txt24">41.0000sp</dimen>
+
+    <dimen name="txt26">44.4167sp</dimen>
+
+    <dimen name="txt28">47.8333sp</dimen>
+
+    <dimen name="txt30">51.2500sp</dimen>
+
+    <dimen name="txt32">54.6667sp</dimen>
+
+    <dimen name="txt34">58.0833sp</dimen>
+
+    <dimen name="card_common_margin_left">@dimen/dp_15</dimen>
+
+    <dimen name="dp_m_60">-102.5000dp</dimen>
+
+    <dimen name="dp_m_30">-51.2500dp</dimen>
+
+    <dimen name="dp_m_20">-34.1667dp</dimen>
+
+    <dimen name="dp_m_12">-20.5000dp</dimen>
+
+    <dimen name="dp_m_10">-17.0833dp</dimen>
+
+    <dimen name="dp_m_8">-13.6667dp</dimen>
+
+    <dimen name="dp_m_5">-8.5417dp</dimen>
+
+    <dimen name="dp_m_2">-3.4167dp</dimen>
+
+    <dimen name="dp_m_1">-1.7083dp</dimen>
+
+    <dimen name="dp_0">0.0000dp</dimen>
+
+    <dimen name="dp_0_1">0.1708dp</dimen>
+
+    <dimen name="dp_0_5">0.8542dp</dimen>
+
+    <dimen name="dp_1">1.7083dp</dimen>
+
+    <dimen name="dp_1_5">2.5625dp</dimen>
+
+    <dimen name="dp_2">3.4167dp</dimen>
+
+    <dimen name="dp_2_5">4.2708dp</dimen>
+
+    <dimen name="dp_3">5.1250dp</dimen>
+
+    <dimen name="dp_3_5">5.9792dp</dimen>
+
+    <dimen name="dp_4">6.8333dp</dimen>
+
+    <dimen name="dp_4_5">7.6875dp</dimen>
+
+    <dimen name="dp_5">8.5417dp</dimen>
+
+    <dimen name="dp_6">10.2500dp</dimen>
+
+    <dimen name="dp_7">11.9583dp</dimen>
+
+    <dimen name="dp_7_5">12.8125dp</dimen>
+
+    <dimen name="dp_8">13.6667dp</dimen>
+
+    <dimen name="dp_9">15.3750dp</dimen>
+
+    <dimen name="dp_10">17.0833dp</dimen>
+
+    <dimen name="dp_11">18.7917dp</dimen>
+
+    <dimen name="dp_12">20.5000dp</dimen>
+
+    <dimen name="dp_13">22.2083dp</dimen>
+
+    <dimen name="dp_14">23.9167dp</dimen>
+
+    <dimen name="dp_15">25.6250dp</dimen>
+
+    <dimen name="dp_16">27.3333dp</dimen>
+
+    <dimen name="dp_17">29.0417dp</dimen>
+
+    <dimen name="dp_18">30.7500dp</dimen>
+
+    <dimen name="dp_19">32.4583dp</dimen>
+
+    <dimen name="dp_20">34.1667dp</dimen>
+
+    <dimen name="dp_21">35.8750dp</dimen>
+
+    <dimen name="dp_22">37.5833dp</dimen>
+
+    <dimen name="dp_23">39.2917dp</dimen>
+
+    <dimen name="dp_24">41.0000dp</dimen>
+
+    <dimen name="dp_25">42.7083dp</dimen>
+
+    <dimen name="dp_26">44.4167dp</dimen>
+
+    <dimen name="dp_27">46.1250dp</dimen>
+
+    <dimen name="dp_28">47.8333dp</dimen>
+
+    <dimen name="dp_29">49.5417dp</dimen>
+
+    <dimen name="dp_30">51.2500dp</dimen>
+
+    <dimen name="dp_31">52.9583dp</dimen>
+
+    <dimen name="dp_32">54.6667dp</dimen>
+
+    <dimen name="dp_33">56.3750dp</dimen>
+
+    <dimen name="dp_34">58.0833dp</dimen>
+
+    <dimen name="dp_35">59.7917dp</dimen>
+
+    <dimen name="dp_36">61.5000dp</dimen>
+
+    <dimen name="dp_37">63.2083dp</dimen>
+
+    <dimen name="dp_38">64.9167dp</dimen>
+
+    <dimen name="dp_39">66.6250dp</dimen>
+
+    <dimen name="dp_40">68.3333dp</dimen>
+
+    <dimen name="dp_41">70.0417dp</dimen>
+
+    <dimen name="dp_42">71.7500dp</dimen>
+
+    <dimen name="dp_43">73.4583dp</dimen>
+
+    <dimen name="dp_44">75.1667dp</dimen>
+
+    <dimen name="dp_45">76.8750dp</dimen>
+
+    <dimen name="dp_46">78.5833dp</dimen>
+
+    <dimen name="dp_47">80.2917dp</dimen>
+
+    <dimen name="dp_48">82.0000dp</dimen>
+
+    <dimen name="dp_49">83.7083dp</dimen>
+
+    <dimen name="dp_50">85.4167dp</dimen>
+
+    <dimen name="dp_51">87.1250dp</dimen>
+
+    <dimen name="dp_52">88.8333dp</dimen>
+
+    <dimen name="dp_53">90.5417dp</dimen>
+
+    <dimen name="dp_54">92.2500dp</dimen>
+
+    <dimen name="dp_55">93.9583dp</dimen>
+
+    <dimen name="dp_56">95.6667dp</dimen>
+
+    <dimen name="dp_57">97.3750dp</dimen>
+
+    <dimen name="dp_58">99.0833dp</dimen>
+
+    <dimen name="dp_59">100.7917dp</dimen>
+
+    <dimen name="dp_60">102.5000dp</dimen>
+
+    <dimen name="dp_61">104.2083dp</dimen>
+
+    <dimen name="dp_62">105.9167dp</dimen>
+
+    <dimen name="dp_63">107.6250dp</dimen>
+
+    <dimen name="dp_64">109.3333dp</dimen>
+
+    <dimen name="dp_65">111.0417dp</dimen>
+
+    <dimen name="dp_66">112.7500dp</dimen>
+
+    <dimen name="dp_67">114.4583dp</dimen>
+
+    <dimen name="dp_68">116.1667dp</dimen>
+
+    <dimen name="dp_69">117.8750dp</dimen>
+
+    <dimen name="dp_70">119.5833dp</dimen>
+
+    <dimen name="dp_71">121.2917dp</dimen>
+
+    <dimen name="dp_72">123.0000dp</dimen>
+
+    <dimen name="dp_73">124.7083dp</dimen>
+
+    <dimen name="dp_74">126.4167dp</dimen>
+
+    <dimen name="dp_75">128.1250dp</dimen>
+
+    <dimen name="dp_76">129.8333dp</dimen>
+
+    <dimen name="dp_77">131.5417dp</dimen>
+
+    <dimen name="dp_78">133.2500dp</dimen>
+
+    <dimen name="dp_79">134.9583dp</dimen>
+
+    <dimen name="dp_80">136.6667dp</dimen>
+
+    <dimen name="dp_81">138.3750dp</dimen>
+
+    <dimen name="dp_82">140.0833dp</dimen>
+
+    <dimen name="dp_83">141.7917dp</dimen>
+
+    <dimen name="dp_84">143.5000dp</dimen>
+
+    <dimen name="dp_85">145.2083dp</dimen>
+
+    <dimen name="dp_86">146.9167dp</dimen>
+
+    <dimen name="dp_87">148.6250dp</dimen>
+
+    <dimen name="dp_88">150.3333dp</dimen>
+
+    <dimen name="dp_89">152.0417dp</dimen>
+
+    <dimen name="dp_90">153.7500dp</dimen>
+
+    <dimen name="dp_91">155.4583dp</dimen>
+
+    <dimen name="dp_92">157.1667dp</dimen>
+
+    <dimen name="dp_93">158.8750dp</dimen>
+
+    <dimen name="dp_94">160.5833dp</dimen>
+
+    <dimen name="dp_95">162.2917dp</dimen>
+
+    <dimen name="dp_96">164.0000dp</dimen>
+
+    <dimen name="dp_97">165.7083dp</dimen>
+
+    <dimen name="dp_98">167.4167dp</dimen>
+
+    <dimen name="dp_99">169.1250dp</dimen>
+
+    <dimen name="dp_100">170.8333dp</dimen>
+
+    <dimen name="dp_101">172.5417dp</dimen>
+
+    <dimen name="dp_102">174.2500dp</dimen>
+
+    <dimen name="dp_103">175.9583dp</dimen>
+
+    <dimen name="dp_104">177.6667dp</dimen>
+
+    <dimen name="dp_104_5">178.5208dp</dimen>
+
+    <dimen name="dp_105">179.3750dp</dimen>
+
+    <dimen name="dp_106">181.0833dp</dimen>
+
+    <dimen name="dp_107">182.7917dp</dimen>
+
+    <dimen name="dp_108">184.5000dp</dimen>
+
+    <dimen name="dp_109">186.2083dp</dimen>
+
+    <dimen name="dp_110">187.9167dp</dimen>
+
+    <dimen name="dp_111">189.6250dp</dimen>
+
+    <dimen name="dp_112">191.3333dp</dimen>
+
+    <dimen name="dp_113">193.0417dp</dimen>
+
+    <dimen name="dp_114">194.7500dp</dimen>
+
+    <dimen name="dp_115">196.4583dp</dimen>
+
+    <dimen name="dp_116">198.1667dp</dimen>
+
+    <dimen name="dp_117">199.8750dp</dimen>
+
+    <dimen name="dp_118">201.5833dp</dimen>
+
+    <dimen name="dp_119">203.2917dp</dimen>
+
+    <dimen name="dp_120">205.0000dp</dimen>
+
+    <dimen name="dp_121">206.7083dp</dimen>
+
+    <dimen name="dp_122">208.4167dp</dimen>
+
+    <dimen name="dp_123">210.1250dp</dimen>
+
+    <dimen name="dp_124">211.8333dp</dimen>
+
+    <dimen name="dp_125">213.5417dp</dimen>
+
+    <dimen name="dp_126">215.2500dp</dimen>
+
+    <dimen name="dp_127">216.9583dp</dimen>
+
+    <dimen name="dp_128">218.6667dp</dimen>
+
+    <dimen name="dp_129">220.3750dp</dimen>
+
+    <dimen name="dp_130">222.0833dp</dimen>
+
+    <dimen name="dp_131">223.7917dp</dimen>
+
+    <dimen name="dp_132">225.5000dp</dimen>
+
+    <dimen name="dp_133">227.2083dp</dimen>
+
+    <dimen name="dp_134">228.9167dp</dimen>
+
+    <dimen name="dp_134_5">229.7708dp</dimen>
+
+    <dimen name="dp_135">230.6250dp</dimen>
+
+    <dimen name="dp_136">232.3333dp</dimen>
+
+    <dimen name="dp_137">234.0417dp</dimen>
+
+    <dimen name="dp_138">235.7500dp</dimen>
+
+    <dimen name="dp_139">237.4583dp</dimen>
+
+    <dimen name="dp_140">239.1667dp</dimen>
+
+    <dimen name="dp_141">240.8750dp</dimen>
+
+    <dimen name="dp_142">242.5833dp</dimen>
+
+    <dimen name="dp_143">244.2917dp</dimen>
+
+    <dimen name="dp_144">246.0000dp</dimen>
+
+    <dimen name="dp_145">247.7083dp</dimen>
+
+    <dimen name="dp_146">249.4167dp</dimen>
+
+    <dimen name="dp_147">251.1250dp</dimen>
+
+    <dimen name="dp_148">252.8333dp</dimen>
+
+    <dimen name="dp_149">254.5417dp</dimen>
+
+    <dimen name="dp_150">256.2500dp</dimen>
+
+    <dimen name="dp_151">257.9583dp</dimen>
+
+    <dimen name="dp_152">259.6667dp</dimen>
+
+    <dimen name="dp_153">261.3750dp</dimen>
+
+    <dimen name="dp_154">263.0833dp</dimen>
+
+    <dimen name="dp_155">264.7917dp</dimen>
+
+    <dimen name="dp_156">266.5000dp</dimen>
+
+    <dimen name="dp_157">268.2083dp</dimen>
+
+    <dimen name="dp_158">269.9167dp</dimen>
+
+    <dimen name="dp_159">271.6250dp</dimen>
+
+    <dimen name="dp_160">273.3333dp</dimen>
+
+    <dimen name="dp_161">275.0417dp</dimen>
+
+    <dimen name="dp_162">276.7500dp</dimen>
+
+    <dimen name="dp_163">278.4583dp</dimen>
+
+    <dimen name="dp_164">280.1667dp</dimen>
+
+    <dimen name="dp_165">281.8750dp</dimen>
+
+    <dimen name="dp_166">283.5833dp</dimen>
+
+    <dimen name="dp_167">285.2917dp</dimen>
+
+    <dimen name="dp_168">287.0000dp</dimen>
+
+    <dimen name="dp_169">288.7083dp</dimen>
+
+    <dimen name="dp_170">290.4167dp</dimen>
+
+    <dimen name="dp_171">292.1250dp</dimen>
+
+    <dimen name="dp_172">293.8333dp</dimen>
+
+    <dimen name="dp_173">295.5417dp</dimen>
+
+    <dimen name="dp_174">297.2500dp</dimen>
+
+    <dimen name="dp_175">298.9583dp</dimen>
+
+    <dimen name="dp_176">300.6667dp</dimen>
+
+    <dimen name="dp_177">302.3750dp</dimen>
+
+    <dimen name="dp_178">304.0833dp</dimen>
+
+    <dimen name="dp_179">305.7917dp</dimen>
+
+    <dimen name="dp_180">307.5000dp</dimen>
+
+    <dimen name="dp_181">309.2083dp</dimen>
+
+    <dimen name="dp_182">310.9167dp</dimen>
+
+    <dimen name="dp_183">312.6250dp</dimen>
+
+    <dimen name="dp_184">314.3333dp</dimen>
+
+    <dimen name="dp_185">316.0417dp</dimen>
+
+    <dimen name="dp_186">317.7500dp</dimen>
+
+    <dimen name="dp_187">319.4583dp</dimen>
+
+    <dimen name="dp_188">321.1667dp</dimen>
+
+    <dimen name="dp_189">322.8750dp</dimen>
+
+    <dimen name="dp_190">324.5833dp</dimen>
+
+    <dimen name="dp_191">326.2917dp</dimen>
+
+    <dimen name="dp_191_25">326.7188dp</dimen>
+
+    <dimen name="dp_192">328.0000dp</dimen>
+
+    <dimen name="dp_193">329.7083dp</dimen>
+
+    <dimen name="dp_194">331.4167dp</dimen>
+
+    <dimen name="dp_195">333.1250dp</dimen>
+
+    <dimen name="dp_196">334.8333dp</dimen>
+
+    <dimen name="dp_197">336.5417dp</dimen>
+
+    <dimen name="dp_198">338.2500dp</dimen>
+
+    <dimen name="dp_199">339.9583dp</dimen>
+
+    <dimen name="dp_200">341.6667dp</dimen>
+
+    <dimen name="dp_201">343.3750dp</dimen>
+
+    <dimen name="dp_202">345.0833dp</dimen>
+
+    <dimen name="dp_203">346.7917dp</dimen>
+
+    <dimen name="dp_204">348.5000dp</dimen>
+
+    <dimen name="dp_205">350.2083dp</dimen>
+
+    <dimen name="dp_206">351.9167dp</dimen>
+
+    <dimen name="dp_207">353.6250dp</dimen>
+
+    <dimen name="dp_208">355.3333dp</dimen>
+
+    <dimen name="dp_209">357.0417dp</dimen>
+
+    <dimen name="dp_210">358.7500dp</dimen>
+
+    <dimen name="dp_211">360.4583dp</dimen>
+
+    <dimen name="dp_212">362.1667dp</dimen>
+
+    <dimen name="dp_213">363.8750dp</dimen>
+
+    <dimen name="dp_214">365.5833dp</dimen>
+
+    <dimen name="dp_215">367.2917dp</dimen>
+
+    <dimen name="dp_216">369.0000dp</dimen>
+
+    <dimen name="dp_217">370.7083dp</dimen>
+
+    <dimen name="dp_218">372.4167dp</dimen>
+
+    <dimen name="dp_219">374.1250dp</dimen>
+
+    <dimen name="dp_220">375.8333dp</dimen>
+
+    <dimen name="dp_221">377.5417dp</dimen>
+
+    <dimen name="dp_222">379.2500dp</dimen>
+
+    <dimen name="dp_223">380.9583dp</dimen>
+
+    <dimen name="dp_224">382.6667dp</dimen>
+
+    <dimen name="dp_225">384.3750dp</dimen>
+
+    <dimen name="dp_226">386.0833dp</dimen>
+
+    <dimen name="dp_227">387.7917dp</dimen>
+
+    <dimen name="dp_228">389.5000dp</dimen>
+
+    <dimen name="dp_229">391.2083dp</dimen>
+
+    <dimen name="dp_230">392.9167dp</dimen>
+
+    <dimen name="dp_231">394.6250dp</dimen>
+
+    <dimen name="dp_232">396.3333dp</dimen>
+
+    <dimen name="dp_233">398.0417dp</dimen>
+
+    <dimen name="dp_234">399.7500dp</dimen>
+
+    <dimen name="dp_235">401.4583dp</dimen>
+
+    <dimen name="dp_236">403.1667dp</dimen>
+
+    <dimen name="dp_237">404.8750dp</dimen>
+
+    <dimen name="dp_238">406.5833dp</dimen>
+
+    <dimen name="dp_239">408.2917dp</dimen>
+
+    <dimen name="dp_240">410.0000dp</dimen>
+
+    <dimen name="dp_241">411.7083dp</dimen>
+
+    <dimen name="dp_242">413.4167dp</dimen>
+
+    <dimen name="dp_243">415.1250dp</dimen>
+
+    <dimen name="dp_244">416.8333dp</dimen>
+
+    <dimen name="dp_245">418.5417dp</dimen>
+
+    <dimen name="dp_246">420.2500dp</dimen>
+
+    <dimen name="dp_247">421.9583dp</dimen>
+
+    <dimen name="dp_248">423.6667dp</dimen>
+
+    <dimen name="dp_249">425.3750dp</dimen>
+
+    <dimen name="dp_250">427.0833dp</dimen>
+
+    <dimen name="dp_251">428.7917dp</dimen>
+
+    <dimen name="dp_252">430.5000dp</dimen>
+
+    <dimen name="dp_253">432.2083dp</dimen>
+
+    <dimen name="dp_254">433.9167dp</dimen>
+
+    <dimen name="dp_255">435.6250dp</dimen>
+
+    <dimen name="dp_256">437.3333dp</dimen>
+
+    <dimen name="dp_257">439.0417dp</dimen>
+
+    <dimen name="dp_258">440.7500dp</dimen>
+
+    <dimen name="dp_259">442.4583dp</dimen>
+
+    <dimen name="dp_260">444.1667dp</dimen>
+
+    <dimen name="dp_261">445.8750dp</dimen>
+
+    <dimen name="dp_262">447.5833dp</dimen>
+
+    <dimen name="dp_263">449.2917dp</dimen>
+
+    <dimen name="dp_264">451.0000dp</dimen>
+
+    <dimen name="dp_265">452.7083dp</dimen>
+
+    <dimen name="dp_266">454.4167dp</dimen>
+
+    <dimen name="dp_267">456.1250dp</dimen>
+
+    <dimen name="dp_268">457.8333dp</dimen>
+
+    <dimen name="dp_269">459.5417dp</dimen>
+
+    <dimen name="dp_270">461.2500dp</dimen>
+
+    <dimen name="dp_271">462.9583dp</dimen>
+
+    <dimen name="dp_272">464.6667dp</dimen>
+
+    <dimen name="dp_273">466.3750dp</dimen>
+
+    <dimen name="dp_274">468.0833dp</dimen>
+
+    <dimen name="dp_275">469.7917dp</dimen>
+
+    <dimen name="dp_276">471.5000dp</dimen>
+
+    <dimen name="dp_277">473.2083dp</dimen>
+
+    <dimen name="dp_278">474.9167dp</dimen>
+
+    <dimen name="dp_279">476.6250dp</dimen>
+
+    <dimen name="dp_280">478.3333dp</dimen>
+
+    <dimen name="dp_281">480.0417dp</dimen>
+
+    <dimen name="dp_282">481.7500dp</dimen>
+
+    <dimen name="dp_283">483.4583dp</dimen>
+
+    <dimen name="dp_284">485.1667dp</dimen>
+
+    <dimen name="dp_285">486.8750dp</dimen>
+
+    <dimen name="dp_286">488.5833dp</dimen>
+
+    <dimen name="dp_287">490.2917dp</dimen>
+
+    <dimen name="dp_288">492.0000dp</dimen>
+
+    <dimen name="dp_289">493.7083dp</dimen>
+
+    <dimen name="dp_290">495.4167dp</dimen>
+
+    <dimen name="dp_291">497.1250dp</dimen>
+
+    <dimen name="dp_292">498.8333dp</dimen>
+
+    <dimen name="dp_293">500.5417dp</dimen>
+
+    <dimen name="dp_294">502.2500dp</dimen>
+
+    <dimen name="dp_295">503.9583dp</dimen>
+
+    <dimen name="dp_296">505.6667dp</dimen>
+
+    <dimen name="dp_297">507.3750dp</dimen>
+
+    <dimen name="dp_298">509.0833dp</dimen>
+
+    <dimen name="dp_299">510.7917dp</dimen>
+
+    <dimen name="dp_300">512.5000dp</dimen>
+
+    <dimen name="dp_301">514.2083dp</dimen>
+
+    <dimen name="dp_302">515.9167dp</dimen>
+
+    <dimen name="dp_303">517.6250dp</dimen>
+
+    <dimen name="dp_304">519.3333dp</dimen>
+
+    <dimen name="dp_305">521.0417dp</dimen>
+
+    <dimen name="dp_306">522.7500dp</dimen>
+
+    <dimen name="dp_307">524.4583dp</dimen>
+
+    <dimen name="dp_308">526.1667dp</dimen>
+
+    <dimen name="dp_309">527.8750dp</dimen>
+
+    <dimen name="dp_310">529.5833dp</dimen>
+
+    <dimen name="dp_311">531.2917dp</dimen>
+
+    <dimen name="dp_312">533.0000dp</dimen>
+
+    <dimen name="dp_313">534.7083dp</dimen>
+
+    <dimen name="dp_314">536.4167dp</dimen>
+
+    <dimen name="dp_315">538.1250dp</dimen>
+
+    <dimen name="dp_316">539.8333dp</dimen>
+
+    <dimen name="dp_317">541.5417dp</dimen>
+
+    <dimen name="dp_318">543.2500dp</dimen>
+
+    <dimen name="dp_319">544.9583dp</dimen>
+
+    <dimen name="dp_320">546.6667dp</dimen>
+
+    <dimen name="dp_321">548.3750dp</dimen>
+
+    <dimen name="dp_322">550.0833dp</dimen>
+
+    <dimen name="dp_323">551.7917dp</dimen>
+
+    <dimen name="dp_324">553.5000dp</dimen>
+
+    <dimen name="dp_325">555.2083dp</dimen>
+
+    <dimen name="dp_326">556.9167dp</dimen>
+
+    <dimen name="dp_327">558.6250dp</dimen>
+
+    <dimen name="dp_328">560.3333dp</dimen>
+
+    <dimen name="dp_329">562.0417dp</dimen>
+
+    <dimen name="dp_330">563.7500dp</dimen>
+
+    <dimen name="dp_331">565.4583dp</dimen>
+
+    <dimen name="dp_332">567.1667dp</dimen>
+
+    <dimen name="dp_333">568.8750dp</dimen>
+
+    <dimen name="dp_334">570.5833dp</dimen>
+
+    <dimen name="dp_335">572.2917dp</dimen>
+
+    <dimen name="dp_336">574.0000dp</dimen>
+
+    <dimen name="dp_337">575.7083dp</dimen>
+
+    <dimen name="dp_338">577.4167dp</dimen>
+
+    <dimen name="dp_339">579.1250dp</dimen>
+
+    <dimen name="dp_340">580.8333dp</dimen>
+
+    <dimen name="dp_341">582.5417dp</dimen>
+
+    <dimen name="dp_342">584.2500dp</dimen>
+
+    <dimen name="dp_343">585.9583dp</dimen>
+
+    <dimen name="dp_344">587.6667dp</dimen>
+
+    <dimen name="dp_345">589.3750dp</dimen>
+
+    <dimen name="dp_346">591.0833dp</dimen>
+
+    <dimen name="dp_347">592.7917dp</dimen>
+
+    <dimen name="dp_348">594.5000dp</dimen>
+
+    <dimen name="dp_349">596.2083dp</dimen>
+
+    <dimen name="dp_350">597.9167dp</dimen>
+
+    <dimen name="dp_351">599.6250dp</dimen>
+
+    <dimen name="dp_352">601.3333dp</dimen>
+
+    <dimen name="dp_353">603.0417dp</dimen>
+
+    <dimen name="dp_354">604.7500dp</dimen>
+
+    <dimen name="dp_355">606.4583dp</dimen>
+
+    <dimen name="dp_356">608.1667dp</dimen>
+
+    <dimen name="dp_357">609.8750dp</dimen>
+
+    <dimen name="dp_358">611.5833dp</dimen>
+
+    <dimen name="dp_359">613.2917dp</dimen>
+
+    <dimen name="dp_360">615.0000dp</dimen>
+
+    <dimen name="dp_365">623.5417dp</dimen>
+
+    <dimen name="dp_370">632.0833dp</dimen>
+
+    <dimen name="dp_400">683.3333dp</dimen>
+
+    <dimen name="dp_410">700.4167dp</dimen>
+
+    <dimen name="dp_422">720.9167dp</dimen>
+
+    <dimen name="dp_472">806.3333dp</dimen>
+
+    <dimen name="dp_500">854.1667dp</dimen>
+
+    <dimen name="dp_600">1025.0000dp</dimen>
+
+    <dimen name="dp_640">1093.3333dp</dimen>
+
+    <dimen name="dp_650">1110.4167dp</dimen>
+
+    <dimen name="dp_710">1212.9167dp</dimen>
+
+    <dimen name="dp_720">1230.0000dp</dimen>
+
+
+</resources>
diff --git a/system/basic/src/main/res/values-sw960dp/dimens.xml b/system/basic/src/main/res/values-sw960dp/dimens.xml
new file mode 100644
index 0000000..08e6816
--- /dev/null
+++ b/system/basic/src/main/res/values-sw960dp/dimens.xml
@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+
+    <dimen name="txt5">10.0000sp</dimen>
+
+    <dimen name="txt6">12.0000sp</dimen>
+
+    <dimen name="txt7">14.0000sp</dimen>
+
+    <dimen name="txt8">16.0000sp</dimen>
+
+    <dimen name="txt9">18.0000sp</dimen>
+
+    <dimen name="txt10">20.0000sp</dimen>
+
+    <dimen name="txt11">22.0000sp</dimen>
+
+    <dimen name="txt12">24.0000sp</dimen>
+
+    <dimen name="txt13">26.0000sp</dimen>
+
+    <dimen name="txt14">28.0000sp</dimen>
+
+    <dimen name="txt15">30.0000sp</dimen>
+
+    <dimen name="txt16">32.0000sp</dimen>
+
+    <dimen name="txt17">34.0000sp</dimen>
+
+    <dimen name="txt18">36.0000sp</dimen>
+
+    <dimen name="txt19">38.0000sp</dimen>
+
+    <dimen name="txt20">40.0000sp</dimen>
+
+    <dimen name="txt21">42.0000sp</dimen>
+
+    <dimen name="txt22">44.0000sp</dimen>
+
+    <dimen name="txt24">48.0000sp</dimen>
+
+    <dimen name="txt26">52.0000sp</dimen>
+
+    <dimen name="txt28">56.0000sp</dimen>
+
+    <dimen name="txt30">60.0000sp</dimen>
+
+    <dimen name="txt32">64.0000sp</dimen>
+
+    <dimen name="txt34">68.0000sp</dimen>
+
+    <dimen name="card_common_margin_left">@dimen/dp_15</dimen>
+
+    <dimen name="dp_m_60">-120.0000dp</dimen>
+
+    <dimen name="dp_m_30">-60.0000dp</dimen>
+
+    <dimen name="dp_m_20">-40.0000dp</dimen>
+
+    <dimen name="dp_m_12">-24.0000dp</dimen>
+
+    <dimen name="dp_m_10">-20.0000dp</dimen>
+
+    <dimen name="dp_m_8">-16.0000dp</dimen>
+
+    <dimen name="dp_m_5">-10.0000dp</dimen>
+
+    <dimen name="dp_m_2">-4.0000dp</dimen>
+
+    <dimen name="dp_m_1">-2.0000dp</dimen>
+
+    <dimen name="dp_0">0.0000dp</dimen>
+
+    <dimen name="dp_0_1">0.2000dp</dimen>
+
+    <dimen name="dp_0_5">1.0000dp</dimen>
+
+    <dimen name="dp_1">2.0000dp</dimen>
+
+    <dimen name="dp_1_5">3.0000dp</dimen>
+
+    <dimen name="dp_2">4.0000dp</dimen>
+
+    <dimen name="dp_2_5">5.0000dp</dimen>
+
+    <dimen name="dp_3">6.0000dp</dimen>
+
+    <dimen name="dp_3_5">7.0000dp</dimen>
+
+    <dimen name="dp_4">8.0000dp</dimen>
+
+    <dimen name="dp_4_5">9.0000dp</dimen>
+
+    <dimen name="dp_5">10.0000dp</dimen>
+
+    <dimen name="dp_6">12.0000dp</dimen>
+
+    <dimen name="dp_7">14.0000dp</dimen>
+
+    <dimen name="dp_7_5">15.0000dp</dimen>
+
+    <dimen name="dp_8">16.0000dp</dimen>
+
+    <dimen name="dp_9">18.0000dp</dimen>
+
+    <dimen name="dp_10">20.0000dp</dimen>
+
+    <dimen name="dp_11">22.0000dp</dimen>
+
+    <dimen name="dp_12">24.0000dp</dimen>
+
+    <dimen name="dp_13">26.0000dp</dimen>
+
+    <dimen name="dp_14">28.0000dp</dimen>
+
+    <dimen name="dp_15">30.0000dp</dimen>
+
+    <dimen name="dp_16">32.0000dp</dimen>
+
+    <dimen name="dp_17">34.0000dp</dimen>
+
+    <dimen name="dp_18">36.0000dp</dimen>
+
+    <dimen name="dp_19">38.0000dp</dimen>
+
+    <dimen name="dp_20">40.0000dp</dimen>
+
+    <dimen name="dp_21">42.0000dp</dimen>
+
+    <dimen name="dp_22">44.0000dp</dimen>
+
+    <dimen name="dp_23">46.0000dp</dimen>
+
+    <dimen name="dp_24">48.0000dp</dimen>
+
+    <dimen name="dp_25">50.0000dp</dimen>
+
+    <dimen name="dp_26">52.0000dp</dimen>
+
+    <dimen name="dp_27">54.0000dp</dimen>
+
+    <dimen name="dp_28">56.0000dp</dimen>
+
+    <dimen name="dp_29">58.0000dp</dimen>
+
+    <dimen name="dp_30">60.0000dp</dimen>
+
+    <dimen name="dp_31">62.0000dp</dimen>
+
+    <dimen name="dp_32">64.0000dp</dimen>
+
+    <dimen name="dp_33">66.0000dp</dimen>
+
+    <dimen name="dp_34">68.0000dp</dimen>
+
+    <dimen name="dp_35">70.0000dp</dimen>
+
+    <dimen name="dp_36">72.0000dp</dimen>
+
+    <dimen name="dp_37">74.0000dp</dimen>
+
+    <dimen name="dp_38">76.0000dp</dimen>
+
+    <dimen name="dp_39">78.0000dp</dimen>
+
+    <dimen name="dp_40">80.0000dp</dimen>
+
+    <dimen name="dp_41">82.0000dp</dimen>
+
+    <dimen name="dp_42">84.0000dp</dimen>
+
+    <dimen name="dp_43">86.0000dp</dimen>
+
+    <dimen name="dp_44">88.0000dp</dimen>
+
+    <dimen name="dp_45">90.0000dp</dimen>
+
+    <dimen name="dp_46">92.0000dp</dimen>
+
+    <dimen name="dp_47">94.0000dp</dimen>
+
+    <dimen name="dp_48">96.0000dp</dimen>
+
+    <dimen name="dp_49">98.0000dp</dimen>
+
+    <dimen name="dp_50">100.0000dp</dimen>
+
+    <dimen name="dp_51">102.0000dp</dimen>
+
+    <dimen name="dp_52">104.0000dp</dimen>
+
+    <dimen name="dp_53">106.0000dp</dimen>
+
+    <dimen name="dp_54">108.0000dp</dimen>
+
+    <dimen name="dp_55">110.0000dp</dimen>
+
+    <dimen name="dp_56">112.0000dp</dimen>
+
+    <dimen name="dp_57">114.0000dp</dimen>
+
+    <dimen name="dp_58">116.0000dp</dimen>
+
+    <dimen name="dp_59">118.0000dp</dimen>
+
+    <dimen name="dp_60">120.0000dp</dimen>
+
+    <dimen name="dp_61">122.0000dp</dimen>
+
+    <dimen name="dp_62">124.0000dp</dimen>
+
+    <dimen name="dp_63">126.0000dp</dimen>
+
+    <dimen name="dp_64">128.0000dp</dimen>
+
+    <dimen name="dp_65">130.0000dp</dimen>
+
+    <dimen name="dp_66">132.0000dp</dimen>
+
+    <dimen name="dp_67">134.0000dp</dimen>
+
+    <dimen name="dp_68">136.0000dp</dimen>
+
+    <dimen name="dp_69">138.0000dp</dimen>
+
+    <dimen name="dp_70">140.0000dp</dimen>
+
+    <dimen name="dp_71">142.0000dp</dimen>
+
+    <dimen name="dp_72">144.0000dp</dimen>
+
+    <dimen name="dp_73">146.0000dp</dimen>
+
+    <dimen name="dp_74">148.0000dp</dimen>
+
+    <dimen name="dp_75">150.0000dp</dimen>
+
+    <dimen name="dp_76">152.0000dp</dimen>
+
+    <dimen name="dp_77">154.0000dp</dimen>
+
+    <dimen name="dp_78">156.0000dp</dimen>
+
+    <dimen name="dp_79">158.0000dp</dimen>
+
+    <dimen name="dp_80">160.0000dp</dimen>
+
+    <dimen name="dp_81">162.0000dp</dimen>
+
+    <dimen name="dp_82">164.0000dp</dimen>
+
+    <dimen name="dp_83">166.0000dp</dimen>
+
+    <dimen name="dp_84">168.0000dp</dimen>
+
+    <dimen name="dp_85">170.0000dp</dimen>
+
+    <dimen name="dp_86">172.0000dp</dimen>
+
+    <dimen name="dp_87">174.0000dp</dimen>
+
+    <dimen name="dp_88">176.0000dp</dimen>
+
+    <dimen name="dp_89">178.0000dp</dimen>
+
+    <dimen name="dp_90">180.0000dp</dimen>
+
+    <dimen name="dp_91">182.0000dp</dimen>
+
+    <dimen name="dp_92">184.0000dp</dimen>
+
+    <dimen name="dp_93">186.0000dp</dimen>
+
+    <dimen name="dp_94">188.0000dp</dimen>
+
+    <dimen name="dp_95">190.0000dp</dimen>
+
+    <dimen name="dp_96">192.0000dp</dimen>
+
+    <dimen name="dp_97">194.0000dp</dimen>
+
+    <dimen name="dp_98">196.0000dp</dimen>
+
+    <dimen name="dp_99">198.0000dp</dimen>
+
+    <dimen name="dp_100">200.0000dp</dimen>
+
+    <dimen name="dp_101">202.0000dp</dimen>
+
+    <dimen name="dp_102">204.0000dp</dimen>
+
+    <dimen name="dp_103">206.0000dp</dimen>
+
+    <dimen name="dp_104">208.0000dp</dimen>
+
+    <dimen name="dp_104_5">209.0000dp</dimen>
+
+    <dimen name="dp_105">210.0000dp</dimen>
+
+    <dimen name="dp_106">212.0000dp</dimen>
+
+    <dimen name="dp_107">214.0000dp</dimen>
+
+    <dimen name="dp_108">216.0000dp</dimen>
+
+    <dimen name="dp_109">218.0000dp</dimen>
+
+    <dimen name="dp_110">220.0000dp</dimen>
+
+    <dimen name="dp_111">222.0000dp</dimen>
+
+    <dimen name="dp_112">224.0000dp</dimen>
+
+    <dimen name="dp_113">226.0000dp</dimen>
+
+    <dimen name="dp_114">228.0000dp</dimen>
+
+    <dimen name="dp_115">230.0000dp</dimen>
+
+    <dimen name="dp_116">232.0000dp</dimen>
+
+    <dimen name="dp_117">234.0000dp</dimen>
+
+    <dimen name="dp_118">236.0000dp</dimen>
+
+    <dimen name="dp_119">238.0000dp</dimen>
+
+    <dimen name="dp_120">240.0000dp</dimen>
+
+    <dimen name="dp_121">242.0000dp</dimen>
+
+    <dimen name="dp_122">244.0000dp</dimen>
+
+    <dimen name="dp_123">246.0000dp</dimen>
+
+    <dimen name="dp_124">248.0000dp</dimen>
+
+    <dimen name="dp_125">250.0000dp</dimen>
+
+    <dimen name="dp_126">252.0000dp</dimen>
+
+    <dimen name="dp_127">254.0000dp</dimen>
+
+    <dimen name="dp_128">256.0000dp</dimen>
+
+    <dimen name="dp_129">258.0000dp</dimen>
+
+    <dimen name="dp_130">260.0000dp</dimen>
+
+    <dimen name="dp_131">262.0000dp</dimen>
+
+    <dimen name="dp_132">264.0000dp</dimen>
+
+    <dimen name="dp_133">266.0000dp</dimen>
+
+    <dimen name="dp_134">268.0000dp</dimen>
+
+    <dimen name="dp_134_5">269.0000dp</dimen>
+
+    <dimen name="dp_135">270.0000dp</dimen>
+
+    <dimen name="dp_136">272.0000dp</dimen>
+
+    <dimen name="dp_137">274.0000dp</dimen>
+
+    <dimen name="dp_138">276.0000dp</dimen>
+
+    <dimen name="dp_139">278.0000dp</dimen>
+
+    <dimen name="dp_140">280.0000dp</dimen>
+
+    <dimen name="dp_141">282.0000dp</dimen>
+
+    <dimen name="dp_142">284.0000dp</dimen>
+
+    <dimen name="dp_143">286.0000dp</dimen>
+
+    <dimen name="dp_144">288.0000dp</dimen>
+
+    <dimen name="dp_145">290.0000dp</dimen>
+
+    <dimen name="dp_146">292.0000dp</dimen>
+
+    <dimen name="dp_147">294.0000dp</dimen>
+
+    <dimen name="dp_148">296.0000dp</dimen>
+
+    <dimen name="dp_149">298.0000dp</dimen>
+
+    <dimen name="dp_150">300.0000dp</dimen>
+
+    <dimen name="dp_151">302.0000dp</dimen>
+
+    <dimen name="dp_152">304.0000dp</dimen>
+
+    <dimen name="dp_153">306.0000dp</dimen>
+
+    <dimen name="dp_154">308.0000dp</dimen>
+
+    <dimen name="dp_155">310.0000dp</dimen>
+
+    <dimen name="dp_156">312.0000dp</dimen>
+
+    <dimen name="dp_157">314.0000dp</dimen>
+
+    <dimen name="dp_158">316.0000dp</dimen>
+
+    <dimen name="dp_159">318.0000dp</dimen>
+
+    <dimen name="dp_160">320.0000dp</dimen>
+
+    <dimen name="dp_161">322.0000dp</dimen>
+
+    <dimen name="dp_162">324.0000dp</dimen>
+
+    <dimen name="dp_163">326.0000dp</dimen>
+
+    <dimen name="dp_164">328.0000dp</dimen>
+
+    <dimen name="dp_165">330.0000dp</dimen>
+
+    <dimen name="dp_166">332.0000dp</dimen>
+
+    <dimen name="dp_167">334.0000dp</dimen>
+
+    <dimen name="dp_168">336.0000dp</dimen>
+
+    <dimen name="dp_169">338.0000dp</dimen>
+
+    <dimen name="dp_170">340.0000dp</dimen>
+
+    <dimen name="dp_171">342.0000dp</dimen>
+
+    <dimen name="dp_172">344.0000dp</dimen>
+
+    <dimen name="dp_173">346.0000dp</dimen>
+
+    <dimen name="dp_174">348.0000dp</dimen>
+
+    <dimen name="dp_175">350.0000dp</dimen>
+
+    <dimen name="dp_176">352.0000dp</dimen>
+
+    <dimen name="dp_177">354.0000dp</dimen>
+
+    <dimen name="dp_178">356.0000dp</dimen>
+
+    <dimen name="dp_179">358.0000dp</dimen>
+
+    <dimen name="dp_180">360.0000dp</dimen>
+
+    <dimen name="dp_181">362.0000dp</dimen>
+
+    <dimen name="dp_182">364.0000dp</dimen>
+
+    <dimen name="dp_183">366.0000dp</dimen>
+
+    <dimen name="dp_184">368.0000dp</dimen>
+
+    <dimen name="dp_185">370.0000dp</dimen>
+
+    <dimen name="dp_186">372.0000dp</dimen>
+
+    <dimen name="dp_187">374.0000dp</dimen>
+
+    <dimen name="dp_188">376.0000dp</dimen>
+
+    <dimen name="dp_189">378.0000dp</dimen>
+
+    <dimen name="dp_190">380.0000dp</dimen>
+
+    <dimen name="dp_191">382.0000dp</dimen>
+
+    <dimen name="dp_191_25">382.5000dp</dimen>
+
+    <dimen name="dp_192">384.0000dp</dimen>
+
+    <dimen name="dp_193">386.0000dp</dimen>
+
+    <dimen name="dp_194">388.0000dp</dimen>
+
+    <dimen name="dp_195">390.0000dp</dimen>
+
+    <dimen name="dp_196">392.0000dp</dimen>
+
+    <dimen name="dp_197">394.0000dp</dimen>
+
+    <dimen name="dp_198">396.0000dp</dimen>
+
+    <dimen name="dp_199">398.0000dp</dimen>
+
+    <dimen name="dp_200">400.0000dp</dimen>
+
+    <dimen name="dp_201">402.0000dp</dimen>
+
+    <dimen name="dp_202">404.0000dp</dimen>
+
+    <dimen name="dp_203">406.0000dp</dimen>
+
+    <dimen name="dp_204">408.0000dp</dimen>
+
+    <dimen name="dp_205">410.0000dp</dimen>
+
+    <dimen name="dp_206">412.0000dp</dimen>
+
+    <dimen name="dp_207">414.0000dp</dimen>
+
+    <dimen name="dp_208">416.0000dp</dimen>
+
+    <dimen name="dp_209">418.0000dp</dimen>
+
+    <dimen name="dp_210">420.0000dp</dimen>
+
+    <dimen name="dp_211">422.0000dp</dimen>
+
+    <dimen name="dp_212">424.0000dp</dimen>
+
+    <dimen name="dp_213">426.0000dp</dimen>
+
+    <dimen name="dp_214">428.0000dp</dimen>
+
+    <dimen name="dp_215">430.0000dp</dimen>
+
+    <dimen name="dp_216">432.0000dp</dimen>
+
+    <dimen name="dp_217">434.0000dp</dimen>
+
+    <dimen name="dp_218">436.0000dp</dimen>
+
+    <dimen name="dp_219">438.0000dp</dimen>
+
+    <dimen name="dp_220">440.0000dp</dimen>
+
+    <dimen name="dp_221">442.0000dp</dimen>
+
+    <dimen name="dp_222">444.0000dp</dimen>
+
+    <dimen name="dp_223">446.0000dp</dimen>
+
+    <dimen name="dp_224">448.0000dp</dimen>
+
+    <dimen name="dp_225">450.0000dp</dimen>
+
+    <dimen name="dp_226">452.0000dp</dimen>
+
+    <dimen name="dp_227">454.0000dp</dimen>
+
+    <dimen name="dp_228">456.0000dp</dimen>
+
+    <dimen name="dp_229">458.0000dp</dimen>
+
+    <dimen name="dp_230">460.0000dp</dimen>
+
+    <dimen name="dp_231">462.0000dp</dimen>
+
+    <dimen name="dp_232">464.0000dp</dimen>
+
+    <dimen name="dp_233">466.0000dp</dimen>
+
+    <dimen name="dp_234">468.0000dp</dimen>
+
+    <dimen name="dp_235">470.0000dp</dimen>
+
+    <dimen name="dp_236">472.0000dp</dimen>
+
+    <dimen name="dp_237">474.0000dp</dimen>
+
+    <dimen name="dp_238">476.0000dp</dimen>
+
+    <dimen name="dp_239">478.0000dp</dimen>
+
+    <dimen name="dp_240">480.0000dp</dimen>
+
+    <dimen name="dp_241">482.0000dp</dimen>
+
+    <dimen name="dp_242">484.0000dp</dimen>
+
+    <dimen name="dp_243">486.0000dp</dimen>
+
+    <dimen name="dp_244">488.0000dp</dimen>
+
+    <dimen name="dp_245">490.0000dp</dimen>
+
+    <dimen name="dp_246">492.0000dp</dimen>
+
+    <dimen name="dp_247">494.0000dp</dimen>
+
+    <dimen name="dp_248">496.0000dp</dimen>
+
+    <dimen name="dp_249">498.0000dp</dimen>
+
+    <dimen name="dp_250">500.0000dp</dimen>
+
+    <dimen name="dp_251">502.0000dp</dimen>
+
+    <dimen name="dp_252">504.0000dp</dimen>
+
+    <dimen name="dp_253">506.0000dp</dimen>
+
+    <dimen name="dp_254">508.0000dp</dimen>
+
+    <dimen name="dp_255">510.0000dp</dimen>
+
+    <dimen name="dp_256">512.0000dp</dimen>
+
+    <dimen name="dp_257">514.0000dp</dimen>
+
+    <dimen name="dp_258">516.0000dp</dimen>
+
+    <dimen name="dp_259">518.0000dp</dimen>
+
+    <dimen name="dp_260">520.0000dp</dimen>
+
+    <dimen name="dp_261">522.0000dp</dimen>
+
+    <dimen name="dp_262">524.0000dp</dimen>
+
+    <dimen name="dp_263">526.0000dp</dimen>
+
+    <dimen name="dp_264">528.0000dp</dimen>
+
+    <dimen name="dp_265">530.0000dp</dimen>
+
+    <dimen name="dp_266">532.0000dp</dimen>
+
+    <dimen name="dp_267">534.0000dp</dimen>
+
+    <dimen name="dp_268">536.0000dp</dimen>
+
+    <dimen name="dp_269">538.0000dp</dimen>
+
+    <dimen name="dp_270">540.0000dp</dimen>
+
+    <dimen name="dp_271">542.0000dp</dimen>
+
+    <dimen name="dp_272">544.0000dp</dimen>
+
+    <dimen name="dp_273">546.0000dp</dimen>
+
+    <dimen name="dp_274">548.0000dp</dimen>
+
+    <dimen name="dp_275">550.0000dp</dimen>
+
+    <dimen name="dp_276">552.0000dp</dimen>
+
+    <dimen name="dp_277">554.0000dp</dimen>
+
+    <dimen name="dp_278">556.0000dp</dimen>
+
+    <dimen name="dp_279">558.0000dp</dimen>
+
+    <dimen name="dp_280">560.0000dp</dimen>
+
+    <dimen name="dp_281">562.0000dp</dimen>
+
+    <dimen name="dp_282">564.0000dp</dimen>
+
+    <dimen name="dp_283">566.0000dp</dimen>
+
+    <dimen name="dp_284">568.0000dp</dimen>
+
+    <dimen name="dp_285">570.0000dp</dimen>
+
+    <dimen name="dp_286">572.0000dp</dimen>
+
+    <dimen name="dp_287">574.0000dp</dimen>
+
+    <dimen name="dp_288">576.0000dp</dimen>
+
+    <dimen name="dp_289">578.0000dp</dimen>
+
+    <dimen name="dp_290">580.0000dp</dimen>
+
+    <dimen name="dp_291">582.0000dp</dimen>
+
+    <dimen name="dp_292">584.0000dp</dimen>
+
+    <dimen name="dp_293">586.0000dp</dimen>
+
+    <dimen name="dp_294">588.0000dp</dimen>
+
+    <dimen name="dp_295">590.0000dp</dimen>
+
+    <dimen name="dp_296">592.0000dp</dimen>
+
+    <dimen name="dp_297">594.0000dp</dimen>
+
+    <dimen name="dp_298">596.0000dp</dimen>
+
+    <dimen name="dp_299">598.0000dp</dimen>
+
+    <dimen name="dp_300">600.0000dp</dimen>
+
+    <dimen name="dp_301">602.0000dp</dimen>
+
+    <dimen name="dp_302">604.0000dp</dimen>
+
+    <dimen name="dp_303">606.0000dp</dimen>
+
+    <dimen name="dp_304">608.0000dp</dimen>
+
+    <dimen name="dp_305">610.0000dp</dimen>
+
+    <dimen name="dp_306">612.0000dp</dimen>
+
+    <dimen name="dp_307">614.0000dp</dimen>
+
+    <dimen name="dp_308">616.0000dp</dimen>
+
+    <dimen name="dp_309">618.0000dp</dimen>
+
+    <dimen name="dp_310">620.0000dp</dimen>
+
+    <dimen name="dp_311">622.0000dp</dimen>
+
+    <dimen name="dp_312">624.0000dp</dimen>
+
+    <dimen name="dp_313">626.0000dp</dimen>
+
+    <dimen name="dp_314">628.0000dp</dimen>
+
+    <dimen name="dp_315">630.0000dp</dimen>
+
+    <dimen name="dp_316">632.0000dp</dimen>
+
+    <dimen name="dp_317">634.0000dp</dimen>
+
+    <dimen name="dp_318">636.0000dp</dimen>
+
+    <dimen name="dp_319">638.0000dp</dimen>
+
+    <dimen name="dp_320">640.0000dp</dimen>
+
+    <dimen name="dp_321">642.0000dp</dimen>
+
+    <dimen name="dp_322">644.0000dp</dimen>
+
+    <dimen name="dp_323">646.0000dp</dimen>
+
+    <dimen name="dp_324">648.0000dp</dimen>
+
+    <dimen name="dp_325">650.0000dp</dimen>
+
+    <dimen name="dp_326">652.0000dp</dimen>
+
+    <dimen name="dp_327">654.0000dp</dimen>
+
+    <dimen name="dp_328">656.0000dp</dimen>
+
+    <dimen name="dp_329">658.0000dp</dimen>
+
+    <dimen name="dp_330">660.0000dp</dimen>
+
+    <dimen name="dp_331">662.0000dp</dimen>
+
+    <dimen name="dp_332">664.0000dp</dimen>
+
+    <dimen name="dp_333">666.0000dp</dimen>
+
+    <dimen name="dp_334">668.0000dp</dimen>
+
+    <dimen name="dp_335">670.0000dp</dimen>
+
+    <dimen name="dp_336">672.0000dp</dimen>
+
+    <dimen name="dp_337">674.0000dp</dimen>
+
+    <dimen name="dp_338">676.0000dp</dimen>
+
+    <dimen name="dp_339">678.0000dp</dimen>
+
+    <dimen name="dp_340">680.0000dp</dimen>
+
+    <dimen name="dp_341">682.0000dp</dimen>
+
+    <dimen name="dp_342">684.0000dp</dimen>
+
+    <dimen name="dp_343">686.0000dp</dimen>
+
+    <dimen name="dp_344">688.0000dp</dimen>
+
+    <dimen name="dp_345">690.0000dp</dimen>
+
+    <dimen name="dp_346">692.0000dp</dimen>
+
+    <dimen name="dp_347">694.0000dp</dimen>
+
+    <dimen name="dp_348">696.0000dp</dimen>
+
+    <dimen name="dp_349">698.0000dp</dimen>
+
+    <dimen name="dp_350">700.0000dp</dimen>
+
+    <dimen name="dp_351">702.0000dp</dimen>
+
+    <dimen name="dp_352">704.0000dp</dimen>
+
+    <dimen name="dp_353">706.0000dp</dimen>
+
+    <dimen name="dp_354">708.0000dp</dimen>
+
+    <dimen name="dp_355">710.0000dp</dimen>
+
+    <dimen name="dp_356">712.0000dp</dimen>
+
+    <dimen name="dp_357">714.0000dp</dimen>
+
+    <dimen name="dp_358">716.0000dp</dimen>
+
+    <dimen name="dp_359">718.0000dp</dimen>
+
+    <dimen name="dp_360">720.0000dp</dimen>
+
+    <dimen name="dp_365">730.0000dp</dimen>
+
+    <dimen name="dp_370">740.0000dp</dimen>
+
+    <dimen name="dp_400">800.0000dp</dimen>
+
+    <dimen name="dp_410">820.0000dp</dimen>
+
+    <dimen name="dp_422">844.0000dp</dimen>
+
+    <dimen name="dp_472">944.0000dp</dimen>
+
+    <dimen name="dp_500">1000.0000dp</dimen>
+
+    <dimen name="dp_600">1200.0000dp</dimen>
+
+    <dimen name="dp_640">1280.0000dp</dimen>
+
+    <dimen name="dp_650">1300.0000dp</dimen>
+
+    <dimen name="dp_710">1420.0000dp</dimen>
+
+    <dimen name="dp_720">1440.0000dp</dimen>
+
+
+</resources>
diff --git a/system/basic/src/main/res/values-sw961dp/dimens.xml b/system/basic/src/main/res/values-sw961dp/dimens.xml
new file mode 100644
index 0000000..c8b573d
--- /dev/null
+++ b/system/basic/src/main/res/values-sw961dp/dimens.xml
@@ -0,0 +1,839 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+
+    <dimen name="txt5">10.0104sp</dimen>
+
+    <dimen name="txt6">12.0125sp</dimen>
+
+    <dimen name="txt7">14.0146sp</dimen>
+
+    <dimen name="txt8">16.0167sp</dimen>
+
+    <dimen name="txt9">18.0187sp</dimen>
+
+    <dimen name="txt10">20.0208sp</dimen>
+
+    <dimen name="txt11">22.0229sp</dimen>
+
+    <dimen name="txt12">24.0250sp</dimen>
+
+    <dimen name="txt13">26.0271sp</dimen>
+
+    <dimen name="txt14">28.0292sp</dimen>
+
+    <dimen name="txt15">30.0312sp</dimen>
+
+    <dimen name="txt16">32.0333sp</dimen>
+
+    <dimen name="txt17">34.0354sp</dimen>
+
+    <dimen name="txt18">36.0375sp</dimen>
+
+    <dimen name="txt19">38.0396sp</dimen>
+
+    <dimen name="txt20">40.0417sp</dimen>
+
+    <dimen name="txt21">42.0437sp</dimen>
+
+    <dimen name="txt22">44.0458sp</dimen>
+
+    <dimen name="txt24">48.0500sp</dimen>
+
+    <dimen name="txt26">52.0542sp</dimen>
+
+    <dimen name="txt28">56.0583sp</dimen>
+
+    <dimen name="txt30">60.0625sp</dimen>
+
+    <dimen name="txt32">64.0667sp</dimen>
+
+    <dimen name="txt34">68.0708sp</dimen>
+
+    <dimen name="card_common_margin_left">@dimen/dp_15</dimen>
+
+    <dimen name="dp_m_60">-120.1250dp</dimen>
+
+    <dimen name="dp_m_30">-60.0625dp</dimen>
+
+    <dimen name="dp_m_20">-40.0417dp</dimen>
+
+    <dimen name="dp_m_12">-24.0250dp</dimen>
+
+    <dimen name="dp_m_10">-20.0208dp</dimen>
+
+    <dimen name="dp_m_8">-16.0167dp</dimen>
+
+    <dimen name="dp_m_5">-10.0104dp</dimen>
+
+    <dimen name="dp_m_2">-4.0042dp</dimen>
+
+    <dimen name="dp_m_1">-2.0021dp</dimen>
+
+    <dimen name="dp_0">0.0000dp</dimen>
+
+    <dimen name="dp_0_1">0.2002dp</dimen>
+
+    <dimen name="dp_0_5">1.0010dp</dimen>
+
+    <dimen name="dp_1">2.0021dp</dimen>
+
+    <dimen name="dp_1_5">3.0031dp</dimen>
+
+    <dimen name="dp_2">4.0042dp</dimen>
+
+    <dimen name="dp_2_5">5.0052dp</dimen>
+
+    <dimen name="dp_3">6.0062dp</dimen>
+
+    <dimen name="dp_3_5">7.0073dp</dimen>
+
+    <dimen name="dp_4">8.0083dp</dimen>
+
+    <dimen name="dp_4_5">9.0094dp</dimen>
+
+    <dimen name="dp_5">10.0104dp</dimen>
+
+    <dimen name="dp_6">12.0125dp</dimen>
+
+    <dimen name="dp_7">14.0146dp</dimen>
+
+    <dimen name="dp_7_5">15.0156dp</dimen>
+
+    <dimen name="dp_8">16.0167dp</dimen>
+
+    <dimen name="dp_9">18.0187dp</dimen>
+
+    <dimen name="dp_10">20.0208dp</dimen>
+
+    <dimen name="dp_11">22.0229dp</dimen>
+
+    <dimen name="dp_12">24.0250dp</dimen>
+
+    <dimen name="dp_13">26.0271dp</dimen>
+
+    <dimen name="dp_14">28.0292dp</dimen>
+
+    <dimen name="dp_15">30.0312dp</dimen>
+
+    <dimen name="dp_16">32.0333dp</dimen>
+
+    <dimen name="dp_17">34.0354dp</dimen>
+
+    <dimen name="dp_18">36.0375dp</dimen>
+
+    <dimen name="dp_19">38.0396dp</dimen>
+
+    <dimen name="dp_20">40.0417dp</dimen>
+
+    <dimen name="dp_21">42.0437dp</dimen>
+
+    <dimen name="dp_22">44.0458dp</dimen>
+
+    <dimen name="dp_23">46.0479dp</dimen>
+
+    <dimen name="dp_24">48.0500dp</dimen>
+
+    <dimen name="dp_25">50.0521dp</dimen>
+
+    <dimen name="dp_26">52.0542dp</dimen>
+
+    <dimen name="dp_27">54.0562dp</dimen>
+
+    <dimen name="dp_28">56.0583dp</dimen>
+
+    <dimen name="dp_29">58.0604dp</dimen>
+
+    <dimen name="dp_30">60.0625dp</dimen>
+
+    <dimen name="dp_31">62.0646dp</dimen>
+
+    <dimen name="dp_32">64.0667dp</dimen>
+
+    <dimen name="dp_33">66.0687dp</dimen>
+
+    <dimen name="dp_34">68.0708dp</dimen>
+
+    <dimen name="dp_35">70.0729dp</dimen>
+
+    <dimen name="dp_36">72.0750dp</dimen>
+
+    <dimen name="dp_37">74.0771dp</dimen>
+
+    <dimen name="dp_38">76.0792dp</dimen>
+
+    <dimen name="dp_39">78.0812dp</dimen>
+
+    <dimen name="dp_40">80.0833dp</dimen>
+
+    <dimen name="dp_41">82.0854dp</dimen>
+
+    <dimen name="dp_42">84.0875dp</dimen>
+
+    <dimen name="dp_43">86.0896dp</dimen>
+
+    <dimen name="dp_44">88.0917dp</dimen>
+
+    <dimen name="dp_45">90.0938dp</dimen>
+
+    <dimen name="dp_46">92.0958dp</dimen>
+
+    <dimen name="dp_47">94.0979dp</dimen>
+
+    <dimen name="dp_48">96.1000dp</dimen>
+
+    <dimen name="dp_49">98.1021dp</dimen>
+
+    <dimen name="dp_50">100.1042dp</dimen>
+
+    <dimen name="dp_51">102.1062dp</dimen>
+
+    <dimen name="dp_52">104.1083dp</dimen>
+
+    <dimen name="dp_53">106.1104dp</dimen>
+
+    <dimen name="dp_54">108.1125dp</dimen>
+
+    <dimen name="dp_55">110.1146dp</dimen>
+
+    <dimen name="dp_56">112.1167dp</dimen>
+
+    <dimen name="dp_57">114.1187dp</dimen>
+
+    <dimen name="dp_58">116.1208dp</dimen>
+
+    <dimen name="dp_59">118.1229dp</dimen>
+
+    <dimen name="dp_60">120.1250dp</dimen>
+
+    <dimen name="dp_61">122.1271dp</dimen>
+
+    <dimen name="dp_62">124.1292dp</dimen>
+
+    <dimen name="dp_63">126.1312dp</dimen>
+
+    <dimen name="dp_64">128.1333dp</dimen>
+
+    <dimen name="dp_65">130.1354dp</dimen>
+
+    <dimen name="dp_66">132.1375dp</dimen>
+
+    <dimen name="dp_67">134.1396dp</dimen>
+
+    <dimen name="dp_68">136.1417dp</dimen>
+
+    <dimen name="dp_69">138.1437dp</dimen>
+
+    <dimen name="dp_70">140.1458dp</dimen>
+
+    <dimen name="dp_71">142.1479dp</dimen>
+
+    <dimen name="dp_72">144.1500dp</dimen>
+
+    <dimen name="dp_73">146.1521dp</dimen>
+
+    <dimen name="dp_74">148.1542dp</dimen>
+
+    <dimen name="dp_75">150.1562dp</dimen>
+
+    <dimen name="dp_76">152.1583dp</dimen>
+
+    <dimen name="dp_77">154.1604dp</dimen>
+
+    <dimen name="dp_78">156.1625dp</dimen>
+
+    <dimen name="dp_79">158.1646dp</dimen>
+
+    <dimen name="dp_80">160.1667dp</dimen>
+
+    <dimen name="dp_81">162.1687dp</dimen>
+
+    <dimen name="dp_82">164.1708dp</dimen>
+
+    <dimen name="dp_83">166.1729dp</dimen>
+
+    <dimen name="dp_84">168.1750dp</dimen>
+
+    <dimen name="dp_85">170.1771dp</dimen>
+
+    <dimen name="dp_86">172.1792dp</dimen>
+
+    <dimen name="dp_87">174.1812dp</dimen>
+
+    <dimen name="dp_88">176.1833dp</dimen>
+
+    <dimen name="dp_89">178.1854dp</dimen>
+
+    <dimen name="dp_90">180.1875dp</dimen>
+
+    <dimen name="dp_91">182.1896dp</dimen>
+
+    <dimen name="dp_92">184.1917dp</dimen>
+
+    <dimen name="dp_93">186.1937dp</dimen>
+
+    <dimen name="dp_94">188.1958dp</dimen>
+
+    <dimen name="dp_95">190.1979dp</dimen>
+
+    <dimen name="dp_96">192.2000dp</dimen>
+
+    <dimen name="dp_97">194.2021dp</dimen>
+
+    <dimen name="dp_98">196.2042dp</dimen>
+
+    <dimen name="dp_99">198.2062dp</dimen>
+
+    <dimen name="dp_100">200.2083dp</dimen>
+
+    <dimen name="dp_101">202.2104dp</dimen>
+
+    <dimen name="dp_102">204.2125dp</dimen>
+
+    <dimen name="dp_103">206.2146dp</dimen>
+
+    <dimen name="dp_104">208.2167dp</dimen>
+
+    <dimen name="dp_104_5">209.2177dp</dimen>
+
+    <dimen name="dp_105">210.2188dp</dimen>
+
+    <dimen name="dp_106">212.2208dp</dimen>
+
+    <dimen name="dp_107">214.2229dp</dimen>
+
+    <dimen name="dp_108">216.2250dp</dimen>
+
+    <dimen name="dp_109">218.2271dp</dimen>
+
+    <dimen name="dp_110">220.2292dp</dimen>
+
+    <dimen name="dp_111">222.2312dp</dimen>
+
+    <dimen name="dp_112">224.2333dp</dimen>
+
+    <dimen name="dp_113">226.2354dp</dimen>
+
+    <dimen name="dp_114">228.2375dp</dimen>
+
+    <dimen name="dp_115">230.2396dp</dimen>
+
+    <dimen name="dp_116">232.2417dp</dimen>
+
+    <dimen name="dp_117">234.2437dp</dimen>
+
+    <dimen name="dp_118">236.2458dp</dimen>
+
+    <dimen name="dp_119">238.2479dp</dimen>
+
+    <dimen name="dp_120">240.2500dp</dimen>
+
+    <dimen name="dp_121">242.2521dp</dimen>
+
+    <dimen name="dp_122">244.2542dp</dimen>
+
+    <dimen name="dp_123">246.2562dp</dimen>
+
+    <dimen name="dp_124">248.2583dp</dimen>
+
+    <dimen name="dp_125">250.2604dp</dimen>
+
+    <dimen name="dp_126">252.2625dp</dimen>
+
+    <dimen name="dp_127">254.2646dp</dimen>
+
+    <dimen name="dp_128">256.2667dp</dimen>
+
+    <dimen name="dp_129">258.2688dp</dimen>
+
+    <dimen name="dp_130">260.2708dp</dimen>
+
+    <dimen name="dp_131">262.2729dp</dimen>
+
+    <dimen name="dp_132">264.2750dp</dimen>
+
+    <dimen name="dp_133">266.2771dp</dimen>
+
+    <dimen name="dp_134">268.2792dp</dimen>
+
+    <dimen name="dp_134_5">269.2802dp</dimen>
+
+    <dimen name="dp_135">270.2812dp</dimen>
+
+    <dimen name="dp_136">272.2833dp</dimen>
+
+    <dimen name="dp_137">274.2854dp</dimen>
+
+    <dimen name="dp_138">276.2875dp</dimen>
+
+    <dimen name="dp_139">278.2896dp</dimen>
+
+    <dimen name="dp_140">280.2917dp</dimen>
+
+    <dimen name="dp_141">282.2937dp</dimen>
+
+    <dimen name="dp_142">284.2958dp</dimen>
+
+    <dimen name="dp_143">286.2979dp</dimen>
+
+    <dimen name="dp_144">288.3000dp</dimen>
+
+    <dimen name="dp_145">290.3021dp</dimen>
+
+    <dimen name="dp_146">292.3042dp</dimen>
+
+    <dimen name="dp_147">294.3062dp</dimen>
+
+    <dimen name="dp_148">296.3083dp</dimen>
+
+    <dimen name="dp_149">298.3104dp</dimen>
+
+    <dimen name="dp_150">300.3125dp</dimen>
+
+    <dimen name="dp_151">302.3146dp</dimen>
+
+    <dimen name="dp_152">304.3167dp</dimen>
+
+    <dimen name="dp_153">306.3187dp</dimen>
+
+    <dimen name="dp_154">308.3208dp</dimen>
+
+    <dimen name="dp_155">310.3229dp</dimen>
+
+    <dimen name="dp_156">312.3250dp</dimen>
+
+    <dimen name="dp_157">314.3271dp</dimen>
+
+    <dimen name="dp_158">316.3292dp</dimen>
+
+    <dimen name="dp_159">318.3312dp</dimen>
+
+    <dimen name="dp_160">320.3333dp</dimen>
+
+    <dimen name="dp_161">322.3354dp</dimen>
+
+    <dimen name="dp_162">324.3375dp</dimen>
+
+    <dimen name="dp_163">326.3396dp</dimen>
+
+    <dimen name="dp_164">328.3417dp</dimen>
+
+    <dimen name="dp_165">330.3438dp</dimen>
+
+    <dimen name="dp_166">332.3458dp</dimen>
+
+    <dimen name="dp_167">334.3479dp</dimen>
+
+    <dimen name="dp_168">336.3500dp</dimen>
+
+    <dimen name="dp_169">338.3521dp</dimen>
+
+    <dimen name="dp_170">340.3542dp</dimen>
+
+    <dimen name="dp_171">342.3562dp</dimen>
+
+    <dimen name="dp_172">344.3583dp</dimen>
+
+    <dimen name="dp_173">346.3604dp</dimen>
+
+    <dimen name="dp_174">348.3625dp</dimen>
+
+    <dimen name="dp_175">350.3646dp</dimen>
+
+    <dimen name="dp_176">352.3667dp</dimen>
+
+    <dimen name="dp_177">354.3687dp</dimen>
+
+    <dimen name="dp_178">356.3708dp</dimen>
+
+    <dimen name="dp_179">358.3729dp</dimen>
+
+    <dimen name="dp_180">360.3750dp</dimen>
+
+    <dimen name="dp_181">362.3771dp</dimen>
+
+    <dimen name="dp_182">364.3792dp</dimen>
+
+    <dimen name="dp_183">366.3812dp</dimen>
+
+    <dimen name="dp_184">368.3833dp</dimen>
+
+    <dimen name="dp_185">370.3854dp</dimen>
+
+    <dimen name="dp_186">372.3875dp</dimen>
+
+    <dimen name="dp_187">374.3896dp</dimen>
+
+    <dimen name="dp_188">376.3917dp</dimen>
+
+    <dimen name="dp_189">378.3937dp</dimen>
+
+    <dimen name="dp_190">380.3958dp</dimen>
+
+    <dimen name="dp_191">382.3979dp</dimen>
+
+    <dimen name="dp_191_25">382.8984dp</dimen>
+
+    <dimen name="dp_192">384.4000dp</dimen>
+
+    <dimen name="dp_193">386.4021dp</dimen>
+
+    <dimen name="dp_194">388.4042dp</dimen>
+
+    <dimen name="dp_195">390.4062dp</dimen>
+
+    <dimen name="dp_196">392.4083dp</dimen>
+
+    <dimen name="dp_197">394.4104dp</dimen>
+
+    <dimen name="dp_198">396.4125dp</dimen>
+
+    <dimen name="dp_199">398.4146dp</dimen>
+
+    <dimen name="dp_200">400.4167dp</dimen>
+
+    <dimen name="dp_201">402.4187dp</dimen>
+
+    <dimen name="dp_202">404.4208dp</dimen>
+
+    <dimen name="dp_203">406.4229dp</dimen>
+
+    <dimen name="dp_204">408.4250dp</dimen>
+
+    <dimen name="dp_205">410.4271dp</dimen>
+
+    <dimen name="dp_206">412.4292dp</dimen>
+
+    <dimen name="dp_207">414.4312dp</dimen>
+
+    <dimen name="dp_208">416.4333dp</dimen>
+
+    <dimen name="dp_209">418.4354dp</dimen>
+
+    <dimen name="dp_210">420.4375dp</dimen>
+
+    <dimen name="dp_211">422.4396dp</dimen>
+
+    <dimen name="dp_212">424.4417dp</dimen>
+
+    <dimen name="dp_213">426.4437dp</dimen>
+
+    <dimen name="dp_214">428.4458dp</dimen>
+
+    <dimen name="dp_215">430.4479dp</dimen>
+
+    <dimen name="dp_216">432.4500dp</dimen>
+
+    <dimen name="dp_217">434.4521dp</dimen>
+
+    <dimen name="dp_218">436.4542dp</dimen>
+
+    <dimen name="dp_219">438.4562dp</dimen>
+
+    <dimen name="dp_220">440.4583dp</dimen>
+
+    <dimen name="dp_221">442.4604dp</dimen>
+
+    <dimen name="dp_222">444.4625dp</dimen>
+
+    <dimen name="dp_223">446.4646dp</dimen>
+
+    <dimen name="dp_224">448.4667dp</dimen>
+
+    <dimen name="dp_225">450.4688dp</dimen>
+
+    <dimen name="dp_226">452.4708dp</dimen>
+
+    <dimen name="dp_227">454.4729dp</dimen>
+
+    <dimen name="dp_228">456.4750dp</dimen>
+
+    <dimen name="dp_229">458.4771dp</dimen>
+
+    <dimen name="dp_230">460.4792dp</dimen>
+
+    <dimen name="dp_231">462.4812dp</dimen>
+
+    <dimen name="dp_232">464.4833dp</dimen>
+
+    <dimen name="dp_233">466.4854dp</dimen>
+
+    <dimen name="dp_234">468.4875dp</dimen>
+
+    <dimen name="dp_235">470.4896dp</dimen>
+
+    <dimen name="dp_236">472.4917dp</dimen>
+
+    <dimen name="dp_237">474.4937dp</dimen>
+
+    <dimen name="dp_238">476.4958dp</dimen>
+
+    <dimen name="dp_239">478.4979dp</dimen>
+
+    <dimen name="dp_240">480.5000dp</dimen>
+
+    <dimen name="dp_241">482.5021dp</dimen>
+
+    <dimen name="dp_242">484.5042dp</dimen>
+
+    <dimen name="dp_243">486.5062dp</dimen>
+
+    <dimen name="dp_244">488.5083dp</dimen>
+
+    <dimen name="dp_245">490.5104dp</dimen>
+
+    <dimen name="dp_246">492.5125dp</dimen>
+
+    <dimen name="dp_247">494.5146dp</dimen>
+
+    <dimen name="dp_248">496.5167dp</dimen>
+
+    <dimen name="dp_249">498.5187dp</dimen>
+
+    <dimen name="dp_250">500.5208dp</dimen>
+
+    <dimen name="dp_251">502.5229dp</dimen>
+
+    <dimen name="dp_252">504.5250dp</dimen>
+
+    <dimen name="dp_253">506.5271dp</dimen>
+
+    <dimen name="dp_254">508.5292dp</dimen>
+
+    <dimen name="dp_255">510.5312dp</dimen>
+
+    <dimen name="dp_256">512.5333dp</dimen>
+
+    <dimen name="dp_257">514.5354dp</dimen>
+
+    <dimen name="dp_258">516.5375dp</dimen>
+
+    <dimen name="dp_259">518.5396dp</dimen>
+
+    <dimen name="dp_260">520.5417dp</dimen>
+
+    <dimen name="dp_261">522.5437dp</dimen>
+
+    <dimen name="dp_262">524.5458dp</dimen>
+
+    <dimen name="dp_263">526.5479dp</dimen>
+
+    <dimen name="dp_264">528.5500dp</dimen>
+
+    <dimen name="dp_265">530.5521dp</dimen>
+
+    <dimen name="dp_266">532.5542dp</dimen>
+
+    <dimen name="dp_267">534.5562dp</dimen>
+
+    <dimen name="dp_268">536.5583dp</dimen>
+
+    <dimen name="dp_269">538.5604dp</dimen>
+
+    <dimen name="dp_270">540.5625dp</dimen>
+
+    <dimen name="dp_271">542.5646dp</dimen>
+
+    <dimen name="dp_272">544.5667dp</dimen>
+
+    <dimen name="dp_273">546.5688dp</dimen>
+
+    <dimen name="dp_274">548.5708dp</dimen>
+
+    <dimen name="dp_275">550.5729dp</dimen>
+
+    <dimen name="dp_276">552.5750dp</dimen>
+
+    <dimen name="dp_277">554.5771dp</dimen>
+
+    <dimen name="dp_278">556.5792dp</dimen>
+
+    <dimen name="dp_279">558.5812dp</dimen>
+
+    <dimen name="dp_280">560.5833dp</dimen>
+
+    <dimen name="dp_281">562.5854dp</dimen>
+
+    <dimen name="dp_282">564.5875dp</dimen>
+
+    <dimen name="dp_283">566.5896dp</dimen>
+
+    <dimen name="dp_284">568.5917dp</dimen>
+
+    <dimen name="dp_285">570.5938dp</dimen>
+
+    <dimen name="dp_286">572.5958dp</dimen>
+
+    <dimen name="dp_287">574.5979dp</dimen>
+
+    <dimen name="dp_288">576.6000dp</dimen>
+
+    <dimen name="dp_289">578.6021dp</dimen>
+
+    <dimen name="dp_290">580.6042dp</dimen>
+
+    <dimen name="dp_291">582.6062dp</dimen>
+
+    <dimen name="dp_292">584.6083dp</dimen>
+
+    <dimen name="dp_293">586.6104dp</dimen>
+
+    <dimen name="dp_294">588.6125dp</dimen>
+
+    <dimen name="dp_295">590.6146dp</dimen>
+
+    <dimen name="dp_296">592.6167dp</dimen>
+
+    <dimen name="dp_297">594.6187dp</dimen>
+
+    <dimen name="dp_298">596.6208dp</dimen>
+
+    <dimen name="dp_299">598.6229dp</dimen>
+
+    <dimen name="dp_300">600.6250dp</dimen>
+
+    <dimen name="dp_301">602.6271dp</dimen>
+
+    <dimen name="dp_302">604.6292dp</dimen>
+
+    <dimen name="dp_303">606.6312dp</dimen>
+
+    <dimen name="dp_304">608.6333dp</dimen>
+
+    <dimen name="dp_305">610.6354dp</dimen>
+
+    <dimen name="dp_306">612.6375dp</dimen>
+
+    <dimen name="dp_307">614.6396dp</dimen>
+
+    <dimen name="dp_308">616.6417dp</dimen>
+
+    <dimen name="dp_309">618.6437dp</dimen>
+
+    <dimen name="dp_310">620.6458dp</dimen>
+
+    <dimen name="dp_311">622.6479dp</dimen>
+
+    <dimen name="dp_312">624.6500dp</dimen>
+
+    <dimen name="dp_313">626.6521dp</dimen>
+
+    <dimen name="dp_314">628.6542dp</dimen>
+
+    <dimen name="dp_315">630.6562dp</dimen>
+
+    <dimen name="dp_316">632.6583dp</dimen>
+
+    <dimen name="dp_317">634.6604dp</dimen>
+
+    <dimen name="dp_318">636.6625dp</dimen>
+
+    <dimen name="dp_319">638.6646dp</dimen>
+
+    <dimen name="dp_320">640.6667dp</dimen>
+
+    <dimen name="dp_321">642.6687dp</dimen>
+
+    <dimen name="dp_322">644.6708dp</dimen>
+
+    <dimen name="dp_323">646.6729dp</dimen>
+
+    <dimen name="dp_324">648.6750dp</dimen>
+
+    <dimen name="dp_325">650.6771dp</dimen>
+
+    <dimen name="dp_326">652.6792dp</dimen>
+
+    <dimen name="dp_327">654.6812dp</dimen>
+
+    <dimen name="dp_328">656.6833dp</dimen>
+
+    <dimen name="dp_329">658.6854dp</dimen>
+
+    <dimen name="dp_330">660.6875dp</dimen>
+
+    <dimen name="dp_331">662.6896dp</dimen>
+
+    <dimen name="dp_332">664.6917dp</dimen>
+
+    <dimen name="dp_333">666.6937dp</dimen>
+
+    <dimen name="dp_334">668.6958dp</dimen>
+
+    <dimen name="dp_335">670.6979dp</dimen>
+
+    <dimen name="dp_336">672.7000dp</dimen>
+
+    <dimen name="dp_337">674.7021dp</dimen>
+
+    <dimen name="dp_338">676.7042dp</dimen>
+
+    <dimen name="dp_339">678.7062dp</dimen>
+
+    <dimen name="dp_340">680.7083dp</dimen>
+
+    <dimen name="dp_341">682.7104dp</dimen>
+
+    <dimen name="dp_342">684.7125dp</dimen>
+
+    <dimen name="dp_343">686.7146dp</dimen>
+
+    <dimen name="dp_344">688.7167dp</dimen>
+
+    <dimen name="dp_345">690.7188dp</dimen>
+
+    <dimen name="dp_346">692.7208dp</dimen>
+
+    <dimen name="dp_347">694.7229dp</dimen>
+
+    <dimen name="dp_348">696.7250dp</dimen>
+
+    <dimen name="dp_349">698.7271dp</dimen>
+
+    <dimen name="dp_350">700.7292dp</dimen>
+
+    <dimen name="dp_351">702.7312dp</dimen>
+
+    <dimen name="dp_352">704.7333dp</dimen>
+
+    <dimen name="dp_353">706.7354dp</dimen>
+
+    <dimen name="dp_354">708.7375dp</dimen>
+
+    <dimen name="dp_355">710.7396dp</dimen>
+
+    <dimen name="dp_356">712.7417dp</dimen>
+
+    <dimen name="dp_357">714.7437dp</dimen>
+
+    <dimen name="dp_358">716.7458dp</dimen>
+
+    <dimen name="dp_359">718.7479dp</dimen>
+
+    <dimen name="dp_360">720.7500dp</dimen>
+
+    <dimen name="dp_365">730.7604dp</dimen>
+
+    <dimen name="dp_370">740.7708dp</dimen>
+
+    <dimen name="dp_400">800.8333dp</dimen>
+
+    <dimen name="dp_410">820.8542dp</dimen>
+
+    <dimen name="dp_422">844.8792dp</dimen>
+
+    <dimen name="dp_472">944.9833dp</dimen>
+
+    <dimen name="dp_500">1001.0417dp</dimen>
+
+    <dimen name="dp_600">1201.2500dp</dimen>
+
+    <dimen name="dp_640">1281.3333dp</dimen>
+
+    <dimen name="dp_650">1301.3542dp</dimen>
+
+    <dimen name="dp_710">1421.4792dp</dimen>
+
+    <dimen name="dp_720">1441.5000dp</dimen>
+
+
+</resources>
diff --git a/system/basic/src/main/res/values/colors.xml b/system/basic/src/main/res/values/colors.xml
new file mode 100644
index 0000000..fd02301
--- /dev/null
+++ b/system/basic/src/main/res/values/colors.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="dialogColorAccent">#FF1385FA</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+    <color name="transparent">#00000000</color>
+    <color name="c_home_menu_item_bg">#1F1F29</color>
+    <color name="colorTopLineGray">#E9E9E9</color>
+
+
+    <color name="black_3">#FF333333</color>
+    <color name="black_6">#FF666666</color>
+    <color name="black_9">#FF999999</color>
+</resources>
\ No newline at end of file
diff --git a/system/basic/src/main/res/values/dimens.xml b/system/basic/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..42471ff
--- /dev/null
+++ b/system/basic/src/main/res/values/dimens.xml
@@ -0,0 +1,428 @@
+<resources>
+    <dimen name="txt5">5sp</dimen>
+    <dimen name="txt6">6sp</dimen>
+    <dimen name="txt7">7sp</dimen>
+    <dimen name="txt8">8sp</dimen>
+    <dimen name="txt9">9sp</dimen>
+    <dimen name="txt10">10sp</dimen>
+    <dimen name="txt11">11sp</dimen>
+    <dimen name="txt12">12sp</dimen>
+    <dimen name="txt13">13sp</dimen>
+    <dimen name="txt14">14sp</dimen>
+    <dimen name="txt15">15sp</dimen>
+    <dimen name="txt16">16sp</dimen>
+    <dimen name="txt17">17sp</dimen>
+    <dimen name="txt18">18sp</dimen>
+    <dimen name="txt19">19sp</dimen>
+    <dimen name="txt20">20sp</dimen>
+    <dimen name="txt21">21sp</dimen>
+    <dimen name="txt22">22sp</dimen>
+    <dimen name="txt24">24sp</dimen>
+    <dimen name="txt26">26sp</dimen>
+    <dimen name="txt28">28sp</dimen>
+    <dimen name="txt30">30sp</dimen>
+    <dimen name="txt32">32sp</dimen>
+    <dimen name="txt34">34sp</dimen>
+
+
+
+    <!-- Your custom size defind by references, can be writted in anywhere, any module, any values/*.xml, for example: -->
+    <dimen name="card_common_margin_left">@dimen/dp_15</dimen>
+
+    <!-- dp and sp values, must be defind in this file! -->
+    <!-- view size,you can add if there is no one -->
+    <dimen name="dp_m_60">-60dp</dimen>
+    <dimen name="dp_m_30">-30dp</dimen>
+    <dimen name="dp_m_20">-20dp</dimen>
+    <dimen name="dp_m_12">-12dp</dimen>
+    <dimen name="dp_m_10">-10dp</dimen>
+    <dimen name="dp_m_8">-8dp</dimen>
+    <dimen name="dp_m_5">-5dp</dimen>
+    <dimen name="dp_m_2">-2dp</dimen>
+    <dimen name="dp_m_1">-1dp</dimen>
+    <dimen name="dp_0">0dp</dimen>
+    <dimen name="dp_0_1">0.1dp</dimen>
+    <dimen name="dp_0_5">0.5dp</dimen>
+    <dimen name="dp_1">1dp</dimen>
+    <dimen name="dp_1_5">1.5dp</dimen>
+    <dimen name="dp_2">2dp</dimen>
+    <dimen name="dp_2_5">2.5dp</dimen>
+    <dimen name="dp_3">3dp</dimen>
+    <dimen name="dp_3_5">3.5dp</dimen>
+    <dimen name="dp_4">4dp</dimen>
+    <dimen name="dp_4_5">4.5dp</dimen>
+    <dimen name="dp_5">5dp</dimen>
+    <dimen name="dp_6">6dp</dimen>
+    <dimen name="dp_7">7dp</dimen>
+    <dimen name="dp_7_5">7.5dp</dimen>
+    <dimen name="dp_8">8dp</dimen>
+    <dimen name="dp_9">9dp</dimen>
+    <dimen name="dp_10">10dp</dimen>
+    <dimen name="dp_11">11dp</dimen>
+    <dimen name="dp_12">12dp</dimen>
+    <dimen name="dp_13">13dp</dimen>
+    <dimen name="dp_14">14dp</dimen>
+    <dimen name="dp_15">15dp</dimen>
+    <dimen name="dp_16">16dp</dimen>
+    <dimen name="dp_17">17dp</dimen>
+    <dimen name="dp_18">18dp</dimen>
+    <dimen name="dp_19">19dp</dimen>
+    <dimen name="dp_20">20dp</dimen>
+    <dimen name="dp_21">21dp</dimen>
+    <dimen name="dp_22">22dp</dimen>
+    <dimen name="dp_23">23dp</dimen>
+    <dimen name="dp_24">24dp</dimen>
+    <dimen name="dp_25">25dp</dimen>
+    <dimen name="dp_26">26dp</dimen>
+    <dimen name="dp_27">27dp</dimen>
+    <dimen name="dp_28">28dp</dimen>
+    <dimen name="dp_29">29dp</dimen>
+    <dimen name="dp_30">30dp</dimen>
+    <dimen name="dp_31">31dp</dimen>
+    <dimen name="dp_32">32dp</dimen>
+    <dimen name="dp_33">33dp</dimen>
+    <dimen name="dp_34">34dp</dimen>
+    <dimen name="dp_35">35dp</dimen>
+    <dimen name="dp_36">36dp</dimen>
+    <dimen name="dp_37">37dp</dimen>
+    <dimen name="dp_38">38dp</dimen>
+    <dimen name="dp_39">39dp</dimen>
+    <dimen name="dp_40">40dp</dimen>
+    <dimen name="dp_41">41dp</dimen>
+    <dimen name="dp_42">42dp</dimen>
+    <dimen name="dp_43">43dp</dimen>
+    <dimen name="dp_44">44dp</dimen>
+    <dimen name="dp_45">45dp</dimen>
+    <dimen name="dp_46">46dp</dimen>
+    <dimen name="dp_47">47dp</dimen>
+    <dimen name="dp_48">48dp</dimen>
+    <dimen name="dp_49">49dp</dimen>
+    <dimen name="dp_50">50dp</dimen>
+    <dimen name="dp_51">51dp</dimen>
+    <dimen name="dp_52">52dp</dimen>
+    <dimen name="dp_53">53dp</dimen>
+    <dimen name="dp_54">54dp</dimen>
+    <dimen name="dp_55">55dp</dimen>
+    <dimen name="dp_56">56dp</dimen>
+    <dimen name="dp_57">57dp</dimen>
+    <dimen name="dp_58">58dp</dimen>
+    <dimen name="dp_59">59dp</dimen>
+    <dimen name="dp_60">60dp</dimen>
+    <dimen name="dp_61">61dp</dimen>
+    <dimen name="dp_62">62dp</dimen>
+    <dimen name="dp_63">63dp</dimen>
+    <dimen name="dp_64">64dp</dimen>
+    <dimen name="dp_65">65dp</dimen>
+    <dimen name="dp_66">66dp</dimen>
+    <dimen name="dp_67">67dp</dimen>
+    <dimen name="dp_68">68dp</dimen>
+    <dimen name="dp_69">69dp</dimen>
+    <dimen name="dp_70">70dp</dimen>
+    <dimen name="dp_71">71dp</dimen>
+    <dimen name="dp_72">72dp</dimen>
+    <dimen name="dp_73">73dp</dimen>
+    <dimen name="dp_74">74dp</dimen>
+    <dimen name="dp_75">75dp</dimen>
+    <dimen name="dp_76">76dp</dimen>
+    <dimen name="dp_77">77dp</dimen>
+    <dimen name="dp_78">78dp</dimen>
+    <dimen name="dp_79">79dp</dimen>
+    <dimen name="dp_80">80dp</dimen>
+    <dimen name="dp_81">81dp</dimen>
+    <dimen name="dp_82">82dp</dimen>
+    <dimen name="dp_83">83dp</dimen>
+    <dimen name="dp_84">84dp</dimen>
+    <dimen name="dp_85">85dp</dimen>
+    <dimen name="dp_86">86dp</dimen>
+    <dimen name="dp_87">87dp</dimen>
+    <dimen name="dp_88">88dp</dimen>
+    <dimen name="dp_89">89dp</dimen>
+    <dimen name="dp_90">90dp</dimen>
+    <dimen name="dp_91">91dp</dimen>
+    <dimen name="dp_92">92dp</dimen>
+    <dimen name="dp_93">93dp</dimen>
+    <dimen name="dp_94">94dp</dimen>
+    <dimen name="dp_95">95dp</dimen>
+    <dimen name="dp_96">96dp</dimen>
+    <dimen name="dp_97">97dp</dimen>
+    <dimen name="dp_98">98dp</dimen>
+    <dimen name="dp_99">99dp</dimen>
+    <dimen name="dp_100">100dp</dimen>
+    <dimen name="dp_101">101dp</dimen>
+    <dimen name="dp_102">102dp</dimen>
+    <dimen name="dp_103">103dp</dimen>
+    <dimen name="dp_104">104dp</dimen>
+    <dimen name="dp_104_5">104.5dp</dimen>
+    <dimen name="dp_105">105dp</dimen>
+    <dimen name="dp_106">106dp</dimen>
+    <dimen name="dp_107">107dp</dimen>
+    <dimen name="dp_108">108dp</dimen>
+    <dimen name="dp_109">109dp</dimen>
+    <dimen name="dp_110">110dp</dimen>
+    <dimen name="dp_111">111dp</dimen>
+    <dimen name="dp_112">112dp</dimen>
+    <dimen name="dp_113">113dp</dimen>
+    <dimen name="dp_114">114dp</dimen>
+    <dimen name="dp_115">115dp</dimen>
+    <dimen name="dp_116">116dp</dimen>
+    <dimen name="dp_117">117dp</dimen>
+    <dimen name="dp_118">118dp</dimen>
+    <dimen name="dp_119">119dp</dimen>
+    <dimen name="dp_120">120dp</dimen>
+    <dimen name="dp_121">121dp</dimen>
+    <dimen name="dp_122">122dp</dimen>
+    <dimen name="dp_123">123dp</dimen>
+    <dimen name="dp_124">124dp</dimen>
+    <dimen name="dp_125">125dp</dimen>
+    <dimen name="dp_126">126dp</dimen>
+    <dimen name="dp_127">127dp</dimen>
+    <dimen name="dp_128">128dp</dimen>
+    <dimen name="dp_129">129dp</dimen>
+    <dimen name="dp_130">130dp</dimen>
+    <dimen name="dp_131">131dp</dimen>
+    <dimen name="dp_132">132dp</dimen>
+    <dimen name="dp_133">133dp</dimen>
+    <dimen name="dp_134">134dp</dimen>
+    <dimen name="dp_134_5">134.5dp</dimen>
+    <dimen name="dp_135">135dp</dimen>
+    <dimen name="dp_136">136dp</dimen>
+    <dimen name="dp_137">137dp</dimen>
+    <dimen name="dp_138">138dp</dimen>
+    <dimen name="dp_139">139dp</dimen>
+    <dimen name="dp_140">140dp</dimen>
+    <dimen name="dp_141">141dp</dimen>
+    <dimen name="dp_142">142dp</dimen>
+    <dimen name="dp_143">143dp</dimen>
+    <dimen name="dp_144">144dp</dimen>
+    <dimen name="dp_145">145dp</dimen>
+    <dimen name="dp_146">146dp</dimen>
+    <dimen name="dp_147">147dp</dimen>
+    <dimen name="dp_148">148dp</dimen>
+    <dimen name="dp_149">149dp</dimen>
+    <dimen name="dp_150">150dp</dimen>
+    <dimen name="dp_151">151dp</dimen>
+    <dimen name="dp_152">152dp</dimen>
+    <dimen name="dp_153">153dp</dimen>
+    <dimen name="dp_154">154dp</dimen>
+    <dimen name="dp_155">155dp</dimen>
+    <dimen name="dp_156">156dp</dimen>
+    <dimen name="dp_157">157dp</dimen>
+    <dimen name="dp_158">158dp</dimen>
+    <dimen name="dp_159">159dp</dimen>
+    <dimen name="dp_160">160dp</dimen>
+    <dimen name="dp_161">161dp</dimen>
+    <dimen name="dp_162">162dp</dimen>
+    <dimen name="dp_163">163dp</dimen>
+    <dimen name="dp_164">164dp</dimen>
+    <dimen name="dp_165">165dp</dimen>
+    <dimen name="dp_166">166dp</dimen>
+    <dimen name="dp_167">167dp</dimen>
+    <dimen name="dp_168">168dp</dimen>
+    <dimen name="dp_169">169dp</dimen>
+    <dimen name="dp_170">170dp</dimen>
+    <dimen name="dp_171">171dp</dimen>
+    <dimen name="dp_172">172dp</dimen>
+    <dimen name="dp_173">173dp</dimen>
+    <dimen name="dp_174">174dp</dimen>
+    <dimen name="dp_175">175dp</dimen>
+    <dimen name="dp_176">176dp</dimen>
+    <dimen name="dp_177">177dp</dimen>
+    <dimen name="dp_178">178dp</dimen>
+    <dimen name="dp_179">179dp</dimen>
+    <dimen name="dp_180">180dp</dimen>
+    <dimen name="dp_181">181dp</dimen>
+    <dimen name="dp_182">182dp</dimen>
+    <dimen name="dp_183">183dp</dimen>
+    <dimen name="dp_184">184dp</dimen>
+    <dimen name="dp_185">185dp</dimen>
+    <dimen name="dp_186">186dp</dimen>
+    <dimen name="dp_187">187dp</dimen>
+    <dimen name="dp_188">188dp</dimen>
+    <dimen name="dp_189">189dp</dimen>
+    <dimen name="dp_190">190dp</dimen>
+    <dimen name="dp_191">191dp</dimen>
+    <dimen name="dp_191_25">191.25dp</dimen>
+    <dimen name="dp_192">192dp</dimen>
+    <dimen name="dp_193">193dp</dimen>
+    <dimen name="dp_194">194dp</dimen>
+    <dimen name="dp_195">195dp</dimen>
+    <dimen name="dp_196">196dp</dimen>
+    <dimen name="dp_197">197dp</dimen>
+    <dimen name="dp_198">198dp</dimen>
+    <dimen name="dp_199">199dp</dimen>
+    <dimen name="dp_200">200dp</dimen>
+    <dimen name="dp_201">201dp</dimen>
+    <dimen name="dp_202">202dp</dimen>
+    <dimen name="dp_203">203dp</dimen>
+    <dimen name="dp_204">204dp</dimen>
+    <dimen name="dp_205">205dp</dimen>
+    <dimen name="dp_206">206dp</dimen>
+    <dimen name="dp_207">207dp</dimen>
+    <dimen name="dp_208">208dp</dimen>
+    <dimen name="dp_209">209dp</dimen>
+    <dimen name="dp_210">210dp</dimen>
+    <dimen name="dp_211">211dp</dimen>
+    <dimen name="dp_212">212dp</dimen>
+    <dimen name="dp_213">213dp</dimen>
+    <dimen name="dp_214">214dp</dimen>
+    <dimen name="dp_215">215dp</dimen>
+    <dimen name="dp_216">216dp</dimen>
+    <dimen name="dp_217">217dp</dimen>
+    <dimen name="dp_218">218dp</dimen>
+    <dimen name="dp_219">219dp</dimen>
+    <dimen name="dp_220">220dp</dimen>
+    <dimen name="dp_221">221dp</dimen>
+    <dimen name="dp_222">222dp</dimen>
+    <dimen name="dp_223">223dp</dimen>
+    <dimen name="dp_224">224dp</dimen>
+    <dimen name="dp_225">225dp</dimen>
+    <dimen name="dp_226">226dp</dimen>
+    <dimen name="dp_227">227dp</dimen>
+    <dimen name="dp_228">228dp</dimen>
+    <dimen name="dp_229">229dp</dimen>
+    <dimen name="dp_230">230dp</dimen>
+    <dimen name="dp_231">231dp</dimen>
+    <dimen name="dp_232">232dp</dimen>
+    <dimen name="dp_233">233dp</dimen>
+    <dimen name="dp_234">234dp</dimen>
+    <dimen name="dp_235">235dp</dimen>
+    <dimen name="dp_236">236dp</dimen>
+    <dimen name="dp_237">237dp</dimen>
+    <dimen name="dp_238">238dp</dimen>
+    <dimen name="dp_239">239dp</dimen>
+    <dimen name="dp_240">240dp</dimen>
+    <dimen name="dp_241">241dp</dimen>
+    <dimen name="dp_242">242dp</dimen>
+    <dimen name="dp_243">243dp</dimen>
+    <dimen name="dp_244">244dp</dimen>
+    <dimen name="dp_245">245dp</dimen>
+    <dimen name="dp_246">246dp</dimen>
+    <dimen name="dp_247">247dp</dimen>
+    <dimen name="dp_248">248dp</dimen>
+    <dimen name="dp_249">249dp</dimen>
+    <dimen name="dp_250">250dp</dimen>
+    <dimen name="dp_251">251dp</dimen>
+    <dimen name="dp_252">252dp</dimen>
+    <dimen name="dp_253">253dp</dimen>
+    <dimen name="dp_254">254dp</dimen>
+    <dimen name="dp_255">255dp</dimen>
+    <dimen name="dp_256">256dp</dimen>
+    <dimen name="dp_257">257dp</dimen>
+    <dimen name="dp_258">258dp</dimen>
+    <dimen name="dp_259">259dp</dimen>
+    <dimen name="dp_260">260dp</dimen>
+    <dimen name="dp_261">261dp</dimen>
+    <dimen name="dp_262">262dp</dimen>
+    <dimen name="dp_263">263dp</dimen>
+    <dimen name="dp_264">264dp</dimen>
+    <dimen name="dp_265">265dp</dimen>
+    <dimen name="dp_266">266dp</dimen>
+    <dimen name="dp_267">267dp</dimen>
+    <dimen name="dp_268">268dp</dimen>
+    <dimen name="dp_269">269dp</dimen>
+    <dimen name="dp_270">270dp</dimen>
+    <dimen name="dp_271">271dp</dimen>
+    <dimen name="dp_272">272dp</dimen>
+    <dimen name="dp_273">273dp</dimen>
+    <dimen name="dp_274">274dp</dimen>
+    <dimen name="dp_275">275dp</dimen>
+    <dimen name="dp_276">276dp</dimen>
+    <dimen name="dp_277">277dp</dimen>
+    <dimen name="dp_278">278dp</dimen>
+    <dimen name="dp_279">279dp</dimen>
+    <dimen name="dp_280">280dp</dimen>
+    <dimen name="dp_281">281dp</dimen>
+    <dimen name="dp_282">282dp</dimen>
+    <dimen name="dp_283">283dp</dimen>
+    <dimen name="dp_284">284dp</dimen>
+    <dimen name="dp_285">285dp</dimen>
+    <dimen name="dp_286">286dp</dimen>
+    <dimen name="dp_287">287dp</dimen>
+    <dimen name="dp_288">288dp</dimen>
+    <dimen name="dp_289">289dp</dimen>
+    <dimen name="dp_290">290dp</dimen>
+    <dimen name="dp_291">291dp</dimen>
+    <dimen name="dp_292">292dp</dimen>
+    <dimen name="dp_293">293dp</dimen>
+    <dimen name="dp_294">294dp</dimen>
+    <dimen name="dp_295">295dp</dimen>
+    <dimen name="dp_296">296dp</dimen>
+    <dimen name="dp_297">297dp</dimen>
+    <dimen name="dp_298">298dp</dimen>
+    <dimen name="dp_299">299dp</dimen>
+    <dimen name="dp_300">300dp</dimen>
+    <dimen name="dp_301">301dp</dimen>
+    <dimen name="dp_302">302dp</dimen>
+    <dimen name="dp_303">303dp</dimen>
+    <dimen name="dp_304">304dp</dimen>
+    <dimen name="dp_305">305dp</dimen>
+    <dimen name="dp_306">306dp</dimen>
+    <dimen name="dp_307">307dp</dimen>
+    <dimen name="dp_308">308dp</dimen>
+    <dimen name="dp_309">309dp</dimen>
+    <dimen name="dp_310">310dp</dimen>
+    <dimen name="dp_311">311dp</dimen>
+    <dimen name="dp_312">312dp</dimen>
+    <dimen name="dp_313">313dp</dimen>
+    <dimen name="dp_314">314dp</dimen>
+    <dimen name="dp_315">315dp</dimen>
+    <dimen name="dp_316">316dp</dimen>
+    <dimen name="dp_317">317dp</dimen>
+    <dimen name="dp_318">318dp</dimen>
+    <dimen name="dp_319">319dp</dimen>
+    <dimen name="dp_320">320dp</dimen>
+    <dimen name="dp_321">321dp</dimen>
+    <dimen name="dp_322">322dp</dimen>
+    <dimen name="dp_323">323dp</dimen>
+    <dimen name="dp_324">324dp</dimen>
+    <dimen name="dp_325">325dp</dimen>
+    <dimen name="dp_326">326dp</dimen>
+    <dimen name="dp_327">327dp</dimen>
+    <dimen name="dp_328">328dp</dimen>
+    <dimen name="dp_329">329dp</dimen>
+    <dimen name="dp_330">330dp</dimen>
+    <dimen name="dp_331">331dp</dimen>
+    <dimen name="dp_332">332dp</dimen>
+    <dimen name="dp_333">333dp</dimen>
+    <dimen name="dp_334">334dp</dimen>
+    <dimen name="dp_335">335dp</dimen>
+    <dimen name="dp_336">336dp</dimen>
+    <dimen name="dp_337">337dp</dimen>
+    <dimen name="dp_338">338dp</dimen>
+    <dimen name="dp_339">339dp</dimen>
+    <dimen name="dp_340">340dp</dimen>
+    <dimen name="dp_341">341dp</dimen>
+    <dimen name="dp_342">342dp</dimen>
+    <dimen name="dp_343">343dp</dimen>
+    <dimen name="dp_344">344dp</dimen>
+    <dimen name="dp_345">345dp</dimen>
+    <dimen name="dp_346">346dp</dimen>
+    <dimen name="dp_347">347dp</dimen>
+    <dimen name="dp_348">348dp</dimen>
+    <dimen name="dp_349">349dp</dimen>
+    <dimen name="dp_350">350dp</dimen>
+    <dimen name="dp_351">351dp</dimen>
+    <dimen name="dp_352">352dp</dimen>
+    <dimen name="dp_353">353dp</dimen>
+    <dimen name="dp_354">354dp</dimen>
+    <dimen name="dp_355">355dp</dimen>
+    <dimen name="dp_356">356dp</dimen>
+    <dimen name="dp_357">357dp</dimen>
+    <dimen name="dp_358">358dp</dimen>
+    <dimen name="dp_359">359dp</dimen>
+    <dimen name="dp_360">360dp</dimen>
+    <dimen name="dp_365">365dp</dimen>
+    <dimen name="dp_370">370dp</dimen>
+    <dimen name="dp_400">400dp</dimen>
+    <dimen name="dp_410">410dp</dimen>
+    <dimen name="dp_422">422dp</dimen>
+    <dimen name="dp_472">472dp</dimen>
+    <dimen name="dp_500">500dp</dimen>
+    <dimen name="dp_600">600dp</dimen>
+    <dimen name="dp_640">640dp</dimen>
+    <dimen name="dp_650">650dp</dimen>
+    <dimen name="dp_710">710dp</dimen>
+    <dimen name="dp_720">720dp</dimen>
+
+
+</resources>
\ No newline at end of file
diff --git a/system/basic/src/main/res/values/strings.xml b/system/basic/src/main/res/values/strings.xml
new file mode 100644
index 0000000..6b30d8d
--- /dev/null
+++ b/system/basic/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+
+</resources>
\ No newline at end of file
diff --git a/system/basic/src/main/res/values/styles.xml b/system/basic/src/main/res/values/styles.xml
new file mode 100644
index 0000000..91a0350
--- /dev/null
+++ b/system/basic/src/main/res/values/styles.xml
@@ -0,0 +1,15 @@
+<resources>
+
+    <!--圆角Dialog-->
+    <style name="MyDialog" parent="@android:style/Theme.Dialog">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:backgroundDimEnabled">true</item>
+        <item name="android:backgroundDimAmount">0.6</item>
+    </style>
+
+</resources>
diff --git a/system/basic/src/main/res/xml/file_paths.xml b/system/basic/src/main/res/xml/file_paths.xml
new file mode 100644
index 0000000..6a4e16e
--- /dev/null
+++ b/system/basic/src/main/res/xml/file_paths.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <files-path
+        name="files-path"
+        path="." />
+    <cache-path
+        name="cache-path"
+        path="." />
+    <external-path
+        name="external_storage_root"
+        path="." />
+    <external-files-path
+        name="external_file_path"
+        path="." />
+    <external-cache-path
+        name="external_cache_path"
+        path="." />
+    <!--配置root-path。这样子可以读取到sd卡和一些应用分身的目录，否则微信分身保存的图片，就会导致 java.lang.IllegalArgumentException: Failed to find configured root that contains /storage/emulated/999/tencent/MicroMsg/WeiXin/export1544062754693.jpg-->
+    <root-path
+        name="root-path"
+        path="" />
+</paths>
\ No newline at end of file
diff --git a/system/basic/src/main/res/xml/network_security_config.xml b/system/basic/src/main/res/xml/network_security_config.xml
new file mode 100644
index 0000000..dca93c0
--- /dev/null
+++ b/system/basic/src/main/res/xml/network_security_config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true" />
+</network-security-config>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/build.gradle b/system/tuicallkit-7.3.4358/build.gradle
new file mode 100644
index 0000000..722671a
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/build.gradle
@@ -0,0 +1,50 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 31
+
+    defaultConfig {
+        versionName "1.0"
+        versionCode 1
+        minSdkVersion 19
+        targetSdkVersion 26
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    api 'androidx.appcompat:appcompat:1.3.1'
+    api 'com.google.android.material:material:1.4.0'
+    api 'androidx.recyclerview:recyclerview:1.2.1'
+    api 'androidx.constraintlayout:constraintlayout:1.1.3'
+    api "com.github.bumptech.glide:glide:4.12.0"
+
+    def projects = this.rootProject.getAllprojects().stream().map { project -> project.name }.collect()
+    println "all projects : {$projects}"
+    if (projects.contains("tuicore")) {
+        api project(':system:tuicore-7.3.4358')
+    } else {
+        api "com.tencent.imsdk:imsdk-plus:7.3.4358"
+        api "com.tencent.liteav.tuikit:tuicore:1.1.24"
+    }
+
+    if (projects.contains("tuicallengine")) {
+        api project(':tuicallengine')
+    } else {
+        api "com.google.code.gson:gson:2.9.1"
+        api "com.tencent.liteav:LiteAVSDK_TRTC:latest.release"
+        api 'com.tencent.liteav.tuikit:tuicallengine:latest.release'
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/proguard-rules.pro b/system/tuicallkit-7.3.4358/proguard-rules.pro
new file mode 100644
index 0000000..f1b4245
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/system/tuicallkit-7.3.4358/src/main/AndroidManifest.xml b/system/tuicallkit-7.3.4358/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..9e7c05b
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/AndroidManifest.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.tencent.qcloud.tuikit.tuicallkit">
+
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <uses-permission android:name="android.permission.CAMERA" />
+
+    <uses-feature android:name="android.hardware.camera" />
+    <uses-feature android:name="android.hardware.camera.autofocus" />
+
+    <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30" />
+    <!-- Support Android S(31) Bluetooth-->
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+
+    <application>
+        <activity
+            android:name="com.tencent.qcloud.tuikit.tuicallkit.base.BaseCallActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat.NoActionBar" />
+
+        <activity
+            android:name=".extensions.inviteuser.SelectGroupMemberActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat.NoActionBar" />
+
+        <provider
+            android:name="com.tencent.qcloud.tuikit.tuicallkit.internal.ServiceInitializer"
+            android:authorities="${applicationId}.ServiceInitializer"
+            android:enabled="true"
+            android:exported="false" />
+
+        <service
+            android:name="com.tencent.qcloud.tuikit.tuicallkit.service.TUICallService"
+            android:enabled="true"
+            android:exported="false" />
+
+        <service
+            android:name="com.tencent.qcloud.tuikit.tuicallkit.view.floatwindow.FloatWindowService"
+            android:enabled="true"
+            android:exported="false" />
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/TUICallKit.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/TUICallKit.java
new file mode 100644
index 0000000..ff0cad6
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/TUICallKit.java
@@ -0,0 +1,98 @@
+package com.tencent.qcloud.tuikit.tuicallkit;
+
+import android.content.Context;
+
+import com.tencent.qcloud.tuikit.TUICommonDefine;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine;
+
+import java.util.List;
+
+public abstract class TUICallKit {
+
+    public static TUICallKit createInstance(Context context) {
+        return TUICallKitImpl.createInstance(context);
+    }
+
+    /**
+     * Set user profile
+     *
+     * @param nickname User name, which can contain up to 500 bytes
+     * @param avatar   User profile photo URL, which can contain up to 500 bytes
+     *                 For example: https://liteav.sdk.qcloud.com/app/res/picture/voiceroom/avatar/user_avatar1.png
+     * @param callback Set the result callback
+     */
+    public void setSelfInfo(String nickname, String avatar, TUICommonDefine.Callback callback) {
+    }
+
+    /**
+     * Make a call
+     *
+     * @param userId        callees
+     * @param callMediaType Call type
+     */
+    public void call(String userId, TUICallDefine.MediaType callMediaType) {
+    }
+
+    /**
+     * Make a call
+     *
+     * @param userId        callees
+     * @param callMediaType Call type
+     * @param params        Extension param: eg: offlinePushInfo
+     */
+    public void call(String userId, TUICallDefine.MediaType callMediaType,
+                     TUICallDefine.CallParams params, TUICommonDefine.Callback callback) {
+    }
+
+    /**
+     * Make a group call
+     *
+     * @param groupId       GroupId
+     * @param userIdList    List of userId
+     * @param callMediaType Call type
+     */
+    public void groupCall(String groupId, List<String> userIdList, TUICallDefine.MediaType callMediaType) {
+    }
+
+    /**
+     * Make a group call
+     *
+     * @param groupId       GroupId
+     * @param userIdList    List of userId
+     * @param callMediaType Call type
+     * @param params        Extension param: eg: offlinePushInfo
+     */
+    public void groupCall(String groupId, List<String> userIdList,
+                          TUICallDefine.MediaType callMediaType, TUICallDefine.CallParams params,
+                          TUICommonDefine.Callback callback) {
+    }
+
+    /**
+     * Join a current call
+     *
+     * @param roomId        current call room ID
+     * @param callMediaType call type
+     */
+    public void joinInGroupCall(TUICommonDefine.RoomId roomId, String groupId, TUICallDefine.MediaType callMediaType) {
+    }
+
+    /**
+     * Set the ringtone (preferably shorter than 30s)
+     *
+     * @param filePath Callee ringtone path
+     */
+    public void setCallingBell(String filePath) {
+    }
+
+    /**
+     * Enable the mute mode (the callee doesn't ring)
+     */
+    public void enableMuteMode(boolean enable) {
+    }
+
+    /**
+     * Enable the floating window
+     */
+    public void enableFloatWindow(boolean enable) {
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/TUICallKitImpl.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/TUICallKitImpl.java
new file mode 100644
index 0000000..889cf35
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/TUICallKitImpl.java
@@ -0,0 +1,840 @@
+package com.tencent.qcloud.tuikit.tuicallkit;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.text.TextUtils;
+
+import com.tencent.liteav.beauty.TXBeautyManager;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.interfaces.ITUINotification;
+import com.tencent.qcloud.tuicore.permission.PermissionCallback;
+import com.tencent.qcloud.tuicore.util.SPUtils;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.TUICommonDefine;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine.Scene;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine.Status;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallEngine;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallObserver;
+import com.tencent.qcloud.tuikit.tuicallengine.impl.base.TUILog;
+import com.tencent.qcloud.tuikit.tuicallengine.utils.PermissionUtils;
+import com.tencent.qcloud.tuikit.tuicallkit.base.CallingUserModel;
+import com.tencent.qcloud.tuikit.tuicallkit.base.Constants;
+import com.tencent.qcloud.tuikit.tuicallkit.base.TUICallingStatusManager;
+import com.tencent.qcloud.tuikit.tuicallkit.config.OfflinePushInfoConfig;
+import com.tencent.qcloud.tuikit.tuicallkit.extensions.CallingBellFeature;
+import com.tencent.qcloud.tuikit.tuicallkit.extensions.CallingKeepAliveFeature;
+import com.tencent.qcloud.tuikit.tuicallkit.extensions.CallingScreenSensorFeature;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.DeviceUtils;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.PermissionRequest;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.UserInfoUtils;
+import com.tencent.qcloud.tuikit.tuicallkit.view.TUICallingViewManager;
+import com.tencent.trtc.TRTCCloud;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+public final class TUICallKitImpl extends TUICallKit implements ITUINotification {
+    private static final String TAG = "TUICallKit";
+
+    private static TUICallKitImpl sInstance;
+    private final  Context        mContext;
+    private final  UserInfoUtils  mUserInfoUtils;
+
+    private final CallingKeepAliveFeature    mCallingKeepAliveFeature;
+    private final CallingScreenSensorFeature mCallingScreenSensorFeature;
+    private final CallingBellFeature         mCallingBellFeature;
+    private final TUICallingViewManager      mCallingViewManager;
+    private final Handler                    mMainHandler = new Handler(Looper.getMainLooper());
+
+    private Runnable      mTimeRunnable;
+    private int           mTimeCount;
+    private Handler       mTimeHandler;
+    private HandlerThread mTimeHandlerThread;
+
+    private long mSelfLowQualityTime;
+    private long mOtherUserLowQualityTime;
+
+    private List<CallingUserModel> mInviteeList = new ArrayList<>();
+    private CallingUserModel       mInviter     = new CallingUserModel();
+
+    public static TUICallKitImpl createInstance(Context context) {
+        if (null == sInstance) {
+            synchronized (TUICallKitImpl.class) {
+                if (null == sInstance) {
+                    sInstance = new TUICallKitImpl(context);
+                }
+            }
+        }
+        return sInstance;
+    }
+
+    private TUICallKitImpl(Context context) {
+        mContext = context.getApplicationContext();
+        TUICallEngine.createInstance(mContext).addObserver(mTUICallObserver);
+        mCallingKeepAliveFeature = new CallingKeepAliveFeature(mContext);
+        mCallingScreenSensorFeature = new CallingScreenSensorFeature(mContext);
+        mCallingBellFeature = new CallingBellFeature(mContext);
+        mCallingViewManager = new TUICallingViewManager(mContext);
+        mUserInfoUtils = new UserInfoUtils();
+        createTimeHandler();
+        registerCallingEvent();
+    }
+
+    private void registerCallingEvent() {
+        //Login Event
+        TUICore.registerEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED,
+                TUIConstants.TUILogin.EVENT_SUB_KEY_USER_LOGIN_SUCCESS, this);
+        TUICore.registerEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED,
+                TUIConstants.TUILogin.EVENT_SUB_KEY_USER_LOGOUT_SUCCESS, this);
+
+        //TUICallkit Event
+        TUICore.registerEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_CALL_STATUS_CHANGED, this);
+    }
+
+    @Override
+    public void setSelfInfo(String nickname, String avatar, TUICommonDefine.Callback callback) {
+        TUILog.i(TAG, "setSelfInfo, nickname: " + nickname + " ,avatar: " + avatar);
+        TUICallEngine.createInstance(mContext).setSelfInfo(nickname, avatar, callback);
+    }
+
+    @Override
+    public void call(String userId, TUICallDefine.MediaType callMediaType) {
+        TUICallDefine.CallParams params = new TUICallDefine.CallParams();
+        params.offlinePushInfo = OfflinePushInfoConfig.createOfflinePushInfo(mContext);
+        params.timeout = Constants.SIGNALING_MAX_TIME;
+        call(userId, callMediaType, params, null);
+    }
+
+    @Override
+    public void call(String userId, TUICallDefine.MediaType callMediaType, TUICallDefine.CallParams params,
+                     TUICommonDefine.Callback callback) {
+        TUILog.i(TAG, "call, userId: " + userId + " ,callMediaType: " + callMediaType + " ,params: " + params);
+
+        if (TextUtils.isEmpty(userId)) {
+            TUILog.e(TAG, "call failed, userId is empty");
+            callbackError(callback, TUICallDefine.ERROR_PARAM_INVALID, "call failed, userId is empty");
+            return;
+        }
+        if (TUICallDefine.MediaType.Unknown.equals(callMediaType)) {
+            TUILog.e(TAG, "call failed, callMediaType is Unknown");
+            callbackError(callback, TUICallDefine.ERROR_PARAM_INVALID, "call failed, callMediaType is Unknown");
+            return;
+        }
+
+        PermissionRequest.requestPermissions(mContext, callMediaType, new PermissionCallback() {
+            @Override
+            public void onGranted() {
+                TUICallEngine.createInstance(mContext).call(userId, callMediaType, params,
+                        new TUICommonDefine.Callback() {
+                            @Override
+                            public void onSuccess() {
+                                CallingUserModel model = new CallingUserModel();
+                                model.userId = userId;
+                                mInviteeList.add(model);
+                                TUICallingStatusManager.sharedInstance(mContext).setMediaType(callMediaType);
+                                TUICallingStatusManager.sharedInstance(mContext).setCallRole(TUICallDefine.Role.Caller);
+                                TUICallingStatusManager.sharedInstance(mContext).setCallScene(Scene.SINGLE_CALL);
+
+                                showCallingView();
+                                mCallingBellFeature.startDialingMusic();
+                                callbackSuccess(callback);
+                            }
+
+                            @Override
+                            public void onError(int errCode, String errMsg) {
+                                if (errCode == TUICallDefine.ERROR_PACKAGE_NOT_PURCHASED) {
+                                    errMsg = mContext.getString(R.string.tuicalling_package_not_purchased);
+                                }
+                                ToastUtil.toastLongMessage(errMsg);
+                                callbackError(callback, errCode, errMsg);
+                            }
+                        });
+            }
+
+            @Override
+            public void onDenied() {
+                callbackError(callback, TUICallDefine.ERROR_PERMISSION_DENIED, "permission denied");
+                resetCall();
+            }
+        });
+    }
+
+    @Override
+    public void groupCall(String groupId, List<String> userIdList, TUICallDefine.MediaType callMediaType) {
+        TUICallDefine.CallParams params = new TUICallDefine.CallParams();
+        params.offlinePushInfo = OfflinePushInfoConfig.createOfflinePushInfo(mContext);
+        params.timeout = Constants.SIGNALING_MAX_TIME;
+        groupCall(groupId, userIdList, callMediaType, params, null);
+    }
+
+    @Override
+    public void groupCall(String groupId, List<String> userIdList, TUICallDefine.MediaType callMediaType,
+                          TUICallDefine.CallParams params, TUICommonDefine.Callback callback) {
+        TUILog.i(TAG, "groupCall, groupId: " + groupId + " ,userIdList: " + userIdList
+                + " ,callMediaType: " + callMediaType + " ,params: " + params);
+
+        if (TextUtils.isEmpty(groupId)) {
+            TUILog.e(TAG, "groupCall failed, groupId is empty");
+            callbackError(callback, TUICallDefine.ERROR_PARAM_INVALID, "groupCall failed, groupId is empty");
+            return;
+        }
+
+        if (TUICallDefine.MediaType.Unknown.equals(callMediaType)) {
+            TUILog.e(TAG, "groupCall failed, callMediaType is Unknown");
+            callbackError(callback, TUICallDefine.ERROR_PARAM_INVALID, "groupCall failed, callMediaType is Unknown");
+            return;
+        }
+
+        if (userIdList == null || userIdList.isEmpty()) {
+            TUILog.e(TAG, "groupCall failed, userIdList is empty");
+            callbackError(callback, TUICallDefine.ERROR_PARAM_INVALID, "groupCall failed, userIdList is empty");
+            return;
+        }
+
+        if (userIdList.size() >= Constants.MAX_USER) {
+            ToastUtil.toastLongMessage(mContext.getString(R.string.tuicalling_user_exceed_limit));
+            TUILog.e(TAG, "groupCall failed, exceeding max user number: 9");
+            callbackError(callback, TUICallDefine.ERROR_PARAM_INVALID, "groupCall failed, exceeding max user number");
+            return;
+        }
+
+        PermissionRequest.requestPermissions(mContext, callMediaType, new PermissionCallback() {
+            @Override
+            public void onGranted() {
+                TUICallEngine.createInstance(mContext).groupCall(groupId, userIdList, callMediaType, params,
+                        new TUICommonDefine.Callback() {
+                            @Override
+                            public void onSuccess() {
+                                for (String userId : userIdList) {
+                                    if (!TextUtils.isEmpty(userId)) {
+                                        CallingUserModel model = new CallingUserModel();
+                                        model.userId = userId;
+                                        mInviteeList.add(model);
+                                    }
+                                }
+                                TUICallingStatusManager.sharedInstance(mContext).setMediaType(callMediaType);
+                                TUICallingStatusManager.sharedInstance(mContext).setCallRole(TUICallDefine.Role.Caller);
+                                TUICallingStatusManager.sharedInstance(mContext).setCallScene(Scene.GROUP_CALL);
+                                TUICallingStatusManager.sharedInstance(mContext).setGroupId(groupId);
+
+                                showCallingView();
+                                mCallingBellFeature.startDialingMusic();
+                                callbackSuccess(callback);
+                            }
+
+                            @Override
+                            public void onError(int errCode, String errMsg) {
+                                if (errCode == TUICallDefine.ERROR_PACKAGE_NOT_SUPPORTED) {
+                                    errMsg = mContext.getString(R.string.tuicalling_package_not_support);
+                                }
+                                ToastUtil.toastLongMessage(errMsg);
+                                callbackError(callback, errCode, errMsg);
+                            }
+                        });
+            }
+
+            @Override
+            public void onDenied() {
+                callbackError(callback, TUICallDefine.ERROR_PERMISSION_DENIED, "permission denied");
+                resetCall();
+            }
+        });
+    }
+
+    private void showCallingView() {
+        mCallingViewManager.createCallingView(mInviteeList, mInviter);
+        TUICallingStatusManager.sharedInstance(mContext).updateCallStatus(TUICallDefine.Status.Waiting);
+        queryUserInfo();
+
+        mCallingKeepAliveFeature.startKeepAlive();
+        mCallingScreenSensorFeature.registerSensorEventListener();
+
+        mCallingViewManager.showCallingView();
+    }
+
+    @Override
+    public void joinInGroupCall(TUICommonDefine.RoomId roomId, String groupId, TUICallDefine.MediaType mediaType) {
+        TUILog.i(TAG, "joinInGroupCall, roomId: " + roomId + " ,groupId: " + groupId + " ,mediaType: " + mediaType);
+
+        int intRoomId = (roomId != null) ? roomId.intRoomId : 0;
+        String strRoomId = (roomId != null) ? roomId.strRoomId : "";
+        if (intRoomId <= 0 && TextUtils.isEmpty(strRoomId)) {
+            TUILog.e(TAG, "joinInGroupCall failed, roomId is invalid");
+            return;
+        }
+        if (TextUtils.isEmpty(groupId)) {
+            TUILog.e(TAG, "joinInGroupCall failed, groupId is empty");
+            return;
+        }
+        if (TUICallDefine.MediaType.Unknown.equals(mediaType)) {
+            TUILog.e(TAG, "joinInGroupCall failed, mediaType is unknown");
+            return;
+        }
+
+        PermissionRequest.requestPermissions(mContext, mediaType, new PermissionCallback() {
+            @Override
+            public void onGranted() {
+                TUICallEngine.createInstance(mContext).joinInGroupCall(roomId, groupId, mediaType,
+                        new TUICommonDefine.Callback() {
+                            @Override
+                            public void onSuccess() {
+                                TUICallingStatusManager.sharedInstance(mContext).updateCallStatus(Status.Accept);
+                                TUICallingStatusManager.sharedInstance(mContext).setMediaType(mediaType);
+                                TUICallingStatusManager.sharedInstance(mContext).setCallScene(Scene.GROUP_CALL);
+                                TUICallingStatusManager.sharedInstance(mContext).setCallRole(TUICallDefine.Role.Called);
+                                TUICallingStatusManager.sharedInstance(mContext).setGroupId(groupId);
+
+                                mCallingViewManager.createGroupCallingAcceptView();
+                                mCallingViewManager.showCallingView();
+                                showTimeCount();
+                            }
+
+                            @Override
+                            public void onError(int errCode, String errMsg) {
+                                if (errCode == TUICallDefine.ERROR_PACKAGE_NOT_SUPPORTED) {
+                                    errMsg = mContext.getString(R.string.tuicalling_package_not_support);
+                                }
+                                ToastUtil.toastLongMessage(errMsg);
+                            }
+                        });
+            }
+
+            @Override
+            public void onDenied() {
+                resetCall();
+            }
+        });
+    }
+
+    @Override
+    public void setCallingBell(String filePath) {
+        TUILog.i(TAG, "setCallingBell, filePath: " + filePath);
+        SPUtils.getInstance(CallingBellFeature.PROFILE_TUICALLKIT).put(CallingBellFeature.PROFILE_CALL_BELL, filePath);
+    }
+
+    @Override
+    public void enableMuteMode(boolean enable) {
+        TUILog.i(TAG, "enableMuteMode, enable: " + enable);
+        SPUtils.getInstance(CallingBellFeature.PROFILE_TUICALLKIT).put(CallingBellFeature.PROFILE_MUTE_MODE, enable);
+    }
+
+    @Override
+    public void enableFloatWindow(boolean enable) {
+        TUILog.i(TAG, "enableFloatWindow, enable: " + enable);
+        mCallingViewManager.enableFloatWindow(enable);
+    }
+
+    public void queryOfflineCall() {
+        if (Status.None.equals(TUICallingStatusManager.sharedInstance(mContext).getCallStatus())) {
+            TUICallDefine.Role role = TUICallingStatusManager.sharedInstance(mContext).getCallRole();
+            TUICallDefine.MediaType mediaType = TUICallingStatusManager.sharedInstance(mContext).getMediaType();
+            if (TUICallDefine.Role.None.equals(role) || TUICallDefine.MediaType.Unknown.equals(mediaType)) {
+                return;
+            }
+            PermissionRequest.requestPermissions(mContext, mediaType, new PermissionCallback() {
+                @Override
+                public void onGranted() {
+                    showCallingView();
+                }
+
+                @Override
+                public void onDenied() {
+                    TUICallEngine.createInstance(mContext).reject(null);
+                    resetCall();
+                }
+            });
+        }
+    }
+
+    private final TUICallObserver mTUICallObserver = new TUICallObserver() {
+        @Override
+        public void onError(int code, String msg) {
+            super.onError(code, msg);
+            ToastUtil.toastLongMessage(mContext.getString(R.string.tuicalling_toast_call_error_msg, code, msg));
+        }
+
+        @Override
+        public void onCallReceived(String callerId, List<String> calleeIdList, String groupId,
+                                   TUICallDefine.MediaType callMediaType, String userData) {
+            super.onCallReceived(callerId, calleeIdList, groupId, callMediaType, userData);
+
+            if (TUICallDefine.MediaType.Unknown.equals(callMediaType)) {
+                return;
+            }
+
+            if (calleeIdList == null || calleeIdList.isEmpty()) {
+                return;
+            }
+
+            if (calleeIdList.size() >= Constants.MAX_USER) {
+                ToastUtil.toastLongMessage(mContext.getString(R.string.tuicalling_user_exceed_limit));
+                return;
+            }
+
+            mInviter.userId = callerId;
+            for (String userId : calleeIdList) {
+                if (!TextUtils.isEmpty(userId)) {
+                    CallingUserModel model = new CallingUserModel();
+                    model.userId = userId;
+                    mInviteeList.add(model);
+                }
+            }
+
+            Scene scene;
+            if (!TextUtils.isEmpty(groupId)) {
+                scene = Scene.GROUP_CALL;
+            } else {
+                scene = (calleeIdList.size() > 1) ? Scene.MULTI_CALL : Scene.SINGLE_CALL;
+            }
+            TUICallingStatusManager.sharedInstance(mContext).setMediaType(callMediaType);
+            TUICallingStatusManager.sharedInstance(mContext).setCallRole(TUICallDefine.Role.Called);
+            TUICallingStatusManager.sharedInstance(mContext).setCallScene(scene);
+            TUICallingStatusManager.sharedInstance(mContext).setGroupId(groupId);
+
+            //when app comes back to foreground, start the call
+            if (!DeviceUtils.isAppRunningForeground(mContext) && !PermissionUtils.hasPermission(mContext)) {
+                TUILog.w(TAG, "App is in background");
+                mCallingBellFeature.startRing();
+                return;
+            }
+
+            TUICallingStatusManager.sharedInstance(mContext).updateCallStatus(TUICallDefine.Status.Waiting);
+
+            PermissionRequest.requestPermissions(mContext, callMediaType, new PermissionCallback() {
+                @Override
+                public void onGranted() {
+                    showCallingView();
+                    mCallingBellFeature.startRing();
+                }
+
+                @Override
+                public void onDenied() {
+                    TUICallEngine.createInstance(mContext).reject(null);
+                    resetCall();
+                }
+            });
+        }
+
+        @Override
+        public void onCallCancelled(String callerId) {
+            super.onCallCancelled(callerId);
+            resetCall();
+        }
+
+        @Override
+        public void onCallBegin(TUICommonDefine.RoomId roomId, TUICallDefine.MediaType callMediaType,
+                                TUICallDefine.Role callRole) {
+            super.onCallBegin(roomId, callMediaType, callRole);
+            mCallingBellFeature.stopMusic();
+            TUICallingStatusManager.sharedInstance(mContext).updateCallStatus(TUICallDefine.Status.Accept);
+            showTimeCount();
+        }
+
+        @Override
+        public void onCallEnd(TUICommonDefine.RoomId roomId, TUICallDefine.MediaType callMediaType,
+                              TUICallDefine.Role callRole, long totalTime) {
+            super.onCallEnd(roomId, callMediaType, callRole, totalTime);
+            resetCall();
+        }
+
+        @Override
+        public void onCallMediaTypeChanged(TUICallDefine.MediaType oldCallMediaType,
+                                           TUICallDefine.MediaType newCallMediaType) {
+            super.onCallMediaTypeChanged(oldCallMediaType, newCallMediaType);
+            if (!oldCallMediaType.equals(newCallMediaType)) {
+                TUICallingStatusManager.sharedInstance(mContext).setMediaType(newCallMediaType);
+            }
+        }
+
+        @Override
+        public void onUserReject(String userId) {
+            super.onUserReject(userId);
+            CallingUserModel userModel = findCallingUserModel(userId);
+            mCallingViewManager.userLeave(userModel);
+            showUserToast(userModel, R.string.tuicalling_toast_user_reject_call);
+            mInviteeList.remove(userModel);
+        }
+
+        @Override
+        public void onUserNoResponse(String userId) {
+            super.onUserNoResponse(userId);
+            CallingUserModel userModel = findCallingUserModel(userId);
+            mCallingViewManager.userLeave(userModel);
+            showUserToast(userModel, R.string.tuicalling_toast_user_not_response);
+            mInviteeList.remove(userModel);
+        }
+
+        @Override
+        public void onUserLineBusy(String userId) {
+            super.onUserLineBusy(userId);
+            CallingUserModel userModel = findCallingUserModel(userId);
+            mCallingViewManager.userLeave(userModel);
+            showUserToast(userModel, R.string.tuicalling_toast_user_busy);
+            mInviteeList.remove(userModel);
+        }
+
+        @Override
+        public void onUserJoin(String userId) {
+            super.onUserJoin(userId);
+            CallingUserModel userModel = findCallingUserModel(userId);
+            if (userModel == null) {
+                userModel = new CallingUserModel();
+                userModel.userId = userId;
+                mInviteeList.add(userModel);
+            }
+            mCallingViewManager.userEnter(userModel);
+        }
+
+        @Override
+        public void onUserLeave(String userId) {
+            super.onUserLeave(userId);
+            CallingUserModel userModel = findCallingUserModel(userId);
+            mCallingViewManager.userLeave(userModel);
+            showUserToast(userModel, R.string.tuicalling_toast_user_end);
+            mInviteeList.remove(userModel);
+        }
+
+        @Override
+        public void onUserVideoAvailable(String userId, boolean isVideoAvailable) {
+            super.onUserVideoAvailable(userId, isVideoAvailable);
+            CallingUserModel model = findCallingUserModel(userId);
+            if (model != null && model.isVideoAvailable != isVideoAvailable) {
+                model.isVideoAvailable = isVideoAvailable;
+                mCallingViewManager.updateUser(model);
+            }
+        }
+
+        @Override
+        public void onUserAudioAvailable(String userId, boolean isAudioAvailable) {
+            super.onUserAudioAvailable(userId, isAudioAvailable);
+            CallingUserModel model = findCallingUserModel(userId);
+            if (model != null && model.isAudioAvailable != isAudioAvailable) {
+                model.isAudioAvailable = isAudioAvailable;
+                mCallingViewManager.updateUser(model);
+            }
+        }
+
+        @Override
+        public void onUserVoiceVolumeChanged(Map<String, Integer> volumeMap) {
+            super.onUserVoiceVolumeChanged(volumeMap);
+            if (Scene.SINGLE_CALL.equals(TUICallingStatusManager.sharedInstance(mContext).getCallScene())) {
+                return;
+            }
+            for (Map.Entry<String, Integer> entry : volumeMap.entrySet()) {
+                if (null != entry && !TextUtils.isEmpty(entry.getKey())) {
+                    CallingUserModel userModel = findCallingUserModel(entry.getKey());
+                    if (userModel != null && userModel.volume != entry.getValue()) {
+                        userModel.volume = entry.getValue();
+                        mCallingViewManager.updateUser(userModel);
+                    }
+                }
+            }
+        }
+
+        @Override
+        public void onUserNetworkQualityChanged(List<TUICommonDefine.NetworkQualityInfo> networkQualityList) {
+            super.onUserNetworkQualityChanged(networkQualityList);
+            updateNetworkQuality(networkQualityList);
+        }
+
+        @Override
+        public void onKickedOffline() {
+            super.onKickedOffline();
+            TUICallEngine.createInstance(mContext).hangup(null);
+            resetCall();
+        }
+
+        @Override
+        public void onUserSigExpired() {
+            super.onUserSigExpired();
+            TUICallEngine.createInstance(mContext).hangup(null);
+            resetCall();
+        }
+    };
+
+    private void resetCall() {
+        runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+
+                stopTimeCount();
+                mCallingBellFeature.stopMusic();
+                mCallingKeepAliveFeature.stopKeepAlive();
+                mCallingScreenSensorFeature.unregisterSensorEventListener();
+
+                mCallingViewManager.closeCallingView();
+                mInviter = new CallingUserModel();
+                mInviteeList.clear();
+                TUICallingStatusManager.sharedInstance(mContext).clear();
+            }
+        });
+    }
+
+    private void runOnMainThread(Runnable task) {
+        if (null != task) {
+            mMainHandler.post(task);
+        }
+    }
+
+    private void queryUserInfo() {
+        ArrayList<CallingUserModel> list = new ArrayList<>();
+        list.add(mInviter);
+        list.addAll(mInviteeList);
+        mUserInfoUtils.getUserInfo(list, new UserInfoUtils.UserCallback() {
+            @Override
+            public void onSuccess(List<CallingUserModel> list) {
+                if (null == list || list.isEmpty()) {
+                    return;
+                }
+                for (CallingUserModel model : list) {
+                    if (null != model && !TextUtils.isEmpty(model.userId)) {
+                        CallingUserModel userModel = findCallingUserModel(model.userId);
+                        if (null != userModel) {
+                            userModel.userName = model.userName;
+                            userModel.userAvatar = model.userAvatar;
+                        }
+                    }
+                }
+                mCallingViewManager.updateCallingUserView(mInviteeList, mInviter);
+            }
+
+            @Override
+            public void onFailed(int errorCode, String errorMsg) {
+            }
+        });
+    }
+
+    private void showUserToast(CallingUserModel model, int msgId) {
+        if (null == model || TextUtils.isEmpty(model.userId)) {
+            return;
+        }
+        if (!TextUtils.isEmpty(model.userName)) {
+            ToastUtil.toastLongMessage(mContext.getString(msgId, model.userName));
+            return;
+        }
+        UserInfoUtils userInfoUtils = new UserInfoUtils();
+        userInfoUtils.getUserInfo(model.userId, new UserInfoUtils.UserCallback() {
+            @Override
+            public void onSuccess(List<CallingUserModel> list) {
+                if (null == list || list.isEmpty() || null == list.get(0) || TextUtils.isEmpty(list.get(0).userId)) {
+                    ToastUtil.toastLongMessage(mContext.getString(msgId, model.userId));
+                    return;
+                }
+
+                model.userName = list.get(0).userName;
+                model.userAvatar = list.get(0).userAvatar;
+                ToastUtil.toastLongMessage(mContext.getString(msgId, model.userName));
+            }
+
+            @Override
+            public void onFailed(int errorCode, String errorMsg) {
+                ToastUtil.toastLongMessage(mContext.getString(msgId, model.userId));
+            }
+        });
+    }
+
+    private CallingUserModel findCallingUserModel(String userId) {
+        if (TextUtils.isEmpty(userId)) {
+            return null;
+        }
+        if (userId.equals(mInviter.userId)) {
+            return mInviter;
+        } else {
+            for (CallingUserModel model : mInviteeList) {
+                if (null != model && !TextUtils.isEmpty(model.userId) && userId.equals(model.userId)) {
+                    return model;
+                }
+            }
+        }
+        return null;
+    }
+
+    private void createTimeHandler() {
+        mTimeHandlerThread = new HandlerThread("time-count-thread");
+        mTimeHandlerThread.start();
+        mTimeHandler = new Handler(mTimeHandlerThread.getLooper());
+    }
+
+    private void showTimeCount() {
+        if (mTimeRunnable != null) {
+            return;
+        }
+        mTimeCount = 0;
+        mTimeRunnable = new Runnable() {
+            @Override
+            public void run() {
+                mTimeCount++;
+                mCallingViewManager.userCallingTimeStr(getShowTime(mTimeCount));
+                mTimeHandler.postDelayed(mTimeRunnable, 1000);
+            }
+        };
+        mTimeHandler.post(mTimeRunnable);
+    }
+
+    private String getShowTime(int count) {
+        return mContext.getString(R.string.tuicalling_called_time_format, count / 60, count % 60);
+    }
+
+    private void stopTimeCount() {
+        mTimeHandler.removeCallbacks(mTimeRunnable);
+        mTimeRunnable = null;
+        mTimeCount = 0;
+    }
+
+    private void updateNetworkQuality(List<TUICommonDefine.NetworkQualityInfo> networkQualityList) {
+        if (networkQualityList.isEmpty()) {
+            return;
+        }
+        TUICommonDefine.NetworkQualityInfo localInfo = null;
+        Iterator<TUICommonDefine.NetworkQualityInfo> iterator = networkQualityList.iterator();
+        while (iterator.hasNext()) {
+            TUICommonDefine.NetworkQualityInfo tempInfo = iterator.next();
+            if (TUILogin.getLoginUser().equals(tempInfo.userId)) {
+                localInfo = tempInfo;
+                break;
+            }
+        }
+        boolean isLocalLowQuality = false;
+        if (localInfo != null) {
+            isLocalLowQuality = isLowQuality(localInfo.quality);
+        }
+        if (isLocalLowQuality) {
+            updateLowQualityTip(true);
+        } else if (iterator.hasNext()) {
+            TUICommonDefine.NetworkQualityInfo remoteInfo = iterator.next();
+            if (isLowQuality(remoteInfo.quality)) {
+                updateLowQualityTip(false);
+            }
+        }
+    }
+
+    private boolean isLowQuality(TUICommonDefine.NetworkQuality quality) {
+        if (null == quality) {
+            return false;
+        }
+        boolean lowQuality;
+        switch (quality) {
+            case Vbad:
+            case Down:
+                lowQuality = true;
+                break;
+            default:
+                lowQuality = false;
+        }
+        return lowQuality;
+    }
+
+    private void updateLowQualityTip(boolean isSelf) {
+        long currentTime = System.currentTimeMillis();
+        if (isSelf) {
+            if (currentTime - mSelfLowQualityTime > Constants.MIN_DURATION_SHOW_LOW_QUALITY) {
+                ToastUtil.toastShortMessage(mContext.getString(R.string.tuicalling_self_network_low_quality));
+                mSelfLowQualityTime = currentTime;
+            }
+        } else {
+            if (currentTime - mOtherUserLowQualityTime > Constants.MIN_DURATION_SHOW_LOW_QUALITY) {
+                ToastUtil.toastShortMessage(mContext.getString(R.string.tuicalling_other_party_network_low_quality));
+                mOtherUserLowQualityTime = currentTime;
+            }
+        }
+    }
+
+    private void initCallEngine() {
+        TUICallEngine.createInstance(mContext).init(TUILogin.getSdkAppId(), TUILogin.getLoginUser(),
+                TUILogin.getUserSig(), new TUICommonDefine.Callback() {
+                    @Override
+                    public void onSuccess() {
+                    }
+
+                    @Override
+                    public void onError(int errCode, String errMsg) {
+                    }
+                });
+        initCallVideoParams();
+        initCallBeautyParams();
+    }
+
+    private void initCallVideoParams() {
+        //set video render params of loginUser
+        TUICommonDefine.VideoRenderParams renderParams = new TUICommonDefine.VideoRenderParams();
+        renderParams.fillMode = TUICommonDefine.VideoRenderParams.FillMode.Fill;
+        renderParams.rotation = TUICommonDefine.VideoRenderParams.Rotation.Rotation_0;
+        String user = TUILogin.getLoginUser();
+        TUICallEngine.createInstance(mContext).setVideoRenderParams(user, renderParams, new TUICommonDefine.Callback() {
+            @Override
+            public void onSuccess() {
+            }
+
+            @Override
+            public void onError(int errCode, String errMsg) {
+            }
+        });
+
+        //set video encoder params
+        TUICommonDefine.VideoEncoderParams encoderParams = new TUICommonDefine.VideoEncoderParams();
+        encoderParams.resolution = TUICommonDefine.VideoEncoderParams.Resolution.Resolution_640_360;
+        encoderParams.resolutionMode = TUICommonDefine.VideoEncoderParams.ResolutionMode.Portrait;
+        TUICallEngine.createInstance(mContext).setVideoEncoderParams(encoderParams, new TUICommonDefine.Callback() {
+            @Override
+            public void onSuccess() {
+            }
+
+            @Override
+            public void onError(int errCode, String errMsg) {
+            }
+        });
+    }
+
+    private void initCallBeautyParams() {
+        TRTCCloud trtcCloud = TUICallEngine.createInstance(mContext).getTRTCCloudInstance();
+        TXBeautyManager txBeautyManager = trtcCloud.getBeautyManager();
+        txBeautyManager.setBeautyStyle(TXBeautyManager.TXBeautyStyleNature);
+        txBeautyManager.setBeautyLevel(6);
+    }
+
+    @Override
+    public void onNotifyEvent(String key, String subKey, Map<String, Object> param) {
+        //Login Event
+        if (TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED.equals(key)) {
+            if (TUIConstants.TUILogin.EVENT_SUB_KEY_USER_LOGOUT_SUCCESS.equals(subKey)) {
+                //logout succeed: if user is in the call, end the call first and then clean data
+                TUICallEngine.createInstance(mContext).hangup(null);
+                TUICallEngine.destroyInstance();
+                resetCall();
+            } else if (TUIConstants.TUILogin.EVENT_SUB_KEY_USER_LOGIN_SUCCESS.equals(subKey)) {
+                TUILog.i(TAG, "login success");
+                //login succeed: add "TUICallObserver" again
+                TUICallEngine.createInstance(mContext).addObserver(mTUICallObserver);
+                //login succeed: initialize "TUICallEngine"
+                initCallEngine();
+            }
+        }
+
+        //TUICallkit Event
+        if (Constants.EVENT_TUICALLING_CHANGED.equals(key)
+                && Constants.EVENT_SUB_CALL_STATUS_CHANGED.equals(subKey) && param != null) {
+            if (TUICallDefine.Status.None.equals(param.get(Constants.CALL_STATUS))) {
+                resetCall();
+            }
+        }
+    }
+
+    public void callbackSuccess(TUICommonDefine.Callback callback) {
+        if (callback != null) {
+            callback.onSuccess();
+        }
+    }
+
+    public void callbackError(TUICommonDefine.Callback callback, int errCode, String errMsg) {
+        if (callback != null) {
+            callback.onError(errCode, errMsg);
+        }
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/BaseCallActivity.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/BaseCallActivity.java
new file mode 100644
index 0000000..baa9768
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/BaseCallActivity.java
@@ -0,0 +1,100 @@
+package com.tencent.qcloud.tuikit.tuicallkit.base;
+
+import android.app.NotificationManager;
+import android.content.Context;
+import android.graphics.Color;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.RelativeLayout;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.DeviceUtils;
+import com.tencent.qcloud.tuikit.tuicallkit.view.root.BaseCallView;
+
+public class BaseCallActivity extends AppCompatActivity {
+    private static AppCompatActivity mActivity;
+    private static BaseCallView      mBaseCallView;
+    private static RelativeLayout    mLayoutContainer;
+
+    public static void updateBaseView(BaseCallView view) {
+        mBaseCallView = view;
+        if (null != mLayoutContainer && null != mBaseCallView) {
+            mLayoutContainer.removeAllViews();
+            if (null != mBaseCallView.getParent()) {
+                ((ViewGroup) mBaseCallView.getParent()).removeView(mBaseCallView);
+            }
+            mLayoutContainer.addView(mBaseCallView);
+        }
+    }
+
+    public static void finishActivity() {
+        if (null != mActivity) {
+            mActivity.finish();
+        }
+        mActivity = null;
+        if (null != mBaseCallView && null != mBaseCallView.getParent()) {
+            ((ViewGroup) mBaseCallView.getParent()).removeView(mBaseCallView);
+        }
+        mBaseCallView = null;
+        mLayoutContainer = null;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        DeviceUtils.setScreenLockParams(getWindow());
+        mActivity = this;
+        setContentView(R.layout.tuicalling_base_activity);
+        initStatusBar();
+    }
+
+    private void initStatusBar() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Window window = getWindow();
+            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+            window.setStatusBarColor(Color.TRANSPARENT);
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        initView();
+        // clear notifications after a call is processed
+        NotificationManager notificationManager =
+                (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.cancelAll();
+    }
+
+    private void initView() {
+        mLayoutContainer = findViewById(R.id.rl_container);
+        mLayoutContainer.removeAllViews();
+        if (null != mBaseCallView) {
+            if (null != mBaseCallView.getParent()) {
+                ((ViewGroup) mBaseCallView.getParent()).removeView(mBaseCallView);
+            }
+            mLayoutContainer.addView(mBaseCallView);
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+}
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/CallingUserModel.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/CallingUserModel.java
new file mode 100644
index 0000000..ca0599a
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/CallingUserModel.java
@@ -0,0 +1,38 @@
+package com.tencent.qcloud.tuikit.tuicallkit.base;
+
+import java.util.Objects;
+
+public class CallingUserModel {
+    public String  userId;
+    public String  userAvatar;
+    public String  userName;
+    public boolean isEnter;
+    public boolean isAudioAvailable;
+    public boolean isVideoAvailable;
+    public int     volume;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        CallingUserModel model = (CallingUserModel) o;
+        return Objects.equals(userId, model.userId);
+    }
+
+    @Override
+    public String toString() {
+        return "CallingUserModel{"
+                + "userId='" + userId
+                + ", userAvatar='" + userAvatar
+                + ", userName='" + userName
+                + ", isEnter=" + isEnter
+                + ", isAudioAvailable=" + isAudioAvailable
+                + ", isVideoAvailable=" + isVideoAvailable
+                + ", volume=" + volume
+                + '}';
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/Constants.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/Constants.java
new file mode 100644
index 0000000..8b668ad
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/Constants.java
@@ -0,0 +1,30 @@
+package com.tencent.qcloud.tuikit.tuicallkit.base;
+
+public class Constants {
+    //信令超时时长，默认 30s
+    public static int SIGNALING_MAX_TIME = 30;
+
+    public static final int MIN_AUDIO_VOLUME              = 10;
+    public static final int MAX_USER                      = 9;
+    public static final int MIN_DURATION_SHOW_LOW_QUALITY = 5000; //Minimum interval for displaying poor network
+
+    public static final String EVENT_TUICALLING_CHANGED = "eventTUICallingChanged";
+
+    public static final String EVENT_SUB_CALL_STATUS_CHANGED     = "eventSubCallStatusChanged";
+    public static final String EVENT_SUB_CALL_TYPE_CHANGED       = "eventSubMediaTypeChanged";
+    public static final String EVENT_SUB_CAMERA_OPEN             = "eventSubCameraOpen";
+    public static final String EVENT_SUB_CAMERA_FRONT            = "eventSubCameraFront";
+    public static final String EVENT_SUB_MIC_STATUS_CHANGED      = "eventSubMicStatusChanged";
+    public static final String EVENT_SUB_AUDIOPLAYDEVICE_CHANGED = "eventSubAudioPlayDeviceChanged";
+    public static final String EVENT_SUB_GROUP_MEMBER_SELECTED   = "eventSubGroupMemberSelected";
+
+    public static final String OPEN_CAMERA     = "openCamera";
+    public static final String SWITCH_CAMERA   = "switchCamera";
+    public static final String MUTE_MIC        = "muteMic";
+    public static final String HANDS_FREE      = "handsFree";
+    public static final String CALL_STATUS     = "callStatus";
+    public static final String CALL_MEDIA_TYPE = "callMediaType";
+
+    public static final String GROUP_ID           = "groupId";
+    public static final String SELECT_MEMBER_LIST = "selectMemberList";
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/TUICallingAction.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/TUICallingAction.java
new file mode 100644
index 0000000..d417081
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/TUICallingAction.java
@@ -0,0 +1,149 @@
+package com.tencent.qcloud.tuikit.tuicallkit.base;
+
+import android.content.Context;
+
+import com.tencent.qcloud.tuikit.TUICommonDefine;
+import com.tencent.qcloud.tuikit.TUIVideoView;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallEngine;
+import com.tencent.qcloud.tuikit.tuicallkit.config.OfflinePushInfoConfig;
+
+import java.util.List;
+
+public class TUICallingAction {
+    private final Context mContext;
+
+    public TUICallingAction(Context context) {
+        mContext = context;
+    }
+
+    public void inviteUser(List<String> userIdList, TUICommonDefine.ValueCallback callback) {
+        TUICallDefine.CallParams params = new TUICallDefine.CallParams();
+        params.offlinePushInfo = OfflinePushInfoConfig.createOfflinePushInfo(mContext);
+        params.timeout = Constants.SIGNALING_MAX_TIME;
+        TUICallEngine.createInstance(mContext).inviteUser(userIdList, params, callback);
+    }
+
+    public void accept(TUICommonDefine.Callback callback) {
+        TUICallEngine.createInstance(mContext).accept(new TUICommonDefine.Callback() {
+            @Override
+            public void onSuccess() {
+                TUICallingStatusManager.sharedInstance(mContext).updateCallStatus(TUICallDefine.Status.Accept);
+                if (callback != null) {
+                    callback.onSuccess();
+                }
+            }
+
+            @Override
+            public void onError(int errCode, String errMsg) {
+                TUICallingStatusManager.sharedInstance(mContext).updateCallStatus(TUICallDefine.Status.None);
+                if (callback != null) {
+                    callback.onError(errCode, errMsg);
+                }
+            }
+        });
+    }
+
+    public void reject(TUICommonDefine.Callback callback) {
+        TUICallEngine.createInstance(mContext).reject(new TUICommonDefine.Callback() {
+            @Override
+            public void onSuccess() {
+                TUICallingStatusManager.sharedInstance(mContext).updateCallStatus(TUICallDefine.Status.None);
+                if (callback != null) {
+                    callback.onSuccess();
+                }
+            }
+
+            @Override
+            public void onError(int errCode, String errMsg) {
+                TUICallingStatusManager.sharedInstance(mContext).updateCallStatus(TUICallDefine.Status.None);
+                if (callback != null) {
+                    callback.onError(errCode, errMsg);
+                }
+            }
+        });
+    }
+
+    public void hangup(TUICommonDefine.Callback callback) {
+        TUICallEngine.createInstance(mContext).hangup(new TUICommonDefine.Callback() {
+            @Override
+            public void onSuccess() {
+                TUICallingStatusManager.sharedInstance(mContext).updateCallStatus(TUICallDefine.Status.None);
+                if (callback != null) {
+                    callback.onSuccess();
+                }
+            }
+
+            @Override
+            public void onError(int errCode, String errMsg) {
+                TUICallingStatusManager.sharedInstance(mContext).updateCallStatus(TUICallDefine.Status.None);
+                if (callback != null) {
+                    callback.onError(errCode, errMsg);
+                }
+            }
+        });
+    }
+
+    public void switchCallMediaType(TUICallDefine.MediaType callMediaType) {
+        TUICallEngine.createInstance(mContext).switchCallMediaType(callMediaType);
+    }
+
+    public void openCamera(TUICommonDefine.Camera camera, TUIVideoView videoView, TUICommonDefine.Callback callback) {
+        TUICallEngine.createInstance(mContext).openCamera(camera, videoView, new TUICommonDefine.Callback() {
+            @Override
+            public void onSuccess() {
+                TUICallDefine.Status status = TUICallingStatusManager.sharedInstance(mContext).getCallStatus();
+                if (!TUICallDefine.Status.None.equals(status)) {
+                    TUICommonDefine.Camera camera = TUICallingStatusManager.sharedInstance(mContext).getFrontCamera();
+                    TUICallingStatusManager.sharedInstance(mContext).updateCameraOpenStatus(true, camera);
+                    TUICallingStatusManager.sharedInstance(mContext).updateFrontCameraStatus(camera);
+                }
+
+                if (callback != null) {
+                    callback.onSuccess();
+                }
+            }
+
+            @Override
+            public void onError(int errCode, String errMsg) {
+                if (callback != null) {
+                    callback.onError(errCode, errMsg);
+                }
+            }
+        });
+    }
+
+    public void closeCamera() {
+        TUICallEngine.createInstance(mContext).closeCamera();
+        TUICommonDefine.Camera frontCamera = TUICallingStatusManager.sharedInstance(mContext).getFrontCamera();
+        TUICallingStatusManager.sharedInstance(mContext).updateCameraOpenStatus(false, frontCamera);
+    }
+
+    public void switchCamera(TUICommonDefine.Camera camera) {
+        TUICallEngine.createInstance(mContext).switchCamera(camera);
+        TUICallingStatusManager.sharedInstance(mContext).updateFrontCameraStatus(camera);
+    }
+
+    public void openMicrophone(TUICommonDefine.Callback callback) {
+        TUICallEngine.createInstance(mContext).openMicrophone(callback);
+        TUICallingStatusManager.sharedInstance(mContext).updateMicMuteStatus(false);
+    }
+
+    public void closeMicrophone() {
+        TUICallEngine.createInstance(mContext).closeMicrophone();
+        TUICallingStatusManager.sharedInstance(mContext).updateMicMuteStatus(true);
+    }
+
+    public void selectAudioPlaybackDevice(TUICommonDefine.AudioPlaybackDevice device) {
+        TUICallEngine.createInstance(mContext).selectAudioPlaybackDevice(device);
+        TUICallingStatusManager.sharedInstance(mContext).updateAudioPlaybackDevice(device);
+    }
+
+    public void startRemoteView(String userId, TUIVideoView videoView, TUICommonDefine.PlayCallback callback) {
+        TUICallEngine.createInstance(mContext).startRemoteView(userId, videoView, callback);
+    }
+
+    public void stopRemoteView(String userId) {
+        TUICallEngine.createInstance(mContext).stopRemoteView(userId);
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/TUICallingStatusManager.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/TUICallingStatusManager.java
new file mode 100644
index 0000000..7f0bd59
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/TUICallingStatusManager.java
@@ -0,0 +1,153 @@
+package com.tencent.qcloud.tuikit.tuicallkit.base;
+
+import android.content.Context;
+
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuikit.TUICommonDefine;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine;
+import com.tencent.qcloud.tuikit.tuicallkit.TUICallKitImpl;
+
+import java.util.HashMap;
+
+public class TUICallingStatusManager {
+    private static TUICallingStatusManager sInstance;
+    private final  Context                 mContext;
+
+    private boolean                             mIsCameraOpen;
+    private boolean                             mIsMicMute;
+    private TUICommonDefine.Camera              mIsFrontCamera = TUICommonDefine.Camera.Front;
+    private TUICommonDefine.AudioPlaybackDevice mAudioDevice   = TUICommonDefine.AudioPlaybackDevice.Speakerphone;
+    private TUICallDefine.Status                mCallStatus    = TUICallDefine.Status.None;
+    private TUICallDefine.Role                  mCallRole      = TUICallDefine.Role.None;
+    private TUICallDefine.MediaType             mMediaType     = TUICallDefine.MediaType.Unknown;
+    private TUICallDefine.Scene                 mCallScene;
+    private String                              mGroupId;
+
+    public static TUICallingStatusManager sharedInstance(Context context) {
+        if (null == sInstance) {
+            synchronized (TUICallKitImpl.class) {
+                if (null == sInstance) {
+                    sInstance = new TUICallingStatusManager(context);
+                }
+            }
+        }
+        return sInstance;
+    }
+
+    private TUICallingStatusManager(Context context) {
+        mContext = context.getApplicationContext();
+    }
+
+    public boolean isCameraOpen() {
+        return mIsCameraOpen;
+    }
+
+    public boolean isMicMute() {
+        return mIsMicMute;
+    }
+
+    public TUICommonDefine.Camera getFrontCamera() {
+        return mIsFrontCamera;
+    }
+
+    public TUICommonDefine.AudioPlaybackDevice getAudioPlaybackDevice() {
+        return mAudioDevice;
+    }
+
+    public TUICallDefine.Status getCallStatus() {
+        return mCallStatus;
+    }
+
+    public void updateCallStatus(TUICallDefine.Status status) {
+        if (mCallStatus.equals(status)) {
+            return;
+        }
+        mCallStatus = status;
+
+        HashMap<String, Object> map = new HashMap<>();
+        map.put(Constants.CALL_STATUS, status);
+        TUICore.notifyEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_CALL_STATUS_CHANGED, map);
+    }
+
+    public void updateCameraOpenStatus(boolean isOpen, TUICommonDefine.Camera isFrontCamera) {
+        mIsCameraOpen = isOpen;
+
+        HashMap<String, Object> map = new HashMap<>();
+        map.put(Constants.OPEN_CAMERA, isOpen);
+        if (isOpen) {
+            map.put(Constants.SWITCH_CAMERA, isFrontCamera);
+        }
+        TUICore.notifyEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_CAMERA_OPEN, map);
+    }
+
+    public void updateFrontCameraStatus(TUICommonDefine.Camera isFrontCamera) {
+        mIsFrontCamera = isFrontCamera;
+
+        HashMap<String, Object> map = new HashMap<>();
+        map.put(Constants.SWITCH_CAMERA, isFrontCamera);
+        TUICore.notifyEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_CAMERA_FRONT, map);
+    }
+
+    public void updateMicMuteStatus(boolean isMicMute) {
+        mIsMicMute = isMicMute;
+
+        HashMap<String, Object> map = new HashMap<>();
+        map.put(Constants.MUTE_MIC, isMicMute);
+        TUICore.notifyEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_MIC_STATUS_CHANGED, map);
+    }
+
+    public void updateAudioPlaybackDevice(TUICommonDefine.AudioPlaybackDevice audioPlaybackDevice) {
+        mAudioDevice = audioPlaybackDevice;
+
+        HashMap<String, Object> map = new HashMap<>();
+        map.put(Constants.HANDS_FREE, audioPlaybackDevice);
+        TUICore.notifyEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_AUDIOPLAYDEVICE_CHANGED, map);
+    }
+
+    public void setGroupId(String groupId) {
+        mGroupId = groupId;
+    }
+
+    public String getGroupId() {
+        return mGroupId;
+    }
+
+    public void setCallRole(TUICallDefine.Role role) {
+        mCallRole = role;
+    }
+
+    public TUICallDefine.Role getCallRole() {
+        return mCallRole;
+    }
+
+    public TUICallDefine.MediaType getMediaType() {
+        return mMediaType;
+    }
+
+    public void setMediaType(TUICallDefine.MediaType type) {
+        mMediaType = type;
+        HashMap<String, Object> map = new HashMap<>();
+        map.put(Constants.CALL_MEDIA_TYPE, mMediaType);
+        TUICore.notifyEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_CALL_TYPE_CHANGED, map);
+    }
+
+    public TUICallDefine.Scene getCallScene() {
+        return mCallScene;
+    }
+
+    public void setCallScene(TUICallDefine.Scene scene) {
+        this.mCallScene = scene;
+    }
+
+    public void clear() {
+        mIsCameraOpen = false;
+        mIsFrontCamera = TUICommonDefine.Camera.Front;
+        mIsMicMute = false;
+        mAudioDevice = TUICommonDefine.AudioPlaybackDevice.Speakerphone;
+        mCallStatus = TUICallDefine.Status.None;
+        mCallRole = TUICallDefine.Role.None;
+        mMediaType = TUICallDefine.MediaType.Unknown;
+        mCallScene = null;
+        mGroupId = "";
+    }
+}
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/UserLayout.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/UserLayout.java
new file mode 100644
index 0000000..58df61b
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/UserLayout.java
@@ -0,0 +1,119 @@
+package com.tencent.qcloud.tuikit.tuicallkit.base;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuikit.TUIVideoView;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.ImageLoader;
+
+public class UserLayout extends RelativeLayout {
+    private RelativeLayout mLayoutImageHead;
+    private TUIVideoView   mTUIVideoView;
+    private ImageView      mImgUserAvatar;
+    private TextView       mTextUserName;
+    private ImageView      mImgAudioInput;
+    private ImageView      mImgLoading;
+    private boolean        mMoveAble;
+    private boolean        mMuteAudio         = false;
+    private boolean        mDisableAudioImage = false;
+
+    public UserLayout(Context context) {
+        this(context, null);
+    }
+
+    public UserLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initView();
+        setClickable(true);
+    }
+
+    private void initView() {
+        LayoutInflater.from(getContext()).inflate(R.layout.tuicalling_group_user_layout, this, true);
+        mLayoutImageHead = findViewById(R.id.rl_image_head);
+        mTUIVideoView = findViewById(R.id.tx_cloud_view);
+        mImgUserAvatar = findViewById(R.id.img_head);
+        mTextUserName = findViewById(R.id.tv_name);
+        mImgAudioInput = findViewById(R.id.iv_audio_input);
+        mImgLoading = findViewById(R.id.img_loading);
+    }
+
+    public TUIVideoView getVideoView() {
+        return mTUIVideoView;
+    }
+
+    public void addVideoView(TUIVideoView view) {
+        if (this.mTUIVideoView != null) {
+            this.removeView(this.mTUIVideoView);
+        }
+
+        this.mTUIVideoView = view;
+        this.addView(this.mTUIVideoView);
+    }
+
+    public ImageView getAvatarImage() {
+        return mImgUserAvatar;
+    }
+
+    public void setVideoAvailable(boolean available) {
+        if (available) {
+            mTUIVideoView.setVisibility(VISIBLE);
+            mLayoutImageHead.setVisibility(GONE);
+            mTextUserName.setVisibility(VISIBLE);
+        } else {
+            mTUIVideoView.setVisibility(GONE);
+            mLayoutImageHead.setVisibility(VISIBLE);
+            mTextUserName.setVisibility(VISIBLE);
+        }
+    }
+
+    public void setUserName(String userName) {
+        mTextUserName.setText(userName);
+    }
+
+    public void setAudioVolume(int vol, boolean isAudioAvailable) {
+        if (mMuteAudio || mDisableAudioImage) {
+            return;
+        }
+        mImgAudioInput.setVisibility((isAudioAvailable && vol > Constants.MIN_AUDIO_VOLUME) ? VISIBLE : GONE);
+    }
+
+    public void muteMic(boolean mute) {
+        mMuteAudio = mute;
+        if (mDisableAudioImage) {
+            return;
+        }
+        mImgAudioInput.setVisibility(mMuteAudio ? GONE : VISIBLE);
+    }
+
+    public void disableAudioImage(boolean enable) {
+        mDisableAudioImage = enable;
+    }
+
+    public void startLoading() {
+        mImgLoading.setVisibility(VISIBLE);
+        ImageLoader.loadGifImage(getContext(), mImgLoading, R.drawable.tuicalling_loading);
+    }
+
+    public void stopLoading() {
+        mImgLoading.setVisibility(GONE);
+    }
+
+    public boolean isMoveAble() {
+        return mMoveAble;
+    }
+
+    public void setMoveAble(boolean enable) {
+        mMoveAble = enable;
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/UserLayoutEntity.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/UserLayoutEntity.java
new file mode 100644
index 0000000..849cd44
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/UserLayoutEntity.java
@@ -0,0 +1,7 @@
+package com.tencent.qcloud.tuikit.tuicallkit.base;
+
+public class UserLayoutEntity {
+    public String           userId = "";
+    public UserLayout       layout;
+    public CallingUserModel userModel;
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/config/OfflinePushInfoConfig.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/config/OfflinePushInfoConfig.java
new file mode 100644
index 0000000..f392602
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/config/OfflinePushInfoConfig.java
@@ -0,0 +1,34 @@
+package com.tencent.qcloud.tuikit.tuicallkit.config;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+
+public class OfflinePushInfoConfig {
+
+    //Customize offline push information
+    public static TUICallDefine.OfflinePushInfo createOfflinePushInfo(Context context) {
+        TUICallDefine.OfflinePushInfo pushInfo = new TUICallDefine.OfflinePushInfo();
+        pushInfo.setTitle(TextUtils.isEmpty(TUILogin.getNickName()) ? TUILogin.getUserId() : TUILogin.getNickName());
+        pushInfo.setDesc(context.getString(R.string.tuicalling_have_a_new_call));
+        // OPPO必须设置ChannelID才可以收到推送消息，如果在控制台已经配置,代码中无需调用
+        // OPPO must set a ChannelID to receive push messages. If you set it on the console, you don't need set here.
+        // pushInfo.setAndroidOPPOChannelID("tuikit");
+        pushInfo.setIgnoreIOSBadge(false);
+        pushInfo.setIOSSound("phone_ringing.mp3");
+        pushInfo.setAndroidSound("phone_ringing");
+        //VIVO message type: 0-push message, 1-System message(have a higher delivery rate)
+        pushInfo.setAndroidVIVOClassification(1);
+        //FCM channel ID, you need change PrivateConstants.java and set "fcmPushChannelId",
+        //If you set it on the console, you don't need set here.
+        //pushInfo.setAndroidFCMChannelID("fcm_push_channel");
+        //HuaWei message type: https://developer.huawei.com/consumer/cn/doc/development/HMSCore-Guides/message-classification-0000001149358835
+        pushInfo.setAndroidHuaWeiCategory("IM");
+        //IOS push type: if you want user VoIP, please modify type to TUICallDefine.IOSOfflinePushType.VoIP
+        pushInfo.setIOSPushType(TUICallDefine.IOSOfflinePushType.APNs);
+        return pushInfo;
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/CallingBellFeature.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/CallingBellFeature.java
new file mode 100644
index 0000000..9122e86
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/CallingBellFeature.java
@@ -0,0 +1,133 @@
+package com.tencent.qcloud.tuikit.tuicallkit.extensions;
+
+import android.content.Context;
+import android.content.res.AssetFileDescriptor;
+import android.media.AudioManager;
+import android.media.MediaPlayer;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.text.TextUtils;
+
+import com.tencent.qcloud.tuicore.util.SPUtils;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+
+import java.io.File;
+
+public class CallingBellFeature {
+    public static final String PROFILE_TUICALLKIT = "per_profile_tuicallkit";
+    public static final String PROFILE_CALL_BELL  = "per_call_bell";
+    public static final String PROFILE_MUTE_MODE  = "per_mute_mode";
+
+    private       Context     mContext;
+    private final MediaPlayer mMediaPlayer;
+    private       Handler     mHandler;
+    private       int         mCallingBellResourceId = -1;
+    private       String      mCallingBellResourcePath;
+
+    public CallingBellFeature(Context context) {
+        mContext = context.getApplicationContext();
+        mMediaPlayer = new MediaPlayer();
+    }
+
+    public void startDialingMusic() {
+        start("", R.raw.phone_dialing);
+    }
+
+    public void startRing() {
+        if (SPUtils.getInstance(PROFILE_TUICALLKIT).getBoolean(PROFILE_MUTE_MODE, false)) {
+            return;
+        }
+        String path = SPUtils.getInstance(PROFILE_TUICALLKIT).getString(PROFILE_CALL_BELL, "");
+        if (TextUtils.isEmpty(path)) {
+            start("", R.raw.phone_ringing);
+        } else {
+            start(path, -1);
+        }
+    }
+
+    public void stopMusic() {
+        stop();
+    }
+
+    private void start(String resPath, int resId) {
+        preHandler();
+        if (TextUtils.isEmpty(resPath) && (-1 == resId)) {
+            return;
+        }
+        if ((-1 != resId && (mCallingBellResourceId == resId))
+                || (!TextUtils.isEmpty(resPath) && TextUtils.equals(mCallingBellResourcePath, resPath))) {
+            return;
+        }
+
+        if (!TextUtils.isEmpty(resPath) && isUrl(resPath)) {
+            return;
+        }
+
+        AssetFileDescriptor afd0 = null;
+        if (!TextUtils.isEmpty(resPath) && new File(resPath).exists()) {
+            mCallingBellResourcePath = resPath;
+        } else if (-1 != resId) {
+            mCallingBellResourceId = resId;
+            afd0 = mContext.getResources().openRawResourceFd(resId);
+        }
+
+        final AssetFileDescriptor afd = afd0;
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                if (mMediaPlayer.isPlaying()) {
+                    mMediaPlayer.stop();
+                }
+                mMediaPlayer.reset();
+                mMediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
+
+                try {
+                    if (null != afd) {
+                        mMediaPlayer.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
+                    } else if (!TextUtils.isEmpty(mCallingBellResourcePath)) {
+                        mMediaPlayer.setDataSource(mCallingBellResourcePath);
+                    } else {
+                        return;
+                    }
+
+                    mMediaPlayer.setLooping(true);
+                    mMediaPlayer.prepare();
+                    mMediaPlayer.start();
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
+    private boolean isUrl(String url) {
+        return url.startsWith("http://") || url.startsWith("https://");
+    }
+
+    private void preHandler() {
+        if (null != mHandler) {
+            return;
+        }
+        HandlerThread thread = new HandlerThread("CallingBell");
+        thread.start();
+        mHandler = new Handler(thread.getLooper());
+    }
+
+    private void stop() {
+        if (null == mHandler) {
+            return;
+        }
+
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                if (mMediaPlayer.isPlaying()) {
+                    mMediaPlayer.stop();
+                }
+                mCallingBellResourceId = -1;
+                mCallingBellResourcePath = "";
+            }
+        });
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/CallingKeepAliveFeature.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/CallingKeepAliveFeature.java
new file mode 100644
index 0000000..6be16b2
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/CallingKeepAliveFeature.java
@@ -0,0 +1,32 @@
+package com.tencent.qcloud.tuikit.tuicallkit.extensions;
+
+import android.content.Context;
+
+import com.tencent.qcloud.tuikit.tuicallkit.service.TUICallService;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.DeviceUtils;
+
+public class CallingKeepAliveFeature {
+    private Context mContext;
+    private boolean mEnableKeepAlive = true;
+
+    public CallingKeepAliveFeature(Context context) {
+        mContext = context;
+    }
+
+    public void enableKeepAlive(boolean enable) {
+        mEnableKeepAlive = enable;
+    }
+
+    public void startKeepAlive() {
+        if (!mEnableKeepAlive) {
+            return;
+        }
+        TUICallService.start(mContext);
+    }
+
+    public void stopKeepAlive() {
+        if (DeviceUtils.isServiceRunning(mContext, TUICallService.class.getName())) {
+            TUICallService.stop(mContext);
+        }
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/CallingScreenSensorFeature.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/CallingScreenSensorFeature.java
new file mode 100644
index 0000000..35e7ad7
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/CallingScreenSensorFeature.java
@@ -0,0 +1,72 @@
+package com.tencent.qcloud.tuikit.tuicallkit.extensions;
+
+import android.content.Context;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.os.PowerManager;
+
+public class CallingScreenSensorFeature {
+    private Context             mContext;
+    private SensorManager       mSensorManager;
+    private SensorEventListener mSensorEventListener;
+    private boolean             mEnableCloseScreenNearEar = false;
+
+    public CallingScreenSensorFeature(Context context) {
+        mContext = context;
+    }
+
+    public void enableScreenSensor(boolean enable) {
+        mEnableCloseScreenNearEar = enable;
+    }
+
+    public void registerSensorEventListener() {
+        if (!mEnableCloseScreenNearEar) {
+            return;
+        }
+        if (null != mSensorManager) {
+            return;
+        }
+        mSensorManager = (SensorManager) mContext.getSystemService(Context.SENSOR_SERVICE);
+        Sensor sensor = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY);
+        PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
+        final PowerManager.WakeLock wakeLock = pm.newWakeLock(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK,
+                "TUICalling:TRTCAudioCallWakeLock");
+        mSensorEventListener = new SensorEventListener() {
+            @Override
+            public void onSensorChanged(SensorEvent event) {
+                if (event.sensor.getType() == Sensor.TYPE_PROXIMITY) {
+                    if (event.values[0] == 0.0) {
+                        if (wakeLock.isHeld()) {
+                            return;
+                        } else {
+                            wakeLock.acquire();
+                        }
+                    } else {
+                        if (!wakeLock.isHeld()) {
+                            return;
+                        } else {
+                            wakeLock.setReferenceCounted(false);
+                            wakeLock.release();
+                        }
+                    }
+                }
+            }
+
+            @Override
+            public void onAccuracyChanged(Sensor sensor, int accuracy) {
+
+            }
+        };
+        mSensorManager.registerListener(mSensorEventListener, sensor, SensorManager.SENSOR_DELAY_FASTEST);
+    }
+
+    public void unregisterSensorEventListener() {
+        if (null != mSensorManager && null != mSensorEventListener) {
+            Sensor sensor = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY);
+            mSensorManager.unregisterListener(mSensorEventListener, sensor);
+            mSensorManager = null;
+        }
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/inviteuser/GroupMemberInfo.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/inviteuser/GroupMemberInfo.java
new file mode 100644
index 0000000..80ecbc6
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/inviteuser/GroupMemberInfo.java
@@ -0,0 +1,8 @@
+package com.tencent.qcloud.tuikit.tuicallkit.extensions.inviteuser;
+
+class GroupMemberInfo {
+    protected String  userId;
+    protected String  userName;
+    protected String  avatar;
+    protected boolean isSelected;
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/inviteuser/SelectGroupMemberActivity.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/inviteuser/SelectGroupMemberActivity.java
new file mode 100644
index 0000000..c976451
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/inviteuser/SelectGroupMemberActivity.java
@@ -0,0 +1,132 @@
+package com.tencent.qcloud.tuikit.tuicallkit.extensions.inviteuser;
+
+import android.content.Intent;
+import android.graphics.Color;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.Button;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.imsdk.v2.V2TIMGroupMemberFullInfo;
+import com.tencent.imsdk.v2.V2TIMGroupMemberInfoResult;
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMValueCallback;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.base.Constants;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class SelectGroupMemberActivity extends AppCompatActivity {
+    private static AppCompatActivity mActivity;
+
+    private RecyclerView             mRecyclerUserList;
+    private String                   mGroupId;
+    private List<GroupMemberInfo>    mGroupMemberList   = new ArrayList<>();
+    private List<String>             mAlreadySelectList = new ArrayList<>();
+    private SelectGroupMemberAdapter mAdapter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.tuicallkit_activity_group_user);
+        mActivity = this;
+        initStatusBar();
+        initView();
+        initData();
+    }
+
+    private void initView() {
+        Toolbar toolbar = findViewById(R.id.toolbar_group);
+        toolbar.setNavigationOnClickListener(v -> finish());
+        Button btnOK = findViewById(R.id.btn_group_ok);
+        btnOK.setOnClickListener(v -> {
+            if (mAdapter != null) {
+                List<String> selectUsers = new ArrayList<>();
+                for (GroupMemberInfo info : mGroupMemberList) {
+                    if (info != null && !TextUtils.isEmpty(info.userId) && info.isSelected) {
+                        selectUsers.add(info.userId);
+                    }
+                }
+                Map<String, Object> map = new HashMap<>();
+                map.put(Constants.SELECT_MEMBER_LIST, selectUsers);
+                TUICore.notifyEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_GROUP_MEMBER_SELECTED, map);
+            }
+            finish();
+        });
+        mRecyclerUserList = findViewById(R.id.rv_user_list);
+    }
+
+    private void initData() {
+        Intent intent = getIntent();
+        mGroupId = intent.getStringExtra(Constants.GROUP_ID);
+        mAlreadySelectList = new ArrayList<>(intent.getStringArrayListExtra(Constants.SELECT_MEMBER_LIST));
+
+        mAdapter = new SelectGroupMemberAdapter();
+        mRecyclerUserList.setLayoutManager(new LinearLayoutManager(getApplicationContext()));
+        mRecyclerUserList.setAdapter(mAdapter);
+
+        updateGroupUserList();
+    }
+
+    private void updateGroupUserList() {
+        int filter = V2TIMGroupMemberFullInfo.V2TIM_GROUP_MEMBER_FILTER_ALL;
+        V2TIMManager.getGroupManager().getGroupMemberList(mGroupId, filter, 0,
+                new V2TIMValueCallback<V2TIMGroupMemberInfoResult>() {
+                    @Override
+                    public void onSuccess(V2TIMGroupMemberInfoResult v2TIMGroupMemberInfoResult) {
+                        List<V2TIMGroupMemberFullInfo> results = v2TIMGroupMemberInfoResult.getMemberInfoList();
+                        mGroupMemberList.clear();
+                        for (V2TIMGroupMemberFullInfo info : results) {
+                            GroupMemberInfo userInfo = new GroupMemberInfo();
+                            userInfo.userId = info.getUserID();
+                            userInfo.avatar = info.getFaceUrl();
+                            userInfo.userName = info.getNickName();
+                            userInfo.isSelected = mAlreadySelectList.contains(userInfo.userId);
+                            mGroupMemberList.add(userInfo);
+                        }
+
+                        if (mAdapter != null) {
+                            mAdapter.setDataSource(mGroupMemberList);
+                            mAdapter.notifyDataSetChanged();
+                        }
+                    }
+
+                    @Override
+                    public void onError(int errorCode, String errorMsg) {
+                    }
+                });
+    }
+
+    public static void finishActivity() {
+        if (mActivity == null || mActivity.isFinishing()) {
+            return;
+        }
+        mActivity.finish();
+        mActivity = null;
+    }
+
+    private void initStatusBar() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Window window = getWindow();
+            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+            window.setStatusBarColor(Color.TRANSPARENT);
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+        }
+    }
+}
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/inviteuser/SelectGroupMemberAdapter.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/inviteuser/SelectGroupMemberAdapter.java
new file mode 100644
index 0000000..f9a8360
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/inviteuser/SelectGroupMemberAdapter.java
@@ -0,0 +1,81 @@
+package com.tencent.qcloud.tuikit.tuicallkit.extensions.inviteuser;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.ImageLoader;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SelectGroupMemberAdapter extends RecyclerView.Adapter<SelectGroupMemberAdapter.GroupMemberViewHolder> {
+    private Context               mContext;
+    private List<GroupMemberInfo> mGroupMemberList = new ArrayList<>();
+
+    public void setDataSource(List<GroupMemberInfo> userList) {
+        mGroupMemberList = userList;
+    }
+
+    @NonNull
+    @Override
+    public GroupMemberViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        mContext = parent.getContext();
+        View view = LayoutInflater.from(mContext).inflate(R.layout.tuicallkit_group_user_list_item, parent, false);
+        return new GroupMemberViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull GroupMemberViewHolder holder, int position) {
+        GroupMemberInfo userInfo = mGroupMemberList.get(position);
+        holder.itemView.setOnClickListener(v -> {
+            holder.mCheckBox.setChecked(!holder.mCheckBox.isChecked());
+            userInfo.isSelected = holder.mCheckBox.isChecked();
+        });
+        holder.layoutView(userInfo);
+    }
+
+    @Override
+    public int getItemCount() {
+        return mGroupMemberList.size();
+    }
+
+    class GroupMemberViewHolder extends RecyclerView.ViewHolder {
+        private ImageView mImageAvatar;
+        private TextView  mTextName;
+        private TextView  mTextHint;
+        private CheckBox  mCheckBox;
+
+        public GroupMemberViewHolder(@NonNull View itemView) {
+            super(itemView);
+            mCheckBox = itemView.findViewById(R.id.group_user_check_box);
+            mImageAvatar = itemView.findViewById(R.id.group_user_avatar);
+            mTextName = itemView.findViewById(R.id.group_user_name);
+            mTextHint = itemView.findViewById(R.id.group_user_hint);
+        }
+
+        public void layoutView(GroupMemberInfo userInfo) {
+            if (userInfo == null || TextUtils.isEmpty(userInfo.userId)) {
+                return;
+            }
+            itemView.setEnabled(!userInfo.isSelected);
+            mCheckBox.setEnabled(!userInfo.isSelected);
+            mCheckBox.setChecked(userInfo.isSelected);
+            mCheckBox.setSelected(userInfo.isSelected);
+
+            mTextName.setText((TextUtils.isEmpty(userInfo.userName)) ? userInfo.userId : userInfo.userName);
+            mTextHint.setVisibility((userInfo.userId.equals(TUILogin.getLoginUser())) ? View.VISIBLE : View.GONE);
+            ImageLoader.loadImage(mContext, mImageAvatar, userInfo.avatar, R.drawable.tuicalling_ic_avatar);
+        }
+    }
+}
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/recents/RecentCallsFragment.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/recents/RecentCallsFragment.java
new file mode 100644
index 0000000..e7a2dd2
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/recents/RecentCallsFragment.java
@@ -0,0 +1,310 @@
+package com.tencent.qcloud.tuikit.tuicallkit.extensions.recents;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+import com.google.android.material.tabs.TabLayout;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUIConstants.TUICalling.ObjectFactory.RecentCalls;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.TUICallKit;
+import com.tencent.qcloud.tuikit.tuicallkit.extensions.recents.interfaces.ICallRecordItemListener;
+import com.tencent.qcloud.tuikit.tuicallkit.view.common.SlideRecyclerView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RecentCallsFragment extends Fragment {
+    public static final String TYPE_ALL  = "AllCall";
+    public static final String TYPE_MISS = "MissedCall";
+
+    private View              mRootView;
+    private Button            mButtonEdit;
+    private Button            mButtonStartCall;
+    private Button            mButtonEditDone;
+    private Button            mButtonClear;
+    private TabLayout         mLayoutTab;
+    private SlideRecyclerView mRecyclerRecent;
+    private BottomSheetDialog mBottomSheetDialog;
+    private ConstraintLayout  mLayoutTitle;
+
+    private String                 mType          = RecentCallsFragment.TYPE_ALL;
+    private RecentCallsViewModel   mViewModel;
+    private RecentCallsListAdapter mListAdapter;
+    private String                 mChatViewStyle = RecentCalls.UI_STYLE_MINIMALIST;
+
+    public RecentCallsFragment() {
+    }
+
+    public RecentCallsFragment(String style) {
+        mChatViewStyle = style;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        mRootView = inflater.inflate(R.layout.tuicallkit_record_fragment_main, container, false);
+        initView();
+        initData();
+        initListener();
+        return mRootView;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (mViewModel != null) {
+            mViewModel.queryRecentCalls(getFilter());
+        }
+    }
+
+    private void initView() {
+        mButtonEdit = mRootView.findViewById(R.id.btn_call_edit);
+        mButtonStartCall = mRootView.findViewById(R.id.btn_start_call);
+        mButtonEditDone = mRootView.findViewById(R.id.btn_edit_done);
+        mButtonClear = mRootView.findViewById(R.id.btn_clear);
+        mLayoutTab = mRootView.findViewById(R.id.tab_layout);
+        mRecyclerRecent = mRootView.findViewById(R.id.recycle_view_list);
+        mLayoutTitle = mRootView.findViewById(R.id.cl_record_title);
+        if (TUIConstants.TUICalling.ObjectFactory.RecentCalls.UI_STYLE_MINIMALIST.equals(mChatViewStyle)) {
+            mLayoutTitle.setBackgroundColor(getResources().getColor(R.color.tuicalling_color_white));
+        }
+    }
+
+    private void initData() {
+        mListAdapter = new RecentCallsListAdapter();
+        mListAdapter.setHasStableIds(true);
+        mRecyclerRecent.setLayoutManager(new LinearLayoutManager(getContext()));
+        mRecyclerRecent.setAdapter(mListAdapter);
+        setAdapterListener();
+
+        mViewModel = new ViewModelProvider(requireActivity()).get(RecentCallsViewModel.class);
+
+        mViewModel.getCallHistoryList().observe(requireActivity(), recordList -> {
+            if (mListAdapter != null && TYPE_ALL.equals(mType)) {
+                mListAdapter.onDataSourceChanged(recordList);
+            }
+        });
+        mViewModel.getCallMissedList().observe(requireActivity(), recordList -> {
+            if (mListAdapter != null && TYPE_MISS.equals(mType)) {
+                mListAdapter.onDataSourceChanged(recordList);
+            }
+        });
+
+        if (mViewModel != null) {
+            mViewModel.queryRecentCalls(getFilter());
+        }
+    }
+
+    private TUICallDefine.RecentCallsFilter getFilter() {
+        TUICallDefine.RecentCallsFilter filter = new TUICallDefine.RecentCallsFilter();
+        if (RecentCallsFragment.TYPE_MISS.equals(mType)) {
+            filter.result = TUICallDefine.CallRecords.Result.Missed;
+        }
+        return filter;
+    }
+
+    private void initListener() {
+        mButtonEdit.setOnClickListener(v -> {
+            startMultiSelect();
+            updateTabViews(true);
+        });
+        mButtonStartCall.setOnClickListener(v -> {
+            TUICore.startActivity("StartC2CChatMinimalistActivity", null);
+        });
+
+        mButtonEditDone.setOnClickListener(v -> {
+            stopMultiSelect();
+            updateTabViews(false);
+        });
+        mButtonClear.setOnClickListener(v -> {
+            showDeleteHistoryDialog();
+        });
+        mLayoutTab.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+            @Override
+            public void onTabSelected(TabLayout.Tab tab) {
+                mType = (tab.getPosition() == 1) ? TYPE_MISS : TYPE_ALL;
+                updateTabViews(false);
+                stopMultiSelect();
+                refreshData();
+            }
+
+            @Override
+            public void onTabUnselected(TabLayout.Tab tab) {
+            }
+
+            @Override
+            public void onTabReselected(TabLayout.Tab tab) {
+            }
+        });
+    }
+
+    private void refreshData() {
+        if (mViewModel != null) {
+            mViewModel.queryRecentCalls(getFilter());
+        }
+    }
+
+    private void updateTabViews(boolean isEditable) {
+        if (isEditable) {
+            mButtonEdit.setVisibility(View.GONE);
+            mButtonStartCall.setVisibility(View.GONE);
+            mButtonEditDone.setVisibility(View.VISIBLE);
+            mButtonClear.setVisibility(View.VISIBLE);
+        } else {
+            mButtonEdit.setVisibility(View.VISIBLE);
+            mButtonStartCall.setVisibility(View.GONE);
+            mButtonEditDone.setVisibility(View.GONE);
+            mButtonClear.setVisibility(View.GONE);
+        }
+    }
+
+    private void setAdapterListener() {
+        mListAdapter.setOnCallRecordItemListener(new ICallRecordItemListener() {
+            @Override
+            public void onItemClick(View view, int viewType, TUICallDefine.CallRecords callRecords) {
+                if (callRecords == null) {
+                    return;
+                }
+                if (mListAdapter.isMultiSelectMode()) {
+                    return;
+                }
+                if (callRecords.scene.equals(TUICallDefine.Scene.GROUP_CALL)) {
+                    startGroupInfoActivity(callRecords);
+                    Toast.makeText(getContext(), R.string.tuicallkit_group_recall_unsupport, Toast.LENGTH_SHORT).show();
+                    return;
+                }
+                if (TUICallDefine.Role.Caller.equals(callRecords.role)) {
+                    TUICallKit.createInstance(getContext()).call(callRecords.inviteList.get(0), callRecords.mediaType);
+                } else {
+                    TUICallKit.createInstance(getContext()).call(callRecords.inviter, callRecords.mediaType);
+                }
+            }
+
+            @Override
+            public void onItemDeleteClick(View view, int viewType, TUICallDefine.CallRecords callRecords) {
+                if (callRecords == null) {
+                    return;
+                }
+                List<TUICallDefine.CallRecords> list = new ArrayList<>();
+                list.add(callRecords);
+                deleteRecordCalls(list);
+            }
+
+            @Override
+            public void onDetailViewClick(View view, TUICallDefine.CallRecords records) {
+                if (records == null) {
+                    return;
+                }
+                if (TUICallDefine.Scene.SINGLE_CALL.equals(records.scene)) {
+                    startFriendProfileActivity(records);
+                } else if (TUICallDefine.Scene.GROUP_CALL.equals(records.scene)) {
+                    startGroupInfoActivity(records);
+                }
+            }
+        });
+    }
+
+    private void startFriendProfileActivity(TUICallDefine.CallRecords records) {
+        Bundle bundle = new Bundle();
+        if (TUICallDefine.Role.Caller.equals(records.role)) {
+            bundle.putString(TUIConstants.TUIChat.CHAT_ID, records.inviteList.get(0));
+        } else {
+            bundle.putString(TUIConstants.TUIChat.CHAT_ID, records.inviter);
+        }
+        String activityName = "FriendProfileActivity";
+        if (TUIConstants.TUICalling.ObjectFactory.RecentCalls.UI_STYLE_MINIMALIST.equals(mChatViewStyle)) {
+            activityName = "FriendProfileMinimalistActivity";
+        }
+        TUICore.startActivity(activityName, bundle);
+    }
+
+    private void startGroupInfoActivity(TUICallDefine.CallRecords records) {
+        Bundle bundle = new Bundle();
+        bundle.putString("group_id", records.groupId);
+        String activityName = "GroupInfoActivity";
+        if (TUIConstants.TUICalling.ObjectFactory.RecentCalls.UI_STYLE_MINIMALIST.equals(mChatViewStyle)) {
+            activityName = "GroupInfoMinimalistActivity";
+        }
+        TUICore.startActivity(getContext(), activityName, bundle);
+    }
+
+    private void startMultiSelect() {
+        RecentCallsListAdapter adapter = (RecentCallsListAdapter) mRecyclerRecent.getAdapter();
+        if (adapter != null) {
+            adapter.setShowMultiSelectCheckBox(true);
+            adapter.notifyDataSetChanged();
+        }
+        mRecyclerRecent.disableRecyclerViewSlide(true);
+        mRecyclerRecent.closeMenu();
+    }
+
+    private void stopMultiSelect() {
+        RecentCallsListAdapter adapter = (RecentCallsListAdapter) mRecyclerRecent.getAdapter();
+        if (adapter != null) {
+            adapter.setShowMultiSelectCheckBox(false);
+            adapter.notifyDataSetChanged();
+        }
+        mRecyclerRecent.disableRecyclerViewSlide(false);
+        mRecyclerRecent.closeMenu();
+    }
+
+    private void deleteRecordCalls(List<TUICallDefine.CallRecords> selectItem) {
+        if (mViewModel != null) {
+            mViewModel.deleteRecordCalls(selectItem);
+        }
+        stopMultiSelect();
+    }
+
+    private void clearRecentCalls() {
+        List<TUICallDefine.CallRecords> selectedItems = new ArrayList<>();
+        if (mListAdapter != null) {
+            selectedItems = mListAdapter.getSelectedItem();
+        }
+        if (selectedItems == null) {
+            return;
+        }
+        List<TUICallDefine.CallRecords> recordList = new ArrayList<>();
+        for (TUICallDefine.CallRecords records : selectedItems) {
+            if (records != null && !TextUtils.isEmpty(records.callId)) {
+                recordList.add(records);
+            }
+        }
+        if (mViewModel != null) {
+            mViewModel.deleteRecordCalls(recordList);
+        }
+    }
+
+    private void showDeleteHistoryDialog() {
+        if (mBottomSheetDialog == null) {
+            mBottomSheetDialog = new BottomSheetDialog(getContext(), R.style.TUICallBottomSelectSheet);
+        }
+        mBottomSheetDialog.setContentView(R.layout.tuicallkit_record_dialog);
+        mBottomSheetDialog.setCanceledOnTouchOutside(false);
+        TextView textPositive = mBottomSheetDialog.findViewById(R.id.tv_clear_call_history);
+        TextView textCancel = mBottomSheetDialog.findViewById(R.id.tv_clear_cancel);
+        textPositive.setOnClickListener(v -> {
+            clearRecentCalls();
+            mBottomSheetDialog.dismiss();
+            stopMultiSelect();
+        });
+        textCancel.setOnClickListener(v -> {
+            mBottomSheetDialog.dismiss();
+        });
+        mBottomSheetDialog.show();
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/recents/RecentCallsItemHolder.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/recents/RecentCallsItemHolder.java
new file mode 100644
index 0000000..e9c82a3
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/recents/RecentCallsItemHolder.java
@@ -0,0 +1,120 @@
+package com.tencent.qcloud.tuikit.tuicallkit.extensions.recents;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMUserFullInfo;
+import com.tencent.imsdk.v2.V2TIMValueCallback;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.util.DateTimeUtil;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class RecentCallsItemHolder extends RecyclerView.ViewHolder {
+    protected RecordsIconView  mCallIconView;
+    protected TextView         mTextUserTitle;
+    protected ImageView        mImageMediaType;
+    protected TextView         mTextCallStatus;
+    protected TextView         mTextCallTime;
+    protected ImageView        mImageDetails;
+    protected RelativeLayout   mLayoutDelete;
+    protected CheckBox         mCheckBoxSelectCall;
+    protected ConstraintLayout mLayoutView;
+
+    public RecentCallsItemHolder(@NonNull View itemView) {
+        super(itemView);
+        initView();
+    }
+
+    private void initView() {
+        mLayoutDelete = itemView.findViewById(R.id.ll_call_delete);
+        mCheckBoxSelectCall = itemView.findViewById(R.id.cb_call_select);
+
+        mCallIconView = itemView.findViewById(R.id.call_icon);
+        mTextUserTitle = itemView.findViewById(R.id.tv_call_user_id);
+        mImageMediaType = itemView.findViewById(R.id.call_media_type);
+        mTextCallStatus = itemView.findViewById(R.id.tv_call_status);
+        mTextCallTime = itemView.findViewById(R.id.tv_call_time);
+        mImageDetails = itemView.findViewById(R.id.img_call_details);
+
+        mLayoutView = itemView.findViewById(R.id.cl_info_layout);
+    }
+
+    public void layoutViews(Context context, TUICallDefine.CallRecords records, int position) {
+        if (records == null) {
+            return;
+        }
+
+        int colorId = TUICallDefine.CallRecords.Result.Missed.equals(records.result)
+                ? R.color.tuicallkit_record_text_red : R.color.tuicalling_color_black;
+        mTextUserTitle.setTextColor(context.getResources().getColor(colorId));
+
+        int imageId = TUICallDefine.MediaType.Video.equals(records.mediaType)
+                ? R.drawable.tuicallkit_record_ic_video_call : R.drawable.tuicallkit_ic_audio_call;
+        mImageMediaType.setImageDrawable(context.getResources().getDrawable(imageId));
+
+        mTextCallStatus.setText(String.valueOf(records.result));
+        mTextCallTime.setText(DateTimeUtil.getTimeFormatText(new Date(records.beginTime)));
+
+        List<String> list = new ArrayList<>();
+        if (records.inviteList != null) {
+            list.addAll(records.inviteList);
+        }
+        list.add(records.inviter.trim());
+        list.remove(TUILogin.getLoginUser());
+        mCallIconView.setTag(list);
+
+        V2TIMManager.getInstance().getUsersInfo(list, new V2TIMValueCallback<List<V2TIMUserFullInfo>>() {
+            @Override
+            public void onSuccess(List<V2TIMUserFullInfo> userFullInfoList) {
+                if (null == userFullInfoList || userFullInfoList.isEmpty()) {
+                    return;
+                }
+
+                List<Object> avatarList = new ArrayList<>();
+                List<String> newUserList = new ArrayList<>();
+                List<String> nameList = new ArrayList<>();
+                for (int i = 0; i < userFullInfoList.size(); i++) {
+                    avatarList.add(userFullInfoList.get(i).getFaceUrl());
+                    newUserList.add(userFullInfoList.get(i).getUserID());
+                    String name = (TextUtils.isEmpty(userFullInfoList.get(i).getNickName())) ?
+                            userFullInfoList.get(i).getUserID() : userFullInfoList.get(i).getNickName();
+                    nameList.add(name);
+                }
+                if (!TextUtils.isEmpty(records.groupId)) {
+                    avatarList.add(TUILogin.getFaceUrl());
+                }
+
+                List<String> oldUserList = new ArrayList<>((List<String>) mCallIconView.getTag());
+                if (oldUserList.size() == newUserList.size() && oldUserList.containsAll(newUserList)) {
+                    mCallIconView.setImageId(records.callId);
+                    mCallIconView.displayImage(avatarList).load(records.callId);
+                    mTextUserTitle.setText(String.valueOf(nameList).replaceAll(("[\\[\\]]"), ""));
+                }
+            }
+
+            @Override
+            public void onError(int errorCode, String errorMsg) {
+                List<Object> list = new ArrayList<>();
+                list.add(TUILogin.getFaceUrl());
+                mCallIconView.displayImage(list).load(records.callId);
+                mTextUserTitle.setText(TUILogin.getNickName());
+            }
+        });
+    }
+}
+
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/recents/RecentCallsListAdapter.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/recents/RecentCallsListAdapter.java
new file mode 100644
index 0000000..0ee1ac9
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/recents/RecentCallsListAdapter.java
@@ -0,0 +1,207 @@
+package com.tencent.qcloud.tuikit.tuicallkit.extensions.recents;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.extensions.recents.interfaces.ICallRecordItemListener;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+public class RecentCallsListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+    private static final int ITEM_TYPE_HEADER = 101;
+    private static final int ITEM_TYPE_NORMAL = -98;
+    private static final int HEADER_COUNT     = 1;
+
+    private Context                         mContext;
+    private List<TUICallDefine.CallRecords> mDataSource        = new ArrayList<>();
+    private ICallRecordItemListener         mItemListener;
+    private HashMap<String, Boolean>        mSelectedPositions = new HashMap<>();
+    private boolean                         mIsMultiSelectMode = false;
+
+    public void setOnCallRecordItemListener(ICallRecordItemListener listener) {
+        this.mItemListener = listener;
+    }
+
+    public void onDataSourceChanged(List<TUICallDefine.CallRecords> dataSource) {
+        mDataSource.clear();
+        mDataSource.addAll(dataSource);
+        notifyDataSetChanged();
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        mContext = parent.getContext().getApplicationContext();
+        LayoutInflater inflater = LayoutInflater.from(parent.getContext());
+        if (viewType == ITEM_TYPE_HEADER) {
+            View view = inflater.inflate(R.layout.tuicallkit_item_head_view, parent, false);
+            return new HeaderViewHolder(view);
+        } else {
+            View view = inflater.inflate(R.layout.tuicallkit_layout_call_list_item, parent, false);
+            return new RecentCallsItemHolder(view);
+        }
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        if (holder instanceof RecentCallsItemHolder) {
+            RecentCallsItemHolder viewHolder = (RecentCallsItemHolder) holder;
+            viewHolder.mLayoutView.setOnClickListener(v -> {
+                if (mItemListener != null) {
+                    int curPos = viewHolder.getBindingAdapterPosition();
+                    mItemListener.onItemClick(viewHolder.itemView, getItemViewType(curPos), getItem(curPos));
+                }
+            });
+            viewHolder.mImageDetails.setOnClickListener(view -> {
+                if (mItemListener != null) {
+                    mItemListener.onDetailViewClick(view, getItem(viewHolder.getBindingAdapterPosition()));
+                }
+            });
+            //左滑删除按钮事件监听
+            if (!viewHolder.mLayoutDelete.hasOnClickListeners()) {
+                viewHolder.mLayoutDelete.setOnClickListener(view -> {
+                    int curPos = viewHolder.getBindingAdapterPosition();
+                    TUICallDefine.CallRecords record = getItem(curPos);
+                    if (record == null || TextUtils.isEmpty(record.callId)) {
+                        return;
+                    }
+                    setItemChecked(record.callId, true);
+                    if (mItemListener != null) {
+                        mItemListener.onItemDeleteClick(view, getItemViewType(curPos), record);
+                    }
+                });
+            }
+
+            viewHolder.layoutViews(mContext, getItem(position), position);
+            setCheckBoxStatus(viewHolder);
+        }
+    }
+
+    @Override
+    public void onViewRecycled(@NonNull RecyclerView.ViewHolder holder) {
+        if (holder instanceof RecentCallsItemHolder) {
+            ((RecentCallsItemHolder) holder).mCallIconView.clear();
+        }
+    }
+
+    private TUICallDefine.CallRecords getItem(int position) {
+        if (mDataSource == null || mDataSource.isEmpty()) {
+            return null;
+        }
+
+        int dataPosition = position - HEADER_COUNT;
+        if (dataPosition < mDataSource.size() && dataPosition >= 0) {
+            return mDataSource.get(dataPosition);
+        }
+        return null;
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public int getItemCount() {
+        if (mDataSource == null) {
+            return HEADER_COUNT;
+        }
+        return mDataSource.size() + HEADER_COUNT;
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        if (position == 0) {
+            return ITEM_TYPE_HEADER;
+        }
+        return ITEM_TYPE_NORMAL;
+    }
+
+    private void setCheckBoxStatus(RecentCallsItemHolder holder) {
+        if (holder == null || holder.mCheckBoxSelectCall == null) {
+            return;
+        }
+        if (!mIsMultiSelectMode) {
+            holder.mCheckBoxSelectCall.setVisibility(View.GONE);
+            holder.itemView.setOnClickListener(null);
+        } else {
+            holder.mCheckBoxSelectCall.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private int getIndexInAdapter(TUICallDefine.CallRecords records) {
+        int position = -1;
+        if (mDataSource != null) {
+            int indexInData = mDataSource.indexOf(records);
+            if (indexInData != -1) {
+                position = indexInData + HEADER_COUNT;
+            }
+        }
+        return position;
+    }
+
+    public void setShowMultiSelectCheckBox(boolean show) {
+        mIsMultiSelectMode = show;
+        for (TUICallDefine.CallRecords records : mDataSource) {
+            if (records == null || TextUtils.isEmpty(records.callId)) {
+                continue;
+            }
+            setItemChecked(records.callId, show);
+            int currentPosition = getIndexInAdapter(records);
+            if (currentPosition != -1) {
+                notifyItemChanged(currentPosition);
+            }
+        }
+    }
+
+    private void setItemChecked(String callId, boolean isChecked) {
+        mSelectedPositions.put(callId, isChecked);
+    }
+
+    public boolean isMultiSelectMode() {
+        return mIsMultiSelectMode;
+    }
+
+    public List<TUICallDefine.CallRecords> getSelectedItem() {
+        if (mSelectedPositions.size() == 0) {
+            return null;
+        }
+        List<TUICallDefine.CallRecords> selectList = new ArrayList<>();
+        for (int i = 0; i < getItemCount(); i++) {
+            TUICallDefine.CallRecords records = getItem(i);
+            if (records != null && isItemChecked(records.callId)) {
+                selectList.add(records);
+            }
+        }
+        return selectList;
+    }
+
+    private boolean isItemChecked(String id) {
+        if (mSelectedPositions.size() <= 0) {
+            return false;
+        }
+
+        if (mSelectedPositions.containsKey(id)) {
+            return mSelectedPositions.get(id);
+        } else {
+            return false;
+        }
+    }
+
+    static class HeaderViewHolder extends RecyclerView.ViewHolder {
+        public HeaderViewHolder(@NonNull View itemView) {
+            super(itemView);
+        }
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/recents/RecentCallsViewModel.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/recents/RecentCallsViewModel.java
new file mode 100644
index 0000000..f76f3fc
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/recents/RecentCallsViewModel.java
@@ -0,0 +1,99 @@
+package com.tencent.qcloud.tuikit.tuicallkit.extensions.recents;
+
+import android.app.Application;
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.AndroidViewModel;
+import androidx.lifecycle.MutableLiveData;
+
+import com.tencent.qcloud.tuikit.TUICommonDefine;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine.CallRecords;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallEngine;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RecentCallsViewModel extends AndroidViewModel {
+    private static final String TAG = "RecentCallsViewModel";
+
+    private final MutableLiveData<List<CallRecords>> mCallHistoryLiveData = new MutableLiveData<>();
+    private final MutableLiveData<List<CallRecords>> mCallMissedLiveData  = new MutableLiveData<>();
+
+    public RecentCallsViewModel(@NonNull Application application) {
+        super(application);
+        mCallHistoryLiveData.setValue(new ArrayList<>());
+        mCallMissedLiveData.setValue(new ArrayList<>());
+    }
+
+    public MutableLiveData<List<CallRecords>> getCallHistoryList() {
+        return mCallHistoryLiveData;
+    }
+
+    public MutableLiveData<List<CallRecords>> getCallMissedList() {
+        return mCallMissedLiveData;
+    }
+
+    public void queryRecentCalls(TUICallDefine.RecentCallsFilter filter) {
+        TUICallEngine.createInstance(getApplication()).queryRecentCalls(filter, new TUICommonDefine.ValueCallback() {
+            @Override
+            public void onSuccess(Object data) {
+                if (data == null || !(data instanceof List)) {
+                    return;
+                }
+                List<CallRecords> queryList = (List<CallRecords>) data;
+                if (filter != null && CallRecords.Result.Missed.equals(filter.result)) {
+                    List<CallRecords> missList = mCallMissedLiveData.getValue();
+                    if (missList != null) {
+                        missList.removeAll(queryList);
+                        missList.addAll(queryList);
+                    }
+                    mCallMissedLiveData.setValue(missList);
+                } else {
+                    List<CallRecords> historyList = mCallHistoryLiveData.getValue();
+                    if (historyList != null) {
+                        historyList.removeAll(queryList);
+                        historyList.addAll(queryList);
+                    }
+                    mCallHistoryLiveData.setValue(historyList);
+                }
+            }
+
+            @Override
+            public void onError(int errCode, String errMsg) {
+            }
+        });
+    }
+
+    public void deleteRecordCalls(List<CallRecords> list) {
+        if (list == null || list.isEmpty()) {
+            return;
+        }
+
+        ArrayList<CallRecords> missList = new ArrayList<>(mCallMissedLiveData.getValue());
+        missList.removeAll(list);
+        mCallMissedLiveData.setValue(missList);
+
+        List<CallRecords> allList = new ArrayList<>(mCallHistoryLiveData.getValue());
+        allList.removeAll(list);
+        mCallHistoryLiveData.setValue(allList);
+
+        List<String> callIdList = new ArrayList<>();
+        for (CallRecords record : list) {
+            if (record != null && !TextUtils.isEmpty(record.callId)) {
+                callIdList.add(record.callId);
+            }
+        }
+        TUICallEngine.createInstance(getApplication()).deleteRecordCalls(callIdList,
+                new TUICommonDefine.ValueCallback() {
+                    @Override
+                    public void onSuccess(Object data) {
+                    }
+
+                    @Override
+                    public void onError(int errCode, String errMsg) {
+                    }
+                });
+    }
+}
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/recents/RecordsIconView.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/recents/RecordsIconView.java
new file mode 100644
index 0000000..6309ebf
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/recents/RecordsIconView.java
@@ -0,0 +1,76 @@
+package com.tencent.qcloud.tuikit.tuicallkit.extensions.recents;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Color;
+import android.util.AttributeSet;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.view.common.RoundCornerImageView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.common.gridimage.GridImageSynthesizer;
+
+import java.util.List;
+
+public class RecordsIconView extends RoundCornerImageView {
+    private int mImageSize         = 100;
+    private int mBackground        = Color.parseColor("#cfd3d8");
+    private int mDefaultImageResId = 0;
+    private int mImageGap          = 6;
+
+    private GridImageSynthesizer mGridImageSynthesizer;
+
+    public RecordsIconView(Context context) {
+        super(context);
+        init(context);
+    }
+
+    public RecordsIconView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        initAttrs(attrs);
+        init(context);
+    }
+
+    public RecordsIconView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initAttrs(attrs);
+        init(context);
+    }
+
+    private void initAttrs(AttributeSet attributeSet) {
+        TypedArray ta = getContext().obtainStyledAttributes(attributeSet, R.styleable.SynthesizedImageView);
+        if (null != ta) {
+            mBackground = ta.getColor(R.styleable.SynthesizedImageView_image_background, mBackground);
+            mDefaultImageResId = ta.getResourceId(R.styleable.SynthesizedImageView_default_image, mDefaultImageResId);
+            mImageSize = ta.getDimensionPixelSize(R.styleable.SynthesizedImageView_image_size, mImageSize);
+            mImageGap = ta.getDimensionPixelSize(R.styleable.SynthesizedImageView_image_gap, mImageGap);
+            ta.recycle();
+        }
+    }
+
+    private void init(Context context) {
+        mGridImageSynthesizer = new GridImageSynthesizer(context, this);
+        mGridImageSynthesizer.setMaxSize(mImageSize, mImageSize);
+        mGridImageSynthesizer.setDefaultImage(mDefaultImageResId);
+        mGridImageSynthesizer.setBgColor(mBackground);
+        mGridImageSynthesizer.setGap(mImageGap);
+    }
+
+    public RecordsIconView displayImage(List<Object> imageUrls) {
+        mGridImageSynthesizer.setImageUrls(imageUrls);
+        return this;
+    }
+
+    public void setImageId(String id) {
+        mGridImageSynthesizer.setImageId(id);
+    }
+
+    public void load(String imageId) {
+        mGridImageSynthesizer.load(imageId);
+    }
+
+    public void clear() {
+        mGridImageSynthesizer.clearImage();
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/recents/interfaces/ICallRecordItemListener.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/recents/interfaces/ICallRecordItemListener.java
new file mode 100644
index 0000000..1159229
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/recents/interfaces/ICallRecordItemListener.java
@@ -0,0 +1,13 @@
+package com.tencent.qcloud.tuikit.tuicallkit.extensions.recents.interfaces;
+
+import android.view.View;
+
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine;
+
+public interface ICallRecordItemListener {
+    void onItemClick(View view, int viewType, TUICallDefine.CallRecords callRecords);
+
+    void onItemDeleteClick(View view, int viewType, TUICallDefine.CallRecords callRecords);
+
+    void onDetailViewClick(View view, TUICallDefine.CallRecords callRecords);
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/internal/ServiceInitializer.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/internal/ServiceInitializer.java
new file mode 100644
index 0000000..4f33db7
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/internal/ServiceInitializer.java
@@ -0,0 +1,120 @@
+package com.tencent.qcloud.tuikit.tuicallkit.internal;
+
+import android.app.Activity;
+import android.app.Application;
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuikit.tuicallkit.TUICallKitImpl;
+
+/**
+ * `TUICallKit` uses `ContentProvider` to be registered with `TUICore`.
+ * (`TUICore` is the connection and communication class of each component)
+ */
+public final class ServiceInitializer extends ContentProvider {
+    public void init(Context context) {
+        TUICallingService callingService = TUICallingService.sharedInstance();
+        callingService.init(context);
+        TUICore.registerService(TUIConstants.TUICalling.SERVICE_NAME, callingService);
+        TUICore.registerExtension(TUIConstants.TUIChat.EXTENSION_INPUT_MORE_AUDIO_CALL, callingService);
+        TUICore.registerExtension(TUIConstants.TUIChat.EXTENSION_INPUT_MORE_VIDEO_CALL, callingService);
+
+        TUIAudioMessageRecordService audioRecordService = new TUIAudioMessageRecordService(context);
+        TUICore.registerService(TUIConstants.TUICalling.SERVICE_NAME_AUDIO_RECORD, audioRecordService);
+
+        if (context instanceof Application) {
+            ((Application) context).registerActivityLifecycleCallbacks(new Application.ActivityLifecycleCallbacks() {
+                private int foregroundActivities = 0;
+                private boolean isChangingConfiguration;
+
+                @Override
+                public void onActivityCreated(Activity activity, Bundle bundle) {
+                }
+
+                @Override
+                public void onActivityStarted(Activity activity) {
+                    foregroundActivities++;
+                    if (foregroundActivities == 1 && !isChangingConfiguration) {
+                        if (TUILogin.isUserLogined()) {
+                            TUICallKitImpl.createInstance(context).queryOfflineCall();
+                        }
+                    }
+                    isChangingConfiguration = false;
+                }
+
+                @Override
+                public void onActivityResumed(Activity activity) {
+
+                }
+
+                @Override
+                public void onActivityPaused(Activity activity) {
+
+                }
+
+                @Override
+                public void onActivityStopped(Activity activity) {
+                    foregroundActivities--;
+                    isChangingConfiguration = activity.isChangingConfigurations();
+                }
+
+                @Override
+                public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
+
+                }
+
+                @Override
+                public void onActivityDestroyed(Activity activity) {
+
+                }
+            });
+        }
+    }
+
+    @Override
+    public boolean onCreate() {
+        Context appContext = getContext().getApplicationContext();
+        init(appContext);
+        return false;
+    }
+
+    @Nullable
+    @Override
+    public Cursor query(@NonNull Uri uri, @Nullable String[] projection, @Nullable String selection,
+                        @Nullable String[] selectionArgs, @Nullable String sortOrder) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public String getType(@NonNull Uri uri) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public Uri insert(@NonNull Uri uri, @Nullable ContentValues values) {
+        return null;
+    }
+
+    @Override
+    public int delete(@NonNull Uri uri, @Nullable String selection, @Nullable String[] selectionArgs) {
+        return 0;
+    }
+
+    @Override
+    public int update(@NonNull Uri uri, @Nullable ContentValues values, @Nullable String selection,
+                      @Nullable String[] selectionArgs) {
+        return 0;
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/internal/TUIAudioMessageRecordService.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/internal/TUIAudioMessageRecordService.java
new file mode 100644
index 0000000..0c9b5f4
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/internal/TUIAudioMessageRecordService.java
@@ -0,0 +1,337 @@
+package com.tencent.qcloud.tuikit.tuicallkit.internal;
+
+import android.content.Context;
+import android.media.AudioAttributes;
+import android.media.AudioFocusRequest;
+import android.media.AudioManager;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.TextUtils;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.interfaces.ITUINotification;
+import com.tencent.qcloud.tuicore.interfaces.ITUIService;
+import com.tencent.qcloud.tuicore.interfaces.TUIServiceCallback;
+import com.tencent.qcloud.tuicore.permission.PermissionCallback;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallEngine;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallObserver;
+import com.tencent.qcloud.tuikit.tuicallengine.impl.base.TUILog;
+import com.tencent.qcloud.tuikit.tuicallkit.base.TUICallingStatusManager;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.PermissionRequest;
+import com.tencent.trtc.TRTCCloud;
+import com.tencent.trtc.TRTCCloudDef;
+import com.tencent.trtc.TRTCCloudListener;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.List;
+import java.util.Map;
+
+public class TUIAudioMessageRecordService implements ITUIService, ITUINotification {
+    private static final String TAG = "TUIAudioMessageRecordService";
+
+    private Context         mContext;
+    private AudioRecordInfo mAudioRecordInfo;
+
+    private AudioFocusRequest                       mFocusRequest;
+    private AudioManager                            mAudioManager;
+    private AudioManager.OnAudioFocusChangeListener mOnFocusChangeListener;
+    private TUIServiceCallback mAudioRecordValueCallback;
+
+    public TUIAudioMessageRecordService(Context context) {
+        mContext = context.getApplicationContext();
+        TUICore.registerEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED,
+                TUIConstants.TUILogin.EVENT_SUB_KEY_USER_LOGIN_SUCCESS, this);
+    }
+
+    @Override
+    public Object onCall(String method, Map<String, Object> param, TUIServiceCallback callback) {
+        this.mAudioRecordValueCallback = callback;
+        if (TextUtils.equals(TUIConstants.TUICalling.METHOD_NAME_START_RECORD_AUDIO_MESSAGE, method)) {
+            if (param == null) {
+                TUILog.e(TAG, "startRecordAudioMessage failed, param is empty");
+                notifyAudioMessageRecordEvent(TUIConstants.TUICalling.EVENT_SUB_KEY_RECORD_START,
+                        TUIConstants.TUICalling.ERROR_INVALID_PARAM, null);
+                return false;
+            }
+
+            //如果当前在通话中,不支持录音
+            if (!TUICallDefine.Status.None.equals(TUICallingStatusManager.sharedInstance(mContext).getCallStatus())) {
+                TUILog.e(TAG, "startRecordAudioMessage failed, The current call status does not support recording");
+                notifyAudioMessageRecordEvent(TUIConstants.TUICalling.EVENT_SUB_KEY_RECORD_START,
+                        TUIConstants.TUICalling.ERROR_STATUS_IN_CALL, null);
+                return false;
+            }
+
+            //当前已经在录音中
+            if (mAudioRecordInfo != null) {
+                TUILog.e(TAG, "startRecordAudioMessage failed, The recording is not over, It cannot be called again");
+                notifyAudioMessageRecordEvent(TUIConstants.TUICalling.EVENT_SUB_KEY_RECORD_START,
+                        TUIConstants.TUICalling.ERROR_STATUS_IS_AUDIO_RECORDING, null);
+                return false;
+            }
+
+            //获取麦克风权限
+            PermissionRequest.requestPermissions(mContext, TUICallDefine.MediaType.Audio, new PermissionCallback() {
+                @Override
+                public void onGranted() {
+                    //获取音频焦点
+                    initAudioFocusManager();
+                    if (requestAudioFocus() != AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
+                        TUILog.e(TAG, "startRecordAudioMessage failed, Failed to obtain audio focus");
+                        notifyAudioMessageRecordEvent(TUIConstants.TUICalling.EVENT_SUB_KEY_RECORD_START,
+                                TUIConstants.TUICalling.ERROR_REQUEST_AUDIO_FOCUS_FAILED, null);
+                        return;
+                    }
+
+                    mAudioRecordInfo = new AudioRecordInfo();
+                    if (param.containsKey(TUIConstants.TUICalling.PARAM_NAME_AUDIO_PATH)) {
+                        mAudioRecordInfo.path = (String) param.get(TUIConstants.TUICalling.PARAM_NAME_AUDIO_PATH);
+                    }
+                    if (param.containsKey(TUIConstants.TUICalling.PARAM_NAME_SDK_APP_ID)) {
+                        mAudioRecordInfo.sdkAppId = (int) param.get(TUIConstants.TUICalling.PARAM_NAME_SDK_APP_ID);
+                    }
+                    if (param.containsKey(TUIConstants.TUICalling.PARAM_NAME_AUDIO_SIGNATURE)) {
+                        mAudioRecordInfo.signature =
+                                (String) param.get(TUIConstants.TUICalling.PARAM_NAME_AUDIO_SIGNATURE);
+                    }
+
+                    //开启音频采集
+                    TRTCCloud.sharedInstance(mContext).setListener(mTRTCCloudListener);
+                    startRecordAudioMessage();
+                }
+
+                @Override
+                public void onDenied() {
+                    super.onDenied();
+                    notifyAudioMessageRecordEvent(TUIConstants.TUICalling.EVENT_SUB_KEY_RECORD_START,
+                            TUIConstants.TUICalling.ERROR_MIC_PERMISSION_REFUSED, null);
+                }
+            });
+            return true;
+        }
+
+        if (TextUtils.equals(TUIConstants.TUICalling.METHOD_NAME_STOP_RECORD_AUDIO_MESSAGE, method)) {
+            stopRecordAudioMessage();
+        }
+        return true;
+    }
+
+    private TRTCCloudListener mTRTCCloudListener = new TRTCCloudListener() {
+        @Override
+        public void onError(int errCode, String errMsg, Bundle extraInfo) {
+            super.onError(errCode, errMsg, extraInfo);
+            if (errCode == TUIConstants.TUICalling.ERR_MIC_START_FAIL
+                    || errCode == TUIConstants.TUICalling.ERR_MIC_NOT_AUTHORIZED
+                    || errCode == TUIConstants.TUICalling.ERR_MIC_SET_PARAM_FAIL
+                    || errCode == TUIConstants.TUICalling.ERR_MIC_OCCUPY) {
+                notifyAudioMessageRecordEvent(TUIConstants.TUICalling.EVENT_SUB_KEY_RECORD_START, errCode, null);
+            }
+        }
+
+        @Override
+        public void onLocalRecordBegin(int errCode, String storagePath) {
+            super.onLocalRecordBegin(errCode, storagePath);
+            int tempCode = convertErrorCode("onLocalRecordBegin", errCode);
+            if (errCode == TUIConstants.TUICalling.ERROR_NONE) {
+                TRTCCloud.sharedInstance(mContext).startLocalAudio(TRTCCloudDef.TRTC_AUDIO_QUALITY_SPEECH);
+            }
+            notifyAudioMessageRecordEvent(TUIConstants.TUICalling.EVENT_SUB_KEY_RECORD_START, tempCode, storagePath);
+        }
+
+        @Override
+        public void onLocalRecordComplete(int errCode, String storagePath) {
+            super.onLocalRecordComplete(errCode, storagePath);
+            int tempCode = convertErrorCode("onLocalRecordComplete", errCode);
+            notifyAudioMessageRecordEvent(TUIConstants.TUICalling.EVENT_SUB_KEY_RECORD_STOP, tempCode, storagePath);
+        }
+    };
+
+    private TUICallObserver mCallObserver = new TUICallObserver() {
+        @Override
+        public void onCallReceived(String callerId, List<String> calleeIdList, String groupId,
+                                   TUICallDefine.MediaType callMediaType, String userData) {
+            super.onCallReceived(callerId, calleeIdList, groupId, callMediaType, userData);
+            //收到通话邀请,停止录制
+            stopRecordAudioMessage();
+        }
+    };
+
+    private void startRecordAudioMessage() {
+        if (mAudioRecordInfo == null) {
+            TUILog.e(TAG, "startRecordAudioMessage failed, audioRecordInfo is empty");
+            return;
+        }
+        TUILog.i(TAG, "startRecordAudioMessage, mAudioRecordInfo: " + mAudioRecordInfo);
+        JSONObject jsonObject = new JSONObject();
+        try {
+            jsonObject.put("api", "startRecordAudioMessage");
+            JSONObject params = new JSONObject();
+            params.put(TUIConstants.TUICalling.PARAM_NAME_SDK_APP_ID, mAudioRecordInfo.sdkAppId);
+            params.put(TUIConstants.TUICalling.PARAM_NAME_AUDIO_PATH, mAudioRecordInfo.path);
+            params.put("key", mAudioRecordInfo.signature);
+            jsonObject.put("params", params);
+            TRTCCloud.sharedInstance(mContext).callExperimentalAPI(jsonObject.toString());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void stopRecordAudioMessage() {
+        if (mAudioRecordInfo == null) {
+            TUILog.w(TAG, "stopRecordAudioMessage, current recording status is Idle,do not need to stop");
+            return;
+        }
+
+        JSONObject jsonObject = new JSONObject();
+        try {
+            jsonObject.put("api", "stopRecordAudioMessage");
+            JSONObject params = new JSONObject();
+            jsonObject.put("params", params);
+            TRTCCloud.sharedInstance(mContext).callExperimentalAPI(jsonObject.toString());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        TUILog.i(TAG, "stopRecordAudioMessage, stopLocalAudio");
+        TRTCCloud.sharedInstance(mContext).stopLocalAudio();
+        //清空录制信息
+        mAudioRecordInfo = null;
+        //释放音频焦点
+        abandonAudioFocus();
+    }
+
+    private void notifyAudioMessageRecordEvent(String method, int errCode, String path) {
+        TUILog.i(TAG, "notifyAudioMessageRecordEvent, method: " + method + ", errCode: " + errCode + ",path: " + path);
+        if (mAudioRecordValueCallback != null) {
+            Bundle bundleInfo = new Bundle();
+            bundleInfo.putString(TUIConstants.TUICalling.EVENT_KEY_RECORD_AUDIO_MESSAGE, method);
+            bundleInfo.putString(TUIConstants.TUICalling.PARAM_NAME_AUDIO_PATH, path);
+            mAudioRecordValueCallback.onServiceCallback(errCode, "", bundleInfo);
+        }
+    }
+
+    @Override
+    public void onNotifyEvent(String key, String subKey, Map<String, Object> param) {
+        if (TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED.equals(key)
+                && TUIConstants.TUILogin.EVENT_SUB_KEY_USER_LOGIN_SUCCESS.equals(subKey)) {
+            TUICallEngine.createInstance(mContext).addObserver(mCallObserver);
+        }
+    }
+
+    private void initAudioFocusManager() {
+        if (mAudioManager == null) {
+            mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+        }
+        if (mOnFocusChangeListener == null) {
+            mOnFocusChangeListener = new AudioManager.OnAudioFocusChangeListener() {
+                @Override
+                public void onAudioFocusChange(int focusChange) {
+                    switch (focusChange) {
+                        case AudioManager.AUDIOFOCUS_GAIN:
+                            break;
+                        case AudioManager.AUDIOFOCUS_LOSS:
+                        case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT:
+                        case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK:
+                            //其他应用占用焦点的时候,停止录制
+                            stopRecordAudioMessage();
+                            break;
+                        default:
+                            break;
+                    }
+
+                }
+            };
+        }
+
+        AudioAttributes attributes = null;
+        //android 5.0
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            attributes = new AudioAttributes.Builder()
+                    .setUsage(AudioAttributes.USAGE_MEDIA)
+                    .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
+                    .build();
+        }
+        //android 8.0
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+            mFocusRequest = new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT)
+                    .setWillPauseWhenDucked(true)
+                    .setAudioAttributes(attributes)
+                    .setOnAudioFocusChangeListener(mOnFocusChangeListener)
+                    .build();
+        }
+    }
+
+    private int requestAudioFocus() {
+        if (mAudioManager == null) {
+            return AudioManager.AUDIOFOCUS_REQUEST_FAILED;
+        }
+        int result;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            result = mAudioManager.requestAudioFocus(mFocusRequest);
+        } else {
+            result = mAudioManager.requestAudioFocus(mOnFocusChangeListener, AudioManager.STREAM_MUSIC,
+                    AudioManager.AUDIOFOCUS_GAIN_TRANSIENT);
+        }
+        return result;
+    }
+
+    private int abandonAudioFocus() {
+        if (mAudioManager == null) {
+            return AudioManager.AUDIOFOCUS_REQUEST_FAILED;
+        }
+        int result;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            result = mAudioManager.abandonAudioFocusRequest(mFocusRequest);
+        } else {
+            result = mAudioManager.abandonAudioFocus(mOnFocusChangeListener);
+        }
+        return result;
+    }
+
+    private int convertErrorCode(String method, int errorCode) {
+        int targetCode;
+        switch (errorCode) {
+            case -1:
+                targetCode = "onLocalRecordBegin".equals(method) ? TUIConstants.TUICalling.ERROR_RECORD_INIT_FAILED
+                        : TUIConstants.TUICalling.ERROR_RECORD_FAILED;
+                break;
+            case -2:
+                targetCode = TUIConstants.TUICalling.ERROR_PATH_FORMAT_NOT_SUPPORT;
+                break;
+            case -3:
+                targetCode = TUIConstants.TUICalling.ERROR_NO_MESSAGE_TO_RECORD;
+                break;
+            case -4:
+                targetCode = TUIConstants.TUICalling.ERROR_SIGNATURE_ERROR;
+                break;
+            case -5:
+                targetCode = TUIConstants.TUICalling.ERROR_SIGNATURE_EXPIRED;
+                break;
+            default:
+                targetCode = TUIConstants.TUICalling.ERROR_NONE;
+                break;
+        }
+        return targetCode;
+    }
+
+    class AudioRecordInfo {
+        public String path;       // 录制文件地址
+        public int    sdkAppId;   // 应用的 SDKAppID
+        public String signature;  // AI 降噪签名
+
+        public AudioRecordInfo() {
+        }
+
+        @Override
+        public String toString() {
+            return "AudioRecordInfo{"
+                    + "path=" + path
+                    + ", SDKAppID=" + sdkAppId
+                    + '}';
+        }
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/internal/TUICallingService.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/internal/TUICallingService.java
new file mode 100644
index 0000000..3c6645e
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/internal/TUICallingService.java
@@ -0,0 +1,391 @@
+package com.tencent.qcloud.tuikit.tuicallkit.internal;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.activity.result.ActivityResultCaller;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUIConstants.TUICalling.ObjectFactory.RecentCalls;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.interfaces.ITUIExtension;
+import com.tencent.qcloud.tuicore.interfaces.ITUINotification;
+import com.tencent.qcloud.tuicore.interfaces.ITUIObjectFactory;
+import com.tencent.qcloud.tuicore.interfaces.ITUIService;
+import com.tencent.qcloud.tuicore.interfaces.TUIExtensionEventListener;
+import com.tencent.qcloud.tuicore.interfaces.TUIExtensionInfo;
+import com.tencent.qcloud.tuikit.TUICommonDefine;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallEngine;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.TUICallKit;
+import com.tencent.qcloud.tuikit.tuicallkit.extensions.recents.RecentCallsFragment;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * `TUICore` call (if the `TUICore` module is not imported, use `TUICallKitImpl` instead)
+ */
+final class TUICallingService implements ITUINotification, ITUIService, ITUIExtension, ITUIObjectFactory {
+    private static final String TAG = "TUICallingService";
+
+    private static final int CALL_MEMBER_LIMIT = 9;
+
+    private static final TUICallingService INSTANCE = new TUICallingService();
+
+    static TUICallingService sharedInstance() {
+        return INSTANCE;
+    }
+
+    private Context appContext;
+
+    private TUICallingService() {
+
+    }
+
+    public void init(Context context) {
+        appContext = context;
+        TUICore.registerEvent(TUIConstants.TUILogin.EVENT_IMSDK_INIT_STATE_CHANGED,
+                TUIConstants.TUILogin.EVENT_SUB_KEY_START_INIT, this);
+
+        TUICore.registerExtension(TUIConstants.TUIChat.Extension.InputMore.CLASSIC_EXTENSION_ID, this);
+        TUICore.registerExtension(TUIConstants.TUIChat.Extension.InputMore.MINIMALIST_EXTENSION_ID, this);
+        TUICore.registerExtension(TUIConstants.TUIGroup.Extension.GroupProfileItem.MINIMALIST_EXTENSION_ID, this);
+        TUICore.registerExtension(TUIConstants.TUIGroup.Extension.GroupProfileItem.CLASSIC_EXTENSION_ID, this);
+        TUICore.registerExtension(TUIConstants.TUIContact.Extension.FriendProfileItem.CLASSIC_EXTENSION_ID, this);
+        TUICore.registerExtension(TUIConstants.TUIContact.Extension.FriendProfileItem.MINIMALIST_EXTENSION_ID, this);
+        TUICore.registerExtension(TUIConstants.TUIChat.Extension.ChatNavigationMoreItem.CLASSIC_EXTENSION_ID, this);
+        TUICore.registerExtension(TUIConstants.TUIChat.Extension.ChatNavigationMoreItem.MINIMALIST_EXTENSION_ID, this);
+
+        TUICore.registerObjectFactory(TUIConstants.TUICalling.ObjectFactory.FACTORY_NAME, this);
+    }
+
+    @Override
+    public Object onCall(String method, Map<String, Object> param) {
+        Log.i(TAG, "onCall, method: " + method + " ,param: " + param);
+
+        if (null != param && TextUtils.equals(TUIConstants.TUICalling.METHOD_NAME_ENABLE_FLOAT_WINDOW, method)) {
+            boolean enableFloatWindow = (boolean) param.get(TUIConstants.TUICalling.PARAM_NAME_ENABLE_FLOAT_WINDOW);
+            Log.i(TAG, "onCall, enableFloatWindow: " + enableFloatWindow);
+            TUICallKit.createInstance(appContext).enableFloatWindow(enableFloatWindow);
+            return null;
+        }
+
+        if (null != param && TextUtils.equals(TUIConstants.TUICalling.METHOD_NAME_ENABLE_MULTI_DEVICE, method)) {
+            boolean enable = (boolean) param.get(TUIConstants.TUICalling.PARAM_NAME_ENABLE_MULTI_DEVICE);
+            Log.i(TAG, "onCall, enableMultiDevice: " + enable);
+            TUICallEngine.createInstance(appContext).enableMultiDeviceAbility(enable, new TUICommonDefine.Callback() {
+                @Override
+                public void onSuccess() {
+                }
+
+                @Override
+                public void onError(int errCode, String errMsg) {
+                }
+            });
+            return null;
+        }
+
+        if (null != param && TextUtils.equals(TUIConstants.TUICalling.METHOD_NAME_CALL, method)) {
+            String[] userIDs = (String[]) param.get(TUIConstants.TUICalling.PARAM_NAME_USERIDS);
+            String typeString = (String) param.get(TUIConstants.TUICalling.PARAM_NAME_TYPE);
+            String groupID = (String) param.get(TUIConstants.TUICalling.PARAM_NAME_GROUPID);
+
+            List<String> userIdList = new ArrayList<>(Arrays.asList(userIDs));
+            TUICallDefine.MediaType mediaType = TUICallDefine.MediaType.Unknown;
+            if (TUIConstants.TUICalling.TYPE_AUDIO.equals(typeString)) {
+                mediaType = TUICallDefine.MediaType.Audio;
+            } else if (TUIConstants.TUICalling.TYPE_VIDEO.equals(typeString)) {
+                mediaType = TUICallDefine.MediaType.Video;
+            }
+            if (!TextUtils.isEmpty(groupID)) {
+                TUICallKit.createInstance(appContext).groupCall(groupID, userIdList, mediaType);
+            } else if (userIdList.size() == 1) {
+                TUICallKit.createInstance(appContext).call(userIdList.get(0), mediaType);
+            } else {
+                Log.e(TAG, "onCall ignored, groupId is empty and userList is not 1, cannot start call or groupCall");
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public Object onCreateObject(String objectName, Map<String, Object> param) {
+        if (TextUtils.equals(objectName, RecentCalls.OBJECT_NAME)) {
+            String style = RecentCalls.UI_STYLE_MINIMALIST;
+            if (param != null && RecentCalls.UI_STYLE_CLASSIC.equals(param.get(RecentCalls.UI_STYLE))) {
+                style = RecentCalls.UI_STYLE_CLASSIC;
+            }
+            return new RecentCallsFragment(style);
+        }
+        return null;
+    }
+
+    @Override
+    public List<TUIExtensionInfo> onGetExtension(String extensionID, Map<String, Object> param) {
+        Log.i(TAG, "onGetExtension, extensionID: " + extensionID + " ,param: " + param);
+        if (TextUtils.equals(extensionID,
+                TUIConstants.TUIChat.Extension.InputMore.CLASSIC_EXTENSION_ID)) {
+            return getClassicChatInputMoreExtension(param);
+        } else if (TextUtils.equals(extensionID,
+                TUIConstants.TUIGroup.Extension.GroupProfileItem.MINIMALIST_EXTENSION_ID)) {
+            return getMinimalistGroupProfileExtension(param);
+        } else if (TextUtils.equals(extensionID,
+                TUIConstants.TUIContact.Extension.FriendProfileItem.CLASSIC_EXTENSION_ID)) {
+            return getClassicFriendProfileExtension(param);
+        } else if (TextUtils.equals(extensionID,
+                TUIConstants.TUIContact.Extension.FriendProfileItem.MINIMALIST_EXTENSION_ID)) {
+            return getMinimalistFriendProfileExtension(param);
+        } else if (TextUtils.equals(extensionID,
+                TUIConstants.TUIChat.Extension.ChatNavigationMoreItem.MINIMALIST_EXTENSION_ID)) {
+            return getMinimalistChatNavigationMoreExtension(param);
+        }
+        return null;
+    }
+
+    private List<TUIExtensionInfo> getClassicChatInputMoreExtension(Map<String, Object> param) {
+        TUIExtensionInfo voiceCallExtension = new TUIExtensionInfo();
+        voiceCallExtension.setWeight(600);
+        TUIExtensionInfo videoCallExtension = new TUIExtensionInfo();
+        videoCallExtension.setWeight(500);
+
+        String userID = getOrDefault(param, TUIConstants.TUIChat.Extension.InputMore.USER_ID, null);
+        String groupID = getOrDefault(param, TUIConstants.TUIChat.Extension.InputMore.GROUP_ID, null);
+        ResultTUIExtensionEventListener voiceListener = new ResultTUIExtensionEventListener();
+        voiceListener.mediaType = TUICallDefine.MediaType.Audio;
+        voiceListener.userID = userID;
+        voiceListener.groupID = groupID;
+        ResultTUIExtensionEventListener videoListener = new ResultTUIExtensionEventListener();
+        videoListener.mediaType = TUICallDefine.MediaType.Video;
+        videoListener.userID = userID;
+        videoListener.groupID = groupID;
+
+        voiceCallExtension.setText(appContext.getString(R.string.tuicalling_audio_call));
+        voiceCallExtension.setIcon(R.drawable.tuicalling_ic_audio_call);
+        voiceCallExtension.setExtensionListener(voiceListener);
+        voiceListener.activityResultCaller = getOrDefault(param,
+                TUIConstants.TUIChat.Extension.InputMore.CONTEXT, null);
+        videoCallExtension.setText(appContext.getString(R.string.tuicalling_video_call));
+        videoCallExtension.setIcon(R.drawable.tuicalling_ic_video_call);
+        videoCallExtension.setExtensionListener(videoListener);
+        videoListener.activityResultCaller = getOrDefault(param,
+                TUIConstants.TUIChat.Extension.InputMore.CONTEXT, null);
+        boolean filterVoice = getOrDefault(param, TUIConstants.TUIChat.Extension.InputMore.FILTER_VOICE_CALL, false);
+        boolean filterVideo = getOrDefault(param, TUIConstants.TUIChat.Extension.InputMore.FILTER_VIDEO_CALL, false);
+        List<TUIExtensionInfo> extensionInfoList = new ArrayList<>();
+        if (!filterVoice) {
+            extensionInfoList.add(voiceCallExtension);
+        }
+        if (!filterVideo) {
+            extensionInfoList.add(videoCallExtension);
+        }
+        return extensionInfoList;
+    }
+
+    private List<TUIExtensionInfo> getMinimalistGroupProfileExtension(Map<String, Object> param) {
+        TUIExtensionInfo voiceCallExtension = new TUIExtensionInfo();
+        voiceCallExtension.setWeight(200);
+        TUIExtensionInfo videoCallExtension = new TUIExtensionInfo();
+        videoCallExtension.setWeight(100);
+
+        String groupID = getOrDefault(param, TUIConstants.TUIGroup.Extension.GroupProfileItem.GROUP_ID, null);
+        ResultTUIExtensionEventListener voiceListener = new ResultTUIExtensionEventListener();
+        voiceListener.mediaType = TUICallDefine.MediaType.Audio;
+        voiceListener.groupID = groupID;
+        voiceListener.isClassicUI = false;
+        ResultTUIExtensionEventListener videoListener = new ResultTUIExtensionEventListener();
+        videoListener.mediaType = TUICallDefine.MediaType.Video;
+        videoListener.groupID = groupID;
+        videoListener.isClassicUI = false;
+
+        voiceCallExtension.setText(appContext.getString(R.string.tuicalling_audio_call));
+        voiceCallExtension.setIcon(R.drawable.tuicallkit_profile_minimalist_audio_icon);
+        voiceCallExtension.setExtensionListener(voiceListener);
+        voiceListener.activityResultCaller = getOrDefault(param,
+                TUIConstants.TUIGroup.Extension.GroupProfileItem.CONTEXT, null);
+        voiceListener.isClassicUI = false;
+        videoCallExtension.setText(appContext.getString(R.string.tuicalling_video_call));
+        videoCallExtension.setIcon(R.drawable.tuicallkit_profile_minimalist_video_icon);
+        videoCallExtension.setExtensionListener(videoListener);
+        videoListener.isClassicUI = false;
+        videoListener.activityResultCaller = getOrDefault(param,
+                TUIConstants.TUIGroup.Extension.GroupProfileItem.CONTEXT, null);
+        List<TUIExtensionInfo> extensionInfoList = new ArrayList<>();
+        extensionInfoList.add(videoCallExtension);
+        extensionInfoList.add(voiceCallExtension);
+        return extensionInfoList;
+    }
+
+    private List<TUIExtensionInfo> getClassicFriendProfileExtension(Map<String, Object> param) {
+        TUIExtensionInfo voiceCallExtension = new TUIExtensionInfo();
+        voiceCallExtension.setWeight(300);
+        TUIExtensionInfo videoCallExtension = new TUIExtensionInfo();
+        videoCallExtension.setWeight(200);
+
+        String userID = getOrDefault(param, TUIConstants.TUIContact.Extension.FriendProfileItem.USER_ID, null);
+        ResultTUIExtensionEventListener voiceListener = new ResultTUIExtensionEventListener();
+        voiceListener.mediaType = TUICallDefine.MediaType.Audio;
+        voiceListener.userID = userID;
+        ResultTUIExtensionEventListener videoListener = new ResultTUIExtensionEventListener();
+        videoListener.mediaType = TUICallDefine.MediaType.Video;
+        videoListener.userID = userID;
+
+        voiceCallExtension.setText(appContext.getString(R.string.tuicalling_audio_call));
+        voiceCallExtension.setExtensionListener(voiceListener);
+        videoCallExtension.setText(appContext.getString(R.string.tuicalling_video_call));
+        videoCallExtension.setExtensionListener(videoListener);
+        List<TUIExtensionInfo> extensionInfoList = new ArrayList<>();
+        extensionInfoList.add(videoCallExtension);
+        extensionInfoList.add(voiceCallExtension);
+        return extensionInfoList;
+    }
+
+    private List<TUIExtensionInfo> getMinimalistFriendProfileExtension(Map<String, Object> param) {
+        TUIExtensionInfo voiceCallExtension = new TUIExtensionInfo();
+        voiceCallExtension.setWeight(300);
+        TUIExtensionInfo videoCallExtension = new TUIExtensionInfo();
+        videoCallExtension.setWeight(200);
+
+        String userID = getOrDefault(param, TUIConstants.TUIContact.Extension.FriendProfileItem.USER_ID, null);
+        ResultTUIExtensionEventListener voiceListener = new ResultTUIExtensionEventListener();
+        voiceListener.mediaType = TUICallDefine.MediaType.Audio;
+        voiceListener.userID = userID;
+        voiceListener.isClassicUI = false;
+        ResultTUIExtensionEventListener videoListener = new ResultTUIExtensionEventListener();
+        videoListener.mediaType = TUICallDefine.MediaType.Video;
+        videoListener.userID = userID;
+        videoListener.isClassicUI = false;
+
+        voiceCallExtension.setIcon(R.drawable.tuicallkit_profile_minimalist_audio_icon);
+        voiceCallExtension.setText(appContext.getString(R.string.tuicalling_audio_call));
+        voiceCallExtension.setExtensionListener(voiceListener);
+        videoCallExtension.setIcon(R.drawable.tuicallkit_profile_minimalist_video_icon);
+        videoCallExtension.setText(appContext.getString(R.string.tuicalling_video_call));
+        videoCallExtension.setExtensionListener(videoListener);
+        List<TUIExtensionInfo> extensionInfoList = new ArrayList<>();
+        extensionInfoList.add(videoCallExtension);
+        extensionInfoList.add(voiceCallExtension);
+        return extensionInfoList;
+    }
+
+    private List<TUIExtensionInfo> getMinimalistChatNavigationMoreExtension(Map<String, Object> param) {
+        String userID = getOrDefault(param, TUIConstants.TUIChat.Extension.ChatNavigationMoreItem.USER_ID, null);
+        String groupID = getOrDefault(param, TUIConstants.TUIChat.Extension.ChatNavigationMoreItem.GROUP_ID, null);
+        ResultTUIExtensionEventListener voiceListener = new ResultTUIExtensionEventListener();
+        voiceListener.mediaType = TUICallDefine.MediaType.Audio;
+        voiceListener.groupID = groupID;
+        voiceListener.userID = userID;
+        voiceListener.isClassicUI = false;
+        voiceListener.activityResultCaller = getOrDefault(param,
+                TUIConstants.TUIChat.Extension.ChatNavigationMoreItem.CONTEXT, null);
+        ResultTUIExtensionEventListener videoListener = new ResultTUIExtensionEventListener();
+        videoListener.mediaType = TUICallDefine.MediaType.Video;
+        videoListener.groupID = groupID;
+        videoListener.userID = userID;
+        videoListener.isClassicUI = false;
+        videoListener.activityResultCaller = getOrDefault(param,
+                TUIConstants.TUIChat.Extension.ChatNavigationMoreItem.CONTEXT, null);
+
+        TUIExtensionInfo voiceCallExtension = new TUIExtensionInfo();
+        TUIExtensionInfo videoCallExtension = new TUIExtensionInfo();
+
+        voiceCallExtension.setIcon(R.drawable.tuicallkit_chat_title_bar_minimalist_audio_call_icon);
+        voiceCallExtension.setExtensionListener(voiceListener);
+        videoCallExtension.setIcon(R.drawable.tuicallkit_chat_title_bar_minimalist_video_call_icon);
+        videoCallExtension.setExtensionListener(videoListener);
+        List<TUIExtensionInfo> extensionInfoList = new ArrayList<>();
+        extensionInfoList.add(voiceCallExtension);
+        extensionInfoList.add(videoCallExtension);
+        return extensionInfoList;
+    }
+
+    private <T> T getOrDefault(Map map, Object key, T defaultValue) {
+        if (map == null || map.isEmpty()) {
+            return defaultValue;
+        }
+        Object object = map.get(key);
+        try {
+            if (object != null) {
+                return (T) object;
+            }
+        } catch (ClassCastException e) {
+            return defaultValue;
+        }
+        return defaultValue;
+    }
+
+    @Override
+    public void onNotifyEvent(String key, String subKey, Map<String, Object> param) {
+        if (TUIConstants.TUILogin.EVENT_IMSDK_INIT_STATE_CHANGED.equals(key)
+                && TUIConstants.TUILogin.EVENT_SUB_KEY_START_INIT.equals(subKey)) {
+            TUICallKit.createInstance(appContext);
+            adaptiveComponentReport();
+        }
+    }
+
+    private void adaptiveComponentReport() {
+        ITUIService service = TUICore.getService(TUIConstants.TUIChat.SERVICE_NAME);
+        try {
+            JSONObject params = new JSONObject();
+            params.put("framework", 1);
+            if (service == null) {
+                params.put("component", 14);
+            } else {
+                params.put("component", 15);
+            }
+            params.put("language", 1);
+
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("api", "setFramework");
+            jsonObject.put("params", params);
+            TUICallEngine.createInstance(appContext).callExperimentalAPI(jsonObject.toString());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
+    class ResultTUIExtensionEventListener extends TUIExtensionEventListener {
+        public ActivityResultCaller    activityResultCaller;
+        public TUICallDefine.MediaType mediaType;
+        public boolean                 isClassicUI = true;
+        public String                  userID;
+        public String                  groupID;
+
+        @Override
+        public void onClicked(Map<String, Object> param) {
+            if (!TextUtils.isEmpty(groupID)) {
+                String groupMemberSelectActivityName =
+                        TUIConstants.TUIContact.StartActivity.GroupMemberSelect.CLASSIC_ACTIVITY_NAME;
+                if (!isClassicUI) {
+                    groupMemberSelectActivityName =
+                            TUIConstants.TUIContact.StartActivity.GroupMemberSelect.MINIMALIST_ACTIVITY_NAME;
+                }
+                Bundle bundle = new Bundle();
+                bundle.putString(TUIConstants.TUIContact.StartActivity.GroupMemberSelect.GROUP_ID, groupID);
+                bundle.putBoolean(TUIConstants.TUIContact.StartActivity.GroupMemberSelect.SELECT_FOR_CALL, true);
+                bundle.putInt(TUIConstants.TUIContact.StartActivity.GroupMemberSelect.MEMBER_LIMIT, CALL_MEMBER_LIMIT);
+                TUICore.startActivityForResult(activityResultCaller, groupMemberSelectActivityName, bundle, result -> {
+                    Intent data = result.getData();
+                    if (data != null) {
+                        List<String> stringList = data.getStringArrayListExtra(
+                                TUIConstants.TUIContact.StartActivity.GroupMemberSelect.DATA_LIST);
+                        TUICallKit.createInstance(appContext).groupCall(groupID, stringList, mediaType);
+                    }
+                });
+            } else if (!TextUtils.isEmpty(userID)) {
+                TUICallKit.createInstance(appContext).call(userID, mediaType);
+            } else {
+                Log.e(TAG, "onClicked event ignored, groupId is empty or userId is empty, cannot start call");
+            }
+        }
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/service/TUICallService.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/service/TUICallService.java
new file mode 100644
index 0000000..699b750
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/service/TUICallService.java
@@ -0,0 +1,80 @@
+package com.tencent.qcloud.tuikit.tuicallkit.service;
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.os.IBinder;
+
+import androidx.core.app.NotificationCompat;
+
+import com.tencent.qcloud.tuikit.tuicallkit.utils.DeviceUtils;
+
+/**
+ * TUICallKit are kept alive to ensure that applications are not killed by the system in the background.
+ * You can delete them if they are not needed.
+ */
+public class TUICallService extends Service {
+    private static final int NOTIFICATION_ID = 1001;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        // 获取服务通知
+        Notification notification = createForegroundNotification();
+        //将服务置于启动状态 ,NOTIFICATION_ID指的是创建的通知的ID
+        startForeground(NOTIFICATION_ID, notification);
+    }
+
+    public static void start(Context context) {
+        if (DeviceUtils.isServiceRunning(context, TUICallService.class.getName())) {
+            return;
+        }
+        Intent starter = new Intent(context, TUICallService.class);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            context.startForegroundService(starter);
+        } else {
+            context.startService(starter);
+        }
+    }
+
+    public static void stop(Context context) {
+        Intent intent = new Intent(context, TUICallService.class);
+        context.stopService(intent);
+    }
+
+    private Notification createForegroundNotification() {
+        NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        String notificationChannelId = "notification_channel_id_01";
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            String channelName = "TRTC Foreground Service Notification";
+            NotificationChannel notificationChannel = new NotificationChannel(
+                    notificationChannelId, channelName, NotificationManager.IMPORTANCE_LOW);
+            notificationChannel.setDescription("Channel description");
+            if (notificationManager != null) {
+                notificationManager.createNotificationChannel(notificationChannel);
+            }
+        }
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(this, notificationChannelId);
+        return builder.build();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        return START_NOT_STICKY;
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        throw new UnsupportedOperationException("Not yet implemented");
+    }
+
+    @Override
+    public void onTaskRemoved(Intent rootIntent) {
+        super.onTaskRemoved(rootIntent);
+        stopSelf();
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/DeviceUtils.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/DeviceUtils.java
new file mode 100644
index 0000000..17180d7
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/DeviceUtils.java
@@ -0,0 +1,79 @@
+package com.tencent.qcloud.tuikit.tuicallkit.utils;
+
+import android.app.ActivityManager;
+import android.content.Context;
+import android.os.PowerManager;
+import android.text.TextUtils;
+import android.util.DisplayMetrics;
+import android.view.Window;
+import android.view.WindowManager;
+
+import java.util.List;
+
+public class DeviceUtils {
+
+    public static void setScreenLockParams(Window window) {
+        if (null == window) {
+            return;
+        }
+        PowerManager powerManager = (PowerManager) window.getContext().getSystemService(Context.POWER_SERVICE);
+        boolean isScreenOn = powerManager.isScreenOn();
+        if (isScreenOn) {
+            window.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
+                    | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
+                    | WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+        } else {
+            window.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
+                    | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
+                    | WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+                    | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
+        }
+    }
+
+    public static int getScreenWidth(Context context) {
+        DisplayMetrics metric = new DisplayMetrics();
+        WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+        wm.getDefaultDisplay().getMetrics(metric);
+        return metric.widthPixels;
+    }
+
+    public static int getScreenHeight(Context context) {
+        DisplayMetrics metric = new DisplayMetrics();
+        WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+        wm.getDefaultDisplay().getMetrics(metric);
+        return metric.heightPixels;
+    }
+
+    public static boolean isAppRunningForeground(Context context) {
+        ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+        List<ActivityManager.RunningAppProcessInfo> runningAppProcessInfos = activityManager.getRunningAppProcesses();
+        if (runningAppProcessInfos == null) {
+            return false;
+        }
+        String packageName = context.getPackageName();
+        for (ActivityManager.RunningAppProcessInfo appProcessInfo : runningAppProcessInfos) {
+            if (appProcessInfo.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND
+                    && appProcessInfo.processName.equals(packageName)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean isServiceRunning(Context context, String className) {
+        if (context == null || TextUtils.isEmpty(className)) {
+            return false;
+        }
+        ActivityManager am = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+        List<ActivityManager.RunningServiceInfo> info = am.getRunningServices(0x7FFFFFFF);
+        if (info == null || info.size() == 0) {
+            return false;
+        }
+        for (ActivityManager.RunningServiceInfo aInfo : info) {
+            if (className.equals(aInfo.service.getClassName())) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/DisplayUtils.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/DisplayUtils.java
new file mode 100644
index 0000000..f10738f
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/DisplayUtils.java
@@ -0,0 +1,214 @@
+package com.tencent.qcloud.tuikit.tuicallkit.utils;
+
+import android.content.Context;
+import android.view.ViewGroup;
+import android.widget.RelativeLayout;
+
+import java.util.ArrayList;
+
+public class DisplayUtils {
+
+    public static int dip2px(Context context, float dpValue) {
+        final float scale = context.getResources().getDisplayMetrics().density;
+        return (int) (dpValue * scale + 0.5f);
+    }
+
+    // init stack layout
+    public static ArrayList<RelativeLayout.LayoutParams> initFloatParamList(Context context, int width, int height) {
+        ArrayList<RelativeLayout.LayoutParams> list = new ArrayList<RelativeLayout.LayoutParams>();
+        // the largest layout in the bottom
+        RelativeLayout.LayoutParams layoutParams0 = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT);
+        list.add(layoutParams0);
+
+        final int midMargin = dip2px(context, 10);
+        final int lrMargin = dip2px(context, 15);
+        final int bottomMargin = dip2px(context, 50);
+        final int subWidth = dip2px(context, 120);
+        final int subHeight = dip2px(context, 180);
+        for (int i = 2; i >= 0; i--) {
+            RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(subWidth, subHeight);
+            layoutParams.leftMargin = width - lrMargin - subWidth;
+            layoutParams.topMargin = height - (bottomMargin + midMargin * (i + 1) + subHeight * i) - subHeight;
+            list.add(layoutParams);
+        }
+
+        for (int i = 2; i >= 0; i--) {
+            RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(subWidth, subHeight);
+            layoutParams.leftMargin = lrMargin;
+            layoutParams.topMargin = height - (bottomMargin + midMargin * (i + 1) + subHeight * i) - subHeight;
+            list.add(layoutParams);
+        }
+        return list;
+    }
+
+    // init one grid layout ,center in the screen
+    public static ArrayList<RelativeLayout.LayoutParams> initGrid1Param(Context context, int width, int height) {
+        int margin = dip2px(context, 10);
+        int grid4W = (width - margin * 2) / 2;
+        int grid4H = (height - margin * 2) / 2;
+        RelativeLayout.LayoutParams layoutParams0 = new RelativeLayout.LayoutParams(grid4W, grid4H);
+        layoutParams0.addRule(RelativeLayout.CENTER_IN_PARENT);
+
+        ArrayList<RelativeLayout.LayoutParams> list = new ArrayList<>();
+        list.add(layoutParams0);
+        return list;
+    }
+
+    // init two grid layout ,split the screen
+    public static ArrayList<RelativeLayout.LayoutParams> initGrid2Param(Context context, int width, int height) {
+        int margin = dip2px(context, 10);
+        int grid4W = (width - margin * 2) / 2;
+        int grid4H = (height - margin * 2) / 2;
+
+        RelativeLayout.LayoutParams layoutParams0 = new RelativeLayout.LayoutParams(grid4W, grid4H);
+        layoutParams0.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
+        layoutParams0.addRule(RelativeLayout.CENTER_VERTICAL);
+        layoutParams0.leftMargin = margin;
+
+        RelativeLayout.LayoutParams layoutParams1 = new RelativeLayout.LayoutParams(grid4W, grid4H);
+        layoutParams1.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
+        layoutParams1.addRule(RelativeLayout.CENTER_VERTICAL);
+        layoutParams1.rightMargin = margin;
+
+        ArrayList<RelativeLayout.LayoutParams> list = new ArrayList<>();
+        list.add(layoutParams0);
+        list.add(layoutParams1);
+        return list;
+    }
+
+    // init three grid layout
+    public static ArrayList<RelativeLayout.LayoutParams> initGrid3Param(Context context, int width, int height) {
+        int margin = dip2px(context, 10);
+        int grid3W = (width - margin * 2) / 2;
+        int grid3H = (height - margin * 2) / 2;
+
+        RelativeLayout.LayoutParams layoutParams0 = new RelativeLayout.LayoutParams(grid3W, grid3H);
+        layoutParams0.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
+        layoutParams0.addRule(RelativeLayout.ALIGN_PARENT_TOP);
+        layoutParams0.topMargin = margin;
+        layoutParams0.leftMargin = margin;
+
+        RelativeLayout.LayoutParams layoutParams1 = new RelativeLayout.LayoutParams(grid3W, grid3H);
+        layoutParams1.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
+        layoutParams1.addRule(RelativeLayout.ALIGN_PARENT_TOP);
+        layoutParams1.topMargin = margin;
+        layoutParams1.rightMargin = margin;
+
+        RelativeLayout.LayoutParams layoutParams2 = new RelativeLayout.LayoutParams(grid3W, grid3H);
+        layoutParams2.addRule(RelativeLayout.CENTER_HORIZONTAL);
+        layoutParams2.bottomMargin = margin;
+        layoutParams2.topMargin = margin + grid3H;
+
+        ArrayList<RelativeLayout.LayoutParams> list = new ArrayList<>();
+        list.add(layoutParams0);
+        list.add(layoutParams1);
+        list.add(layoutParams2);
+        return list;
+    }
+
+    // init four grid layout
+    public static ArrayList<RelativeLayout.LayoutParams> initGrid4Param(Context context, int width, int height) {
+        int margin = dip2px(context, 10);
+        int grid4W = (width - margin * 2) / 2;
+        int grid4H = (height - margin * 2) / 2;
+
+        RelativeLayout.LayoutParams layoutParams0 = new RelativeLayout.LayoutParams(grid4W, grid4H);
+        layoutParams0.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
+        layoutParams0.addRule(RelativeLayout.ALIGN_PARENT_TOP);
+        layoutParams0.topMargin = margin;
+        layoutParams0.leftMargin = margin;
+
+        RelativeLayout.LayoutParams layoutParams1 = new RelativeLayout.LayoutParams(grid4W, grid4H);
+        layoutParams1.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
+        layoutParams1.addRule(RelativeLayout.ALIGN_PARENT_TOP);
+        layoutParams1.topMargin = margin;
+        layoutParams1.rightMargin = margin;
+
+        RelativeLayout.LayoutParams layoutParams2 = new RelativeLayout.LayoutParams(grid4W, grid4H);
+        layoutParams2.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
+        layoutParams2.bottomMargin = margin;
+        layoutParams2.topMargin = margin + grid4H;
+        layoutParams2.leftMargin = margin;
+
+        RelativeLayout.LayoutParams layoutParams3 = new RelativeLayout.LayoutParams(grid4W, grid4H);
+        layoutParams3.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
+        layoutParams3.bottomMargin = margin;
+        layoutParams3.topMargin = margin + grid4H;
+        layoutParams3.rightMargin = margin;
+
+        ArrayList<RelativeLayout.LayoutParams> list = new ArrayList<>();
+        list.add(layoutParams0);
+        list.add(layoutParams1);
+        list.add(layoutParams2);
+        list.add(layoutParams3);
+        return list;
+    }
+
+    // init nine grid layout
+    public static ArrayList<RelativeLayout.LayoutParams> initGrid9Param(Context context, int width, int height) {
+        int margin = dip2px(context, 10);
+        int grid9W = (width - margin * 2) / 3;
+        int grid9H = (height - margin * 2) / 3;
+
+        RelativeLayout.LayoutParams layoutParams0 = new RelativeLayout.LayoutParams(grid9W, grid9H);
+        layoutParams0.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
+        layoutParams0.addRule(RelativeLayout.ALIGN_PARENT_TOP);
+        layoutParams0.topMargin = margin;
+        layoutParams0.leftMargin = margin;
+
+        RelativeLayout.LayoutParams layoutParams1 = new RelativeLayout.LayoutParams(grid9W, grid9H);
+        layoutParams1.addRule(RelativeLayout.ALIGN_PARENT_TOP);
+        layoutParams1.topMargin = margin;
+        layoutParams1.leftMargin = margin + grid9W;
+
+        RelativeLayout.LayoutParams layoutParams2 = new RelativeLayout.LayoutParams(grid9W, grid9H);
+        layoutParams2.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
+        layoutParams2.addRule(RelativeLayout.ALIGN_PARENT_TOP);
+        layoutParams2.topMargin = margin;
+        layoutParams2.rightMargin = margin;
+
+        RelativeLayout.LayoutParams layoutParams3 = new RelativeLayout.LayoutParams(grid9W, grid9H);
+        layoutParams3.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
+        layoutParams3.leftMargin = margin;
+        layoutParams3.topMargin = margin + grid9H;
+
+        RelativeLayout.LayoutParams layoutParams4 = new RelativeLayout.LayoutParams(grid9W, grid9H);
+        layoutParams4.topMargin = margin + grid9H;
+        layoutParams4.leftMargin = margin + grid9W;
+
+        RelativeLayout.LayoutParams layoutParams5 = new RelativeLayout.LayoutParams(grid9W, grid9H);
+        layoutParams5.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
+        layoutParams5.topMargin = margin + grid9H;
+        layoutParams5.rightMargin = margin;
+
+        RelativeLayout.LayoutParams layoutParams6 = new RelativeLayout.LayoutParams(grid9W, grid9H);
+        layoutParams6.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
+        layoutParams6.bottomMargin = margin;
+        layoutParams6.leftMargin = margin;
+        layoutParams6.topMargin = margin + grid9H * 2;
+
+        RelativeLayout.LayoutParams layoutParams7 = new RelativeLayout.LayoutParams(grid9W, grid9H);
+        layoutParams7.bottomMargin = margin;
+        layoutParams7.topMargin = margin + grid9H * 2;
+        layoutParams7.leftMargin = margin + grid9W;
+
+        RelativeLayout.LayoutParams layoutParams8 = new RelativeLayout.LayoutParams(grid9W, grid9H);
+        layoutParams8.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
+        layoutParams8.bottomMargin = margin;
+        layoutParams8.topMargin = margin + grid9H * 2;
+        layoutParams8.rightMargin = margin;
+
+        ArrayList<RelativeLayout.LayoutParams> list = new ArrayList<>();
+        list.add(layoutParams0);
+        list.add(layoutParams1);
+        list.add(layoutParams2);
+        list.add(layoutParams3);
+        list.add(layoutParams4);
+        list.add(layoutParams5);
+        list.add(layoutParams6);
+        list.add(layoutParams7);
+        list.add(layoutParams8);
+        return list;
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/ImageLoader.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/ImageLoader.java
new file mode 100644
index 0000000..07bc308
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/ImageLoader.java
@@ -0,0 +1,107 @@
+package com.tencent.qcloud.tuikit.tuicallkit.utils;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapShader;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.graphics.drawable.Drawable;
+import android.widget.ImageView;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.RawRes;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.RequestBuilder;
+import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
+import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
+import com.bumptech.glide.request.RequestOptions;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+
+import java.security.MessageDigest;
+import java.util.concurrent.ExecutionException;
+
+public class ImageLoader {
+    private static int radius = 0;
+
+    public static void clear(Context context, ImageView imageView) {
+        Glide.with(context).clear(imageView);
+    }
+
+    public static void loadImage(Context context, ImageView imageView, Object url) {
+        loadImage(context, imageView, url, R.drawable.tuicalling_ic_avatar);
+    }
+
+    public static void loadImage(Context context, ImageView imageView, Object url, @DrawableRes int resId) {
+        if (url == null || url == "") {
+            if (imageView != null && resId != 0) {
+                imageView.setImageResource(resId);
+            }
+            return;
+        }
+        Glide.with(context).load(url).placeholder(resId).error(loadTransform(context, resId, radius)).into(imageView);
+    }
+
+    public static void loadImage(Context context, ImageView imageView, @RawRes @DrawableRes Integer resourceId) {
+        Glide.with(context).load(resourceId).into(imageView);
+    }
+
+    public static Bitmap loadBitmap(Context context, Object imageUrl, int targetImageSize) throws InterruptedException,
+            ExecutionException {
+        if (imageUrl == null) {
+            return null;
+        }
+        return Glide.with(context).asBitmap().load(imageUrl)
+                .apply(loadTransform(context, R.drawable.tuicalling_ic_avatar, radius))
+                .into(targetImageSize, targetImageSize)
+                .get();
+    }
+
+    public static void loadGifImage(Context context, ImageView imageView, @RawRes @DrawableRes int resourceId) {
+        Glide.with(context).asGif().load(resourceId).into(imageView);
+    }
+
+    private static RequestBuilder<Drawable> loadTransform(Context context, @DrawableRes int resId, int radius) {
+        return Glide.with(context).load(resId).placeholder(resId)
+                .apply(new RequestOptions().centerCrop().transform(new GlideRoundTransform(context, radius)));
+    }
+
+    public static class GlideRoundTransform extends BitmapTransformation {
+        private static float radius = 0f;
+
+        public GlideRoundTransform(Context context, int dp) {
+            radius = Resources.getSystem().getDisplayMetrics().density * dp;
+        }
+
+        @Override
+        protected Bitmap transform(BitmapPool pool, Bitmap toTransform, int outWidth, int outHeight) {
+            return roundCrop(pool, toTransform);
+        }
+
+        private static Bitmap roundCrop(BitmapPool pool, Bitmap source) {
+            if (source == null) {
+                return null;
+            }
+
+            Bitmap result = pool.get(source.getWidth(), source.getHeight(), Bitmap.Config.ARGB_8888);
+            if (result == null) {
+                result = Bitmap.createBitmap(source.getWidth(), source.getHeight(), Bitmap.Config.ARGB_8888);
+            }
+
+            Canvas canvas = new Canvas(result);
+            Paint paint = new Paint();
+            paint.setShader(new BitmapShader(source, BitmapShader.TileMode.CLAMP, BitmapShader.TileMode.CLAMP));
+            paint.setAntiAlias(true);
+            RectF rectF = new RectF(0f, 0f, source.getWidth(), source.getHeight());
+            canvas.drawRoundRect(rectF, radius, radius, paint);
+            return result;
+        }
+
+        @Override
+        public void updateDiskCacheKey(MessageDigest messageDigest) {
+
+        }
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/PermissionRequest.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/PermissionRequest.java
new file mode 100644
index 0000000..9ad0f67
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/PermissionRequest.java
@@ -0,0 +1,119 @@
+package com.tencent.qcloud.tuikit.tuicallkit.utils;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.net.Uri;
+import android.os.Build;
+import android.provider.Settings;
+import android.text.TextUtils;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.permission.PermissionCallback;
+import com.tencent.qcloud.tuicore.permission.PermissionRequester;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine;
+import com.tencent.qcloud.tuikit.tuicallengine.utils.BrandUtils;
+import com.tencent.qcloud.tuikit.tuicallengine.utils.PermissionUtils;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PermissionRequest {
+
+    public static void requestPermissions(Context context, TUICallDefine.MediaType type, PermissionCallback callback) {
+        StringBuilder title = new StringBuilder().append(context.getString(R.string.tuicalling_permission_microphone));
+        StringBuilder reason = new StringBuilder();
+        String microphonePermissionsDescription = (String) TUICore.createObject(
+                TUIConstants.Privacy.PermissionsFactory.FACTORY_NAME,
+                TUIConstants.Privacy.PermissionsFactory.PermissionsName.MICROPHONE_PERMISSIONS, null);
+        if (!TextUtils.isEmpty(microphonePermissionsDescription)) {
+            reason.append(microphonePermissionsDescription);
+        } else {
+            reason.append(context.getString(R.string.tuicalling_permission_mic_reason));
+        }
+        List<String> permissionList = new ArrayList<>();
+        permissionList.add(Manifest.permission.RECORD_AUDIO);
+
+        if (TUICallDefine.MediaType.Video.equals(type)) {
+            title.append(context.getString(R.string.tuicalling_permission_separator));
+            title.append(context.getString(R.string.tuicalling_permission_camera));
+            String cameraPermissionsDescription = (String) TUICore.createObject(
+                    TUIConstants.Privacy.PermissionsFactory.FACTORY_NAME,
+                    TUIConstants.Privacy.PermissionsFactory.PermissionsName.CAMERA_PERMISSIONS, null);
+            if (!TextUtils.isEmpty(cameraPermissionsDescription)) {
+                reason.append(cameraPermissionsDescription);
+            } else {
+                reason.append(context.getString(R.string.tuicalling_permission_camera_reason));
+            }
+            permissionList.add(Manifest.permission.CAMERA);
+        }
+        //Android S(31) need apply for this permission,refer to:https://developer.android.com/about/versions/12/features/bluetooth-permissions?hl=zh-cn
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            title.append(context.getString(R.string.tuicalling_permission_separator));
+            title.append(context.getString(R.string.tuicalling_permission_bluetooth));
+            reason.append(context.getString(R.string.tuicalling_permission_bluetooth_reason));
+            permissionList.add(Manifest.permission.BLUETOOTH_CONNECT);
+        }
+
+        ApplicationInfo applicationInfo = context.getApplicationInfo();
+        String appName = context.getPackageManager().getApplicationLabel(applicationInfo).toString();
+
+        String[] permissions = permissionList.toArray(new String[0]);
+        PermissionRequester.newInstance(permissions)
+                .title(context.getString(R.string.tuicalling_permission_title, appName, title))
+                .description(reason.toString())
+                .settingsTip(context.getString(R.string.tuicalling_permission_tips, title) + "\n" + reason.toString())
+                .callback(callback)
+                .request();
+    }
+
+    public static void requestFloatPermission(Context context) {
+        if (PermissionUtils.hasPermission(context)) {
+            return;
+        }
+        startCommonSettings(context);
+    }
+
+    private static void startCommonSettings(Context context) {
+        try {
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+                Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
+                intent.setData(Uri.parse("package:" + context.getPackageName()));
+                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                context.startActivity(intent);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static void requestVivoFloatPermission(Context context) {
+        Intent intent = new Intent();
+        String model = BrandUtils.getModel();
+        boolean isVivoY85 = false;
+        if (!TextUtils.isEmpty(model)) {
+            isVivoY85 = model.contains("Y85") && !model.contains("Y85A");
+        }
+
+        if (!TextUtils.isEmpty(model) && (isVivoY85 || model.contains("vivo Y53L"))) {
+            intent.setClassName("com.vivo.permissionmanager",
+                    "com.vivo.permissionmanager.activity.PurviewTabActivity");
+            intent.putExtra("tabId", "1");
+        } else {
+            intent.setClassName("com.vivo.permissionmanager",
+                    "com.vivo.permissionmanager.activity.SoftPermissionDetailActivity");
+            intent.setAction("secure.intent.action.softPermissionDetail");
+        }
+
+        intent.putExtra("packagename", context.getPackageName());
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        try {
+            context.startActivity(intent);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/UserInfoUtils.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/UserInfoUtils.java
new file mode 100644
index 0000000..d9ff2ab
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/UserInfoUtils.java
@@ -0,0 +1,112 @@
+package com.tencent.qcloud.tuikit.tuicallkit.utils;
+
+import android.text.TextUtils;
+
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMUserFullInfo;
+import com.tencent.imsdk.v2.V2TIMValueCallback;
+import com.tencent.qcloud.tuikit.tuicallengine.impl.base.TUILog;
+import com.tencent.qcloud.tuikit.tuicallkit.base.CallingUserModel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class UserInfoUtils {
+    private static final String TAG                  = "UserInfoUtils";
+    private static final String ERROR_MSG_EMPTY_LIST = "userList is empty";
+
+    public UserInfoUtils() {
+    }
+
+    public void getUserInfo(String userId, final UserCallback callback) {
+        if (TextUtils.isEmpty(userId)) {
+            TUILog.e(TAG, "getUserInfo, userId is empty.");
+            if (callback != null) {
+                callback.onFailed(-1, ERROR_MSG_EMPTY_LIST);
+            }
+            return;
+        }
+
+        List<String> list = new ArrayList<>();
+        list.add(userId);
+        internalGetUserInfo(list, callback);
+    }
+
+    public void getUserInfo(List<CallingUserModel> userIdList, final UserCallback callback) {
+        if (null == userIdList || userIdList.isEmpty()) {
+            TUILog.e(TAG, "getUserInfo, userIdList is empty.");
+            if (callback != null) {
+                callback.onFailed(-1, ERROR_MSG_EMPTY_LIST);
+            }
+            return;
+        }
+
+        List<String> list = new ArrayList<>();
+        for (CallingUserModel model : userIdList) {
+            if (null != model && !TextUtils.isEmpty(model.userId)) {
+                list.add(model.userId);
+            }
+        }
+        internalGetUserInfo(list, callback);
+    }
+
+    private void internalGetUserInfo(List<String> userList, UserCallback callback) {
+        if (null == userList || userList.isEmpty()) {
+            TUILog.e(TAG, "internalGetUserInfo, userIdList is empty.");
+            if (callback != null) {
+                callback.onFailed(-1, ERROR_MSG_EMPTY_LIST);
+            }
+            return;
+        }
+
+        V2TIMManager.getInstance().getUsersInfo(userList, new V2TIMValueCallback<List<V2TIMUserFullInfo>>() {
+            @Override
+            public void onError(int errorCode, String errorMsg) {
+                TUILog.e(TAG, "internalGetUserInfo fail, errorCode: " + errorCode + ", errorMsg: " + errorMsg);
+                if (callback != null) {
+                    callback.onFailed(errorCode, errorMsg);
+                }
+            }
+
+            @Override
+            public void onSuccess(List<V2TIMUserFullInfo> userFullInfoList) {
+                if (null == userFullInfoList || userFullInfoList.isEmpty()) {
+                    TUILog.e(TAG, "internalGetUserInfo result is empty");
+                    if (null != callback) {
+                        callback.onFailed(-1, ERROR_MSG_EMPTY_LIST);
+                    }
+                    return;
+                }
+
+                List<CallingUserModel> list = new ArrayList<>();
+                for (int i = 0; i < userFullInfoList.size(); i++) {
+                    CallingUserModel model = new CallingUserModel();
+                    model.userName = userFullInfoList.get(i).getNickName();
+                    model.userId = userFullInfoList.get(i).getUserID();
+                    model.userAvatar = userFullInfoList.get(i).getFaceUrl();
+
+                    if (!isUrl(model.userAvatar)) {
+                        model.userAvatar = "";
+                    }
+
+                    model.userName = TextUtils.isEmpty(model.userName) ? model.userId : model.userName;
+                    TUILog.i(TAG, "internalGetUserInfo, model: " + model);
+                    list.add(model);
+                }
+                if (callback != null) {
+                    callback.onSuccess(list);
+                }
+            }
+        });
+    }
+
+    private boolean isUrl(String url) {
+        return !TextUtils.isEmpty(url) && (url.startsWith("http://") || url.startsWith("https://"));
+    }
+
+    public interface UserCallback {
+        void onSuccess(List<CallingUserModel> list);
+
+        void onFailed(int errorCode, String errorMsg);
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/TUICallingViewManager.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/TUICallingViewManager.java
new file mode 100644
index 0000000..8f27483
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/TUICallingViewManager.java
@@ -0,0 +1,898 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.interfaces.ITUINotification;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.TUICommonDefine;
+import com.tencent.qcloud.tuikit.TUIVideoView;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine.MediaType;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine.Role;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine.Scene;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine.Status;
+import com.tencent.qcloud.tuikit.tuicallengine.impl.base.TUILog;
+import com.tencent.qcloud.tuikit.tuicallengine.utils.PermissionUtils;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.base.BaseCallActivity;
+import com.tencent.qcloud.tuikit.tuicallkit.base.CallingUserModel;
+import com.tencent.qcloud.tuikit.tuicallkit.base.Constants;
+import com.tencent.qcloud.tuikit.tuicallkit.base.TUICallingAction;
+import com.tencent.qcloud.tuikit.tuicallkit.base.TUICallingStatusManager;
+import com.tencent.qcloud.tuikit.tuicallkit.base.UserLayout;
+import com.tencent.qcloud.tuikit.tuicallkit.base.UserLayoutEntity;
+import com.tencent.qcloud.tuikit.tuicallkit.extensions.inviteuser.SelectGroupMemberActivity;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.ImageLoader;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.PermissionRequest;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.UserInfoUtils;
+import com.tencent.qcloud.tuikit.tuicallkit.view.common.RoundCornerImageView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.component.BaseUserView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.component.TUICallingSingleVideoUserView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.component.TUICallingUserView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.floatwindow.FloatCallView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.floatwindow.FloatWindowService;
+import com.tencent.qcloud.tuikit.tuicallkit.view.floatwindow.HomeWatcher;
+import com.tencent.qcloud.tuikit.tuicallkit.view.function.BaseFunctionView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.function.TUICallingAudioFunctionView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.function.TUICallingSwitchAudioView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.function.TUICallingVideoFunctionView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.function.TUICallingVideoInviteFunctionView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.function.TUICallingWaitFunctionView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.root.BaseCallView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.root.TUICallingGroupView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.root.TUICallingImageView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.root.TUICallingSingleView;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class TUICallingViewManager implements ITUINotification {
+    private static final String TAG = "TUICallingViewManager";
+
+    private final Context           mContext;
+    private final Handler           mMainHandler = new Handler(Looper.getMainLooper());
+    private final UserLayoutFactory mUserLayoutFactory;
+    private final TUICallingAction  mCallingAction;
+
+    private CallingUserModel       mSelfUserModel;
+    private List<CallingUserModel> mInviteeList     = new ArrayList<>();
+    private CallingUserModel       mInviter;
+    private boolean                mEnableFloatView = false;
+
+    private BaseCallView     mBaseCallView;
+    private BaseFunctionView mFunctionView;
+    private BaseUserView     mUserView;
+    private ImageView        mImageFloatFunction;
+    private FloatCallView    mFloatCallView;
+    private LinearLayout     mOtherUserLayout;
+    private HomeWatcher      mHomeWatcher;
+    private UserInfoUtils    mUserInfoUtils;
+
+    public TUICallingViewManager(Context context) {
+        mContext = context.getApplicationContext();
+        mUserLayoutFactory = new UserLayoutFactory(mContext);
+        mCallingAction = new TUICallingAction(context);
+        mUserInfoUtils = new UserInfoUtils();
+        registerCallingEvent();
+    }
+
+    private void registerCallingEvent() {
+        TUICore.registerEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_CAMERA_OPEN, this);
+        TUICore.registerEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_MIC_STATUS_CHANGED, this);
+
+        TUICore.registerEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_CALL_STATUS_CHANGED, this);
+        TUICore.registerEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_CALL_TYPE_CHANGED, this);
+        TUICore.registerEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_GROUP_MEMBER_SELECTED, this);
+    }
+
+    public void createCallingView(List<CallingUserModel> inviteeList, CallingUserModel inviter) {
+        mInviter = inviter;
+        mInviteeList = inviteeList;
+        initHomeWatcher();
+        TUILog.i(TAG, "createCallingView mInviter: " + mInviter + " ,mInviteeList: " + mInviteeList);
+
+        if (Scene.SINGLE_CALL.equals(TUICallingStatusManager.sharedInstance(mContext).getCallScene())) {
+            initSingleWaitingView();
+        } else {
+            initGroupWaitingView();
+        }
+    }
+
+    //JoinInGroupCall
+    public void createGroupCallingAcceptView() {
+        initSelfModel();
+        mUserLayoutFactory.allocUserLayout(mSelfUserModel);
+        initGroupAcceptCallView();
+    }
+
+    public void updateCallingUserView(List<CallingUserModel> inviteeList, CallingUserModel inviter) {
+        mInviter = inviter;
+        mInviteeList = inviteeList;
+
+        CallingUserModel userModel;
+        if (TUICallDefine.Role.Caller.equals(TUICallingStatusManager.sharedInstance(mContext).getCallRole())) {
+            userModel = inviteeList.get(0);
+            for (CallingUserModel model : inviteeList) {
+                reloadUserModel(model);
+            }
+        } else {
+            userModel = inviter;
+            reloadUserModel(inviter);
+        }
+
+        if (null != mUserView) {
+            mUserView.updateUserInfo(userModel);
+        }
+        initOtherInviteeView();
+    }
+
+    public void showCallingView() {
+        TUILog.i(TAG, "showCallingView: mBaseCallView: " + mBaseCallView);
+        BaseCallActivity.updateBaseView(mBaseCallView);
+        Intent intent = new Intent(mContext, BaseCallActivity.class);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        mContext.startActivity(intent);
+    }
+
+    public void closeCallingView() {
+        if (null != mBaseCallView) {
+            mBaseCallView.finish();
+        }
+        mBaseCallView = null;
+        BaseCallActivity.finishActivity();
+        SelectGroupMemberActivity.finishActivity();
+
+        mSelfUserModel = null;
+        mInviteeList.clear();
+        mInviter = new CallingUserModel();
+
+        TUICallingStatusManager.sharedInstance(mContext).clear();
+
+        mFunctionView = null;
+        mFloatCallView = null;
+        mUserView = null;
+        mImageFloatFunction = null;
+        mOtherUserLayout = null;
+
+        if (null != mHomeWatcher) {
+            mHomeWatcher.stopWatch();
+            mHomeWatcher = null;
+        }
+        FloatWindowService.stopService(mContext);
+    }
+
+    private void updateCallStatus(TUICallDefine.Status status) {
+        if (TUICallDefine.Status.None.equals(status)) {
+            closeCallingView();
+            return;
+        }
+        if (!TUICallDefine.Status.Accept.equals(status)) {
+            return;
+        }
+
+        if (null != mBaseCallView) {
+            if (Scene.SINGLE_CALL.equals(TUICallingStatusManager.sharedInstance(mContext).getCallScene())) {
+                initSingleAcceptCallView();
+            } else {
+                initGroupAcceptCallView();
+            }
+        }
+        if (null != mFloatCallView) {
+            updateFloatView(TUICallingStatusManager.sharedInstance(mContext).getCallStatus());
+        }
+    }
+
+    private void updateCallType(TUICallDefine.MediaType type) {
+        if (TUICallDefine.MediaType.Unknown.equals(type)) {
+            return;
+        }
+
+        if (mBaseCallView == null) {
+            return;
+        }
+        mBaseCallView.finish();
+        mBaseCallView = null;
+
+        if (TUICallDefine.Status.Waiting.equals(TUICallingStatusManager.sharedInstance(mContext).getCallStatus())) {
+            initSingleWaitingView();
+        } else {
+            initAudioPlayDevice();
+            initSingleAcceptCallView();
+        }
+
+        if (null != mFloatCallView) {
+            updateFloatView(TUICallingStatusManager.sharedInstance(mContext).getCallStatus());
+        }
+    }
+
+    public void userCallingTimeStr(String time) {
+        if (null == mBaseCallView) {
+            return;
+        }
+        mMainHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                if (null != mFloatCallView) {
+                    mFloatCallView.updateCallTimeView(time);
+                }
+
+                if (null != mBaseCallView) {
+                    mBaseCallView.updateCallTimeView(time);
+                }
+            }
+        });
+    }
+
+    public void userEnter(CallingUserModel userModel) {
+        if (null == userModel || TextUtils.isEmpty(userModel.userId)) {
+            return;
+        }
+        userModel.isEnter = true;
+        if (!mInviteeList.contains(userModel)) {
+            mInviteeList.add(userModel);
+        }
+        if (null != mBaseCallView) {
+            mBaseCallView.userEnter(userModel);
+        }
+        if (TextUtils.isEmpty(userModel.userName) || TextUtils.isEmpty(userModel.userAvatar)) {
+            loadUserInfo(userModel);
+        }
+    }
+
+    public void userLeave(CallingUserModel userModel) {
+        if (userModel == null || TextUtils.isEmpty(userModel.userId)) {
+            return;
+        }
+        if (mInviter != null && userModel.userId.equals(mInviter.userId)) {
+            mInviter = new CallingUserModel();
+        }
+        mInviteeList.remove(userModel);
+        initOtherInviteeView();
+
+        if (null != mBaseCallView) {
+            mBaseCallView.userLeave(userModel);
+        }
+    }
+
+    public void updateUser(CallingUserModel userModel) {
+        if (null == userModel || TextUtils.isEmpty(userModel.userId)) {
+            return;
+        }
+
+        initSelfModel();
+        if (mSelfUserModel != null && userModel.userId.equals(mSelfUserModel.userId)) {
+            userModel.isVideoAvailable = mSelfUserModel.isVideoAvailable;
+            userModel.isAudioAvailable = mSelfUserModel.isAudioAvailable;
+        }
+
+        if (null != mBaseCallView) {
+            mBaseCallView.updateUserInfo(userModel);
+        }
+
+        if (mFloatCallView != null) {
+            CallingUserModel model = findCallingUserModel(mFloatCallView.getCurrentUser());
+            if (model != null && userModel.userId.equals(model.userId)) {
+                updateFloatView(TUICallingStatusManager.sharedInstance(mContext).getCallStatus());
+            }
+            return;
+        }
+
+        UserLayout layout = mUserLayoutFactory.findUserLayout(userModel.userId);
+        if (null != layout) {
+            layout.setAudioVolume(userModel.volume, userModel.isAudioAvailable);
+        }
+    }
+
+    public void enableFloatWindow(boolean enable) {
+        mEnableFloatView = enable;
+    }
+
+    private void initSingleWaitingView() {
+        initSelfModel();
+        initAudioPlayDevice();
+        if (TUICallDefine.MediaType.Video.equals(TUICallingStatusManager.sharedInstance(mContext).getMediaType())) {
+            initSingleVideoWaitingView();
+        } else {
+            initSingleAudioWaitingView();
+        }
+    }
+
+    private void initSingleAudioWaitingView() {
+        mBaseCallView = new TUICallingImageView(mContext);
+        String hint;
+        TUICallDefine.Role callRole = TUICallingStatusManager.sharedInstance(mContext).getCallRole();
+
+        if (TUICallDefine.Role.Caller.equals(callRole)) {
+            hint = mContext.getString(R.string.tuicalling_waiting_accept);
+            mFunctionView = new TUICallingAudioFunctionView(mContext);
+        } else {
+            hint = mContext.getString(R.string.tuicalling_invite_audio_call);
+            mFunctionView = new TUICallingWaitFunctionView(mContext);
+        }
+
+        mUserView = new TUICallingUserView(mContext);
+        if (TUICallDefine.Role.Caller.equals(callRole) && !mInviteeList.isEmpty()) {
+            mUserView.updateUserInfo(mInviteeList.get(0));
+        } else {
+            mUserView.updateUserInfo(mInviter);
+        }
+        mBaseCallView.updateUserView(mUserView);
+
+        mBaseCallView.updateCallingHint(hint);
+        mBaseCallView.updateFunctionView(mFunctionView);
+
+        updateViewColor();
+        initFloatingWindowBtn();
+        BaseCallActivity.updateBaseView(mBaseCallView);
+    }
+
+    private void initSingleVideoWaitingView() {
+        mUserLayoutFactory.allocUserLayout(mSelfUserModel);
+        mBaseCallView = new TUICallingSingleView(mContext, mUserLayoutFactory);
+        String hint = "";
+        if (TUICallDefine.Role.Caller.equals(TUICallingStatusManager.sharedInstance(mContext).getCallRole())) {
+            hint = mContext.getString(R.string.tuicalling_waiting_accept);
+            mFunctionView = new TUICallingVideoInviteFunctionView(mContext);
+        } else {
+            hint = mContext.getString(R.string.tuicalling_invite_video_call);
+            mFunctionView = new TUICallingWaitFunctionView(mContext);
+        }
+
+        mUserView = new TUICallingSingleVideoUserView(mContext, hint);
+        mBaseCallView.updateUserView(mUserView);
+
+        mBaseCallView.updateSwitchAudioView(new TUICallingSwitchAudioView(mContext));
+
+        mFunctionView.setLocalUserLayout(mUserLayoutFactory.findUserLayout(TUILogin.getLoginUser()));
+        mBaseCallView.updateFunctionView(mFunctionView);
+
+        updateViewColor();
+        initFloatingWindowBtn();
+        BaseCallActivity.updateBaseView(mBaseCallView);
+    }
+
+    private void initGroupWaitingView() {
+        initSelfModel();
+        initAudioPlayDevice();
+
+        TUICallDefine.MediaType mediaType = TUICallingStatusManager.sharedInstance(mContext).getMediaType();
+        String hint;
+        if (TUICallDefine.Role.Caller.equals(TUICallingStatusManager.sharedInstance(mContext).getCallRole())) {
+            mUserLayoutFactory.allocUserLayout(mSelfUserModel);
+            for (CallingUserModel model : mInviteeList) {
+                if (null != model && !TextUtils.isEmpty(model.userId)) {
+                    mUserLayoutFactory.allocUserLayout(model);
+                }
+            }
+            mBaseCallView = new TUICallingGroupView(mContext, mUserLayoutFactory);
+            hint = mContext.getString(R.string.tuicalling_waiting_accept);
+            mFunctionView = (TUICallDefine.MediaType.Video.equals(mediaType))
+                    ? new TUICallingVideoFunctionView(mContext) :
+                    new TUICallingAudioFunctionView(mContext);
+            initInviteUserFunction();
+        } else {
+            mBaseCallView = new TUICallingImageView(mContext);
+            mUserView = new TUICallingUserView(mContext);
+            mFunctionView = new TUICallingWaitFunctionView(mContext);
+            hint = TUICallDefine.MediaType.Audio.equals(mediaType)
+                    ? mContext.getString(R.string.tuicalling_invite_audio_call) :
+                    mContext.getString(R.string.tuicalling_invite_video_call);
+
+            mBaseCallView.updateUserView(mUserView);
+            mBaseCallView.addOtherUserView(initOtherInviteeView());
+        }
+        mFunctionView.setLocalUserLayout(mUserLayoutFactory.findUserLayout(TUILogin.getLoginUser()));
+
+        mBaseCallView.updateCallingHint(hint);
+        mBaseCallView.updateFunctionView(mFunctionView);
+
+        updateViewColor();
+        updateFunctionStatus();
+        initFloatingWindowBtn();
+    }
+
+    private void initSingleAcceptCallView() {
+        if (TUICallDefine.MediaType.Audio.equals(TUICallingStatusManager.sharedInstance(mContext).getMediaType())) {
+            initSingleAudioAcceptCallView();
+        } else {
+            initSingleVideoAcceptCallView();
+        }
+    }
+
+    private void initSingleAudioAcceptCallView() {
+        if (mBaseCallView != null) {
+            mBaseCallView.finish();
+            mBaseCallView = null;
+        }
+        mBaseCallView = new TUICallingImageView(mContext);
+        mFunctionView = new TUICallingAudioFunctionView(mContext);
+        mUserView = new TUICallingUserView(mContext);
+        TUICallDefine.Role role = TUICallingStatusManager.sharedInstance(mContext).getCallRole();
+        if (TUICallDefine.Role.Caller.equals(role) && !mInviteeList.isEmpty()) {
+            mUserView.updateUserInfo(mInviteeList.get(0));
+        } else {
+            mUserView.updateUserInfo(mInviter);
+        }
+
+        mBaseCallView.updateFunctionView(mFunctionView);
+        mBaseCallView.updateUserView(mUserView);
+        mBaseCallView.updateCallingHint("");
+
+        updateViewColor();
+        updateFunctionStatus();
+        initFloatingWindowBtn();
+        BaseCallActivity.updateBaseView(mBaseCallView);
+    }
+
+    private void initSingleVideoAcceptCallView() {
+        if (null == mBaseCallView) {
+            mBaseCallView = new TUICallingSingleView(mContext, mUserLayoutFactory);
+            mBaseCallView.updateSwitchAudioView(new TUICallingSwitchAudioView(mContext));
+        }
+        mFunctionView = new TUICallingVideoFunctionView(mContext);
+        mFunctionView.setLocalUserLayout(mUserLayoutFactory.findUserLayout(TUILogin.getLoginUser()));
+
+        mBaseCallView.updateUserView(null);
+        mBaseCallView.updateFunctionView(mFunctionView);
+
+        updateViewColor();
+        updateFunctionStatus();
+        initFloatingWindowBtn();
+        BaseCallActivity.updateBaseView(mBaseCallView);
+    }
+
+    private void initGroupAcceptCallView() {
+        TUICallDefine.MediaType mediaType = TUICallingStatusManager.sharedInstance(mContext).getMediaType();
+
+        if (TUICallDefine.Role.Caller.equals(TUICallingStatusManager.sharedInstance(mContext).getCallRole())) {
+            if (null == mBaseCallView) {
+                mBaseCallView = new TUICallingGroupView(mContext, mUserLayoutFactory);
+            }
+            if (TUICallDefine.MediaType.Video.equals(mediaType)) {
+                mFunctionView = new TUICallingVideoFunctionView(mContext);
+                mBaseCallView.updateFunctionView(mFunctionView);
+            }
+        } else {
+            if (null != mBaseCallView) {
+                mBaseCallView.finish();
+            }
+
+            mUserLayoutFactory.allocUserLayout(mInviter);
+            for (CallingUserModel model : mInviteeList) {
+                if (null != model && !TextUtils.isEmpty(model.userId)) {
+                    mUserLayoutFactory.allocUserLayout(model);
+                }
+            }
+            mBaseCallView = new TUICallingGroupView(mContext, mUserLayoutFactory);
+            mFunctionView = (TUICallDefine.MediaType.Video.equals(mediaType))
+                    ? new TUICallingVideoFunctionView(mContext)
+                    : new TUICallingAudioFunctionView(mContext);
+            mBaseCallView.updateFunctionView(mFunctionView);
+        }
+        mFunctionView.setLocalUserLayout(mUserLayoutFactory.findUserLayout(TUILogin.getLoginUser()));
+        mBaseCallView.updateCallingHint("");
+
+        updateViewColor();
+        updateFunctionStatus();
+        initInviteUserFunction();
+        initFloatingWindowBtn();
+        BaseCallActivity.updateBaseView(mBaseCallView);
+    }
+
+    private View initOtherInviteeView() {
+        if (mOtherUserLayout == null) {
+            mOtherUserLayout = new LinearLayout(mContext);
+        } else {
+            mOtherUserLayout.removeAllViews();
+        }
+
+        List<CallingUserModel> otherInviteeList = mInviteeList;
+
+        int squareWidth = mContext.getResources().getDimensionPixelOffset(R.dimen.tuicalling_small_image_size);
+        int leftMargin = mContext.getResources().getDimensionPixelOffset(R.dimen.tuicalling_small_image_left_margin);
+
+        for (int index = 0; index < otherInviteeList.size(); index++) {
+            final CallingUserModel model = otherInviteeList.get(index);
+            final ImageView imageView = new ImageView(mContext);
+            LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(squareWidth, squareWidth);
+            if (index != 0) {
+                layoutParams.leftMargin = leftMargin;
+            }
+            imageView.setLayoutParams(layoutParams);
+            ImageLoader.loadImage(mContext, imageView, model.userAvatar, R.drawable.tuicalling_ic_avatar);
+            mOtherUserLayout.addView(imageView);
+        }
+        return mOtherUserLayout;
+    }
+
+    private void updateViewColor() {
+        TUICallDefine.MediaType mediaType = TUICallingStatusManager.sharedInstance(mContext).getMediaType();
+        int backgroundColor = TUICallDefine.MediaType.Video.equals(mediaType)
+                ? mContext.getResources().getColor(R.color.tuicalling_color_video_background)
+                : mContext.getResources().getColor(R.color.tuicalling_color_audio_background);
+
+        int textColor = TUICallDefine.MediaType.Video.equals(mediaType)
+                ? mContext.getResources().getColor(R.color.tuicalling_color_white)
+                : mContext.getResources().getColor(R.color.tuicalling_color_black);
+
+        if (null != mBaseCallView) {
+            mBaseCallView.updateBackgroundColor(backgroundColor);
+            mBaseCallView.updateTextColor(textColor);
+        }
+
+        if (null != mUserView) {
+            mUserView.updateTextColor(textColor);
+        }
+        if (null != mFunctionView) {
+            mFunctionView.updateTextColor(textColor);
+        }
+    }
+
+    private void updateFunctionStatus() {
+        TUICallingStatusManager statusManager = TUICallingStatusManager.sharedInstance(mContext);
+        statusManager.updateCameraOpenStatus(statusManager.isCameraOpen(), statusManager.getFrontCamera());
+        mCallingAction.selectAudioPlaybackDevice(statusManager.getAudioPlaybackDevice());
+        if (statusManager.isMicMute()) {
+            mCallingAction.closeMicrophone();
+        } else {
+            mCallingAction.openMicrophone(null);
+        }
+    }
+
+    private void initAudioPlayDevice() {
+        TUICallDefine.MediaType mediaType = TUICallingStatusManager.sharedInstance(mContext).getMediaType();
+        TUICommonDefine.AudioPlaybackDevice device = TUICallDefine.MediaType.Audio.equals(mediaType)
+                ? TUICommonDefine.AudioPlaybackDevice.Earpiece : TUICommonDefine.AudioPlaybackDevice.Speakerphone;
+        TUICallingStatusManager.sharedInstance(mContext).updateAudioPlaybackDevice(device);
+    }
+
+    private void initSelfModel() {
+        if (mSelfUserModel != null) {
+            return;
+        }
+        mSelfUserModel = new CallingUserModel();
+        mSelfUserModel.userId = TUILogin.getLoginUser();
+        mSelfUserModel.userAvatar = TUILogin.getFaceUrl();
+        mSelfUserModel.userName = TUILogin.getNickName();
+    }
+
+    private void reloadUserModel(CallingUserModel model) {
+        if (model == null || TextUtils.isEmpty(model.userId)) {
+            return;
+        }
+        UserLayout layout = mUserLayoutFactory.findUserLayout(model.userId);
+        if (null != layout) {
+            layout.setUserName(model.userName);
+            ImageLoader.loadImage(mContext, layout.getAvatarImage(), model.userAvatar, R.drawable.tuicalling_ic_avatar);
+        }
+    }
+
+    private void initFloatingWindowBtn() {
+        if (mBaseCallView == null) {
+            return;
+        }
+
+        if (mEnableFloatView) {
+            mImageFloatFunction = new ImageView(mContext);
+            TUICallDefine.MediaType mediaType = TUICallingStatusManager.sharedInstance(mContext).getMediaType();
+            int resId = TUICallDefine.MediaType.Video.equals(mediaType)
+                    ? R.drawable.tuicalling_ic_move_back_white : R.drawable.tuicalling_ic_move_back_black;
+            mImageFloatFunction.setBackgroundResource(resId);
+            ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.MATCH_PARENT);
+            mImageFloatFunction.setLayoutParams(lp);
+            mImageFloatFunction.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    startFloatService();
+                }
+            });
+        }
+
+        if (mImageFloatFunction != null && mImageFloatFunction.getParent() != null) {
+            ((ViewGroup) mImageFloatFunction.getParent()).removeView(mImageFloatFunction);
+        }
+        mBaseCallView.enableFloatView(mImageFloatFunction);
+    }
+
+    private void startFloatService() {
+        if (!mEnableFloatView) {
+            return;
+        }
+
+        if (null != mFloatCallView) {
+            return;
+        }
+        if (PermissionUtils.hasPermission(mContext)) {
+            mFloatCallView = createFloatView();
+            updateFloatView(TUICallingStatusManager.sharedInstance(mContext).getCallStatus());
+            FloatWindowService.startFloatService(mContext, mFloatCallView);
+            BaseCallActivity.finishActivity();
+        } else {
+            PermissionRequest.requestFloatPermission(mContext);
+        }
+    }
+
+    private FloatCallView createFloatView() {
+        FloatCallView floatView = new FloatCallView(mContext, mUserLayoutFactory);
+        floatView.setOnClickListener(new FloatCallView.OnClickListener() {
+            @Override
+            public void onClick() {
+                FloatWindowService.stopService(mContext);
+                mFloatCallView = null;
+                mImageFloatFunction = null;
+
+                MediaType mediaType = TUICallingStatusManager.sharedInstance(mContext).getMediaType();
+                Scene callScene = TUICallingStatusManager.sharedInstance(mContext).getCallScene();
+                if (MediaType.Video.equals(mediaType) && Scene.SINGLE_CALL.equals(callScene)) {
+
+                    Role callRole = TUICallingStatusManager.sharedInstance(mContext).getCallRole();
+                    CallingUserModel model = (Role.Called.equals(callRole)) ? mInviter : mInviteeList.get(0);
+                    Status status = TUICallingStatusManager.sharedInstance(mContext).getCallStatus();
+
+                    if (Status.Accept.equals(status)) {
+                        resetVideoCloudView(mSelfUserModel);
+                        resetVideoCloudView(model);
+                    } else {
+                        resetVideoCloudView(mSelfUserModel);
+                    }
+                }
+                showCallingView();
+            }
+        });
+        return floatView;
+    }
+
+    private void resetVideoCloudView(CallingUserModel model) {
+        UserLayout userLayout = mUserLayoutFactory.findUserLayout(model.userId);
+        if (null == userLayout) {
+            userLayout = mUserLayoutFactory.allocUserLayout(model);
+        }
+
+        TUIVideoView videoView = userLayout.getVideoView();
+        if (videoView != null) {
+            if (null != videoView.getParent()) {
+                ((ViewGroup) videoView.getParent()).removeView(videoView);
+            }
+            userLayout.addVideoView(videoView);
+        }
+    }
+
+    private void updateFloatView(TUICallDefine.Status status) {
+        if (null == mFloatCallView) {
+            return;
+        }
+        TUICallDefine.MediaType type = TUICallingStatusManager.sharedInstance(mContext).getMediaType();
+        Scene scene = TUICallingStatusManager.sharedInstance(mContext).getCallScene();
+
+        if (TUICallDefine.MediaType.Video.equals(type) && Scene.SINGLE_CALL.equals(scene)) {
+            mFloatCallView.enableCallingHint(false);
+            String userId;
+            if (TUICallDefine.Status.Waiting.equals(status)) {
+                userId = TUILogin.getLoginUser();
+            } else {
+                TUICallDefine.Role callRole = TUICallingStatusManager.sharedInstance(mContext).getCallRole();
+                userId = (TUICallDefine.Role.Caller.equals(callRole)) ? mInviteeList.get(0).userId : mInviter.userId;
+            }
+            mFloatCallView.updateView(true, userId);
+        } else {
+            mFloatCallView.enableCallingHint(TUICallDefine.Status.Waiting.equals(status));
+            mFloatCallView.updateView(false, null);
+        }
+    }
+
+    private void initHomeWatcher() {
+        if (null == mHomeWatcher) {
+            mHomeWatcher = new HomeWatcher(mContext);
+        }
+        mHomeWatcher.setOnHomePressedListener(new HomeWatcher.OnHomePressedListener() {
+            @Override
+            public void onHomePressed() {
+                if (PermissionUtils.hasPermission(mContext)) {
+                    startFloatService();
+                }
+            }
+
+            @Override
+            public void onRecentAppsPressed() {
+                if (PermissionUtils.hasPermission(mContext)) {
+                    startFloatService();
+                }
+            }
+        });
+        mHomeWatcher.startWatch();
+    }
+
+    private CallingUserModel findCallingUserModel(String userId) {
+        if (TextUtils.isEmpty(userId)) {
+            return null;
+        }
+        for (UserLayoutEntity entity : mUserLayoutFactory.mLayoutEntityList) {
+            if (entity != null && userId.equals(entity.userId)) {
+                return entity.userModel;
+            }
+        }
+        return null;
+    }
+
+    private void initInviteUserFunction() {
+        if (mBaseCallView == null) {
+            return;
+        }
+        Button inviteUserBtn = new Button(mContext);
+        TUICallDefine.MediaType mediaType = TUICallingStatusManager.sharedInstance(mContext).getMediaType();
+        int resId = TUICallDefine.MediaType.Video.equals(mediaType)
+                ? R.drawable.tuicalling_ic_add_user_white : R.drawable.tuicalling_ic_add_user_black;
+        inviteUserBtn.setBackgroundResource(resId);
+        inviteUserBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String groupId = TUICallingStatusManager.sharedInstance(mContext).getGroupId();
+                if (TextUtils.isEmpty(groupId)) {
+                    ToastUtil.toastShortMessage(mContext.getString(R.string.tuicalling_groupid_is_empty));
+                    return;
+                }
+
+                TUICallDefine.Status status = TUICallingStatusManager.sharedInstance(mContext).getCallStatus();
+                TUICallDefine.Role role = TUICallingStatusManager.sharedInstance(mContext).getCallRole();
+                if (TUICallDefine.Role.Called.equals(role) && !TUICallDefine.Status.Accept.equals(status)) {
+                    ToastUtil.toastShortMessage(mContext.getString(R.string.tuicalling_status_is_not_accept));
+                    return;
+                }
+
+                ArrayList<String> list = new ArrayList<>();
+                list.add(mInviter.userId);
+                for (CallingUserModel model : mInviteeList) {
+                    if (model != null && !TextUtils.isEmpty(model.userId) && !list.contains(model.userId)) {
+                        list.add(model.userId);
+                    }
+                }
+                if (!list.contains(TUILogin.getLoginUser())) {
+                    list.add(TUILogin.getLoginUser());
+                }
+
+                TUILog.i(TAG, "initInviteUserFunction, groupId: " + groupId + " ,list: " + list);
+
+                Bundle bundle = new Bundle();
+                bundle.putString(Constants.GROUP_ID, groupId);
+                bundle.putStringArrayList(Constants.SELECT_MEMBER_LIST, list);
+                TUICore.startActivity("SelectGroupMemberActivity", bundle);
+            }
+        });
+        mBaseCallView.enableAddUserView(inviteUserBtn);
+    }
+
+    private void inviteUsersToGroupCall(List<String> userIdList) {
+        if (userIdList == null || userIdList.isEmpty()) {
+            TUILog.e(TAG, "inviteUsersToGroupCall, userIdList is empty: " + userIdList);
+            return;
+        }
+
+        mCallingAction.inviteUser(userIdList, new TUICommonDefine.ValueCallback() {
+            @Override
+            public void onSuccess(Object data) {
+                if (!(data instanceof List)) {
+                    return;
+                }
+
+                List<String> list = (List<String>) data;
+
+                TUILog.i(TAG, "inviteUsersToGroupCall success, list:" + list);
+                for (String userId : list) {
+                    if (!TextUtils.isEmpty(userId)) {
+                        CallingUserModel userModel = new CallingUserModel();
+                        userModel.userId = userId;
+                        addUser(userModel);
+                    }
+                }
+            }
+
+            @Override
+            public void onError(int errCode, String errMsg) {
+            }
+        });
+    }
+
+    private void addUser(CallingUserModel userModel) {
+        if (!mInviteeList.contains(userModel)) {
+            mInviteeList.add(userModel);
+        }
+        if (null != mBaseCallView) {
+            mBaseCallView.userAdd(userModel);
+        }
+        loadUserInfo(userModel);
+    }
+
+    private void loadUserInfo(CallingUserModel model) {
+        UserLayout userLayout = mUserLayoutFactory.findUserLayout(model.userId);
+        if (userLayout == null) {
+            return;
+        }
+        mUserInfoUtils.getUserInfo(model.userId, new UserInfoUtils.UserCallback() {
+            @Override
+            public void onSuccess(List<CallingUserModel> list) {
+                if (list != null && !list.isEmpty()) {
+                    CallingUserModel tempModel = list.get(0);
+                    if (tempModel != null && model.userId.equals(tempModel.userId)) {
+                        model.userAvatar = tempModel.userAvatar;
+                        model.userName = tempModel.userName;
+                    }
+                }
+                userLayout.setUserName(model.userName);
+                userLayout.setVideoAvailable(model.isVideoAvailable);
+                ImageLoader.loadImage(mContext, userLayout.getAvatarImage(), model.userAvatar,
+                        R.drawable.tuicalling_ic_avatar);
+            }
+
+            @Override
+            public void onFailed(int errorCode, String errorMsg) {
+            }
+        });
+    }
+
+    @Override
+    public void onNotifyEvent(String key, String subKey, Map<String, Object> param) {
+        if (param == null) {
+            return;
+        }
+        if (Constants.EVENT_TUICALLING_CHANGED.equals(key)) {
+            switch (subKey) {
+                case Constants.EVENT_SUB_CAMERA_OPEN:
+                    if (mSelfUserModel == null) {
+                        break;
+                    }
+                    mSelfUserModel.isVideoAvailable = (boolean) param.get(Constants.OPEN_CAMERA);
+
+                    UserLayout selfLayout = mUserLayoutFactory.findUserLayout(mSelfUserModel.userId);
+                    if (selfLayout == null) {
+                        break;
+                    }
+                    selfLayout.setVideoAvailable(mSelfUserModel.isVideoAvailable);
+
+                    if (Scene.SINGLE_CALL.equals(TUICallingStatusManager.sharedInstance(mContext).getCallScene())) {
+                        RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(180, 180);
+                        lp.addRule(RelativeLayout.CENTER_IN_PARENT);
+                        ((RoundCornerImageView) selfLayout.getAvatarImage()).setRadius(15);
+                        selfLayout.getAvatarImage().setLayoutParams(lp);
+                    }
+                    ImageLoader.loadImage(mContext, selfLayout.getAvatarImage(), mSelfUserModel.userAvatar);
+                    break;
+                case Constants.EVENT_SUB_MIC_STATUS_CHANGED:
+                    if (mSelfUserModel != null) {
+                        mSelfUserModel.isAudioAvailable = ((Boolean) param.get(Constants.MUTE_MIC));
+                    }
+                    UserLayout layout = mUserLayoutFactory.findUserLayout(TUILogin.getLoginUser());
+                    if (null != layout) {
+                        layout.muteMic(mSelfUserModel.isAudioAvailable);
+                    }
+                    break;
+                case Constants.EVENT_SUB_CALL_STATUS_CHANGED:
+                    updateCallStatus((TUICallDefine.Status) param.get(Constants.CALL_STATUS));
+                    break;
+                case Constants.EVENT_SUB_CALL_TYPE_CHANGED:
+                    updateCallType((TUICallDefine.MediaType) param.get(Constants.CALL_MEDIA_TYPE));
+                    break;
+                case Constants.EVENT_SUB_GROUP_MEMBER_SELECTED:
+                    List<String> list = (List<String>) param.get(Constants.SELECT_MEMBER_LIST);
+                    inviteUsersToGroupCall(list);
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/UserLayoutFactory.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/UserLayoutFactory.java
new file mode 100644
index 0000000..21f06d6
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/UserLayoutFactory.java
@@ -0,0 +1,49 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.View;
+
+import com.tencent.qcloud.tuikit.tuicallkit.base.CallingUserModel;
+import com.tencent.qcloud.tuikit.tuicallkit.base.UserLayout;
+import com.tencent.qcloud.tuikit.tuicallkit.base.UserLayoutEntity;
+
+import java.util.LinkedList;
+
+public class UserLayoutFactory {
+    private Context                      mContext;
+    public  LinkedList<UserLayoutEntity> mLayoutEntityList = new LinkedList<>();
+
+    public UserLayoutFactory(Context context) {
+        mContext = context;
+    }
+
+    public UserLayout allocUserLayout(CallingUserModel model) {
+        if (null == model || TextUtils.isEmpty(model.userId)) {
+            return null;
+        }
+        UserLayout userLayout = findUserLayout(model.userId);
+        if (null != userLayout) {
+            return userLayout;
+        }
+        UserLayoutEntity layoutEntity = new UserLayoutEntity();
+        layoutEntity.userId = model.userId;
+        layoutEntity.userModel = model;
+        layoutEntity.layout = new UserLayout(mContext);
+        layoutEntity.layout.setVisibility(View.VISIBLE);
+        mLayoutEntityList.add(layoutEntity);
+        return layoutEntity.layout;
+    }
+
+    public UserLayout findUserLayout(String userId) {
+        if (TextUtils.isEmpty(userId)) {
+            return null;
+        }
+        for (UserLayoutEntity layoutEntity : mLayoutEntityList) {
+            if (userId.equals(layoutEntity.userId)) {
+                return layoutEntity.layout;
+            }
+        }
+        return null;
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/common/RoundCornerImageView.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/common/RoundCornerImageView.java
new file mode 100644
index 0000000..95dec5c
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/common/RoundCornerImageView.java
@@ -0,0 +1,132 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.common;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.PaintFlagsDrawFilter;
+import android.graphics.Path;
+import android.graphics.RectF;
+import android.util.AttributeSet;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatImageView;
+
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+
+public class RoundCornerImageView extends AppCompatImageView {
+    private final Path                 path        = new Path();
+    private final RectF                rectF       = new RectF();
+    private final PaintFlagsDrawFilter aliasFilter = new PaintFlagsDrawFilter(0,
+            Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);
+
+    private int radius;
+    private int leftTopRadius;
+    private int rightTopRadius;
+    private int rightBottomRadius;
+    private int leftBottomRadius;
+
+    public RoundCornerImageView(@NonNull Context context) {
+        super(context);
+        init(context, null);
+    }
+
+    public RoundCornerImageView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public RoundCornerImageView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    private void init(Context context, AttributeSet attrs) {
+        setLayerType(View.LAYER_TYPE_HARDWARE, null);
+        int defaultRadius = 0;
+        if (attrs != null) {
+            TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.RoundCornerImageView);
+            radius = array.getDimensionPixelOffset(R.styleable.RoundCornerImageView_corner_radius, defaultRadius);
+            leftTopRadius = array.getDimensionPixelOffset(R.styleable.RoundCornerImageView_left_top_radius,
+                    defaultRadius);
+            rightTopRadius = array.getDimensionPixelOffset(R.styleable.RoundCornerImageView_right_top_radius,
+                    defaultRadius);
+            rightBottomRadius = array.getDimensionPixelOffset(R.styleable.RoundCornerImageView_right_bottom_radius,
+                    defaultRadius);
+            leftBottomRadius = array.getDimensionPixelOffset(R.styleable.RoundCornerImageView_left_bottom_radius,
+                    defaultRadius);
+            array.recycle();
+        }
+
+        if (defaultRadius == leftTopRadius) {
+            leftTopRadius = radius;
+        }
+        if (defaultRadius == rightTopRadius) {
+            rightTopRadius = radius;
+        }
+        if (defaultRadius == rightBottomRadius) {
+            rightBottomRadius = radius;
+        }
+        if (defaultRadius == leftBottomRadius) {
+            leftBottomRadius = radius;
+        }
+    }
+
+    public void setRadius(int radius) {
+        this.radius = radius;
+        leftBottomRadius = radius;
+        rightBottomRadius = radius;
+        rightTopRadius = radius;
+        leftTopRadius = radius;
+    }
+
+    public int getRadius() {
+        return radius;
+    }
+
+    public void setLeftTopRadius(int leftTopRadius) {
+        this.leftTopRadius = leftTopRadius;
+    }
+
+    public void setLeftBottomRadius(int leftBottomRadius) {
+        this.leftBottomRadius = leftBottomRadius;
+    }
+
+    public void setRightTopRadius(int rightTopRadius) {
+        this.rightTopRadius = rightTopRadius;
+    }
+
+    public void setRightBottomRadius(int rightBottomRadius) {
+        this.rightBottomRadius = rightBottomRadius;
+    }
+
+    public int getLeftTopRadius() {
+        return leftTopRadius;
+    }
+
+    public int getLeftBottomRadius() {
+        return leftBottomRadius;
+    }
+
+    public int getRightTopRadius() {
+        return rightTopRadius;
+    }
+
+    public int getRightBottomRadius() {
+        return rightBottomRadius;
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        path.reset();
+        canvas.setDrawFilter(aliasFilter);
+        rectF.set(0, 0, getMeasuredWidth(), getMeasuredHeight());
+        // left-top -> right-top -> right-bottom -> left-bottom
+        float[] radius = {leftTopRadius, leftTopRadius, rightTopRadius, rightTopRadius,
+                rightBottomRadius, rightBottomRadius, leftBottomRadius, leftBottomRadius};
+        path.addRoundRect(rectF, radius, Path.Direction.CW);
+        canvas.clipPath(path);
+        super.onDraw(canvas);
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/common/SlideRecyclerView.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/common/SlideRecyclerView.java
new file mode 100644
index 0000000..ae63683
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/common/SlideRecyclerView.java
@@ -0,0 +1,226 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.common;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.VelocityTracker;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+import android.widget.Scroller;
+
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * 支持左滑删除的RecyclerView
+ */
+public class SlideRecyclerView extends RecyclerView {
+    private static final String TAG                 = "SlideRecyclerView";
+    private static final int    INVALID_POSITION    = -1;  // 触摸到的点不在子View范围内
+    private static final int    INVALID_CHILD_WIDTH = -1;  // 子ItemView不含两个子View
+    private static final int    SNAP_VELOCITY       = 600; // 最小滑动速度
+
+    private VelocityTracker mVelocityTracker;   // 速度追踪器
+    private ViewGroup       mFlingView;         // 触碰的子View
+    private Scroller        mScroller;          // 触碰动画
+    private Rect            mTouchFrame;        // 子View所在的矩形范围
+    private float           mLastX;             // 滑动过程中记录上次触碰点X
+    private float           mFirstX;
+    private float           mFirstY;   // 首次触碰范围
+
+    private int     mTouchSlop;      // 认为是滑动的最小距离（一般由系统提供）
+    private boolean mIsSlide;        // 是否滑动子View
+    private int     mPosition;       // 触碰的view的位置
+    private int     mMenuViewWidth;  // 菜单按钮宽度
+    private boolean mDisableRecyclerViewSlide;
+
+    public SlideRecyclerView(Context context) {
+        this(context, null);
+    }
+
+    public SlideRecyclerView(Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public SlideRecyclerView(Context context, @Nullable AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
+        mScroller = new Scroller(context);
+    }
+
+    public void disableRecyclerViewSlide(boolean disable) {
+        mDisableRecyclerViewSlide = disable;
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent e) {
+        int x = (int) e.getX();
+        int y = (int) e.getY();
+        obtainVelocity(e);
+        switch (e.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                if (!mScroller.isFinished()) {
+                    mScroller.abortAnimation();
+                }
+                mFirstX = mLastX = x;
+                mFirstY = y;
+                // 获取触碰点所在的position
+                mPosition = pointToPosition(x, y);
+                if (mPosition != INVALID_POSITION) {
+                    View view = mFlingView;
+                    // 获取触碰点所在的view
+                    mFlingView = (ViewGroup) getChildAt(mPosition - ((LinearLayoutManager) getLayoutManager())
+                            .findFirstVisibleItemPosition());
+                    // 如果之前触碰的view已经打开，而当前碰到的view不是那个view则立即关闭之前的view
+                    if (view != null && mFlingView != view && view.getScrollX() != 0) {
+                        view.scrollTo(0, 0);
+                    }
+
+                    if (mFlingView.getChildCount() == 2) {
+                        mMenuViewWidth = mFlingView.getChildAt(1).getWidth();
+                    } else {
+                        mMenuViewWidth = INVALID_CHILD_WIDTH;
+                    }
+                }
+                break;
+            case MotionEvent.ACTION_MOVE:
+                mVelocityTracker.computeCurrentVelocity(1000);
+                // 此处有俩判断，满足其一则认为是侧滑：
+                // 1.如果x方向速度大于y方向速度，且大于最小速度限制；
+                // 2.如果x方向的侧滑距离大于y方向滑动距离，且x方向达到最小滑动距离；
+                float xVelocity = mVelocityTracker.getXVelocity();
+                float yVelocity = mVelocityTracker.getYVelocity();
+
+                //找到最上面第一个view，不处理滑动事件但是也不拦截后续事件
+                View topView = ((LinearLayoutManager) getLayoutManager()).findViewByPosition(0);
+                if (topView == mFlingView) {
+                    mIsSlide = false;
+                } else if (Math.abs(xVelocity) > SNAP_VELOCITY && Math.abs(xVelocity) > Math.abs(yVelocity)
+                        || Math.abs(x - mFirstX) >= mTouchSlop
+                        && Math.abs(x - mFirstX) > Math.abs(y - mFirstY)) {
+                    mIsSlide = true;
+                    return true;
+                }
+                break;
+            case MotionEvent.ACTION_UP:
+                releaseVelocity();
+                break;
+            default:
+                break;
+        }
+        return super.onInterceptTouchEvent(e);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent e) {
+        if (mIsSlide && mPosition != INVALID_POSITION) {
+            float x = e.getX();
+            obtainVelocity(e);
+            switch (e.getAction()) {
+                case MotionEvent.ACTION_DOWN:
+                    break;
+                case MotionEvent.ACTION_MOVE:
+                    // 随手指滑动
+                    if (mMenuViewWidth != INVALID_CHILD_WIDTH) {
+                        float dx = mLastX - x;
+                        if (mFlingView.getScrollX() + dx <= mMenuViewWidth
+                                && mFlingView.getScrollX() + dx > 0) {
+                            if (mMenuViewWidth != INVALID_CHILD_WIDTH) {
+                                int scrollX = mFlingView.getScrollX();
+                                mVelocityTracker.computeCurrentVelocity(1000);
+                                // 此处有两个原因决定是否打开菜单：
+                                // 1.菜单被拉出宽度大于菜单宽度一半；
+                                // 2.横向滑动速度大于最小滑动速度；
+                                // 注意:向左滑则速度为负值
+                                if (mVelocityTracker.getXVelocity() < -SNAP_VELOCITY) {    // 向左侧滑达到侧滑最低速度，则打开
+                                    mScroller.startScroll(scrollX, 0, mMenuViewWidth - scrollX, 0,
+                                            Math.abs(mMenuViewWidth - scrollX));
+                                } else if (mVelocityTracker.getXVelocity() >= SNAP_VELOCITY) {  // 向右侧滑达到侧滑最低速度，则关闭
+                                    mScroller.startScroll(scrollX, 0, -scrollX, 0, Math.abs(scrollX));
+                                } else if (scrollX >= mMenuViewWidth / 2) { // 如果超过删除按钮一半，则打开
+                                    mScroller.startScroll(scrollX, 0, mMenuViewWidth - scrollX, 0,
+                                            Math.abs(mMenuViewWidth - scrollX));
+                                } else {    // 其他情况则关闭
+                                    mScroller.startScroll(scrollX, 0, -scrollX, 0, Math.abs(scrollX));
+                                }
+                                invalidate();
+                            }
+                            mMenuViewWidth = INVALID_CHILD_WIDTH;
+                            mIsSlide = false;
+                            mPosition = INVALID_POSITION;
+                        }
+                        mLastX = x;
+                    }
+                    break;
+                case MotionEvent.ACTION_UP:
+                    releaseVelocity();
+                    break;
+                default:
+                    break;
+            }
+            return true;
+        } else {
+            // 防止RecyclerView正常滑动时，还有菜单未关闭
+            closeMenu();
+            releaseVelocity();
+        }
+        return super.onTouchEvent(e);
+    }
+
+    private void releaseVelocity() {
+        if (mVelocityTracker != null) {
+            mVelocityTracker.clear();
+            mVelocityTracker.recycle();
+            mVelocityTracker = null;
+        }
+    }
+
+    private void obtainVelocity(MotionEvent event) {
+        if (mVelocityTracker == null) {
+            mVelocityTracker = VelocityTracker.obtain();
+        }
+        mVelocityTracker.addMovement(event);
+    }
+
+    public int pointToPosition(int x, int y) {
+        int firstPosition = ((LinearLayoutManager) getLayoutManager()).findFirstVisibleItemPosition();
+        Rect frame = mTouchFrame;
+        if (frame == null) {
+            mTouchFrame = new Rect();
+            frame = mTouchFrame;
+        }
+
+        final int count = getChildCount();
+        for (int i = count - 1; i >= 0; i--) {
+            final View child = getChildAt(i);
+            if (child.getVisibility() == View.VISIBLE) {
+                child.getHitRect(frame);
+                if (frame.contains(x, y)) {
+                    return firstPosition + i;
+                }
+            }
+        }
+        return INVALID_POSITION;
+    }
+
+    @Override
+    public void computeScroll() {
+        if (mScroller.computeScrollOffset()) {
+            if (mDisableRecyclerViewSlide) {
+                mFlingView.scrollTo(0, 0);
+            } else {
+                mFlingView.scrollTo(mScroller.getCurrX(), mScroller.getCurrY());
+            }
+            invalidate();
+        }
+    }
+
+    public void closeMenu() {
+        if (mFlingView != null && mFlingView.getScrollX() != 0) {
+            mFlingView.scrollTo(0, 0);
+        }
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/common/gridimage/GridImageData.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/common/gridimage/GridImageData.java
new file mode 100644
index 0000000..71105a8
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/common/gridimage/GridImageData.java
@@ -0,0 +1,93 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.common.gridimage;
+
+import android.graphics.Bitmap;
+import android.graphics.Color;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class GridImageData implements Cloneable {
+    private static final int MAX_SIZE = 9;
+
+    protected List<Object>         imageUrlList;
+    protected Map<Integer, Bitmap> bitmapMap;
+    protected int                  defaultImageResId;
+    protected int                  bgColor = Color.parseColor("#cfd3d8");
+
+    protected int targetImageSize;
+    protected int maxWidth;
+    protected int maxHeight;
+    protected int rowCount;
+    protected int columnCount;
+    protected int gap = 6;
+
+    public GridImageData() {
+    }
+
+    public GridImageData(List<Object> imageUrlList, int defaultImageResId) {
+        this.imageUrlList = imageUrlList;
+        this.defaultImageResId = defaultImageResId;
+    }
+
+    public int getDefaultImageResId() {
+        return defaultImageResId;
+    }
+
+    public void setDefaultImageResId(int defaultImageResId) {
+        this.defaultImageResId = defaultImageResId;
+    }
+
+    public List<Object> getImageUrlList() {
+        return imageUrlList;
+    }
+
+    public void setImageUrlList(List<Object> imageUrlList) {
+        this.imageUrlList = imageUrlList;
+    }
+
+    public void putBitmap(Bitmap bitmap, int position) {
+        if (null != bitmapMap) {
+            synchronized (bitmapMap) {
+                bitmapMap.put(position, bitmap);
+            }
+        } else {
+            bitmapMap = new HashMap<>();
+            synchronized (bitmapMap) {
+                bitmapMap.put(position, bitmap);
+            }
+        }
+    }
+
+    public Bitmap getBitmap(int position) {
+        if (null != bitmapMap) {
+            synchronized (bitmapMap) {
+                return bitmapMap.get(position);
+            }
+        }
+        return null;
+    }
+
+    public int size() {
+        if (null != imageUrlList) {
+            return Math.min(imageUrlList.size(), MAX_SIZE);
+        } else {
+            return 0;
+        }
+    }
+
+    @Override
+    protected GridImageData clone() throws CloneNotSupportedException {
+        GridImageData gridImageData = (GridImageData) super.clone();
+        if (imageUrlList != null) {
+            gridImageData.imageUrlList = new ArrayList<>(imageUrlList.size());
+            gridImageData.imageUrlList.addAll(imageUrlList);
+        }
+        if (bitmapMap != null) {
+            gridImageData.bitmapMap = new HashMap<>();
+            gridImageData.bitmapMap.putAll(bitmapMap);
+        }
+        return gridImageData;
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/common/gridimage/GridImageSynthesizer.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/common/gridimage/GridImageSynthesizer.java
new file mode 100644
index 0000000..4c2171b
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/common/gridimage/GridImageSynthesizer.java
@@ -0,0 +1,317 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.common.gridimage;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.text.TextUtils;
+import android.widget.ImageView;
+
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.ImageLoader;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+
+public class GridImageSynthesizer {
+    private GridImageData mGridImageData;
+    private Context       mContext;
+    private ImageView     mImageView;
+    private String        mCurrentImageId = "";
+
+    public GridImageSynthesizer(Context mContext, ImageView imageView) {
+        this.mContext = mContext;
+        this.mImageView = imageView;
+        init();
+    }
+
+    private void init() {
+        mGridImageData = new GridImageData();
+    }
+
+    public void setImageUrls(List<Object> list) {
+        mGridImageData.setImageUrlList(list);
+    }
+
+    public void setMaxSize(int maxWidth, int maxHeight) {
+        mGridImageData.maxWidth = maxWidth;
+        mGridImageData.maxHeight = maxHeight;
+    }
+
+    public int getDefaultImage() {
+        return mGridImageData.getDefaultImageResId();
+    }
+
+    public void setDefaultImage(int defaultImageResId) {
+        mGridImageData.setDefaultImageResId(defaultImageResId);
+    }
+
+    public void setBgColor(int bgColor) {
+        mGridImageData.bgColor = bgColor;
+    }
+
+    public void setGap(int gap) {
+        mGridImageData.gap = gap;
+    }
+
+    public void setImageId(String id) {
+        mCurrentImageId = id;
+    }
+
+    public String getImageId() {
+        return mCurrentImageId;
+    }
+
+    private int[] calculateGridParam(int imagesSize) {
+        int[] gridParam = new int[2];
+        if (imagesSize < 3) {
+            gridParam[0] = 1;
+            gridParam[1] = imagesSize;
+        } else if (imagesSize <= 4) {
+            gridParam[0] = 2;
+            gridParam[1] = 2;
+        } else {
+            gridParam[0] = imagesSize / 3 + (imagesSize % 3 == 0 ? 0 : 1);
+            gridParam[1] = 3;
+        }
+        return gridParam;
+    }
+
+    private boolean asyncLoadImageList(GridImageData imageData) {
+        boolean loadSuccess = true;
+        List<Object> imageUrlList = imageData.getImageUrlList();
+        for (int i = 0; i < imageUrlList.size(); i++) {
+            Bitmap defaultIcon = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.tuicalling_ic_avatar);
+            try {
+                Bitmap bitmap = asyncLoadImage(imageUrlList.get(i), imageData.targetImageSize);
+                imageData.putBitmap(bitmap, i);
+            } catch (InterruptedException | ExecutionException e) {
+                e.printStackTrace();
+                imageData.putBitmap(defaultIcon, i);
+            }
+        }
+        return loadSuccess;
+    }
+
+    private Bitmap synthesizeImageList(GridImageData imageData) {
+        Bitmap mergeBitmap = Bitmap.createBitmap(imageData.maxWidth, imageData.maxHeight, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(mergeBitmap);
+        drawDrawable(canvas, imageData);
+        canvas.save();
+        canvas.restore();
+        return mergeBitmap;
+    }
+
+    private void drawDrawable(Canvas canvas, GridImageData imageData) {
+        canvas.drawColor(imageData.bgColor);
+        int size = imageData.size();
+        int tCenter = (imageData.maxHeight + imageData.gap) / 2;
+        int bCenter = (imageData.maxHeight - imageData.gap) / 2;
+        int lCenter = (imageData.maxWidth + imageData.gap) / 2;
+        int rCenter = (imageData.maxWidth - imageData.gap) / 2;
+        int center = (imageData.maxHeight - imageData.targetImageSize) / 2;
+        for (int i = 0; i < size; i++) {
+            int rowNum = i / imageData.columnCount;
+            int columnNum = i % imageData.columnCount;
+
+            int left = ((int) (imageData.targetImageSize * (imageData.columnCount == 1 ? columnNum + 0.5 : columnNum)
+                    + imageData.gap * (columnNum + 1)));
+            int top = ((int) (imageData.targetImageSize * (imageData.columnCount == 1 ? rowNum + 0.5 : rowNum)
+                    + imageData.gap * (rowNum + 1)));
+            int right = left + imageData.targetImageSize;
+            int bottom = top + imageData.targetImageSize;
+
+            Bitmap bitmap = imageData.getBitmap(i);
+            if (size == 1) {
+                drawBitmapAtPosition(canvas, left, top, right, bottom, bitmap);
+            } else if (size == 2) {
+                drawBitmapAtPosition(canvas, left, center, right, center + imageData.targetImageSize, bitmap);
+            } else if (size == 3) {
+                if (i == 0) {
+                    drawBitmapAtPosition(canvas, center, top, center + imageData.targetImageSize, bottom, bitmap);
+                } else {
+                    drawBitmapAtPosition(canvas, imageData.gap * i + imageData.targetImageSize * (i - 1), tCenter,
+                            imageData.gap * i + imageData.targetImageSize * i, tCenter + imageData.targetImageSize,
+                            bitmap);
+                }
+            } else if (size == 4) {
+                drawBitmapAtPosition(canvas, left, top, right, bottom, bitmap);
+            } else if (size == 5) {
+                if (i == 0) {
+                    drawBitmapAtPosition(canvas, rCenter - imageData.targetImageSize,
+                            rCenter - imageData.targetImageSize, rCenter, rCenter, bitmap);
+                } else if (i == 1) {
+                    drawBitmapAtPosition(canvas, lCenter, rCenter - imageData.targetImageSize,
+                            lCenter + imageData.targetImageSize, rCenter, bitmap);
+                } else {
+                    drawBitmapAtPosition(canvas, imageData.gap * (i - 1) + imageData.targetImageSize * (i - 2),
+                            tCenter, imageData.gap * (i - 1) + imageData.targetImageSize * (i - 1), tCenter
+                                    + imageData.targetImageSize, bitmap);
+                }
+            } else if (size == 6) {
+                if (i < 3) {
+                    drawBitmapAtPosition(canvas, imageData.gap * (i + 1) + imageData.targetImageSize * i,
+                            bCenter - imageData.targetImageSize,
+                            imageData.gap * (i + 1) + imageData.targetImageSize * (i + 1), bCenter, bitmap);
+                } else {
+                    drawBitmapAtPosition(canvas, imageData.gap * (i - 2) + imageData.targetImageSize * (i - 3),
+                            tCenter, imageData.gap * (i - 2) + imageData.targetImageSize * (i - 2), tCenter
+                                    + imageData.targetImageSize, bitmap);
+                }
+            } else if (size == 7) {
+                if (i == 0) {
+                    drawBitmapAtPosition(canvas, center, imageData.gap, center + imageData.targetImageSize,
+                            imageData.gap + imageData.targetImageSize, bitmap);
+                } else if (i > 0 && i < 4) {
+                    drawBitmapAtPosition(canvas, imageData.gap * i + imageData.targetImageSize * (i - 1), center,
+                            imageData.gap * i + imageData.targetImageSize * i, center + imageData.targetImageSize,
+                            bitmap);
+                } else {
+                    drawBitmapAtPosition(canvas, imageData.gap * (i - 3) + imageData.targetImageSize * (i - 4),
+                            tCenter + imageData.targetImageSize / 2,
+                            imageData.gap * (i - 3) + imageData.targetImageSize * (i - 3),
+                            tCenter + imageData.targetImageSize / 2 + imageData.targetImageSize, bitmap);
+                }
+            } else if (size == 8) {
+                if (i == 0) {
+                    drawBitmapAtPosition(canvas, rCenter - imageData.targetImageSize, imageData.gap, rCenter,
+                            imageData.gap + imageData.targetImageSize, bitmap);
+                } else if (i == 1) {
+                    drawBitmapAtPosition(canvas, lCenter, imageData.gap, lCenter + imageData.targetImageSize,
+                            imageData.gap + imageData.targetImageSize, bitmap);
+                } else if (i > 1 && i < 5) {
+                    drawBitmapAtPosition(canvas, imageData.gap * (i - 1) + imageData.targetImageSize * (i - 2),
+                            center, imageData.gap * (i - 1) + imageData.targetImageSize * (i - 1),
+                            center + imageData.targetImageSize, bitmap);
+                } else {
+                    drawBitmapAtPosition(canvas, imageData.gap * (i - 4) + imageData.targetImageSize * (i - 5),
+                            tCenter + imageData.targetImageSize / 2,
+                            imageData.gap * (i - 4) + imageData.targetImageSize * (i - 4),
+                            tCenter + imageData.targetImageSize / 2 + imageData.targetImageSize, bitmap);
+                }
+            } else if (size == 9) {
+                drawBitmapAtPosition(canvas, left, top, right, bottom, bitmap);
+            }
+        }
+    }
+
+    private void drawBitmapAtPosition(Canvas canvas, int left, int top, int right, int bottom, Bitmap bitmap) {
+        if (null == bitmap) {
+            if (mGridImageData.getDefaultImageResId() > 0) {
+                bitmap = BitmapFactory.decodeResource(mContext.getResources(), mGridImageData.getDefaultImageResId());
+            }
+        }
+        if (null != bitmap) {
+            Rect rect = new Rect(left, top, right, bottom);
+            canvas.drawBitmap(bitmap, null, rect, null);
+        }
+    }
+
+    private Bitmap asyncLoadImage(Object imgUrl, int targetImageSize) throws ExecutionException, InterruptedException {
+        return ImageLoader.loadBitmap(mContext, imgUrl, targetImageSize);
+    }
+
+    public void load(String imageId) {
+        if (mGridImageData.size() == 0) {
+            if (imageId != null && !TextUtils.equals(imageId, mCurrentImageId)) {
+                return;
+            }
+            ImageLoader.loadImage(mContext, mImageView, getDefaultImage());
+            return;
+        }
+
+        if (mGridImageData.size() == 1) {
+            if (imageId != null && !TextUtils.equals(imageId, mCurrentImageId)) {
+                return;
+            }
+            ImageLoader.loadImage(mContext, mImageView, mGridImageData.getImageUrlList().get(0));
+            return;
+        }
+
+        clearImage();
+
+        GridImageData copyGridImageData;
+        try {
+            copyGridImageData = mGridImageData.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+            List<Object> urlList = new ArrayList();
+            if (mGridImageData.imageUrlList != null) {
+                urlList.addAll(mGridImageData.imageUrlList);
+            }
+            copyGridImageData = new GridImageData(urlList, mGridImageData.defaultImageResId);
+        }
+        int[] gridParam = calculateGridParam(mGridImageData.size());
+        copyGridImageData.rowCount = gridParam[0];
+        copyGridImageData.columnCount = gridParam[1];
+        copyGridImageData.targetImageSize = (copyGridImageData.maxWidth - (copyGridImageData.columnCount + 1)
+                * copyGridImageData.gap) / (copyGridImageData.columnCount == 1 ? 2 : copyGridImageData.columnCount);
+
+        final String finalImageId = imageId;
+        final GridImageData finalCopyGridImageData = copyGridImageData;
+        ThreadUtils.execute(new Runnable() {
+            @Override
+            public void run() {
+                final File file = new File(TUIConfig.getImageBaseDir() + finalImageId);
+                boolean cacheBitmapExists = false;
+                Bitmap existsBitmap = null;
+                if (file.exists() && file.isFile()) {
+                    BitmapFactory.Options options = new BitmapFactory.Options();
+                    existsBitmap = BitmapFactory.decodeFile(file.getPath(), options);
+                    if (options.outWidth > 0 && options.outHeight > 0) {
+                        cacheBitmapExists = true;
+                    }
+                }
+                if (!cacheBitmapExists) {
+                    asyncLoadImageList(finalCopyGridImageData);
+                    existsBitmap = synthesizeImageList(finalCopyGridImageData);
+                    storeBitmap(file, existsBitmap);
+                }
+                loadImage(existsBitmap, finalImageId);
+            }
+        });
+    }
+
+    private void loadImage(Bitmap bitmap, String targetId) {
+        ThreadUtils.runOnUIThread(() -> {
+            if (TextUtils.equals(getImageId(), targetId)) {
+                ImageLoader.loadImage(mContext, mImageView, bitmap);
+            }
+        });
+    }
+
+    public void clearImage() {
+        ImageLoader.clear(mContext, mImageView);
+    }
+
+    private void storeBitmap(File outFile, Bitmap bitmap) {
+        if (!outFile.exists() || outFile.isDirectory()) {
+            outFile.getParentFile().mkdirs();
+        }
+        FileOutputStream fOut = null;
+        try {
+            outFile.deleteOnExit();
+            outFile.createNewFile();
+            fOut = new FileOutputStream(outFile);
+            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fOut);
+            fOut.flush();
+        } catch (IOException e) {
+            outFile.deleteOnExit();
+        } finally {
+            if (null != fOut) {
+                try {
+                    fOut.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    outFile.deleteOnExit();
+                }
+            }
+        }
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/common/gridimage/ThreadUtils.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/common/gridimage/ThreadUtils.java
new file mode 100644
index 0000000..943693a
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/common/gridimage/ThreadUtils.java
@@ -0,0 +1,26 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.common.gridimage;
+
+import android.os.Handler;
+import android.os.Looper;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+public class ThreadUtils {
+    private static Handler         mMainHandler = new Handler(Looper.getMainLooper());
+    private static ExecutorService mExecutors;
+
+    public static void execute(Runnable runnable) {
+        if (mExecutors == null) {
+            mExecutors = new ThreadPoolExecutor(0, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS,
+                    new SynchronousQueue<>());
+        }
+        mExecutors.execute(runnable);
+    }
+
+    public static void runOnUIThread(Runnable runnable) {
+        mMainHandler.post(runnable);
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/component/BaseUserView.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/component/BaseUserView.java
new file mode 100644
index 0000000..be53cdf
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/component/BaseUserView.java
@@ -0,0 +1,18 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.component;
+
+import android.content.Context;
+import android.widget.RelativeLayout;
+
+import com.tencent.qcloud.tuikit.tuicallkit.base.CallingUserModel;
+
+public abstract class BaseUserView extends RelativeLayout {
+    public BaseUserView(Context context) {
+        super(context);
+    }
+
+    public void updateUserInfo(CallingUserModel userModel) {
+    }
+
+    public void updateTextColor(int color) {
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/component/TUICallingSingleVideoUserView.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/component/TUICallingSingleVideoUserView.java
new file mode 100644
index 0000000..5ef1214
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/component/TUICallingSingleVideoUserView.java
@@ -0,0 +1,43 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.component;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.base.CallingUserModel;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.ImageLoader;
+
+public class TUICallingSingleVideoUserView extends BaseUserView {
+    private Context   mContext;
+    private ImageView mImageAvatar;
+    private TextView  mTextUserName;
+    private TextView  mTextVideoHint;
+    private String    mHintMessage;
+
+    public TUICallingSingleVideoUserView(Context context, String message) {
+        super(context);
+        mContext = context.getApplicationContext();
+        mHintMessage = message;
+        initView();
+    }
+
+    private void initView() {
+        LayoutInflater.from(mContext).inflate(R.layout.tuicalling_single_video_user_view, this);
+        mImageAvatar = findViewById(R.id.iv_user_avatar);
+        mTextUserName = findViewById(R.id.tv_user_name);
+        mTextVideoHint = findViewById(R.id.tv_video_tag);
+        mTextVideoHint.setText(mHintMessage);
+    }
+
+    @Override
+    public void updateUserInfo(CallingUserModel model) {
+        super.updateUserInfo(model);
+        if (null != model && !TextUtils.isEmpty(model.userId)) {
+            ImageLoader.loadImage(mContext, mImageAvatar, model.userAvatar, R.drawable.tuicalling_ic_avatar);
+            mTextUserName.setText(TextUtils.isEmpty(model.userName) ? model.userId : model.userName);
+        }
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/component/TUICallingUserView.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/component/TUICallingUserView.java
new file mode 100644
index 0000000..1150d1e
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/component/TUICallingUserView.java
@@ -0,0 +1,42 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.component;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.base.CallingUserModel;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.ImageLoader;
+
+public class TUICallingUserView extends BaseUserView {
+    private Context   mContext;
+    private ImageView mImageAvatar;
+    private TextView  mTextUserName;
+
+    public TUICallingUserView(Context context) {
+        super(context);
+        mContext = context.getApplicationContext();
+        initView();
+    }
+
+    private void initView() {
+        LayoutInflater.from(mContext).inflate(R.layout.tuicalling_user_view, this);
+        mImageAvatar = findViewById(R.id.img_avatar);
+        mTextUserName = findViewById(R.id.tv_name);
+    }
+
+    @Override
+    public void updateUserInfo(CallingUserModel model) {
+        super.updateUserInfo(model);
+        ImageLoader.loadImage(mContext, mImageAvatar, model.userAvatar, R.drawable.tuicalling_ic_avatar);
+        mTextUserName.setText(TextUtils.isEmpty(model.userName) ? model.userId : model.userName);
+    }
+
+    @Override
+    public void updateTextColor(int color) {
+        super.updateTextColor(color);
+        mTextUserName.setTextColor(color);
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/floatwindow/FloatCallView.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/floatwindow/FloatCallView.java
new file mode 100644
index 0000000..a4a7b72
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/floatwindow/FloatCallView.java
@@ -0,0 +1,171 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.floatwindow;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuikit.TUIVideoView;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.base.CallingUserModel;
+import com.tencent.qcloud.tuikit.tuicallkit.base.UserLayout;
+import com.tencent.qcloud.tuikit.tuicallkit.base.UserLayoutEntity;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.ImageLoader;
+import com.tencent.qcloud.tuikit.tuicallkit.view.UserLayoutFactory;
+
+import java.util.Objects;
+
+public class FloatCallView extends RelativeLayout {
+    private static final int UPDATE_COUNT         = 3;
+    private static final int UPDATE_INTERVAL      = 300;
+    private static final int MESSAGE_LAYOUT_EMPTY = 1;
+    private static final int MESSAGE_VIEW_EMPTY   = 2;
+    private              int mCount               = 0;
+
+    private final Context mContext;
+
+    private RelativeLayout mLayoutVideoView;
+    private ImageView      mImageAudio;
+    private TextView       mTextHint;
+    private TextView       mTextTime;
+    private ImageView      mImageFloatAvatar;
+
+    private OnClickListener   mOnClickListener;
+    private UserLayoutFactory mUserLayoutFactory;
+    private UserLayout        mVideoLayout;
+    private String            mCurrentUser;
+    private boolean           mIsVideoAvailable;
+
+    public FloatCallView(Context context, UserLayoutFactory factory) {
+        super(context);
+        mContext = context;
+        mUserLayoutFactory = factory;
+        initView(context);
+    }
+
+    private void initView(Context context) {
+        LayoutInflater.from(context).inflate(R.layout.tuicalling_floatwindow_layout, this);
+        mLayoutVideoView = findViewById(R.id.rl_video_view);
+        mImageFloatAvatar = findViewById(R.id.img_float_avatar);
+        mTextHint = findViewById(R.id.tv_float_hint);
+        mImageAudio = findViewById(R.id.float_audioView);
+        mTextTime = findViewById(R.id.tv_float_time);
+        setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (null != mOnClickListener) {
+                    mOnClickListener.onClick();
+                }
+            }
+        });
+    }
+
+    public void updateView(boolean isVideoAvailable, String userId) {
+        mIsVideoAvailable = isVideoAvailable;
+        if (!isVideoAvailable) {
+            mLayoutVideoView.setVisibility(GONE);
+            mImageFloatAvatar.setVisibility(GONE);
+            mImageAudio.setVisibility(VISIBLE);
+            return;
+        }
+
+        if (null == mUserLayoutFactory || TextUtils.isEmpty(userId)) {
+            return;
+        }
+
+        mCurrentUser = userId;
+        mImageAudio.setVisibility(GONE);
+
+        CallingUserModel model = new CallingUserModel();
+        for (UserLayoutEntity entity : mUserLayoutFactory.mLayoutEntityList) {
+            if (entity != null && Objects.equals(entity.userId, userId)) {
+                model = entity.userModel;
+                break;
+            }
+        }
+
+        if (model != null && !model.isVideoAvailable) {
+            mLayoutVideoView.removeAllViews();
+            mLayoutVideoView.setVisibility(GONE);
+            mImageFloatAvatar.setVisibility(VISIBLE);
+            ImageLoader.loadImage(mContext, mImageFloatAvatar, model.userAvatar, R.drawable.tuicalling_ic_avatar);
+            return;
+        }
+        mImageFloatAvatar.setVisibility(GONE);
+
+        mVideoLayout = mUserLayoutFactory.findUserLayout(userId);
+        if (null == mVideoLayout) {
+            mViewHandler.sendEmptyMessageDelayed(MESSAGE_LAYOUT_EMPTY, UPDATE_INTERVAL);
+            return;
+        }
+        reloadVideoView();
+    }
+
+    private void reloadVideoView() {
+        if (null == mVideoLayout) {
+            return;
+        }
+
+        TUIVideoView videoView = mVideoLayout.getVideoView();
+        if (videoView == null) {
+            mViewHandler.sendEmptyMessageDelayed(MESSAGE_VIEW_EMPTY, UPDATE_INTERVAL);
+            return;
+        }
+        if (null != videoView.getParent()) {
+            ((ViewGroup) videoView.getParent()).removeView(videoView);
+        }
+        mLayoutVideoView.removeAllViews();
+        mLayoutVideoView.setVisibility(VISIBLE);
+        mLayoutVideoView.addView(videoView);
+    }
+
+    private final Handler mViewHandler = new Handler(Looper.getMainLooper()) {
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            if (msg.what == MESSAGE_LAYOUT_EMPTY && null == mVideoLayout && mCount <= UPDATE_COUNT) {
+                mVideoLayout = mUserLayoutFactory.findUserLayout(mCurrentUser);
+                sendEmptyMessageDelayed(MESSAGE_LAYOUT_EMPTY, UPDATE_INTERVAL);
+                mCount++;
+            } else if (msg.what == MESSAGE_VIEW_EMPTY && mCount < UPDATE_COUNT) {
+                sendEmptyMessageDelayed(MESSAGE_VIEW_EMPTY, UPDATE_INTERVAL);
+                mCount++;
+            } else {
+                reloadVideoView();
+                mCount = 0;
+            }
+        }
+    };
+
+    public void enableCallingHint(boolean enable) {
+        mTextHint.setVisibility(enable ? VISIBLE : GONE);
+    }
+
+    public void updateCallTimeView(String time) {
+        if (mIsVideoAvailable) {
+            mTextTime.setVisibility(GONE);
+            return;
+        }
+        mTextTime.setText(time);
+        mTextTime.setVisibility(TextUtils.isEmpty(time) ? INVISIBLE : VISIBLE);
+    }
+
+    public void setOnClickListener(OnClickListener callback) {
+        mOnClickListener = callback;
+    }
+
+    public String getCurrentUser() {
+        return mCurrentUser;
+    }
+
+    public interface OnClickListener {
+        void onClick();
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/floatwindow/FloatWindowService.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/floatwindow/FloatWindowService.java
new file mode 100644
index 0000000..a79120d
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/floatwindow/FloatWindowService.java
@@ -0,0 +1,202 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.floatwindow;
+
+import android.animation.ValueAnimator;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.PixelFormat;
+import android.os.Binder;
+import android.os.Build;
+import android.os.IBinder;
+import android.view.Gravity;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.WindowManager;
+
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+
+public class FloatWindowService extends Service {
+    private static Intent        mStartIntent;
+    private static FloatCallView mCallView;
+    private static Context       mContext;
+
+    private WindowManager              mWindowManager;
+    private WindowManager.LayoutParams mWindowLayoutParams;
+
+    private int mScreenWidth;
+    private int mWidth;
+    private int mTouchStartX;
+    private int mTouchStartY;
+    private int mTouchCurrentX;
+    private int mTouchCurrentY;
+    private int mStartX;
+    private int mStartY;
+    private int mStopX;
+    private int mStopY;
+
+    private boolean mIsMove;
+
+    public static void startFloatService(Context context, FloatCallView callView) {
+        mContext = context;
+        mCallView = callView;
+        mStartIntent = new Intent(context, FloatWindowService.class);
+        context.startService(mStartIntent);
+    }
+
+    public static void stopService(Context context) {
+        if (null != mStartIntent) {
+            context.stopService(mStartIntent);
+        }
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        initWindow();
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return new FloatBinder();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        return super.onStartCommand(intent, flags, startId);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (null != mCallView) {
+            mWindowManager.removeView(mCallView);
+            mCallView = null;
+        }
+    }
+
+    private void initWindow() {
+        mWindowManager = (WindowManager) getApplicationContext().getSystemService(Context.WINDOW_SERVICE);
+        mWindowLayoutParams = getViewParams();
+        mScreenWidth = mWindowManager.getDefaultDisplay().getWidth();
+
+        if (null != mCallView) {
+            mCallView.setBackgroundResource(R.drawable.tuicalling_bg_floatwindow_left);
+            mWindowManager.addView(mCallView, mWindowLayoutParams);
+            mCallView.setOnTouchListener(new FloatingListener());
+        }
+    }
+
+    private WindowManager.LayoutParams getViewParams() {
+        mWindowLayoutParams = new WindowManager.LayoutParams();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            mWindowLayoutParams.type = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
+        } else {
+            mWindowLayoutParams.type = WindowManager.LayoutParams.TYPE_PHONE;
+        }
+        mWindowLayoutParams.flags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
+                | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+                | WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS;
+
+        mWindowLayoutParams.gravity = Gravity.LEFT | Gravity.TOP;
+        mWindowLayoutParams.x = 0;
+        mWindowLayoutParams.y = mWindowManager.getDefaultDisplay().getHeight() / 2;
+
+        mWindowLayoutParams.width = WindowManager.LayoutParams.WRAP_CONTENT;
+        mWindowLayoutParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
+        mWindowLayoutParams.format = PixelFormat.TRANSPARENT;
+
+        return mWindowLayoutParams;
+    }
+
+    public class FloatBinder extends Binder {
+        public FloatWindowService getService() {
+            return FloatWindowService.this;
+        }
+    }
+
+    private class FloatingListener implements View.OnTouchListener {
+        @Override
+        public boolean onTouch(View v, MotionEvent event) {
+            int action = event.getAction();
+            switch (action) {
+                case MotionEvent.ACTION_DOWN:
+                    mIsMove = false;
+                    mTouchStartX = (int) event.getRawX();
+                    mTouchStartY = (int) event.getRawY();
+
+                    mStartX = (int) event.getRawX();
+                    mStartY = (int) event.getRawY();
+                    break;
+                case MotionEvent.ACTION_MOVE:
+                    mTouchCurrentX = (int) event.getRawX();
+                    mTouchCurrentY = (int) event.getRawY();
+                    if (mWindowLayoutParams != null && null != mCallView) {
+                        mWindowLayoutParams.x += mTouchCurrentX - mTouchStartX;
+                        mWindowLayoutParams.y += mTouchCurrentY - mTouchStartY;
+                        mWindowManager.updateViewLayout(mCallView, mWindowLayoutParams);
+                    }
+                    mTouchStartX = mTouchCurrentX;
+                    mTouchStartY = mTouchCurrentY;
+                    break;
+                case MotionEvent.ACTION_UP:
+                    mStopX = (int) event.getRawX();
+                    mStopY = (int) event.getRawY();
+                    if (Math.abs(mStartX - mStopX) >= 5 || Math.abs(mStartY - mStopY) >= 5) {
+                        mIsMove = true;
+                        if (null != mCallView) {
+                            mWidth = mCallView.getWidth();
+                            if (mTouchCurrentX > (mScreenWidth / 2)) {
+                                startScroll(mStopX, mScreenWidth - mWidth, false);
+                            } else {
+                                startScroll(mStopX, 0, true);
+                            }
+                        }
+                    }
+                    break;
+                default:
+                    break;
+            }
+            return mIsMove;
+        }
+    }
+
+    private void startScroll(int start, int end, boolean isLeft) {
+        ValueAnimator valueAnimator = ValueAnimator.ofFloat(start, end).setDuration(300);
+        valueAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                if (mWindowLayoutParams == null || mCallView == null) {
+                    return;
+                }
+                mWidth = mCallView.getWidth();
+                if (isLeft) {
+                    mWindowLayoutParams.x = (int) (start * (1 - animation.getAnimatedFraction()));
+                    mCallView.setBackgroundResource(R.drawable.tuicalling_bg_floatwindow_left);
+                } else {
+                    float end = (mScreenWidth - start - mWidth) * animation.getAnimatedFraction();
+                    mWindowLayoutParams.x = (int) (start + end);
+                    mCallView.setBackgroundResource(R.drawable.tuicalling_bg_floatwindow_right);
+                }
+                calculateHeight();
+                mWindowManager.updateViewLayout(mCallView, mWindowLayoutParams);
+            }
+        });
+        valueAnimator.start();
+    }
+
+    private void calculateHeight() {
+        if (mWindowLayoutParams == null) {
+            return;
+        }
+        int height = mCallView.getHeight();
+        int screenHeight = mWindowManager.getDefaultDisplay().getHeight();
+        int resourceId = mContext.getResources().getIdentifier("status_bar_height",
+                "dimen", "android");
+        int statusBarHeight = mContext.getResources().getDimensionPixelSize(resourceId);
+        if (mWindowLayoutParams.y < 0) {
+            mWindowLayoutParams.y = 0;
+        } else if (mWindowLayoutParams.y > (screenHeight - height - statusBarHeight)) {
+            mWindowLayoutParams.y = screenHeight - height - statusBarHeight;
+        }
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/floatwindow/HomeWatcher.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/floatwindow/HomeWatcher.java
new file mode 100644
index 0000000..f2c3585
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/floatwindow/HomeWatcher.java
@@ -0,0 +1,71 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.floatwindow;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+
+public class HomeWatcher {
+    private Context               mContext;
+    private IntentFilter          mFilter;
+    private OnHomePressedListener mListener;
+    private InnerReceiver         mReceiver;
+    private boolean               mIsRegisted;
+
+    public HomeWatcher(Context context) {
+        mContext = context.getApplicationContext();
+        mFilter = new IntentFilter(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
+        mReceiver = new InnerReceiver();
+    }
+
+    public void setOnHomePressedListener(OnHomePressedListener listener) {
+        mListener = listener;
+    }
+
+    public void startWatch() {
+        if (null != mReceiver && !mIsRegisted) {
+            mContext.registerReceiver(mReceiver, mFilter);
+            mIsRegisted = true;
+        }
+    }
+
+    public void stopWatch() {
+        try {
+            if (null != mReceiver) {
+                mIsRegisted = false;
+                mContext.unregisterReceiver(mReceiver);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    class InnerReceiver extends BroadcastReceiver {
+        private static final String SYSTEM_DIALOG_REASON_KEY            = "reason";
+        private static final String SYSTEM_DIALOG_REASON_GLOBAL_ACTIONS = "globalactions";
+        private static final String SYSTEM_DIALOG_REASON_RECENT_APPS    = "recentapps";
+        private static final String SYSTEM_DIALOG_REASON_HOME_KEY       = "homekey";
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (action != null && action.equals(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)) {
+                String reason = intent.getStringExtra(SYSTEM_DIALOG_REASON_KEY);
+                if (mListener != null) {
+                    if (SYSTEM_DIALOG_REASON_HOME_KEY.equals(reason)) {
+                        mListener.onHomePressed();
+                    } else if (SYSTEM_DIALOG_REASON_RECENT_APPS.equals(reason)) {
+                        mListener.onRecentAppsPressed();
+                    }
+                }
+            }
+        }
+    }
+
+    public interface OnHomePressedListener {
+        void onHomePressed();
+
+        void onRecentAppsPressed();
+    }
+}
+
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/BaseFunctionView.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/BaseFunctionView.java
new file mode 100644
index 0000000..070253b
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/BaseFunctionView.java
@@ -0,0 +1,73 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.function;
+
+import android.content.Context;
+import android.widget.RelativeLayout;
+
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.interfaces.ITUINotification;
+import com.tencent.qcloud.tuikit.TUICommonDefine;
+import com.tencent.qcloud.tuikit.tuicallkit.base.Constants;
+import com.tencent.qcloud.tuikit.tuicallkit.base.TUICallingAction;
+import com.tencent.qcloud.tuikit.tuicallkit.base.UserLayout;
+
+import java.util.Map;
+
+public abstract class BaseFunctionView extends RelativeLayout {
+    protected Context          mContext;
+    protected TUICallingAction mCallingAction;
+    protected UserLayout       mLocalUserLayout;
+
+    public BaseFunctionView(Context context) {
+        super(context);
+        mContext = context.getApplicationContext();
+        mCallingAction = new TUICallingAction(context);
+        registerEvent();
+    }
+
+    private void registerEvent() {
+        TUICore.registerEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_CAMERA_OPEN, mNotification);
+        TUICore.registerEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_MIC_STATUS_CHANGED,
+                mNotification);
+        TUICore.registerEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_AUDIOPLAYDEVICE_CHANGED,
+                mNotification);
+    }
+
+    private final ITUINotification mNotification = new ITUINotification() {
+        @Override
+        public void onNotifyEvent(String key, String subKey, Map<String, Object> param) {
+            if (Constants.EVENT_TUICALLING_CHANGED.equals(key) && param != null) {
+                switch (subKey) {
+                    case Constants.EVENT_SUB_CAMERA_OPEN:
+                        updateCameraOpenStatus((boolean) param.get(Constants.OPEN_CAMERA));
+                        break;
+                    case Constants.EVENT_SUB_MIC_STATUS_CHANGED:
+                        updateMicMuteStatus((Boolean) param.get(Constants.MUTE_MIC));
+                        break;
+                    case Constants.EVENT_SUB_AUDIOPLAYDEVICE_CHANGED:
+                        TUICommonDefine.AudioPlaybackDevice device =
+                                (TUICommonDefine.AudioPlaybackDevice) param.get(Constants.HANDS_FREE);
+                        updateAudioPlayDevice(TUICommonDefine.AudioPlaybackDevice.Speakerphone.equals(device));
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+    };
+
+    public void updateCameraOpenStatus(boolean isOpen) {
+    }
+
+    public void updateMicMuteStatus(boolean isMicMute) {
+    }
+
+    public void updateAudioPlayDevice(boolean isSpeaker) {
+    }
+
+    public void updateTextColor(int color) {
+    }
+
+    public void setLocalUserLayout(UserLayout layout) {
+        mLocalUserLayout = layout;
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingAudioFunctionView.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingAudioFunctionView.java
new file mode 100644
index 0000000..f1df83b
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingAudioFunctionView.java
@@ -0,0 +1,94 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.function;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.TUICommonDefine;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.base.TUICallingStatusManager;
+
+public class TUICallingAudioFunctionView extends BaseFunctionView {
+    private LinearLayout mLayoutMute;
+    private LinearLayout mLayoutHangup;
+    private LinearLayout mLayoutHandsFree;
+    private ImageView    mImageMute;
+    private ImageView    mImageHandsFree;
+
+    public TUICallingAudioFunctionView(Context context) {
+        super(context);
+        initView();
+        initListener();
+    }
+
+    private void initView() {
+        LayoutInflater.from(mContext).inflate(R.layout.tuicalling_funcation_view_audio, this);
+        mLayoutMute = findViewById(R.id.ll_mute);
+        mImageMute = findViewById(R.id.img_mute);
+        mLayoutHangup = findViewById(R.id.ll_hangup);
+        mLayoutHandsFree = findViewById(R.id.ll_handsfree);
+        mImageHandsFree = findViewById(R.id.img_handsfree);
+    }
+
+    private void initListener() {
+        mLayoutMute.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                boolean isMicMute = TUICallingStatusManager.sharedInstance(mContext).isMicMute();
+                if (isMicMute) {
+                    mCallingAction.openMicrophone(new TUICommonDefine.Callback() {
+                        @Override
+                        public void onSuccess() {
+
+                        }
+
+                        @Override
+                        public void onError(int errCode, String errMsg) {
+
+                        }
+                    });
+                } else {
+                    mCallingAction.closeMicrophone();
+                }
+                int resId = isMicMute ? R.string.tuicalling_toast_disable_mute : R.string.tuicalling_toast_enable_mute;
+                ToastUtil.toastShortMessage(mContext.getString(resId));
+            }
+        });
+        mLayoutHangup.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mCallingAction.hangup(null);
+            }
+        });
+
+        mLayoutHandsFree.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                boolean isSpeaker = TUICommonDefine.AudioPlaybackDevice.Speakerphone
+                        .equals(TUICallingStatusManager.sharedInstance(mContext).getAudioPlaybackDevice());
+                if (isSpeaker) {
+                    mCallingAction.selectAudioPlaybackDevice(TUICommonDefine.AudioPlaybackDevice.Earpiece);
+                } else {
+                    mCallingAction.selectAudioPlaybackDevice(TUICommonDefine.AudioPlaybackDevice.Speakerphone);
+                }
+                int resId = isSpeaker ? R.string.tuicalling_toast_use_handset : R.string.tuicalling_toast_speaker;
+                ToastUtil.toastShortMessage(mContext.getString(resId));
+            }
+        });
+    }
+
+    @Override
+    public void updateMicMuteStatus(boolean isMicMute) {
+        super.updateMicMuteStatus(isMicMute);
+        mImageMute.setActivated(isMicMute);
+    }
+
+    @Override
+    public void updateAudioPlayDevice(boolean isSpeaker) {
+        super.updateAudioPlayDevice(isSpeaker);
+        mImageHandsFree.setActivated(isSpeaker);
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingSwitchAudioView.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingSwitchAudioView.java
new file mode 100644
index 0000000..1fd0771
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingSwitchAudioView.java
@@ -0,0 +1,33 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.function;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.base.TUICallingAction;
+
+public class TUICallingSwitchAudioView extends RelativeLayout {
+    private final Context mContext;
+
+    public TUICallingSwitchAudioView(Context context) {
+        super(context);
+        mContext = context.getApplicationContext();
+        initView();
+    }
+
+    private void initView() {
+        LayoutInflater.from(mContext).inflate(R.layout.tuicalling_switch_audio_view, this);
+        LinearLayout layoutSwitchToAudio = findViewById(R.id.ll_switch_audio);
+        layoutSwitchToAudio.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                TUICallingAction callingAction = new TUICallingAction(mContext);
+                callingAction.switchCallMediaType(TUICallDefine.MediaType.Audio);
+            }
+        });
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingVideoFunctionView.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingVideoFunctionView.java
new file mode 100644
index 0000000..14e7884
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingVideoFunctionView.java
@@ -0,0 +1,131 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.function;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.TUICommonDefine;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.base.TUICallingStatusManager;
+
+public class TUICallingVideoFunctionView extends BaseFunctionView {
+    private LinearLayout mLayoutOpenCamera;
+    private LinearLayout mLayoutMute;
+    private LinearLayout mLayoutHandsFree;
+    private LinearLayout mLayoutHangup;
+    private ImageView    mImageOpenCamera;
+    private ImageView    mImageMute;
+    private ImageView    mImageHandsFree;
+    private ImageView    mImageSwitchCamera;
+
+    public TUICallingVideoFunctionView(Context context) {
+        super(context);
+        initView();
+        initClickListener();
+    }
+
+    private void initView() {
+        LayoutInflater.from(mContext).inflate(R.layout.tuicalling_funcation_view_video, this);
+        mLayoutMute = (LinearLayout) findViewById(R.id.ll_mute);
+        mImageMute = (ImageView) findViewById(R.id.iv_mute);
+        mLayoutHandsFree = (LinearLayout) findViewById(R.id.ll_handsfree);
+        mImageHandsFree = (ImageView) findViewById(R.id.iv_handsfree);
+        mLayoutOpenCamera = (LinearLayout) findViewById(R.id.ll_open_camera);
+        mImageOpenCamera = (ImageView) findViewById(R.id.img_camera);
+        mLayoutHangup = (LinearLayout) findViewById(R.id.ll_hangup);
+        mImageSwitchCamera = (ImageView) findViewById(R.id.switch_camera);
+    }
+
+    private void initClickListener() {
+        mLayoutMute.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                boolean isMicMute = TUICallingStatusManager.sharedInstance(mContext).isMicMute();
+                if (isMicMute) {
+                    mCallingAction.openMicrophone(new TUICommonDefine.Callback() {
+                        @Override
+                        public void onSuccess() {
+
+                        }
+
+                        @Override
+                        public void onError(int errCode, String errMsg) {
+
+                        }
+                    });
+                } else {
+                    mCallingAction.closeMicrophone();
+                }
+                int resId = isMicMute ? R.string.tuicalling_toast_disable_mute : R.string.tuicalling_toast_enable_mute;
+                ToastUtil.toastShortMessage(mContext.getString(resId));
+            }
+        });
+        mLayoutHandsFree.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                boolean isSpeaker = TUICommonDefine.AudioPlaybackDevice.Speakerphone
+                        .equals(TUICallingStatusManager.sharedInstance(mContext).getAudioPlaybackDevice());
+                if (isSpeaker) {
+                    mCallingAction.selectAudioPlaybackDevice(TUICommonDefine.AudioPlaybackDevice.Earpiece);
+                } else {
+                    mCallingAction.selectAudioPlaybackDevice(TUICommonDefine.AudioPlaybackDevice.Speakerphone);
+                }
+                int resId = isSpeaker ? R.string.tuicalling_toast_use_handset : R.string.tuicalling_toast_speaker;
+                ToastUtil.toastShortMessage(mContext.getString(resId));
+            }
+        });
+        mLayoutOpenCamera.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (TUICallingStatusManager.sharedInstance(mContext).isCameraOpen()) {
+                    mCallingAction.closeCamera();
+                    ToastUtil.toastShortMessage(mContext.getString(R.string.tuicalling_toast_disable_camera));
+                } else {
+                    if (null != mLocalUserLayout) {
+                        mCallingAction.openCamera(TUICallingStatusManager.sharedInstance(mContext).getFrontCamera(),
+                                mLocalUserLayout.getVideoView(), null);
+                        ToastUtil.toastShortMessage(mContext.getString(R.string.tuicalling_toast_enable_camera));
+                    }
+                }
+            }
+        });
+
+        mImageSwitchCamera.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                TUICommonDefine.Camera camera = TUICallingStatusManager.sharedInstance(mContext).getFrontCamera();
+                mCallingAction.switchCamera(TUICommonDefine.Camera.Front.equals(camera)
+                        ? TUICommonDefine.Camera.Back : TUICommonDefine.Camera.Front);
+                ToastUtil.toastShortMessage(mContext.getString(R.string.tuicalling_toast_switch_camera));
+            }
+        });
+
+        mLayoutHangup.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mCallingAction.hangup(null);
+            }
+        });
+    }
+
+    @Override
+    public void updateCameraOpenStatus(boolean isOpen) {
+        super.updateCameraOpenStatus(isOpen);
+        mImageOpenCamera.setActivated(isOpen);
+    }
+
+    @Override
+    public void updateMicMuteStatus(boolean isMicMute) {
+        super.updateMicMuteStatus(isMicMute);
+        mImageMute.setActivated(isMicMute);
+    }
+
+    @Override
+    public void updateAudioPlayDevice(boolean isSpeaker) {
+        super.updateAudioPlayDevice(isSpeaker);
+        mImageHandsFree.setActivated(isSpeaker);
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingVideoInviteFunctionView.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingVideoInviteFunctionView.java
new file mode 100644
index 0000000..927122c
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingVideoInviteFunctionView.java
@@ -0,0 +1,48 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.function;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.TUICommonDefine;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.base.TUICallingStatusManager;
+
+public class TUICallingVideoInviteFunctionView extends BaseFunctionView {
+    private LinearLayout mLayoutCancel;
+    private ImageView    mImageSwitchCamera;
+
+    public TUICallingVideoInviteFunctionView(Context context) {
+        super(context);
+        initView();
+        initClickListener();
+    }
+
+    private void initView() {
+        LayoutInflater.from(mContext).inflate(R.layout.tuicalling_funcation_view_video_inviting, this);
+        mLayoutCancel = findViewById(R.id.ll_cancel);
+        mImageSwitchCamera = findViewById(R.id.img_switch_camera);
+    }
+
+    private void initClickListener() {
+        mLayoutCancel.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mCallingAction.hangup(null);
+            }
+        });
+
+        mImageSwitchCamera.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                TUICommonDefine.Camera camera = TUICallingStatusManager.sharedInstance(mContext).getFrontCamera();
+                mCallingAction.switchCamera(TUICommonDefine.Camera.Front.equals(camera)
+                        ? TUICommonDefine.Camera.Back : TUICommonDefine.Camera.Front);
+                ToastUtil.toastShortMessage(mContext.getString(R.string.tuicalling_toast_switch_camera));
+            }
+        });
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingWaitFunctionView.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingWaitFunctionView.java
new file mode 100644
index 0000000..f1c2f86
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingWaitFunctionView.java
@@ -0,0 +1,52 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.function;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+
+public class TUICallingWaitFunctionView extends BaseFunctionView {
+    private LinearLayout mLayoutReject;
+    private LinearLayout mLayoutDialing;
+    private TextView     mTextReject;
+    private TextView     mTextDialing;
+
+    public TUICallingWaitFunctionView(Context context) {
+        super(context);
+        initView();
+        initListener();
+    }
+
+    private void initView() {
+        LayoutInflater.from(mContext).inflate(R.layout.tuicalling_funcation_view_audio_waiting, this);
+        mLayoutReject = findViewById(R.id.ll_decline);
+        mLayoutDialing = findViewById(R.id.ll_answer);
+        mTextReject = findViewById(R.id.tv_reject);
+        mTextDialing = findViewById(R.id.tv_dialing);
+    }
+
+    private void initListener() {
+        mLayoutReject.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mCallingAction.reject(null);
+            }
+        });
+
+        mLayoutDialing.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mCallingAction.accept(null);
+            }
+        });
+    }
+
+    @Override
+    public void updateTextColor(int color) {
+        mTextReject.setTextColor(color);
+        mTextDialing.setTextColor(color);
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/root/BaseCallView.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/root/BaseCallView.java
new file mode 100644
index 0000000..26452a5
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/root/BaseCallView.java
@@ -0,0 +1,77 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.root;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.RelativeLayout;
+
+import com.tencent.qcloud.tuikit.tuicallkit.base.CallingUserModel;
+import com.tencent.qcloud.tuikit.tuicallkit.base.TUICallingAction;
+
+public abstract class BaseCallView extends RelativeLayout {
+    protected Context          mContext;
+    protected TUICallingAction mCallingAction;
+
+    public BaseCallView(Context context) {
+        super(context);
+        mContext = context;
+        mCallingAction = new TUICallingAction(context);
+    }
+
+    public void userEnter(CallingUserModel userModel) {
+    }
+
+    public void userAdd(CallingUserModel userModel) {
+    }
+
+    public void userLeave(CallingUserModel userModel) {
+    }
+
+    public void updateUserInfo(CallingUserModel userModel) {
+    }
+
+    public void updateCallingHint(String hint) {
+    }
+
+    public void updateCallTimeView(String time) {
+    }
+
+    public void updateUserView(View view) {
+    }
+
+    public void updateFunctionView(View view) {
+    }
+
+    public void updateSwitchAudioView(View view) {
+    }
+
+    public void addOtherUserView(View view) {
+    }
+
+    public void enableFloatView(View view) {
+    }
+
+    public void enableAddUserView(View view) {
+    }
+
+    public void updateBackgroundColor(int color) {
+    }
+
+    public void updateTextColor(int color) {
+    }
+
+    public void finish() {
+        clearAllViews();
+        removeAllViews();
+        detachAllViewsFromParent();
+        onDetachedFromWindow();
+    }
+
+    public void clearAllViews() {
+        updateCallingHint("");
+        updateCallTimeView(null);
+        updateUserView(null);
+        updateFunctionView(null);
+        updateSwitchAudioView(null);
+        addOtherUserView(null);
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/root/TUICallingGroupView.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/root/TUICallingGroupView.java
new file mode 100644
index 0000000..b964124
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/root/TUICallingGroupView.java
@@ -0,0 +1,318 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.root;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuikit.TUICommonDefine;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.base.CallingUserModel;
+import com.tencent.qcloud.tuikit.tuicallkit.base.Constants;
+import com.tencent.qcloud.tuikit.tuicallkit.base.TUICallingStatusManager;
+import com.tencent.qcloud.tuikit.tuicallkit.base.UserLayout;
+import com.tencent.qcloud.tuikit.tuicallkit.base.UserLayoutEntity;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.DeviceUtils;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.DisplayUtils;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.ImageLoader;
+import com.tencent.qcloud.tuikit.tuicallkit.view.UserLayoutFactory;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+public class TUICallingGroupView extends BaseCallView {
+    private TextView          mTextCallHint;
+    private RelativeLayout    mLayoutFunction;
+    private TextView          mTextTime;
+    private UserLayoutFactory mUserLayoutFactory;
+    private View              mRootView;
+    private RelativeLayout    mLayoutFloatView;
+    private RelativeLayout    mLayoutAddUserView;
+    private RelativeLayout    mLayoutGroupManager;
+
+    private int     mCount     = 0;
+    private boolean mInitParam = false;
+
+    private ArrayList<LayoutParams> mGrid1ParamList;
+    private ArrayList<LayoutParams> mGrid2ParamList;
+    private ArrayList<LayoutParams> mGrid3ParamList;
+    private ArrayList<LayoutParams> mGrid4ParamList;
+    private ArrayList<LayoutParams> mGrid9ParamList;
+
+    public TUICallingGroupView(Context context, UserLayoutFactory factory) {
+        super(context);
+        mUserLayoutFactory = factory;
+        initView();
+        initData();
+    }
+
+    public void initView() {
+        mRootView = LayoutInflater.from(mContext).inflate(R.layout.tuicalling_background_group_view, this);
+        mLayoutGroupManager = findViewById(R.id.group_layout_manager);
+        mLayoutFloatView = findViewById(R.id.rl_float_view);
+        mLayoutAddUserView = findViewById(R.id.rl_add_user_view);
+        mTextCallHint = findViewById(R.id.tv_group_call_hint);
+        mTextTime = findViewById(R.id.tv_group_time);
+        mLayoutFunction = findViewById(R.id.rl_group_function);
+    }
+
+    private void initData() {
+        for (UserLayoutEntity entity : mUserLayoutFactory.mLayoutEntityList) {
+            if (null == entity || TextUtils.isEmpty(entity.userId)) {
+                continue;
+            }
+            UserLayout layout = allocUserLayout(entity.userModel);
+            TUICallDefine.MediaType mediaType = TUICallingStatusManager.sharedInstance(mContext).getMediaType();
+            if (entity.userId.equals(TUILogin.getLoginUser())) {
+                if (TUICallDefine.MediaType.Video.equals(mediaType)) {
+                    layout.setVideoAvailable(true);
+                    TUICommonDefine.Camera camera = TUICallingStatusManager.sharedInstance(mContext).getFrontCamera();
+                    mCallingAction.openCamera(camera, layout.getVideoView(), null);
+                } else {
+                    ImageLoader.loadImage(mContext, entity.layout.getAvatarImage(), TUILogin.getFaceUrl(),
+                            R.drawable.tuicalling_ic_avatar);
+                    entity.layout.setUserName(TUILogin.getNickName());
+                }
+            } else {
+                if (null != entity.userModel) {
+                    if (TUICallDefine.MediaType.Video.equals(mediaType) && entity.userModel.isVideoAvailable) {
+                        layout.setVideoAvailable(true);
+                        mCallingAction.startRemoteView(entity.userId, layout.getVideoView(), null);
+                    }
+                    ImageLoader.loadImage(mContext, entity.layout.getAvatarImage(), entity.userModel.userAvatar,
+                            R.drawable.tuicalling_ic_avatar);
+                    entity.layout.setUserName(entity.userModel.userName);
+                    if (entity.userModel.isEnter) {
+                        entity.layout.stopLoading();
+                    } else {
+                        entity.layout.startLoading();
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public void userEnter(CallingUserModel userModel) {
+        super.userEnter(userModel);
+        UserLayout layout = mUserLayoutFactory.findUserLayout(userModel.userId);
+        if (null == layout) {
+            layout = allocUserLayout(userModel);
+        }
+        if (layout == null) {
+            return;
+        }
+        layout.stopLoading();
+        TUICallDefine.MediaType mediaType = TUICallingStatusManager.sharedInstance(mContext).getMediaType();
+        layout.setVideoAvailable(TUICallDefine.MediaType.Video.equals(mediaType));
+        if (TUICallDefine.MediaType.Video.equals(mediaType)) {
+            mCallingAction.startRemoteView(userModel.userId, layout.getVideoView(), null);
+        } else {
+            ImageLoader.loadImage(mContext, layout.getAvatarImage(), userModel.userAvatar,
+                    R.drawable.tuicalling_ic_avatar);
+        }
+    }
+
+    @Override
+    public void userAdd(CallingUserModel userModel) {
+        super.userAdd(userModel);
+        UserLayout layout = mUserLayoutFactory.findUserLayout(userModel.userId);
+        if (null == layout) {
+            layout = allocUserLayout(userModel);
+        }
+        if (layout == null) {
+            return;
+        }
+        layout.startLoading();
+        TUICallDefine.MediaType mediaType = TUICallingStatusManager.sharedInstance(mContext).getMediaType();
+        layout.setVideoAvailable(TUICallDefine.MediaType.Video.equals(mediaType));
+        if (TUICallDefine.MediaType.Video.equals(mediaType)) {
+            mCallingAction.startRemoteView(userModel.userId, layout.getVideoView(), null);
+        } else {
+            ImageLoader.loadImage(mContext, layout.getAvatarImage(), userModel.userAvatar,
+                    R.drawable.tuicalling_ic_avatar);
+        }
+    }
+
+    @Override
+    public void userLeave(CallingUserModel userModel) {
+        super.userLeave(userModel);
+        if (null != userModel) {
+            recyclerUserLayout(userModel.userId);
+            mCallingAction.stopRemoteView(userModel.userId);
+        }
+    }
+
+    @Override
+    public void updateUserInfo(CallingUserModel userModel) {
+        super.updateUserInfo(userModel);
+        UserLayout userLayout = mUserLayoutFactory.findUserLayout(userModel.userId);
+        if (null != userLayout) {
+            userLayout.setVideoAvailable(userModel.isVideoAvailable);
+            ImageLoader.loadImage(mContext, userLayout.getAvatarImage(), userModel.userAvatar,
+                    R.drawable.tuicalling_ic_avatar);
+        }
+    }
+
+    @Override
+    public void updateCallingHint(String hint) {
+        super.updateCallingHint(hint);
+        mTextCallHint.setText(hint);
+        mTextCallHint.setVisibility(TextUtils.isEmpty(hint) ? GONE : VISIBLE);
+    }
+
+    @Override
+    public void updateCallTimeView(String time) {
+        mTextTime.setText(time);
+        mTextTime.setVisibility(TextUtils.isEmpty(time) ? GONE : VISIBLE);
+    }
+
+    @Override
+    public void updateFunctionView(View view) {
+        mLayoutFunction.removeAllViews();
+        if (null != view) {
+            mLayoutFunction.addView(view);
+        }
+    }
+
+    @Override
+    public void updateBackgroundColor(int color) {
+        mRootView.setBackgroundColor(color);
+    }
+
+    @Override
+    public void updateTextColor(int color) {
+        super.updateTextColor(color);
+        mTextCallHint.setTextColor(color);
+        mTextTime.setTextColor(color);
+    }
+
+    @Override
+    public void enableFloatView(View view) {
+        mLayoutFloatView.removeAllViews();
+        if (null != view) {
+            mLayoutFloatView.addView(view);
+        }
+    }
+
+    @Override
+    public void enableAddUserView(View view) {
+        mLayoutAddUserView.removeAllViews();
+        if (null != view) {
+            mLayoutAddUserView.addView(view);
+        }
+    }
+
+    @Override
+    public void finish() {
+        if (null != mLayoutGroupManager) {
+            recyclerAllUserLayout();
+        }
+        super.finish();
+    }
+
+    private UserLayout allocUserLayout(CallingUserModel userModel) {
+        if (null == userModel || TextUtils.isEmpty(userModel.userId)) {
+            return null;
+        }
+        if (mCount > Constants.MAX_USER) {
+            return null;
+        }
+        UserLayout userLayout = mUserLayoutFactory.allocUserLayout(userModel);
+        if (null != userLayout.getParent()) {
+            ((ViewGroup) userLayout.getParent()).removeView(userLayout);
+        }
+        mLayoutGroupManager.addView(userLayout);
+        mCount++;
+        post(new Runnable() {
+            @Override
+            public void run() {
+                makeGirdLayout(true);
+            }
+        });
+        return userLayout;
+    }
+
+    private void recyclerUserLayout(String userId) {
+        if (TextUtils.isEmpty(userId)) {
+            return;
+        }
+        Iterator iterator = mUserLayoutFactory.mLayoutEntityList.iterator();
+        while (iterator.hasNext()) {
+            UserLayoutEntity item = (UserLayoutEntity) iterator.next();
+            if (userId.equals(item.userId)) {
+                mLayoutGroupManager.removeView(item.layout);
+                iterator.remove();
+                mCount--;
+                break;
+            }
+        }
+        post(new Runnable() {
+            @Override
+            public void run() {
+                makeGirdLayout(true);
+            }
+        });
+    }
+
+    private void recyclerAllUserLayout() {
+        if (null == mUserLayoutFactory) {
+            return;
+        }
+        Iterator iterator = mUserLayoutFactory.mLayoutEntityList.iterator();
+        while (iterator.hasNext()) {
+            UserLayoutEntity item = (UserLayoutEntity) iterator.next();
+            mLayoutGroupManager.removeView(item.layout);
+            iterator.remove();
+        }
+        mCount = 0;
+    }
+
+    private void makeGirdLayout(boolean needUpdate) {
+        if (!mInitParam) {
+            int width = DeviceUtils.getScreenWidth(mContext);
+            int height = DeviceUtils.getScreenHeight(mContext);
+            int size = Math.min(width, height);
+            mGrid1ParamList = DisplayUtils.initGrid1Param(getContext(), size, size);
+            mGrid2ParamList = DisplayUtils.initGrid2Param(getContext(), size, size);
+            mGrid3ParamList = DisplayUtils.initGrid3Param(getContext(), size, size);
+            mGrid4ParamList = DisplayUtils.initGrid4Param(getContext(), size, size);
+            mGrid9ParamList = DisplayUtils.initGrid9Param(getContext(), size, size);
+            mInitParam = true;
+        }
+        if (null == mUserLayoutFactory || mUserLayoutFactory.mLayoutEntityList.isEmpty()) {
+            return;
+        }
+        if (needUpdate) {
+            ArrayList<LayoutParams> paramList;
+            if (mCount <= 1) {
+                paramList = mGrid1ParamList;
+                UserLayoutEntity entity = mUserLayoutFactory.mLayoutEntityList.get(0);
+                entity.layout.setLayoutParams(paramList.get(0));
+                return;
+            } else if (mCount == 2) {
+                paramList = mGrid2ParamList;
+            } else if (mCount == 3) {
+                paramList = mGrid3ParamList;
+            } else if (mCount == 4) {
+                paramList = mGrid4ParamList;
+            } else {
+                paramList = mGrid9ParamList;
+            }
+            int layoutIndex = TextUtils.isEmpty(TUILogin.getLoginUser()) ? 0 : 1;
+            for (int i = 0; i < mUserLayoutFactory.mLayoutEntityList.size(); i++) {
+                UserLayoutEntity entity = mUserLayoutFactory.mLayoutEntityList.get(i);
+                if (entity.userId.equals(TUILogin.getLoginUser())) {
+                    entity.layout.setLayoutParams(paramList.get(0));
+                } else if (layoutIndex < paramList.size()) {
+                    entity.layout.setLayoutParams(paramList.get(layoutIndex++));
+                }
+            }
+        }
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/root/TUICallingImageView.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/root/TUICallingImageView.java
new file mode 100644
index 0000000..3c274bb
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/root/TUICallingImageView.java
@@ -0,0 +1,107 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.root;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+
+public class TUICallingImageView extends BaseCallView {
+    private Context        mContext;
+    private RelativeLayout mLayoutUserView;
+    private LinearLayout   mLayoutOtherUserContainer;
+    private RelativeLayout mLayoutFunction;
+    private TextView       mTextTime;
+    private TextView       mTextCallHint;
+    private View           mRootView;
+    private RelativeLayout mLayoutFloatView;
+    private RelativeLayout mLayoutAddUserView;
+
+    public TUICallingImageView(Context context) {
+        super(context);
+        mContext = context;
+        initView();
+    }
+
+    public void initView() {
+        mRootView = LayoutInflater.from(mContext).inflate(R.layout.tuicalling_background_image_view, this);
+        mLayoutFloatView = findViewById(R.id.rl_float_view);
+        mLayoutAddUserView = findViewById(R.id.rl_add_user_view);
+        mLayoutUserView = findViewById(R.id.rl_single_audio_view);
+        mTextCallHint = findViewById(R.id.tv_call_hint);
+        mLayoutOtherUserContainer = findViewById(R.id.ll_other_user_container);
+        mTextTime = findViewById(R.id.tv_image_time);
+        mLayoutFunction = findViewById(R.id.rl_image_function);
+    }
+
+    @Override
+    public void updateUserView(View view) {
+        super.updateUserView(view);
+        mLayoutUserView.removeAllViews();
+        if (null != view) {
+            mLayoutUserView.addView(view);
+        }
+    }
+
+    @Override
+    public void addOtherUserView(View view) {
+        super.addOtherUserView(view);
+        mLayoutOtherUserContainer.removeAllViews();
+        if (null != view) {
+            mLayoutOtherUserContainer.addView(view);
+        }
+    }
+
+    @Override
+    public void updateCallingHint(String hint) {
+        super.updateCallingHint(hint);
+        mTextCallHint.setText(hint);
+        mTextCallHint.setVisibility(TextUtils.isEmpty(hint) ? GONE : VISIBLE);
+    }
+
+    @Override
+    public void updateCallTimeView(String time) {
+        mTextTime.setText(time);
+        mTextTime.setVisibility(TextUtils.isEmpty(time) ? GONE : VISIBLE);
+    }
+
+    @Override
+    public void updateFunctionView(View view) {
+        mLayoutFunction.removeAllViews();
+        if (null != view) {
+            mLayoutFunction.addView(view);
+        }
+    }
+
+    @Override
+    public void updateBackgroundColor(int color) {
+        mRootView.setBackgroundColor(color);
+    }
+
+    @Override
+    public void updateTextColor(int color) {
+        super.updateTextColor(color);
+        mTextCallHint.setTextColor(color);
+        mTextTime.setTextColor(color);
+    }
+
+    @Override
+    public void enableFloatView(View view) {
+        mLayoutFloatView.removeAllViews();
+        if (null != view) {
+            mLayoutFloatView.addView(view);
+        }
+    }
+
+    @Override
+    public void enableAddUserView(View view) {
+        mLayoutAddUserView.removeAllViews();
+        if (null != view) {
+            mLayoutAddUserView.addView(view);
+        }
+    }
+}
diff --git a/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/root/TUICallingSingleView.java b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/root/TUICallingSingleView.java
new file mode 100644
index 0000000..3f6a905
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/root/TUICallingSingleView.java
@@ -0,0 +1,283 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.root;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.GestureDetector;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuikit.TUICommonDefine;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.base.CallingUserModel;
+import com.tencent.qcloud.tuikit.tuicallkit.base.TUICallingStatusManager;
+import com.tencent.qcloud.tuikit.tuicallkit.base.UserLayout;
+import com.tencent.qcloud.tuikit.tuicallkit.base.UserLayoutEntity;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.DisplayUtils;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.ImageLoader;
+import com.tencent.qcloud.tuikit.tuicallkit.view.UserLayoutFactory;
+import com.tencent.qcloud.tuikit.tuicallkit.view.common.RoundCornerImageView;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+public class TUICallingSingleView extends BaseCallView {
+    private Context           mContext;
+    private UserLayoutFactory mUserLayoutFactory;
+    private TextView          mTextTime;
+    private RelativeLayout    mLayoutUserWaitView;
+    private RelativeLayout    mLayoutSwitchAudio;
+    private RelativeLayout    mLayoutFunction;
+    private RelativeLayout    mLayoutFloatView;
+    private RelativeLayout    mLayoutUserContainer;
+
+    private ArrayList<LayoutParams> mFloatParamList;
+    private int                     mCount = 0;
+
+    public TUICallingSingleView(Context context, UserLayoutFactory factory) {
+        super(context);
+        mContext = context.getApplicationContext();
+        mUserLayoutFactory = factory;
+        initView();
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        initData();
+    }
+
+    public void initView() {
+        LayoutInflater.from(mContext).inflate(R.layout.tuicalling_background_single_view, this);
+        mLayoutUserContainer = findViewById(R.id.rl_video_container);
+        mLayoutFloatView = findViewById(R.id.rl_float_view);
+        mLayoutUserWaitView = findViewById(R.id.rl_single_video_user);
+        mLayoutSwitchAudio = findViewById(R.id.rl_switch_audio);
+        mTextTime = findViewById(R.id.tv_single_time);
+        mLayoutFunction = findViewById(R.id.rl_single_function);
+    }
+
+    private void initData() {
+        for (UserLayoutEntity entity : mUserLayoutFactory.mLayoutEntityList) {
+            if (null != entity && !TextUtils.isEmpty(entity.userId) && entity.userId.equals(TUILogin.getLoginUser())) {
+                UserLayout layout = allocUserLayout(entity.userModel);
+                if (layout == null) {
+                    continue;
+                }
+                layout.setVideoAvailable(true);
+                if (!TUICallingStatusManager.sharedInstance(mContext).isCameraOpen()) {
+                    TUICommonDefine.Camera camera = TUICallingStatusManager.sharedInstance(mContext).getFrontCamera();
+                    mCallingAction.openCamera(camera, layout.getVideoView(), null);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void userEnter(CallingUserModel userModel) {
+        super.userEnter(userModel);
+        UserLayout layout = findUserLayout(userModel.userId);
+        if (null == layout) {
+            layout = allocUserLayout(userModel);
+        }
+
+        layout.setVideoAvailable(userModel.isVideoAvailable);
+        mCallingAction.startRemoteView(userModel.userId, layout.getVideoView(), null);
+    }
+
+    public void updateUserInfo(CallingUserModel userModel) {
+        super.updateUserInfo(userModel);
+        UserLayout layout = findUserLayout(userModel.userId);
+        if (layout != null) {
+            layout.setVideoAvailable(userModel.isVideoAvailable);
+            ImageLoader.loadImage(mContext, layout.getAvatarImage(), userModel.userAvatar,
+                    R.drawable.tuicalling_ic_avatar);
+        }
+    }
+
+    @Override
+    public void updateUserView(View view) {
+        super.updateUserView(view);
+        mLayoutUserWaitView.removeAllViews();
+        if (null != view) {
+            mLayoutUserWaitView.addView(view);
+        }
+    }
+
+    @Override
+    public void updateSwitchAudioView(View view) {
+        mLayoutSwitchAudio.removeAllViews();
+        if (null != view) {
+            mLayoutSwitchAudio.addView(view);
+        }
+    }
+
+    @Override
+    public void updateCallTimeView(String time) {
+        mTextTime.setText(time);
+        mTextTime.setVisibility(TextUtils.isEmpty(time) ? GONE : VISIBLE);
+    }
+
+    @Override
+    public void updateTextColor(int color) {
+        super.updateTextColor(color);
+        mTextTime.setTextColor(color);
+    }
+
+    @Override
+    public void updateFunctionView(View view) {
+        mLayoutFunction.removeAllViews();
+        if (null != view) {
+            mLayoutFunction.addView(view);
+        }
+    }
+
+    @Override
+    public void enableFloatView(View view) {
+        mLayoutFloatView.removeAllViews();
+        if (null != view) {
+            mLayoutFloatView.addView(view);
+        }
+    }
+
+    public void finish() {
+        recyclerAllUserLayout();
+        super.finish();
+    }
+
+    private UserLayout findUserLayout(String userId) {
+        if (TextUtils.isEmpty(userId)) {
+            return null;
+        }
+        return (null == mUserLayoutFactory) ? null : mUserLayoutFactory.findUserLayout(userId);
+    }
+
+    private UserLayout allocUserLayout(CallingUserModel userModel) {
+        if (null == userModel || TextUtils.isEmpty(userModel.userId)) {
+            return null;
+        }
+        UserLayout userLayout = mUserLayoutFactory.allocUserLayout(userModel);
+        if (null != userLayout.getParent()) {
+            ((ViewGroup) userLayout.getParent()).removeView(userLayout);
+        }
+        initGestureListener(userLayout);
+        userLayout.setVisibility(VISIBLE);
+        userLayout.disableAudioImage(true);
+        RelativeLayout.LayoutParams lp = new LayoutParams(180, 180);
+        lp.addRule(CENTER_IN_PARENT);
+        ((RoundCornerImageView) userLayout.getAvatarImage()).setRadius(15);
+        userLayout.getAvatarImage().setLayoutParams(lp);
+        mLayoutUserContainer.addView(userLayout);
+        mCount++;
+        this.post(new Runnable() {
+            @Override
+            public void run() {
+                makeFloatLayout();
+            }
+        });
+        return userLayout;
+    }
+
+    private void recyclerAllUserLayout() {
+        if (null == mUserLayoutFactory || null == mLayoutUserContainer) {
+            return;
+        }
+        Iterator iterator = mUserLayoutFactory.mLayoutEntityList.iterator();
+        while (iterator.hasNext()) {
+            UserLayoutEntity item = (UserLayoutEntity) iterator.next();
+            mLayoutUserContainer.removeView(item.layout);
+            iterator.remove();
+        }
+        mCount = 0;
+    }
+
+    private void initGestureListener(UserLayout layout) {
+        GestureDetector detector = new GestureDetector(getContext(), new GestureDetector.SimpleOnGestureListener() {
+            @Override
+            public boolean onSingleTapUp(MotionEvent e) {
+                layout.performClick();
+                return false;
+            }
+
+            @Override
+            public boolean onDown(MotionEvent e) {
+                return true;
+            }
+
+            @Override
+            public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
+                if (!layout.isMoveAble()) {
+                    return false;
+                }
+                ViewGroup.LayoutParams params = layout.getLayoutParams();
+                if (params instanceof LayoutParams) {
+                    LayoutParams layoutParams = (LayoutParams) layout.getLayoutParams();
+                    int newX = (int) (layoutParams.leftMargin + (e2.getX() - e1.getX()));
+                    int newY = (int) (layoutParams.topMargin + (e2.getY() - e1.getY()));
+                    if (newX >= 0 && newX <= (getWidth() - layout.getWidth())
+                            && newY >= 0 && newY <= (getHeight() - layout.getHeight())) {
+                        layoutParams.leftMargin = newX;
+                        layoutParams.topMargin = newY;
+                        layout.setLayoutParams(layoutParams);
+                    }
+                }
+                return true;
+            }
+        });
+        layout.setOnTouchListener(new OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                return detector.onTouchEvent(event);
+            }
+        });
+    }
+
+    private UserLayoutEntity findEntity(String userId) {
+        for (UserLayoutEntity entity : mUserLayoutFactory.mLayoutEntityList) {
+            if (entity.userId.equals(userId)) {
+                return entity;
+            }
+        }
+        return null;
+    }
+
+    private void makeFloatLayout() {
+        if (null == mFloatParamList || mFloatParamList.size() == 0) {
+            mFloatParamList = DisplayUtils.initFloatParamList(getContext(), getWidth(), getHeight());
+        }
+
+        int size = mUserLayoutFactory.mLayoutEntityList.size();
+        for (int i = 0; i < size; i++) {
+            UserLayoutEntity entity = mUserLayoutFactory.mLayoutEntityList.get(size - i - 1);
+            LayoutParams layoutParams = mFloatParamList.get(i);
+
+            entity.layout.setLayoutParams(layoutParams);
+            entity.layout.setMoveAble(i != 0);
+            addFloatViewClickListener(entity);
+            entity.layout.bringToFront();
+        }
+    }
+
+    private void addFloatViewClickListener(UserLayoutEntity entity) {
+        final String userId = entity.userId;
+        entity.layout.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (!TextUtils.isEmpty(userId)) {
+                    makeFullVideoView(userId);
+                }
+            }
+        });
+    }
+
+    private void makeFullVideoView(String userId) {
+        UserLayoutEntity entity = findEntity(userId);
+        mUserLayoutFactory.mLayoutEntityList.remove(entity);
+        mUserLayoutFactory.mLayoutEntityList.addLast(entity);
+        makeFloatLayout();
+    }
+}
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_add_user_black.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_add_user_black.png
new file mode 100644
index 0000000..d38955d
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_add_user_black.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_add_user_white.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_add_user_white.png
new file mode 100644
index 0000000..dc9b9e3
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_add_user_white.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_audio_call.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_audio_call.png
new file mode 100644
index 0000000..d27271e
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_audio_call.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_avatar.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_avatar.png
new file mode 100644
index 0000000..4ab41ba
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_avatar.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_camera_disable.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_camera_disable.png
new file mode 100644
index 0000000..2093ad2
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_camera_disable.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_camera_enable.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_camera_enable.png
new file mode 100644
index 0000000..c4c00b0
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_camera_enable.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_dialing.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_dialing.png
new file mode 100644
index 0000000..c762da9
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_dialing.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_dialing_pressed.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_dialing_pressed.png
new file mode 100644
index 0000000..5f5c8ee
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_dialing_pressed.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_float.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_float.png
new file mode 100644
index 0000000..949ae2b
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_float.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_handsfree_disable.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_handsfree_disable.png
new file mode 100644
index 0000000..4042495
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_handsfree_disable.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_handsfree_enable.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_handsfree_enable.png
new file mode 100644
index 0000000..5ec86ca
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_handsfree_enable.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_hangup.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_hangup.png
new file mode 100644
index 0000000..eafab69
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_hangup.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_hangup_pressed.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_hangup_pressed.png
new file mode 100644
index 0000000..ca23295
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_hangup_pressed.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_mic_mute.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_mic_mute.png
new file mode 100644
index 0000000..8a13b6d
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_mic_mute.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_mic_unmute.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_mic_unmute.png
new file mode 100644
index 0000000..f0b9978
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_mic_unmute.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_move_back_black.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_move_back_black.png
new file mode 100644
index 0000000..e25df37
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_move_back_black.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_move_back_white.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_move_back_white.png
new file mode 100644
index 0000000..3f63ba0
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_move_back_white.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_switch_camera.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_switch_camera.png
new file mode 100644
index 0000000..6159919
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_switch_camera.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_switch_to_audio_call.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_switch_to_audio_call.png
new file mode 100644
index 0000000..1bbcea7
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_switch_to_audio_call.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_video_call.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_video_call.png
new file mode 100644
index 0000000..4baa9ef
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_ic_video_call.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_loading.gif b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_loading.gif
new file mode 100644
index 0000000..33b7aa0
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicalling_loading.gif differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_chat_title_bar_minimalist_audio_call_icon.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_chat_title_bar_minimalist_audio_call_icon.png
new file mode 100644
index 0000000..38a2476
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_chat_title_bar_minimalist_audio_call_icon.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_chat_title_bar_minimalist_video_call_icon.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_chat_title_bar_minimalist_video_call_icon.png
new file mode 100644
index 0000000..f4a8c12
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_chat_title_bar_minimalist_video_call_icon.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_check_box_group_selected.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_check_box_group_selected.png
new file mode 100644
index 0000000..273e525
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_check_box_group_selected.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_check_box_group_unselected.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_check_box_group_unselected.png
new file mode 100644
index 0000000..949bc8b
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_check_box_group_unselected.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_checkbox_selected.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_checkbox_selected.png
new file mode 100644
index 0000000..cdda5d4
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_checkbox_selected.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_group_select_disable.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_group_select_disable.png
new file mode 100644
index 0000000..3244854
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_group_select_disable.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_ic_audio_call.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_ic_audio_call.png
new file mode 100644
index 0000000..5afc89d
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_ic_audio_call.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_ic_back.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_ic_back.png
new file mode 100644
index 0000000..8d34527
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_ic_back.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_ic_delete.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_ic_delete.png
new file mode 100644
index 0000000..85fc5c9
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_ic_delete.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_ic_edit.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_ic_edit.png
new file mode 100644
index 0000000..76c5cb2
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_ic_edit.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_ic_more_info.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_ic_more_info.png
new file mode 100644
index 0000000..1aee710
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_ic_more_info.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_ic_start_call.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_ic_start_call.png
new file mode 100644
index 0000000..a7affb3
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_ic_start_call.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_profile_minimalist_audio_icon.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_profile_minimalist_audio_icon.png
new file mode 100644
index 0000000..5a3619a
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_profile_minimalist_audio_icon.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_profile_minimalist_video_icon.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_profile_minimalist_video_icon.png
new file mode 100644
index 0000000..816242b
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_profile_minimalist_video_icon.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_record_ic_video_call.png b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_record_ic_video_call.png
new file mode 100644
index 0000000..a0cb77b
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/drawable-xxhdpi/tuicallkit_record_ic_video_call.png differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicalling_bg_camera.xml b/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicalling_bg_camera.xml
new file mode 100644
index 0000000..a16ee12
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicalling_bg_camera.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/tuicalling_ic_camera_disable" android:state_activated="false" android:state_enabled="true" />
+    <item android:drawable="@drawable/tuicalling_ic_camera_enable" android:state_activated="true" android:state_enabled="true" />
+</selector>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicalling_bg_dialing.xml b/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicalling_bg_dialing.xml
new file mode 100644
index 0000000..b0fc0e4
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicalling_bg_dialing.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/tuicalling_ic_dialing_pressed" android:state_pressed="true" android:state_enabled="true" />
+    <item android:drawable="@drawable/tuicalling_ic_dialing" android:state_pressed="false" android:state_enabled="true" />
+</selector>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicalling_bg_floatwindow.xml b/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicalling_bg_floatwindow.xml
new file mode 100644
index 0000000..2f71f9d
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicalling_bg_floatwindow.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/tuicalling_color_white" />
+    <corners android:radius="15dp" />
+</shape>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicalling_bg_floatwindow_left.xml b/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicalling_bg_floatwindow_left.xml
new file mode 100644
index 0000000..dcb4ade
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicalling_bg_floatwindow_left.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/tuicalling_color_bg_float_view" />
+    <corners
+        android:bottomRightRadius="15dp"
+        android:topRightRadius="15dp" />
+</shape>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicalling_bg_floatwindow_right.xml b/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicalling_bg_floatwindow_right.xml
new file mode 100644
index 0000000..a79469c
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicalling_bg_floatwindow_right.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/tuicalling_color_bg_float_view" />
+    <corners
+        android:bottomLeftRadius="15dp"
+        android:topLeftRadius="15dp" />
+</shape>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicalling_bg_handsfree.xml b/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicalling_bg_handsfree.xml
new file mode 100644
index 0000000..d7494ea
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicalling_bg_handsfree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/tuicalling_ic_handsfree_enable" android:state_activated="true" android:state_enabled="true" />
+    <item android:drawable="@drawable/tuicalling_ic_handsfree_disable" android:state_activated="false" android:state_enabled="true" />
+</selector>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicalling_bg_hangup.xml b/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicalling_bg_hangup.xml
new file mode 100644
index 0000000..ec598b8
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicalling_bg_hangup.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/tuicalling_ic_hangup_pressed" android:state_enabled="true" android:state_pressed="true" />
+    <item android:drawable="@drawable/tuicalling_ic_hangup" android:state_enabled="true" android:state_pressed="false" />
+</selector>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicalling_bg_mute_mic.xml b/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicalling_bg_mute_mic.xml
new file mode 100644
index 0000000..759e2ed
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicalling_bg_mute_mic.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/tuicalling_ic_mic_unmute" android:state_activated="true" android:state_enabled="true" />
+    <item android:drawable="@drawable/tuicalling_ic_mic_mute" android:state_activated="false" android:state_enabled="true" />
+</selector>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicallkit_dialog_cancel.xml b/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicallkit_dialog_cancel.xml
new file mode 100644
index 0000000..b4fdd77
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicallkit_dialog_cancel.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#FFFFFF" />
+    <corners android:radius="12dp" />
+</shape>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicallkit_dialog_sure.xml b/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicallkit_dialog_sure.xml
new file mode 100644
index 0000000..bca92ac
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicallkit_dialog_sure.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#F2F2F2" />
+    <corners android:radius="12dp" />
+</shape>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicallkit_group_checkbox_selector.xml b/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicallkit_group_checkbox_selector.xml
new file mode 100644
index 0000000..b8465c6
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicallkit_group_checkbox_selector.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/tuicallkit_check_box_group_selected" android:state_checked="true" android:state_enabled="true" />
+    <item android:drawable="@drawable/tuicallkit_group_select_disable" android:state_checked="true" android:state_enabled="false" />
+    <item android:drawable="@drawable/tuicallkit_check_box_group_unselected" android:state_checked="false" />
+    <item android:drawable="@drawable/tuicallkit_check_box_group_unselected" />
+
+</selector>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicallkit_tab_item_selector.xml b/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicallkit_tab_item_selector.xml
new file mode 100644
index 0000000..02ec0bf
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicallkit_tab_item_selector.xml
@@ -0,0 +1,16 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true">
+        <shape android:shape="rectangle">
+            <stroke android:width="2dp" android:color="@color/tuicalling_color_transparent" />
+            <solid android:color="@color/white" />
+            <corners android:radius="8.91dp" />
+        </shape>
+    </item>
+    <item android:state_selected="false">
+        <shape android:shape="rectangle">
+            <stroke android:width="2dp" android:color="@color/tuicalling_color_transparent" />
+            <solid android:color="#EFEFF4" />
+            <corners android:radius="8.91dp" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicallkit_tab_selector.xml b/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicallkit_tab_selector.xml
new file mode 100644
index 0000000..ef9fd21
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/drawable/tuicallkit_tab_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#EFEFF4" />
+    <corners android:radius="8.91dp" />
+</shape>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_background_group_view.xml b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_background_group_view.xml
new file mode 100644
index 0000000..d92b618
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_background_group_view.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/gl_horizontal_top"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_begin="20dp" />
+
+    <RelativeLayout
+        android:id="@+id/group_layout_manager"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/rl_add_user_view" />
+
+    <RelativeLayout
+        android:id="@+id/rl_float_view"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginStart="20dp"
+        android:background="@color/tuicalling_color_transparent"
+        app:layout_constraintBottom_toBottomOf="@+id/rl_add_user_view"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/rl_add_user_view" />
+
+    <RelativeLayout
+        android:id="@+id/rl_add_user_view"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginEnd="20dp"
+        android:background="@color/tuicalling_color_transparent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_top" />
+
+    <TextView
+        android:id="@+id/tv_group_call_hint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@id/tv_group_time"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/group_layout_manager" />
+
+
+    <TextView
+        android:id="@+id/tv_group_time"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:textSize="12sp"
+        android:visibility="visible"
+        app:layout_constraintBottom_toTopOf="@+id/rl_group_function"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <RelativeLayout
+        android:id="@+id/rl_group_function"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_background_image_view.xml b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_background_image_view.xml
new file mode 100644
index 0000000..a398fd3
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_background_image_view.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/cl_root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/gl_horizontal_top"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_begin="20dp" />
+
+    <RelativeLayout
+        android:id="@+id/rl_single_audio_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="98dp"
+        android:gravity="center_horizontal"
+        app:layout_constraintBottom_toTopOf="@id/tv_call_hint"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/gl_horizontal_top" />
+
+    <RelativeLayout
+        android:id="@+id/rl_float_view"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginTop="32dp"
+        android:background="@color/tuicalling_color_transparent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/gl_horizontal_top" />
+
+    <RelativeLayout
+        android:id="@+id/rl_add_user_view"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginRight="20dp"
+        android:background="@color/tuicalling_color_transparent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/gl_horizontal_top" />
+
+    <TextView
+        android:id="@+id/tv_call_hint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="12dp"
+        android:textColor="@color/tuicalling_color_black"
+        android:textSize="14sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/rl_single_audio_view" />
+
+    <LinearLayout
+        android:id="@+id/ll_other_user_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:gravity="center"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_call_hint" />
+
+    <TextView
+        android:id="@+id/tv_image_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="12dp"
+        android:textSize="12sp"
+        app:layout_constraintBottom_toTopOf="@+id/rl_image_function"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <RelativeLayout
+        android:id="@+id/rl_image_function"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_background_single_view.xml b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_background_single_view.xml
new file mode 100644
index 0000000..b91d24c
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_background_single_view.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/cl_root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/tuicalling_color_video_background">
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/gl_horizontal_top"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_begin="20dp" />
+
+    <RelativeLayout
+        android:id="@+id/rl_video_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <RelativeLayout
+        android:id="@+id/rl_float_view"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginStart="20dp"
+        app:layout_constraintBottom_toBottomOf="@+id/rl_single_video_user"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/rl_single_video_user" />
+
+    <RelativeLayout
+        android:id="@+id/rl_single_video_user"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="64dp"
+        android:layout_marginEnd="20dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_top" />
+
+    <TextView
+        android:id="@+id/tv_single_call_hint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/tuicalling_color_black"
+        android:textSize="14sp"
+        app:layout_constraintBottom_toTopOf="@id/tv_single_time"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <TextView
+        android:id="@+id/tv_single_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="12dp"
+        android:textSize="12sp"
+        app:layout_constraintBottom_toTopOf="@+id/rl_switch_audio"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <RelativeLayout
+        android:id="@+id/rl_switch_audio"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@id/rl_single_function"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <RelativeLayout
+        android:id="@+id/rl_single_function"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_base_activity.xml b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_base_activity.xml
new file mode 100644
index 0000000..8035102
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_base_activity.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RelativeLayout
+        android:id="@+id/rl_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_floatwindow_layout.xml b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_floatwindow_layout.xml
new file mode 100644
index 0000000..aaaa83e
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_floatwindow_layout.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:background="@drawable/tuicalling_bg_floatwindow"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:id="@+id/rl_video_view"
+            android:layout_width="100dp"
+            android:layout_height="120dp"
+            android:orientation="vertical"
+            android:visibility="gone" />
+
+        <com.tencent.qcloud.tuikit.tuicallkit.view.common.RoundCornerImageView
+            android:id="@+id/img_float_avatar"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:visibility="gone"
+            app:corner_radius="15dp" />
+
+        <ImageView
+            android:id="@+id/float_audioView"
+            android:layout_width="64dp"
+            android:layout_height="48dp"
+            android:layout_margin="4dp"
+            android:src="@drawable/tuicalling_ic_float" />
+
+        <TextView
+            android:id="@+id/tv_float_hint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginBottom="4dp"
+            android:text="@string/tuicalling_wait_resonse"
+            android:textColor="@color/tuicalling_color_green"
+            android:textSize="12sp"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/tv_float_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginBottom="4dp"
+            android:textColor="@color/tuicalling_color_green"
+            android:textSize="12sp"
+            android:visibility="gone" />
+    </LinearLayout>
+</LinearLayout>
+
+
diff --git a/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_funcation_view_audio.xml b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_funcation_view_audio.xml
new file mode 100644
index 0000000..c3fca88
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_funcation_view_audio.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="20dp"
+    android:layout_marginBottom="20dp">
+
+    <LinearLayout
+        android:id="@+id/ll_mute"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/ll_hangup"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/img_mute"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:src="@drawable/tuicalling_bg_mute_mic" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:text="@string/tuicalling_text_microphone"
+            android:textColor="@color/tuicalling_color_second"
+            android:textSize="@dimen/tuicalling_text_size_hint" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_hangup"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/ll_handsfree"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/ll_mute"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/img_hangup"
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:src="@drawable/tuicalling_bg_hangup" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:text="@string/tuicalling_text_hangup"
+            android:textColor="@color/tuicalling_color_second"
+            android:textSize="@dimen/tuicalling_text_size_hint" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_handsfree"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/ll_hangup"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/img_handsfree"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:src="@drawable/tuicalling_bg_handsfree" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:text="@string/tuicalling_text_speaker"
+            android:textColor="@color/tuicalling_color_second"
+            android:textSize="@dimen/tuicalling_text_size_hint" />
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_funcation_view_audio_waiting.xml b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_funcation_view_audio_waiting.xml
new file mode 100644
index 0000000..1228f73
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_funcation_view_audio_waiting.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="20dp"
+    android:layout_marginBottom="36dp">
+
+    <LinearLayout
+        android:id="@+id/ll_decline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/ll_answer"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:src="@drawable/tuicalling_bg_hangup" />
+
+        <TextView
+            android:id="@+id/tv_reject"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:text="@string/tuicalling_text_reject"
+            android:textColor="@color/tuicalling_color_second"
+            android:textSize="@dimen/tuicalling_text_size_hint" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_answer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/ll_decline"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:src="@drawable/tuicalling_bg_dialing" />
+
+        <TextView
+            android:id="@+id/tv_dialing"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:text="@string/tuicalling_text_dialing"
+            android:textColor="@color/tuicalling_color_second"
+            android:textSize="@dimen/tuicalling_text_size_hint" />
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_funcation_view_video.xml b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_funcation_view_video.xml
new file mode 100644
index 0000000..d2d7aad
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_funcation_view_video.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="20dp"
+    android:layout_marginBottom="20dp">
+
+    <LinearLayout
+        android:id="@+id/ll_mute"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintEnd_toStartOf="@+id/ll_handsfree"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/iv_mute"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:src="@drawable/tuicalling_bg_mute_mic" />
+
+        <TextView
+            android:id="@+id/tv_mic"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:text="@string/tuicalling_text_microphone"
+            android:textColor="@color/tuicalling_color_white"
+            android:textSize="@dimen/tuicalling_text_size_hint" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_handsfree"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintEnd_toStartOf="@+id/ll_open_camera"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/ll_mute"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/iv_handsfree"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:src="@drawable/tuicalling_bg_handsfree" />
+
+        <TextView
+            android:id="@+id/tv_speaker"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:text="@string/tuicalling_text_speaker"
+            android:textColor="@color/tuicalling_color_white"
+            android:textSize="@dimen/tuicalling_text_size_hint" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_open_camera"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/ll_handsfree"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/img_camera"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:src="@drawable/tuicalling_bg_camera" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:text="@string/tuicalling_text_camera"
+            android:textColor="@color/tuicalling_color_white"
+            android:textSize="@dimen/tuicalling_text_size_hint" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_hangup"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/ll_mute">
+
+        <ImageView
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:src="@drawable/tuicalling_bg_hangup" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:text="@string/tuicalling_text_hangup"
+            android:textColor="@color/tuicalling_color_white"
+            android:textSize="@dimen/tuicalling_text_size_hint" />
+
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/switch_camera"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginBottom="28dp"
+        android:src="@drawable/tuicalling_ic_switch_camera"
+        app:layout_constraintBottom_toBottomOf="@+id/ll_hangup"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/ll_hangup"
+        app:layout_constraintTop_toTopOf="@+id/ll_hangup" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_funcation_view_video_inviting.xml b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_funcation_view_video_inviting.xml
new file mode 100644
index 0000000..d2fd98c
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_funcation_view_video_inviting.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="20dp"
+    android:layout_marginBottom="20dp">
+
+    <LinearLayout
+        android:id="@+id/ll_cancel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:src="@drawable/tuicalling_bg_hangup" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:text="@string/tuicalling_btn_cancel"
+            android:textColor="@color/tuicalling_color_white"
+            android:textSize="@dimen/tuicalling_text_size_hint" />
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/img_switch_camera"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginBottom="28dp"
+        android:src="@drawable/tuicalling_ic_switch_camera"
+        app:layout_constraintBottom_toBottomOf="@+id/ll_cancel"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/ll_cancel"
+        app:layout_constraintTop_toTopOf="@+id/ll_cancel" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_group_user_layout.xml b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_group_user_layout.xml
new file mode 100644
index 0000000..6f00493
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_group_user_layout.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:parentTag="android.widget.RelativeLayout">
+
+    <com.tencent.qcloud.tuikit.TUIVideoView
+        android:id="@+id/tx_cloud_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone" />
+
+    <RelativeLayout
+        android:id="@+id/rl_image_head"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/tuicalling_color_video_background"
+        android:gravity="center">
+
+        <com.tencent.qcloud.tuikit.tuicallkit.view.common.RoundCornerImageView
+            android:id="@+id/img_head"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_horizontal"
+            android:scaleType="fitXY" />
+    </RelativeLayout>
+
+    <ImageView
+        android:id="@+id/img_loading"
+        android:layout_width="64dp"
+        android:layout_height="64dp"
+        android:layout_centerInParent="true"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/tv_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_marginLeft="10dp"
+        android:layout_marginBottom="4dp"
+        android:background="@color/tuicalling_color_transparent"
+        android:textColor="@color/tuicalling_color_white"
+        android:textSize="14sp" />
+
+    <ImageView
+        android:id="@+id/iv_audio_input"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginRight="8dp"
+        android:layout_marginBottom="4dp"
+        android:background="@drawable/tuicalling_ic_mic_mute"
+        android:visibility="gone" />
+</merge>
+
diff --git a/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_single_video_user_view.xml b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_single_video_user_view.xml
new file mode 100644
index 0000000..40b6d45
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_single_video_user_view.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/cl_root"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <com.tencent.qcloud.tuikit.tuicallkit.view.common.RoundCornerImageView
+        android:id="@+id/iv_user_avatar"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:src="@drawable/tuicalling_ic_avatar"
+        app:corner_radius="15dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tv_user_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="20dp"
+        android:paddingLeft="20dp"
+        android:text="@string/tuicalling_contact_default_name"
+        android:textColor="@color/tuicalling_color_white"
+        android:textSize="24sp"
+        android:textStyle="bold"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintEnd_toStartOf="@+id/iv_user_avatar"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintTop_toTopOf="@+id/iv_user_avatar" />
+
+    <TextView
+        android:id="@+id/tv_video_tag"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:layout_marginEnd="10dp"
+        android:textColor="@color/tuicalling_color_white"
+        android:textSize="12sp"
+        app:layout_constraintEnd_toStartOf="@+id/iv_user_avatar"
+        app:layout_constraintTop_toBottomOf="@+id/tv_user_name" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_switch_audio_view.xml b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_switch_audio_view.xml
new file mode 100644
index 0000000..802c025
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_switch_audio_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="20dp"
+    android:layout_marginBottom="20dp">
+
+    <LinearLayout
+        android:id="@+id/ll_switch_audio"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:layout_width="36dp"
+            android:layout_height="19dp"
+            android:layout_gravity="center_horizontal"
+            android:src="@drawable/tuicalling_ic_switch_to_audio_call" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="10dp"
+            android:text="@string/tuicalling_switch_audio_call"
+            android:textColor="@color/tuicalling_color_white"
+            android:textSize="12sp" />
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_user_view.xml b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_user_view.xml
new file mode 100644
index 0000000..c590999
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicalling_user_view.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <com.tencent.qcloud.tuikit.tuicallkit.view.common.RoundCornerImageView
+        android:id="@+id/img_avatar"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:src="@drawable/tuicalling_ic_avatar"
+        app:corner_radius="15dp"
+        app:layout_constraintBottom_toBottomOf="@id/tv_name"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tv_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:text="@string/tuicalling_contact_default_name"
+        android:textColor="@color/tuicalling_color_black"
+        android:textSize="24sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/img_avatar" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/layout/tuicallkit_activity_group_user.xml b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicallkit_activity_group_user.xml
new file mode 100644
index 0000000..58274a4
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicallkit_activity_group_user.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/tuicalling_color_white">
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar_group"
+        android:layout_width="match_parent"
+        android:layout_height="?android:attr/actionBarSize"
+        android:layout_marginTop="28dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:navigationIcon="@drawable/tuicallkit_ic_back">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:singleLine="true"
+            android:text="@string/tuicallkit_group_title_add_user"
+            android:textColor="@color/tuicalling_color_black"
+            android:textSize="18sp"
+            android:textStyle="bold" />
+
+        <Button
+            android:id="@+id/btn_group_ok"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right|center_vertical"
+            android:background="@android:color/transparent"
+            android:text="@string/tuicallkit_group_btn_ok"
+            android:textAllCaps="false"
+
+            android:textColor="@color/tuicallkit_record_edit"
+            android:textSize="16sp" />
+    </androidx.appcompat.widget.Toolbar>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_user_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar_group" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/layout/tuicallkit_group_user_list_item.xml b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicallkit_group_user_list_item.xml
new file mode 100644
index 0000000..bc8a19e
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicallkit_group_user_list_item.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="58dp"
+    android:background="@color/tuicalling_color_white"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingBottom="5dp">
+
+        <CheckBox
+            android:id="@+id/group_user_check_box"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:background="@drawable/tuicallkit_group_checkbox_selector"
+            android:button="@null"
+            android:clickable="false"
+            android:focusable="false"
+            android:gravity="center" />
+
+        <com.tencent.qcloud.tuikit.tuicallkit.view.common.RoundCornerImageView
+            android:id="@+id/group_user_avatar"
+            android:layout_width="38.4dp"
+            android:layout_height="38.4dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="12dp"
+            android:scaleType="centerCrop"
+            android:src="@drawable/tuicalling_ic_avatar"
+            app:corner_radius="12dp" />
+
+        <TextView
+            android:id="@+id/group_user_name"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:lines="1"
+            android:textColor="#ff111111"
+            android:textSize="18sp" />
+
+        <TextView
+            android:id="@+id/group_user_hint"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginStart="4dp"
+            android:gravity="center_vertical"
+            android:text="@string/tuicallkit_group_hint_you"
+            android:textColor="@color/tuicalling_color_gray"
+            android:textSize="14sp"
+            android:visibility="gone" />
+    </LinearLayout>
+
+    <View
+        android:id="@+id/view_line"
+        android:layout_width="match_parent"
+        android:layout_height="0.55dp"
+        android:background="#D9D9D9" />
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/layout/tuicallkit_item_head_view.xml b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicallkit_item_head_view.xml
new file mode 100644
index 0000000..412c5ba
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicallkit_item_head_view.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="60dp"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/tv_call_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="13dp"
+        android:text="@string/tuicallkit_record_call_title"
+        android:textColor="@color/tuicalling_color_black"
+        android:textSize="34sp" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/layout/tuicallkit_layout_call_list_item.xml b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicallkit_layout_call_list_item.xml
new file mode 100644
index 0000000..980ed0d
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicallkit_layout_call_list_item.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="64dp"
+    android:background="#FFFFFF"
+    android:orientation="horizontal"
+    app:clickToClose="false">
+
+    <LinearLayout
+        android:id="@+id/ll_call_item_left"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#FFFFFF"
+        android:gravity="center_vertical"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/ll_call_item"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#FFFFFF"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp">
+
+            <CheckBox
+                android:id="@+id/cb_call_select"
+                android:layout_width="14dp"
+                android:layout_height="14dp"
+                android:layout_alignParentLeft="true"
+                android:layout_gravity="center"
+                android:layout_marginRight="6dp"
+                android:background="@drawable/tuicallkit_checkbox_selected"
+                android:button="@null"
+                android:gravity="center"
+                android:padding="10dp"
+                android:visibility="visible" />
+
+            <include
+                layout="@layout/tuicallkit_layout_call_list_item_sub"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center_vertical"
+                android:tag="Hover" />
+        </LinearLayout>
+
+        <View
+            android:id="@+id/bottom_line"
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:background="#DDDDDD" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/bottom_wrapper_2"
+        android:layout_width="70dp"
+        android:layout_height="match_parent"
+        android:tag="Bottom4">
+
+        <RelativeLayout
+            android:id="@+id/ll_call_delete"
+            android:layout_width="70dp"
+            android:layout_height="match_parent"
+            android:background="#ff0000"
+            android:clickable="true"
+            android:gravity="center">
+
+            <ImageView
+                android:id="@+id/img_call_delete"
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
+                android:src="@drawable/tuicallkit_ic_delete" />
+
+            <TextView
+                android:id="@+id/tv_call_delete"
+                android:layout_width="70dp"
+                android:layout_height="match_parent"
+                android:layout_below="@+id/img_call_delete"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
+                android:gravity="center"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
+                android:text="@string/tuicallkit_record_call_delete"
+                android:textColor="@color/tuicalling_color_white"
+                android:textSize="12sp" />
+        </RelativeLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/system/tuicallkit-7.3.4358/src/main/res/layout/tuicallkit_layout_call_list_item_sub.xml b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicallkit_layout_call_list_item_sub.xml
new file mode 100644
index 0000000..dcf193f
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicallkit_layout_call_list_item_sub.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/cl_info_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
+
+    <com.tencent.qcloud.tuikit.tuicallkit.extensions.recents.RecordsIconView
+        android:id="@+id/call_icon"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:scaleType="fitCenter"
+        app:corner_radius="45dp"
+        app:default_image="@drawable/tuicalling_ic_avatar"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_info"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="8dp"
+        app:layout_constraintBottom_toBottomOf="@+id/call_icon"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_weight="1"
+        app:layout_constraintStart_toEndOf="@+id/call_icon"
+        app:layout_constraintTop_toTopOf="@+id/call_icon">
+
+        <TextView
+            android:id="@+id/tv_call_user_id"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:maxWidth="180dp"
+            android:singleLine="true"
+            android:text="userId"
+            android:textColor="@color/tuicalling_color_black"
+            android:textSize="14sp"
+            android:textStyle="bold"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/call_media_type"
+            android:layout_width="14dp"
+            android:layout_height="14dp"
+            android:layout_gravity="center_vertical"
+            android:scaleType="fitCenter"
+            app:layout_constraintBottom_toBottomOf="@+id/tv_call_status"
+            app:layout_constraintStart_toStartOf="@+id/tv_call_user_id"
+            app:layout_constraintTop_toTopOf="@+id/tv_call_status" />
+
+        <TextView
+            android:id="@+id/tv_call_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="4dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="4dp"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:text="Missed"
+            android:textColor="#7A7A7A"
+            android:textSize="12sp"
+            app:layout_constraintStart_toEndOf="@+id/call_media_type"
+            app:layout_constraintTop_toBottomOf="@+id/tv_call_user_id" />
+
+        <TextView
+            android:id="@+id/tv_call_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="12dp"
+            android:lineHeight="15.84sp"
+            android:text="2:14 PM"
+            android:textColor="#b0b0b0"
+            android:textSize="12sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/img_call_details"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/img_call_details"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:padding="5dp"
+            android:src="@drawable/tuicallkit_ic_more_info"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/layout/tuicallkit_record_dialog.xml b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicallkit_record_dialog.xml
new file mode 100644
index 0000000..83b0466
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicallkit_record_dialog.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/tv_clear_call_history"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:background="@drawable/tuicallkit_dialog_sure"
+        android:gravity="center"
+        android:text="@string/tuicallkit_record_dialog_message"
+        android:textColor="@color/tuicallkit_record_text_red"
+        android:textSize="17sp"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tv_clear_cancel"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="21dp"
+        android:background="@drawable/tuicallkit_dialog_cancel"
+        android:gravity="center"
+        android:text="@string/tuicallkit_record_dialog_cancel"
+        android:textColor="#007AFF"
+        android:textSize="17sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_clear_call_history" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/system/tuicallkit-7.3.4358/src/main/res/layout/tuicallkit_record_fragment_main.xml b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicallkit_record_fragment_main.xml
new file mode 100644
index 0000000..4cd3216
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/layout/tuicallkit_record_fragment_main.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/tuicalling_color_white">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/cl_record_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/core_header_start_color"
+        android:padding="10dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/tab_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="32dp"
+            android:background="@drawable/tuicallkit_tab_selector"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:tabBackground="@drawable/tuicallkit_tab_item_selector"
+            app:tabIndicatorHeight="0dp"
+            app:tabMinWidth="76dp"
+            app:tabRippleColor="@null"
+            app:tabTextAppearance="@style/TUICallTabLayoutStyle">
+
+            <com.google.android.material.tabs.TabItem
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/tuicallkit_record_tab_title_all" />
+
+            <com.google.android.material.tabs.TabItem
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/tuicallkit_record_tab_title_miss" />
+        </com.google.android.material.tabs.TabLayout>
+
+        <Button
+            android:id="@+id/btn_call_edit"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
+            android:layout_marginEnd="18dp"
+            android:background="@drawable/tuicallkit_ic_edit"
+            android:padding="5dp"
+            app:layout_constraintBottom_toBottomOf="@+id/tab_layout"
+            app:layout_constraintEnd_toStartOf="@+id/btn_start_call"
+            app:layout_constraintTop_toTopOf="@+id/tab_layout" />
+
+        <Button
+            android:id="@+id/btn_start_call"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
+            android:layout_marginEnd="24dp"
+            android:background="@drawable/tuicallkit_ic_start_call"
+            android:padding="5dp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="@+id/tab_layout"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/tab_layout" />
+
+        <Button
+            android:id="@+id/btn_clear"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:background="@color/tuicalling_color_transparent"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
+            android:padding="5dp"
+            android:text="@string/tuicallkit_record_clear"
+            android:textAllCaps="false"
+            android:textColor="?attr/core_header_text_color"
+            android:textStyle="bold"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="@+id/tab_layout"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/tab_layout" />
+
+        <Button
+            android:id="@+id/btn_edit_done"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="15dp"
+            android:background="@color/tuicalling_color_transparent"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
+            android:padding="5dp"
+            android:text="@string/tuicallkit_record_done"
+            android:textAllCaps="false"
+            android:textColor="?attr/core_header_text_color"
+            android:textStyle="bold"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="@+id/tab_layout"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/tab_layout" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <com.tencent.qcloud.tuikit.tuicallkit.view.common.SlideRecyclerView
+        android:id="@+id/recycle_view_list"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/cl_record_title" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/system/tuicallkit-7.3.4358/src/main/res/raw/phone_dialing.mp3 b/system/tuicallkit-7.3.4358/src/main/res/raw/phone_dialing.mp3
new file mode 100644
index 0000000..50ece95
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/raw/phone_dialing.mp3 differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/raw/phone_hangup.mp3 b/system/tuicallkit-7.3.4358/src/main/res/raw/phone_hangup.mp3
new file mode 100644
index 0000000..a711121
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/raw/phone_hangup.mp3 differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/raw/phone_ringing.mp3 b/system/tuicallkit-7.3.4358/src/main/res/raw/phone_ringing.mp3
new file mode 100644
index 0000000..166c027
Binary files /dev/null and b/system/tuicallkit-7.3.4358/src/main/res/raw/phone_ringing.mp3 differ
diff --git a/system/tuicallkit-7.3.4358/src/main/res/values-en/strings.xml b/system/tuicallkit-7.3.4358/src/main/res/values-en/strings.xml
new file mode 100644
index 0000000..8f4be41
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/values-en/strings.xml
@@ -0,0 +1,68 @@
+<resources>
+    <string name="tuicalling_contact_default_name">test 123</string>
+    <string name="tuicalling_toast_call_error_msg">Error [%1$d]:%2$s.</string>
+    <string name="tuicalling_toast_user_reject_call">%1$s declined the call.</string>
+    <string name="tuicalling_toast_user_not_response">%1$s didn’t answer.</string>
+    <string name="tuicalling_toast_user_busy">%1$s is busy.</string>
+    <string name="tuicalling_toast_user_cancel_call">%1$s cancelled the call.</string>
+    <string name="tuicalling_toast_user_timeout">%1$s timed out.</string>
+    <string name="tuicalling_toast_enable_mute">Muted</string>
+    <string name="tuicalling_toast_disable_mute">Unmuted</string>
+    <string name="tuicalling_toast_speaker">Speaker</string>
+    <string name="tuicalling_toast_use_handset">Earpiece</string>
+    <string name="tuicalling_called_time_format">%02d:%02d</string>
+    <string name="tuicalling_toast_user_end">%s end the call.</string>
+    <string name="tuicalling_other_party_network_low_quality">The other party\'s network connection is poor</string>
+    <string name="tuicalling_self_network_low_quality">Your network connection is poor</string>
+    <string name="tuicalling_toast_switch_camera">Switch Camera</string>
+    <string name="tuicalling_toast_enable_camera">Camera On</string>
+    <string name="tuicalling_toast_disable_camera">Camera Off</string>
+    <string name="tuicalling_waiting_accept">Waiting for the user to accept…</string>
+    <string name="tuicalling_invite_audio_call">Invited you to a voice call…</string>
+    <string name="tuicalling_invite_video_call">Invites you to a video call…</string>
+    <string name="tuicalling_text_microphone">Mic</string>
+    <string name="tuicalling_text_hangup">Hang Up</string>
+    <string name="tuicalling_text_reject">Decline</string>
+    <string name="tuicalling_text_speaker">Speaker</string>
+    <string name="tuicalling_text_dialing">Answer</string>
+    <string name="tuicalling_text_camera">Camera</string>
+    <string name="tuicalling_switch_camera_hint">Turn on your camera first</string>
+    <string name="tuicalling_switch_audio_call">Switch to Voice Call</string>
+    <string name="tuicalling_btn_cancel">Cancel</string>
+    <string name="tuicalling_video_call">Video Call</string>
+    <string name="tuicalling_audio_call">Voice Call</string>
+    <string name="tuicalling_user_kicked_offline">You have been kicked off the line. Please log in again!</string>
+    <string name="tuicalling_user_sig_expired">Your user signature information has expired</string>
+    <string name="tuicalling_user_exceed_limit">TUICalling currently supports call with up to 9 people.For larger conference calls,try using TUIRoom</string>
+    <string name="tuicalling_wait_resonse">Waiting</string>
+
+    <string name="tuicalling_permission_camera">Camera</string>
+    <string name="tuicalling_permission_microphone">Microphone</string>
+    <string name="tuicalling_permission_bluetooth">Bluetooth</string>
+    <string name="tuicalling_permission_separator">,</string>
+    <string name="tuicalling_permission_tips">Please turn on the %s permission first</string>
+    <string name="tuicalling_permission_title">%s applies for access to the %s</string>
+    <string name="tuicalling_permission_mic_reason">Needs access to your microphone, and it can be used for functions such as Audio/Video Call, Group Audio/Video Call etc.</string>
+    <string name="tuicalling_permission_camera_reason">Needs access to your camera, and it can be used for functions such as Video Call, Group Video Call etc. For beauty filters to work, we will collect the facial information captured by your camera in real time to detect your facial features.</string>
+    <string name="tuicalling_permission_bluetooth_reason">Needs access to your bluetooth，and it can be user for bluetooth headset.</string>
+
+    <string name="tuicalling_package_not_purchased">You do not have TUICallKit package, please open the free experience in the console or purchase the official package</string>
+    <string name="tuicalling_package_not_support">The package you purchased does not support this ability</string>
+    <string name="tuicalling_status_is_not_accept">You can only use this function after you accept the call</string>
+    <string name="tuicalling_groupid_is_empty">groupId is empty</string>
+    <string name="tuicalling_have_a_new_call">You have a new call</string>
+
+    <string name="tuicallkit_record_call_title">Recent Calls</string>
+    <string name="tuicallkit_record_call_delete">delete</string>
+    <string name="tuicallkit_record_dialog_message">Clear All Call History</string>
+    <string name="tuicallkit_record_dialog_cancel">Cancel</string>
+    <string name="tuicallkit_record_tab_title_all">All</string>
+    <string name="tuicallkit_record_tab_title_miss">Missed</string>
+    <string name="tuicallkit_record_done">Done</string>
+    <string name="tuicallkit_record_clear">Clear</string>
+    <string name="tuicallkit_group_recall_unsupport">Multiple call records do not support recalls</string>
+
+    <string name="tuicallkit_group_title_add_user">Add User</string>
+    <string name="tuicallkit_group_hint_you">(you)</string>
+    <string name="tuicallkit_group_btn_ok">Confirm</string>
+</resources>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/values-zh/strings.xml b/system/tuicallkit-7.3.4358/src/main/res/values-zh/strings.xml
new file mode 100644
index 0000000..b739140
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/values-zh/strings.xml
@@ -0,0 +1,68 @@
+<resources>
+    <string name="tuicalling_contact_default_name">测试123</string>
+    <string name="tuicalling_toast_call_error_msg">发生错误[%1$d]:%2$s</string>
+    <string name="tuicalling_toast_user_reject_call">%1$s拒绝通话</string>
+    <string name="tuicalling_toast_user_not_response">%1$s无响应</string>
+    <string name="tuicalling_toast_user_busy">%1$s忙线</string>
+    <string name="tuicalling_toast_user_cancel_call">%1$s取消了通话</string>
+    <string name="tuicalling_toast_user_timeout">%1$s通话超时</string>
+    <string name="tuicalling_toast_enable_mute">开启静音</string>
+    <string name="tuicalling_toast_disable_mute">关闭静音</string>
+    <string name="tuicalling_toast_speaker">使用扬声器</string>
+    <string name="tuicalling_toast_use_handset">使用听筒</string>
+    <string name="tuicalling_called_time_format">%02d:%02d</string>
+    <string name="tuicalling_toast_user_end">%s 结束通话</string>
+    <string name="tuicalling_other_party_network_low_quality">对方网络不佳</string>
+    <string name="tuicalling_self_network_low_quality">己方网络不佳</string>
+    <string name="tuicalling_toast_switch_camera">切换摄像头</string>
+    <string name="tuicalling_toast_enable_camera">开启摄像头</string>
+    <string name="tuicalling_toast_disable_camera">关闭摄像头</string>
+    <string name="tuicalling_waiting_accept">正在等待对方接受邀请...</string>
+    <string name="tuicalling_invite_audio_call">邀请您进行语音通话…</string>
+    <string name="tuicalling_invite_video_call">邀请您进行视频通话…</string>
+    <string name="tuicalling_text_microphone">麦克风</string>
+    <string name="tuicalling_text_hangup">挂断</string>
+    <string name="tuicalling_text_reject">拒接</string>
+    <string name="tuicalling_text_speaker">扬声器</string>
+    <string name="tuicalling_text_dialing">接听</string>
+    <string name="tuicalling_text_camera">摄像头</string>
+    <string name="tuicalling_switch_camera_hint">请先打开摄像头</string>
+    <string name="tuicalling_switch_audio_call">切到语音通话</string>
+    <string name="tuicalling_btn_cancel">取消</string>
+    <string name="tuicalling_video_call">视频通话</string>
+    <string name="tuicalling_audio_call">语音通话</string>
+    <string name="tuicalling_user_kicked_offline">您已被踢下线，请重新登录</string>
+    <string name="tuicalling_user_sig_expired">您的用户签名信息已过期</string>
+    <string name="tuicalling_user_exceed_limit">暂支持最多9人通话。如需多人会议，请使用TUIRoom</string>
+    <string name="tuicalling_wait_resonse">等待接听</string>
+
+    <string name="tuicalling_permission_camera">相机</string>
+    <string name="tuicalling_permission_microphone">麦克风</string>
+    <string name="tuicalling_permission_bluetooth">蓝牙</string>
+    <string name="tuicalling_permission_separator">、</string>
+    <string name="tuicalling_permission_tips">请先打开%s权限</string>
+    <string name="tuicalling_permission_title">%s申请获取%s权限</string>
+    <string name="tuicalling_permission_camera_reason">需要访问您的相机权限，开启后用于视频通话、多人视频通话等功能，在您使用美颜功能时，我们会对您实时拍摄的面部的像素信息进行实时智能识别，在识别过程中会实时收集您面部的像素信息，以为您提供更好的美颜效果。</string>
+    <string name="tuicalling_permission_mic_reason">需要访问您的麦克风权限，开启后用于语音通话、多人语音通话、视频通话、多人视频通话等功能，并且开启后录制的视频才会有声音。</string>
+    <string name="tuicalling_permission_bluetooth_reason">需要访问您的蓝牙权限，开启后用于使用蓝牙耳机。</string>
+
+    <string name="tuicalling_package_not_purchased">您当前未购买音视频通话能力套餐，请前往 IM 控制台开通免费体验或加购正式版</string>
+    <string name="tuicalling_package_not_support">您当前购买的音视频通话能力套餐不支持该功能，建议您升级套餐类型</string>
+    <string name="tuicalling_status_is_not_accept">接听后才能使用该功能</string>
+    <string name="tuicalling_groupid_is_empty">群ID为空</string>
+    <string name="tuicalling_have_a_new_call">您有一个新的通话</string>
+
+    <string name="tuicallkit_record_call_title">最近通话</string>
+    <string name="tuicallkit_record_call_delete">删除</string>
+    <string name="tuicallkit_record_dialog_message">清除所有记录</string>
+    <string name="tuicallkit_record_dialog_cancel">取消</string>
+    <string name="tuicallkit_record_tab_title_all">所有通话</string>
+    <string name="tuicallkit_record_tab_title_miss">未接来电</string>
+    <string name="tuicallkit_record_done">完成</string>
+    <string name="tuicallkit_record_clear">清除</string>
+    <string name="tuicallkit_group_recall_unsupport">多人通话记录不支持重呼</string>
+
+    <string name="tuicallkit_group_title_add_user">添加成员</string>
+    <string name="tuicallkit_group_hint_you">(你)</string>
+    <string name="tuicallkit_group_btn_ok">确定</string>
+</resources>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/values/attrs.xml b/system/tuicallkit-7.3.4358/src/main/res/values/attrs.xml
new file mode 100644
index 0000000..c006afc
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/values/attrs.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="RoundCornerImageView">
+        <attr name="corner_radius" format="dimension" />
+        <attr name="left_top_radius" format="dimension" />
+        <attr name="right_top_radius" format="dimension" />
+        <attr name="right_bottom_radius" format="dimension" />
+        <attr name="left_bottom_radius" format="dimension" />
+    </declare-styleable>
+
+    <declare-styleable name="SynthesizedImageView">
+        <attr name="image_background" format="color" />
+        <attr name="default_image" format="reference" />
+        <attr name="image_size" format="dimension" />
+        <attr name="image_gap" format="dimension" />
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/values/colors.xml b/system/tuicallkit-7.3.4358/src/main/res/values/colors.xml
new file mode 100644
index 0000000..77e4211
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/values/colors.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="tuicalling_color_white">#FFFFFFFF</color>
+    <color name="tuicalling_color_black">#000000</color>
+    <color name="tuicalling_color_second">#666666</color>
+    <color name="tuicalling_color_audio_background">#FFF1F2F8</color>
+    <color name="tuicalling_color_video_background">#FF55534F</color>
+    <color name="tuicalling_color_transparent">#00000000</color>
+    <color name="tuicalling_color_green">#FF29CC85</color>
+    <color name="tuicalling_color_bg_float_view">#FFBBBBBB</color>
+    <color name="tuicalling_color_gray">#696969</color>
+
+    <color name="tuicallkit_record_text_red">#FF584C</color>
+    <color name="tuicallkit_record_edit">#0365F9</color>
+</resources>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/values/dimens.xml b/system/tuicallkit-7.3.4358/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..40fb48e
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/values/dimens.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="tuicalling_small_image_size">30dp</dimen>
+    <dimen name="tuicalling_small_image_left_margin">5dp</dimen>
+    <dimen name="tuicalling_text_size_hint">12sp</dimen>
+</resources>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/values/strings.xml b/system/tuicallkit-7.3.4358/src/main/res/values/strings.xml
new file mode 100644
index 0000000..8f4be41
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/values/strings.xml
@@ -0,0 +1,68 @@
+<resources>
+    <string name="tuicalling_contact_default_name">test 123</string>
+    <string name="tuicalling_toast_call_error_msg">Error [%1$d]:%2$s.</string>
+    <string name="tuicalling_toast_user_reject_call">%1$s declined the call.</string>
+    <string name="tuicalling_toast_user_not_response">%1$s didn’t answer.</string>
+    <string name="tuicalling_toast_user_busy">%1$s is busy.</string>
+    <string name="tuicalling_toast_user_cancel_call">%1$s cancelled the call.</string>
+    <string name="tuicalling_toast_user_timeout">%1$s timed out.</string>
+    <string name="tuicalling_toast_enable_mute">Muted</string>
+    <string name="tuicalling_toast_disable_mute">Unmuted</string>
+    <string name="tuicalling_toast_speaker">Speaker</string>
+    <string name="tuicalling_toast_use_handset">Earpiece</string>
+    <string name="tuicalling_called_time_format">%02d:%02d</string>
+    <string name="tuicalling_toast_user_end">%s end the call.</string>
+    <string name="tuicalling_other_party_network_low_quality">The other party\'s network connection is poor</string>
+    <string name="tuicalling_self_network_low_quality">Your network connection is poor</string>
+    <string name="tuicalling_toast_switch_camera">Switch Camera</string>
+    <string name="tuicalling_toast_enable_camera">Camera On</string>
+    <string name="tuicalling_toast_disable_camera">Camera Off</string>
+    <string name="tuicalling_waiting_accept">Waiting for the user to accept…</string>
+    <string name="tuicalling_invite_audio_call">Invited you to a voice call…</string>
+    <string name="tuicalling_invite_video_call">Invites you to a video call…</string>
+    <string name="tuicalling_text_microphone">Mic</string>
+    <string name="tuicalling_text_hangup">Hang Up</string>
+    <string name="tuicalling_text_reject">Decline</string>
+    <string name="tuicalling_text_speaker">Speaker</string>
+    <string name="tuicalling_text_dialing">Answer</string>
+    <string name="tuicalling_text_camera">Camera</string>
+    <string name="tuicalling_switch_camera_hint">Turn on your camera first</string>
+    <string name="tuicalling_switch_audio_call">Switch to Voice Call</string>
+    <string name="tuicalling_btn_cancel">Cancel</string>
+    <string name="tuicalling_video_call">Video Call</string>
+    <string name="tuicalling_audio_call">Voice Call</string>
+    <string name="tuicalling_user_kicked_offline">You have been kicked off the line. Please log in again!</string>
+    <string name="tuicalling_user_sig_expired">Your user signature information has expired</string>
+    <string name="tuicalling_user_exceed_limit">TUICalling currently supports call with up to 9 people.For larger conference calls,try using TUIRoom</string>
+    <string name="tuicalling_wait_resonse">Waiting</string>
+
+    <string name="tuicalling_permission_camera">Camera</string>
+    <string name="tuicalling_permission_microphone">Microphone</string>
+    <string name="tuicalling_permission_bluetooth">Bluetooth</string>
+    <string name="tuicalling_permission_separator">,</string>
+    <string name="tuicalling_permission_tips">Please turn on the %s permission first</string>
+    <string name="tuicalling_permission_title">%s applies for access to the %s</string>
+    <string name="tuicalling_permission_mic_reason">Needs access to your microphone, and it can be used for functions such as Audio/Video Call, Group Audio/Video Call etc.</string>
+    <string name="tuicalling_permission_camera_reason">Needs access to your camera, and it can be used for functions such as Video Call, Group Video Call etc. For beauty filters to work, we will collect the facial information captured by your camera in real time to detect your facial features.</string>
+    <string name="tuicalling_permission_bluetooth_reason">Needs access to your bluetooth，and it can be user for bluetooth headset.</string>
+
+    <string name="tuicalling_package_not_purchased">You do not have TUICallKit package, please open the free experience in the console or purchase the official package</string>
+    <string name="tuicalling_package_not_support">The package you purchased does not support this ability</string>
+    <string name="tuicalling_status_is_not_accept">You can only use this function after you accept the call</string>
+    <string name="tuicalling_groupid_is_empty">groupId is empty</string>
+    <string name="tuicalling_have_a_new_call">You have a new call</string>
+
+    <string name="tuicallkit_record_call_title">Recent Calls</string>
+    <string name="tuicallkit_record_call_delete">delete</string>
+    <string name="tuicallkit_record_dialog_message">Clear All Call History</string>
+    <string name="tuicallkit_record_dialog_cancel">Cancel</string>
+    <string name="tuicallkit_record_tab_title_all">All</string>
+    <string name="tuicallkit_record_tab_title_miss">Missed</string>
+    <string name="tuicallkit_record_done">Done</string>
+    <string name="tuicallkit_record_clear">Clear</string>
+    <string name="tuicallkit_group_recall_unsupport">Multiple call records do not support recalls</string>
+
+    <string name="tuicallkit_group_title_add_user">Add User</string>
+    <string name="tuicallkit_group_hint_you">(you)</string>
+    <string name="tuicallkit_group_btn_ok">Confirm</string>
+</resources>
\ No newline at end of file
diff --git a/system/tuicallkit-7.3.4358/src/main/res/values/styles.xml b/system/tuicallkit-7.3.4358/src/main/res/values/styles.xml
new file mode 100644
index 0000000..8d98f26
--- /dev/null
+++ b/system/tuicallkit-7.3.4358/src/main/res/values/styles.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TUICallTabLayoutStyle" parent="android:style/TextAppearance.Widget.TabWidget">
+        <item name="android:textSize">13sp</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:textColor">#000000</item>
+        <item name="textAllCaps">false</item>
+    </style>
+
+    <style name="TUICallBottomSelectSheet" parent="@android:style/Theme.Dialog">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowFrame">@null</item>
+        <item name="android:backgroundDimEnabled">true</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/system/tuicallkit/.gitignore b/system/tuicallkit/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/system/tuicallkit/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/system/tuicallkit/build.gradle b/system/tuicallkit/build.gradle
new file mode 100644
index 0000000..1da2f03
--- /dev/null
+++ b/system/tuicallkit/build.gradle
@@ -0,0 +1,50 @@
+apply plugin: 'com.android.library'
+apply plugin: 'org.jetbrains.kotlin.android'
+
+android {
+    compileSdk rootProject.ext.compileSdkVersion
+
+    defaultConfig {
+        minSdk rootProject.ext.minSdkVersion
+        targetSdk rootProject.ext.targetSdkVersion
+        versionCode rootProject.ext.versionCode
+        versionName rootProject.ext.versionName
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    api 'androidx.appcompat:appcompat:1.0.0'
+    api 'androidx.constraintlayout:constraintlayout:1.1.3'
+    api 'com.github.bumptech.glide:glide:4.12.0'
+    implementation 'androidx.core:core-ktx:1.8.0'
+
+    def projects = this.rootProject.getAllprojects().stream().map { project -> project.name }.collect()
+    println "all projects : {$projects}"
+    if (projects.contains("tuicore")) {
+        api project(':system:tuicore')
+    } else {
+        api "com.tencent.imsdk:imsdk-plus:7.3.4358"
+        api "com.tencent.liteav.tuikit:tuicore:1.1.18"
+    }
+
+    if (projects.contains("tuicallengine")) {
+        api project(':tuicallengine')
+    } else {
+        api "com.google.code.gson:gson:2.9.1"
+        api "com.tencent.liteav:LiteAVSDK_TRTC:11.4.0.13189"
+        api 'com.tencent.liteav.tuikit:tuicallengine:1.9.0.680'
+    }
+}
diff --git a/system/tuicallkit/proguard-rules.pro b/system/tuicallkit/proguard-rules.pro
new file mode 100644
index 0000000..f1b4245
--- /dev/null
+++ b/system/tuicallkit/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/system/tuicallkit/src/main/AndroidManifest.xml b/system/tuicallkit/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..de5f223
--- /dev/null
+++ b/system/tuicallkit/src/main/AndroidManifest.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.tencent.qcloud.tuikit.tuicallkit">
+
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <uses-permission android:name="android.permission.CAMERA" />
+
+    <uses-feature android:name="android.hardware.camera" />
+    <uses-feature android:name="android.hardware.camera.autofocus" />
+    <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30" />
+    <!-- Support Android S(31) Bluetooth-->
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <application>
+        <activity
+            android:name="com.tencent.qcloud.tuikit.tuicallkit.base.BaseCallActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat.NoActionBar" />
+
+        <provider
+            android:name="com.tencent.qcloud.tuikit.tuicallkit.internal.ServiceInitializer"
+            android:authorities="${applicationId}.ServiceInitializer"
+            android:enabled="true"
+            android:exported="false" />
+
+        <service
+            android:name="com.tencent.qcloud.tuikit.tuicallkit.service.TUICallService"
+            android:enabled="true"
+            android:exported="false" />
+
+        <service
+            android:name="com.tencent.qcloud.tuikit.tuicallkit.view.floatwindow.FloatWindowService"
+            android:enabled="true"
+            android:exported="false" />
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/TUICallKit.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/TUICallKit.java
new file mode 100644
index 0000000..ff0cad6
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/TUICallKit.java
@@ -0,0 +1,98 @@
+package com.tencent.qcloud.tuikit.tuicallkit;
+
+import android.content.Context;
+
+import com.tencent.qcloud.tuikit.TUICommonDefine;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine;
+
+import java.util.List;
+
+public abstract class TUICallKit {
+
+    public static TUICallKit createInstance(Context context) {
+        return TUICallKitImpl.createInstance(context);
+    }
+
+    /**
+     * Set user profile
+     *
+     * @param nickname User name, which can contain up to 500 bytes
+     * @param avatar   User profile photo URL, which can contain up to 500 bytes
+     *                 For example: https://liteav.sdk.qcloud.com/app/res/picture/voiceroom/avatar/user_avatar1.png
+     * @param callback Set the result callback
+     */
+    public void setSelfInfo(String nickname, String avatar, TUICommonDefine.Callback callback) {
+    }
+
+    /**
+     * Make a call
+     *
+     * @param userId        callees
+     * @param callMediaType Call type
+     */
+    public void call(String userId, TUICallDefine.MediaType callMediaType) {
+    }
+
+    /**
+     * Make a call
+     *
+     * @param userId        callees
+     * @param callMediaType Call type
+     * @param params        Extension param: eg: offlinePushInfo
+     */
+    public void call(String userId, TUICallDefine.MediaType callMediaType,
+                     TUICallDefine.CallParams params, TUICommonDefine.Callback callback) {
+    }
+
+    /**
+     * Make a group call
+     *
+     * @param groupId       GroupId
+     * @param userIdList    List of userId
+     * @param callMediaType Call type
+     */
+    public void groupCall(String groupId, List<String> userIdList, TUICallDefine.MediaType callMediaType) {
+    }
+
+    /**
+     * Make a group call
+     *
+     * @param groupId       GroupId
+     * @param userIdList    List of userId
+     * @param callMediaType Call type
+     * @param params        Extension param: eg: offlinePushInfo
+     */
+    public void groupCall(String groupId, List<String> userIdList,
+                          TUICallDefine.MediaType callMediaType, TUICallDefine.CallParams params,
+                          TUICommonDefine.Callback callback) {
+    }
+
+    /**
+     * Join a current call
+     *
+     * @param roomId        current call room ID
+     * @param callMediaType call type
+     */
+    public void joinInGroupCall(TUICommonDefine.RoomId roomId, String groupId, TUICallDefine.MediaType callMediaType) {
+    }
+
+    /**
+     * Set the ringtone (preferably shorter than 30s)
+     *
+     * @param filePath Callee ringtone path
+     */
+    public void setCallingBell(String filePath) {
+    }
+
+    /**
+     * Enable the mute mode (the callee doesn't ring)
+     */
+    public void enableMuteMode(boolean enable) {
+    }
+
+    /**
+     * Enable the floating window
+     */
+    public void enableFloatWindow(boolean enable) {
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/TUICallKitImpl.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/TUICallKitImpl.java
new file mode 100644
index 0000000..ccaf392
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/TUICallKitImpl.java
@@ -0,0 +1,846 @@
+package com.tencent.qcloud.tuikit.tuicallkit;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.text.TextUtils;
+
+import com.tencent.liteav.beauty.TXBeautyManager;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.interfaces.ITUINotification;
+import com.tencent.qcloud.tuicore.interfaces.TUICallback;
+import com.tencent.qcloud.tuicore.util.SPUtils;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.TUICommonDefine;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine.Scene;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine.Status;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallEngine;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallObserver;
+import com.tencent.qcloud.tuikit.tuicallengine.impl.base.TUILog;
+import com.tencent.qcloud.tuikit.tuicallengine.utils.PermissionUtils;
+import com.tencent.qcloud.tuikit.tuicallkit.base.CallingUserModel;
+import com.tencent.qcloud.tuikit.tuicallkit.base.Constants;
+import com.tencent.qcloud.tuikit.tuicallkit.base.TUICallingStatusManager;
+import com.tencent.qcloud.tuikit.tuicallkit.config.OfflinePushInfoConfig;
+import com.tencent.qcloud.tuikit.tuicallkit.event.CallBackEvent;
+import com.tencent.qcloud.tuikit.tuicallkit.extensions.CallingBellFeature;
+import com.tencent.qcloud.tuikit.tuicallkit.extensions.CallingKeepAliveFeature;
+import com.tencent.qcloud.tuikit.tuicallkit.extensions.CallingScreenSensorFeature;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.DeviceUtils;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.PermissionRequest;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.UserInfoUtils;
+import com.tencent.qcloud.tuikit.tuicallkit.view.TUICallingViewManager;
+import com.tencent.trtc.TRTCCloud;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+public final class TUICallKitImpl extends TUICallKit implements ITUINotification {
+    private static final String TAG = "TUICallKit";
+
+    private static TUICallKitImpl sInstance;
+    private final  Context        mContext;
+    private final  UserInfoUtils  mUserInfoUtils;
+
+    private final CallingKeepAliveFeature    mCallingKeepAliveFeature;
+    private final CallingScreenSensorFeature mCallingScreenSensorFeature;
+    private final CallingBellFeature         mCallingBellFeature;
+    private final TUICallingViewManager      mCallingViewManager;
+    private final Handler                    mMainHandler = new Handler(Looper.getMainLooper());
+
+    private Runnable      mTimeRunnable;
+    private int           mTimeCount;
+    private Handler       mTimeHandler;
+    private HandlerThread mTimeHandlerThread;
+
+    private long mSelfLowQualityTime;
+    private long mOtherUserLowQualityTime;
+
+    private List<CallingUserModel> mInviteeList = new ArrayList<>();
+    private CallingUserModel       mInviter     = new CallingUserModel();
+
+    public static TUICallKitImpl createInstance(Context context) {
+        if (null == sInstance) {
+            synchronized (TUICallKitImpl.class) {
+                if (null == sInstance) {
+                    sInstance = new TUICallKitImpl(context);
+                }
+            }
+        }
+        return sInstance;
+    }
+
+    private TUICallKitImpl(Context context) {
+        mContext = context.getApplicationContext();
+        TUICallEngine.createInstance(mContext).addObserver(mTUICallObserver);
+        mCallingKeepAliveFeature = new CallingKeepAliveFeature(mContext);
+        mCallingScreenSensorFeature = new CallingScreenSensorFeature(mContext);
+        mCallingBellFeature = new CallingBellFeature(mContext);
+        mCallingViewManager = new TUICallingViewManager(mContext);
+        mUserInfoUtils = new UserInfoUtils();
+        createTimeHandler();
+        registerCallingEvent();
+    }
+
+    private void registerCallingEvent() {
+        //Login Event
+        TUICore.registerEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED,
+                TUIConstants.TUILogin.EVENT_SUB_KEY_USER_LOGIN_SUCCESS, this);
+        TUICore.registerEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED,
+                TUIConstants.TUILogin.EVENT_SUB_KEY_USER_LOGOUT_SUCCESS, this);
+
+        //TUICallkit Event
+        TUICore.registerEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_CALL_STATUS_CHANGED, this);
+    }
+
+    @Override
+    public void setSelfInfo(String nickname, String avatar, TUICommonDefine.Callback callback) {
+        TUICallEngine.createInstance(mContext).setSelfInfo(nickname, avatar, callback);
+    }
+
+    @Override
+    public void call(String userId, TUICallDefine.MediaType callMediaType) {
+        TUICallDefine.CallParams params = new TUICallDefine.CallParams();
+        params.offlinePushInfo = OfflinePushInfoConfig.createOfflinePushInfo(mContext);
+        params.timeout = Constants.SIGNALING_MAX_TIME;
+        call(userId, callMediaType, params, null);
+    }
+
+    @Override
+    public void call(String userId, TUICallDefine.MediaType callMediaType, TUICallDefine.CallParams params,
+                     TUICommonDefine.Callback callback) {
+        if (TextUtils.isEmpty(userId)) {
+            TUILog.e(TAG, "call failed, userId is empty");
+            callbackError(callback, TUICallDefine.ERROR_PARAM_INVALID, "call failed, userId is empty");
+            return;
+        }
+        if (TUICallDefine.MediaType.Unknown.equals(callMediaType)) {
+            TUILog.e(TAG, "call failed, callMediaType is Unknown");
+            callbackError(callback, TUICallDefine.ERROR_PARAM_INVALID, "call failed, callMediaType is Unknown");
+            return;
+        }
+
+        checkCallingPermission(callMediaType, new TUICallback() {
+            @Override
+            public void onSuccess() {
+
+                TUICallEngine.createInstance(mContext).call(userId, callMediaType, params,
+                        new TUICommonDefine.Callback() {
+                            @Override
+                            public void onSuccess() {
+                                CallingUserModel model = new CallingUserModel();
+                                model.userId = userId;
+                                mInviteeList.add(model);
+                                TUICallingStatusManager.sharedInstance(mContext).setMediaType(callMediaType);
+                                TUICallingStatusManager.sharedInstance(mContext).setCallRole(TUICallDefine.Role.Caller);
+                                TUICallingStatusManager.sharedInstance(mContext).setCallScene(Scene.SINGLE_CALL);
+
+                                showCallingView();
+                                mCallingBellFeature.startDialingMusic();
+                                callbackSuccess(callback);
+                            }
+
+                            @Override
+                            public void onError(int errCode, String errMsg) {
+                                if (errCode == TUICallDefine.ERROR_PACKAGE_NOT_PURCHASED) {
+                                    errMsg = mContext.getString(R.string.tuicalling_package_not_purchased);
+                                }
+                                ToastUtil.toastLongMessage(errMsg);
+                                callbackError(callback, errCode, errMsg);
+                            }
+                        });
+            }
+
+            @Override
+            public void onError(int errorCode, String errorMessage) {
+                callbackError(callback, errorCode, errorMessage);
+                resetCall();
+            }
+        });
+    }
+
+    @Override
+    public void groupCall(String groupId, List<String> userIdList, TUICallDefine.MediaType callMediaType) {
+        TUICallDefine.CallParams params = new TUICallDefine.CallParams();
+        params.offlinePushInfo = OfflinePushInfoConfig.createOfflinePushInfo(mContext);
+        params.timeout = Constants.SIGNALING_MAX_TIME;
+        groupCall(groupId, userIdList, callMediaType, params, null);
+    }
+
+    @Override
+    public void groupCall(String groupId, List<String> userIdList, TUICallDefine.MediaType callMediaType,
+                          TUICallDefine.CallParams params, TUICommonDefine.Callback callback) {
+        if (TextUtils.isEmpty(groupId)) {
+            TUILog.e(TAG, "groupCall failed, groupId is empty");
+            callbackError(callback, TUICallDefine.ERROR_PARAM_INVALID, "groupCall failed, groupId is empty");
+            return;
+        }
+
+        if (TUICallDefine.MediaType.Unknown.equals(callMediaType)) {
+            TUILog.e(TAG, "groupCall failed, callMediaType is Unknown");
+            callbackError(callback, TUICallDefine.ERROR_PARAM_INVALID, "groupCall failed, callMediaType is Unknown");
+            return;
+        }
+
+        if (userIdList == null || userIdList.isEmpty()) {
+            TUILog.e(TAG, "groupCall failed, userIdList is empty");
+            callbackError(callback, TUICallDefine.ERROR_PARAM_INVALID, "groupCall failed, userIdList is empty");
+            return;
+        }
+
+        if (userIdList.size() >= Constants.MAX_USER) {
+            ToastUtil.toastLongMessage(mContext.getString(R.string.tuicalling_user_exceed_limit));
+            TUILog.e(TAG, "groupCall failed, exceeding max user number: 9");
+            callbackError(callback, TUICallDefine.ERROR_PARAM_INVALID, "groupCall failed, exceeding max user number");
+            return;
+        }
+
+        checkCallingPermission(callMediaType, new TUICallback() {
+            @Override
+            public void onSuccess() {
+                TUICallEngine.createInstance(mContext).groupCall(groupId, userIdList, callMediaType,
+                        params, new TUICommonDefine.Callback() {
+                            @Override
+                            public void onSuccess() {
+                                for (String userId : userIdList) {
+                                    if (!TextUtils.isEmpty(userId)) {
+                                        CallingUserModel model = new CallingUserModel();
+                                        model.userId = userId;
+                                        mInviteeList.add(model);
+                                    }
+                                }
+                                TUICallingStatusManager.sharedInstance(mContext).setMediaType(callMediaType);
+                                TUICallingStatusManager.sharedInstance(mContext).setCallRole(TUICallDefine.Role.Caller);
+                                TUICallingStatusManager.sharedInstance(mContext).setCallScene(Scene.GROUP_CALL);
+                                TUICallingStatusManager.sharedInstance(mContext).setGroupId(groupId);
+
+                                showCallingView();
+                                mCallingBellFeature.startDialingMusic();
+                                callbackSuccess(callback);
+                            }
+
+                            @Override
+                            public void onError(int errCode, String errMsg) {
+                                if (errCode == TUICallDefine.ERROR_PACKAGE_NOT_SUPPORTED) {
+                                    errMsg = mContext.getString(R.string.tuicalling_package_not_support);
+                                }
+                                ToastUtil.toastLongMessage(errMsg);
+                                callbackError(callback, errCode, errMsg);
+                            }
+                        });
+            }
+
+            @Override
+            public void onError(int errorCode, String errorMessage) {
+                callbackError(callback, errorCode, errorMessage);
+                resetCall();
+            }
+        });
+    }
+
+    private void showCallingView() {
+        mCallingViewManager.createCallingView(mInviteeList, mInviter);
+        TUICallingStatusManager.sharedInstance(mContext).updateCallStatus(TUICallDefine.Status.Waiting);
+        queryUserInfo();
+
+        mCallingKeepAliveFeature.startKeepAlive();
+        mCallingScreenSensorFeature.registerSensorEventListener();
+
+        mCallingViewManager.showCallingView();
+    }
+
+    @Override
+    public void joinInGroupCall(TUICommonDefine.RoomId roomId, String groupId, TUICallDefine.MediaType mediaType) {
+        int intRoomId = (roomId != null) ? roomId.intRoomId : 0;
+        if (intRoomId <= 0 || intRoomId >= Constants.ROOM_ID_MAX) {
+            TUILog.e(TAG, "joinInGroupCall failed, roomId is invalid");
+            return;
+        }
+        if (TextUtils.isEmpty(groupId)) {
+            TUILog.e(TAG, "joinInGroupCall failed, groupId is empty");
+            return;
+        }
+        if (TUICallDefine.MediaType.Unknown.equals(mediaType)) {
+            TUILog.e(TAG, "joinInGroupCall failed, mediaType is unknown");
+            return;
+        }
+
+        checkCallingPermission(mediaType, new TUICallback() {
+            @Override
+            public void onSuccess() {
+                TUICallEngine.createInstance(mContext).joinInGroupCall(roomId, groupId, mediaType,
+                        new TUICommonDefine.Callback() {
+                            @Override
+                            public void onSuccess() {
+                                TUICallingStatusManager.sharedInstance(mContext).updateCallStatus(Status.Accept);
+                                TUICallingStatusManager.sharedInstance(mContext).setMediaType(mediaType);
+                                TUICallingStatusManager.sharedInstance(mContext).setCallScene(Scene.GROUP_CALL);
+                                TUICallingStatusManager.sharedInstance(mContext).setCallRole(TUICallDefine.Role.Called);
+                                TUICallingStatusManager.sharedInstance(mContext).setGroupId(groupId);
+
+                                mCallingViewManager.createGroupCallingAcceptView();
+                                mCallingViewManager.showCallingView();
+                                showTimeCount();
+                            }
+
+                            @Override
+                            public void onError(int errCode, String errMsg) {
+                                if (errCode == TUICallDefine.ERROR_PACKAGE_NOT_SUPPORTED) {
+                                    errMsg = mContext.getString(R.string.tuicalling_package_not_support);
+                                }
+                                ToastUtil.toastLongMessage(errMsg);
+                            }
+                        });
+            }
+
+            @Override
+            public void onError(int errorCode, String errorMessage) {
+                resetCall();
+            }
+        });
+    }
+
+    @Override
+    public void setCallingBell(String filePath) {
+        SPUtils.getInstance(CallingBellFeature.PROFILE_TUICALLING).put(CallingBellFeature.PROFILE_CALL_BELL, filePath);
+    }
+
+    @Override
+    public void enableMuteMode(boolean enable) {
+        SPUtils.getInstance(CallingBellFeature.PROFILE_TUICALLING).put(CallingBellFeature.PROFILE_MUTE_MODE, enable);
+    }
+
+    @Override
+    public void enableFloatWindow(boolean enable) {
+        mCallingViewManager.enableFloatWindow(enable);
+    }
+
+    public void queryOfflineCall() {
+        if (Status.None.equals(TUICallingStatusManager.sharedInstance(mContext).getCallStatus())) {
+            TUICallEngine.createInstance(mContext).queryOfflineCall();
+        }
+    }
+
+    private final TUICallObserver mTUICallObserver = new TUICallObserver() {
+        @Override
+        public void onError(int code, String msg) {
+            super.onError(code, msg);
+            ToastUtil.toastLongMessage(mContext.getString(R.string.tuicalling_toast_call_error_msg, code, msg));
+        }
+
+        @Override
+        public void onCallReceived(String callerId, List<String> calleeIdList, String groupId,
+                                   TUICallDefine.MediaType callMediaType, String userData) {
+            super.onCallReceived(callerId, calleeIdList, groupId, callMediaType, userData);
+
+            if (TUICallDefine.MediaType.Unknown.equals(callMediaType)) {
+                return;
+            }
+
+            if (calleeIdList == null || calleeIdList.isEmpty()) {
+                return;
+            }
+
+            if (calleeIdList.size() >= Constants.MAX_USER) {
+                ToastUtil.toastLongMessage(mContext.getString(R.string.tuicalling_user_exceed_limit));
+                return;
+            }
+
+            //when app comes back to foreground, start the call
+            if (!DeviceUtils.isAppRunningForeground(mContext) && !PermissionUtils.hasPermission(mContext)) {
+                TUILog.w(TAG, "App is in background");
+                mCallingBellFeature.startRing();
+                return;
+            }
+
+            checkCallingPermission(callMediaType, new TUICallback() {
+                @Override
+                public void onSuccess() {
+                    for (String userId : calleeIdList) {
+                        if (!TextUtils.isEmpty(userId)) {
+                            CallingUserModel model = new CallingUserModel();
+                            model.userId = userId;
+                            mInviteeList.add(model);
+                        }
+                    }
+
+                    mInviter.userId = callerId;
+                    Scene scene;
+                    if (!TextUtils.isEmpty(groupId)) {
+                        scene = Scene.GROUP_CALL;
+                    } else {
+                        scene = (calleeIdList.size() > 1) ? Scene.MULTI_CALL : Scene.SINGLE_CALL;
+                    }
+                    TUICallingStatusManager.sharedInstance(mContext).setMediaType(callMediaType);
+                    TUICallingStatusManager.sharedInstance(mContext).setCallRole(TUICallDefine.Role.Called);
+                    TUICallingStatusManager.sharedInstance(mContext).setCallScene(scene);
+                    TUICallingStatusManager.sharedInstance(mContext).setGroupId(groupId);
+
+                    showCallingView();
+                    mCallingBellFeature.startRing();
+                }
+
+                @Override
+                public void onError(int errorCode, String errorMessage) {
+                    TUICallEngine.createInstance(mContext).reject(null);
+                    resetCall();
+                }
+            });
+        }
+
+        @Override
+        public void onCallCancelled(String callerId) {
+            super.onCallCancelled(callerId);
+            EventBus.getDefault().post(new CallBackEvent(CallBackEvent.CALL_CANCEL));
+            resetCall();
+        }
+
+        @Override
+        public void onCallBegin(TUICommonDefine.RoomId roomId, TUICallDefine.MediaType callMediaType,
+                                TUICallDefine.Role callRole) {
+            super.onCallBegin(roomId, callMediaType, callRole);
+            mCallingBellFeature.stopMusic();
+            TUICallingStatusManager.sharedInstance(mContext).updateCallStatus(TUICallDefine.Status.Accept);
+            showTimeCount();
+            EventBus.getDefault().post(new CallBackEvent(CallBackEvent.CALL_BEGIN));
+        }
+
+        @Override
+        public void onCallEnd(TUICommonDefine.RoomId roomId, TUICallDefine.MediaType callMediaType,
+                              TUICallDefine.Role callRole, long totalTime) {
+            super.onCallEnd(roomId, callMediaType, callRole, totalTime);
+            resetCall();
+            EventBus.getDefault().post(new CallBackEvent(CallBackEvent.CALL_END));
+        }
+
+        @Override
+        public void onCallMediaTypeChanged(TUICallDefine.MediaType oldCallMediaType,
+                                           TUICallDefine.MediaType newCallMediaType) {
+            super.onCallMediaTypeChanged(oldCallMediaType, newCallMediaType);
+            if (!oldCallMediaType.equals(newCallMediaType)) {
+                TUICallingStatusManager.sharedInstance(mContext).setMediaType(newCallMediaType);
+            }
+        }
+
+        @Override
+        public void onUserReject(String userId) {
+            super.onUserReject(userId);
+            CallingUserModel userModel = findCallingUserModel(userId);
+            mCallingViewManager.userLeave(userModel);
+            showUserToast(userModel, R.string.tuicalling_toast_user_reject_call);
+            mInviteeList.remove(userModel);
+        }
+
+        @Override
+        public void onUserNoResponse(String userId) {
+            super.onUserNoResponse(userId);
+            CallingUserModel userModel = findCallingUserModel(userId);
+            mCallingViewManager.userLeave(userModel);
+            showUserToast(userModel, R.string.tuicalling_toast_user_not_response);
+            mInviteeList.remove(userModel);
+        }
+
+        @Override
+        public void onUserLineBusy(String userId) {
+            super.onUserLineBusy(userId);
+            CallingUserModel userModel = findCallingUserModel(userId);
+            mCallingViewManager.userLeave(userModel);
+            showUserToast(userModel, R.string.tuicalling_toast_user_busy);
+            mInviteeList.remove(userModel);
+        }
+
+        @Override
+        public void onUserJoin(String userId) {
+            super.onUserJoin(userId);
+            CallingUserModel userModel = findCallingUserModel(userId);
+            if (userModel == null) {
+                userModel = new CallingUserModel();
+                userModel.userId = userId;
+            }
+            mCallingViewManager.userEnter(userModel);
+        }
+
+        @Override
+        public void onUserLeave(String userId) {
+            super.onUserLeave(userId);
+            CallingUserModel userModel = findCallingUserModel(userId);
+            mCallingViewManager.userLeave(userModel);
+            showUserToast(userModel, R.string.tuicalling_toast_user_end);
+            mInviteeList.remove(userModel);
+        }
+
+        @Override
+        public void onUserVideoAvailable(String userId, boolean isVideoAvailable) {
+            super.onUserVideoAvailable(userId, isVideoAvailable);
+            CallingUserModel model = findCallingUserModel(userId);
+            if (model != null && model.isVideoAvailable != isVideoAvailable) {
+                model.isVideoAvailable = isVideoAvailable;
+                mCallingViewManager.updateUser(model);
+            }
+        }
+
+        @Override
+        public void onUserAudioAvailable(String userId, boolean isAudioAvailable) {
+            super.onUserAudioAvailable(userId, isAudioAvailable);
+            CallingUserModel model = findCallingUserModel(userId);
+            if (model != null && model.isAudioAvailable != isAudioAvailable) {
+                model.isAudioAvailable = isAudioAvailable;
+                mCallingViewManager.updateUser(model);
+            }
+        }
+
+        @Override
+        public void onUserVoiceVolumeChanged(Map<String, Integer> volumeMap) {
+            super.onUserVoiceVolumeChanged(volumeMap);
+            if (Scene.SINGLE_CALL.equals(TUICallingStatusManager.sharedInstance(mContext).getCallScene())) {
+                return;
+            }
+            for (Map.Entry<String, Integer> entry : volumeMap.entrySet()) {
+                if (null != entry && !TextUtils.isEmpty(entry.getKey())) {
+                    CallingUserModel userModel = findCallingUserModel(entry.getKey());
+                    if (userModel != null && userModel.volume != entry.getValue()) {
+                        userModel.volume = entry.getValue();
+                        mCallingViewManager.updateUser(userModel);
+                    }
+                }
+            }
+        }
+
+        @Override
+        public void onUserNetworkQualityChanged(List<TUICommonDefine.NetworkQualityInfo> networkQualityList) {
+            super.onUserNetworkQualityChanged(networkQualityList);
+            updateNetworkQuality(networkQualityList);
+        }
+
+        @Override
+        public void onKickedOffline() {
+            super.onKickedOffline();
+            TUICallEngine.createInstance(mContext).hangup(null);
+            resetCall();
+        }
+
+        @Override
+        public void onUserSigExpired() {
+            super.onUserSigExpired();
+            TUICallEngine.createInstance(mContext).hangup(null);
+            resetCall();
+        }
+    };
+
+    private void resetCall() {
+        runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+
+                stopTimeCount();
+                mCallingBellFeature.stopMusic();
+                mCallingKeepAliveFeature.stopKeepAlive();
+                mCallingScreenSensorFeature.unregisterSensorEventListener();
+
+                mCallingViewManager.closeCallingView();
+                mInviter = new CallingUserModel();
+                mInviteeList.clear();
+                TUICallingStatusManager.sharedInstance(mContext).clear();
+            }
+        });
+    }
+
+    private void runOnMainThread(Runnable task) {
+        if (null != task) {
+            mMainHandler.post(task);
+        }
+    }
+
+    private void queryUserInfo() {
+        ArrayList<CallingUserModel> list = new ArrayList<>();
+        list.add(mInviter);
+        list.addAll(mInviteeList);
+        mUserInfoUtils.getUserInfo(list, new UserInfoUtils.UserCallback() {
+            @Override
+            public void onSuccess(List<CallingUserModel> list) {
+                if (null == list || list.isEmpty()) {
+                    return;
+                }
+                for (CallingUserModel model : list) {
+                    if (null != model && !TextUtils.isEmpty(model.userId)) {
+                        CallingUserModel userModel = findCallingUserModel(model.userId);
+                        if (null != userModel) {
+                            userModel.userName = model.userName;
+                            userModel.userAvatar = model.userAvatar;
+                        }
+                    }
+                }
+                mCallingViewManager.updateCallingUserView(mInviteeList, mInviter);
+            }
+
+            @Override
+            public void onFailed(int errorCode, String errorMsg) {
+            }
+        });
+    }
+
+    private void showUserToast(CallingUserModel model, int msgId) {
+        if (null == model || TextUtils.isEmpty(model.userId)) {
+            return;
+        }
+        if (!TextUtils.isEmpty(model.userName)) {
+            ToastUtil.toastLongMessage(mContext.getString(msgId, model.userName));
+            return;
+        }
+        UserInfoUtils userInfoUtils = new UserInfoUtils();
+        userInfoUtils.getUserInfo(model.userId, new UserInfoUtils.UserCallback() {
+            @Override
+            public void onSuccess(List<CallingUserModel> list) {
+                if (null == list || list.isEmpty() || null == list.get(0) || TextUtils.isEmpty(list.get(0).userId)) {
+                    ToastUtil.toastLongMessage(mContext.getString(msgId, model.userId));
+                    return;
+                }
+
+                model.userName = list.get(0).userName;
+                model.userAvatar = list.get(0).userAvatar;
+                ToastUtil.toastLongMessage(mContext.getString(msgId, model.userName));
+            }
+
+            @Override
+            public void onFailed(int errorCode, String errorMsg) {
+                ToastUtil.toastLongMessage(mContext.getString(msgId, model.userId));
+            }
+        });
+    }
+
+    private CallingUserModel findCallingUserModel(String userId) {
+        if (TextUtils.isEmpty(userId)) {
+            return null;
+        }
+        if (userId.equals(mInviter.userId)) {
+            return mInviter;
+        } else {
+            for (CallingUserModel model : mInviteeList) {
+                if (null != model && !TextUtils.isEmpty(model.userId) && userId.equals(model.userId)) {
+                    return model;
+                }
+            }
+        }
+        return null;
+    }
+
+    private void createTimeHandler() {
+        mTimeHandlerThread = new HandlerThread("time-count-thread");
+        mTimeHandlerThread.start();
+        mTimeHandler = new Handler(mTimeHandlerThread.getLooper());
+    }
+
+    private void showTimeCount() {
+        if (mTimeRunnable != null) {
+            return;
+        }
+        mTimeCount = 0;
+        mTimeRunnable = new Runnable() {
+            @Override
+            public void run() {
+                mTimeCount++;
+                mCallingViewManager.userCallingTimeStr(getShowTime(mTimeCount));
+                mTimeHandler.postDelayed(mTimeRunnable, 1000);
+            }
+        };
+        mTimeHandler.post(mTimeRunnable);
+    }
+
+    private String getShowTime(int count) {
+        return mContext.getString(R.string.tuicalling_called_time_format, count / 60, count % 60);
+    }
+
+    private void stopTimeCount() {
+        mTimeHandler.removeCallbacks(mTimeRunnable);
+        mTimeRunnable = null;
+        mTimeCount = 0;
+    }
+
+    private void updateNetworkQuality(List<TUICommonDefine.NetworkQualityInfo> networkQualityList) {
+        if (networkQualityList.isEmpty()) {
+            return;
+        }
+        TUICommonDefine.NetworkQualityInfo localInfo = null;
+        Iterator<TUICommonDefine.NetworkQualityInfo> iterator = networkQualityList.iterator();
+        while (iterator.hasNext()) {
+            TUICommonDefine.NetworkQualityInfo tempInfo = iterator.next();
+            if (TUILogin.getLoginUser().equals(tempInfo.userId)) {
+                localInfo = tempInfo;
+                break;
+            }
+        }
+        boolean isLocalLowQuality = false;
+        if (localInfo != null) {
+            isLocalLowQuality = isLowQuality(localInfo.quality);
+        }
+        if (isLocalLowQuality) {
+            updateLowQualityTip(true);
+        } else if (iterator.hasNext()) {
+            TUICommonDefine.NetworkQualityInfo remoteInfo = iterator.next();
+            if (isLowQuality(remoteInfo.quality)) {
+                updateLowQualityTip(false);
+            }
+        }
+    }
+
+    private boolean isLowQuality(TUICommonDefine.NetworkQuality quality) {
+        if (null == quality) {
+            return false;
+        }
+        boolean lowQuality;
+        switch (quality) {
+            case Vbad:
+            case Down:
+                lowQuality = true;
+                break;
+            default:
+                lowQuality = false;
+        }
+        return lowQuality;
+    }
+
+    private void updateLowQualityTip(boolean isSelf) {
+        long currentTime = System.currentTimeMillis();
+        if (isSelf) {
+            if (currentTime - mSelfLowQualityTime > Constants.MIN_DURATION_SHOW_LOW_QUALITY) {
+                ToastUtil.toastShortMessage(mContext.getString(R.string.tuicalling_self_network_low_quality));
+                mSelfLowQualityTime = currentTime;
+            }
+        } else {
+            if (currentTime - mOtherUserLowQualityTime > Constants.MIN_DURATION_SHOW_LOW_QUALITY) {
+                ToastUtil.toastShortMessage(mContext.getString(R.string.tuicalling_other_party_network_low_quality));
+                mOtherUserLowQualityTime = currentTime;
+            }
+        }
+    }
+
+    private void checkCallingPermission(TUICallDefine.MediaType mediaType, TUICallback callback) {
+        PermissionRequest.PermissionCallback permissionCallback = new PermissionRequest.PermissionCallback() {
+            @Override
+            public void onGranted() {
+                super.onGranted();
+                if (callback != null) {
+                    callback.onSuccess();
+                }
+            }
+
+            @Override
+            public void onDialogRefused() {
+                super.onDialogRefused();
+                if (callback != null) {
+                    callback.onError(TUICallDefine.ERROR_PERMISSION_DENIED, "permission denied");
+                }
+            }
+        };
+        if (TUICallDefine.MediaType.Video.equals(mediaType)) {
+            PermissionRequest.requestPermission(mContext, PermissionRequest.PERMISSION_MICROPHONE,
+                    PermissionRequest.PERMISSION_CAMERA, permissionCallback);
+        } else {
+            PermissionRequest.requestPermission(mContext, PermissionRequest.PERMISSION_MICROPHONE, permissionCallback);
+        }
+    }
+
+    private int generateRoomId() {
+        return new Random().nextInt(Constants.ROOM_ID_MAX - Constants.ROOM_ID_MIN + 1) + Constants.ROOM_ID_MIN;
+    }
+
+    private void initCallEngine() {
+        TUICallEngine.createInstance(mContext).init(TUILogin.getSdkAppId(), TUILogin.getLoginUser(),
+                TUILogin.getUserSig(), new TUICommonDefine.Callback() {
+                    @Override
+                    public void onSuccess() {
+                    }
+
+                    @Override
+                    public void onError(int errCode, String errMsg) {
+                    }
+                });
+        initCallVideoParams();
+        initCallBeautyParams();
+    }
+
+    private void initCallVideoParams() {
+        //set video render params of loginUser
+        TUICommonDefine.VideoRenderParams renderParams = new TUICommonDefine.VideoRenderParams();
+        renderParams.fillMode = TUICommonDefine.VideoRenderParams.FillMode.Fill;
+        renderParams.rotation = TUICommonDefine.VideoRenderParams.Rotation.Rotation_0;
+        String user = TUILogin.getLoginUser();
+        TUICallEngine.createInstance(mContext).setVideoRenderParams(user, renderParams, new TUICommonDefine.Callback() {
+            @Override
+            public void onSuccess() {
+            }
+
+            @Override
+            public void onError(int errCode, String errMsg) {
+            }
+        });
+
+        //set video encoder params
+        TUICommonDefine.VideoEncoderParams encoderParams = new TUICommonDefine.VideoEncoderParams();
+        encoderParams.resolution = TUICommonDefine.VideoEncoderParams.Resolution.Resolution_640_360;
+        encoderParams.resolutionMode = TUICommonDefine.VideoEncoderParams.ResolutionMode.Portrait;
+        TUICallEngine.createInstance(mContext).setVideoEncoderParams(encoderParams, new TUICommonDefine.Callback() {
+            @Override
+            public void onSuccess() {
+            }
+
+            @Override
+            public void onError(int errCode, String errMsg) {
+            }
+        });
+    }
+
+    private void initCallBeautyParams() {
+        TRTCCloud trtcCloud = TUICallEngine.createInstance(mContext).getTRTCCloudInstance();
+        TXBeautyManager txBeautyManager = trtcCloud.getBeautyManager();
+        txBeautyManager.setBeautyStyle(TXBeautyManager.TXBeautyStyleNature);
+        txBeautyManager.setBeautyLevel(6);
+    }
+
+    @Override
+    public void onNotifyEvent(String key, String subKey, Map<String, Object> param) {
+        //Login Event
+        if (TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED.equals(key)) {
+            if (TUIConstants.TUILogin.EVENT_SUB_KEY_USER_LOGOUT_SUCCESS.equals(subKey)) {
+                //logout succeed: if user is in the call, end the call first and then clean data
+                TUICallEngine.createInstance(mContext).hangup(null);
+                TUICallEngine.destroyInstance();
+                resetCall();
+            } else if (TUIConstants.TUILogin.EVENT_SUB_KEY_USER_LOGIN_SUCCESS.equals(subKey)) {
+                //login succeed: add "TUICallObserver" again
+                TUICallEngine.createInstance(mContext).addObserver(mTUICallObserver);
+                //login succeed: initialize "TUICallEngine"
+                initCallEngine();
+            }
+        }
+
+        //TUICallkit Event
+        if (Constants.EVENT_TUICALLING_CHANGED.equals(key)
+                && Constants.EVENT_SUB_CALL_STATUS_CHANGED.equals(subKey) && param != null) {
+            if (TUICallDefine.Status.None.equals(param.get(Constants.CALL_STATUS))) {
+                resetCall();
+            }
+        }
+    }
+
+    public void callbackSuccess(TUICommonDefine.Callback callback) {
+        if (callback != null) {
+            callback.onSuccess();
+        }
+    }
+
+    public void callbackError(TUICommonDefine.Callback callback, int errCode, String errMsg) {
+        if (callback != null) {
+            callback.onError(errCode, errMsg);
+        }
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/BaseCallActivity.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/BaseCallActivity.java
new file mode 100644
index 0000000..b6dd812
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/BaseCallActivity.java
@@ -0,0 +1,111 @@
+package com.tencent.qcloud.tuikit.tuicallkit.base;
+
+import android.app.NotificationManager;
+import android.content.Context;
+import android.graphics.Color;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.RelativeLayout;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.event.CallBackEvent;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.DeviceUtils;
+import com.tencent.qcloud.tuikit.tuicallkit.view.root.BaseCallView;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+public class BaseCallActivity extends AppCompatActivity {
+    private static AppCompatActivity mActivity;
+    private static BaseCallView      mBaseCallView;
+    private static RelativeLayout    mLayoutContainer;
+
+    public static void updateBaseView(BaseCallView view) {
+        mBaseCallView = view;
+        if (null != mLayoutContainer && null != mBaseCallView) {
+            mLayoutContainer.removeAllViews();
+            if (null != mBaseCallView.getParent()) {
+                ((ViewGroup) mBaseCallView.getParent()).removeView(mBaseCallView);
+            }
+            mLayoutContainer.addView(mBaseCallView);
+        }
+    }
+
+    public static void finishActivity() {
+        if (null != mActivity) {
+            mActivity.finish();
+        }
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        DeviceUtils.setScreenLockParams(getWindow());
+        mActivity = this;
+        setContentView(R.layout.tuicalling_base_activity);
+        EventBus.getDefault().register(this);
+        initStatusBar();
+    }
+
+    private void initStatusBar() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            Window window = getWindow();
+            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+            window.setStatusBarColor(Color.TRANSPARENT);
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        initView();
+        // clear notifications after a call is processed
+        NotificationManager notificationManager =
+                (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.cancelAll();
+    }
+
+    private void initView() {
+        mLayoutContainer = findViewById(R.id.rl_container);
+        mLayoutContainer.removeAllViews();
+        if (null != mBaseCallView) {
+            if (null != mBaseCallView.getParent()) {
+                ((ViewGroup) mBaseCallView.getParent()).removeView(mBaseCallView);
+            }
+            mLayoutContainer.addView(mBaseCallView);
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        EventBus.getDefault().unregister(this);
+        if (null != mBaseCallView && null != mBaseCallView.getParent()) {
+            ((ViewGroup) mBaseCallView.getParent()).removeView(mBaseCallView);
+        }
+        mBaseCallView = null;
+        mLayoutContainer = null;
+        mActivity = null;
+    }
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEvent(CallBackEvent event) {
+
+    }
+}
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/CallingUserModel.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/CallingUserModel.java
new file mode 100644
index 0000000..ca0599a
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/CallingUserModel.java
@@ -0,0 +1,38 @@
+package com.tencent.qcloud.tuikit.tuicallkit.base;
+
+import java.util.Objects;
+
+public class CallingUserModel {
+    public String  userId;
+    public String  userAvatar;
+    public String  userName;
+    public boolean isEnter;
+    public boolean isAudioAvailable;
+    public boolean isVideoAvailable;
+    public int     volume;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        CallingUserModel model = (CallingUserModel) o;
+        return Objects.equals(userId, model.userId);
+    }
+
+    @Override
+    public String toString() {
+        return "CallingUserModel{"
+                + "userId='" + userId
+                + ", userAvatar='" + userAvatar
+                + ", userName='" + userName
+                + ", isEnter=" + isEnter
+                + ", isAudioAvailable=" + isAudioAvailable
+                + ", isVideoAvailable=" + isVideoAvailable
+                + ", volume=" + volume
+                + '}';
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/Constants.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/Constants.java
new file mode 100644
index 0000000..614ef36
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/Constants.java
@@ -0,0 +1,31 @@
+package com.tencent.qcloud.tuikit.tuicallkit.base;
+
+public class Constants {
+    public static final String TUICALLKIT = "TUICallKit";
+
+    public static final int ROOM_ID_MIN = 1;
+    public static final int ROOM_ID_MAX = Integer.MAX_VALUE;
+
+    //信令超时时长，默认 30s
+    public static int SIGNALING_MAX_TIME = 30;
+
+    public static final int MIN_AUDIO_VOLUME              = 10;
+    public static final int MAX_USER                      = 9;
+    public static final int MIN_DURATION_SHOW_LOW_QUALITY = 5000; //Minimum interval for displaying poor network
+
+    public static final String EVENT_TUICALLING_CHANGED = "eventTUICallingChanged";
+
+    public static final String EVENT_SUB_CALL_STATUS_CHANGED     = "eventSubCallStatusChanged";
+    public static final String EVENT_SUB_CALL_TYPE_CHANGED       = "eventSubMediaTypeChanged";
+    public static final String EVENT_SUB_CAMERA_OPEN             = "eventSubCameraOpen";
+    public static final String EVENT_SUB_CAMERA_FRONT            = "eventSubCameraFront";
+    public static final String EVENT_SUB_MIC_STATUS_CHANGED      = "eventSubMicStatusChanged";
+    public static final String EVENT_SUB_AUDIOPLAYDEVICE_CHANGED = "eventSubAudioPlayDeviceChanged";
+
+    public static final String OPEN_CAMERA     = "openCamera";
+    public static final String SWITCH_CAMERA   = "switchCamera";
+    public static final String MUTE_MIC        = "muteMic";
+    public static final String HANDS_FREE      = "handsFree";
+    public static final String CALL_STATUS     = "callStatus";
+    public static final String CALL_MEDIA_TYPE = "callMediaType";
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/TUICallingAction.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/TUICallingAction.java
new file mode 100644
index 0000000..d417081
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/TUICallingAction.java
@@ -0,0 +1,149 @@
+package com.tencent.qcloud.tuikit.tuicallkit.base;
+
+import android.content.Context;
+
+import com.tencent.qcloud.tuikit.TUICommonDefine;
+import com.tencent.qcloud.tuikit.TUIVideoView;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallEngine;
+import com.tencent.qcloud.tuikit.tuicallkit.config.OfflinePushInfoConfig;
+
+import java.util.List;
+
+public class TUICallingAction {
+    private final Context mContext;
+
+    public TUICallingAction(Context context) {
+        mContext = context;
+    }
+
+    public void inviteUser(List<String> userIdList, TUICommonDefine.ValueCallback callback) {
+        TUICallDefine.CallParams params = new TUICallDefine.CallParams();
+        params.offlinePushInfo = OfflinePushInfoConfig.createOfflinePushInfo(mContext);
+        params.timeout = Constants.SIGNALING_MAX_TIME;
+        TUICallEngine.createInstance(mContext).inviteUser(userIdList, params, callback);
+    }
+
+    public void accept(TUICommonDefine.Callback callback) {
+        TUICallEngine.createInstance(mContext).accept(new TUICommonDefine.Callback() {
+            @Override
+            public void onSuccess() {
+                TUICallingStatusManager.sharedInstance(mContext).updateCallStatus(TUICallDefine.Status.Accept);
+                if (callback != null) {
+                    callback.onSuccess();
+                }
+            }
+
+            @Override
+            public void onError(int errCode, String errMsg) {
+                TUICallingStatusManager.sharedInstance(mContext).updateCallStatus(TUICallDefine.Status.None);
+                if (callback != null) {
+                    callback.onError(errCode, errMsg);
+                }
+            }
+        });
+    }
+
+    public void reject(TUICommonDefine.Callback callback) {
+        TUICallEngine.createInstance(mContext).reject(new TUICommonDefine.Callback() {
+            @Override
+            public void onSuccess() {
+                TUICallingStatusManager.sharedInstance(mContext).updateCallStatus(TUICallDefine.Status.None);
+                if (callback != null) {
+                    callback.onSuccess();
+                }
+            }
+
+            @Override
+            public void onError(int errCode, String errMsg) {
+                TUICallingStatusManager.sharedInstance(mContext).updateCallStatus(TUICallDefine.Status.None);
+                if (callback != null) {
+                    callback.onError(errCode, errMsg);
+                }
+            }
+        });
+    }
+
+    public void hangup(TUICommonDefine.Callback callback) {
+        TUICallEngine.createInstance(mContext).hangup(new TUICommonDefine.Callback() {
+            @Override
+            public void onSuccess() {
+                TUICallingStatusManager.sharedInstance(mContext).updateCallStatus(TUICallDefine.Status.None);
+                if (callback != null) {
+                    callback.onSuccess();
+                }
+            }
+
+            @Override
+            public void onError(int errCode, String errMsg) {
+                TUICallingStatusManager.sharedInstance(mContext).updateCallStatus(TUICallDefine.Status.None);
+                if (callback != null) {
+                    callback.onError(errCode, errMsg);
+                }
+            }
+        });
+    }
+
+    public void switchCallMediaType(TUICallDefine.MediaType callMediaType) {
+        TUICallEngine.createInstance(mContext).switchCallMediaType(callMediaType);
+    }
+
+    public void openCamera(TUICommonDefine.Camera camera, TUIVideoView videoView, TUICommonDefine.Callback callback) {
+        TUICallEngine.createInstance(mContext).openCamera(camera, videoView, new TUICommonDefine.Callback() {
+            @Override
+            public void onSuccess() {
+                TUICallDefine.Status status = TUICallingStatusManager.sharedInstance(mContext).getCallStatus();
+                if (!TUICallDefine.Status.None.equals(status)) {
+                    TUICommonDefine.Camera camera = TUICallingStatusManager.sharedInstance(mContext).getFrontCamera();
+                    TUICallingStatusManager.sharedInstance(mContext).updateCameraOpenStatus(true, camera);
+                    TUICallingStatusManager.sharedInstance(mContext).updateFrontCameraStatus(camera);
+                }
+
+                if (callback != null) {
+                    callback.onSuccess();
+                }
+            }
+
+            @Override
+            public void onError(int errCode, String errMsg) {
+                if (callback != null) {
+                    callback.onError(errCode, errMsg);
+                }
+            }
+        });
+    }
+
+    public void closeCamera() {
+        TUICallEngine.createInstance(mContext).closeCamera();
+        TUICommonDefine.Camera frontCamera = TUICallingStatusManager.sharedInstance(mContext).getFrontCamera();
+        TUICallingStatusManager.sharedInstance(mContext).updateCameraOpenStatus(false, frontCamera);
+    }
+
+    public void switchCamera(TUICommonDefine.Camera camera) {
+        TUICallEngine.createInstance(mContext).switchCamera(camera);
+        TUICallingStatusManager.sharedInstance(mContext).updateFrontCameraStatus(camera);
+    }
+
+    public void openMicrophone(TUICommonDefine.Callback callback) {
+        TUICallEngine.createInstance(mContext).openMicrophone(callback);
+        TUICallingStatusManager.sharedInstance(mContext).updateMicMuteStatus(false);
+    }
+
+    public void closeMicrophone() {
+        TUICallEngine.createInstance(mContext).closeMicrophone();
+        TUICallingStatusManager.sharedInstance(mContext).updateMicMuteStatus(true);
+    }
+
+    public void selectAudioPlaybackDevice(TUICommonDefine.AudioPlaybackDevice device) {
+        TUICallEngine.createInstance(mContext).selectAudioPlaybackDevice(device);
+        TUICallingStatusManager.sharedInstance(mContext).updateAudioPlaybackDevice(device);
+    }
+
+    public void startRemoteView(String userId, TUIVideoView videoView, TUICommonDefine.PlayCallback callback) {
+        TUICallEngine.createInstance(mContext).startRemoteView(userId, videoView, callback);
+    }
+
+    public void stopRemoteView(String userId) {
+        TUICallEngine.createInstance(mContext).stopRemoteView(userId);
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/TUICallingStatusManager.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/TUICallingStatusManager.java
new file mode 100644
index 0000000..a033013
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/TUICallingStatusManager.java
@@ -0,0 +1,156 @@
+package com.tencent.qcloud.tuikit.tuicallkit.base;
+
+import android.content.Context;
+
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuikit.TUICommonDefine;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine;
+import com.tencent.qcloud.tuikit.tuicallkit.TUICallKitImpl;
+
+import java.util.HashMap;
+
+public class TUICallingStatusManager {
+    private static TUICallingStatusManager sInstance;
+    private final  Context                 mContext;
+
+    private boolean                             mIsCameraOpen;
+    private boolean                             mIsMicMute;
+    private TUICommonDefine.Camera              mIsFrontCamera = TUICommonDefine.Camera.Front;
+    private TUICommonDefine.AudioPlaybackDevice mAudioDevice   = TUICommonDefine.AudioPlaybackDevice.Speakerphone;
+    private TUICallDefine.Status                mCallStatus    = TUICallDefine.Status.None;
+    private TUICallDefine.Role                  mCallRole      = TUICallDefine.Role.None;
+    private TUICallDefine.MediaType             mMediaType     = TUICallDefine.MediaType.Unknown;
+    private TUICallDefine.Scene                 mCallScene;
+    private String                              mGroupId;
+
+    public static TUICallingStatusManager sharedInstance(Context context) {
+        if (null == sInstance) {
+            synchronized (TUICallKitImpl.class) {
+                if (null == sInstance) {
+                    sInstance = new TUICallingStatusManager(context);
+                }
+            }
+        }
+        return sInstance;
+    }
+
+    private TUICallingStatusManager(Context context) {
+        mContext = context.getApplicationContext();
+    }
+
+    public boolean isCameraOpen() {
+        return mIsCameraOpen;
+    }
+
+    public boolean isMicMute() {
+        return mIsMicMute;
+    }
+
+    public TUICommonDefine.Camera getFrontCamera() {
+        return mIsFrontCamera;
+    }
+
+    public TUICommonDefine.AudioPlaybackDevice getAudioPlaybackDevice() {
+        return mAudioDevice;
+    }
+
+    public TUICallDefine.Status getCallStatus() {
+        return mCallStatus;
+    }
+
+    public void updateCallStatus(TUICallDefine.Status status) {
+        if (mCallStatus.equals(status)) {
+            return;
+        }
+        mCallStatus = status;
+
+        HashMap<String, Object> map = new HashMap<>();
+        map.put(Constants.CALL_STATUS, status);
+        TUICore.notifyEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_CALL_STATUS_CHANGED, map);
+    }
+
+    public void updateCameraOpenStatus(boolean isOpen, TUICommonDefine.Camera isFrontCamera) {
+        mIsCameraOpen = isOpen;
+
+        HashMap<String, Object> map = new HashMap<>();
+        map.put(Constants.OPEN_CAMERA, isOpen);
+        if (isOpen) {
+            map.put(Constants.SWITCH_CAMERA, isFrontCamera);
+        }
+        TUICore.notifyEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_CAMERA_OPEN, map);
+    }
+
+    public void updateFrontCameraStatus(TUICommonDefine.Camera isFrontCamera) {
+        mIsFrontCamera = isFrontCamera;
+
+        HashMap<String, Object> map = new HashMap<>();
+        map.put(Constants.SWITCH_CAMERA, isFrontCamera);
+        TUICore.notifyEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_CAMERA_FRONT, map);
+    }
+
+    public void updateMicMuteStatus(boolean isMicMute) {
+        if (mIsMicMute == isMicMute) {
+            return;
+        }
+        mIsMicMute = isMicMute;
+
+        HashMap<String, Object> map = new HashMap<>();
+        map.put(Constants.MUTE_MIC, isMicMute);
+        TUICore.notifyEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_MIC_STATUS_CHANGED, map);
+    }
+
+    public void updateAudioPlaybackDevice(TUICommonDefine.AudioPlaybackDevice audioPlaybackDevice) {
+        mAudioDevice = audioPlaybackDevice;
+
+        HashMap<String, Object> map = new HashMap<>();
+        map.put(Constants.HANDS_FREE, audioPlaybackDevice);
+        TUICore.notifyEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_AUDIOPLAYDEVICE_CHANGED, map);
+    }
+
+    public void setGroupId(String groupId) {
+        mGroupId = groupId;
+    }
+
+    public String getGroupId() {
+        return mGroupId;
+    }
+
+    public void setCallRole(TUICallDefine.Role role) {
+        mCallRole = role;
+    }
+
+    public TUICallDefine.Role getCallRole() {
+        return mCallRole;
+    }
+
+    public TUICallDefine.MediaType getMediaType() {
+        return mMediaType;
+    }
+
+    public void setMediaType(TUICallDefine.MediaType type) {
+        mMediaType = type;
+        HashMap<String, Object> map = new HashMap<>();
+        map.put(Constants.CALL_MEDIA_TYPE, mMediaType);
+        TUICore.notifyEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_CALL_TYPE_CHANGED, map);
+    }
+
+    public TUICallDefine.Scene getCallScene() {
+        return mCallScene;
+    }
+
+    public void setCallScene(TUICallDefine.Scene scene) {
+        this.mCallScene = scene;
+    }
+
+    public void clear() {
+        mIsCameraOpen = false;
+        mIsFrontCamera = TUICommonDefine.Camera.Front;
+        mIsMicMute = false;
+        mAudioDevice = TUICommonDefine.AudioPlaybackDevice.Speakerphone;
+        mCallStatus = TUICallDefine.Status.None;
+        mCallRole = TUICallDefine.Role.None;
+        mMediaType = TUICallDefine.MediaType.Unknown;
+        mCallScene = null;
+        mGroupId = "";
+    }
+}
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/UserLayout.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/UserLayout.java
new file mode 100644
index 0000000..81c3ede
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/UserLayout.java
@@ -0,0 +1,122 @@
+package com.tencent.qcloud.tuikit.tuicallkit.base;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuikit.TUIVideoView;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.ImageLoader;
+
+public class UserLayout extends RelativeLayout {
+    private TUIVideoView mTUIVideoView;
+    private ImageView    mImgUserAvatar;
+    private TextView     mTextUserName;
+    private ImageView    mImgAudioInput;
+    private ImageView    mImgLoading;
+    private boolean      mMoveAble;
+    private boolean      mMuteAudio         = false;
+    private boolean      mDisableAudioImage = false;
+
+    public UserLayout(Context context) {
+        this(context, null);
+    }
+
+    public UserLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initView();
+        setClickable(true);
+    }
+
+    private void initView() {
+        LayoutInflater.from(getContext()).inflate(R.layout.tuicalling_group_user_layout, this, true);
+        mTUIVideoView = findViewById(R.id.tx_cloud_view);
+        mImgUserAvatar = findViewById(R.id.img_head);
+        mTextUserName = findViewById(R.id.tv_name);
+        mImgAudioInput = findViewById(R.id.iv_audio_input);
+        mImgLoading = (ImageView) findViewById(R.id.img_loading);
+        ImageLoader.loadGifImage(getContext(), mImgLoading, R.drawable.tuicalling_loading);
+    }
+
+    public TUIVideoView getVideoView() {
+        return mTUIVideoView;
+    }
+
+    public void addVideoView(TUIVideoView view) {
+        if (this.mTUIVideoView != null) {
+            this.removeView(this.mTUIVideoView);
+        }
+
+        this.mTUIVideoView = view;
+        this.addView(this.mTUIVideoView);
+    }
+
+    public ImageView getAvatarImage() {
+        return mImgUserAvatar;
+    }
+
+    public void setVideoAvailable(boolean available) {
+        if (available) {
+            mTUIVideoView.setVisibility(VISIBLE);
+            mImgUserAvatar.setVisibility(GONE);
+            mTextUserName.setVisibility(VISIBLE);
+        } else {
+            mTUIVideoView.setVisibility(GONE);
+            mImgUserAvatar.setVisibility(VISIBLE);
+            mTextUserName.setVisibility(VISIBLE);
+        }
+    }
+
+    public void setRemoteIconAvailable(boolean available) {
+        mImgUserAvatar.setVisibility(available ? VISIBLE : GONE);
+        mTextUserName.setVisibility(available ? VISIBLE : GONE);
+    }
+
+    public void setUserName(String userName) {
+        mTextUserName.setText(userName);
+    }
+
+    public void setAudioVolume(int vol, boolean isAudioAvailable) {
+        if (mMuteAudio || mDisableAudioImage) {
+            return;
+        }
+        mImgAudioInput.setVisibility((isAudioAvailable && vol > Constants.MIN_AUDIO_VOLUME) ? VISIBLE : GONE);
+    }
+
+    public void muteMic(boolean mute) {
+        mMuteAudio = mute;
+        if (mDisableAudioImage) {
+            return;
+        }
+        mImgAudioInput.setVisibility(mMuteAudio ? GONE : VISIBLE);
+    }
+
+    public void disableAudioImage(boolean enable) {
+        mDisableAudioImage = enable;
+    }
+
+    public void startLoading() {
+        mImgLoading.setVisibility(VISIBLE);
+    }
+
+    public void stopLoading() {
+        mImgLoading.setVisibility(GONE);
+    }
+
+    public boolean isMoveAble() {
+        return mMoveAble;
+    }
+
+    public void setMoveAble(boolean enable) {
+        mMoveAble = enable;
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/UserLayoutEntity.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/UserLayoutEntity.java
new file mode 100644
index 0000000..849cd44
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/base/UserLayoutEntity.java
@@ -0,0 +1,7 @@
+package com.tencent.qcloud.tuikit.tuicallkit.base;
+
+public class UserLayoutEntity {
+    public String           userId = "";
+    public UserLayout       layout;
+    public CallingUserModel userModel;
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/config/OfflinePushInfoConfig.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/config/OfflinePushInfoConfig.java
new file mode 100644
index 0000000..e9ce2fc
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/config/OfflinePushInfoConfig.java
@@ -0,0 +1,25 @@
+package com.tencent.qcloud.tuikit.tuicallkit.config;
+
+import android.content.Context;
+
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+
+public class OfflinePushInfoConfig {
+
+    //Customize offline push information
+    public static TUICallDefine.OfflinePushInfo createOfflinePushInfo(Context context) {
+        TUICallDefine.OfflinePushInfo pushInfo = new TUICallDefine.OfflinePushInfo();
+        pushInfo.setTitle(TUILogin.getNickName());
+        pushInfo.setDesc(context.getString(R.string.tuicalling_have_a_new_call));
+        // OPPO必须设置ChannelID才可以收到推送消息，这个channelID需要和控制台一致
+        // OPPO must set a ChannelID to receive push messages. This channelID needs to be the same as the console.
+        pushInfo.setAndroidOPPOChannelID("tuikit");
+        pushInfo.setIgnoreIOSBadge(false);
+        pushInfo.setIOSSound("phone_ringing.mp3");
+        //VIVO message type: 0-push message, 1-System message(have a higher delivery rate)
+        pushInfo.setAndroidVIVOClassification(1);
+        return pushInfo;
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/event/CallBackEvent.kt b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/event/CallBackEvent.kt
new file mode 100644
index 0000000..58b385e
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/event/CallBackEvent.kt
@@ -0,0 +1,15 @@
+package com.tencent.qcloud.tuikit.tuicallkit.event
+
+/**
+ * @author nanfeifei
+ * @time 2023/7/12 9:59
+ * @description
+ */
+class CallBackEvent(val callStatus: Int) {
+    companion object{
+        const val CALL_BEGIN = 1
+        const val CALL_CANCEL = 2
+        const val CALL_END = 3
+
+    }
+}
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/CallingBellFeature.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/CallingBellFeature.java
new file mode 100644
index 0000000..30e3ed2
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/CallingBellFeature.java
@@ -0,0 +1,154 @@
+package com.tencent.qcloud.tuikit.tuicallkit.extensions;
+
+import android.content.Context;
+import android.content.res.AssetFileDescriptor;
+import android.media.AudioManager;
+import android.media.MediaPlayer;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.text.TextUtils;
+
+import com.tencent.qcloud.tuicore.util.SPUtils;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+
+import java.io.File;
+import java.io.IOException;
+
+public class CallingBellFeature {
+    public static final String PROFILE_TUICALLING = "per_profile_tuicalling";
+    public static final String PROFILE_CALL_BELL  = "per_call_bell";
+    public static final String PROFILE_MUTE_MODE  = "per_mute_mode";
+
+    private       Context     mContext;
+    private final MediaPlayer mMediaPlayer;
+    private       Handler     mHandler;
+    private       int         mCallingBellResourceId;
+    private       String      mCallingBellResourcePath;
+
+    public CallingBellFeature(Context context) {
+        mContext = context.getApplicationContext();
+        mMediaPlayer = new MediaPlayer();
+        mCallingBellResourceId = -1;
+        mCallingBellResourcePath = "";
+    }
+
+    public void startDialingMusic() {
+        start("", R.raw.phone_dialing, 0);
+    }
+
+    public void startRing() {
+        String path = SPUtils.getInstance(PROFILE_TUICALLING).getString(PROFILE_CALL_BELL, "");
+        if (TextUtils.isEmpty(path)) {
+            start("", R.raw.phone_ringing, 0);
+        } else {
+            start(path, -1, 0);
+        }
+    }
+
+    public void stopMusic() {
+        stop();
+    }
+
+    private void start(String resPath, final int resId, long duration) {
+        preHandler();
+        if (TextUtils.isEmpty(resPath) && (-1 == resId)) {
+            return;
+        }
+        if ((-1 != resId && (mCallingBellResourceId == resId))
+                || (!TextUtils.isEmpty(resPath) && TextUtils.equals(mCallingBellResourcePath, resPath))) {
+            return;
+        }
+        AssetFileDescriptor afd0 = null;
+        if (!TextUtils.isEmpty(resPath) && isUrl(resPath)) {
+            return;
+        } else if (!TextUtils.isEmpty(resPath) && new File(resPath).exists()) {
+            mCallingBellResourcePath = resPath;
+        } else if (-1 != resId) {
+            mCallingBellResourceId = resId;
+            afd0 = mContext.getResources().openRawResourceFd(resId);
+            if (afd0 == null) {
+                return;
+            }
+        }
+
+        final AssetFileDescriptor afd = afd0;
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                if (mMediaPlayer.isPlaying()) {
+                    mMediaPlayer.stop();
+                }
+                mMediaPlayer.setOnCompletionListener(null);
+                mMediaPlayer.reset();
+                mMediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
+                try {
+                    if (null != afd) {
+                        mMediaPlayer.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
+                    } else if (!TextUtils.isEmpty(mCallingBellResourcePath)) {
+                        mMediaPlayer.setDataSource(mCallingBellResourcePath);
+                    } else {
+                        return;
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                mMediaPlayer.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
+                    @Override
+                    public void onCompletion(MediaPlayer mp) {
+                        stop();
+                    }
+                });
+                try {
+                    mMediaPlayer.prepare();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+                mMediaPlayer.start();
+            }
+        });
+        if (duration > 0) {
+            mHandler.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    stop();
+                }
+            }, duration);
+        }
+    }
+
+    private boolean isUrl(String url) {
+        return url.startsWith("http://") || url.startsWith("https://");
+    }
+
+    private void preHandler() {
+        if (null != mHandler) {
+            return;
+        }
+        HandlerThread thread = new HandlerThread("Handler-MediaPlayer");
+        thread.start();
+        mHandler = new Handler(thread.getLooper());
+    }
+
+    private int getResId() {
+        return mCallingBellResourceId;
+    }
+
+    private void stop() {
+        if (null == mHandler) {
+            return;
+        }
+        if ((-1 == getResId()) && TextUtils.isEmpty(mCallingBellResourcePath)) {
+            return;
+        }
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                if (mMediaPlayer.isPlaying()) {
+                    mMediaPlayer.stop();
+                }
+                mCallingBellResourceId = -1;
+                mCallingBellResourcePath = "";
+            }
+        });
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/CallingKeepAliveFeature.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/CallingKeepAliveFeature.java
new file mode 100644
index 0000000..6be16b2
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/CallingKeepAliveFeature.java
@@ -0,0 +1,32 @@
+package com.tencent.qcloud.tuikit.tuicallkit.extensions;
+
+import android.content.Context;
+
+import com.tencent.qcloud.tuikit.tuicallkit.service.TUICallService;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.DeviceUtils;
+
+public class CallingKeepAliveFeature {
+    private Context mContext;
+    private boolean mEnableKeepAlive = true;
+
+    public CallingKeepAliveFeature(Context context) {
+        mContext = context;
+    }
+
+    public void enableKeepAlive(boolean enable) {
+        mEnableKeepAlive = enable;
+    }
+
+    public void startKeepAlive() {
+        if (!mEnableKeepAlive) {
+            return;
+        }
+        TUICallService.start(mContext);
+    }
+
+    public void stopKeepAlive() {
+        if (DeviceUtils.isServiceRunning(mContext, TUICallService.class.getName())) {
+            TUICallService.stop(mContext);
+        }
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/CallingScreenSensorFeature.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/CallingScreenSensorFeature.java
new file mode 100644
index 0000000..cb8d697
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/extensions/CallingScreenSensorFeature.java
@@ -0,0 +1,75 @@
+package com.tencent.qcloud.tuikit.tuicallkit.extensions;
+
+import android.content.Context;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.os.PowerManager;
+
+public class CallingScreenSensorFeature {
+    private Context             mContext;
+    private SensorManager       mSensorManager;
+    private SensorEventListener mSensorEventListener;
+    /**
+     * 开启或者关闭贴耳息屏（这个不要开启，OPPO手机有问题）
+     */
+    private boolean             mEnableCloseScreenNearEar = false;
+
+    public CallingScreenSensorFeature(Context context) {
+        mContext = context;
+    }
+
+    public void enableScreenSensor(boolean enable) {
+        mEnableCloseScreenNearEar = enable;
+    }
+
+    public void registerSensorEventListener() {
+        if (!mEnableCloseScreenNearEar) {
+            return;
+        }
+        if (null != mSensorManager) {
+            return;
+        }
+        mSensorManager = (SensorManager) mContext.getSystemService(Context.SENSOR_SERVICE);
+        Sensor sensor = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY);
+        PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
+        final PowerManager.WakeLock wakeLock = pm.newWakeLock(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK,
+                "TUICalling:TRTCAudioCallWakeLock");
+        mSensorEventListener = new SensorEventListener() {
+            @Override
+            public void onSensorChanged(SensorEvent event) {
+                if (event.sensor.getType() == Sensor.TYPE_PROXIMITY) {
+                    if (event.values[0] == 0.0) {
+                        if (wakeLock.isHeld()) {
+                            return;
+                        } else {
+                            wakeLock.acquire();
+                        }
+                    } else {
+                        if (!wakeLock.isHeld()) {
+                            return;
+                        } else {
+                            wakeLock.setReferenceCounted(false);
+                            wakeLock.release();
+                        }
+                    }
+                }
+            }
+
+            @Override
+            public void onAccuracyChanged(Sensor sensor, int accuracy) {
+
+            }
+        };
+        mSensorManager.registerListener(mSensorEventListener, sensor, SensorManager.SENSOR_DELAY_FASTEST);
+    }
+
+    public void unregisterSensorEventListener() {
+        if (null != mSensorManager && null != mSensorEventListener) {
+            Sensor sensor = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY);
+            mSensorManager.unregisterListener(mSensorEventListener, sensor);
+            mSensorManager = null;
+        }
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/internal/ServiceInitializer.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/internal/ServiceInitializer.java
new file mode 100644
index 0000000..4f33db7
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/internal/ServiceInitializer.java
@@ -0,0 +1,120 @@
+package com.tencent.qcloud.tuikit.tuicallkit.internal;
+
+import android.app.Activity;
+import android.app.Application;
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuikit.tuicallkit.TUICallKitImpl;
+
+/**
+ * `TUICallKit` uses `ContentProvider` to be registered with `TUICore`.
+ * (`TUICore` is the connection and communication class of each component)
+ */
+public final class ServiceInitializer extends ContentProvider {
+    public void init(Context context) {
+        TUICallingService callingService = TUICallingService.sharedInstance();
+        callingService.init(context);
+        TUICore.registerService(TUIConstants.TUICalling.SERVICE_NAME, callingService);
+        TUICore.registerExtension(TUIConstants.TUIChat.EXTENSION_INPUT_MORE_AUDIO_CALL, callingService);
+        TUICore.registerExtension(TUIConstants.TUIChat.EXTENSION_INPUT_MORE_VIDEO_CALL, callingService);
+
+        TUIAudioMessageRecordService audioRecordService = new TUIAudioMessageRecordService(context);
+        TUICore.registerService(TUIConstants.TUICalling.SERVICE_NAME_AUDIO_RECORD, audioRecordService);
+
+        if (context instanceof Application) {
+            ((Application) context).registerActivityLifecycleCallbacks(new Application.ActivityLifecycleCallbacks() {
+                private int foregroundActivities = 0;
+                private boolean isChangingConfiguration;
+
+                @Override
+                public void onActivityCreated(Activity activity, Bundle bundle) {
+                }
+
+                @Override
+                public void onActivityStarted(Activity activity) {
+                    foregroundActivities++;
+                    if (foregroundActivities == 1 && !isChangingConfiguration) {
+                        if (TUILogin.isUserLogined()) {
+                            TUICallKitImpl.createInstance(context).queryOfflineCall();
+                        }
+                    }
+                    isChangingConfiguration = false;
+                }
+
+                @Override
+                public void onActivityResumed(Activity activity) {
+
+                }
+
+                @Override
+                public void onActivityPaused(Activity activity) {
+
+                }
+
+                @Override
+                public void onActivityStopped(Activity activity) {
+                    foregroundActivities--;
+                    isChangingConfiguration = activity.isChangingConfigurations();
+                }
+
+                @Override
+                public void onActivitySaveInstanceState(Activity activity, Bundle outState) {
+
+                }
+
+                @Override
+                public void onActivityDestroyed(Activity activity) {
+
+                }
+            });
+        }
+    }
+
+    @Override
+    public boolean onCreate() {
+        Context appContext = getContext().getApplicationContext();
+        init(appContext);
+        return false;
+    }
+
+    @Nullable
+    @Override
+    public Cursor query(@NonNull Uri uri, @Nullable String[] projection, @Nullable String selection,
+                        @Nullable String[] selectionArgs, @Nullable String sortOrder) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public String getType(@NonNull Uri uri) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public Uri insert(@NonNull Uri uri, @Nullable ContentValues values) {
+        return null;
+    }
+
+    @Override
+    public int delete(@NonNull Uri uri, @Nullable String selection, @Nullable String[] selectionArgs) {
+        return 0;
+    }
+
+    @Override
+    public int update(@NonNull Uri uri, @Nullable ContentValues values, @Nullable String selection,
+                      @Nullable String[] selectionArgs) {
+        return 0;
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/internal/TUIAudioMessageRecordService.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/internal/TUIAudioMessageRecordService.java
new file mode 100644
index 0000000..d72ddfd
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/internal/TUIAudioMessageRecordService.java
@@ -0,0 +1,335 @@
+package com.tencent.qcloud.tuikit.tuicallkit.internal;
+
+import android.content.Context;
+import android.media.AudioAttributes;
+import android.media.AudioFocusRequest;
+import android.media.AudioManager;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.TextUtils;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.interfaces.ITUINotification;
+import com.tencent.qcloud.tuicore.interfaces.ITUIService;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallEngine;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallObserver;
+import com.tencent.qcloud.tuikit.tuicallengine.impl.base.TUILog;
+import com.tencent.qcloud.tuikit.tuicallkit.base.TUICallingStatusManager;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.PermissionRequest;
+import com.tencent.trtc.TRTCCloud;
+import com.tencent.trtc.TRTCCloudDef;
+import com.tencent.trtc.TRTCCloudListener;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class TUIAudioMessageRecordService implements ITUIService, ITUINotification {
+    private static final String TAG = "TUIAudioMessageRecordService";
+
+    private Context         mContext;
+    private AudioRecordInfo mAudioRecordInfo;
+
+    private AudioFocusRequest                       mFocusRequest;
+    private AudioManager                            mAudioManager;
+    private AudioManager.OnAudioFocusChangeListener onFocusChangeListener;
+
+    public TUIAudioMessageRecordService(Context context) {
+        mContext = context.getApplicationContext();
+        TUICore.registerEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED,
+                TUIConstants.TUILogin.EVENT_SUB_KEY_USER_LOGIN_SUCCESS, this);
+    }
+
+    @Override
+    public Object onCall(String method, Map<String, Object> param) {
+        if (TextUtils.equals(TUIConstants.TUICalling.METHOD_NAME_START_RECORD_AUDIO_MESSAGE, method)) {
+            if (param == null) {
+                TUILog.e(TAG, "startRecordAudioMessage failed, param is empty");
+                notifyAudioMessageRecordEvent(TUIConstants.TUICalling.EVENT_SUB_KEY_RECORD_START,
+                        TUIConstants.TUICalling.ERROR_INVALID_PARAM, null);
+                return false;
+            }
+
+            //如果当前在通话中,不支持录音
+            if (!TUICallDefine.Status.None.equals(TUICallingStatusManager.sharedInstance(mContext).getCallStatus())) {
+                TUILog.e(TAG, "startRecordAudioMessage failed, The current call status does not support recording");
+                notifyAudioMessageRecordEvent(TUIConstants.TUICalling.EVENT_SUB_KEY_RECORD_START,
+                        TUIConstants.TUICalling.ERROR_STATUS_IN_CALL, null);
+                return false;
+            }
+
+            //当前已经在录音中
+            if (mAudioRecordInfo != null) {
+                TUILog.e(TAG, "startRecordAudioMessage failed, The recording is not over, It cannot be called again");
+                notifyAudioMessageRecordEvent(TUIConstants.TUICalling.EVENT_SUB_KEY_RECORD_START,
+                        TUIConstants.TUICalling.ERROR_STATUS_IS_AUDIO_RECORDING, null);
+                return false;
+            }
+
+            //获取麦克风权限
+            int microphone = PermissionRequest.PERMISSION_MICROPHONE;
+            PermissionRequest.requestPermission(mContext, microphone, new PermissionRequest.PermissionCallback() {
+                @Override
+                public void onGranted() {
+                    super.onGranted();
+
+                    //获取音频焦点
+                    initAudioFocusManager();
+                    if (requestAudioFocus() != AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
+                        TUILog.e(TAG, "startRecordAudioMessage failed, Failed to obtain audio focus");
+                        notifyAudioMessageRecordEvent(TUIConstants.TUICalling.EVENT_SUB_KEY_RECORD_START,
+                                TUIConstants.TUICalling.ERROR_REQUEST_AUDIO_FOCUS_FAILED, null);
+                        return;
+                    }
+
+                    mAudioRecordInfo = new AudioRecordInfo();
+                    if (param.containsKey(TUIConstants.TUICalling.PARAM_NAME_AUDIO_PATH)) {
+                        mAudioRecordInfo.path = (String) param.get(TUIConstants.TUICalling.PARAM_NAME_AUDIO_PATH);
+                    }
+                    if (param.containsKey(TUIConstants.TUICalling.PARAM_NAME_SDK_APP_ID)) {
+                        mAudioRecordInfo.sdkAppId = (int) param.get(TUIConstants.TUICalling.PARAM_NAME_SDK_APP_ID);
+                    }
+                    if (param.containsKey(TUIConstants.TUICalling.PARAM_NAME_AUDIO_SIGNATURE)) {
+                        mAudioRecordInfo.signature =
+                                (String) param.get(TUIConstants.TUICalling.PARAM_NAME_AUDIO_SIGNATURE);
+                    }
+
+                    //开启音频采集
+                    TRTCCloud.sharedInstance(mContext).setListener(mTRTCCloudListener);
+                    startRecordAudioMessage();
+                }
+
+                @Override
+                public void onDialogRefused() {
+                    super.onDialogRefused();
+                    notifyAudioMessageRecordEvent(TUIConstants.TUICalling.EVENT_SUB_KEY_RECORD_START,
+                            TUIConstants.TUICalling.ERROR_MIC_PERMISSION_REFUSED, null);
+                }
+            });
+            return true;
+        }
+
+        if (TextUtils.equals(TUIConstants.TUICalling.METHOD_NAME_STOP_RECORD_AUDIO_MESSAGE, method)) {
+            stopRecordAudioMessage();
+        }
+        return true;
+    }
+
+    private TRTCCloudListener mTRTCCloudListener = new TRTCCloudListener() {
+        @Override
+        public void onError(int errCode, String errMsg, Bundle extraInfo) {
+            super.onError(errCode, errMsg, extraInfo);
+            if (errCode == TUIConstants.TUICalling.ERR_MIC_START_FAIL
+                    || errCode == TUIConstants.TUICalling.ERR_MIC_NOT_AUTHORIZED
+                    || errCode == TUIConstants.TUICalling.ERR_MIC_SET_PARAM_FAIL
+                    || errCode == TUIConstants.TUICalling.ERR_MIC_OCCUPY) {
+                notifyAudioMessageRecordEvent(TUIConstants.TUICalling.EVENT_SUB_KEY_RECORD_START, errCode, null);
+            }
+        }
+
+        @Override
+        public void onLocalRecordBegin(int errCode, String storagePath) {
+            super.onLocalRecordBegin(errCode, storagePath);
+            int tempCode = convertErrorCode("onLocalRecordBegin", errCode);
+            if (errCode == TUIConstants.TUICalling.ERROR_NONE) {
+                TRTCCloud.sharedInstance(mContext).startLocalAudio(TRTCCloudDef.TRTC_AUDIO_QUALITY_SPEECH);
+            }
+            notifyAudioMessageRecordEvent(TUIConstants.TUICalling.EVENT_SUB_KEY_RECORD_START, tempCode, storagePath);
+        }
+
+        @Override
+        public void onLocalRecordComplete(int errCode, String storagePath) {
+            super.onLocalRecordComplete(errCode, storagePath);
+            int tempCode = convertErrorCode("onLocalRecordComplete", errCode);
+            notifyAudioMessageRecordEvent(TUIConstants.TUICalling.EVENT_SUB_KEY_RECORD_STOP, tempCode, storagePath);
+        }
+    };
+
+    private TUICallObserver mCallObserver = new TUICallObserver() {
+        @Override
+        public void onCallReceived(String callerId, List<String> calleeIdList,
+                                   String groupId, TUICallDefine.MediaType callMediaType) {
+            super.onCallReceived(callerId, calleeIdList, groupId, callMediaType);
+            //收到通话邀请,停止录制
+            stopRecordAudioMessage();
+        }
+    };
+
+    private void startRecordAudioMessage() {
+        if (mAudioRecordInfo == null) {
+            TUILog.e(TAG, "startRecordAudioMessage failed, audioRecordInfo is empty");
+            return;
+        }
+        TUILog.i(TAG, "startRecordAudioMessage, mAudioRecordInfo: " + mAudioRecordInfo);
+        JSONObject jsonObject = new JSONObject();
+        try {
+            jsonObject.put("api", "startRecordAudioMessage");
+            JSONObject params = new JSONObject();
+            params.put(TUIConstants.TUICalling.PARAM_NAME_SDK_APP_ID, mAudioRecordInfo.sdkAppId);
+            params.put(TUIConstants.TUICalling.PARAM_NAME_AUDIO_PATH, mAudioRecordInfo.path);
+            params.put("key", mAudioRecordInfo.signature);
+            jsonObject.put("params", params);
+            TRTCCloud.sharedInstance(mContext).callExperimentalAPI(jsonObject.toString());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void stopRecordAudioMessage() {
+        if (mAudioRecordInfo == null) {
+            TUILog.w(TAG, "stopRecordAudioMessage, current recording status is Idle,do not need to stop");
+            return;
+        }
+
+        JSONObject jsonObject = new JSONObject();
+        try {
+            jsonObject.put("api", "stopRecordAudioMessage");
+            JSONObject params = new JSONObject();
+            jsonObject.put("params", params);
+            TRTCCloud.sharedInstance(mContext).callExperimentalAPI(jsonObject.toString());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+
+        TUILog.i(TAG, "stopRecordAudioMessage, stopLocalAudio");
+        TRTCCloud.sharedInstance(mContext).stopLocalAudio();
+        //清空录制信息
+        mAudioRecordInfo = null;
+        //释放音频焦点
+        abandonAudioFocus();
+    }
+
+    private void notifyAudioMessageRecordEvent(String method, int errCode, String path) {
+        TUILog.i(TAG, "notifyAudioMessageRecordEvent, method: " + method + ",errCode: " + errCode + ",path: " + path);
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("errorCode", errCode);
+        map.put(TUIConstants.TUICalling.PARAM_NAME_AUDIO_PATH, path);
+        TUICore.notifyEvent(TUIConstants.TUICalling.EVENT_KEY_RECORD_AUDIO_MESSAGE, method, map);
+    }
+
+    @Override
+    public void onNotifyEvent(String key, String subKey, Map<String, Object> param) {
+        if (TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED.equals(key)
+                && TUIConstants.TUILogin.EVENT_SUB_KEY_USER_LOGIN_SUCCESS.equals(subKey)) {
+            TUICallEngine.createInstance(mContext).addObserver(mCallObserver);
+        }
+    }
+
+    private void initAudioFocusManager() {
+        if (mAudioManager == null) {
+            mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+        }
+        if (onFocusChangeListener == null) {
+            onFocusChangeListener = new AudioManager.OnAudioFocusChangeListener() {
+                @Override
+                public void onAudioFocusChange(int focusChange) {
+                    switch (focusChange) {
+                        case AudioManager.AUDIOFOCUS_GAIN:
+                            break;
+                        case AudioManager.AUDIOFOCUS_LOSS:
+                        case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT:
+                        case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK:
+                            //其他应用占用焦点的时候,停止录制
+                            stopRecordAudioMessage();
+                            break;
+                        default:
+                            break;
+                    }
+
+                }
+            };
+        }
+
+        AudioAttributes attributes = null;
+        //android 5.0
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            attributes = new AudioAttributes.Builder()
+                    .setUsage(AudioAttributes.USAGE_MEDIA)
+                    .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
+                    .build();
+        }
+        //android 8.0
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+            mFocusRequest = new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT)
+                    .setWillPauseWhenDucked(true)
+                    .setAudioAttributes(attributes)
+                    .setOnAudioFocusChangeListener(onFocusChangeListener)
+                    .build();
+        }
+    }
+
+    private int requestAudioFocus() {
+        if (mAudioManager == null) {
+            return AudioManager.AUDIOFOCUS_REQUEST_FAILED;
+        }
+        int result;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            result = mAudioManager.requestAudioFocus(mFocusRequest);
+        } else {
+            result = mAudioManager.requestAudioFocus(onFocusChangeListener, AudioManager.STREAM_MUSIC,
+                    AudioManager.AUDIOFOCUS_GAIN_TRANSIENT);
+        }
+        return result;
+    }
+
+    private int abandonAudioFocus() {
+        if (mAudioManager == null) {
+            return AudioManager.AUDIOFOCUS_REQUEST_FAILED;
+        }
+        int result;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            result = mAudioManager.abandonAudioFocusRequest(mFocusRequest);
+        } else {
+            result = mAudioManager.abandonAudioFocus(onFocusChangeListener);
+        }
+        return result;
+    }
+
+    private int convertErrorCode(String method, int errorCode) {
+        int targetCode;
+        switch (errorCode) {
+            case -1:
+                targetCode = "onLocalRecordBegin".equals(method) ? TUIConstants.TUICalling.ERROR_RECORD_INIT_FAILED
+                        : TUIConstants.TUICalling.ERROR_RECORD_FAILED;
+                break;
+            case -2:
+                targetCode = TUIConstants.TUICalling.ERROR_PATH_FORMAT_NOT_SUPPORT;
+                break;
+            case -3:
+                targetCode = TUIConstants.TUICalling.ERROR_NO_MESSAGE_TO_RECORD;
+                break;
+            case -4:
+                targetCode = TUIConstants.TUICalling.ERROR_SIGNATURE_ERROR;
+                break;
+            case -5:
+                targetCode = TUIConstants.TUICalling.ERROR_SIGNATURE_EXPIRED;
+                break;
+            default:
+                targetCode = TUIConstants.TUICalling.ERROR_NONE;
+                break;
+        }
+        return targetCode;
+    }
+
+    class AudioRecordInfo {
+        public String path;       // 录制文件地址
+        public int    sdkAppId;   // 应用的 SDKAppID
+        public String signature;  // AI 降噪签名
+
+        public AudioRecordInfo() {
+        }
+
+        @Override
+        public String toString() {
+            return "AudioRecordInfo{"
+                    + "path=" + path
+                    + ", SDKAppID=" + sdkAppId
+                    + '}';
+        }
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/internal/TUICallingService.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/internal/TUICallingService.java
new file mode 100644
index 0000000..cfc6f74
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/internal/TUICallingService.java
@@ -0,0 +1,183 @@
+package com.tencent.qcloud.tuikit.tuicallkit.internal;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.interfaces.ITUIExtension;
+import com.tencent.qcloud.tuicore.interfaces.ITUINotification;
+import com.tencent.qcloud.tuicore.interfaces.ITUIService;
+import com.tencent.qcloud.tuikit.TUICommonDefine;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallEngine;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.TUICallKit;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * `TUICore` call (if the `TUICore` module is not imported, use `TUICallKitImpl` instead)
+ */
+final class TUICallingService implements ITUINotification, ITUIService, ITUIExtension {
+
+    private static final String TAG = "TUICallingService";
+
+    private static final TUICallingService INSTANCE = new TUICallingService();
+
+    static TUICallingService sharedInstance() {
+        return INSTANCE;
+    }
+
+    private Context appContext;
+
+    private TUICallingService() {
+
+    }
+
+    public void init(Context context) {
+        appContext = context;
+        TUICore.registerEvent(TUIConstants.TUILogin.EVENT_IMSDK_INIT_STATE_CHANGED,
+                TUIConstants.TUILogin.EVENT_SUB_KEY_START_INIT, this);
+    }
+
+    @Override
+    public Object onCall(String method, Map<String, Object> param) {
+        Log.i(TAG, "onCall, method: " + method + " ,param: " + param);
+
+        if (null != param && TextUtils.equals(TUIConstants.TUICalling.METHOD_NAME_ENABLE_FLOAT_WINDOW, method)) {
+            boolean enableFloatWindow = (boolean) param.get(TUIConstants.TUICalling.PARAM_NAME_ENABLE_FLOAT_WINDOW);
+            Log.i(TAG, "onCall, enableFloatWindow: " + enableFloatWindow);
+            TUICallKit.createInstance(appContext).enableFloatWindow(enableFloatWindow);
+            return null;
+        }
+
+        if (null != param && TextUtils.equals(TUIConstants.TUICalling.METHOD_NAME_ENABLE_MULTI_DEVICE, method)) {
+            boolean enable = (boolean) param.get(TUIConstants.TUICalling.PARAM_NAME_ENABLE_MULTI_DEVICE);
+            Log.i(TAG, "onCall, enableMultiDevice: " + enable);
+            TUICallEngine.createInstance(appContext).enableMultiDeviceAbility(enable, new TUICommonDefine.Callback() {
+                @Override
+                public void onSuccess() {
+                }
+
+                @Override
+                public void onError(int errCode, String errMsg) {
+                }
+            });
+            return null;
+        }
+
+        if (null != param && TextUtils.equals(TUIConstants.TUICalling.METHOD_NAME_CALL, method)) {
+            String[] userIDs = (String[]) param.get(TUIConstants.TUICalling.PARAM_NAME_USERIDS);
+            String typeString = (String) param.get(TUIConstants.TUICalling.PARAM_NAME_TYPE);
+            String groupID = (String) param.get(TUIConstants.TUICalling.PARAM_NAME_GROUPID);
+
+            List<String> userIdList = new ArrayList<>(Arrays.asList(userIDs));
+            TUICallDefine.MediaType mediaType = TUICallDefine.MediaType.Unknown;
+            if (TUIConstants.TUICalling.TYPE_AUDIO.equals(typeString)) {
+                mediaType = TUICallDefine.MediaType.Audio;
+            } else if (TUIConstants.TUICalling.TYPE_VIDEO.equals(typeString)) {
+                mediaType = TUICallDefine.MediaType.Video;
+            }
+            if (!TextUtils.isEmpty(groupID)) {
+                TUICallKit.createInstance(appContext).groupCall(groupID, userIdList, mediaType);
+            } else if (userIdList.size() == 1) {
+                TUICallKit.createInstance(appContext).call(userIdList.get(0), mediaType);
+            } else {
+                Log.e(TAG, "onCall ignored, groupId is empty and userList is not 1, cannot start call or groupCall");
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public Map<String, Object> onGetExtensionInfo(String key, Map<String, Object> param) {
+        Log.i(TAG, "onGetExtensionInfo, key: " + key + " ,param: " + param);
+
+        Context inflateContext = (Context) param.get(TUIConstants.TUIChat.CONTEXT);
+        if (inflateContext == null) {
+            inflateContext = appContext;
+        }
+        if (inflateContext == null) {
+            return null;
+        }
+        HashMap<String, Object> extensionMap = new HashMap<>();
+        View unitView = LayoutInflater.from(inflateContext).inflate(R.layout.chat_input_more_action, null);
+        ImageView imageView = unitView.findViewById(R.id.imageView);
+        TextView textView = unitView.findViewById(R.id.textView);
+        int actionId = 0;
+        if (TUIConstants.TUIChat.EXTENSION_INPUT_MORE_AUDIO_CALL.equals(key)) {
+            imageView.setImageResource(R.drawable.tuicalling_ic_audio_call);
+            textView.setText(inflateContext.getString(R.string.tuicalling_audio_call));
+            actionId = TUIConstants.TUICalling.ACTION_ID_AUDIO_CALL;
+        } else if (TUIConstants.TUIChat.EXTENSION_INPUT_MORE_VIDEO_CALL.equals(key)) {
+            imageView.setImageResource(R.drawable.tuicalling_ic_video_call);
+            textView.setText(inflateContext.getString(R.string.tuicalling_video_call));
+            actionId = TUIConstants.TUICalling.ACTION_ID_VIDEO_CALL;
+        }
+        final String chatId = (String) param.get(TUIConstants.TUIChat.CHAT_ID);
+        int chatType = (int) param.get(TUIConstants.TUIChat.CHAT_TYPE);
+        if (chatType == V2TIMConversation.V2TIM_GROUP) {
+            unitView.setClickable(false);
+        } else {
+            unitView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    TUICallDefine.MediaType mediaType = TUICallDefine.MediaType.Unknown;
+                    if (TUIConstants.TUIChat.EXTENSION_INPUT_MORE_AUDIO_CALL.equals(key)) {
+                        mediaType = TUICallDefine.MediaType.Audio;
+                    } else if (TUIConstants.TUIChat.EXTENSION_INPUT_MORE_VIDEO_CALL.equals(key)) {
+                        mediaType = TUICallDefine.MediaType.Video;
+                    }
+                    Log.i(TAG, "onGetExtensionInfo, mediaType: " + mediaType + " ,chatId: " + chatId);
+                    TUICallKit.createInstance(appContext).call(chatId, mediaType);
+                }
+            });
+        }
+        extensionMap.put(TUIConstants.TUIChat.INPUT_MORE_VIEW, unitView);
+        extensionMap.put(TUIConstants.TUIChat.INPUT_MORE_ACTION_ID, actionId);
+        return extensionMap;
+    }
+
+    @Override
+    public void onNotifyEvent(String key, String subKey, Map<String, Object> param) {
+        if (TUIConstants.TUILogin.EVENT_IMSDK_INIT_STATE_CHANGED.equals(key)
+                && TUIConstants.TUILogin.EVENT_SUB_KEY_START_INIT.equals(subKey)) {
+            TUICallKit.createInstance(appContext);
+            adaptiveComponentReport();
+        }
+    }
+
+    private void adaptiveComponentReport() {
+        ITUIService service = TUICore.getService(TUIConstants.TUIChat.SERVICE_NAME);
+        if (service == null) {
+            return;
+        }
+
+        try {
+            JSONObject params = new JSONObject();
+            params.put("framework", 1);
+            params.put("component", 15);
+
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("api", "setFramework");
+            jsonObject.put("params", params);
+            TUICallEngine.createInstance(appContext).callExperimentalAPI(jsonObject.toString());
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/service/TUICallService.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/service/TUICallService.java
new file mode 100644
index 0000000..f4a2287
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/service/TUICallService.java
@@ -0,0 +1,88 @@
+package com.tencent.qcloud.tuikit.tuicallkit.service;
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.os.IBinder;
+
+import androidx.core.app.NotificationCompat;
+
+import com.tencent.qcloud.tuikit.tuicallkit.utils.DeviceUtils;
+
+/**
+ * TUICalling组件保活, 确保应用在后台不被系统杀死, 如不需要,可删除.
+ */
+public class TUICallService extends Service {
+    private static final int NOTIFICATION_ID = 1001;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        // 获取服务通知
+        Notification notification = createForegroundNotification();
+        //将服务置于启动状态 ,NOTIFICATION_ID指的是创建的通知的ID
+        startForeground(NOTIFICATION_ID, notification);
+    }
+
+    public static void start(Context context) {
+        if (DeviceUtils.isServiceRunning(context, TUICallService.class.getName())) {
+            return;
+        }
+        Intent starter = new Intent(context, TUICallService.class);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            context.startForegroundService(starter);
+        } else {
+            context.startService(starter);
+        }
+    }
+
+    public static void stop(Context context) {
+        Intent intent = new Intent(context, TUICallService.class);
+        context.stopService(intent);
+    }
+
+    private Notification createForegroundNotification() {
+        NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        // 唯一的通知通道的id.
+        String notificationChannelId = "notification_channel_id_01";
+        // Android8.0以上的系统，新建消息通道
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            //用户可见的通道名称
+            String channelName = "TRTC Foreground Service Notification";
+            //通道的重要程度
+            int importance = NotificationManager.IMPORTANCE_HIGH;
+            NotificationChannel notificationChannel = new NotificationChannel(
+                    notificationChannelId, channelName, importance);
+            notificationChannel.setDescription("Channel description");
+            //震动
+            notificationChannel.setVibrationPattern(new long[]{0, 1000, 500, 1000});
+            notificationChannel.enableVibration(true);
+            if (notificationManager != null) {
+                notificationManager.createNotificationChannel(notificationChannel);
+            }
+        }
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(this, notificationChannelId);
+        //创建通知并返回
+        return builder.build();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        return START_NOT_STICKY;
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        throw new UnsupportedOperationException("Not yet implemented");
+    }
+
+    @Override
+    public void onTaskRemoved(Intent rootIntent) {
+        super.onTaskRemoved(rootIntent);
+        stopSelf();
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/DeviceUtils.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/DeviceUtils.java
new file mode 100644
index 0000000..17180d7
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/DeviceUtils.java
@@ -0,0 +1,79 @@
+package com.tencent.qcloud.tuikit.tuicallkit.utils;
+
+import android.app.ActivityManager;
+import android.content.Context;
+import android.os.PowerManager;
+import android.text.TextUtils;
+import android.util.DisplayMetrics;
+import android.view.Window;
+import android.view.WindowManager;
+
+import java.util.List;
+
+public class DeviceUtils {
+
+    public static void setScreenLockParams(Window window) {
+        if (null == window) {
+            return;
+        }
+        PowerManager powerManager = (PowerManager) window.getContext().getSystemService(Context.POWER_SERVICE);
+        boolean isScreenOn = powerManager.isScreenOn();
+        if (isScreenOn) {
+            window.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
+                    | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
+                    | WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+        } else {
+            window.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
+                    | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD
+                    | WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+                    | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
+        }
+    }
+
+    public static int getScreenWidth(Context context) {
+        DisplayMetrics metric = new DisplayMetrics();
+        WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+        wm.getDefaultDisplay().getMetrics(metric);
+        return metric.widthPixels;
+    }
+
+    public static int getScreenHeight(Context context) {
+        DisplayMetrics metric = new DisplayMetrics();
+        WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+        wm.getDefaultDisplay().getMetrics(metric);
+        return metric.heightPixels;
+    }
+
+    public static boolean isAppRunningForeground(Context context) {
+        ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+        List<ActivityManager.RunningAppProcessInfo> runningAppProcessInfos = activityManager.getRunningAppProcesses();
+        if (runningAppProcessInfos == null) {
+            return false;
+        }
+        String packageName = context.getPackageName();
+        for (ActivityManager.RunningAppProcessInfo appProcessInfo : runningAppProcessInfos) {
+            if (appProcessInfo.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND
+                    && appProcessInfo.processName.equals(packageName)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static boolean isServiceRunning(Context context, String className) {
+        if (context == null || TextUtils.isEmpty(className)) {
+            return false;
+        }
+        ActivityManager am = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+        List<ActivityManager.RunningServiceInfo> info = am.getRunningServices(0x7FFFFFFF);
+        if (info == null || info.size() == 0) {
+            return false;
+        }
+        for (ActivityManager.RunningServiceInfo aInfo : info) {
+            if (className.equals(aInfo.service.getClassName())) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/DisplayUtils.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/DisplayUtils.java
new file mode 100644
index 0000000..89d5e71
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/DisplayUtils.java
@@ -0,0 +1,216 @@
+package com.tencent.qcloud.tuikit.tuicallkit.utils;
+
+import android.content.Context;
+import android.view.ViewGroup;
+import android.widget.RelativeLayout;
+
+import java.util.ArrayList;
+
+public class DisplayUtils {
+
+    public static int dip2px(Context context, float dpValue) {
+        final float scale = context.getResources().getDisplayMetrics().density;
+        return (int) (dpValue * scale + 0.5f);
+    }
+
+    // init stack layout
+    public static ArrayList<RelativeLayout.LayoutParams> initFloatParamList(Context context, int width, int height) {
+        ArrayList<RelativeLayout.LayoutParams> list = new ArrayList<RelativeLayout.LayoutParams>();
+        // the largest layout in the bottom
+        RelativeLayout.LayoutParams layoutParams0 = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT);
+        list.add(layoutParams0);
+
+        final int midMargin = dip2px(context, 10);
+        final int lrMargin = dip2px(context, 15);
+        final int bottomMargin = dip2px(context, 50);
+        final int subWidth = dip2px(context, 120);
+        final int subHeight = dip2px(context, 180);
+        for (int i = 2; i >= 0; i--) {
+            RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(subWidth, subHeight);
+            layoutParams.leftMargin = width - lrMargin - subWidth;
+            layoutParams.topMargin = height - (bottomMargin + midMargin * (i + 1) + subHeight * i) - subHeight;
+            list.add(layoutParams);
+        }
+
+        for (int i = 2; i >= 0; i--) {
+            RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(subWidth, subHeight);
+            layoutParams.leftMargin = lrMargin;
+            layoutParams.topMargin = height - (bottomMargin + midMargin * (i + 1) + subHeight * i) - subHeight;
+            list.add(layoutParams);
+        }
+        return list;
+    }
+
+    // init one grid layout ,center in the screen
+    public static ArrayList<RelativeLayout.LayoutParams> initGrid1Param(Context context, int width, int height) {
+        int margin = dip2px(context, 10);
+        int grid4W = (width - margin * 2) / 2;
+        int grid4H = (height - margin * 2) / 2;
+        RelativeLayout.LayoutParams layoutParams0 = new RelativeLayout.LayoutParams(grid4W, grid4H);
+        layoutParams0.addRule(RelativeLayout.CENTER_IN_PARENT);
+
+        ArrayList<RelativeLayout.LayoutParams> list = new ArrayList<>();
+        list.add(layoutParams0);
+        return list;
+    }
+
+    // init two grid layout ,split the screen
+    public static ArrayList<RelativeLayout.LayoutParams> initGrid2Param(Context context, int width, int height) {
+        int margin = dip2px(context, 10);
+        int grid4W = (width - margin * 2) / 2;
+        int grid4H = (height - margin * 2) / 2;
+
+        RelativeLayout.LayoutParams layoutParams0 = new RelativeLayout.LayoutParams(width, width);
+        layoutParams0.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
+//        layoutParams0.addRule(RelativeLayout.CENTER_VERTICAL);
+        layoutParams0.leftMargin = margin;
+        layoutParams0.rightMargin = margin;
+
+        RelativeLayout.LayoutParams layoutParams1 = new RelativeLayout.LayoutParams((grid4W/3)*2, (grid4H/3)*2);
+        layoutParams1.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
+//        layoutParams1.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
+        layoutParams1.leftMargin = margin;
+        layoutParams1.topMargin = width;
+
+        ArrayList<RelativeLayout.LayoutParams> list = new ArrayList<>();
+        list.add(layoutParams1);
+        list.add(layoutParams0);
+        return list;
+    }
+
+    // init three grid layout
+    public static ArrayList<RelativeLayout.LayoutParams> initGrid3Param(Context context, int width, int height) {
+        int margin = dip2px(context, 10);
+        int grid3W = (width - margin * 2) / 2;
+        int grid3H = (height - margin * 2) / 2;
+
+        RelativeLayout.LayoutParams layoutParams0 = new RelativeLayout.LayoutParams(grid3W, grid3H);
+        layoutParams0.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
+        layoutParams0.addRule(RelativeLayout.ALIGN_PARENT_TOP);
+        layoutParams0.topMargin = margin;
+        layoutParams0.leftMargin = margin;
+
+        RelativeLayout.LayoutParams layoutParams1 = new RelativeLayout.LayoutParams(grid3W, grid3H);
+        layoutParams1.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
+        layoutParams1.addRule(RelativeLayout.ALIGN_PARENT_TOP);
+        layoutParams1.topMargin = margin;
+        layoutParams1.rightMargin = margin;
+
+        RelativeLayout.LayoutParams layoutParams2 = new RelativeLayout.LayoutParams(grid3W, grid3H);
+        layoutParams2.addRule(RelativeLayout.CENTER_HORIZONTAL);
+        layoutParams2.bottomMargin = margin;
+        layoutParams2.topMargin = margin + grid3H;
+
+        ArrayList<RelativeLayout.LayoutParams> list = new ArrayList<>();
+        list.add(layoutParams0);
+        list.add(layoutParams1);
+        list.add(layoutParams2);
+        return list;
+    }
+
+    // init four grid layout
+    public static ArrayList<RelativeLayout.LayoutParams> initGrid4Param(Context context, int width, int height) {
+        int margin = dip2px(context, 10);
+        int grid4W = (width - margin * 2) / 2;
+        int grid4H = (height - margin * 2) / 2;
+
+        RelativeLayout.LayoutParams layoutParams0 = new RelativeLayout.LayoutParams(grid4W, grid4H);
+        layoutParams0.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
+        layoutParams0.addRule(RelativeLayout.ALIGN_PARENT_TOP);
+        layoutParams0.topMargin = margin;
+        layoutParams0.leftMargin = margin;
+
+        RelativeLayout.LayoutParams layoutParams1 = new RelativeLayout.LayoutParams(grid4W, grid4H);
+        layoutParams1.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
+        layoutParams1.addRule(RelativeLayout.ALIGN_PARENT_TOP);
+        layoutParams1.topMargin = margin;
+        layoutParams1.rightMargin = margin;
+
+        RelativeLayout.LayoutParams layoutParams2 = new RelativeLayout.LayoutParams(grid4W, grid4H);
+        layoutParams2.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
+        layoutParams2.bottomMargin = margin;
+        layoutParams2.topMargin = margin + grid4H;
+        layoutParams2.leftMargin = margin;
+
+        RelativeLayout.LayoutParams layoutParams3 = new RelativeLayout.LayoutParams(grid4W, grid4H);
+        layoutParams3.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
+        layoutParams3.bottomMargin = margin;
+        layoutParams3.topMargin = margin + grid4H;
+        layoutParams3.rightMargin = margin;
+
+        ArrayList<RelativeLayout.LayoutParams> list = new ArrayList<>();
+        list.add(layoutParams0);
+        list.add(layoutParams1);
+        list.add(layoutParams2);
+        list.add(layoutParams3);
+        return list;
+    }
+
+    // init nine grid layout
+    public static ArrayList<RelativeLayout.LayoutParams> initGrid9Param(Context context, int width, int height) {
+        int margin = dip2px(context, 10);
+        int grid9W = (width - margin * 2) / 3;
+        int grid9H = (height - margin * 2) / 3;
+
+        RelativeLayout.LayoutParams layoutParams0 = new RelativeLayout.LayoutParams(grid9W, grid9H);
+        layoutParams0.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
+        layoutParams0.addRule(RelativeLayout.ALIGN_PARENT_TOP);
+        layoutParams0.topMargin = margin;
+        layoutParams0.leftMargin = margin;
+
+        RelativeLayout.LayoutParams layoutParams1 = new RelativeLayout.LayoutParams(grid9W, grid9H);
+        layoutParams1.addRule(RelativeLayout.ALIGN_PARENT_TOP);
+        layoutParams1.topMargin = margin;
+        layoutParams1.leftMargin = margin + grid9W;
+
+        RelativeLayout.LayoutParams layoutParams2 = new RelativeLayout.LayoutParams(grid9W, grid9H);
+        layoutParams2.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
+        layoutParams2.addRule(RelativeLayout.ALIGN_PARENT_TOP);
+        layoutParams2.topMargin = margin;
+        layoutParams2.rightMargin = margin;
+
+        RelativeLayout.LayoutParams layoutParams3 = new RelativeLayout.LayoutParams(grid9W, grid9H);
+        layoutParams3.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
+        layoutParams3.leftMargin = margin;
+        layoutParams3.topMargin = margin + grid9H;
+
+        RelativeLayout.LayoutParams layoutParams4 = new RelativeLayout.LayoutParams(grid9W, grid9H);
+        layoutParams4.topMargin = margin + grid9H;
+        layoutParams4.leftMargin = margin + grid9W;
+
+        RelativeLayout.LayoutParams layoutParams5 = new RelativeLayout.LayoutParams(grid9W, grid9H);
+        layoutParams5.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
+        layoutParams5.topMargin = margin + grid9H;
+        layoutParams5.rightMargin = margin;
+
+        RelativeLayout.LayoutParams layoutParams6 = new RelativeLayout.LayoutParams(grid9W, grid9H);
+        layoutParams6.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
+        layoutParams6.bottomMargin = margin;
+        layoutParams6.leftMargin = margin;
+        layoutParams6.topMargin = margin + grid9H * 2;
+
+        RelativeLayout.LayoutParams layoutParams7 = new RelativeLayout.LayoutParams(grid9W, grid9H);
+        layoutParams7.bottomMargin = margin;
+        layoutParams7.topMargin = margin + grid9H * 2;
+        layoutParams7.leftMargin = margin + grid9W;
+
+        RelativeLayout.LayoutParams layoutParams8 = new RelativeLayout.LayoutParams(grid9W, grid9H);
+        layoutParams8.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
+        layoutParams8.bottomMargin = margin;
+        layoutParams8.topMargin = margin + grid9H * 2;
+        layoutParams8.rightMargin = margin;
+
+        ArrayList<RelativeLayout.LayoutParams> list = new ArrayList<>();
+        list.add(layoutParams0);
+        list.add(layoutParams1);
+        list.add(layoutParams2);
+        list.add(layoutParams3);
+        list.add(layoutParams4);
+        list.add(layoutParams5);
+        list.add(layoutParams6);
+        list.add(layoutParams7);
+        list.add(layoutParams8);
+        return list;
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/ImageLoader.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/ImageLoader.java
new file mode 100644
index 0000000..8dece61
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/ImageLoader.java
@@ -0,0 +1,135 @@
+package com.tencent.qcloud.tuikit.tuicallkit.utils;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapShader;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
+import android.widget.ImageView;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.RawRes;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.RequestBuilder;
+import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
+import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
+import com.bumptech.glide.request.RequestOptions;
+
+import java.security.MessageDigest;
+import java.util.concurrent.ExecutionException;
+
+public class ImageLoader {
+    private static int radius = 0;
+
+    public static void clear(Context context, ImageView imageView) {
+        Glide.with(context).clear(imageView);
+    }
+
+    public static void loadImage(Context context, ImageView imageView, String url) {
+        loadImage(context, imageView, url, 0, radius);
+    }
+
+    public static void loadImage(Context context, ImageView imageView, String url, @DrawableRes int errorResId) {
+        loadImage(context, imageView, url, errorResId, radius);
+    }
+
+    public static void loadImage(Context context, ImageView imageView, String url, @DrawableRes int errorResId,
+                                 int radius) {
+        if (TextUtils.isEmpty(url)) {
+            if (imageView != null && errorResId != 0) {
+                imageView.setImageResource(errorResId);
+            }
+            return;
+        }
+        Glide.with(context).load(url).error(loadTransform(context, errorResId, radius)).into(imageView);
+    }
+
+    public static void loadImage(Context context, ImageView imageView, @RawRes @DrawableRes Integer resourceId) {
+        Glide.with(context).load(resourceId).into(imageView);
+    }
+
+    public static Bitmap getImage(Context context, String url, int width, int height) {
+        if (TextUtils.isEmpty(url)) {
+            return null;
+        }
+        try {
+            Bitmap bitmap = Glide.with(context)
+                    .asBitmap()
+                    .load(url)
+                    .into(width, height)
+                    .get();
+            return bitmap;
+        } catch (ExecutionException e) {
+            e.printStackTrace();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static void loadGifImage(Context context, ImageView imageView, String url) {
+        loadGifImage(context, imageView, url, 0);
+    }
+
+    public static void loadGifImage(Context context, ImageView imageView, String url, @DrawableRes int errorResId) {
+        if (TextUtils.isEmpty(url)) {
+            if (imageView != null && errorResId != 0) {
+                imageView.setImageResource(errorResId);
+            }
+            return;
+        }
+        Glide.with(context).asGif().load(url).into(imageView);
+    }
+
+    public static void loadGifImage(Context context, ImageView imageView, @RawRes @DrawableRes int resourceId) {
+        Glide.with(context).asGif().load(resourceId).into(imageView);
+    }
+
+    private static RequestBuilder<Drawable> loadTransform(Context context, @DrawableRes int placeholderId, int radius) {
+        return Glide.with(context).load(placeholderId)
+                .apply(new RequestOptions().centerCrop().transform(new GlideRoundTransform(context, radius)));
+    }
+
+    public static class GlideRoundTransform extends BitmapTransformation {
+
+        private static float radius = 0f;
+
+        public GlideRoundTransform(Context context, int dp) {
+            radius = Resources.getSystem().getDisplayMetrics().density * dp;
+        }
+
+        @Override
+        protected Bitmap transform(BitmapPool pool, Bitmap toTransform, int outWidth, int outHeight) {
+            return roundCrop(pool, toTransform);
+        }
+
+        private static Bitmap roundCrop(BitmapPool pool, Bitmap source) {
+            if (source == null) {
+                return null;
+            }
+
+            Bitmap result = pool.get(source.getWidth(), source.getHeight(), Bitmap.Config.ARGB_8888);
+            if (result == null) {
+                result = Bitmap.createBitmap(source.getWidth(), source.getHeight(), Bitmap.Config.ARGB_8888);
+            }
+
+            Canvas canvas = new Canvas(result);
+            Paint paint = new Paint();
+            paint.setShader(new BitmapShader(source, BitmapShader.TileMode.CLAMP, BitmapShader.TileMode.CLAMP));
+            paint.setAntiAlias(true);
+            RectF rectF = new RectF(0f, 0f, source.getWidth(), source.getHeight());
+            canvas.drawRoundRect(rectF, radius, radius, paint);
+            return result;
+        }
+
+        @Override
+        public void updateDiskCacheKey(MessageDigest messageDigest) {
+
+        }
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/PermissionRequest.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/PermissionRequest.java
new file mode 100644
index 0000000..0ff6c92
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/PermissionRequest.java
@@ -0,0 +1,208 @@
+package com.tencent.qcloud.tuikit.tuicallkit.utils;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.net.Uri;
+import android.provider.Settings;
+import android.text.TextUtils;
+
+import androidx.annotation.IntDef;
+
+import com.tencent.qcloud.tuicore.util.PermissionRequester;
+import com.tencent.qcloud.tuikit.tuicallengine.utils.BrandUtils;
+import com.tencent.qcloud.tuikit.tuicallengine.utils.PermissionUtils;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+
+public class PermissionRequest {
+    public static final int PERMISSION_MICROPHONE = 1;
+    public static final int PERMISSION_CAMERA     = 2;
+
+    @IntDef({PERMISSION_MICROPHONE, PERMISSION_CAMERA})
+    public @interface PermissionType {
+    }
+
+    public static void requestPermission(Context context, @PermissionType int type1, @PermissionType int type2,
+                                         PermissionCallback callback) {
+        requestPermission(context, type2, new PermissionCallback() {
+            @Override
+            public void onGranted() {
+                requestPermission(context, type1, new PermissionCallback() {
+                    @Override
+                    public void onGranted() {
+                        if (null != callback) {
+                            callback.onGranted();
+                        }
+                    }
+
+                    @Override
+                    public void onDenied() {
+                        if (null != callback) {
+                            callback.onDenied();
+                        }
+                    }
+
+                    @Override
+                    public void onDialogApproved() {
+                        if (null != callback) {
+                            callback.onDialogApproved();
+                        }
+                    }
+
+                    @Override
+                    public void onDialogRefused() {
+                        if (null != callback) {
+                            callback.onDialogRefused();
+                        }
+                    }
+                });
+
+            }
+
+            @Override
+            public void onDenied() {
+                if (null != callback) {
+                    callback.onDenied();
+                }
+            }
+
+            @Override
+            public void onDialogApproved() {
+                if (null != callback) {
+                    callback.onDialogApproved();
+                }
+            }
+
+            @Override
+            public void onDialogRefused() {
+                if (null != callback) {
+                    callback.onDialogRefused();
+                }
+            }
+        });
+    }
+
+    public static void requestPermission(Context context, @PermissionType int type, PermissionCallback callback) {
+        String permission = null;
+        String reason = null;
+        String reasonTitle = null;
+        String deniedAlert = null;
+        ApplicationInfo applicationInfo = context.getApplicationInfo();
+        String appName = context.getPackageManager().getApplicationLabel(applicationInfo).toString();
+        switch (type) {
+            case PERMISSION_MICROPHONE: {
+                permission = PermissionRequester.PermissionConstants.MICROPHONE;
+                reasonTitle = context.getString(R.string.tuicalling_permission_mic_reason_title, appName);
+                reason = context.getString(R.string.tuicalling_permission_mic_reason);
+                deniedAlert = context.getString(R.string.tuicalling_tips_start_audio);
+                break;
+            }
+            case PERMISSION_CAMERA: {
+                permission = PermissionRequester.PermissionConstants.CAMERA;
+                reasonTitle = context.getString(R.string.tuicalling_permission_camera_reason_title, appName);
+                reason = context.getString(R.string.tuicalling_permission_camera_reason);
+                deniedAlert = context.getString(R.string.tuicalling_tips_start_camera);
+                break;
+            }
+            default:
+                break;
+        }
+
+        PermissionRequester.SimpleCallback simpleCallback = new PermissionRequester.SimpleCallback() {
+            @Override
+            public void onGranted() {
+                if (callback != null) {
+                    callback.onGranted();
+                }
+            }
+
+            @Override
+            public void onDenied() {
+                if (callback != null) {
+                    callback.onDenied();
+                }
+            }
+        };
+        if (!TextUtils.isEmpty(permission)) {
+            PermissionRequester.permission(permission)
+                    .reason(reason)
+                    .reasonTitle(reasonTitle)
+                    .deniedAlert(deniedAlert)
+                    .callback(simpleCallback)
+                    .permissionDialogCallback(new PermissionRequester.PermissionDialogCallback() {
+                        @Override
+                        public void onApproved() {
+                            if (callback != null) {
+                                callback.onDialogApproved();
+                            }
+                        }
+
+                        @Override
+                        public void onRefused() {
+                            if (callback != null) {
+                                callback.onDialogRefused();
+                            }
+                        }
+                    })
+                    .request();
+        }
+    }
+
+    public abstract static class PermissionCallback {
+
+        public void onGranted() {
+        }
+
+        public void onDenied() {
+        }
+
+        public void onDialogApproved() {
+        }
+
+        public void onDialogRefused() {
+        }
+    }
+
+    public static void requestFloatPermission(Context context) {
+        if (PermissionUtils.hasPermission(context)) {
+            return;
+        }
+        if (BrandUtils.isBrandVivo()) {
+            requestVivoFloatPermission(context);
+        } else {
+            startCommonSettings(context);
+        }
+    }
+
+    private static void startCommonSettings(Context context) {
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+            Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
+            intent.setData(Uri.parse("package:" + context.getPackageName()));
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            context.startActivity(intent);
+        }
+    }
+
+    private static void requestVivoFloatPermission(Context context) {
+        Intent vivoIntent = new Intent();
+        String model = BrandUtils.getModel();
+        boolean isVivoY85 = false;
+        if (!TextUtils.isEmpty(model)) {
+            isVivoY85 = model.contains("Y85") && !model.contains("Y85A");
+        }
+
+        if (!TextUtils.isEmpty(model) && (isVivoY85 || model.contains("vivo Y53L"))) {
+            vivoIntent.setClassName("com.vivo.permissionmanager",
+                    "com.vivo.permissionmanager.activity.PurviewTabActivity");
+            vivoIntent.putExtra("tabId", "1");
+        } else {
+            vivoIntent.setClassName("com.vivo.permissionmanager",
+                    "com.vivo.permissionmanager.activity.SoftPermissionDetailActivity");
+            vivoIntent.setAction("secure.intent.action.softPermissionDetail");
+        }
+
+        vivoIntent.putExtra("packagename", context.getPackageName());
+        vivoIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(vivoIntent);
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/UserInfoUtils.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/UserInfoUtils.java
new file mode 100644
index 0000000..d9ff2ab
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/utils/UserInfoUtils.java
@@ -0,0 +1,112 @@
+package com.tencent.qcloud.tuikit.tuicallkit.utils;
+
+import android.text.TextUtils;
+
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMUserFullInfo;
+import com.tencent.imsdk.v2.V2TIMValueCallback;
+import com.tencent.qcloud.tuikit.tuicallengine.impl.base.TUILog;
+import com.tencent.qcloud.tuikit.tuicallkit.base.CallingUserModel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class UserInfoUtils {
+    private static final String TAG                  = "UserInfoUtils";
+    private static final String ERROR_MSG_EMPTY_LIST = "userList is empty";
+
+    public UserInfoUtils() {
+    }
+
+    public void getUserInfo(String userId, final UserCallback callback) {
+        if (TextUtils.isEmpty(userId)) {
+            TUILog.e(TAG, "getUserInfo, userId is empty.");
+            if (callback != null) {
+                callback.onFailed(-1, ERROR_MSG_EMPTY_LIST);
+            }
+            return;
+        }
+
+        List<String> list = new ArrayList<>();
+        list.add(userId);
+        internalGetUserInfo(list, callback);
+    }
+
+    public void getUserInfo(List<CallingUserModel> userIdList, final UserCallback callback) {
+        if (null == userIdList || userIdList.isEmpty()) {
+            TUILog.e(TAG, "getUserInfo, userIdList is empty.");
+            if (callback != null) {
+                callback.onFailed(-1, ERROR_MSG_EMPTY_LIST);
+            }
+            return;
+        }
+
+        List<String> list = new ArrayList<>();
+        for (CallingUserModel model : userIdList) {
+            if (null != model && !TextUtils.isEmpty(model.userId)) {
+                list.add(model.userId);
+            }
+        }
+        internalGetUserInfo(list, callback);
+    }
+
+    private void internalGetUserInfo(List<String> userList, UserCallback callback) {
+        if (null == userList || userList.isEmpty()) {
+            TUILog.e(TAG, "internalGetUserInfo, userIdList is empty.");
+            if (callback != null) {
+                callback.onFailed(-1, ERROR_MSG_EMPTY_LIST);
+            }
+            return;
+        }
+
+        V2TIMManager.getInstance().getUsersInfo(userList, new V2TIMValueCallback<List<V2TIMUserFullInfo>>() {
+            @Override
+            public void onError(int errorCode, String errorMsg) {
+                TUILog.e(TAG, "internalGetUserInfo fail, errorCode: " + errorCode + ", errorMsg: " + errorMsg);
+                if (callback != null) {
+                    callback.onFailed(errorCode, errorMsg);
+                }
+            }
+
+            @Override
+            public void onSuccess(List<V2TIMUserFullInfo> userFullInfoList) {
+                if (null == userFullInfoList || userFullInfoList.isEmpty()) {
+                    TUILog.e(TAG, "internalGetUserInfo result is empty");
+                    if (null != callback) {
+                        callback.onFailed(-1, ERROR_MSG_EMPTY_LIST);
+                    }
+                    return;
+                }
+
+                List<CallingUserModel> list = new ArrayList<>();
+                for (int i = 0; i < userFullInfoList.size(); i++) {
+                    CallingUserModel model = new CallingUserModel();
+                    model.userName = userFullInfoList.get(i).getNickName();
+                    model.userId = userFullInfoList.get(i).getUserID();
+                    model.userAvatar = userFullInfoList.get(i).getFaceUrl();
+
+                    if (!isUrl(model.userAvatar)) {
+                        model.userAvatar = "";
+                    }
+
+                    model.userName = TextUtils.isEmpty(model.userName) ? model.userId : model.userName;
+                    TUILog.i(TAG, "internalGetUserInfo, model: " + model);
+                    list.add(model);
+                }
+                if (callback != null) {
+                    callback.onSuccess(list);
+                }
+            }
+        });
+    }
+
+    private boolean isUrl(String url) {
+        return !TextUtils.isEmpty(url) && (url.startsWith("http://") || url.startsWith("https://"));
+    }
+
+    public interface UserCallback {
+        void onSuccess(List<CallingUserModel> list);
+
+        void onFailed(int errorCode, String errorMsg);
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/TUICallingViewManager.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/TUICallingViewManager.java
new file mode 100644
index 0000000..0053404
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/TUICallingViewManager.java
@@ -0,0 +1,888 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.interfaces.ITUINotification;
+import com.tencent.qcloud.tuicore.interfaces.ITUIService;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.TUICommonDefine;
+import com.tencent.qcloud.tuikit.TUIVideoView;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine.MediaType;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine.Role;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine.Scene;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine.Status;
+import com.tencent.qcloud.tuikit.tuicallengine.impl.base.TUILog;
+import com.tencent.qcloud.tuikit.tuicallengine.utils.PermissionUtils;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.base.BaseCallActivity;
+import com.tencent.qcloud.tuikit.tuicallkit.base.CallingUserModel;
+import com.tencent.qcloud.tuikit.tuicallkit.base.Constants;
+import com.tencent.qcloud.tuikit.tuicallkit.base.TUICallingAction;
+import com.tencent.qcloud.tuikit.tuicallkit.base.TUICallingStatusManager;
+import com.tencent.qcloud.tuikit.tuicallkit.base.UserLayout;
+import com.tencent.qcloud.tuikit.tuicallkit.base.UserLayoutEntity;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.ImageLoader;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.PermissionRequest;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.UserInfoUtils;
+import com.tencent.qcloud.tuikit.tuicallkit.view.component.BaseUserView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.component.TUICallingSingleVideoUserView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.component.TUICallingUserView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.floatwindow.FloatCallView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.floatwindow.FloatWindowService;
+import com.tencent.qcloud.tuikit.tuicallkit.view.floatwindow.HomeWatcher;
+import com.tencent.qcloud.tuikit.tuicallkit.view.function.BaseFunctionView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.function.TUICallingAudioFunctionView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.function.TUICallingSwitchAudioView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.function.TUICallingVideoFunctionView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.function.TUICallingVideoInviteFunctionView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.function.TUICallingWaitFunctionView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.root.BaseCallView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.root.TUICallingGroupView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.root.TUICallingImageView;
+import com.tencent.qcloud.tuikit.tuicallkit.view.root.TUICallingSingleView;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class TUICallingViewManager implements ITUINotification {
+    private static final String TAG = "TUICallingViewManager";
+
+    private final Context           mContext;
+    private final Handler           mMainHandler = new Handler(Looper.getMainLooper());
+    private final UserLayoutFactory mUserLayoutFactory;
+    private final TUICallingAction  mCallingAction;
+
+    private CallingUserModel       mSelfUserModel;
+    private List<CallingUserModel> mInviteeList     = new ArrayList<>();
+    private CallingUserModel       mInviter;
+    private boolean                mEnableFloatView = false;
+
+    private BaseCallView     mBaseCallView;
+    private BaseFunctionView mFunctionView;
+    private BaseUserView     mUserView;
+    private ImageView        mImageFloatFunction;
+    private FloatCallView    mFloatCallView;
+    private LinearLayout     mOtherUserLayout;
+    private HomeWatcher      mHomeWatcher;
+    private UserInfoUtils    mUserInfoUtils;
+
+    public TUICallingViewManager(Context context) {
+        mContext = context.getApplicationContext();
+        mUserLayoutFactory = new UserLayoutFactory(mContext);
+        mCallingAction = new TUICallingAction(context);
+        mUserInfoUtils = new UserInfoUtils();
+        registerCallingEvent();
+    }
+
+    private void registerCallingEvent() {
+        TUICore.registerEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_CAMERA_OPEN, this);
+        TUICore.registerEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_MIC_STATUS_CHANGED, this);
+
+        TUICore.registerEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_CALL_STATUS_CHANGED, this);
+        TUICore.registerEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_CALL_TYPE_CHANGED, this);
+        TUICore.registerEvent(TUIConstants.TUIGroup.EVENT_GROUP,
+                TUIConstants.TUIGroup.EVENT_SUB_KEY_GROUP_MEMBER_SELECTED, this);
+    }
+
+    public void createCallingView(List<CallingUserModel> inviteeList, CallingUserModel inviter) {
+        mInviter = inviter;
+        mInviteeList = inviteeList;
+        initHomeWatcher();
+        TUILog.i(TAG, "createCallingView mInviter: " + mInviter + " ,mInviteeList: " + mInviteeList);
+
+        if (Scene.SINGLE_CALL.equals(TUICallingStatusManager.sharedInstance(mContext).getCallScene())) {
+            initSingleWaitingView();
+        } else {
+            initGroupWaitingView();
+        }
+    }
+
+    //JoinInGroupCall
+    public void createGroupCallingAcceptView() {
+        initSelfModel();
+        mUserLayoutFactory.allocUserLayout(mSelfUserModel);
+        initGroupAcceptCallView();
+    }
+
+    public void updateCallingUserView(List<CallingUserModel> inviteeList, CallingUserModel inviter) {
+        mInviter = inviter;
+        mInviteeList = inviteeList;
+
+        CallingUserModel userModel;
+        if (TUICallDefine.Role.Caller.equals(TUICallingStatusManager.sharedInstance(mContext).getCallRole())) {
+            userModel = inviteeList.get(0);
+            for (CallingUserModel model : inviteeList) {
+                reloadUserModel(model);
+            }
+        } else {
+            userModel = inviter;
+            reloadUserModel(inviter);
+        }
+
+        if (null != mUserView) {
+            mUserView.updateUserInfo(userModel);
+        }
+        initOtherInviteeView();
+    }
+
+    public void showCallingView() {
+        TUILog.i(TAG, "showCallingView: mBaseCallView: " + mBaseCallView);
+        BaseCallActivity.updateBaseView(mBaseCallView);
+        Intent intent = new Intent(mContext, BaseCallActivity.class);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        mContext.startActivity(intent);
+    }
+
+    public void closeCallingView() {
+        if (null != mBaseCallView) {
+            mBaseCallView.finish();
+        }
+        mBaseCallView = null;
+        BaseCallActivity.finishActivity();
+
+        mSelfUserModel = null;
+        mInviteeList.clear();
+        mInviter = new CallingUserModel();
+
+        TUICallingStatusManager.sharedInstance(mContext).clear();
+
+        mFunctionView = null;
+        mFloatCallView = null;
+        mUserView = null;
+        mImageFloatFunction = null;
+        mOtherUserLayout = null;
+
+        if (null != mHomeWatcher) {
+            mHomeWatcher.stopWatch();
+            mHomeWatcher = null;
+        }
+        FloatWindowService.stopService(mContext);
+    }
+
+    private void updateCallStatus(TUICallDefine.Status status) {
+        if (TUICallDefine.Status.None.equals(status)) {
+            closeCallingView();
+            return;
+        }
+        if (!TUICallDefine.Status.Accept.equals(status)) {
+            return;
+        }
+
+        if (null != mBaseCallView) {
+            if (Scene.SINGLE_CALL.equals(TUICallingStatusManager.sharedInstance(mContext).getCallScene())) {
+                initSingleAcceptCallView();
+            } else {
+                initGroupAcceptCallView();
+            }
+        }
+        if (null != mFloatCallView) {
+            updateFloatView(TUICallingStatusManager.sharedInstance(mContext).getCallStatus());
+        }
+    }
+
+    private void updateCallType(TUICallDefine.MediaType type) {
+        if (TUICallDefine.MediaType.Unknown.equals(type)) {
+            return;
+        }
+
+        if (mBaseCallView == null) {
+            return;
+        }
+        mBaseCallView.finish();
+        mBaseCallView = null;
+
+        if (TUICallDefine.Status.Waiting.equals(TUICallingStatusManager.sharedInstance(mContext).getCallStatus())) {
+            initSingleWaitingView();
+        } else {
+            initAudioPlayDevice();
+            initSingleAcceptCallView();
+        }
+
+        if (null != mFloatCallView) {
+            updateFloatView(TUICallingStatusManager.sharedInstance(mContext).getCallStatus());
+        }
+    }
+
+    public void userCallingTimeStr(String time) {
+        if (null == mBaseCallView) {
+            return;
+        }
+        mMainHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                if (null != mFloatCallView) {
+                    mFloatCallView.updateCallTimeView(time);
+                }
+
+                if (null != mBaseCallView) {
+                    mBaseCallView.updateCallTimeView(time);
+                }
+            }
+        });
+    }
+
+    public void userEnter(CallingUserModel userModel) {
+        if (null == userModel || TextUtils.isEmpty(userModel.userId)) {
+            return;
+        }
+        userModel.isEnter = true;
+        if (!mInviteeList.contains(userModel)) {
+            mInviteeList.add(userModel);
+        }
+        if (null != mBaseCallView) {
+            mBaseCallView.userEnter(userModel);
+        }
+        if (TextUtils.isEmpty(userModel.userName) || TextUtils.isEmpty(userModel.userAvatar)) {
+            loadUserInfo(userModel);
+        }
+    }
+
+    public void userLeave(CallingUserModel userModel) {
+        if (userModel == null || TextUtils.isEmpty(userModel.userId)) {
+            return;
+        }
+        if (mInviter != null && userModel.userId.equals(mInviter.userId)) {
+            mInviter = new CallingUserModel();
+        }
+        mInviteeList.remove(userModel);
+        initOtherInviteeView();
+
+        if (null != mBaseCallView) {
+            mBaseCallView.userLeave(userModel);
+        }
+    }
+
+    public void updateUser(CallingUserModel userModel) {
+        if (null == userModel || TextUtils.isEmpty(userModel.userId)) {
+            return;
+        }
+
+        initSelfModel();
+        if (mSelfUserModel != null && userModel.userId.equals(mSelfUserModel.userId)) {
+            userModel.isVideoAvailable = mSelfUserModel.isVideoAvailable;
+            userModel.isAudioAvailable = mSelfUserModel.isAudioAvailable;
+        }
+
+        if (null != mBaseCallView) {
+            mBaseCallView.updateUserInfo(userModel);
+        }
+
+        if (mFloatCallView != null) {
+            CallingUserModel model = findCallingUserModel(mFloatCallView.getCurrentUser());
+            if (model != null && userModel.userId.equals(model.userId)) {
+                updateFloatView(TUICallingStatusManager.sharedInstance(mContext).getCallStatus());
+            }
+            return;
+        }
+
+        UserLayout layout = mUserLayoutFactory.findUserLayout(userModel.userId);
+        if (null != layout) {
+            layout.setAudioVolume(userModel.volume, userModel.isAudioAvailable);
+        }
+    }
+
+    public void enableFloatWindow(boolean enable) {
+        mEnableFloatView = enable;
+    }
+
+    private void initSingleWaitingView() {
+        initSelfModel();
+        initAudioPlayDevice();
+        if (TUICallDefine.MediaType.Video.equals(TUICallingStatusManager.sharedInstance(mContext).getMediaType())) {
+            initSingleVideoWaitingView();
+        } else {
+            initSingleAudioWaitingView();
+        }
+    }
+
+    private void initSingleAudioWaitingView() {
+        mBaseCallView = new TUICallingImageView(mContext);
+        String hint;
+        TUICallDefine.Role callRole = TUICallingStatusManager.sharedInstance(mContext).getCallRole();
+
+        if (TUICallDefine.Role.Caller.equals(callRole)) {
+            hint = mContext.getString(R.string.tuicalling_waiting_accept);
+            mFunctionView = new TUICallingAudioFunctionView(mContext);
+        } else {
+            hint = mContext.getString(R.string.tuicalling_invite_audio_call);
+            mFunctionView = new TUICallingWaitFunctionView(mContext);
+        }
+
+        mUserView = new TUICallingUserView(mContext);
+        if (TUICallDefine.Role.Caller.equals(callRole) && !mInviteeList.isEmpty()) {
+            mUserView.updateUserInfo(mInviteeList.get(0));
+        } else {
+            mUserView.updateUserInfo(mInviter);
+        }
+        mBaseCallView.updateUserView(mUserView);
+
+        mBaseCallView.updateCallingHint(hint);
+        mBaseCallView.updateFunctionView(mFunctionView);
+
+        updateViewColor();
+        initFloatingWindowBtn();
+        BaseCallActivity.updateBaseView(mBaseCallView);
+    }
+
+    private void initSingleVideoWaitingView() {
+        mUserLayoutFactory.allocUserLayout(mSelfUserModel);
+        mBaseCallView = new TUICallingSingleView(mContext, mUserLayoutFactory);
+        String hint = "";
+        if (TUICallDefine.Role.Caller.equals(TUICallingStatusManager.sharedInstance(mContext).getCallRole())) {
+            hint = mContext.getString(R.string.tuicalling_waiting_accept);
+            mFunctionView = new TUICallingVideoInviteFunctionView(mContext);
+        } else {
+            hint = mContext.getString(R.string.tuicalling_invite_video_call);
+            mFunctionView = new TUICallingWaitFunctionView(mContext);
+        }
+
+        mUserView = new TUICallingSingleVideoUserView(mContext, hint);
+        mBaseCallView.updateUserView(mUserView);
+
+        mBaseCallView.updateSwitchAudioView(new TUICallingSwitchAudioView(mContext));
+
+        mFunctionView.setLocalUserLayout(mUserLayoutFactory.findUserLayout(TUILogin.getLoginUser()));
+        mBaseCallView.updateFunctionView(mFunctionView);
+
+        updateViewColor();
+        initFloatingWindowBtn();
+        BaseCallActivity.updateBaseView(mBaseCallView);
+    }
+
+    private void initGroupWaitingView() {
+        initSelfModel();
+        initAudioPlayDevice();
+
+        TUICallDefine.MediaType mediaType = TUICallingStatusManager.sharedInstance(mContext).getMediaType();
+        String hint;
+        if (TUICallDefine.Role.Caller.equals(TUICallingStatusManager.sharedInstance(mContext).getCallRole())) {
+            mUserLayoutFactory.allocUserLayout(mSelfUserModel);
+            for (CallingUserModel model : mInviteeList) {
+                if (null != model && !TextUtils.isEmpty(model.userId)) {
+                    mUserLayoutFactory.allocUserLayout(model);
+                }
+            }
+            mBaseCallView = new TUICallingGroupView(mContext, mUserLayoutFactory);
+            hint = mContext.getString(R.string.tuicalling_waiting_accept);
+            mFunctionView = (TUICallDefine.MediaType.Video.equals(mediaType))
+                    ? new TUICallingVideoFunctionView(mContext) :
+                    new TUICallingAudioFunctionView(mContext);
+            initInviteUserFunction();
+        } else {
+            mBaseCallView = new TUICallingImageView(mContext);
+            mUserView = new TUICallingUserView(mContext);
+            mFunctionView = new TUICallingWaitFunctionView(mContext);
+            hint = TUICallDefine.MediaType.Audio.equals(mediaType)
+                    ? mContext.getString(R.string.tuicalling_invite_audio_call) :
+                    mContext.getString(R.string.tuicalling_invite_video_call);
+
+            mBaseCallView.updateUserView(mUserView);
+            mBaseCallView.addOtherUserView(initOtherInviteeView());
+        }
+        mFunctionView.setLocalUserLayout(mUserLayoutFactory.findUserLayout(TUILogin.getLoginUser()));
+
+        mBaseCallView.updateCallingHint(hint);
+        mBaseCallView.updateFunctionView(mFunctionView);
+
+        updateViewColor();
+        initFloatingWindowBtn();
+    }
+
+    private void initSingleAcceptCallView() {
+        if (TUICallDefine.MediaType.Audio.equals(TUICallingStatusManager.sharedInstance(mContext).getMediaType())) {
+            initSingleAudioAcceptCallView();
+        } else {
+            initSingleVideoAcceptCallView();
+        }
+    }
+
+    private void initSingleAudioAcceptCallView() {
+        if (mBaseCallView != null) {
+            mBaseCallView.finish();
+            mBaseCallView = null;
+        }
+        mBaseCallView = new TUICallingImageView(mContext);
+        mFunctionView = new TUICallingAudioFunctionView(mContext);
+        mUserView = new TUICallingUserView(mContext);
+        TUICallDefine.Role role = TUICallingStatusManager.sharedInstance(mContext).getCallRole();
+        if (TUICallDefine.Role.Caller.equals(role) && !mInviteeList.isEmpty()) {
+            mUserView.updateUserInfo(mInviteeList.get(0));
+        } else {
+            mUserView.updateUserInfo(mInviter);
+        }
+
+        mBaseCallView.updateFunctionView(mFunctionView);
+        mBaseCallView.updateUserView(mUserView);
+        mBaseCallView.updateCallingHint("");
+
+        updateViewColor();
+        updateFunctionStatus();
+        initFloatingWindowBtn();
+        BaseCallActivity.updateBaseView(mBaseCallView);
+    }
+
+    private void initSingleVideoAcceptCallView() {
+        if (null == mBaseCallView) {
+            mBaseCallView = new TUICallingSingleView(mContext, mUserLayoutFactory);
+            mBaseCallView.updateSwitchAudioView(new TUICallingSwitchAudioView(mContext));
+        }
+        mFunctionView = new TUICallingVideoFunctionView(mContext);
+        mFunctionView.setLocalUserLayout(mUserLayoutFactory.findUserLayout(TUILogin.getLoginUser()));
+
+        mBaseCallView.updateUserView(null);
+        mBaseCallView.updateFunctionView(mFunctionView);
+
+        updateViewColor();
+        updateFunctionStatus();
+        initFloatingWindowBtn();
+        BaseCallActivity.updateBaseView(mBaseCallView);
+    }
+
+    private void initGroupAcceptCallView() {
+        TUICallDefine.MediaType mediaType = TUICallingStatusManager.sharedInstance(mContext).getMediaType();
+
+        if (TUICallDefine.Role.Caller.equals(TUICallingStatusManager.sharedInstance(mContext).getCallRole())) {
+            if (null == mBaseCallView) {
+                mBaseCallView = new TUICallingGroupView(mContext, mUserLayoutFactory);
+            }
+            if (TUICallDefine.MediaType.Video.equals(mediaType)) {
+                mFunctionView = new TUICallingVideoFunctionView(mContext);
+                mBaseCallView.updateFunctionView(mFunctionView);
+            }
+        } else {
+            if (null != mBaseCallView) {
+                mBaseCallView.finish();
+            }
+
+            mUserLayoutFactory.allocUserLayout(mInviter);
+            for (CallingUserModel model : mInviteeList) {
+                if (null != model && !TextUtils.isEmpty(model.userId)) {
+                    mUserLayoutFactory.allocUserLayout(model);
+                }
+            }
+            mBaseCallView = new TUICallingGroupView(mContext, mUserLayoutFactory);
+            mFunctionView = (TUICallDefine.MediaType.Video.equals(mediaType))
+                    ? new TUICallingVideoFunctionView(mContext)
+                    : new TUICallingAudioFunctionView(mContext);
+            mBaseCallView.updateFunctionView(mFunctionView);
+        }
+        mFunctionView.setLocalUserLayout(mUserLayoutFactory.findUserLayout(TUILogin.getLoginUser()));
+        mBaseCallView.updateCallingHint("");
+
+        updateViewColor();
+        updateFunctionStatus();
+        initInviteUserFunction();
+        initFloatingWindowBtn();
+        BaseCallActivity.updateBaseView(mBaseCallView);
+    }
+
+    private View initOtherInviteeView() {
+        if (mOtherUserLayout == null) {
+            mOtherUserLayout = new LinearLayout(mContext);
+        } else {
+            mOtherUserLayout.removeAllViews();
+        }
+
+        List<CallingUserModel> otherInviteeList = mInviteeList;
+
+        int squareWidth = mContext.getResources().getDimensionPixelOffset(R.dimen.tuicalling_small_image_size);
+        int leftMargin = mContext.getResources().getDimensionPixelOffset(R.dimen.tuicalling_small_image_left_margin);
+
+        for (int index = 0; index < otherInviteeList.size(); index++) {
+            final CallingUserModel model = otherInviteeList.get(index);
+            final ImageView imageView = new ImageView(mContext);
+            LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(squareWidth, squareWidth);
+            if (index != 0) {
+                layoutParams.leftMargin = leftMargin;
+            }
+            imageView.setLayoutParams(layoutParams);
+            ImageLoader.loadImage(mContext, imageView, model.userAvatar, R.drawable.tuicalling_ic_avatar);
+            mOtherUserLayout.addView(imageView);
+        }
+        return mOtherUserLayout;
+    }
+
+    private void updateViewColor() {
+        TUICallDefine.MediaType mediaType = TUICallingStatusManager.sharedInstance(mContext).getMediaType();
+        int backgroundColor = TUICallDefine.MediaType.Video.equals(mediaType)
+                ? mContext.getResources().getColor(R.color.tuicalling_color_video_background)
+                : mContext.getResources().getColor(R.color.tuicalling_color_audio_background);
+
+        int textColor = TUICallDefine.MediaType.Video.equals(mediaType)
+                ? mContext.getResources().getColor(R.color.tuicalling_color_white)
+                : mContext.getResources().getColor(R.color.tuicalling_color_black);
+
+        if (null != mBaseCallView) {
+            mBaseCallView.updateBackgroundColor(backgroundColor);
+            mBaseCallView.updateTextColor(textColor);
+        }
+
+        if (null != mUserView) {
+            mUserView.updateTextColor(textColor);
+        }
+        if (null != mFunctionView) {
+            mFunctionView.updateTextColor(textColor);
+        }
+    }
+
+    private void updateFunctionStatus() {
+        TUICallingStatusManager statusManager = TUICallingStatusManager.sharedInstance(mContext);
+        statusManager.updateCameraOpenStatus(statusManager.isCameraOpen(), statusManager.getFrontCamera());
+        mCallingAction.selectAudioPlaybackDevice(statusManager.getAudioPlaybackDevice());
+        if (statusManager.isMicMute()) {
+            mCallingAction.closeMicrophone();
+        } else {
+            mCallingAction.openMicrophone(null);
+        }
+    }
+
+    private void initAudioPlayDevice() {
+        TUICallDefine.MediaType mediaType = TUICallingStatusManager.sharedInstance(mContext).getMediaType();
+        TUICommonDefine.AudioPlaybackDevice device = TUICallDefine.MediaType.Audio.equals(mediaType)
+                ? TUICommonDefine.AudioPlaybackDevice.Earpiece : TUICommonDefine.AudioPlaybackDevice.Speakerphone;
+        TUICallingStatusManager.sharedInstance(mContext).updateAudioPlaybackDevice(device);
+    }
+
+    private void initSelfModel() {
+        if (mSelfUserModel != null) {
+            return;
+        }
+        mSelfUserModel = new CallingUserModel();
+        mSelfUserModel.userId = TUILogin.getLoginUser();
+        mSelfUserModel.userAvatar = TUILogin.getFaceUrl();
+        mSelfUserModel.userName = TUILogin.getNickName();
+    }
+
+    private void reloadUserModel(CallingUserModel model) {
+        if (model == null || TextUtils.isEmpty(model.userId)) {
+            return;
+        }
+        UserLayout layout = mUserLayoutFactory.findUserLayout(model.userId);
+        if (null != layout) {
+            layout.setUserName(model.userName);
+            ImageLoader.loadImage(mContext, layout.getAvatarImage(), model.userAvatar, R.drawable.tuicalling_ic_avatar);
+        }
+    }
+
+    private void initFloatingWindowBtn() {
+        if (mBaseCallView == null) {
+            return;
+        }
+
+        if (mEnableFloatView) {
+            mImageFloatFunction = new ImageView(mContext);
+            TUICallDefine.MediaType mediaType = TUICallingStatusManager.sharedInstance(mContext).getMediaType();
+            int resId = TUICallDefine.MediaType.Video.equals(mediaType)
+                    ? R.drawable.tuicalling_ic_move_back_white : R.drawable.tuicalling_ic_move_back_black;
+            mImageFloatFunction.setBackgroundResource(resId);
+            ViewGroup.LayoutParams lp = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.MATCH_PARENT);
+            mImageFloatFunction.setLayoutParams(lp);
+            mImageFloatFunction.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    startFloatService();
+                }
+            });
+        }
+
+        if (mImageFloatFunction != null && mImageFloatFunction.getParent() != null) {
+            ((ViewGroup) mImageFloatFunction.getParent()).removeView(mImageFloatFunction);
+        }
+        mBaseCallView.enableFloatView(mImageFloatFunction);
+    }
+
+    private void startFloatService() {
+        if (!mEnableFloatView) {
+            return;
+        }
+
+        if (null != mFloatCallView) {
+            return;
+        }
+        if (PermissionUtils.hasPermission(mContext)) {
+            mFloatCallView = createFloatView();
+            updateFloatView(TUICallingStatusManager.sharedInstance(mContext).getCallStatus());
+            FloatWindowService.startFloatService(mContext, mFloatCallView);
+            BaseCallActivity.finishActivity();
+        } else {
+            PermissionRequest.requestFloatPermission(mContext);
+        }
+    }
+
+    private FloatCallView createFloatView() {
+        FloatCallView floatView = new FloatCallView(mContext, mUserLayoutFactory);
+        floatView.setOnClickListener(new FloatCallView.OnClickListener() {
+            @Override
+            public void onClick() {
+                FloatWindowService.stopService(mContext);
+                mFloatCallView = null;
+                mImageFloatFunction = null;
+
+                MediaType mediaType = TUICallingStatusManager.sharedInstance(mContext).getMediaType();
+                Scene callScene = TUICallingStatusManager.sharedInstance(mContext).getCallScene();
+                if (MediaType.Video.equals(mediaType) && Scene.SINGLE_CALL.equals(callScene)) {
+
+                    Role callRole = TUICallingStatusManager.sharedInstance(mContext).getCallRole();
+                    CallingUserModel model = (Role.Called.equals(callRole)) ? mInviter : mInviteeList.get(0);
+                    Status status = TUICallingStatusManager.sharedInstance(mContext).getCallStatus();
+
+                    if (Status.Accept.equals(status)) {
+                        resetVideoCloudView(mSelfUserModel);
+                        resetVideoCloudView(model);
+                    } else {
+                        resetVideoCloudView(mSelfUserModel);
+                    }
+                }
+                showCallingView();
+            }
+        });
+        return floatView;
+    }
+
+    private void resetVideoCloudView(CallingUserModel model) {
+        UserLayout userLayout = mUserLayoutFactory.findUserLayout(model.userId);
+        if (null == userLayout) {
+            userLayout = mUserLayoutFactory.allocUserLayout(model);
+        }
+
+        TUIVideoView videoView = userLayout.getVideoView();
+        if (videoView != null) {
+            if (null != videoView.getParent()) {
+                ((ViewGroup) videoView.getParent()).removeView(videoView);
+            }
+            userLayout.addVideoView(videoView);
+        }
+    }
+
+    private void updateFloatView(TUICallDefine.Status status) {
+        if (null == mFloatCallView) {
+            return;
+        }
+        TUICallDefine.MediaType type = TUICallingStatusManager.sharedInstance(mContext).getMediaType();
+        Scene scene = TUICallingStatusManager.sharedInstance(mContext).getCallScene();
+
+        if (TUICallDefine.MediaType.Video.equals(type) && Scene.SINGLE_CALL.equals(scene)) {
+            mFloatCallView.enableCallingHint(false);
+            String userId;
+            if (TUICallDefine.Status.Waiting.equals(status)) {
+                userId = TUILogin.getLoginUser();
+            } else {
+                TUICallDefine.Role callRole = TUICallingStatusManager.sharedInstance(mContext).getCallRole();
+                userId = (TUICallDefine.Role.Caller.equals(callRole)) ? mInviteeList.get(0).userId : mInviter.userId;
+            }
+            mFloatCallView.updateView(true, userId);
+        } else {
+            mFloatCallView.enableCallingHint(TUICallDefine.Status.Waiting.equals(status));
+            mFloatCallView.updateView(false, null);
+        }
+    }
+
+    private void initHomeWatcher() {
+        if (null == mHomeWatcher) {
+            mHomeWatcher = new HomeWatcher(mContext);
+        }
+        mHomeWatcher.setOnHomePressedListener(new HomeWatcher.OnHomePressedListener() {
+            @Override
+            public void onHomePressed() {
+                if (PermissionUtils.hasPermission(mContext)) {
+                    startFloatService();
+                }
+            }
+
+            @Override
+            public void onRecentAppsPressed() {
+                if (PermissionUtils.hasPermission(mContext)) {
+                    startFloatService();
+                }
+            }
+        });
+        mHomeWatcher.startWatch();
+    }
+
+    private CallingUserModel findCallingUserModel(String userId) {
+        if (TextUtils.isEmpty(userId)) {
+            return null;
+        }
+        for (UserLayoutEntity entity : mUserLayoutFactory.mLayoutEntityList) {
+            if (entity != null && userId.equals(entity.userId)) {
+                return entity.userModel;
+            }
+        }
+        return null;
+    }
+
+    private void initInviteUserFunction() {
+//        ITUIService service = TUICore.getService(TUIConstants.TUIGroup.SERVICE_NAME);
+//        boolean enableInviteUser = (service != null);
+//
+//        if (enableInviteUser && mBaseCallView != null) {
+//            Button inviteUserBtn = new Button(mContext);
+//            TUICallDefine.MediaType mediaType = TUICallingStatusManager.sharedInstance(mContext).getMediaType();
+//            int resId = TUICallDefine.MediaType.Video.equals(mediaType)
+//                    ? R.drawable.tuicalling_ic_add_user_white : R.drawable.tuicalling_ic_add_user_black;
+//            inviteUserBtn.setBackgroundResource(resId);
+//            inviteUserBtn.setOnClickListener(new View.OnClickListener() {
+//                @Override
+//                public void onClick(View v) {
+//                    String groupId = TUICallingStatusManager.sharedInstance(mContext).getGroupId();
+//                    if (TextUtils.isEmpty(groupId)) {
+//                        ToastUtil.toastShortMessage(mContext.getString(R.string.tuicalling_groupid_is_empty));
+//                        return;
+//                    }
+//
+//                    TUICallDefine.Status status = TUICallingStatusManager.sharedInstance(mContext).getCallStatus();
+//                    TUICallDefine.Role role = TUICallingStatusManager.sharedInstance(mContext).getCallRole();
+//                    if (TUICallDefine.Role.Called.equals(role) && !TUICallDefine.Status.Accept.equals(status)) {
+//                        ToastUtil.toastShortMessage(mContext.getString(R.string.tuicalling_status_is_not_accept));
+//                        return;
+//                    }
+//
+//                    ArrayList<String> list = new ArrayList<>();
+//                    list.add(mInviter.userId);
+//                    for (CallingUserModel model : mInviteeList) {
+//                        if (model != null && !TextUtils.isEmpty(model.userId) && !list.contains(model.userId)) {
+//                            list.add(model.userId);
+//                        }
+//                    }
+//                    if (!list.contains(TUILogin.getLoginUser())) {
+//                        list.add(TUILogin.getLoginUser());
+//                    }
+//
+//                    TUILog.i(TAG, "initInviteUserFunction, groupId: " + groupId + " ,list: " + list);
+//
+//                    Bundle bundle = new Bundle();
+//                    bundle.putString(TUIConstants.TUIGroup.GROUP_ID, groupId);
+//                    bundle.putString(TUIConstants.TUIGroup.USER_DATA, Constants.TUICALLKIT);
+//                    bundle.putStringArrayList(TUIConstants.TUIGroup.SELECTED_LIST, list);
+//                    TUICore.startActivity("GroupMemberActivity", bundle);
+//                }
+//            });
+//            mBaseCallView.enableAddUserView(inviteUserBtn);
+//        }
+    }
+
+    private void inviteUsersToGroupCall(List<String> userIdList) {
+        if (userIdList == null || userIdList.isEmpty()) {
+            TUILog.e(TAG, "inviteUsersToGroupCall, userIdList is empty: " + userIdList);
+            return;
+        }
+
+        mCallingAction.inviteUser(userIdList, new TUICommonDefine.ValueCallback() {
+            @Override
+            public void onSuccess(Object data) {
+                if (!(data instanceof List)) {
+                    return;
+                }
+
+                List<String> list = (List<String>) data;
+
+                TUILog.i(TAG, "inviteUsersToGroupCall success, list:" + list);
+                for (String userId : list) {
+                    if (!TextUtils.isEmpty(userId)) {
+                        CallingUserModel userModel = new CallingUserModel();
+                        userModel.userId = userId;
+                        addUser(userModel);
+                    }
+                }
+            }
+
+            @Override
+            public void onError(int errCode, String errMsg) {
+            }
+        });
+    }
+
+    private void addUser(CallingUserModel userModel) {
+        if (!mInviteeList.contains(userModel)) {
+            mInviteeList.add(userModel);
+        }
+        if (null != mBaseCallView) {
+            mBaseCallView.userAdd(userModel);
+        }
+        loadUserInfo(userModel);
+    }
+
+    private void loadUserInfo(CallingUserModel model) {
+        UserLayout userLayout = mUserLayoutFactory.allocUserLayout(model);
+        if (userLayout == null) {
+            return;
+        }
+        mUserInfoUtils.getUserInfo(model.userId, new UserInfoUtils.UserCallback() {
+            @Override
+            public void onSuccess(List<CallingUserModel> list) {
+                if (list != null && !list.isEmpty()) {
+                    CallingUserModel tempModel = list.get(0);
+                    if (tempModel != null && model.userId.equals(tempModel.userId)) {
+                        model.userAvatar = tempModel.userAvatar;
+                        model.userName = tempModel.userName;
+                    }
+                }
+                userLayout.setUserName(model.userName);
+                ImageLoader.loadImage(mContext, userLayout.getAvatarImage(), model.userAvatar,
+                        R.drawable.tuicalling_ic_avatar);
+            }
+
+            @Override
+            public void onFailed(int errorCode, String errorMsg) {
+            }
+        });
+    }
+
+    @Override
+    public void onNotifyEvent(String key, String subKey, Map<String, Object> param) {
+        if (param == null) {
+            return;
+        }
+        if (Constants.EVENT_TUICALLING_CHANGED.equals(key)) {
+            switch (subKey) {
+                case Constants.EVENT_SUB_CAMERA_OPEN:
+                    if (mSelfUserModel != null) {
+                        mSelfUserModel.isVideoAvailable = (boolean) param.get(Constants.OPEN_CAMERA);
+                    }
+                    break;
+                case Constants.EVENT_SUB_MIC_STATUS_CHANGED:
+                    if (mSelfUserModel != null) {
+                        mSelfUserModel.isAudioAvailable = ((Boolean) param.get(Constants.MUTE_MIC));
+                    }
+                    UserLayout layout = mUserLayoutFactory.findUserLayout(TUILogin.getLoginUser());
+                    if (null != layout) {
+                        layout.muteMic(mSelfUserModel.isAudioAvailable);
+                    }
+                    break;
+                case Constants.EVENT_SUB_CALL_STATUS_CHANGED:
+                    updateCallStatus((TUICallDefine.Status) param.get(Constants.CALL_STATUS));
+                    break;
+                case Constants.EVENT_SUB_CALL_TYPE_CHANGED:
+                    updateCallType((TUICallDefine.MediaType) param.get(Constants.CALL_MEDIA_TYPE));
+                    break;
+                default:
+                    break;
+            }
+        } else if (TUIConstants.TUIGroup.EVENT_GROUP.equals(key)) {
+            if (TUIConstants.TUIGroup.EVENT_SUB_KEY_GROUP_MEMBER_SELECTED.equals(subKey)) {
+                String userData = (String) param.get(TUIConstants.TUIGroup.USER_DATA);
+                if (!Constants.TUICALLKIT.equals(userData)) {
+                    return;
+                }
+                List<String> list = (List<String>) param.get(TUIConstants.TUIGroup.LIST);
+                inviteUsersToGroupCall(list);
+            }
+        }
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/UserLayoutFactory.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/UserLayoutFactory.java
new file mode 100644
index 0000000..21f06d6
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/UserLayoutFactory.java
@@ -0,0 +1,49 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.View;
+
+import com.tencent.qcloud.tuikit.tuicallkit.base.CallingUserModel;
+import com.tencent.qcloud.tuikit.tuicallkit.base.UserLayout;
+import com.tencent.qcloud.tuikit.tuicallkit.base.UserLayoutEntity;
+
+import java.util.LinkedList;
+
+public class UserLayoutFactory {
+    private Context                      mContext;
+    public  LinkedList<UserLayoutEntity> mLayoutEntityList = new LinkedList<>();
+
+    public UserLayoutFactory(Context context) {
+        mContext = context;
+    }
+
+    public UserLayout allocUserLayout(CallingUserModel model) {
+        if (null == model || TextUtils.isEmpty(model.userId)) {
+            return null;
+        }
+        UserLayout userLayout = findUserLayout(model.userId);
+        if (null != userLayout) {
+            return userLayout;
+        }
+        UserLayoutEntity layoutEntity = new UserLayoutEntity();
+        layoutEntity.userId = model.userId;
+        layoutEntity.userModel = model;
+        layoutEntity.layout = new UserLayout(mContext);
+        layoutEntity.layout.setVisibility(View.VISIBLE);
+        mLayoutEntityList.add(layoutEntity);
+        return layoutEntity.layout;
+    }
+
+    public UserLayout findUserLayout(String userId) {
+        if (TextUtils.isEmpty(userId)) {
+            return null;
+        }
+        for (UserLayoutEntity layoutEntity : mLayoutEntityList) {
+            if (userId.equals(layoutEntity.userId)) {
+                return layoutEntity.layout;
+            }
+        }
+        return null;
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/component/BaseUserView.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/component/BaseUserView.java
new file mode 100644
index 0000000..be53cdf
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/component/BaseUserView.java
@@ -0,0 +1,18 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.component;
+
+import android.content.Context;
+import android.widget.RelativeLayout;
+
+import com.tencent.qcloud.tuikit.tuicallkit.base.CallingUserModel;
+
+public abstract class BaseUserView extends RelativeLayout {
+    public BaseUserView(Context context) {
+        super(context);
+    }
+
+    public void updateUserInfo(CallingUserModel userModel) {
+    }
+
+    public void updateTextColor(int color) {
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/component/TUICallingSingleVideoUserView.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/component/TUICallingSingleVideoUserView.java
new file mode 100644
index 0000000..5ef1214
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/component/TUICallingSingleVideoUserView.java
@@ -0,0 +1,43 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.component;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.base.CallingUserModel;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.ImageLoader;
+
+public class TUICallingSingleVideoUserView extends BaseUserView {
+    private Context   mContext;
+    private ImageView mImageAvatar;
+    private TextView  mTextUserName;
+    private TextView  mTextVideoHint;
+    private String    mHintMessage;
+
+    public TUICallingSingleVideoUserView(Context context, String message) {
+        super(context);
+        mContext = context.getApplicationContext();
+        mHintMessage = message;
+        initView();
+    }
+
+    private void initView() {
+        LayoutInflater.from(mContext).inflate(R.layout.tuicalling_single_video_user_view, this);
+        mImageAvatar = findViewById(R.id.iv_user_avatar);
+        mTextUserName = findViewById(R.id.tv_user_name);
+        mTextVideoHint = findViewById(R.id.tv_video_tag);
+        mTextVideoHint.setText(mHintMessage);
+    }
+
+    @Override
+    public void updateUserInfo(CallingUserModel model) {
+        super.updateUserInfo(model);
+        if (null != model && !TextUtils.isEmpty(model.userId)) {
+            ImageLoader.loadImage(mContext, mImageAvatar, model.userAvatar, R.drawable.tuicalling_ic_avatar);
+            mTextUserName.setText(TextUtils.isEmpty(model.userName) ? model.userId : model.userName);
+        }
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/component/TUICallingUserView.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/component/TUICallingUserView.java
new file mode 100644
index 0000000..1150d1e
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/component/TUICallingUserView.java
@@ -0,0 +1,42 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.component;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.base.CallingUserModel;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.ImageLoader;
+
+public class TUICallingUserView extends BaseUserView {
+    private Context   mContext;
+    private ImageView mImageAvatar;
+    private TextView  mTextUserName;
+
+    public TUICallingUserView(Context context) {
+        super(context);
+        mContext = context.getApplicationContext();
+        initView();
+    }
+
+    private void initView() {
+        LayoutInflater.from(mContext).inflate(R.layout.tuicalling_user_view, this);
+        mImageAvatar = findViewById(R.id.img_avatar);
+        mTextUserName = findViewById(R.id.tv_name);
+    }
+
+    @Override
+    public void updateUserInfo(CallingUserModel model) {
+        super.updateUserInfo(model);
+        ImageLoader.loadImage(mContext, mImageAvatar, model.userAvatar, R.drawable.tuicalling_ic_avatar);
+        mTextUserName.setText(TextUtils.isEmpty(model.userName) ? model.userId : model.userName);
+    }
+
+    @Override
+    public void updateTextColor(int color) {
+        super.updateTextColor(color);
+        mTextUserName.setTextColor(color);
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/floatwindow/FloatCallView.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/floatwindow/FloatCallView.java
new file mode 100644
index 0000000..a4a7b72
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/floatwindow/FloatCallView.java
@@ -0,0 +1,171 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.floatwindow;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuikit.TUIVideoView;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.base.CallingUserModel;
+import com.tencent.qcloud.tuikit.tuicallkit.base.UserLayout;
+import com.tencent.qcloud.tuikit.tuicallkit.base.UserLayoutEntity;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.ImageLoader;
+import com.tencent.qcloud.tuikit.tuicallkit.view.UserLayoutFactory;
+
+import java.util.Objects;
+
+public class FloatCallView extends RelativeLayout {
+    private static final int UPDATE_COUNT         = 3;
+    private static final int UPDATE_INTERVAL      = 300;
+    private static final int MESSAGE_LAYOUT_EMPTY = 1;
+    private static final int MESSAGE_VIEW_EMPTY   = 2;
+    private              int mCount               = 0;
+
+    private final Context mContext;
+
+    private RelativeLayout mLayoutVideoView;
+    private ImageView      mImageAudio;
+    private TextView       mTextHint;
+    private TextView       mTextTime;
+    private ImageView      mImageFloatAvatar;
+
+    private OnClickListener   mOnClickListener;
+    private UserLayoutFactory mUserLayoutFactory;
+    private UserLayout        mVideoLayout;
+    private String            mCurrentUser;
+    private boolean           mIsVideoAvailable;
+
+    public FloatCallView(Context context, UserLayoutFactory factory) {
+        super(context);
+        mContext = context;
+        mUserLayoutFactory = factory;
+        initView(context);
+    }
+
+    private void initView(Context context) {
+        LayoutInflater.from(context).inflate(R.layout.tuicalling_floatwindow_layout, this);
+        mLayoutVideoView = findViewById(R.id.rl_video_view);
+        mImageFloatAvatar = findViewById(R.id.img_float_avatar);
+        mTextHint = findViewById(R.id.tv_float_hint);
+        mImageAudio = findViewById(R.id.float_audioView);
+        mTextTime = findViewById(R.id.tv_float_time);
+        setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (null != mOnClickListener) {
+                    mOnClickListener.onClick();
+                }
+            }
+        });
+    }
+
+    public void updateView(boolean isVideoAvailable, String userId) {
+        mIsVideoAvailable = isVideoAvailable;
+        if (!isVideoAvailable) {
+            mLayoutVideoView.setVisibility(GONE);
+            mImageFloatAvatar.setVisibility(GONE);
+            mImageAudio.setVisibility(VISIBLE);
+            return;
+        }
+
+        if (null == mUserLayoutFactory || TextUtils.isEmpty(userId)) {
+            return;
+        }
+
+        mCurrentUser = userId;
+        mImageAudio.setVisibility(GONE);
+
+        CallingUserModel model = new CallingUserModel();
+        for (UserLayoutEntity entity : mUserLayoutFactory.mLayoutEntityList) {
+            if (entity != null && Objects.equals(entity.userId, userId)) {
+                model = entity.userModel;
+                break;
+            }
+        }
+
+        if (model != null && !model.isVideoAvailable) {
+            mLayoutVideoView.removeAllViews();
+            mLayoutVideoView.setVisibility(GONE);
+            mImageFloatAvatar.setVisibility(VISIBLE);
+            ImageLoader.loadImage(mContext, mImageFloatAvatar, model.userAvatar, R.drawable.tuicalling_ic_avatar);
+            return;
+        }
+        mImageFloatAvatar.setVisibility(GONE);
+
+        mVideoLayout = mUserLayoutFactory.findUserLayout(userId);
+        if (null == mVideoLayout) {
+            mViewHandler.sendEmptyMessageDelayed(MESSAGE_LAYOUT_EMPTY, UPDATE_INTERVAL);
+            return;
+        }
+        reloadVideoView();
+    }
+
+    private void reloadVideoView() {
+        if (null == mVideoLayout) {
+            return;
+        }
+
+        TUIVideoView videoView = mVideoLayout.getVideoView();
+        if (videoView == null) {
+            mViewHandler.sendEmptyMessageDelayed(MESSAGE_VIEW_EMPTY, UPDATE_INTERVAL);
+            return;
+        }
+        if (null != videoView.getParent()) {
+            ((ViewGroup) videoView.getParent()).removeView(videoView);
+        }
+        mLayoutVideoView.removeAllViews();
+        mLayoutVideoView.setVisibility(VISIBLE);
+        mLayoutVideoView.addView(videoView);
+    }
+
+    private final Handler mViewHandler = new Handler(Looper.getMainLooper()) {
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            if (msg.what == MESSAGE_LAYOUT_EMPTY && null == mVideoLayout && mCount <= UPDATE_COUNT) {
+                mVideoLayout = mUserLayoutFactory.findUserLayout(mCurrentUser);
+                sendEmptyMessageDelayed(MESSAGE_LAYOUT_EMPTY, UPDATE_INTERVAL);
+                mCount++;
+            } else if (msg.what == MESSAGE_VIEW_EMPTY && mCount < UPDATE_COUNT) {
+                sendEmptyMessageDelayed(MESSAGE_VIEW_EMPTY, UPDATE_INTERVAL);
+                mCount++;
+            } else {
+                reloadVideoView();
+                mCount = 0;
+            }
+        }
+    };
+
+    public void enableCallingHint(boolean enable) {
+        mTextHint.setVisibility(enable ? VISIBLE : GONE);
+    }
+
+    public void updateCallTimeView(String time) {
+        if (mIsVideoAvailable) {
+            mTextTime.setVisibility(GONE);
+            return;
+        }
+        mTextTime.setText(time);
+        mTextTime.setVisibility(TextUtils.isEmpty(time) ? INVISIBLE : VISIBLE);
+    }
+
+    public void setOnClickListener(OnClickListener callback) {
+        mOnClickListener = callback;
+    }
+
+    public String getCurrentUser() {
+        return mCurrentUser;
+    }
+
+    public interface OnClickListener {
+        void onClick();
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/floatwindow/FloatWindowService.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/floatwindow/FloatWindowService.java
new file mode 100644
index 0000000..9b55d8f
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/floatwindow/FloatWindowService.java
@@ -0,0 +1,201 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.floatwindow;
+
+import android.animation.ValueAnimator;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.PixelFormat;
+import android.os.Binder;
+import android.os.Build;
+import android.os.IBinder;
+import android.view.Gravity;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.WindowManager;
+
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+
+public class FloatWindowService extends Service {
+    private static Intent        mStartIntent;
+    private static FloatCallView mCallView;
+    private static Context       mContext;
+
+    private WindowManager              mWindowManager;
+    private WindowManager.LayoutParams mWindowLayoutParams;
+
+    private int mScreenWidth;
+    private int mWidth;
+    private int mTouchStartX;
+    private int mTouchStartY;
+    private int mTouchCurrentX;
+    private int mTouchCurrentY;
+    private int mStartX;
+    private int mStartY;
+    private int mStopX;
+    private int mStopY;
+
+    private boolean mIsMove;
+
+    public static void startFloatService(Context context, FloatCallView callView) {
+        mContext = context;
+        mCallView = callView;
+        mStartIntent = new Intent(context, FloatWindowService.class);
+        context.startService(mStartIntent);
+    }
+
+    public static void stopService(Context context) {
+        if (null != mStartIntent) {
+            context.stopService(mStartIntent);
+        }
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        initWindow();
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return new FloatBinder();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        return super.onStartCommand(intent, flags, startId);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (null != mCallView) {
+            mWindowManager.removeView(mCallView);
+            mCallView = null;
+        }
+    }
+
+    private void initWindow() {
+        mWindowManager = (WindowManager) getApplicationContext().getSystemService(Context.WINDOW_SERVICE);
+        mWindowLayoutParams = getViewParams();
+        mScreenWidth = mWindowManager.getDefaultDisplay().getWidth();
+
+        if (null != mCallView) {
+            mCallView.setBackgroundResource(R.drawable.tuicalling_bg_floatwindow_left);
+            mWindowManager.addView(mCallView, mWindowLayoutParams);
+            mCallView.setOnTouchListener(new FloatingListener());
+        }
+    }
+
+    private WindowManager.LayoutParams getViewParams() {
+        mWindowLayoutParams = new WindowManager.LayoutParams();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            mWindowLayoutParams.type = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
+        } else {
+            mWindowLayoutParams.type = WindowManager.LayoutParams.TYPE_PHONE;
+        }
+        mWindowLayoutParams.flags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
+                | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+                | WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS;
+
+        mWindowLayoutParams.gravity = Gravity.LEFT | Gravity.TOP;
+        mWindowLayoutParams.x = 0;
+        mWindowLayoutParams.y = mWindowManager.getDefaultDisplay().getHeight() / 2;
+
+        mWindowLayoutParams.width = WindowManager.LayoutParams.WRAP_CONTENT;
+        mWindowLayoutParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
+        mWindowLayoutParams.format = PixelFormat.TRANSPARENT;
+
+        return mWindowLayoutParams;
+    }
+
+    public class FloatBinder extends Binder {
+        public FloatWindowService getService() {
+            return FloatWindowService.this;
+        }
+    }
+
+    private class FloatingListener implements View.OnTouchListener {
+        @Override
+        public boolean onTouch(View v, MotionEvent event) {
+            int action = event.getAction();
+            switch (action) {
+                case MotionEvent.ACTION_DOWN:
+                    mIsMove = false;
+                    mTouchStartX = (int) event.getRawX();
+                    mTouchStartY = (int) event.getRawY();
+
+                    mStartX = (int) event.getRawX();
+                    mStartY = (int) event.getRawY();
+                    break;
+                case MotionEvent.ACTION_MOVE:
+                    mTouchCurrentX = (int) event.getRawX();
+                    mTouchCurrentY = (int) event.getRawY();
+                    if (mWindowLayoutParams != null && null != mCallView) {
+                        mWindowLayoutParams.x += mTouchCurrentX - mTouchStartX;
+                        mWindowLayoutParams.y += mTouchCurrentY - mTouchStartY;
+                        mWindowManager.updateViewLayout(mCallView, mWindowLayoutParams);
+                    }
+                    mTouchStartX = mTouchCurrentX;
+                    mTouchStartY = mTouchCurrentY;
+                case MotionEvent.ACTION_UP:
+                    mStopX = (int) event.getRawX();
+                    mStopY = (int) event.getRawY();
+                    if (Math.abs(mStartX - mStopX) >= 5 || Math.abs(mStartY - mStopY) >= 5) {
+                        mIsMove = true;
+                        if (null != mCallView) {
+                            mWidth = mCallView.getWidth();
+                            if (mTouchCurrentX > (mScreenWidth / 2)) {
+                                startScroll(mStopX, mScreenWidth - mWidth, false);
+                            } else {
+                                startScroll(mStopX, 0, true);
+                            }
+                        }
+                    }
+                    break;
+                default:
+                    break;
+            }
+            return mIsMove;
+        }
+    }
+
+    private void startScroll(int start, int end, boolean isLeft) {
+        ValueAnimator valueAnimator = ValueAnimator.ofFloat(start, end).setDuration(300);
+        valueAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                if (mWindowLayoutParams == null || mCallView == null) {
+                    return;
+                }
+                mWidth = mCallView.getWidth();
+                if (isLeft) {
+                    mWindowLayoutParams.x = (int) (start * (1 - animation.getAnimatedFraction()));
+                    mCallView.setBackgroundResource(R.drawable.tuicalling_bg_floatwindow_left);
+                } else {
+                    float end = (mScreenWidth - start - mWidth) * animation.getAnimatedFraction();
+                    mWindowLayoutParams.x = (int) (start + end);
+                    mCallView.setBackgroundResource(R.drawable.tuicalling_bg_floatwindow_right);
+                }
+                calculateHeight();
+                mWindowManager.updateViewLayout(mCallView, mWindowLayoutParams);
+            }
+        });
+        valueAnimator.start();
+    }
+
+    private void calculateHeight() {
+        if (mWindowLayoutParams == null) {
+            return;
+        }
+        int height = mCallView.getHeight();
+        int screenHeight = mWindowManager.getDefaultDisplay().getHeight();
+        int resourceId = mContext.getResources().getIdentifier("status_bar_height",
+                "dimen", "android");
+        int statusBarHeight = mContext.getResources().getDimensionPixelSize(resourceId);
+        if (mWindowLayoutParams.y < 0) {
+            mWindowLayoutParams.y = 0;
+        } else if (mWindowLayoutParams.y > (screenHeight - height - statusBarHeight)) {
+            mWindowLayoutParams.y = screenHeight - height - statusBarHeight;
+        }
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/floatwindow/HomeWatcher.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/floatwindow/HomeWatcher.java
new file mode 100644
index 0000000..f2c3585
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/floatwindow/HomeWatcher.java
@@ -0,0 +1,71 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.floatwindow;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+
+public class HomeWatcher {
+    private Context               mContext;
+    private IntentFilter          mFilter;
+    private OnHomePressedListener mListener;
+    private InnerReceiver         mReceiver;
+    private boolean               mIsRegisted;
+
+    public HomeWatcher(Context context) {
+        mContext = context.getApplicationContext();
+        mFilter = new IntentFilter(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
+        mReceiver = new InnerReceiver();
+    }
+
+    public void setOnHomePressedListener(OnHomePressedListener listener) {
+        mListener = listener;
+    }
+
+    public void startWatch() {
+        if (null != mReceiver && !mIsRegisted) {
+            mContext.registerReceiver(mReceiver, mFilter);
+            mIsRegisted = true;
+        }
+    }
+
+    public void stopWatch() {
+        try {
+            if (null != mReceiver) {
+                mIsRegisted = false;
+                mContext.unregisterReceiver(mReceiver);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    class InnerReceiver extends BroadcastReceiver {
+        private static final String SYSTEM_DIALOG_REASON_KEY            = "reason";
+        private static final String SYSTEM_DIALOG_REASON_GLOBAL_ACTIONS = "globalactions";
+        private static final String SYSTEM_DIALOG_REASON_RECENT_APPS    = "recentapps";
+        private static final String SYSTEM_DIALOG_REASON_HOME_KEY       = "homekey";
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (action != null && action.equals(Intent.ACTION_CLOSE_SYSTEM_DIALOGS)) {
+                String reason = intent.getStringExtra(SYSTEM_DIALOG_REASON_KEY);
+                if (mListener != null) {
+                    if (SYSTEM_DIALOG_REASON_HOME_KEY.equals(reason)) {
+                        mListener.onHomePressed();
+                    } else if (SYSTEM_DIALOG_REASON_RECENT_APPS.equals(reason)) {
+                        mListener.onRecentAppsPressed();
+                    }
+                }
+            }
+        }
+    }
+
+    public interface OnHomePressedListener {
+        void onHomePressed();
+
+        void onRecentAppsPressed();
+    }
+}
+
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/BaseFunctionView.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/BaseFunctionView.java
new file mode 100644
index 0000000..070253b
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/BaseFunctionView.java
@@ -0,0 +1,73 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.function;
+
+import android.content.Context;
+import android.widget.RelativeLayout;
+
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.interfaces.ITUINotification;
+import com.tencent.qcloud.tuikit.TUICommonDefine;
+import com.tencent.qcloud.tuikit.tuicallkit.base.Constants;
+import com.tencent.qcloud.tuikit.tuicallkit.base.TUICallingAction;
+import com.tencent.qcloud.tuikit.tuicallkit.base.UserLayout;
+
+import java.util.Map;
+
+public abstract class BaseFunctionView extends RelativeLayout {
+    protected Context          mContext;
+    protected TUICallingAction mCallingAction;
+    protected UserLayout       mLocalUserLayout;
+
+    public BaseFunctionView(Context context) {
+        super(context);
+        mContext = context.getApplicationContext();
+        mCallingAction = new TUICallingAction(context);
+        registerEvent();
+    }
+
+    private void registerEvent() {
+        TUICore.registerEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_CAMERA_OPEN, mNotification);
+        TUICore.registerEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_MIC_STATUS_CHANGED,
+                mNotification);
+        TUICore.registerEvent(Constants.EVENT_TUICALLING_CHANGED, Constants.EVENT_SUB_AUDIOPLAYDEVICE_CHANGED,
+                mNotification);
+    }
+
+    private final ITUINotification mNotification = new ITUINotification() {
+        @Override
+        public void onNotifyEvent(String key, String subKey, Map<String, Object> param) {
+            if (Constants.EVENT_TUICALLING_CHANGED.equals(key) && param != null) {
+                switch (subKey) {
+                    case Constants.EVENT_SUB_CAMERA_OPEN:
+                        updateCameraOpenStatus((boolean) param.get(Constants.OPEN_CAMERA));
+                        break;
+                    case Constants.EVENT_SUB_MIC_STATUS_CHANGED:
+                        updateMicMuteStatus((Boolean) param.get(Constants.MUTE_MIC));
+                        break;
+                    case Constants.EVENT_SUB_AUDIOPLAYDEVICE_CHANGED:
+                        TUICommonDefine.AudioPlaybackDevice device =
+                                (TUICommonDefine.AudioPlaybackDevice) param.get(Constants.HANDS_FREE);
+                        updateAudioPlayDevice(TUICommonDefine.AudioPlaybackDevice.Speakerphone.equals(device));
+                        break;
+                    default:
+                        break;
+                }
+            }
+        }
+    };
+
+    public void updateCameraOpenStatus(boolean isOpen) {
+    }
+
+    public void updateMicMuteStatus(boolean isMicMute) {
+    }
+
+    public void updateAudioPlayDevice(boolean isSpeaker) {
+    }
+
+    public void updateTextColor(int color) {
+    }
+
+    public void setLocalUserLayout(UserLayout layout) {
+        mLocalUserLayout = layout;
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingAudioFunctionView.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingAudioFunctionView.java
new file mode 100644
index 0000000..f1df83b
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingAudioFunctionView.java
@@ -0,0 +1,94 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.function;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.TUICommonDefine;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.base.TUICallingStatusManager;
+
+public class TUICallingAudioFunctionView extends BaseFunctionView {
+    private LinearLayout mLayoutMute;
+    private LinearLayout mLayoutHangup;
+    private LinearLayout mLayoutHandsFree;
+    private ImageView    mImageMute;
+    private ImageView    mImageHandsFree;
+
+    public TUICallingAudioFunctionView(Context context) {
+        super(context);
+        initView();
+        initListener();
+    }
+
+    private void initView() {
+        LayoutInflater.from(mContext).inflate(R.layout.tuicalling_funcation_view_audio, this);
+        mLayoutMute = findViewById(R.id.ll_mute);
+        mImageMute = findViewById(R.id.img_mute);
+        mLayoutHangup = findViewById(R.id.ll_hangup);
+        mLayoutHandsFree = findViewById(R.id.ll_handsfree);
+        mImageHandsFree = findViewById(R.id.img_handsfree);
+    }
+
+    private void initListener() {
+        mLayoutMute.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                boolean isMicMute = TUICallingStatusManager.sharedInstance(mContext).isMicMute();
+                if (isMicMute) {
+                    mCallingAction.openMicrophone(new TUICommonDefine.Callback() {
+                        @Override
+                        public void onSuccess() {
+
+                        }
+
+                        @Override
+                        public void onError(int errCode, String errMsg) {
+
+                        }
+                    });
+                } else {
+                    mCallingAction.closeMicrophone();
+                }
+                int resId = isMicMute ? R.string.tuicalling_toast_disable_mute : R.string.tuicalling_toast_enable_mute;
+                ToastUtil.toastShortMessage(mContext.getString(resId));
+            }
+        });
+        mLayoutHangup.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mCallingAction.hangup(null);
+            }
+        });
+
+        mLayoutHandsFree.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                boolean isSpeaker = TUICommonDefine.AudioPlaybackDevice.Speakerphone
+                        .equals(TUICallingStatusManager.sharedInstance(mContext).getAudioPlaybackDevice());
+                if (isSpeaker) {
+                    mCallingAction.selectAudioPlaybackDevice(TUICommonDefine.AudioPlaybackDevice.Earpiece);
+                } else {
+                    mCallingAction.selectAudioPlaybackDevice(TUICommonDefine.AudioPlaybackDevice.Speakerphone);
+                }
+                int resId = isSpeaker ? R.string.tuicalling_toast_use_handset : R.string.tuicalling_toast_speaker;
+                ToastUtil.toastShortMessage(mContext.getString(resId));
+            }
+        });
+    }
+
+    @Override
+    public void updateMicMuteStatus(boolean isMicMute) {
+        super.updateMicMuteStatus(isMicMute);
+        mImageMute.setActivated(isMicMute);
+    }
+
+    @Override
+    public void updateAudioPlayDevice(boolean isSpeaker) {
+        super.updateAudioPlayDevice(isSpeaker);
+        mImageHandsFree.setActivated(isSpeaker);
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingSwitchAudioView.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingSwitchAudioView.java
new file mode 100644
index 0000000..0c4bcbf
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingSwitchAudioView.java
@@ -0,0 +1,32 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.function;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.base.TUICallingAction;
+
+public class TUICallingSwitchAudioView extends BaseFunctionView {
+    private final Context mContext;
+
+    public TUICallingSwitchAudioView(Context context) {
+        super(context);
+        mContext = context.getApplicationContext();
+        initView();
+    }
+
+    private void initView() {
+        LayoutInflater.from(mContext).inflate(R.layout.tuicalling_switch_audio_view, this);
+        LinearLayout layoutSwitchToAudio = findViewById(R.id.ll_switch_audio);
+        layoutSwitchToAudio.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                TUICallingAction callingAction = new TUICallingAction(mContext);
+                callingAction.switchCallMediaType(TUICallDefine.MediaType.Audio);
+            }
+        });
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingVideoFunctionView.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingVideoFunctionView.java
new file mode 100644
index 0000000..e9585cf
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingVideoFunctionView.java
@@ -0,0 +1,142 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.function;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.TUICommonDefine;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.base.TUICallingStatusManager;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.ImageLoader;
+
+public class TUICallingVideoFunctionView extends BaseFunctionView {
+    private LinearLayout mLayoutOpenCamera;
+    private LinearLayout mLayoutMute;
+    private LinearLayout mLayoutHandsFree;
+    private LinearLayout mLayoutHangup;
+    private ImageView    mImageOpenCamera;
+    private ImageView    mImageMute;
+    private ImageView    mImageHandsFree;
+    private ImageView    mImageSwitchCamera;
+
+    public TUICallingVideoFunctionView(Context context) {
+        super(context);
+        initView();
+        initClickListener();
+    }
+
+    private void initView() {
+        LayoutInflater.from(mContext).inflate(R.layout.tuicalling_funcation_view_video, this);
+        mLayoutMute = (LinearLayout) findViewById(R.id.ll_mute);
+        mImageMute = (ImageView) findViewById(R.id.iv_mute);
+        mLayoutHandsFree = (LinearLayout) findViewById(R.id.ll_handsfree);
+        mImageHandsFree = (ImageView) findViewById(R.id.iv_handsfree);
+        mLayoutOpenCamera = (LinearLayout) findViewById(R.id.ll_open_camera);
+        mImageOpenCamera = (ImageView) findViewById(R.id.img_camera);
+        mLayoutHangup = (LinearLayout) findViewById(R.id.ll_hangup);
+        mImageSwitchCamera = (ImageView) findViewById(R.id.switch_camera);
+    }
+
+    private void initClickListener() {
+        mLayoutMute.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                boolean isMicMute = TUICallingStatusManager.sharedInstance(mContext).isMicMute();
+                if (isMicMute) {
+                    mCallingAction.openMicrophone(new TUICommonDefine.Callback() {
+                        @Override
+                        public void onSuccess() {
+
+                        }
+
+                        @Override
+                        public void onError(int errCode, String errMsg) {
+
+                        }
+                    });
+                } else {
+                    mCallingAction.closeMicrophone();
+                }
+                int resId = isMicMute ? R.string.tuicalling_toast_disable_mute : R.string.tuicalling_toast_enable_mute;
+                ToastUtil.toastShortMessage(mContext.getString(resId));
+            }
+        });
+        mLayoutHandsFree.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                boolean isSpeaker = TUICommonDefine.AudioPlaybackDevice.Speakerphone
+                        .equals(TUICallingStatusManager.sharedInstance(mContext).getAudioPlaybackDevice());
+                if (isSpeaker) {
+                    mCallingAction.selectAudioPlaybackDevice(TUICommonDefine.AudioPlaybackDevice.Earpiece);
+                } else {
+                    mCallingAction.selectAudioPlaybackDevice(TUICommonDefine.AudioPlaybackDevice.Speakerphone);
+                }
+                int resId = isSpeaker ? R.string.tuicalling_toast_use_handset : R.string.tuicalling_toast_speaker;
+                ToastUtil.toastShortMessage(mContext.getString(resId));
+            }
+        });
+        mLayoutOpenCamera.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (TUICallingStatusManager.sharedInstance(mContext).isCameraOpen()) {
+                    mCallingAction.closeCamera();
+                    if (null != mLocalUserLayout) {
+                        mLocalUserLayout.setVideoAvailable(false);
+                        ImageLoader.loadImage(mContext, mLocalUserLayout.getAvatarImage(), TUILogin.getFaceUrl(),
+                                R.drawable.tuicalling_ic_avatar);
+                    }
+                    ToastUtil.toastShortMessage(mContext.getString(R.string.tuicalling_toast_disable_camera));
+                } else {
+                    if (null != mLocalUserLayout) {
+                        mCallingAction.openCamera(TUICallingStatusManager.sharedInstance(mContext).getFrontCamera(),
+                                mLocalUserLayout.getVideoView(), null);
+                        mLocalUserLayout.setVideoAvailable(true);
+                        ToastUtil.toastShortMessage(mContext.getString(R.string.tuicalling_toast_enable_camera));
+                    }
+                }
+            }
+        });
+
+        mImageSwitchCamera.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                TUICommonDefine.Camera camera = TUICallingStatusManager.sharedInstance(mContext).getFrontCamera();
+                mCallingAction.switchCamera(TUICommonDefine.Camera.Front.equals(camera)
+                        ? TUICommonDefine.Camera.Back : TUICommonDefine.Camera.Front);
+                ToastUtil.toastShortMessage(mContext.getString(R.string.tuicalling_toast_switch_camera));
+            }
+        });
+
+        mLayoutHangup.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mCallingAction.hangup(null);
+            }
+        });
+    }
+
+    @Override
+    public void updateCameraOpenStatus(boolean isOpen) {
+        super.updateCameraOpenStatus(isOpen);
+        mImageOpenCamera.setActivated(isOpen);
+        if (null != mLocalUserLayout) {
+            mLocalUserLayout.setVideoAvailable(isOpen);
+        }
+    }
+
+    @Override
+    public void updateMicMuteStatus(boolean isMicMute) {
+        super.updateMicMuteStatus(isMicMute);
+        mImageMute.setActivated(isMicMute);
+    }
+
+    @Override
+    public void updateAudioPlayDevice(boolean isSpeaker) {
+        super.updateAudioPlayDevice(isSpeaker);
+        mImageHandsFree.setActivated(isSpeaker);
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingVideoInviteFunctionView.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingVideoInviteFunctionView.java
new file mode 100644
index 0000000..927122c
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingVideoInviteFunctionView.java
@@ -0,0 +1,48 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.function;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.TUICommonDefine;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.base.TUICallingStatusManager;
+
+public class TUICallingVideoInviteFunctionView extends BaseFunctionView {
+    private LinearLayout mLayoutCancel;
+    private ImageView    mImageSwitchCamera;
+
+    public TUICallingVideoInviteFunctionView(Context context) {
+        super(context);
+        initView();
+        initClickListener();
+    }
+
+    private void initView() {
+        LayoutInflater.from(mContext).inflate(R.layout.tuicalling_funcation_view_video_inviting, this);
+        mLayoutCancel = findViewById(R.id.ll_cancel);
+        mImageSwitchCamera = findViewById(R.id.img_switch_camera);
+    }
+
+    private void initClickListener() {
+        mLayoutCancel.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mCallingAction.hangup(null);
+            }
+        });
+
+        mImageSwitchCamera.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                TUICommonDefine.Camera camera = TUICallingStatusManager.sharedInstance(mContext).getFrontCamera();
+                mCallingAction.switchCamera(TUICommonDefine.Camera.Front.equals(camera)
+                        ? TUICommonDefine.Camera.Back : TUICommonDefine.Camera.Front);
+                ToastUtil.toastShortMessage(mContext.getString(R.string.tuicalling_toast_switch_camera));
+            }
+        });
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingWaitFunctionView.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingWaitFunctionView.java
new file mode 100644
index 0000000..f1c2f86
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/function/TUICallingWaitFunctionView.java
@@ -0,0 +1,52 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.function;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+
+public class TUICallingWaitFunctionView extends BaseFunctionView {
+    private LinearLayout mLayoutReject;
+    private LinearLayout mLayoutDialing;
+    private TextView     mTextReject;
+    private TextView     mTextDialing;
+
+    public TUICallingWaitFunctionView(Context context) {
+        super(context);
+        initView();
+        initListener();
+    }
+
+    private void initView() {
+        LayoutInflater.from(mContext).inflate(R.layout.tuicalling_funcation_view_audio_waiting, this);
+        mLayoutReject = findViewById(R.id.ll_decline);
+        mLayoutDialing = findViewById(R.id.ll_answer);
+        mTextReject = findViewById(R.id.tv_reject);
+        mTextDialing = findViewById(R.id.tv_dialing);
+    }
+
+    private void initListener() {
+        mLayoutReject.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mCallingAction.reject(null);
+            }
+        });
+
+        mLayoutDialing.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mCallingAction.accept(null);
+            }
+        });
+    }
+
+    @Override
+    public void updateTextColor(int color) {
+        mTextReject.setTextColor(color);
+        mTextDialing.setTextColor(color);
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/root/BaseCallView.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/root/BaseCallView.java
new file mode 100644
index 0000000..26452a5
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/root/BaseCallView.java
@@ -0,0 +1,77 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.root;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.RelativeLayout;
+
+import com.tencent.qcloud.tuikit.tuicallkit.base.CallingUserModel;
+import com.tencent.qcloud.tuikit.tuicallkit.base.TUICallingAction;
+
+public abstract class BaseCallView extends RelativeLayout {
+    protected Context          mContext;
+    protected TUICallingAction mCallingAction;
+
+    public BaseCallView(Context context) {
+        super(context);
+        mContext = context;
+        mCallingAction = new TUICallingAction(context);
+    }
+
+    public void userEnter(CallingUserModel userModel) {
+    }
+
+    public void userAdd(CallingUserModel userModel) {
+    }
+
+    public void userLeave(CallingUserModel userModel) {
+    }
+
+    public void updateUserInfo(CallingUserModel userModel) {
+    }
+
+    public void updateCallingHint(String hint) {
+    }
+
+    public void updateCallTimeView(String time) {
+    }
+
+    public void updateUserView(View view) {
+    }
+
+    public void updateFunctionView(View view) {
+    }
+
+    public void updateSwitchAudioView(View view) {
+    }
+
+    public void addOtherUserView(View view) {
+    }
+
+    public void enableFloatView(View view) {
+    }
+
+    public void enableAddUserView(View view) {
+    }
+
+    public void updateBackgroundColor(int color) {
+    }
+
+    public void updateTextColor(int color) {
+    }
+
+    public void finish() {
+        clearAllViews();
+        removeAllViews();
+        detachAllViewsFromParent();
+        onDetachedFromWindow();
+    }
+
+    public void clearAllViews() {
+        updateCallingHint("");
+        updateCallTimeView(null);
+        updateUserView(null);
+        updateFunctionView(null);
+        updateSwitchAudioView(null);
+        addOtherUserView(null);
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/root/TUICallingGroupView.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/root/TUICallingGroupView.java
new file mode 100644
index 0000000..fe53f2e
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/root/TUICallingGroupView.java
@@ -0,0 +1,351 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.root;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuikit.TUICommonDefine;
+import com.tencent.qcloud.tuikit.tuicallengine.TUICallDefine;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.base.CallingUserModel;
+import com.tencent.qcloud.tuikit.tuicallkit.base.Constants;
+import com.tencent.qcloud.tuikit.tuicallkit.base.TUICallingStatusManager;
+import com.tencent.qcloud.tuikit.tuicallkit.base.UserLayout;
+import com.tencent.qcloud.tuikit.tuicallkit.base.UserLayoutEntity;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.DeviceUtils;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.DisplayUtils;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.ImageLoader;
+import com.tencent.qcloud.tuikit.tuicallkit.view.UserLayoutFactory;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+public class TUICallingGroupView extends BaseCallView {
+    private TextView          mTextCallHint;
+    private RelativeLayout    mLayoutFunction;
+    private TextView          mTextTime;
+    private UserLayoutFactory mUserLayoutFactory;
+    private View              mRootView;
+    private RelativeLayout    mLayoutFloatView;
+    private RelativeLayout    mLayoutAddUserView;
+    private RelativeLayout    mLayoutGroupManager;
+
+    private int     mCount     = 0;
+    private boolean mInitParam = false;
+
+    private ArrayList<LayoutParams> mGrid1ParamList;
+    private ArrayList<LayoutParams> mGrid2ParamList;
+    private ArrayList<LayoutParams> mGrid3ParamList;
+    private ArrayList<LayoutParams> mGrid4ParamList;
+    private ArrayList<LayoutParams> mGrid9ParamList;
+
+    public TUICallingGroupView(Context context, UserLayoutFactory factory) {
+        super(context);
+        mUserLayoutFactory = factory;
+        initView();
+        initData();
+    }
+
+    public void initView() {
+        mRootView = LayoutInflater.from(mContext).inflate(R.layout.tuicalling_background_group_view, this);
+        mLayoutGroupManager = findViewById(R.id.group_layout_manager);
+        mLayoutFloatView = findViewById(R.id.rl_float_view);
+        mLayoutAddUserView = findViewById(R.id.rl_add_user_view);
+        mTextCallHint = findViewById(R.id.tv_group_call_hint);
+        mTextTime = findViewById(R.id.tv_group_time);
+        mLayoutFunction = findViewById(R.id.rl_group_function);
+    }
+
+    private void initData() {
+        for (UserLayoutEntity entity : mUserLayoutFactory.mLayoutEntityList) {
+            if (null == entity || TextUtils.isEmpty(entity.userId)) {
+                continue;
+            }
+            UserLayout layout = allocUserLayout(entity.userModel);
+            TUICallDefine.MediaType mediaType = TUICallingStatusManager.sharedInstance(mContext).getMediaType();
+            if (entity.userId.equals(TUILogin.getLoginUser())) {
+                if (TUICallDefine.MediaType.Video.equals(mediaType)) {
+                    layout.setVideoAvailable(true);
+                    TUICommonDefine.Camera camera = TUICallingStatusManager.sharedInstance(mContext).getFrontCamera();
+                    mCallingAction.openCamera(camera, layout.getVideoView(), null);
+                } else {
+                    ImageLoader.loadImage(mContext, entity.layout.getAvatarImage(), TUILogin.getFaceUrl(),
+                            R.drawable.tuicalling_ic_avatar);
+                    entity.layout.setUserName(TUILogin.getNickName());
+                }
+            } else {
+                if (null != entity.userModel) {
+                    if (TUICallDefine.MediaType.Video.equals(mediaType) && entity.userModel.isVideoAvailable) {
+                        layout.setVideoAvailable(true);
+                        mCallingAction.startRemoteView(entity.userId, layout.getVideoView(),
+                                new TUICommonDefine.PlayCallback() {
+                                    @Override
+                                    public void onPlaying(String userId) {
+
+                                    }
+
+                                    @Override
+                                    public void onLoading(String userId) {
+
+                                    }
+
+                                    @Override
+                                    public void onError(String userId, int errCode, String errMsg) {
+
+                                    }
+                                });
+                    }
+                    ImageLoader.loadImage(mContext, entity.layout.getAvatarImage(), entity.userModel.userAvatar,
+                            R.drawable.tuicalling_ic_avatar);
+                    entity.layout.setUserName(entity.userModel.userName);
+                    if (entity.userModel.isEnter) {
+                        entity.layout.stopLoading();
+                    } else {
+                        entity.layout.startLoading();
+                    }
+                }
+            }
+        }
+    }
+
+    @Override
+    public void userEnter(CallingUserModel userModel) {
+        super.userEnter(userModel);
+        UserLayout layout = mUserLayoutFactory.findUserLayout(userModel.userId);
+        if (null == layout) {
+            layout = allocUserLayout(userModel);
+        }
+        if (layout == null) {
+            return;
+        }
+        layout.stopLoading();
+        TUICallDefine.MediaType mediaType = TUICallingStatusManager.sharedInstance(mContext).getMediaType();
+        if (TUICallDefine.MediaType.Video.equals(mediaType)) {
+            layout.setVideoAvailable(true);
+            mCallingAction.startRemoteView(userModel.userId, layout.getVideoView(),
+                    new TUICommonDefine.PlayCallback() {
+                        @Override
+                        public void onPlaying(String userId) {
+                        }
+
+                        @Override
+                        public void onLoading(String userId) {
+                        }
+
+                        @Override
+                        public void onError(String userId, int errCode, String errMsg) {
+                        }
+                    });
+        }
+    }
+
+    @Override
+    public void userAdd(CallingUserModel userModel) {
+        super.userAdd(userModel);
+        UserLayout layout = mUserLayoutFactory.findUserLayout(userModel.userId);
+        if (null == layout) {
+            layout = allocUserLayout(userModel);
+        }
+        if (layout == null) {
+            return;
+        }
+        layout.startLoading();
+        TUICallDefine.MediaType mediaType = TUICallingStatusManager.sharedInstance(mContext).getMediaType();
+        if (TUICallDefine.MediaType.Video.equals(mediaType)) {
+            mCallingAction.startRemoteView(userModel.userId, layout.getVideoView(),
+                    new TUICommonDefine.PlayCallback() {
+                        @Override
+                        public void onPlaying(String userId) {
+                        }
+
+                        @Override
+                        public void onLoading(String userId) {
+                        }
+
+                        @Override
+                        public void onError(String userId, int errCode, String errMsg) {
+                        }
+                    });
+        }
+    }
+
+    @Override
+    public void userLeave(CallingUserModel userModel) {
+        super.userLeave(userModel);
+        if (null != userModel) {
+            recyclerUserLayout(userModel.userId);
+            mCallingAction.stopRemoteView(userModel.userId);
+        }
+    }
+
+    @Override
+    public void updateUserInfo(CallingUserModel userModel) {
+        super.updateUserInfo(userModel);
+        UserLayout userLayout = mUserLayoutFactory.findUserLayout(userModel.userId);
+        if (null != userLayout) {
+            userLayout.setVideoAvailable(userModel.isVideoAvailable);
+        }
+    }
+
+    @Override
+    public void updateCallingHint(String hint) {
+        super.updateCallingHint(hint);
+        mTextCallHint.setText(hint);
+        mTextCallHint.setVisibility(TextUtils.isEmpty(hint) ? GONE : VISIBLE);
+    }
+
+    @Override
+    public void updateCallTimeView(String time) {
+        mTextTime.setText(time);
+        mTextTime.setVisibility(TextUtils.isEmpty(time) ? GONE : VISIBLE);
+    }
+
+    @Override
+    public void updateFunctionView(View view) {
+        mLayoutFunction.removeAllViews();
+        if (null != view) {
+            mLayoutFunction.addView(view);
+        }
+    }
+
+    @Override
+    public void updateBackgroundColor(int color) {
+        mRootView.setBackgroundColor(color);
+    }
+
+    @Override
+    public void updateTextColor(int color) {
+        super.updateTextColor(color);
+        mTextCallHint.setTextColor(color);
+        mTextTime.setTextColor(color);
+    }
+
+    @Override
+    public void enableFloatView(View view) {
+        mLayoutFloatView.removeAllViews();
+        if (null != view) {
+            mLayoutFloatView.addView(view);
+        }
+    }
+
+    @Override
+    public void enableAddUserView(View view) {
+        mLayoutAddUserView.removeAllViews();
+        if (null != view) {
+            mLayoutAddUserView.addView(view);
+        }
+    }
+
+    @Override
+    public void finish() {
+        if (null != mLayoutGroupManager) {
+            recyclerAllUserLayout();
+        }
+        super.finish();
+    }
+
+    private UserLayout allocUserLayout(CallingUserModel userModel) {
+        if (null == userModel || TextUtils.isEmpty(userModel.userId)) {
+            return null;
+        }
+        if (mCount > Constants.MAX_USER) {
+            return null;
+        }
+        UserLayout userLayout = mUserLayoutFactory.allocUserLayout(userModel);
+        if (null != userLayout.getParent()) {
+            ((ViewGroup) userLayout.getParent()).removeView(userLayout);
+        }
+        mLayoutGroupManager.addView(userLayout);
+        mCount++;
+        post(new Runnable() {
+            @Override
+            public void run() {
+                makeGirdLayout(true);
+            }
+        });
+        return userLayout;
+    }
+
+    private void recyclerUserLayout(String userId) {
+        if (TextUtils.isEmpty(userId)) {
+            return;
+        }
+        Iterator iterator = mUserLayoutFactory.mLayoutEntityList.iterator();
+        while (iterator.hasNext()) {
+            UserLayoutEntity item = (UserLayoutEntity) iterator.next();
+            if (userId.equals(item.userId)) {
+                mLayoutGroupManager.removeView(item.layout);
+                iterator.remove();
+                mCount--;
+                break;
+            }
+        }
+        post(new Runnable() {
+            @Override
+            public void run() {
+                makeGirdLayout(true);
+            }
+        });
+    }
+
+    private void recyclerAllUserLayout() {
+        if (null == mUserLayoutFactory) {
+            return;
+        }
+        Iterator iterator = mUserLayoutFactory.mLayoutEntityList.iterator();
+        while (iterator.hasNext()) {
+            UserLayoutEntity item = (UserLayoutEntity) iterator.next();
+            mLayoutGroupManager.removeView(item.layout);
+            iterator.remove();
+        }
+        mCount = 0;
+    }
+
+    private void makeGirdLayout(boolean needUpdate) {
+        if (!mInitParam) {
+            int width = DeviceUtils.getScreenWidth(mContext);
+            int height = DeviceUtils.getScreenHeight(mContext);
+            int size = Math.min(width, height);
+            mGrid1ParamList = DisplayUtils.initGrid1Param(getContext(), size, size);
+            mGrid2ParamList = DisplayUtils.initGrid2Param(getContext(), size, size);
+            mGrid3ParamList = DisplayUtils.initGrid3Param(getContext(), size, size);
+            mGrid4ParamList = DisplayUtils.initGrid4Param(getContext(), size, size);
+            mGrid9ParamList = DisplayUtils.initGrid9Param(getContext(), size, size);
+            mInitParam = true;
+        }
+        if (null == mUserLayoutFactory || mUserLayoutFactory.mLayoutEntityList.isEmpty()) {
+            return;
+        }
+        if (needUpdate) {
+            ArrayList<LayoutParams> paramList;
+            if (mCount <= 1) {
+                paramList = mGrid1ParamList;
+                UserLayoutEntity entity = mUserLayoutFactory.mLayoutEntityList.get(0);
+                entity.layout.setLayoutParams(paramList.get(0));
+                return;
+            } else if (mCount == 2) {
+                paramList = mGrid2ParamList;
+            } else if (mCount == 3) {
+                paramList = mGrid3ParamList;
+            } else if (mCount == 4) {
+                paramList = mGrid4ParamList;
+            } else {
+                paramList = mGrid9ParamList;
+            }
+            int layoutIndex = TextUtils.isEmpty(TUILogin.getLoginUser()) ? 0 : 1;
+            for (int i = 0; i < mUserLayoutFactory.mLayoutEntityList.size(); i++) {
+                UserLayoutEntity entity = mUserLayoutFactory.mLayoutEntityList.get(i);
+                if (entity.userId.equals(TUILogin.getLoginUser())) {
+                    entity.layout.setLayoutParams(paramList.get(0));
+                } else if (layoutIndex < paramList.size()) {
+                    entity.layout.setLayoutParams(paramList.get(layoutIndex++));
+                }
+            }
+        }
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/root/TUICallingImageView.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/root/TUICallingImageView.java
new file mode 100644
index 0000000..3c274bb
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/root/TUICallingImageView.java
@@ -0,0 +1,107 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.root;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+
+public class TUICallingImageView extends BaseCallView {
+    private Context        mContext;
+    private RelativeLayout mLayoutUserView;
+    private LinearLayout   mLayoutOtherUserContainer;
+    private RelativeLayout mLayoutFunction;
+    private TextView       mTextTime;
+    private TextView       mTextCallHint;
+    private View           mRootView;
+    private RelativeLayout mLayoutFloatView;
+    private RelativeLayout mLayoutAddUserView;
+
+    public TUICallingImageView(Context context) {
+        super(context);
+        mContext = context;
+        initView();
+    }
+
+    public void initView() {
+        mRootView = LayoutInflater.from(mContext).inflate(R.layout.tuicalling_background_image_view, this);
+        mLayoutFloatView = findViewById(R.id.rl_float_view);
+        mLayoutAddUserView = findViewById(R.id.rl_add_user_view);
+        mLayoutUserView = findViewById(R.id.rl_single_audio_view);
+        mTextCallHint = findViewById(R.id.tv_call_hint);
+        mLayoutOtherUserContainer = findViewById(R.id.ll_other_user_container);
+        mTextTime = findViewById(R.id.tv_image_time);
+        mLayoutFunction = findViewById(R.id.rl_image_function);
+    }
+
+    @Override
+    public void updateUserView(View view) {
+        super.updateUserView(view);
+        mLayoutUserView.removeAllViews();
+        if (null != view) {
+            mLayoutUserView.addView(view);
+        }
+    }
+
+    @Override
+    public void addOtherUserView(View view) {
+        super.addOtherUserView(view);
+        mLayoutOtherUserContainer.removeAllViews();
+        if (null != view) {
+            mLayoutOtherUserContainer.addView(view);
+        }
+    }
+
+    @Override
+    public void updateCallingHint(String hint) {
+        super.updateCallingHint(hint);
+        mTextCallHint.setText(hint);
+        mTextCallHint.setVisibility(TextUtils.isEmpty(hint) ? GONE : VISIBLE);
+    }
+
+    @Override
+    public void updateCallTimeView(String time) {
+        mTextTime.setText(time);
+        mTextTime.setVisibility(TextUtils.isEmpty(time) ? GONE : VISIBLE);
+    }
+
+    @Override
+    public void updateFunctionView(View view) {
+        mLayoutFunction.removeAllViews();
+        if (null != view) {
+            mLayoutFunction.addView(view);
+        }
+    }
+
+    @Override
+    public void updateBackgroundColor(int color) {
+        mRootView.setBackgroundColor(color);
+    }
+
+    @Override
+    public void updateTextColor(int color) {
+        super.updateTextColor(color);
+        mTextCallHint.setTextColor(color);
+        mTextTime.setTextColor(color);
+    }
+
+    @Override
+    public void enableFloatView(View view) {
+        mLayoutFloatView.removeAllViews();
+        if (null != view) {
+            mLayoutFloatView.addView(view);
+        }
+    }
+
+    @Override
+    public void enableAddUserView(View view) {
+        mLayoutAddUserView.removeAllViews();
+        if (null != view) {
+            mLayoutAddUserView.addView(view);
+        }
+    }
+}
diff --git a/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/root/TUICallingSingleView.java b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/root/TUICallingSingleView.java
new file mode 100644
index 0000000..e63cbfc
--- /dev/null
+++ b/system/tuicallkit/src/main/java/com/tencent/qcloud/tuikit/tuicallkit/view/root/TUICallingSingleView.java
@@ -0,0 +1,291 @@
+package com.tencent.qcloud.tuikit.tuicallkit.view.root;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.GestureDetector;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuikit.TUICommonDefine;
+import com.tencent.qcloud.tuikit.tuicallkit.R;
+import com.tencent.qcloud.tuikit.tuicallkit.base.CallingUserModel;
+import com.tencent.qcloud.tuikit.tuicallkit.base.TUICallingStatusManager;
+import com.tencent.qcloud.tuikit.tuicallkit.base.UserLayout;
+import com.tencent.qcloud.tuikit.tuicallkit.base.UserLayoutEntity;
+import com.tencent.qcloud.tuikit.tuicallkit.utils.DisplayUtils;
+import com.tencent.qcloud.tuikit.tuicallkit.view.UserLayoutFactory;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+
+public class TUICallingSingleView extends BaseCallView {
+    private Context           mContext;
+    private UserLayoutFactory mUserLayoutFactory;
+    private TextView          mTextTime;
+    private RelativeLayout    mLayoutUserWaitView;
+    private RelativeLayout    mLayoutSwitchAudio;
+    private RelativeLayout    mLayoutFunction;
+    private RelativeLayout    mLayoutFloatView;
+    private RelativeLayout    mLayoutUserContainer;
+
+    private ArrayList<LayoutParams> mFloatParamList;
+    private int                     mCount = 0;
+
+    public TUICallingSingleView(Context context, UserLayoutFactory factory) {
+        super(context);
+        mContext = context.getApplicationContext();
+        mUserLayoutFactory = factory;
+        initView();
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        initData();
+    }
+
+    public void initView() {
+        LayoutInflater.from(mContext).inflate(R.layout.tuicalling_background_single_view, this);
+        mLayoutUserContainer = findViewById(R.id.rl_video_container);
+        mLayoutFloatView = findViewById(R.id.rl_float_view);
+        mLayoutUserWaitView = findViewById(R.id.rl_single_video_user);
+        mLayoutSwitchAudio = findViewById(R.id.rl_switch_audio);
+        mTextTime = findViewById(R.id.tv_single_time);
+        mLayoutFunction = findViewById(R.id.rl_single_function);
+    }
+
+    private void initData() {
+        for (UserLayoutEntity entity : mUserLayoutFactory.mLayoutEntityList) {
+            if (null != entity && !TextUtils.isEmpty(entity.userId) && entity.userId.equals(TUILogin.getLoginUser())) {
+                UserLayout layout = allocUserLayout(entity.userModel);
+                if (layout == null) {
+                    continue;
+                }
+                layout.setVideoAvailable(true);
+                if (!TUICallingStatusManager.sharedInstance(mContext).isCameraOpen()) {
+                    TUICommonDefine.Camera camera = TUICallingStatusManager.sharedInstance(mContext).getFrontCamera();
+                    mCallingAction.openCamera(camera, layout.getVideoView(), null);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void userEnter(CallingUserModel userModel) {
+        super.userEnter(userModel);
+        UserLayout layout = findUserLayout(userModel.userId);
+        if (null == layout) {
+            layout = allocUserLayout(userModel);
+        }
+
+        layout.setVideoAvailable(userModel.isVideoAvailable);
+        mCallingAction.startRemoteView(userModel.userId, layout.getVideoView(),
+                new TUICommonDefine.PlayCallback() {
+                    @Override
+                    public void onPlaying(String userId) {
+
+                    }
+
+                    @Override
+                    public void onLoading(String userId) {
+
+                    }
+
+                    @Override
+                    public void onError(String userId, int errCode, String errMsg) {
+
+                    }
+                });
+    }
+
+    public void updateUserInfo(CallingUserModel userModel) {
+        super.updateUserInfo(userModel);
+        UserLayout layout = findUserLayout(userModel.userId);
+        if (layout != null) {
+            layout.setVideoAvailable(userModel.isVideoAvailable);
+        }
+    }
+
+    @Override
+    public void updateUserView(View view) {
+        super.updateUserView(view);
+        mLayoutUserWaitView.removeAllViews();
+        if (null != view) {
+            mLayoutUserWaitView.addView(view);
+        }
+    }
+
+    @Override
+    public void updateSwitchAudioView(View view) {
+        mLayoutSwitchAudio.removeAllViews();
+        if (null != view) {
+            mLayoutSwitchAudio.addView(view);
+        }
+    }
+
+    @Override
+    public void updateCallTimeView(String time) {
+        mTextTime.setText(time);
+        mTextTime.setVisibility(TextUtils.isEmpty(time) ? GONE : VISIBLE);
+    }
+
+    @Override
+    public void updateTextColor(int color) {
+        super.updateTextColor(color);
+        mTextTime.setTextColor(color);
+    }
+
+    @Override
+    public void updateFunctionView(View view) {
+        mLayoutFunction.removeAllViews();
+        if (null != view) {
+            mLayoutFunction.addView(view);
+        }
+    }
+
+    @Override
+    public void enableFloatView(View view) {
+        mLayoutFloatView.removeAllViews();
+        if (null != view) {
+            mLayoutFloatView.addView(view);
+        }
+    }
+
+    public void finish() {
+        recyclerAllUserLayout();
+        super.finish();
+    }
+
+    private UserLayout findUserLayout(String userId) {
+        if (TextUtils.isEmpty(userId)) {
+            return null;
+        }
+        return (null == mUserLayoutFactory) ? null : mUserLayoutFactory.findUserLayout(userId);
+    }
+
+    private UserLayout allocUserLayout(CallingUserModel userModel) {
+        if (null == userModel || TextUtils.isEmpty(userModel.userId)) {
+            return null;
+        }
+        UserLayout userLayout = mUserLayoutFactory.allocUserLayout(userModel);
+        if (null != userLayout.getParent()) {
+            ((ViewGroup) userLayout.getParent()).removeView(userLayout);
+        }
+        initGestureListener(userLayout);
+        userLayout.setVisibility(VISIBLE);
+        userLayout.disableAudioImage(true);
+        mLayoutUserContainer.addView(userLayout);
+        mCount++;
+        this.post(new Runnable() {
+            @Override
+            public void run() {
+                makeFloatLayout();
+            }
+        });
+        return userLayout;
+    }
+
+    private void recyclerAllUserLayout() {
+        if (null == mUserLayoutFactory || null == mLayoutUserContainer) {
+            return;
+        }
+        Iterator iterator = mUserLayoutFactory.mLayoutEntityList.iterator();
+        while (iterator.hasNext()) {
+            UserLayoutEntity item = (UserLayoutEntity) iterator.next();
+            mLayoutUserContainer.removeView(item.layout);
+            iterator.remove();
+        }
+        mCount = 0;
+    }
+
+    private void initGestureListener(UserLayout layout) {
+        GestureDetector detector = new GestureDetector(getContext(), new GestureDetector.SimpleOnGestureListener() {
+            @Override
+            public boolean onSingleTapUp(MotionEvent e) {
+                layout.performClick();
+                return false;
+            }
+
+            @Override
+            public boolean onDown(MotionEvent e) {
+                return true;
+            }
+
+            @Override
+            public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
+                if (!layout.isMoveAble()) {
+                    return false;
+                }
+                ViewGroup.LayoutParams params = layout.getLayoutParams();
+                if (params instanceof LayoutParams) {
+                    LayoutParams layoutParams = (LayoutParams) layout.getLayoutParams();
+                    int newX = (int) (layoutParams.leftMargin + (e2.getX() - e1.getX()));
+                    int newY = (int) (layoutParams.topMargin + (e2.getY() - e1.getY()));
+                    if (newX >= 0 && newX <= (getWidth() - layout.getWidth())
+                            && newY >= 0 && newY <= (getHeight() - layout.getHeight())) {
+                        layoutParams.leftMargin = newX;
+                        layoutParams.topMargin = newY;
+                        layout.setLayoutParams(layoutParams);
+                    }
+                }
+                return true;
+            }
+        });
+        layout.setOnTouchListener(new OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                return detector.onTouchEvent(event);
+            }
+        });
+    }
+
+    private UserLayoutEntity findEntity(String userId) {
+        for (UserLayoutEntity entity : mUserLayoutFactory.mLayoutEntityList) {
+            if (entity.userId.equals(userId)) {
+                return entity;
+            }
+        }
+        return null;
+    }
+
+    private void makeFloatLayout() {
+        if (null == mFloatParamList || mFloatParamList.size() == 0) {
+            mFloatParamList = DisplayUtils.initFloatParamList(getContext(), getWidth(), getHeight());
+        }
+
+        int size = mUserLayoutFactory.mLayoutEntityList.size();
+        for (int i = 0; i < size; i++) {
+            UserLayoutEntity entity = mUserLayoutFactory.mLayoutEntityList.get(size - i - 1);
+            LayoutParams layoutParams = mFloatParamList.get(i);
+
+            entity.layout.setLayoutParams(layoutParams);
+            entity.layout.setMoveAble(i != 0);
+            addFloatViewClickListener(entity);
+            entity.layout.bringToFront();
+        }
+    }
+
+    private void addFloatViewClickListener(UserLayoutEntity entity) {
+        final String userId = entity.userId;
+        entity.layout.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (!TextUtils.isEmpty(userId)) {
+                    makeFullVideoView(userId);
+                }
+            }
+        });
+    }
+
+    private void makeFullVideoView(String userId) {
+        UserLayoutEntity entity = findEntity(userId);
+        mUserLayoutFactory.mLayoutEntityList.remove(entity);
+        mUserLayoutFactory.mLayoutEntityList.addLast(entity);
+        makeFloatLayout();
+    }
+}
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_add_user_black.png b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_add_user_black.png
new file mode 100644
index 0000000..d38955d
Binary files /dev/null and b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_add_user_black.png differ
diff --git a/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_add_user_white.png b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_add_user_white.png
new file mode 100644
index 0000000..dc9b9e3
Binary files /dev/null and b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_add_user_white.png differ
diff --git a/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_audio_call.png b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_audio_call.png
new file mode 100644
index 0000000..d27271e
Binary files /dev/null and b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_audio_call.png differ
diff --git a/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_avatar.png b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_avatar.png
new file mode 100644
index 0000000..cb7b776
Binary files /dev/null and b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_avatar.png differ
diff --git a/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_camera_disable.png b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_camera_disable.png
new file mode 100644
index 0000000..2093ad2
Binary files /dev/null and b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_camera_disable.png differ
diff --git a/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_camera_enable.png b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_camera_enable.png
new file mode 100644
index 0000000..c4c00b0
Binary files /dev/null and b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_camera_enable.png differ
diff --git a/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_dialing.png b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_dialing.png
new file mode 100644
index 0000000..c762da9
Binary files /dev/null and b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_dialing.png differ
diff --git a/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_dialing_pressed.png b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_dialing_pressed.png
new file mode 100644
index 0000000..5f5c8ee
Binary files /dev/null and b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_dialing_pressed.png differ
diff --git a/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_float.png b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_float.png
new file mode 100644
index 0000000..949ae2b
Binary files /dev/null and b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_float.png differ
diff --git a/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_handsfree_disable.png b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_handsfree_disable.png
new file mode 100644
index 0000000..4042495
Binary files /dev/null and b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_handsfree_disable.png differ
diff --git a/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_handsfree_enable.png b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_handsfree_enable.png
new file mode 100644
index 0000000..5ec86ca
Binary files /dev/null and b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_handsfree_enable.png differ
diff --git a/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_hangup.png b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_hangup.png
new file mode 100644
index 0000000..eafab69
Binary files /dev/null and b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_hangup.png differ
diff --git a/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_hangup_pressed.png b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_hangup_pressed.png
new file mode 100644
index 0000000..ca23295
Binary files /dev/null and b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_hangup_pressed.png differ
diff --git a/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_mic_mute.png b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_mic_mute.png
new file mode 100644
index 0000000..8a13b6d
Binary files /dev/null and b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_mic_mute.png differ
diff --git a/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_mic_unmute.png b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_mic_unmute.png
new file mode 100644
index 0000000..f0b9978
Binary files /dev/null and b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_mic_unmute.png differ
diff --git a/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_move_back_black.png b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_move_back_black.png
new file mode 100644
index 0000000..e25df37
Binary files /dev/null and b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_move_back_black.png differ
diff --git a/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_move_back_white.png b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_move_back_white.png
new file mode 100644
index 0000000..3f63ba0
Binary files /dev/null and b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_move_back_white.png differ
diff --git a/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_switch_camera.png b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_switch_camera.png
new file mode 100644
index 0000000..6159919
Binary files /dev/null and b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_switch_camera.png differ
diff --git a/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_switch_to_audio_call.png b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_switch_to_audio_call.png
new file mode 100644
index 0000000..1bbcea7
Binary files /dev/null and b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_switch_to_audio_call.png differ
diff --git a/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_video_call.png b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_video_call.png
new file mode 100644
index 0000000..4baa9ef
Binary files /dev/null and b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_ic_video_call.png differ
diff --git a/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_loading.gif b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_loading.gif
new file mode 100644
index 0000000..33b7aa0
Binary files /dev/null and b/system/tuicallkit/src/main/res/drawable-xxhdpi/tuicalling_loading.gif differ
diff --git a/system/tuicallkit/src/main/res/drawable/tuicalling_bg_camera.xml b/system/tuicallkit/src/main/res/drawable/tuicalling_bg_camera.xml
new file mode 100644
index 0000000..a16ee12
--- /dev/null
+++ b/system/tuicallkit/src/main/res/drawable/tuicalling_bg_camera.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/tuicalling_ic_camera_disable" android:state_activated="false" android:state_enabled="true" />
+    <item android:drawable="@drawable/tuicalling_ic_camera_enable" android:state_activated="true" android:state_enabled="true" />
+</selector>
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/res/drawable/tuicalling_bg_dialing.xml b/system/tuicallkit/src/main/res/drawable/tuicalling_bg_dialing.xml
new file mode 100644
index 0000000..b0fc0e4
--- /dev/null
+++ b/system/tuicallkit/src/main/res/drawable/tuicalling_bg_dialing.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/tuicalling_ic_dialing_pressed" android:state_pressed="true" android:state_enabled="true" />
+    <item android:drawable="@drawable/tuicalling_ic_dialing" android:state_pressed="false" android:state_enabled="true" />
+</selector>
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/res/drawable/tuicalling_bg_floatwindow.xml b/system/tuicallkit/src/main/res/drawable/tuicalling_bg_floatwindow.xml
new file mode 100644
index 0000000..2f71f9d
--- /dev/null
+++ b/system/tuicallkit/src/main/res/drawable/tuicalling_bg_floatwindow.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/tuicalling_color_white" />
+    <corners android:radius="15dp" />
+</shape>
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/res/drawable/tuicalling_bg_floatwindow_left.xml b/system/tuicallkit/src/main/res/drawable/tuicalling_bg_floatwindow_left.xml
new file mode 100644
index 0000000..dcb4ade
--- /dev/null
+++ b/system/tuicallkit/src/main/res/drawable/tuicalling_bg_floatwindow_left.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/tuicalling_color_bg_float_view" />
+    <corners
+        android:bottomRightRadius="15dp"
+        android:topRightRadius="15dp" />
+</shape>
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/res/drawable/tuicalling_bg_floatwindow_right.xml b/system/tuicallkit/src/main/res/drawable/tuicalling_bg_floatwindow_right.xml
new file mode 100644
index 0000000..a79469c
--- /dev/null
+++ b/system/tuicallkit/src/main/res/drawable/tuicalling_bg_floatwindow_right.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/tuicalling_color_bg_float_view" />
+    <corners
+        android:bottomLeftRadius="15dp"
+        android:topLeftRadius="15dp" />
+</shape>
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/res/drawable/tuicalling_bg_handsfree.xml b/system/tuicallkit/src/main/res/drawable/tuicalling_bg_handsfree.xml
new file mode 100644
index 0000000..d7494ea
--- /dev/null
+++ b/system/tuicallkit/src/main/res/drawable/tuicalling_bg_handsfree.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/tuicalling_ic_handsfree_enable" android:state_activated="true" android:state_enabled="true" />
+    <item android:drawable="@drawable/tuicalling_ic_handsfree_disable" android:state_activated="false" android:state_enabled="true" />
+</selector>
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/res/drawable/tuicalling_bg_hangup.xml b/system/tuicallkit/src/main/res/drawable/tuicalling_bg_hangup.xml
new file mode 100644
index 0000000..ec598b8
--- /dev/null
+++ b/system/tuicallkit/src/main/res/drawable/tuicalling_bg_hangup.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/tuicalling_ic_hangup_pressed" android:state_enabled="true" android:state_pressed="true" />
+    <item android:drawable="@drawable/tuicalling_ic_hangup" android:state_enabled="true" android:state_pressed="false" />
+</selector>
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/res/drawable/tuicalling_bg_mute_mic.xml b/system/tuicallkit/src/main/res/drawable/tuicalling_bg_mute_mic.xml
new file mode 100644
index 0000000..759e2ed
--- /dev/null
+++ b/system/tuicallkit/src/main/res/drawable/tuicalling_bg_mute_mic.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/tuicalling_ic_mic_unmute" android:state_activated="true" android:state_enabled="true" />
+    <item android:drawable="@drawable/tuicalling_ic_mic_mute" android:state_activated="false" android:state_enabled="true" />
+</selector>
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/res/layout/chat_input_more_action.xml b/system/tuicallkit/src/main/res/layout/chat_input_more_action.xml
new file mode 100644
index 0000000..be40355
--- /dev/null
+++ b/system/tuicallkit/src/main/res/layout/chat_input_more_action.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        android:gravity="center">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:scaleType="centerCrop" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6.5dp"
+        android:includeFontPadding="false"
+        android:textColor="@color/tuicalling_color_gray"
+        android:textSize="10sp" />
+
+</LinearLayout>
diff --git a/system/tuicallkit/src/main/res/layout/tuicalling_background_group_view.xml b/system/tuicallkit/src/main/res/layout/tuicalling_background_group_view.xml
new file mode 100644
index 0000000..d92b618
--- /dev/null
+++ b/system/tuicallkit/src/main/res/layout/tuicalling_background_group_view.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/gl_horizontal_top"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_begin="20dp" />
+
+    <RelativeLayout
+        android:id="@+id/group_layout_manager"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/rl_add_user_view" />
+
+    <RelativeLayout
+        android:id="@+id/rl_float_view"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginStart="20dp"
+        android:background="@color/tuicalling_color_transparent"
+        app:layout_constraintBottom_toBottomOf="@+id/rl_add_user_view"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/rl_add_user_view" />
+
+    <RelativeLayout
+        android:id="@+id/rl_add_user_view"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginEnd="20dp"
+        android:background="@color/tuicalling_color_transparent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_top" />
+
+    <TextView
+        android:id="@+id/tv_group_call_hint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@id/tv_group_time"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/group_layout_manager" />
+
+
+    <TextView
+        android:id="@+id/tv_group_time"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:textSize="12sp"
+        android:visibility="visible"
+        app:layout_constraintBottom_toTopOf="@+id/rl_group_function"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <RelativeLayout
+        android:id="@+id/rl_group_function"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/res/layout/tuicalling_background_image_view.xml b/system/tuicallkit/src/main/res/layout/tuicalling_background_image_view.xml
new file mode 100644
index 0000000..a398fd3
--- /dev/null
+++ b/system/tuicallkit/src/main/res/layout/tuicalling_background_image_view.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/cl_root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/gl_horizontal_top"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_begin="20dp" />
+
+    <RelativeLayout
+        android:id="@+id/rl_single_audio_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="98dp"
+        android:gravity="center_horizontal"
+        app:layout_constraintBottom_toTopOf="@id/tv_call_hint"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/gl_horizontal_top" />
+
+    <RelativeLayout
+        android:id="@+id/rl_float_view"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginTop="32dp"
+        android:background="@color/tuicalling_color_transparent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@id/gl_horizontal_top" />
+
+    <RelativeLayout
+        android:id="@+id/rl_add_user_view"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginTop="32dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginRight="20dp"
+        android:background="@color/tuicalling_color_transparent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@id/gl_horizontal_top" />
+
+    <TextView
+        android:id="@+id/tv_call_hint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="12dp"
+        android:textColor="@color/tuicalling_color_black"
+        android:textSize="14sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/rl_single_audio_view" />
+
+    <LinearLayout
+        android:id="@+id/ll_other_user_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:gravity="center"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_call_hint" />
+
+    <TextView
+        android:id="@+id/tv_image_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="12dp"
+        android:textSize="12sp"
+        app:layout_constraintBottom_toTopOf="@+id/rl_image_function"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <RelativeLayout
+        android:id="@+id/rl_image_function"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/res/layout/tuicalling_background_single_view.xml b/system/tuicallkit/src/main/res/layout/tuicalling_background_single_view.xml
new file mode 100644
index 0000000..b91d24c
--- /dev/null
+++ b/system/tuicallkit/src/main/res/layout/tuicalling_background_single_view.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/cl_root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/tuicalling_color_video_background">
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/gl_horizontal_top"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintGuide_begin="20dp" />
+
+    <RelativeLayout
+        android:id="@+id/rl_video_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <RelativeLayout
+        android:id="@+id/rl_float_view"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginStart="20dp"
+        app:layout_constraintBottom_toBottomOf="@+id/rl_single_video_user"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/rl_single_video_user" />
+
+    <RelativeLayout
+        android:id="@+id/rl_single_video_user"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="64dp"
+        android:layout_marginEnd="20dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/gl_horizontal_top" />
+
+    <TextView
+        android:id="@+id/tv_single_call_hint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/tuicalling_color_black"
+        android:textSize="14sp"
+        app:layout_constraintBottom_toTopOf="@id/tv_single_time"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <TextView
+        android:id="@+id/tv_single_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="12dp"
+        android:textSize="12sp"
+        app:layout_constraintBottom_toTopOf="@+id/rl_switch_audio"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <RelativeLayout
+        android:id="@+id/rl_switch_audio"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@id/rl_single_function"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <RelativeLayout
+        android:id="@+id/rl_single_function"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/res/layout/tuicalling_base_activity.xml b/system/tuicallkit/src/main/res/layout/tuicalling_base_activity.xml
new file mode 100644
index 0000000..8035102
--- /dev/null
+++ b/system/tuicallkit/src/main/res/layout/tuicalling_base_activity.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RelativeLayout
+        android:id="@+id/rl_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/res/layout/tuicalling_floatwindow_layout.xml b/system/tuicallkit/src/main/res/layout/tuicalling_floatwindow_layout.xml
new file mode 100644
index 0000000..1e8a71b
--- /dev/null
+++ b/system/tuicallkit/src/main/res/layout/tuicalling_floatwindow_layout.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:background="@drawable/tuicalling_bg_floatwindow"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:id="@+id/rl_video_view"
+            android:layout_width="100dp"
+            android:layout_height="120dp"
+            android:orientation="vertical"
+            android:visibility="gone" />
+
+        <com.tencent.qcloud.tuicore.component.RoundCornerImageView
+            android:id="@+id/img_float_avatar"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:visibility="gone"
+            app:corner_radius="15dp" />
+
+        <ImageView
+            android:id="@+id/float_audioView"
+            android:layout_width="64dp"
+            android:layout_height="48dp"
+            android:layout_margin="4dp"
+            android:src="@drawable/tuicalling_ic_float" />
+
+        <TextView
+            android:id="@+id/tv_float_hint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginBottom="4dp"
+            android:text="@string/tuicalling_wait_resonse"
+            android:textColor="@color/tuicalling_color_green"
+            android:textSize="12sp"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/tv_float_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginBottom="4dp"
+            android:textColor="@color/tuicalling_color_green"
+            android:textSize="12sp"
+            android:visibility="gone" />
+    </LinearLayout>
+</LinearLayout>
+
+
diff --git a/system/tuicallkit/src/main/res/layout/tuicalling_funcation_view_audio.xml b/system/tuicallkit/src/main/res/layout/tuicalling_funcation_view_audio.xml
new file mode 100644
index 0000000..c3fca88
--- /dev/null
+++ b/system/tuicallkit/src/main/res/layout/tuicalling_funcation_view_audio.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="20dp"
+    android:layout_marginBottom="20dp">
+
+    <LinearLayout
+        android:id="@+id/ll_mute"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/ll_hangup"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/img_mute"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:src="@drawable/tuicalling_bg_mute_mic" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:text="@string/tuicalling_text_microphone"
+            android:textColor="@color/tuicalling_color_second"
+            android:textSize="@dimen/tuicalling_text_size_hint" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_hangup"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/ll_handsfree"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/ll_mute"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/img_hangup"
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:src="@drawable/tuicalling_bg_hangup" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:text="@string/tuicalling_text_hangup"
+            android:textColor="@color/tuicalling_color_second"
+            android:textSize="@dimen/tuicalling_text_size_hint" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_handsfree"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/ll_hangup"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/img_handsfree"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:src="@drawable/tuicalling_bg_handsfree" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:text="@string/tuicalling_text_speaker"
+            android:textColor="@color/tuicalling_color_second"
+            android:textSize="@dimen/tuicalling_text_size_hint" />
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/res/layout/tuicalling_funcation_view_audio_waiting.xml b/system/tuicallkit/src/main/res/layout/tuicalling_funcation_view_audio_waiting.xml
new file mode 100644
index 0000000..1228f73
--- /dev/null
+++ b/system/tuicallkit/src/main/res/layout/tuicalling_funcation_view_audio_waiting.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="20dp"
+    android:layout_marginBottom="36dp">
+
+    <LinearLayout
+        android:id="@+id/ll_decline"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/ll_answer"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:src="@drawable/tuicalling_bg_hangup" />
+
+        <TextView
+            android:id="@+id/tv_reject"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:text="@string/tuicalling_text_reject"
+            android:textColor="@color/tuicalling_color_second"
+            android:textSize="@dimen/tuicalling_text_size_hint" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_answer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/ll_decline"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:src="@drawable/tuicalling_bg_dialing" />
+
+        <TextView
+            android:id="@+id/tv_dialing"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:text="@string/tuicalling_text_dialing"
+            android:textColor="@color/tuicalling_color_second"
+            android:textSize="@dimen/tuicalling_text_size_hint" />
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/res/layout/tuicalling_funcation_view_video.xml b/system/tuicallkit/src/main/res/layout/tuicalling_funcation_view_video.xml
new file mode 100644
index 0000000..d2d7aad
--- /dev/null
+++ b/system/tuicallkit/src/main/res/layout/tuicalling_funcation_view_video.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="20dp"
+    android:layout_marginBottom="20dp">
+
+    <LinearLayout
+        android:id="@+id/ll_mute"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintEnd_toStartOf="@+id/ll_handsfree"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/iv_mute"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:src="@drawable/tuicalling_bg_mute_mic" />
+
+        <TextView
+            android:id="@+id/tv_mic"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:text="@string/tuicalling_text_microphone"
+            android:textColor="@color/tuicalling_color_white"
+            android:textSize="@dimen/tuicalling_text_size_hint" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_handsfree"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintEnd_toStartOf="@+id/ll_open_camera"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/ll_mute"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/iv_handsfree"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:src="@drawable/tuicalling_bg_handsfree" />
+
+        <TextView
+            android:id="@+id/tv_speaker"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:text="@string/tuicalling_text_speaker"
+            android:textColor="@color/tuicalling_color_white"
+            android:textSize="@dimen/tuicalling_text_size_hint" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_open_camera"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/ll_handsfree"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/img_camera"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:src="@drawable/tuicalling_bg_camera" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:text="@string/tuicalling_text_camera"
+            android:textColor="@color/tuicalling_color_white"
+            android:textSize="@dimen/tuicalling_text_size_hint" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/ll_hangup"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/ll_mute">
+
+        <ImageView
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:src="@drawable/tuicalling_bg_hangup" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:text="@string/tuicalling_text_hangup"
+            android:textColor="@color/tuicalling_color_white"
+            android:textSize="@dimen/tuicalling_text_size_hint" />
+
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/switch_camera"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginBottom="28dp"
+        android:src="@drawable/tuicalling_ic_switch_camera"
+        app:layout_constraintBottom_toBottomOf="@+id/ll_hangup"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/ll_hangup"
+        app:layout_constraintTop_toTopOf="@+id/ll_hangup" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/res/layout/tuicalling_funcation_view_video_inviting.xml b/system/tuicallkit/src/main/res/layout/tuicalling_funcation_view_video_inviting.xml
new file mode 100644
index 0000000..d2fd98c
--- /dev/null
+++ b/system/tuicallkit/src/main/res/layout/tuicalling_funcation_view_video_inviting.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="20dp"
+    android:layout_marginBottom="20dp">
+
+    <LinearLayout
+        android:id="@+id/ll_cancel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:src="@drawable/tuicalling_bg_hangup" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:text="@string/tuicalling_btn_cancel"
+            android:textColor="@color/tuicalling_color_white"
+            android:textSize="@dimen/tuicalling_text_size_hint" />
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/img_switch_camera"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginBottom="28dp"
+        android:src="@drawable/tuicalling_ic_switch_camera"
+        app:layout_constraintBottom_toBottomOf="@+id/ll_cancel"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/ll_cancel"
+        app:layout_constraintTop_toTopOf="@+id/ll_cancel" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/res/layout/tuicalling_group_user_layout.xml b/system/tuicallkit/src/main/res/layout/tuicalling_group_user_layout.xml
new file mode 100644
index 0000000..33238bd
--- /dev/null
+++ b/system/tuicallkit/src/main/res/layout/tuicalling_group_user_layout.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:parentTag="android.widget.RelativeLayout">
+
+    <com.tencent.qcloud.tuikit.TUIVideoView
+        android:id="@+id/tx_cloud_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone" />
+
+    <com.tencent.qcloud.tuicore.component.RoundCornerImageView
+        android:id="@+id/img_head"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_horizontal"
+        android:scaleType="fitXY"
+        android:src="@drawable/tuicalling_ic_avatar" />
+
+    <ImageView
+        android:id="@+id/img_loading"
+        android:layout_width="64dp"
+        android:layout_height="64dp"
+        android:layout_centerInParent="true"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/tv_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_marginLeft="10dp"
+        android:layout_marginBottom="4dp"
+        android:background="@color/tuicalling_color_transparent"
+        android:textColor="@color/tuicalling_color_white"
+        android:textSize="14sp" />
+
+    <ImageView
+        android:id="@+id/iv_audio_input"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginRight="8dp"
+        android:layout_marginBottom="4dp"
+        android:background="@drawable/tuicalling_ic_mic_mute"
+        android:visibility="gone" />
+</merge>
+
diff --git a/system/tuicallkit/src/main/res/layout/tuicalling_single_video_user_view.xml b/system/tuicallkit/src/main/res/layout/tuicalling_single_video_user_view.xml
new file mode 100644
index 0000000..381d829
--- /dev/null
+++ b/system/tuicallkit/src/main/res/layout/tuicalling_single_video_user_view.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/cl_root"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <com.tencent.qcloud.tuicore.component.RoundCornerImageView
+        android:id="@+id/iv_user_avatar"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        android:src="@drawable/tuicalling_ic_avatar"
+        app:corner_radius="15dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tv_user_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="20dp"
+        android:paddingLeft="20dp"
+        android:text="@string/tuicalling_contact_default_name"
+        android:textColor="@color/tuicalling_color_white"
+        android:textSize="24sp"
+        android:textStyle="bold"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintEnd_toStartOf="@+id/iv_user_avatar"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintTop_toTopOf="@+id/iv_user_avatar" />
+
+    <TextView
+        android:id="@+id/tv_video_tag"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:layout_marginEnd="10dp"
+        android:textColor="@color/tuicalling_color_white"
+        android:textSize="12sp"
+        app:layout_constraintEnd_toStartOf="@+id/iv_user_avatar"
+        app:layout_constraintTop_toBottomOf="@+id/tv_user_name" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/res/layout/tuicalling_switch_audio_view.xml b/system/tuicallkit/src/main/res/layout/tuicalling_switch_audio_view.xml
new file mode 100644
index 0000000..802c025
--- /dev/null
+++ b/system/tuicallkit/src/main/res/layout/tuicalling_switch_audio_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="20dp"
+    android:layout_marginBottom="20dp">
+
+    <LinearLayout
+        android:id="@+id/ll_switch_audio"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:layout_width="36dp"
+            android:layout_height="19dp"
+            android:layout_gravity="center_horizontal"
+            android:src="@drawable/tuicalling_ic_switch_to_audio_call" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="10dp"
+            android:text="@string/tuicalling_switch_audio_call"
+            android:textColor="@color/tuicalling_color_white"
+            android:textSize="12sp" />
+    </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/res/layout/tuicalling_user_view.xml b/system/tuicallkit/src/main/res/layout/tuicalling_user_view.xml
new file mode 100644
index 0000000..d30c211
--- /dev/null
+++ b/system/tuicallkit/src/main/res/layout/tuicalling_user_view.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <com.tencent.qcloud.tuicore.component.RoundCornerImageView
+        android:id="@+id/img_avatar"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:src="@drawable/tuicalling_ic_avatar"
+        app:corner_radius="15dp"
+        app:layout_constraintBottom_toBottomOf="@id/tv_name"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tv_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:text="@string/tuicalling_contact_default_name"
+        android:textColor="@color/tuicalling_color_black"
+        android:textSize="24sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/img_avatar" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/res/raw/phone_dialing.mp3 b/system/tuicallkit/src/main/res/raw/phone_dialing.mp3
new file mode 100644
index 0000000..50ece95
Binary files /dev/null and b/system/tuicallkit/src/main/res/raw/phone_dialing.mp3 differ
diff --git a/system/tuicallkit/src/main/res/raw/phone_hangup.mp3 b/system/tuicallkit/src/main/res/raw/phone_hangup.mp3
new file mode 100644
index 0000000..a711121
Binary files /dev/null and b/system/tuicallkit/src/main/res/raw/phone_hangup.mp3 differ
diff --git a/system/tuicallkit/src/main/res/raw/phone_ringing.mp3 b/system/tuicallkit/src/main/res/raw/phone_ringing.mp3
new file mode 100644
index 0000000..166c027
Binary files /dev/null and b/system/tuicallkit/src/main/res/raw/phone_ringing.mp3 differ
diff --git a/system/tuicallkit/src/main/res/values-en/strings.xml b/system/tuicallkit/src/main/res/values-en/strings.xml
new file mode 100644
index 0000000..5477497
--- /dev/null
+++ b/system/tuicallkit/src/main/res/values-en/strings.xml
@@ -0,0 +1,50 @@
+<resources>
+    <string name="tuicalling_contact_default_name">test 123</string>
+    <string name="tuicalling_toast_call_error_msg">Error [%1$d]:%2$s.</string>
+    <string name="tuicalling_toast_user_reject_call">%1$s declined the call.</string>
+    <string name="tuicalling_toast_user_not_response">%1$s didn’t answer.</string>
+    <string name="tuicalling_toast_user_busy">%1$s is busy.</string>
+    <string name="tuicalling_toast_user_cancel_call">%1$s cancelled the call.</string>
+    <string name="tuicalling_toast_user_timeout">%1$s timed out.</string>
+    <string name="tuicalling_toast_enable_mute">Muted</string>
+    <string name="tuicalling_toast_disable_mute">Unmuted</string>
+    <string name="tuicalling_toast_speaker">Speaker</string>
+    <string name="tuicalling_toast_use_handset">Earpiece</string>
+    <string name="tuicalling_called_time_format">%02d:%02d</string>
+    <string name="tuicalling_toast_user_end">%s end the call.</string>
+    <string name="tuicalling_other_party_network_low_quality">The other party\'s network connection is poor</string>
+    <string name="tuicalling_self_network_low_quality">Your network connection is poor</string>
+    <string name="tuicalling_toast_switch_camera">Switch Camera</string>
+    <string name="tuicalling_toast_enable_camera">Camera On</string>
+    <string name="tuicalling_toast_disable_camera">Camera Off</string>
+    <string name="tuicalling_waiting_accept">Waiting for the user to accept…</string>
+    <string name="tuicalling_invite_audio_call">Invited you to a voice call…</string>
+    <string name="tuicalling_invite_video_call">Invites you to a video call…</string>
+    <string name="tuicalling_text_microphone">Mic</string>
+    <string name="tuicalling_text_hangup">Hang Up</string>
+    <string name="tuicalling_text_reject">Decline</string>
+    <string name="tuicalling_text_speaker">Speaker</string>
+    <string name="tuicalling_text_dialing">Answer</string>
+    <string name="tuicalling_text_camera">Camera</string>
+    <string name="tuicalling_switch_camera_hint">Turn on your camera first</string>
+    <string name="tuicalling_switch_audio_call">Switch to Voice Call</string>
+    <string name="tuicalling_btn_cancel">Cancel</string>
+    <string name="tuicalling_tips_start_audio">Please turn on the microphone permissions first</string>
+    <string name="tuicalling_video_call">Video Call</string>
+    <string name="tuicalling_audio_call">Voice Call</string>
+    <string name="tuicalling_user_kicked_offline">You have been kicked off the line. Please log in again!</string>
+    <string name="tuicalling_user_sig_expired">Your user signature information has expired</string>
+    <string name="tuicalling_user_exceed_limit">TUICalling currently supports call with up to 9 people.For larger conference calls,try using TUIRoom</string>
+    <string name="tuicalling_wait_resonse">Waiting</string>
+    <string name="tuicalling_is_calling">Unable to restart the call</string>
+    <string name="tuicalling_tips_start_camera">Please turn on the camera permission first</string>
+    <string name="tuicalling_permission_mic_reason_title">%s applies for access to the microphone</string>
+    <string name="tuicalling_permission_mic_reason">Needs access to your microphone, and it can be used for functions such as Audio/Video Call, Group Audio/Video Call etc.</string>
+    <string name="tuicalling_permission_camera_reason_title">%s applies for camera permission</string>
+    <string name="tuicalling_permission_camera_reason">Needs access to your camera, and it can be used for functions such as Video Call, Group Video Call etc. For beauty filters to work, we will collect the facial information captured by your camera in real time to detect your facial features.</string>
+    <string name="tuicalling_package_not_purchased">You do not have TUICallKit package, please open the free experience in the console or purchase the official package</string>
+    <string name="tuicalling_package_not_support">The package you purchased does not support this ability</string>
+    <string name="tuicalling_status_is_not_accept">You can only use this function after you accept the call</string>
+    <string name="tuicalling_groupid_is_empty">groupId is empty</string>
+    <string name="tuicalling_have_a_new_call">You have a new call</string>
+</resources>
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/res/values-zh/strings.xml b/system/tuicallkit/src/main/res/values-zh/strings.xml
new file mode 100644
index 0000000..dba39c5
--- /dev/null
+++ b/system/tuicallkit/src/main/res/values-zh/strings.xml
@@ -0,0 +1,50 @@
+<resources>
+    <string name="tuicalling_contact_default_name">测试123</string>
+    <string name="tuicalling_toast_call_error_msg">发生错误[%1$d]:%2$s</string>
+    <string name="tuicalling_toast_user_reject_call">%1$s拒绝通话</string>
+    <string name="tuicalling_toast_user_not_response">%1$s无响应</string>
+    <string name="tuicalling_toast_user_busy">%1$s忙线</string>
+    <string name="tuicalling_toast_user_cancel_call">%1$s取消了通话</string>
+    <string name="tuicalling_toast_user_timeout">%1$s通话超时</string>
+    <string name="tuicalling_toast_enable_mute">开启静音</string>
+    <string name="tuicalling_toast_disable_mute">关闭静音</string>
+    <string name="tuicalling_toast_speaker">使用扬声器</string>
+    <string name="tuicalling_toast_use_handset">使用听筒</string>
+    <string name="tuicalling_called_time_format">%02d:%02d</string>
+    <string name="tuicalling_toast_user_end">%s 结束通话</string>
+    <string name="tuicalling_other_party_network_low_quality">对方网络不佳</string>
+    <string name="tuicalling_self_network_low_quality">己方网络不佳</string>
+    <string name="tuicalling_toast_switch_camera">切换摄像头</string>
+    <string name="tuicalling_toast_enable_camera">开启摄像头</string>
+    <string name="tuicalling_toast_disable_camera">关闭摄像头</string>
+    <string name="tuicalling_waiting_accept">正在等待对方接受邀请...</string>
+    <string name="tuicalling_invite_audio_call">邀请您进行语音通话…</string>
+    <string name="tuicalling_invite_video_call">邀请您进行视频通话…</string>
+    <string name="tuicalling_text_microphone">麦克风</string>
+    <string name="tuicalling_text_hangup">挂断</string>
+    <string name="tuicalling_text_reject">拒接</string>
+    <string name="tuicalling_text_speaker">扬声器</string>
+    <string name="tuicalling_text_dialing">接听</string>
+    <string name="tuicalling_text_camera">摄像头</string>
+    <string name="tuicalling_switch_camera_hint">请先打开摄像头</string>
+    <string name="tuicalling_switch_audio_call">切到语音通话</string>
+    <string name="tuicalling_btn_cancel">取消</string>
+    <string name="tuicalling_tips_start_audio">请先打开麦克风权限</string>
+    <string name="tuicalling_video_call">视频通话</string>
+    <string name="tuicalling_audio_call">语音通话</string>
+    <string name="tuicalling_user_kicked_offline">您已被踢下线，请重新登录</string>
+    <string name="tuicalling_user_sig_expired">您的用户签名信息已过期</string>
+    <string name="tuicalling_user_exceed_limit">暂支持最多9人通话。如需多人会议，请使用TUIRoom</string>
+    <string name="tuicalling_wait_resonse">等待接听</string>
+    <string name="tuicalling_is_calling">正在通话中,无法再次发起</string>
+    <string name="tuicalling_tips_start_camera">请先打开相机权限</string>
+    <string name="tuicalling_permission_camera_reason_title">%s申请获取相机权限</string>
+    <string name="tuicalling_permission_camera_reason">需要访问您的相机权限，开启后用于视频通话、多人视频通话等功能，在您使用美颜功能时，我们会对您实时拍摄的面部的像素信息进行实时智能识别，在识别过程中会实时收集您面部的像素信息，以为您提供更好的美颜效果。</string>
+    <string name="tuicalling_permission_mic_reason_title">%s申请获取麦克风权限</string>
+    <string name="tuicalling_permission_mic_reason">需要访问您的麦克风权限，开启后用于语音通话、多人语音通话、视频通话、多人视频通话等功能，并且开启后录制的视频才会有声音</string>
+    <string name="tuicalling_package_not_purchased">您当前未购买音视频通话能力套餐，请前往 IM 控制台开通免费体验或加购正式版</string>
+    <string name="tuicalling_package_not_support">您当前购买的音视频通话能力套餐不支持该功能，建议您升级套餐类型</string>
+    <string name="tuicalling_status_is_not_accept">接听后才能使用该功能</string>
+    <string name="tuicalling_groupid_is_empty">群ID为空</string>
+    <string name="tuicalling_have_a_new_call">您有一个新的通话</string>
+</resources>
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/res/values/attrs.xml b/system/tuicallkit/src/main/res/values/attrs.xml
new file mode 100644
index 0000000..0d2c4cc
--- /dev/null
+++ b/system/tuicallkit/src/main/res/values/attrs.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/res/values/colors.xml b/system/tuicallkit/src/main/res/values/colors.xml
new file mode 100644
index 0000000..dfd62c7
--- /dev/null
+++ b/system/tuicallkit/src/main/res/values/colors.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="tuicalling_color_white">#FFFFFFFF</color>
+    <color name="tuicalling_color_black">#000000</color>
+    <color name="tuicalling_color_second">#666666</color>
+    <color name="tuicalling_color_audio_background">#FFF1F2F8</color>
+    <color name="tuicalling_color_video_background">#FF55534F</color>
+    <color name="tuicalling_color_transparent">#00000000</color>
+    <color name="tuicalling_color_green">#FF29CC85</color>
+    <color name="tuicalling_color_bg_float_view">#FFBBBBBB</color>
+    <color name="tuicalling_color_gray">#696969</color>
+</resources>
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/res/values/dimens.xml b/system/tuicallkit/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..40fb48e
--- /dev/null
+++ b/system/tuicallkit/src/main/res/values/dimens.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="tuicalling_small_image_size">30dp</dimen>
+    <dimen name="tuicalling_small_image_left_margin">5dp</dimen>
+    <dimen name="tuicalling_text_size_hint">12sp</dimen>
+</resources>
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/res/values/strings.xml b/system/tuicallkit/src/main/res/values/strings.xml
new file mode 100644
index 0000000..5477497
--- /dev/null
+++ b/system/tuicallkit/src/main/res/values/strings.xml
@@ -0,0 +1,50 @@
+<resources>
+    <string name="tuicalling_contact_default_name">test 123</string>
+    <string name="tuicalling_toast_call_error_msg">Error [%1$d]:%2$s.</string>
+    <string name="tuicalling_toast_user_reject_call">%1$s declined the call.</string>
+    <string name="tuicalling_toast_user_not_response">%1$s didn’t answer.</string>
+    <string name="tuicalling_toast_user_busy">%1$s is busy.</string>
+    <string name="tuicalling_toast_user_cancel_call">%1$s cancelled the call.</string>
+    <string name="tuicalling_toast_user_timeout">%1$s timed out.</string>
+    <string name="tuicalling_toast_enable_mute">Muted</string>
+    <string name="tuicalling_toast_disable_mute">Unmuted</string>
+    <string name="tuicalling_toast_speaker">Speaker</string>
+    <string name="tuicalling_toast_use_handset">Earpiece</string>
+    <string name="tuicalling_called_time_format">%02d:%02d</string>
+    <string name="tuicalling_toast_user_end">%s end the call.</string>
+    <string name="tuicalling_other_party_network_low_quality">The other party\'s network connection is poor</string>
+    <string name="tuicalling_self_network_low_quality">Your network connection is poor</string>
+    <string name="tuicalling_toast_switch_camera">Switch Camera</string>
+    <string name="tuicalling_toast_enable_camera">Camera On</string>
+    <string name="tuicalling_toast_disable_camera">Camera Off</string>
+    <string name="tuicalling_waiting_accept">Waiting for the user to accept…</string>
+    <string name="tuicalling_invite_audio_call">Invited you to a voice call…</string>
+    <string name="tuicalling_invite_video_call">Invites you to a video call…</string>
+    <string name="tuicalling_text_microphone">Mic</string>
+    <string name="tuicalling_text_hangup">Hang Up</string>
+    <string name="tuicalling_text_reject">Decline</string>
+    <string name="tuicalling_text_speaker">Speaker</string>
+    <string name="tuicalling_text_dialing">Answer</string>
+    <string name="tuicalling_text_camera">Camera</string>
+    <string name="tuicalling_switch_camera_hint">Turn on your camera first</string>
+    <string name="tuicalling_switch_audio_call">Switch to Voice Call</string>
+    <string name="tuicalling_btn_cancel">Cancel</string>
+    <string name="tuicalling_tips_start_audio">Please turn on the microphone permissions first</string>
+    <string name="tuicalling_video_call">Video Call</string>
+    <string name="tuicalling_audio_call">Voice Call</string>
+    <string name="tuicalling_user_kicked_offline">You have been kicked off the line. Please log in again!</string>
+    <string name="tuicalling_user_sig_expired">Your user signature information has expired</string>
+    <string name="tuicalling_user_exceed_limit">TUICalling currently supports call with up to 9 people.For larger conference calls,try using TUIRoom</string>
+    <string name="tuicalling_wait_resonse">Waiting</string>
+    <string name="tuicalling_is_calling">Unable to restart the call</string>
+    <string name="tuicalling_tips_start_camera">Please turn on the camera permission first</string>
+    <string name="tuicalling_permission_mic_reason_title">%s applies for access to the microphone</string>
+    <string name="tuicalling_permission_mic_reason">Needs access to your microphone, and it can be used for functions such as Audio/Video Call, Group Audio/Video Call etc.</string>
+    <string name="tuicalling_permission_camera_reason_title">%s applies for camera permission</string>
+    <string name="tuicalling_permission_camera_reason">Needs access to your camera, and it can be used for functions such as Video Call, Group Video Call etc. For beauty filters to work, we will collect the facial information captured by your camera in real time to detect your facial features.</string>
+    <string name="tuicalling_package_not_purchased">You do not have TUICallKit package, please open the free experience in the console or purchase the official package</string>
+    <string name="tuicalling_package_not_support">The package you purchased does not support this ability</string>
+    <string name="tuicalling_status_is_not_accept">You can only use this function after you accept the call</string>
+    <string name="tuicalling_groupid_is_empty">groupId is empty</string>
+    <string name="tuicalling_have_a_new_call">You have a new call</string>
+</resources>
\ No newline at end of file
diff --git a/system/tuicallkit/src/main/res/values/styles.xml b/system/tuicallkit/src/main/res/values/styles.xml
new file mode 100644
index 0000000..0d2c4cc
--- /dev/null
+++ b/system/tuicallkit/src/main/res/values/styles.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuichat/.gitignore b/system/tuichat/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/system/tuichat/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/system/tuichat/build.gradle b/system/tuichat/build.gradle
new file mode 100644
index 0000000..c84bdf2
--- /dev/null
+++ b/system/tuichat/build.gradle
@@ -0,0 +1,67 @@
+plugins {
+    id 'com.android.library'
+}
+
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+
+    defaultConfig {
+        minSdkVersion 16
+        targetSdkVersion 30
+        versionCode 1
+        versionName "1.0"
+        renderscriptSupportModeEnabled false
+        renderscriptTargetApi 30
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    // 主题资源文件夹
+    sourceSets {
+        main {
+            res.srcDirs += "src/main/res-minimalistui"
+            res.srcDirs += "src/main/res-light"
+            res.srcDirs += "src/main/res-lively"
+            res.srcDirs += "src/main/res-serious"
+        }
+    }
+    viewBinding {
+        enabled = true
+    }
+}
+
+afterEvaluate{
+    generateReleaseBuildConfig.enabled =false
+    generateDebugBuildConfig.enabled =false
+}
+
+dependencies {
+
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'com.github.bumptech.glide:glide:4.12.0'
+    implementation 'com.google.code.gson:gson:2.8.7'
+    implementation 'androidx.viewpager2:viewpager2:1.0.0'
+    implementation 'androidx.datastore:datastore-preferences:1.0.0'
+    implementation 'androidx.datastore:datastore-preferences-rxjava3:1.0.0'
+    implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    /*类似QQ空间，微信朋友圈九宫格图片*/
+    implementation project(path: ':ninegridview')
+    /*高德地图*/
+    implementation rootProject.ext.mapLibs
+
+    api project(':system:tuicore')
+
+}
\ No newline at end of file
diff --git a/system/tuichat/src/main/AndroidManifest.xml b/system/tuichat/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..60652a2
--- /dev/null
+++ b/system/tuichat/src/main/AndroidManifest.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.tencent.qcloud.tuikit.tuichat">
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="28" />
+
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+
+    <application>
+        <provider
+            android:name=".TUIChatService"
+            android:authorities="${applicationId}.TUIChat.Init"
+            android:enabled="true"
+            android:exported="false" />
+
+        <activity
+            android:name=".component.imagevideoscan.ImageVideoScanActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
+
+
+
+
+        <!-- **************** Classic UI Start **************** -->
+        <activity
+            android:name=".classicui.page.MessageReplyDetailActivity"
+            android:windowSoftInputMode="adjustResize|stateHidden"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".classicui.page.TUIForwardChatActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".classicui.page.TUIC2CChatActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustNothing|stateHidden" />
+
+
+        <activity
+            android:name=".classicui.page.TUIGroupChatActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustNothing|stateHidden"/>
+
+        <activity
+            android:name=".classicui.page.MessageReceiptDetailActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".classicui.component.camera.CameraActivity"
+            android:screenOrientation="portrait" />
+
+        <provider
+            android:name=".classicui.ClassicUIService"
+            android:authorities="${applicationId}.TUIChat.ClassicUI.Init"
+            android:enabled="true"
+            android:exported="false"/>
+        <!-- **************** Classic UI End **************** -->
+
+
+
+
+
+        <!-- **************** Minimalist UI Start **************** -->
+        <activity
+            android:name=".minimalistui.component.camera.CameraActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".minimalistui.widget.messagepopmenu.ChatPopActivity"
+            android:theme="@style/ChatTransparentPopActivityStyle"
+            android:launchMode="singleTask"
+            android:windowSoftInputMode="adjustNothing|stateHidden" />
+
+        <activity
+            android:name=".minimalistui.page.TUIC2CChatMinimalistActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustNothing|stateHidden" />
+
+        <activity
+            android:name=".minimalistui.page.TUIGroupChatMinimalistActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustNothing|stateHidden" />
+
+        <activity
+            android:name=".minimalistui.page.MessageDetailMinimalistActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".minimalistui.page.TUIForwardChatMinimalistActivity"
+            android:screenOrientation="portrait" />
+
+        <provider
+            android:name=".minimalistui.MinimalistUIService"
+            android:authorities="${applicationId}.TUIChat.MinimalistUI.Init"
+            android:enabled="true"
+            android:exported="false"/>
+        <!-- **************** Minimalist UI End **************** -->
+
+
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/system/tuichat/src/main/assets/emoji/[NO]@2x.png b/system/tuichat/src/main/assets/emoji/[NO]@2x.png
new file mode 100644
index 0000000..b7ae6d7
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[NO]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[OK]@2x.png b/system/tuichat/src/main/assets/emoji/[OK]@2x.png
new file mode 100644
index 0000000..e723cb6
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[OK]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[下雨]@2x.png b/system/tuichat/src/main/assets/emoji/[下雨]@2x.png
new file mode 100644
index 0000000..d049b49
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[下雨]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[么么哒]@2x.png b/system/tuichat/src/main/assets/emoji/[么么哒]@2x.png
new file mode 100644
index 0000000..f47fa56
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[么么哒]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[乒乓]@2x.png b/system/tuichat/src/main/assets/emoji/[乒乓]@2x.png
new file mode 100644
index 0000000..56f307d
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[乒乓]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[便便]@2x.png b/system/tuichat/src/main/assets/emoji/[便便]@2x.png
new file mode 100644
index 0000000..adf4cc2
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[便便]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[信封]@2x.png b/system/tuichat/src/main/assets/emoji/[信封]@2x.png
new file mode 100644
index 0000000..c571ad2
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[信封]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[偷笑]@2x.png b/system/tuichat/src/main/assets/emoji/[偷笑]@2x.png
new file mode 100644
index 0000000..a303375
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[偷笑]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[傲慢]@2x.png b/system/tuichat/src/main/assets/emoji/[傲慢]@2x.png
new file mode 100644
index 0000000..34fa967
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[傲慢]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[再见]@2x.png b/system/tuichat/src/main/assets/emoji/[再见]@2x.png
new file mode 100644
index 0000000..497e464
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[再见]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[冷汗]@2x.png b/system/tuichat/src/main/assets/emoji/[冷汗]@2x.png
new file mode 100644
index 0000000..137ec0f
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[冷汗]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[凋谢]@2x.png b/system/tuichat/src/main/assets/emoji/[凋谢]@2x.png
new file mode 100644
index 0000000..dd05090
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[凋谢]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[刀]@2x.png b/system/tuichat/src/main/assets/emoji/[刀]@2x.png
new file mode 100644
index 0000000..ab4fc8d
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[刀]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[删除]@2x.png b/system/tuichat/src/main/assets/emoji/[删除]@2x.png
new file mode 100644
index 0000000..113e20f
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[删除]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[勾引]@2x.png b/system/tuichat/src/main/assets/emoji/[勾引]@2x.png
new file mode 100644
index 0000000..04060f5
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[勾引]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[发呆]@2x.png b/system/tuichat/src/main/assets/emoji/[发呆]@2x.png
new file mode 100644
index 0000000..d8393d9
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[发呆]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[发抖]@2x.png b/system/tuichat/src/main/assets/emoji/[发抖]@2x.png
new file mode 100644
index 0000000..094ed1d
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[发抖]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[可怜]@2x.png b/system/tuichat/src/main/assets/emoji/[可怜]@2x.png
new file mode 100644
index 0000000..73963b7
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[可怜]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[可爱]@2x.png b/system/tuichat/src/main/assets/emoji/[可爱]@2x.png
new file mode 100644
index 0000000..a235324
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[可爱]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[右哼哼]@2x.png b/system/tuichat/src/main/assets/emoji/[右哼哼]@2x.png
new file mode 100644
index 0000000..e1ca267
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[右哼哼]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[右太极]@2x.png b/system/tuichat/src/main/assets/emoji/[右太极]@2x.png
new file mode 100644
index 0000000..6b55dfb
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[右太极]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[右车头]@2x.png b/system/tuichat/src/main/assets/emoji/[右车头]@2x.png
new file mode 100644
index 0000000..85fdb86
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[右车头]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[吐]@2x.png b/system/tuichat/src/main/assets/emoji/[吐]@2x.png
new file mode 100644
index 0000000..0265a28
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[吐]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[吓]@2x.png b/system/tuichat/src/main/assets/emoji/[吓]@2x.png
new file mode 100644
index 0000000..b03f3b6
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[吓]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[咒骂]@2x.png b/system/tuichat/src/main/assets/emoji/[咒骂]@2x.png
new file mode 100644
index 0000000..c65faa6
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[咒骂]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[咖啡]@2x.png b/system/tuichat/src/main/assets/emoji/[咖啡]@2x.png
new file mode 100644
index 0000000..dd595d3
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[咖啡]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[啤酒]@2x.png b/system/tuichat/src/main/assets/emoji/[啤酒]@2x.png
new file mode 100644
index 0000000..52289b0
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[啤酒]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[嘘]@2x.png b/system/tuichat/src/main/assets/emoji/[嘘]@2x.png
new file mode 100644
index 0000000..e011a35
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[嘘]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[回头]@2x.png b/system/tuichat/src/main/assets/emoji/[回头]@2x.png
new file mode 100644
index 0000000..84660e2
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[回头]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[困]@2x.png b/system/tuichat/src/main/assets/emoji/[困]@2x.png
new file mode 100644
index 0000000..cc0447f
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[困]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[坏笑]@2x.png b/system/tuichat/src/main/assets/emoji/[坏笑]@2x.png
new file mode 100644
index 0000000..36f3c32
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[坏笑]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[多云]@2x.png b/system/tuichat/src/main/assets/emoji/[多云]@2x.png
new file mode 100644
index 0000000..71d23d6
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[多云]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[大兵]@2x.png b/system/tuichat/src/main/assets/emoji/[大兵]@2x.png
new file mode 100644
index 0000000..94b0d52
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[大兵]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[大哭]@2x.png b/system/tuichat/src/main/assets/emoji/[大哭]@2x.png
new file mode 100644
index 0000000..e816c56
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[大哭]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[太阳]@2x.png b/system/tuichat/src/main/assets/emoji/[太阳]@2x.png
new file mode 100644
index 0000000..a0d229a
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[太阳]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[奋斗]@2x.png b/system/tuichat/src/main/assets/emoji/[奋斗]@2x.png
new file mode 100644
index 0000000..3347c97
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[奋斗]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[奶瓶]@2x.png b/system/tuichat/src/main/assets/emoji/[奶瓶]@2x.png
new file mode 100644
index 0000000..0d4b8d9
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[奶瓶]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[委屈]@2x.png b/system/tuichat/src/main/assets/emoji/[委屈]@2x.png
new file mode 100644
index 0000000..3f136dd
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[委屈]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[害羞]@2x.png b/system/tuichat/src/main/assets/emoji/[害羞]@2x.png
new file mode 100644
index 0000000..30a9341
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[害羞]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[尴尬]@2x.png b/system/tuichat/src/main/assets/emoji/[尴尬]@2x.png
new file mode 100644
index 0000000..62afd7e
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[尴尬]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[左哼哼]@2x.png b/system/tuichat/src/main/assets/emoji/[左哼哼]@2x.png
new file mode 100644
index 0000000..e6f64df
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[左哼哼]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[左太极]@2x.png b/system/tuichat/src/main/assets/emoji/[左太极]@2x.png
new file mode 100644
index 0000000..5a88a56
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[左太极]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[左车头]@2x.png b/system/tuichat/src/main/assets/emoji/[左车头]@2x.png
new file mode 100644
index 0000000..e05c11c
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[左车头]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[差劲]@2x.png b/system/tuichat/src/main/assets/emoji/[差劲]@2x.png
new file mode 100644
index 0000000..455365a
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[差劲]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[弱]@2x.png b/system/tuichat/src/main/assets/emoji/[弱]@2x.png
new file mode 100644
index 0000000..fe5fbf9
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[弱]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[强]@2x.png b/system/tuichat/src/main/assets/emoji/[强]@2x.png
new file mode 100644
index 0000000..f4f7a5b
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[强]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[彩带]@2x.png b/system/tuichat/src/main/assets/emoji/[彩带]@2x.png
new file mode 100644
index 0000000..88cd3f0
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[彩带]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[彩球]@2x.png b/system/tuichat/src/main/assets/emoji/[彩球]@2x.png
new file mode 100644
index 0000000..8a60eed
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[彩球]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[得意]@2x.png b/system/tuichat/src/main/assets/emoji/[得意]@2x.png
new file mode 100644
index 0000000..4027f8c
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[得意]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[微笑]@2x.png b/system/tuichat/src/main/assets/emoji/[微笑]@2x.png
new file mode 100644
index 0000000..bb57a0a
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[微笑]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[心碎了]@2x.png b/system/tuichat/src/main/assets/emoji/[心碎了]@2x.png
new file mode 100644
index 0000000..a11ed0f
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[心碎了]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[快哭了]@2x.png b/system/tuichat/src/main/assets/emoji/[快哭了]@2x.png
new file mode 100644
index 0000000..8f49f69
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[快哭了]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[怄火]@2x.png b/system/tuichat/src/main/assets/emoji/[怄火]@2x.png
new file mode 100644
index 0000000..7277dae
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[怄火]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[怒]@2x.png b/system/tuichat/src/main/assets/emoji/[怒]@2x.png
new file mode 100644
index 0000000..a4e4a69
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[怒]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[惊恐]@2x.png b/system/tuichat/src/main/assets/emoji/[惊恐]@2x.png
new file mode 100644
index 0000000..617810a
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[惊恐]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[惊讶]@2x.png b/system/tuichat/src/main/assets/emoji/[惊讶]@2x.png
new file mode 100644
index 0000000..df93544
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[惊讶]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[憨笑]@2x.png b/system/tuichat/src/main/assets/emoji/[憨笑]@2x.png
new file mode 100644
index 0000000..4c5b4ba
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[憨笑]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[手枪]@2x.png b/system/tuichat/src/main/assets/emoji/[手枪]@2x.png
new file mode 100644
index 0000000..58af826
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[手枪]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[打哈欠]@2x.png b/system/tuichat/src/main/assets/emoji/[打哈欠]@2x.png
new file mode 100644
index 0000000..14490ce
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[打哈欠]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[抓狂]@2x.png b/system/tuichat/src/main/assets/emoji/[抓狂]@2x.png
new file mode 100644
index 0000000..0556a4d
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[抓狂]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[折磨]@2x.png b/system/tuichat/src/main/assets/emoji/[折磨]@2x.png
new file mode 100644
index 0000000..d9dfd53
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[折磨]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[抠鼻]@2x.png b/system/tuichat/src/main/assets/emoji/[抠鼻]@2x.png
new file mode 100644
index 0000000..cbc61e8
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[抠鼻]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[抱抱]@2x.png b/system/tuichat/src/main/assets/emoji/[抱抱]@2x.png
new file mode 100644
index 0000000..828971e
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[抱抱]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[抱拳]@2x.png b/system/tuichat/src/main/assets/emoji/[抱拳]@2x.png
new file mode 100644
index 0000000..95b5ee0
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[抱拳]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[拳头]@2x.png b/system/tuichat/src/main/assets/emoji/[拳头]@2x.png
new file mode 100644
index 0000000..6d501d3
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[拳头]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[挥手]@2x.png b/system/tuichat/src/main/assets/emoji/[挥手]@2x.png
new file mode 100644
index 0000000..ad5d3e0
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[挥手]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[握手]@2x.png b/system/tuichat/src/main/assets/emoji/[握手]@2x.png
new file mode 100644
index 0000000..10a615b
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[握手]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[撇嘴]@2x.png b/system/tuichat/src/main/assets/emoji/[撇嘴]@2x.png
new file mode 100644
index 0000000..d8839f4
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[撇嘴]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[擦汗]@2x.png b/system/tuichat/src/main/assets/emoji/[擦汗]@2x.png
new file mode 100644
index 0000000..8804e98
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[擦汗]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[敲打]@2x.png b/system/tuichat/src/main/assets/emoji/[敲打]@2x.png
new file mode 100644
index 0000000..3dfff7b
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[敲打]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[晕]@2x.png b/system/tuichat/src/main/assets/emoji/[晕]@2x.png
new file mode 100644
index 0000000..2bd83a4
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[晕]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[月亮]@2x.png b/system/tuichat/src/main/assets/emoji/[月亮]@2x.png
new file mode 100644
index 0000000..eb37fb9
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[月亮]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[棒棒糖]@2x.png b/system/tuichat/src/main/assets/emoji/[棒棒糖]@2x.png
new file mode 100644
index 0000000..4f58458
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[棒棒糖]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[汽车]@2x.png b/system/tuichat/src/main/assets/emoji/[汽车]@2x.png
new file mode 100644
index 0000000..14363af
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[汽车]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[沙发]@2x.png b/system/tuichat/src/main/assets/emoji/[沙发]@2x.png
new file mode 100644
index 0000000..87d233a
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[沙发]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[流汗]@2x.png b/system/tuichat/src/main/assets/emoji/[流汗]@2x.png
new file mode 100644
index 0000000..d835eeb
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[流汗]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[流泪]@2x.png b/system/tuichat/src/main/assets/emoji/[流泪]@2x.png
new file mode 100644
index 0000000..61dab0a
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[流泪]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[激动]@2x.png b/system/tuichat/src/main/assets/emoji/[激动]@2x.png
new file mode 100644
index 0000000..262b317
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[激动]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[灯泡]@2x.png b/system/tuichat/src/main/assets/emoji/[灯泡]@2x.png
new file mode 100644
index 0000000..b61a829
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[灯泡]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[炸弹]@2x.png b/system/tuichat/src/main/assets/emoji/[炸弹]@2x.png
new file mode 100644
index 0000000..62b5736
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[炸弹]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[熊猫]@2x.png b/system/tuichat/src/main/assets/emoji/[熊猫]@2x.png
new file mode 100644
index 0000000..e4088f8
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[熊猫]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[爆筋]@2x.png b/system/tuichat/src/main/assets/emoji/[爆筋]@2x.png
new file mode 100644
index 0000000..af054a7
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[爆筋]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[爱你]@2x.png b/system/tuichat/src/main/assets/emoji/[爱你]@2x.png
new file mode 100644
index 0000000..5be2bd0
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[爱你]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[爱心]@2x.png b/system/tuichat/src/main/assets/emoji/[爱心]@2x.png
new file mode 100644
index 0000000..4474769
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[爱心]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[爱情]@2x.png b/system/tuichat/src/main/assets/emoji/[爱情]@2x.png
new file mode 100644
index 0000000..4f2263d
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[爱情]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[猪头]@2x.png b/system/tuichat/src/main/assets/emoji/[猪头]@2x.png
new file mode 100644
index 0000000..535548b
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[猪头]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[猫咪]@2x.png b/system/tuichat/src/main/assets/emoji/[猫咪]@2x.png
new file mode 100644
index 0000000..c0b1a89
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[猫咪]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[献吻]@2x.png b/system/tuichat/src/main/assets/emoji/[献吻]@2x.png
new file mode 100644
index 0000000..33da041
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[献吻]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[玫瑰]@2x.png b/system/tuichat/src/main/assets/emoji/[玫瑰]@2x.png
new file mode 100644
index 0000000..faac04b
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[玫瑰]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[瓢虫]@2x.png b/system/tuichat/src/main/assets/emoji/[瓢虫]@2x.png
new file mode 100644
index 0000000..8fcd467
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[瓢虫]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[疑问]@2x.png b/system/tuichat/src/main/assets/emoji/[疑问]@2x.png
new file mode 100644
index 0000000..72376dd
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[疑问]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[白眼]@2x.png b/system/tuichat/src/main/assets/emoji/[白眼]@2x.png
new file mode 100644
index 0000000..0a8a259
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[白眼]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[皮球]@2x.png b/system/tuichat/src/main/assets/emoji/[皮球]@2x.png
new file mode 100644
index 0000000..6dcf45e
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[皮球]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[睡觉]@2x.png b/system/tuichat/src/main/assets/emoji/[睡觉]@2x.png
new file mode 100644
index 0000000..aafb55f
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[睡觉]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[磕头]@2x.png b/system/tuichat/src/main/assets/emoji/[磕头]@2x.png
new file mode 100644
index 0000000..817923a
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[磕头]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[示爱]@2x.png b/system/tuichat/src/main/assets/emoji/[示爱]@2x.png
new file mode 100644
index 0000000..7be52ca
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[示爱]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[礼品袋]@2x.png b/system/tuichat/src/main/assets/emoji/[礼品袋]@2x.png
new file mode 100644
index 0000000..5d017c8
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[礼品袋]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[礼物]@2x.png b/system/tuichat/src/main/assets/emoji/[礼物]@2x.png
new file mode 100644
index 0000000..5b606ff
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[礼物]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[篮球]@2x.png b/system/tuichat/src/main/assets/emoji/[篮球]@2x.png
new file mode 100644
index 0000000..aee5674
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[篮球]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[米饭]@2x.png b/system/tuichat/src/main/assets/emoji/[米饭]@2x.png
new file mode 100644
index 0000000..2c469a9
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[米饭]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[糗大了]@2x.png b/system/tuichat/src/main/assets/emoji/[糗大了]@2x.png
new file mode 100644
index 0000000..4373f1b
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[糗大了]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[红双喜]@2x.png b/system/tuichat/src/main/assets/emoji/[红双喜]@2x.png
new file mode 100644
index 0000000..b37d964
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[红双喜]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[红灯笼]@2x.png b/system/tuichat/src/main/assets/emoji/[红灯笼]@2x.png
new file mode 100644
index 0000000..bb432af
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[红灯笼]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[纸巾]@2x.png b/system/tuichat/src/main/assets/emoji/[纸巾]@2x.png
new file mode 100644
index 0000000..10469fe
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[纸巾]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[胜利]@2x.png b/system/tuichat/src/main/assets/emoji/[胜利]@2x.png
new file mode 100644
index 0000000..ac5cefa
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[胜利]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[色]@2x.png b/system/tuichat/src/main/assets/emoji/[色]@2x.png
new file mode 100644
index 0000000..a45e109
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[色]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[药]@2x.png b/system/tuichat/src/main/assets/emoji/[药]@2x.png
new file mode 100644
index 0000000..1588f9e
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[药]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[菜刀]@2x.png b/system/tuichat/src/main/assets/emoji/[菜刀]@2x.png
new file mode 100644
index 0000000..69072bb
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[菜刀]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[蛋糕]@2x.png b/system/tuichat/src/main/assets/emoji/[蛋糕]@2x.png
new file mode 100644
index 0000000..279eb79
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[蛋糕]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[蜡烛]@2x.png b/system/tuichat/src/main/assets/emoji/[蜡烛]@2x.png
new file mode 100644
index 0000000..9f06f3e
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[蜡烛]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[街舞]@2x.png b/system/tuichat/src/main/assets/emoji/[街舞]@2x.png
new file mode 100644
index 0000000..c8045d8
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[街舞]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[衰]@2x.png b/system/tuichat/src/main/assets/emoji/[衰]@2x.png
new file mode 100644
index 0000000..b055d46
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[衰]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[西瓜]@2x.png b/system/tuichat/src/main/assets/emoji/[西瓜]@2x.png
new file mode 100644
index 0000000..0d79d2a
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[西瓜]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[调皮]@2x.png b/system/tuichat/src/main/assets/emoji/[调皮]@2x.png
new file mode 100644
index 0000000..11f0646
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[调皮]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[象棋]@2x.png b/system/tuichat/src/main/assets/emoji/[象棋]@2x.png
new file mode 100644
index 0000000..cf35cad
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[象棋]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[跳绳]@2x.png b/system/tuichat/src/main/assets/emoji/[跳绳]@2x.png
new file mode 100644
index 0000000..17cffd3
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[跳绳]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[跳跳]@2x.png b/system/tuichat/src/main/assets/emoji/[跳跳]@2x.png
new file mode 100644
index 0000000..b5646c6
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[跳跳]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[车厢]@2x.png b/system/tuichat/src/main/assets/emoji/[车厢]@2x.png
new file mode 100644
index 0000000..a1276eb
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[车厢]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[转圈]@2x.png b/system/tuichat/src/main/assets/emoji/[转圈]@2x.png
new file mode 100644
index 0000000..2c15311
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[转圈]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[鄙视]@2x.png b/system/tuichat/src/main/assets/emoji/[鄙视]@2x.png
new file mode 100644
index 0000000..65b1aec
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[鄙视]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[酷]@2x.png b/system/tuichat/src/main/assets/emoji/[酷]@2x.png
new file mode 100644
index 0000000..06d8163
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[酷]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[钞票]@2x.png b/system/tuichat/src/main/assets/emoji/[钞票]@2x.png
new file mode 100644
index 0000000..7218532
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[钞票]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[钻戒]@2x.png b/system/tuichat/src/main/assets/emoji/[钻戒]@2x.png
new file mode 100644
index 0000000..787cb6a
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[钻戒]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[闪电]@2x.png b/system/tuichat/src/main/assets/emoji/[闪电]@2x.png
new file mode 100644
index 0000000..84f1526
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[闪电]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[闭嘴]@2x.png b/system/tuichat/src/main/assets/emoji/[闭嘴]@2x.png
new file mode 100644
index 0000000..d1d3d3b
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[闭嘴]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[闹钟]@2x.png b/system/tuichat/src/main/assets/emoji/[闹钟]@2x.png
new file mode 100644
index 0000000..daade80
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[闹钟]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[阴险]@2x.png b/system/tuichat/src/main/assets/emoji/[阴险]@2x.png
new file mode 100644
index 0000000..e277198
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[阴险]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[难过]@2x.png b/system/tuichat/src/main/assets/emoji/[难过]@2x.png
new file mode 100644
index 0000000..35bd8ec
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[难过]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[雨伞]@2x.png b/system/tuichat/src/main/assets/emoji/[雨伞]@2x.png
new file mode 100644
index 0000000..5011da4
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[雨伞]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[青蛙]@2x.png b/system/tuichat/src/main/assets/emoji/[青蛙]@2x.png
new file mode 100644
index 0000000..4b69277
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[青蛙]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[面条]@2x.png b/system/tuichat/src/main/assets/emoji/[面条]@2x.png
new file mode 100644
index 0000000..78e8e71
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[面条]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[鞭炮]@2x.png b/system/tuichat/src/main/assets/emoji/[鞭炮]@2x.png
new file mode 100644
index 0000000..ec12c3e
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[鞭炮]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[风车]@2x.png b/system/tuichat/src/main/assets/emoji/[风车]@2x.png
new file mode 100644
index 0000000..02321c3
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[风车]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[飞吻]@2x.png b/system/tuichat/src/main/assets/emoji/[飞吻]@2x.png
new file mode 100644
index 0000000..a9a4e16
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[飞吻]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[飞机]@2x.png b/system/tuichat/src/main/assets/emoji/[飞机]@2x.png
new file mode 100644
index 0000000..f407930
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[飞机]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[饥饿]@2x.png b/system/tuichat/src/main/assets/emoji/[饥饿]@2x.png
new file mode 100644
index 0000000..5bbd805
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[饥饿]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[香蕉]@2x.png b/system/tuichat/src/main/assets/emoji/[香蕉]@2x.png
new file mode 100644
index 0000000..b3bde3c
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[香蕉]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[骷髅]@2x.png b/system/tuichat/src/main/assets/emoji/[骷髅]@2x.png
new file mode 100644
index 0000000..c4ee653
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[骷髅]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[麦克风]@2x.png b/system/tuichat/src/main/assets/emoji/[麦克风]@2x.png
new file mode 100644
index 0000000..0e0ae99
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[麦克风]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[麻将]@2x.png b/system/tuichat/src/main/assets/emoji/[麻将]@2x.png
new file mode 100644
index 0000000..011d8e2
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[麻将]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[鼓掌]@2x.png b/system/tuichat/src/main/assets/emoji/[鼓掌]@2x.png
new file mode 100644
index 0000000..18cd1d2
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[鼓掌]@2x.png differ
diff --git a/system/tuichat/src/main/assets/emoji/[龇牙]@2x.png b/system/tuichat/src/main/assets/emoji/[龇牙]@2x.png
new file mode 100644
index 0000000..4fed0fc
Binary files /dev/null and b/system/tuichat/src/main/assets/emoji/[龇牙]@2x.png differ
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/ITUIChatService.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/ITUIChatService.java
new file mode 100644
index 0000000..e04c86d
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/ITUIChatService.java
@@ -0,0 +1,62 @@
+package com.tencent.qcloud.tuikit.tuichat;
+
+import com.tencent.qcloud.tuicore.interfaces.ITUINotification;
+import com.tencent.qcloud.tuicore.interfaces.ITUIService;
+
+import java.util.Map;
+
+public interface ITUIChatService extends ITUIService, ITUINotification {
+    /**
+     * 1、发送消息
+     *   Send Message
+     * 
+     * @param method TUIConstants.TUIChat.METHOD_SEND_MESSAGE
+     * @param param {TUIConstants.TUIChat.CHAT_ID : String, TUIConstants.TUIChat.CHAT_TYPE : Integer,
+     *              TUIConstants.TUIChat.MESSAGE_CONTENT : String, TUIConstants.TUIChat.MESSAGE_DESCRIPTION : String,
+     *              TUIConstants.TUIChat.MESSAGE_EXTENSION : String}
+     * 2、退出聊天
+     *   Exit Chat
+     * 
+     * @param method TUIConstants.TUIChat.METHOD_EXIT_CHAT
+     * @param param {TUIConstants.TUIChat.CHAT_ID : String, TUIConstants.TUIChat.IS_GROUP_CHAT : Boolean}
+     *
+     * 3、获取消息摘要
+     *   Get message digest
+     * 
+     * @param method TUIConstants.TUIChat.METHOD_GET_DISPLAY_STRING
+     * @param param {TUIConstants.TUIChat.V2TIMMESSAGE : V2TIMMessage}
+     */
+    @Override
+    Object onCall(String method, Map<String, Object> param);
+
+    /**
+     * 1、接收退群通知
+     *   Receive exit group notifications
+     * 
+     * @param key TUIConstants.TUIGroup.EVENT_GROUP
+     * @param subKey TUIConstants.TUIGroup.EVENT_SUB_KEY_EXIT_GROUP,
+     *               TUIConstants.TUIGroup.EVENT_SUB_KEY_GROUP_DISMISS,
+     *               TUIConstants.TUIGroup.EVENT_SUB_KEY_GROUP_RECYCLE
+     * @param param {TUIConstants.TUIGroup.GROUP_ID : String}
+     * 2、接收群名称修改通知
+     *   Receive group name change notification
+     * 
+     * @param key TUIConstants.TUIGroup.EVENT_GROUP
+     * @param subKey TUIConstants.TUIGroup.EVENT_SUB_KEY_GROUP_INFO_CHANGED
+     * @param param {TUIConstants.TUIGroup.GROUP_ID : String, TUIConstants.TUIGroup.GROUP_NAME : String}
+     * 3、接收群成员退群通知
+     *   Receive group member withdrawal notification
+     * 
+     * @param key TUIConstants.TUIGroup.EVENT_GROUP
+     * @param subKey TUIConstants.TUIGroup.EVENT_SUB_KEY_MEMBER_KICKED_GROUP
+     * @param param {TUIConstants.TUIGroup.GROUP_ID : String, TUIConstants.TUIGroup.GROUP_MEMBER_ID_LIST : ArrayList<String>}
+     * 4、接收好友备注修改通知
+     *   Receive notifications of changes to friends' notes.
+     * 
+     * @param key TUIConstants.TUIContact.EVENT_FRIEND_INFO_CHANGED
+     * @param subKey TUIConstants.TUIContact.EVENT_SUB_KEY_FRIEND_REMARK_CHANGED
+     * @param param {TUIConstants.TUIContact.FRIEND_ID : String, TUIConstants.TUIContact.FRIEND_REMARK : String}
+     */
+    @Override
+    void onNotifyEvent(String key, String subKey, Map<String, Object> param);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/TUIChatConstants.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/TUIChatConstants.java
new file mode 100644
index 0000000..142ba25
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/TUIChatConstants.java
@@ -0,0 +1,115 @@
+package com.tencent.qcloud.tuikit.tuichat;
+
+import com.tencent.imsdk.BaseConstants;
+
+public class TUIChatConstants {
+    public static final String CHAT_SETTINGS_SP_NAME = "chat_settings_sp";
+    public static final String CHAT_REPLY_GUIDE_SHOW_SP_KEY = "chat_reply_guide_show";
+
+    public static final String CAMERA_IMAGE_PATH = "camera_image_path";
+    public static final String IMAGE_WIDTH = "image_width";
+    public static final String IMAGE_HEIGHT = "image_height";
+    public static final String VIDEO_TIME = "video_time";
+    public static final String CAMERA_VIDEO_PATH = "camera_video_path";
+    public static final String IMAGE_PREVIEW_PATH = "image_preview_path";
+    public static final String IS_ORIGIN_IMAGE = "is_origin_image";
+    public static final String CAMERA_TYPE = "camera_type";
+
+    public static final String BUSINESS_ID_CUSTOM_HELLO = "text_link";
+    public static final String BUSINESS_ID_CUSTOM_EVALUATION = "evaluation";
+    public static final String BUSINESS_ID_CUSTOM_ORDER = "order";
+    public static final String BUSINESS_ID_CUSTOM_TYPING = "user_typing_status";
+    //名片
+    public static final String BUSINESS_ID_BUSINESS_CARD = "business_card";
+    //档案
+    public static final String BUSINESS_ID_ARCHIVES = "archives";
+    //体检
+    public static final String BUSINESS_ID_MEDICAL_EXAMINATION_REPORT = "medical_examination_report";
+    //系统消息
+    public static final String BUSINESS_ID_SYSTEM = "system";
+    public static final String FORWARD_SELECT_CONVERSATION_KEY = "forward_select_conversation_key";
+    public static final int FORWARD_SELECT_ACTIVTY_CODE = 101;
+    public static final String FORWARD_MERGE_MESSAGE_KEY = "forward_merge_message_key";
+
+
+    public static final int GET_MESSAGE_FORWARD = 0;
+    public static final int GET_MESSAGE_BACKWARD = 1;
+    public static final int GET_MESSAGE_TWO_WAY = 2;
+    public static final int GET_MESSAGE_LOCATE = 3;
+
+    public static final String CHAT_INFO = "chatInfo";
+
+    public static final String MESSAGE_BEAN = "messageBean";
+
+    public static final String OPEN_MESSAGE_SCAN = "open_message_scan";
+    public static final String OPEN_MESSAGES_SCAN_FORWARD = "open_messages_scan_forward";
+
+    public static final String FORWARD_MODE = "forward_mode";//0,onebyone;  1,merge;
+    public static final int FORWARD_MODE_ONE_BY_ONE = 0;
+    public static final int FORWARD_MODE_MERGE = 1;
+
+    public static final String SELECT_FRIENDS = "select_friends";
+    public static final String GROUP_ID = "group_id";
+    public static final String SELECT_FOR_CALL = "isSelectForCall";
+
+    public static final String MESSAGE_REPLY_KEY = "messageReply";
+    public static final String MESSAGE_REPLIES_KEY = "messageReplies";
+    public static final String MESSAGE_REACT_KEY = "messageReact";
+    public static final String MESSAGE_FEATURE_KEY = "messageFeature";
+
+    public static final int TYPING_SEND_MESSAGE_INTERVAL = 4;
+    public static final int TYPING_PARSE_MESSAGE_INTERVAL = 5;
+    public static final int TYPING_TRIGGER_CHAT_TIME = 30; //second
+
+    public static final String EVENT_KEY_MESSAGE_STATUS_CHANGED = "eventKeyMessageStatusChanged";
+    public static final String EVENT_SUB_KEY_MESSAGE_SEND = "eventSubKeyMessageSend";
+
+    public static final String EVENT_KEY_OFFLINE_MESSAGE_PRIVATE_RING = "eventKeyOfflineMessagePrivteRing";
+    public static final String EVENT_SUB_KEY_OFFLINE_MESSAGE_PRIVATE_RING = "eventSubKeyOfflineMessagePrivteRing";
+    public static final String OFFLINE_MESSAGE_PRIVATE_RING = "offlineMessagePrivateRing";
+
+    public static final int ERR_SDK_INTERFACE_NOT_SUPPORT = BaseConstants.ERR_SDK_INTERFACE_NOT_SUPPORT;
+    public static final String BUYING_GUIDELINES_EN = "https://intl.cloud.tencent.com/document/product/1047/36021?lang=en&pg=#changing-configuration";
+    public static final String BUYING_GUIDELINES = "https://cloud.tencent.com/document/product/269/32458";
+    
+    /**
+     * 1: 仅仅是一个带链接的文本消息
+     * 2: iOS支持的视频通话版本，后续已经不兼容
+     * 3: 未发布版本
+     * 4: Android/iOS/Web互通的视频通话版本
+     * 
+     * 
+     * 1: Just a text message with a link
+     * 2: The video calling version supported by iOS is no longer compatible
+     * 3: unreleased version
+     * 4: Android/iOS/Web interoperable version for video call 
+     */
+    public static final int JSON_VERSION_UNKNOWN = 0;
+    public static final int JSON_VERSION_1       = 1;
+    public static final int JSON_VERSION_4       = 4;
+    public static int version = JSON_VERSION_4;
+
+    public static String covert2HTMLString(String original) {
+        return "\"<font color=\"#5B6B92\">" + original + "</font>\"";
+    }
+
+    public static final class Group {
+
+        public static final String GROUP_ID = "group_id";
+        public static final String GROUP_INFO = "groupInfo";
+        public static final String MEMBER_APPLY = "apply";
+    }
+
+    public static class Selection {
+        public static final String SELECT_ALL = "select_all";
+        public static final String LIMIT = "limit";
+
+        public static final String USER_ID_SELECT = "user_id_select";
+        public static final String USER_NAMECARD_SELECT = "user_namecard_select";
+    }
+
+    public static class DataStore {
+        public static final String DATA_STORE_NAME = "tuichat_datastore";
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/TUIChatService.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/TUIChatService.java
new file mode 100644
index 0000000..62e5822
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/TUIChatService.java
@@ -0,0 +1,622 @@
+package com.tencent.qcloud.tuikit.tuichat;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import androidx.datastore.preferences.core.Preferences;
+import androidx.datastore.preferences.rxjava3.RxPreferenceDataStoreBuilder;
+import androidx.datastore.rxjava3.RxDataStore;
+
+import com.tencent.imsdk.v2.V2TIMAdvancedMsgListener;
+import com.tencent.imsdk.v2.V2TIMFriendInfo;
+import com.tencent.imsdk.v2.V2TIMFriendshipListener;
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.imsdk.v2.V2TIMMessageReceipt;
+import com.tencent.imsdk.v2.V2TIMSDKListener;
+import com.tencent.qcloud.tuicore.ServiceInitializer;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageReceiptInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ArchivesMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.BusinessCardMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CustomEvaluationMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CustomLinkMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CustomOrderMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.MedicalExaminationReportMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.MessageTypingBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.SystemMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+import com.tencent.qcloud.tuikit.tuichat.config.TUIChatConfigs;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.AudioRecordEventListener;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.C2CChatEventListener;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.GroupChatEventListener;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.IBaseMessageSender;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.NetworkConnectionListener;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.TotalUnreadCountListener;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageBuilder;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageParser;
+import com.tencent.qcloud.tuikit.tuichat.util.DataStoreUtil;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+public class TUIChatService extends ServiceInitializer implements ITUIChatService {
+    public static final String TAG = TUIChatService.class.getSimpleName();
+    private static TUIChatService instance;
+
+    public static TUIChatService getInstance() {
+        return instance;
+    }
+
+    private final List<WeakReference<GroupChatEventListener>> groupChatEventListenerList = new ArrayList<>();
+
+    private final List<WeakReference<C2CChatEventListener>> c2CChatEventListenerList = new ArrayList<>();
+
+    private WeakReference<IBaseMessageSender> messageSender;
+
+    private final List<WeakReference<TotalUnreadCountListener>> unreadCountListenerList = new ArrayList<>();
+
+    private final List<WeakReference<NetworkConnectionListener>> connectListenerList = new ArrayList<>();
+
+    private final Map<String, Class<? extends TUIMessageBean>> customMessageMap = new HashMap<>();
+    private final List<WeakReference<AudioRecordEventListener>> audioRecordEventListenerList = new ArrayList<>();
+
+    private RxDataStore<Preferences> mChatDataStore = null;
+
+    @Override
+    public void init(Context context) {
+        instance = this;
+        initMessageType();
+        initService();
+        initEvent();
+        initIMListener();
+        initDataStore();
+    }
+
+    private void initService() {
+        TUICore.registerService(TUIConstants.TUIChat.SERVICE_NAME, this);
+    }
+
+    private void initDataStore() {
+        if (mChatDataStore == null) {
+            mChatDataStore = new RxPreferenceDataStoreBuilder(getAppContext(), TUIChatConstants.DataStore.DATA_STORE_NAME).build();
+        }
+        DataStoreUtil.getInstance().setDataStore(mChatDataStore);
+    }
+    
+    public RxDataStore<Preferences> getChatDataStore() {
+        return mChatDataStore;
+    }
+
+    private void initEvent() {
+        TUICore.registerEvent(TUIConstants.TUIGroup.EVENT_GROUP, TUIConstants.TUIGroup.EVENT_SUB_KEY_GROUP_INFO_CHANGED, this);
+        TUICore.registerEvent(TUIConstants.TUIGroup.EVENT_GROUP, TUIConstants.TUIGroup.EVENT_SUB_KEY_EXIT_GROUP, this);
+        TUICore.registerEvent(TUIConstants.TUIGroup.EVENT_GROUP, TUIConstants.TUIGroup.EVENT_SUB_KEY_MEMBER_KICKED_GROUP, this);
+        TUICore.registerEvent(TUIConstants.TUIGroup.EVENT_GROUP, TUIConstants.TUIGroup.EVENT_SUB_KEY_GROUP_DISMISS, this);
+        TUICore.registerEvent(TUIConstants.TUIGroup.EVENT_GROUP, TUIConstants.TUIGroup.EVENT_SUB_KEY_JOIN_GROUP, this);
+        TUICore.registerEvent(TUIConstants.TUIGroup.EVENT_GROUP, TUIConstants.TUIGroup.EVENT_SUB_KEY_INVITED_GROUP, this);
+        TUICore.registerEvent(TUIConstants.TUIGroup.EVENT_GROUP, TUIConstants.TUIGroup.EVENT_SUB_KEY_GROUP_RECYCLE, this);
+        TUICore.registerEvent(TUIConstants.TUIContact.EVENT_FRIEND_INFO_CHANGED, TUIConstants.TUIContact.EVENT_SUB_KEY_FRIEND_REMARK_CHANGED, this);
+        TUICore.registerEvent(TUIConstants.TUIGroup.EVENT_GROUP, TUIConstants.TUIGroup.EVENT_SUB_KEY_CLEAR_MESSAGE, this);
+        TUICore.registerEvent(TUIConstants.TUIContact.EVENT_USER, TUIConstants.TUIContact.EVENT_SUB_KEY_CLEAR_MESSAGE, this);
+        TUICore.registerEvent(TUIConstants.TUIConversation.EVENT_UNREAD, TUIConstants.TUIConversation.EVENT_SUB_KEY_UNREAD_CHANGED, this);
+        TUICore.registerEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED, TUIConstants.TUILogin.EVENT_SUB_KEY_USER_LOGIN_SUCCESS, this);
+        TUICore.registerEvent(TUIChatConstants.EVENT_KEY_MESSAGE_STATUS_CHANGED, TUIChatConstants.EVENT_SUB_KEY_MESSAGE_SEND, this);
+        TUICore.registerEvent(TUIConstants.TUICalling.EVENT_KEY_RECORD_AUDIO_MESSAGE, TUIConstants.TUICalling.EVENT_SUB_KEY_RECORD_START, this);
+        TUICore.registerEvent(TUIConstants.TUICalling.EVENT_KEY_RECORD_AUDIO_MESSAGE, TUIConstants.TUICalling.EVENT_SUB_KEY_RECORD_STOP, this);
+        TUICore.registerEvent(TUIChatConstants.EVENT_KEY_OFFLINE_MESSAGE_PRIVATE_RING, TUIChatConstants.EVENT_SUB_KEY_OFFLINE_MESSAGE_PRIVATE_RING, this);
+    }
+
+    @Override
+    public Object onCall(String method, Map<String, Object> param) {
+        if (TextUtils.equals(TUIConstants.TUIChat.METHOD_SEND_MESSAGE, method)) {
+            String chatId = (String) param.get(TUIConstants.TUIChat.CHAT_ID);
+            int chatType = (int) getOrDefault(param.get(TUIConstants.TUIChat.CHAT_TYPE), 0);
+            String content = (String) getOrDefault(param.get(TUIConstants.TUIChat.MESSAGE_CONTENT), "");
+            String description = (String) getOrDefault(param.get(TUIConstants.TUIChat.MESSAGE_DESCRIPTION), "");
+            String extension = (String) getOrDefault(param.get(TUIConstants.TUIChat.MESSAGE_EXTENSION), "");
+            IBaseMessageSender messageSender = getMessageSender();
+            if (messageSender != null) {
+                TUIMessageBean message = ChatMessageBuilder.buildCustomMessage(content, description, extension.getBytes());
+                messageSender.sendMessage(message, chatId, TUIChatUtils.isGroupChat(chatType));
+            }
+        } else if (TextUtils.equals(TUIConstants.TUIChat.METHOD_EXIT_CHAT, method)) {
+            String chatId = (String) param.get(TUIConstants.TUIChat.CHAT_ID);
+            boolean isGroupChat = (boolean) param.get(TUIConstants.TUIChat.IS_GROUP_CHAT);
+            if (isGroupChat) {
+                List<GroupChatEventListener> groupChatEventListenerList = getGroupChatEventListenerList();
+                for (GroupChatEventListener groupChatEventListener : groupChatEventListenerList) {
+                        groupChatEventListener.exitGroupChat(chatId);
+                }
+            } else {
+                List<C2CChatEventListener> c2CChatEventListenerList = getC2CChatEventListenerList();
+                for (C2CChatEventListener c2CChatEventListener : c2CChatEventListenerList) {
+                    c2CChatEventListener.exitC2CChat(chatId);
+                }
+            }
+        } else if (TextUtils.equals(TUIConstants.TUIChat.METHOD_GET_DISPLAY_STRING, method)) {
+            if (param != null) {
+                V2TIMMessage v2TIMMessage = (V2TIMMessage) param.get(TUIConstants.TUIChat.V2TIMMESSAGE);
+                if (v2TIMMessage != null) {
+                    return ChatMessageParser.getDisplayString(v2TIMMessage);
+                }
+            }
+        } else if (TextUtils.equals(TUIConstants.TUIChat.METHOD_ADD_MESSAGE_TO_CHAT, method)) {
+            TUIMessageBean messageBean = (TUIMessageBean) param.get(TUIConstants.TUIChat.MESSAGE_BEAN);
+            String chatId = (String) param.get(TUIConstants.TUIChat.CHAT_ID);
+            boolean isGroupChat = (boolean) param.get(TUIConstants.TUIChat.IS_GROUP_CHAT);
+            if (isGroupChat) {
+                List<GroupChatEventListener> groupChatEventListenerList = getGroupChatEventListenerList();
+                for (GroupChatEventListener groupChatEventListener : groupChatEventListenerList) {
+                    groupChatEventListener.addMessage(messageBean, chatId);
+                }
+            } else {
+                List<C2CChatEventListener> c2CChatEventListenerList = getC2CChatEventListenerList();
+                for (C2CChatEventListener c2CChatEventListener : c2CChatEventListenerList) {
+                    c2CChatEventListener.addMessage(messageBean, chatId);
+                }
+            }
+        } else if (TextUtils.equals(TUIConstants.TUIChat.METHOD_GROUP_APPLICAITON_PROCESSED, method)) {
+            int number = (int) param.get(TUIConstants.TUIChat.GROUP_APPLY_NUM);
+            boolean isGroupChat = (boolean) param.get(TUIConstants.TUIChat.IS_GROUP_CHAT);
+            if (isGroupChat) {
+                List<GroupChatEventListener> groupChatEventListenerList = getGroupChatEventListenerList();
+                for (GroupChatEventListener groupChatEventListener : groupChatEventListenerList) {
+                    groupChatEventListener.onApplied(number);
+                }
+            }
+        } else if (TextUtils.equals(TUIConstants.TUIChat.METHOD_UPDATE_DATA_STORE_CHAT_URI, method)) {
+            String uri = (String) param.get(TUIConstants.TUIChat.CHAT_BACKGROUND_URI);
+            String chatId = (String) param.get(TUIConstants.TUIChat.CHAT_ID);
+            if (!TextUtils.isEmpty(uri)) {
+                DataStoreUtil.getInstance().putValue(chatId, uri);
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public void onNotifyEvent(String key, String subKey, Map<String, Object> param) {
+        if (TextUtils.equals(key, TUIConstants.TUIGroup.EVENT_GROUP)) {
+            if (TextUtils.equals(subKey, TUIConstants.TUIGroup.EVENT_SUB_KEY_EXIT_GROUP)
+                    || TextUtils.equals(subKey, TUIConstants.TUIGroup.EVENT_SUB_KEY_GROUP_DISMISS)
+                    || TextUtils.equals(subKey, TUIConstants.TUIGroup.EVENT_SUB_KEY_GROUP_RECYCLE)) {
+                List<GroupChatEventListener> groupChatEventListenerList = getGroupChatEventListenerList();
+                String groupId = null;
+                if (param != null) {
+                    groupId = (String) getOrDefault(param.get(TUIConstants.TUIGroup.GROUP_ID), "");
+                }
+                for(GroupChatEventListener groupChatEventListener : groupChatEventListenerList) {
+                    groupChatEventListener.onGroupForceExit(groupId);
+                }
+            } else if (TextUtils.equals(subKey, TUIConstants.TUIGroup.EVENT_SUB_KEY_GROUP_INFO_CHANGED)) {
+                if (param == null) {
+                    return;
+                }
+                String newGroupName = (String) getOrDefault(param.get(TUIConstants.TUIGroup.GROUP_NAME), null);
+                String groupId = (String) getOrDefault(param.get(TUIConstants.TUIGroup.GROUP_ID), "");
+                String groupFaceUrl = (String) getOrDefault(param.get(TUIConstants.TUIGroup.GROUP_FACE_URL), null);
+
+
+                if (TextUtils.isEmpty(groupId)) {
+                    return;
+                }
+                if (!TextUtils.isEmpty(newGroupName)) {
+                    List<GroupChatEventListener> groupChatEventListenerList = getGroupChatEventListenerList();
+                    for (GroupChatEventListener groupChatEventListener : groupChatEventListenerList) {
+                        groupChatEventListener.onGroupNameChanged(groupId, newGroupName);
+                    }
+                }
+                if (!TextUtils.isEmpty(groupFaceUrl)) {
+                    List<GroupChatEventListener> groupChatEventListenerList = getGroupChatEventListenerList();
+                    for (GroupChatEventListener groupChatEventListener : groupChatEventListenerList) {
+                        groupChatEventListener.onGroupFaceUrlChanged(groupId, groupFaceUrl);
+                    }
+                }
+            } else if (TextUtils.equals(subKey, TUIConstants.TUIGroup.EVENT_SUB_KEY_MEMBER_KICKED_GROUP)) {
+                if (param == null) {
+                    return;
+                }
+                String groupId = (String) getOrDefault(param.get(TUIConstants.TUIGroup.GROUP_ID), "");
+                ArrayList<String> memberList = (ArrayList<String>) param.get(TUIConstants.TUIGroup.GROUP_MEMBER_ID_LIST);
+                if (TextUtils.isEmpty(groupId) || memberList == null || memberList.isEmpty()) {
+                    return;
+                }
+                String selfId = TUILogin.getLoginUser();
+                if (memberList.contains(selfId)) {
+                    List<GroupChatEventListener> groupChatEventListenerList = getGroupChatEventListenerList();
+                    for(GroupChatEventListener groupChatEventListener : groupChatEventListenerList) {
+                        groupChatEventListener.onGroupForceExit(groupId);
+                    }
+                }
+            } else if (TextUtils.equals(subKey, TUIConstants.TUIGroup.EVENT_SUB_KEY_CLEAR_MESSAGE)) {
+                String groupId = (String) getOrDefault(param.get(TUIConstants.TUIGroup.GROUP_ID), "");
+                List<GroupChatEventListener> groupChatEventListenerList = getGroupChatEventListenerList();
+                for(GroupChatEventListener groupChatEventListener : groupChatEventListenerList) {
+                    groupChatEventListener.clearGroupMessage(groupId);
+                }
+            }
+        } else if (key.equals(TUIConstants.TUIContact.EVENT_USER)) {
+            if (subKey.equals(TUIConstants.TUIContact.EVENT_SUB_KEY_CLEAR_MESSAGE)) {
+                if (param == null || param.isEmpty()) {
+                    return;
+                }
+                String userID = (String) getOrDefault(param.get(TUIConstants.TUIContact.FRIEND_ID), "");
+                List<C2CChatEventListener> c2CChatEventListenerList = getC2CChatEventListenerList();
+                for(C2CChatEventListener c2CChatEventListener : c2CChatEventListenerList) {
+                    c2CChatEventListener.clearC2CMessage(userID);
+                }
+            }
+        } else if (key.equals(TUIConstants.TUIContact.EVENT_FRIEND_INFO_CHANGED)) {
+            if (subKey.equals(TUIConstants.TUIContact.EVENT_SUB_KEY_FRIEND_REMARK_CHANGED)) {
+                if (param == null || param.isEmpty()) {
+                    return;
+                }
+                String id = (String) param.get(TUIConstants.TUIContact.FRIEND_ID);
+                String remark = (String) param.get(TUIConstants.TUIContact.FRIEND_REMARK);
+                List<C2CChatEventListener> c2CChatEventListenerList = getC2CChatEventListenerList();
+                for(C2CChatEventListener c2CChatEventListener : c2CChatEventListenerList) {
+                    c2CChatEventListener.onFriendNameChanged(id, remark);
+                }
+            }
+        } else if (key.equals(TUIConstants.TUIConversation.EVENT_UNREAD)) {
+            if (subKey.equals(TUIConstants.TUIConversation.EVENT_SUB_KEY_UNREAD_CHANGED)) {
+                long unreadCount = (long) param.get(TUIConstants.TUIConversation.TOTAL_UNREAD_COUNT);
+                List<TotalUnreadCountListener> totalUnreadCountListenerList = getUnreadCountListenerList();
+                for (TotalUnreadCountListener totalUnreadCountListener : totalUnreadCountListenerList) {
+                    totalUnreadCountListener.onTotalUnreadCountChanged(unreadCount);
+                }
+            }
+        } else if (TextUtils.equals(key, TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED)) {
+            if (TextUtils.equals(subKey, TUIConstants.TUILogin.EVENT_SUB_KEY_USER_LOGIN_SUCCESS)) {
+                // 加载默认 emoji 小表情
+                // load default emojis
+                FaceManager.loadEmojis();
+                // 设置音视频通话的悬浮窗是否开启
+                // Set whether to open the floating window for voice and video calls
+                Map<String, Object> enableFloatWindowParam = new HashMap<>();
+                enableFloatWindowParam.put(TUIConstants.TUICalling.PARAM_NAME_ENABLE_FLOAT_WINDOW, TUIChatConfigs.getConfigs().getGeneralConfig().isEnableFloatWindowForCall());
+                TUICore.callService(TUIConstants.TUICalling.SERVICE_NAME, TUIConstants.TUICalling.METHOD_NAME_ENABLE_FLOAT_WINDOW, enableFloatWindowParam);
+
+                // 设置音视频通话开启多端登录功能
+                // Set Whether to enable multi-terminal login function for audio and video calls
+                Map<String, Object> enableMultiDeviceParam = new HashMap<>();
+                enableMultiDeviceParam.put(TUIConstants.TUICalling.PARAM_NAME_ENABLE_MULTI_DEVICE, TUIChatConfigs.getConfigs().getGeneralConfig().isEnableMultiDeviceForCall());
+                TUICore.callService(TUIConstants.TUICalling.SERVICE_NAME, TUIConstants.TUICalling.METHOD_NAME_ENABLE_MULTI_DEVICE, enableMultiDeviceParam);
+            }
+        } else if (TextUtils.equals(key, TUIChatConstants.EVENT_KEY_MESSAGE_STATUS_CHANGED)) {
+            if (TextUtils.equals(subKey, TUIChatConstants.EVENT_SUB_KEY_MESSAGE_SEND)) {
+                Object msgBeanObj = param.get(TUIChatConstants.MESSAGE_BEAN);
+                if (msgBeanObj instanceof TUIMessageBean) {
+                    List<GroupChatEventListener> groupChatEventListenerList = getGroupChatEventListenerList();
+                    for (GroupChatEventListener groupChatEventListener : groupChatEventListenerList) {
+                        groupChatEventListener.onMessageChanged((TUIMessageBean) msgBeanObj);
+                    }
+                    List<C2CChatEventListener> c2CChatEventListenerList = getC2CChatEventListenerList();
+                    for (C2CChatEventListener c2CChatEventListener : c2CChatEventListenerList) {
+                        c2CChatEventListener.onMessageChanged((TUIMessageBean) msgBeanObj);
+                    }
+                }
+            }
+        } else if (TextUtils.equals(key, TUIConstants.TUICalling.EVENT_KEY_RECORD_AUDIO_MESSAGE)) {
+            if (param == null) {
+                return;
+            }
+
+            int errorCode = (int) getOrDefault(param.get("errorCode"), TUIConstants.TUICalling.ERROR_INVALID_PARAM);
+            String path = (String) getOrDefault(param.get(TUIConstants.TUICalling.PARAM_NAME_AUDIO_PATH), "");
+            for (AudioRecordEventListener audioRecordEventListener : getAudioRecordEventListenerList()) {
+                if (TextUtils.equals(subKey, TUIConstants.TUICalling.EVENT_SUB_KEY_RECORD_START)) {
+                    audioRecordEventListener.onRecordBegin(errorCode, path);
+                } else if (TextUtils.equals(subKey, TUIConstants.TUICalling.EVENT_SUB_KEY_RECORD_STOP)) {
+                    audioRecordEventListener.onRecordComplete(errorCode, path);
+                }
+            }
+        } else if (TextUtils.equals(key, TUIChatConstants.EVENT_KEY_OFFLINE_MESSAGE_PRIVATE_RING)) {
+            if (TextUtils.equals(subKey, TUIChatConstants.EVENT_SUB_KEY_OFFLINE_MESSAGE_PRIVATE_RING)) {
+                Boolean isPrivateRing = (Boolean) param.get(TUIChatConstants.OFFLINE_MESSAGE_PRIVATE_RING);
+                TUIChatConfigs.getConfigs().getGeneralConfig().setAndroidPrivateRing(isPrivateRing);
+            }
+        }
+    }
+
+    private Object getOrDefault(Object value, Object defaultValue) {
+        if (value != null) {
+            return value;
+        }
+        return defaultValue;
+    }
+
+    private void initIMListener() {
+        V2TIMManager.getMessageManager().addAdvancedMsgListener(new V2TIMAdvancedMsgListener() {
+            @Override
+            public void onRecvNewMessage(V2TIMMessage msg) {
+                TUIMessageBean message = ChatMessageParser.parseMessage(msg);
+                if (message == null) {
+                    return;
+                }
+
+                HashMap<String, Object> param = new HashMap<>();
+                String conversationID;
+                if (TextUtils.isEmpty(msg.getGroupID())) {
+                    List<C2CChatEventListener> c2CChatEventListenerList = getInstance().getC2CChatEventListenerList();
+                    for (C2CChatEventListener c2CChatEventListener : c2CChatEventListenerList) {
+                        c2CChatEventListener.onRecvNewMessage(message);
+                    }
+                    conversationID = TUIConstants.TUIConversation.CONVERSATION_C2C_PREFIX + msg.getUserID();
+                    if (message instanceof MessageTypingBean) {
+                        param.put(TUIConstants.TUIChat.IS_TYPING_MESSAGE, true);
+                    } else {
+                        param.put(TUIConstants.TUIChat.IS_TYPING_MESSAGE, false);
+                    }
+                } else {
+                    List<GroupChatEventListener> groupChatEventListenerList = getInstance().getGroupChatEventListenerList();
+                    for (GroupChatEventListener groupChatEventListener : groupChatEventListenerList) {
+                        groupChatEventListener.onRecvNewMessage(message);
+                    }
+                    conversationID = TUIConstants.TUIConversation.CONVERSATION_GROUP_PREFIX + msg.getGroupID();
+                }
+
+                param.put(TUIConstants.TUIChat.CONVERSATION_ID, conversationID);
+                TUICore.notifyEvent(TUIConstants.TUIChat.EVENT_KEY_RECEIVE_MESSAGE, TUIConstants.TUIChat.EVENT_SUB_KEY_CONVERSATION_ID, param);
+            }
+
+            @Override
+            public void onRecvMessageReadReceipts(List<V2TIMMessageReceipt> receiptList) {
+                List<C2CChatEventListener> c2CChatEventListenerList = getInstance().getC2CChatEventListenerList();
+                List<GroupChatEventListener> groupChatEventListenerList = getInstance().getGroupChatEventListenerList();
+
+                List<MessageReceiptInfo> messageReceiptInfos = new ArrayList<>();
+                for (V2TIMMessageReceipt messageReceipt : receiptList) {
+                    MessageReceiptInfo messageReceiptInfo = new MessageReceiptInfo();
+                    messageReceiptInfo.setMessageReceipt(messageReceipt);
+                    messageReceiptInfos.add(messageReceiptInfo);
+                }
+                for (GroupChatEventListener groupChatEventListener : groupChatEventListenerList) {
+                    groupChatEventListener.onReadReport(messageReceiptInfos);
+                }
+                for (C2CChatEventListener c2CChatEventListener : c2CChatEventListenerList) {
+                    c2CChatEventListener.onReadReport(messageReceiptInfos);
+                }
+            }
+
+            @Override
+            public void onRecvMessageRevoked(String msgId) {
+                List<C2CChatEventListener> c2CChatEventListenerList = getInstance().getC2CChatEventListenerList();
+                for (C2CChatEventListener c2CChatEventListener : c2CChatEventListenerList) {
+                    c2CChatEventListener.handleRevoke(msgId);
+                }
+                List<GroupChatEventListener> groupChatEventListenerList = getInstance().getGroupChatEventListenerList();
+                for (GroupChatEventListener groupChatEventListener : groupChatEventListenerList) {
+                    groupChatEventListener.handleRevoke(msgId);
+                }
+            }
+
+            @Override
+            public void onRecvMessageModified(V2TIMMessage msg) {
+                TUIMessageBean message = ChatMessageParser.parseMessage(msg);
+                if (message == null) {
+                    return;
+                }
+                List<C2CChatEventListener> c2CChatEventListenerList = getInstance().getC2CChatEventListenerList();
+                for (C2CChatEventListener c2CChatEventListener : c2CChatEventListenerList) {
+                    c2CChatEventListener.onRecvMessageModified(message);
+                }
+                List<GroupChatEventListener> groupChatEventListenerList = getInstance().getGroupChatEventListenerList();
+                for (GroupChatEventListener groupChatEventListener : groupChatEventListenerList) {
+                    groupChatEventListener.onRecvMessageModified(message);
+                }
+                TUIChatLog.i(TAG, "onRecvMessageModified msgID:" + msg.getMsgID());
+            }
+        });
+
+        V2TIMManager.getFriendshipManager().addFriendListener(new V2TIMFriendshipListener() {
+            @Override
+            public void onFriendInfoChanged(List<V2TIMFriendInfo> infoList) {
+                List<C2CChatEventListener> c2CChatEventListenerList = getInstance().getC2CChatEventListenerList();
+                for (C2CChatEventListener c2CChatEventListener : c2CChatEventListenerList) {
+                    for (V2TIMFriendInfo info : infoList) {
+                        if (TextUtils.isEmpty(info.getFriendRemark())) {
+                            String nickName = info.getUserProfile().getNickName();
+                            if (TextUtils.isEmpty(nickName)) {
+                                c2CChatEventListener.onFriendNameChanged(info.getUserID(), info.getUserID());
+                            } else {
+                                c2CChatEventListener.onFriendNameChanged(info.getUserID(), nickName);
+                            }
+                        } else {
+                            c2CChatEventListener.onFriendNameChanged(info.getUserID(), info.getFriendRemark());
+                        }
+                        c2CChatEventListener.onFriendFaceUrlChanged(info.getUserID(), info.getUserProfile().getFaceUrl());
+                    }
+                }
+            }
+        });
+
+        V2TIMManager.getInstance().addIMSDKListener(new V2TIMSDKListener() {
+            @Override
+            public void onConnectSuccess() {
+                for (WeakReference<NetworkConnectionListener> listenerWeakReference : connectListenerList) {
+                    NetworkConnectionListener listener = listenerWeakReference.get();
+                    if (listener != null) {
+                        listener.onConnected();
+                    }
+                }
+            }
+        });
+    }
+
+    public void registerNetworkListener(NetworkConnectionListener listener) {
+        if (listener == null) {
+            return;
+        }
+
+        for (WeakReference<NetworkConnectionListener> weakReference : connectListenerList) {
+            NetworkConnectionListener networkConnectionListener = weakReference.get();
+            if (networkConnectionListener == listener) {
+                return;
+            }
+        }
+
+        WeakReference<NetworkConnectionListener> weakReference = new WeakReference<>(listener);
+        connectListenerList.add(weakReference);
+    }
+
+    // 初始化自定义消息类型
+    // Initialize custom message types
+    private void initMessageType() {
+        addCustomMessageType(TUIChatConstants.BUSINESS_ID_CUSTOM_HELLO, CustomLinkMessageBean.class);
+        addCustomMessageType(TUIChatConstants.BUSINESS_ID_CUSTOM_EVALUATION, CustomEvaluationMessageBean.class);
+        addCustomMessageType(TUIChatConstants.BUSINESS_ID_CUSTOM_ORDER, CustomOrderMessageBean.class);
+        addCustomMessageType(TUIChatConstants.BUSINESS_ID_CUSTOM_TYPING, MessageTypingBean.class);
+        addCustomMessageType(TUIChatConstants.BUSINESS_ID_BUSINESS_CARD, BusinessCardMessageBean.class);
+        addCustomMessageType(TUIChatConstants.BUSINESS_ID_ARCHIVES, ArchivesMessageBean.class);
+        addCustomMessageType(TUIChatConstants.BUSINESS_ID_MEDICAL_EXAMINATION_REPORT, MedicalExaminationReportMessageBean.class);
+        addCustomMessageType(TUIChatConstants.BUSINESS_ID_SYSTEM, SystemMessageBean.class);
+    }
+
+    /**
+     * 注册自定义消息类型
+     * @param businessId 自定义消息唯一标识（注意不能重复）
+     * @param beanClass 消息 MessageBean 类型
+     *
+     * Register a custom message type
+     * @param businessId Custom message unique identifier（cannot be repeated）
+     * @param beanClass  MessageBean type
+     */
+    private void addCustomMessageType(String businessId, Class<? extends TUIMessageBean> beanClass) {
+        customMessageMap.put(businessId, beanClass);
+    }
+
+    public Class<? extends TUIMessageBean> getMessageBeanClass(String businessId) {
+        return customMessageMap.get(businessId);
+    }
+
+    private List<GroupChatEventListener> getGroupChatEventListenerList() {
+        List<GroupChatEventListener> listeners = new ArrayList<>();
+        Iterator<WeakReference<GroupChatEventListener>> iterator = groupChatEventListenerList.listIterator();
+        while(iterator.hasNext()) {
+            WeakReference<GroupChatEventListener> listenerWeakReference = iterator.next();
+            GroupChatEventListener listener = listenerWeakReference.get();
+            if (listener == null) {
+                iterator.remove();
+            } else {
+                listeners.add(listener);
+            }
+        }
+        return listeners;
+    }
+
+    public void addGroupChatEventListener(GroupChatEventListener groupChatListener) {
+        if (groupChatListener == null) {
+            return;
+        }
+        for (WeakReference<GroupChatEventListener> listenerWeakReference : groupChatEventListenerList) {
+            if (listenerWeakReference.get() == groupChatListener) {
+                return;
+            }
+        }
+        groupChatEventListenerList.add(new WeakReference<>(groupChatListener));
+    }
+
+    private List<C2CChatEventListener> getC2CChatEventListenerList() {
+        List<C2CChatEventListener> listeners = new ArrayList<>();
+        Iterator<WeakReference<C2CChatEventListener>> iterator = c2CChatEventListenerList.listIterator();
+        while(iterator.hasNext()) {
+            WeakReference<C2CChatEventListener> listenerWeakReference = iterator.next();
+            C2CChatEventListener listener = listenerWeakReference.get();
+            if (listener == null) {
+                iterator.remove();
+            } else {
+                listeners.add(listener);
+            }
+        }
+        return listeners;
+    }
+
+    public void addC2CChatEventListener(C2CChatEventListener c2cChatEventListener) {
+        if (c2cChatEventListener == null) {
+            return;
+        }
+        for (WeakReference<C2CChatEventListener> listenerWeakReference : c2CChatEventListenerList) {
+            if (listenerWeakReference.get() == c2cChatEventListener) {
+                return;
+            }
+        }
+        c2CChatEventListenerList.add(new WeakReference<>(c2cChatEventListener));    }
+
+    public void setMessageSender(IBaseMessageSender baseMessageSender) {
+        messageSender = new WeakReference<>(baseMessageSender);
+    }
+
+    public void addUnreadCountListener(TotalUnreadCountListener unreadCountListener) {
+        if (unreadCountListener == null) {
+            return;
+        }
+        for (WeakReference<TotalUnreadCountListener> listenerWeakReference : unreadCountListenerList) {
+            if (listenerWeakReference.get() == unreadCountListener) {
+                return;
+            }
+        }
+        unreadCountListenerList.add(new WeakReference<>(unreadCountListener));
+    }
+
+
+    private List<TotalUnreadCountListener> getUnreadCountListenerList() {
+        List<TotalUnreadCountListener> listeners = new ArrayList<>();
+        Iterator<WeakReference<TotalUnreadCountListener>> iterator = unreadCountListenerList.listIterator();
+        while(iterator.hasNext()) {
+            WeakReference<TotalUnreadCountListener> listenerWeakReference = iterator.next();
+            TotalUnreadCountListener listener = listenerWeakReference.get();
+            if (listener == null) {
+                iterator.remove();
+            } else {
+                listeners.add(listener);
+            }
+        }
+        return listeners;
+    }
+
+    public void addAudioRecordEventListener(AudioRecordEventListener audioRecordEventListener) {
+        if (audioRecordEventListener == null) {
+            return;
+        }
+
+        for (WeakReference<AudioRecordEventListener> listenerWeakReference : audioRecordEventListenerList) {
+            if (listenerWeakReference.get() == audioRecordEventListener) {
+                return;
+            }
+        }
+        audioRecordEventListenerList.add(new WeakReference<>(audioRecordEventListener));
+    }
+
+    public List<AudioRecordEventListener> getAudioRecordEventListenerList() {
+        List<AudioRecordEventListener> listeners = new ArrayList<>();
+        Iterator<WeakReference<AudioRecordEventListener>> iterator = audioRecordEventListenerList.listIterator();
+        while(iterator.hasNext()) {
+            WeakReference<AudioRecordEventListener> listenerWeakReference = iterator.next();
+            AudioRecordEventListener listener = listenerWeakReference.get();
+            if (listener == null) {
+                iterator.remove();
+            } else {
+                listeners.add(listener);
+            }
+        }
+        return listeners;
+    }
+
+    private IBaseMessageSender getMessageSender() {
+        if (messageSender != null) {
+            return messageSender.get();
+        }
+        return null;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/CallModel.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/CallModel.java
new file mode 100644
index 0000000..1f48d35
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/CallModel.java
@@ -0,0 +1,288 @@
+package com.tencent.qcloud.tuikit.tuichat.bean;
+
+import android.text.TextUtils;
+
+import com.google.gson.Gson;
+import com.google.gson.annotations.SerializedName;
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.imsdk.v2.V2TIMSignalingInfo;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CallingMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class CallModel implements Cloneable, Serializable {
+
+    private static final String TAG = CallModel.class.getSimpleName();
+
+    /**
+     * 系统错误
+     * 
+     * system error
+     */
+    public static final int VIDEO_CALL_ACTION_ERROR           = -1;
+    /**
+     * 未知信令
+     * 
+     * unknown signaling
+     */
+    public static final int VIDEO_CALL_ACTION_UNKNOWN         = 0;
+    /**
+     * 正在呼叫
+     * 
+     * calling
+     */
+    public static final int VIDEO_CALL_ACTION_DIALING         = 1;
+    /**
+     * 发起人取消
+     * 
+     * initiator cancellation
+     */
+    public static final int VIDEO_CALL_ACTION_SPONSOR_CANCEL  = 2;
+    /**
+     * 拒接电话
+     * 
+     * reject the call
+     */
+    public static final int VIDEO_CALL_ACTION_REJECT          = 3;
+    /**
+     * 无人接听
+     * 
+     * no one heard
+     */
+    public static final int VIDEO_CALL_ACTION_SPONSOR_TIMEOUT = 4;
+    /**
+     * 挂断
+     * 
+     * hang up
+     */
+    public static final int VIDEO_CALL_ACTION_HANGUP          = 5;
+    /**
+     * 电话占线
+     * 
+     * phone busy
+     */
+    public static final int VIDEO_CALL_ACTION_LINE_BUSY       = 6;
+    /**
+     * 接听电话
+     * 
+     * answer the phone
+     */
+    public static final int VIDEO_CALL_ACTION_ACCEPT          = 7;
+
+    public static final int VIDEO_CALL_ACTION_SWITCH_TO_AUDIO = 8;
+
+    public static final int VIDEO_CALL_ACTION_SWITCH_TO_AUDIO_ACCEPT = 9;
+
+    public static final int VIDEO_CALL_ACTION_UNKNOWN_INVITE = 10;
+
+    public static String SIGNALING_EXTRA_VALUE_BUSINESS_ID = "av_call";
+
+    public static String SIGNALING_EXTRA_KEY_BUSINESS_ID = "businessID";
+    public static String SIGNALING_EXTRA_KEY_CALL_TYPE   = "call_type";
+    public static String SIGNALING_EXTRA_KEY_ROOM_ID     = "room_id";
+    public static String SIGNALING_EXTRA_KEY_LINE_BUSY   = "line_busy";
+    public static String SIGNALING_EXTRA_KEY_CALL_END    = "call_end";
+    public static String SIGNALING_EXTRA_KEY_VERSION     = "version";
+
+    @SerializedName("businessID")
+    public String bussinessID;
+
+    @SerializedName("version")
+    public int version = 0;
+
+    /**
+     * 表示一次通话的唯一ID
+     * 
+     * call ID
+     */
+    @SerializedName("call_id")
+    public String callId;
+
+    /**
+     * TRTC的房间号
+     * 
+     * room ID
+     */
+    @SerializedName("room_id")
+    public int roomId  = 0;
+
+    /**
+     * IM的群组id，在群组内发起通话时使用
+     * 
+     * group ID
+     */
+    @SerializedName("group_id")
+    public String groupId = "";
+
+    /**
+     * 信令动作
+     * 
+     * signaling action
+     */
+    @SerializedName("action")
+    public int action = VIDEO_CALL_ACTION_UNKNOWN;
+
+    /**
+     * 通话类型
+     * 0-未知
+     * 1-语音通话
+     * 2-视频通话
+     * 
+     * call type
+     * 0-unkown
+     * 1-audio call
+     * 2-video call
+     */
+    @SerializedName("call_type")
+    public int callType = 0;
+
+    /**
+     * 正在邀请的列表
+     * 
+     * Inviting list
+     */
+    @SerializedName("invited_list")
+    public List<String> invitedList;
+
+    @SerializedName("duration")
+    public int duration = 0;
+
+    @SerializedName("code")
+    public int code = 0;
+
+    public long timestamp;
+    public String sender;
+    // 超时时间，单位秒
+    // seconds
+    public int timeout;
+    public String data;
+
+    public static CallModel convert2VideoCallData(V2TIMMessage msg) {
+        V2TIMSignalingInfo signalingInfo = V2TIMManager.getSignalingManager().getSignalingInfo(msg);
+        if (signalingInfo == null) {
+            return null;
+        }
+        Gson gson = new Gson();
+        CallModel callModel = new CallModel();
+        try {
+            Map extraMap = gson.fromJson(signalingInfo.getData(), Map.class);
+            if (extraMap != null
+                    && extraMap.containsKey(CallModel.SIGNALING_EXTRA_KEY_VERSION)
+                    && ((Double)extraMap.get(CallModel.SIGNALING_EXTRA_KEY_VERSION)).intValue() > TUIChatConstants.version) {
+                callModel.action = CallModel.VIDEO_CALL_ACTION_UNKNOWN;
+                return callModel;
+            }
+            callModel.data = signalingInfo.getData();
+            if (extraMap != null) {
+                callModel.callType = ((Double)extraMap.get(TUIConstants.Message.CALLING_TYPE_KEY)).intValue();
+                callModel.bussinessID = (String) extraMap.get(CallModel.SIGNALING_EXTRA_KEY_BUSINESS_ID);
+            }
+            if (signalingInfo.getActionType() == V2TIMSignalingInfo.SIGNALING_ACTION_TYPE_INVITE && extraMap != null) {
+                handleInvite(msg, signalingInfo, gson, callModel, extraMap);
+            } else if (signalingInfo.getActionType() == V2TIMSignalingInfo.SIGNALING_ACTION_TYPE_CANCEL_INVITE) {
+                callModel.action = CallModel.VIDEO_CALL_ACTION_SPONSOR_CANCEL;
+                callModel.groupId = signalingInfo.getGroupID();
+                callModel.callId = signalingInfo.getInviteID();
+                callModel.version = ((Double)extraMap.get(CallModel.SIGNALING_EXTRA_KEY_VERSION)).intValue();
+            } else if (signalingInfo.getActionType() == V2TIMSignalingInfo.SIGNALING_ACTION_TYPE_REJECT_INVITE && extraMap != null) {
+                callModel.groupId = signalingInfo.getGroupID();
+                callModel.callId = signalingInfo.getInviteID();
+                callModel.invitedList = signalingInfo.getInviteeList();
+                callModel.version = ((Double)extraMap.get(CallModel.SIGNALING_EXTRA_KEY_VERSION)).intValue();
+                if (extraMap.containsKey(CallModel.SIGNALING_EXTRA_KEY_LINE_BUSY)) {
+                    callModel.action = CallModel.VIDEO_CALL_ACTION_LINE_BUSY;
+                } else {
+                    callModel.action = CallModel.VIDEO_CALL_ACTION_REJECT;
+                }
+            } else if (signalingInfo.getActionType() == V2TIMSignalingInfo.SIGNALING_ACTION_TYPE_INVITE_TIMEOUT) {
+                callModel.action = CallModel.VIDEO_CALL_ACTION_SPONSOR_TIMEOUT;
+                callModel.groupId = signalingInfo.getGroupID();
+                callModel.callId = signalingInfo.getInviteID();
+                callModel.invitedList = signalingInfo.getInviteeList();
+            } else if (signalingInfo.getActionType() == V2TIMSignalingInfo.SIGNALING_ACTION_TYPE_ACCEPT_INVITE) {
+                handleAccept(signalingInfo, callModel, extraMap);
+            }
+
+        } catch (Exception e) {
+            TUIChatLog.e(TAG, "convert2VideoCallData exception:" + e);
+        }
+        return callModel;
+    }
+
+    private static void handleAccept(V2TIMSignalingInfo signalingInfo, CallModel callModel, Map extraMap) {
+        callModel.groupId = signalingInfo.getGroupID();
+        callModel.callId = signalingInfo.getInviteID();
+        callModel.invitedList = signalingInfo.getInviteeList();
+        callModel.version = ((Double) extraMap.get(CallModel.SIGNALING_EXTRA_KEY_VERSION)).intValue();
+        callModel.callType = ((Double)extraMap.get(TUIConstants.Message.CALLING_TYPE_KEY)).intValue();
+
+        Map contentDataMap = (Map) extraMap.get("data");
+        if (contentDataMap != null) {
+            // new version
+            if (!contentDataMap.containsKey("cmd")) {
+                callModel.action = VIDEO_CALL_ACTION_UNKNOWN_INVITE;
+            } else {
+                String cmd = (String) contentDataMap.get("cmd");
+                if (TextUtils.equals(cmd, "switchToAudio")) {
+                    callModel.action = VIDEO_CALL_ACTION_SWITCH_TO_AUDIO_ACCEPT;
+                    callModel.callType = CallingMessageBean.ACTION_ID_VIDEO_CALL;
+                } else {
+                    callModel.action = VIDEO_CALL_ACTION_ACCEPT;
+                }
+            }
+        } else {
+            // old version
+            callModel.action = CallModel.VIDEO_CALL_ACTION_ACCEPT;
+        }
+    }
+
+    private static void handleInvite(V2TIMMessage msg, V2TIMSignalingInfo signalingInfo, Gson gson, CallModel callModel, Map extraMap) {
+        callModel.groupId = signalingInfo.getGroupID();
+        callModel.timestamp = msg.getTimestamp();
+        callModel.version = ((Double) extraMap.get(CallModel.SIGNALING_EXTRA_KEY_VERSION)).intValue();
+        Map contentDataMap = (Map) extraMap.get("data");
+        if (contentDataMap != null) {
+            // new version
+            if (!contentDataMap.containsKey("cmd")) {
+                callModel.action = VIDEO_CALL_ACTION_UNKNOWN_INVITE;
+            } else {
+                String cmd = (String) contentDataMap.get("cmd");
+                if (TextUtils.equals(cmd, "switchToAudio")) {
+                    callModel.action = VIDEO_CALL_ACTION_SWITCH_TO_AUDIO;
+                } else if (TextUtils.equals(cmd, "hangup")) {
+                    callModel.action = CallModel.VIDEO_CALL_ACTION_HANGUP;
+                    callModel.duration = Double.valueOf(String.valueOf(extraMap.get(CallModel.SIGNALING_EXTRA_KEY_CALL_END))).intValue();
+                } else if (TextUtils.equals(cmd, "videoCall") || TextUtils.equals(cmd, "audioCall")) {
+                    callModel.action = CallModel.VIDEO_CALL_ACTION_DIALING;
+                    callModel.callId = signalingInfo.getInviteID();
+                    callModel.sender = signalingInfo.getInviter();
+                    callModel.invitedList = signalingInfo.getInviteeList();
+                    callModel.callType = TextUtils.equals(cmd, "audioCall") ? 1 : 2;
+                    callModel.roomId = ((Double) extraMap.get(CallModel.SIGNALING_EXTRA_KEY_ROOM_ID)).intValue();
+                } else {
+                    callModel.action = VIDEO_CALL_ACTION_UNKNOWN_INVITE;
+                }
+            }
+        } else {
+            // old version
+            if (extraMap.containsKey(CallModel.SIGNALING_EXTRA_KEY_CALL_END)) {
+                callModel.action = CallModel.VIDEO_CALL_ACTION_HANGUP;
+                callModel.duration = Double.valueOf(String.valueOf(extraMap.get(CallModel.SIGNALING_EXTRA_KEY_CALL_END))).intValue();
+            } else {
+                callModel.action = CallModel.VIDEO_CALL_ACTION_DIALING;
+                callModel.callId = signalingInfo.getInviteID();
+                callModel.sender = signalingInfo.getInviter();
+                callModel.invitedList = signalingInfo.getInviteeList();
+                callModel.callType = ((Double) extraMap.get(CallModel.SIGNALING_EXTRA_KEY_CALL_TYPE)).intValue();
+                callModel.roomId = ((Double) extraMap.get(CallModel.SIGNALING_EXTRA_KEY_ROOM_ID)).intValue();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/ChatInfo.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/ChatInfo.java
new file mode 100644
index 0000000..6ecac01
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/ChatInfo.java
@@ -0,0 +1,197 @@
+package com.tencent.qcloud.tuikit.tuichat.bean;
+
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.imsdk.v2.V2TIMGroupAtInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.classicui.setting.InputActionSetting;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ChatInfo implements Serializable {
+
+    public static final int TYPE_C2C = V2TIMConversation.V2TIM_C2C;
+    public static final int TYPE_GROUP = V2TIMConversation.V2TIM_GROUP;
+    public static final int TYPE_INVALID = V2TIMConversation.CONVERSATION_TYPE_INVALID;
+
+    private static List<V2TIMGroupAtInfo> atInfoList;
+
+    protected String chatName;
+    // other's face url
+    protected String faceUrl;
+    private List<Object> iconUrlList = new ArrayList<>();
+    private int type = V2TIMConversation.V2TIM_C2C;
+    private String id;
+    private String groupType;
+    private boolean isTopChat;
+    private TUIMessageBean locateMessage;
+
+    private DraftInfo draft;
+    private WorkBean workBean;
+    private InputActionSetting inputActionSetting;
+
+    public ChatInfo() {
+
+    }
+
+    /**
+     * 获取聊天的标题，单聊一般为对方名称，群聊为群名字
+     * 
+     * Get the title of the chat, usually the name of the other party for a single chat, and the group name for a group chat
+     *
+     * @return
+     */
+    public String getChatName() {
+        return chatName;
+    }
+
+    public void setFaceUrl(String faceUrl) {
+        this.faceUrl = faceUrl;
+    }
+
+    public String getFaceUrl() {
+        return faceUrl;
+    }
+
+    /**
+     * 设置聊天的标题，单聊一般为对方名称，群聊为群名字
+     * 
+     * Set the title of the chat, usually the name of the other party for a single chat, and the group name for a group chat
+     *
+     * @param chatName
+     */
+    public void setChatName(String chatName) {
+        this.chatName = chatName;
+    }
+
+    /**
+     * 获取聊天类型，C2C为单聊，Group为群聊
+     * 
+     * Get the chat type, C2C is a single chat, Group is a group chat
+     *
+     * @return
+     */
+    public int getType() {
+        return type;
+    }
+
+    /**
+     * 设置聊天类型，C2C为单聊，Group为群聊
+     * 
+     * Set the chat type, C2C is a single chat, Group is a group chat
+     *
+     * @param type
+     */
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    /**
+     * 获取聊天唯一标识
+     * 
+     * get chat id
+     *
+     * @return
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * 设置聊天唯一标识
+     * 
+     * set chat id
+     *
+     * @param id
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取群组类型
+     * 
+     * get group type
+     */
+    public String getGroupType() {
+        return groupType;
+    }
+
+    /**
+     * 设置群组类型
+     * 
+     * set group type
+     */
+    public void setGroupType(String groupType) {
+        this.groupType = groupType;
+    }
+
+    /**
+     * 是否为置顶的会话
+     * 
+     * Is it a pinned conversation
+     *
+     * @return
+     */
+    public boolean isTopChat() {
+        return isTopChat;
+    }
+
+    /**
+     * 设置会话是否置顶
+     * 
+     * Set whether the conversation is sticky
+     *
+     * @param topChat
+     */
+    public void setTopChat(boolean topChat) {
+        isTopChat = topChat;
+    }
+
+    public List<V2TIMGroupAtInfo> getAtInfoList() {
+        return atInfoList;
+    }
+
+    public void setAtInfoList(List<V2TIMGroupAtInfo> atInfoList) {
+        this.atInfoList = atInfoList;
+    }
+
+    public void setLocateMessage(TUIMessageBean locateMessage) {
+        this.locateMessage = locateMessage;
+    }
+
+    public TUIMessageBean getLocateMessage() {
+        return locateMessage;
+    }
+
+    public void setDraft(DraftInfo draft) {
+        this.draft = draft;
+    }
+
+    public DraftInfo getDraft() {
+        return this.draft;
+    }
+
+    public List<Object> getIconUrlList() {
+        return iconUrlList;
+    }
+
+    public void setIconUrlList(List<Object> iconUrlList) {
+        this.iconUrlList = iconUrlList;
+    }
+    public WorkBean getWorkBean() {
+        return workBean;
+    }
+
+    public void setWorkBean(WorkBean workBean) {
+        this.workBean = workBean;
+    }
+    public InputActionSetting getInputActionSetting() {
+        return inputActionSetting;
+    }
+
+    public void setInputActionSetting(InputActionSetting inputActionSetting) {
+        this.inputActionSetting = inputActionSetting;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/CustomHelloMessage.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/CustomHelloMessage.java
new file mode 100644
index 0000000..237d633
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/CustomHelloMessage.java
@@ -0,0 +1,17 @@
+package com.tencent.qcloud.tuikit.tuichat.bean;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+
+import java.io.Serializable;
+
+public class CustomHelloMessage implements Serializable {
+    public static final int CUSTOM_HELLO_ACTION_ID = 3;
+
+    public String businessID = TUIChatConstants.BUSINESS_ID_CUSTOM_HELLO;
+    public String text = TUIChatService.getAppContext().getString(R.string.welcome_tip);
+    public String link = "https://cloud.tencent.com/document/product/269/3794";
+
+    public int version = TUIChatConstants.JSON_VERSION_UNKNOWN;
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/DraftInfo.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/DraftInfo.java
new file mode 100644
index 0000000..55fca30
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/DraftInfo.java
@@ -0,0 +1,32 @@
+package com.tencent.qcloud.tuikit.tuichat.bean;
+
+import java.io.Serializable;
+
+public class DraftInfo implements Serializable {
+    private String draftText;
+    private long draftTime;
+
+    public String getDraftText() {
+        return draftText;
+    }
+
+    public void setDraftText(String draftText) {
+        this.draftText = draftText;
+    }
+
+    public long getDraftTime() {
+        return draftTime;
+    }
+
+    public void setDraftTime(long draftTime) {
+        this.draftTime = draftTime;
+    }
+
+    @Override
+    public String toString() {
+        return "DraftInfo{" +
+                "draftText='" + draftText + '\'' +
+                ", draftTime=" + draftTime +
+                '}';
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/GroupApplyInfo.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/GroupApplyInfo.java
new file mode 100644
index 0000000..a947822
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/GroupApplyInfo.java
@@ -0,0 +1,60 @@
+package com.tencent.qcloud.tuikit.tuichat.bean;
+
+import com.tencent.imsdk.v2.V2TIMGroupApplication;
+
+import java.io.Serializable;
+
+public class GroupApplyInfo implements Serializable {
+
+    public static final int APPLIED = 1;
+    public static final int REFUSED = -1;
+    public static final int UNHANDLED = 0;
+
+    private int status;
+    private V2TIMGroupApplication timGroupApplication;
+
+    public GroupApplyInfo(V2TIMGroupApplication timGroupApplication) {
+        this.timGroupApplication = timGroupApplication;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public V2TIMGroupApplication getGroupApplication() {
+        return timGroupApplication;
+    }
+
+    public String getFromUser() {
+        if (timGroupApplication != null) {
+            return timGroupApplication.getFromUser();
+        }
+        return "";
+    }
+
+    public String getFromUserNickName() {
+        if (timGroupApplication != null) {
+            return timGroupApplication.getFromUserNickName();
+        }
+        return "";
+    }
+
+    public String getRequestMsg() {
+        if (timGroupApplication != null) {
+            return timGroupApplication.getRequestMsg();
+        }
+        return "";
+    }
+
+    public boolean isStatusHandled() {
+        if (timGroupApplication != null) {
+            return timGroupApplication.getHandleStatus() != V2TIMGroupApplication.V2TIM_GROUP_APPLICATION_HANDLE_STATUS_UNHANDLED;
+        }
+        return false;
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/GroupInfo.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/GroupInfo.java
new file mode 100644
index 0000000..35bc028
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/GroupInfo.java
@@ -0,0 +1,226 @@
+package com.tencent.qcloud.tuikit.tuichat.bean;
+
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.imsdk.v2.V2TIMGroupInfoResult;
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMMessage;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class GroupInfo extends ChatInfo {
+
+    public static final String GROUP_TYPE_PUBLIC = V2TIMManager.GROUP_TYPE_PUBLIC;
+    public static final String GROUP_TYPE_WORK = V2TIMManager.GROUP_TYPE_WORK;
+    public static final String GROUP_TYPE_AVCHATROOM = V2TIMManager.GROUP_TYPE_AVCHATROOM;
+    public static final String GROUP_TYPE_MEETING = V2TIMManager.GROUP_TYPE_MEETING;
+    public static final String GROUP_TYPE_COMMUNITY = V2TIMManager.GROUP_TYPE_COMMUNITY;
+
+    private String groupType;
+    private int memberCount;
+    private String groupName;
+    private String notice;
+    private List<GroupMemberInfo> memberDetails = new ArrayList<>();
+    private int joinType;
+    private String owner;
+    private boolean messageReceiveOption;
+
+    public GroupInfo() {
+        setType(V2TIMConversation.V2TIM_GROUP);
+    }
+
+    /**
+     * 获取群名称
+     * 
+     * Get the group name
+     *
+     * @return
+     */
+    public String getGroupName() {
+        return groupName;
+    }
+
+    /**
+     * 设置群名称
+     * 
+     * Set the group name
+     *
+     * @param groupName
+     */
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    /**
+     * 获取群公告
+     * 
+     * Get the group notice
+     *
+     * @return
+     */
+    public String getNotice() {
+        return notice;
+    }
+
+    /**
+     * 设置群公告
+     * 
+     * Set the group notice
+     *
+     * @param signature
+     */
+    public void setNotice(String signature) {
+        this.notice = signature;
+    }
+
+    /**
+     * 获取加群验证方式
+     * 
+     * Get the group joining approval type
+     *
+     * @return
+     */
+    public int getJoinType() {
+        return joinType;
+    }
+
+    /**
+     * 设置加群验证方式
+     * 
+     * Set the group joining approval type
+     *
+     * @param joinType
+     */
+    public void setJoinType(int joinType) {
+        this.joinType = joinType;
+    }
+
+    /**
+     * 获取群类型，Public/Private/ChatRoom
+     * 
+     * Get the group type
+     *
+     * @return
+     */
+    public String getGroupType() {
+        return groupType;
+    }
+
+    /**
+     * 设置群类型
+     * 
+     * Set the group type
+     *
+     * @param groupType
+     */
+    public void setGroupType(String groupType) {
+        this.groupType = groupType;
+    }
+
+    /**
+     * 获取成员详细信息
+     * 
+     * Get member details
+     *
+     * @return
+     */
+    public List<GroupMemberInfo> getMemberDetails() {
+        return memberDetails;
+    }
+
+    /**
+     * 设置成员详细信息
+     * 
+     * Set member details
+     *
+     * @param memberDetails
+     */
+    public void setMemberDetails(List<GroupMemberInfo> memberDetails) {
+        this.memberDetails = memberDetails;
+    }
+
+    /**
+     * 获取群成员数量
+     *
+     * @return
+     */
+    public int getMemberCount() {
+        if (memberDetails != null) {
+            return memberDetails.size();
+        }
+        return memberCount;
+    }
+
+    /**
+     * 设置群成员数量
+     * 
+     * Get the number of members that have joined the group
+     *
+     * @param memberCount
+     */
+    public void setMemberCount(int memberCount) {
+        this.memberCount = memberCount;
+    }
+
+    /**
+     * 返回是否是群主
+     * 
+     * Returns whether it is the owner of the group
+     *
+     * @return
+     */
+    public boolean isOwner() {
+        return V2TIMManager.getInstance().getLoginUser().equals(owner);
+    }
+
+    /**
+     * 设置是否是群主
+     * 
+     * Set the owner of the group
+     *
+     * @param owner
+     */
+    public void setOwner(String owner) {
+        this.owner = owner;
+    }
+
+    /**
+     * 获取消息接收选项
+     * 
+     * Get the current user's message receiving option in the group. To modify the group message receiving option, please call the setReceiveMessageOpt API.
+     *
+     * @return
+     */
+    public boolean getMessageReceiveOption() {
+        return messageReceiveOption;
+    }
+
+    /**
+     * 设置消息接收选项
+     * @param messageReceiveOption, true,免打扰； false，接收消息
+     * 
+     * 
+     * Set the current user's message receiving option in the group.
+     * @param messageReceiveOption, true,no message will be received； false，messages will be received.
+     */
+    public void setMessageReceiveOption(boolean messageReceiveOption) {
+        this.messageReceiveOption = messageReceiveOption;
+    }
+
+    public GroupInfo covertTIMGroupDetailInfo(V2TIMGroupInfoResult infoResult) {
+        if (infoResult.getResultCode() != 0) {
+            return this;
+        }
+        setChatName(infoResult.getGroupInfo().getGroupName());
+        setGroupName(infoResult.getGroupInfo().getGroupName());
+        setId(infoResult.getGroupInfo().getGroupID());
+        setNotice(infoResult.getGroupInfo().getNotification());
+        setMemberCount(infoResult.getGroupInfo().getMemberCount());
+        setGroupType(infoResult.getGroupInfo().getGroupType());
+        setOwner(infoResult.getGroupInfo().getOwner());
+        setJoinType(infoResult.getGroupInfo().getGroupAddOpt());
+        setMessageReceiveOption(infoResult.getGroupInfo().getRecvOpt() == V2TIMMessage.V2TIM_RECEIVE_NOT_NOTIFY_MESSAGE ? true : false);
+        return this;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/GroupMemberInfo.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/GroupMemberInfo.java
new file mode 100644
index 0000000..39f6d0a
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/GroupMemberInfo.java
@@ -0,0 +1,158 @@
+package com.tencent.qcloud.tuikit.tuichat.bean;
+
+import android.text.TextUtils;
+
+import com.tencent.imsdk.v2.V2TIMGroupMemberFullInfo;
+import com.tencent.imsdk.v2.V2TIMGroupMemberInfo;
+
+import java.io.Serializable;
+
+public class GroupMemberInfo implements Serializable {
+
+    private String iconUrl;
+    private String account;
+    private String signature;
+    private String location;
+    private String birthday;
+    private String nameCard;
+    private String friendRemark;
+    private String nickName;
+    private boolean isTopChat;
+    private boolean isFriend;
+    private long joinTime;
+    private long tinyId;
+    private int memberType;
+
+    public String getIconUrl() {
+        return iconUrl;
+    }
+
+    public void setIconUrl(String iconUrl) {
+        this.iconUrl = iconUrl;
+    }
+
+    public String getAccount() {
+        return account;
+    }
+
+    public void setAccount(String account) {
+        this.account = account;
+    }
+
+    public String getSignature() {
+        return signature;
+    }
+
+    public void setSignature(String signature) {
+        this.signature = signature;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public String getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(String birthday) {
+        this.birthday = birthday;
+    }
+
+    public void setNameCard(String nameCard) {
+        this.nameCard = nameCard;
+    }
+
+    public String getNameCard() {
+        return nameCard;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getNickName() {
+        return this.nickName;
+    }
+
+    public boolean isTopChat() {
+        return isTopChat;
+    }
+
+    public void setTopChat(boolean topChat) {
+        isTopChat = topChat;
+    }
+
+    public boolean isFriend() {
+        return isFriend;
+    }
+
+    public void setFriend(boolean friend) {
+        isFriend = friend;
+    }
+
+    public long getJoinTime() {
+        return joinTime;
+    }
+
+    public void setJoinTime(long joinTime) {
+        this.joinTime = joinTime;
+    }
+
+    public long getTinyId() {
+        return tinyId;
+    }
+
+    public void setTinyId(long tinyId) {
+        this.tinyId = tinyId;
+    }
+
+    public int getMemberType() {
+        return memberType;
+    }
+
+    public void setMemberType(int memberType) {
+        this.memberType = memberType;
+    }
+
+    public String getFriendRemark() {
+        return friendRemark;
+    }
+
+    public void setFriendRemark(String friendRemark) {
+        this.friendRemark = friendRemark;
+    }
+
+    public String getDisplayName() {
+        String displayName;
+
+        if (!TextUtils.isEmpty(nameCard)) {
+            displayName = nameCard;
+        } else if (!TextUtils.isEmpty(friendRemark)) {
+            displayName = friendRemark;
+        } else if (!TextUtils.isEmpty(nickName)) {
+            displayName = nickName;
+        } else {
+            displayName = account;
+        }
+        return displayName;
+    }
+
+    public GroupMemberInfo covertTIMGroupMemberInfo(V2TIMGroupMemberInfo info) {
+        if (info instanceof V2TIMGroupMemberFullInfo) {
+            V2TIMGroupMemberFullInfo v2TIMGroupMemberFullInfo = (V2TIMGroupMemberFullInfo)info;
+            setJoinTime(v2TIMGroupMemberFullInfo.getJoinTime());
+            setMemberType(v2TIMGroupMemberFullInfo.getRole());
+        }
+        setAccount(info.getUserID());
+        setNameCard(info.getNameCard());
+        setIconUrl(info.getFaceUrl());
+        setFriendRemark(info.getFriendRemark());
+        setNickName(info.getNickName());
+        return this;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/InputMoreActionUnit.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/InputMoreActionUnit.java
new file mode 100644
index 0000000..746dafe
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/InputMoreActionUnit.java
@@ -0,0 +1,116 @@
+package com.tencent.qcloud.tuikit.tuichat.bean;
+
+
+import android.view.View;
+
+public class InputMoreActionUnit {
+
+    private ChatInfo chatInfo;
+
+    private int iconResId;
+
+    private int titleId;
+
+    private int actionId;
+    
+    private View unitView;
+
+    // 0, not need onActivityResult; 1, need onActivityResult
+    private int actionType = 0;
+
+    // 数字越小优先级越高
+    // The lower the number, the higher the priority
+    private int priority = 0;
+
+    private OnActionClickListener onClickListener = new OnActionClickListener();
+
+    public int getPriority() {
+        return priority;
+    }
+
+    public void setPriority(int priority) {
+        this.priority = priority;
+    }
+
+    public int getChatType() {
+        if (chatInfo != null) {
+            return chatInfo.getType();
+        } else {
+            return 0;
+        }
+    }
+
+    public String getChatId() {
+        if (chatInfo != null) {
+            return chatInfo.getId();
+        } else {
+            return null;
+        }
+    }
+
+    public void setChatInfo(ChatInfo chatInfo) {
+        this.chatInfo = chatInfo;
+    }
+
+    public int getIconResId() {
+        return iconResId;
+    }
+
+    public void setIconResId(int iconResId) {
+        this.iconResId = iconResId;
+    }
+
+    public int getTitleId() {
+        return titleId;
+    }
+
+    public void setTitleId(int titleId) {
+        this.titleId = titleId;
+    }
+
+    public int getActionId() {
+        return actionId;
+    }
+
+    public void setActionId(int actionId) {
+        this.actionId = actionId;
+    }
+
+    public OnActionClickListener getOnClickListener() {
+        return onClickListener;
+    }
+
+    public void setOnClickListener(OnActionClickListener onClickListener) {
+        this.onClickListener = onClickListener;
+    }
+
+    public void setUnitView(View unitView) {
+        this.unitView = unitView;
+    }
+
+    public View getUnitView() {
+        return unitView;
+    }
+
+    public boolean isEnable(int chatType) {
+        return true;
+    }
+    
+    public void onAction(String chatInfoId, int chatType) {
+
+    }
+
+    public int getActionType() {
+        return actionType;
+    }
+
+    public void setActionType(int actionType) {
+        this.actionType = actionType;
+    }
+
+    public class OnActionClickListener {
+        public void onClick() {
+            onAction(getChatId(), getChatType());
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/MessageCustom.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/MessageCustom.java
new file mode 100644
index 0000000..4d441b6
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/MessageCustom.java
@@ -0,0 +1,11 @@
+package com.tencent.qcloud.tuikit.tuichat.bean;
+
+public class MessageCustom {
+    public static final String BUSINESS_ID_GROUP_CREATE = "group_create";
+
+    public int version = 0;
+    public String businessID;
+    public String opUser;
+    public String content;
+    public String data;
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/MessageFeature.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/MessageFeature.java
new file mode 100644
index 0000000..4f338f1
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/MessageFeature.java
@@ -0,0 +1,33 @@
+package com.tencent.qcloud.tuikit.tuichat.bean;
+
+import java.io.Serializable;
+
+/*
+ *  通过消息携带功能宏，主要用于新老版本兼容，使用 cloudCustomData 字段。
+ *  像对方输入中功能。
+ *
+ *  Carrying function macros through messages，Mainly used to be compatible with old and new versions，Use the cloudCustomData field.
+ *  Such as Typing function.
+ */
+public class MessageFeature implements Serializable {
+    public static final int VERSION = 1;
+
+    private int needTyping = 1; // message typing feature ...
+    private int version = VERSION;
+
+    public int getVersion() {
+        return version;
+    }
+
+    public void setVersion(int version) {
+        this.version = version;
+    }
+
+    public int getNeedTyping() {
+        return needTyping;
+    }
+
+    public void setNeedTyping(int needTyping) {
+        this.needTyping = needTyping;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/MessageReactBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/MessageReactBean.java
new file mode 100644
index 0000000..11da1c8
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/MessageReactBean.java
@@ -0,0 +1,67 @@
+package com.tencent.qcloud.tuikit.tuichat.bean;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+public class MessageReactBean implements Serializable {
+    public static final int VERSION = 1;
+
+    private Map<String, Set<String>> reacts;
+    private int version = VERSION;
+
+    private transient Map<String, ReactUserBean> reactUserBeanMap;
+
+    public void operateUser(String emojiId, String userId) {
+        if (reacts == null) {
+            reacts = new LinkedHashMap<>();
+        }
+        Set<String> userList = reacts.get(emojiId);
+        if (userList == null) {
+            userList = new LinkedHashSet<>();
+            reacts.put(emojiId, userList);
+        }
+        if (userList.contains(userId)) {
+            userList.remove(userId);
+        } else {
+            userList.add(userId);
+        }
+        if (userList.isEmpty()) {
+            reacts.remove(emojiId);
+        }
+    }
+
+    public Map<String, Set<String>> getReacts() {
+        return reacts;
+    }
+
+    public void setReacts(Map<String, Set<String>> reacts) {
+        this.reacts = reacts;
+    }
+
+    public int getReactSize() {
+        if (reacts != null) {
+            return reacts.size();
+        }
+        return 0;
+    }
+
+    public void setReactUserBeanMap(Map<String, ReactUserBean> reactUserBeanMap) {
+        this.reactUserBeanMap = reactUserBeanMap;
+    }
+
+    public Map<String, ReactUserBean> getReactUserBeanMap() {
+        return reactUserBeanMap;
+    }
+
+    public int getVersion() {
+        return version;
+    }
+
+    public void setVersion(int version) {
+        this.version = version;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/MessageReceiptInfo.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/MessageReceiptInfo.java
new file mode 100644
index 0000000..98df655
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/MessageReceiptInfo.java
@@ -0,0 +1,55 @@
+package com.tencent.qcloud.tuikit.tuichat.bean;
+
+import com.tencent.imsdk.v2.V2TIMMessageReceipt;
+
+import java.io.Serializable;
+
+public class MessageReceiptInfo implements Serializable {
+    private V2TIMMessageReceipt messageReceipt;
+
+    public void setMessageReceipt(V2TIMMessageReceipt messageReceipt) {
+        this.messageReceipt = messageReceipt;
+    }
+
+    public String getUserID() {
+        if (messageReceipt != null) {
+            return messageReceipt.getUserID();
+        }
+        return null;
+    }
+
+    public boolean isPeerRead() {
+        if (messageReceipt != null) {
+            return messageReceipt.isPeerRead();
+        }
+        return false;
+    }
+
+    public String getGroupID() {
+        if (messageReceipt != null) {
+            return messageReceipt.getGroupID();
+        }
+        return null;
+    }
+
+    public long getReadCount() {
+        if (messageReceipt != null) {
+            return messageReceipt.getReadCount();
+        }
+        return 0;
+    }
+
+    public long getUnreadCount() {
+        if (messageReceipt != null) {
+            return messageReceipt.getUnreadCount();
+        }
+        return 0;
+    }
+
+    public String getMsgID() {
+        if (messageReceipt != null) {
+            return messageReceipt.getMsgID();
+        }
+        return null;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/MessageRepliesBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/MessageRepliesBean.java
new file mode 100644
index 0000000..13793f1
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/MessageRepliesBean.java
@@ -0,0 +1,115 @@
+package com.tencent.qcloud.tuikit.tuichat.bean;
+
+import android.text.TextUtils;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+public class MessageRepliesBean implements Serializable {
+    public static final int VERSION = 1;
+
+    public static class ReplyBean implements Serializable {
+        private String messageID;
+        private String messageAbstract;
+        private String messageSender;
+        transient private String senderFaceUrl;
+        transient private String senderShowName;
+        public String getMessageID() {
+            return messageID;
+        }
+
+        public void setMessageID(String messageID) {
+            this.messageID = messageID;
+        }
+
+        public String getMessageAbstract() {
+            return messageAbstract;
+        }
+
+        public void setMessageAbstract(String messageAbstract) {
+            this.messageAbstract = messageAbstract;
+        }
+
+        public String getMessageSender() {
+            return messageSender;
+        }
+
+        public void setMessageSender(String messageSender) {
+            this.messageSender = messageSender;
+        }
+
+        public void setSenderFaceUrl(String senderFaceUrl) {
+            this.senderFaceUrl = senderFaceUrl;
+        }
+
+        public String getSenderFaceUrl() {
+            return senderFaceUrl;
+        }
+
+        public void setSenderShowName(String senderShowName) {
+            this.senderShowName = senderShowName;
+        }
+
+        public String getSenderShowName() {
+            if (TextUtils.isEmpty(senderShowName)) {
+                return messageSender;
+            }
+            return senderShowName;
+        }
+    }
+
+    private List<ReplyBean> replies;
+    private int version = VERSION;
+
+    public void addReplyMessage(String messageId, String messageAbstract, String sender) {
+        if (replies == null) {
+            replies = new ArrayList<>();
+        }
+        for (ReplyBean replyBean : replies) {
+            if (TextUtils.equals(replyBean.messageID, messageId)) {
+                return;
+            }
+        }
+        ReplyBean replyBean = new ReplyBean();
+        replyBean.messageID = messageId;
+        replyBean.messageAbstract = messageAbstract;
+        replyBean.messageSender = sender;
+        replies.add(replyBean);
+    }
+
+    public void removeReplyMessage(String messageID) {
+        if (replies == null) {
+            return;
+        }
+        for (ReplyBean replyBean : replies) {
+            if (TextUtils.equals(replyBean.messageID, messageID)) {
+                replies.remove(replyBean);
+                return;
+            }
+        }
+    }
+
+    public void setVersion(int version) {
+        this.version = version;
+    }
+
+    public int getVersion() {
+        return version;
+    }
+
+    public List<ReplyBean> getReplies() {
+        return replies;
+    }
+
+    public void setReplies(List<ReplyBean> replies) {
+        this.replies = replies;
+    }
+
+    public int getRepliesSize() {
+        if (replies != null) {
+            return replies.size();
+        }
+        return 0;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/MessageTyping.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/MessageTyping.java
new file mode 100644
index 0000000..38eec00
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/MessageTyping.java
@@ -0,0 +1,35 @@
+package com.tencent.qcloud.tuikit.tuichat.bean;
+
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+
+import java.io.Serializable;
+
+public class MessageTyping implements Serializable {
+    public String businessID = TUIChatConstants.BUSINESS_ID_CUSTOM_TYPING;
+    public int typingStatus = 0; //  正在输入中1,  输入结束0  // Typing 1, Ending 0
+    public int version = TUIChatConstants.JSON_VERSION_UNKNOWN;
+
+    // 兼容老版本 Compatible with older versions
+    public static final int TYPE_TYPING = 14;
+    public static final String EDIT_START = "EIMAMSG_InputStatus_Ing";
+    public static final String EDIT_END = "EIMAMSG_InputStatus_End";
+
+    public int userAction = 0; // 14表示正在输入 // Typing 14
+    public String actionParam = ""; //"EIMAMSG_InputStatus_Ing" 表示正在输入  // Typing "EIMAMSG_InputStatus_End", Ending "EIMAMSG_InputStatus_End"
+
+    public void setTypingStatus(boolean isTyping) {
+        if (isTyping) {
+            typingStatus = 1;
+
+            // old version
+            userAction = 14;
+            actionParam = "EIMAMSG_InputStatus_Ing";
+        } else {
+            typingStatus = 0;
+
+            // old version
+            userAction = 0;
+            actionParam = "EIMAMSG_InputStatus_End";
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/OfflineMessageBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/OfflineMessageBean.java
new file mode 100644
index 0000000..49e9ae1
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/OfflineMessageBean.java
@@ -0,0 +1,37 @@
+package com.tencent.qcloud.tuikit.tuichat.bean;
+
+import androidx.annotation.NonNull;
+
+import com.tencent.imsdk.v2.V2TIMConversation;
+
+public class OfflineMessageBean {
+
+    public static final int REDIRECT_ACTION_CHAT = 1;
+    public static final int REDIRECT_ACTION_CALL = 2;
+
+    public int version = 1;
+    public int chatType = V2TIMConversation.V2TIM_C2C;
+    public int action = REDIRECT_ACTION_CHAT;
+    public String sender = "";
+    public String nickname = "";
+    public String faceUrl = "";
+    public String content = "";
+    // 发送时间戳，单位秒
+    // seconds
+    public long sendTime = 0;
+
+    @NonNull
+    @Override
+    public String toString() {
+        return  "OfflineMessageBean{" +
+                "version=" + version +
+                ", chatType='" + chatType + '\'' +
+                ", action=" + action +
+                ", sender=" + sender +
+                ", nickname=" + nickname +
+                ", faceUrl=" + faceUrl +
+                ", content=" + content +
+                ", sendTime=" + sendTime +
+                '}';
+    }
+}
\ No newline at end of file
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/OfflineMessageContainerBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/OfflineMessageContainerBean.java
new file mode 100644
index 0000000..e079508
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/OfflineMessageContainerBean.java
@@ -0,0 +1,36 @@
+package com.tencent.qcloud.tuikit.tuichat.bean;
+
+/**
+ * Function：离线推送消息的透传字段可以通过接口 V2TIMOfflinePushInfo.setExt(ext) 设置，当用户收到推送点击通知栏时，可以在启动界面内获取该透传字段。
+ *           OfflineMessageContainerBean 是 TUIKitDemo 的透传参数 ext 对应的 Javabean。
+ * 
+ * Format：设置透传字段格式
+ *           new Gson().toJson(OfflineMessageContainerBean).getBytes()
+ *         获取透传字段格式
+ *           {"entity":"xxxxxx"}
+ * 
+ * Attention：OfflineMessageContainerBean 转化为 json 多了一层包装解析为 {"entity":"xxxxxx"} 格式，
+ *            因为 OPPO 透传消息解析方法有：收到数据时用bundle.keySet()解析需要 key-value 格式，不然无法简单转化为bean而获取失败。
+ * 
+ * 
+ * 
+ * 
+ * Function：The transparent transmission field of the offline push message can be set through the interface V2TIMOfflinePushInfo.setExt(ext)，
+ *           When the user receives the push and clicks on the notification bar, the transparent transmission field can be obtained in the startup interface.
+ *           OfflineMessageContainerBean is the Javabean corresponding to the transparent parameter ext of TUIKitDemo.
+ * 
+ * Format：Set the transparent transmission field format
+ *           new Gson().toJson(OfflineMessageContainerBean).getBytes()
+ *         Get the transparent transmission field format
+ *           {"entity":"xxxxxx"}
+ * 
+ * Attention：OfflineMessageContainerBean is converted to json with an extra layer of packaging and parsed as {"entity":"xxxxxx"} format，
+ *            Because OPPO's transparent message parsing methods are: when data is received, the key-value format is required for parsing with bundle.keySet(),
+ *            otherwise it cannot be simply converted into a bean and the acquisition fails.
+ * 
+ */
+public class OfflineMessageContainerBean {
+
+    public OfflineMessageBean entity;
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/OfflinePushInfo.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/OfflinePushInfo.java
new file mode 100644
index 0000000..08dfcbb
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/OfflinePushInfo.java
@@ -0,0 +1,219 @@
+package com.tencent.qcloud.tuikit.tuichat.bean;
+
+import com.tencent.imsdk.message.MessageOfflinePushInfo;
+
+import java.io.Serializable;
+
+public class OfflinePushInfo implements Serializable{
+
+    public static final String IOS_OFFLINE_PUSH_NO_SOUND = "push.no_sound";
+    public static final String IOS_OFFLINE_PUSH_DEFAULT_SOUND = "default";
+
+    private String title;
+    private String description;
+    private byte[] extension;
+    private String iosSoundFilePath;
+    private int pushFlag;
+    private int badgeMode;
+    private int notifyMode;
+    private String oppoChannelID;
+    private int vivoClassification = 1;
+    private String androidSoundFilePath;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public byte[] getExtension() {
+        return extension;
+    }
+
+    public void setExtension(byte[] extension) {
+        this.extension = extension;
+    }
+
+    public String getIOSSoundFilePath() {
+        return iosSoundFilePath;
+    }
+
+    public int getPushFlag() {
+        return pushFlag;
+    }
+
+    public void setPushFlag(int pushFlag) {
+        this.pushFlag = pushFlag;
+    }
+
+    public int getBadgeMode() {
+        return badgeMode;
+    }
+
+    public void setBadgeMode(int badgeMode) {
+        this.badgeMode = badgeMode;
+    }
+
+    public int getNotifyMode() {
+        return notifyMode;
+    }
+
+    public void setNotifyMode(int notifyMode) {
+        this.notifyMode = notifyMode;
+    }
+
+    public String getOppoChannelID() {
+        return oppoChannelID;
+    }
+
+    public void setOppoChannelID(String oppoChannelID) {
+        this.oppoChannelID = oppoChannelID;
+    }
+
+    public int getVivoClassification() {
+        return vivoClassification;
+    }
+
+    public void setVivoClassification(int vivoClassification) {
+        this.vivoClassification = vivoClassification;
+    }
+
+    public String getAndroidSound() {
+        return androidSoundFilePath;
+    }
+
+    /**
+     * 是否关闭推送（默认开启推送）。
+     *
+     * @param disable true：关闭；false：打开
+     * 
+     * 
+     * Whether to disable push (push enabled by default)
+     *
+     * @param disable   true: disable; false: enable
+     */
+    public void disablePush(boolean disable) {
+        if (disable) {
+            setPushFlag(MessageOfflinePushInfo.OFFLINE_PUSH_FLAG_NO_PUSH);
+        } else {
+            setPushFlag(MessageOfflinePushInfo.OFFLINE_PUSH_FLAG_DEFAULT);
+        }
+    }
+
+    /**
+     * 获取是否关闭离线推送状态。
+     *
+     * @return 关闭状态。true：关闭；false：打开
+     * 
+     * 
+     * Get the offline push disablement status
+     *
+     * @return Disabled. true: disabled; false: enabled
+     */
+    public boolean isDisablePush() {
+        if (getPushFlag() == MessageOfflinePushInfo.OFFLINE_PUSH_FLAG_NO_PUSH) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * 离线推送声音设置（仅对 iOS 生效）。
+     * 当 sound = IOS_OFFLINE_PUSH_NO_SOUND，表示接收时不会播放声音。
+     * 当 sound = IOS_OFFLINE_PUSH_DEFAULT_SOUND，表示接收时播放系统声音。
+     * 如果要自定义 iOSSound，需要先把语音文件链接进 Xcode 工程，然后把语音文件名（带后缀）设置给 iOSSound。
+     *
+     * @param sound iOS 声音路径
+     * 
+     * 
+     * Offline push sound setting (valid only for iOS)
+     * When sound is IOS_OFFLINE_PUSH_NO_SOUND, no sound is played when a message is received.
+     * When sound is IOS_OFFLINE_PUSH_DEFAULT_SOUND, the system alert sound is played when a message is received.
+     * To customize iOSSound, link the audio file to the Xcode project and set iOSSound to the audio filename (with the extension name).
+     *
+     * @param sound iOS    Sound path
+     */
+    public void setIOSSound(String sound) {
+        this.iosSoundFilePath = sound;
+    }
+
+    /**
+     * 离线推送声音设置（仅对 Android 生效）。
+     * 指定 Android 工程里 raw 目录中的铃声文件名，不需要后缀名。
+     *
+     * @param sound 铃声文件名
+     * 
+     * 
+     * Offline push sound setting (valid only for Android, supported only in imsdk 6.1 and later versions)
+     * Only Huawei and Google phones support setting ringtone. And Xiaomi needs refer to https://dev.mi.com/console/doc/detail?pId=1278%23_3_0 .
+     * 
+     * @param sound: The ringtone file name in the raw directory of the Android project, no suffix is required.
+     */
+    public void setAndroidSound(String sound) {
+        this.androidSoundFilePath = sound;
+    }
+
+    /**
+     * 离线推送忽略 badge 计数（仅对 iOS 生效），
+     * 如果设置为 true，在 iOS 接收端，这条消息不会使 APP 的应用图标未读计数增加。
+     *
+     * @param ignoreIOSBadge iOS 应用图标未读计数状态。true：忽略；false：开启
+     * 
+     * 
+     * Whether to ignore the badge count for offline push (valid only for iOS)
+     * If this parameter is set to true, the unread message count on the app badge will not increase when the message is received by the iOS device.
+     *
+     * @param ignoreIOSBadge iOS   Status of the unread message count on the app badge. true: ignore; false: enable
+     */
+    public void setIgnoreIOSBadge(boolean ignoreIOSBadge) {
+        if (ignoreIOSBadge) {
+            setBadgeMode(MessageOfflinePushInfo.OFFLINE_APNS_BADGE_MODE_IGNORE);
+        } else {
+            setBadgeMode(MessageOfflinePushInfo.OFFLINE_APNS_BADGE_MODE_DEFAULT);
+        }
+    }
+
+    public boolean isIgnoreIOSBadge() {
+        return badgeMode == MessageOfflinePushInfo.OFFLINE_APNS_BADGE_MODE_IGNORE;
+    }
+
+    /**
+     * 离线推送设置 OPPO 手机 8.0 系统及以上的渠道 ID。
+     *
+     * @param channelID OPPO 手机的渠道 ID
+     * 
+     * 
+     * Offline push channel ID for OPPO phones that run Android 8.0 or later
+     *
+     * @param channelID    OPPO phone channel ID
+     */
+    public void setAndroidOPPOChannelID(String channelID) {
+        setOppoChannelID(channelID);
+    }
+
+    /**
+     * 离线推送设置 VIVO 手机
+     *
+     * @param classification VIVO 手机离线推送消息分类，0：运营消息 1：系统消息，默认取值为 1
+     * 
+     *
+     * Offline push setting for vivo phones
+     *
+     * @param classification   Offline push message classification for vivo phones. 0: operation message; 1: system message. The default value is 1.
+     */
+    public void setAndroidVIVOClassification(int classification) {
+        setVivoClassification(classification);
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/ReactUserBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/ReactUserBean.java
new file mode 100644
index 0000000..0114aa9
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/ReactUserBean.java
@@ -0,0 +1,65 @@
+package com.tencent.qcloud.tuikit.tuichat.bean;
+
+import android.text.TextUtils;
+
+import java.io.Serializable;
+
+public class ReactUserBean implements Serializable {
+    private String userId;
+    private String nikeName;
+    private String nameCard;
+    private String friendRemark;
+    private String faceUrl;
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getNikeName() {
+        return nikeName;
+    }
+
+    public void setNikeName(String nikeName) {
+        this.nikeName = nikeName;
+    }
+
+    public String getFriendRemark() {
+        return friendRemark;
+    }
+
+    public void setFriendRemark(String friendRemark) {
+        this.friendRemark = friendRemark;
+    }
+
+    public void setNameCard(String nameCard) {
+        this.nameCard = nameCard;
+    }
+
+    public String getNameCard() {
+        return nameCard;
+    }
+
+    public String getDisplayString() {
+        if (!TextUtils.isEmpty(nameCard)) {
+            return nameCard;
+        } else if (!TextUtils.isEmpty(friendRemark)) {
+            return friendRemark;
+        } else if (!TextUtils.isEmpty(nikeName)) {
+            return nikeName;
+        } else {
+            return userId;
+        }
+    }
+
+    public String getFaceUrl() {
+        return faceUrl;
+    }
+
+    public void setFaceUrl(String faceUrl) {
+        this.faceUrl = faceUrl;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/ReplyPreviewBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/ReplyPreviewBean.java
new file mode 100644
index 0000000..fa4c612
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/ReplyPreviewBean.java
@@ -0,0 +1,103 @@
+package com.tencent.qcloud.tuikit.tuichat.bean;
+
+import android.text.TextUtils;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+import java.io.Serializable;
+
+public class ReplyPreviewBean implements Serializable {
+
+    public static final int VERSION = 1;
+
+    private String messageID;
+    private String messageRootID;
+    private String messageAbstract;
+    private String messageSender;
+    private int messageType;
+    private long messageTime;
+    private long messageSequence;
+
+    private int version = VERSION;
+
+    private transient TUIMessageBean originalMessageBean;
+
+    public String getMessageID() {
+        return messageID;
+    }
+
+    public void setMessageID(String messageID) {
+        this.messageID = messageID;
+    }
+
+    public String getMessageAbstract() {
+        return messageAbstract;
+    }
+
+    public void setMessageAbstract(String messageAbstract) {
+        this.messageAbstract = messageAbstract;
+    }
+
+    public String getMessageSender() {
+        return messageSender;
+    }
+
+    public void setMessageSender(String messageSender) {
+        this.messageSender = messageSender;
+    }
+
+    public int getMessageType() {
+        return messageType;
+    }
+
+    public void setMessageType(int messageType) {
+        this.messageType = messageType;
+    }
+
+    public TUIMessageBean getOriginalMessageBean() {
+        return originalMessageBean;
+    }
+
+    public void setOriginalMessageBean(TUIMessageBean originalMessageBean) {
+        this.originalMessageBean = originalMessageBean;
+    }
+
+    public void setVersion(int version) {
+        this.version = version;
+    }
+
+    public int getVersion() {
+        return version;
+    }
+
+    public long getMessageSequence() {
+        return messageSequence;
+    }
+
+    public long getMessageTime() {
+        return messageTime;
+    }
+
+    public void setMessageSequence(long messageSequence) {
+        this.messageSequence = messageSequence;
+    }
+
+    public void setMessageTime(long messageTime) {
+        this.messageTime = messageTime;
+    }
+
+    public String getMessageRootID() {
+        return messageRootID;
+    }
+
+    public void setMessageRootID(String messageRootID) {
+        this.messageRootID = messageRootID;
+    }
+
+    /**
+     * @return true if it's replayMessage, or false it's quoteMessage
+     */
+    public boolean isReplyMessage() {
+        return !TextUtils.isEmpty(messageRootID);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/UserStatusBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/UserStatusBean.java
new file mode 100644
index 0000000..88e2d62
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/UserStatusBean.java
@@ -0,0 +1,30 @@
+package com.tencent.qcloud.tuikit.tuichat.bean;
+
+import com.tencent.imsdk.v2.V2TIMUserStatus;
+
+import java.io.Serializable;
+
+public class UserStatusBean implements Serializable {
+
+    public static final int STATUS_ONLINE = V2TIMUserStatus.V2TIM_USER_STATUS_ONLINE;
+    public static final int STATUS_OFFLINE = V2TIMUserStatus.V2TIM_USER_STATUS_ONLINE;
+
+    private String userID;
+    private int onlineStatus = STATUS_OFFLINE;
+
+    public void setOnlineStatus(int onlineStatus) {
+        this.onlineStatus = onlineStatus;
+    }
+
+    public int getOnlineStatus() {
+        return onlineStatus;
+    }
+
+    public void setUserID(String userID) {
+        this.userID = userID;
+    }
+
+    public String getUserID() {
+        return userID;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/WorkBean.kt b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/WorkBean.kt
new file mode 100644
index 0000000..314db76
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/WorkBean.kt
@@ -0,0 +1,8 @@
+package com.tencent.qcloud.tuikit.tuichat.bean
+
+import java.io.Serializable
+
+/**
+ * 当前公司业务使用数据传输类
+ */
+data class WorkBean(var workId: String, var workType: Int,var workState: Int=-1): Serializable
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/ArchivesMessageBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/ArchivesMessageBean.java
new file mode 100644
index 0000000..e0ae46e
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/ArchivesMessageBean.java
@@ -0,0 +1,93 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message;
+
+import android.text.TextUtils;
+
+import com.google.gson.Gson;
+import com.lzy.ninegrid.ImageInfo;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+
+import java.util.List;
+
+/**
+ * 档案
+ * */
+public class ArchivesMessageBean extends TUIMessageBean{
+    public String businessID = TUIChatConstants.BUSINESS_ID_ARCHIVES;
+    public String extension = TUIChatService.getAppContext().getString(R.string.chat_message_type_archives);
+    private String archivesId;
+    private String name;
+    private String gender;
+    private int age;
+    private String symptomDescription;
+    private List<ImageInfo> imageList;
+    @Override
+    public String onGetDisplayString() {
+        return getExtra();
+    }
+
+    @Override
+    public void onProcessMessage(V2TIMMessage v2TIMMessage) {
+        String data = new String(v2TIMMessage.getCustomElem().getData());
+        if(!TextUtils.isEmpty(data)) {
+            ArchivesMessageBean archivesMessageBean = new Gson().fromJson(data, ArchivesMessageBean.class);
+            setArchivesId(archivesMessageBean.getArchivesId());
+            setName(archivesMessageBean.getName());
+            setAge(archivesMessageBean.getAge());
+            setGender(archivesMessageBean.getGender());
+            setSymptomDescription(archivesMessageBean.getSymptomDescription());
+            setImageList(archivesMessageBean.getImageList());
+            setExtra(TUIChatService.getAppContext().getString(R.string.chat_message_type_archives));
+        }
+    }
+
+    public String getArchivesId() {
+        return archivesId;
+    }
+
+    public void setArchivesId(String archivesId) {
+        this.archivesId = archivesId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getGender() {
+        return gender;
+    }
+
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
+
+    public int getAge() {
+        return age;
+    }
+
+    public void setAge(int age) {
+        this.age = age;
+    }
+
+    public String getSymptomDescription() {
+        return symptomDescription;
+    }
+
+    public void setSymptomDescription(String symptomDescription) {
+        this.symptomDescription = symptomDescription;
+    }
+
+    public List<ImageInfo> getImageList() {
+        return imageList;
+    }
+
+    public void setImageList(List<ImageInfo> imageList) {
+        this.imageList = imageList;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/BusinessCardMessageBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/BusinessCardMessageBean.java
new file mode 100644
index 0000000..e9d59dd
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/BusinessCardMessageBean.java
@@ -0,0 +1,91 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message;
+
+import android.text.TextUtils;
+
+import com.google.gson.Gson;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+
+/**
+ * 名片
+ * */
+public class BusinessCardMessageBean extends TUIMessageBean {
+    public static final int CUSTOM_HELLO_ACTION_ID = 0X103;
+    public String businessID = TUIChatConstants.BUSINESS_ID_BUSINESS_CARD;
+    public int version = TUIChatConstants.JSON_VERSION_UNKNOWN;
+    private String cardId;
+    private String doctorName;
+    private String organization;
+    private String departmentName;
+    private String doctorTitle;
+    private String doctorHeadImg;
+
+    public String getDoctorName() {
+        return doctorName;
+    }
+
+    public void setDoctorName(String doctorName) {
+        this.doctorName = doctorName;
+    }
+
+    public String getOrganization() {
+        return organization;
+    }
+
+    public void setOrganization(String organization) {
+        this.organization = organization;
+    }
+
+    public String getDoctorHeadImg() {
+        return doctorHeadImg;
+    }
+
+    public void setDoctorHeadImg(String doctorHeadImg) {
+        this.doctorHeadImg = doctorHeadImg;
+    }
+
+    public String getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(String cardId) {
+        this.cardId = cardId;
+    }
+
+    public String getDepartmentName() {
+        return departmentName;
+    }
+
+    public void setDepartmentName(String departmentName) {
+        this.departmentName = departmentName;
+    }
+
+    public String getDoctorTitle() {
+        return doctorTitle;
+    }
+
+    public void setDoctorTitle(String doctorTitle) {
+        this.doctorTitle = doctorTitle;
+    }
+
+    @Override
+    public String onGetDisplayString() {
+        //列表文字摘要
+        return getExtra();
+    }
+
+    @Override
+    public void onProcessMessage(V2TIMMessage v2TIMMessage) {
+        // 解析JSON文本赋值给bean的属性
+        String data = new String(v2TIMMessage.getCustomElem().getData());
+        if(!TextUtils.isEmpty(data)) {
+            BusinessCardMessageBean businessCardMessageBean = new Gson().fromJson(data, BusinessCardMessageBean.class);
+            setCardId(businessCardMessageBean.getCardId());
+            setDoctorName(businessCardMessageBean.getDoctorName());
+            setDoctorHeadImg(businessCardMessageBean.getDoctorHeadImg());
+            setOrganization(businessCardMessageBean.getOrganization());
+            setDepartmentName(businessCardMessageBean.getDepartmentName());
+            setDoctorTitle(businessCardMessageBean.getDoctorTitle());
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/CallingMessageBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/CallingMessageBean.java
new file mode 100644
index 0000000..bd9f30f
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/CallingMessageBean.java
@@ -0,0 +1,47 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message;
+
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TextReplyQuoteBean;
+
+
+public class CallingMessageBean extends TextMessageBean {
+    private String text;
+    private int callType; //1：audio; 2:video
+    public static final int ACTION_ID_AUDIO_CALL = 1;
+    public static final int ACTION_ID_VIDEO_CALL = 2;
+
+    @Override
+    public String onGetDisplayString() {
+        return text;
+    }
+
+    @Override
+    public void onProcessMessage(V2TIMMessage v2TIMMessage) {
+        if (v2TIMMessage.getTextElem() != null) {
+            text = v2TIMMessage.getTextElem().getText();
+        }
+        setExtra(text);
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public int getCallType() {
+        return callType;
+    }
+
+    public void setCallType(int callType) {
+        this.callType = callType;
+    }
+
+    @Override
+    public Class<? extends TUIReplyQuoteBean> getReplyQuoteBeanClass() {
+        return TextReplyQuoteBean.class;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/CustomEvaluationMessageBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/CustomEvaluationMessageBean.java
new file mode 100644
index 0000000..1031711
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/CustomEvaluationMessageBean.java
@@ -0,0 +1,72 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message;
+
+import android.text.TextUtils;
+
+import com.google.gson.Gson;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.CustomEvaluationMessageReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+import java.io.Serializable;
+
+public class CustomEvaluationMessageBean extends TUIMessageBean{
+
+    public static class CustomEvaluationMessage implements Serializable {
+        //public static final int CUSTOM_EVALUATION_ACTION_ID = 4;
+
+        public String businessID = TUIChatConstants.BUSINESS_ID_CUSTOM_EVALUATION;
+        public float score = 0;
+        public String comment = "";
+
+        public int version = TUIChatConstants.JSON_VERSION_UNKNOWN;
+    }
+
+    private CustomEvaluationMessage customEvaluationMessage;
+
+    @Override
+    public String onGetDisplayString() {
+        return getExtra();
+    }
+
+    @Override
+    public void onProcessMessage(V2TIMMessage v2TIMMessage) {
+        String data = new String(v2TIMMessage.getCustomElem().getData());
+        TUIChatLog.d("CustomEvaluationMessageBean", "data = " + data);
+        if(!TextUtils.isEmpty(data)) {
+            try {
+                customEvaluationMessage = new Gson().fromJson(data, CustomEvaluationMessage.class);
+            } catch (Exception e) {
+                TUIChatLog.e("CustomEvaluationMessage", "exception e = " + e);
+            }
+        }
+        if (customEvaluationMessage != null) {
+            setExtra(TUIChatService.getAppContext().getString(R.string.custom_msg));
+        } else {
+            String text = TUIChatService.getAppContext().getString(R.string.no_support_msg);
+            setExtra(text);
+        }
+    }
+
+    public float getScore() {
+        if (customEvaluationMessage != null) {
+            return customEvaluationMessage.score;
+        }
+        return 0;
+    }
+
+    public String getContent() {
+        if (customEvaluationMessage != null) {
+            return customEvaluationMessage.comment;
+        }
+        return "";
+    }
+
+    @Override
+    public Class<? extends TUIReplyQuoteBean> getReplyQuoteBeanClass() {
+        return CustomEvaluationMessageReplyQuoteBean.class;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/CustomLinkMessageBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/CustomLinkMessageBean.java
new file mode 100644
index 0000000..d19adf9
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/CustomLinkMessageBean.java
@@ -0,0 +1,59 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message;
+
+import android.text.TextUtils;
+
+import com.google.gson.Gson;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.CustomHelloMessage;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.CustomLinkReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+public class CustomLinkMessageBean extends TUIMessageBean {
+
+    private CustomHelloMessage customHelloMessage;
+
+    @Override
+    public String onGetDisplayString() {
+        return getText();
+    }
+
+    @Override
+    public void onProcessMessage(V2TIMMessage v2TIMMessage) {
+        String data = new String(v2TIMMessage.getCustomElem().getData());
+        if(!TextUtils.isEmpty(data)) {
+            try {
+                customHelloMessage = new Gson().fromJson(data, CustomHelloMessage.class);
+            } catch (Exception e) {
+                TUIChatLog.e("CustomLinkMessageBean", "exception e = " + e);
+            }
+        }
+        if (customHelloMessage != null) {
+            setExtra(customHelloMessage.text);
+        } else {
+            String text = TUIChatService.getAppContext().getString(R.string.no_support_msg);
+            setExtra(text);
+        }
+    }
+
+    public String getText() {
+        if (customHelloMessage != null) {
+            return customHelloMessage.text;
+        }
+        return getExtra();
+    }
+
+    public String getLink() {
+        if (customHelloMessage != null) {
+            return customHelloMessage.link;
+        }
+        return "";
+    }
+
+    @Override
+    public Class<? extends TUIReplyQuoteBean> getReplyQuoteBeanClass() {
+        return CustomLinkReplyQuoteBean.class;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/CustomOrderMessageBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/CustomOrderMessageBean.java
new file mode 100644
index 0000000..423ee55
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/CustomOrderMessageBean.java
@@ -0,0 +1,97 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message;
+
+
+import android.text.TextUtils;
+
+import com.google.gson.Gson;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.CustomOrderMessageReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+import java.io.Serializable;
+
+public class CustomOrderMessageBean extends TUIMessageBean{
+
+    public class CustomOrderMessage implements Serializable {
+        //public static final int CUSTOM_EVALUATION_ACTION_ID = 5;
+
+        public String businessID = TUIChatConstants.BUSINESS_ID_CUSTOM_ORDER;
+        public String imageUrl = "";
+        public String title = "";
+        public String description = "";
+        public String price = "";
+        public String link = "";
+
+        public int version = TUIChatConstants.JSON_VERSION_UNKNOWN;
+    }
+
+    private CustomOrderMessage orderMessage;
+
+    @Override
+    public String onGetDisplayString() {
+        return getExtra();
+    }
+
+    @Override
+    public void onProcessMessage(V2TIMMessage v2TIMMessage) {
+        String data = new String(v2TIMMessage.getCustomElem().getData());
+        TUIChatLog.d("CustomOrderMessageBean", "data = " + data);
+        if(!TextUtils.isEmpty(data)) {
+            try {
+                orderMessage = new Gson().fromJson(data, CustomOrderMessage.class);
+            } catch (Exception e) {
+                TUIChatLog.e("CustomOrderMessageBean", "exception e = " + e);
+            }
+        }
+        if (orderMessage != null) {
+            setExtra(TUIChatService.getAppContext().getString(R.string.custom_msg));
+        } else {
+            String text = TUIChatService.getAppContext().getString(R.string.no_support_msg);
+            setExtra(text);
+        }
+    }
+
+    public String getImageUrl() {
+        if (orderMessage != null) {
+            return orderMessage.imageUrl;
+        }
+        return "";
+    }
+
+    public String getDescription() {
+        if (orderMessage != null) {
+            return orderMessage.description;
+        }
+        return "";
+    }
+
+    public String getTitle() {
+        if (orderMessage != null) {
+            return orderMessage.title;
+        }
+        return "";
+    }
+
+    public String getPrice() {
+        if (orderMessage != null) {
+            return orderMessage.price;
+        }
+        return "";
+    }
+
+    public String getLink() {
+        if (orderMessage != null) {
+            return orderMessage.link;
+        }
+        return "";
+    }
+
+    @Override
+    public Class<? extends TUIReplyQuoteBean> getReplyQuoteBeanClass() {
+        return CustomOrderMessageReplyQuoteBean.class;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/FaceMessageBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/FaceMessageBean.java
new file mode 100644
index 0000000..278e49c
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/FaceMessageBean.java
@@ -0,0 +1,50 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message;
+
+import com.tencent.imsdk.v2.V2TIMFaceElem;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.FaceReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+public class FaceMessageBean extends TUIMessageBean {
+
+    private V2TIMFaceElem faceElem;
+
+    @Override
+    public String onGetDisplayString() {
+        return getExtra();
+    }
+
+    @Override
+    public void onProcessMessage(V2TIMMessage v2TIMMessage) {
+        faceElem = v2TIMMessage.getFaceElem();
+        if (faceElem.getIndex() < 1 || faceElem.getData() == null) {
+            TUIChatLog.e("FaceMessageBean", "faceElem data is null or index<1");
+            return;
+        }
+        setExtra(TUIChatService.getAppContext().getString(R.string.custom_emoji));
+    }
+
+    public byte[] getData() {
+        if (faceElem != null) {
+            return faceElem.getData();
+        } else {
+            return new byte[0];
+        }
+    }
+
+    public int getIndex() {
+        if (faceElem != null) {
+            return faceElem.getIndex();
+        } else {
+            return 0;
+        }
+    }
+
+    @Override
+    public Class<? extends TUIReplyQuoteBean> getReplyQuoteBeanClass() {
+        return FaceReplyQuoteBean.class;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/FileMessageBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/FileMessageBean.java
new file mode 100644
index 0000000..a336c83
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/FileMessageBean.java
@@ -0,0 +1,157 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message;
+
+import android.text.TextUtils;
+
+import com.tencent.imsdk.v2.V2TIMDownloadCallback;
+import com.tencent.imsdk.v2.V2TIMElem;
+import com.tencent.imsdk.v2.V2TIMFileElem;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.FileReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+
+import java.io.File;
+
+public class FileMessageBean extends TUIMessageBean {
+
+    private String dataPath;
+    private V2TIMFileElem fileElem;
+
+    @Override
+    public String onGetDisplayString() {
+        return getExtra();
+    }
+
+    @Override
+    public void onProcessMessage(V2TIMMessage v2TIMMessage) {
+        if (getStatus() == TUIMessageBean.MSG_STATUS_REVOKE) {
+            return;
+        }
+        fileElem = v2TIMMessage.getFileElem();
+        String filename = fileElem.getUUID();
+        if (TextUtils.isEmpty(filename)) {
+            filename = System.currentTimeMillis() + fileElem.getFileName();
+        }
+        final String path = TUIConfig.getFileDownloadDir() + filename;
+        String finalPath = path;
+        File file = new File(path);
+
+        if (file.exists()) {
+            if (isSelf()) {
+                setStatus(TUIMessageBean.MSG_STATUS_SEND_SUCCESS);
+            }
+            setDownloadStatus(TUIMessageBean.MSG_STATUS_DOWNLOADED);
+        } else {
+            if (isSelf()) {
+                if (TextUtils.isEmpty(fileElem.getPath())) {
+                    setDownloadStatus(TUIMessageBean.MSG_STATUS_UN_DOWNLOAD);
+                } else {
+                    file = new File(fileElem.getPath());
+                    if (file.exists()) {
+                        setStatus(TUIMessageBean.MSG_STATUS_SEND_SUCCESS);
+                        setDownloadStatus(TUIMessageBean.MSG_STATUS_DOWNLOADED);
+                        finalPath = fileElem.getPath();
+                    } else {
+                        setDownloadStatus(TUIMessageBean.MSG_STATUS_UN_DOWNLOAD);
+                    }
+                }
+            } else {
+                setDownloadStatus(TUIMessageBean.MSG_STATUS_UN_DOWNLOAD);
+            }
+        }
+        setDataPath(finalPath);
+        setExtra(TUIChatService.getAppContext().getString(R.string.file_extra));
+    }
+
+    /**
+     * 获取文件的保存路径
+     * 
+     * Get the save path of the file
+     *
+     * @return
+     */
+    public String getDataPath() {
+        return dataPath;
+    }
+
+    /**
+     * 设置文件的保存路径
+     * 
+     * Set the save path of the file
+     *
+     * @param dataPath
+     */
+    public void setDataPath(String dataPath) {
+        this.dataPath = dataPath;
+    }
+
+    public String getUUID() {
+        if (fileElem != null) {
+            return fileElem.getUUID();
+        }
+        return "";
+    }
+    public String getFileName() {
+        if (fileElem != null) {
+            return fileElem.getFileName();
+        }
+        return "";
+    }
+
+    public int getFileSize() {
+        if (fileElem != null) {
+            return fileElem.getFileSize();
+        }
+        return 0;
+    }
+
+    public String getPath() {
+        if (fileElem != null) {
+            return fileElem.getPath();
+        }
+        return "";
+    }
+
+    public void downloadFile(String path, FileDownloadCallback callback) {
+        if (fileElem != null) {
+            fileElem.downloadFile(path, new V2TIMDownloadCallback() {
+                @Override
+                public void onProgress(V2TIMElem.V2ProgressInfo progressInfo) {
+                    if (callback != null) {
+                        callback.onProgress(progressInfo.getCurrentSize(), progressInfo.getTotalSize());
+                    }
+                }
+
+                @Override
+                public void onSuccess() {
+                    if (callback != null) {
+                        callback.onSuccess();
+                    }
+                }
+
+                @Override
+                public void onError(int code, String desc) {
+                    if (callback != null) {
+                        callback.onError(code, desc);
+                    }
+                }
+            });
+        }
+    }
+
+    public interface FileDownloadCallback {
+        void onProgress(long currentSize, long totalSize);
+
+        void onSuccess();
+
+        void onError(int code, String desc);
+    }
+
+    @Override
+    public Class<? extends TUIReplyQuoteBean> getReplyQuoteBeanClass() {
+        return FileReplyQuoteBean.class;
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/GroupMessageReadMembersInfo.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/GroupMessageReadMembersInfo.java
new file mode 100644
index 0000000..9708281
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/GroupMessageReadMembersInfo.java
@@ -0,0 +1,37 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message;
+
+import com.tencent.imsdk.v2.V2TIMGroupMemberInfo;
+import com.tencent.imsdk.v2.V2TIMGroupMessageReadMemberList;
+import com.tencent.qcloud.tuikit.tuichat.bean.GroupMemberInfo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class GroupMessageReadMembersInfo {
+    private List<GroupMemberInfo> groupMemberInfoList;
+    private V2TIMGroupMessageReadMemberList readMembers;
+
+    public void setReadMembers(V2TIMGroupMessageReadMemberList readMembers) {
+        this.readMembers = readMembers;
+        groupMemberInfoList = new ArrayList<>();
+        List<V2TIMGroupMemberInfo> readMemberList = readMembers.getMemberInfoList();
+        for (V2TIMGroupMemberInfo v2TIMGroupMemberInfo : readMemberList) {
+            GroupMemberInfo memberInfo = new GroupMemberInfo();
+            memberInfo.covertTIMGroupMemberInfo(v2TIMGroupMemberInfo);
+            groupMemberInfoList.add(memberInfo);
+        }
+    }
+
+    public boolean isFinished() {
+        return readMembers.isFinished();
+    }
+
+    public long getNextSeq() {
+        readMembers.getMemberInfoList();
+        return readMembers.getNextSeq();
+    }
+
+    public List<GroupMemberInfo> getGroupMemberInfoList() {
+        return groupMemberInfoList;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/ImageMessageBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/ImageMessageBean.java
new file mode 100644
index 0000000..3d1e561
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/ImageMessageBean.java
@@ -0,0 +1,278 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message;
+
+import android.net.Uri;
+import android.text.TextUtils;
+
+import com.tencent.imsdk.v2.V2TIMDownloadCallback;
+import com.tencent.imsdk.v2.V2TIMElem;
+import com.tencent.imsdk.v2.V2TIMImageElem;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuicore.util.ImageUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.ImageReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+
+import java.io.File;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ImageMessageBean  extends TUIMessageBean {
+
+    /**
+     * ## 原图
+     * 
+     * original image
+     */
+    public static final int IMAGE_TYPE_ORIGIN = V2TIMImageElem.V2TIM_IMAGE_TYPE_ORIGIN;
+    /**
+     * ## 缩略图
+     * 
+     * thumbnail
+     */
+    public static final int IMAGE_TYPE_THUMB = V2TIMImageElem.V2TIM_IMAGE_TYPE_THUMB;
+    /**
+     * ## 大图
+     * 
+     * big picture
+     */
+    public static final int IMAGE_TYPE_LARGE = V2TIMImageElem.V2TIM_IMAGE_TYPE_LARGE;
+
+    private String dataUri;
+    private String dataPath;
+    private int imgWidth;
+    private int imgHeight;
+
+    private V2TIMImageElem imageElem;
+    private List<ImageBean> imageBeanList;
+
+    @Override
+    public String onGetDisplayString() {
+        return getExtra();
+    }
+
+    @Override
+    public void onProcessMessage(V2TIMMessage v2TIMMessage) {
+        imageElem = v2TIMMessage.getImageElem();
+
+        List<V2TIMImageElem.V2TIMImage> imageList = imageElem.getImageList();
+        if (imageList != null) {
+            List<ImageBean> imageBeans = new ArrayList<>();
+            for(V2TIMImageElem.V2TIMImage v2TIMImage : imageList) {
+                ImageBean imageBean = new ImageBean();
+                imageBean.setV2TIMImage(v2TIMImage);
+                imageBeans.add(imageBean);
+            }
+            this.imageBeanList = imageBeans;
+        }
+
+        String localPath = imageElem.getPath();
+        if (isSelf() && !TextUtils.isEmpty(localPath) && new File(localPath).exists()) {
+            dataPath = localPath;
+            int size[] = ImageUtil.getImageSize(localPath);
+            imgWidth = size[0];
+            imgHeight = size[1];
+        }
+        // 本地路径为空，可能为更换手机或者是接收的消息
+        // The local path is empty, it may be a phone change or a received message
+        else {
+            List<V2TIMImageElem.V2TIMImage> imgs = imageElem.getImageList();
+            for (int i = 0; i < imgs.size(); i++) {
+                V2TIMImageElem.V2TIMImage img = imgs.get(i);
+                if (img.getType() == V2TIMImageElem.V2TIM_IMAGE_TYPE_ORIGIN) {
+                    imgWidth = img.getWidth();
+                    imgHeight = img.getHeight();
+                }
+                if (img.getType() == V2TIMImageElem.V2TIM_IMAGE_TYPE_THUMB) {
+                    final String path = ImageUtil.generateImagePath(img.getUUID(), V2TIMImageElem.V2TIM_IMAGE_TYPE_THUMB);
+                    File file = new File(path);
+                    if (file.exists()) {
+                        dataPath = path;
+                    }
+                }
+            }
+        }
+        setExtra(TUIChatService.getAppContext().getString(R.string.picture_extra));
+    }
+
+    /**
+     * 获取多媒体消息的数据源
+     * 
+     * Get the data source of the multimedia message
+     *
+     * @return
+     */
+    public Uri getDataUriObj() {
+        if (!TextUtils.isEmpty(dataUri)) {
+            return Uri.parse(dataUri);
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * 设置多媒体消息的数据源
+     * 
+     * Set the data source of the multimedia message
+     *
+     * @param dataUri
+     */
+    public void setDataUri(Uri dataUri) {
+        if (dataUri != null) {
+            this.dataUri = dataUri.toString();
+        }
+    }
+
+    /**
+     * 获取多媒体消息的保存路径
+     * 
+     * Get the save path of multimedia messages
+     *
+     * @return
+     */
+    public String getDataPath() {
+        return dataPath;
+    }
+
+    /**
+     * 设置多媒体消息的保存路径
+     * 
+     * Set the save path of multimedia messages
+     *
+     * @param dataPath
+     */
+    public void setDataPath(String dataPath) {
+        this.dataPath = dataPath;
+    }
+
+    public void setImgHeight(int imgHeight) {
+        this.imgHeight = imgHeight;
+    }
+
+    public void setImgWidth(int imgWidth) {
+        this.imgWidth = imgWidth;
+    }
+
+    public int getImgHeight() {
+        return imgHeight;
+    }
+
+    public int getImgWidth() {
+        return imgWidth;
+    }
+
+    public void setImageElem(V2TIMImageElem imageElem) {
+        this.imageElem = imageElem;
+    }
+
+    public void setImageBeanList(List<ImageBean> imageBeanList) {
+        this.imageBeanList = imageBeanList;
+    }
+
+    public List<ImageBean> getImageBeanList() {
+        return imageBeanList;
+    }
+
+    public String getPath() {
+        if(imageElem != null) {
+            return imageElem.getPath();
+        }
+        return "";
+    }
+
+    public static class ImageBean implements Serializable {
+        private V2TIMImageElem.V2TIMImage v2TIMImage;
+
+        public void setV2TIMImage(V2TIMImageElem.V2TIMImage v2TIMImage) {
+            this.v2TIMImage = v2TIMImage;
+        }
+
+        public V2TIMImageElem.V2TIMImage getV2TIMImage() {
+            return v2TIMImage;
+        }
+
+        public String getUUID() {
+            if (v2TIMImage != null) {
+                return v2TIMImage.getUUID();
+            }
+            return "";
+        }
+
+        public String getUrl() {
+            if (v2TIMImage != null) {
+                return v2TIMImage.getUrl();
+            }
+            return "";
+        }
+
+        public int getType() {
+            if (v2TIMImage != null) {
+                return v2TIMImage.getType();
+            }
+            return IMAGE_TYPE_THUMB;
+        }
+
+        public int getSize() {
+            if (v2TIMImage != null) {
+                return v2TIMImage.getSize();
+            }
+            return 0;
+        }
+
+        public int getHeight() {
+            if (v2TIMImage != null) {
+                return v2TIMImage.getHeight();
+            }
+            return 0;
+        }
+
+        public int getWidth() {
+            if (v2TIMImage != null) {
+                return v2TIMImage.getWidth();
+            }
+            return 0;
+        }
+
+        public void downloadImage(String path, ImageDownloadCallback callback) {
+            if (v2TIMImage != null) {
+                v2TIMImage.downloadImage(path, new V2TIMDownloadCallback() {
+                    @Override
+                    public void onProgress(V2TIMElem.V2ProgressInfo progressInfo) {
+                        if (callback != null) {
+                            callback.onProgress(progressInfo.getCurrentSize(), progressInfo.getTotalSize());
+                        }
+                    }
+
+                    @Override
+                    public void onSuccess() {
+                        if (callback != null) {
+                            callback.onSuccess();
+                        }
+                    }
+
+                    @Override
+                    public void onError(int code, String desc) {
+                        if (callback != null) {
+                            callback.onError(code, desc);
+                        }
+                    }
+                });
+            }
+        }
+
+
+        public interface ImageDownloadCallback {
+            void onProgress(long currentSize, long totalSize);
+
+            void onSuccess();
+
+            void onError(int code, String desc);
+        }
+    }
+
+    @Override
+    public Class<? extends TUIReplyQuoteBean> getReplyQuoteBeanClass() {
+        return ImageReplyQuoteBean.class;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/LocationMessageBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/LocationMessageBean.java
new file mode 100644
index 0000000..40ce902
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/LocationMessageBean.java
@@ -0,0 +1,51 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message;
+
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.LocationReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+
+public class LocationMessageBean extends TUIMessageBean {
+
+    private String desc;
+    private double latitude;
+    private double longitude;
+
+    @Override
+    public String onGetDisplayString() {
+        return desc;
+    }
+
+    @Override
+    public void onProcessMessage(V2TIMMessage v2TIMMessage) {
+        desc = v2TIMMessage.getLocationElem().getDesc();
+        longitude = v2TIMMessage.getLocationElem().getLongitude();
+        latitude = v2TIMMessage.getLocationElem().getLatitude();
+    }
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public void setLatitude(double latitude) {
+        this.latitude = latitude;
+    }
+
+    public void setLongitude(double longitude) {
+        this.longitude = longitude;
+    }
+    public double getLatitude() {
+        return latitude;
+    }
+
+    public double getLongitude() {
+        return longitude;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    @Override
+    public Class<? extends TUIReplyQuoteBean> getReplyQuoteBeanClass() {
+        return LocationReplyQuoteBean.class;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/MedicalExaminationReportMessageBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/MedicalExaminationReportMessageBean.java
new file mode 100644
index 0000000..d03c925
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/MedicalExaminationReportMessageBean.java
@@ -0,0 +1,124 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message;
+
+import android.text.TextUtils;
+
+import com.google.gson.Gson;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+
+/**
+ * 体检报告
+ */
+public class MedicalExaminationReportMessageBean extends TUIMessageBean{
+    public String businessID = TUIChatConstants.BUSINESS_ID_MEDICAL_EXAMINATION_REPORT;
+    private String reportId;
+    private String name;
+    private String gender;
+    private String age;
+    private String hospital;
+    private String createTime;
+    private String cardNum;
+    private String year;
+    private String recordId;
+
+    public String getBusinessID() {
+        return businessID;
+    }
+
+    public void setBusinessID(String businessID) {
+        this.businessID = businessID;
+    }
+
+    public String getReportId() {
+        return reportId;
+    }
+
+    public void setReportId(String reportId) {
+        this.reportId = reportId;
+    }
+    public String getRecordId() {
+        return recordId == null ? "" : recordId;
+    }
+
+    public void setRecordId(String recordId) {
+        this.recordId = recordId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getGender() {
+        return gender;
+    }
+
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
+
+    public String getAge() {
+        return age;
+    }
+
+    public void setAge(String age) {
+        this.age = age;
+    }
+
+    public String getHospital() {
+        return hospital;
+    }
+
+    public void setHospital(String hospital) {
+        this.hospital = hospital;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getCardNum() {
+        return cardNum;
+    }
+
+    public void setCardNum(String cardNum) {
+        this.cardNum = cardNum;
+    }
+
+    public String getYear() {
+        return year;
+    }
+
+    public void setYear(String year) {
+        this.year = year;
+    }
+
+    @Override
+    public String onGetDisplayString() {
+        return getExtra();
+    }
+
+    @Override
+    public void onProcessMessage(V2TIMMessage v2TIMMessage) {
+        String data = new String(v2TIMMessage.getCustomElem().getData());
+        if(!TextUtils.isEmpty(data)) {
+            MedicalExaminationReportMessageBean medicalExaminationReportMessageBean = new Gson().fromJson(data, MedicalExaminationReportMessageBean.class);
+            setReportId(medicalExaminationReportMessageBean.getReportId());
+            setName(medicalExaminationReportMessageBean.getName());
+            setGender(medicalExaminationReportMessageBean.getGender());
+            setAge(medicalExaminationReportMessageBean.getAge());
+            setHospital(medicalExaminationReportMessageBean.getHospital());
+            setCreateTime(medicalExaminationReportMessageBean.getCreateTime());
+            setCardNum(medicalExaminationReportMessageBean.getCardNum());
+            setYear(medicalExaminationReportMessageBean.getYear());
+            setRecordId(medicalExaminationReportMessageBean.getRecordId());
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/MergeMessageBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/MergeMessageBean.java
new file mode 100644
index 0000000..7b4af41
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/MergeMessageBean.java
@@ -0,0 +1,57 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message;
+
+import com.tencent.imsdk.v2.V2TIMMergerElem;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.MergeReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MergeMessageBean extends TUIMessageBean {
+    private V2TIMMergerElem mergerElem;
+
+    @Override
+    public String onGetDisplayString() {
+        return getExtra();
+    }
+
+    @Override
+    public void onProcessMessage(V2TIMMessage v2TIMMessage) {
+        mergerElem = v2TIMMessage.getMergerElem();
+        setExtra(TUIChatService.getAppContext().getString(R.string.forward_extra));
+    }
+
+    public V2TIMMergerElem getMergerElem() {
+        return mergerElem;
+    }
+
+    public String getTitle() {
+        if (mergerElem != null) {
+            return mergerElem.getTitle();
+        }
+        return "";
+    }
+
+    public List<String> getAbstractList() {
+        if (mergerElem != null) {
+            return mergerElem.getAbstractList();
+        }
+        return new ArrayList<>();
+    }
+
+    public boolean isLayersOverLimit() {
+        if (mergerElem != null) {
+            return mergerElem.isLayersOverLimit();
+        }
+        return false;
+    }
+
+    @Override
+    public Class<? extends TUIReplyQuoteBean> getReplyQuoteBeanClass() {
+        return MergeReplyQuoteBean.class;
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/MessageTypingBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/MessageTypingBean.java
new file mode 100644
index 0000000..42f2699
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/MessageTypingBean.java
@@ -0,0 +1,40 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message;
+
+import android.text.TextUtils;
+
+import com.google.gson.Gson;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageTyping;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+public class MessageTypingBean extends TUIMessageBean{
+    private MessageTyping messageTyping;
+
+    @Override
+    public String onGetDisplayString() {
+        return null;
+    }
+
+    @Override
+    public void onProcessMessage(V2TIMMessage v2TIMMessage) {
+        String data = new String(v2TIMMessage.getCustomElem().getData());
+        TUIChatLog.d("messageTypingBean", "data = " + data);
+        if(!TextUtils.isEmpty(data)) {
+            try {
+                messageTyping = new Gson().fromJson(data, MessageTyping.class);
+            } catch (Exception e) {
+                TUIChatLog.e("messageTyping", "exception e = " + e);
+            }
+        }
+        if (messageTyping == null) {
+            TUIChatLog.e("messageTypingBean", "messageTyping is null");
+        }
+    }
+
+    public int getTypingStatus() {
+        if (messageTyping != null) {
+            return messageTyping.typingStatus;
+        }
+        return 0;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/QuoteMessageBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/QuoteMessageBean.java
new file mode 100644
index 0000000..70a1f1f
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/QuoteMessageBean.java
@@ -0,0 +1,128 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message;
+
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuikit.tuichat.bean.ReplyPreviewBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.ReplyReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TextReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageParser;
+
+/**
+ * Quote Message
+ */
+public class QuoteMessageBean extends TUIMessageBean {
+
+    // quote content
+    private TUIMessageBean contentMessageBean;
+
+    // origin message
+    private TUIMessageBean originMessageBean;
+
+    private final String originMsgId;
+    private final String originMsgAbstract;
+    private final String originMsgSender;
+    private final int originMsgType;
+    private final int version;
+
+    private TUIReplyQuoteBean replyQuoteBean;
+
+    public QuoteMessageBean(ReplyPreviewBean replyPreviewBean) {
+        originMsgId = replyPreviewBean.getMessageID();
+        originMsgAbstract = replyPreviewBean.getMessageAbstract();
+        originMsgSender = replyPreviewBean.getMessageSender();
+        originMsgType = replyPreviewBean.getMessageType();
+        version = replyPreviewBean.getVersion();
+        originMessageBean = replyPreviewBean.getOriginalMessageBean();
+    }
+
+    @Override
+    public String onGetDisplayString() {
+        if (contentMessageBean != null) {
+            return contentMessageBean.onGetDisplayString();
+        } else {
+            return "";
+        }
+    }
+
+    @Override
+    public void onProcessMessage(V2TIMMessage v2TIMMessage) {
+        contentMessageBean = ChatMessageParser.parseMessage(v2TIMMessage, true);
+        generateReplyQuoteBean();
+        setExtra(contentMessageBean.getExtra());
+    }
+
+    private void generateReplyQuoteBean() {
+        generateDefaultReplyQuoteBean();
+        if (originMessageBean == null) {
+            return;
+        }
+        Class<? extends TUIReplyQuoteBean> quoteReplyBeanClass = originMessageBean.getReplyQuoteBeanClass();
+        if (quoteReplyBeanClass != null) {
+            try {
+                replyQuoteBean = quoteReplyBeanClass.newInstance();
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            } catch (InstantiationException e) {
+                e.printStackTrace();
+            }
+        }
+        if (replyQuoteBean != null) {
+            replyQuoteBean.onProcessReplyQuoteBean(originMessageBean);
+            replyQuoteBean.setMessageBean(originMessageBean);
+            replyQuoteBean.setMessageType(originMsgType);
+            replyQuoteBean.setDefaultAbstract(originMsgAbstract);
+        }
+    }
+
+    private void generateDefaultReplyQuoteBean() {
+        replyQuoteBean = new TextReplyQuoteBean();
+        replyQuoteBean.setDefaultAbstract(originMsgAbstract);
+        replyQuoteBean.setMessageType(originMsgType);
+    }
+
+    public TUIMessageBean getContentMessageBean() {
+        return contentMessageBean;
+    }
+
+    public void setOriginMessageBean(TUIMessageBean originMessageBean) {
+        this.originMessageBean = originMessageBean;
+        generateReplyQuoteBean();
+    }
+
+    public void setReplyQuoteBean(TUIReplyQuoteBean replyQuoteBean) {
+        this.replyQuoteBean = replyQuoteBean;
+    }
+
+    public TUIMessageBean getOriginMessageBean() {
+        return originMessageBean;
+    }
+
+    public String getOriginMsgId() {
+        return originMsgId;
+    }
+
+    public String getOriginMsgAbstract() {
+        return originMsgAbstract;
+    }
+
+    public String getOriginMsgSender() {
+        return originMsgSender;
+    }
+
+    public int getOriginMsgType() {
+        return originMsgType;
+    }
+
+    public int getVersion() {
+        return version;
+    }
+
+    public TUIReplyQuoteBean getReplyQuoteBean() {
+        return replyQuoteBean;
+    }
+
+    @Override
+    public Class<? extends TUIReplyQuoteBean> getReplyQuoteBeanClass() {
+        return ReplyReplyQuoteBean.class;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/ReplyMessageBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/ReplyMessageBean.java
new file mode 100644
index 0000000..dd7f453
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/ReplyMessageBean.java
@@ -0,0 +1,18 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.ReplyPreviewBean;
+/**
+ * Reply Message
+ */
+public class ReplyMessageBean extends QuoteMessageBean {
+    private final String msgRootId;
+
+    public ReplyMessageBean(ReplyPreviewBean replyPreviewBean) {
+        super(replyPreviewBean);
+        msgRootId = replyPreviewBean.getMessageRootID();
+    }
+
+    public String getMsgRootId() {
+        return msgRootId;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/SoundMessageBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/SoundMessageBean.java
new file mode 100644
index 0000000..48857fe
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/SoundMessageBean.java
@@ -0,0 +1,163 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message;
+
+import android.text.TextUtils;
+
+import com.tencent.imsdk.v2.V2TIMDownloadCallback;
+import com.tencent.imsdk.v2.V2TIMElem;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.imsdk.v2.V2TIMSoundElem;
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.SoundReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+import java.io.File;
+
+public class SoundMessageBean extends TUIMessageBean {
+    private String dataPath;
+    private V2TIMSoundElem soundElem;
+
+    @Override
+    public String onGetDisplayString() {
+        return getExtra();
+    }
+
+    @Override
+    public void onProcessMessage(V2TIMMessage v2TIMMessage) {
+        soundElem = v2TIMMessage.getSoundElem();
+        if (isSelf() && !TextUtils.isEmpty(soundElem.getPath())) {
+            dataPath = soundElem.getPath();
+        } else {
+            final String path = TUIConfig.getRecordDownloadDir() + soundElem.getUUID();
+            File file = new File(path);
+            if (!file.exists()) {
+                soundElem.downloadSound(path, new V2TIMDownloadCallback() {
+                    @Override
+                    public void onProgress(V2TIMElem.V2ProgressInfo progressInfo) {
+                        long currentSize = progressInfo.getCurrentSize();
+                        long totalSize = progressInfo.getTotalSize();
+                        int progress = 0;
+                        if (totalSize > 0) {
+                            progress = (int) (100 * currentSize / totalSize);
+                        }
+                        if (progress > 100) {
+                            progress = 100;
+                        }
+                        TUIChatLog.i("ChatMessageInfoUtil getSoundToFile", "progress:" + progress);
+                    }
+
+                    @Override
+                    public void onError(int code, String desc) {
+                        TUIChatLog.e("ChatMessageInfoUtil getSoundToFile", code + ":" + desc);
+                    }
+
+                    @Override
+                    public void onSuccess() {
+                        dataPath = path;
+                    }
+                });
+            } else {
+                dataPath = path;
+            }
+        }
+        setExtra(TUIChatService.getAppContext().getString(R.string.audio_extra));
+    }
+
+    /**
+     * 获取多媒体消息的保存路径
+     * 
+     * Get the save path of multimedia messages
+     *
+     * @return
+     */
+    public String getDataPath() {
+        return dataPath;
+    }
+
+    /**
+     * 设置多媒体消息的保存路径
+     * 
+     * Set the save path of multimedia messages
+     *
+     * @param dataPath
+     */
+    public void setDataPath(String dataPath) {
+        this.dataPath = dataPath;
+    }
+
+    public void setCustomInt(int customInt) {
+        if (getV2TIMMessage() != null) {
+            getV2TIMMessage().setLocalCustomInt(customInt);
+        }
+    }
+
+    public int getCustomInt() {
+        if (getV2TIMMessage() != null) {
+            return getV2TIMMessage().getLocalCustomInt();
+        }
+        return 0;
+    }
+
+
+    public void setSoundElem(V2TIMSoundElem soundElem) {
+        this.soundElem = soundElem;
+    }
+
+    public String getUUID() {
+        if (soundElem != null) {
+            return soundElem.getUUID();
+        }
+        return "";
+    }
+
+    public int getDuration() {
+        if (soundElem != null) {
+            return soundElem.getDuration();
+        }
+        return 0;
+    }
+
+
+    public void downloadSound(String path, SoundDownloadCallback callback) {
+        if (soundElem != null) {
+            soundElem.downloadSound(path, new V2TIMDownloadCallback() {
+                @Override
+                public void onProgress(V2TIMElem.V2ProgressInfo progressInfo) {
+                    if (callback != null) {
+                        callback.onProgress(progressInfo.getCurrentSize(), progressInfo.getTotalSize());
+                    }
+                }
+
+                @Override
+                public void onSuccess() {
+                    if (callback != null) {
+                        callback.onSuccess();
+                    }
+                }
+
+                @Override
+                public void onError(int code, String desc) {
+                    if (callback != null) {
+                        callback.onError(code, desc);
+                    }
+                }
+            });
+        }
+    }
+
+    public interface SoundDownloadCallback {
+        void onProgress(long currentSize, long totalSize);
+
+        void onSuccess();
+
+        void onError(int code, String desc);
+    }
+
+    @Override
+    public Class<? extends TUIReplyQuoteBean> getReplyQuoteBeanClass() {
+        return SoundReplyQuoteBean.class;
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/SystemMessageBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/SystemMessageBean.java
new file mode 100644
index 0000000..23e984b
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/SystemMessageBean.java
@@ -0,0 +1,75 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message;
+
+import android.text.TextUtils;
+
+import com.google.gson.Gson;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+
+public class SystemMessageBean extends TUIMessageBean {
+    public String businessID = TUIChatConstants.BUSINESS_ID_SYSTEM;
+    private String title;
+    private String content;
+    private String messageImageUrl;
+    private int type;
+    public static class Type{
+        public static final int TYPE_CHAT_FINISH = 1;
+        public static final int TYPE_CHAT_APPRAISE = 2;
+    }
+    public String getBusinessID() {
+        return businessID;
+    }
+
+    public void setBusinessID(String businessID) {
+        this.businessID = businessID;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getMessageImageUrl() {
+        return messageImageUrl;
+    }
+
+    public void setMessageImageUrl(String messageImageUrl) {
+        this.messageImageUrl = messageImageUrl;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    @Override
+    public String onGetDisplayString() {
+        return getExtra();
+    }
+
+    @Override
+    public void onProcessMessage(V2TIMMessage v2TIMMessage) {
+        String data = new String(v2TIMMessage.getCustomElem().getData());
+        if(!TextUtils.isEmpty(data)) {
+            SystemMessageBean systemMessageBean = new Gson().fromJson(data, SystemMessageBean.class);
+            setTitle(systemMessageBean.getTitle());
+            setContent(systemMessageBean.getContent());
+            setMessageImageUrl(systemMessageBean.getMessageImageUrl());
+            setType(systemMessageBean.getType());
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/TUIMessageBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/TUIMessageBean.java
new file mode 100644
index 0000000..13e6e16
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/TUIMessageBean.java
@@ -0,0 +1,506 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message;
+
+import android.text.TextUtils;
+
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageFeature;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageReactBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageReceiptInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageRepliesBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageBuilder;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageParser;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.Serializable;
+
+public abstract class TUIMessageBean implements Serializable {
+     /**
+      * 消息正常状态
+      *
+      * message normal
+      */
+     public static final int MSG_STATUS_NORMAL = 0;
+     /**
+      * 消息发送中状态
+      *
+      * message sending
+      */
+     public static final int MSG_STATUS_SENDING = 1;
+     /**
+      * 消息发送成功状态
+      *
+      * message send success
+      */
+     public static final int MSG_STATUS_SEND_SUCCESS = 2;
+     /**
+      * 消息发送失败状态
+      *
+      * message send failed
+      */
+     public static final int MSG_STATUS_SEND_FAIL = 3;
+
+     /**
+      * 消息未读状态
+      *
+      * message unread
+      */
+     public static final int MSG_STATUS_READ = 0x111;
+     /**
+      * 消息删除状态
+      *
+      * message deleted
+      */
+     public static final int MSG_STATUS_DELETE = 0x112;
+     /**
+      * 消息撤回状态
+      *
+      * messaage revoked
+      */
+     public static final int MSG_STATUS_REVOKE = 0x113;
+
+     /**
+      * 消息内容下载中状态
+      *
+      * message downloading
+      */
+     public static final int MSG_STATUS_DOWNLOADING = 4;
+     /**
+      * 消息内容未下载状态
+      *
+      * message undownloaded
+      */
+     public static final int MSG_STATUS_UN_DOWNLOAD = 5;
+     /**
+      * 消息内容已下载状态
+      *
+      * message downloaded
+      */
+     public static final int MSG_STATUS_DOWNLOADED = 6;
+     /**
+      * 消息翻译初始化状态
+      *
+      * message translation unknown
+      */
+     public static final int MSG_TRANSLATE_STATUS_UNKNOWN = 0;
+     /**
+      * 消息翻译隐藏状态
+      *
+      * message translation hidden
+      */
+     public static final int MSG_TRANSLATE_STATUS_HIDDEN  = 1;
+     /**
+      * 消息翻译进行中状态
+      *
+      * message translation loading
+      */
+     public static final int MSG_TRANSLATE_STATUS_LOADING = 2;
+     /**
+      * 消息翻译展示状态
+      *
+      * message translation shown
+      */
+     public static final int MSG_TRANSLATE_STATUS_SHOWN   = 3;
+
+     public static final String TRANSLATION_KEY = "translation";
+     public static final String TRANSLATION_VIEW_STATUS_KEY = "translation_view_status";
+
+     private V2TIMMessage v2TIMMessage;
+     private long msgTime;
+     private String extra;
+     private String id;
+     private boolean isGroup;
+     private int status;
+     private int downloadStatus;
+     private String selectText;
+     private int translationStatus = MSG_TRANSLATE_STATUS_UNKNOWN;
+
+     private MessageReceiptInfo messageReceiptInfo;
+     private MessageRepliesBean messageRepliesBean;
+     private MessageReactBean messageReactBean;
+
+     public MessageReactBean getMessageReactBean() {
+          return messageReactBean;
+     }
+
+     public MessageRepliesBean getMessageRepliesBean() {
+          return messageRepliesBean;
+     }
+
+     public void setMessageReactBean(MessageReactBean messageReactBean) {
+          this.messageReactBean = messageReactBean;
+          ChatMessageBuilder.mergeCloudCustomData(this, TUIChatConstants.MESSAGE_REACT_KEY, messageReactBean);
+     }
+
+     public void setMessageRepliesBean(MessageRepliesBean messageRepliesBean) {
+          this.messageRepliesBean = messageRepliesBean;
+          ChatMessageBuilder.mergeCloudCustomData(this, TUIChatConstants.MESSAGE_REPLIES_KEY, messageRepliesBean);
+     }
+
+     public void setMessageReceiptInfo(MessageReceiptInfo messageReceiptInfo) {
+          this.messageReceiptInfo = messageReceiptInfo;
+     }
+
+     public long getReadCount() {
+          if (messageReceiptInfo != null) {
+               return messageReceiptInfo.getReadCount();
+          }
+          return 0;
+     }
+
+     public long getUnreadCount() {
+          if (messageReceiptInfo != null) {
+               return messageReceiptInfo.getUnreadCount();
+          }
+          return 0;
+     }
+
+     public void setCommonAttribute(V2TIMMessage v2TIMMessage) {
+          msgTime = System.currentTimeMillis() / 1000;
+          this.v2TIMMessage = v2TIMMessage;
+
+          if (v2TIMMessage == null) {
+               return;
+          }
+
+          id = v2TIMMessage.getMsgID();
+          isGroup = !TextUtils.isEmpty(v2TIMMessage.getGroupID());
+
+          if (v2TIMMessage.getStatus() == V2TIMMessage.V2TIM_MSG_STATUS_LOCAL_REVOKED) {
+               status = MSG_STATUS_REVOKE;
+               if (isSelf()) {
+                    extra = TUIChatService.getAppContext().getString(R.string.revoke_tips_you);
+               } else if (isGroup) {
+                    String message = TUIChatConstants.covert2HTMLString(getSender());
+                    extra = message + TUIChatService.getAppContext().getString(R.string.revoke_tips);
+               } else {
+                    extra = TUIChatService.getAppContext().getString(R.string.revoke_tips_other);
+               }
+          } else {
+               if (isSelf()) {
+                    if (v2TIMMessage.getStatus() == V2TIMMessage.V2TIM_MSG_STATUS_SEND_FAIL) {
+                         status = MSG_STATUS_SEND_FAIL;
+                    } else if (v2TIMMessage.getStatus() == V2TIMMessage.V2TIM_MSG_STATUS_SEND_SUCC) {
+                         status = MSG_STATUS_SEND_SUCCESS;
+                    } else if (v2TIMMessage.getStatus() == V2TIMMessage.V2TIM_MSG_STATUS_SENDING) {
+                         status = MSG_STATUS_SENDING;
+                    }
+               }
+          }
+
+          messageReactBean = ChatMessageParser.parseMessageReact(this);
+          messageRepliesBean = ChatMessageParser.parseMessageReplies(this);
+     }
+
+     public boolean isPeerRead() {
+          if (messageReceiptInfo != null) {
+               return messageReceiptInfo.isPeerRead();
+          }
+          return false;
+     }
+
+     public boolean isAllRead() {
+          return getUnreadCount() == 0 && getReadCount() > 0;
+     }
+
+     public boolean isUnread() {
+          return getReadCount() == 0;
+     }
+
+     /**
+      * 获取要显示在会话列表的消息摘要
+      *
+      * Get a summary of messages to display in the conversation list
+      * @return
+      */
+     public abstract String onGetDisplayString();
+
+     public abstract void onProcessMessage(V2TIMMessage v2TIMMessage);
+
+     public final long getMessageTime() {
+          if (v2TIMMessage != null) {
+               long timestamp = v2TIMMessage.getTimestamp();
+               if (timestamp != 0) {
+                    return timestamp;
+               }
+          }
+          return msgTime;
+     }
+
+     public long getMsgSeq() {
+          if (v2TIMMessage != null) {
+               return v2TIMMessage.getSeq();
+          }
+          return 0;
+     }
+
+     public void setId(String id) {
+          this.id = id;
+     }
+
+     public String getId() {
+          return id;
+     }
+
+
+     public String getUserId() {
+          if (v2TIMMessage != null) {
+               return v2TIMMessage.getUserID();
+          }
+          return "";
+     }
+
+     public boolean isSelf() {
+          if (v2TIMMessage != null) {
+               return v2TIMMessage.isSelf();
+          }
+          return true;
+     }
+
+     public String getSender() {
+          String sender = null;
+          if (v2TIMMessage != null) {
+               sender = v2TIMMessage.getSender();
+          }
+          if (TextUtils.isEmpty(sender)) {
+               sender = V2TIMManager.getInstance().getLoginUser();
+          }
+          return sender;
+     }
+
+     public V2TIMMessage getV2TIMMessage() {
+          return v2TIMMessage;
+     }
+
+     public boolean isGroup() {
+          return isGroup;
+     }
+
+     public void setGroup(boolean group) {
+          isGroup = group;
+     }
+
+     public String getGroupId() {
+          if (v2TIMMessage != null) {
+               return v2TIMMessage.getGroupID();
+          }
+          return "";
+     }
+
+     public String getNameCard() {
+          if (v2TIMMessage != null) {
+               return v2TIMMessage.getNameCard();
+          }
+          return "";
+     }
+
+     public String getNickName() {
+          if (v2TIMMessage != null) {
+               return v2TIMMessage.getNickName();
+          }
+          return "";
+     }
+
+     public String getFriendRemark() {
+          if (v2TIMMessage != null) {
+               return v2TIMMessage.getFriendRemark();
+          }
+          return "";
+     }
+
+     public String getUserDisplayName() {
+          String displayName;
+          if (!TextUtils.isEmpty(getNameCard())) {
+               displayName = getNameCard();
+          } else if (!TextUtils.isEmpty(getFriendRemark())) {
+               displayName = getFriendRemark();
+          } else if (!TextUtils.isEmpty(getNickName())) {
+               displayName = getNickName();
+          } else {
+               displayName = getSender();
+          }
+          return displayName;
+     }
+
+     public String getFaceUrl() {
+          if (v2TIMMessage != null) {
+               return v2TIMMessage.getFaceUrl();
+          }
+          return "";
+     }
+
+     public void setStatus(int status) {
+          this.status = status;
+     }
+
+     public int getStatus() {
+          return status;
+     }
+
+     public void setExtra(String extra) {
+          this.extra = extra;
+     }
+
+     public String getExtra() {
+          return extra;
+     }
+
+     public void setDownloadStatus(int downloadStatus) {
+          this.downloadStatus = downloadStatus;
+     }
+
+     public int getDownloadStatus() {
+          return downloadStatus;
+     }
+
+     public int getMsgType() {
+          if (v2TIMMessage != null) {
+               return v2TIMMessage.getElemType();
+          } else {
+               return V2TIMMessage.V2TIM_ELEM_TYPE_NONE;
+          }
+     }
+
+     public boolean isNeedReadReceipt() {
+          if (v2TIMMessage != null) {
+               return v2TIMMessage.isNeedReadReceipt();
+          }
+          return false;
+     }
+
+     public void setNeedReadReceipt(boolean isNeedReceipt) {
+          if (v2TIMMessage != null) {
+               v2TIMMessage.setNeedReadReceipt(isNeedReceipt);
+          }
+     }
+
+     public void setTranslationStatus(int status) {
+          if (status != MSG_TRANSLATE_STATUS_UNKNOWN &&
+              status != MSG_TRANSLATE_STATUS_HIDDEN &&
+              status != MSG_TRANSLATE_STATUS_SHOWN &&
+              status != MSG_TRANSLATE_STATUS_LOADING) {
+               return;
+          }
+
+          if (status == translationStatus) {
+               return;
+          }
+
+          if (status == MSG_TRANSLATE_STATUS_LOADING) {
+               translationStatus = MSG_TRANSLATE_STATUS_LOADING;
+               return;
+          }
+
+          translationStatus = status;
+
+          if (v2TIMMessage != null) {
+               String localCustomData = v2TIMMessage.getLocalCustomData();
+               JSONObject customJson = new JSONObject();
+               try {
+                    if (!TextUtils.isEmpty(localCustomData)) {
+                         customJson = new JSONObject(localCustomData);
+                    }
+                    customJson.put(TRANSLATION_VIEW_STATUS_KEY, status);
+                    v2TIMMessage.setLocalCustomData(customJson.toString());
+               } catch (JSONException e) {
+                    e.printStackTrace();
+               }
+          }
+     }
+
+     public int getTranslationStatus() {
+          if (translationStatus != MSG_TRANSLATE_STATUS_UNKNOWN) {
+               return translationStatus;
+          }
+
+          if (v2TIMMessage != null) {
+               String localCustomData = v2TIMMessage.getLocalCustomData();
+               if (TextUtils.isEmpty(localCustomData)) {
+                    return translationStatus;
+               }
+               try {
+                    JSONObject customJson = new JSONObject(localCustomData);
+                    if (customJson.has(TRANSLATION_VIEW_STATUS_KEY)) {
+                         translationStatus = customJson.getInt(TRANSLATION_VIEW_STATUS_KEY);
+                    }
+               } catch (JSONException e) {
+                    e.printStackTrace();
+               }
+          }
+          return translationStatus;
+     }
+
+     public void setTranslation(String translation) {
+          if (v2TIMMessage != null) {
+               String localCustomData = v2TIMMessage.getLocalCustomData();
+               JSONObject customJson = new JSONObject();
+               try {
+                    if (!TextUtils.isEmpty(localCustomData)) {
+                         customJson = new JSONObject(localCustomData);
+                    }
+                    customJson.put(TRANSLATION_KEY, translation);
+                    customJson.put(TRANSLATION_VIEW_STATUS_KEY, MSG_TRANSLATE_STATUS_SHOWN);
+                    v2TIMMessage.setLocalCustomData(customJson.toString());
+               } catch (JSONException e) {
+                    e.printStackTrace();
+               }
+               translationStatus = MSG_TRANSLATE_STATUS_SHOWN;
+          }
+     }
+
+     public String getTranslation() {
+          String translation = "";
+          if (v2TIMMessage != null) {
+               String localCustomData = v2TIMMessage.getLocalCustomData();
+               if (TextUtils.isEmpty(localCustomData)) {
+                    return translation;
+               }
+               try {
+                    JSONObject customJson = new JSONObject(localCustomData);
+                    if (customJson.has(TRANSLATION_KEY)) {
+                         translation = customJson.getString(TRANSLATION_KEY);
+                    }
+               } catch (JSONException e) {
+                    e.printStackTrace();
+               }
+          }
+          return translation;
+     }
+
+     public void setV2TIMMessage(V2TIMMessage v2TIMMessage) {
+          this.v2TIMMessage = v2TIMMessage;
+          setCommonAttribute(v2TIMMessage);
+          onProcessMessage(v2TIMMessage);
+     }
+
+     public void update(TUIMessageBean messageBean) {
+          setV2TIMMessage(messageBean.getV2TIMMessage());
+     }
+
+     public String getSelectText() {
+          return selectText;
+     }
+
+     public void setSelectText(String text) {
+          this.selectText = text;
+     }
+
+     public MessageFeature isSupportTyping() {
+          return ChatMessageParser.isSupportTyping(this);
+     }
+
+     public void setMessageTypingFeature(MessageFeature messageFeature) {
+          ChatMessageBuilder.mergeCloudCustomData(this, TUIChatConstants.MESSAGE_FEATURE_KEY, messageFeature);
+     }
+
+     public Class<? extends TUIReplyQuoteBean> getReplyQuoteBeanClass() {
+          return null;
+     }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/TextAtMessageBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/TextAtMessageBean.java
new file mode 100644
index 0000000..7cb5426
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/TextAtMessageBean.java
@@ -0,0 +1,4 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message;
+
+public class TextAtMessageBean extends TextMessageBean {
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/TextMessageBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/TextMessageBean.java
new file mode 100644
index 0000000..16ea500
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/TextMessageBean.java
@@ -0,0 +1,35 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message;
+
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TextReplyQuoteBean;
+
+public class TextMessageBean extends TUIMessageBean {
+    private String text;
+
+    @Override
+    public String onGetDisplayString() {
+        return text;
+    }
+
+    @Override
+    public void onProcessMessage(V2TIMMessage v2TIMMessage) {
+        if (v2TIMMessage.getTextElem() != null) {
+            text = v2TIMMessage.getTextElem().getText();
+        }
+        setExtra(text);
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    @Override
+    public Class<? extends TUIReplyQuoteBean> getReplyQuoteBeanClass() {
+        return TextReplyQuoteBean.class;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/TipsMessageBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/TipsMessageBean.java
new file mode 100644
index 0000000..a7001f2
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/TipsMessageBean.java
@@ -0,0 +1,231 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message;
+
+import android.text.TextUtils;
+
+import com.tencent.imsdk.v2.V2TIMGroupChangeInfo;
+import com.tencent.imsdk.v2.V2TIMGroupInfo;
+import com.tencent.imsdk.v2.V2TIMGroupMemberChangeInfo;
+import com.tencent.imsdk.v2.V2TIMGroupMemberInfo;
+import com.tencent.imsdk.v2.V2TIMGroupTipsElem;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuicore.util.DateTimeUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+
+import java.util.List;
+
+public class TipsMessageBean extends TUIMessageBean {
+    /**
+     * 群创建提示消息
+     * 
+     * Create group
+     */
+    public static final int MSG_TYPE_GROUP_CREATE = 0x101;
+    /**
+     * 群解散提示消息
+     * 
+     * Dismiss a group
+     */
+    public static final int MSG_TYPE_GROUP_DELETE = 0x102;
+    /**
+     * 群成员加入提示消息
+     * 
+     * Proactively join a group (memberList joins a group; valid only for non-Work groups)
+     */
+    public static final int MSG_TYPE_GROUP_JOIN = 0x103;
+    /**
+     * 群成员退群提示消息
+     * 
+     * Quit a group
+     */
+    public static final int MSG_TYPE_GROUP_QUITE = 0x104;
+    /**
+     * 群成员被踢出群提示消息
+     * 
+     * Be kicked out of a group (opMember kicks memberList out of the group)
+     */
+    public static final int MSG_TYPE_GROUP_KICK = 0x105;
+    /**
+     * 群名称修改提示消息
+     * 
+     * Group name change prompt message
+     */
+    public static final int MSG_TYPE_GROUP_MODIFY_NAME = 0x106;
+    /**
+     * 群通知更新提示消息
+     * 
+     * Group notification update prompt message
+     */
+    public static final int MSG_TYPE_GROUP_MODIFY_NOTICE = 0x107;
+
+    private String text;
+    private int tipType;
+
+    @Override
+    public String onGetDisplayString() {
+        return getExtra();
+    }
+
+    @Override
+    public void onProcessMessage(V2TIMMessage v2TIMMessage) {
+        V2TIMGroupTipsElem groupTipElem = v2TIMMessage.getGroupTipsElem();
+        if (groupTipElem == null) {
+            return;
+        }
+        int tipsType = groupTipElem.getType();
+        String operationUser = "";
+        String targetUser = "";
+        if (groupTipElem.getMemberList().size() > 0) {
+            List<V2TIMGroupMemberInfo> v2TIMGroupMemberInfoList = groupTipElem.getMemberList();
+            for (int i = 0; i < v2TIMGroupMemberInfoList.size(); i++) {
+                V2TIMGroupMemberInfo v2TIMGroupMemberInfo = v2TIMGroupMemberInfoList.get(i);
+                if (i == 0) {
+                    targetUser = targetUser + getDisplayName(v2TIMGroupMemberInfo);
+                } else {
+                    if (i == 2 && v2TIMGroupMemberInfoList.size() > 3) {
+                        targetUser = targetUser + TUIChatService.getAppContext().getString(R.string.etc);
+                        break;
+                    } else {
+                        targetUser = targetUser + "，" + getDisplayName(v2TIMGroupMemberInfo);
+                    }
+                }
+            }
+        }
+
+        operationUser = getDisplayName(groupTipElem.getOpMember());
+
+        if (!TextUtils.isEmpty(targetUser)) {
+            targetUser = TUIChatConstants.covert2HTMLString(targetUser);
+        }
+
+        if (!TextUtils.isEmpty(operationUser)) {
+            operationUser = TUIChatConstants.covert2HTMLString(operationUser);
+        }
+
+        String tipsMessage = "";
+        if (tipsType == V2TIMGroupTipsElem.V2TIM_GROUP_TIPS_TYPE_JOIN) {
+            setTipType(TipsMessageBean.MSG_TYPE_GROUP_JOIN);
+            tipsMessage = targetUser + TUIChatService.getAppContext().getString(R.string.join_group);
+        }
+        if (tipsType == V2TIMGroupTipsElem.V2TIM_GROUP_TIPS_TYPE_INVITE) {
+            setTipType(TipsMessageBean.MSG_TYPE_GROUP_JOIN);
+            tipsMessage = targetUser + TUIChatService.getAppContext().getString(R.string.invite_joined_group);
+        }
+        if (tipsType == V2TIMGroupTipsElem.V2TIM_GROUP_TIPS_TYPE_QUIT) {
+            setTipType(TipsMessageBean.MSG_TYPE_GROUP_QUITE);
+            tipsMessage = operationUser + TUIChatService.getAppContext().getString(R.string.quit_group);
+        }
+        if (tipsType == V2TIMGroupTipsElem.V2TIM_GROUP_TIPS_TYPE_KICKED) {
+            setTipType(TipsMessageBean.MSG_TYPE_GROUP_KICK);
+            tipsMessage = targetUser + TUIChatService.getAppContext().getString(R.string.kick_group_tip);
+        }
+        if (tipsType == V2TIMGroupTipsElem.V2TIM_GROUP_TIPS_TYPE_SET_ADMIN) {
+            setTipType(TipsMessageBean.MSG_TYPE_GROUP_MODIFY_NOTICE);
+            tipsMessage = targetUser + TUIChatService.getAppContext().getString(R.string.be_group_manager);
+        }
+        if (tipsType == V2TIMGroupTipsElem.V2TIM_GROUP_TIPS_TYPE_CANCEL_ADMIN) {
+            setTipType(TipsMessageBean.MSG_TYPE_GROUP_MODIFY_NOTICE);
+            tipsMessage = targetUser + TUIChatService.getAppContext().getString(R.string.cancle_group_manager);
+        }
+        if (tipsType == V2TIMGroupTipsElem.V2TIM_GROUP_TIPS_TYPE_GROUP_INFO_CHANGE) {
+            List<V2TIMGroupChangeInfo> modifyList = groupTipElem.getGroupChangeInfoList();
+            for (int i = 0; i < modifyList.size(); i++) {
+                V2TIMGroupChangeInfo modifyInfo = modifyList.get(i);
+                int modifyType = modifyInfo.getType();
+                if (modifyType == V2TIMGroupChangeInfo.V2TIM_GROUP_INFO_CHANGE_TYPE_NAME) {
+                    setTipType(TipsMessageBean.MSG_TYPE_GROUP_MODIFY_NAME);
+                    tipsMessage = operationUser + TUIChatService.getAppContext().getString(R.string.modify_group_name_is) + "\"" + modifyInfo.getValue() + "\"";
+                } else if (modifyType == V2TIMGroupChangeInfo.V2TIM_GROUP_INFO_CHANGE_TYPE_NOTIFICATION) {
+                    setTipType(TipsMessageBean.MSG_TYPE_GROUP_MODIFY_NOTICE);
+                    tipsMessage = operationUser + TUIChatService.getAppContext().getString(R.string.modify_notice) + "\"" + modifyInfo.getValue() + "\"";
+                } else if (modifyType == V2TIMGroupChangeInfo.V2TIM_GROUP_INFO_CHANGE_TYPE_OWNER) {
+                    setTipType(TipsMessageBean.MSG_TYPE_GROUP_MODIFY_NOTICE);
+                    if (!TextUtils.isEmpty(targetUser)) {
+                        tipsMessage = operationUser + TUIChatService.getAppContext().getString(R.string.move_owner) + "\"" + targetUser + "\"";
+                    } else {
+                        tipsMessage =
+                                operationUser + TUIChatService.getAppContext().getString(R.string.move_owner) + "\"" + TUIChatConstants.covert2HTMLString(modifyInfo.getValue()) + "\"";
+                    }
+                } else if (modifyType == V2TIMGroupChangeInfo.V2TIM_GROUP_INFO_CHANGE_TYPE_FACE_URL) {
+                    setTipType(TipsMessageBean.MSG_TYPE_GROUP_MODIFY_NOTICE);
+                    tipsMessage = operationUser + TUIChatService.getAppContext().getString(R.string.modify_group_avatar);
+                } else if (modifyType == V2TIMGroupChangeInfo.V2TIM_GROUP_INFO_CHANGE_TYPE_INTRODUCTION) {
+                    setTipType(TipsMessageBean.MSG_TYPE_GROUP_MODIFY_NOTICE);
+                    tipsMessage = operationUser + TUIChatService.getAppContext().getString(R.string.modify_introduction) + "\"" + modifyInfo.getValue() + "\"";
+                } else if (modifyType == V2TIMGroupChangeInfo.V2TIM_GROUP_INFO_CHANGE_TYPE_SHUT_UP_ALL) {
+                    setTipType(TipsMessageBean.MSG_TYPE_GROUP_MODIFY_NOTICE);
+                    boolean isShutUpAll = modifyInfo.getBoolValue();
+                    if (isShutUpAll) {
+                        tipsMessage = operationUser + TUIChatService.getAppContext().getString(R.string.modify_shut_up_all);
+                    } else {
+                        tipsMessage = operationUser + TUIChatService.getAppContext().getString(R.string.modify_cancel_shut_up_all);
+                    }
+                } else if (modifyType == V2TIMGroupChangeInfo.V2TIM_GROUP_INFO_CHANGE_TYPE_GROUP_ADD_OPT) {
+                    setTipType(TipsMessageBean.MSG_TYPE_GROUP_MODIFY_NOTICE);
+                    tipsMessage = TUIChatService.getAppContext().getString(R.string.modify_group_add_opt);
+                    int addOpt = modifyInfo.getIntValue();
+                    if (addOpt == V2TIMGroupInfo.V2TIM_GROUP_ADD_FORBID) {
+                        tipsMessage = tipsMessage + TUIChatService.getAppContext().getString(R.string.group_add_opt_join_disable);
+                    } else if (addOpt == V2TIMGroupInfo.V2TIM_GROUP_ADD_AUTH) {
+                        tipsMessage = tipsMessage + TUIChatService.getAppContext().getString(R.string.group_add_opt_admin_approve);
+                    } else {
+                        tipsMessage = tipsMessage + TUIChatService.getAppContext().getString(R.string.group_add_opt_auto_approval);
+                    }
+                }
+                if (i < modifyList.size() - 1) {
+                    tipsMessage = tipsMessage + "、";
+                }
+            }
+        }
+        if (tipsType == V2TIMGroupTipsElem.V2TIM_GROUP_TIPS_TYPE_MEMBER_INFO_CHANGE) {
+            List<V2TIMGroupMemberChangeInfo> modifyList = groupTipElem.getMemberChangeInfoList();
+            if (modifyList.size() > 0) {
+                long shutupTime = modifyList.get(0).getMuteTime();
+                setTipType(TipsMessageBean.MSG_TYPE_GROUP_MODIFY_NOTICE);
+                if (shutupTime > 0) {
+                    tipsMessage = targetUser + TUIChatService.getAppContext().getString(R.string.banned) + "\"" + DateTimeUtil.formatSeconds(shutupTime) + "\"";
+                } else {
+                    tipsMessage = targetUser + TUIChatService.getAppContext().getString(R.string.cancle_banned);
+                }
+            }
+        }
+        text = tipsMessage;
+        setExtra(tipsMessage);
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setTipType(int tipType) {
+        this.tipType = tipType;
+    }
+
+    public int getTipType() {
+        return tipType;
+    }
+
+    private static String getDisplayName(V2TIMGroupMemberInfo groupMemberInfo) {
+        String displayName;
+        if (groupMemberInfo == null) {
+            return null;
+        }
+        
+        if (!TextUtils.isEmpty(groupMemberInfo.getNameCard())) {
+            displayName = groupMemberInfo.getNameCard();
+        } else if (!TextUtils.isEmpty(groupMemberInfo.getFriendRemark())) {
+            displayName = groupMemberInfo.getFriendRemark();
+        } else if (!TextUtils.isEmpty(groupMemberInfo.getNickName())) {
+            displayName = groupMemberInfo.getNickName();
+        } else {
+            displayName = groupMemberInfo.getUserID();
+        }
+
+        return displayName;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/VideoMessageBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/VideoMessageBean.java
new file mode 100644
index 0000000..7cc7eae
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/VideoMessageBean.java
@@ -0,0 +1,237 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message;
+
+import android.net.Uri;
+import android.text.TextUtils;
+
+import com.tencent.imsdk.BaseConstants;
+import com.tencent.imsdk.v2.V2TIMDownloadCallback;
+import com.tencent.imsdk.v2.V2TIMElem;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.imsdk.v2.V2TIMValueCallback;
+import com.tencent.imsdk.v2.V2TIMVideoElem;
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.util.FileUtil;
+import com.tencent.qcloud.tuicore.util.ImageUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.VideoReplyQuoteBean;
+
+import java.io.File;
+
+public class VideoMessageBean extends TUIMessageBean {
+    private String dataUri;
+    private String dataPath;
+    private int imgWidth;
+    private int imgHeight;
+    private V2TIMVideoElem videoElem;
+
+    @Override
+    public String onGetDisplayString() {
+        return getExtra();
+    }
+
+    @Override
+    public void onProcessMessage(V2TIMMessage v2TIMMessage) {
+        V2TIMVideoElem videoEle = v2TIMMessage.getVideoElem();
+        if (isSelf() && !TextUtils.isEmpty(videoEle.getSnapshotPath())) {
+            int size[] = ImageUtil.getImageSize(videoEle.getSnapshotPath());
+            imgWidth = size[0];
+            imgHeight= size[1];
+            dataPath = videoEle.getSnapshotPath();
+            setDataUri(FileUtil.getUriFromPath(videoEle.getVideoPath()));
+        } else {
+            final String videoPath = TUIConfig.getVideoDownloadDir() + videoEle.getVideoUUID();
+            Uri uri = Uri.parse(videoPath);
+            setDataUri(uri);
+            imgWidth = (int) videoEle.getSnapshotWidth();
+            imgHeight = (int) videoEle.getSnapshotHeight();
+            final String snapPath = TUIConfig.getImageDownloadDir() + videoEle.getSnapshotUUID();
+            if (new File(snapPath).exists()) {
+                dataPath = snapPath;
+            }
+        }
+
+        if (v2TIMMessage.getElemType() == V2TIMMessage.V2TIM_ELEM_TYPE_VIDEO) {
+            videoElem = v2TIMMessage.getVideoElem();
+        }
+        setExtra(TUIChatService.getAppContext().getString(R.string.video_extra));
+    }
+
+    /**
+     * 获取多媒体消息的数据源
+     * 
+     * Get the data source of the multimedia message
+     *
+     * @return
+     */
+    public Uri getDataUriObj() {
+        if (!TextUtils.isEmpty(dataUri)) {
+            return Uri.parse(dataUri);
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * 设置多媒体消息的数据源
+     * 
+     * Set the data source of the multimedia message
+     *
+     * @param dataUri
+     */
+    public void setDataUri(Uri dataUri) {
+        if (dataUri != null) {
+            this.dataUri = dataUri.toString();
+        }
+    }
+
+    /**
+     * 获取多媒体消息的保存路径
+     * 
+     * Get the save path of multimedia messages
+     *
+     * @return
+     */
+    public String getDataPath() {
+        return dataPath;
+    }
+
+    /**
+     * 设置多媒体消息的保存路径
+     * 
+     * Set the save path of multimedia messages
+     *
+     * @param dataPath
+     */
+    public void setDataPath(String dataPath) {
+        this.dataPath = dataPath;
+    }
+
+    public void setImgHeight(int imgHeight) {
+        this.imgHeight = imgHeight;
+    }
+
+    public void setImgWidth(int imgWidth) {
+        this.imgWidth = imgWidth;
+    }
+
+    public int getImgHeight() {
+        return imgHeight;
+    }
+
+    public int getImgWidth() {
+        return imgWidth;
+    }
+
+    public void setVideoElem(V2TIMVideoElem videoElem) {
+        this.videoElem = videoElem;
+    }
+
+    public String getSnapshotUUID() {
+        if (videoElem != null) {
+            return videoElem.getSnapshotUUID();
+        }
+        return "";
+    }
+
+    public String getVideoUUID() {
+        if (videoElem != null) {
+            return videoElem.getVideoUUID();
+        }
+        return "";
+    }
+
+    public int getDuration() {
+        if (videoElem != null) {
+            return videoElem.getDuration();
+        }
+        return 0;
+    }
+
+    public int getVideoSize() {
+        if (videoElem != null) {
+            return videoElem.getVideoSize();
+        }
+        return 0;
+    }
+
+    public void getVideoUrl(final V2TIMValueCallback<String> callback) {
+        if (callback == null) {
+            return;
+        }
+        if (videoElem == null) {
+            callback.onError(BaseConstants.ERR_INVALID_PARAMETERS, "elem is null");
+            return;
+        }
+
+        videoElem.getVideoUrl(callback);
+    }
+
+    public void downloadSnapshot(String path, VideoDownloadCallback callback) {
+        if (videoElem != null) {
+            videoElem.downloadSnapshot(path, new V2TIMDownloadCallback() {
+                @Override
+                public void onProgress(V2TIMElem.V2ProgressInfo progressInfo) {
+                    if (callback != null) {
+                        callback.onProgress(progressInfo.getCurrentSize(), progressInfo.getTotalSize());
+                    }
+                }
+
+                @Override
+                public void onSuccess() {
+                    if (callback != null) {
+                        callback.onSuccess();
+                    }
+                }
+
+                @Override
+                public void onError(int code, String desc) {
+                    if (callback != null) {
+                        callback.onError(code, desc);
+                    }
+                }
+            });
+        }
+    }
+
+    public void downloadVideo(String path, VideoDownloadCallback callback) {
+        if (videoElem != null) {
+            videoElem.downloadVideo(path, new V2TIMDownloadCallback() {
+                @Override
+                public void onProgress(V2TIMElem.V2ProgressInfo progressInfo) {
+                    if (callback != null) {
+                        callback.onProgress(progressInfo.getCurrentSize(), progressInfo.getTotalSize());
+                    }
+                }
+
+                @Override
+                public void onSuccess() {
+                    if (callback != null) {
+                        callback.onSuccess();
+                    }
+                }
+
+                @Override
+                public void onError(int code, String desc) {
+                    if (callback != null) {
+                        callback.onError(code, desc);
+                    }
+                }
+            });
+        }
+    }
+
+    public interface VideoDownloadCallback {
+        void onProgress(long currentSize, long totalSize);
+
+        void onSuccess();
+
+        void onError(int code, String desc);
+    }
+
+    @Override
+    public Class<? extends TUIReplyQuoteBean> getReplyQuoteBeanClass() {
+        return VideoReplyQuoteBean.class;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/CustomEvaluationMessageReplyQuoteBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/CustomEvaluationMessageReplyQuoteBean.java
new file mode 100644
index 0000000..c7d2d76
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/CustomEvaluationMessageReplyQuoteBean.java
@@ -0,0 +1,14 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message.reply;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CustomEvaluationMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+public class CustomEvaluationMessageReplyQuoteBean extends TextReplyQuoteBean {
+    @Override
+    public void onProcessReplyQuoteBean(TUIMessageBean messageBean) {
+        if (messageBean instanceof CustomEvaluationMessageBean) {
+            setText(((CustomEvaluationMessageBean) messageBean).getContent());
+        }
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/CustomLinkReplyQuoteBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/CustomLinkReplyQuoteBean.java
new file mode 100644
index 0000000..4016822
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/CustomLinkReplyQuoteBean.java
@@ -0,0 +1,14 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message.reply;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CustomLinkMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+public class CustomLinkReplyQuoteBean extends TextReplyQuoteBean {
+    @Override
+    public void onProcessReplyQuoteBean(TUIMessageBean messageBean) {
+        if (messageBean instanceof CustomLinkMessageBean) {
+            setText(((CustomLinkMessageBean) messageBean).getText());
+        }
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/CustomOrderMessageReplyQuoteBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/CustomOrderMessageReplyQuoteBean.java
new file mode 100644
index 0000000..7a7523e
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/CustomOrderMessageReplyQuoteBean.java
@@ -0,0 +1,14 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message.reply;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CustomOrderMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+public class CustomOrderMessageReplyQuoteBean extends TextReplyQuoteBean{
+    @Override
+    public void onProcessReplyQuoteBean(TUIMessageBean messageBean) {
+        if (messageBean instanceof CustomOrderMessageBean) {
+            setText(((CustomOrderMessageBean) messageBean).getDescription());
+        }
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/FaceReplyQuoteBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/FaceReplyQuoteBean.java
new file mode 100644
index 0000000..c54dc90
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/FaceReplyQuoteBean.java
@@ -0,0 +1,29 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message.reply;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.FaceMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+public class FaceReplyQuoteBean extends TUIReplyQuoteBean {
+    private byte[] data;
+    private int index;
+    @Override
+    public void onProcessReplyQuoteBean(TUIMessageBean messageBean) {
+        if (messageBean instanceof FaceMessageBean) {
+            data = ((FaceMessageBean) messageBean).getData();
+            index = ((FaceMessageBean) messageBean).getIndex();
+        }
+    }
+
+    public byte[] getData() {
+        if (data != null) {
+            return data;
+        } else {
+            return new byte[0];
+        }
+    }
+
+    public int getIndex() {
+        return index;
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/FileReplyQuoteBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/FileReplyQuoteBean.java
new file mode 100644
index 0000000..6d36f9e
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/FileReplyQuoteBean.java
@@ -0,0 +1,19 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message.reply;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.FileMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+public class FileReplyQuoteBean extends TUIReplyQuoteBean {
+    private String fileName;
+
+    @Override
+    public void onProcessReplyQuoteBean(TUIMessageBean messageBean) {
+        if (messageBean instanceof FileMessageBean) {
+            fileName = ((FileMessageBean) messageBean).getFileName();
+        }
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/ImageReplyQuoteBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/ImageReplyQuoteBean.java
new file mode 100644
index 0000000..457ef8d
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/ImageReplyQuoteBean.java
@@ -0,0 +1,11 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message.reply;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+public class ImageReplyQuoteBean extends TUIReplyQuoteBean {
+    @Override
+    public void onProcessReplyQuoteBean(TUIMessageBean messageBean) {
+
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/LocationReplyQuoteBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/LocationReplyQuoteBean.java
new file mode 100644
index 0000000..3a32cbe
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/LocationReplyQuoteBean.java
@@ -0,0 +1,10 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message.reply;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+public class LocationReplyQuoteBean extends TUIReplyQuoteBean {
+    @Override
+    public void onProcessReplyQuoteBean(TUIMessageBean messageBean) {
+
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/MergeReplyQuoteBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/MergeReplyQuoteBean.java
new file mode 100644
index 0000000..4f85df3
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/MergeReplyQuoteBean.java
@@ -0,0 +1,10 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message.reply;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+public class MergeReplyQuoteBean extends TUIReplyQuoteBean {
+    @Override
+    public void onProcessReplyQuoteBean(TUIMessageBean messageBean) {
+
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/ReplyReplyQuoteBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/ReplyReplyQuoteBean.java
new file mode 100644
index 0000000..408d5da
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/ReplyReplyQuoteBean.java
@@ -0,0 +1,15 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message.reply;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.QuoteMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+public class ReplyReplyQuoteBean extends TextReplyQuoteBean {
+
+    @Override
+    public void onProcessReplyQuoteBean(TUIMessageBean messageBean) {
+        if (messageBean instanceof QuoteMessageBean) {
+            setText(messageBean.getExtra());
+        }
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/SoundReplyQuoteBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/SoundReplyQuoteBean.java
new file mode 100644
index 0000000..f8efedd
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/SoundReplyQuoteBean.java
@@ -0,0 +1,26 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message.reply;
+
+import com.tencent.imsdk.v2.V2TIMSoundElem;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.SoundMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+public class SoundReplyQuoteBean extends TUIReplyQuoteBean {
+    private String dataPath;
+    private V2TIMSoundElem soundElem;
+
+    @Override
+    public void onProcessReplyQuoteBean(TUIMessageBean messageBean) {
+        if (messageBean instanceof SoundMessageBean) {
+            dataPath = ((SoundMessageBean) messageBean).getDataPath();
+            soundElem = messageBean.getV2TIMMessage().getSoundElem();
+        }
+    }
+
+    public int getDuring() {
+        if (soundElem != null) {
+            return soundElem.getDuration();
+        }
+        return 0;
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/TUIReplyQuoteBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/TUIReplyQuoteBean.java
new file mode 100644
index 0000000..03ab5a2
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/TUIReplyQuoteBean.java
@@ -0,0 +1,38 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message.reply;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+import java.io.Serializable;
+
+public abstract class TUIReplyQuoteBean implements Serializable {
+    private TUIMessageBean messageBean;
+    protected String defaultAbstract;
+    protected int messageType;
+
+    public abstract void onProcessReplyQuoteBean(TUIMessageBean messageBean);
+
+    public void setMessageBean(TUIMessageBean messageBean) {
+        this.messageBean = messageBean;
+    }
+
+    public void setDefaultAbstract(String defaultAbstract) {
+        this.defaultAbstract = defaultAbstract;
+    }
+
+    public void setMessageType(int messageType) {
+        this.messageType = messageType;
+    }
+
+    public int getMessageType() {
+        return messageType;
+    }
+
+    public TUIMessageBean getMessageBean() {
+        return messageBean;
+    }
+
+    public String getDefaultAbstract() {
+        return defaultAbstract;
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/TextReplyQuoteBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/TextReplyQuoteBean.java
new file mode 100644
index 0000000..2fa7673
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/TextReplyQuoteBean.java
@@ -0,0 +1,24 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message.reply;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TextMessageBean;
+
+public class TextReplyQuoteBean extends TUIReplyQuoteBean {
+    private String text;
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    @Override
+    public void onProcessReplyQuoteBean(TUIMessageBean messageBean) {
+        if (messageBean instanceof TextMessageBean) {
+            text = ((TextMessageBean) messageBean).getText();
+        }
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/VideoReplyQuoteBean.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/VideoReplyQuoteBean.java
new file mode 100644
index 0000000..523b605
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/bean/message/reply/VideoReplyQuoteBean.java
@@ -0,0 +1,11 @@
+package com.tencent.qcloud.tuikit.tuichat.bean.message.reply;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+public class VideoReplyQuoteBean extends TUIReplyQuoteBean {
+    @Override
+    public void onProcessReplyQuoteBean(TUIMessageBean messageBean) {
+
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/ClassicUIService.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/ClassicUIService.java
new file mode 100644
index 0000000..4ef08e6
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/ClassicUIService.java
@@ -0,0 +1,173 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui;
+
+import android.content.Context;
+
+import com.tencent.qcloud.tuicore.ServiceInitializer;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ArchivesMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.BusinessCardMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CallingMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CustomEvaluationMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CustomLinkMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CustomOrderMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.FaceMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.FileMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ImageMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.LocationMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.MedicalExaminationReportMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.MergeMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.MessageTypingBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.QuoteMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ReplyMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.SoundMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.SystemMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TextAtMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TextMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TipsMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.VideoMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.CustomEvaluationMessageReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.CustomLinkReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.CustomOrderMessageReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.FaceReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.FileReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.ImageReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.LocationReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.MergeReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.ReplyReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.SoundReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TextReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.VideoReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply.FaceReplyQuoteView;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply.FileReplyQuoteView;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply.ImageReplyQuoteView;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply.LocationReplyQuoteView;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply.MergeReplyQuoteView;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply.SoundReplyQuoteView;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply.TUIReplyQuoteView;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply.TextReplyQuoteView;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply.VideoReplyQuoteView;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.ArchivesMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.BusinessCardMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.CallingMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.CustomEvaluationMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.CustomLinkMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.CustomOrderMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.FaceMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.FileMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.ImageMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.LocationMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.MedicalExaminationReportHolder;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.MergeMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.MessageBaseHolder;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.QuoteMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.ReplyMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.SoundMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.SystemMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.TextMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.TipsMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.VideoMessageHolder;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Internal service for ClassicUI
+ */
+public class ClassicUIService extends ServiceInitializer {
+    private static ClassicUIService instance;
+
+    public static ClassicUIService getInstance() {
+        return instance;
+    }
+
+    private final Map<Class<? extends TUIMessageBean>, Integer> messageViewTypeMap = new HashMap<>();
+    private final Map<Integer, Class<? extends MessageBaseHolder>> messageViewHolderMap = new HashMap<>();
+    private final Map<Class<? extends TUIReplyQuoteBean>, Class<? extends TUIReplyQuoteView>> replyMessageViewMap = new HashMap<>();
+    private int viewType = 0;
+
+    @Override
+    public void init(Context context) {
+        instance = this;
+        initMessage();
+        initReplyMessage();
+    }
+
+    public void initMessage() {
+        addMessageType(FaceMessageBean.class, FaceMessageHolder.class);
+        addMessageType(FileMessageBean.class, FileMessageHolder.class);
+        addMessageType(ImageMessageBean.class, ImageMessageHolder.class);
+        addMessageType(LocationMessageBean.class, LocationMessageHolder.class);
+        addMessageType(MergeMessageBean.class, MergeMessageHolder.class);
+        addMessageType(SoundMessageBean.class, SoundMessageHolder.class);
+        addMessageType(TextAtMessageBean.class, TextMessageHolder.class);
+        addMessageType(TextMessageBean.class, TextMessageHolder.class);
+        addMessageType(TipsMessageBean.class, TipsMessageHolder.class);
+        addMessageType(VideoMessageBean.class, VideoMessageHolder.class);
+        addMessageType(ReplyMessageBean.class, ReplyMessageHolder.class);
+        addMessageType(QuoteMessageBean.class, QuoteMessageHolder.class);
+        addMessageType(CallingMessageBean.class, CallingMessageHolder.class);
+        addMessageType(CustomLinkMessageBean.class, CustomLinkMessageHolder.class);
+        addMessageType(CustomEvaluationMessageBean.class, CustomEvaluationMessageHolder.class);
+        addMessageType(CustomOrderMessageBean.class, CustomOrderMessageHolder.class);
+        addMessageType(MessageTypingBean.class, null);
+        addMessageType(BusinessCardMessageBean.class,BusinessCardMessageHolder.class);
+        addMessageType(ArchivesMessageBean.class, ArchivesMessageHolder.class);
+        addMessageType(MedicalExaminationReportMessageBean.class, MedicalExaminationReportHolder.class);
+        addMessageType(SystemMessageBean.class, SystemMessageHolder.class);
+    }
+
+    private void addMessageType(Class<? extends TUIMessageBean> beanClazz, Class<? extends MessageBaseHolder> holderClazz) {
+        viewType++;
+        messageViewTypeMap.put(beanClazz, viewType);
+        messageViewHolderMap.put(viewType, holderClazz);
+    }
+
+    private void initReplyMessage() {
+        replyMessageViewMap.put(CustomEvaluationMessageReplyQuoteBean.class, TextReplyQuoteView.class);
+        replyMessageViewMap.put(CustomLinkReplyQuoteBean.class, TextReplyQuoteView.class);
+        replyMessageViewMap.put(CustomOrderMessageReplyQuoteBean.class, TextReplyQuoteView.class);
+        replyMessageViewMap.put(FaceReplyQuoteBean.class, FaceReplyQuoteView.class);
+        replyMessageViewMap.put(FileReplyQuoteBean.class, FileReplyQuoteView.class);
+        replyMessageViewMap.put(ImageReplyQuoteBean.class, ImageReplyQuoteView.class);
+        replyMessageViewMap.put(LocationReplyQuoteBean.class, LocationReplyQuoteView.class);
+        replyMessageViewMap.put(MergeReplyQuoteBean.class, MergeReplyQuoteView.class);
+        replyMessageViewMap.put(ReplyReplyQuoteBean.class, TextReplyQuoteView.class);
+        replyMessageViewMap.put(SoundReplyQuoteBean.class, SoundReplyQuoteView.class);
+        replyMessageViewMap.put(TextReplyQuoteBean.class, TextReplyQuoteView.class);
+        replyMessageViewMap.put(VideoReplyQuoteBean.class, VideoReplyQuoteView.class);
+    }
+
+    public Class<? extends TUIReplyQuoteView> getReplyMessageViewClass(Class<? extends TUIReplyQuoteBean> replyQuoteBeanType) {
+        return replyMessageViewMap.get(replyQuoteBeanType);
+    }
+
+    public Class<? extends MessageBaseHolder> getMessageViewHolderClass(int viewType) {
+        return messageViewHolderMap.get(viewType);
+    }
+
+    public int getViewType(Class<? extends TUIMessageBean> messageBeanClass) {
+        Integer viewType = messageViewTypeMap.get(messageBeanClass);
+        if (viewType != null) {
+            return viewType;
+        } else {
+            return 0;
+        }
+    }
+
+    @Override
+    public int getLightThemeResId() {
+        return R.style.TUIChatLightTheme;
+    }
+
+    @Override
+    public int getLivelyThemeResId() {
+        return R.style.TUIChatLivelyTheme;
+    }
+
+    @Override
+    public int getSeriousThemeResId() {
+        return R.style.TUIChatSeriousTheme;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/BeginnerGuidePage.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/BeginnerGuidePage.java
new file mode 100644
index 0000000..cb30cfa
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/BeginnerGuidePage.java
@@ -0,0 +1,182 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component;
+
+import android.animation.ValueAnimator;
+import android.app.Activity;
+import android.graphics.drawable.ColorDrawable;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.view.animation.LinearInterpolator;
+import android.widget.ImageView;
+import android.widget.PopupWindow;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewpager2.widget.ViewPager2;
+
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.util.SPUtils;
+import com.tencent.qcloud.tuicore.util.SoftKeyBoardUtil;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+
+public class BeginnerGuidePage {
+
+    private PopupWindow popupWindow;
+    private ViewPager2 viewPager;
+    private OnFinishListener onFinishListener;
+    private int[] resIDs;
+    public BeginnerGuidePage(Activity activity) {
+        View popupView = LayoutInflater.from(activity).inflate(R.layout.layout_beginner_guide, null);
+        viewPager = popupView.findViewById(R.id.view_pager);
+
+        popupWindow = new PopupWindow(popupView, WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT, true) {
+            @Override
+            public void showAtLocation(View anchor, int gravity, int x, int y) {
+                if (activity != null && !activity.isFinishing()) {
+                    Window dialogWindow = activity.getWindow();
+                    startAnimation(dialogWindow, true);
+                }
+                super.showAtLocation(anchor, gravity, x, y);
+            }
+
+            @Override
+            public void dismiss() {
+                if (activity != null && !activity.isFinishing()) {
+                    Window dialogWindow = activity.getWindow();
+                    startAnimation(dialogWindow, false);
+                }
+
+                super.dismiss();
+            }
+        };
+        popupWindow.setBackgroundDrawable(new ColorDrawable());
+        popupWindow.setTouchable(true);
+        popupWindow.setOutsideTouchable(false);
+        popupWindow.setAnimationStyle(R.style.BeginnerGuidePopupAnimation);
+        viewPager.setUserInputEnabled(false);
+        viewPager.setAdapter(new GuideAdapter());
+    }
+
+    private void startAnimation(Window window, boolean isShow) {
+        LinearInterpolator interpolator = new LinearInterpolator();
+        ValueAnimator animator;
+        if (isShow) {
+            animator = ValueAnimator.ofFloat(1.0f, 0.5f);
+        } else {
+            animator = ValueAnimator.ofFloat(0.5f, 1.0f);
+        }
+        animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                WindowManager.LayoutParams lp = window.getAttributes();
+                lp.alpha = (float) animation.getAnimatedValue();
+                window.setAttributes(lp);
+            }
+        });
+
+        animator.setDuration(200);
+        animator.setInterpolator(interpolator);
+        animator.start();
+    }
+
+    public void setPagesResIDs(int... imageResIDs) {
+        resIDs = imageResIDs;
+        viewPager.setOffscreenPageLimit(resIDs.length);
+        viewPager.getAdapter().notifyDataSetChanged();
+        viewPager.setCurrentItem(0, false);
+    }
+
+    public void setOnFinishListener(OnFinishListener onFinishListener) {
+        this.onFinishListener = onFinishListener;
+    }
+
+    public void show(View rootView, int gravity) {
+        if (popupWindow != null) {
+            popupWindow.showAtLocation(rootView, gravity, 0, 0);
+        }
+    }
+
+    class GuideAdapter extends RecyclerView.Adapter<GuideAdapter.GuideViewHolder> {
+        @NonNull
+        @Override
+        public GuideViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            return new GuideViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_beginner_guide_item, parent ,false));
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull GuideViewHolder holder, int position) {
+            ViewGroup.LayoutParams params = holder.image.getLayoutParams();
+            if (params != null) {
+                params.width = ScreenUtil.getScreenWidth(holder.image.getContext());
+                params.height = ScreenUtil.getScreenHeight(holder.image.getContext());
+                holder.image.setLayoutParams(params);
+            }
+            GlideEngine.loadImage(holder.image, resIDs[position]);
+            holder.itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (viewPager != null) {
+                        int currentPos = holder.getBindingAdapterPosition();
+                        if (currentPos < getItemCount() - 1) {
+                            viewPager.setCurrentItem(currentPos + 1, true);
+                        } else {
+                            if (onFinishListener != null) {
+                                onFinishListener.onFinish();
+                            }
+                            if (popupWindow != null && popupWindow.isShowing()) {
+                                popupWindow.dismiss();
+                            }
+                        }
+                    }
+                }
+            });
+        }
+
+        @Override
+        public int getItemCount() {
+            if (resIDs == null) {
+                return 0;
+            }
+            return resIDs.length;
+        }
+
+        class GuideViewHolder extends RecyclerView.ViewHolder {
+            private final ImageView image;
+            public GuideViewHolder(@NonNull View itemView) {
+                super(itemView);
+                image = itemView.findViewById(R.id.center_image);
+            }
+        }
+    }
+
+
+    public static void showBeginnerGuideThen(View view, Runnable runnable) {
+        boolean isShowGuide = SPUtils.getInstance(TUIChatConstants.CHAT_SETTINGS_SP_NAME).getBoolean(TUIChatConstants.CHAT_REPLY_GUIDE_SHOW_SP_KEY, true);
+        if (isShowGuide) {
+            SoftKeyBoardUtil.hideKeyBoard(view.getWindowToken());
+            SPUtils.getInstance(TUIChatConstants.CHAT_SETTINGS_SP_NAME).put(TUIChatConstants.CHAT_REPLY_GUIDE_SHOW_SP_KEY, false);
+
+            BeginnerGuidePage guidePage = new BeginnerGuidePage((Activity) view.getContext());
+            guidePage.setPagesResIDs(R.drawable.chat_reply_guide, R.drawable.chat_quote_guide);
+            guidePage.setOnFinishListener(new BeginnerGuidePage.OnFinishListener() {
+                @Override
+                public void onFinish() {
+                    runnable.run();
+                }
+            });
+            guidePage.show(view, Gravity.NO_GRAVITY);
+        } else {
+            runnable.run();
+        }
+    }
+
+    @FunctionalInterface
+    public interface OnFinishListener {
+        void onFinish();
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/EmojiIndicatorView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/EmojiIndicatorView.java
new file mode 100644
index 0000000..bb91795
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/EmojiIndicatorView.java
@@ -0,0 +1,169 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component;
+
+import android.animation.Animator;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+
+import java.util.ArrayList;
+
+
+public class EmojiIndicatorView extends LinearLayout {
+
+    private Context mContext;
+    private ArrayList<ImageView> mImageViews;
+    private Bitmap bmpSelect;
+    private Bitmap bmpNomal;
+    private int mHeight = 16;
+    private int mMaxHeight;
+    private AnimatorSet mPlayToAnimatorSet;
+    private AnimatorSet mPlayByInAnimatorSet;
+    private AnimatorSet mPlayByOutAnimatorSet;
+
+    public EmojiIndicatorView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        this.mContext = context;
+        this.setOrientation(HORIZONTAL);
+        mMaxHeight = ScreenUtil.dip2px(mHeight);
+        bmpSelect = BitmapFactory.decodeResource(getResources(), R.drawable.indicator_point_select);
+        bmpNomal = BitmapFactory.decodeResource(getResources(), R.drawable.indicator_point_nomal);
+    }
+
+    public EmojiIndicatorView(Context context) {
+        this(context, null);
+    }
+
+    public void init(int count) {
+        mImageViews = new ArrayList<ImageView>();
+        this.removeAllViews();
+        for (int i = 0; i < count; i++) {
+            RelativeLayout rl = new RelativeLayout(mContext);
+            LayoutParams params = new LinearLayout.LayoutParams(mMaxHeight, mMaxHeight);
+            RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
+            layoutParams.addRule(RelativeLayout.CENTER_IN_PARENT);
+            ImageView imageView = new ImageView(mContext);
+            if (i == 0) {
+                imageView.setImageBitmap(bmpSelect);
+                rl.addView(imageView, layoutParams);
+            } else {
+                imageView.setImageBitmap(bmpNomal);
+                rl.addView(imageView, layoutParams);
+            }
+            this.addView(rl, params);
+            mImageViews.add(imageView);
+        }
+    }
+
+    public void setIndicatorCount(int count) {
+        if (mImageViews == null || count > mImageViews.size()) {
+            return;
+        }
+        for (int i = 0; i < mImageViews.size(); i++) {
+            if (i >= count) {
+                mImageViews.get(i).setVisibility(GONE);
+                ((View) mImageViews.get(i).getParent()).setVisibility(GONE);
+            } else {
+                mImageViews.get(i).setVisibility(VISIBLE);
+                ((View) mImageViews.get(i).getParent()).setVisibility(VISIBLE);
+            }
+        }
+    }
+
+    public void playTo(int position) {
+        for (ImageView iv : mImageViews) {
+            iv.setImageBitmap(bmpNomal);
+        }
+        mImageViews.get(position).setImageBitmap(bmpSelect);
+        final ImageView imageViewStrat = mImageViews.get(position);
+        ObjectAnimator animIn1 = ObjectAnimator.ofFloat(imageViewStrat, "scaleX", 0.25f, 1.0f);
+        ObjectAnimator animIn2 = ObjectAnimator.ofFloat(imageViewStrat, "scaleY", 0.25f, 1.0f);
+
+        if (mPlayToAnimatorSet != null && mPlayToAnimatorSet.isRunning()) {
+            mPlayToAnimatorSet.cancel();
+            mPlayToAnimatorSet = null;
+        }
+        mPlayToAnimatorSet = new AnimatorSet();
+        mPlayToAnimatorSet.play(animIn1).with(animIn2);
+        mPlayToAnimatorSet.setDuration(100);
+        mPlayToAnimatorSet.start();
+    }
+
+    public void playBy(int startPosition, int nextPosition) {
+        boolean isShowInAnimOnly = false;
+        if (startPosition < 0 || nextPosition < 0 || nextPosition == startPosition) {
+            startPosition = nextPosition = 0;
+        }
+
+        if (startPosition < 0) {
+            isShowInAnimOnly = true;
+            startPosition = nextPosition = 0;
+        }
+
+        final ImageView imageViewStrat = mImageViews.get(startPosition);
+        final ImageView imageViewNext = mImageViews.get(nextPosition);
+
+        ObjectAnimator anim1 = ObjectAnimator.ofFloat(imageViewStrat, "scaleX", 1.0f, 0.25f);
+        ObjectAnimator anim2 = ObjectAnimator.ofFloat(imageViewStrat, "scaleY", 1.0f, 0.25f);
+
+        if (mPlayByOutAnimatorSet != null && mPlayByOutAnimatorSet.isRunning()) {
+            mPlayByOutAnimatorSet.cancel();
+            mPlayByOutAnimatorSet = null;
+        }
+        mPlayByOutAnimatorSet = new AnimatorSet();
+        mPlayByOutAnimatorSet.play(anim1).with(anim2);
+        mPlayByOutAnimatorSet.setDuration(100);
+
+        ObjectAnimator animIn1 = ObjectAnimator.ofFloat(imageViewNext, "scaleX", 0.25f, 1.0f);
+        ObjectAnimator animIn2 = ObjectAnimator.ofFloat(imageViewNext, "scaleY", 0.25f, 1.0f);
+
+        if (mPlayByInAnimatorSet != null && mPlayByInAnimatorSet.isRunning()) {
+            mPlayByInAnimatorSet.cancel();
+            mPlayByInAnimatorSet = null;
+        }
+        mPlayByInAnimatorSet = new AnimatorSet();
+        mPlayByInAnimatorSet.play(animIn1).with(animIn2);
+        mPlayByInAnimatorSet.setDuration(100);
+
+        if (isShowInAnimOnly) {
+            mPlayByInAnimatorSet.start();
+            return;
+        }
+
+        anim1.addListener(new Animator.AnimatorListener() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                imageViewStrat.setImageBitmap(bmpNomal);
+                ObjectAnimator animFil1l = ObjectAnimator.ofFloat(imageViewStrat, "scaleX", 1.0f);
+                ObjectAnimator animFill2 = ObjectAnimator.ofFloat(imageViewStrat, "scaleY", 1.0f);
+                AnimatorSet mFillAnimatorSet = new AnimatorSet();
+                mFillAnimatorSet.play(animFil1l).with(animFill2);
+                mFillAnimatorSet.start();
+                imageViewNext.setImageBitmap(bmpSelect);
+                mPlayByInAnimatorSet.start();
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animation) {
+            }
+
+            @Override
+            public void onAnimationRepeat(Animator animation) {
+            }
+        });
+        mPlayByOutAnimatorSet.start();
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/MessageProperties.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/MessageProperties.java
new file mode 100644
index 0000000..9616533
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/MessageProperties.java
@@ -0,0 +1,224 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component;
+
+import android.graphics.drawable.Drawable;
+
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.classicui.interfaces.IMessageProperties;
+
+public class MessageProperties implements IMessageProperties {
+    private static MessageProperties sP = new MessageProperties();
+    private int mAvatarId;
+    private int mAvatarRadius;
+    private int[] avatarSize = null;
+    private int mNameFontSize;
+    private int mNameFontColor;
+    private int mLeftNameVisibility;
+    private int mRightNameVisibility;
+    private int mChatContextFontSize;
+    private int mMyChatContentFontColor;
+    private Drawable mMyBubble;
+    private int mFriendChatContentFontColor;
+    private Drawable mFriendBubble;
+    private int mTipsMessageFontSize;
+    private int mTipsMessageFontColor;
+    private Drawable mTipsMessageBubble;
+    private int mChatTimeFontSize;
+    private int mChatTimeFontColor;
+    private Drawable mChatTimeBubble;
+
+    private MessageProperties() {
+
+    }
+
+    public static MessageProperties getInstance() {
+        if (sP == null) {
+            sP = new MessageProperties();
+        }
+        return sP;
+    }
+
+    @Override
+    public int getAvatarRadius() {
+        return mAvatarRadius;
+    }
+
+    @Override
+    public void setAvatarRadius(int radius) {
+        mAvatarRadius = ScreenUtil.getPxByDp(radius);
+    }
+
+    @Override
+    public int[] getAvatarSize() {
+        return avatarSize;
+    }
+
+    @Override
+    public void setAvatarSize(int[] size) {
+        if (size != null && size.length == 2) {
+            avatarSize = new int[2];
+            avatarSize[0] = ScreenUtil.getPxByDp(size[0]);
+            avatarSize[1] = ScreenUtil.getPxByDp(size[1]);
+        }
+    }
+
+    @Override
+    public int getAvatar() {
+        return mAvatarId;
+    }
+
+    @Override
+    public void setAvatar(int resId) {
+        this.mAvatarId = resId;
+    }
+
+    @Override
+    public Drawable getRightBubble() {
+        return mMyBubble;
+    }
+
+    @Override
+    public void setRightBubble(Drawable bubble) {
+        this.mMyBubble = bubble;
+    }
+
+    @Override
+    public Drawable getLeftBubble() {
+        return mFriendBubble;
+    }
+
+    @Override
+    public void setLeftBubble(Drawable bubble) {
+        this.mFriendBubble = bubble;
+    }
+
+    @Override
+    public int getNameFontSize() {
+        return mNameFontSize;
+    }
+
+    @Override
+    public void setNameFontSize(int size) {
+        this.mNameFontSize = size;
+    }
+
+    @Override
+    public int getNameFontColor() {
+        return mNameFontColor;
+    }
+
+    @Override
+    public void setNameFontColor(int color) {
+        this.mNameFontColor = color;
+    }
+
+    @Override
+    public int getLeftNameVisibility() {
+        return mLeftNameVisibility;
+    }
+
+    @Override
+    public void setLeftNameVisibility(int visibility) {
+        mLeftNameVisibility = visibility;
+    }
+
+    @Override
+    public int getRightNameVisibility() {
+        return mRightNameVisibility;
+    }
+
+    @Override
+    public void setRightNameVisibility(int visibility) {
+        mRightNameVisibility = visibility;
+    }
+
+    @Override
+    public int getChatContextFontSize() {
+        return mChatContextFontSize;
+    }
+
+    @Override
+    public void setChatContextFontSize(int size) {
+        this.mChatContextFontSize = size;
+    }
+
+    @Override
+    public int getRightChatContentFontColor() {
+        return mMyChatContentFontColor;
+    }
+
+    @Override
+    public void setRightChatContentFontColor(int color) {
+        this.mMyChatContentFontColor = color;
+    }
+
+    @Override
+    public int getLeftChatContentFontColor() {
+        return mFriendChatContentFontColor;
+    }
+
+    @Override
+    public void setLeftChatContentFontColor(int color) {
+        this.mFriendChatContentFontColor = color;
+    }
+
+    @Override
+    public Drawable getTipsMessageBubble() {
+        return mTipsMessageBubble;
+    }
+
+    @Override
+    public void setTipsMessageBubble(Drawable bubble) {
+        this.mTipsMessageBubble = bubble;
+    }
+
+    @Override
+    public int getTipsMessageFontSize() {
+        return mTipsMessageFontSize;
+    }
+
+    @Override
+    public void setTipsMessageFontSize(int size) {
+        this.mTipsMessageFontSize = size;
+    }
+
+    @Override
+    public int getTipsMessageFontColor() {
+        return mTipsMessageFontColor;
+    }
+
+    @Override
+    public void setTipsMessageFontColor(int color) {
+        this.mTipsMessageFontColor = color;
+    }
+
+    @Override
+    public Drawable getChatTimeBubble() {
+        return mChatTimeBubble;
+    }
+
+    @Override
+    public void setChatTimeBubble(Drawable bubble) {
+        this.mChatTimeBubble = bubble;
+    }
+
+    @Override
+    public int getChatTimeFontSize() {
+        return mChatTimeFontSize;
+    }
+
+    @Override
+    public void setChatTimeFontSize(int size) {
+        this.mChatTimeFontSize = size;
+    }
+
+    @Override
+    public int getChatTimeFontColor() {
+        return mChatTimeFontColor;
+    }
+
+    @Override
+    public void setChatTimeFontColor(int color) {
+        this.mChatTimeFontColor = color;
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/CameraActivity.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/CameraActivity.java
new file mode 100644
index 0000000..2e7a221
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/CameraActivity.java
@@ -0,0 +1,183 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.camera;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.graphics.Bitmap;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.FileUtil;
+import com.tencent.qcloud.tuicore.util.TUIBuild;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.listener.ClickListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.listener.ErrorListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.listener.JCameraListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.view.JCameraView;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+public class CameraActivity extends Activity {
+
+    private static final String TAG = CameraActivity.class.getSimpleName();
+    private static final int REQUEST_CODE_PHOTO_AND_VIDEO = 1000;
+    public static IUIKitCallback mCallBack;
+    private JCameraView jCameraView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        TUIChatLog.i(TAG, "onCreate");
+        super.onCreate(savedInstanceState);
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        setContentView(R.layout.activity_camera);
+        jCameraView = findViewById(R.id.jcameraview);
+        //jCameraView.setSaveVideoPath(Environment.getExternalStorageDirectory().getPath() + File.separator + "JCamera");
+
+        int state = getIntent().getIntExtra(TUIChatConstants.CAMERA_TYPE, JCameraView.BUTTON_STATE_BOTH);
+        jCameraView.setFeatures(state);
+        if (state == JCameraView.BUTTON_STATE_ONLY_CAPTURE) {
+            jCameraView.setTip(getString(R.string.tap_capture));
+        } else if (state == JCameraView.BUTTON_STATE_ONLY_RECORDER) {
+            jCameraView.setTip(getString(R.string.tap_video));
+        }
+
+        jCameraView.setMediaQuality(JCameraView.MEDIA_QUALITY_MIDDLE);
+        jCameraView.setErrorLisenter(new ErrorListener() {
+            @Override
+            public void onError() {
+                TUIChatLog.i(TAG, "camera error");
+                Intent intent = new Intent();
+                setResult(103, intent);
+                finish();
+            }
+
+            @Override
+            public void AudioPermissionError() {
+                ToastUtil.toastShortMessage(getString(R.string.audio_permission_error));
+            }
+        });
+
+        jCameraView.setJCameraLisenter(new JCameraListener() {
+            @Override
+            public void captureSuccess(Bitmap bitmap) {
+                String path = FileUtil.saveBitmap("JCamera", bitmap);
+               /* Intent intent = new Intent();
+                intent.putExtra(ILiveConstants.CAMERA_IMAGE_PATH, path);
+                setResult(-1, intent);*/
+                if (mCallBack != null) {
+                    mCallBack.onSuccess(path);
+                }
+                finish();
+            }
+
+            @Override
+            public void recordSuccess(String url, Bitmap firstFrame, long duration) {
+                String path = FileUtil.saveBitmap("JCamera", firstFrame);
+                Intent intent = new Intent();
+                intent.putExtra(TUIChatConstants.IMAGE_WIDTH, firstFrame.getWidth());
+                intent.putExtra(TUIChatConstants.IMAGE_HEIGHT, firstFrame.getHeight());
+                intent.putExtra(TUIChatConstants.VIDEO_TIME, duration);
+                intent.putExtra(TUIChatConstants.CAMERA_IMAGE_PATH, path);
+                intent.putExtra(TUIChatConstants.CAMERA_VIDEO_PATH, url);
+                firstFrame.getWidth();
+                //setResult(-1, intent);
+                if (mCallBack != null) {
+                    mCallBack.onSuccess(intent);
+                }
+                finish();
+            }
+        });
+
+        jCameraView.setLeftClickListener(new ClickListener() {
+            @Override
+            public void onClick() {
+                CameraActivity.this.finish();
+            }
+        });
+        jCameraView.setRightClickListener(new ClickListener() {
+            @Override
+            public void onClick() {
+                startSendPhoto();
+            }
+        });
+        //jCameraView.setVisibility(View.GONE);
+        TUIChatLog.i(TAG, TUIBuild.getDevice());
+    }
+
+    private void startSendPhoto() {
+        TUIChatLog.i(TAG, "startSendPhoto");
+
+        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+        intent.addCategory(Intent.CATEGORY_OPENABLE);
+        intent.setType("*/*");
+        String[] mimeTypes = {"image/*", "video/*"};
+        intent.putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes);
+        startActivityForResult(intent, REQUEST_CODE_PHOTO_AND_VIDEO);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == REQUEST_CODE_PHOTO_AND_VIDEO) {
+            if (resultCode != RESULT_OK) {
+                return;
+            }
+            setResult(RESULT_OK, data);
+            finish();
+        }
+    }
+
+    @Override
+    public void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        if (Build.VERSION.SDK_INT >= 19) {
+            View decorView = getWindow().getDecorView();
+            decorView.setSystemUiVisibility(
+                    View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                            | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                            | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                            | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                            | View.SYSTEM_UI_FLAG_FULLSCREEN
+                            | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
+        } else {
+            View decorView = getWindow().getDecorView();
+            int option = View.SYSTEM_UI_FLAG_FULLSCREEN;
+            decorView.setSystemUiVisibility(option);
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        TUIChatLog.i(TAG, "onResume");
+        super.onResume();
+        jCameraView.onResume();
+    }
+
+    @Override
+    protected void onPause() {
+        TUIChatLog.i(TAG, "onPause");
+        super.onPause();
+        jCameraView.onPause();
+    }
+
+    @Override
+    protected void onDestroy() {
+        TUIChatLog.i(TAG, "onDestroy");
+        super.onDestroy();
+        jCameraView.onDestroy();
+        mCallBack = null;
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/listener/CaptureListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/listener/CaptureListener.java
new file mode 100644
index 0000000..332f79f
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/listener/CaptureListener.java
@@ -0,0 +1,16 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.listener;
+
+
+public interface CaptureListener {
+    void takePictures();
+
+    void recordShort(long time);
+
+    void recordStart();
+
+    void recordEnd(long time);
+
+    void recordZoom(float zoom);
+
+    void recordError();
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/listener/ClickListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/listener/ClickListener.java
new file mode 100644
index 0000000..6c9cdda
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/listener/ClickListener.java
@@ -0,0 +1,6 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.listener;
+
+
+public interface ClickListener {
+    void onClick();
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/listener/ErrorListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/listener/ErrorListener.java
new file mode 100644
index 0000000..85d7816
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/listener/ErrorListener.java
@@ -0,0 +1,8 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.listener;
+
+public interface ErrorListener {
+
+    void onError();
+
+    void AudioPermissionError();
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/listener/JCameraListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/listener/JCameraListener.java
new file mode 100644
index 0000000..9da0653
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/listener/JCameraListener.java
@@ -0,0 +1,11 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.listener;
+
+import android.graphics.Bitmap;
+
+public interface JCameraListener {
+
+    void captureSuccess(Bitmap bitmap);
+
+    void recordSuccess(String url, Bitmap firstFrame, long duration);
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/listener/ReturnListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/listener/ReturnListener.java
new file mode 100644
index 0000000..244e392
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/listener/ReturnListener.java
@@ -0,0 +1,5 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.listener;
+
+public interface ReturnListener {
+    void onReturn();
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/listener/TypeListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/listener/TypeListener.java
new file mode 100644
index 0000000..24382d0
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/listener/TypeListener.java
@@ -0,0 +1,7 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.listener;
+
+public interface TypeListener {
+    void cancel();
+
+    void confirm();
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/state/BorrowPictureState.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/state/BorrowPictureState.java
new file mode 100644
index 0000000..b24ed1e
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/state/BorrowPictureState.java
@@ -0,0 +1,82 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.state;
+
+import android.view.Surface;
+import android.view.SurfaceHolder;
+
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.view.CameraInterface;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.view.JCameraView;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+public class BorrowPictureState implements State {
+
+    private static final String TAG = BorrowPictureState.class.getSimpleName();
+    private CameraMachine machine;
+
+    public BorrowPictureState(CameraMachine machine) {
+        this.machine = machine;
+    }
+
+    @Override
+    public void start(SurfaceHolder holder, float screenProp) {
+        CameraInterface.getInstance().doStartPreview(holder, screenProp);
+        machine.setState(machine.getPreviewState());
+    }
+
+    @Override
+    public void stop() {
+
+    }
+
+
+    @Override
+    public void foucs(float x, float y, CameraInterface.FocusCallback callback) {
+    }
+
+    @Override
+    public void swtich(SurfaceHolder holder, float screenProp) {
+
+    }
+
+    @Override
+    public void restart() {
+
+    }
+
+    @Override
+    public void capture() {
+
+    }
+
+    @Override
+    public void record(Surface surface, float screenProp) {
+
+    }
+
+    @Override
+    public void stopRecord(boolean isShort, long time) {
+    }
+
+    @Override
+    public void cancle(SurfaceHolder holder, float screenProp) {
+        CameraInterface.getInstance().doStartPreview(holder, screenProp);
+        machine.getView().resetState(JCameraView.TYPE_PICTURE);
+        machine.setState(machine.getPreviewState());
+    }
+
+    @Override
+    public void confirm() {
+        machine.getView().confirmState(JCameraView.TYPE_PICTURE);
+        machine.setState(machine.getPreviewState());
+    }
+
+    @Override
+    public void zoom(float zoom, int type) {
+        TUIChatLog.i(TAG, "zoom");
+    }
+
+    @Override
+    public void flash(String mode) {
+
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/state/BorrowVideoState.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/state/BorrowVideoState.java
new file mode 100644
index 0000000..5400e7f
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/state/BorrowVideoState.java
@@ -0,0 +1,82 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.state;
+
+import android.view.Surface;
+import android.view.SurfaceHolder;
+
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.view.CameraInterface;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.view.JCameraView;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+public class BorrowVideoState implements State {
+
+    private static final String TAG = BorrowVideoState.class.getSimpleName();
+    private CameraMachine machine;
+
+    public BorrowVideoState(CameraMachine machine) {
+        this.machine = machine;
+    }
+
+    @Override
+    public void start(SurfaceHolder holder, float screenProp) {
+        CameraInterface.getInstance().doStartPreview(holder, screenProp);
+        machine.setState(machine.getPreviewState());
+    }
+
+    @Override
+    public void stop() {
+
+    }
+
+    @Override
+    public void foucs(float x, float y, CameraInterface.FocusCallback callback) {
+
+    }
+
+
+    @Override
+    public void swtich(SurfaceHolder holder, float screenProp) {
+
+    }
+
+    @Override
+    public void restart() {
+
+    }
+
+    @Override
+    public void capture() {
+
+    }
+
+    @Override
+    public void record(Surface surface, float screenProp) {
+
+    }
+
+    @Override
+    public void stopRecord(boolean isShort, long time) {
+
+    }
+
+    @Override
+    public void cancle(SurfaceHolder holder, float screenProp) {
+        machine.getView().resetState(JCameraView.TYPE_VIDEO);
+        machine.setState(machine.getPreviewState());
+    }
+
+    @Override
+    public void confirm() {
+        machine.getView().confirmState(JCameraView.TYPE_VIDEO);
+        machine.setState(machine.getPreviewState());
+    }
+
+    @Override
+    public void zoom(float zoom, int type) {
+        TUIChatLog.i(TAG, "zoom");
+    }
+
+    @Override
+    public void flash(String mode) {
+
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/state/CameraMachine.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/state/CameraMachine.java
new file mode 100644
index 0000000..1a186e0
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/state/CameraMachine.java
@@ -0,0 +1,119 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.state;
+
+import android.content.Context;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.view.CameraInterface;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.view.CameraView;
+
+public class CameraMachine implements State {
+
+    private Context context;
+    private State state;
+    private CameraView view;
+//    private CameraInterface.CameraOpenOverCallback cameraOpenOverCallback;
+
+    private State previewState;
+    private State borrowPictureState;
+    private State borrowVideoState;
+
+    public CameraMachine(Context context, CameraView view, CameraInterface.CameraOpenOverCallback
+            cameraOpenOverCallback) {
+        this.context = context;
+        previewState = new PreviewState(this);
+        borrowPictureState = new BorrowPictureState(this);
+        borrowVideoState = new BorrowVideoState(this); 
+        this.state = previewState;
+//        this.cameraOpenOverCallback = cameraOpenOverCallback;
+        this.view = view;
+    }
+
+    public CameraView getView() {
+        return view;
+    }
+
+    public Context getContext() {
+        return context;
+    }
+
+    State getBorrowPictureState() {
+        return borrowPictureState;
+    }
+
+    State getBorrowVideoState() {
+        return borrowVideoState;
+    }
+
+    State getPreviewState() {
+        return previewState;
+    }
+
+    @Override
+    public void start(SurfaceHolder holder, float screenProp) {
+        state.start(holder, screenProp);
+    }
+
+    @Override
+    public void stop() {
+        state.stop();
+    }
+
+    @Override
+    public void foucs(float x, float y, CameraInterface.FocusCallback callback) {
+        state.foucs(x, y, callback);
+    }
+
+    @Override
+    public void swtich(SurfaceHolder holder, float screenProp) {
+        state.swtich(holder, screenProp);
+    }
+
+    @Override
+    public void restart() {
+        state.restart();
+    }
+
+    @Override
+    public void capture() {
+        state.capture();
+    }
+
+    @Override
+    public void record(Surface surface, float screenProp) {
+        state.record(surface, screenProp);
+    }
+
+    @Override
+    public void stopRecord(boolean isShort, long time) {
+        state.stopRecord(isShort, time);
+    }
+
+    @Override
+    public void cancle(SurfaceHolder holder, float screenProp) {
+        state.cancle(holder, screenProp);
+    }
+
+    @Override
+    public void confirm() {
+        state.confirm();
+    }
+
+    @Override
+    public void zoom(float zoom, int type) {
+        state.zoom(zoom, type);
+    }
+
+    @Override
+    public void flash(String mode) {
+        state.flash(mode);
+    }
+
+    public State getState() {
+        return this.state;
+    }
+
+    public void setState(State state) {
+        this.state = state;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/state/PreviewState.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/state/PreviewState.java
new file mode 100644
index 0000000..1f980e6
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/state/PreviewState.java
@@ -0,0 +1,103 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.state;
+
+import android.graphics.Bitmap;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.view.CameraInterface;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.view.JCameraView;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+class PreviewState implements State {
+    public static final String TAG = "PreviewState";
+
+    private CameraMachine machine;
+
+    PreviewState(CameraMachine machine) {
+        this.machine = machine;
+    }
+
+    @Override
+    public void start(SurfaceHolder holder, float screenProp) {
+        CameraInterface.getInstance().doStartPreview(holder, screenProp);
+    }
+
+    @Override
+    public void stop() {
+        CameraInterface.getInstance().doStopPreview();
+    }
+
+
+    @Override
+    public void foucs(float x, float y, CameraInterface.FocusCallback callback) {
+        TUIChatLog.i(TAG, "preview state foucs");
+        if (machine.getView().handlerFoucs(x, y)) {
+            CameraInterface.getInstance().handleFocus(machine.getContext(), x, y, callback);
+        }
+    }
+
+    @Override
+    public void swtich(SurfaceHolder holder, float screenProp) {
+        CameraInterface.getInstance().switchCamera(holder, screenProp);
+    }
+
+    @Override
+    public void restart() {
+
+    }
+
+    @Override
+    public void capture() {
+        CameraInterface.getInstance().takePicture(new CameraInterface.TakePictureCallback() {
+            @Override
+            public void captureResult(Bitmap bitmap, boolean isVertical) {
+                machine.getView().showPicture(bitmap, isVertical);
+                machine.setState(machine.getBorrowPictureState());
+                TUIChatLog.i(TAG, "capture");
+            }
+        });
+    }
+
+    @Override
+    public void record(Surface surface, float screenProp) {
+        CameraInterface.getInstance().startRecord(surface, screenProp, null);
+    }
+
+    @Override
+    public void stopRecord(final boolean isShort, long time) {
+        CameraInterface.getInstance().stopRecord(isShort, new CameraInterface.StopRecordCallback() {
+            @Override
+            public void recordResult(String url, Bitmap firstFrame) {
+                if (isShort) {
+                    machine.getView().resetState(JCameraView.TYPE_SHORT);
+                } else {
+                    machine.getView().playVideo(firstFrame, url);
+                    machine.setState(machine.getBorrowVideoState());
+                }
+            }
+        });
+    }
+
+    @Override
+    public void cancle(SurfaceHolder holder, float screenProp) {
+        TUIChatLog.i(TAG, TUIChatService.getAppContext().getString(R.string.no_event_cancle_tip));
+    }
+
+    @Override
+    public void confirm() {
+        TUIChatLog.i(TAG, TUIChatService.getAppContext().getString(R.string.no_event_confirm_tip));
+    }
+
+    @Override
+    public void zoom(float zoom, int type) {
+        TUIChatLog.i(TAG, "zoom");
+        CameraInterface.getInstance().setZoom(zoom, type);
+    }
+
+    @Override
+    public void flash(String mode) {
+        CameraInterface.getInstance().setFlashMode(mode);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/state/State.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/state/State.java
new file mode 100644
index 0000000..eb43c42
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/state/State.java
@@ -0,0 +1,33 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.state;
+
+import android.view.Surface;
+import android.view.SurfaceHolder;
+
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.view.CameraInterface;
+
+public interface State {
+
+    void start(SurfaceHolder holder, float screenProp);
+
+    void stop();
+
+    void foucs(float x, float y, CameraInterface.FocusCallback callback);
+
+    void swtich(SurfaceHolder holder, float screenProp);
+
+    void restart();
+
+    void capture();
+
+    void record(Surface surface, float screenProp);
+
+    void stopRecord(boolean isShort, long time);
+
+    void cancle(SurfaceHolder holder, float screenProp);
+
+    void confirm();
+
+    void zoom(float zoom, int type);
+
+    void flash(String mode);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/view/CameraInterface.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/view/CameraInterface.java
new file mode 100644
index 0000000..1aa55fe
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/view/CameraInterface.java
@@ -0,0 +1,737 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.view;
+
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.ImageFormat;
+import android.graphics.Matrix;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.graphics.YuvImage;
+import android.hardware.Camera;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.media.MediaRecorder;
+import android.os.Build;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+import android.widget.ImageView;
+
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.util.FileUtil;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.listener.ErrorListener;
+import com.tencent.qcloud.tuikit.tuichat.util.AngleUtil;
+import com.tencent.qcloud.tuikit.tuichat.util.CameraParamUtil;
+import com.tencent.qcloud.tuikit.tuichat.util.CheckPermission;
+import com.tencent.qcloud.tuikit.tuichat.util.DeviceUtil;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
+import static android.graphics.Bitmap.createBitmap;
+
+public class CameraInterface implements Camera.PreviewCallback {
+
+    public static final int TYPE_RECORDER = 0x090;
+    public static final int TYPE_CAPTURE = 0x091;
+    private static final String TAG = CameraInterface.class.getSimpleName();
+    private volatile static CameraInterface mCameraInterface;
+    int handlerTime = 0;
+    private Camera mCamera;
+    private Camera.Parameters mParams;
+    private boolean isPreviewing = false;
+    private int SELECTED_CAMERA = -1;
+    private int CAMERA_POST_POSITION = -1;
+    private int CAMERA_FRONT_POSITION = -1;
+    private SurfaceHolder mHolder = null;
+    private float screenProp = -1.0f;
+    private boolean isRecorder = false;
+    private MediaRecorder mediaRecorder;
+    private String videoFileName;
+    private String saveVideoPath = TUIConfig.getMediaDir();
+    private String videoFileAbsPath;
+    private Bitmap videoFirstFrame = null;
+    private ErrorListener errorLisenter;
+    private ImageView mSwitchView;
+    private ImageView mFlashLamp;
+    private int preview_width;
+    private int preview_height;
+    private int angle = 0;
+    private int cameraAngle = 90;
+    private int rotation = 0;
+    private byte[] firstFrame_data;
+    private int nowScaleRate = 0;
+    private int recordScleRate = 0;
+
+    private int mediaQuality = JCameraView.MEDIA_QUALITY_MIDDLE;
+    private SensorManager sm = null;
+    private SensorEventListener sensorEventListener = new SensorEventListener() {
+        public void onSensorChanged(SensorEvent event) {
+            if (Sensor.TYPE_ACCELEROMETER != event.sensor.getType()) {
+                return;
+            }
+            float[] values = event.values;
+            angle = AngleUtil.getSensorAngle(values[0], values[1]);
+            rotationAnimation();
+        }
+
+        public void onAccuracyChanged(Sensor sensor, int accuracy) {
+        }
+    };
+
+    private int nowAngle;
+
+    private CameraInterface() {
+        findAvailableCameras();
+        SELECTED_CAMERA = CAMERA_POST_POSITION;
+    }
+
+    public static void destroyCameraInterface() {
+        if (mCameraInterface != null) {
+            mCameraInterface.doDestroyCamera();
+            mCameraInterface = null;
+        }
+    }
+
+    public static synchronized CameraInterface getInstance() {
+        if (mCameraInterface == null)
+            synchronized (CameraInterface.class) {
+                if (mCameraInterface == null)
+                    mCameraInterface = new CameraInterface();
+            }
+        return mCameraInterface;
+    }
+
+    private static Rect calculateTapArea(float x, float y, float coefficient, Context context) {
+        float focusAreaSize = 300;
+        int areaSize = Float.valueOf(focusAreaSize * coefficient).intValue();
+        int centerX = (int) (x / ScreenUtil.getScreenWidth(context) * 2000 - 1000);
+        int centerY = (int) (y / ScreenUtil.getScreenHeight(context) * 2000 - 1000);
+        int left = clamp(centerX - areaSize / 2, -1000, 1000);
+        int top = clamp(centerY - areaSize / 2, -1000, 1000);
+        RectF rectF = new RectF(left, top, left + areaSize, top + areaSize);
+        return new Rect(Math.round(rectF.left), Math.round(rectF.top), Math.round(rectF.right), Math.round(rectF
+                .bottom));
+    }
+
+    private static int clamp(int x, int min, int max) {
+        if (x > max) {
+            return max;
+        }
+        if (x < min) {
+            return min;
+        }
+        return x;
+    }
+
+    public void setSwitchView(ImageView mSwitchView, ImageView mFlashLamp) {
+        this.mSwitchView = mSwitchView;
+        this.mFlashLamp = mFlashLamp;
+        if (mSwitchView != null) {
+            cameraAngle = CameraParamUtil.getInstance().getCameraDisplayOrientation(mSwitchView.getContext(),
+                    SELECTED_CAMERA);
+        }
+    }
+
+    private void rotationAnimation() {
+        if (mSwitchView == null) {
+            return;
+        }
+        if (rotation != angle) {
+            int start_rotaion = 0;
+            int end_rotation = 0;
+            switch (rotation) {
+                case 0:
+                    start_rotaion = 0;
+                    switch (angle) {
+                        case 90:
+                            end_rotation = -90;
+                            break;
+                        case 270:
+                            end_rotation = 90;
+                            break;
+                    }
+                    break;
+                case 90:
+                    start_rotaion = -90;
+                    switch (angle) {
+                        case 0:
+                            end_rotation = 0;
+                            break;
+                        case 180:
+                            end_rotation = -180;
+                            break;
+                    }
+                    break;
+                case 180:
+                    start_rotaion = 180;
+                    switch (angle) {
+                        case 90:
+                            end_rotation = 270;
+                            break;
+                        case 270:
+                            end_rotation = 90;
+                            break;
+                    }
+                    break;
+                case 270:
+                    start_rotaion = 90;
+                    switch (angle) {
+                        case 0:
+                            end_rotation = 0;
+                            break;
+                        case 180:
+                            end_rotation = 180;
+                            break;
+                    }
+                    break;
+            }
+            ObjectAnimator animC = ObjectAnimator.ofFloat(mSwitchView, "rotation", start_rotaion, end_rotation);
+            ObjectAnimator animF = ObjectAnimator.ofFloat(mFlashLamp, "rotation", start_rotaion, end_rotation);
+            AnimatorSet set = new AnimatorSet();
+            set.playTogether(animC, animF);
+            set.setDuration(500);
+            set.start();
+            rotation = angle;
+        }
+    }
+
+    public void setZoom(float zoom, int type) {
+        if (mCamera == null) {
+            return;
+        }
+        if (mParams == null) {
+            mParams = mCamera.getParameters();
+        }
+        if (!mParams.isZoomSupported() || !mParams.isSmoothZoomSupported()) {
+            return;
+        }
+        switch (type) {
+            case TYPE_RECORDER:
+                if (!isRecorder) {
+                    return;
+                }
+                if (zoom >= 0) {
+                    // 每移动50个像素缩放一个级别
+                    // Zooms one level every 50 pixels you move
+                    int scaleRate = (int) (zoom / 40);
+                    if (scaleRate <= mParams.getMaxZoom() && scaleRate >= nowScaleRate && recordScleRate != scaleRate) {
+                        mParams.setZoom(scaleRate);
+                        mCamera.setParameters(mParams);
+                        recordScleRate = scaleRate;
+                    }
+                }
+                break;
+            case TYPE_CAPTURE:
+                if (isRecorder) {
+                    return;
+                }
+                // 每移动50个像素缩放一个级别
+                // Zooms one level every 50 pixels you move
+                int scaleRate = (int) (zoom / 50);
+                if (scaleRate < mParams.getMaxZoom()) {
+                    nowScaleRate += scaleRate;
+                    if (nowScaleRate < 0) {
+                        nowScaleRate = 0;
+                    } else if (nowScaleRate > mParams.getMaxZoom()) {
+                        nowScaleRate = mParams.getMaxZoom();
+                    }
+                    mParams.setZoom(nowScaleRate);
+                    mCamera.setParameters(mParams);
+                }
+                TUIChatLog.i(TAG, "setZoom = " + nowScaleRate);
+                break;
+        }
+
+    }
+
+    void setMediaQuality(int quality) {
+        this.mediaQuality = quality;
+    }
+
+    @Override
+    public void onPreviewFrame(byte[] data, Camera camera) {
+        firstFrame_data = data;
+    }
+
+    public void setFlashMode(String flashMode) {
+        if (mCamera == null)
+            return;
+        Camera.Parameters params = mCamera.getParameters();
+        params.setFlashMode(flashMode);
+        mCamera.setParameters(params);
+    }
+
+    /**
+     * open Camera
+     */
+    void doOpenCamera(CameraOpenOverCallback callback) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            if (!CheckPermission.isCameraUseable(SELECTED_CAMERA) && this.errorLisenter != null) {
+                this.errorLisenter.onError();
+                return;
+            }
+        }
+        if (mCamera == null) {
+            openCamera(SELECTED_CAMERA);
+        }
+        callback.cameraHasOpened();
+    }
+
+    private void setFlashModel() {
+        mParams = mCamera.getParameters();
+        mParams.setFlashMode(Camera.Parameters.FLASH_MODE_TORCH);
+        mCamera.setParameters(mParams);
+    }
+
+    private synchronized void openCamera(int id) {
+        try {
+            this.mCamera = Camera.open(id);
+        } catch (Exception var3) {
+            var3.printStackTrace();
+            if (this.errorLisenter != null) {
+                this.errorLisenter.onError();
+            }
+        }
+
+        if (Build.VERSION.SDK_INT > 17 && this.mCamera != null) {
+            try {
+                this.mCamera.enableShutterSound(false);
+            } catch (Exception e) {
+                e.printStackTrace();
+                TUIChatLog.e(TAG, "enable shutter sound faild");
+            }
+        }
+    }
+
+    public synchronized void switchCamera(SurfaceHolder holder, float screenProp) {
+        if (SELECTED_CAMERA == CAMERA_POST_POSITION) {
+            SELECTED_CAMERA = CAMERA_FRONT_POSITION;
+        } else {
+            SELECTED_CAMERA = CAMERA_POST_POSITION;
+        }
+        doDestroyCamera();
+        TUIChatLog.i(TAG, "open start");
+        openCamera(SELECTED_CAMERA);
+//        mCamera = Camera.open();
+        if (Build.VERSION.SDK_INT > 17 && this.mCamera != null) {
+            try {
+                this.mCamera.enableShutterSound(false);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        TUIChatLog.i(TAG, "open end");
+        doStartPreview(holder, screenProp);
+    }
+
+    /**
+     * doStartPreview
+     */
+    public void doStartPreview(SurfaceHolder holder, float screenProp) {
+        if (isPreviewing) {
+            TUIChatLog.i(TAG, "doStartPreview isPreviewing");
+        }
+        if (this.screenProp < 0) {
+            this.screenProp = screenProp;
+        }
+        if (holder == null) {
+            return;
+        }
+        this.mHolder = holder;
+        if (mCamera != null) {
+            try {
+                if (DeviceUtil.isVivoX21()) {
+                    if (mCamera != null) {
+                        mCamera.release();
+                        mCamera = null;
+                    }
+                    openCamera(SELECTED_CAMERA);
+                }
+                mParams = mCamera.getParameters();
+                Camera.Size previewSize = CameraParamUtil.getInstance().getPreviewSize(mParams
+                        .getSupportedPreviewSizes(), 1000, screenProp);
+                Camera.Size pictureSize = CameraParamUtil.getInstance().getPictureSize(mParams
+                        .getSupportedPictureSizes(), 1200, screenProp);
+
+                mParams.setPreviewSize(previewSize.width, previewSize.height);
+
+                preview_width = previewSize.width;
+                preview_height = previewSize.height;
+
+                mParams.setPictureSize(pictureSize.width, pictureSize.height);
+
+                if (CameraParamUtil.getInstance().isSupportedFocusMode(
+                        mParams.getSupportedFocusModes(),
+                        Camera.Parameters.FOCUS_MODE_AUTO)) {
+                    mParams.setFocusMode(Camera.Parameters.FOCUS_MODE_AUTO);
+                }
+                if (CameraParamUtil.getInstance().isSupportedPictureFormats(mParams.getSupportedPictureFormats(),
+                        ImageFormat.JPEG)) {
+                    mParams.setPictureFormat(ImageFormat.JPEG);
+                    mParams.setJpegQuality(100);
+                }
+                mCamera.setParameters(mParams);
+                mParams = mCamera.getParameters();
+                mCamera.setPreviewDisplay(holder);  //SurfaceView
+                mCamera.setDisplayOrientation(cameraAngle);
+                mCamera.setPreviewCallback(this);
+                mCamera.startPreview();
+                isPreviewing = true;
+                TUIChatLog.i(TAG, "=== Start Preview ===");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public void doStopPreview() {
+        if (null != mCamera) {
+            try {
+                mCamera.setPreviewCallback(null);
+                mCamera.stopPreview();
+                mCamera.setPreviewDisplay(null);
+                isPreviewing = false;
+                TUIChatLog.i(TAG, "=== Stop Preview ===");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    void doDestroyCamera() {
+        errorLisenter = null;
+        if (null != mCamera) {
+            try {
+                mCamera.setPreviewCallback(null);
+                mSwitchView = null;
+                mFlashLamp = null;
+                mCamera.stopPreview();
+                mCamera.setPreviewDisplay(null);
+                mHolder = null;
+                isPreviewing = false;
+                mCamera.release();
+                mCamera = null;
+                TUIChatLog.i(TAG, "=== Destroy Camera ===");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        } else {
+            TUIChatLog.i(TAG, "=== Camera  Null===");
+        }
+    }
+
+    public void takePicture(final TakePictureCallback callback) {
+        if (mCamera == null) {
+            return;
+        }
+        switch (cameraAngle) {
+            case 90:
+                nowAngle = Math.abs(angle + cameraAngle) % 360;
+                break;
+            case 270:
+                nowAngle = Math.abs(cameraAngle - angle);
+                break;
+        }
+//
+        TUIChatLog.i(TAG, angle + " = " + cameraAngle + " = " + nowAngle);
+        mCamera.takePicture(null, null, new Camera.PictureCallback() {
+            @Override
+            public void onPictureTaken(byte[] data, Camera camera) {
+                Bitmap bitmap = BitmapFactory.decodeByteArray(data, 0, data.length);
+                Matrix matrix = new Matrix();
+                if (SELECTED_CAMERA == CAMERA_POST_POSITION) {
+                    matrix.setRotate(nowAngle);
+                } else if (SELECTED_CAMERA == CAMERA_FRONT_POSITION) {
+                    matrix.setRotate(360 - nowAngle);
+                    matrix.postScale(-1, 1);
+                }
+
+                bitmap = createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);
+                if (callback != null) {
+                    if (nowAngle == 90 || nowAngle == 270) {
+                        callback.captureResult(bitmap, true);
+                    } else {
+                        callback.captureResult(bitmap, false);
+                    }
+                }
+            }
+        });
+    }
+
+    public void startRecord(Surface surface, float screenProp, ErrorCallback callback) {
+        mCamera.setPreviewCallback(null);
+        final int nowAngle = (angle + 90) % 360;
+        Camera.Parameters parameters = mCamera.getParameters();
+        int width = parameters.getPreviewSize().width;
+        int height = parameters.getPreviewSize().height;
+        YuvImage yuv = new YuvImage(firstFrame_data, parameters.getPreviewFormat(), width, height, null);
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        yuv.compressToJpeg(new Rect(0, 0, width, height), 50, out);
+        byte[] bytes = out.toByteArray();
+        videoFirstFrame = BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
+        Matrix matrix = new Matrix();
+        if (SELECTED_CAMERA == CAMERA_POST_POSITION) {
+            matrix.setRotate(nowAngle);
+        } else if (SELECTED_CAMERA == CAMERA_FRONT_POSITION) {
+            matrix.setRotate(270);
+        }
+        videoFirstFrame = createBitmap(videoFirstFrame, 0, 0, videoFirstFrame.getWidth(), videoFirstFrame
+                .getHeight(), matrix, true);
+
+        if (isRecorder) {
+            return;
+        }
+        if (mCamera == null) {
+            openCamera(SELECTED_CAMERA);
+        }
+        if (mediaRecorder == null) {
+            mediaRecorder = new MediaRecorder();
+        }
+        if (mParams == null) {
+            mParams = mCamera.getParameters();
+        }
+        List<String> focusModes = mParams.getSupportedFocusModes();
+        if (focusModes.contains(Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO)) {
+            mParams.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO);
+        }
+        mCamera.setParameters(mParams);
+        mCamera.unlock();
+        mediaRecorder.reset();
+        if (DeviceUtil.isVivoX21()) {
+            mCamera.release();
+            mCamera = null;
+            openCamera(SELECTED_CAMERA);
+            mCamera.setDisplayOrientation(90);
+            mCamera.unlock();
+        }
+        mediaRecorder.setCamera(mCamera);
+        mediaRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA);
+
+        mediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
+
+        mediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4);
+        mediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.H264);
+        mediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
+
+
+        Camera.Size videoSize;
+        if (mParams.getSupportedVideoSizes() == null) {
+            videoSize = CameraParamUtil.getInstance().getPreviewSize(mParams.getSupportedPreviewSizes(), 600,
+                    screenProp);
+        } else {
+            videoSize = CameraParamUtil.getInstance().getPreviewSize(mParams.getSupportedVideoSizes(), 600,
+                    screenProp);
+        }
+        TUIChatLog.i(TAG, "setVideoSize    width = " + videoSize.width + "height = " + videoSize.height);
+        if (videoSize.width == videoSize.height) {
+            mediaRecorder.setVideoSize(preview_width, preview_height);
+        } else {
+            mediaRecorder.setVideoSize(videoSize.width, videoSize.height);
+        }
+//        if (SELECTED_CAMERA == CAMERA_FRONT_POSITION) {
+//            mediaRecorder.setOrientationHint(270);
+//        } else {
+//            mediaRecorder.setOrientationHint(nowAngle);
+////            mediaRecorder.setOrientationHint(90);
+//        }
+
+        if (SELECTED_CAMERA == CAMERA_FRONT_POSITION) {
+            if (cameraAngle == 270) {
+                if (nowAngle == 0) {
+                    mediaRecorder.setOrientationHint(180);
+                } else if (nowAngle == 270) {
+                    mediaRecorder.setOrientationHint(270);
+                } else {
+                    mediaRecorder.setOrientationHint(90);
+                }
+            } else {
+                if (nowAngle == 90) {
+                    mediaRecorder.setOrientationHint(270);
+                } else if (nowAngle == 270) {
+                    mediaRecorder.setOrientationHint(90);
+                } else {
+                    mediaRecorder.setOrientationHint(nowAngle);
+                }
+            }
+        } else {
+            mediaRecorder.setOrientationHint(nowAngle);
+        }
+
+
+        if (DeviceUtil.isHuaWeiOrHonor()) {
+            mediaRecorder.setVideoEncodingBitRate(4 * 100000);
+        } else {
+            mediaRecorder.setVideoEncodingBitRate(mediaQuality);
+        }
+        mediaRecorder.setPreviewDisplay(surface);
+
+        videoFileName = "video_" + new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(new Date()) + ".mp4";
+        videoFileAbsPath = saveVideoPath + videoFileName;
+        mediaRecorder.setOutputFile(videoFileAbsPath);
+        try {
+            mediaRecorder.prepare();
+            mediaRecorder.start();
+            isRecorder = true;
+        } catch (IllegalStateException e) {
+            e.printStackTrace();
+            TUIChatLog.i(TAG, "startRecord IllegalStateException");
+            if (this.errorLisenter != null) {
+                this.errorLisenter.onError();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            TUIChatLog.i(TAG, "startRecord IOException");
+            if (this.errorLisenter != null) {
+                this.errorLisenter.onError();
+            }
+        } catch (RuntimeException e) {
+            TUIChatLog.i(TAG, "startRecord RuntimeException");
+        }
+    }
+
+    public void stopRecord(boolean isShort, StopRecordCallback callback) {
+        if (!isRecorder) {
+            return;
+        }
+        if (mediaRecorder != null) {
+            mediaRecorder.setOnErrorListener(null);
+            mediaRecorder.setOnInfoListener(null);
+            mediaRecorder.setPreviewDisplay(null);
+            try {
+                mediaRecorder.stop();
+            } catch (RuntimeException e) {
+                e.printStackTrace();
+                mediaRecorder = null;
+                mediaRecorder = new MediaRecorder();
+            } finally {
+                if (mediaRecorder != null) {
+                    mediaRecorder.release();
+                }
+                mediaRecorder = null;
+                isRecorder = false;
+            }
+            if (isShort) {
+                if (FileUtil.deleteFile(videoFileAbsPath)) {
+                    callback.recordResult(null, null);
+                }
+                return;
+            }
+            doStopPreview();
+            String fileName = saveVideoPath + videoFileName;
+            callback.recordResult(fileName, videoFirstFrame);
+        }
+    }
+
+    private void findAvailableCameras() {
+        Camera.CameraInfo info = new Camera.CameraInfo();
+        int cameraNum = Camera.getNumberOfCameras();
+        for (int i = 0; i < cameraNum; i++) {
+            Camera.getCameraInfo(i, info);
+            switch (info.facing) {
+                case Camera.CameraInfo.CAMERA_FACING_FRONT:
+                    CAMERA_FRONT_POSITION = info.facing;
+                    break;
+                case Camera.CameraInfo.CAMERA_FACING_BACK:
+                    CAMERA_POST_POSITION = info.facing;
+                    break;
+            }
+        }
+    }
+
+    public void handleFocus(final Context context, final float x, final float y, final FocusCallback callback) {
+        if (mCamera == null) {
+            return;
+        }
+        final Camera.Parameters params = mCamera.getParameters();
+        Rect focusRect = calculateTapArea(x, y, 1f, context);
+        mCamera.cancelAutoFocus();
+        if (params.getMaxNumFocusAreas() > 0) {
+            List<Camera.Area> focusAreas = new ArrayList<>();
+            focusAreas.add(new Camera.Area(focusRect, 800));
+            params.setFocusAreas(focusAreas);
+        } else {
+            TUIChatLog.i(TAG, "focus areas not supported");
+            callback.focusSuccess();
+            return;
+        }
+        final String currentFocusMode = params.getFocusMode();
+        try {
+            params.setFocusMode(Camera.Parameters.FOCUS_MODE_AUTO);
+            mCamera.setParameters(params);
+            mCamera.autoFocus(new Camera.AutoFocusCallback() {
+                @Override
+                public void onAutoFocus(boolean success, Camera camera) {
+                    if (success || handlerTime > 10) {
+                        Camera.Parameters params = camera.getParameters();
+                        params.setFocusMode(currentFocusMode);
+                        camera.setParameters(params);
+                        handlerTime = 0;
+                        callback.focusSuccess();
+                    } else {
+                        handlerTime++;
+                        handleFocus(context, x, y, callback);
+                    }
+                }
+            });
+        } catch (Exception e) {
+            TUIChatLog.e(TAG, "autoFocus failer");
+        }
+    }
+
+    void setErrorLinsenter(ErrorListener errorLisenter) {
+        this.errorLisenter = errorLisenter;
+    }
+
+    void registerSensorManager(Context context) {
+        if (sm == null) {
+            sm = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
+        }
+        sm.registerListener(sensorEventListener, sm.getDefaultSensor(Sensor.TYPE_ACCELEROMETER), SensorManager
+                .SENSOR_DELAY_NORMAL);
+    }
+
+    void unregisterSensorManager(Context context) {
+        if (sm == null) {
+            sm = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
+        }
+        sm.unregisterListener(sensorEventListener);
+    }
+
+    void isPreview(boolean res) {
+        this.isPreviewing = res;
+    }
+
+    public interface CameraOpenOverCallback {
+        void cameraHasOpened();
+    }
+
+    public interface StopRecordCallback {
+        void recordResult(String url, Bitmap firstFrame);
+    }
+
+
+    interface ErrorCallback {
+        void onError();
+    }
+
+    public interface TakePictureCallback {
+        void captureResult(Bitmap bitmap, boolean isVertical);
+    }
+
+    public interface FocusCallback {
+        void focusSuccess();
+
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/view/CameraView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/view/CameraView.java
new file mode 100644
index 0000000..cc43b5c
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/view/CameraView.java
@@ -0,0 +1,22 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.view;
+
+import android.graphics.Bitmap;
+
+public interface CameraView {
+
+    void resetState(int type);
+
+    void confirmState(int type);
+
+    void showPicture(Bitmap bitmap, boolean isVertical);
+
+    void playVideo(Bitmap firstFrame, String url);
+
+    void stopVideo();
+
+    void setTip(String tip);
+
+    void startPreviewCallback();
+
+    boolean handlerFoucs(float x, float y);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/view/CaptureButton.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/view/CaptureButton.java
new file mode 100644
index 0000000..8fc2fdb
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/view/CaptureButton.java
@@ -0,0 +1,346 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.view;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ValueAnimator;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.os.CountDownTimer;
+import android.view.MotionEvent;
+import android.view.View;
+
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.listener.CaptureListener;
+import com.tencent.qcloud.tuikit.tuichat.util.CheckPermission;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+public class CaptureButton extends View {
+
+    public static final int STATE_IDLE = 0x001;        //空闲状态 idle state
+    public static final int STATE_PRESS = 0x002;       //按下状态 pressed state
+    public static final int STATE_LONG_PRESS = 0x003;  //长按状态 long press state
+    public static final int STATE_RECORDERING = 0x004; //录制状态 recording status
+    public static final int STATE_BAN = 0x005;         //禁止状态 forbidden state
+    private static final String TAG = CaptureButton.class.getSimpleName();
+    private int state;              //当前按钮状态 current button state
+    private int button_state;       //按钮可执行的功能状态（拍照,录制,两者）The state of the function that the button can perform (photograph, record, both)
+    private int progress_color = 0xEE16AE16;            //进度条颜色 progress bar color
+    private int outside_color = 0xEEDCDCDC;             //外圆背景色 Outer circle background color
+    private int inside_color = 0xFFFFFFFF;              //内圆背景色 Inner circle background color
+
+
+    private float event_Y;  //Touch_Event_Down时候记录的Y值 Y value recorded when Touch_Event_Down
+
+
+    private Paint mPaint;
+
+    private float strokeWidth;          //进度条宽度 progress bar width
+    private int outside_add_size;       //长按外圆半径变大的Size Long press the Size whose outer circle radius becomes larger
+    private int inside_reduce_size;     //长安内圆缩小的Size The size of the inner circle of Chang'an reduced
+
+    //中心坐标 Center coordinates
+    private float center_X;
+    private float center_Y;
+
+    private float button_radius;            //按钮半径 button radius
+    private float button_outside_radius;    //外圆半径 Outer circle radius
+    private float button_inside_radius;     //内圆半径 Inner circle radius
+    private int button_size;                //按钮大小 button size
+
+    private float progress;         //录制视频的进度 Progress of recording video
+    private int duration;           //录制视频最大时间长度 Maximum length of time to record video
+    private int min_duration;       //最短录制时间限制 Minimum recording time limit
+    private int recorded_time;      //记录当前录制的时间 Record the current recording time
+
+    private RectF rectF;
+
+    private LongPressRunnable longPressRunnable;    //长按后处理的逻辑Runnable Logic of post-processing after long press
+    private CaptureListener captureLisenter;        //按钮回调接口 button callback interface
+    private RecordCountDownTimer timer;             //计时器 timer
+
+    public CaptureButton(Context context) {
+        super(context);
+    }
+
+    public CaptureButton(Context context, int size) {
+        super(context);
+        this.button_size = size;
+        button_radius = size / 2.0f;
+
+        button_outside_radius = button_radius;
+        button_inside_radius = button_radius * 0.75f;
+
+        strokeWidth = size / 15;
+        outside_add_size = size / 5;
+        inside_reduce_size = size / 8;
+
+        mPaint = new Paint();
+        mPaint.setAntiAlias(true);
+
+        progress = 0;
+        longPressRunnable = new LongPressRunnable();
+
+        state = STATE_IDLE;
+        button_state = JCameraView.BUTTON_STATE_BOTH;
+        TUIChatLog.i(TAG, "CaptureButtom start");
+        duration = 10 * 1000;
+        TUIChatLog.i(TAG, "CaptureButtom end");
+        min_duration = 1500;
+
+        center_X = (button_size + outside_add_size * 2) / 2;
+        center_Y = (button_size + outside_add_size * 2) / 2;
+
+        rectF = new RectF(
+                center_X - (button_radius + outside_add_size - strokeWidth / 2),
+                center_Y - (button_radius + outside_add_size - strokeWidth / 2),
+                center_X + (button_radius + outside_add_size - strokeWidth / 2),
+                center_Y + (button_radius + outside_add_size - strokeWidth / 2));
+
+        timer = new RecordCountDownTimer(duration, duration / 360);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        setMeasuredDimension(button_size + outside_add_size * 2, button_size + outside_add_size * 2);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        mPaint.setStyle(Paint.Style.FILL);
+
+        mPaint.setColor(outside_color);
+        canvas.drawCircle(center_X, center_Y, button_outside_radius, mPaint);
+
+        mPaint.setColor(inside_color);
+        canvas.drawCircle(center_X, center_Y, button_inside_radius, mPaint);
+
+        // 如果状态为录制状态，则绘制录制进度条
+        // If the state is recording, draw a recording progress bar
+        if (state == STATE_RECORDERING) {
+            mPaint.setColor(progress_color);
+            mPaint.setStyle(Paint.Style.STROKE);
+            mPaint.setStrokeWidth(strokeWidth);
+            canvas.drawArc(rectF, -90, progress, false, mPaint);
+        }
+    }
+
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                TUIChatLog.i(TAG, "state = " + state);
+                if (event.getPointerCount() > 1 || state != STATE_IDLE)
+                    break;
+                event_Y = event.getY();
+                state = STATE_PRESS;
+
+                if ((button_state == JCameraView.BUTTON_STATE_ONLY_RECORDER || button_state == JCameraView.BUTTON_STATE_BOTH))
+                    postDelayed(longPressRunnable, 500);
+                break;
+            case MotionEvent.ACTION_MOVE:
+                if (captureLisenter != null
+                        && state == STATE_RECORDERING
+                        && (button_state == JCameraView.BUTTON_STATE_ONLY_RECORDER || button_state == JCameraView.BUTTON_STATE_BOTH)) {
+                    // 记录当前Y值与按下时候Y值的差值，调用缩放回调接口
+                    // Record the difference between the current Y value and the Y value when pressed, and call the zoom callback interface
+                    captureLisenter.recordZoom(event_Y - event.getY());
+                }
+                break;
+            case MotionEvent.ACTION_UP:
+                // 根据当前按钮的状态进行相应的处理
+                // Perform corresponding processing according to the current state of the button
+                handlerUnpressByState();
+                break;
+        }
+        return true;
+    }
+
+    private void handlerUnpressByState() {
+        removeCallbacks(longPressRunnable);
+        switch (state) {
+            case STATE_PRESS:
+                if (captureLisenter != null && (button_state == JCameraView.BUTTON_STATE_ONLY_CAPTURE || button_state ==
+                        JCameraView.BUTTON_STATE_BOTH)) {
+                    startCaptureAnimation(button_inside_radius);
+                } else {
+                    state = STATE_IDLE;
+                }
+                break;
+            case STATE_RECORDERING:
+                timer.cancel();
+                recordEnd();
+                break;
+        }
+    }
+
+    private void recordEnd() {
+        if (captureLisenter != null) {
+            if (recorded_time < min_duration)
+                captureLisenter.recordShort(recorded_time);
+            else
+                captureLisenter.recordEnd(recorded_time);
+        }
+        resetRecordAnim();
+    }
+
+    private void resetRecordAnim() {
+        state = STATE_BAN;
+        progress = 0;
+        invalidate();
+        startRecordAnimation(
+                button_outside_radius,
+                button_radius,
+                button_inside_radius,
+                button_radius * 0.75f
+        );
+    }
+
+    private void startCaptureAnimation(float inside_start) {
+        ValueAnimator inside_anim = ValueAnimator.ofFloat(inside_start, inside_start * 0.75f, inside_start);
+        inside_anim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                button_inside_radius = (float) animation.getAnimatedValue();
+                invalidate();
+            }
+        });
+        inside_anim.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                super.onAnimationEnd(animation);
+                captureLisenter.takePictures();
+                state = STATE_BAN;
+            }
+        });
+        inside_anim.setDuration(100);
+        inside_anim.start();
+    }
+
+    private void startRecordAnimation(float outside_start, float outside_end, float inside_start, float inside_end) {
+        ValueAnimator outside_anim = ValueAnimator.ofFloat(outside_start, outside_end);
+        ValueAnimator inside_anim = ValueAnimator.ofFloat(inside_start, inside_end);
+        outside_anim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                button_outside_radius = (float) animation.getAnimatedValue();
+                invalidate();
+            }
+        });
+        inside_anim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                button_inside_radius = (float) animation.getAnimatedValue();
+                invalidate();
+            }
+        });
+        AnimatorSet set = new AnimatorSet();
+        set.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                super.onAnimationEnd(animation);
+                if (state == STATE_LONG_PRESS) {
+                    if (captureLisenter != null)
+                        captureLisenter.recordStart();
+                    state = STATE_RECORDERING;
+                    timer.start();
+                }
+            }
+        });
+        set.playTogether(outside_anim, inside_anim);
+        set.setDuration(100);
+        set.start();
+    }
+
+    private void updateProgress(long millisUntilFinished) {
+        recorded_time = (int) (duration - millisUntilFinished);
+        progress = 360f - millisUntilFinished / (float) duration * 360f;
+        invalidate();
+    }
+
+    /**************************************************
+     * Call API                     *
+     **************************************************/
+
+    // 设置最长录制时间
+    // Set the maximum recording time
+    public void setDuration(int duration) {
+        this.duration = duration;
+        timer = new RecordCountDownTimer(duration, duration / 360);    //录制定时器
+    }
+
+    // 设置最短录制时间
+    // Set the minimum recording time
+    public void setMinDuration(int duration) {
+        this.min_duration = duration;
+    }
+
+    // 设置回调接口
+    // Set callback interface
+    public void setCaptureLisenter(CaptureListener captureLisenter) {
+        this.captureLisenter = captureLisenter;
+    }
+
+    // 设置按钮功能（拍照和录像）
+    // Set button functions (photo and video)
+    public void setButtonFeatures(int state) {
+        this.button_state = state;
+    }
+
+    // 是否空闲状态
+    // Is it idle
+    public boolean isIdle() {
+        return state == STATE_IDLE;
+    }
+
+    // 设置状态
+    // set state
+    public void resetState() {
+        state = STATE_IDLE;
+    }
+
+    // 录制视频计时器
+    // record video timer
+    private class RecordCountDownTimer extends CountDownTimer {
+        RecordCountDownTimer(long millisInFuture, long countDownInterval) {
+            super(millisInFuture, countDownInterval);
+        }
+
+        @Override
+        public void onTick(long millisUntilFinished) {
+            updateProgress(millisUntilFinished);
+        }
+
+        @Override
+        public void onFinish() {
+            updateProgress(0);
+            recordEnd();
+        }
+    }
+
+    // 长按线程
+    // long press thread
+    private class LongPressRunnable implements Runnable {
+        @Override
+        public void run() {
+            state = STATE_LONG_PRESS;
+            if (CheckPermission.getRecordState() != CheckPermission.STATE_SUCCESS) {
+                state = STATE_IDLE;
+                if (captureLisenter != null) {
+                    captureLisenter.recordError();
+                    return;
+                }
+            }
+            startRecordAnimation(
+                    button_outside_radius,
+                    button_outside_radius + outside_add_size,
+                    button_inside_radius,
+                    button_inside_radius - inside_reduce_size
+            );
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/view/CaptureLayout.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/view/CaptureLayout.java
new file mode 100644
index 0000000..7a6e98d
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/view/CaptureLayout.java
@@ -0,0 +1,351 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.view;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.view.Gravity;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.listener.CaptureListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.listener.ClickListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.listener.ReturnListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.listener.TypeListener;
+
+public class CaptureLayout extends FrameLayout {
+
+    private CaptureListener captureLisenter;    //拍照按钮监听 Camera button Lisenter
+    private TypeListener typeLisenter;          //拍照或录制后接结果按钮监听 Take a picture or record followed by the result button Lisenter
+    private ReturnListener returnListener;      //退出按钮监听 Exit button listener
+    private ClickListener leftClickListener;    //左边按钮监听 left button Lisenter
+    private ClickListener rightClickListener;   //右边按钮监听 Right button Lisenter
+    private CaptureButton btn_capture;      //拍照按钮 photo button
+    private TypeButton btn_confirm;         //确认按钮 Confirm button
+    private TypeButton btn_cancel;          //取消按钮 cancel button
+    private ReturnButton btn_return;        //返回按钮 back button
+    private ImageView iv_custom_left;            //左边自定义按钮 left custom button
+    private ImageView iv_custom_right;            //右边自定义按钮 right custom button
+    private TextView txt_tip;               //提示文本 prompt text
+    private int layout_width;
+    private int layout_height;
+    private int button_size;
+    private int iconLeft = 0;
+    private int iconRight = 0;
+    private boolean isFirst = true;
+
+    public CaptureLayout(Context context) {
+        this(context, null);
+    }
+
+    public CaptureLayout(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public CaptureLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+
+        WindowManager manager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+        DisplayMetrics outMetrics = new DisplayMetrics();
+        manager.getDefaultDisplay().getMetrics(outMetrics);
+
+        if (this.getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
+            layout_width = outMetrics.widthPixels;
+        } else {
+            layout_width = outMetrics.widthPixels / 2;
+        }
+        button_size = (int) (layout_width / 4.5f);
+        layout_height = button_size + (button_size / 5) * 2 + 100;
+
+        initView();
+        initEvent();
+    }
+
+    public void setTypeLisenter(TypeListener typeLisenter) {
+        this.typeLisenter = typeLisenter;
+    }
+
+    public void setCaptureLisenter(CaptureListener captureLisenter) {
+        this.captureLisenter = captureLisenter;
+    }
+
+    public void setReturnLisenter(ReturnListener returnListener) {
+        this.returnListener = returnListener;
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        setMeasuredDimension(layout_width, layout_height);
+    }
+
+    public void initEvent() {
+        iv_custom_right.setVisibility(GONE);
+        btn_cancel.setVisibility(GONE);
+        btn_confirm.setVisibility(GONE);
+    }
+
+    public void startTypeBtnAnimator() {
+        if (this.iconLeft != 0)
+            iv_custom_left.setVisibility(GONE);
+        else
+            btn_return.setVisibility(GONE);
+        if (this.iconRight != 0)
+            iv_custom_right.setVisibility(GONE);
+        btn_capture.setVisibility(GONE);
+        btn_cancel.setVisibility(VISIBLE);
+        btn_confirm.setVisibility(VISIBLE);
+        btn_cancel.setClickable(false);
+        btn_confirm.setClickable(false);
+        ObjectAnimator animator_cancel = ObjectAnimator.ofFloat(btn_cancel, "translationX", layout_width / 4, 0);
+        ObjectAnimator animator_confirm = ObjectAnimator.ofFloat(btn_confirm, "translationX", -layout_width / 4, 0);
+
+        AnimatorSet set = new AnimatorSet();
+        set.playTogether(animator_cancel, animator_confirm);
+        set.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                super.onAnimationEnd(animation);
+                btn_cancel.setClickable(true);
+                btn_confirm.setClickable(true);
+            }
+        });
+        set.setDuration(200);
+        set.start();
+    }
+
+
+    private void initView() {
+        setWillNotDraw(false);
+        //拍照按钮
+        btn_capture = new CaptureButton(getContext(), button_size);
+        LayoutParams btn_capture_param = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+        btn_capture_param.gravity = Gravity.CENTER;
+        btn_capture.setLayoutParams(btn_capture_param);
+        btn_capture.setCaptureLisenter(new CaptureListener() {
+            @Override
+            public void takePictures() {
+                if (captureLisenter != null) {
+                    captureLisenter.takePictures();
+                }
+            }
+
+            @Override
+            public void recordShort(long time) {
+                if (captureLisenter != null) {
+                    captureLisenter.recordShort(time);
+                }
+                startAlphaAnimation();
+            }
+
+            @Override
+            public void recordStart() {
+                if (captureLisenter != null) {
+                    captureLisenter.recordStart();
+                }
+                startAlphaAnimation();
+            }
+
+            @Override
+            public void recordEnd(long time) {
+                if (captureLisenter != null) {
+                    captureLisenter.recordEnd(time);
+                }
+                startAlphaAnimation();
+                startTypeBtnAnimator();
+            }
+
+            @Override
+            public void recordZoom(float zoom) {
+                if (captureLisenter != null) {
+                    captureLisenter.recordZoom(zoom);
+                }
+            }
+
+            @Override
+            public void recordError() {
+                if (captureLisenter != null) {
+                    captureLisenter.recordError();
+                }
+            }
+        });
+
+        //取消按钮
+        btn_cancel = new TypeButton(getContext(), TypeButton.TYPE_CANCEL, button_size);
+        final LayoutParams btn_cancel_param = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+        btn_cancel_param.gravity = Gravity.CENTER_VERTICAL;
+        btn_cancel_param.setMargins((layout_width / 4) - button_size / 2, 0, 0, 0);
+        btn_cancel.setLayoutParams(btn_cancel_param);
+        btn_cancel.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (typeLisenter != null) {
+                    typeLisenter.cancel();
+                }
+                startAlphaAnimation();
+//                resetCaptureLayout();
+            }
+        });
+
+        btn_confirm = new TypeButton(getContext(), TypeButton.TYPE_CONFIRM, button_size);
+        LayoutParams btn_confirm_param = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+        btn_confirm_param.gravity = Gravity.CENTER_VERTICAL | Gravity.RIGHT;
+        btn_confirm_param.setMargins(0, 0, (layout_width / 4) - button_size / 2, 0);
+        btn_confirm.setLayoutParams(btn_confirm_param);
+        btn_confirm.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (typeLisenter != null) {
+                    typeLisenter.confirm();
+                }
+                startAlphaAnimation();
+//                resetCaptureLayout();
+            }
+        });
+
+        btn_return = new ReturnButton(getContext(), (int) (button_size / 2.5f));
+        LayoutParams btn_return_param = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+        btn_return_param.gravity = Gravity.CENTER_VERTICAL;
+        btn_return_param.setMargins(layout_width / 6, 0, 0, 0);
+        btn_return.setLayoutParams(btn_return_param);
+        btn_return.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (leftClickListener != null) {
+                    leftClickListener.onClick();
+                }
+            }
+        });
+
+        iv_custom_left = new ImageView(getContext());
+        LayoutParams iv_custom_param_left = new LayoutParams((int) (button_size / 2.5f), (int) (button_size / 2.5f));
+        iv_custom_param_left.gravity = Gravity.CENTER_VERTICAL;
+        iv_custom_param_left.setMargins(layout_width / 6, 0, 0, 0);
+        iv_custom_left.setLayoutParams(iv_custom_param_left);
+        iv_custom_left.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (leftClickListener != null) {
+                    leftClickListener.onClick();
+                }
+            }
+        });
+
+        iv_custom_right = new ImageView(getContext());
+        LayoutParams iv_custom_param_right = new LayoutParams((int) (button_size / 2.5f), (int) (button_size / 2.5f));
+        iv_custom_param_right.gravity = Gravity.CENTER_VERTICAL | Gravity.RIGHT;
+        iv_custom_param_right.setMargins(0, 0, layout_width / 6, 0);
+        iv_custom_right.setLayoutParams(iv_custom_param_right);
+        iv_custom_right.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (rightClickListener != null) {
+                    rightClickListener.onClick();
+                }
+            }
+        });
+
+        txt_tip = new TextView(getContext());
+        LayoutParams txt_param = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
+        txt_param.gravity = Gravity.CENTER_HORIZONTAL;
+        txt_param.setMargins(0, 0, 0, 0);
+        txt_tip.setText(TUIChatService.getAppContext().getString(R.string.tap_tips));
+        txt_tip.setTextColor(0xFFFFFFFF);
+        txt_tip.setGravity(Gravity.CENTER);
+        txt_tip.setLayoutParams(txt_param);
+
+        this.addView(btn_capture);
+        this.addView(btn_cancel);
+        this.addView(btn_confirm);
+        this.addView(btn_return);
+        this.addView(iv_custom_left);
+        this.addView(iv_custom_right);
+        this.addView(txt_tip);
+
+    }
+
+    /**************************************************
+     * Call API                      *
+     **************************************************/
+    public void resetCaptureLayout() {
+        btn_capture.resetState();
+        btn_cancel.setVisibility(GONE);
+        btn_confirm.setVisibility(GONE);
+        btn_capture.setVisibility(VISIBLE);
+        if (this.iconLeft != 0)
+            iv_custom_left.setVisibility(VISIBLE);
+        else
+            btn_return.setVisibility(VISIBLE);
+        if (this.iconRight != 0)
+            iv_custom_right.setVisibility(VISIBLE);
+    }
+
+
+    public void startAlphaAnimation() {
+        if (isFirst) {
+            ObjectAnimator animator_txt_tip = ObjectAnimator.ofFloat(txt_tip, "alpha", 1f, 0f);
+            animator_txt_tip.setDuration(500);
+            animator_txt_tip.start();
+            isFirst = false;
+        }
+    }
+
+    public void setTextWithAnimation(String tip) {
+        txt_tip.setText(tip);
+        ObjectAnimator animator_txt_tip = ObjectAnimator.ofFloat(txt_tip, "alpha", 0f, 1f, 1f, 0f);
+        animator_txt_tip.setDuration(2500);
+        animator_txt_tip.start();
+    }
+
+    public void setDuration(int duration) {
+        btn_capture.setDuration(duration);
+    }
+
+    public void setButtonFeatures(int state) {
+        btn_capture.setButtonFeatures(state);
+    }
+
+    public void setTip(String tip) {
+        txt_tip.setText(tip);
+    }
+
+    public void showTip() {
+        txt_tip.setVisibility(VISIBLE);
+    }
+
+    public void setIconSrc(int iconLeft, int iconRight) {
+        this.iconLeft = iconLeft;
+        this.iconRight = iconRight;
+        if (this.iconLeft != 0) {
+            iv_custom_left.setImageResource(iconLeft);
+            iv_custom_left.setVisibility(VISIBLE);
+            btn_return.setVisibility(GONE);
+        } else {
+            iv_custom_left.setVisibility(GONE);
+            btn_return.setVisibility(VISIBLE);
+        }
+        if (this.iconRight != 0) {
+            iv_custom_right.setImageResource(iconRight);
+            iv_custom_right.setVisibility(VISIBLE);
+        } else {
+            iv_custom_right.setVisibility(GONE);
+        }
+    }
+
+    public void setLeftClickListener(ClickListener leftClickListener) {
+        this.leftClickListener = leftClickListener;
+    }
+
+    public void setRightClickListener(ClickListener rightClickListener) {
+        this.rightClickListener = rightClickListener;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/view/FoucsView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/view/FoucsView.java
new file mode 100644
index 0000000..50493af
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/view/FoucsView.java
@@ -0,0 +1,57 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.view;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.util.AttributeSet;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+
+public class FoucsView extends View {
+    private int size;
+    private int center_x;
+    private int center_y;
+    private int length;
+    private Paint mPaint;
+
+    public FoucsView(Context context) {
+        this(context, null);
+    }
+
+    public FoucsView(Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public FoucsView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        this.size = ScreenUtil.getScreenWidth(context) / 3;
+        mPaint = new Paint();
+        mPaint.setAntiAlias(true);
+        mPaint.setDither(true);
+        mPaint.setColor(0xEE16AE16);
+        mPaint.setStrokeWidth(4);
+        mPaint.setStyle(Paint.Style.STROKE);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        center_x = (int) (size / 2.0);
+        center_y = (int) (size / 2.0);
+        length = (int) (size / 2.0) - 2;
+        setMeasuredDimension(size, size);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        canvas.drawRect(center_x - length, center_y - length, center_x + length, center_y + length, mPaint);
+        canvas.drawLine(2, getHeight() / 2, size / 10, getHeight() / 2, mPaint);
+        canvas.drawLine(getWidth() - 2, getHeight() / 2, getWidth() - size / 10, getHeight() / 2, mPaint);
+        canvas.drawLine(getWidth() / 2, 2, getWidth() / 2, size / 10, mPaint);
+        canvas.drawLine(getWidth() / 2, getHeight() - 2, getWidth() / 2, getHeight() - size / 10, mPaint);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/view/JCameraView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/view/JCameraView.java
new file mode 100644
index 0000000..15371ba
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/view/JCameraView.java
@@ -0,0 +1,551 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.view;
+
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.hardware.Camera;
+import android.media.AudioManager;
+import android.media.MediaPlayer;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.SurfaceHolder;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.VideoView;
+
+import com.tencent.qcloud.tuicore.util.FileUtil;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.listener.CaptureListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.listener.ClickListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.listener.ErrorListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.listener.JCameraListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.listener.TypeListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.state.CameraMachine;
+import com.tencent.qcloud.tuikit.tuichat.config.TUIChatConfigs;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+import java.io.IOException;
+
+public class JCameraView extends FrameLayout implements CameraInterface.CameraOpenOverCallback, SurfaceHolder.Callback, CameraView {
+
+    // 拍照浏览时候的类型
+    // camera mode
+    public static final int TYPE_PICTURE = 0x001;
+    public static final int TYPE_VIDEO = 0x002;
+    public static final int TYPE_SHORT = 0x003;
+    public static final int TYPE_DEFAULT = 0x004;
+    // 录制视频比特率
+    // Recording video bit rate
+    public static final int MEDIA_QUALITY_HIGH = 20 * 100000;
+    public static final int MEDIA_QUALITY_MIDDLE = 16 * 100000;
+    public static final int MEDIA_QUALITY_LOW = 12 * 100000;
+    public static final int MEDIA_QUALITY_POOR = 8 * 100000;
+    public static final int MEDIA_QUALITY_FUNNY = 4 * 100000;
+    public static final int MEDIA_QUALITY_DESPAIR = 2 * 100000;
+    public static final int MEDIA_QUALITY_SORRY = 1 * 80000;
+    public static final int BUTTON_STATE_ONLY_CAPTURE = 0x101;      //只能拍照
+    public static final int BUTTON_STATE_ONLY_RECORDER = 0x102;     //只能录像
+    public static final int BUTTON_STATE_BOTH = 0x103;              //两者都可以
+    private static final String TAG = JCameraView.class.getSimpleName();
+    // 闪关灯状态
+    // Flash status
+    private static final int TYPE_FLASH_AUTO = 0x021;
+    private static final int TYPE_FLASH_ON = 0x022;
+    private static final int TYPE_FLASH_OFF = 0x023;
+    // Camera 状态机
+    // Camera state machine
+    private CameraMachine machine;
+    private int type_flash = TYPE_FLASH_OFF;
+    private JCameraListener jCameraLisenter;
+    private ClickListener leftClickListener;
+    private ClickListener rightClickListener;
+
+    private Context mContext;
+    private VideoView mVideoView;
+    private ImageView mPhoto;
+    private ImageView mSwitchCamera;
+    private CaptureLayout mCaptureLayout;
+    private FoucsView mFoucsView;
+    private MediaPlayer mMediaPlayer;
+
+    private int layout_width;
+    private float screenProp = 0f;
+
+    private Bitmap captureBitmap;   //捕获的图片 captured picture
+    private Bitmap firstFrame;      //第一帧图片 first frame picture
+    private String videoUrl;        //视频URL Video URL
+
+
+    // 切换摄像头按钮的参数
+    // Switch camera button parameters
+    private int iconSize = 0;
+    private int iconMargin = 0;
+    private int iconSrc = 0;
+    private int iconLeft = 0;
+    private int iconRight = 0;
+    private int duration = 0;
+    private long recordTime;
+
+    // 缩放梯度
+    // scale gradient
+    private int zoomGradient = 0;
+
+    private boolean firstTouch = true;
+    private float firstTouchLength = 0;
+    private ErrorListener errorLisenter;
+
+    public JCameraView(Context context) {
+        this(context, null);
+    }
+
+    public JCameraView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public JCameraView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mContext = context;
+        //get AttributeSet
+        TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.JCameraView, defStyleAttr, 0);
+        iconSize = a.getDimensionPixelSize(R.styleable.JCameraView_iconSize, (int) TypedValue.applyDimension(
+                TypedValue.COMPLEX_UNIT_SP, 35, getResources().getDisplayMetrics()));
+        iconMargin = a.getDimensionPixelSize(R.styleable.JCameraView_iconMargin, (int) TypedValue.applyDimension(
+                TypedValue.COMPLEX_UNIT_SP, 15, getResources().getDisplayMetrics()));
+        iconSrc = a.getResourceId(R.styleable.JCameraView_iconSrc, R.drawable.chat_camera_switchcamera);
+        iconLeft = a.getResourceId(R.styleable.JCameraView_iconLeft, 0);
+        iconRight = a.getResourceId(R.styleable.JCameraView_iconRight, 0);
+        duration = TUIChatConfigs.getConfigs().getGeneralConfig().getVideoRecordMaxTime() * 1000;
+        a.recycle();
+        initData();
+        initView();
+    }
+
+    private void initData() {
+        layout_width = ScreenUtil.getScreenWidth(mContext);
+        zoomGradient = (int) (layout_width / 16f);
+        TUIChatLog.i(TAG, "zoom = " + zoomGradient);
+        machine = new CameraMachine(getContext(), this, this);
+    }
+
+    private void initView() {
+        setWillNotDraw(false);
+        View view = LayoutInflater.from(mContext).inflate(R.layout.chat_input_camera_view, this);
+        mVideoView = view.findViewById(R.id.video_preview);
+        mPhoto = view.findViewById(R.id.image_photo);
+        mSwitchCamera = view.findViewById(R.id.image_switch);
+        mSwitchCamera.setImageResource(iconSrc);
+        setFlashRes();
+        mCaptureLayout = view.findViewById(R.id.capture_layout);
+        mCaptureLayout.setDuration(duration);
+        mCaptureLayout.setIconSrc(iconLeft, iconRight);
+        mFoucsView = view.findViewById(R.id.fouce_view);
+        mVideoView.getHolder().addCallback(this);
+
+        mSwitchCamera.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                machine.swtich(mVideoView.getHolder(), screenProp);
+            }
+        });
+
+        mCaptureLayout.setCaptureLisenter(new CaptureListener() {
+            @Override
+            public void takePictures() {
+                mSwitchCamera.setVisibility(INVISIBLE);
+                machine.capture();
+            }
+
+            @Override
+            public void recordStart() {
+                mSwitchCamera.setVisibility(INVISIBLE);
+                machine.record(mVideoView.getHolder().getSurface(), screenProp);
+            }
+
+            @Override
+            public void recordShort(final long time) {
+                mCaptureLayout.setTextWithAnimation(TUIChatService.getAppContext().getString(R.string.record_time_tip));
+                mSwitchCamera.setVisibility(VISIBLE);
+                postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        machine.stopRecord(true, time);
+                    }
+                }, 1500 - time);
+            }
+
+            @Override
+            public void recordEnd(long time) {
+                machine.stopRecord(false, time);
+                recordTime = time;
+            }
+
+            @Override
+            public void recordZoom(float zoom) {
+                TUIChatLog.i(TAG, "recordZoom");
+                machine.zoom(zoom, CameraInterface.TYPE_RECORDER);
+            }
+
+            @Override
+            public void recordError() {
+                if (errorLisenter != null) {
+                    errorLisenter.AudioPermissionError();
+                }
+            }
+        });
+
+        mCaptureLayout.setTypeLisenter(new TypeListener() {
+            @Override
+            public void cancel() {
+                machine.cancle(mVideoView.getHolder(), screenProp);
+            }
+
+            @Override
+            public void confirm() {
+                machine.confirm();
+            }
+        });
+
+//        mCaptureLayout.setReturnLisenter(new ReturnListener() {
+//            @Override
+//            public void onReturn() {
+//                if (jCameraLisenter != null) {
+//                    jCameraLisenter.quit();
+//                }
+//            }
+//        });
+        mCaptureLayout.setLeftClickListener(new ClickListener() {
+            @Override
+            public void onClick() {
+                if (leftClickListener != null) {
+                    leftClickListener.onClick();
+                }
+            }
+        });
+        mCaptureLayout.setRightClickListener(new ClickListener() {
+            @Override
+            public void onClick() {
+                if (rightClickListener != null) {
+                    rightClickListener.onClick();
+                }
+            }
+        });
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        float widthSize = mVideoView.getMeasuredWidth();
+        float heightSize = mVideoView.getMeasuredHeight();
+        if (screenProp == 0) {
+            screenProp = heightSize / widthSize;
+        }
+    }
+
+    @Override
+    public void cameraHasOpened() {
+        CameraInterface.getInstance().doStartPreview(mVideoView.getHolder(), screenProp);
+    }
+
+    public void onResume() {
+        TUIChatLog.i(TAG, "JCameraView onResume");
+        resetState(TYPE_DEFAULT);
+        CameraInterface.getInstance().registerSensorManager(mContext);
+        machine.start(mVideoView.getHolder(), screenProp);
+    }
+
+    public void onPause() {
+        TUIChatLog.i(TAG, "JCameraView onPause");
+        machine.stop();
+        CameraInterface.getInstance().unregisterSensorManager(mContext);
+    }
+
+    public void onDestroy() {
+        stopVideo();
+        resetState(TYPE_PICTURE);
+        CameraInterface.getInstance().isPreview(false);
+        CameraInterface.getInstance().unregisterSensorManager(mContext);
+        CameraInterface.destroyCameraInterface();
+    }
+
+    @Override
+    public void surfaceCreated(SurfaceHolder holder) {
+        TUIChatLog.i(TAG, "JCameraView SurfaceCreated");
+        new Thread() {
+            @Override
+            public void run() {
+                CameraInterface.getInstance().doOpenCamera(JCameraView.this);
+            }
+        }.start();
+    }
+
+    @Override
+    public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
+    }
+
+    @Override
+    public void surfaceDestroyed(SurfaceHolder holder) {
+        TUIChatLog.i(TAG, "JCameraView SurfaceDestroyed");
+        CameraInterface.getInstance().doDestroyCamera();
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                if (event.getPointerCount() == 1) {
+                    setFocusViewWidthAnimation(event.getX(), event.getY());
+                }
+                if (event.getPointerCount() == 2) {
+                    TUIChatLog.i(TAG, "ACTION_DOWN = " + 2);
+                }
+                break;
+            case MotionEvent.ACTION_MOVE:
+                if (event.getPointerCount() == 1) {
+                    firstTouch = true;
+                }
+                if (event.getPointerCount() == 2) {
+                    float point_1_X = event.getX(0);
+                    float point_1_Y = event.getY(0);
+                    float point_2_X = event.getX(1);
+                    float point_2_Y = event.getY(1);
+
+                    float result = (float) Math.sqrt(Math.pow(point_1_X - point_2_X, 2) + Math.pow(point_1_Y -
+                            point_2_Y, 2));
+
+                    if (firstTouch) {
+                        firstTouchLength = result;
+                        firstTouch = false;
+                    }
+                    if ((int) (result - firstTouchLength) / zoomGradient != 0) {
+                        firstTouch = true;
+                        machine.zoom(result - firstTouchLength, CameraInterface.TYPE_CAPTURE);
+                    }
+//                    TUIChatLog.i(TAG, "result = " + (result - firstTouchLength));
+                }
+                break;
+            case MotionEvent.ACTION_UP:
+                firstTouch = true;
+                break;
+        }
+        return true;
+    }
+
+    private void setFocusViewWidthAnimation(float x, float y) {
+        machine.foucs(x, y, new CameraInterface.FocusCallback() {
+            @Override
+            public void focusSuccess() {
+                mFoucsView.setVisibility(INVISIBLE);
+            }
+        });
+    }
+
+    private void updateVideoViewSize(float videoWidth, float videoHeight) {
+        if (videoWidth > videoHeight) {
+            LayoutParams videoViewParam;
+            int height = (int) ((videoHeight / videoWidth) * getWidth());
+            videoViewParam = new LayoutParams(LayoutParams.MATCH_PARENT, height);
+            videoViewParam.gravity = Gravity.CENTER;
+            mVideoView.setLayoutParams(videoViewParam);
+        }
+    }
+
+    public void setJCameraLisenter(JCameraListener jCameraLisenter) {
+        this.jCameraLisenter = jCameraLisenter;
+    }
+
+    public void setErrorLisenter(ErrorListener errorLisenter) {
+        this.errorLisenter = errorLisenter;
+        CameraInterface.getInstance().setErrorLinsenter(errorLisenter);
+    }
+
+    public void setFeatures(int state) {
+        this.mCaptureLayout.setButtonFeatures(state);
+    }
+
+    public void setMediaQuality(int quality) {
+        CameraInterface.getInstance().setMediaQuality(quality);
+    }
+
+    @Override
+    public void resetState(int type) {
+        switch (type) {
+            case TYPE_VIDEO:
+                stopVideo();
+                FileUtil.deleteFile(videoUrl);
+                mVideoView.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+                machine.start(mVideoView.getHolder(), screenProp);
+                break;
+            case TYPE_PICTURE:
+                mPhoto.setVisibility(INVISIBLE);
+                break;
+            case TYPE_SHORT:
+                break;
+            case TYPE_DEFAULT:
+                mVideoView.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+                break;
+        }
+        mSwitchCamera.setVisibility(VISIBLE);
+        //mFlashLamp.setVisibility(VISIBLE);
+        mCaptureLayout.resetCaptureLayout();
+    }
+
+    @Override
+    public void confirmState(int type) {
+        switch (type) {
+            case TYPE_VIDEO:
+                stopVideo();
+                mVideoView.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+                machine.start(mVideoView.getHolder(), screenProp);
+                if (jCameraLisenter != null) {
+                    jCameraLisenter.recordSuccess(videoUrl, firstFrame, recordTime);
+                }
+                break;
+            case TYPE_PICTURE:
+                mPhoto.setVisibility(INVISIBLE);
+                if (jCameraLisenter != null) {
+                    jCameraLisenter.captureSuccess(captureBitmap);
+                }
+                break;
+            case TYPE_SHORT:
+                break;
+            case TYPE_DEFAULT:
+                break;
+        }
+        mCaptureLayout.resetCaptureLayout();
+    }
+
+    @Override
+    public void showPicture(Bitmap bitmap, boolean isVertical) {
+        if (isVertical) {
+            mPhoto.setScaleType(ImageView.ScaleType.FIT_XY);
+        } else {
+            mPhoto.setScaleType(ImageView.ScaleType.FIT_CENTER);
+        }
+        captureBitmap = bitmap;
+        mPhoto.setImageBitmap(bitmap);
+        mPhoto.setVisibility(VISIBLE);
+        mCaptureLayout.startAlphaAnimation();
+        mCaptureLayout.startTypeBtnAnimator();
+    }
+
+    @Override
+    public void playVideo(Bitmap firstFrame, final String url) {
+        videoUrl = url;
+        JCameraView.this.firstFrame = firstFrame;
+        try {
+            if (mMediaPlayer == null) {
+                mMediaPlayer = new MediaPlayer();
+            } else {
+                mMediaPlayer.reset();
+            }
+            mMediaPlayer.setDataSource(url);
+            mMediaPlayer.setSurface(mVideoView.getHolder().getSurface());
+            mMediaPlayer.setVideoScalingMode(MediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT);
+            mMediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
+            mMediaPlayer.setOnVideoSizeChangedListener(new MediaPlayer
+                    .OnVideoSizeChangedListener() {
+                @Override
+                public void
+                onVideoSizeChanged(MediaPlayer mp, int width, int height) {
+                    updateVideoViewSize(mMediaPlayer.getVideoWidth(), mMediaPlayer
+                            .getVideoHeight());
+                }
+            });
+            mMediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
+                @Override
+                public void onPrepared(MediaPlayer mp) {
+                    mMediaPlayer.start();
+                }
+            });
+            mMediaPlayer.setLooping(true);
+            mMediaPlayer.prepareAsync();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void stopVideo() {
+        if (mMediaPlayer != null && mMediaPlayer.isPlaying()) {
+            mMediaPlayer.stop();
+            mMediaPlayer.release();
+            mMediaPlayer = null;
+        }
+    }
+
+    @Override
+    public void setTip(String tip) {
+        mCaptureLayout.setTip(tip);
+    }
+
+    @Override
+    public void startPreviewCallback() {
+        TUIChatLog.i(TAG, "startPreviewCallback");
+        handlerFoucs(mFoucsView.getWidth() / 2, mFoucsView.getHeight() / 2);
+    }
+
+    @Override
+    public boolean handlerFoucs(float x, float y) {
+        if (y > mCaptureLayout.getTop()) {
+            return false;
+        }
+        mFoucsView.setVisibility(VISIBLE);
+        if (x < mFoucsView.getWidth() / 2) {
+            x = mFoucsView.getWidth() / 2;
+        }
+        if (x > layout_width - mFoucsView.getWidth() / 2) {
+            x = layout_width - mFoucsView.getWidth() / 2;
+        }
+        if (y < mFoucsView.getWidth() / 2) {
+            y = mFoucsView.getWidth() / 2;
+        }
+        if (y > mCaptureLayout.getTop() - mFoucsView.getWidth() / 2) {
+            y = mCaptureLayout.getTop() - mFoucsView.getWidth() / 2;
+        }
+        mFoucsView.setX(x - mFoucsView.getWidth() / 2);
+        mFoucsView.setY(y - mFoucsView.getHeight() / 2);
+        ObjectAnimator scaleX = ObjectAnimator.ofFloat(mFoucsView, "scaleX", 1, 0.6f);
+        ObjectAnimator scaleY = ObjectAnimator.ofFloat(mFoucsView, "scaleY", 1, 0.6f);
+        ObjectAnimator alpha = ObjectAnimator.ofFloat(mFoucsView, "alpha", 1f, 0.4f, 1f, 0.4f, 1f, 0.4f, 1f);
+        AnimatorSet animSet = new AnimatorSet();
+        animSet.play(scaleX).with(scaleY).before(alpha);
+        animSet.setDuration(400);
+        animSet.start();
+        return true;
+    }
+
+    public void setLeftClickListener(ClickListener clickListener) {
+        this.leftClickListener = clickListener;
+    }
+
+    public void setRightClickListener(ClickListener clickListener) {
+        this.rightClickListener = clickListener;
+    }
+
+    private void setFlashRes() {
+        switch (type_flash) {
+            case TYPE_FLASH_AUTO:
+                machine.flash(Camera.Parameters.FLASH_MODE_AUTO);
+                break;
+            case TYPE_FLASH_ON:
+                machine.flash(Camera.Parameters.FLASH_MODE_ON);
+                break;
+            case TYPE_FLASH_OFF:
+                machine.flash(Camera.Parameters.FLASH_MODE_OFF);
+                break;
+        }
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/view/ReturnButton.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/view/ReturnButton.java
new file mode 100644
index 0000000..8aa37e2
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/view/ReturnButton.java
@@ -0,0 +1,53 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.view;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.view.View;
+
+public class ReturnButton extends View {
+
+    Path path;
+    private int size;
+    private int center_X;
+    private int center_Y;
+    private float strokeWidth;
+    private Paint paint;
+
+    public ReturnButton(Context context, int size) {
+        this(context);
+        this.size = size;
+        center_X = size / 2;
+        center_Y = size / 2;
+
+        strokeWidth = size / 15f;
+
+        paint = new Paint();
+        paint.setAntiAlias(true);
+        paint.setColor(Color.WHITE);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(strokeWidth);
+
+        path = new Path();
+    }
+
+    public ReturnButton(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        setMeasuredDimension(size, size / 2);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        path.moveTo(strokeWidth, strokeWidth / 2);
+        path.lineTo(center_X, center_Y - strokeWidth / 2);
+        path.lineTo(size - strokeWidth, strokeWidth / 2);
+        canvas.drawPath(path, paint);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/view/TypeButton.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/view/TypeButton.java
new file mode 100644
index 0000000..32ab54f
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/camera/view/TypeButton.java
@@ -0,0 +1,109 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.view;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.RectF;
+import android.view.View;
+
+/**
+ * 拍照或录制完成后弹出的确认和返回按钮
+ * 
+ * Confirm and return buttons that pop up after taking a photo or recording
+ */
+public class TypeButton extends View {
+
+    public static final int TYPE_CANCEL = 0x001;
+    public static final int TYPE_CONFIRM = 0x002;
+    private int button_type;
+    private int button_size;
+
+    private float center_X;
+    private float center_Y;
+    private float button_radius;
+
+    private Paint mPaint;
+    private Path path;
+    private float strokeWidth;
+
+    private float index;
+    private RectF rectF;
+
+    public TypeButton(Context context) {
+        super(context);
+    }
+
+    public TypeButton(Context context, int type, int size) {
+        super(context);
+        this.button_type = type;
+        button_size = size;
+        button_radius = size / 2.0f;
+        center_X = size / 2.0f;
+        center_Y = size / 2.0f;
+
+        mPaint = new Paint();
+        path = new Path();
+        strokeWidth = size / 50f;
+        index = button_size / 12f;
+        rectF = new RectF(center_X, center_Y - index, center_X + index * 2, center_Y + index);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        setMeasuredDimension(button_size, button_size);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        // 如果类型为取消，则绘制内部为返回箭头
+        // If the type is cancel, draw the return arrow inside
+        if (button_type == TYPE_CANCEL) {
+            mPaint.setAntiAlias(true);
+            mPaint.setColor(0xEEDCDCDC);
+            mPaint.setStyle(Paint.Style.FILL);
+            canvas.drawCircle(center_X, center_Y, button_radius, mPaint);
+
+            mPaint.setColor(Color.BLACK);
+            mPaint.setStyle(Paint.Style.STROKE);
+            mPaint.setStrokeWidth(strokeWidth);
+
+            path.moveTo(center_X - index / 7, center_Y + index);
+            path.lineTo(center_X + index, center_Y + index);
+
+            path.arcTo(rectF, 90, -180);
+            path.lineTo(center_X - index, center_Y - index);
+            canvas.drawPath(path, mPaint);
+            mPaint.setStyle(Paint.Style.FILL);
+            path.reset();
+            path.moveTo(center_X - index, (float) (center_Y - index * 1.5));
+            path.lineTo(center_X - index, (float) (center_Y - index / 2.3));
+            path.lineTo((float) (center_X - index * 1.6), center_Y - index);
+            path.close();
+            canvas.drawPath(path, mPaint);
+
+        }
+        // 如果类型为确认，则绘制绿色勾
+        // If the type is confirmation, draw a green tick
+        if (button_type == TYPE_CONFIRM) {
+            mPaint.setAntiAlias(true);
+            mPaint.setColor(0xFFFFFFFF);
+            mPaint.setStyle(Paint.Style.FILL);
+            canvas.drawCircle(center_X, center_Y, button_radius, mPaint);
+            mPaint.setAntiAlias(true);
+            mPaint.setStyle(Paint.Style.STROKE);
+            mPaint.setColor(0xFF00CC00);
+            mPaint.setStrokeWidth(strokeWidth);
+
+            path.moveTo(center_X - button_size / 6f, center_Y);
+            path.lineTo(center_X - button_size / 21.2f, center_Y + button_size / 7.7f);
+            path.lineTo(center_X + button_size / 4.0f, center_Y - button_size / 8.5f);
+            path.lineTo(center_X - button_size / 21.2f, center_Y + button_size / 9.4f);
+            path.close();
+            canvas.drawPath(path, mPaint);
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/noticelayout/INoticeLayout.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/noticelayout/INoticeLayout.java
new file mode 100644
index 0000000..1a9fb92
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/noticelayout/INoticeLayout.java
@@ -0,0 +1,65 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.noticelayout;
+
+import android.view.View;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+/**
+ * 通知区域 {@link NoticeLayout} 位置固定，只能显示或隐藏，位置不会随聊天内容的滚动而变化，可以用来展示<br>
+ * 待处理的群消息，或者一些广播等。该区域分为两部分，可以用来展示内容主题以及辅助主题。可以设置点击事件来<br>
+ * 响应用户操作。
+ * 
+ * The notification area {@link NoticeLayout} has a fixed position and can only be displayed or hidden. 
+ * The position will not change with the scrolling of the chat content. It can be used to display pending
+ * group messages, or some broadcasts. This area is divided into two parts, which can be used to display 
+ * content topics and auxiliary topics. Click events can be set up in response to user actions.
+ */
+public interface INoticeLayout {
+
+    /**
+     * 获取父视图
+     *
+     * Get parent view
+     *
+     * @return
+     */
+    RelativeLayout getParentLayout();
+
+    /**
+     * 获取通知的主题信息 View
+     * 
+     * Get the subject information of the notification View
+     *
+     * @return
+     */
+    TextView getContent();
+
+
+    /**
+     * 获取通知的进一步操作 View
+     * 
+     * Get notifications for further actions View
+     *
+     * @return
+     */
+    TextView getContentExtra();
+
+    /**
+     * 设置通知的点击事件
+     * 
+     * Set the click event for the notification
+     *
+     * @param l
+     */
+    void setOnNoticeClickListener(View.OnClickListener l);
+
+    /**
+     * 设置通知区域是否一直显示
+     * 
+     * Set whether the notification area is always displayed
+     *
+     * @param show 一直显示为 true
+     */
+    void alwaysShow(boolean show);
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/noticelayout/NoticeLayout.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/noticelayout/NoticeLayout.java
new file mode 100644
index 0000000..cd59b43
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/noticelayout/NoticeLayout.java
@@ -0,0 +1,77 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.noticelayout;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+
+public class NoticeLayout extends RelativeLayout implements INoticeLayout {
+
+    private RelativeLayout mNoticeLayout;
+    private TextView mContentText;
+    private TextView mContentExtraText;
+    private boolean mAwaysShow;
+
+    public NoticeLayout(Context context) {
+        super(context);
+        init();
+    }
+
+    public NoticeLayout(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public NoticeLayout(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private void init() {
+        inflate(getContext(), R.layout.notice_layout, this);
+        mNoticeLayout = findViewById(R.id.notice_layout);
+        mContentText = findViewById(R.id.notice_content);
+        mContentExtraText = findViewById(R.id.notice_content_extra);
+    }
+
+    @Override
+    public RelativeLayout getParentLayout() {
+        return mNoticeLayout;
+    }
+
+    @Override
+    public TextView getContent() {
+        return mContentText;
+    }
+
+    @Override
+    public TextView getContentExtra() {
+        return mContentExtraText;
+    }
+
+    @Override
+    public void setOnNoticeClickListener(OnClickListener l) {
+        setOnClickListener(l);
+    }
+
+    @Override
+    public void setVisibility(int visibility) {
+        if (mAwaysShow) {
+            super.setVisibility(VISIBLE);
+        } else {
+            super.setVisibility(visibility);
+        }
+    }
+
+    @Override
+    public void alwaysShow(boolean show) {
+        mAwaysShow = show;
+        if (mAwaysShow) {
+            super.setVisibility(VISIBLE);
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/noticelayout/NoticeLayoutConfig.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/noticelayout/NoticeLayoutConfig.java
new file mode 100644
index 0000000..4187aac
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/noticelayout/NoticeLayoutConfig.java
@@ -0,0 +1,25 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.noticelayout;
+
+import android.view.ViewGroup;
+
+public class NoticeLayoutConfig {
+    private ViewGroup mCustomNoticeLayout = null;
+
+    /**
+     * 获取聊天界面自定义视图
+     *
+     * Get a custom view of the chat interface
+     */
+    public ViewGroup getCustomNoticeLayout() {
+        return mCustomNoticeLayout;
+    }
+
+    /**
+     * 设置聊天界面自定义视图
+     *
+     * Set a custom view of the chat interface
+     */
+    public void setCustomNoticeLayout(ViewGroup mCustomNoticeLayout) {
+        this.mCustomNoticeLayout = mCustomNoticeLayout;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/listener/OnGestureListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/listener/OnGestureListener.java
new file mode 100644
index 0000000..1aa46a6
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/listener/OnGestureListener.java
@@ -0,0 +1,27 @@
+/*
+ Copyright 2011, 2012 Chris Banes.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener;
+
+public interface OnGestureListener {
+
+    void onDrag(float dx, float dy);
+
+    void onFling(float startX, float startY, float velocityX,
+                 float velocityY);
+
+    void onScale(float scaleFactor, float focusX, float focusY);
+
+}
\ No newline at end of file
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/listener/OnMatrixChangedListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/listener/OnMatrixChangedListener.java
new file mode 100644
index 0000000..53c2836
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/listener/OnMatrixChangedListener.java
@@ -0,0 +1,18 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener;
+
+import android.graphics.RectF;
+
+/**
+ * Interface definition for a callback to be invoked when the internal Matrix has changed for
+ * this View.
+ */
+public interface OnMatrixChangedListener {
+
+    /**
+     * Callback for when the Matrix displaying the Drawable has changed. This could be because
+     * the View's bounds have changed, or the user has zoomed.
+     *
+     * @param rect - Rectangle displaying the Drawable's new bounds.
+     */
+    void onMatrixChanged(RectF rect);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/listener/OnOutsidePhotoTapListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/listener/OnOutsidePhotoTapListener.java
new file mode 100644
index 0000000..01b75c5
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/listener/OnOutsidePhotoTapListener.java
@@ -0,0 +1,14 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener;
+
+import android.widget.ImageView;
+
+/**
+ * Callback when the user tapped outside of the photo
+ */
+public interface OnOutsidePhotoTapListener {
+
+    /**
+     * The outside of the photo has been tapped
+     */
+    void onOutsidePhotoTap(ImageView imageView);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/listener/OnPhotoTapListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/listener/OnPhotoTapListener.java
new file mode 100644
index 0000000..1ca69b8
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/listener/OnPhotoTapListener.java
@@ -0,0 +1,22 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener;
+
+import android.widget.ImageView;
+
+/**
+ * A callback to be invoked when the Photo is tapped with a single
+ * tap.
+ */
+public interface OnPhotoTapListener {
+
+    /**
+     * A callback to receive where the user taps on a photo. You will only receive a callback if
+     * the user taps on the actual photo, tapping on 'whitespace' will be ignored.
+     *
+     * @param view ImageView the user tapped.
+     * @param x    where the user tapped from the of the Drawable, as percentage of the
+     *             Drawable width.
+     * @param y    where the user tapped from the top of the Drawable, as percentage of the
+     *             Drawable height.
+     */
+    void onPhotoTap(ImageView view, float x, float y);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/listener/OnScaleChangedListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/listener/OnScaleChangedListener.java
new file mode 100644
index 0000000..a657a18
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/listener/OnScaleChangedListener.java
@@ -0,0 +1,17 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener;
+
+
+/**
+ * Interface definition for callback to be invoked when attached ImageView scale changes
+ */
+public interface OnScaleChangedListener {
+
+    /**
+     * Callback for when the scale changes
+     *
+     * @param scaleFactor the scale factor (less than 1 for zoom out, greater than 1 for zoom in)
+     * @param focusX      focal point X position
+     * @param focusY      focal point Y position
+     */
+    void onScaleChange(float scaleFactor, float focusX, float focusY);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/listener/OnSingleFlingListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/listener/OnSingleFlingListener.java
new file mode 100644
index 0000000..4b7f7f3
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/listener/OnSingleFlingListener.java
@@ -0,0 +1,21 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener;
+
+import android.view.MotionEvent;
+
+/**
+ * A callback to be invoked when the ImageView is flung with a single
+ * touch
+ */
+public interface OnSingleFlingListener {
+
+    /**
+     * A callback to receive where the user flings on a ImageView. You will receive a callback if
+     * the user flings anywhere on the view.
+     *
+     * @param e1        MotionEvent the user first touch.
+     * @param e2        MotionEvent the user last touch.
+     * @param velocityX distance of user's horizontal fling.
+     * @param velocityY distance of user's vertical fling.
+     */
+    boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/listener/OnViewDragListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/listener/OnViewDragListener.java
new file mode 100644
index 0000000..1b8bab2
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/listener/OnViewDragListener.java
@@ -0,0 +1,16 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener;
+
+/**
+ * Interface definition for a callback to be invoked when the photo is experiencing a drag event
+ */
+public interface OnViewDragListener {
+
+    /**
+     * Callback for when the photo is experiencing a drag event. This cannot be invoked when the
+     * user is scaling.
+     *
+     * @param dx The change of the coordinates in the x-direction
+     * @param dy The change of the coordinates in the y-direction
+     */
+    void onDrag(float dx, float dy);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/listener/OnViewTapListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/listener/OnViewTapListener.java
new file mode 100644
index 0000000..e9d1f7d
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/listener/OnViewTapListener.java
@@ -0,0 +1,16 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener;
+
+import android.view.View;
+
+public interface OnViewTapListener {
+
+    /**
+     * A callback to receive where the user taps on a ImageView. You will receive a callback if
+     * the user taps anywhere on the view, tapping on 'whitespace' will not be ignored.
+     *
+     * @param view - View the user tapped.
+     * @param x    - where the user tapped from the left of the View.
+     * @param y    - where the user tapped from the top of the View.
+     */
+    void onViewTap(View view, float x, float y);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/view/Compat.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/view/Compat.java
new file mode 100644
index 0000000..cba77af
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/view/Compat.java
@@ -0,0 +1,24 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.view;
+
+import android.annotation.TargetApi;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.view.View;
+
+class Compat {
+
+    private static final int SIXTY_FPS_INTERVAL = 1000 / 60;
+
+    public static void postOnAnimation(View view, Runnable runnable) {
+        if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN) {
+            postOnAnimationJellyBean(view, runnable);
+        } else {
+            view.postDelayed(runnable, SIXTY_FPS_INTERVAL);
+        }
+    }
+
+    @TargetApi(16)
+    private static void postOnAnimationJellyBean(View view, Runnable runnable) {
+        view.postOnAnimation(runnable);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/view/CustomGestureDetector.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/view/CustomGestureDetector.java
new file mode 100644
index 0000000..f3c39b5
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/view/CustomGestureDetector.java
@@ -0,0 +1,188 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.view;
+
+import android.content.Context;
+import android.view.MotionEvent;
+import android.view.ScaleGestureDetector;
+import android.view.VelocityTracker;
+import android.view.ViewConfiguration;
+
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener.OnGestureListener;
+
+/**
+ * Does a whole lot of gesture detecting.
+ */
+class CustomGestureDetector {
+
+    private static final int INVALID_POINTER_ID = -1;
+    private final ScaleGestureDetector mDetector;
+    private final float mTouchSlop;
+    private final float mMinimumVelocity;
+    private int mActivePointerId = INVALID_POINTER_ID;
+    private int mActivePointerIndex = 0;
+    private VelocityTracker mVelocityTracker;
+    private boolean mIsDragging;
+    private float mLastTouchX;
+    private float mLastTouchY;
+    private OnGestureListener mListener;
+
+    CustomGestureDetector(Context context, OnGestureListener listener) {
+        final ViewConfiguration configuration = ViewConfiguration
+                .get(context);
+        mMinimumVelocity = configuration.getScaledMinimumFlingVelocity();
+        mTouchSlop = configuration.getScaledTouchSlop();
+
+        mListener = listener;
+        ScaleGestureDetector.OnScaleGestureListener mScaleListener = new ScaleGestureDetector.OnScaleGestureListener() {
+
+            @Override
+            public boolean onScale(ScaleGestureDetector detector) {
+                float scaleFactor = detector.getScaleFactor();
+
+                if (Float.isNaN(scaleFactor) || Float.isInfinite(scaleFactor))
+                    return false;
+
+                mListener.onScale(scaleFactor,
+                        detector.getFocusX(), detector.getFocusY());
+                return true;
+            }
+
+            @Override
+            public boolean onScaleBegin(ScaleGestureDetector detector) {
+                return true;
+            }
+
+            @Override
+            public void onScaleEnd(ScaleGestureDetector detector) {
+                // NO-OP
+            }
+        };
+        mDetector = new ScaleGestureDetector(context, mScaleListener);
+    }
+
+    private float getActiveX(MotionEvent ev) {
+        try {
+            return ev.getX(mActivePointerIndex);
+        } catch (Exception e) {
+            return ev.getX();
+        }
+    }
+
+    private float getActiveY(MotionEvent ev) {
+        try {
+            return ev.getY(mActivePointerIndex);
+        } catch (Exception e) {
+            return ev.getY();
+        }
+    }
+
+    public boolean isScaling() {
+        return mDetector.isInProgress();
+    }
+
+    public boolean isDragging() {
+        return mIsDragging;
+    }
+
+    public boolean onTouchEvent(MotionEvent ev) {
+        try {
+            mDetector.onTouchEvent(ev);
+            return processTouchEvent(ev);
+        } catch (IllegalArgumentException e) {
+            // Fix for support lib bug, happening when onDestroy is called
+            return true;
+        }
+    }
+
+    private boolean processTouchEvent(MotionEvent ev) {
+        final int action = ev.getAction();
+        switch (action & MotionEvent.ACTION_MASK) {
+            case MotionEvent.ACTION_DOWN:
+                mActivePointerId = ev.getPointerId(0);
+
+                mVelocityTracker = VelocityTracker.obtain();
+                if (null != mVelocityTracker) {
+                    mVelocityTracker.addMovement(ev);
+                }
+
+                mLastTouchX = getActiveX(ev);
+                mLastTouchY = getActiveY(ev);
+                mIsDragging = false;
+                break;
+            case MotionEvent.ACTION_MOVE:
+                final float x = getActiveX(ev);
+                final float y = getActiveY(ev);
+                final float dx = x - mLastTouchX, dy = y - mLastTouchY;
+
+                if (!mIsDragging) {
+                    // Use Pythagoras to see if drag length is larger than
+                    // touch slop
+                    mIsDragging = Math.sqrt((dx * dx) + (dy * dy)) >= mTouchSlop;
+                }
+
+                if (mIsDragging) {
+                    mListener.onDrag(dx, dy);
+                    mLastTouchX = x;
+                    mLastTouchY = y;
+
+                    if (null != mVelocityTracker) {
+                        mVelocityTracker.addMovement(ev);
+                    }
+                }
+                break;
+            case MotionEvent.ACTION_CANCEL:
+                mActivePointerId = INVALID_POINTER_ID;
+                // Recycle Velocity Tracker
+                if (null != mVelocityTracker) {
+                    mVelocityTracker.recycle();
+                    mVelocityTracker = null;
+                }
+                break;
+            case MotionEvent.ACTION_UP:
+                mActivePointerId = INVALID_POINTER_ID;
+                if (mIsDragging) {
+                    if (null != mVelocityTracker) {
+                        mLastTouchX = getActiveX(ev);
+                        mLastTouchY = getActiveY(ev);
+
+                        // Compute velocity within the last 1000ms
+                        mVelocityTracker.addMovement(ev);
+                        mVelocityTracker.computeCurrentVelocity(1000);
+
+                        final float vX = mVelocityTracker.getXVelocity(), vY = mVelocityTracker
+                                .getYVelocity();
+
+                        // If the velocity is greater than minVelocity, call
+                        // listener
+                        if (Math.max(Math.abs(vX), Math.abs(vY)) >= mMinimumVelocity) {
+                            mListener.onFling(mLastTouchX, mLastTouchY, -vX,
+                                    -vY);
+                        }
+                    }
+                }
+
+                // Recycle Velocity Tracker
+                if (null != mVelocityTracker) {
+                    mVelocityTracker.recycle();
+                    mVelocityTracker = null;
+                }
+                break;
+            case MotionEvent.ACTION_POINTER_UP:
+                final int pointerIndex = PhotoViewUtil.getPointerIndex(ev.getAction());
+                final int pointerId = ev.getPointerId(pointerIndex);
+                if (pointerId == mActivePointerId) {
+                    // This was our active pointer going up. Choose a new
+                    // active pointer and adjust accordingly.
+                    final int newPointerIndex = pointerIndex == 0 ? 1 : 0;
+                    mActivePointerId = ev.getPointerId(newPointerIndex);
+                    mLastTouchX = ev.getX(newPointerIndex);
+                    mLastTouchY = ev.getY(newPointerIndex);
+                }
+                break;
+        }
+
+        mActivePointerIndex = ev
+                .findPointerIndex(mActivePointerId != INVALID_POINTER_ID ? mActivePointerId
+                        : 0);
+        return true;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/view/PhotoView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/view/PhotoView.java
new file mode 100644
index 0000000..8b01581
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/view/PhotoView.java
@@ -0,0 +1,249 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.view;
+
+import android.content.Context;
+import android.graphics.Matrix;
+import android.graphics.RectF;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.util.AttributeSet;
+import android.view.GestureDetector;
+
+import androidx.appcompat.widget.AppCompatImageView;
+
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener.OnMatrixChangedListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener.OnOutsidePhotoTapListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener.OnPhotoTapListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener.OnScaleChangedListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener.OnSingleFlingListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener.OnViewDragListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener.OnViewTapListener;
+
+/**
+ * A zoomable ImageView. See {@link PhotoViewAttacher} for most of the details on how the zooming
+ * is accomplished
+ */
+public class PhotoView extends AppCompatImageView {
+
+    private PhotoViewAttacher attacher;
+    private ScaleType pendingScaleType;
+
+    public PhotoView(Context context) {
+        this(context, null);
+    }
+
+    public PhotoView(Context context, AttributeSet attr) {
+        this(context, attr, 0);
+    }
+
+    public PhotoView(Context context, AttributeSet attr, int defStyle) {
+        super(context, attr, defStyle);
+        init();
+    }
+
+    private void init() {
+        attacher = new PhotoViewAttacher(this);
+        //We always pose as a Matrix scale type, though we can change to another scale type
+        //via the attacher
+        super.setScaleType(ScaleType.MATRIX);
+        //apply the previously applied scale type
+        if (pendingScaleType != null) {
+            setScaleType(pendingScaleType);
+            pendingScaleType = null;
+        }
+    }
+
+    /**
+     * Get the current {@link PhotoViewAttacher} for this view. Be wary of holding on to references
+     * to this attacher, as it has a reference to this view, which, if a reference is held in the
+     * wrong place, can cause memory leaks.
+     *
+     * @return the attacher.
+     */
+    public PhotoViewAttacher getAttacher() {
+        return attacher;
+    }
+
+    @Override
+    public ScaleType getScaleType() {
+        return attacher.getScaleType();
+    }
+
+    @Override
+    public void setScaleType(ScaleType scaleType) {
+        if (attacher == null) {
+            pendingScaleType = scaleType;
+        } else {
+            attacher.setScaleType(scaleType);
+        }
+    }
+
+    @Override
+    public Matrix getImageMatrix() {
+        return attacher.getImageMatrix();
+    }
+
+    @Override
+    public void setOnLongClickListener(OnLongClickListener l) {
+        attacher.setOnLongClickListener(l);
+    }
+
+    @Override
+    public void setOnClickListener(OnClickListener l) {
+        attacher.setOnClickListener(l);
+    }
+
+    @Override
+    public void setImageDrawable(Drawable drawable) {
+        super.setImageDrawable(drawable);
+        // setImageBitmap calls through to this method
+        if (attacher != null) {
+            attacher.update();
+        }
+    }
+
+    @Override
+    public void setImageResource(int resId) {
+        super.setImageResource(resId);
+        if (attacher != null) {
+            attacher.update();
+        }
+    }
+
+    @Override
+    public void setImageURI(Uri uri) {
+        super.setImageURI(uri);
+        if (attacher != null) {
+            attacher.update();
+        }
+    }
+
+    @Override
+    protected boolean setFrame(int l, int t, int r, int b) {
+        boolean changed = super.setFrame(l, t, r, b);
+        if (changed) {
+            attacher.update();
+        }
+        return changed;
+    }
+
+    public void setRotationTo(float rotationDegree) {
+        attacher.setRotationTo(rotationDegree);
+    }
+
+    public void setRotationBy(float rotationDegree) {
+        attacher.setRotationBy(rotationDegree);
+    }
+
+    public boolean isZoomable() {
+        return attacher.isZoomable();
+    }
+
+    public void setZoomable(boolean zoomable) {
+        attacher.setZoomable(zoomable);
+    }
+
+    public RectF getDisplayRect() {
+        return attacher.getDisplayRect();
+    }
+
+    public void getDisplayMatrix(Matrix matrix) {
+        attacher.getDisplayMatrix(matrix);
+    }
+
+    @SuppressWarnings("UnusedReturnValue")
+    public boolean setDisplayMatrix(Matrix finalRectangle) {
+        return attacher.setDisplayMatrix(finalRectangle);
+    }
+
+    public void getSuppMatrix(Matrix matrix) {
+        attacher.getSuppMatrix(matrix);
+    }
+
+    public boolean setSuppMatrix(Matrix matrix) {
+        return attacher.setDisplayMatrix(matrix);
+    }
+
+    public float getMinimumScale() {
+        return attacher.getMinimumScale();
+    }
+
+    public void setMinimumScale(float minimumScale) {
+        attacher.setMinimumScale(minimumScale);
+    }
+
+    public float getMediumScale() {
+        return attacher.getMediumScale();
+    }
+
+    public void setMediumScale(float mediumScale) {
+        attacher.setMediumScale(mediumScale);
+    }
+
+    public float getMaximumScale() {
+        return attacher.getMaximumScale();
+    }
+
+    public void setMaximumScale(float maximumScale) {
+        attacher.setMaximumScale(maximumScale);
+    }
+
+    public float getScale() {
+        return attacher.getScale();
+    }
+
+    public void setScale(float scale) {
+        attacher.setScale(scale);
+    }
+
+    public void setAllowParentInterceptOnEdge(boolean allow) {
+        attacher.setAllowParentInterceptOnEdge(allow);
+    }
+
+    public void setScaleLevels(float minimumScale, float mediumScale, float maximumScale) {
+        attacher.setScaleLevels(minimumScale, mediumScale, maximumScale);
+    }
+
+    public void setOnMatrixChangeListener(OnMatrixChangedListener listener) {
+        attacher.setOnMatrixChangeListener(listener);
+    }
+
+    public void setOnPhotoTapListener(OnPhotoTapListener listener) {
+        attacher.setOnPhotoTapListener(listener);
+    }
+
+    public void setOnOutsidePhotoTapListener(OnOutsidePhotoTapListener listener) {
+        attacher.setOnOutsidePhotoTapListener(listener);
+    }
+
+    public void setOnViewTapListener(OnViewTapListener listener) {
+        attacher.setOnViewTapListener(listener);
+    }
+
+    public void setOnViewDragListener(OnViewDragListener listener) {
+        attacher.setOnViewDragListener(listener);
+    }
+
+    public void setScale(float scale, boolean animate) {
+        attacher.setScale(scale, animate);
+    }
+
+    public void setScale(float scale, float focalX, float focalY, boolean animate) {
+        attacher.setScale(scale, focalX, focalY, animate);
+    }
+
+    public void setZoomTransitionDuration(int milliseconds) {
+        attacher.setZoomTransitionDuration(milliseconds);
+    }
+
+    public void setOnDoubleTapListener(GestureDetector.OnDoubleTapListener onDoubleTapListener) {
+        attacher.setOnDoubleTapListener(onDoubleTapListener);
+    }
+
+    public void setOnScaleChangeListener(OnScaleChangedListener onScaleChangedListener) {
+        attacher.setOnScaleChangeListener(onScaleChangedListener);
+    }
+
+    public void setOnSingleFlingListener(OnSingleFlingListener onSingleFlingListener) {
+        attacher.setOnSingleFlingListener(onSingleFlingListener);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/view/PhotoViewAttacher.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/view/PhotoViewAttacher.java
new file mode 100644
index 0000000..7ba50ae
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/view/PhotoViewAttacher.java
@@ -0,0 +1,793 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.view;
+
+import android.content.Context;
+import android.graphics.Matrix;
+import android.graphics.Matrix.ScaleToFit;
+import android.graphics.RectF;
+import android.graphics.drawable.Drawable;
+import android.view.GestureDetector;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.OnLongClickListener;
+import android.view.ViewParent;
+import android.view.animation.AccelerateDecelerateInterpolator;
+import android.view.animation.Interpolator;
+import android.widget.ImageView;
+import android.widget.ImageView.ScaleType;
+import android.widget.OverScroller;
+
+import com.tencent.qcloud.tuicore.util.BackgroundTasks;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener.OnGestureListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener.OnMatrixChangedListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener.OnOutsidePhotoTapListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener.OnPhotoTapListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener.OnScaleChangedListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener.OnSingleFlingListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener.OnViewDragListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener.OnViewTapListener;
+
+/**
+ * The component of {@link PhotoView} which does the work allowing for zooming, scaling, panning, etc.
+ * It is made public in case you need to subclass something other than AppCompatImageView and still
+ * gain the functionality that {@link PhotoView} offers
+ */
+public class PhotoViewAttacher implements View.OnTouchListener,
+        View.OnLayoutChangeListener {
+
+    private static final int EDGE_NONE = -1;
+    private static final int EDGE_LEFT = 0;
+    private static final int EDGE_RIGHT = 1;
+    private static final int EDGE_BOTH = 2;
+    private static float DEFAULT_MAX_SCALE = 3.0f;
+    private static float DEFAULT_MID_SCALE = 1.75f;
+    private static float DEFAULT_MIN_SCALE = 1.0f;
+    private static int DEFAULT_ZOOM_DURATION = 200;
+    private static int SINGLE_TOUCH = 1;
+    // These are set so we don't keep allocating them on the heap
+    private final Matrix mBaseMatrix = new Matrix();
+    private final Matrix mDrawMatrix = new Matrix();
+    private final Matrix mSuppMatrix = new Matrix();
+    private final RectF mDisplayRect = new RectF();
+    private final float[] mMatrixValues = new float[9];
+    private Interpolator mInterpolator = new AccelerateDecelerateInterpolator();
+    private int mZoomDuration = DEFAULT_ZOOM_DURATION;
+    private float mMinScale = DEFAULT_MIN_SCALE;
+    private float mMidScale = DEFAULT_MID_SCALE;
+    private float mMaxScale = DEFAULT_MAX_SCALE;
+    private boolean mAllowParentInterceptOnEdge = true;
+    private boolean mBlockParentIntercept = false;
+    private ImageView mImageView;
+    // Gesture Detectors
+    private GestureDetector mGestureDetector;
+    private CustomGestureDetector mScaleDragDetector;
+    // Listeners
+    private OnMatrixChangedListener mMatrixChangeListener;
+    private OnPhotoTapListener mPhotoTapListener;
+    private OnOutsidePhotoTapListener mOutsidePhotoTapListener;
+    private OnViewTapListener mViewTapListener;
+    private View.OnClickListener mOnClickListener;
+    private OnLongClickListener mLongClickListener;
+    private OnScaleChangedListener mScaleChangeListener;
+    private OnSingleFlingListener mSingleFlingListener;
+    private OnViewDragListener mOnViewDragListener;
+
+    private FlingRunnable mCurrentFlingRunnable;
+    private int mScrollEdge = EDGE_BOTH;
+    private float mBaseRotation;
+
+    private boolean mZoomEnabled = true;
+    private ScaleType mScaleType = ScaleType.FIT_CENTER;
+
+    private OnGestureListener onGestureListener = new OnGestureListener() {
+        @Override
+        public void onDrag(float dx, float dy) {
+            if (mScaleDragDetector.isScaling()) {
+                return; // Do not drag if we are already scaling
+            }
+            if (mOnViewDragListener != null) {
+                mOnViewDragListener.onDrag(dx, dy);
+            }
+            mSuppMatrix.postTranslate(dx, dy);
+            checkAndDisplayMatrix();
+
+            /*
+             * Here we decide whether to let the ImageView's parent to start taking
+             * over the touch event.
+             *
+             * First we check whether this function is enabled. We never want the
+             * parent to take over if we're scaling. We then check the edge we're
+             * on, and the direction of the scroll (i.e. if we're pulling against
+             * the edge, aka 'overscrolling', let the parent take over).
+             */
+            ViewParent parent = mImageView.getParent();
+            if (mAllowParentInterceptOnEdge && !mScaleDragDetector.isScaling() && !mBlockParentIntercept) {
+                if (mScrollEdge == EDGE_BOTH
+                        || (mScrollEdge == EDGE_LEFT && dx >= 1f)
+                        || (mScrollEdge == EDGE_RIGHT && dx <= -1f)) {
+                    if (parent != null) {
+                        parent.requestDisallowInterceptTouchEvent(false);
+                    }
+                }
+            } else {
+                if (parent != null) {
+                    parent.requestDisallowInterceptTouchEvent(true);
+                }
+            }
+        }
+
+        @Override
+        public void onFling(float startX, float startY, float velocityX, float velocityY) {
+            mCurrentFlingRunnable = new FlingRunnable(mImageView.getContext());
+            mCurrentFlingRunnable.fling(getImageViewWidth(mImageView),
+                    getImageViewHeight(mImageView), (int) velocityX, (int) velocityY);
+            BackgroundTasks.getInstance().runOnUiThread(mCurrentFlingRunnable);
+        }
+
+        @Override
+        public void onScale(float scaleFactor, float focusX, float focusY) {
+            if ((getScale() < mMaxScale || scaleFactor < 1f) && (getScale() > mMinScale || scaleFactor > 1f)) {
+                if (mScaleChangeListener != null) {
+                    mScaleChangeListener.onScaleChange(scaleFactor, focusX, focusY);
+                }
+                mSuppMatrix.postScale(scaleFactor, scaleFactor, focusX, focusY);
+                checkAndDisplayMatrix();
+            }
+        }
+    };
+
+    public PhotoViewAttacher(ImageView imageView) {
+        mImageView = imageView;
+        imageView.setOnTouchListener(this);
+        imageView.addOnLayoutChangeListener(this);
+        if (imageView.isInEditMode()) {
+            return;
+        }
+        mBaseRotation = 0.0f;
+        // Create Gesture Detectors...
+        mScaleDragDetector = new CustomGestureDetector(imageView.getContext(), onGestureListener);
+        mGestureDetector = new GestureDetector(imageView.getContext(), new GestureDetector.SimpleOnGestureListener() {
+
+            // forward long click listener
+            @Override
+            public void onLongPress(MotionEvent e) {
+                if (mLongClickListener != null) {
+                    mLongClickListener.onLongClick(mImageView);
+                }
+            }
+
+            @Override
+            public boolean onFling(MotionEvent e1, MotionEvent e2,
+                                   float velocityX, float velocityY) {
+                if (mSingleFlingListener != null) {
+                    if (getScale() > DEFAULT_MIN_SCALE) {
+                        return false;
+                    }
+                    if (e1.getPointerCount() > SINGLE_TOUCH
+                            || e2.getPointerCount() > SINGLE_TOUCH) {
+                        return false;
+                    }
+                    return mSingleFlingListener.onFling(e1, e2, velocityX, velocityY);
+                }
+                return false;
+            }
+        });
+        mGestureDetector.setOnDoubleTapListener(new GestureDetector.OnDoubleTapListener() {
+            @Override
+            public boolean onSingleTapConfirmed(MotionEvent e) {
+                if (mOnClickListener != null) {
+                    mOnClickListener.onClick(mImageView);
+                }
+                final RectF displayRect = getDisplayRect();
+                final float x = e.getX(), y = e.getY();
+                if (mViewTapListener != null) {
+                    mViewTapListener.onViewTap(mImageView, x, y);
+                }
+                if (displayRect != null) {
+                    // Check to see if the user tapped on the photo
+                    if (displayRect.contains(x, y)) {
+                        float xResult = (x - displayRect.left)
+                                / displayRect.width();
+                        float yResult = (y - displayRect.top)
+                                / displayRect.height();
+                        if (mPhotoTapListener != null) {
+                            mPhotoTapListener.onPhotoTap(mImageView, xResult, yResult);
+                        }
+                        return true;
+                    } else {
+                        if (mOutsidePhotoTapListener != null) {
+                            mOutsidePhotoTapListener.onOutsidePhotoTap(mImageView);
+                        }
+                    }
+                }
+                return false;
+            }
+
+            @Override
+            public boolean onDoubleTap(MotionEvent ev) {
+                try {
+                    float scale = getScale();
+                    float x = ev.getX();
+                    float y = ev.getY();
+                    if (scale < getMediumScale()) {
+                        setScale(getMediumScale(), x, y, true);
+                    } else if (scale >= getMediumScale() && scale < getMaximumScale()) {
+                        setScale(getMaximumScale(), x, y, true);
+                    } else {
+                        setScale(getMinimumScale(), x, y, true);
+                    }
+                } catch (ArrayIndexOutOfBoundsException e) {
+                    // Can sometimes happen when getX() and getY() is called
+                }
+                return true;
+            }
+
+            @Override
+            public boolean onDoubleTapEvent(MotionEvent e) {
+                // Wait for the confirmed onDoubleTap() instead
+                return false;
+            }
+        });
+    }
+
+    public void setOnDoubleTapListener(GestureDetector.OnDoubleTapListener newOnDoubleTapListener) {
+        this.mGestureDetector.setOnDoubleTapListener(newOnDoubleTapListener);
+    }
+
+    public void setOnScaleChangeListener(OnScaleChangedListener onScaleChangeListener) {
+        this.mScaleChangeListener = onScaleChangeListener;
+    }
+
+    public void setOnSingleFlingListener(OnSingleFlingListener onSingleFlingListener) {
+        this.mSingleFlingListener = onSingleFlingListener;
+    }
+
+    @Deprecated
+    public boolean isZoomEnabled() {
+        return mZoomEnabled;
+    }
+
+    public RectF getDisplayRect() {
+        checkMatrixBounds();
+        return getDisplayRect(getDrawMatrix());
+    }
+
+    public boolean setDisplayMatrix(Matrix finalMatrix) {
+        if (finalMatrix == null) {
+            throw new IllegalArgumentException("Matrix cannot be null");
+        }
+        if (mImageView.getDrawable() == null) {
+            return false;
+        }
+        mSuppMatrix.set(finalMatrix);
+        checkAndDisplayMatrix();
+        return true;
+    }
+
+    public void setBaseRotation(final float degrees) {
+        mBaseRotation = degrees % 360;
+        update();
+        setRotationBy(mBaseRotation);
+        checkAndDisplayMatrix();
+    }
+
+    public void setRotationTo(float degrees) {
+        mSuppMatrix.setRotate(degrees % 360);
+        checkAndDisplayMatrix();
+    }
+
+    public void setRotationBy(float degrees) {
+        mSuppMatrix.postRotate(degrees % 360);
+        checkAndDisplayMatrix();
+    }
+
+    public float getMinimumScale() {
+        return mMinScale;
+    }
+
+    public void setMinimumScale(float minimumScale) {
+        PhotoViewUtil.checkZoomLevels(minimumScale, mMidScale, mMaxScale);
+        mMinScale = minimumScale;
+    }
+
+    public float getMediumScale() {
+        return mMidScale;
+    }
+
+    public void setMediumScale(float mediumScale) {
+        PhotoViewUtil.checkZoomLevels(mMinScale, mediumScale, mMaxScale);
+        mMidScale = mediumScale;
+    }
+
+    public float getMaximumScale() {
+        return mMaxScale;
+    }
+
+    public void setMaximumScale(float maximumScale) {
+        PhotoViewUtil.checkZoomLevels(mMinScale, mMidScale, maximumScale);
+        mMaxScale = maximumScale;
+    }
+
+    public float getScale() {
+        return (float) Math.sqrt((float) Math.pow(getValue(mSuppMatrix, Matrix.MSCALE_X), 2) + (float) Math.pow
+                (getValue(mSuppMatrix, Matrix.MSKEW_Y), 2));
+    }
+
+    public void setScale(float scale) {
+        setScale(scale, false);
+    }
+
+    public ScaleType getScaleType() {
+        return mScaleType;
+    }
+
+    public void setScaleType(ScaleType scaleType) {
+        if (PhotoViewUtil.isSupportedScaleType(scaleType) && scaleType != mScaleType) {
+            mScaleType = scaleType;
+            update();
+        }
+    }
+
+    @Override
+    public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int
+            oldRight, int oldBottom) {
+        // Update our base matrix, as the bounds have changed
+        if (left != oldLeft || top != oldTop || right != oldRight || bottom != oldBottom) {
+            updateBaseMatrix(mImageView.getDrawable());
+        }
+    }
+
+    @Override
+    public boolean onTouch(View v, MotionEvent ev) {
+        boolean handled = false;
+        if (mZoomEnabled && PhotoViewUtil.hasDrawable((ImageView) v)) {
+            switch (ev.getAction()) {
+                case MotionEvent.ACTION_DOWN:
+                    ViewParent parent = v.getParent();
+                    // First, disable the Parent from intercepting the touch
+                    // event
+                    if (parent != null) {
+                        parent.requestDisallowInterceptTouchEvent(true);
+                    }
+                    // If we're flinging, and the user presses down, cancel
+                    // fling
+                    cancelFling();
+                    break;
+                case MotionEvent.ACTION_CANCEL:
+                case MotionEvent.ACTION_UP:
+                    // If the user has zoomed less than min scale, zoom back
+                    // to min scale
+                    if (getScale() < mMinScale) {
+                        RectF rect = getDisplayRect();
+                        if (rect != null) {
+                            v.post(new AnimatedZoomRunnable(getScale(), mMinScale,
+                                    rect.centerX(), rect.centerY()));
+                            handled = true;
+                        }
+                    } else if (getScale() > mMaxScale) {
+                        RectF rect = getDisplayRect();
+                        if (rect != null) {
+                            v.post(new AnimatedZoomRunnable(getScale(), mMaxScale,
+                                    rect.centerX(), rect.centerY()));
+                            handled = true;
+                        }
+                    }
+                    break;
+            }
+            // Try the Scale/Drag detector
+            if (mScaleDragDetector != null) {
+                boolean wasScaling = mScaleDragDetector.isScaling();
+                boolean wasDragging = mScaleDragDetector.isDragging();
+                handled = mScaleDragDetector.onTouchEvent(ev);
+                boolean didntScale = !wasScaling && !mScaleDragDetector.isScaling();
+                boolean didntDrag = !wasDragging && !mScaleDragDetector.isDragging();
+                mBlockParentIntercept = didntScale && didntDrag;
+            }
+            // Check to see if the user double tapped
+            if (mGestureDetector != null && mGestureDetector.onTouchEvent(ev)) {
+                handled = true;
+            }
+
+        }
+        return handled;
+    }
+
+    public void setAllowParentInterceptOnEdge(boolean allow) {
+        mAllowParentInterceptOnEdge = allow;
+    }
+
+    public void setScaleLevels(float minimumScale, float mediumScale, float maximumScale) {
+        PhotoViewUtil.checkZoomLevels(minimumScale, mediumScale, maximumScale);
+        mMinScale = minimumScale;
+        mMidScale = mediumScale;
+        mMaxScale = maximumScale;
+    }
+
+    public void setOnLongClickListener(OnLongClickListener listener) {
+        mLongClickListener = listener;
+    }
+
+    public void setOnClickListener(View.OnClickListener listener) {
+        mOnClickListener = listener;
+    }
+
+    public void setOnMatrixChangeListener(OnMatrixChangedListener listener) {
+        mMatrixChangeListener = listener;
+    }
+
+    public void setOnPhotoTapListener(OnPhotoTapListener listener) {
+        mPhotoTapListener = listener;
+    }
+
+    public void setOnOutsidePhotoTapListener(OnOutsidePhotoTapListener mOutsidePhotoTapListener) {
+        this.mOutsidePhotoTapListener = mOutsidePhotoTapListener;
+    }
+
+    public void setOnViewTapListener(OnViewTapListener listener) {
+        mViewTapListener = listener;
+    }
+
+    public void setOnViewDragListener(OnViewDragListener listener) {
+        mOnViewDragListener = listener;
+    }
+
+    public void setScale(float scale, boolean animate) {
+        setScale(scale,
+                (mImageView.getRight()) / 2,
+                (mImageView.getBottom()) / 2,
+                animate);
+    }
+
+    public void setScale(float scale, float focalX, float focalY,
+                         boolean animate) {
+        // Check to see if the scale is within bounds
+        if (scale < mMinScale || scale > mMaxScale) {
+            throw new IllegalArgumentException("Scale must be within the range of minScale and maxScale");
+        }
+        if (animate) {
+            BackgroundTasks.getInstance().runOnUiThread(new AnimatedZoomRunnable(getScale(), scale,
+                    focalX, focalY));
+        } else {
+            mSuppMatrix.setScale(scale, scale, focalX, focalY);
+            checkAndDisplayMatrix();
+        }
+    }
+
+    /**
+     * Set the zoom interpolator
+     *
+     * @param interpolator the zoom interpolator
+     */
+    public void setZoomInterpolator(Interpolator interpolator) {
+        mInterpolator = interpolator;
+    }
+
+    public boolean isZoomable() {
+        return mZoomEnabled;
+    }
+
+    public void setZoomable(boolean zoomable) {
+        mZoomEnabled = zoomable;
+        update();
+    }
+
+    public void update() {
+        if (mZoomEnabled) {
+            // Update the base matrix using the current drawable
+            updateBaseMatrix(mImageView.getDrawable());
+        } else {
+            // Reset the Matrix...
+            resetMatrix();
+        }
+    }
+
+    /**
+     * Get the display matrix
+     *
+     * @param matrix target matrix to copy to
+     */
+    public void getDisplayMatrix(Matrix matrix) {
+        matrix.set(getDrawMatrix());
+    }
+
+    /**
+     * Get the current support matrix
+     */
+    public void getSuppMatrix(Matrix matrix) {
+        matrix.set(mSuppMatrix);
+    }
+
+    private Matrix getDrawMatrix() {
+        mDrawMatrix.set(mBaseMatrix);
+        mDrawMatrix.postConcat(mSuppMatrix);
+        return mDrawMatrix;
+    }
+
+    public Matrix getImageMatrix() {
+        return mDrawMatrix;
+    }
+
+    public void setZoomTransitionDuration(int milliseconds) {
+        this.mZoomDuration = milliseconds;
+    }
+
+    /**
+     * Helper method that 'unpacks' a Matrix and returns the required value
+     *
+     * @param matrix     Matrix to unpack
+     * @param whichValue Which value from Matrix.M* to return
+     * @return returned value
+     */
+    private float getValue(Matrix matrix, int whichValue) {
+        matrix.getValues(mMatrixValues);
+        return mMatrixValues[whichValue];
+    }
+
+    /**
+     * Resets the Matrix back to FIT_CENTER, and then displays its contents
+     */
+    private void resetMatrix() {
+        mSuppMatrix.reset();
+        setRotationBy(mBaseRotation);
+        setImageViewMatrix(getDrawMatrix());
+        checkMatrixBounds();
+    }
+
+    private void setImageViewMatrix(Matrix matrix) {
+        mImageView.setImageMatrix(matrix);
+        // Call MatrixChangedListener if needed
+        if (mMatrixChangeListener != null) {
+            RectF displayRect = getDisplayRect(matrix);
+            if (displayRect != null) {
+                mMatrixChangeListener.onMatrixChanged(displayRect);
+            }
+        }
+    }
+
+    /**
+     * Helper method that simply checks the Matrix, and then displays the result
+     */
+    private void checkAndDisplayMatrix() {
+        if (checkMatrixBounds()) {
+            setImageViewMatrix(getDrawMatrix());
+        }
+    }
+
+    /**
+     * Helper method that maps the supplied Matrix to the current Drawable
+     *
+     * @param matrix - Matrix to map Drawable against
+     * @return RectF - Displayed Rectangle
+     */
+    private RectF getDisplayRect(Matrix matrix) {
+        Drawable d = mImageView.getDrawable();
+        if (d != null) {
+            mDisplayRect.set(0, 0, d.getIntrinsicWidth(),
+                    d.getIntrinsicHeight());
+            matrix.mapRect(mDisplayRect);
+            return mDisplayRect;
+        }
+        return null;
+    }
+
+    /**
+     * Calculate Matrix for FIT_CENTER
+     *
+     * @param drawable - Drawable being displayed
+     */
+    private void updateBaseMatrix(Drawable drawable) {
+        if (drawable == null) {
+            return;
+        }
+        final float viewWidth = getImageViewWidth(mImageView);
+        final float viewHeight = getImageViewHeight(mImageView);
+        final int drawableWidth = drawable.getIntrinsicWidth();
+        final int drawableHeight = drawable.getIntrinsicHeight();
+        mBaseMatrix.reset();
+        final float widthScale = viewWidth / drawableWidth;
+        final float heightScale = viewHeight / drawableHeight;
+        if (mScaleType == ScaleType.CENTER) {
+            mBaseMatrix.postTranslate((viewWidth - drawableWidth) / 2F,
+                    (viewHeight - drawableHeight) / 2F);
+
+        } else if (mScaleType == ScaleType.CENTER_CROP) {
+            float scale = Math.max(widthScale, heightScale);
+            mBaseMatrix.postScale(scale, scale);
+            mBaseMatrix.postTranslate((viewWidth - drawableWidth * scale) / 2F,
+                    (viewHeight - drawableHeight * scale) / 2F);
+
+        } else if (mScaleType == ScaleType.CENTER_INSIDE) {
+            float scale = Math.min(1.0f, Math.min(widthScale, heightScale));
+            mBaseMatrix.postScale(scale, scale);
+            mBaseMatrix.postTranslate((viewWidth - drawableWidth * scale) / 2F,
+                    (viewHeight - drawableHeight * scale) / 2F);
+
+        } else {
+            RectF mTempSrc = new RectF(0, 0, drawableWidth, drawableHeight);
+            RectF mTempDst = new RectF(0, 0, viewWidth, viewHeight);
+            if ((int) mBaseRotation % 180 != 0) {
+                mTempSrc = new RectF(0, 0, drawableHeight, drawableWidth);
+            }
+            switch (mScaleType) {
+                case FIT_CENTER:
+                    mBaseMatrix.setRectToRect(mTempSrc, mTempDst, ScaleToFit.CENTER);
+                    break;
+                case FIT_START:
+                    mBaseMatrix.setRectToRect(mTempSrc, mTempDst, ScaleToFit.START);
+                    break;
+                case FIT_END:
+                    mBaseMatrix.setRectToRect(mTempSrc, mTempDst, ScaleToFit.END);
+                    break;
+                case FIT_XY:
+                    mBaseMatrix.setRectToRect(mTempSrc, mTempDst, ScaleToFit.FILL);
+                    break;
+                default:
+                    break;
+            }
+        }
+        resetMatrix();
+    }
+
+    private boolean checkMatrixBounds() {
+        final RectF rect = getDisplayRect(getDrawMatrix());
+        if (rect == null) {
+            return false;
+        }
+        final float height = rect.height(), width = rect.width();
+        float deltaX = 0, deltaY = 0;
+        final int viewHeight = getImageViewHeight(mImageView);
+        if (height <= viewHeight) {
+            switch (mScaleType) {
+                case FIT_START:
+                    deltaY = -rect.top;
+                    break;
+                case FIT_END:
+                    deltaY = viewHeight - height - rect.top;
+                    break;
+                default:
+                    deltaY = (viewHeight - height) / 2 - rect.top;
+                    break;
+            }
+        } else if (rect.top > 0) {
+            deltaY = -rect.top;
+        } else if (rect.bottom < viewHeight) {
+            deltaY = viewHeight - rect.bottom;
+        }
+        final int viewWidth = getImageViewWidth(mImageView);
+        if (width <= viewWidth) {
+            switch (mScaleType) {
+                case FIT_START:
+                    deltaX = -rect.left;
+                    break;
+                case FIT_END:
+                    deltaX = viewWidth - width - rect.left;
+                    break;
+                default:
+                    deltaX = (viewWidth - width) / 2 - rect.left;
+                    break;
+            }
+            mScrollEdge = EDGE_BOTH;
+        } else if (rect.left > 0) {
+            mScrollEdge = EDGE_LEFT;
+            deltaX = -rect.left;
+        } else if (rect.right < viewWidth) {
+            deltaX = viewWidth - rect.right;
+            mScrollEdge = EDGE_RIGHT;
+        } else {
+            mScrollEdge = EDGE_NONE;
+        }
+        // Finally actually translate the matrix
+        mSuppMatrix.postTranslate(deltaX, deltaY);
+        return true;
+    }
+
+    private int getImageViewWidth(ImageView imageView) {
+        return imageView.getWidth() - imageView.getPaddingLeft() - imageView.getPaddingRight();
+    }
+
+    private int getImageViewHeight(ImageView imageView) {
+        return imageView.getHeight() - imageView.getPaddingTop() - imageView.getPaddingBottom();
+    }
+
+    private void cancelFling() {
+        if (mCurrentFlingRunnable != null) {
+            mCurrentFlingRunnable.cancelFling();
+            mCurrentFlingRunnable = null;
+        }
+    }
+
+    private class AnimatedZoomRunnable implements Runnable {
+
+        private final float mFocalX, mFocalY;
+        private final long mStartTime;
+        private final float mZoomStart, mZoomEnd;
+
+        public AnimatedZoomRunnable(final float currentZoom, final float targetZoom,
+                                    final float focalX, final float focalY) {
+            mFocalX = focalX;
+            mFocalY = focalY;
+            mStartTime = System.currentTimeMillis();
+            mZoomStart = currentZoom;
+            mZoomEnd = targetZoom;
+        }
+
+        @Override
+        public void run() {
+            float t = interpolate();
+            float scale = mZoomStart + t * (mZoomEnd - mZoomStart);
+            float deltaScale = scale / getScale();
+            onGestureListener.onScale(deltaScale, mFocalX, mFocalY);
+            // We haven't hit our target scale yet, so post ourselves again
+            if (t < 1f) {
+                Compat.postOnAnimation(mImageView, this);
+            }
+        }
+
+        private float interpolate() {
+            float t = 1f * (System.currentTimeMillis() - mStartTime) / mZoomDuration;
+            t = Math.min(1f, t);
+            t = mInterpolator.getInterpolation(t);
+            return t;
+        }
+    }
+
+    private class FlingRunnable implements Runnable {
+
+        private final OverScroller mScroller;
+        private int mCurrentX, mCurrentY;
+
+        public FlingRunnable(Context context) {
+            mScroller = new OverScroller(context);
+        }
+
+        public void cancelFling() {
+            mScroller.forceFinished(true);
+        }
+
+        public void fling(int viewWidth, int viewHeight, int velocityX,
+                          int velocityY) {
+            final RectF rect = getDisplayRect();
+            if (rect == null) {
+                return;
+            }
+            final int startX = Math.round(-rect.left);
+            final int minX, maxX, minY, maxY;
+            if (viewWidth < rect.width()) {
+                minX = 0;
+                maxX = Math.round(rect.width() - viewWidth);
+            } else {
+                minX = maxX = startX;
+            }
+            final int startY = Math.round(-rect.top);
+            if (viewHeight < rect.height()) {
+                minY = 0;
+                maxY = Math.round(rect.height() - viewHeight);
+            } else {
+                minY = maxY = startY;
+            }
+            mCurrentX = startX;
+            mCurrentY = startY;
+            // If we actually can move, fling the scroller
+            if (startX != maxX || startY != maxY) {
+                mScroller.fling(startX, startY, velocityX, velocityY, minX,
+                        maxX, minY, maxY, 0, 0);
+            }
+        }
+
+        @Override
+        public void run() {
+            if (mScroller.isFinished()) {
+                return; // remaining post that should not be handled
+            }
+            if (mScroller.computeScrollOffset()) {
+                final int newX = mScroller.getCurrX();
+                final int newY = mScroller.getCurrY();
+                mSuppMatrix.postTranslate(mCurrentX - newX, mCurrentY - newY);
+                checkAndDisplayMatrix();
+                mCurrentX = newX;
+                mCurrentY = newY;
+                // Post On animation
+                Compat.postOnAnimation(mImageView, this);
+            }
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/view/PhotoViewUtil.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/view/PhotoViewUtil.java
new file mode 100644
index 0000000..77cdd28
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/photoview/view/PhotoViewUtil.java
@@ -0,0 +1,37 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.view;
+
+import android.view.MotionEvent;
+import android.widget.ImageView;
+
+public class PhotoViewUtil {
+
+    public static void checkZoomLevels(float minZoom, float midZoom,
+                                       float maxZoom) {
+        if (minZoom >= midZoom) {
+            throw new IllegalArgumentException(
+                    "Minimum zoom has to be less than Medium zoom. Call setMinimumZoom() with a more appropriate value");
+        } else if (midZoom >= maxZoom) {
+            throw new IllegalArgumentException(
+                    "Medium zoom has to be less than Maximum zoom. Call setMaximumZoom() with a more appropriate value");
+        }
+    }
+
+    public static boolean hasDrawable(ImageView imageView) {
+        return imageView.getDrawable() != null;
+    }
+
+    public static boolean isSupportedScaleType(final ImageView.ScaleType scaleType) {
+        if (scaleType == null) {
+            return false;
+        }
+        switch (scaleType) {
+            case MATRIX:
+                throw new IllegalStateException("Matrix scale type is not supported");
+        }
+        return true;
+    }
+
+    public static int getPointerIndex(int action) {
+        return (action & MotionEvent.ACTION_POINTER_INDEX_MASK) >> MotionEvent.ACTION_POINTER_INDEX_SHIFT;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/popmenu/ChatPopMenu.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/popmenu/ChatPopMenu.java
new file mode 100644
index 0000000..d060041
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/popmenu/ChatPopMenu.java
@@ -0,0 +1,710 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.popmenu;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PixelFormat;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.PagerSnapHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.EmojiIndicatorView;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MessageRecyclerView;
+import com.tencent.qcloud.tuikit.tuichat.component.face.Emoji;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+import com.tencent.qcloud.tuikit.tuichat.component.face.RecentEmojiManager;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ChatPopMenu {
+    // action column num
+    private static final int ACTION_COLUMN_NUM = 5;
+    // emoji column num
+    private static final int EMOJI_COLUMN_NUM = 8;
+    private static final int EMOJI_ROW_NUM = 3;
+    private static final int RECENT_EMOJI_NUM = 6;
+    private static final String RECENT_EMOJI_KEY = "recentEmoji";
+    // shadow width
+    private static final int SHADOW_WIDTH = 10;
+    // rect radius
+    private static final int RECT_RADIUS = 16;
+
+    private final PopupWindow popupWindow;
+    private final Context context;
+    private final RecyclerView actionRecyclerView;
+    private final GridLayoutManager actionGridLayoutManager;
+    private final RecyclerView facePageRecyclerView;
+    private final LinearLayout facePageLinearLayout;
+    private final EmojiIndicatorView facePageIndicator;
+    private RecyclerView recentFaceView;
+    private View divideLine;
+    private FacePageAdapter facePageAdapter;
+    private final View popupView;
+    private final MenuAdapter menuAdapter;
+    private final List<ChatPopMenuAction> chatPopMenuActionList = new ArrayList<>();
+    private final List<Emoji> emojiList = new ArrayList<>();
+    private final List<String> recentEmojiList = new ArrayList<>();
+    private final ChatPopMenu chatPopMenu;
+    private MessageRecyclerView.OnEmptySpaceClickListener mEmptySpaceClickListener;
+    private EmojiOnClickListener emojiOnClickListener;
+    private boolean isShowMoreFace = false;
+
+    private View anchorView;
+    private int minY;
+    private final int indicatorHeight;
+    private int paddingTopOffset;
+    private int paddingBottomOffset;
+    private int oldFacePageIndex = 0;
+
+    private boolean isShowFaces = false;
+    public ChatPopMenu(Context context) {
+        chatPopMenu = this;
+        this.context = context;
+        initEmojiList();
+        popupView = LayoutInflater.from(context).inflate(R.layout.chat_pop_menu_layout, null);
+        indicatorHeight = context.getResources().getDimensionPixelOffset(R.dimen.chat_pop_menu_indicator_height);
+
+        // add space to show shadow
+        popupView.setPadding(popupView.getPaddingLeft() + SHADOW_WIDTH, popupView.getPaddingTop() + SHADOW_WIDTH,
+                popupView.getPaddingRight() + SHADOW_WIDTH, popupView.getPaddingBottom() + SHADOW_WIDTH);
+        // actions
+        actionRecyclerView = popupView.findViewById(R.id.chat_pop_menu_content_view);
+        actionGridLayoutManager = new GridLayoutManager(context, ACTION_COLUMN_NUM);
+        actionRecyclerView.setLayoutManager(actionGridLayoutManager);
+        int spaceWidth = context.getResources().getDimensionPixelSize(R.dimen.chat_pop_menu_item_space_width);
+        int spaceHeight = context.getResources().getDimensionPixelSize(R.dimen.chat_pop_menu_item_space_height);
+        actionRecyclerView.addItemDecoration(new GridDecoration(null, ACTION_COLUMN_NUM, spaceWidth, spaceHeight));
+        menuAdapter = new MenuAdapter();
+        actionRecyclerView.setAdapter(menuAdapter);
+
+        divideLine = popupView.findViewById(R.id.divide_line);
+        // recent faces
+        recentFaceView = popupView.findViewById(R.id.recent_faces);
+        recentFaceView.setItemAnimator(null);
+        LinearLayoutManager recentLayoutManager = new LinearLayoutManager(context, RecyclerView.HORIZONTAL, false);
+        int recentSpacing = ScreenUtil.dip2px(13.44f);
+        recentFaceView.addItemDecoration(new GridDecoration(null, RECENT_EMOJI_NUM + 1, recentSpacing, 0));
+        recentFaceView.setLayoutManager(recentLayoutManager);
+        RecentFaceAdapter recentFaceAdapter = new RecentFaceAdapter();
+        recentFaceView.setAdapter(recentFaceAdapter);
+        // grid faces
+        facePageLinearLayout = popupView.findViewById(R.id.face_grid_ll);
+        facePageRecyclerView = popupView.findViewById(R.id.face_grid);
+        facePageIndicator = popupView.findViewById(R.id.face_indicator);
+        facePageLinearLayout.setVisibility(View.GONE);
+        LinearLayoutManager faceLayoutManager = new LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false);
+        PagerSnapHelper snapHelper = new PagerSnapHelper();
+        snapHelper.attachToRecyclerView(facePageRecyclerView);
+        facePageRecyclerView.setLayoutManager(faceLayoutManager);
+        facePageAdapter = new FacePageAdapter();
+        facePageRecyclerView.setAdapter(facePageAdapter);
+        setFacePageIndicator(faceLayoutManager);
+
+        popupWindow = new PopupWindow(popupView, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, false);
+        popupWindow.setBackgroundDrawable(new ColorDrawable());
+        popupWindow.setTouchable(true);
+        popupWindow.setAnimationStyle(R.style.ChatPopMenuAnimation);
+        popupWindow.setOutsideTouchable(true);
+    }
+
+    private void setFacePageIndicator(LinearLayoutManager faceLayoutManager) {
+        facePageIndicator.init(facePageAdapter.getItemCount());
+        facePageRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+                int currentFacePageIndex;
+                if (dx >= 0) {
+                    currentFacePageIndex = faceLayoutManager.findLastVisibleItemPosition();
+                } else {
+                    currentFacePageIndex = faceLayoutManager.findFirstVisibleItemPosition();
+                }
+                // the page is not be selected
+                if (currentFacePageIndex == RecyclerView.NO_POSITION || oldFacePageIndex == currentFacePageIndex) {
+                    return;
+                }
+                facePageIndicator.playBy(oldFacePageIndex, currentFacePageIndex);
+                oldFacePageIndex = currentFacePageIndex;
+            }
+        });
+    }
+
+    public void setOnDismissListener(PopupWindow.OnDismissListener listener) {
+        if (popupWindow != null) {
+            popupWindow.setOnDismissListener(listener);
+        }
+    }
+
+    private void initEmojiList() {
+        emojiList.addAll(FaceManager.getEmojiList());
+        initDefaultEmoji();
+    }
+
+    private void initDefaultEmoji() {
+        List<String> emojis = null;
+        try {
+            emojis = (List<String>) RecentEmojiManager.getInstance().getCollection(RECENT_EMOJI_KEY);
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+        if (emojis == null) {
+            List<Emoji> subList = emojiList.subList(0, RECENT_EMOJI_NUM);
+            List<String> emojiKeys = new ArrayList<>();
+            for (Emoji emoji : subList) {
+                emojiKeys.add(emoji.getFaceKey());
+            }
+            emojis = new ArrayList<>(emojiKeys);
+            try {
+                RecentEmojiManager.getInstance().putCollection(RECENT_EMOJI_KEY, emojis);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        recentEmojiList.addAll(emojis);
+    }
+
+    private void updateRecentEmoji(Emoji emoji) {
+        recentEmojiList.remove(emoji.getFaceKey());
+        recentEmojiList.add(0, emoji.getFaceKey());
+        try {
+            RecentEmojiManager.getInstance().putCollection(RECENT_EMOJI_KEY, recentEmojiList);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void setShowFaces(boolean showFaces) {
+        isShowFaces = showFaces;
+    }
+
+    public void show(View anchorView, int minY) {
+        this.anchorView = anchorView;
+        this.minY = minY;
+        if (!isShowFaces) {
+            recentFaceView.setVisibility(View.GONE);
+            divideLine.setVisibility(View.GONE);
+        } else {
+            recentFaceView.setVisibility(View.VISIBLE);
+            if (chatPopMenuActionList.isEmpty()) {
+                divideLine.setVisibility(View.GONE);
+                actionRecyclerView.setVisibility(View.GONE);
+            } else {
+                divideLine.setVisibility(View.VISIBLE);
+                actionRecyclerView.setVisibility(View.VISIBLE);
+            }
+        }
+        popupView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+        popupView.setBackground(new PopIndicatorDrawable(anchorView, indicatorHeight, RECT_RADIUS));
+        showAtLocation();
+    }
+
+    private void showAtLocation() {
+        // reset padding
+        popupView.setPadding(popupView.getPaddingLeft(), popupView.getPaddingTop() - paddingTopOffset,
+                popupView.getPaddingRight(), popupView.getPaddingBottom() - paddingBottomOffset);
+        paddingTopOffset = 0;
+        paddingBottomOffset = 0;
+
+        int measureSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
+        popupView.measure(measureSpec, measureSpec);
+        int popWidth = popupView.getMeasuredWidth();
+        int popHeight = popupView.getMeasuredHeight();
+
+        float anchorWidth = anchorView.getWidth();
+        float anchorHeight = anchorView.getHeight();
+
+        int[] location = new int[2];
+        anchorView.getLocationOnScreen(location);
+        int screenWidth = ScreenUtil.getScreenWidth(context);
+        int x = location[0] - indicatorHeight;
+        int y = location[1] - popHeight - indicatorHeight;
+        // if popup show on the right
+        if (location[0] * 2 + anchorWidth > screenWidth) {
+            x = (int) (location[0] + anchorWidth - popWidth) + indicatorHeight;
+        }
+        // if it's too high, should show on the anchor's bottom
+        boolean isTop = y <= minY;
+
+        if (isTop) {
+            y = (int) (location[1] + anchorHeight + indicatorHeight);
+            // add paddingTop to show indicator
+            paddingTopOffset = indicatorHeight;
+            popupView.setPadding(popupView.getPaddingLeft(), popupView.getPaddingTop() + paddingTopOffset,
+                    popupView.getPaddingRight(), popupView.getPaddingBottom());
+        } else {
+            // add paddingBottom to show indicator
+            paddingBottomOffset = indicatorHeight;
+            popupView.setPadding(popupView.getPaddingLeft(), popupView.getPaddingTop(),
+                    popupView.getPaddingRight(), popupView.getPaddingBottom() + paddingBottomOffset);
+            y = y - indicatorHeight;
+        }
+        if (popupWindow.isShowing()) {
+            popupWindow.update(x, y, -1, -1, true);
+        } else {
+            popupWindow.showAtLocation(anchorView, Gravity.NO_GRAVITY, x, y);
+        }
+    }
+
+    public void hide() {
+        if (popupWindow != null && popupWindow.isShowing()) {
+            popupWindow.dismiss();
+        }
+    }
+
+    public void setChatPopMenuActionList(List<ChatPopMenuAction> actionList) {
+        chatPopMenuActionList.clear();
+        chatPopMenuActionList.addAll(actionList);
+        if (!chatPopMenuActionList.isEmpty() && chatPopMenuActionList.size() < ACTION_COLUMN_NUM) {
+            actionGridLayoutManager.setSpanCount(chatPopMenuActionList.size());
+        }
+        menuAdapter.notifyDataSetChanged();
+    }
+
+    public void setEmptySpaceClickListener(MessageRecyclerView.OnEmptySpaceClickListener mEmptySpaceClickListener) {
+        this.mEmptySpaceClickListener = mEmptySpaceClickListener;
+    }
+
+    private ChatPopMenuAction getChatPopMenuAction(int position) {
+        return chatPopMenuActionList.get(position);
+    }
+
+    public void setEmojiOnClickListener(EmojiOnClickListener emojiOnClickListener) {
+        this.emojiOnClickListener = emojiOnClickListener;
+    }
+
+    private void refreshLayout() {
+        if (isShowMoreFace) {
+            facePageLinearLayout.setVisibility(View.VISIBLE);
+            actionRecyclerView.setVisibility(View.GONE);
+            divideLine.setVisibility(View.VISIBLE);
+        } else {
+            facePageLinearLayout.setVisibility(View.GONE);
+            if (chatPopMenuActionList.isEmpty()) {
+                divideLine.setVisibility(View.GONE);
+                actionRecyclerView.setVisibility(View.GONE);
+            } else {
+                divideLine.setVisibility(View.VISIBLE);
+                actionRecyclerView.setVisibility(View.VISIBLE);
+            }
+        }
+        showAtLocation();
+    }
+
+    class PopIndicatorDrawable extends Drawable {
+        private final Paint paint = new Paint();
+        private final Path path = new Path();
+        private final View anchorView;
+        private final int indicatorHeight;
+        private final float radius;
+
+        public PopIndicatorDrawable(View anchorView, int indicatorHeight, float radius) {
+            this.radius = radius;
+            this.anchorView = anchorView;
+            this.indicatorHeight = indicatorHeight;
+            paint.setColor(Color.WHITE);
+            paint.setStyle(Paint.Style.FILL);
+            paint.setShadowLayer(SHADOW_WIDTH, 0,0,0xFFAAAAAA);
+        }
+
+        @Override
+        public void draw(@NonNull Canvas canvas) {
+            Rect bounds = getBounds();
+            float widthPixel = bounds.width();
+            float heightPixel = bounds.height();
+            float anchorWidth = anchorView.getWidth();
+            int[] anchorLocation = new int[2];
+            anchorView.getLocationOnScreen(anchorLocation);
+            int anchorX = anchorLocation[0];
+            int anchorY = anchorLocation[1];
+
+            int[] popLocation = new int[2];
+            popupView.getLocationOnScreen(popLocation);
+            int popX = popLocation[0];
+            int popY = popLocation[1];
+
+            int indicatorX = (int) (anchorX + anchorWidth / 2 - popX);
+            boolean isTop = anchorY < popY;
+
+            path.reset();
+            // indicator on the top
+            if (isTop) {
+                float top = indicatorHeight + SHADOW_WIDTH;
+                path.addRoundRect(new RectF(SHADOW_WIDTH, top, widthPixel -  SHADOW_WIDTH,
+                        heightPixel - SHADOW_WIDTH), radius, radius, Path.Direction.CW);
+                path.moveTo(indicatorX - indicatorHeight, top);
+                path.lineTo(indicatorX, top - indicatorHeight);
+                path.lineTo(indicatorX + indicatorHeight, top);
+            } else {
+                float bottom = heightPixel - SHADOW_WIDTH - indicatorHeight;
+                path.addRoundRect(new RectF(SHADOW_WIDTH, SHADOW_WIDTH, widthPixel - SHADOW_WIDTH,
+                        bottom), radius, radius, Path.Direction.CW);
+                path.moveTo(indicatorX - indicatorHeight, bottom);
+                path.lineTo(indicatorX, bottom + indicatorHeight);
+                path.lineTo(indicatorX + indicatorHeight, bottom);
+            }
+            path.close();
+            canvas.drawPath(path, paint);
+        }
+
+        @Override
+        public void setAlpha(int alpha) {
+
+        }
+
+        @Override
+        public void setColorFilter(@Nullable ColorFilter colorFilter) {
+
+        }
+
+        @Override
+        public int getOpacity() {
+            return PixelFormat.TRANSLUCENT;
+        }
+    }
+
+    class RecentFaceAdapter extends RecyclerView.Adapter<RecentFaceAdapter.RecentFaceViewHolder> {
+
+        @NonNull
+        @Override
+        public RecentFaceViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            View faceView = LayoutInflater.from(parent.getContext()).inflate(R.layout.chat_menu_recent_face_item_layout, parent, false);
+            return new RecentFaceViewHolder(faceView);
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull RecentFaceViewHolder holder, int position) {
+            Emoji emoji;
+            if (position == RECENT_EMOJI_NUM) {
+                emoji = new Emoji();
+                Bitmap bitMap;
+                if (!isShowMoreFace) {
+                    bitMap = BitmapFactory.decodeResource(context.getResources(), R.drawable.chat_menu_face_show_more);
+                } else {
+                    bitMap = BitmapFactory.decodeResource(context.getResources(), R.drawable.chat_menu_face_hide_more);
+                }
+                emoji.setIcon(bitMap);
+            } else {
+                emoji = getEmoji(recentEmojiList.get(position));
+            }
+            if (emoji == null) {
+                return;
+            }
+            holder.faceIv.setImageBitmap(emoji.getIcon());
+            if (emojiOnClickListener != null) {
+                holder.faceIv.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        if (position == RECENT_EMOJI_NUM) {
+                            isShowMoreFace = !isShowMoreFace;
+                            refreshLayout();
+                            notifyItemChanged(position);
+                        } else {
+                            emojiOnClickListener.onClick(emoji);
+                            updateRecentEmoji(emoji);
+                            hide();
+                        }
+                    }
+                });
+            }
+        }
+
+        private Emoji getEmoji(String emojiKey) {
+            for (Emoji emoji : emojiList) {
+                if (TextUtils.equals(emoji.getFaceKey(), emojiKey)) {
+                    return emoji;
+                }
+            }
+            return null;
+        }
+
+        @Override
+        public int getItemCount() {
+            return RECENT_EMOJI_NUM + 1;
+        }
+
+        class RecentFaceViewHolder extends RecyclerView.ViewHolder {
+            ImageView faceIv;
+            public RecentFaceViewHolder(@NonNull View itemView) {
+                super(itemView);
+                faceIv = itemView.findViewById(R.id.face_iv);
+            }
+        }
+    }
+
+    class FacePageAdapter extends RecyclerView.Adapter<FacePageAdapter.FacePageViewHolder> {
+
+        @NonNull
+        @Override
+        public FacePageAdapter.FacePageViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            RecyclerView faceGridView = new RecyclerView(parent.getContext());
+            faceGridView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+            faceGridView.setLayoutManager(new GridLayoutManager(parent.getContext(), EMOJI_COLUMN_NUM));
+            int faceVerticalSpacing = ScreenUtil.dip2px(16.32f);
+            int faceHorizontalSpacing = ScreenUtil.dip2px(9.12f);
+            faceGridView.addItemDecoration(new FaceGridDecoration(EMOJI_COLUMN_NUM, faceHorizontalSpacing, faceVerticalSpacing));
+            return new FacePageViewHolder(faceGridView);
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull FacePageAdapter.FacePageViewHolder holder, int position) {
+            FaceGridAdapter faceGridAdapter = new FaceGridAdapter();
+            holder.recyclerView.setAdapter(faceGridAdapter);
+            int startIndex = position * EMOJI_ROW_NUM * EMOJI_COLUMN_NUM;
+            int endIndex = (position + 1) * EMOJI_COLUMN_NUM * EMOJI_ROW_NUM;
+            if (endIndex > emojiList.size()) {
+                endIndex = emojiList.size();
+            }
+            List<Emoji> data = emojiList.subList(startIndex, endIndex);
+            faceGridAdapter.setData(data);
+        }
+
+        @Override
+        public int getItemCount() {
+            return (int) Math.ceil(emojiList.size() * 1.0f / (EMOJI_COLUMN_NUM * EMOJI_ROW_NUM));
+        }
+
+        class FacePageViewHolder extends RecyclerView.ViewHolder {
+            public RecyclerView recyclerView;
+            public FacePageViewHolder(@NonNull View itemView) {
+                super(itemView);
+                recyclerView = (RecyclerView) itemView;
+            }
+        }
+    }
+
+    class FaceGridAdapter extends RecyclerView.Adapter<FaceViewHolder> {
+        private List<Emoji> data;
+
+        public void setData(List<Emoji> data) {
+            this.data = data;
+            notifyDataSetChanged();
+        }
+
+        @NonNull
+        @Override
+        public FaceViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            View faceView = LayoutInflater.from(parent.getContext()).inflate(R.layout.chat_menu_face_item_layout, parent, false);
+            return new FaceViewHolder(faceView);
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull FaceViewHolder holder, int position) {
+            Emoji emoji = data.get(position);
+            holder.faceIv.setBackground(new BitmapDrawable(holder.itemView.getResources(), emoji.getIcon()));
+            if (emojiOnClickListener != null) {
+                holder.faceIv.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        emojiOnClickListener.onClick(emoji);
+                        updateRecentEmoji(emoji);
+                        hide();
+                    }
+                });
+            }
+        }
+
+        @Override
+        public int getItemCount() {
+            if (data == null) {
+                return 0;
+            }
+            return data.size();
+        }
+    }
+
+    static class FaceViewHolder extends RecyclerView.ViewHolder {
+        ImageView faceIv;
+        public FaceViewHolder(@NonNull View itemView) {
+            super(itemView);
+            faceIv = itemView.findViewById(R.id.face_iv);
+        }
+    }
+
+    static class FaceGridDecoration extends RecyclerView.ItemDecoration {
+
+        private final int columnNum;
+        private final int leftRightSpace; // horizontal spacing
+        private final int topBottomSpace; // vertical spacing
+
+        public FaceGridDecoration(int columnNum, int leftRightSpace, int topBottomSpace) {
+            this.columnNum = columnNum;
+            this.leftRightSpace = leftRightSpace;
+            this.topBottomSpace = topBottomSpace;
+        }
+
+        @Override
+        public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+            int position = parent.getChildAdapterPosition(view);
+            int column = position % columnNum;
+
+            outRect.left = column * leftRightSpace / columnNum;
+            outRect.right = leftRightSpace * (columnNum - 1 - column) / columnNum;
+
+            // grid has multi rows, add top spacing
+            if (position >= columnNum) {
+                outRect.top = topBottomSpace;
+            }
+        }
+    }
+
+    class MenuAdapter extends RecyclerView.Adapter<MenuAdapter.MenuItemViewHolder> {
+        @NonNull
+        @Override
+        public MenuAdapter.MenuItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            View view = LayoutInflater.from(context).inflate(R.layout.chat_pop_menu_item_layout, parent, false);
+            return new MenuItemViewHolder(view);
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull MenuAdapter.MenuItemViewHolder holder, int position) {
+            ChatPopMenuAction chatPopMenuAction = getChatPopMenuAction(position);
+            holder.title.setText(chatPopMenuAction.actionName);
+            Drawable drawable = ResourcesCompat.getDrawable(context.getResources(), chatPopMenuAction.actionIcon, null);
+            holder.icon.setImageDrawable(drawable);
+            holder.itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    chatPopMenuAction.actionClickListener.onClick();
+                    chatPopMenu.hide();
+
+                    if (mEmptySpaceClickListener != null) {
+                        mEmptySpaceClickListener.onClick();
+                    }
+                }
+            });
+        }
+
+        @Override
+        public int getItemCount() {
+            return chatPopMenuActionList.size();
+        }
+
+        class MenuItemViewHolder extends RecyclerView.ViewHolder {
+            public TextView title;
+            public ImageView icon;
+
+            public MenuItemViewHolder(@NonNull View itemView) {
+                super(itemView);
+                title = itemView.findViewById(R.id.menu_title);
+                icon = itemView.findViewById(R.id.menu_icon);
+            }
+        }
+    }
+
+    static class GridDecoration extends RecyclerView.ItemDecoration {
+
+        private final int columnNum;
+        private final int leftRightSpace;
+        private final int topBottomSpace;
+        private final Drawable divider;
+
+        public GridDecoration(Drawable divider, int columnNum, int leftRightSpace, int topBottomSpace) {
+            this.divider = divider;
+            this.columnNum = columnNum;
+            this.leftRightSpace = leftRightSpace;
+            this.topBottomSpace = topBottomSpace;
+        }
+
+        @Override
+        public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+            int position = parent.getChildAdapterPosition(view);
+            int column = position % columnNum;
+
+            outRect.left = column * leftRightSpace / columnNum;
+            outRect.right = leftRightSpace * (columnNum - 1 - column) / columnNum;
+
+            if (position >= columnNum) {
+                outRect.top = topBottomSpace;
+            }
+        }
+
+        @Override
+        public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
+            if (divider == null) {
+                return;
+            }
+            canvas.save();
+            final int childCount = parent.getChildCount();
+            int rowNum = (int) Math.ceil(childCount * 1.0f / columnNum);
+            final int divideLine = rowNum - 1;
+            for (int i = 0; i < divideLine; i++) {
+                View startChild = parent.getChildAt(i * columnNum);
+                View endChild = parent.getChildAt((i + 1) * columnNum - 1);
+                final int bottom = startChild.getBottom();
+                final int top = bottom - divider.getIntrinsicHeight();
+                divider.setBounds(startChild.getLeft(), top + topBottomSpace / 2, endChild.getRight(), bottom + topBottomSpace / 2);
+                divider.draw(canvas);
+            }
+            canvas.restore();
+        }
+    }
+
+    public interface EmojiOnClickListener {
+        void onClick(Emoji emoji);
+    }
+
+    public static class ChatPopMenuAction {
+        private String actionName;
+        private int actionIcon;
+        private OnClickListener actionClickListener;
+
+        public void setActionName(String actionName) {
+            this.actionName = actionName;
+        }
+
+        public String getActionName() {
+            return actionName;
+        }
+
+        public void setActionIcon(int actionIcon) {
+            this.actionIcon = actionIcon;
+        }
+
+        public int getActionIcon() {
+            return actionIcon;
+        }
+
+        public void setActionClickListener(OnClickListener actionClickListener) {
+            this.actionClickListener = actionClickListener;
+        }
+
+        public OnClickListener getActionClickListener() {
+            return actionClickListener;
+        }
+
+        @FunctionalInterface
+        public interface OnClickListener {
+            void onClick();
+        }
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/video/UIKitVideoView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/video/UIKitVideoView.java
new file mode 100644
index 0000000..fbebf7b
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/video/UIKitVideoView.java
@@ -0,0 +1,368 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.video;
+
+import android.content.Context;
+import android.graphics.SurfaceTexture;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.Surface;
+import android.view.TextureView;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.video.proxy.IPlayer;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.video.proxy.MediaPlayerProxy;
+
+public class UIKitVideoView extends TextureView {
+
+    private static final String TAG = UIKitVideoView.class.getSimpleName();
+
+    private static int STATE_ERROR = -1;
+    private static int STATE_IDLE = 0;
+    private static int STATE_PREPARING = 1;
+    private static int STATE_PREPARED = 2;
+    private static int STATE_PLAYING = 3;
+    private static int STATE_PAUSED = 4;
+    private static int STATE_PLAYBACK_COMPLETED = 5;
+    private static int STATE_STOPPED = 6;
+
+    private int mCurrentState = STATE_IDLE;
+
+    private Context mContext;
+    private Surface mSurface;
+    private MediaPlayerProxy mMediaPlayer;
+
+    private Uri mUri;
+    private int mVideoWidth;
+    private int mVideoHeight;
+    private int mVideoRotationDegree;
+
+    private IPlayer.OnPreparedListener mOutOnPreparedListener;
+    private IPlayer.OnErrorListener mOutOnErrorListener;
+    private IPlayer.OnCompletionListener mOutOnCompletionListener;
+    private IPlayer.OnSeekCompleteListener mOnSeekCompleteListener;
+    private IPlayer.OnPreparedListener mOnPreparedListener = new IPlayer.OnPreparedListener() {
+        public void onPrepared(IPlayer mp) {
+            mCurrentState = STATE_PREPARED;
+            mVideoHeight = mp.getVideoHeight();
+            mVideoWidth = mp.getVideoWidth();
+            Log.i(TAG, "onPrepared mVideoWidth: " + mVideoWidth
+                    + " mVideoHeight: " + mVideoHeight
+                    + " mVideoRotationDegree: " + mVideoRotationDegree);
+            if (mOutOnPreparedListener != null) {
+                mOutOnPreparedListener.onPrepared(mp);
+            }
+        }
+    };
+    private IPlayer.OnErrorListener mOnErrorListener = new IPlayer.OnErrorListener() {
+        public boolean onError(IPlayer mp, int what, int extra) {
+            Log.w(TAG, "onError: what/extra: " + what + "/" + extra);
+            mCurrentState = STATE_ERROR;
+            stop_l();
+            if (mOutOnErrorListener != null) {
+                mOutOnErrorListener.onError(mp, what, extra);
+            }
+            return true;
+        }
+    };
+    private IPlayer.OnInfoListener mOnInfoListener = new IPlayer.OnInfoListener() {
+        public void onInfo(IPlayer mp, int what, int extra) {
+            Log.w(TAG, "onInfo: what/extra: " + what + "/" + extra);
+            if (what == 10001) { // IJK: MEDIA_INFO_VIDEO_ROTATION_CHANGED
+                mVideoRotationDegree = extra;
+                setRotation(mVideoRotationDegree);
+                requestLayout();
+            }
+        }
+    };
+    private IPlayer.OnCompletionListener mOnCompletionListener = new IPlayer.OnCompletionListener() {
+        public void onCompletion(IPlayer mp) {
+            Log.i(TAG, "onCompletion");
+            mCurrentState = STATE_PLAYBACK_COMPLETED;
+            if (mOutOnCompletionListener != null) {
+                mOutOnCompletionListener.onCompletion(mp);
+            }
+        }
+    };
+    private IPlayer.OnVideoSizeChangedListener mOnVideoSizeChangedListener = new IPlayer.OnVideoSizeChangedListener() {
+        @Override
+        public void onVideoSizeChanged(IPlayer mp, int width, int height) {
+            // TUIChatLog.i(TAG, "onVideoSizeChanged width: " + width + " height: " + height);
+        }
+    };
+
+    private IPlayer.OnSeekCompleteListener onSeekCompleteListener = new IPlayer.OnSeekCompleteListener() {
+        @Override
+        public void OnSeekComplete(IPlayer mp) {
+            if (mOnSeekCompleteListener != null) {
+                mOnSeekCompleteListener.OnSeekComplete(mp);
+            }
+        }
+    };
+    private SurfaceTextureListener mSurfaceTextureListener = new SurfaceTextureListener() {
+
+        @Override
+        public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
+            Log.i(TAG, "onSurfaceTextureAvailable");
+            mSurface = new Surface(surface);
+            openVideo();
+        }
+
+        @Override
+        public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
+            Log.i(TAG, "onSurfaceTextureSizeChanged");
+        }
+
+        @Override
+        public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
+            Log.i(TAG, "onSurfaceTextureDestroyed");
+            return true;
+        }
+
+        @Override
+        public void onSurfaceTextureUpdated(SurfaceTexture surface) {
+            // TUIChatLog.i(TAG,"onSurfaceTextureUpdated");
+        }
+    };
+
+    public UIKitVideoView(Context context) {
+        super(context);
+        initVideoView(context);
+    }
+
+    public UIKitVideoView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initVideoView(context);
+    }
+
+    public UIKitVideoView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initVideoView(context);
+    }
+
+    private void initVideoView(Context context) {
+        Log.i(TAG, "initVideoView");
+        mContext = context;
+        setSurfaceTextureListener(mSurfaceTextureListener);
+        mCurrentState = STATE_IDLE;
+    }
+
+    public void setOnPreparedListener(IPlayer.OnPreparedListener l) {
+        mOutOnPreparedListener = l;
+    }
+
+    public void setOnSeekCompleteListener(IPlayer.OnSeekCompleteListener l) {
+        mOnSeekCompleteListener = l;
+    }
+
+    public void setOnErrorListener(IPlayer.OnErrorListener l) {
+        mOutOnErrorListener = l;
+    }
+
+    public void setOnCompletionListener(IPlayer.OnCompletionListener l) {
+        mOutOnCompletionListener = l;
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        //  TUIChatLog.i(TAG, "onMeasure(" + MeasureSpec.toString(widthMeasureSpec) + ", "
+        //        + MeasureSpec.toString(heightMeasureSpec) + ")"
+        //        + " mVideoWidth: " + mVideoWidth
+        //        + " mVideoHeight: " + mVideoHeight);
+
+        int width = getDefaultSize(mVideoWidth, widthMeasureSpec);
+        int height = getDefaultSize(mVideoHeight, heightMeasureSpec);
+        int widthSpecMode = MeasureSpec.getMode(widthMeasureSpec);
+        int widthSpecSize = MeasureSpec.getSize(widthMeasureSpec);
+        int heightSpecMode = MeasureSpec.getMode(heightMeasureSpec);
+        int heightSpecSize = MeasureSpec.getSize(heightMeasureSpec);
+        if (mVideoWidth > 0 && mVideoHeight > 0) {
+            if (widthSpecMode == MeasureSpec.EXACTLY && heightSpecMode == MeasureSpec.EXACTLY) {
+                // the size is fixed
+                width = widthSpecSize;
+                height = heightSpecSize;
+
+                // for compatibility, we adjust size based on aspect ratio
+                if (mVideoWidth * height < width * mVideoHeight) {
+                    //Log.i("@@@", "image too wide, correcting");
+                    width = height * mVideoWidth / mVideoHeight;
+                } else if (mVideoWidth * height > width * mVideoHeight) {
+                    //Log.i("@@@", "image too tall, correcting");
+                    height = width * mVideoHeight / mVideoWidth;
+                }
+            } else if (widthSpecMode == MeasureSpec.EXACTLY) {
+                // only the width is fixed, adjust the height to match aspect ratio if possible
+                width = widthSpecSize;
+                height = width * mVideoHeight / mVideoWidth;
+                if (heightSpecMode == MeasureSpec.AT_MOST && height > heightSpecSize) {
+                    // couldn't match aspect ratio within the constraints
+                    height = heightSpecSize;
+                }
+            } else if (heightSpecMode == MeasureSpec.EXACTLY) {
+                // only the height is fixed, adjust the width to match aspect ratio if possible
+                height = heightSpecSize;
+                width = height * mVideoWidth / mVideoHeight;
+                if (widthSpecMode == MeasureSpec.AT_MOST && width > widthSpecSize) {
+                    // couldn't match aspect ratio within the constraints
+                    width = widthSpecSize;
+                }
+            } else {
+                // neither the width nor the height are fixed, try to use actual video size
+                width = mVideoWidth;
+                height = mVideoHeight;
+                if (heightSpecMode == MeasureSpec.AT_MOST && height > heightSpecSize) {
+                    // too tall, decrease both width and height
+                    height = heightSpecSize;
+                    width = height * mVideoWidth / mVideoHeight;
+                }
+                if (widthSpecMode == MeasureSpec.AT_MOST && width > widthSpecSize) {
+                    // too wide, decrease both width and height
+                    width = widthSpecSize;
+                    height = width * mVideoHeight / mVideoWidth;
+                }
+            }
+        } else {
+            // no size yet, just adopt the given spec sizes
+        }
+        Log.i(TAG, "onMeasure width: " + width + " height: " + height + " rotation degree: " + mVideoRotationDegree);
+        setMeasuredDimension(width, height);
+        if ((mVideoRotationDegree + 180) % 180 != 0) {
+            // 画面旋转之后需要缩放，而且旋转之后宽高的计算都要换为高宽。
+            // After the screen is rotated, it needs to be scaled, and the calculation of width and height after rotation must be changed to height and width.
+            int[] size = ScreenUtil.scaledSize(widthSpecSize, heightSpecSize, height, width);
+            Log.i(TAG, "onMeasure scaled width: " + size[0] + " height: " + size[1]);
+            setScaleX(size[0] / ((float) height));
+            setScaleY(size[1] / ((float) width));
+        }
+    }
+
+    public void setVideoURI(Uri uri) {
+        mUri = uri;
+        openVideo();
+    }
+
+    public void resetVideo() {
+        openVideo();
+    }
+
+    private void openVideo() {
+        if (mUri == null) {
+            Log.e(TAG, "openVideo: mUri is null ");
+            return;
+        }
+        Log.i(TAG, "openVideo: mUri: " + mUri.getPath() + " mSurface: " + mSurface);
+        if (mSurface == null) {
+            Log.e(TAG, "openVideo: mSurface is null ");
+            return;
+        }
+
+        stop_l();
+        try {
+            mMediaPlayer = new MediaPlayerProxy();
+            mMediaPlayer.setOnPreparedListener(mOnPreparedListener);
+            mMediaPlayer.setOnCompletionListener(mOnCompletionListener);
+            mMediaPlayer.setOnErrorListener(mOnErrorListener);
+            mMediaPlayer.setOnInfoListener(mOnInfoListener);
+            mMediaPlayer.setOnVideoSizeChangedListener(mOnVideoSizeChangedListener);
+            mMediaPlayer.setOnSeekCompleteListener(mOnSeekCompleteListener);
+            mMediaPlayer.setSurface(mSurface);
+            mMediaPlayer.setDataSource(getContext(), mUri);
+            mMediaPlayer.prepareAsync();
+            mCurrentState = STATE_PREPARING;
+        } catch (Exception ex) {
+            Log.w(TAG, "ex = " + ex.getMessage());
+            mCurrentState = STATE_ERROR;
+        }
+
+    }
+
+    public boolean start() {
+        Log.i(TAG, "start mCurrentState:" + mCurrentState);
+        if (mMediaPlayer != null) {
+            mMediaPlayer.start();
+            mCurrentState = STATE_PLAYING;
+        }
+        return true;
+    }
+
+    public boolean stop() {
+        Log.i(TAG, "stop mCurrentState:" + mCurrentState);
+        stop_l();
+        return true;
+    }
+
+    public boolean pause() {
+        Log.i(TAG, "pause mCurrentState:" + mCurrentState);
+        if (mMediaPlayer != null) {
+            mMediaPlayer.pause();
+            mCurrentState = STATE_PAUSED;
+        }
+        return true;
+    }
+
+    public void stop_l() {
+        if (mMediaPlayer != null) {
+            mMediaPlayer.stop();
+            mMediaPlayer.release();
+            mMediaPlayer = null;
+            mCurrentState = STATE_IDLE;
+        }
+    }
+
+    public boolean isPlaying() {
+        if (mMediaPlayer != null) {
+            return mMediaPlayer.isPlaying();
+        }
+        return false;
+    }
+
+    public void seekTo(int progress) {
+        if (mMediaPlayer != null) {
+            mMediaPlayer.seekTo(progress);
+        }
+    }
+
+    public boolean isPrepared() {
+        if (mUri == null) {
+            Log.e(TAG, "isPrepared: mUri is null ");
+            return false;
+        }
+        Log.i(TAG, "isPrepared: mUri: " + mUri.getPath() + " mSurface: " + mSurface);
+        if (mSurface == null) {
+            Log.e(TAG, "isPrepared: mSurface is null ");
+            return false;
+        }
+
+        return true;
+    }
+
+    public int getCurrentPosition() {
+        if (mMediaPlayer != null) {
+            return mMediaPlayer.getCurrentPosition();
+        }
+        return 0;
+    }
+
+    public int getDuration() {
+        if (mMediaPlayer != null) {
+            return mMediaPlayer.getDuration();
+        }
+        return 0;
+    }
+
+
+    @Override
+    public void setBackgroundDrawable(Drawable background) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N && background != null) {
+            super.setBackgroundDrawable(background);
+        }
+    }
+
+    @Override
+    public void setOnClickListener(@Nullable OnClickListener l) {
+        super.setOnClickListener(l);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/video/listener/ResultListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/video/listener/ResultListener.java
new file mode 100644
index 0000000..e430595
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/video/listener/ResultListener.java
@@ -0,0 +1,5 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.video.listener;
+
+public interface ResultListener {
+    void callback();
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/video/proxy/IPlayer.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/video/proxy/IPlayer.java
new file mode 100644
index 0000000..918a8fa
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/video/proxy/IPlayer.java
@@ -0,0 +1,73 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.video.proxy;
+
+import android.content.Context;
+import android.net.Uri;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+
+import java.io.IOException;
+
+public interface IPlayer {
+
+    void setOnPreparedListener(final OnPreparedListener l);
+
+    void setOnErrorListener(final OnErrorListener l);
+
+    void setOnCompletionListener(final OnCompletionListener l);
+
+    void setOnVideoSizeChangedListener(final OnVideoSizeChangedListener l);
+
+    void setOnSeekCompleteListener(final OnSeekCompleteListener l);
+
+    void setOnInfoListener(final OnInfoListener l);
+
+    void setDisplay(SurfaceHolder sh);
+
+    void setSurface(Surface sh);
+
+    void setDataSource(Context context, Uri uri) throws IOException, IllegalArgumentException, SecurityException, IllegalStateException;
+
+    void prepareAsync();
+
+    void release();
+
+    void start();
+
+    void stop();
+
+    void pause();
+
+    boolean isPlaying();
+
+    int getVideoWidth();
+
+    int getVideoHeight();
+
+    void seekTo(int progress);
+    int getCurrentPosition();
+    int getDuration();
+
+    interface OnPreparedListener {
+        void onPrepared(IPlayer mp);
+    }
+
+    interface OnErrorListener {
+        boolean onError(IPlayer mp, int what, int extra);
+    }
+
+    interface OnCompletionListener {
+        void onCompletion(IPlayer mp);
+    }
+
+    interface OnVideoSizeChangedListener {
+        void onVideoSizeChanged(IPlayer mp, int width, int height);
+    }
+
+    interface OnInfoListener {
+        void onInfo(IPlayer mp, int what, int extra);
+    }
+
+    interface OnSeekCompleteListener {
+        void OnSeekComplete(IPlayer mp);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/video/proxy/MediaPlayerProxy.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/video/proxy/MediaPlayerProxy.java
new file mode 100644
index 0000000..d99d731
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/video/proxy/MediaPlayerProxy.java
@@ -0,0 +1,121 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.video.proxy;
+
+import android.content.Context;
+import android.net.Uri;
+import android.util.Log;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+
+import java.io.IOException;
+
+public class MediaPlayerProxy implements IPlayer {
+
+    private static final String TAG = MediaPlayerProxy.class.getSimpleName();
+
+    private IPlayer mMediaPlayer;
+
+    public MediaPlayerProxy() {
+        mMediaPlayer = new SystemMediaPlayerWrapper();
+        Log.i(TAG, "use mMediaPlayer: " + mMediaPlayer);
+    }
+
+    @Override
+    public void setOnPreparedListener(final OnPreparedListener l) {
+        mMediaPlayer.setOnPreparedListener(l);
+    }
+
+    @Override
+    public void setOnErrorListener(final OnErrorListener l) {
+        mMediaPlayer.setOnErrorListener(l);
+    }
+
+    @Override
+    public void setOnCompletionListener(final OnCompletionListener l) {
+        mMediaPlayer.setOnCompletionListener(l);
+    }
+
+    @Override
+    public void setOnVideoSizeChangedListener(final OnVideoSizeChangedListener l) {
+        mMediaPlayer.setOnVideoSizeChangedListener(l);
+    }
+
+    @Override
+    public void setOnSeekCompleteListener(OnSeekCompleteListener l) {
+        mMediaPlayer.setOnSeekCompleteListener(l);
+    }
+
+    @Override
+    public void setOnInfoListener(final OnInfoListener l) {
+        mMediaPlayer.setOnInfoListener(l);
+    }
+
+    @Override
+    public void setDisplay(SurfaceHolder sh) {
+        mMediaPlayer.setDisplay(sh);
+    }
+
+    @Override
+    public void setSurface(Surface sh) {
+        mMediaPlayer.setSurface(sh);
+    }
+
+    @Override
+    public void setDataSource(Context context, Uri uri) throws IOException, IllegalArgumentException, SecurityException, IllegalStateException {
+        mMediaPlayer.setDataSource(context, uri);
+    }
+
+    @Override
+    public void prepareAsync() {
+        mMediaPlayer.prepareAsync();
+    }
+
+    @Override
+    public void release() {
+        mMediaPlayer.release();
+    }
+
+    @Override
+    public void start() {
+        mMediaPlayer.start();
+    }
+
+    @Override
+    public void stop() {
+        mMediaPlayer.stop();
+    }
+
+    @Override
+    public void pause() {
+        mMediaPlayer.pause();
+    }
+
+    @Override
+    public boolean isPlaying() {
+        return mMediaPlayer.isPlaying();
+    }
+
+    @Override
+    public int getVideoWidth() {
+        return mMediaPlayer.getVideoWidth();
+    }
+
+    @Override
+    public int getVideoHeight() {
+        return mMediaPlayer.getVideoHeight();
+    }
+
+    @Override
+    public void seekTo(int progress) {
+        mMediaPlayer.seekTo(progress);
+    }
+
+    @Override
+    public int getCurrentPosition() {
+        return mMediaPlayer.getCurrentPosition();
+    }
+
+    @Override
+    public int getDuration() {
+        return mMediaPlayer.getDuration();
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/video/proxy/SystemMediaPlayerWrapper.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/video/proxy/SystemMediaPlayerWrapper.java
new file mode 100644
index 0000000..517b041
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/video/proxy/SystemMediaPlayerWrapper.java
@@ -0,0 +1,155 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.video.proxy;
+
+import android.content.Context;
+import android.media.MediaPlayer;
+import android.net.Uri;
+import android.os.Build;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+
+import java.io.IOException;
+
+public class SystemMediaPlayerWrapper implements IPlayer {
+
+    private MediaPlayer mMediaPlayer;
+
+    public SystemMediaPlayerWrapper() {
+        mMediaPlayer = new MediaPlayer();
+    }
+
+    @Override
+    public void setOnPreparedListener(final OnPreparedListener l) {
+        mMediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
+            @Override
+            public void onPrepared(MediaPlayer mp) {
+                l.onPrepared(SystemMediaPlayerWrapper.this);
+            }
+        });
+    }
+
+    @Override
+    public void setOnErrorListener(final OnErrorListener l) {
+        mMediaPlayer.setOnErrorListener(new MediaPlayer.OnErrorListener() {
+            @Override
+            public boolean onError(MediaPlayer mp, int what, int extra) {
+                return l.onError(SystemMediaPlayerWrapper.this, what, extra);
+            }
+        });
+    }
+
+    @Override
+    public void setOnCompletionListener(final OnCompletionListener l) {
+        mMediaPlayer.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
+            @Override
+            public void onCompletion(MediaPlayer mp) {
+                l.onCompletion(SystemMediaPlayerWrapper.this);
+            }
+        });
+    }
+
+    @Override
+    public void setOnSeekCompleteListener(final OnSeekCompleteListener l) {
+        mMediaPlayer.setOnSeekCompleteListener(new MediaPlayer.OnSeekCompleteListener() {
+            @Override
+            public void onSeekComplete(MediaPlayer mediaPlayer) {
+                l.OnSeekComplete(SystemMediaPlayerWrapper.this);
+            }
+        });
+    }
+
+    @Override
+    public void setOnVideoSizeChangedListener(final OnVideoSizeChangedListener l) {
+        mMediaPlayer.setOnVideoSizeChangedListener(new MediaPlayer.OnVideoSizeChangedListener() {
+            @Override
+            public void onVideoSizeChanged(MediaPlayer mp, int width, int height) {
+                l.onVideoSizeChanged(SystemMediaPlayerWrapper.this, width, height);
+            }
+        });
+    }
+
+    @Override
+    public void setOnInfoListener(final OnInfoListener l) {
+        mMediaPlayer.setOnInfoListener(new MediaPlayer.OnInfoListener() {
+            @Override
+            public boolean onInfo(MediaPlayer mp, int what, int extra) {
+                l.onInfo(SystemMediaPlayerWrapper.this, what, extra);
+                return false;
+            }
+        });
+    }
+
+    @Override
+    public void setDisplay(SurfaceHolder sh) {
+        mMediaPlayer.setDisplay(sh);
+    }
+
+    @Override
+    public void setSurface(Surface sh) {
+        mMediaPlayer.setSurface(sh);
+    }
+
+    @Override
+    public void setDataSource(Context context, Uri uri) throws IOException, IllegalArgumentException, SecurityException, IllegalStateException {
+        mMediaPlayer.setDataSource(context, uri);
+    }
+
+    @Override
+    public void prepareAsync() {
+        mMediaPlayer.prepareAsync();
+    }
+
+    @Override
+    public void release() {
+        mMediaPlayer.release();
+    }
+
+    @Override
+    public void start() {
+        mMediaPlayer.start();
+    }
+
+    @Override
+    public void stop() {
+        mMediaPlayer.stop();
+    }
+
+    @Override
+    public void pause() {
+        mMediaPlayer.pause();
+    }
+
+    @Override
+    public boolean isPlaying() {
+        return mMediaPlayer.isPlaying();
+    }
+
+    @Override
+    public int getVideoWidth() {
+        return mMediaPlayer.getVideoWidth();
+    }
+
+    @Override
+    public int getVideoHeight() {
+        return mMediaPlayer.getVideoHeight();
+    }
+
+    @Override
+    public void seekTo(int progress) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            mMediaPlayer.seekTo(progress, MediaPlayer.SEEK_CLOSEST);
+        } else {
+            mMediaPlayer.seekTo(progress);
+        }
+    }
+
+    @Override
+    public int getCurrentPosition() {
+        return mMediaPlayer.getCurrentPosition();
+    }
+
+    @Override
+    public int getDuration() {
+        return mMediaPlayer.getDuration();
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/video/util/AudioUtil.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/video/util/AudioUtil.java
new file mode 100644
index 0000000..60d1437
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/component/video/util/AudioUtil.java
@@ -0,0 +1,17 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.component.video.util;
+
+import android.content.Context;
+import android.media.AudioManager;
+
+public class AudioUtil {
+
+    public static void setAudioManage(Context context) {
+        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+        audioManager.setStreamMute(AudioManager.STREAM_SYSTEM, true);
+        audioManager.setStreamMute(AudioManager.STREAM_MUSIC, true);
+        audioManager.setStreamVolume(AudioManager.STREAM_ALARM, 0, 0);
+        audioManager.setStreamVolume(AudioManager.STREAM_DTMF, 0, 0);
+        audioManager.setStreamVolume(AudioManager.STREAM_NOTIFICATION, 0, 0);
+        audioManager.setStreamVolume(AudioManager.STREAM_RING, 0, 0);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/interfaces/IChatLayout.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/interfaces/IChatLayout.java
new file mode 100644
index 0000000..f2efe66
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/interfaces/IChatLayout.java
@@ -0,0 +1,87 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.interfaces;
+
+import com.tencent.qcloud.tuicore.component.interfaces.ILayout;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.noticelayout.NoticeLayout;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.classicui.setting.InputActionSetting;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.ChatView;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.input.InputView;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MessageRecyclerView;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+
+/**
+ * 聊天窗口 {@link ChatView} 提供了消息的展示与发送等功能，界面布局从上到下分为四个部分: <br>
+ * <pre>    标题区 {@link TitleBarLayout}，
+ *  提醒区 {@link NoticeLayout}，
+ *  消息区 {@link MessageRecyclerView}，
+ *  输入区 {@link InputView}，</pre>
+ * 每个区域提供了多样的方法以供定制使用。
+ * 
+ * 
+ * The chat window {@link ChatView} provides functions such as displaying and sending messages.
+ * The interface layout is divided into four parts from top to bottom:
+ *  TitleBarLayout {@link TitleBarLayout}，
+ *  NoticeLayout {@link NoticeLayout}，
+ *  MessageRecyclerView {@link MessageRecyclerView}，
+ *  InputView {@link InputView},
+ *  Each area offers a variety of methods for customization.
+ */
+public interface IChatLayout extends ILayout {
+
+    /**
+     * 获取聊天窗口 Input 区域 Layout
+     *
+     * @return
+     */
+    InputView getInputLayout();
+
+    /**
+     * 获取聊天窗口 Message 区域 Layout
+     *
+     * @return
+     */
+    MessageRecyclerView getMessageLayout();
+
+    /**
+     * 获取聊天窗口 Notice 区域 Layout
+     *
+     * @return
+     */
+    NoticeLayout getNoticeLayout();
+
+    /**
+     * 获取当前的会话信息
+     */
+    ChatInfo getChatInfo();
+
+    /**
+     * 设置当前的会话信息
+     *
+     * @param chatInfo
+     */
+    void setChatInfo(ChatInfo chatInfo);
+
+    /**
+     * 退出聊天，释放相关资源（一般在 activity finish 时调用）
+     */
+    void exitChat();
+
+    /**
+     * 初始化参数
+     */
+    void initDefault(InputActionSetting inputActionSetting);
+
+    /**
+     * 加载聊天消息
+     */
+    void loadMessages(int type);
+
+    /**
+     * 发送消息
+     *
+     * @param msg   消息
+     * @param retry 是否重试
+     */
+    void sendMessage(TUIMessageBean msg, boolean retry);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/interfaces/ICommonMessageAdapter.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/interfaces/ICommonMessageAdapter.java
new file mode 100644
index 0000000..d2a33fe
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/interfaces/ICommonMessageAdapter.java
@@ -0,0 +1,8 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.interfaces;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+public interface ICommonMessageAdapter {
+    TUIMessageBean getItem(int position);
+    void notifyItemChanged(int position);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/interfaces/IMessageLayout.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/interfaces/IMessageLayout.java
new file mode 100644
index 0000000..ec1544d
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/interfaces/IMessageLayout.java
@@ -0,0 +1,54 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.interfaces;
+
+import com.tencent.qcloud.tuicore.component.action.PopMenuAction;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.popmenu.ChatPopMenu;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MessageAdapter;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MessageRecyclerView;
+
+import java.util.List;
+
+/**
+ * 消息区域 {@link MessageRecyclerView} 继承自 {@link RecyclerView}，提供了消息的展示功能。<br>
+ * 本类提供了大量的方法以供定制化需求，包括外观设置、事件点击，以及自定义消息的展示等。
+ * 
+ * The message area {@link MessageRecyclerView} inherits from {@link RecyclerView} and provides the display function of the message.
+ * This class provides a large number of methods for customization requirements, including appearance settings, event clicks, 
+ * and display of custom messages.
+ */
+public interface IMessageLayout extends IMessageProperties {
+
+    /**
+     * 设置消息列表的适配器 {@link MessageAdapter}
+     *
+     * @param adapter
+     */
+    void setAdapter(MessageAdapter adapter);
+
+    /**
+     * 获得消息列表的点击事件
+     *
+     * @return
+     */
+    OnItemClickListener getOnItemClickListener();
+
+    /**
+     * 设置消息列表的事件监听器 {@link OnItemClickListener}
+     *
+     * @param listener
+     */
+    void setOnItemClickListener(OnItemClickListener listener);
+
+    /**
+     * 获取 PopMenu 的 Action 列表
+     *
+     * @return
+     */
+    List<ChatPopMenu.ChatPopMenuAction> getPopActions();
+
+    /**
+     * 给 PopMenu 加入一条自定义 action
+     *
+     * @param action 菜单选项 {@link PopMenuAction}, 可以自定义图片、文字以及点击事件
+     */
+    void addPopAction(ChatPopMenu.ChatPopMenuAction action);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/interfaces/IMessageProperties.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/interfaces/IMessageProperties.java
new file mode 100644
index 0000000..904d294
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/interfaces/IMessageProperties.java
@@ -0,0 +1,353 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.interfaces;
+
+import android.graphics.drawable.Drawable;
+
+public interface IMessageProperties {
+
+    /// @name 设置头像 Set Avatar
+    /// @{
+
+    /**
+     * 获取默认头像
+     * 
+     * Get default avatar
+     *
+     * @return
+     */
+    int getAvatar();
+
+    /**
+     * 设置默认头像，默认与左边与右边的头像相同
+     * 
+     * Set the default avatar, the default is the same as the avatar on the left and right
+     *
+     * @param resId
+     */
+    void setAvatar(int resId);
+
+    /**
+     * 获取头像圆角
+     * 
+     * Get avatar rounded corners
+     *
+     * @return
+     */
+    int getAvatarRadius();
+
+    /**
+     * 设置头像圆角
+     * 
+     * Set avatar rounded corners
+     *
+     * @param radius
+     */
+    void setAvatarRadius(int radius);
+
+    /**
+     * 获得头像大小
+     * 
+     * Get avatar size
+     *
+     * @return
+     */
+    int[] getAvatarSize();
+
+    /**
+     * 设置头像大小
+     *
+     * Set avatar size
+     * 
+     * @param size
+     */
+    void setAvatarSize(int[] size);
+
+    /// @}
+    /// @name 设置昵称样式 Set nickname style
+    /// @{
+
+    /**
+     * 获得昵称文字大小
+     * 
+     * Get nickname text size
+     *
+     * @return
+     */
+    int getNameFontSize();
+
+    /**
+     * 设置昵称文字大小
+     * 
+     * Set nickname text size
+     *
+     * @param size
+     */
+    void setNameFontSize(int size);
+
+    /**
+     * 获取昵称文字颜色
+     * 
+     * Get nickname text color
+     *
+     * @return
+     */
+    int getNameFontColor();
+
+    /**
+     * 设置昵称文字颜色
+     * 
+     * Set nickname text color
+     *
+     * @param color
+     */
+    void setNameFontColor(int color);
+
+    /**
+     * 获取左边昵称显示状态
+     * 
+     * Get the display status of the nickname on the left
+     *
+     * @return
+     */
+    int getLeftNameVisibility();
+
+    /**
+     * 设置左边昵称是否显示
+     * 
+     * Set the display status of the nickname on the left
+     *
+     * @param visibility
+     */
+    void setLeftNameVisibility(int visibility);
+
+    /**
+     * 获取右边昵称显示状态
+     * 
+     * Get the display status of the nickname on the right
+     *
+     * @return
+     */
+    int getRightNameVisibility();
+
+    /**
+     * 设置右边昵称是否显示
+     * 
+     * Set the display status of the nickname on the right
+     *
+     * @param visibility
+     */
+    void setRightNameVisibility(int visibility);
+
+    /// @}
+    /// @name 设置气泡 set bubbles
+    /// @{
+
+    /**
+     * 获取右边聊天气泡的背景
+     * 
+     * Get the background of the chat bubble on the right
+     *
+     * @return
+     */
+    Drawable getRightBubble();
+
+    /**
+     * 设置右边聊天气泡的背景
+     * 
+     * Set the background of the chat bubble on the right
+     *
+     * @param drawable
+     */
+    void setRightBubble(Drawable drawable);
+
+    /**
+     * 获取左边聊天气泡的背景
+     * 
+     * Get the background of the left chat bubble
+     *
+     * @return
+     */
+    Drawable getLeftBubble();
+
+    /**
+     * 设置左边聊天气泡的背景
+     * 
+     * Set the background of the left chat bubble
+     *
+     * @param drawable
+     */
+    void setLeftBubble(Drawable drawable);
+
+    /// @}
+    /// @name 设置聊天内容 Set chat content
+    /// @{
+
+    /**
+     * 获取聊天内容字体大小
+     * 
+     * Get chat content font size
+     *
+     * @return
+     */
+    int getChatContextFontSize();
+
+    /**
+     * 设置聊天内容字体大小
+     * 
+     * Set chat content font size
+     *
+     * @param size
+     */
+    void setChatContextFontSize(int size);
+
+    /**
+     * 获取右边聊天内容字体颜色
+     * 
+     * Get the font color of the chat content on the right
+     *
+     * @return
+     */
+    int getRightChatContentFontColor();
+
+    /**
+     * 设置右边聊天内容字体颜色
+     * 
+     * Set the font color of the chat content on the right
+     *
+     * @param color
+     */
+    void setRightChatContentFontColor(int color);
+
+    /**
+     * 获取左边聊天内容字体颜色
+     * 
+     * Get the font color of the chat content on the left
+     *
+     * @return
+     */
+    int getLeftChatContentFontColor();
+
+    /**
+     * 设置左边聊天内容字体颜色
+     * 
+     * Set the font color of the chat content on the left
+     *
+     * @param color
+     */
+    void setLeftChatContentFontColor(int color);
+
+    /// @}
+    /// @name 设置聊天时间 Set chat time
+    /// @{
+
+    /**
+     * 获取聊天时间的背景
+     * 
+     * Get the context of the chat time
+     *
+     * @return
+     */
+    Drawable getChatTimeBubble();
+
+    /**
+     * 设置聊天时间的背景
+     * 
+     * Set the context of the chat time
+     *
+     * @param drawable
+     */
+    void setChatTimeBubble(Drawable drawable);
+
+    /**
+     * 获取聊天时间的文字大小
+     * 
+     * Get the text size of the chat time
+     *
+     * @return
+     */
+    int getChatTimeFontSize();
+
+    /**
+     * 设置聊天时间的字体大小
+     * 
+     * Set the text size of the chat time
+     *
+     * @param size
+     */
+    void setChatTimeFontSize(int size);
+
+    /**
+     * 获取聊天时间的字体颜色
+     * 
+     * Get the font color of chat time
+     *
+     * @return
+     */
+    int getChatTimeFontColor();
+
+    /**
+     * 设置聊天时间的字体颜色
+     * 
+     * Set the font color of chat time
+     *
+     * @param color
+     */
+    void setChatTimeFontColor(int color);
+
+    /// @}
+    /// @name 设置聊天的提示信息 Set up chat alerts
+    /// @{
+
+    /**
+     * 获取聊天提示信息的背景
+     * 
+     * Get context for chat alerts
+     *
+     * @return
+     */
+    Drawable getTipsMessageBubble();
+
+    /**
+     * 设置聊天提示信息的背景
+     * 
+     * Set context for chat alerts
+     *
+     * @param drawable
+     */
+    void setTipsMessageBubble(Drawable drawable);
+
+    /**
+     * 获取聊天提示信息的文字大小
+     * 
+     * Get the text size of the chat prompt message
+     *
+     * @return
+     */
+    int getTipsMessageFontSize();
+
+    /**
+     * 设置聊天提示信息的文字大小
+     * 
+     * Set the text size of the chat prompt message
+     *
+     * @param size
+     */
+    void setTipsMessageFontSize(int size);
+
+    /**
+     * 获取聊天提示信息的文字颜色
+     * 
+     * Get the text color of the chat prompt message
+     *
+     * @return
+     */
+    int getTipsMessageFontColor();
+
+    /**
+     * 设置聊天提示信息的文字颜色
+     * 
+     * Set the text color of the chat prompt message
+     *
+     * @param color
+     */
+    void setTipsMessageFontColor(int color);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/interfaces/OnItemClickListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/interfaces/OnItemClickListener.java
new file mode 100644
index 0000000..ea28644
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/interfaces/OnItemClickListener.java
@@ -0,0 +1,32 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.interfaces;
+
+import android.view.View;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.QuoteMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+public abstract class OnItemClickListener {
+    public void onMessageLongClick(View view, int position, TUIMessageBean messageInfo) {};
+
+    public void onMessageClick(View view, int position, TUIMessageBean messageInfo) {};
+
+    public void onUserIconClick(View view, int position, TUIMessageBean messageInfo) {};
+
+    public void onUserIconLongClick(View view, int position, TUIMessageBean messageInfo) {};
+
+    public void onReEditRevokeMessage(View view, int position, TUIMessageBean messageInfo) {};
+
+    public void onRecallClick(View view, int position, TUIMessageBean messageInfo) {};
+
+    public  void onReplyMessageClick(View view, int position, QuoteMessageBean messageBean) {}
+
+    public  void onReplyDetailClick(TUIMessageBean messageBean) {}
+
+    public  void onReactOnClick(String emojiId, TUIMessageBean messageBean) {}
+
+    public  void onSendFailBtnClick(View view, int position, TUIMessageBean messageInfo) {};
+
+    public  void onTextSelected(View view, int position, TUIMessageBean messageInfo) {};
+
+    public void onTranslationLongClick(View view, int position, TUIMessageBean messageInfo) {};
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/MessageReceiptDetailActivity.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/MessageReceiptDetailActivity.java
new file mode 100644
index 0000000..e15c598
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/MessageReceiptDetailActivity.java
@@ -0,0 +1,402 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.page;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuicore.component.CustomLinearLayoutManager;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.DateTimeUtil;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageReceiptInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.FileMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.GroupMessageReadMembersInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ImageMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.VideoMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+import com.tencent.qcloud.tuikit.tuichat.presenter.MessageReceiptPresenter;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class MessageReceiptDetailActivity extends BaseLightActivity {
+
+    private static final String TAG = MessageReceiptDetailActivity.class.getSimpleName();
+
+    private MessageReceiptPresenter presenter;
+
+    private TitleBarLayout titleBarLayout;
+
+    private View groupDetailArea;
+    private TextView msgAbstract;
+    private ImageView msgAbstractImg;
+    private TextView nameTv;
+    private TextView timeTv;
+    private TextView readTitleTv;
+    private TextView unreadTitleTv;
+    private View readTitle;
+    private View unreadTitle;
+    private View readTitleLine;
+    private View unreadTitleLine;
+    private RecyclerView readList;
+    private RecyclerView unreadList;
+
+    private View c2cDetailArea;
+    private ImageView userFace;
+    private TextView userName;
+
+    private TUIMessageBean messageBean;
+    private ChatInfo chatInfo;
+
+    private MemberAdapter readAdapter;
+    private MemberAdapter unreadAdapter;
+
+    private final List<GroupMemberInfo> readMemberList = new ArrayList<>();
+    private final List<GroupMemberInfo> unreadMemberList = new ArrayList<>();
+    private long readNextSeq;
+    private long unreadNextSeq;
+    private boolean readFinished = false;
+    private boolean unreadFinished = false;
+
+    private boolean readLoading = false;
+    private boolean unreadLoading = false;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        TUIChatLog.i(TAG, "onCreate " + this);
+        setContentView(R.layout.msg_receipt_detail_layout);
+
+        initView();
+        initData();
+    }
+
+    private void initView() {
+        titleBarLayout = findViewById(R.id.receipt_title);
+        titleBarLayout.setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        titleBarLayout.setTitle(getString(R.string.chat_message_detail), ITitleBarLayout.Position.MIDDLE);
+        groupDetailArea = findViewById(R.id.group_read_details);
+        c2cDetailArea = findViewById(R.id.user_read_detail);
+        userFace = findViewById(R.id.user_face);
+        userName = findViewById(R.id.user_name_tv);
+        msgAbstract = findViewById(R.id.msg_abstract);
+        msgAbstractImg = findViewById(R.id.msg_abstract_iv);
+        nameTv = findViewById(R.id.name_tv);
+        timeTv = findViewById(R.id.time_tv);
+        readTitleTv = findViewById(R.id.read_title_tv);
+        unreadTitleTv = findViewById(R.id.unread_title_tv);
+        readTitleLine = findViewById(R.id.read_title_line);
+        unreadTitleLine = findViewById(R.id.unread_title_line);
+        readList = findViewById(R.id.read_list);
+        unreadList = findViewById(R.id.unread_list);
+        readTitle = findViewById(R.id.read_title);
+        unreadTitle = findViewById(R.id.unread_title);
+
+        readTitle.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                readTitleLine.setVisibility(View.VISIBLE);
+                readTitleTv.setTextColor(getResources().getColor(TUIThemeManager.getAttrResId(MessageReceiptDetailActivity.this, com.tencent.qcloud.tuicore.R.attr.core_primary_color)));
+                readList.setVisibility(View.VISIBLE);
+                unreadList.setVisibility(View.GONE);
+                unreadTitleLine.setVisibility(View.INVISIBLE);
+                unreadTitleTv.setTextColor(0xff444444);
+            }
+        });
+
+        unreadTitle.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                unreadTitleLine.setVisibility(View.VISIBLE);
+                unreadTitleTv.setTextColor(getResources().getColor(TUIThemeManager.getAttrResId(MessageReceiptDetailActivity.this, com.tencent.qcloud.tuicore.R.attr.core_primary_color)));
+                unreadList.setVisibility(View.VISIBLE);
+                readList.setVisibility(View.GONE);
+                readTitleLine.setVisibility(View.INVISIBLE);
+                readTitleTv.setTextColor(0xff444444);
+            }
+        });
+    }
+
+    private void initData() {
+        Intent intent = getIntent();
+        messageBean = (TUIMessageBean) intent.getSerializableExtra(TUIChatConstants.MESSAGE_BEAN);
+        chatInfo = (ChatInfo) intent.getSerializableExtra(TUIChatConstants.CHAT_INFO);
+        presenter = new MessageReceiptPresenter();
+
+        setMsgAbstract();
+
+        String userName = messageBean.getUserDisplayName();
+        nameTv.setText(userName);
+        long time = messageBean.getMessageTime();
+        timeTv.setText(DateTimeUtil.getTimeFormatText(new Date(time * 1000)));
+
+        if (!messageBean.isGroup()) {
+            setUserDetail(messageBean);
+            return;
+        }
+
+        readAdapter = new MemberAdapter();
+        unreadAdapter = new MemberAdapter();
+        readList.setLayoutManager(new CustomLinearLayoutManager(this));
+        unreadList.setLayoutManager(new CustomLinearLayoutManager(this));
+        readList.setAdapter(readAdapter);
+        unreadList.setAdapter(unreadAdapter);
+
+        presenter.getGroupMessageReadReceipt(messageBean, new IUIKitCallback<List<MessageReceiptInfo>>() {
+            @Override
+            public void onSuccess(List<MessageReceiptInfo> data) {
+                MessageReceiptInfo info = data.get(0);
+                readTitleTv.setText(getString(R.string.someone_have_read, info.getReadCount()));
+                unreadTitleTv.setText(getString(R.string.someone_unread, info.getUnreadCount()));
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+
+            }
+        });
+
+        readList.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int state) {
+                if (state == RecyclerView.SCROLL_STATE_IDLE) {
+                    if (isLastItemVisibleCompleted(readList) && !readFinished) {
+                        loadGroupMessageReadMembers(readNextSeq);
+                    }
+                }
+            }
+        });
+
+        unreadList.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int state) {
+                if (state == RecyclerView.SCROLL_STATE_IDLE) {
+                    if (isLastItemVisibleCompleted(unreadList) && !unreadFinished) {
+                        loadGroupMessageUnreadMembers(unreadNextSeq);
+                    }
+                }
+            }
+        });
+
+        loadGroupMessageReadMembers(0);
+        loadGroupMessageUnreadMembers(0);
+    }
+
+    private void setMsgAbstract() {
+        if (messageBean instanceof ImageMessageBean || messageBean instanceof VideoMessageBean) {
+            msgAbstractImg.setLayoutParams(getImageParams(msgAbstractImg.getLayoutParams(), messageBean));
+            msgAbstractImg.setVisibility(View.VISIBLE);
+            if (messageBean instanceof ImageMessageBean) {
+                GlideEngine.loadImage(msgAbstractImg, ((ImageMessageBean) messageBean).getDataPath());
+            } else if (messageBean instanceof VideoMessageBean) {
+                GlideEngine.loadImage(msgAbstractImg, ((VideoMessageBean) messageBean).getDataPath());
+            }
+            msgAbstract.setText("");
+        } else {
+            msgAbstractImg.setVisibility(View.GONE);
+            if (messageBean instanceof FileMessageBean) {
+                msgAbstract.setText(messageBean.getExtra() + ((FileMessageBean) messageBean).getFileName());
+            } else {
+                FaceManager.handlerEmojiText(msgAbstract, messageBean.getExtra(), false);
+            }
+        }
+    }
+
+    private void setUserDetail(TUIMessageBean messageBean) {
+        groupDetailArea.setVisibility(View.GONE);
+        c2cDetailArea.setVisibility(View.VISIBLE);
+        String userId = messageBean.getUserId();
+        if (chatInfo != null) {
+            GlideEngine.loadUserIcon(userFace, chatInfo.getFaceUrl());
+            userName.setText(chatInfo.getChatName());
+        }
+
+        c2cDetailArea.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Bundle bundle = new Bundle();
+                bundle.putString(TUIConstants.TUIChat.CHAT_ID, userId);
+                TUICore.startActivity("FriendProfileActivity", bundle);
+            }
+        });
+    }
+
+    private ViewGroup.LayoutParams getImageParams(ViewGroup.LayoutParams params, final TUIMessageBean msg) {
+        int width;
+        int height;
+        if (msg instanceof ImageMessageBean) {
+            width = ((ImageMessageBean) msg).getImgWidth();
+            height = ((ImageMessageBean) msg).getImgHeight();
+        } else {
+            width = ((VideoMessageBean) msg).getImgWidth();
+            height = ((VideoMessageBean) msg).getImgHeight();
+        }
+        if (width == 0 || height == 0) {
+            return params;
+        }
+        int defaultSize = ScreenUtil.dip2px(40.32f);
+        if (width > height) {
+            params.width = defaultSize;
+            params.height = defaultSize * height / width;
+        } else {
+            params.width = defaultSize * width / height;
+            params.height = defaultSize;
+        }
+        return params;
+    }
+
+    private void loadGroupMessageReadMembers(long seq) {
+        if (readLoading) {
+            return;
+        }
+        readLoading = true;
+        presenter.getGroupMessageReadMembers(messageBean, true, seq, new IUIKitCallback<GroupMessageReadMembersInfo>() {
+            @Override
+            public void onSuccess(GroupMessageReadMembersInfo data) {
+                readNextSeq = data.getNextSeq();
+                readFinished = data.isFinished();
+                readMemberList.addAll(data.getGroupMemberInfoList());
+                readAdapter.setData(readMemberList);
+                readAdapter.notifyDataSetChanged();
+                readLoading = false;
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                readLoading = false;
+                TUIChatLog.e(TAG, "errCode " + errCode + " errMsg " + errMsg);
+            }
+        });
+    }
+
+    private void loadGroupMessageUnreadMembers(long seq) {
+        if (unreadLoading) {
+            return;
+        }
+        unreadLoading = true;
+        presenter.getGroupMessageReadMembers(messageBean, false, seq, new IUIKitCallback<GroupMessageReadMembersInfo>() {
+            @Override
+            public void onSuccess(GroupMessageReadMembersInfo data) {
+                unreadNextSeq = data.getNextSeq();
+                unreadFinished = data.isFinished();
+                unreadMemberList.addAll(data.getGroupMemberInfoList());
+                unreadAdapter.setData(unreadMemberList);
+                unreadAdapter.notifyDataSetChanged();
+                unreadLoading = false;
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                unreadLoading = false;
+                TUIChatLog.e(TAG, "errCode " + errCode + " errMsg " + errMsg);
+            }
+        });
+    }
+
+    public boolean isLastItemVisibleCompleted(RecyclerView recyclerView) {
+        LinearLayoutManager linearLayoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
+        if (linearLayoutManager == null) {
+            return false;
+        }
+        int lastPosition = linearLayoutManager.findLastCompletelyVisibleItemPosition();
+        int childCount = linearLayoutManager.getChildCount();
+        int firstPosition = linearLayoutManager.findFirstVisibleItemPosition();
+        if (lastPosition >= firstPosition + childCount - 1) {
+            return true;
+        }
+        return false;
+    }
+
+    static class MemberAdapter extends RecyclerView.Adapter<MemberAdapter.MemberViewHolder> {
+
+        private List<GroupMemberInfo> data;
+
+        public void setData(List<GroupMemberInfo> data) {
+            this.data = data;
+        }
+
+        @NonNull
+        @Override
+        public MemberViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.group_receipt_member_item, parent, false);
+            return new MemberViewHolder(view);
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull MemberViewHolder holder, int position) {
+            GroupMemberInfo memberInfo = data.get(position);
+            GlideEngine.loadUserIcon(holder.face, memberInfo.getIconUrl());
+            holder.name.setText(getDisplayName(memberInfo));
+            holder.itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Bundle bundle = new Bundle();
+                    bundle.putString(TUIConstants.TUIChat.CHAT_ID, memberInfo.getAccount());
+                    TUICore.startActivity("FriendProfileActivity", bundle);
+                }
+            });
+        }
+
+        @Override
+        public int getItemCount() {
+            if (data != null && !data.isEmpty()) {
+                return data.size();
+            }
+            return 0;
+        }
+
+        static class MemberViewHolder extends RecyclerView.ViewHolder {
+            private final ImageView face;
+            private final TextView name;
+
+            public MemberViewHolder(@NonNull View itemView) {
+                super(itemView);
+                face = itemView.findViewById(R.id.avatar_img);
+                name = itemView.findViewById(R.id.name_tv);
+            }
+        }
+
+        private String getDisplayName(GroupMemberInfo memberInfo) {
+            String displayName;
+            if (!TextUtils.isEmpty(memberInfo.getNameCard())) {
+                displayName = memberInfo.getNameCard();
+            } else if (!TextUtils.isEmpty(memberInfo.getFriendRemark())) {
+                displayName = memberInfo.getFriendRemark();
+            } else if (!TextUtils.isEmpty(memberInfo.getNickName())) {
+                displayName = memberInfo.getNickName();
+            } else {
+                displayName = memberInfo.getAccount();
+            }
+            return displayName;
+        }
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/MessageReplyDetailActivity.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/MessageReplyDetailActivity.java
new file mode 100644
index 0000000..966cbb7
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/MessageReplyDetailActivity.java
@@ -0,0 +1,181 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.page;
+
+import static com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MessageRecyclerView.DATA_CHANGE_TYPE_UPDATE;
+
+import android.os.Bundle;
+import android.view.GestureDetector;
+import android.view.MotionEvent;
+import android.view.View;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageRepliesBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.ReplyPreviewBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.input.InputView;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MessageAdapter;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MessageRecyclerView;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply.ReplyDetailsView;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.IReplyMessageHandler;
+import com.tencent.qcloud.tuikit.tuichat.presenter.ReplyPresenter;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageBuilder;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class MessageReplyDetailActivity extends BaseLightActivity implements InputView.MessageHandler, IReplyMessageHandler {
+    // 取一个足够大的偏移保证能一次性滚动到最底部
+    // Take a large enough offset to scroll to the bottom at one time
+    private static final int SCROLL_TO_END_OFFSET = -999999;
+
+    private TitleBarLayout titleBarLayout;
+    private MessageRecyclerView messageRecyclerView;
+    private MessageAdapter messageAdapter;
+    private ReplyDetailsView repliesList;
+    private InputView inputView;
+    private ReplyPresenter presenter;
+    private TUIMessageBean message;
+    private ChatInfo chatInfo;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_message_reply_detail);
+
+        message = (TUIMessageBean) getIntent().getSerializableExtra(TUIChatConstants.MESSAGE_BEAN);
+        chatInfo = (ChatInfo) getIntent().getSerializableExtra(TUIChatConstants.CHAT_INFO);
+        presenter = new ReplyPresenter();
+        presenter.setMessageId(message.getId());
+        presenter.setChatInfo(chatInfo);
+        presenter.setChatEventListener();
+        presenter.setReplyHandler(this);
+        titleBarLayout = findViewById(R.id.reply_title);
+        titleBarLayout.setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
+        titleBarLayout.setTitle(getString(R.string.chat_reply_detail), ITitleBarLayout.Position.MIDDLE);
+
+        inputView = findViewById(R.id.reply_input_layout);
+        inputView.disableMoreInput(true);
+        inputView.disableAudioInput(true);
+        inputView.disableShowCustomFace(true);
+        inputView.setMessageHandler(this);
+
+        repliesList = findViewById(R.id.replies_detail);
+
+        messageRecyclerView = findViewById(R.id.message_view);
+        messageRecyclerView.setLayoutManager(new LinearLayoutManager(this));
+        messageRecyclerView.setPresenter(presenter.getChatPresenter());
+        messageRecyclerView.setItemAnimator(null);
+        setOnEmptyAreaClickListener();
+        initData();
+    }
+
+    private void initData() {
+        if (message != null) {
+            MessageRepliesBean repliesBean = message.getMessageRepliesBean();
+            if (repliesBean != null) {
+                presenter.findReplyMessages(repliesBean);
+            }
+
+            messageAdapter = new MessageAdapter();
+            messageAdapter.setReplyDetailMode(true);
+            messageAdapter.setPresenter(presenter.getChatPresenter());
+            messageRecyclerView.setAdapter(messageAdapter);
+            presenter.getReactUserBean(message, new IUIKitCallback<Void>() {
+                @Override
+                public void onSuccess(Void data) {
+                    initMessageDetail();
+                }
+
+                @Override
+                public void onError(String module, int errCode, String errMsg) {
+                    initMessageDetail();
+                }
+            });
+        }
+    }
+
+    private void initMessageDetail() {
+        List<TUIMessageBean> messageBeanList = new ArrayList<>();
+        messageBeanList.add(message);
+        messageAdapter.onDataSourceChanged(messageBeanList);
+        messageAdapter.onViewNeedRefresh(DATA_CHANGE_TYPE_UPDATE, message);
+    }
+
+    @Override
+    public void sendMessage(TUIMessageBean replyContentMsg) {
+        ReplyPreviewBean replyPreviewBean = ChatMessageBuilder.buildReplyPreviewBean(message);
+        TUIMessageBean replyMessageBean = ChatMessageBuilder.buildReplyMessage(replyContentMsg.getExtra(), replyPreviewBean);
+        presenter.sendReplyMessage(replyMessageBean, new IUIKitCallback<TUIMessageBean>() {
+            @Override
+            public void onSuccess(TUIMessageBean data) {
+                scrollToEnd();
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage("send reply failed code=" + errCode + " msg=" + errMsg);
+            }
+        });
+    }
+
+    @Override
+    public void updateData(TUIMessageBean messageBean) {
+        message = messageBean;
+        initData();
+    }
+
+    @Override
+    public void onRepliesMessageFound(Map<MessageRepliesBean.ReplyBean, TUIMessageBean> messageBeanMap) {
+        if (repliesList != null) {
+            repliesList.setData(messageBeanMap);
+        }
+    }
+
+
+    @Override
+    public void scrollToEnd() {
+        if (repliesList.getAdapter() != null) {
+            RecyclerView.LayoutManager layoutManager = repliesList.getLayoutManager();
+            int itemCount = repliesList.getAdapter().getItemCount();
+            if (layoutManager instanceof LinearLayoutManager && itemCount > 0) {
+                ((LinearLayoutManager) layoutManager).scrollToPositionWithOffset(itemCount - 1, SCROLL_TO_END_OFFSET);
+            }
+        }
+    }
+
+    private void setOnEmptyAreaClickListener() {
+        GestureDetector.OnGestureListener gestureListener = new GestureDetector.SimpleOnGestureListener() {
+            @Override
+            public boolean onSingleTapUp(MotionEvent e) {
+                inputView.onEmptyClick();
+                return true;
+            }
+        };
+
+        GestureDetector gestureDetector = new GestureDetector(this, gestureListener);
+        repliesList.setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                gestureDetector.onTouchEvent(event);
+                return false;
+            }
+        });
+    }
+
+}
\ No newline at end of file
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIBaseChatActivity.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIBaseChatActivity.java
new file mode 100644
index 0000000..bf7dd73
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIBaseChatActivity.java
@@ -0,0 +1,146 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.page;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.imsdk.v2.V2TIMGroupAtInfo;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.DraftInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.WorkBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.classicui.setting.InputActionSetting;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageBuilder;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+import java.util.HashMap;
+import java.util.List;
+
+public abstract class TUIBaseChatActivity extends BaseLightActivity {
+
+    private static final String TAG = TUIBaseChatActivity.class.getSimpleName();
+    public InputActionSetting inputActionSetting;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        TUIChatLog.i(TAG, "onCreate " + this);
+
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.chat_activity);
+        chat(getIntent());
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        TUIChatLog.i(TAG, "onNewIntent");
+        super.onNewIntent(intent);
+        chat(intent);
+    }
+
+    @Override
+    protected void onResume() {
+        TUIChatLog.i(TAG, "onResume");
+        super.onResume();
+    }
+
+    private void chat(Intent intent) {
+        Bundle bundle = intent.getExtras();
+        TUIChatLog.i(TAG, "bundle: " + bundle + " intent: " + intent);
+        if (!TUILogin.isUserLogined()) {
+            ToastUtil.toastShortMessage(getString(R.string.chat_tips_not_login));
+            finish();
+            return;
+        }
+        if(inputActionSetting == null){
+            inputActionSetting = InputActionSetting.createInstance().copy();
+        }
+        ChatInfo chatInfo = getChatInfo(intent);
+        chatInfo.setInputActionSetting(inputActionSetting);
+        TUIChatLog.i(TAG, "start chatActivity chatInfo: " + chatInfo);
+
+        if (chatInfo != null) {
+            initChat(chatInfo);
+        } else {
+            ToastUtil.toastShortMessage("init chat failed , chatInfo is empty.");
+            TUIChatLog.e(TAG, "init chat failed , chatInfo is empty.");
+            finish();
+        }
+    }
+
+    public abstract void initChat(ChatInfo chatInfo);
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == 3 && data != null) {
+            if (requestCode == 11) {
+                List<String> stringList = data.getStringArrayListExtra("list");
+                if (stringList != null && !stringList.isEmpty()) {
+                    String[] stringArray = stringList.toArray(new String[]{});
+                    data.putExtra(TUIConstants.TUICalling.PARAM_NAME_USERIDS, stringArray);
+                    HashMap<String, Object> hashMap = new HashMap<>();
+                    for (String key : data.getExtras().keySet()) {
+                        hashMap.put(key, data.getExtras().get(key));
+                    }
+                    TUICore.callService(TUIConstants.TUICalling.SERVICE_NAME,
+                            TUIConstants.TUICalling.METHOD_NAME_CALL, hashMap);
+                }
+            }
+        }
+
+    }
+
+    private ChatInfo getChatInfo(Intent intent) {
+        int chatType = intent.getIntExtra(TUIConstants.TUIChat.CHAT_TYPE, ChatInfo.TYPE_INVALID);
+        ChatInfo chatInfo;
+        if (chatType == ChatInfo.TYPE_C2C) {
+            chatInfo = new ChatInfo();
+        } else if (chatType == ChatInfo.TYPE_GROUP) {
+            chatInfo = new GroupInfo();
+        } else {
+            return null;
+        }
+        chatInfo.setType(chatType);
+        chatInfo.setId(intent.getStringExtra(TUIConstants.TUIChat.CHAT_ID));
+        chatInfo.setChatName(intent.getStringExtra(TUIConstants.TUIChat.CHAT_NAME));
+        DraftInfo draftInfo = new DraftInfo();
+        draftInfo.setDraftText(intent.getStringExtra(TUIConstants.TUIChat.DRAFT_TEXT));
+        draftInfo.setDraftTime(intent.getLongExtra(TUIConstants.TUIChat.DRAFT_TIME, 0));
+        chatInfo.setDraft(draftInfo);
+        chatInfo.setTopChat(intent.getBooleanExtra(TUIConstants.TUIChat.IS_TOP_CHAT, false));
+        //回显本地消息
+        V2TIMMessage v2TIMMessage = (V2TIMMessage) intent.getSerializableExtra(TUIConstants.TUIChat.LOCATE_MESSAGE);
+        TUIMessageBean messageInfo = ChatMessageBuilder.buildMessage(v2TIMMessage);
+        chatInfo.setLocateMessage(messageInfo);
+        chatInfo.setAtInfoList((List<V2TIMGroupAtInfo>) intent.getSerializableExtra(TUIConstants.TUIChat.AT_INFO_LIST));
+        chatInfo.setFaceUrl(intent.getStringExtra(TUIConstants.TUIChat.FACE_URL));
+        chatInfo.setWorkBean((WorkBean) intent.getSerializableExtra(TUIConstants.TUIChat.WORK_BEAN));
+        if (chatType == ChatInfo.TYPE_GROUP) {
+            GroupInfo groupInfo = (GroupInfo) chatInfo;
+            groupInfo.setGroupName(intent.getStringExtra(TUIConstants.TUIChat.GROUP_NAME));
+            groupInfo.setGroupType(intent.getStringExtra(TUIConstants.TUIChat.GROUP_TYPE));
+            groupInfo.setJoinType(intent.getIntExtra(TUIConstants.TUIChat.JOIN_TYPE, 0));
+            groupInfo.setMemberCount(intent.getIntExtra(TUIConstants.TUIChat.MEMBER_COUNT, 0));
+            groupInfo.setMessageReceiveOption(intent.getBooleanExtra(TUIConstants.TUIChat.RECEIVE_OPTION, false));
+            groupInfo.setNotice(intent.getStringExtra(TUIConstants.TUIChat.NOTICE));
+            groupInfo.setOwner(intent.getStringExtra(TUIConstants.TUIChat.OWNER));
+            groupInfo.setMemberDetails((List<GroupMemberInfo>) intent.getSerializableExtra(TUIConstants.TUIChat.MEMBER_DETAILS));
+        }
+
+        if (TextUtils.isEmpty(chatInfo.getId())) {
+            return null;
+        }
+        return chatInfo;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIBaseChatFragment.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIBaseChatFragment.java
new file mode 100644
index 0000000..3dba30a
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIBaseChatFragment.java
@@ -0,0 +1,420 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.page;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.target.CustomTarget;
+import com.bumptech.glide.request.transition.Transition;
+import com.google.gson.Gson;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.fragments.BaseFragment;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CallingMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.LocationMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.classicui.setting.ChatLayoutSetting;
+import com.tencent.qcloud.tuikit.tuichat.component.AudioPlayer;
+import com.tencent.qcloud.tuikit.tuichat.classicui.interfaces.OnItemClickListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.ChatView;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.input.InputView;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MessageRecyclerView;
+import com.tencent.qcloud.tuikit.tuichat.presenter.ChatPresenter;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageBuilder;
+import com.tencent.qcloud.tuikit.tuichat.util.DataStoreUtil;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+public class TUIBaseChatFragment extends BaseFragment {
+    private static final String TAG = TUIBaseChatFragment.class.getSimpleName();
+
+    protected View baseView;
+    protected TitleBarLayout titleBar;
+
+    protected ChatView chatView;
+
+    private List<TUIMessageBean> mForwardSelectMsgInfos = null;
+    private int mForwardMode;
+    private boolean mOnlyForTranslation;
+
+    private MessageRecyclerView messageRecyclerView;
+    protected String mChatBackgroundUrl;
+    protected String mChatBackgroundThumbnailUrl;
+    private int messageViewBackgroundHeight;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        TUIChatLog.i(TAG, "oncreate view " + this);
+
+        baseView = inflater.inflate(R.layout.chat_fragment, container, false);
+//        // TODO 通过api设置ChatLayout各种属性的样例
+//        // Example of setting various properties of ChatLayout through api
+//        ChatLayoutSetting helper = new ChatLayoutSetting(getActivity());
+//        helper.setGroupId(mChatInfo.getId());
+//        helper.customizeChatLayout(mChatLayout);
+        return baseView;
+    }
+
+    protected void initView() {
+        chatView = baseView.findViewById(R.id.chat_layout);
+        chatView.setFragment(TUIBaseChatFragment.this);
+        chatView.initDefault(getChatInfo().getInputActionSetting());
+        titleBar = chatView.getTitleBar();
+        titleBar.getRightGroup().setVisibility(View.GONE);
+        titleBar.setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+                imm.hideSoftInputFromWindow(chatView.getWindowToken(), 0);
+                getActivity().finish();
+            }
+        });
+
+        chatView.setForwardSelectActivityListener(new ChatView.ForwardSelectActivityListener(){
+            @Override
+            public void onStartForwardSelectActivity(int mode, List<TUIMessageBean> msgIds, boolean onlyForTranslation) {
+                mForwardMode = mode;
+                mForwardSelectMsgInfos = msgIds;
+                mOnlyForTranslation = onlyForTranslation;
+                Bundle bundle = new Bundle();
+                bundle.putInt(TUIChatConstants.FORWARD_MODE, mode);
+                TUICore.startActivity(TUIBaseChatFragment.this, "TUIForwardSelectActivity", bundle, TUIChatConstants.FORWARD_SELECT_ACTIVTY_CODE);
+
+            }
+        });
+
+        chatView.getMessageLayout().setOnItemClickListener(new OnItemClickListener() {
+            @Override
+            public void onMessageLongClick(View view, int position, TUIMessageBean message) {
+                // 因为adapter中第一条为加载条目，位置需减1
+                // Because the first entry in the adapter is the load entry, the position needs to be decremented by 1
+                TUIChatLog.d(TAG, "chatfragment onTextSelected selectedText = ");
+                chatView.getMessageLayout().showItemPopMenu(position - 1, message, view);
+            }
+
+            @Override
+            public void onUserIconClick(View view, int position, TUIMessageBean message) {
+                if (null == message) {
+                    return;
+                }
+
+                Bundle bundle = new Bundle();
+                bundle.putString(TUIConstants.TUIChat.CHAT_ID, message.getSender());
+                TUICore.startActivity("FriendProfileActivity", bundle);
+
+            }
+
+            @Override
+            public void onReEditRevokeMessage(View view, int position, TUIMessageBean messageInfo) {
+                if (messageInfo == null) {
+                    return;
+                }
+                int messageType = messageInfo.getMsgType();
+                if (messageType == V2TIMMessage.V2TIM_ELEM_TYPE_TEXT){
+                    chatView.getInputLayout().appendText(messageInfo.getV2TIMMessage().getTextElem().getText());
+                } else {
+                    TUIChatLog.e(TAG, "error type: " + messageType);
+                }
+            }
+
+            @Override
+            public void onRecallClick(View view, int position, TUIMessageBean messageInfo) {
+                if (messageInfo == null) {
+                    return;
+                }
+                CallingMessageBean callingMessageBean = (CallingMessageBean) messageInfo;
+                String callTypeString = "";
+                int callType = callingMessageBean.getCallType();
+                if (callType == CallingMessageBean.ACTION_ID_VIDEO_CALL) {
+                    callTypeString = TUIConstants.TUICalling.TYPE_VIDEO;
+                } else if (callType == CallingMessageBean.ACTION_ID_AUDIO_CALL) {
+                    callTypeString = TUIConstants.TUICalling.TYPE_AUDIO;
+                }
+                Map<String, Object> map = new HashMap<>();
+                map.put(TUIConstants.TUICalling.PARAM_NAME_USERIDS, new String[]{messageInfo.getUserId()});
+                map.put(TUIConstants.TUICalling.PARAM_NAME_TYPE, callTypeString);
+                TUICore.callService(TUIConstants.TUICalling.SERVICE_NAME, TUIConstants.TUICalling.METHOD_NAME_CALL, map);
+            }
+
+            @Override
+            public void onTextSelected(View view, int position, TUIMessageBean messageInfo) {
+                chatView.getMessageLayout().setSelectedPosition(position);
+                chatView.getMessageLayout().showItemPopMenu(position - 1, messageInfo, view);
+            }
+
+            @Override
+            public void onTranslationLongClick(View view, int position, TUIMessageBean messageInfo) {
+                chatView.getMessageLayout().showTranslationItemPopMenu(position - 1, messageInfo, view);
+            }
+        });
+
+        chatView.getInputLayout().setOnInputViewListener(new InputView.OnInputViewListener() {
+            @Override
+            public void onStartGroupMemberSelectActivity() {
+                Bundle param = new Bundle();
+                param.putString(TUIChatConstants.GROUP_ID, getChatInfo().getId());
+                TUICore.startActivity(TUIBaseChatFragment.this, "StartGroupMemberSelectActivity", param, 1);
+            }
+
+            @Override
+            public void onUpdateChatBackground() {
+                setChatViewBackground(mChatBackgroundUrl);
+            }
+        });
+
+        messageRecyclerView = chatView.getMessageLayout();
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 1 && resultCode == 3) {
+            ArrayList<String> result_ids = data.getStringArrayListExtra(TUIChatConstants.Selection.USER_ID_SELECT);
+            ArrayList<String> result_names = data.getStringArrayListExtra(TUIChatConstants.Selection.USER_NAMECARD_SELECT);
+            chatView.getInputLayout().updateInputText(result_names, result_ids);
+        } else if (requestCode == TUIChatConstants.FORWARD_SELECT_ACTIVTY_CODE && resultCode == TUIChatConstants.FORWARD_SELECT_ACTIVTY_CODE) {
+            if (data != null) {
+                if (mForwardSelectMsgInfos == null || mForwardSelectMsgInfos.isEmpty()) {
+                    return;
+                }
+
+                HashMap<String, Boolean> chatMap = (HashMap<String, Boolean>) data.getSerializableExtra(TUIChatConstants.FORWARD_SELECT_CONVERSATION_KEY);
+                if (chatMap == null || chatMap.isEmpty()) {
+                    return;
+                }
+
+                for (Map.Entry<String, Boolean> entry : chatMap.entrySet()) {
+                    boolean isGroup = entry.getValue();
+                    String id = entry.getKey();
+                    String title = "";
+                    ChatInfo chatInfo = getChatInfo();
+                    if (chatInfo == null) {
+                        return;
+                    }
+                    if (TUIChatUtils.isGroupChat(chatInfo.getType())) {
+                        title = getString(R.string.forward_chats);
+                    } else {
+                        String senderName;
+                        String userNickName = TUIConfig.getSelfNickName();
+                        if (!TextUtils.isEmpty(userNickName)) {
+                            senderName = userNickName;
+                        } else {
+                            senderName = TUILogin.getLoginUser();
+                        }
+                        String chatName;
+                        if (!TextUtils.isEmpty(getChatInfo().getChatName())) {
+                            chatName = getChatInfo().getChatName();
+                        } else {
+                            chatName = getChatInfo().getId();
+                        }
+                        title = senderName + getString(R.string.and_text) + chatName + getString(R.string.forward_chats_c2c);                    }
+
+                    boolean selfConversation = false;
+                    if (id != null && id.equals(chatInfo.getId())) {
+                        selfConversation = true;
+                    }
+
+                    ChatPresenter chatPresenter = getPresenter();
+                    chatPresenter.forwardMessage(mForwardSelectMsgInfos, isGroup, id, title, mForwardMode, selfConversation, mOnlyForTranslation, new IUIKitCallback() {
+                        @Override
+                        public void onSuccess(Object data) {
+                            TUIChatLog.v(TAG, "sendMessage onSuccess:");
+                        }
+
+                        @Override
+                        public void onError(String module, int errCode, String errMsg) {
+                            TUIChatLog.v(TAG, "sendMessage fail:" + errCode + "=" + errMsg);
+                            ToastUtil.toastLongMessage(getString(R.string.send_failed) + ", " + errMsg);
+                        }
+                    });
+                }
+            }
+        } else if (ChatLayoutSetting.REQUEST_CODE_CUSTOM_MESSAGE == requestCode) {
+            if (data == null) {
+                return;
+            }
+            String messageJson = data.getStringExtra(ChatLayoutSetting.KEY_CUSTOM_MESSAGE);
+            if (ChatLayoutSetting.RESULT_CODE_LOCATION == resultCode) {
+                sendLocationMessage(messageJson);
+            }
+        }
+    }
+
+    public ChatInfo getChatInfo() {
+        return null;
+    }
+    public void sendLocationMessage(String messageJson) {
+        if (chatView != null) {
+            LocationMessageBean locationMessageBean = new Gson().fromJson(messageJson, LocationMessageBean.class);
+            TUIMessageBean info = ChatMessageBuilder.buildLocationMessage(
+                    TextUtils.isEmpty(locationMessageBean.getDesc()) ? requireContext().getString(R.string.chat_message_type_location) : locationMessageBean.getDesc(),
+                    locationMessageBean.getLongitude(),
+                    locationMessageBean.getLatitude());
+            chatView.sendMessage(info, false);
+        }
+    }
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (getPresenter() != null) {
+            getPresenter().setChatFragmentShow(true);
+        }
+        initChatViewBackground();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (chatView != null) {
+            if (chatView.getInputLayout() != null) {
+                chatView.getInputLayout().setDraft();
+            }
+
+            if (getPresenter() != null) {
+                getPresenter().setChatFragmentShow(false);
+            }
+        }
+        AudioPlayer.getInstance().stopPlay();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (chatView != null) {
+            chatView.exitChat();
+        }
+    }
+
+    public ChatPresenter getPresenter() {
+        return null;
+    }
+
+    protected void initChatViewBackground() {
+        if (getChatInfo() == null) {
+            TUIChatLog.e(TAG, "initChatViewBackground getChatInfo is null");
+            return;
+        }
+        DataStoreUtil.getInstance().getValueAsync(getChatInfo().getId(), new DataStoreUtil.GetResult<String>() {
+            @Override
+            public void onSuccess(String result) {
+                setChatViewBackground(result);
+            }
+
+            @Override
+            public void onFail() {
+                TUIChatLog.e(TAG, "initChatViewBackground onFail");
+            }
+        }, String.class);
+    }
+
+    protected void setChatViewBackground(String uri){
+        TUIChatLog.d(TAG, "setChatViewBackground uri = " + uri);
+        if (TextUtils.isEmpty(uri)) {
+            return;
+        }
+
+        if (chatView == null) {
+            TUIChatLog.e(TAG, "setChatViewBackground chatview is null");
+            return;
+        }
+
+        if (messageRecyclerView == null) {
+            TUIChatLog.e(TAG, "setChatViewBackground messageRecyclerView is null");
+            return;
+        }
+
+        String[] list = uri.split(",");
+        if (list.length > 0) {
+            mChatBackgroundThumbnailUrl = list[0];
+        }
+
+        if (list.length > 1) {
+            mChatBackgroundUrl = list[1];
+        }
+
+        if (TextUtils.equals(TUIConstants.TUIChat.CHAT_CONVERSATION_BACKGROUND_DEFAULT_URL, mChatBackgroundUrl)) {
+            mChatBackgroundThumbnailUrl = TUIConstants.TUIChat.CHAT_CONVERSATION_BACKGROUND_DEFAULT_URL;
+            messageRecyclerView.setBackgroundResource(R.color.chat_background_color);
+            return;
+        }
+
+        messageRecyclerView.post(new Runnable() {
+            @Override
+            public void run() {
+                int imageWidth = messageRecyclerView.getWidth();
+                int imageHeight = messageRecyclerView.getHeight();
+                if (imageHeight > messageViewBackgroundHeight) {
+                    messageViewBackgroundHeight = imageHeight;
+                }
+                TUIChatLog.d(TAG, "messageRecyclerView  width = " + imageWidth + ", height = " + messageViewBackgroundHeight);
+                if (imageWidth == 0 || messageViewBackgroundHeight == 0) {
+                    return;
+                }
+                Glide.with(getContext()).asBitmap().load(mChatBackgroundUrl).into(new CustomTarget<Bitmap>(imageWidth, messageViewBackgroundHeight) {
+                    @Override
+                    public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition<? super Bitmap> transition) {
+                        TUIChatLog.d(TAG, "messageRecyclerView onGlobalLayout url = " + mChatBackgroundUrl);
+                        Bitmap srcBitmap = zoomImg(resource, imageWidth, messageViewBackgroundHeight);
+                        messageRecyclerView.setBackground(new BitmapDrawable(getResources(), resource) {
+                            @Override
+                            public void draw(@NonNull Canvas canvas) {
+                                // TUIChatLog.d(TAG, "draw canvas =" + canvas.getClipBounds());
+                                canvas.drawBitmap(srcBitmap, canvas.getClipBounds(), canvas.getClipBounds(), null);
+                            }
+                        });
+                    }
+
+                    @Override
+                    public void onLoadCleared(@Nullable Drawable placeholder) {
+
+                    }
+                });
+            }
+        });
+    }
+
+    private Bitmap zoomImg(Bitmap bm, int targetWidth, int targetHeight) {
+        int srcWidth = bm.getWidth();
+        int srcHeight = bm.getHeight();
+        float widthScale = targetWidth * 1.0f / srcWidth;
+        float heightScale = targetHeight * 1.0f / srcHeight;
+        Matrix matrix = new Matrix();
+        matrix.postScale(widthScale, heightScale, 0, 0);
+        Bitmap bmpRet = Bitmap.createBitmap(targetWidth, targetHeight, Bitmap.Config.RGB_565);
+        Canvas canvas = new Canvas(bmpRet);
+        Paint paint = new Paint();
+        canvas.drawBitmap(bm, matrix, paint);
+        return bmpRet;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIC2CChatActivity.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIC2CChatActivity.java
new file mode 100644
index 0000000..5fccbf0
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIC2CChatActivity.java
@@ -0,0 +1,35 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.page;
+
+import android.os.Bundle;
+
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.presenter.C2CChatPresenter;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+public class TUIC2CChatActivity extends TUIBaseChatActivity {
+    private static final String TAG = TUIC2CChatActivity.class.getSimpleName();
+
+    private TUIC2CChatFragment chatFragment;
+    private C2CChatPresenter presenter;
+    @Override
+    public void initChat(ChatInfo chatInfo) {
+        TUIChatLog.i(TAG, "inti chat " + chatInfo);
+
+        if (!TUIChatUtils.isC2CChat(chatInfo.getType())) {
+            TUIChatLog.e(TAG, "init C2C chat failed , chatInfo = " + chatInfo);
+            ToastUtil.toastShortMessage("init c2c chat failed.");
+        }
+        chatFragment = new TUIC2CChatFragment();
+        Bundle bundle = new Bundle();
+        bundle.putSerializable(TUIChatConstants.CHAT_INFO, chatInfo);
+        chatFragment.setArguments(bundle);
+        presenter = new C2CChatPresenter();
+        presenter.initListener();
+        chatFragment.setPresenter(presenter);
+        getSupportFragmentManager().beginTransaction().replace(R.id.empty_view, chatFragment).commitAllowingStateLoss();
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIC2CChatFragment.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIC2CChatFragment.java
new file mode 100644
index 0000000..ffb7543
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIC2CChatFragment.java
@@ -0,0 +1,75 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.page;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.presenter.C2CChatPresenter;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+public class TUIC2CChatFragment extends TUIBaseChatFragment {
+    private static final String TAG = TUIC2CChatFragment.class.getSimpleName();
+
+    private ChatInfo chatInfo;
+    private C2CChatPresenter presenter;
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        TUIChatLog.i(TAG, "oncreate view " + this);
+
+        baseView = super.onCreateView(inflater, container, savedInstanceState);
+        Bundle bundle = getArguments();
+        if (bundle == null) {
+            return baseView;
+        }
+        chatInfo = (ChatInfo) bundle.getSerializable(TUIChatConstants.CHAT_INFO);
+        if (chatInfo == null) {
+            return baseView;
+        }
+
+        initView();
+
+        return baseView;
+    }
+
+    @Override
+    protected void initView() {
+        super.initView();
+
+        titleBar.setOnRightClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Bundle bundle = new Bundle();
+                bundle.putString(TUIConstants.TUIChat.CHAT_ID, chatInfo.getId());
+                bundle.putString(TUIConstants.TUIChat.CHAT_BACKGROUND_URI, mChatBackgroundThumbnailUrl);
+                TUICore.startActivity("FriendProfileActivity", bundle);
+            }
+        });
+
+        chatView.setPresenter(presenter);
+        presenter.setChatInfo(chatInfo);
+        presenter.setTypingListener(chatView.mTypingListener);
+        chatView.setChatInfo(chatInfo);
+    }
+
+    public void setPresenter(C2CChatPresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    @Override
+    public C2CChatPresenter getPresenter() {
+        return presenter;
+    }
+
+    @Override
+    public ChatInfo getChatInfo() {
+        return chatInfo;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIForwardChatActivity.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIForwardChatActivity.java
new file mode 100644
index 0000000..23d5daf
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIForwardChatActivity.java
@@ -0,0 +1,98 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.page;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.tencent.qcloud.tuicore.component.CustomLinearLayoutManager;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.MergeMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.classicui.interfaces.OnItemClickListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MessageAdapter;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MessageRecyclerView;
+import com.tencent.qcloud.tuikit.tuichat.presenter.ForwardPresenter;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+public class TUIForwardChatActivity extends BaseLightActivity {
+
+    private static final String TAG = TUIForwardChatActivity.class.getSimpleName();
+
+    private TitleBarLayout mTitleBar;
+    private MessageRecyclerView mFowardChatMessageRecyclerView;
+    private MessageAdapter mForwardChatAdapter;
+
+    private MergeMessageBean mMessageInfo;
+    private ChatInfo chatInfo;
+    private String mTitle;
+
+    private ForwardPresenter presenter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.forward_chat_layout);
+        mFowardChatMessageRecyclerView = (MessageRecyclerView) findViewById(R.id.chat_message_layout);
+        mFowardChatMessageRecyclerView.setLayoutManager(new CustomLinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
+        mForwardChatAdapter = new MessageAdapter();
+        mForwardChatAdapter.setForwardMode(true);
+        presenter = new ForwardPresenter();
+        presenter.setMessageListAdapter(mForwardChatAdapter);
+        presenter.setNeedShowTranslation(false);
+        mForwardChatAdapter.setPresenter(presenter);
+
+        mFowardChatMessageRecyclerView.setAdapter(mForwardChatAdapter);
+        mFowardChatMessageRecyclerView.setPresenter(presenter);
+
+        mTitleBar = (TitleBarLayout) findViewById(R.id.chat_title_bar);
+        mTitleBar.setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                finish();
+            }
+        });
+
+        mFowardChatMessageRecyclerView.setOnItemClickListener(new OnItemClickListener() {
+
+            @Override
+            public void onUserIconClick(View view, int position, TUIMessageBean messageInfo) {
+                if (!(messageInfo instanceof MergeMessageBean)) {
+                    return;
+                }
+
+                Intent intent = new Intent(getBaseContext(), TUIForwardChatActivity.class);
+                Bundle bundle=new Bundle();
+                bundle.putSerializable(TUIChatConstants.FORWARD_MERGE_MESSAGE_KEY, messageInfo);
+                intent.putExtras(bundle);
+                startActivity(intent);
+            }
+        });
+
+        init();
+    }
+
+    private void init(){
+        Intent intent = getIntent();
+        if (intent != null) {
+            mTitleBar.setTitle(mTitle, ITitleBarLayout.Position.MIDDLE);
+            mTitleBar.getRightGroup().setVisibility(View.GONE);
+
+            mMessageInfo = (MergeMessageBean) intent.getSerializableExtra(TUIChatConstants.FORWARD_MERGE_MESSAGE_KEY);
+            chatInfo = (ChatInfo) intent.getSerializableExtra(TUIChatConstants.CHAT_INFO);
+            if (null == mMessageInfo) {
+                TUIChatLog.e(TAG, "mMessageInfo is null");
+                return;
+            }
+            presenter.setChatInfo(chatInfo);
+            presenter.downloadMergerMessage(mMessageInfo);
+        }
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIGroupChatActivity.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIGroupChatActivity.java
new file mode 100644
index 0000000..8e5294e
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIGroupChatActivity.java
@@ -0,0 +1,39 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.page;
+
+import android.os.Bundle;
+
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuichat.presenter.GroupChatPresenter;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+public class TUIGroupChatActivity extends TUIBaseChatActivity {
+    private static final String TAG = TUIGroupChatActivity.class.getSimpleName();
+
+    private TUIGroupChatFragment chatFragment;
+    private GroupChatPresenter presenter;
+
+    @Override
+    public void initChat(ChatInfo chatInfo) {
+        TUIChatLog.i(TAG, "inti chat " + chatInfo);
+
+        if (!TUIChatUtils.isGroupChat(chatInfo.getType())) {
+            TUIChatLog.e(TAG, "init group chat failed , chatInfo = " + chatInfo);
+            ToastUtil.toastShortMessage("init group chat failed.");
+        }
+        GroupInfo groupInfo = (GroupInfo) chatInfo;
+
+        chatFragment = new TUIGroupChatFragment();
+        Bundle bundle = new Bundle();
+        bundle.putSerializable(TUIChatConstants.CHAT_INFO, groupInfo);
+        chatFragment.setArguments(bundle);
+        presenter = new GroupChatPresenter();
+        presenter.initListener();
+        chatFragment.setPresenter(presenter);
+        getSupportFragmentManager().beginTransaction().replace(R.id.empty_view, chatFragment).commitAllowingStateLoss();
+    }
+}
\ No newline at end of file
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIGroupChatFragment.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIGroupChatFragment.java
new file mode 100644
index 0000000..bae69ff
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIGroupChatFragment.java
@@ -0,0 +1,138 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.page;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.classicui.interfaces.OnItemClickListener;
+import com.tencent.qcloud.tuikit.tuichat.presenter.GroupChatPresenter;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+public class TUIGroupChatFragment extends TUIBaseChatFragment {
+    private static final String TAG = TUIGroupChatFragment.class.getSimpleName();
+
+    private GroupChatPresenter presenter;
+    private GroupInfo groupInfo;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        TUIChatLog.i(TAG, "oncreate view " + this);
+
+        baseView = super.onCreateView(inflater, container, savedInstanceState);
+        Bundle bundle = getArguments();
+        if (bundle == null) {
+            return baseView;
+        }
+        groupInfo = (GroupInfo) bundle.getSerializable(TUIChatConstants.CHAT_INFO);
+        if (groupInfo == null) {
+            return baseView;
+        }
+
+        initView();
+        return baseView;
+    }
+
+    @Override
+    protected void initView() {
+        super.initView();
+        chatView.setPresenter(presenter);
+        presenter.setGroupInfo(groupInfo);
+        chatView.setChatInfo(groupInfo);
+        chatView.getMessageLayout().setOnItemClickListener(new OnItemClickListener() {
+            @Override
+            public void onMessageLongClick(View view, int position, TUIMessageBean messageBean) {
+                // 因为adapter中第一条为加载条目，位置需减1
+                // Because the first entry in the adapter is the load entry, the position needs to be decremented by 1
+                chatView.getMessageLayout().showItemPopMenu(position - 1, messageBean, view);
+            }
+
+            @Override
+            public void onUserIconClick(View view, int position, TUIMessageBean messageBean) {
+                if (null == messageBean) {
+                    return;
+                }
+                //当前项目不需要跳转个人信息
+//                ChatInfo info = new ChatInfo();
+//                info.setId(messageBean.getSender());
+//
+//                Bundle bundle = new Bundle();
+//                bundle.putString(TUIConstants.TUIChat.CHAT_ID, info.getId());
+//                TUICore.startActivity("FriendProfileActivity", bundle);
+
+            }
+
+            @Override
+            public void onUserIconLongClick(View view, int position, TUIMessageBean messageBean) {
+                String result_id = messageBean.getV2TIMMessage().getSender();
+                String result_name = messageBean.getV2TIMMessage().getNickName();
+                chatView.getInputLayout().addInputText(result_name, result_id);
+            }
+
+            @Override
+            public void onReEditRevokeMessage(View view, int position, TUIMessageBean messageInfo) {
+                if (messageInfo == null) {
+                    return;
+                }
+                int messageType = messageInfo.getMsgType();
+                if (messageType == V2TIMMessage.V2TIM_ELEM_TYPE_TEXT){
+                    chatView.getInputLayout().appendText(messageInfo.getV2TIMMessage().getTextElem().getText());
+                } else {
+                    TUIChatLog.e(TAG, "error type: " + messageType);
+                }
+            }
+
+            @Override
+            public void onTextSelected(View view, int position, TUIMessageBean messageInfo) {
+                chatView.getMessageLayout().setSelectedPosition(position);
+                chatView.getMessageLayout().showItemPopMenu(position - 1, messageInfo, view);
+            }
+
+            @Override
+            public void onTranslationLongClick(View view, int position, TUIMessageBean messageInfo) {
+                chatView.getMessageLayout().showTranslationItemPopMenu(position - 1, messageInfo, view);
+            }
+        });
+
+        chatView.getTitleBar().setOnRightClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (TUIChatUtils.isTopicGroup(groupInfo.getId())) {
+                    Bundle bundle = new Bundle();
+                    bundle.putString(TUIConstants.TUICommunity.TOPIC_ID, groupInfo.getId());
+                    TUICore.startActivity(getContext(), "TopicInfoActivity", bundle);
+                } else {
+                    Bundle bundle = new Bundle();
+                    bundle.putString(TUIChatConstants.Group.GROUP_ID, groupInfo.getId());
+                    bundle.putString(TUIConstants.TUIChat.CHAT_BACKGROUND_URI, mChatBackgroundThumbnailUrl);
+                    TUICore.startActivity(getContext(), "GroupInfoActivity", bundle);
+                }
+            }
+        });
+    }
+
+    public void setPresenter(GroupChatPresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    @Override
+    public GroupChatPresenter getPresenter() {
+        return presenter;
+    }
+
+    @Override
+    public ChatInfo getChatInfo() {
+        return groupInfo;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/setting/ChatLayoutSetting.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/setting/ChatLayoutSetting.java
new file mode 100644
index 0000000..1e05218
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/setting/ChatLayoutSetting.java
@@ -0,0 +1,424 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.setting;
+
+import android.content.Context;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+import android.widget.FrameLayout;
+
+import com.google.gson.Gson;
+import com.lzy.ninegrid.ImageInfo;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.InputMoreActionUnit;
+import com.tencent.qcloud.tuikit.tuichat.bean.WorkBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ArchivesMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.BusinessCardMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CustomEvaluationMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.MedicalExaminationReportMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.SystemMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.ChatView;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.input.InputView;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MessageRecyclerView;
+import com.tencent.qcloud.tuikit.tuichat.config.TUIChatConfigs;
+import com.tencent.qcloud.tuikit.tuichat.util.ActionIdConstant;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageBuilder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ChatLayoutSetting {
+
+    private static final String TAG = ChatLayoutSetting.class.getSimpleName();
+
+    private Context mContext;
+    private String groupId;
+    private ChatInfo chatInfo;
+    public static final int REQUEST_CODE_CUSTOM_MESSAGE = 1001;
+    public static final int RESULT_CODE_LOCATION = 2001;
+    public static final int RESULT_CODE_ARCHIVES = 2002;
+    public static final int RESULT_CODE_MEDICAL_EXAMINATION_REPORT = 2003;
+    public static final String KEY_CUSTOM_MESSAGE = "customMessage";
+
+    public ChatLayoutSetting(Context context) {
+        mContext = context;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+    public void setChatInfo(ChatInfo chatInfo){
+        this.chatInfo = chatInfo;
+    }
+
+    public void customizeMessageLayout(final MessageRecyclerView messageRecyclerView) {
+        if (messageRecyclerView == null) {
+            return;
+        }
+    }
+
+    public void customizeChatLayout(final ChatView layout) {
+
+//        //====== NoticeLayout使用范例 ======//
+        //====== NoticeLayout example======//
+//        NoticeLayout noticeLayout = layout.getNoticeLayout();
+//        noticeLayout.alwaysShow(true);
+//        noticeLayout.setBackground(new ColorDrawable(0xFF54ECCB));
+//        noticeLayout.getContent().setText("现在插播一条广告");
+//        noticeLayout.getContentExtra().setText("参看有奖");
+//        noticeLayout.setOnNoticeClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                ToastUtil.toastShortMessage("赏白银五千两");
+//            }
+//        });
+
+        // 设置聊天界面自定义视图为安全提示
+        // Set custom view of chat interface as security prompt
+        ViewGroup customNoticeLayout = TUIChatConfigs.getConfigs().getNoticeLayoutConfig().getCustomNoticeLayout();
+        FrameLayout customView = layout.getCustomView();
+        if (customNoticeLayout != null && customView.getVisibility() == View.GONE) {
+            ViewParent viewParent = customNoticeLayout.getParent();
+            if (viewParent instanceof ViewGroup) {
+                ViewGroup parentView = (ViewGroup) viewParent;
+                parentView.removeAllViews();
+            }
+            customView.addView(customNoticeLayout);
+            customView.setVisibility(View.VISIBLE);
+        }
+
+
+        //====== MessageLayout使用范例 ======//
+        //====== MessageLayout example ======//
+        MessageRecyclerView messageRecyclerView = layout.getMessageLayout();
+//        ////// 设置聊天背景 Set chat background//////
+        messageRecyclerView.setBackground(new ColorDrawable(0xFFEEEEEE));
+//        ////// 设置头像 Set Avatar//////
+//        // 设置默认头像，默认与朋友与自己的头像相同
+        // Set the default avatar, the default is the same as your friend's and your own avatar
+        messageRecyclerView.setAvatar(R.drawable.ic_default_head_img);
+//        // 设置头像圆角 Set avatar rounded corners
+        messageRecyclerView.setAvatarRadius(50);
+//        // 设置头像大小 Set avatar size
+//        messageRecyclerView.setAvatarSize(new int[]{48, 48});
+//
+//        ////// 设置昵称样式（对方与自己的样式保持一致）//////
+//        ////// Set the nickname style (the other party is consistent with their own style) //////
+        messageRecyclerView.setLeftNameVisibility(View.VISIBLE);
+        messageRecyclerView.setRightNameVisibility(View.VISIBLE);
+        messageRecyclerView.setNameFontSize(12);
+        messageRecyclerView.setNameFontColor(0xFF8B5A2B);
+//
+//        ////// 设置气泡 set bubbles///////
+        // 设置自己聊天气泡的背景
+        // Set the background of your own chat bubble
+        messageRecyclerView.setRightBubble(mContext.getResources().getDrawable(R.drawable.chat_bubble_custom_self_bg_serious));
+        // 设置朋友聊天气泡的背景
+        // Set the background of friends chat bubbles
+        messageRecyclerView.setLeftBubble(mContext.getResources().getDrawable(R.drawable.chat_bubble_custom_other_bg_serious));
+//
+//        ////// 设置聊天内容 Set up chat content//////
+//        // 设置聊天内容字体字体大小，朋友和自己用一种字体大小
+//        // Set the font size of chat content, friends and yourself use a font size
+//        messageRecyclerView.setChatContextFontSize(15);
+//        // 设置自己聊天内容字体颜色
+//        // Set your own chat content font color
+        messageRecyclerView.setRightChatContentFontColor(0xFF333333);
+//        // 设置朋友聊天内容字体颜色
+//        // Set friend chat content font color
+        messageRecyclerView.setLeftChatContentFontColor(0xFFFFFFFF);
+//
+//        ////// 设置聊天时间 Set chat time//////
+//        // 设置聊天时间线的背景
+//        // Set the background of the chat timeline
+//        messageRecyclerView.setChatTimeBubble(new ColorDrawable(0xFFE4E7EB));
+//        // 设置聊天时间的字体大小
+//        // Set the font size of chat time
+//        messageRecyclerView.setChatTimeFontSize(12);
+//        // 设置聊天时间的字体颜色
+//        // Set the font color of chat time
+//        messageRecyclerView.setChatTimeFontColor(0xFF7E848C);
+//
+//        ////// 设置聊天的提示信息 Set up chat alerts//////
+//        // 设置提示的背景
+//        // Set the background of the prompt
+//        messageRecyclerView.setTipsMessageBubble(new ColorDrawable(0xFFEEEEEE));
+//        // 设置提示的字体大小
+//        // Set the font size of the prompt
+//        messageRecyclerView.setTipsMessageFontSize(12);
+//        // 设置提示的字体颜色
+//        // Set the font color of the prompt
+//        messageRecyclerView.setTipsMessageFontColor(0xFF7E848C);
+//
+
+//
+//        // 新增一个PopMenuAction
+//        // Add a PopMenuAction
+//        PopMenuAction action = new PopMenuAction();
+//        action.setActionName("test");
+//        action.setActionClickListener(new PopActionClickListener() {
+//            @Override
+//            public void onActionClick(int position, Object data) {
+//                ToastUtil.toastShortMessage("新增一个pop action");
+//            }
+//        });
+//        messageRecyclerView.addPopAction(action);
+//
+//        final OnItemClickListener l = messageRecyclerView.getOnItemClickListener();
+//        messageRecyclerView.setOnItemClickListener(new OnItemClickListener() {
+//            @Override
+//            public void onMessageLongClick(View view, int position, TUIMessageBean messageInfo) {
+//                l.onMessageLongClick(view, position, messageInfo);
+//                ToastUtil.toastShortMessage("demo中自定义长按item");
+//            }
+//
+//            @Override
+//            public void onUserIconClick(View view, int position, TUIMessageBean messageInfo) {
+//                l.onUserIconClick(view, position, messageInfo);
+//                ToastUtil.toastShortMessage("demo中自定义点击头像");
+//            }
+//        });
+
+
+        //====== InputLayout使用范例 ======//
+        //====== InputLayout example ======//
+        final InputView inputView = layout.getInputLayout();
+
+//        // TODO 隐藏音频输入的入口，可以打开下面代码测试
+//        // To hide the entrance of audio input, you can open the following code to test
+        inputView.disableAudioInput(false);
+        // TODO 隐藏表情输入的入口，可以打开下面代码测试
+        // To hide the entry of expression input, you can open the following code test
+        inputView.disableEmojiInput(true);
+//        // TODO 隐藏更多功能的入口，可以打开下面代码测试
+//        // To hide the entrance of more functions, you can open the following code test
+//        inputView.disableMoreInput(true);
+//        // TODO 可以用自定义的事件来替换更多功能的入口，可以打开下面代码测试
+//        // You can replace the entry of more functions with custom events, you can open the following code test
+//        inputView.replaceMoreInput(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                ToastUtil.toastShortMessage("自定义的更多功能按钮事件");
+//                MessageInfo info = ChatMessageInfoUtil.buildTextMessage("自定义的消息");
+//                layout.sendMessage(info, false);
+//            }
+//        });
+//        // TODO 可以用自定义的fragment来替换更多功能，可以打开下面代码测试
+//        // You can replace more functions with custom fragments, you can open the following code to test
+//        inputView.replaceMoreInput(new CustomInputFragment().setChatLayout(layout));
+//
+//        // TODO 可以disable更多面板上的各个功能，可以打开下面代码测试
+//        // You can disable various functions on more panels, you can open the following code test
+//        inputView.disableCaptureAction(true);
+        inputView.disableSendFileAction(false);
+//        inputView.disableSendPhotoAction(true);
+        inputView.disableVideoRecordAction(true);
+        //隐藏音频通话
+        inputView.disableAudioCall(true);
+        //隐藏视频通话
+        inputView.disableVideoCall(true);
+
+        // 增加名片
+        InputMoreActionUnit businessCardUnit = new InputMoreActionUnit() {
+        };
+        businessCardUnit.setIconResId(R.drawable.custom);
+        businessCardUnit.setTitleId(R.string.chat_message_type_business_card);
+        businessCardUnit.setActionId(ActionIdConstant.ACTION_ID_BUSINESS_CARD);
+        businessCardUnit.setPriority(100);
+        businessCardUnit.setOnClickListener(businessCardUnit.new OnActionClickListener() {
+            @Override
+            public void onClick() {
+                actionClick(layout, businessCardUnit.getActionId());
+            }
+        });
+//        inputView.addAction(businessCardUnit);
+        // 增加个人档案
+        InputMoreActionUnit archivesUnit = new InputMoreActionUnit() {
+        };
+        archivesUnit.setIconResId(R.drawable.ic_more_archives);
+        archivesUnit.setTitleId(R.string.chat_message_type_archives);
+        archivesUnit.setActionId(ActionIdConstant.ACTION_ID_ARCHIVES);
+        archivesUnit.setPriority(11);
+        archivesUnit.setOnClickListener(archivesUnit.new OnActionClickListener() {
+            @Override
+            public void onClick() {
+                actionClick(layout, archivesUnit.getActionId());
+            }
+        });
+//        inputView.addAction(archivesUnit);
+        // 增加位置
+        InputMoreActionUnit locationUnit = new InputMoreActionUnit() {
+        };
+        locationUnit.setIconResId(R.drawable.ic_more_location);
+        locationUnit.setTitleId(R.string.chat_message_type_location);
+        locationUnit.setActionId(ActionIdConstant.ACTION_ID_LOCATION);
+        locationUnit.setPriority(12);
+        locationUnit.setOnClickListener(locationUnit.new OnActionClickListener() {
+            @Override
+            public void onClick() {
+                actionClick(layout, locationUnit.getActionId());
+            }
+        });
+        inputView.addAction(locationUnit);
+        // 增加体检报告
+        InputMoreActionUnit medicalExaminationReportUnit = new InputMoreActionUnit() {
+        };
+        medicalExaminationReportUnit.setIconResId(R.drawable.ic_more_medical_examination_report);
+        medicalExaminationReportUnit.setTitleId(R.string.chat_message_type_medical_examination_report);
+        medicalExaminationReportUnit.setActionId(ActionIdConstant.ACTION_ID_MEDICAL_EXAMINATION_REPORT);
+        medicalExaminationReportUnit.setPriority(13);
+        medicalExaminationReportUnit.setOnClickListener(medicalExaminationReportUnit.new OnActionClickListener() {
+            @Override
+            public void onClick() {
+                actionClick(layout, medicalExaminationReportUnit.getActionId());
+            }
+        });
+//        inputView.addAction(medicalExaminationReportUnit);
+        // 结束咨询
+        InputMoreActionUnit endConsultUnit = new InputMoreActionUnit() {
+        };
+        endConsultUnit.setIconResId(R.drawable.ic_more_end_consultation);
+        endConsultUnit.setTitleId(R.string.chat_message_type_end_consultation);
+        endConsultUnit.setActionId(ActionIdConstant.ACTION_ID_END_CONSULT);
+        endConsultUnit.setPriority(14);
+        endConsultUnit.setOnClickListener(endConsultUnit.new OnActionClickListener() {
+            @Override
+            public void onClick() {
+                actionClick(layout, endConsultUnit.getActionId());
+            }
+        });
+        inputView.addAction(endConsultUnit);
+        // 评价
+        InputMoreActionUnit evaluationUnit = new InputMoreActionUnit() {
+        };
+        evaluationUnit.setIconResId(R.drawable.custom);
+        evaluationUnit.setTitleId(R.string.custom_evaluation_message);
+        evaluationUnit.setActionId(ActionIdConstant.ACTION_ID_APPRAISE);
+        evaluationUnit.setPriority(14);
+        evaluationUnit.setOnClickListener(evaluationUnit.new OnActionClickListener() {
+            @Override
+            public void onClick() {
+                actionClick(layout, evaluationUnit.getActionId());
+            }
+        });
+//        inputView.addAction(evaluationUnit);
+        //系统消息
+        InputMoreActionUnit systemUnit = new InputMoreActionUnit() {
+        };
+        systemUnit.setIconResId(R.drawable.custom);
+        systemUnit.setTitleId(R.string.chat_message_type_system);
+        systemUnit.setActionId(ActionIdConstant.ACTION_ID_SYSTEM);
+        systemUnit.setPriority(15);
+        systemUnit.setOnClickListener(systemUnit.new OnActionClickListener() {
+            @Override
+            public void onClick() {
+                actionClick(layout, systemUnit.getActionId());
+            }
+        });
+//        inputView.addAction(systemUnit);
+
+    }
+
+    public void actionClick(ChatView layout, int id) {
+        switch (id) {
+            case ActionIdConstant.ACTION_ID_LOCATION: {
+                TUICore.startActivity(layout.getFragment(), "SelectLocationActivity", new Bundle(), REQUEST_CODE_CUSTOM_MESSAGE);
+//                TUIMessageBean info = ChatMessageBuilder.buildLocationMessage(mContext.getString(R.string.chat_message_type_location), 108.87, 34.19);
+//                layout.sendMessage(info, false);
+                break;
+            }
+            case ActionIdConstant.ACTION_ID_BUSINESS_CARD: {
+                Gson gson = new Gson();
+                BusinessCardMessageBean businessCardMessageBean = new BusinessCardMessageBean();
+                businessCardMessageBean.setDoctorName("张医生");
+                businessCardMessageBean.setOrganization("协和医院");
+                businessCardMessageBean.setDoctorHeadImg("https://tse2-mm.cn.bing.net/th/id/OIP-C.7o7kx5xj-SejpCy3GGUazgHaEK?w=288&h=180&c=7&r=0&o=5&pid=1.7");
+                String data = gson.toJson(businessCardMessageBean);
+                TUIMessageBean info = ChatMessageBuilder.buildCustomMessage(
+                        data,
+                        businessCardMessageBean.getDoctorName(),
+                        mContext.getString(R.string.chat_message_type_business_card).getBytes());
+                layout.sendMessage(info, false);
+                break;
+            }
+            case ActionIdConstant.ACTION_ID_ARCHIVES: {
+                Gson gson = new Gson();
+                ArchivesMessageBean archivesMessageBean = new ArchivesMessageBean();
+                archivesMessageBean.setName("张三");
+                archivesMessageBean.setGender("男");
+                archivesMessageBean.setAge(35);
+                archivesMessageBean.setSymptomDescription("常我不气，该去医院看看了");
+                ImageInfo imageInfo = new ImageInfo();
+                imageInfo.setThumbnailUrl("https://tse2-mm.cn.bing.net/th/id/OIP-C.7o7kx5xj-SejpCy3GGUazgHaEK?w=288&h=180&c=7&r=0&o=5&pid=1.7");
+                imageInfo.setBigImageUrl("https://tse2-mm.cn.bing.net/th/id/OIP-C.7o7kx5xj-SejpCy3GGUazgHaEK?w=288&h=180&c=7&r=0&o=5&pid=1.7");
+                List<ImageInfo> list = new ArrayList<>();
+                list.add(imageInfo);
+                list.add(imageInfo);
+                list.add(imageInfo);
+                list.add(imageInfo);
+                list.add(imageInfo);
+                archivesMessageBean.setImageList(list);
+                String data = gson.toJson(archivesMessageBean);
+                TUIMessageBean info = ChatMessageBuilder.buildCustomMessage(data, archivesMessageBean.getName()
+                        , mContext.getString(R.string.chat_message_type_archives).getBytes());
+                layout.sendMessage(info, false);
+                break;
+            }
+            case ActionIdConstant.ACTION_ID_MEDICAL_EXAMINATION_REPORT: {
+                Gson gson = new Gson();
+                MedicalExaminationReportMessageBean medicalExaminationReportMessageBean = new MedicalExaminationReportMessageBean();
+                medicalExaminationReportMessageBean.setName("李四");
+                medicalExaminationReportMessageBean.setGender("女");
+                medicalExaminationReportMessageBean.setAge("30岁");
+                medicalExaminationReportMessageBean.setHospital("第二人民医院");
+                medicalExaminationReportMessageBean.setCreateTime("2022.12.16");
+                String data = gson.toJson(medicalExaminationReportMessageBean);
+                TUIMessageBean info = ChatMessageBuilder.buildCustomMessage(
+                        data,
+                        medicalExaminationReportMessageBean.getName(),
+                        mContext.getString(R.string.chat_message_type_medical_examination_report).getBytes());
+                layout.sendMessage(info, false);
+                break;
+            }
+            case ActionIdConstant.ACTION_ID_END_CONSULT: {
+                WorkBean workBean = chatInfo.getWorkBean();
+                if(workBean != null){
+                    TUIChatConfigs.getConfigs().getImInputViewActionListener().finishAction(workBean.getWorkType(), workBean.getWorkId());
+                }
+                break;
+            }
+            case ActionIdConstant.ACTION_ID_APPRAISE: {
+                Gson gson = new Gson();
+                CustomEvaluationMessageBean.CustomEvaluationMessage customEvaluationMessage = new CustomEvaluationMessageBean.CustomEvaluationMessage();
+                customEvaluationMessage.score = 2;
+                customEvaluationMessage.comment = mContext.getString(R.string.custom_evaluation_message);
+                String data = gson.toJson(customEvaluationMessage);
+                TUIMessageBean info = ChatMessageBuilder.buildCustomMessage(
+                        data,
+                        mContext.getString(R.string.custom_evaluation_message),
+                        mContext.getString(R.string.custom_evaluation_message).getBytes());
+                layout.sendMessage(info, false);
+                break;
+            }
+            case ActionIdConstant.ACTION_ID_SYSTEM: {
+                Gson gson = new Gson();
+                SystemMessageBean systemMessageBean = new SystemMessageBean();
+                systemMessageBean.setContent("本次咨询已结束，请对本次服务进行评价！");
+                systemMessageBean.setMessageImageUrl("https://tse2-mm.cn.bing.net/th/id/OIP-C.7o7kx5xj-SejpCy3GGUazgHaEK?w=288&h=180&c=7&r=0&o=5&pid=1.7");
+                String data = gson.toJson(systemMessageBean);
+                TUIMessageBean info = ChatMessageBuilder.buildCustomMessage(
+                        data,
+                        mContext.getString(R.string.custom_evaluation_message),
+                        mContext.getString(R.string.custom_evaluation_message).getBytes());
+                layout.sendMessage(info, false);
+                break;
+            }
+        }
+
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/setting/InputActionSetting.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/setting/InputActionSetting.java
new file mode 100644
index 0000000..fddbd66
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/setting/InputActionSetting.java
@@ -0,0 +1,87 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.setting;
+
+import java.io.Serializable;
+
+public class InputActionSetting implements Serializable {
+    private static InputActionSetting sInstance;
+
+    /**
+     * 目前通过单例实现Action设置，从A聊天页面到B聊天页面，返回A页面销毁的话可能会有问题，完善的话可在聊天Activity中保存
+     * 进入页面时的设置，页面销毁保存，恢复时获取一下，也可以直接在进入聊天页面时将配置实例传入，我懒得写了
+     * @return
+     */
+    public static InputActionSetting createInstance() {
+        if (null == sInstance) {
+            synchronized (InputActionSetting.class) {
+                if (null == sInstance) {
+                    sInstance = new InputActionSetting();
+                }
+            }
+        }
+        return sInstance;
+    }
+    private boolean disableVideoRecord = true;
+    private boolean disableArchives = false;
+    private boolean disableMedicalExaminationReport = false;
+    private boolean disableAudioCall = false;
+    private boolean disableVideoCall = false;
+    private boolean disableSendMessage = false;
+
+    public boolean isDisableVideoRecord() {
+        return disableVideoRecord;
+    }
+
+    public void setDisableVideoRecord(boolean disableVideoRecord) {
+        this.disableVideoRecord = disableVideoRecord;
+    }
+
+    public boolean isDisableArchives() {
+        return disableArchives;
+    }
+
+    public void setDisableArchives(boolean disableArchives) {
+        this.disableArchives = disableArchives;
+    }
+
+    public boolean isDisableMedicalExaminationReport() {
+        return disableMedicalExaminationReport;
+    }
+
+    public void setDisableMedicalExaminationReport(boolean disableMedicalExaminationReport) {
+        this.disableMedicalExaminationReport = disableMedicalExaminationReport;
+    }
+
+    public boolean isDisableAudioCall() {
+        return disableAudioCall;
+    }
+
+    public void setDisableAudioCall(boolean disableAudioCall) {
+        this.disableAudioCall = disableAudioCall;
+    }
+
+    public boolean isDisableVideoCall() {
+        return disableVideoCall;
+    }
+
+    public void setDisableVideoCall(boolean disableVideoCall) {
+        this.disableVideoCall = disableVideoCall;
+    }
+
+    public boolean isDisableSendMessage() {
+        return disableSendMessage;
+    }
+
+    public void setDisableSendMessage(boolean disableSendMessage) {
+        this.disableSendMessage = disableSendMessage;
+    }
+    public InputActionSetting copy(){
+        InputActionSetting inputActionSetting = new InputActionSetting();
+        inputActionSetting.setDisableArchives(disableArchives);
+        inputActionSetting.setDisableSendMessage(disableSendMessage);
+        inputActionSetting.setDisableAudioCall(disableAudioCall);
+        inputActionSetting.setDisableVideoCall(disableVideoCall);
+        inputActionSetting.setDisableVideoRecord(disableVideoRecord);
+        inputActionSetting.setDisableMedicalExaminationReport(disableMedicalExaminationReport);
+        return inputActionSetting;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/ArchivesImageView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/ArchivesImageView.java
new file mode 100644
index 0000000..33eaa2a
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/ArchivesImageView.java
@@ -0,0 +1,118 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.text.TextPaint;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.MotionEvent;
+import android.widget.ImageView;
+
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.core.view.ViewCompat;
+
+public class ArchivesImageView extends AppCompatImageView {
+    private int moreNum = 0;              //显示更多的数量
+    private int maskColor = 0x00000000;   //默认的遮盖颜色
+    private float textSize = 35;          //显示文字的大小单位sp
+    private int textColor = 0xFFFFFFFF;   //显示文字的颜色
+
+    private TextPaint textPaint;              //文字的画笔
+    private String msg = "";                  //要绘制的文字
+
+    public ArchivesImageView(Context context) {
+        this(context, null);
+    }
+
+    public ArchivesImageView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public ArchivesImageView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+
+        //转化单位
+        textSize = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, textSize, getContext().getResources().getDisplayMetrics());
+
+        textPaint = new TextPaint();
+        textPaint.setTextAlign(Paint.Align.CENTER);  //文字居中对齐
+        textPaint.setAntiAlias(true);                //抗锯齿
+        textPaint.setTextSize(textSize);             //设置文字大小
+        textPaint.setColor(textColor);               //设置文字颜色
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        if (moreNum > 0) {
+            canvas.drawColor(maskColor);
+            float baseY = getHeight() / 2 - (textPaint.ascent() + textPaint.descent()) / 2;
+            canvas.drawText(msg, getWidth() / 2, baseY, textPaint);
+        }
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                break;
+            case MotionEvent.ACTION_MOVE:
+                break;
+            case MotionEvent.ACTION_CANCEL:
+            case MotionEvent.ACTION_UP:
+                break;
+        }
+
+        return super.onTouchEvent(event);
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        setImageDrawable(null);
+    }
+
+    public int getMoreNum() {
+        return moreNum;
+    }
+
+    public void setMoreNum(int moreNum) {
+        this.moreNum = moreNum;
+        msg = "+" + moreNum;
+        invalidate();
+    }
+
+    public int getMaskColor() {
+        return maskColor;
+    }
+
+    public void setMaskColor(int maskColor) {
+        this.maskColor = maskColor;
+        invalidate();
+    }
+
+    public float getTextSize() {
+        return textSize;
+    }
+
+    public void setTextSize(float textSize) {
+        this.textSize = textSize;
+        textPaint.setTextSize(textSize);
+        invalidate();
+    }
+
+    public int getTextColor() {
+        return textColor;
+    }
+
+    public void setTextColor(int textColor) {
+        this.textColor = textColor;
+        textPaint.setColor(textColor);
+        invalidate();
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/ChatView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/ChatView.java
new file mode 100644
index 0000000..a7d569b
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/ChatView.java
@@ -0,0 +1,1345 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget;
+
+import android.app.Activity;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.drawable.AnimationDrawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.TextPaint;
+import android.text.TextUtils;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
+import android.text.style.ForegroundColorSpan;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.gson.Gson;
+import com.tencent.imsdk.v2.V2TIMGroupAtInfo;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.UnreadCountTextView;
+import com.tencent.qcloud.tuicore.component.dialog.TUIKitDialog;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.BackgroundTasks;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.GroupApplyInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageTyping;
+import com.tencent.qcloud.tuikit.tuichat.bean.ReplyPreviewBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ReplyMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.SystemMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.classicui.setting.InputActionSetting;
+import com.tencent.qcloud.tuikit.tuichat.component.AudioPlayer;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.noticelayout.NoticeLayout;
+import com.tencent.qcloud.tuikit.tuichat.classicui.interfaces.IChatLayout;
+import com.tencent.qcloud.tuikit.tuichat.classicui.setting.ChatLayoutSetting;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.input.InputView;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MessageAdapter;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MessageRecyclerView;
+import com.tencent.qcloud.tuikit.tuichat.component.AudioRecorder;
+import com.tencent.qcloud.tuikit.tuichat.component.face.Emoji;
+import com.tencent.qcloud.tuikit.tuichat.component.progress.ProgressPresenter;
+import com.tencent.qcloud.tuikit.tuichat.config.TUIChatConfigs;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.TotalUnreadCountListener;
+import com.tencent.qcloud.tuikit.tuichat.presenter.C2CChatPresenter;
+import com.tencent.qcloud.tuikit.tuichat.presenter.ChatPresenter;
+import com.tencent.qcloud.tuikit.tuichat.presenter.GroupChatPresenter;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageBuilder;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+import java.util.List;
+
+
+public class ChatView extends LinearLayout  implements IChatLayout {
+    private static final String TAG = ChatView.class.getSimpleName();
+    // 逐条转发消息数量限制
+    // Limit the number of messages forwarded one by one
+    private static final int FORWARD_MSG_NUM_LIMIT = 30;
+
+    protected MessageAdapter mAdapter;
+    private ForwardSelectActivityListener mForwardSelectActivityListener;
+    private TotalUnreadCountListener unreadCountListener;
+
+    private AnimationDrawable mVolumeAnim;
+    private Runnable mTypingRunnable = null;
+    private ChatInfo mChatInfo;
+    private Fragment fragment;
+    public ChatPresenter.TypingListener mTypingListener = new ChatPresenter.TypingListener() {
+        @Override
+        public void onTyping(int status) {
+            if (!TUIChatConfigs.getConfigs().getGeneralConfig().isEnableMessageTyping()) {
+                return;
+            }
+
+            if (mChatInfo == null) {
+                return;
+            }
+
+            TUIChatLog.d(TAG, "mTypingListener status= " + status);
+            String oldTitle = mChatInfo.getChatName();
+            if (status == 1) {
+                getTitleBar().getMiddleTitle().setText(R.string.typing);
+
+                if (mTypingRunnable == null) {
+                    mTypingRunnable = new Runnable() {
+                        @Override
+                        public void run() {
+                            getTitleBar().getMiddleTitle().setText(oldTitle);
+                        }
+                    };
+                }
+                getTitleBar().getMiddleTitle().removeCallbacks(mTypingRunnable);
+                getTitleBar().getMiddleTitle().postDelayed(mTypingRunnable, TUIChatConstants.TYPING_PARSE_MESSAGE_INTERVAL * 1000);
+            } else if (status == 0){
+                getTitleBar().getMiddleTitle().removeCallbacks(mTypingRunnable);
+                getTitleBar().getMiddleTitle().setText(oldTitle);
+            } else {
+                TUIChatLog.e(TAG, "parseTypingMessage error status =" + status);
+            }
+        }
+    };
+
+    protected FrameLayout mCustomView;
+    protected NoticeLayout mGroupApplyLayout;
+    protected View mRecordingGroup;
+    protected ImageView mRecordingIcon;
+    protected TextView mRecordingTips;
+    private TitleBarLayout mTitleBar;
+    private MessageRecyclerView mMessageRecyclerView;
+    private InputView mInputView;
+    private NoticeLayout mNoticeLayout;
+    private LinearLayout mJumpMessageLayout;
+    private ImageView mArrowImageView;
+    private TextView mJumpMessageTextView;
+    private boolean mJumpNewMessageShow;
+    private boolean mJumpGroupAtInfoShow;
+    private boolean mClickLastMessageShow;
+
+    private LinearLayout mForwardLayout;
+    private View mForwardOneButton;
+    private View mForwardMergeButton;
+    private View mDeleteButton;
+    private long lastTypingTime = 0;
+    private boolean isSupportTyping = false;
+
+    private ChatPresenter presenter;
+    ChatLayoutSetting chatLayoutSetting;
+
+    public ChatView(Context context) {
+        super(context);
+        initViews();
+    }
+
+    public ChatView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        initViews();
+    }
+
+    public ChatView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initViews();
+    }
+
+    private void initViews() {
+        inflate(getContext(), R.layout.chat_layout, this);
+
+        mTitleBar = findViewById(R.id.chat_title_bar);
+        mMessageRecyclerView = findViewById(R.id.chat_message_layout);
+        mInputView = findViewById(R.id.chat_input_layout);
+        mInputView.setChatLayout(this);
+        mRecordingGroup = findViewById(R.id.voice_recording_view);
+        mRecordingIcon = findViewById(R.id.recording_icon);
+        mRecordingTips = findViewById(R.id.recording_tips);
+        mGroupApplyLayout = findViewById(R.id.chat_group_apply_layout);
+        mNoticeLayout = findViewById(R.id.chat_notice_layout);
+        mCustomView = findViewById(R.id.custom_layout);
+        mCustomView.setVisibility(GONE);
+
+        mForwardLayout = findViewById(R.id.forward_layout);
+        mForwardOneButton = findViewById(R.id.forward_one_by_one_button);
+        mForwardMergeButton = findViewById(R.id.forward_merge_button);
+        mDeleteButton = findViewById(R.id.delete_button);
+
+        mJumpMessageLayout = findViewById(R.id.jump_message_layout);
+        mJumpMessageTextView = findViewById(R.id.jump_message_content);
+        mArrowImageView = findViewById(R.id.arrow_icon);
+        mJumpNewMessageShow = false;
+        hideJumpMessageLayouts();
+
+        mTitleBar.getMiddleTitle().setEllipsize(TextUtils.TruncateAt.END);
+        lastTypingTime = 0;
+        isSupportTyping = false;
+    }
+
+    public void displayBackToLastMessages(String messageId) {
+        mJumpMessageLayout.setVisibility(VISIBLE);
+        mArrowImageView.setBackgroundResource(TUIThemeManager.getAttrResId(getContext(), R.attr.chat_jump_recent_down_icon));
+        mJumpMessageTextView.setText(getContext().getString(R.string.back_to_lastmessage));
+        mJumpMessageLayout.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                locateOriginMessage(messageId);
+                mClickLastMessageShow = true;
+            }
+        });
+    }
+
+    public void displayBackToNewMessages(String messageId, int count) {
+        mJumpNewMessageShow = true;
+        mJumpMessageLayout.setVisibility(VISIBLE);
+        mArrowImageView.setBackgroundResource(TUIThemeManager.getAttrResId(getContext(), R.attr.chat_jump_recent_down_icon));
+        mJumpMessageTextView.setText(String.valueOf(count) + getContext().getString(R.string.back_to_newmessage));
+        mJumpMessageLayout.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                locateOriginMessage(messageId);
+                presenter.markMessageAsRead(mChatInfo);
+                mJumpNewMessageShow = false;
+                presenter.resetNewMessageCount();
+            }
+        });
+    }
+
+    public void displayBackToAtMessages(V2TIMGroupAtInfo groupAtInfo) {
+        mJumpGroupAtInfoShow = true;
+        mJumpMessageLayout.setVisibility(VISIBLE);
+        mArrowImageView.setBackgroundResource(TUIThemeManager.getAttrResId(getContext(), R.attr.chat_jump_recent_up_icon));
+        if (groupAtInfo.getAtType() == V2TIMGroupAtInfo.TIM_AT_ALL) {
+            mJumpMessageTextView.setText(getContext().getString(R.string.back_to_atmessage_all));
+        } else {
+            mJumpMessageTextView.setText(getContext().getString(R.string.back_to_atmessage_me));
+        }
+        mJumpMessageLayout.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                locateOriginMessageBySeq(groupAtInfo.getSeq());
+                hideJumpMessageLayouts();
+                mJumpGroupAtInfoShow = false;
+            }
+        });
+    }
+
+    public void hideJumpMessageLayouts() {
+        mJumpMessageLayout.setVisibility(GONE);
+    }
+
+    public void hideBackToAtMessages() {
+        if (mJumpGroupAtInfoShow) {
+            mJumpGroupAtInfoShow = false;
+            hideJumpMessageLayouts();
+        }
+    }
+    public Fragment getFragment() {
+        return fragment;
+    }
+
+    public void setFragment(Fragment fragment) {
+        this.fragment = fragment;
+    }
+    private void initGroupAtInfoLayout() {
+        if (mChatInfo != null) {
+            List<V2TIMGroupAtInfo> groupAtInfos = mChatInfo.getAtInfoList();
+            if (groupAtInfos != null && groupAtInfos.size() > 0) {
+                V2TIMGroupAtInfo groupAtInfo = groupAtInfos.get(0);
+                if (groupAtInfo != null) {
+                    displayBackToAtMessages(groupAtInfo);
+                } else {
+                    mJumpGroupAtInfoShow = false;
+                    hideJumpMessageLayouts();
+                }
+            } else {
+                TUIChatLog.d(TAG, "initGroupAtInfoLayout groupAtInfos == null");
+                mJumpGroupAtInfoShow = false;
+                hideJumpMessageLayouts();
+            }
+        } else {
+            TUIChatLog.d(TAG, "initGroupAtInfoLayout mChatInfo == null");
+            mJumpGroupAtInfoShow = false;
+            hideJumpMessageLayouts();
+        }
+    }
+
+    private void locateOriginMessageBySeq(long seq) {
+        presenter.locateMessageBySeq(mChatInfo.getId(), seq, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                hideJumpMessageLayouts();
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                hideJumpMessageLayouts();
+                ToastUtil.toastShortMessage(getContext().getString(R.string.locate_origin_msg_failed_tip));
+            }
+        });
+    }
+
+    private void locateOriginMessage(String originMsgId) {
+        if (TextUtils.isEmpty(originMsgId)) {
+            ToastUtil.toastShortMessage(getContext().getString(R.string.locate_origin_msg_failed_tip));
+            return;
+        }
+        presenter.locateMessage(originMsgId, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                hideJumpMessageLayouts();
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                hideJumpMessageLayouts();
+                ToastUtil.toastShortMessage(getContext().getString(R.string.locate_origin_msg_failed_tip));
+            }
+        });
+        hideJumpMessageLayouts();
+    }
+
+    public void setPresenter(ChatPresenter presenter) {
+        this.presenter = presenter;
+        mMessageRecyclerView.setPresenter(presenter);
+        mInputView.setPresenter(presenter);
+        presenter.setMessageListAdapter(mAdapter);
+        mAdapter.setPresenter(presenter);
+        presenter.setMessageRecycleView(mMessageRecyclerView);
+    }
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        if (ev.getAction() == MotionEvent.ACTION_DOWN) {
+            if (mAdapter != null) {
+                mAdapter.resetSelectableText();
+            }
+        }
+        return super.dispatchTouchEvent(ev);
+    }
+
+    public void setChatInfo(ChatInfo chatInfo) {
+        mChatInfo = chatInfo;
+        if (chatInfo == null) {
+            return;
+        }
+        mInputView.setChatInfo(chatInfo);
+        chatLayoutSetting.setChatInfo(chatInfo);
+        String chatTitle = chatInfo.getChatName();
+        getTitleBar().setTitle(chatTitle, ITitleBarLayout.Position.MIDDLE);
+
+        setChatHandler();
+
+        if (!TUIChatUtils.isC2CChat(chatInfo.getType())) {
+            loadApplyList();
+            mGroupApplyLayout.setOnNoticeClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    Bundle bundle = new Bundle();
+                    bundle.putString(TUIChatConstants.GROUP_ID, chatInfo.getId());
+                    TUICore.startActivity(getContext(), "GroupApplyManagerActivity", bundle);
+                }
+            });
+        }
+        mMessageRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+                LinearLayoutManager linearLayoutManager = (LinearLayoutManager) getMessageLayout().getLayoutManager();
+                int firstVisiblePosition = linearLayoutManager.findFirstCompletelyVisibleItemPosition();
+                int lastVisiblePosition = linearLayoutManager.findLastCompletelyVisibleItemPosition();
+                sendMsgReadReceipt(firstVisiblePosition, lastVisiblePosition);
+            }
+        });
+
+        mMessageRecyclerView.setMenuEmojiOnClickListener(new MessageRecyclerView.OnMenuEmojiClickListener() {
+            @Override
+            public void onClick(Emoji emoji, TUIMessageBean messageBean) {
+                reactMessage(emoji, messageBean);
+            }
+        });
+
+        getTitleBar().setRightIcon(TUIThemeManager.getAttrResId(getContext(), R.attr.chat_title_bar_more_menu));
+        loadMessages(chatInfo.getLocateMessage(), chatInfo.getLocateMessage() == null ? TUIChatConstants.GET_MESSAGE_FORWARD : TUIChatConstants.GET_MESSAGE_TWO_WAY);
+        setTotalUnread();
+    }
+
+    private void sendMsgReadReceipt(int firstPosition, int lastPosition) {
+        if (mAdapter == null || presenter == null) {
+            return;
+        }
+        List<TUIMessageBean> tuiMessageBeans = mAdapter.getItemList(firstPosition, lastPosition);
+        presenter.sendMessageReadReceipt(tuiMessageBeans, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                if (errCode == TUIConstants.BuyingFeature.ERR_SDK_INTERFACE_NOT_SUPPORT) {
+                    showNotSupportDialog();
+                }
+            }
+        });
+    }
+
+    private void setTotalUnread() {
+        UnreadCountTextView unreadCountTextView = mTitleBar.getUnreadCountTextView();
+        unreadCountTextView.setPaintColor(getResources().getColor(TUIThemeManager.getAttrResId(getContext(), R.attr.chat_unread_dot_bg_color)));
+        unreadCountTextView.setTextColor(getResources().getColor(TUIThemeManager.getAttrResId(getContext(), R.attr.chat_unread_dot_text_color)));
+        long unreadCount = 0;
+        Object result = TUICore.callService(TUIConstants.TUIConversation.SERVICE_NAME, TUIConstants.TUIConversation.METHOD_GET_TOTAL_UNREAD_COUNT, null);
+        if (result != null && result instanceof Long) {
+            unreadCount = (long) TUICore.callService(TUIConstants.TUIConversation.SERVICE_NAME, TUIConstants.TUIConversation.METHOD_GET_TOTAL_UNREAD_COUNT, null);
+        }
+        updateUnreadCount(unreadCountTextView, unreadCount);
+        unreadCountListener = new TotalUnreadCountListener() {
+            @Override
+            public void onTotalUnreadCountChanged(long totalUnreadCount) {
+                updateUnreadCount(unreadCountTextView, totalUnreadCount);
+            }
+        };
+        TUIChatService.getInstance().addUnreadCountListener(unreadCountListener);
+    }
+
+    private void updateUnreadCount(UnreadCountTextView unreadCountTextView, long count) {
+        //本项目不需要展示，而且这里的未读消息数与项目需求得到的不匹配，展示也是错的
+//        if (count <= 0) {
+//            unreadCountTextView.setVisibility(GONE);
+//        } else {
+//            unreadCountTextView.setVisibility(VISIBLE);
+//            String unreadCountStr = count + "";
+//            if (count > 99) {
+//                unreadCountStr = "99+";
+//            }
+//            unreadCountTextView.setText(unreadCountStr);
+//        }
+    }
+
+    private void setChatHandler() {
+        if (presenter instanceof GroupChatPresenter) {
+            presenter.setChatNotifyHandler(new ChatPresenter.ChatNotifyHandler() {
+                @Override
+                public void onGroupForceExit() {
+                    ChatView.this.onExitChat();
+                }
+
+                @Override
+                public void onGroupNameChanged(String newName) {
+                    ChatView.this.onGroupNameChanged(newName);
+                }
+
+                @Override
+                public void onRecvNewMessage(TUIMessageBean message) {
+                    //接收到消息后可以对UI进行一些处理
+                    if(message instanceof SystemMessageBean){
+                        if(SystemMessageBean.Type.TYPE_CHAT_FINISH == ((SystemMessageBean) message).getType() ||
+                                SystemMessageBean.Type.TYPE_CHAT_APPRAISE == ((SystemMessageBean) message).getType()){//系统消息类型为会话结束的通知
+                            goneInputLayout();
+                        }
+                    }
+                }
+
+                @Override
+                public void onApplied(int size) {
+                    ChatView.this.onApplied(size);
+                }
+
+                @Override
+                public void onExitChat(String chatId) {
+                    ChatView.this.onExitChat();
+                }
+            });
+        } else if (presenter instanceof C2CChatPresenter) {
+            presenter.setChatNotifyHandler(new ChatPresenter.ChatNotifyHandler() {
+                @Override
+                public void onExitChat(String chatId) {
+                    ChatView.this.onExitChat();
+                }
+
+                @Override
+                public void onFriendNameChanged(String newName) {
+                    ChatView.this.onFriendNameChanged(newName);
+                }
+                @Override
+                public void onRecvNewMessage(TUIMessageBean message) {
+                    //接收到消息后可以对UI进行一些处理
+                    if(message instanceof SystemMessageBean){
+                        if(SystemMessageBean.Type.TYPE_CHAT_FINISH == ((SystemMessageBean) message).getType() ||
+                                SystemMessageBean.Type.TYPE_CHAT_APPRAISE == ((SystemMessageBean) message).getType()){//系统消息类型为会话结束的通知
+                            goneInputLayout();
+                        }
+                    }
+                }
+            });
+        }
+    }
+
+    private void loadApplyList() {
+        presenter.loadApplyList(new IUIKitCallback<List<GroupApplyInfo>>() {
+            @Override
+            public void onSuccess(List<GroupApplyInfo> data) {
+                if (data != null && data.size() > 0) {
+                    mGroupApplyLayout.getContent().setText(getContext().getString(R.string.group_apply_tips, data.size()));
+                    mGroupApplyLayout.setVisibility(View.VISIBLE);
+                }
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIChatLog.e(TAG, "loadApplyList onError: " + errMsg);
+            }
+        });
+    }
+
+    public void onExitChat() {
+        if (getContext() instanceof Activity) {
+            ((Activity) getContext()).finish();
+        }
+    }
+
+    public void onGroupNameChanged(String newName) {
+        getTitleBar().setTitle(newName, ITitleBarLayout.Position.MIDDLE);
+    }
+
+    public void onFriendNameChanged(String newName) {
+        getTitleBar().setTitle(newName, ITitleBarLayout.Position.MIDDLE);
+    }
+
+    public void onApplied(int size) {
+        if (size == 0) {
+            mGroupApplyLayout.setVisibility(View.GONE);
+        } else {
+            mGroupApplyLayout.getContent().setText(getContext().getString(R.string.group_apply_tips, size));
+            mGroupApplyLayout.setVisibility(View.VISIBLE);
+        }
+    }
+
+    public void loadMessages(TUIMessageBean lastMessage, int type) {
+        if (presenter != null) {
+            presenter.loadMessage(type, lastMessage);
+        }
+    }
+
+    public LinearLayout getForwardLayout() {
+        return mForwardLayout;
+    }
+    public View getForwardOneButton() {
+        return mForwardOneButton;
+    }
+    public View getDeleteButton() {
+        return mDeleteButton;
+    }
+
+    public View getForwardMergeButton() {
+        return mForwardMergeButton;
+    }
+
+    @Override
+    public InputView getInputLayout() {
+        return mInputView;
+    }
+
+    @Override
+    public MessageRecyclerView getMessageLayout() {
+        return mMessageRecyclerView;
+    }
+
+    @Override
+    public NoticeLayout getNoticeLayout() {
+        return mNoticeLayout;
+    }
+
+    public FrameLayout getCustomView() {
+        return mCustomView;
+    }
+
+    @Override
+    public ChatInfo getChatInfo() {
+        return mChatInfo;
+    }
+
+    @Override
+    public TitleBarLayout getTitleBar() {
+        return mTitleBar;
+    }
+
+    private void initListener() {
+        getMessageLayout().setPopActionClickListener(new MessageRecyclerView.OnPopActionClickListener() {
+            @Override
+            public void onCopyClick(TUIMessageBean msg) {
+                ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+                if (clipboard == null || msg == null) {
+                    return;
+                }
+                String copyContent = msg.getSelectText();
+                ClipData clip = ClipData.newPlainText("message", copyContent);
+                clipboard.setPrimaryClip(clip);
+
+                if (!TextUtils.isEmpty(copyContent)) {
+                    String copySuccess = getResources().getString(R.string.copy_success_tip);
+                    ToastUtil.toastShortMessage(copySuccess);
+                }
+            }
+
+            @Override
+            public void onSendMessageClick(TUIMessageBean msg, boolean retry) {
+                sendMessage(msg, retry);
+            }
+
+            @Override
+            public void onDeleteMessageClick(TUIMessageBean msg) {
+                TUIKitDialog tipsDialog = new TUIKitDialog(getContext())
+                        .builder()
+                        .setCancelable(true)
+                        .setCancelOutside(true)
+                        .setTitle(getContext().getString(R.string.chat_delete_msg_tip))
+                        .setDialogWidth(0.75f)
+                        .setPositiveButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.sure), new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                deleteMessage(msg);
+                            }
+                        })
+                        .setNegativeButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.cancel), new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+
+                            }
+                        });
+                tipsDialog.show();
+            }
+
+            @Override
+            public void onRevokeMessageClick(TUIMessageBean msg) {
+                revokeMessage(msg);
+            }
+
+            @Override
+            public void onMultiSelectMessageClick(TUIMessageBean msg) {
+                multiSelectMessage(msg);
+            }
+
+            @Override
+            public void onForwardMessageClick(TUIMessageBean msg){
+                forwardMessage(msg, false);
+            }
+
+            @Override
+            public void onReplyMessageClick(TUIMessageBean msg) {
+                replyMessage(msg);
+            }
+
+            @Override
+            public void onQuoteMessageClick(TUIMessageBean msg) {
+                quoteMessage(msg);
+            }
+
+            @Override
+            public void onTranslateMessageClick(TUIMessageBean msg) {
+                translateMessage(msg);
+            }
+
+        });
+        getMessageLayout().setTranslationPopActionClickListener(new MessageRecyclerView.OnTranslationPopActionClickListener() {
+            @Override
+            public void onCopyTranslationClick(String translationContent) {
+                ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+                if (clipboard == null || TextUtils.isEmpty(translationContent)) {
+                    return;
+                }
+                ClipData clip = ClipData.newPlainText("message", translationContent);
+                clipboard.setPrimaryClip(clip);
+                String copySuccess = getResources().getString(R.string.copy_success_tip);
+                ToastUtil.toastShortMessage(copySuccess);
+            }
+
+            @Override
+            public void onForwardTranslationClick(TUIMessageBean msg) {
+                forwardMessage(msg, true);
+            }
+
+            @Override
+            public void onHideTranslationClick(TUIMessageBean msg) {
+                msg.setTranslationStatus(TUIMessageBean.MSG_TRANSLATE_STATUS_HIDDEN);
+                presenter.updateTranslationMessage(msg);
+            }
+        });
+        getMessageLayout().setLoadMoreMessageHandler(new MessageRecyclerView.OnLoadMoreHandler() {
+            @Override
+            public void loadMore(int type) {
+                loadMessages(type);
+            }
+
+            @Override
+            public boolean isListEnd(int position) {
+                return getMessageLayout().isLastItemVisibleCompleted();
+            }
+
+            @Override
+            public void displayBackToLastMessage(boolean display) {
+                if (mJumpNewMessageShow) {
+                    return;
+                }
+                if (display) {
+                    if (mAdapter != null) {
+                        TUIMessageBean messageBean = null;
+                        for (int i = mAdapter.getItemCount() - 1; i >= 0; i--) {
+                            TUIMessageBean tuiMessageBean = mAdapter.getItem(i);
+                            if (tuiMessageBean == null || tuiMessageBean.getStatus() == TUIMessageBean.MSG_STATUS_REVOKE) {
+                                continue;
+                            } else {
+                                messageBean = mAdapter.getItem(i);
+                                break;
+                            }
+                        }
+
+                        if (messageBean != null) {
+                            displayBackToLastMessages(messageBean.getId());
+                        } else {
+                            TUIChatLog.e(TAG, "displayJumpLayout messageBean is null");
+                        }
+                    } else {
+                        TUIChatLog.e(TAG, "displayJumpLayout mAdapter is null");
+                    }
+                } else {
+                    hideJumpMessageLayouts();
+                }
+            }
+
+            @Override
+            public void displayBackToNewMessage(boolean display, String messageId, int count) {
+                if (display) {
+                    displayBackToNewMessages(messageId, count);
+                } else {
+                    mJumpNewMessageShow = false;
+                    hideJumpMessageLayouts();
+                }
+            }
+
+            @Override
+            public void hideBackToAtMessage() {
+                hideBackToAtMessages();
+            }
+
+            @Override
+            public void loadMessageFinish() {
+                initGroupAtInfoLayout();
+            }
+
+            @Override
+            public void scrollMessageFinish() {
+                if (mClickLastMessageShow && mMessageRecyclerView != null) {
+                    mClickLastMessageShow = false;
+                    mMessageRecyclerView.setHighShowPosition(-1);
+                }
+            }
+        });
+        getMessageLayout().setEmptySpaceClickListener(new MessageRecyclerView.OnEmptySpaceClickListener() {
+            @Override
+            public void onClick() {
+                getInputLayout().onEmptyClick();
+            }
+        });
+
+        getInputLayout().setChatInputHandler(new InputView.ChatInputHandler() {
+            @Override
+            public void onInputAreaClick() {
+                post(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (presenter != null) {
+                            presenter.scrollToNewestMessage();
+                        }
+                    }
+                });
+            }
+
+            @Override
+            public void onRecordStatusChanged(int status) {
+                switch (status) {
+                    case RECORD_START:
+                        startRecording();
+                        break;
+                    case RECORD_STOP:
+                        stopRecording();
+                        break;
+                    case RECORD_CANCEL:
+                        cancelRecording();
+                        break;
+                    case RECORD_TOO_SHORT:
+                    case RECORD_FAILED:
+                        stopAbnormally(status);
+                        break;
+                    default:
+                        break;
+                }
+            }
+
+            @Override
+            public void onUserTyping(boolean status, long curTime) {
+                if (!TUIChatConfigs.getConfigs().getGeneralConfig().isEnableMessageTyping()) {
+                    return;
+                }
+
+                if (!isSupportTyping) {
+                    if (!isSupportTyping(curTime)) {
+                        TUIChatLog.d(TAG, "onUserTyping trigger condition not met");
+                        return;
+                    } else {
+                        isSupportTyping = true;
+                    }
+                }
+
+                if (!status) {
+                    sendTypingStatusMessage(false);
+                    return;
+                }
+
+                if (lastTypingTime != 0) {
+                    if ((curTime - lastTypingTime) < TUIChatConstants.TYPING_SEND_MESSAGE_INTERVAL) {
+                        return;
+                    }
+                }
+
+                lastTypingTime = curTime;
+                sendTypingStatusMessage(true);
+            }
+
+            private void startRecording() {
+                post(new Runnable() {
+                    @Override
+                    public void run() {
+                        AudioPlayer.getInstance().stopPlay();
+                        mRecordingGroup.setVisibility(View.VISIBLE);
+                        mRecordingIcon.setImageResource(R.drawable.recording_volume);
+                        mVolumeAnim = (AnimationDrawable) mRecordingIcon.getDrawable();
+                        mVolumeAnim.start();
+                        mRecordingTips.setTextColor(Color.WHITE);
+                        mRecordingTips.setText(TUIChatService.getAppContext().getString(R.string.down_cancle_send));
+                    }
+                });
+            }
+
+            private void stopRecording() {
+                postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (mVolumeAnim != null) {
+                            mVolumeAnim.stop();
+                        }
+                        mRecordingGroup.setVisibility(View.GONE);
+                    }
+                }, 500);
+            }
+
+            private void stopAbnormally(final int status) {
+                post(new Runnable() {
+                    @Override
+                    public void run() {
+                        mVolumeAnim.stop();
+                        mRecordingIcon.setImageResource(R.drawable.ic_volume_dialog_length_short);
+                        mRecordingTips.setTextColor(Color.WHITE);
+                        if (status == RECORD_TOO_SHORT) {
+                            mRecordingTips.setText(TUIChatService.getAppContext().getString(R.string.say_time_short));
+                        } else {
+                            mRecordingTips.setText(TUIChatService.getAppContext().getString(R.string.record_fail));
+                        }
+                    }
+                });
+                postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        mRecordingGroup.setVisibility(View.GONE);
+                    }
+                }, 1000);
+            }
+
+            private void cancelRecording() {
+                post(new Runnable() {
+                    @Override
+                    public void run() {
+                        mRecordingIcon.setImageResource(R.drawable.ic_volume_dialog_cancel);
+                        mRecordingTips.setText(TUIChatService.getAppContext().getString(R.string.up_cancle_send));
+                    }
+                });
+            }
+        });
+    }
+
+    public boolean isSupportTyping(long time) {
+        return presenter.isSupportTyping(time);
+    }
+
+    @Override
+    public void initDefault(InputActionSetting inputActionSetting) {
+        getTitleBar().getLeftGroup().setVisibility(View.VISIBLE);
+        getTitleBar().setOnLeftClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (getContext() instanceof Activity) {
+                    ((Activity) getContext()).finish();
+                }
+            }
+        });
+        getInputLayout().setMessageHandler(new InputView.MessageHandler() {
+            @Override
+            public void sendMessage(TUIMessageBean msg) {
+                if (msg instanceof ReplyMessageBean) {
+                    ChatView.this.sendReplyMessage(msg, false);
+                } else {
+                    ChatView.this.sendMessage(msg, false);
+                }
+            }
+
+            @Override
+            public void scrollToEnd() {
+                ChatView.this.scrollToEnd();
+            }
+        });
+        getInputLayout().clearCustomActionList();
+        if (getMessageLayout().getAdapter() == null) {
+            mAdapter = new MessageAdapter();
+            mMessageRecyclerView.setAdapter(mAdapter);
+        }
+        chatLayoutSetting = new ChatLayoutSetting(getContext());
+        chatLayoutSetting.customizeChatLayout(this);
+        initListener();
+        resetForwardState("");
+        if(inputActionSetting != null&&inputActionSetting.isDisableSendMessage()){
+            goneInputLayout();
+        }
+    }
+    private void goneInputLayout(){
+        getInputLayout().getLayoutParams().height = 0;  //因IM布局用相对布局写的，所以这个没用GONE，使用设置高度的方式隐藏他，防止需要改动的地方太多或者导致未知视图异常
+    }
+    @Override
+    public void setParentLayout(Object parentContainer) {
+
+    }
+
+    public void scrollToEnd() {
+        getMessageLayout().scrollToEnd();
+    }
+
+    @Override
+    public void loadMessages(int type) {
+        if (type == TUIChatConstants.GET_MESSAGE_FORWARD) {
+            loadMessages(mAdapter.getItemCount() > 0 ? mAdapter.getItem(1) : null, type);
+        } else if (type == TUIChatConstants.GET_MESSAGE_BACKWARD){
+            loadMessages(mAdapter.getItemCount() > 0 ? mAdapter.getItem(mAdapter.getItemCount() -1) : null, type);
+        }
+    }
+
+    protected void deleteMessage(TUIMessageBean msg) {
+        presenter.deleteMessage(msg);
+    }
+
+    protected void deleteMessages(final List<Integer> positions) {
+        presenter.deleteMessages(positions);
+    }
+
+    protected void deleteMessageInfos(final List<TUIMessageBean> msgIds) {
+        presenter.deleteMessageInfos(msgIds);
+    }
+
+    protected boolean checkFailedMessageInfos(final List<TUIMessageBean> msgIds){
+        return presenter.checkFailedMessageInfos(msgIds);
+    }
+
+    protected void revokeMessage(TUIMessageBean msg) {
+        presenter.revokeMessage(msg);
+    }
+
+    protected void multiSelectMessage(TUIMessageBean msg) {
+        if(mAdapter != null){
+            mInputView.hideSoftInput();
+            mAdapter.setShowMultiSelectCheckBox(true);
+            mAdapter.setItemChecked(msg.getId(), true);
+            mAdapter.notifyDataSetChanged();
+
+            setTitleBarWhenMultiSelectMessage();
+        }
+    }
+
+    protected void forwardMessage(TUIMessageBean msg, boolean onlyForTranslation) {
+        if (mAdapter != null) {
+            mInputView.hideSoftInput();
+            mAdapter.setItemChecked(msg.getId(), true);
+            mAdapter.notifyDataSetChanged();
+            showForwardDialog(false, true, onlyForTranslation);
+        }
+    }
+
+    // Reply Message need MessageRootId
+    protected void replyMessage(TUIMessageBean messageBean) {
+        ReplyPreviewBean replyPreviewBean = ChatMessageBuilder.buildReplyPreviewBean(messageBean);
+        mInputView.showReplyPreview(replyPreviewBean);
+    }
+
+    // Quote Message not need MessageRootId
+    protected void quoteMessage(TUIMessageBean messageBean) {
+        ReplyPreviewBean replyPreviewBean = ChatMessageBuilder.buildReplyPreviewBean(messageBean);
+        replyPreviewBean.setMessageRootID(null);
+        mInputView.showReplyPreview(replyPreviewBean);
+    }
+
+    protected void reactMessage(Emoji emoji, TUIMessageBean messageBean) {
+        presenter.reactMessage(emoji.getFaceKey(), messageBean);
+    }
+
+    protected void translateMessage(TUIMessageBean messageBean) {
+        presenter.translateMessage(messageBean);
+    }
+
+    private void resetTitleBar(String leftTitle){
+        getTitleBar().getRightGroup().setVisibility(VISIBLE);
+
+        getTitleBar().getLeftGroup().setVisibility(View.VISIBLE);
+        getTitleBar().getLeftIcon().setVisibility(VISIBLE);
+        if (!TextUtils.isEmpty(leftTitle)) {
+            getTitleBar().setTitle(leftTitle, ITitleBarLayout.Position.LEFT);
+        } else {
+            getTitleBar().setTitle("", TitleBarLayout.Position.LEFT);
+        }
+        getTitleBar().setOnLeftClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (getContext() instanceof Activity) {
+                    ((Activity) getContext()).finish();
+                }
+            }
+        });
+
+        getForwardLayout().setVisibility(GONE);
+        getInputLayout().setVisibility(VISIBLE);
+    }
+
+    private void resetForwardState(String leftTitle){
+        if(mAdapter != null){
+            mAdapter.setShowMultiSelectCheckBox(false);
+            mAdapter.notifyDataSetChanged();
+        }
+
+        resetTitleBar(leftTitle);
+    }
+
+    private void setTitleBarWhenMultiSelectMessage(){
+        getTitleBar().getRightGroup().setVisibility(GONE);
+
+        getTitleBar().getLeftGroup().setVisibility(View.VISIBLE);
+        getTitleBar().getLeftIcon().setVisibility(GONE);
+        final CharSequence leftTitle = getTitleBar().getLeftTitle().getText();
+        getTitleBar().setTitle(getContext().getString(com.tencent.qcloud.tuicore.R.string.cancel), TitleBarLayout.Position.LEFT);
+        getTitleBar().setOnLeftClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                resetForwardState(leftTitle.toString());
+            }
+        });
+        getInputLayout().setVisibility(GONE);
+        getForwardLayout().setVisibility(VISIBLE);
+        getForwardOneButton().setOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View v) {
+                showForwardDialog(true, true, false);
+            }
+        });
+        getForwardMergeButton().setOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View v) {
+                showForwardDialog(true, false, false);
+            }
+        });
+        getDeleteButton().setOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View v) {
+                List<TUIMessageBean> msgIds =  mAdapter.getSelectedItem();
+
+                if(msgIds == null || msgIds.isEmpty()){
+                    ToastUtil.toastShortMessage("please select message!");
+                    return;
+                }
+
+                deleteMessageInfos(msgIds);
+
+                resetForwardState(leftTitle.toString());
+            }
+        });
+    }
+
+    private void showForwardDialog(boolean isMultiSelect, boolean isOneByOne, boolean onlyForTranslation) {
+        if (mAdapter == null){
+            return;
+        }
+
+        final List<TUIMessageBean> messageInfoList = mAdapter.getSelectedItem();
+
+        if(messageInfoList == null || messageInfoList.isEmpty()){
+            ToastUtil.toastShortMessage(getContext().getString(R.string.forward_tip));
+            return;
+        }
+
+        if(!onlyForTranslation && checkFailedMessageInfos(messageInfoList)){
+            ToastUtil.toastShortMessage(getContext().getString(R.string.forward_failed_tip));
+            return;
+        }
+
+        if (!isMultiSelect) {
+            mAdapter.setShowMultiSelectCheckBox(false);
+        }
+
+        if (isOneByOne) {
+            if (messageInfoList.size() > FORWARD_MSG_NUM_LIMIT) {
+                showForwardLimitDialog(messageInfoList);
+            } else {
+                startSelectForwardActivity(TUIChatConstants.FORWARD_MODE_ONE_BY_ONE, messageInfoList, onlyForTranslation);
+                resetForwardState("");
+            }
+        } else {
+            startSelectForwardActivity(TUIChatConstants.FORWARD_MODE_MERGE, messageInfoList, onlyForTranslation);
+            resetForwardState("");
+        }
+    }
+
+    private void showForwardLimitDialog(final List<TUIMessageBean> messageInfoList) {
+        TUIKitDialog tipsDialog = new TUIKitDialog(getContext())
+                .builder()
+                .setCancelable(true)
+                .setCancelOutside(true)
+                .setTitle(getContext().getString(R.string.forward_oneByOne_limit_number_tip))
+                .setDialogWidth(0.75f)
+                .setPositiveButton(getContext().getString(R.string.forward_mode_merge), new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        startSelectForwardActivity(TUIChatConstants.FORWARD_MODE_MERGE, messageInfoList, false);
+                        resetForwardState("");
+                    }
+                })
+                .setNegativeButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.cancel), new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+
+                    }
+                });
+        tipsDialog.show();
+    }
+
+    private void startSelectForwardActivity(int mode, List<TUIMessageBean> msgIds, boolean onlyForTranslation){
+        if (mForwardSelectActivityListener != null) {
+            mForwardSelectActivityListener.onStartForwardSelectActivity(mode, msgIds, onlyForTranslation);
+        }
+    }
+
+    public void setForwardSelectActivityListener(ForwardSelectActivityListener listener) {
+        this.mForwardSelectActivityListener = listener;
+    }
+
+    @Override
+    public void sendMessage(TUIMessageBean msg, boolean retry) {
+        presenter.sendMessage(msg, retry, new IUIKitCallback<TUIMessageBean>() {
+            @Override
+            public void onSuccess(TUIMessageBean data) {
+                BackgroundTasks.getInstance().runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        scrollToEnd();
+                    }
+                });
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                String toastMsg = errCode + ", " + errMsg;
+                if (errCode == TUIConstants.BuyingFeature.ERR_SDK_INTERFACE_NOT_SUPPORT) {
+                    showNotSupportDialog();
+                    if (msg.isNeedReadReceipt()) {
+                        toastMsg = getResources().getString(R.string.chat_message_read_receipt)
+                                + getResources().getString(com.tencent.qcloud.tuicore.R.string.TUIKitErrorUnsupporInterfaceSuffix);
+                    }
+                }
+                ToastUtil.toastLongMessage(toastMsg);
+            }
+
+            @Override
+            public void onProgress(Object data) {
+                ProgressPresenter.getInstance().updateProgress(msg.getId(), (Integer) data);
+            }
+        });
+    }
+
+    public void sendReplyMessage(TUIMessageBean msg, boolean retry) {
+        presenter.sendMessage(msg, retry, new IUIKitCallback<TUIMessageBean>() {
+            @Override
+            public void onSuccess(TUIMessageBean data) {
+                BackgroundTasks.getInstance().runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        scrollToEnd();
+                    }
+                });
+                presenter.modifyRootMessageToAddReplyInfo((ReplyMessageBean) data, new IUIKitCallback<Void>() {
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        ToastUtil.toastShortMessage("modify message failed code = " + errCode + " message = " + errMsg);
+                    }
+                });
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                String toastMsg = errCode + ", " + errMsg;
+                if (errCode == TUIConstants.BuyingFeature.ERR_SDK_INTERFACE_NOT_SUPPORT) {
+                    showNotSupportDialog();
+                    if (msg.isNeedReadReceipt()) {
+                        toastMsg = getResources().getString(R.string.chat_message_read_receipt)
+                                + getResources().getString(com.tencent.qcloud.tuicore.R.string.TUIKitErrorUnsupporInterfaceSuffix);
+                    }
+                }
+                ToastUtil.toastLongMessage(toastMsg);
+            }
+        });
+    }
+
+    public void sendTypingStatusMessage(boolean status) {
+        if (mChatInfo == null || TextUtils.isEmpty(getChatInfo().getId())) {
+            TUIChatLog.e(TAG, "sendTypingStatusMessage receiver is invalid");
+            return;
+        }
+
+        Gson gson = new Gson();
+        MessageTyping typingMessageBean = new MessageTyping();
+        typingMessageBean.setTypingStatus(status);
+        String data = gson.toJson(typingMessageBean);
+        TUIChatLog.d(TAG, "sendTypingStatusMessage data = " + data);
+        TUIMessageBean msg = ChatMessageBuilder.buildCustomMessage(data, "", null);
+
+        presenter.sendTypingStatusMessage(msg, mChatInfo.getId(), new IUIKitCallback<TUIMessageBean>() {
+            @Override
+            public void onSuccess(TUIMessageBean data) {
+                TUIChatLog.d(TAG, "sendTypingStatusMessage onSuccess:" + data.getId());
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIChatLog.d(TAG, "sendTypingStatusMessage fail:" + errCode + "=" + errMsg);
+            }
+        });
+    }
+
+    public void exitChat() {
+        getTitleBar().getMiddleTitle().removeCallbacks(mTypingRunnable);
+        AudioRecorder.getInstance().stopRecord();
+        AudioPlayer.getInstance().stopPlay();
+        presenter.markMessageAsRead(mChatInfo);
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        mCustomView.removeAllViews();
+        exitChat();
+    }
+
+    public interface ForwardSelectActivityListener {
+        public void onStartForwardSelectActivity(int mode, List<TUIMessageBean> msgIds, boolean onlyForTranslation);
+    }
+
+    @Override
+    protected void onVisibilityChanged(@NonNull View changedView, int visibility) {
+        // 从其他界面会到 Chat ，也要上报一次已读回执
+        // You will go to Chat from other interfaces, and you must also report a read receipt
+        if (visibility == VISIBLE) {
+            if (getMessageLayout() == null) {
+                return;
+            }
+            LinearLayoutManager linearLayoutManager = (LinearLayoutManager) getMessageLayout().getLayoutManager();
+            if (linearLayoutManager == null) {
+                return;
+            }
+            int firstVisiblePosition = linearLayoutManager.findFirstCompletelyVisibleItemPosition();
+            int lastVisiblePosition = linearLayoutManager.findLastCompletelyVisibleItemPosition();
+            sendMsgReadReceipt(firstVisiblePosition, lastVisiblePosition);
+        }
+    }
+
+    private void showNotSupportDialog() {
+        String string = getResources().getString(R.string.chat_im_flagship_edition_update_tip, getResources().getString(R.string.chat_message_read_receipt));
+        String buyingGuidelines = getResources().getString(R.string.chat_buying_guidelines);
+        int buyingGuidelinesIndex = string.lastIndexOf(buyingGuidelines);
+        final int foregroundColor = getResources().getColor(TUIThemeManager.getAttrResId(getContext(), com.tencent.qcloud.tuicore.R.attr.core_primary_color));
+        SpannableString spannedString = new SpannableString(string);
+        ForegroundColorSpan colorSpan2 = new ForegroundColorSpan(foregroundColor);
+        spannedString.setSpan(colorSpan2, buyingGuidelinesIndex, buyingGuidelinesIndex + buyingGuidelines.length(), Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
+
+        ClickableSpan clickableSpan2 = new ClickableSpan() {
+            @Override
+            public void onClick(View view) {
+                if (TextUtils.equals(TUIThemeManager.getInstance().getCurrentLanguage(), "zh")) {
+                    openWebUrl(TUIConstants.BuyingFeature.BUYING_PRICE_DESC);
+                } else {
+                    openWebUrl(TUIConstants.BuyingFeature.BUYING_PRICE_DESC_EN);
+                }
+            }
+
+            @Override
+            public void updateDrawState(TextPaint ds) {
+                ds.setUnderlineText(false);
+            }
+        };
+        spannedString.setSpan(clickableSpan2, buyingGuidelinesIndex, buyingGuidelinesIndex + buyingGuidelines.length(), Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
+        TUIKitDialog.TUIIMUpdateDialog.getInstance()
+                .createDialog(getContext())
+                .setShowOnlyDebug(true)
+                .setMovementMethod(LinkMovementMethod.getInstance())
+                .setHighlightColor(Color.TRANSPARENT)
+                .setCancelable(true)
+                .setCancelOutside(true)
+                .setTitle(spannedString)
+                .setDialogWidth(0.75f)
+                .setDialogFeatureName(TUIConstants.BuyingFeature.BUYING_FEATURE_MESSAGE_RECEIPT)
+                .setPositiveButton(getResources().getString(R.string.chat_no_more_reminders), new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        TUIKitDialog.TUIIMUpdateDialog.getInstance().dismiss();
+                        TUIKitDialog.TUIIMUpdateDialog.getInstance().setNeverShow(true);
+                    }
+                })
+                .setNegativeButton(getResources().getString(R.string.chat_i_know), new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        TUIKitDialog.TUIIMUpdateDialog.getInstance().dismiss();
+                    }
+                })
+                .show();
+    }
+
+    private void openWebUrl(String url) {
+        Intent intent = new Intent();
+        intent.setAction(Intent.ACTION_VIEW);
+        Uri contentUrl = Uri.parse(url);
+        intent.setData(contentUrl);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        getContext().startActivity(intent);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/BaseInputFragment.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/BaseInputFragment.java
new file mode 100644
index 0000000..d06163e
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/BaseInputFragment.java
@@ -0,0 +1,18 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.input;
+
+import com.tencent.qcloud.tuicore.component.fragments.BaseFragment;
+import com.tencent.qcloud.tuikit.tuichat.classicui.interfaces.IChatLayout;
+
+public class BaseInputFragment extends BaseFragment {
+
+    private IChatLayout mChatLayout;
+
+    public IChatLayout getChatLayout() {
+        return mChatLayout;
+    }
+
+    public BaseInputFragment setChatLayout(IChatLayout layout) {
+        mChatLayout = layout;
+        return this;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/InputView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/InputView.java
new file mode 100644
index 0000000..8615ae3
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/InputView.java
@@ -0,0 +1,1538 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.input;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.Rect;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
+import android.webkit.MimeTypeMap;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.FragmentManager;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.BackgroundTasks;
+import com.tencent.qcloud.tuicore.util.FileUtil;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.DraftInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.InputMoreActionUnit;
+import com.tencent.qcloud.tuikit.tuichat.bean.ReplyPreviewBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.FileMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.CameraActivity;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.view.JCameraView;
+import com.tencent.qcloud.tuikit.tuichat.classicui.interfaces.IChatLayout;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.input.face.FaceFragment;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.input.inputmore.InputMoreFragment;
+import com.tencent.qcloud.tuikit.tuichat.component.AudioRecorder;
+import com.tencent.qcloud.tuikit.tuichat.component.face.CustomFace;
+import com.tencent.qcloud.tuikit.tuichat.component.face.Emoji;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+import com.tencent.qcloud.tuikit.tuichat.presenter.ChatPresenter;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageBuilder;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageParser;
+import com.tencent.qcloud.tuikit.tuichat.util.PermissionHelper;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 聊天界面，底部发送图片、拍照、摄像、文件面板
+ * 
+ * Chat interface, send pictures, take pictures, video, file panels at the bottom
+ */
+
+public class InputView extends LinearLayout implements View.OnClickListener, TextWatcher {
+    private static final String TAG = InputView.class.getSimpleName();
+
+    private static final int STATE_NONE_INPUT = -1;
+    private static final int STATE_SOFT_INPUT = 0;
+    private static final int STATE_VOICE_INPUT = 1;
+    private static final int STATE_FACE_INPUT = 2;
+    private static final int STATE_ACTION_INPUT = 3;
+
+    // 音视频通话成员数限制
+    // Membership limit for audio and video calls
+    protected static final int CALL_MEMBER_LIMIT = 8;
+
+    /**
+     * 语音/文字切换输入控件
+     * 
+     * Voice/text switch input controls
+     */
+    protected ImageView mAudioInputSwitchButton;
+    protected boolean mAudioInputDisable;
+
+    /**
+     * 表情按钮
+     * 
+     * emoji button
+     */
+    protected ImageView mEmojiInputButton;
+    protected boolean mEmojiInputDisable;
+
+    /**
+     * 更多按钮
+     * 
+     * more button
+     */
+    protected ImageView mMoreInputButton;
+    protected Object mMoreInputEvent;
+    protected boolean mMoreInputDisable;
+
+    /**
+     * 消息发送按钮
+     * 
+     * message send button
+     */
+    protected TextView mSendTextButton;
+
+    /**
+     * 语音长按按钮
+     * 
+     * voice send button
+     */
+    protected Button mSendAudioButton;
+
+    /**
+     * 文本输入框
+     * 
+     * input text
+     */
+    protected TIMMentionEditText mTextInput;
+    private boolean mIsSending = false;
+
+    protected AppCompatActivity mActivity;
+    protected View mInputMoreLayout;
+    //    protected ShortcutArea mShortcutArea;
+    protected View mInputMoreView;
+    protected ChatInfo mChatInfo;
+    protected List<InputMoreActionUnit> mInputMoreActionList = new ArrayList<>();
+    protected List<InputMoreActionUnit> mInputMoreCustomActionList = new ArrayList<>();
+    private AlertDialog mPermissionDialog;
+    private boolean mSendPhotoDisable;
+    private boolean mCaptureDisable;
+    private boolean mVideoRecordDisable;
+    private boolean mSendFileDisable;
+    private boolean mAudioCallDisable;
+    private boolean mVideoCallDisable;
+
+    private FaceFragment mFaceFragment;
+    private ChatInputHandler mChatInputHandler;
+    private MessageHandler mMessageHandler;
+    private FragmentManager mFragmentManager;
+    private InputMoreFragment mInputMoreFragment;
+    private IChatLayout mChatLayout;
+    private boolean mSendEnable;
+    private boolean mAudioCancel;
+    private int mCurrentState;
+    private int mLastMsgLineCount;
+    private float mStartRecordY;
+    private String mInputContent;
+    private OnInputViewListener mOnInputViewListener;
+
+    private Map<String,String> atUserInfoMap = new HashMap<>();
+    private String displayInputString;
+
+    private ChatPresenter presenter;
+
+    private boolean isReplyModel = false;
+    private boolean isQuoteModel = false;
+    private ReplyPreviewBean replyPreviewBean;
+    private View replyPreviewBar;
+    private ImageView replyCloseBtn;
+    private TextView replyTv;
+    private View quotePreviewBar;
+    private TextView quoteTv;
+    private ImageView quoteCloseBtn;
+    private boolean isShowCustomFace = true;
+    public InputView(Context context) {
+        super(context);
+        initViews();
+    }
+
+    public InputView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        initViews();
+    }
+
+    public InputView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initViews();
+    }
+
+    public void setPresenter(ChatPresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    private void initViews() {
+        mActivity = (AppCompatActivity) getContext();
+        inflate(mActivity, R.layout.chat_input_layout, this);
+//        mShortcutArea = findViewById(R.id.shortcut_area);
+        mInputMoreView = findViewById(R.id.more_groups);
+        mSendAudioButton = findViewById(R.id.chat_voice_input);
+        mAudioInputSwitchButton = findViewById(R.id.voice_input_switch);
+        mEmojiInputButton = findViewById(R.id.face_btn);
+        mMoreInputButton = findViewById(R.id.more_btn);
+        mSendTextButton = findViewById(R.id.send_btn);
+        mTextInput = findViewById(R.id.chat_message_input);
+        replyPreviewBar = findViewById(R.id.reply_preview_bar);
+        replyTv = replyPreviewBar.findViewById(R.id.reply_text);
+        replyCloseBtn = replyPreviewBar.findViewById(R.id.reply_close_btn);
+        quotePreviewBar = findViewById(R.id.quote_preview_bar);
+        quoteTv = quotePreviewBar.findViewById(R.id.reply_text);
+        quoteCloseBtn = quotePreviewBar.findViewById(R.id.reply_close_btn);
+
+        int iconSize = getResources().getDimensionPixelSize(R.dimen.chat_input_icon_size);
+        ViewGroup.LayoutParams layoutParams = mEmojiInputButton.getLayoutParams();
+        layoutParams.width = iconSize;
+        layoutParams.height = iconSize;
+        mEmojiInputButton.setLayoutParams(layoutParams);
+
+        layoutParams = mAudioInputSwitchButton.getLayoutParams();
+        layoutParams.width = iconSize;
+        layoutParams.height = iconSize;
+        mAudioInputSwitchButton.setLayoutParams(layoutParams);
+
+        layoutParams = mMoreInputButton.getLayoutParams();
+        layoutParams.width = iconSize;
+        layoutParams.height = iconSize;
+        mMoreInputButton.setLayoutParams(layoutParams);
+
+        mIsSending = false;
+
+        init();
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    protected void init() {
+
+        mAudioInputSwitchButton.setOnClickListener(this);
+        mEmojiInputButton.setOnClickListener(this);
+        mMoreInputButton.setOnClickListener(this);
+        mSendTextButton.setOnClickListener(this);
+        mTextInput.addTextChangedListener(this);
+        mTextInput.setOnTouchListener(new OnTouchListener() {
+            @Override
+            public boolean onTouch(View view, MotionEvent motionEvent) {
+                if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
+                    if (presenter != null) {
+                        presenter.scrollToNewestMessage();
+                    }
+                    showSoftInput();
+                }
+                return false;
+            }
+        });
+
+        mTextInput.setOnKeyListener(new OnKeyListener() {
+            @Override
+            public boolean onKey(View view, int keyCode, KeyEvent keyEvent) {
+                if (keyCode == KeyEvent.KEYCODE_DEL && keyEvent.getAction() == KeyEvent.ACTION_DOWN) {
+                    if ((isQuoteModel || isReplyModel) && TextUtils.isEmpty(mTextInput.getText().toString())) {
+                        exitReply();
+                    }
+                }
+                return false;
+            }
+        });
+
+        mTextInput.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
+                return false;
+            }
+        });
+
+        mTextInput.setOnFocusChangeListener(new OnFocusChangeListener() {
+            @Override
+            public void onFocusChange(View view, boolean focus) {
+                if (!focus && mChatInputHandler != null) {
+                    mChatInputHandler.onUserTyping(false, V2TIMManager.getInstance().getServerTime());
+                }
+            }
+        });
+
+        mSendAudioButton.setOnTouchListener(new OnTouchListener() {
+
+            @Override
+            public boolean onTouch(View view, MotionEvent motionEvent) {
+                TUIChatLog.i(TAG, "mSendAudioButton onTouch action:" + motionEvent.getAction());
+                PermissionHelper.requestPermission(PermissionHelper.PERMISSION_MICROPHONE, new PermissionHelper.PermissionCallback() {
+                    @Override
+                    public void onGranted() {
+                        switch (motionEvent.getAction()) {
+                            case MotionEvent.ACTION_DOWN:
+                                mAudioCancel = true;
+                                mStartRecordY = motionEvent.getY();
+                                if (mChatInputHandler != null) {
+                                    mChatInputHandler.onRecordStatusChanged(ChatInputHandler.RECORD_START);
+                                }
+                                mSendAudioButton.setText(TUIChatService.getAppContext().getString(R.string.release_end));
+                                AudioRecorder.getInstance().startRecord(new AudioRecorder.Callback() {
+                                    @Override
+                                    public void onCompletion(Boolean success) {
+                                        recordComplete(success);
+                                    }
+
+                                    @Override
+                                    public void onVoiceDb(double db) {}
+                                });
+                                break;
+                            case MotionEvent.ACTION_MOVE:
+                                if (motionEvent.getY() - mStartRecordY < -100) {
+                                    mAudioCancel = true;
+                                    if (mChatInputHandler != null) {
+                                        mChatInputHandler.onRecordStatusChanged(ChatInputHandler.RECORD_CANCEL);
+                                    }
+                                } else {
+                                    if (mAudioCancel) {
+                                        if (mChatInputHandler != null) {
+                                            mChatInputHandler.onRecordStatusChanged(ChatInputHandler.RECORD_START);
+                                        }
+                                    }
+                                    mAudioCancel = false;
+                                }
+                                mSendAudioButton.setText(TUIChatService.getAppContext().getString(R.string.release_end));
+                                break;
+                            case MotionEvent.ACTION_CANCEL:
+                            case MotionEvent.ACTION_UP:
+                                mAudioCancel = motionEvent.getY() - mStartRecordY < -100;
+                                if (mChatInputHandler != null) {
+                                    mChatInputHandler.onRecordStatusChanged(ChatInputHandler.RECORD_STOP);
+                                }
+                                AudioRecorder.getInstance().stopRecord();
+                                mSendAudioButton.setText(TUIChatService.getAppContext().getString(R.string.hold_say));
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+
+                    @Override
+                    public void onDenied() {
+                        TUIChatLog.i(TAG, "audio record checkPermission failed");
+
+                    }
+                });
+                return false;
+            }
+        });
+
+        mTextInput.setOnMentionInputListener(new TIMMentionEditText.OnMentionInputListener() {
+            @Override
+            public void onMentionCharacterInput(String tag) {
+                //艾特（@）操作
+                if ((tag.equals(TIMMentionEditText.TIM_MENTION_TAG) || tag.equals(TIMMentionEditText.TIM_MENTION_TAG_FULL))
+                        && TUIChatUtils.isGroupChat(mChatLayout.getChatInfo().getType())) {
+                    if (mOnInputViewListener != null) {
+                        mOnInputViewListener.onStartGroupMemberSelectActivity();
+                    }
+                }
+            }
+        });
+
+        replyCloseBtn.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                exitReply();
+            }
+        });
+
+        quoteCloseBtn.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                exitReply();
+            }
+        });
+    }
+
+    public void addInputText(String name, String id){
+        if (id == null || id.isEmpty()){
+            return;
+        }
+
+        ArrayList<String> nameList = new ArrayList<String>() {
+            {
+                add(name);
+            }
+        };
+        ArrayList<String> idList = new ArrayList<String>() {
+            {
+                add(id);
+            }
+        };
+
+        updateAtUserInfoMap(nameList, idList);
+        if (mTextInput != null) {
+            Map<String, String> displayAtNameMap = new HashMap<>();
+            displayAtNameMap.put(TIMMentionEditText.TIM_MENTION_TAG + displayInputString, id);
+            mTextInput.setMentionMap(displayAtNameMap);
+            int selectedIndex = mTextInput.getSelectionEnd();
+            if (selectedIndex != -1) {
+                String insertStr = TIMMentionEditText.TIM_MENTION_TAG + displayInputString;
+                String text = mTextInput.getText().insert(selectedIndex, insertStr).toString();
+                FaceManager.handlerEmojiText(mTextInput, text, true);
+                mTextInput.setSelection(selectedIndex + insertStr.length());
+            }
+            showSoftInput();
+        }
+    }
+
+    public void updateInputText(ArrayList<String> names, ArrayList<String> ids){
+        if (ids == null || ids.isEmpty()){
+            return;
+        }
+
+        updateAtUserInfoMap(names, ids);
+        if (mTextInput != null) {
+            Map<String, String> displayAtNameList = getDisplayAtNameMap(names, ids);
+            mTextInput.setMentionMap(displayAtNameList);
+
+            int selectedIndex = mTextInput.getSelectionEnd();
+            if (selectedIndex != -1) {
+                String text = mTextInput.getText().insert(selectedIndex, displayInputString).toString();
+                FaceManager.handlerEmojiText(mTextInput, text, true);
+                mTextInput.setSelection(selectedIndex + displayInputString.length());
+            }
+            // @ 之后要显示软键盘。Activity 没有 onResume 导致无法显示软键盘
+            // Afterwards @, the soft keyboard is to be displayed. Activity does not have onResume, so the soft keyboard cannot be displayed
+            BackgroundTasks.getInstance().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    showSoftInput();
+                }
+            }, 200);
+        }
+    }
+
+    private Map<String, String> getDisplayAtNameMap(List<String> names, List<String> ids) {
+        Map<String, String> displayNameList = new HashMap<>();
+        String mentionTag = TIMMentionEditText.TIM_MENTION_TAG;
+        if (mTextInput != null) {
+            Editable editable = mTextInput.getText();
+            int selectionIndex = mTextInput.getSelectionEnd();
+            if (editable != null && selectionIndex > 0) {
+                String text = editable.toString();
+                if (!TextUtils.isEmpty(text)) {
+                    mentionTag = text.substring(selectionIndex - 1, selectionIndex);
+                }
+            }
+        }
+
+        for (int i = 0; i < ids.size(); i++) {
+            if (i == 0) {
+                if (TextUtils.isEmpty(names.get(0))) {
+                    displayNameList.put(mentionTag + ids.get(0) + " ", ids.get(0));
+                } else {
+                    displayNameList.put(mentionTag + names.get(0) + " ", ids.get(0));
+                }
+                continue;
+            }
+            String str = TIMMentionEditText.TIM_MENTION_TAG;
+            if (TextUtils.isEmpty(names.get(i))) {
+                str += ids.get(i);
+            } else {
+                str += names.get(i);
+            }
+            str += " ";
+            displayNameList.put(str, ids.get(i));
+        }
+        return displayNameList;
+    }
+
+    private void updateAtUserInfoMap(ArrayList<String> names, ArrayList<String> ids){
+        displayInputString = "";
+
+        for (int i = 0; i < ids.size(); i++) {
+            atUserInfoMap.put(ids.get(i), names.get(i));
+
+            //for display
+            if (TextUtils.isEmpty(names.get(i))) {
+                displayInputString += ids.get(i);
+                displayInputString += " ";
+                displayInputString += TIMMentionEditText.TIM_MENTION_TAG;
+            } else {
+                displayInputString += names.get(i);
+                displayInputString += " ";
+                displayInputString += TIMMentionEditText.TIM_MENTION_TAG;
+            }
+        }
+
+        if(!displayInputString.isEmpty()) {
+            displayInputString = displayInputString.substring(0, displayInputString.length() - 1);
+        }
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        mTextInput.removeTextChangedListener(this);
+        atUserInfoMap.clear();
+
+        if (mChatInputHandler != null) {
+            mChatInputHandler.onUserTyping(false, V2TIMManager.getInstance().getServerTime());
+        }
+    }
+
+    protected void startSendPhoto() {
+        TUIChatLog.i(TAG, "startSendPhoto");
+
+        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+        intent.addCategory(Intent.CATEGORY_OPENABLE);
+        intent.setType("*/*");
+        String[] mimetypes = {"image/*", "video/*"};
+        intent.putExtra(Intent.EXTRA_MIME_TYPES, mimetypes);
+
+        setOpenPhotoCallback();
+        mInputMoreFragment.startActivityForResult(intent, InputMoreFragment.REQUEST_CODE_PHOTO);
+    }
+
+    private void setOpenPhotoCallback() {
+        mInputMoreFragment.setCallback(new IUIKitCallback() {
+            @Override
+            public void onSuccess(Object data) {
+                TUIChatLog.i(TAG, "onSuccess: " + data);
+                if (data == null){
+                    TUIChatLog.e(TAG, "data is null");
+                    return;
+                }
+
+                String uri = data.toString();
+                if (TextUtils.isEmpty(uri)){
+                    TUIChatLog.e(TAG, "uri is empty");
+                    return;
+                }
+
+                String fileName = FileUtil.getFileName(TUIChatService.getAppContext(), (Uri) data);
+                String fileExtension = FileUtil.getFileExtensionFromUrl(fileName);
+                String mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileExtension);
+                if (TextUtils.isEmpty(mimeType)) {
+                    TUIChatLog.e(TAG, "mimeType is empty.");
+                    return;
+                }
+                if (mimeType.contains("video")){
+                    String videoPath = FileUtil.getPathFromUri((Uri) data);
+                    TUIMessageBean msg = buildVideoMessage(videoPath);
+                    if (msg == null){
+                        ToastUtil.toastShortMessage(getResources().getString(R.string.send_failed_file_not_exists));
+                        TUIChatLog.e(TAG, "start send video error data: " + data);
+                    } else if (mMessageHandler != null) {
+                        mMessageHandler.sendMessage(msg);
+                        hideSoftInput();
+                    }
+                } else if (mimeType.contains("image")){
+                    TUIMessageBean info = ChatMessageBuilder.buildImageMessage((Uri) data);
+                    if (info == null) {
+                        TUIChatLog.e(TAG, "start send image error data: " + data);
+                        ToastUtil.toastShortMessage(getResources().getString(R.string.send_failed_file_not_exists));
+                        return;
+                    }
+                    if (mMessageHandler != null) {
+                        mMessageHandler.sendMessage(info);
+                        hideSoftInput();
+                    }
+                } else {
+                    TUIChatLog.e(TAG, "Send photo or video failed , invalid mimeType : " + mimeType);
+                }
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIChatLog.i(TAG, "errCode: " + errCode);
+                ToastUtil.toastLongMessage(errMsg);
+            }
+        });
+    }
+
+    private TUIMessageBean buildVideoMessage(String mUri) {
+        android.media.MediaMetadataRetriever mmr = new android.media.MediaMetadataRetriever();
+        try {
+            mmr.setDataSource(mUri);
+            String sDuration = mmr.extractMetadata(android.media.MediaMetadataRetriever.METADATA_KEY_DURATION);
+            Bitmap bitmap = mmr.getFrameAtTime(0, android.media.MediaMetadataRetriever.OPTION_NEXT_SYNC);
+
+            if (bitmap == null){
+                TUIChatLog.e(TAG, "buildVideoMessage() bitmap is null");
+                return null;
+            }
+
+            String imgPath = FileUtil.saveBitmap("JCamera", bitmap);
+            String videoPath = mUri;
+            int imgWidth = bitmap.getWidth();
+            int imgHeight = bitmap.getHeight();
+            long duration = Long.valueOf(sDuration);
+            TUIMessageBean msg = ChatMessageBuilder.buildVideoMessage(imgPath, videoPath, imgWidth, imgHeight, duration);
+
+            return msg;
+        } catch (Exception ex) {
+            TUIChatLog.e(TAG, "MediaMetadataRetriever exception " + ex);
+        } finally {
+            mmr.release();
+        }
+
+        return null;
+    }
+
+    protected void startCapture() {
+        TUIChatLog.i(TAG, "startCapture");
+
+        PermissionHelper.requestPermission(PermissionHelper.PERMISSION_CAMERA, new PermissionHelper.PermissionCallback() {
+            @Override
+            public void onGranted() {
+                Intent captureIntent = new Intent(getContext(), CameraActivity.class);
+                captureIntent.putExtra(TUIChatConstants.CAMERA_TYPE, JCameraView.BUTTON_STATE_ONLY_CAPTURE);
+                CameraActivity.mCallBack = new IUIKitCallback() {
+                    @Override
+                    public void onSuccess(Object data) {
+                        Uri contentUri = Uri.fromFile(new File(data.toString()));
+                        TUIMessageBean msg = ChatMessageBuilder.buildImageMessage(contentUri);
+                        if (mMessageHandler != null) {
+                            mMessageHandler.sendMessage(msg);
+                            hideSoftInput();
+                        }
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+
+                    }
+                };
+                setOpenPhotoCallback();
+                mInputMoreFragment.startActivityForResult(captureIntent, InputMoreFragment.REQUEST_CODE_PHOTO);
+            }
+
+            @Override
+            public void onDenied() {
+                TUIChatLog.i(TAG, "startCapture checkPermission failed");
+            }
+        });
+    }
+
+    protected void startVideoRecord() {
+        TUIChatLog.i(TAG, "startVideoRecord");
+
+        PermissionHelper.requestPermission(PermissionHelper.PERMISSION_CAMERA, new PermissionHelper.PermissionCallback() {
+            @Override
+            public void onGranted() {
+                PermissionHelper.requestPermission(PermissionHelper.PERMISSION_MICROPHONE, new PermissionHelper.PermissionCallback() {
+                    @Override
+                    public void onGranted() {
+                        Intent captureIntent = new Intent(getContext(), CameraActivity.class);
+                        captureIntent.putExtra(TUIChatConstants.CAMERA_TYPE, JCameraView.BUTTON_STATE_ONLY_RECORDER);
+                        CameraActivity.mCallBack = new IUIKitCallback() {
+                            @Override
+                            public void onSuccess(Object data) {
+                                Intent videoData = (Intent) data;
+                                String imgPath = videoData.getStringExtra(TUIChatConstants.CAMERA_IMAGE_PATH);
+                                String videoPath = videoData.getStringExtra(TUIChatConstants.CAMERA_VIDEO_PATH);
+                                int imgWidth = videoData.getIntExtra(TUIChatConstants.IMAGE_WIDTH, 0);
+                                int imgHeight = videoData.getIntExtra(TUIChatConstants.IMAGE_HEIGHT, 0);
+                                long duration = videoData.getLongExtra(TUIChatConstants.VIDEO_TIME, 0);
+                                TUIMessageBean msg = ChatMessageBuilder.buildVideoMessage(imgPath, videoPath, imgWidth, imgHeight, duration);
+                                if (mMessageHandler != null) {
+                                    mMessageHandler.sendMessage(msg);
+                                    hideSoftInput();
+                                }
+                            }
+
+                            @Override
+                            public void onError(String module, int errCode, String errMsg) {
+
+                            }
+                        };
+                        setOpenPhotoCallback();
+                        mInputMoreFragment.startActivityForResult(captureIntent, InputMoreFragment.REQUEST_CODE_PHOTO);
+                    }
+
+                    @Override
+                    public void onDenied() {
+                        TUIChatLog.i(TAG, "startVideoRecord checkPermission failed");
+                    }
+                });
+            }
+
+            @Override
+            public void onDenied() {
+                TUIChatLog.i(TAG, "startVideoRecord checkPermission failed");
+            }
+        });
+
+    }
+
+    protected void startSendFile() {
+        TUIChatLog.i(TAG, "startSendFile");
+
+        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+        intent.setType("*/*");
+        intent.addCategory(Intent.CATEGORY_OPENABLE);
+        mInputMoreFragment.setCallback(new IUIKitCallback() {
+            @Override
+            public void onSuccess(Object data) {
+                TUIMessageBean info = ChatMessageBuilder.buildFileMessage((Uri) data);
+                if (info == null) {
+                    ToastUtil.toastShortMessage(getResources().getString(R.string.send_failed_file_not_exists));
+                    return;
+                }
+                if (mMessageHandler != null) {
+                    mMessageHandler.sendMessage(info);
+                    hideSoftInput();
+                }
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastLongMessage(errMsg);
+            }
+        });
+        mInputMoreFragment.startActivityForResult(intent, InputMoreFragment.REQUEST_CODE_FILE);
+    }
+
+    public void setChatInputHandler(ChatInputHandler handler) {
+        this.mChatInputHandler = handler;
+    }
+
+    public void setMessageHandler(MessageHandler handler) {
+        this.mMessageHandler = handler;
+    }
+
+    public void setOnInputViewListener(OnInputViewListener listener) {
+        this.mOnInputViewListener = listener;
+    }
+
+    @Override
+    public void onClick(View view) {
+        TUIChatLog.i(TAG, "onClick id:" + view.getId()
+                + "|voice_input_switch:" + R.id.voice_input_switch
+                + "|face_btn:" + R.id.face_btn
+                + "|more_btn:" + R.id.more_btn
+                + "|send_btn:" + R.id.send_btn
+                + "|mCurrentState:" + mCurrentState
+                + "|mSendEnable:" + mSendEnable
+                + "|mMoreInputEvent:" + mMoreInputEvent);
+        if (view.getId() == R.id.voice_input_switch) {
+            if (mCurrentState == STATE_FACE_INPUT || mCurrentState == STATE_ACTION_INPUT) {
+                mCurrentState = STATE_VOICE_INPUT;
+                mInputMoreView.setVisibility(View.GONE);
+                mEmojiInputButton.setImageResource(R.drawable.action_face_selector);
+            } else if (mCurrentState == STATE_SOFT_INPUT) {
+                mCurrentState = STATE_VOICE_INPUT;
+            } else {
+                mCurrentState = STATE_SOFT_INPUT;
+            }
+            if (mCurrentState == STATE_VOICE_INPUT) {
+                mSendAudioButton.setVisibility(VISIBLE);
+                mTextInput.setVisibility(GONE);
+                mAudioInputSwitchButton.setImageResource(R.drawable.chat_input_keyboard);
+                hideInputMoreLayout();
+                hideSoftInput();
+            } else {
+                mAudioInputSwitchButton.setImageResource(R.drawable.action_audio_selector);
+                mSendAudioButton.setVisibility(GONE);
+                mTextInput.setVisibility(VISIBLE);
+                showSoftInput();
+            }
+        } else if (view.getId() == R.id.face_btn) {
+            mAudioInputSwitchButton.setImageResource(R.drawable.action_audio_selector);
+            if (mCurrentState == STATE_VOICE_INPUT) {
+                mCurrentState = STATE_NONE_INPUT;
+                mSendAudioButton.setVisibility(GONE);
+                mTextInput.setVisibility(VISIBLE);
+            }
+            if (mCurrentState == STATE_FACE_INPUT) {
+                mCurrentState = STATE_SOFT_INPUT;
+                mEmojiInputButton.setImageResource(R.drawable.action_face_selector);
+                mTextInput.setVisibility(VISIBLE);
+                showSoftInput();
+            } else {
+                mCurrentState = STATE_FACE_INPUT;
+                mEmojiInputButton.setImageResource(R.drawable.chat_input_keyboard);
+                showFaceViewGroup();
+            }
+        } else if (view.getId() == R.id.more_btn) {
+            hideSoftInput();
+            if (mMoreInputEvent instanceof OnClickListener) {
+                ((OnClickListener) mMoreInputEvent).onClick(view);
+            } else if (mMoreInputEvent instanceof BaseInputFragment) {
+                showCustomInputMoreFragment();
+            } else {
+                if (mCurrentState == STATE_ACTION_INPUT) {
+                    mCurrentState = STATE_NONE_INPUT;
+                    mInputMoreView.setVisibility(View.VISIBLE);
+                } else {
+                    showInputMoreLayout();
+                    mCurrentState = STATE_ACTION_INPUT;
+                    mAudioInputSwitchButton.setImageResource(R.drawable.action_audio_selector);
+                    mEmojiInputButton.setImageResource(R.drawable.action_face_selector);
+                    mSendAudioButton.setVisibility(GONE);
+                    mTextInput.setVisibility(VISIBLE);
+                }
+            }
+        } else if (view.getId() == R.id.send_btn) {
+            if (mSendEnable) {
+                if (mMessageHandler != null) {
+                    if (mChatLayout == null) {
+                        mMessageHandler.sendMessage(ChatMessageBuilder.buildTextMessage(mTextInput.getText().toString()));
+                    } else {
+                        if ((isQuoteModel || isReplyModel) && replyPreviewBean != null) {
+                            if (TUIChatUtils.isGroupChat(mChatLayout.getChatInfo().getType()) && !mTextInput.getMentionIdList().isEmpty()) {
+                                List<String> atUserList = new ArrayList<>(mTextInput.getMentionIdList());
+                                mMessageHandler.sendMessage(ChatMessageBuilder.buildAtReplyMessage(mTextInput.getText().toString(), atUserList, replyPreviewBean));
+                            } else {
+                                mMessageHandler.sendMessage(ChatMessageBuilder.buildReplyMessage(mTextInput.getText().toString(), replyPreviewBean));
+                            }
+                            exitReply();
+                        } else {
+                            if (TUIChatUtils.isGroupChat(mChatLayout.getChatInfo().getType()) && !mTextInput.getMentionIdList().isEmpty()) {
+                                //发送时通过获取输入框匹配上@的昵称list，去从map中获取ID list。
+                                // When sending, get the ID list from the map by getting the nickname list that matches the @ in the input box.
+                                List<String> atUserList = new ArrayList<>(mTextInput.getMentionIdList());
+                                if (atUserList.isEmpty()) {
+                                    mMessageHandler.sendMessage(ChatMessageBuilder.buildTextMessage(mTextInput.getText().toString()));
+                                } else {
+                                    mMessageHandler.sendMessage(ChatMessageBuilder.buildTextAtMessage(atUserList, mTextInput.getText().toString()));
+                                }
+                            } else {
+                                mMessageHandler.sendMessage(ChatMessageBuilder.buildTextMessage(mTextInput.getText().toString()));
+                            }
+                        }
+                    }
+                }
+                mIsSending = true;
+                mTextInput.setText("");
+            }
+        }
+    }
+
+    public void showSoftInput() {
+        TUIChatLog.i(TAG, "showSoftInput");
+        mCurrentState = STATE_SOFT_INPUT;
+        InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+        if (!isSoftInputShown()) {
+            imm.toggleSoftInput(0, 0);
+        }
+        BackgroundTasks.getInstance().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                hideInputMoreLayout();
+                mAudioInputSwitchButton.setImageResource(R.drawable.action_audio_selector);
+                mEmojiInputButton.setImageResource(R.drawable.chat_input_face);
+                mSendAudioButton.setVisibility(GONE);
+                mTextInput.setVisibility(VISIBLE);
+                mTextInput.requestFocus();
+                Context context = getContext();
+                if (context instanceof Activity) {
+                    Window window = ((Activity) context).getWindow();
+                    if (window != null) {
+                        window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+                    }
+                }
+            }
+        }, 200);
+
+        if (mChatInputHandler != null) {
+            postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    mChatInputHandler.onInputAreaClick();
+                }
+            }, 200);
+        }
+    }
+
+    public void hideSoftInput() {
+        TUIChatLog.i(TAG, "hideSoftInput");
+        InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(mTextInput.getWindowToken(), 0);
+        mTextInput.clearFocus();
+        Context context = getContext();
+        if (context instanceof Activity) {
+            Window window = ((Activity) context).getWindow();
+            if (window != null) {
+                window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING);
+            }
+        }
+    }
+
+    public void onEmptyClick() {
+        hideSoftInput();
+        mCurrentState = STATE_SOFT_INPUT;
+        hideInputMoreLayout();
+        mEmojiInputButton.setImageResource(R.drawable.action_face_selector);
+        mAudioInputSwitchButton.setImageResource(R.drawable.action_audio_selector);
+        mSendAudioButton.setVisibility(GONE);
+        mTextInput.setVisibility(VISIBLE);
+    }
+
+    private boolean isSoftInputShown() {
+        View decorView = ((Activity) getContext()).getWindow().getDecorView();
+        int screenHeight = decorView.getHeight();
+        Rect rect = new Rect();
+        decorView.getWindowVisibleDisplayFrame(rect);
+        return screenHeight - rect.bottom - getNavigateBarHeight() >= 0;
+    }
+
+    private int getNavigateBarHeight() {
+        DisplayMetrics metrics = new DisplayMetrics();
+        WindowManager windowManager  = (WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE);
+        windowManager.getDefaultDisplay().getMetrics(metrics);
+        int usableHeight = metrics.heightPixels;
+        windowManager.getDefaultDisplay().getRealMetrics(metrics);
+        int realHeight = metrics.heightPixels;
+        if (realHeight > usableHeight) {
+            return realHeight - usableHeight;
+        } else {
+            return 0;
+        }
+    }
+
+    public void disableShowCustomFace(boolean disable) {
+        isShowCustomFace = !disable;
+    }
+
+    private void showFaceViewGroup() {
+        TUIChatLog.i(TAG, "showFaceViewGroup");
+        if (mFragmentManager == null) {
+            mFragmentManager = mActivity.getSupportFragmentManager();
+        }
+        if (mFaceFragment == null) {
+            mFaceFragment = new FaceFragment();
+        }
+        hideSoftInput();
+        mInputMoreView.setVisibility(View.VISIBLE);
+        mTextInput.requestFocus();
+        mFaceFragment.setShowCustomFace(isShowCustomFace);
+        mFaceFragment.setListener(new FaceFragment.OnEmojiClickListener() {
+            @Override
+            public void onEmojiDelete() {
+                int index = mTextInput.getSelectionStart();
+                Editable editable = mTextInput.getText();
+                boolean isFace = false;
+                if (index <= 0) {
+                    return;
+                }
+                if (editable.charAt(index - 1) == ']') {
+                    for (int i = index - 2; i >= 0; i--) {
+                        if (editable.charAt(i) == '[') {
+                            String faceChar = editable.subSequence(i, index).toString();
+                            if (FaceManager.isFaceChar(faceChar)) {
+                                editable.delete(i, index);
+                                isFace = true;
+                            }
+                            break;
+                        }
+                    }
+                }
+                if (!isFace) {
+                    editable.delete(index - 1, index);
+                }
+            }
+
+            @Override
+            public void onEmojiClick(Emoji emoji) {
+                int index = mTextInput.getSelectionStart();
+                Editable editable = mTextInput.getText();
+                editable.insert(index, emoji.getFaceKey());
+                FaceManager.handlerEmojiText(mTextInput, editable, true);
+            }
+
+            @Override
+            public void onCustomFaceClick(int groupIndex, CustomFace customFace) {
+                mMessageHandler.sendMessage(ChatMessageBuilder.buildFaceMessage(groupIndex, customFace.getFaceKey()));
+            }
+        });
+        mFragmentManager.beginTransaction().replace(R.id.more_groups, mFaceFragment).commitAllowingStateLoss();
+        if (mChatInputHandler != null) {
+            postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    mChatInputHandler.onInputAreaClick();
+                }
+            }, 100);
+        }
+    }
+
+    private void showCustomInputMoreFragment() {
+        TUIChatLog.i(TAG, "showCustomInputMoreFragment");
+        if (mFragmentManager == null) {
+            mFragmentManager = mActivity.getSupportFragmentManager();
+        }
+        BaseInputFragment fragment = (BaseInputFragment) mMoreInputEvent;
+        hideSoftInput();
+        mInputMoreView.setVisibility(View.VISIBLE);
+        mFragmentManager.beginTransaction().replace(R.id.more_groups, fragment).commitAllowingStateLoss();
+        if (mChatInputHandler != null) {
+            postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    mChatInputHandler.onInputAreaClick();
+                }
+            }, 100);
+        }
+    }
+
+    private void showInputMoreLayout() {
+        TUIChatLog.i(TAG, "showInputMoreLayout");
+        if (mFragmentManager == null) {
+            mFragmentManager = mActivity.getSupportFragmentManager();
+        }
+        if (mInputMoreFragment == null) {
+            mInputMoreFragment = new InputMoreFragment();
+        }
+
+        assembleActions();
+        mInputMoreFragment.setActions(mInputMoreActionList);
+        hideSoftInput();
+        mInputMoreView.setVisibility(View.VISIBLE);
+        mFragmentManager.beginTransaction().replace(R.id.more_groups, mInputMoreFragment).commitAllowingStateLoss();
+        if (mChatInputHandler != null) {
+            postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    mChatInputHandler.onInputAreaClick();
+                }
+            }, 100);
+        }
+    }
+
+    private void hideInputMoreLayout() {
+        mInputMoreView.setVisibility(View.GONE);
+    }
+
+    private void recordComplete(boolean success) {
+        int duration = AudioRecorder.getInstance().getDuration();
+        TUIChatLog.i(TAG, "recordComplete duration:" + duration);
+        if (mChatInputHandler != null) {
+            if (!success || duration == 0) {
+                mChatInputHandler.onRecordStatusChanged(ChatInputHandler.RECORD_FAILED);
+                return;
+            }
+            if (mAudioCancel) {
+                mChatInputHandler.onRecordStatusChanged(ChatInputHandler.RECORD_CANCEL);
+                return;
+            }
+            if (duration < 1000) {
+                mChatInputHandler.onRecordStatusChanged(ChatInputHandler.RECORD_TOO_SHORT);
+                return;
+            }
+            mChatInputHandler.onRecordStatusChanged(ChatInputHandler.RECORD_STOP);
+        }
+
+        if (mMessageHandler != null && success) {
+            mMessageHandler.sendMessage(ChatMessageBuilder.buildAudioMessage(AudioRecorder.getInstance().getPath(), duration));
+        }
+    }
+
+    @Override
+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+        mInputContent = s.toString();
+    }
+
+    @Override
+    public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+    }
+
+    @Override
+    public void afterTextChanged(Editable s) {
+        if (TextUtils.isEmpty(s.toString().trim())) {
+            mSendEnable = false;
+            showSendTextButton(View.GONE);
+            showMoreInputButton(View.VISIBLE);
+
+            if (mChatInputHandler != null) {
+                mChatInputHandler.onUserTyping(false, V2TIMManager.getInstance().getServerTime());
+            }
+        } else {
+            mSendEnable = true;
+            showSendTextButton(View.VISIBLE);
+            showMoreInputButton(View.GONE);
+            if (mTextInput.getLineCount() != mLastMsgLineCount) {
+                mLastMsgLineCount = mTextInput.getLineCount();
+                if (mChatInputHandler != null) {
+                    mChatInputHandler.onInputAreaClick();
+                }
+            }
+            if (!TextUtils.equals(mInputContent, mTextInput.getText().toString())) {
+                FaceManager.handlerEmojiText(mTextInput, mTextInput.getText(), true);
+            }
+        }
+
+        if (mChatInputHandler != null && !mIsSending) {
+            mChatInputHandler.onUserTyping(true, V2TIMManager.getInstance().getServerTime());
+        }
+
+        if (mIsSending) {
+            mIsSending = false;
+        }
+    }
+
+    public void setDraft() {
+        if (mChatInfo == null) {
+            TUIChatLog.e(TAG, "set drafts error :  chatInfo is null");
+            return;
+        }
+        if (mTextInput == null) {
+            TUIChatLog.e(TAG, "set drafts error :  textInput is null");
+            return;
+        }
+
+        String draftText = mTextInput.getText().toString();
+        if ((isQuoteModel || isReplyModel) && replyPreviewBean != null) {
+            Gson gson = new Gson();
+            Map<String, String> draftMap = new HashMap<>();
+            draftMap.put("content", draftText);
+            draftMap.put("reply", gson.toJson(replyPreviewBean));
+            draftText = gson.toJson(draftMap);
+        }
+        if (presenter != null) {
+            presenter.setDraft(draftText);
+        }
+    }
+
+    public void appendText(String text) {
+        if (mChatInfo == null) {
+            TUIChatLog.e(TAG, "appendText error :  chatInfo is null");
+            return;
+        }
+        if (mTextInput == null) {
+            TUIChatLog.e(TAG, "appendText error :  textInput is null");
+            return;
+        }
+        String draftText = mTextInput.getText().toString();
+        draftText += text;
+        mTextInput.setText(draftText);
+        mTextInput.setSelection(mTextInput.getText().length());
+    }
+
+    public void setChatInfo(ChatInfo chatInfo) {
+        mChatInfo = chatInfo;
+        if (chatInfo != null) {
+            DraftInfo draftInfo = chatInfo.getDraft();
+            if (draftInfo != null && !TextUtils.isEmpty(draftInfo.getDraftText()) && mTextInput != null) {
+                Gson gson = new Gson();
+                HashMap draftJsonMap;
+                String content = draftInfo.getDraftText();
+                try {
+                    draftJsonMap = gson.fromJson(draftInfo.getDraftText(), HashMap.class);
+                    if (draftJsonMap != null) {
+                        content = (String) draftJsonMap.get("content");
+                        String draftStr = (String) draftJsonMap.get("reply");
+                        ReplyPreviewBean bean = gson.fromJson(draftStr, ReplyPreviewBean.class);
+                        if (bean != null) {
+                            showReplyPreview(bean);
+                        }
+                    }
+                } catch (JsonSyntaxException e) {
+                    TUIChatLog.e(TAG, " getCustomJsonMap error ");
+                }
+
+                mTextInput.setText(content);
+                mTextInput.setSelection(mTextInput.getText().length());
+            }
+        }
+    }
+
+    public void setChatLayout(IChatLayout chatLayout) {
+        mChatLayout = chatLayout;
+    }
+
+    protected void assembleActions() {
+        mInputMoreActionList.clear();
+        InputMoreActionUnit actionUnit;
+        if (!mSendPhotoDisable) {
+            actionUnit = new InputMoreActionUnit() {
+                @Override
+                public void onAction(String chatInfoId, int chatType) {
+                    startSendPhoto();
+                }
+            };
+            actionUnit.setIconResId(R.drawable.ic_more_picture);
+            actionUnit.setTitleId(R.string.pic);
+            mInputMoreActionList.add(actionUnit);
+        }
+
+        if (!mCaptureDisable) {
+            actionUnit = new InputMoreActionUnit() {
+                @Override
+                public void onAction(String chatInfoId, int chatType) {
+                    startCapture();
+                }
+            };
+            actionUnit.setIconResId(R.drawable.ic_more_camera);
+            actionUnit.setTitleId(R.string.photo);
+            mInputMoreActionList.add(actionUnit);
+        }
+
+        if (!mVideoRecordDisable) {
+            actionUnit = new InputMoreActionUnit() {
+                @Override
+                public void onAction(String chatInfoId, int chatType) {
+                    startVideoRecord();
+                }
+            };
+            actionUnit.setIconResId(R.drawable.ic_more_video);
+            actionUnit.setTitleId(R.string.video);
+            mInputMoreActionList.add(actionUnit);
+        }
+
+        if (!mSendFileDisable) {
+            actionUnit = new InputMoreActionUnit() {
+                @Override
+                public void onAction(String chatInfoId, int chatType) {
+                    startSendFile();
+                }
+            };
+            actionUnit.setIconResId(R.drawable.ic_more_file);
+            actionUnit.setTitleId(R.string.file);
+            mInputMoreActionList.add(actionUnit);
+        }
+
+        addActionsFromListeners();
+        mInputMoreActionList.addAll(mInputMoreCustomActionList);
+        Collections.sort(mInputMoreActionList, new Comparator<InputMoreActionUnit>() {
+            @Override
+            public int compare(InputMoreActionUnit o1, InputMoreActionUnit o2) {
+                return o1.getPriority() - o2.getPriority();
+            }
+        });
+    }
+
+    private void addActionsFromListeners() {
+        if (mChatInfo == null) {
+            return;
+        }
+
+        HashMap<String, Object> param = new HashMap<>();
+        param.put(TUIConstants.TUIChat.CHAT_ID, mChatInfo.getId());
+        param.put(TUIConstants.TUIChat.CHAT_NAME, mChatInfo.getChatName());
+        param.put(TUIConstants.TUIChat.CHAT_TYPE, mChatInfo.getType());
+        param.put(TUIConstants.TUIChat.CONTEXT, getContext());
+        Map<String, Object> customMessageExtension = TUICore.getExtensionInfo(TUIConstants.TUIChat.EXTENSION_INPUT_MORE_CUSTOM_MESSAGE, param);
+        if (customMessageExtension != null) {
+            Integer icon = (Integer) customMessageExtension.get(TUIConstants.TUIChat.INPUT_MORE_ICON);
+            Integer title = (Integer) customMessageExtension.get(TUIConstants.TUIChat.INPUT_MORE_TITLE);
+            Integer id = (Integer) customMessageExtension.get(TUIConstants.TUIChat.INPUT_MORE_ACTION_ID);
+            InputMoreActionUnit unit = new InputMoreActionUnit();
+            unit.setActionId(id);
+            unit.setIconResId(icon);
+            unit.setTitleId(title);
+            unit.setPriority(10);
+            unit.setOnClickListener(unit.new OnActionClickListener() {
+                @Override
+                public void onClick() {
+                    onCustomActionClick(unit.getActionId());
+                }
+            });
+            mInputMoreActionList.add(unit);
+        }
+
+        // topic not support call yet.
+        if (TUIChatUtils.isTopicGroup(mChatInfo.getId())) {
+            return;
+        }
+
+        Map<String, Object> audioCallExtension = TUICore.getExtensionInfo(TUIConstants.TUIChat.EXTENSION_INPUT_MORE_AUDIO_CALL, param);
+        if (audioCallExtension != null) {
+            View audioView = (View) audioCallExtension.get(TUIConstants.TUIChat.INPUT_MORE_VIEW);
+            int audioActionId = (Integer) audioCallExtension.get(TUIConstants.TUIChat.INPUT_MORE_ACTION_ID);
+            InputMoreActionUnit audioUnit = new InputMoreActionUnit();
+            audioUnit.setActionId(audioActionId);
+            audioUnit.setUnitView(audioView);
+            audioUnit.setPriority(2);
+            audioUnit.setOnClickListener(audioUnit.new OnActionClickListener() {
+                @Override
+                public void onClick() {
+                    PermissionHelper.requestPermission(PermissionHelper.PERMISSION_MICROPHONE, new PermissionHelper.PermissionCallback() {
+                        @Override
+                        public void onGranted() {
+                            onCustomActionClick(audioUnit.getActionId());
+                        }
+
+                        @Override
+                        public void onDenied() {
+
+                        }
+                    });
+                }
+            });
+            if(!mAudioCallDisable){
+                mInputMoreActionList.add(audioUnit);
+            }
+        }
+
+        Map<String, Object> videoCallExtension = TUICore.getExtensionInfo(TUIConstants.TUIChat.EXTENSION_INPUT_MORE_VIDEO_CALL, param);
+        if (videoCallExtension != null) {
+            View videoView = (View) videoCallExtension.get(TUIConstants.TUIChat.INPUT_MORE_VIEW);
+            int videoActionId = (Integer) videoCallExtension.get(TUIConstants.TUIChat.INPUT_MORE_ACTION_ID);
+            InputMoreActionUnit videoUnit = new InputMoreActionUnit();
+            videoUnit.setActionId(videoActionId);
+            videoUnit.setUnitView(videoView);
+            videoUnit.setPriority(1);
+            videoUnit.setOnClickListener(videoUnit.new OnActionClickListener() {
+                @Override
+                public void onClick() {
+                    PermissionHelper.requestPermission(PermissionHelper.PERMISSION_MICROPHONE, new PermissionHelper.PermissionCallback() {
+                        @Override
+                        public void onGranted() {
+                            PermissionHelper.requestPermission(PermissionHelper.PERMISSION_CAMERA, new PermissionHelper.PermissionCallback() {
+                                @Override
+                                public void onGranted() {
+                                    onCustomActionClick(videoUnit.getActionId());
+                                }
+
+                                @Override
+                                public void onDenied() {
+
+                                }
+                            });
+                        }
+
+                        @Override
+                        public void onDenied() {
+
+                        }
+                    });
+                }
+            });
+            if(!mVideoCallDisable){
+                mInputMoreActionList.add(videoUnit);
+            }
+        }
+
+    }
+
+    private void onCustomActionClick(int id) {
+        if (id == TUIConstants.TUICalling.ACTION_ID_AUDIO_CALL || id == TUIConstants.TUICalling.ACTION_ID_VIDEO_CALL) {
+            String type = id == TUIConstants.TUICalling.ACTION_ID_AUDIO_CALL ? TUIConstants.TUICalling.TYPE_AUDIO
+                    : TUIConstants.TUICalling.TYPE_VIDEO;
+            if (TUIChatUtils.isGroupChat(getChatInfo().getType())) {
+                Bundle bundle = new Bundle();
+                bundle.putString(TUIConstants.TUICalling.GROUP_ID, getChatInfo().getId());
+                bundle.putString(TUIConstants.TUICalling.PARAM_NAME_TYPE, type);
+                bundle.putString(TUIChatConstants.GROUP_ID, getChatInfo().getId());
+                bundle.putBoolean(TUIChatConstants.SELECT_FOR_CALL, true);
+                bundle.putInt(TUIChatConstants.Selection.LIMIT, CALL_MEMBER_LIMIT);
+                TUICore.startActivity(getContext(), "StartGroupMemberSelectActivity", bundle, 11);
+            }
+            return;
+        }
+        HashMap<String, Object> param = new HashMap<>();
+        param.put(TUIConstants.TUIChat.INPUT_MORE_ACTION_ID, id);
+        param.put(TUIConstants.TUIChat.CHAT_ID, mChatInfo.getId());
+        param.put(TUIConstants.TUIChat.CHAT_NAME, mChatInfo.getChatName());
+        param.put(TUIConstants.TUIChat.CHAT_TYPE, mChatInfo.getType());
+        TUICore.notifyEvent(TUIConstants.TUIChat.EVENT_KEY_INPUT_MORE, TUIConstants.TUIChat.EVENT_SUB_KEY_ON_CLICK, param);
+    }
+
+    public void disableAudioInput(boolean disable) {
+        mAudioInputDisable = disable;
+        if (disable) {
+            mAudioInputSwitchButton.setVisibility(GONE);
+        } else {
+            mAudioInputSwitchButton.setVisibility(VISIBLE);
+        }
+    }
+
+    public void disableEmojiInput(boolean disable) {
+        mEmojiInputDisable = disable;
+        if (disable) {
+            mEmojiInputButton.setVisibility(GONE);
+        } else {
+            mEmojiInputButton.setVisibility(VISIBLE);
+        }
+    }
+
+    public void disableMoreInput(boolean disable) {
+        mMoreInputDisable = disable;
+        if (disable) {
+            mMoreInputButton.setVisibility(GONE);
+            mSendTextButton.setVisibility(VISIBLE);
+        } else {
+            mMoreInputButton.setVisibility(VISIBLE);
+            mSendTextButton.setVisibility(GONE);
+        }
+    }
+
+    public void replaceMoreInput(BaseInputFragment fragment) {
+        mMoreInputEvent = fragment;
+    }
+
+    public void replaceMoreInput(OnClickListener listener) {
+        mMoreInputEvent = listener;
+    }
+
+    public void disableSendPhotoAction(boolean disable) {
+        mSendPhotoDisable = disable;
+    }
+
+    public void disableCaptureAction(boolean disable) {
+        mCaptureDisable = disable;
+    }
+
+    public void disableVideoRecordAction(boolean disable) {
+        mVideoRecordDisable = disable;
+    }
+
+    public void disableSendFileAction(boolean disable) {
+        mSendFileDisable = disable;
+    }
+
+    public void disableAudioCall(boolean mAudioCallDisable) {
+        this.mAudioCallDisable = mAudioCallDisable;
+    }
+
+    public void disableVideoCall(boolean mVideoCallDisable) {
+        this.mVideoCallDisable = mVideoCallDisable;
+    }
+
+    public void addAction(InputMoreActionUnit action) {
+        mInputMoreCustomActionList.add(action);
+    }
+
+    public EditText getInputText() {
+        return mTextInput;
+    }
+
+    protected void showMoreInputButton(int visibility) {
+        if (mMoreInputDisable) {
+            return;
+        }
+        mMoreInputButton.setVisibility(visibility);
+    }
+
+    protected void showSendTextButton(int visibility) {
+        if (mMoreInputDisable) {
+            mSendTextButton.setVisibility(VISIBLE);
+        } else {
+            mSendTextButton.setVisibility(visibility);
+        }
+    }
+
+    public void showReplyPreview(ReplyPreviewBean previewBean) {
+        exitReply();
+        replyPreviewBean = previewBean;
+        String replyMessageAbstract = previewBean.getMessageAbstract();
+        String msgTypeStr = ChatMessageParser.getMsgTypeStr(previewBean.getMessageType());
+        String text = previewBean.getMessageSender() + " : " + msgTypeStr + " " + replyMessageAbstract;
+        text = FaceManager.emojiJudge(text);
+        // If replying to a text message, the middle part of the file name is displayed in abbreviated form
+        if (previewBean.isReplyMessage()) {
+            isReplyModel = true;
+            replyTv.setText(text);
+            replyPreviewBar.setVisibility(View.VISIBLE);
+        } else {
+            isQuoteModel = true;
+            quoteTv.setText(text);
+            quotePreviewBar.setVisibility(View.VISIBLE);
+        }
+
+        if (previewBean.getOriginalMessageBean() instanceof FileMessageBean) {
+            replyTv.setEllipsize(TextUtils.TruncateAt.MIDDLE);
+            quoteTv.setEllipsize(TextUtils.TruncateAt.MIDDLE);
+        } else {
+            replyTv.setEllipsize(TextUtils.TruncateAt.END);
+            quoteTv.setEllipsize(TextUtils.TruncateAt.END);
+        }
+
+        if (mMessageHandler != null) {
+            mMessageHandler.scrollToEnd();
+        }
+
+        showSoftInput();
+    }
+
+    public void exitReply() {
+        isReplyModel = false;
+        replyPreviewBean = null;
+        replyPreviewBar.setVisibility(View.GONE);
+        isQuoteModel = false;
+        quotePreviewBar.setVisibility(View.GONE);
+        updateChatBackground();
+    }
+
+    private void updateChatBackground() {
+        if (mOnInputViewListener != null) {
+            mOnInputViewListener.onUpdateChatBackground();
+        }
+    }
+
+    protected void showEmojiInputButton(int visibility) {
+        if (mEmojiInputDisable) {
+            return;
+        }
+        mEmojiInputButton.setVisibility(visibility);
+    }
+
+    public void clearCustomActionList() {
+        mInputMoreCustomActionList.clear();
+    }
+
+    public ChatInfo getChatInfo() {
+        return mChatInfo;
+    }
+
+    public interface MessageHandler {
+        void sendMessage(TUIMessageBean msg);
+        void scrollToEnd();
+    }
+
+    public interface ChatInputHandler {
+
+        int RECORD_START = 1;
+        int RECORD_STOP = 2;
+        int RECORD_CANCEL = 3;
+        int RECORD_TOO_SHORT = 4;
+        int RECORD_FAILED = 5;
+
+        void onInputAreaClick();
+
+        void onRecordStatusChanged(int status);
+
+        void onUserTyping(boolean status, long time);
+    }
+
+    public interface OnInputViewListener {
+        void onStartGroupMemberSelectActivity();
+        void onUpdateChatBackground();
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/ReplyPreviewBar.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/ReplyPreviewBar.java
new file mode 100644
index 0000000..a187c21
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/ReplyPreviewBar.java
@@ -0,0 +1,28 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.input;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.RelativeLayout;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+
+public class ReplyPreviewBar extends RelativeLayout {
+    public ReplyPreviewBar(Context context) {
+        super(context);
+        initViews();
+    }
+
+    public ReplyPreviewBar(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initViews();
+    }
+
+    public ReplyPreviewBar(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initViews();
+    }
+
+    private void initViews() {
+        inflate(getContext(), R.layout.reply_preview_layout, this);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/TIMMentionEditText.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/TIMMentionEditText.java
new file mode 100644
index 0000000..c88b4fc
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/TIMMentionEditText.java
@@ -0,0 +1,301 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.input;
+
+import android.content.Context;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.AttributeSet;
+import android.view.KeyEvent;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputConnectionWrapper;
+import android.widget.EditText;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class TIMMentionEditText extends EditText {
+    public static final String TIM_MENTION_TAG = "@";
+    public static final String TIM_MENTION_TAG_FULL = "＠";
+
+    private List<String> mentionTagList = new ArrayList<>();
+
+    private boolean mIsSelected;
+    private Range mLastSelectedRange;
+    private List<Range> mRangeArrayList = new ArrayList<>();
+    private Map<String, String> mentionMap = new HashMap<>();
+
+    private OnMentionInputListener mOnMentionInputListener;
+
+    public TIMMentionEditText(Context context) {
+        super(context);
+        init();
+    }
+
+    public TIMMentionEditText(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public TIMMentionEditText(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    @Override
+    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+        return new HackInputConnection(super.onCreateInputConnection(outAttrs), true, this);
+    }
+
+    @Override
+    protected void onTextChanged(CharSequence text, int start, int lengthBefore, int lengthAfter) {
+        setMentionStringRange();
+    }
+
+    @Override
+    protected void onSelectionChanged(int selStart, int selEnd) {
+        super.onSelectionChanged(selStart, selEnd);
+
+        if (mLastSelectedRange != null && mLastSelectedRange.isEqual(selStart, selEnd)) {
+            return;
+        }
+
+        Range closestRange = getRangeOfClosestMentionString(selStart, selEnd);
+        if (closestRange != null && closestRange.to == selEnd) {
+            mIsSelected = false;
+        }
+
+        Range nearbyRange = getRangeOfNearbyMentionString(selStart, selEnd);
+        if (nearbyRange == null) {
+            return;
+        }
+
+        //forbid cursor located in the mention string.
+        if (selStart == selEnd) {
+            setSelection(nearbyRange.getAnchorPosition(selStart));
+        } else {
+            if (selEnd < nearbyRange.to) {
+                setSelection(selStart, nearbyRange.to);
+            }
+            if (selStart > nearbyRange.from) {
+                setSelection(nearbyRange.from, selEnd);
+            }
+        }
+    }
+
+    public void setOnMentionInputListener(OnMentionInputListener onMentionInputListener) {
+        mOnMentionInputListener = onMentionInputListener;
+    }
+
+    private void init() {
+        mentionTagList.clear();
+        mentionTagList.add(TIM_MENTION_TAG);
+        mentionTagList.add(TIM_MENTION_TAG_FULL);
+        addTextChangedListener(new MentionTextWatcher());
+    }
+
+    public void setMentionMap(Map<String, String> mentionList) {
+        this.mentionMap.putAll(mentionList);
+    }
+
+    public List<String> getMentionIdList() {
+        List<String> mentionIDList = new ArrayList<>();
+        for (Range range : mRangeArrayList) {
+            mentionIDList.add(range.userID);
+        }
+        return mentionIDList;
+    }
+
+    private void setMentionStringRange() {
+        updateMentionList();
+        mIsSelected = false;
+        if (mRangeArrayList != null) {
+            mRangeArrayList.clear();
+        }
+
+        Editable spannableText = getText();
+        if (spannableText == null || TextUtils.isEmpty(spannableText.toString())) {
+            return;
+        }
+
+        String text = spannableText.toString();
+        if (TextUtils.isEmpty(text)) {
+            return;
+        }
+        for (String name : mentionMap.keySet()) {
+            if (TextUtils.isEmpty(name)) {
+                continue;
+            }
+            int nameStartIndex = 0;
+            while (true) {
+                int findIndex = text.indexOf(name, nameStartIndex);
+                if (findIndex == -1) {
+                    break;
+                } else {
+                    int end = findIndex + name.length();
+                    mRangeArrayList.add(new Range(findIndex, end, mentionMap.get(name)));
+                    nameStartIndex = end;
+                }
+            }
+        }
+
+        Collections.sort(mRangeArrayList, new Comparator<Range>() {
+            @Override
+            public int compare(Range lhs, Range rhs) {
+                return lhs.from - rhs.from;
+            }
+        });
+    }
+
+    private void updateMentionList() {
+        if (mentionMap == null) {
+            return;
+        }
+        Editable spannableText = getText();
+        if (spannableText == null) {
+            return;
+        }
+        String text = spannableText.toString();
+        if (TextUtils.isEmpty(text)) {
+            mentionMap.clear();
+        }
+        for (String name : new ArrayList<>(mentionMap.keySet())) {
+            if (!text.contains(name)) {
+                mentionMap.remove(name);
+            }
+        }
+    }
+
+    private Range getRangeOfClosestMentionString(int selStart, int selEnd) {
+        if (mRangeArrayList == null) {
+            return null;
+        }
+        for (Range range : mRangeArrayList) {
+            if (range.contains(selStart, selEnd)) {
+                return range;
+            }
+        }
+        return null;
+    }
+
+    private Range getRangeOfNearbyMentionString(int selStart, int selEnd) {
+        if (mRangeArrayList == null) {
+            return null;
+        }
+        for (Range range : mRangeArrayList) {
+            if (range.isWrappedBy(selStart, selEnd)) {
+                return range;
+            }
+        }
+        return null;
+    }
+
+
+    private class MentionTextWatcher implements TextWatcher {
+        @Override
+        public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+        }
+
+        @Override
+        public void onTextChanged(CharSequence charSequence, int index, int i1, int count) {
+            if (count == 1 && !TextUtils.isEmpty(charSequence) && hasFocus()) {
+                char mentionChar = charSequence.toString().charAt(index);
+                for (String mentionTag: mentionTagList) {
+                    if (mentionTag.equals(String.valueOf(mentionChar)) && mOnMentionInputListener != null) {
+                        mOnMentionInputListener.onMentionCharacterInput(mentionTag);
+                    }
+                }
+            }
+        }
+
+        @Override
+        public void afterTextChanged(Editable editable) {
+        }
+    }
+
+
+    private class HackInputConnection extends InputConnectionWrapper {
+        private EditText editText;
+
+        HackInputConnection(InputConnection target, boolean mutable, TIMMentionEditText editText) {
+            super(target, mutable);
+            this.editText = editText;
+        }
+
+        @Override
+        public boolean sendKeyEvent(KeyEvent event) {
+            if (event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_DEL) {
+                int selectionStart = editText.getSelectionStart();
+                int selectionEnd = editText.getSelectionEnd();
+                Range closestRange = getRangeOfClosestMentionString(selectionStart, selectionEnd);
+                if (closestRange == null) {
+                    mIsSelected = false;
+                    return super.sendKeyEvent(event);
+                }
+
+                if (mIsSelected || selectionStart == closestRange.from) {
+                    mIsSelected = false;
+                    return super.sendKeyEvent(event);
+                } else {
+                    mIsSelected = true;
+                    mLastSelectedRange = closestRange;
+                    setSelection(closestRange.to, closestRange.from);
+                    sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL));
+                }
+
+                return true;
+            }
+            return super.sendKeyEvent(event);
+        }
+
+        @Override
+        public boolean deleteSurroundingText(int beforeLength, int afterLength) {
+            if (beforeLength == 1 && afterLength == 0) {
+                return sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL))
+                        && sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DEL));
+            }
+            return super.deleteSurroundingText(beforeLength, afterLength);
+        }
+    }
+
+    private class Range {
+        int from;
+        int to;
+        String userID;
+
+        Range(int from, int to, String userID) {
+            this.from = from;
+            this.to = to;
+            this.userID = userID;
+        }
+
+        boolean isWrappedBy(int start, int end) {
+            return (start > from && start < to) || (end > from && end < to);
+        }
+
+        boolean contains(int start, int end) {
+            return from <= start && to >= end;
+        }
+
+        boolean isEqual(int start, int end) {
+            return (from == start && to == end) || (from == end && to == start);
+        }
+
+        int getAnchorPosition(int value) {
+            if ((value - from) - (to - value) >= 0) {
+                return to;
+            } else {
+                return from;
+            }
+        }
+    }
+
+    public interface OnMentionInputListener {
+        void onMentionCharacterInput(String tag);
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/face/FaceFragment.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/face/FaceFragment.java
new file mode 100644
index 0000000..520413a
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/face/FaceFragment.java
@@ -0,0 +1,341 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.input.face;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.BitmapFactory;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.FrameLayout;
+import android.widget.GridView;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.EmojiIndicatorView;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.input.BaseInputFragment;
+import com.tencent.qcloud.tuikit.tuichat.component.face.ChatFace;
+import com.tencent.qcloud.tuikit.tuichat.component.face.CustomFace;
+import com.tencent.qcloud.tuikit.tuichat.component.face.Emoji;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceGroup;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+import com.tencent.qcloud.tuikit.tuichat.component.face.RecentEmojiManager;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class FaceFragment extends BaseInputFragment {
+
+    ViewPager faceViewPager;
+    EmojiIndicatorView faceIndicator;
+    FaceGroupIcon mCurrentSelected;
+    LinearLayout faceGroup;
+    ArrayList<View> ViewPagerItems = new ArrayList<>();
+    ArrayList<Emoji> recentlyEmojiList;
+    List<FaceGroup> faceGroups;
+    private int mCurrentGroupIndex = 0;
+    private OnEmojiClickListener listener;
+    private RecentEmojiManager recentManager;
+
+    private boolean showCustomFace = true;
+
+    public void setListener(OnEmojiClickListener listener) {
+        this.listener = listener;
+    }
+
+    public void setShowCustomFace(boolean showCustomFace) {
+        this.showCustomFace = showCustomFace;
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        if (activity instanceof OnEmojiClickListener) {
+            this.listener = (OnEmojiClickListener) activity;
+        }
+        recentManager = RecentEmojiManager.getInstance();
+        super.onAttach(activity);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        try {
+            if (recentManager.getCollection(RecentEmojiManager.PREFERENCE_NAME) != null) {
+                recentlyEmojiList = (ArrayList<Emoji>) recentManager.getCollection(RecentEmojiManager.PREFERENCE_NAME);
+            } else {
+                recentlyEmojiList = new ArrayList<>();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_face, container, false);
+        faceViewPager = view.findViewById(R.id.face_viewPager);
+        faceIndicator = view.findViewById(R.id.face_indicator);
+        faceGroup = view.findViewById(R.id.face_view_group);
+        initViews();
+        return view;
+    }
+
+    private void initViews() {
+        faceGroups = FaceManager.getFaceGroupList();
+
+        for (int i = 0; i < faceGroups.size(); i++) {
+            final FaceGroup group = faceGroups.get(i);
+            if (group.getGroupID() != FaceManager.EMOJI_GROUP_ID && !showCustomFace) {
+                continue;
+            }
+            FaceGroupIcon faceBtn = new FaceGroupIcon(getActivity());
+            faceBtn.setFaceTabIcon(group.getFaceGroupIconUrl());
+            if (i == 0) {
+                mCurrentSelected = faceBtn;
+                mCurrentGroupIndex = group.getGroupID();
+                ArrayList<ChatFace> faces = group.getFaces();
+                initViewPager(faces, group.getPageColumnCount(), group.getPageRowCount());
+                mCurrentSelected.setSelected(true);
+            }
+            faceBtn.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (mCurrentSelected != v) {
+                        mCurrentGroupIndex = group.getGroupID();
+                        ArrayList<ChatFace> faces = group.getFaces();
+                        mCurrentSelected.setSelected(false);
+                        initViewPager(faces, group.getPageColumnCount(), group.getPageRowCount());
+                        mCurrentSelected = (FaceGroupIcon) v;
+                        mCurrentSelected.setSelected(true);
+                    }
+                }
+            });
+            faceGroup.addView(faceBtn);
+        }
+    }
+
+    private void initViewPager(ArrayList<? extends ChatFace> list, int columns, int rows) {
+        intiIndicator(list, columns, rows);
+        ViewPagerItems.clear();
+        int pageCont = getPagerCount(list, columns, rows);
+        for (int i = 0; i < pageCont; i++) {
+            ViewPagerItems.add(getViewPagerItem(i, list, columns, rows));
+        }
+        FaceVPAdapter mVpAdapter = new FaceVPAdapter(ViewPagerItems);
+        faceViewPager.setAdapter(mVpAdapter);
+        faceViewPager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            int oldPosition = 0;
+
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+            }
+
+            @Override
+            public void onPageSelected(int position) {
+                faceIndicator.playBy(oldPosition, position);
+                oldPosition = position;
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int state) {
+
+            }
+        });
+    }
+
+    private void intiIndicator(ArrayList<? extends ChatFace> list, int columns, int rows) {
+        faceIndicator.init(getPagerCount(list, columns, rows));
+    }
+
+    /**
+     * 根据表情数量以及GridView设置的行数和列数计算Pager数量
+     * 
+     * Calculate the number of Pagers based on the number of expressions and the number of rows and columns set by the GridView
+     *
+     * @return
+     */
+    private int getPagerCount(ArrayList<? extends ChatFace> list, int columns, int rows) {
+        int count = list.size();
+        int dit = 1;
+        if (mCurrentGroupIndex > 0)
+            dit = 0;
+        return count % (columns * rows - dit) == 0 ? count / (columns * rows - dit)
+                : count / (columns * rows - dit) + 1;
+    }
+
+    private View getViewPagerItem(int position, ArrayList<? extends ChatFace> list, int columns, int rows) {
+        LayoutInflater inflater = (LayoutInflater) getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        View layout = inflater.inflate(R.layout.layout_face_grid, null);
+        GridView gridview = layout.findViewById(R.id.chart_face_gv);
+        gridview.setNumColumns(columns);
+        /**
+         * 注：因为每一页末尾都有一个删除图标，所以每一页的实际表情columns *　rows　－　1; 空出最后一个位置给删除图标
+         * 
+         * Because there is a delete icon at the end of each page, the actual emoji of each page columns *　rows　－　1, Empty the last position for the delete icon
+         * */
+        final List<ChatFace> subList = new ArrayList<>();
+        int dit = 1;
+        if (mCurrentGroupIndex > 0)
+            dit = 0;
+        subList.addAll(list.subList(position * (columns * rows - dit),
+                (columns * rows - dit) * (position + 1) > list
+                        .size() ? list.size() : (columns
+                        * rows - dit)
+                        * (position + 1)));
+        /**
+         * 末尾添加删除图标
+         * 
+         * Add delete icon at the end
+         * */
+        if (mCurrentGroupIndex == 0 && subList.size() < (columns * rows - dit)) {
+            for (int i = subList.size(); i < (columns * rows - dit); i++) {
+                subList.add(null);
+            }
+        }
+        if (mCurrentGroupIndex == 0) {
+            Emoji deleteEmoji = new Emoji();
+            deleteEmoji.setIcon(BitmapFactory.decodeResource(getResources(), R.drawable.face_delete));
+            subList.add(deleteEmoji);
+        }
+
+        FaceGVAdapter mGvAdapter = new FaceGVAdapter(subList, getActivity());
+        gridview.setAdapter(mGvAdapter);
+        gridview.setNumColumns(columns);
+
+        gridview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                if (mCurrentGroupIndex > 0) {
+                    listener.onCustomFaceClick(mCurrentGroupIndex, (CustomFace) subList.get(position));
+                } else {
+                    if (position == columns * rows - 1) {
+                        if (listener != null) {
+                            listener.onEmojiDelete();
+                        }
+                        return;
+                    }
+                    if (listener != null) {
+                        listener.onEmojiClick((Emoji) subList.get(position));
+                    }
+                }
+            }
+        });
+
+        return gridview;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        try {
+            recentManager.putCollection(RecentEmojiManager.PREFERENCE_NAME, recentlyEmojiList);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public interface OnEmojiClickListener {
+        void onEmojiDelete();
+
+        void onEmojiClick(Emoji emoji);
+
+        void onCustomFaceClick(int groupIndex, CustomFace customFace);
+    }
+
+    static class FaceGVAdapter extends BaseAdapter {
+        private final List<ChatFace> list;
+        private final Context mContext;
+
+        public FaceGVAdapter(List<ChatFace> list, Context mContext) {
+            super();
+            this.list = list;
+            this.mContext = mContext;
+        }
+
+        @Override
+        public int getCount() {
+            // TODO Auto-generated method stub
+            return list.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            // TODO Auto-generated method stub
+            return list.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            // TODO Auto-generated method stub
+            return position;
+        }
+
+        @Override
+        public View getView(final int position, View convertView, ViewGroup parent) {
+            ViewHolder holder;
+            ChatFace chatFace = list.get(position);
+            if (convertView == null) {
+                holder = new ViewHolder();
+                convertView = LayoutInflater.from(mContext).inflate(R.layout.item_face, null);
+                holder.iv = convertView.findViewById(R.id.face_image);
+                FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) holder.iv.getLayoutParams();
+                if (chatFace != null && chatFace.getHeight() != 0 && chatFace.getWidth() != 0) {
+                    params.width = chatFace.getWidth();
+                    params.height = chatFace.getHeight();
+                }
+                holder.iv.setLayoutParams(params);
+                convertView.setTag(holder);
+            } else {
+                holder = (ViewHolder) convertView.getTag();
+            }
+
+            if (chatFace != null) {
+                FaceManager.loadFace(chatFace, holder.iv);
+            }
+            return convertView;
+        }
+
+        class ViewHolder {
+            ImageView iv;
+        }
+    }
+
+    class FaceVPAdapter extends PagerAdapter {
+        private List<View> views;
+
+        public FaceVPAdapter(List<View> views) {
+            this.views = views;
+        }
+
+        @Override
+        public void destroyItem(View arg0, int arg1, Object arg2) {
+            ((ViewPager) arg0).removeView((View) (arg2));
+        }
+
+        @Override
+        public int getCount() {
+            return views.size();
+        }
+
+        @Override
+        public Object instantiateItem(View arg0, int arg1) {
+            ((ViewPager) arg0).addView(views.get(arg1));
+            return views.get(arg1);
+        }
+
+        @Override
+        public boolean isViewFromObject(View arg0, Object arg1) {
+            return (arg0 == arg1);
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/face/FaceGroupIcon.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/face/FaceGroupIcon.java
new file mode 100644
index 0000000..b4f7540
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/face/FaceGroupIcon.java
@@ -0,0 +1,45 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.input.face;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
+import com.tencent.qcloud.tuikit.tuichat.R;
+
+
+public class FaceGroupIcon extends RelativeLayout {
+
+    private ImageView faceTabIcon;
+
+    public FaceGroupIcon(Context context) {
+        super(context);
+        init();
+    }
+
+    public FaceGroupIcon(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public FaceGroupIcon(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private void init() {
+        LayoutInflater inflater = LayoutInflater.from(getContext());
+        inflater.inflate(R.layout.face_group_icon, this);
+        faceTabIcon = findViewById(R.id.face_group_tab_icon);
+    }
+
+    public void setFaceTabIcon(String faceGroupIconUrl) {
+        Glide.with(this)
+                .load(faceGroupIconUrl)
+                .apply(new RequestOptions().error(android.R.drawable.ic_menu_report_image))
+                .into(faceTabIcon);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/inputmore/ActionsGridViewAdapter.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/inputmore/ActionsGridViewAdapter.java
new file mode 100644
index 0000000..f54207e
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/inputmore/ActionsGridViewAdapter.java
@@ -0,0 +1,67 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.input.inputmore;
+
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.InputMoreActionUnit;
+
+import java.util.List;
+
+public class ActionsGridViewAdapter extends BaseAdapter {
+
+    private Context context;
+
+    private List<InputMoreActionUnit> baseActions;
+
+    public ActionsGridViewAdapter(Context context, List<InputMoreActionUnit> baseActions) {
+        this.context = context;
+        this.baseActions = baseActions;
+    }
+
+    @Override
+    public int getCount() {
+        return baseActions.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return baseActions.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        InputMoreActionUnit action = baseActions.get(position);
+        View unitView = action.getUnitView();
+        if (unitView != null) {
+            return unitView;
+        }
+
+        View itemLayout;
+        if (convertView == null) {
+            itemLayout = LayoutInflater.from(context).inflate(R.layout.chat_input_layout_actoin, parent, false);
+        } else {
+            itemLayout = convertView;
+        }
+
+        if (action.getIconResId() > 0) {
+            ((ImageView) itemLayout.findViewById(R.id.imageView)).setImageResource(action.getIconResId());
+        }
+        if (action.getTitleId() > 0) {
+            ((TextView) itemLayout.findViewById(R.id.textView)).setText(context.getString(action.getTitleId()));
+        }
+        return itemLayout;
+    }
+}
+
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/inputmore/ActionsPagerAdapter.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/inputmore/ActionsPagerAdapter.java
new file mode 100644
index 0000000..64d29e3
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/inputmore/ActionsPagerAdapter.java
@@ -0,0 +1,106 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.input.inputmore;
+
+import android.content.Context;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.GridView;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.InputMoreActionUnit;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+
+
+public class ActionsPagerAdapter extends PagerAdapter {
+
+    private final int ITEM_COUNT_PER_GRID_VIEW = 8;
+    private final int COLUMN_COUNT = 4;
+    private final Context mContext;
+    private final List<InputMoreActionUnit> mInputMoreList;
+    private final ViewPager mViewPager;
+    private final int mGridViewCount;
+    private int actionWidth, actionHeight;
+
+    public ActionsPagerAdapter(ViewPager mViewPager, List<InputMoreActionUnit> mInputMoreList) {
+        this.mContext = mViewPager.getContext();
+        this.mInputMoreList = new ArrayList<>(mInputMoreList);
+        this.mViewPager = mViewPager;
+        this.mGridViewCount = (mInputMoreList.size() + ITEM_COUNT_PER_GRID_VIEW - 1) / ITEM_COUNT_PER_GRID_VIEW;
+    }
+
+    @Override
+    public Object instantiateItem(ViewGroup container, int position) {
+        int end = (position + 1) * ITEM_COUNT_PER_GRID_VIEW > mInputMoreList.size()
+                ? mInputMoreList.size() : (position + 1) * ITEM_COUNT_PER_GRID_VIEW;
+        List<InputMoreActionUnit> subBaseActions = mInputMoreList.subList(position
+                * ITEM_COUNT_PER_GRID_VIEW, end);
+
+        GridView gridView = new GridView(mContext);
+        gridView.setAdapter(new ActionsGridViewAdapter(mContext, subBaseActions));
+        if (mInputMoreList.size() >= COLUMN_COUNT) {
+            gridView.setNumColumns(COLUMN_COUNT);
+
+            container.post(new Runnable() {
+                @Override
+                public void run() {
+                    ViewGroup.LayoutParams layoutParams = mViewPager.getLayoutParams();
+                    layoutParams.height = actionHeight;
+                    mViewPager.setLayoutParams(layoutParams);
+                }
+            });
+        } else {
+            gridView.setNumColumns(mInputMoreList.size());
+
+            container.post(new Runnable() {
+                @Override
+                public void run() {
+                    ViewGroup.LayoutParams layoutParams = mViewPager.getLayoutParams();
+                    layoutParams.height = actionHeight;
+                    mViewPager.setLayoutParams(layoutParams);
+                }
+            });
+        }
+        gridView.setSelector(R.color.transparent);
+        gridView.setHorizontalSpacing(60);
+        gridView.setVerticalSpacing(60);
+        gridView.setGravity(Gravity.CENTER);
+        gridView.setTag(Integer.valueOf(position));
+        gridView.setOnItemClickListener(new GridView.OnItemClickListener() {
+
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                int index = ((Integer) parent.getTag()) * ITEM_COUNT_PER_GRID_VIEW + position;
+                mInputMoreList.get(index).getOnClickListener().onClick();
+            }
+        });
+
+        container.addView(gridView);
+        return gridView;
+    }
+
+    @Override
+    public void destroyItem(ViewGroup container, int position, Object object) {
+        // TODO
+    }
+
+    @Override
+    public boolean isViewFromObject(View view, Object object) {
+        return view == object;
+    }
+
+    @Override
+    public int getCount() {
+        return mGridViewCount;
+    }
+
+    @Override
+    public int getItemPosition(Object object) {
+        return POSITION_NONE;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/inputmore/InputMoreFragment.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/inputmore/InputMoreFragment.java
new file mode 100644
index 0000000..54a8ca8
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/inputmore/InputMoreFragment.java
@@ -0,0 +1,60 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.input.inputmore;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.input.BaseInputFragment;
+import com.tencent.qcloud.tuikit.tuichat.bean.InputMoreActionUnit;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class InputMoreFragment extends BaseInputFragment {
+
+    public static final int REQUEST_CODE_FILE = 1011;
+    public static final int REQUEST_CODE_PHOTO = 1012;
+
+    private View mBaseView;
+    private List<InputMoreActionUnit> mInputMoreList = new ArrayList<>();
+    private IUIKitCallback mCallback;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        mBaseView = inflater.inflate(R.layout.chat_inputmore_fragment, container, false);
+        InputMoreLayout layout = mBaseView.findViewById(R.id.input_extra_area);
+        layout.init(mInputMoreList);
+        return mBaseView;
+    }
+
+    public void setActions(List<InputMoreActionUnit> actions) {
+        this.mInputMoreList = actions;
+    }
+
+    public void setCallback(IUIKitCallback callback) {
+        mCallback = callback;
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQUEST_CODE_FILE
+                || requestCode == REQUEST_CODE_PHOTO) {
+            if (resultCode != -1) {
+                return;
+            }
+            Uri uri = data.getData();
+            if (mCallback != null) {
+                mCallback.onSuccess(uri);
+            }
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/inputmore/InputMoreLayout.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/inputmore/InputMoreLayout.java
new file mode 100644
index 0000000..7ca6828
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/inputmore/InputMoreLayout.java
@@ -0,0 +1,45 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.input.inputmore;
+
+import android.content.Context;
+
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.ViewPager;
+
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.InputMoreActionUnit;
+
+import java.util.List;
+
+public class InputMoreLayout extends LinearLayout {
+
+    public InputMoreLayout(Context context) {
+        super(context);
+        init();
+    }
+
+    public InputMoreLayout(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public InputMoreLayout(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private void init() {
+        inflate(getContext(), R.layout.chat_inputmore_layout, this);
+    }
+
+    public void init(List<InputMoreActionUnit> actions) {
+
+        final ViewPager viewPager = findViewById(R.id.viewPager);
+
+        ActionsPagerAdapter adapter = new ActionsPagerAdapter(viewPager, actions);
+        viewPager.setAdapter(adapter);
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/ArchivesImageAdapter.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/ArchivesImageAdapter.java
new file mode 100644
index 0000000..63f4eb1
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/ArchivesImageAdapter.java
@@ -0,0 +1,24 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message;
+
+import android.content.Context;
+import android.widget.ImageView;
+
+import com.lzy.ninegrid.ImageInfo;
+import com.lzy.ninegrid.NineGridViewAdapter;
+import com.lzy.ninegrid.NineGridViewWrapper;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.ArchivesImageView;
+
+import java.util.List;
+
+public class ArchivesImageAdapter extends NineGridViewAdapter {
+    public ArchivesImageAdapter(Context context, List<ImageInfo> imageInfo) {
+        super(context, imageInfo);
+    }
+
+    @Override
+    protected ImageView generateImageView(Context context) {
+        ArchivesImageView imageView = new ArchivesImageView(context);
+        imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
+        return imageView;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/MaxWidthFrameLayout.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/MaxWidthFrameLayout.java
new file mode 100644
index 0000000..f3622ad
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/MaxWidthFrameLayout.java
@@ -0,0 +1,45 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.widget.FrameLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+
+public class MaxWidthFrameLayout extends FrameLayout {
+
+    int maxWidthPx;
+
+    public MaxWidthFrameLayout(@NonNull Context context) {
+        super(context);
+    }
+
+    public MaxWidthFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public MaxWidthFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs);
+    }
+
+    private void init(Context context, AttributeSet attributeSet) {
+        TypedArray array = context.obtainStyledAttributes(attributeSet, R.styleable.max_width_style);
+        maxWidthPx = array.getDimensionPixelSize(R.styleable.max_width_style_maxWidth, 0);
+        array.recycle();
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int measuredWidth = MeasureSpec.getSize(widthMeasureSpec);
+        if(maxWidthPx > 0 && maxWidthPx < measuredWidth) {
+            widthMeasureSpec = MeasureSpec.makeMeasureSpec(maxWidthPx, MeasureSpec.AT_MOST);
+        }
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/MaxWidthLinearLayout.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/MaxWidthLinearLayout.java
new file mode 100644
index 0000000..0c33359
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/MaxWidthLinearLayout.java
@@ -0,0 +1,45 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+
+public class MaxWidthLinearLayout extends LinearLayout {
+
+    int maxWidthPx;
+
+    public MaxWidthLinearLayout(@NonNull Context context) {
+        super(context);
+    }
+
+    public MaxWidthLinearLayout(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public MaxWidthLinearLayout(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs);
+    }
+
+    private void init(Context context, AttributeSet attributeSet) {
+        TypedArray array = context.obtainStyledAttributes(attributeSet, R.styleable.max_width_style);
+        maxWidthPx = array.getDimensionPixelSize(R.styleable.max_width_style_maxWidth, 0);
+        array.recycle();
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int measuredWidth = MeasureSpec.getSize(widthMeasureSpec);
+        if(maxWidthPx > 0 && maxWidthPx < measuredWidth) {
+            widthMeasureSpec = MeasureSpec.makeMeasureSpec(maxWidthPx, MeasureSpec.AT_MOST);
+        }
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/MessageAdapter.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/MessageAdapter.java
new file mode 100644
index 0000000..96465a0
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/MessageAdapter.java
@@ -0,0 +1,446 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message;
+
+import static com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.MessageBaseHolder.MSG_TYPE_HEADER_VIEW;
+
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.QuoteMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TipsMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.classicui.ClassicUIService;
+import com.tencent.qcloud.tuikit.tuichat.classicui.interfaces.ICommonMessageAdapter;
+import com.tencent.qcloud.tuikit.tuichat.classicui.interfaces.OnItemClickListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.MessageBaseHolder;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.MessageContentHolder;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.MessageHeaderHolder;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.MessageViewHolderFactory;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.IMessageAdapter;
+import com.tencent.qcloud.tuikit.tuichat.presenter.ChatPresenter;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+
+public class MessageAdapter extends RecyclerView.Adapter implements IMessageAdapter, ICommonMessageAdapter {
+
+    private static final String TAG = MessageAdapter.class.getSimpleName();
+    private static final int ITEM_POSITION_UNKNOWN = -1;
+
+    private boolean mLoading = true;
+    private MessageRecyclerView mRecycleView;
+    private List<TUIMessageBean> mDataSource = new ArrayList<>();
+    private OnItemClickListener mOnItemClickListener;
+
+    private HashMap<String, Boolean> mSelectedPositions = new HashMap<String, Boolean>();
+    protected boolean isShowMultiSelectCheckBox = false;
+
+    private int mHighShowPosition;
+
+    private boolean isForwardMode = false;
+    private boolean isReplyDetailMode = false;
+
+    private ChatPresenter presenter;
+
+    public void setPresenter(ChatPresenter chatPresenter) {
+        this.presenter = chatPresenter;
+    }
+
+    public void setForwardMode(boolean forwardMode) {
+        isForwardMode = forwardMode;
+    }
+
+    public void setReplyDetailMode(boolean replyDetailMode) {
+        isReplyDetailMode = replyDetailMode;
+    }
+
+    public ArrayList<TUIMessageBean> getSelectedItem() {
+        if (mSelectedPositions == null || mSelectedPositions.size() == 0) {
+            return null;
+        }
+        ArrayList<TUIMessageBean> selectList = new ArrayList<>();
+        for (int i = 0; i < getItemCount() - 1; i++) {
+            if (isItemChecked(mDataSource.get(i).getId())) {
+                selectList.add(mDataSource.get(i));
+            }
+        }
+
+        return selectList;
+    }
+
+    public void setShowMultiSelectCheckBox(boolean show) {
+        isShowMultiSelectCheckBox = show;
+
+        if (!isShowMultiSelectCheckBox && mSelectedPositions != null) {
+            mSelectedPositions.clear();
+        }
+
+    }
+
+    public void setItemChecked(String msgID, boolean isChecked) {
+        if (mSelectedPositions == null) {
+            return;
+        }
+
+        mSelectedPositions.put(msgID, isChecked);
+    }
+
+    private boolean isItemChecked(String id) {
+        if (mSelectedPositions.size() <= 0) {
+            return false;
+        }
+
+        if (mSelectedPositions.containsKey(id)) {
+            return mSelectedPositions.get(id);
+        } else {
+            return false;
+        }
+    }
+
+    public OnItemClickListener getOnItemClickListener() {
+        return this.mOnItemClickListener;
+    }
+
+    public void setOnItemClickListener(OnItemClickListener listener) {
+        this.mOnItemClickListener = listener;
+    }
+
+    public void setHighShowPosition(int mHighShowPosition) {
+        this.mHighShowPosition = mHighShowPosition;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        RecyclerView.ViewHolder holder = MessageViewHolderFactory.getInstance(parent, this, viewType);
+        if (holder instanceof MessageContentHolder) {
+            MessageContentHolder messageContentHolder = (MessageContentHolder) holder;
+            messageContentHolder.isForwardMode = isForwardMode;
+            messageContentHolder.isReplyDetailMode = isReplyDetailMode;
+            messageContentHolder.setPresenter(presenter);
+
+            if (isForwardMode) {
+                messageContentHolder.setDataSource(mDataSource);
+            }
+        }
+        return holder;
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, final int position) {
+        final TUIMessageBean msg = getItem(position);
+        if (holder instanceof MessageBaseHolder) {
+            if (holder instanceof MessageContentHolder) {
+                ((MessageContentHolder) holder).isMultiSelectMode = isShowMultiSelectCheckBox;
+            }
+            final MessageBaseHolder baseHolder = (MessageBaseHolder) holder;
+            baseHolder.setOnItemClickListener(mOnItemClickListener);
+            String msgId = "";
+            if (msg != null) {
+                msgId = msg.getId();
+            }
+
+            setCheckBoxStatus(position, msgId, baseHolder);
+            baseHolder.layoutViews(msg, position);
+
+            if (getItemViewType(position) == MSG_TYPE_HEADER_VIEW) {
+                if (isForwardMode) {
+                    ((MessageHeaderHolder) baseHolder).setLoadingStatus(false);
+                } else {
+                    ((MessageHeaderHolder) baseHolder).setLoadingStatus(mLoading);
+                }
+                return;
+            } else {
+                if (position == mHighShowPosition && baseHolder.mContentLayout != null) {
+                    baseHolder.startHighLight();
+                    mHighShowPosition = -1;
+                }
+            }
+        }
+    }
+
+    private void setCheckBoxStatus(final int position, final String msgId, MessageBaseHolder baseHolder) {
+        if (baseHolder.mMutiSelectCheckBox == null) {
+            return;
+        }
+        if (!isShowMultiSelectCheckBox) {
+            baseHolder.mMutiSelectCheckBox.setVisibility(View.GONE);
+            baseHolder.setOnItemClickListener(mOnItemClickListener);
+            if (baseHolder.msgContentFrame != null) {
+                baseHolder.msgContentFrame.setOnClickListener(null);
+            }
+        } else {
+            baseHolder.mMutiSelectCheckBox.setVisibility(View.VISIBLE);
+            baseHolder.mMutiSelectCheckBox.setChecked(isItemChecked(msgId));
+            baseHolder.mMutiSelectCheckBox.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    changeCheckedStatus(msgId, position);
+                }
+            });
+            baseHolder.itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    changeCheckedStatus(msgId, position);
+                }
+            });
+
+            baseHolder.setOnItemClickListener(new OnItemClickListener() {
+                @Override
+                public void onMessageLongClick(View view, int position, TUIMessageBean messageInfo) {
+                }
+
+                @Override
+                public void onUserIconClick(View view, int position, TUIMessageBean messageInfo) {
+                    changeCheckedStatus(msgId, position);
+                }
+
+                @Override
+                public void onUserIconLongClick(View view, int position, TUIMessageBean messageInfo) {
+                    changeCheckedStatus(msgId, position);
+                }
+
+                @Override
+                public void onReEditRevokeMessage(View view, int position, TUIMessageBean messageInfo) {
+
+                }
+
+                @Override
+                public void onRecallClick(View view, int position, TUIMessageBean messageInfo) {
+
+                }
+
+                @Override
+                public void onReplyMessageClick(View view, int position, QuoteMessageBean messageBean) {
+                    changeCheckedStatus(msgId, position);
+                }
+
+                @Override
+                public void onMessageClick(View view, int position, TUIMessageBean messageInfo) {
+                    changeCheckedStatus(msgId, position);
+                }
+            });
+
+            if (baseHolder.msgContentFrame != null) {
+                baseHolder.msgContentFrame.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        changeCheckedStatus(msgId, position);
+                    }
+                });
+            }
+        }
+    }
+
+    private void changeCheckedStatus(String msgId, int position) {
+        if (isItemChecked(msgId)) {
+            setItemChecked(msgId, false);
+        } else {
+            setItemChecked(msgId, true);
+        }
+        notifyItemChanged(position);
+    }
+
+    public void resetSelectableText() {
+        int index = mRecycleView.getSelectedPosition();
+        if (index < 0) {
+            return;
+        }
+        RecyclerView.ViewHolder holder = mRecycleView.findViewHolderForAdapterPosition(index);
+        if (holder != null) {
+            if (holder instanceof MessageContentHolder) {
+                ((MessageContentHolder) holder).resetSelectableText();
+            }
+        } else {
+            TUIChatLog.d(TAG, "holder == null");
+        }
+    }
+
+    @Override
+    public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
+        super.onAttachedToRecyclerView(recyclerView);
+        mRecycleView = (MessageRecyclerView) recyclerView;
+        mRecycleView.setItemViewCacheSize(5);
+    }
+
+    public void showLoading() {
+        if (isForwardMode) {
+            return;
+        }
+        if (mLoading) {
+            return;
+        }
+        mLoading = true;
+        notifyItemChanged(0);
+    }
+
+    @Override
+    public void onViewRecycled(@NonNull RecyclerView.ViewHolder holder) {
+        if (holder instanceof MessageContentHolder) {
+            ((MessageContentHolder) holder).msgArea.setBackground(null);
+            ((MessageContentHolder) holder).stopHighLight();
+            ((MessageContentHolder) holder).onRecycled();
+        }
+    }
+
+    @Override
+    public void onViewNeedRefresh(final int type, TUIMessageBean messageBean) {
+        mLoading = false;
+        refreshLoadView();
+        if (type == MessageRecyclerView.DATA_CHANGE_LOCATE_TO_POSITION) {
+            notifyDataSetChanged();
+            int position = getMessagePosition(messageBean);
+            if (position == ITEM_POSITION_UNKNOWN) {
+                return;
+            }
+            mRecycleView.scrollToPosition(position);
+            mRecycleView.setHighShowPosition(position);
+        } else if (type == MessageRecyclerView.SCROLL_TO_POSITION) {
+            int position = getMessagePosition(messageBean);
+            if (position == ITEM_POSITION_UNKNOWN) {
+                return;
+            }
+            mRecycleView.scrollToPosition(position);
+            mRecycleView.setHighShowPosition(position);
+            notifyItemChanged(position);
+            mRecycleView.scrollMessageFinish();
+        } else if (type == MessageRecyclerView.DATA_CHANGE_SCROLL_TO_POSITION) {
+            notifyDataSetChanged();
+            int position = getMessagePosition(messageBean);
+            if (position == ITEM_POSITION_UNKNOWN) {
+                return;
+            }
+            mRecycleView.scrollToEnd();
+            mRecycleView.smoothScrollToPosition(position);
+            mRecycleView.setHighShowPosition(position);
+            notifyItemChanged(position);
+            mRecycleView.scrollMessageFinish();
+        } else if (type == MessageRecyclerView.DATA_CHANGE_TYPE_UPDATE) {
+            int position = getMessagePosition(messageBean);
+            if (position == ITEM_POSITION_UNKNOWN) {
+                return;
+            }
+            notifyItemChanged(position);
+        } else if (type == MessageRecyclerView.DATA_CHANGE_TYPE_DELETE) {
+            int position = getMessagePosition(messageBean);
+            if (position == ITEM_POSITION_UNKNOWN) {
+                return;
+            }
+            notifyItemRemoved(position);
+        }
+    }
+
+    @Override
+    public void onViewNeedRefresh(final int type, final int value) {
+        mLoading = false;
+        if (type == MessageRecyclerView.DATA_CHANGE_TYPE_REFRESH) {
+            notifyDataSetChanged();
+            mRecycleView.scrollToEnd();
+        } else if (type == MessageRecyclerView.DATA_CHANGE_TYPE_ADD_BACK) {
+            notifyItemRangeInserted(mDataSource.size() + 1, value);
+        } else if (type == MessageRecyclerView.DATA_CHANGE_NEW_MESSAGE) {
+            notifyItemRangeInserted(mDataSource.size() + 1, value);
+            mRecycleView.onMsgAddBack();
+        } else if (type == MessageRecyclerView.DATA_CHANGE_TYPE_UPDATE) {
+            notifyDataSetChanged();
+        } else if (type == MessageRecyclerView.DATA_CHANGE_TYPE_ADD_FRONT) {
+            // 加载条目为数0，只更新动画
+            // The number of loaded entries is 0, only the animation is updated
+            if (value != 0) {
+                // 加载过程中有可能之前第一条与新加载的最后一条的时间间隔不超过5分钟，时间条目需去掉，所以这里的刷新要多一个条目
+                // During the loading process, it is possible that the time interval between the first item before
+                // and the last item newly loaded is not more than 5 minutes, and the time entry needs to be removed,
+                // so the refresh here needs one more entry
+                notifyItemRangeInserted(0, value);
+            }
+        } else if (type == MessageRecyclerView.DATA_CHANGE_TYPE_LOAD) {
+            notifyDataSetChanged();
+            mRecycleView.scrollToEnd();
+            mRecycleView.loadMessageFinish();
+        }
+        refreshLoadView();
+    }
+
+    private void refreshLoadView() {
+        notifyItemChanged(0);
+    }
+
+    @Override
+    public int getItemCount() {
+        return mDataSource.size() + 1;
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        if (position == 0) {
+            return MSG_TYPE_HEADER_VIEW;
+        }
+        TUIMessageBean msg = getItem(position);
+        if (msg.getStatus() == TUIMessageBean.MSG_STATUS_REVOKE) {
+            return ClassicUIService.getInstance().getViewType(TipsMessageBean.class);
+        }
+        return ClassicUIService.getInstance().getViewType(msg.getClass());
+    }
+
+    @Override
+    public void onDataSourceChanged(List<TUIMessageBean> dataSource) {
+        mDataSource = dataSource;
+    }
+
+
+    @Override
+    public void onScrollToEnd() {
+        if (mRecycleView != null) {
+            mRecycleView.scrollToEnd();
+        }
+    }
+
+    private int getMessagePosition(TUIMessageBean message) {
+        int position = ITEM_POSITION_UNKNOWN;
+        if (mDataSource == null || mDataSource.isEmpty()) {
+            return position;
+        }
+
+        position = mDataSource.indexOf(message);
+        if (position == -1) {
+            return ITEM_POSITION_UNKNOWN;
+        }
+        return position + 1;
+    }
+
+    public TUIMessageBean getItem(int position) {
+        if (position == 0 || mDataSource == null || mDataSource.size() == 0) {
+            return null;
+        }
+        if (position >= mDataSource.size() + 1) {
+            return null;
+        }
+        return mDataSource.get(position - 1);
+    }
+
+    public List<TUIMessageBean> getItemList(int first, int last) {
+        if (first < 0 || last < 0) {
+            return new ArrayList<>(0);
+        }
+        if (first == 0) {
+            first = 1;
+        }
+        if (last == 0) {
+            last = 1;
+        }
+        if (mDataSource == null || mDataSource.size() == 0 || first > last) {
+            return new ArrayList<>(0);
+        }
+        if (first >= mDataSource.size() + 1 || last >= mDataSource.size() + 1) {
+            return new ArrayList<>(0);
+        }
+
+        return new ArrayList<>(mDataSource.subList(first - 1, last));
+    }
+
+}
\ No newline at end of file
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/MessageRecyclerView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/MessageRecyclerView.java
new file mode 100644
index 0000000..3e97095
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/MessageRecyclerView.java
@@ -0,0 +1,904 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.GestureDetector;
+import android.view.MotionEvent;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.SimpleItemAnimator;
+
+import com.tencent.qcloud.tuicore.component.CustomLinearLayoutManager;
+import com.tencent.qcloud.tuicore.component.dialog.TUIKitDialog;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.QuoteMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ReplyMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TextMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.BeginnerGuidePage;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.MessageProperties;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.popmenu.ChatPopMenu;
+import com.tencent.qcloud.tuikit.tuichat.classicui.interfaces.IMessageLayout;
+import com.tencent.qcloud.tuikit.tuichat.classicui.interfaces.OnItemClickListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.page.MessageReplyDetailActivity;
+import com.tencent.qcloud.tuikit.tuichat.component.face.Emoji;
+import com.tencent.qcloud.tuikit.tuichat.config.TUIChatConfigs;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.IMessageRecyclerView;
+import com.tencent.qcloud.tuikit.tuichat.presenter.ChatPresenter;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MessageRecyclerView extends RecyclerView implements IMessageRecyclerView, IMessageLayout {
+    private static final String TAG = MessageRecyclerView.class.getSimpleName();
+
+    // 120s
+    public static final int REVOKE_TIME_OUT = 120;
+
+    // 取一个足够大的偏移保证能一次性滚动到最底部
+    // Take a large enough offset to scroll to the bottom at one time
+    private static final int SCROLL_TO_END_OFFSET = -999999;
+
+    protected OnItemClickListener mOnItemClickListener;
+    protected MessageRecyclerView.OnLoadMoreHandler mHandler;
+    protected MessageRecyclerView.OnEmptySpaceClickListener mEmptySpaceClickListener;
+    protected MessageAdapter mAdapter;
+    protected List<ChatPopMenu.ChatPopMenuAction> mPopActions = new ArrayList<>();
+    protected List<ChatPopMenu.ChatPopMenuAction> mMorePopActions = new ArrayList<>();
+    protected List<ChatPopMenu.ChatPopMenuAction> mTranslationPopActions = new ArrayList<>();
+    protected MessageRecyclerView.OnPopActionClickListener mOnPopActionClickListener;
+    protected MessageRecyclerView.OnTranslationPopActionClickListener mOnTranslationPopActionClickListener;
+    private final MessageProperties properties = MessageProperties.getInstance();
+
+    private OnMenuEmojiClickListener menuEmojiOnClickListener;
+
+    private ChatPresenter presenter;
+
+    private int mSelectedPosition = -1;
+    private ChatPopMenu mChatPopMenu;
+    private ChatPopMenu mTranslationChatPopMenu;
+
+    public MessageRecyclerView(Context context) {
+        super(context);
+        init();
+    }
+
+    public MessageRecyclerView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public MessageRecyclerView(Context context, @Nullable AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init();
+    }
+
+    private void init() {
+        TUIChatLog.d(TAG, "init()");
+        setLayoutFrozen(false);
+        setItemViewCacheSize(0);
+        setHasFixedSize(true);
+        setFocusableInTouchMode(false);
+        setFocusable(true);
+        setClickable(true);
+        LinearLayoutManager linearLayoutManager = new CustomLinearLayoutManager(getContext());
+        linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
+        setLayoutManager(linearLayoutManager);
+        SimpleItemAnimator animator = (SimpleItemAnimator) getItemAnimator();
+        if (animator != null) {
+            animator.setSupportsChangeAnimations(false);
+        }
+        setClickEmptySpaceEvent();
+    }
+
+    public void setPresenter(ChatPresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    private void setClickEmptySpaceEvent() {
+        GestureDetector.OnGestureListener gestureListener = new GestureDetector.SimpleOnGestureListener() {
+            @Override
+            public boolean onSingleTapUp(MotionEvent e) {
+                if (mEmptySpaceClickListener != null) {
+                    mEmptySpaceClickListener.onClick();
+                    return true;
+                }
+                return false;
+            }
+        };
+
+        GestureDetector gestureDetector = new GestureDetector(getContext(), gestureListener);
+        setOnTouchListener(new OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                if (v instanceof RecyclerView) {
+                    gestureDetector.onTouchEvent(event);
+                }
+                return false;
+            }
+        });
+    }
+
+    public void setSelectedPosition(int position) {
+        this.mSelectedPosition = position;
+    }
+
+    public int getSelectedPosition() {
+        return mSelectedPosition;
+    }
+
+    public void showItemPopMenu(final int index, final TUIMessageBean messageInfo, View view) {
+        initPopActions(messageInfo);
+        if (mPopActions.size() == 0) {
+            return;
+        }
+
+        if (mChatPopMenu != null) {
+            mChatPopMenu.hide();
+            mChatPopMenu = null;
+        }
+        mChatPopMenu = new ChatPopMenu(getContext());
+        mChatPopMenu.setShowFaces(TUIChatConfigs.getConfigs().getGeneralConfig().isReactEnable());
+        mChatPopMenu.setChatPopMenuActionList(mPopActions);
+        mChatPopMenu.setEmojiOnClickListener(new ChatPopMenu.EmojiOnClickListener() {
+
+            @Override
+            public void onClick(Emoji emoji) {
+                if (menuEmojiOnClickListener != null) {
+                    menuEmojiOnClickListener.onClick(emoji, messageInfo);
+                }
+            }
+        });
+
+        int[] location = new int[2];
+        getLocationOnScreen(location);
+        mChatPopMenu.setEmptySpaceClickListener(new MessageRecyclerView.OnEmptySpaceClickListener() {
+            @Override
+            public void onClick() {
+                if (mAdapter != null) {
+                    mAdapter.resetSelectableText();
+                }
+            }
+        });
+        mChatPopMenu.show(view, location[1]);
+    }
+
+    public void showTranslationItemPopMenu(int index, TUIMessageBean messageInfo, View view) {
+        initTranslationPopActions(messageInfo);
+        if (mTranslationPopActions.size() == 0) {
+            return;
+        }
+
+        if (mTranslationChatPopMenu != null) {
+            mTranslationChatPopMenu.hide();
+            mTranslationChatPopMenu = null;
+        }
+        mTranslationChatPopMenu = new ChatPopMenu(getContext());
+        mTranslationChatPopMenu.setShowFaces(false);
+        mTranslationChatPopMenu.setChatPopMenuActionList(mTranslationPopActions);
+
+        int[] location = new int[2];
+        getLocationOnScreen(location);
+        mTranslationChatPopMenu.show(view, location[1]);
+    }
+
+    private void initTranslationPopActions(TUIMessageBean msg) {
+        if (msg == null) {
+            return;
+        }
+
+        ChatPopMenu.ChatPopMenuAction copyAction = null;
+        ChatPopMenu.ChatPopMenuAction forwardAction = null;
+        ChatPopMenu.ChatPopMenuAction hiddenAction = null;
+
+        copyAction = new ChatPopMenu.ChatPopMenuAction();
+        copyAction.setActionName(getContext().getString(R.string.copy_action));
+        copyAction.setActionIcon(R.drawable.pop_menu_copy);
+        copyAction.setActionClickListener(() -> mOnTranslationPopActionClickListener.onCopyTranslationClick(msg.getTranslation()));
+
+        if (msg.getStatus() != TUIMessageBean.MSG_STATUS_SEND_FAIL) {
+            forwardAction = new ChatPopMenu.ChatPopMenuAction();
+            forwardAction.setActionName(getContext().getString(R.string.forward_button));
+            forwardAction.setActionIcon(R.drawable.pop_menu_forward);
+            forwardAction.setActionClickListener(()-> mOnTranslationPopActionClickListener.onForwardTranslationClick(msg));
+        }
+
+        hiddenAction = new ChatPopMenu.ChatPopMenuAction();
+        hiddenAction.setActionName(getContext().getString(R.string.hide_action));
+        hiddenAction.setActionIcon(R.drawable.pop_menu_hide);
+        hiddenAction.setActionClickListener(() -> mOnTranslationPopActionClickListener.onHideTranslationClick(msg));
+
+        mTranslationPopActions.clear();
+        mTranslationPopActions.add(copyAction);
+        if (forwardAction != null) {
+            mTranslationPopActions.add(forwardAction);
+        }
+        mTranslationPopActions.add(hiddenAction);
+    }
+
+    public void onMsgAddBack() {
+        if (mAdapter != null) {
+            if (isLastItemVisibleCompleted()) {
+                scrollToEnd();
+            }
+        }
+    }
+    
+    public boolean isDisplayJumpMessageLayout() {
+        TUIChatLog.d(TAG, "computeVerticalScrollRange() = " + computeVerticalScrollRange() + ", computeVerticalScrollExtent() = "
+                + computeVerticalScrollExtent() + ", computeVerticalScrollOffset() = " + computeVerticalScrollOffset());
+        int toBottom = computeVerticalScrollRange() - computeVerticalScrollExtent() - computeVerticalScrollOffset();
+        TUIChatLog.d(TAG, "toBottom = " + toBottom);
+        if (toBottom > 0 && toBottom >= 2 * computeVerticalScrollExtent()) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public boolean isLastItemVisibleCompleted() {
+        LinearLayoutManager linearLayoutManager = (LinearLayoutManager) getLayoutManager();
+        if (linearLayoutManager == null) {
+            return false;
+        }
+        int lastPosition = linearLayoutManager.findLastCompletelyVisibleItemPosition();
+        int childCount = linearLayoutManager.getChildCount();
+        int firstPosition = linearLayoutManager.findFirstVisibleItemPosition();
+        if (lastPosition >= firstPosition + childCount - 1) {
+            return true;
+        }
+        return false;
+    }
+
+    private void initPopActions(final TUIMessageBean msg) {
+        if (msg == null) {
+            return;
+        }
+
+        boolean textIsAllSelected = true;
+        if (msg instanceof TextMessageBean || msg instanceof QuoteMessageBean) {
+            String selectText = msg.getSelectText();
+            if (!TextUtils.isEmpty(selectText)) {
+                String text = msg.getExtra();
+                if (!text.equals(selectText)) {
+                    textIsAllSelected = false;
+                }
+            }
+        }
+
+        ChatPopMenu.ChatPopMenuAction copyAction = null;
+        ChatPopMenu.ChatPopMenuAction forwardAction = null;
+        ChatPopMenu.ChatPopMenuAction multiSelectAction = null;
+        ChatPopMenu.ChatPopMenuAction quoteAction = null;
+        ChatPopMenu.ChatPopMenuAction replyAction = null;
+        ChatPopMenu.ChatPopMenuAction translateAction = null;
+        ChatPopMenu.ChatPopMenuAction revokeAction = null;
+        ChatPopMenu.ChatPopMenuAction deleteAction = null;
+
+        if (msg instanceof TextMessageBean || msg instanceof QuoteMessageBean) {
+            copyAction = new ChatPopMenu.ChatPopMenuAction();
+            copyAction.setActionName(getContext().getString(R.string.copy_action));
+            copyAction.setActionIcon(R.drawable.pop_menu_copy);
+            copyAction.setActionClickListener(() -> mOnPopActionClickListener.onCopyClick(msg));
+        }
+
+        if (textIsAllSelected) {
+            deleteAction = new ChatPopMenu.ChatPopMenuAction();
+            deleteAction.setActionName(getContext().getString(R.string.delete_action));
+            deleteAction.setActionIcon(R.drawable.pop_menu_delete);
+            deleteAction.setActionClickListener(() -> mOnPopActionClickListener.onDeleteMessageClick(msg));
+            if (msg.isSelf()) {
+                if (msg.getStatus() != TUIMessageBean.MSG_STATUS_SEND_FAIL) {
+                    long timeInterval = TUIChatUtils.getServerTime() - msg.getMessageTime();
+                    if (timeInterval <= REVOKE_TIME_OUT) {
+                        revokeAction = new ChatPopMenu.ChatPopMenuAction();
+                        revokeAction.setActionName(getContext().getString(R.string.revoke_action));
+                        revokeAction.setActionIcon(R.drawable.pop_menu_revoke);
+                        revokeAction.setActionClickListener(() -> mOnPopActionClickListener.onRevokeMessageClick(msg));
+                    }
+                }
+            }
+
+            multiSelectAction = new ChatPopMenu.ChatPopMenuAction();
+            multiSelectAction.setActionName(getContext().getString(R.string.titlebar_mutiselect));
+            multiSelectAction.setActionIcon(R.drawable.pop_menu_multi_select);
+            multiSelectAction.setActionClickListener(() -> mOnPopActionClickListener.onMultiSelectMessageClick(msg));
+
+            if (TUIChatConfigs.getConfigs().getGeneralConfig().isEnableTextTranslation() &&
+                    msg.getTranslationStatus() != TUIMessageBean.MSG_TRANSLATE_STATUS_SHOWN) {
+                translateAction = new ChatPopMenu.ChatPopMenuAction();
+                translateAction.setActionName(getContext().getString(R.string.translate_action));
+                translateAction.setActionIcon(R.drawable.pop_menu_translate);
+                translateAction.setActionClickListener(() -> mOnPopActionClickListener.onTranslateMessageClick(msg));
+            }
+        }
+
+        if (msg.getStatus() != TUIMessageBean.MSG_STATUS_SEND_FAIL) {
+            forwardAction = new ChatPopMenu.ChatPopMenuAction();
+            forwardAction.setActionName(getContext().getString(R.string.forward_button));
+            forwardAction.setActionIcon(R.drawable.pop_menu_forward);
+            forwardAction.setActionClickListener(()-> mOnPopActionClickListener.onForwardMessageClick(msg));
+        }
+
+        if (textIsAllSelected) {
+            if (msg.getStatus() != TUIMessageBean.MSG_STATUS_SEND_FAIL) {
+                replyAction = new ChatPopMenu.ChatPopMenuAction();
+                replyAction.setActionName(getContext().getString(R.string.reply_button));
+                replyAction.setActionIcon(R.drawable.pop_menu_reply);
+                replyAction.setActionClickListener(() -> mOnPopActionClickListener.onReplyMessageClick(msg));
+
+                quoteAction = new ChatPopMenu.ChatPopMenuAction();
+                quoteAction.setActionName(getContext().getString(R.string.quote_button));
+                quoteAction.setActionIcon(R.drawable.pop_menu_quote);
+                quoteAction.setActionClickListener(() -> mOnPopActionClickListener.onQuoteMessageClick(msg));
+            }
+        }
+
+        mPopActions.clear();
+        if (copyAction != null) {
+            mPopActions.add(copyAction);
+        }
+        if (forwardAction != null) {
+            mPopActions.add(forwardAction);
+        }
+        if (multiSelectAction != null) {
+            mPopActions.add(multiSelectAction);
+        }
+        if (quoteAction != null && TUIChatConfigs.getConfigs().getGeneralConfig().isQuoteEnable()) {
+            mPopActions.add(quoteAction);
+        }
+        if (replyAction != null && TUIChatConfigs.getConfigs().getGeneralConfig().isReplyEnable()) {
+            mPopActions.add(replyAction);
+        }
+        if (revokeAction != null) {
+            mPopActions.add(revokeAction);
+        }
+        if (deleteAction != null) {
+            mPopActions.add(deleteAction);
+        }
+        if (translateAction != null) {
+            mPopActions.add(translateAction);
+        }
+        mPopActions.addAll(mMorePopActions);
+    }
+
+    @Override
+    public void onScrollStateChanged(int state) {
+        super.onScrollStateChanged(state);
+        if (mAdapter != null) {
+            mAdapter.resetSelectableText();
+        }
+        if (state == RecyclerView.SCROLL_STATE_IDLE) {
+            if (mHandler != null) {
+                LinearLayoutManager layoutManager = (LinearLayoutManager) getLayoutManager();
+                int firstPosition = layoutManager.findFirstCompletelyVisibleItemPosition();
+                int lastPosition = layoutManager.findLastCompletelyVisibleItemPosition();
+                if (firstPosition == 0 && ((lastPosition - firstPosition + 1) < getAdapter().getItemCount())) {
+                    if (getAdapter() instanceof MessageAdapter) {
+                        ((MessageAdapter) getAdapter()).showLoading();
+                    }
+                    mHandler.loadMore(TUIChatConstants.GET_MESSAGE_FORWARD);
+                } else if (isListEnd(lastPosition)){
+                    if (getAdapter() instanceof MessageAdapter) {
+                        ((MessageAdapter) getAdapter()).showLoading();
+                    }
+                    mHandler.loadMore(TUIChatConstants.GET_MESSAGE_BACKWARD);
+
+                    mHandler.displayBackToLastMessage(false);
+                    mHandler.displayBackToNewMessage(false, "", 0);
+                    presenter.resetCurrentChatUnreadCount();
+                }
+
+                if (isDisplayJumpMessageLayout()) {
+                    mHandler.displayBackToLastMessage(true);
+                } else {
+                    mHandler.displayBackToLastMessage(false);
+                }
+            }
+        } else if (state == RecyclerView.SCROLL_STATE_DRAGGING) {
+            if (mHandler != null) {
+                mHandler.hideBackToAtMessage();
+            }
+        }
+    }
+
+    public void displayBackToNewMessage(boolean display, String messageId, int count) {
+        if (mHandler != null) {
+            mHandler.displayBackToNewMessage(display, messageId, count);
+        }
+    }
+
+    private boolean isListEnd(int lastPosition) {
+       return mHandler.isListEnd(lastPosition);
+    }
+
+    public void scrollToEnd() {
+        if (getAdapter() != null) {
+            RecyclerView.LayoutManager layoutManager = getLayoutManager();
+            int itemCount = getAdapter().getItemCount();
+            if (layoutManager instanceof LinearLayoutManager && itemCount > 0) {
+                ((LinearLayoutManager) layoutManager).scrollToPositionWithOffset(itemCount - 1, SCROLL_TO_END_OFFSET);
+            }
+        }
+    }
+
+    @Override
+    public void scrollToPosition(int position) {
+        if (getAdapter() != null && position < getAdapter().getItemCount()) {
+            super.scrollToPosition(position);
+        }
+    }
+
+    public void smoothScrollToPosition(int position) {
+        if (getAdapter() != null && position < getAdapter().getItemCount()) {
+            super.smoothScrollToPosition(position);
+        }
+    }
+
+    public void setHighShowPosition(int position) {
+        if (mAdapter != null) {
+            mAdapter.setHighShowPosition(position);
+        }
+    }
+
+    public OnLoadMoreHandler getLoadMoreHandler() {
+        return mHandler;
+    }
+
+    public void setLoadMoreMessageHandler(OnLoadMoreHandler mHandler) {
+        this.mHandler = mHandler;
+    }
+
+    public OnEmptySpaceClickListener getEmptySpaceClickListener() {
+        return mEmptySpaceClickListener;
+    }
+
+    public void setEmptySpaceClickListener(OnEmptySpaceClickListener mEmptySpaceClickListener) {
+        this.mEmptySpaceClickListener = mEmptySpaceClickListener;
+    }
+
+    public void setPopActionClickListener(OnPopActionClickListener listener) {
+        mOnPopActionClickListener = listener;
+    }
+
+    public void setTranslationPopActionClickListener(OnTranslationPopActionClickListener listener) {
+        mOnTranslationPopActionClickListener = listener;
+    }
+
+    public void setMenuEmojiOnClickListener(OnMenuEmojiClickListener menuEmojiOnClickListener) {
+        this.menuEmojiOnClickListener = menuEmojiOnClickListener;
+    }
+
+    public void setAdapterListener() {
+        mAdapter.setOnItemClickListener(new OnItemClickListener() {
+            @Override
+            public void onMessageLongClick(View view, int position, TUIMessageBean messageInfo) {
+                if (mOnItemClickListener != null) {
+                    BeginnerGuidePage.showBeginnerGuideThen(view, new Runnable() {
+                        @Override
+                        public void run() {
+                            mOnItemClickListener.onMessageLongClick(view, position, messageInfo);
+                        }
+                    });
+                }
+            }
+
+            @Override
+            public void onUserIconClick(View view, int position, TUIMessageBean info) {
+                if (mOnItemClickListener != null) {
+                    mOnItemClickListener.onUserIconClick(view, position, info);
+                }
+            }
+
+            @Override
+            public void onUserIconLongClick(View view, int position, TUIMessageBean messageInfo) {
+                if (mOnItemClickListener != null) {
+                    mOnItemClickListener.onUserIconLongClick(view, position, messageInfo);
+                }
+            }
+
+            @Override
+            public void onReEditRevokeMessage(View view, int position, TUIMessageBean messageInfo) {
+                if (mOnItemClickListener != null) {
+                    mOnItemClickListener.onReEditRevokeMessage(view, position, messageInfo);
+                }
+            }
+
+            @Override
+            public void onRecallClick(View view, int position, TUIMessageBean messageInfo) {
+                if (mOnItemClickListener != null) {
+                    mOnItemClickListener.onRecallClick(view, position, messageInfo);
+                }
+            }
+
+            @Override
+            public void onReplyMessageClick(View view, int position, QuoteMessageBean messageBean) {
+                if (messageBean instanceof ReplyMessageBean) {
+                    showRootMessageReplyDetail(((ReplyMessageBean) messageBean).getMsgRootId());
+                } else {
+                    locateOriginMessage(messageBean.getOriginMsgId());
+                }
+            }
+
+            @Override
+            public void onReplyDetailClick(TUIMessageBean messageBean) {
+                showRootMessageReplyDetail(messageBean);
+            }
+
+            @Override
+            public void onReactOnClick(String emojiId, TUIMessageBean messageBean) {
+                presenter.reactMessage(emojiId, messageBean);
+            }
+
+            @Override
+            public void onSendFailBtnClick(View view, int position, TUIMessageBean messageInfo) {
+                new TUIKitDialog(getContext())
+                        .builder()
+                        .setCancelable(true)
+                        .setCancelOutside(true)
+                        .setTitle(getContext().getString(R.string.resend_tips))
+                        .setDialogWidth(0.75f)
+                        .setPositiveButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.sure), new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                mOnPopActionClickListener.onSendMessageClick(messageInfo, true);
+                            }
+                        })
+                        .setNegativeButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.cancel), new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+
+                            }
+                        })
+                        .show();
+            }
+
+            @Override
+            public void onTextSelected(View view, int position, TUIMessageBean messageInfo) {
+                if (mOnItemClickListener != null) {
+                    mOnItemClickListener.onTextSelected(view, position, messageInfo);
+                }
+            }
+
+            @Override
+            public void onTranslationLongClick(View view, int position, TUIMessageBean messageInfo) {
+                if (mOnItemClickListener != null) {
+                    mOnItemClickListener.onTranslationLongClick(view, position, messageInfo);
+                }
+            }
+        });
+    }
+
+    private void locateOriginMessage(String originMsgId) {
+        if (TextUtils.isEmpty(originMsgId)) {
+            ToastUtil.toastShortMessage(getContext().getString(R.string.locate_origin_msg_failed_tip));
+            return;
+        }
+        presenter.locateMessage(originMsgId, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage(getContext().getString(R.string.locate_origin_msg_failed_tip));
+            }
+        });
+    }
+
+    private void showRootMessageReplyDetail(TUIMessageBean messageBean) {
+        if (presenter.getChatInfo() == null) {
+            return;
+        }
+        Intent intent = new Intent(getContext(), MessageReplyDetailActivity.class);
+        intent.putExtra(TUIChatConstants.MESSAGE_BEAN, messageBean);
+        intent.putExtra(TUIChatConstants.CHAT_INFO, presenter.getChatInfo());
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        getContext().startActivity(intent);
+    }
+
+    private void showRootMessageReplyDetail(String rootMessageId) {
+        if (presenter.getChatInfo() == null) {
+            return;
+        }
+        presenter.findMessage(rootMessageId, new IUIKitCallback<TUIMessageBean>() {
+            @Override
+            public void onSuccess(TUIMessageBean data) {
+                if (data.getStatus() == TUIMessageBean.MSG_STATUS_REVOKE) {
+                    ToastUtil.toastShortMessage(getContext().getString(R.string.locate_origin_msg_failed_tip));
+                    return;
+                }
+                Intent intent = new Intent(getContext(), MessageReplyDetailActivity.class);
+                intent.putExtra(TUIChatConstants.MESSAGE_BEAN, data);
+                intent.putExtra(TUIChatConstants.CHAT_INFO, presenter.getChatInfo());
+                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                getContext().startActivity(intent);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage(getContext().getString(R.string.locate_origin_msg_failed_tip) + " code = " + errCode + " message = " + errMsg);
+            }
+        });
+
+    }
+
+    @Override
+    public int getAvatarRadius() {
+        return properties.getAvatarRadius();
+    }
+
+    @Override
+    public void setAvatarRadius(int radius) {
+        properties.setAvatarRadius(radius);
+    }
+
+    @Override
+    public int[] getAvatarSize() {
+        return properties.getAvatarSize();
+    }
+
+    @Override
+    public void setAvatarSize(int[] size) {
+        properties.setAvatarSize(size);
+    }
+
+    @Override
+    public int getAvatar() {
+        return properties.getAvatar();
+    }
+
+    @Override
+    public void setAvatar(int resId) {
+        properties.setAvatar(resId);
+    }
+
+    @Override
+    public Drawable getRightBubble() {
+        return properties.getRightBubble();
+    }
+
+    @Override
+    public void setRightBubble(Drawable bubble) {
+        properties.setRightBubble(bubble);
+    }
+
+    @Override
+    public Drawable getLeftBubble() {
+        return properties.getLeftBubble();
+    }
+
+    @Override
+    public void setLeftBubble(Drawable bubble) {
+        properties.setLeftBubble(bubble);
+    }
+
+    @Override
+    public int getNameFontSize() {
+        return properties.getNameFontSize();
+    }
+
+    @Override
+    public void setNameFontSize(int size) {
+        properties.setNameFontSize(size);
+    }
+
+    @Override
+    public int getNameFontColor() {
+        return properties.getNameFontColor();
+    }
+
+    @Override
+    public void setNameFontColor(int color) {
+        properties.setNameFontColor(color);
+    }
+
+    @Override
+    public int getLeftNameVisibility() {
+        return properties.getLeftNameVisibility();
+    }
+
+    @Override
+    public void setLeftNameVisibility(int visibility) {
+        properties.setLeftNameVisibility(visibility);
+    }
+
+    @Override
+    public int getRightNameVisibility() {
+        return properties.getRightNameVisibility();
+    }
+
+    @Override
+    public void setRightNameVisibility(int visibility) {
+        properties.setRightNameVisibility(visibility);
+    }
+
+    @Override
+    public int getChatContextFontSize() {
+        return properties.getChatContextFontSize();
+    }
+
+    @Override
+    public void setChatContextFontSize(int size) {
+        properties.setChatContextFontSize(size);
+    }
+
+    @Override
+    public int getRightChatContentFontColor() {
+        return properties.getRightChatContentFontColor();
+    }
+
+    @Override
+    public void setRightChatContentFontColor(int color) {
+        properties.setRightChatContentFontColor(color);
+    }
+
+    @Override
+    public int getLeftChatContentFontColor() {
+        return properties.getLeftChatContentFontColor();
+    }
+
+    @Override
+    public void setLeftChatContentFontColor(int color) {
+        properties.setLeftChatContentFontColor(color);
+    }
+
+    @Override
+    public Drawable getTipsMessageBubble() {
+        return properties.getTipsMessageBubble();
+    }
+
+    @Override
+    public void setTipsMessageBubble(Drawable bubble) {
+        properties.setTipsMessageBubble(bubble);
+    }
+
+    @Override
+    public int getTipsMessageFontSize() {
+        return properties.getTipsMessageFontSize();
+    }
+
+    @Override
+    public void setTipsMessageFontSize(int size) {
+        properties.setTipsMessageFontSize(size);
+    }
+
+    @Override
+    public int getTipsMessageFontColor() {
+        return properties.getTipsMessageFontColor();
+    }
+
+    @Override
+    public void setTipsMessageFontColor(int color) {
+        properties.setTipsMessageFontColor(color);
+    }
+
+    @Override
+    public Drawable getChatTimeBubble() {
+        return properties.getChatTimeBubble();
+    }
+
+    @Override
+    public void setChatTimeBubble(Drawable bubble) {
+        properties.setChatTimeBubble(bubble);
+    }
+
+    @Override
+    public int getChatTimeFontSize() {
+        return properties.getChatTimeFontSize();
+    }
+
+    @Override
+    public void setChatTimeFontSize(int size) {
+        properties.setChatTimeFontSize(size);
+    }
+
+    @Override
+    public int getChatTimeFontColor() {
+        return properties.getChatTimeFontColor();
+    }
+
+    @Override
+    public void setChatTimeFontColor(int color) {
+        properties.setChatTimeFontColor(color);
+    }
+
+    @Override
+    public OnItemClickListener getOnItemClickListener() {
+        return mAdapter.getOnItemClickListener();
+    }
+
+    @Override
+    public void setOnItemClickListener(OnItemClickListener listener) {
+        mOnItemClickListener = listener;
+        setAdapterListener();
+    }
+
+    @Override
+    public void setAdapter(MessageAdapter adapter) {
+        super.setAdapter(adapter);
+        mAdapter = adapter;
+    }
+
+    @Override
+    public List<ChatPopMenu.ChatPopMenuAction> getPopActions() {
+        return mPopActions;
+    }
+
+    @Override
+    public void addPopAction(ChatPopMenu.ChatPopMenuAction action) {
+        mMorePopActions.add(action);
+    }
+
+    public void loadMessageFinish() {
+        if (mHandler != null) {
+            mHandler.loadMessageFinish();
+        }
+    }
+
+    public void scrollMessageFinish() {
+        if (mHandler != null) {
+            mHandler.scrollMessageFinish();
+        }
+    }
+
+    public interface OnMenuEmojiClickListener {
+        void onClick(Emoji emoji, TUIMessageBean messageBean);
+    }
+
+
+    public interface OnLoadMoreHandler {
+        void loadMore(int type);
+        boolean isListEnd(int position);
+        void displayBackToLastMessage(boolean display);
+        void displayBackToNewMessage(boolean display, String messageId, int count);
+        void hideBackToAtMessage();
+        void loadMessageFinish();
+        void scrollMessageFinish();
+    }
+
+    public interface OnEmptySpaceClickListener {
+        void onClick();
+    }
+
+    public interface OnPopActionClickListener {
+
+        void onCopyClick(TUIMessageBean msg);
+
+        void onSendMessageClick(TUIMessageBean msg, boolean retry);
+
+        void onDeleteMessageClick(TUIMessageBean msg);
+
+        void onTranslateMessageClick(TUIMessageBean msg);
+
+        void onRevokeMessageClick(TUIMessageBean msg);
+
+        void onMultiSelectMessageClick(TUIMessageBean msg);
+
+        void onForwardMessageClick(TUIMessageBean msg);
+
+        void onReplyMessageClick(TUIMessageBean msg);
+
+        void onQuoteMessageClick(TUIMessageBean msg);
+    }
+
+    public interface OnTranslationPopActionClickListener {
+        void onCopyTranslationClick(String translationContent);
+
+        void onForwardTranslationClick(TUIMessageBean msg);
+
+        void onHideTranslationClick(TUIMessageBean msg);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/SelectTextHelper.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/SelectTextHelper.java
new file mode 100644
index 0000000..83f0453
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/SelectTextHelper.java
@@ -0,0 +1,937 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
+import android.graphics.drawable.ShapeDrawable;
+import android.os.Build;
+import android.text.Layout;
+import android.text.Selection;
+import android.text.Spannable;
+import android.text.Spanned;
+import android.text.TextUtils;
+import android.text.method.LinkMovementMethod;
+import android.text.style.BackgroundColorSpan;
+import android.text.style.ClickableSpan;
+import android.text.style.ImageSpan;
+import android.text.style.URLSpan;
+import android.util.Pair;
+import android.view.Gravity;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+import android.widget.Magnifier;
+import android.widget.PopupWindow;
+import android.widget.TextView;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
+
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.BeginnerGuidePage;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+public class SelectTextHelper {
+    private static final String TAG = SelectTextHelper.class.getSimpleName();
+
+    private static int DEFAULT_SELECTION_LENGTH = 2;
+    private static int DEFAULT_SHOW_DURATION = 100;
+
+    private CursorHandle mStartHandle;
+    private CursorHandle mEndHandle;
+    private Magnifier mMagnifier;
+    private SelectionInfo mSelectionInfo = new SelectionInfo();
+    private OnSelectListener mSelectListener;
+
+    private Context mContext;
+    private TextView mTextView;
+    private Spannable mSpannable;
+
+    private int mTouchX;
+    private int mTouchY;
+    private int mTextViewMarginStart = 0;// textView的marginStart值
+
+    private int mSelectedColor;
+    private int mCursorHandleColor;
+    private int mCursorHandleSize;
+    private boolean mSelectAll;
+    private boolean mSelectedAllNoPop;
+    private boolean mScrollShow;
+    private boolean mMagnifierShow;
+    private int mPopSpanCount;
+    private int mPopBgResource;
+    private int mPopArrowImg;
+    private boolean mIsEmoji = false;
+    private List<Pair<Integer, String>> itemTextList;
+    private List<Builder.onSeparateItemClickListener> itemListenerList = new LinkedList<>();
+
+    private BackgroundColorSpan mSpan;
+    private boolean isHideWhenScroll;
+    private boolean isHide = true;
+    private boolean usedClickListener = false;
+
+    private ViewTreeObserver.OnPreDrawListener mOnPreDrawListener;
+    private ViewTreeObserver.OnScrollChangedListener mOnScrollChangedListener;
+    private View.OnTouchListener mRootTouchListener;
+
+
+    public interface OnSelectListener {
+        void onClick(View v);// 点击textView
+
+        void onLongClick(View v);// 长按textView
+
+        void onTextSelected(CharSequence content);// 选中文本回调
+
+        void onDismiss();// 解除弹窗回调
+
+        void onClickUrl(String url);// 点击文本里的url回调
+
+        void onSelectAllShowCustomPop();// 全选显示自定义弹窗回调
+
+        void onReset();// 重置回调
+
+        void onDismissCustomPop();// 解除自定义弹窗回调
+
+        void onScrolling();// 正在滚动回调
+    }
+
+    public static class Builder {
+        private TextView mTextView;
+        private int mCursorHandleColor = 0xFF1379D6;
+        private int mSelectedColor = 0xFFAFE1F4;
+        private float mCursorHandleSizeInDp = 24;
+        private boolean mSelectAll = true;
+        private boolean mSelectedAllNoPop = false;
+        private boolean mScrollShow = true;
+        private boolean mMagnifierShow = true;
+        private int mPopSpanCount = 5;
+        private int mPopBgResource = 0;
+        private int mPopArrowImg = 0;
+        private boolean mIsEmoji = false;
+        private List<Pair<Integer, String>> itemTextList = new LinkedList<>();
+        private List<onSeparateItemClickListener> itemListenerList = new LinkedList<>();
+
+        public Builder(TextView textView) {
+            mTextView = textView;
+        }
+
+        /**
+         * 选择游标颜色
+         */
+        public Builder setCursorHandleColor(@ColorInt int cursorHandleColor) {
+            mCursorHandleColor = cursorHandleColor;
+            return this;
+        }
+
+        /**
+         * 选择游标大小
+         */
+        public Builder setCursorHandleSizeInDp(float cursorHandleSizeInDp) {
+            mCursorHandleSizeInDp = cursorHandleSizeInDp;
+            return this;
+        }
+
+        /**
+         * 选中文本的颜色
+         */
+        public Builder setSelectedColor(@ColorInt int selectedBgColor) {
+            mSelectedColor = selectedBgColor;
+            return this;
+        }
+
+        /**
+         * 全选
+         */
+        public Builder setSelectAll(boolean selectAll) {
+            mSelectAll = selectAll;
+            return this;
+        }
+
+        /**
+         * 已经全选无弹窗
+         */
+        public Builder setSelectedAllNoPop(boolean selectedAllNoPop) {
+            mSelectedAllNoPop = selectedAllNoPop;
+            return this;
+        }
+
+        /**
+         * 滑动依然显示弹窗
+         */
+        public Builder setScrollShow(boolean scrollShow) {
+            mScrollShow = scrollShow;
+            return this;
+        }
+
+        /**
+         * 显示放大镜
+         */
+        public Builder setMagnifierShow(boolean magnifierShow) {
+            mMagnifierShow = magnifierShow;
+            return this;
+        }
+
+        /**
+         * 弹窗每行个数
+         */
+        public Builder setPopSpanCount(int popSpanCount) {
+            mPopSpanCount = popSpanCount;
+            return this;
+        }
+
+        /**
+         * 弹窗背景颜色、弹窗箭头
+         */
+        public Builder setPopStyle(int popBgResource, int popArrowImg) {
+            mPopBgResource = popBgResource;
+            mPopArrowImg = popArrowImg;
+            return this;
+        }
+
+        public Builder setIsEmoji(boolean isEmoji) {
+            mIsEmoji = isEmoji;
+            return this;
+        }
+
+        public Builder addItem(@DrawableRes int drawableId, @StringRes int textResId, onSeparateItemClickListener listener) {
+            itemTextList.add(new Pair<>(drawableId, mTextView.getContext().getResources().getString(textResId)));
+            itemListenerList.add(listener);
+            return this;
+        }
+
+        public Builder addItem(@DrawableRes int drawableId, String itemText, onSeparateItemClickListener listener) {
+            itemTextList.add(new Pair<>(drawableId, itemText));
+            itemListenerList.add(listener);
+            return this;
+        }
+
+        public SelectTextHelper build() {
+            return new SelectTextHelper(this);
+        }
+
+        public interface onSeparateItemClickListener {
+            void onClick();
+        }
+    }
+
+    public SelectTextHelper(Builder builder) {
+        mTextView = builder.mTextView;
+        mContext = mTextView.getContext();
+        mSelectedColor = builder.mSelectedColor;
+        mCursorHandleColor = builder.mCursorHandleColor;
+        mSelectAll = builder.mSelectAll;
+        mIsEmoji = builder.mIsEmoji;
+        mScrollShow = builder.mScrollShow;
+        mMagnifierShow = builder.mMagnifierShow;
+        mPopSpanCount = builder.mPopSpanCount;
+        mPopBgResource = builder.mPopBgResource;
+        mPopArrowImg = builder.mPopArrowImg;
+        mSelectedAllNoPop = builder.mSelectedAllNoPop;
+        itemTextList = builder.itemTextList;
+        itemListenerList = builder.itemListenerList;
+        mCursorHandleSize = dp2px(builder.mCursorHandleSizeInDp);
+        init();
+    }
+
+    /**
+     * 重置弹窗
+     */
+    public void reset() {
+        TUIChatLog.d(TAG, "reset");
+        hideSelectView();
+        resetSelectionInfo();
+        // 重置弹窗回调
+        if (mSelectListener != null) {
+            mSelectListener.onReset();
+        }
+    }
+
+
+    /**
+     * 选择文本监听
+     */
+    public void setSelectListener(OnSelectListener selectListener) {
+        mSelectListener = selectListener;
+    }
+
+    /**
+     * 销毁
+     */
+    public void destroy() {
+        mTextView.getViewTreeObserver().removeOnScrollChangedListener(mOnScrollChangedListener);
+        mTextView.getViewTreeObserver().removeOnPreDrawListener(mOnPreDrawListener);
+        mTextView.getRootView().setOnTouchListener(null);
+        reset();
+        mStartHandle = null;
+        mEndHandle = null;
+    }
+
+    /**
+     * 全选
+     */
+    public void selectAll() {
+        showAllView();
+    }
+
+    /**
+     * public end
+     */
+
+    private void init() {
+        mTextView.setText(mTextView.getText(), TextView.BufferType.SPANNABLE);
+
+        mTextView.setOnTouchListener((v, event) -> {
+            mTouchX = (int) event.getX();
+            mTouchY = (int) event.getY();
+            return false;
+        });
+
+        mTextView.setOnClickListener(v -> {
+            if (usedClickListener) {
+                usedClickListener = false;
+                return;
+            }
+            if (null != mSelectListener) {
+                mSelectListener.onDismiss();
+            }
+            reset();
+            if (null != mSelectListener) {
+                mSelectListener.onClick(mTextView);
+            }
+        });
+
+        mTextView.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                BeginnerGuidePage.showBeginnerGuideThen(mTextView, new Runnable() {
+                    @Override
+                    public void run() {
+                        onLongTextViewClick();
+                    }
+                });
+                return true;
+            }
+
+            private void onLongTextViewClick() {
+                mTextView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
+                    @Override
+                    public void onViewAttachedToWindow(View v) {
+                    }
+
+                    @Override
+                    public void onViewDetachedFromWindow(View v) {
+                        destroy();
+                    }
+                });
+
+                mOnPreDrawListener = new ViewTreeObserver.OnPreDrawListener() {
+                    @Override
+                    public boolean onPreDraw() {
+                        if (isHideWhenScroll) {
+                            isHideWhenScroll = false;
+                            postShowSelectView(DEFAULT_SHOW_DURATION);
+                        }
+                        // 拿textView的x坐标
+                        if (0 == mTextViewMarginStart) {
+                            int[] location = new int[2];
+                            mTextView.getLocationInWindow(location);
+                            mTextViewMarginStart = location[0];
+                        }
+                        return true;
+                    }
+                };
+                mTextView.getViewTreeObserver().addOnPreDrawListener(mOnPreDrawListener);
+
+                // 根布局监听
+                mRootTouchListener = new View.OnTouchListener() {
+                    @Override
+                    public boolean onTouch(View v, MotionEvent event) {
+                        reset();
+                        mTextView.getRootView().setOnTouchListener(null);
+                        return false;
+                    }
+                };
+                mTextView.getRootView().setOnTouchListener(mRootTouchListener);
+
+                mOnScrollChangedListener = new ViewTreeObserver.OnScrollChangedListener() {
+                    @Override
+                    public void onScrollChanged() {
+                        if (mScrollShow) {
+                            if (!isHideWhenScroll && !isHide) {
+                                isHideWhenScroll = true;
+                                if (mStartHandle != null) {
+                                    mStartHandle.dismiss();
+                                }
+                                if (mEndHandle != null) {
+                                    mEndHandle.dismiss();
+                                }
+                            }
+                            if (null != mSelectListener) {
+                                mSelectListener.onScrolling();
+                            }
+                        } else {
+                            reset();
+                        }
+                    }
+                };
+                mTextView.getViewTreeObserver().addOnScrollChangedListener(mOnScrollChangedListener);
+
+                if (mSelectAll) {
+                    showAllView();
+                } else {
+                    showSelectView(mTouchX, mTouchY);
+                }
+                if (null != mSelectListener) {
+                    mSelectListener.onLongClick(mTextView);
+                }
+            }
+        });
+        // 此setMovementMethod可被修改
+        mTextView.setMovementMethod(new LinkMovementMethodInterceptor());
+    }
+
+    private void postShowSelectView(int duration) {
+        mTextView.removeCallbacks(mShowSelectViewRunnable);
+        if (duration <= 0) {
+            mShowSelectViewRunnable.run();
+        } else {
+            mTextView.postDelayed(mShowSelectViewRunnable, duration);
+        }
+    }
+
+    private final Runnable mShowSelectViewRunnable = new Runnable() {
+        @Override
+        public void run() {
+            if (isHide) return;
+            if (mStartHandle != null) {
+                showCursorHandle(mStartHandle);
+            }
+            if (mEndHandle != null) {
+                showCursorHandle(mEndHandle);
+            }
+        }
+    };
+
+    private void hideSelectView() {
+        isHide = true;
+        usedClickListener = false;
+        if (mStartHandle != null) {
+            TUIChatLog.d(TAG, "mStartHandle.dismiss();");
+            mStartHandle.dismiss();
+        }
+        if (mEndHandle != null) {
+            TUIChatLog.d(TAG, "mEndHandle.dismiss();");
+            mEndHandle.dismiss();
+        }
+    }
+
+    private void resetSelectionInfo() {
+        mSelectionInfo.mSelectionContent = null;
+        if (mSpannable != null && mSpan != null) {
+            TUIChatLog.d(TAG, "mSpannable.removeSpan(mSpan);");
+            mSpannable.removeSpan(mSpan);
+            mSpan = null;
+        }
+    }
+
+    private void showSelectView(int x, int y) {
+        reset();
+        isHide = false;
+        if (mStartHandle == null) mStartHandle = new CursorHandle(true);
+        if (mEndHandle == null) mEndHandle = new CursorHandle(false);
+
+        int startOffset = getPreciseOffset(mTextView, x, y);
+        int endOffset = startOffset + DEFAULT_SELECTION_LENGTH;
+        if (mTextView.getText() instanceof Spannable) {
+            mSpannable = (Spannable) mTextView.getText();
+        }
+        if (mSpannable == null || endOffset - 1 >= mTextView.getText().length()) {
+            return;
+        }
+        selectText(startOffset, endOffset);
+        showCursorHandle(mStartHandle);
+        showCursorHandle(mEndHandle);
+    }
+
+    /**
+     * 全选
+     * Select all
+     */
+    private void showAllView() {
+        reset();
+        isHide = false;
+        if (mStartHandle == null) mStartHandle = new CursorHandle(true);
+        if (mEndHandle == null) mEndHandle = new CursorHandle(false);
+
+        if (mTextView.getText() instanceof Spannable) {
+            mSpannable = (Spannable) mTextView.getText();
+        }
+        if (mSpannable == null) {
+            return;
+        }
+        selectText(0, mTextView.getText().length());
+        showCursorHandle(mStartHandle);
+        showCursorHandle(mEndHandle);
+    }
+
+    private void showCursorHandle(CursorHandle cursorHandle) {
+        Layout layout = mTextView.getLayout();
+        if (layout == null) {
+            return;
+        }
+        int offset = cursorHandle.isLeft ? mSelectionInfo.mStart : mSelectionInfo.mEnd;
+        cursorHandle.show((int) layout.getPrimaryHorizontal(offset), layout.getLineBottom(layout.getLineForOffset(offset)));
+    }
+
+    private void selectText(int startPos, int endPos) {
+        if (startPos != -1) {
+            mSelectionInfo.mStart = startPos;
+        }
+        if (endPos != -1) {
+            mSelectionInfo.mEnd = endPos;
+        }
+        if (mSelectionInfo.mStart > mSelectionInfo.mEnd) {
+            int temp = mSelectionInfo.mStart;
+            mSelectionInfo.mStart = mSelectionInfo.mEnd;
+            mSelectionInfo.mEnd = temp;
+        }
+
+        if (mSpannable != null) {
+            if (mSpan == null) {
+                mSpan = new BackgroundColorSpan(mSelectedColor);
+            }
+            mSelectionInfo.mSelectionContent = mSpannable.subSequence(mSelectionInfo.mStart, mSelectionInfo.mEnd).toString();
+            mSpannable.setSpan(mSpan, mSelectionInfo.mStart, mSelectionInfo.mEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+            if (mSelectListener != null) {
+                mSelectListener.onTextSelected(mSelectionInfo.mSelectionContent);
+            }
+
+            if (mIsEmoji) {
+                //handlerEmojiSelectText();
+            }
+        }
+    }
+
+    private void handlerEmojiSelectText() {
+        String regex = "\\[(\\S+?)\\]";
+        Pattern p = Pattern.compile(regex);
+        Matcher m = p.matcher(mSelectionInfo.mSelectionContent);
+
+        while (m.find()) {
+            String emojiName = m.group();
+            Bitmap bitmap = FaceManager.getEmoji(emojiName);
+            if (bitmap != null) {
+
+                Drawable drawable = new BitmapDrawable(bitmap);
+                ShapeDrawable background = new ShapeDrawable();
+                background.getPaint().setColor(mTextView.getContext().getResources().getColor(com.tencent.qcloud.tuicore.R.color.text_select_color));
+                LayerDrawable layerDrawable = new LayerDrawable(new Drawable[]{background, drawable});
+                layerDrawable.setBounds(0, 0, 64, 64);
+                ImageSpan image = new ImageSpan(layerDrawable, ImageSpan.ALIGN_BASELINE);
+                mSpannable.setSpan(image, mSelectionInfo.mStart, mSelectionInfo.mEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+            }
+        }
+    }
+
+    /**
+     * 游标
+     */
+    private class CursorHandle extends View {
+
+        private PopupWindow mPopupWindow;
+        private Paint mPaint;
+
+        private int mCircleRadius = mCursorHandleSize / 2;
+        private int mWidth = mCursorHandleSize;
+        private int mHeight = mCursorHandleSize;
+        private int mPadding = 32;// 游标padding
+        private boolean isLeft;
+
+        public CursorHandle(boolean isLeft) {
+            super(mContext);
+            this.isLeft = isLeft;
+            mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+            mPaint.setColor(mCursorHandleColor);
+
+            mPopupWindow = new PopupWindow(this);
+            mPopupWindow.setClippingEnabled(false);
+            mPopupWindow.setWidth(mWidth + mPadding * 2);
+            mPopupWindow.setHeight(mHeight + mPadding / 2);
+            invalidate();
+        }
+
+        @Override
+        protected void onDraw(Canvas canvas) {
+            canvas.drawCircle(mCircleRadius + mPadding, mCircleRadius, mCircleRadius, mPaint);
+            if (isLeft) {
+                canvas.drawRect(mCircleRadius + mPadding, 0, mCircleRadius * 2 + mPadding, mCircleRadius, mPaint);
+            } else {
+                canvas.drawRect(mPadding, 0, mCircleRadius + mPadding, mCircleRadius, mPaint);
+            }
+        }
+
+        private int mAdjustX;
+        private int mAdjustY;
+
+        private int mBeforeDragStart;
+        private int mBeforeDragEnd;
+
+        @Override
+        public boolean onTouchEvent(MotionEvent event) {
+            switch (event.getAction()) {
+                case MotionEvent.ACTION_DOWN:
+                    mBeforeDragStart = mSelectionInfo.mStart;
+                    mBeforeDragEnd = mSelectionInfo.mEnd;
+                    mAdjustX = (int) event.getX();
+                    mAdjustY = (int) event.getY();
+                    break;
+                case MotionEvent.ACTION_UP:
+                case MotionEvent.ACTION_CANCEL:
+                    if (mMagnifierShow) {
+                        // android 9 放大镜
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P
+                                && null != mMagnifier) {
+                            mMagnifier.dismiss();
+                        }
+                    }
+                    break;
+                case MotionEvent.ACTION_MOVE:
+                    if (null != mSelectListener) {
+                        mSelectListener.onDismissCustomPop();
+                    }
+                    int rawX = (int) event.getRawX();
+                    int rawY = (int) event.getRawY();
+                    // x y不准 x 减去textView距离x轴距离值  y减去字体大小的像素值
+                    update(rawX + mAdjustX - mWidth - mTextViewMarginStart,
+                            rawY + mAdjustY - mHeight - (int) mTextView.getTextSize());
+                    if (mMagnifierShow) {
+                        // android 9 放大镜功能
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                            if (null == mMagnifier) {
+                                mMagnifier = new Magnifier(mTextView);
+                                mMagnifier.getWidth();
+                            }
+                            final int[] viewPosition = new int[2];
+                            mTextView.getLocationOnScreen(viewPosition);
+                            int magnifierX = rawX - viewPosition[0];
+                            int magnifierY = rawY - viewPosition[1] - dp2px(32);
+                            mMagnifier.show(magnifierX, Math.max(magnifierY, 0));
+                        }
+                    }
+                    break;
+            }
+            return true;
+        }
+
+        private void changeDirection() {
+            isLeft = !isLeft;
+            invalidate();
+        }
+
+        public void dismiss() {
+            mPopupWindow.dismiss();
+        }
+
+        private int[] mTempCoors = new int[2];
+
+        public void update(int x, int y) {
+            mTextView.getLocationInWindow(mTempCoors);
+            int oldOffset;
+            if (isLeft) {
+                oldOffset = mSelectionInfo.mStart;
+            } else {
+                oldOffset = mSelectionInfo.mEnd;
+            }
+
+            y -= mTempCoors[1];
+
+            int offset = getHysteresisOffset(mTextView, x, y, oldOffset);
+
+            if (offset != oldOffset) {
+                resetSelectionInfo();
+                if (isLeft) {
+                    if (offset > mBeforeDragEnd) {
+                        CursorHandle handle = getCursorHandle(false);
+                        changeDirection();
+                        handle.changeDirection();
+                        mBeforeDragStart = mBeforeDragEnd;
+                        selectText(mBeforeDragEnd, offset);
+                        handle.updateCursorHandle();
+                    } else {
+                        selectText(offset, -1);
+                    }
+                    updateCursorHandle();
+                } else {
+                    if (offset < mBeforeDragStart) {
+                        CursorHandle handle = getCursorHandle(true);
+                        handle.changeDirection();
+                        changeDirection();
+                        mBeforeDragEnd = mBeforeDragStart;
+                        selectText(offset, mBeforeDragStart);
+                        handle.updateCursorHandle();
+                    } else {
+                        selectText(mBeforeDragStart, offset);
+                    }
+                    updateCursorHandle();
+                }
+            }
+        }
+
+        private void updateCursorHandle() {
+            mTextView.getLocationInWindow(mTempCoors);
+            Layout layout = mTextView.getLayout();
+            if (isLeft) {
+                mPopupWindow.update((int) layout.getPrimaryHorizontal(mSelectionInfo.mStart) - mWidth + getExtraX(),
+                        layout.getLineBottom(layout.getLineForOffset(mSelectionInfo.mStart)) + getExtraY(), -1, -1);
+            } else {
+                mPopupWindow.update((int) layout.getPrimaryHorizontal(mSelectionInfo.mEnd) + getExtraX(),
+                        layout.getLineBottom(layout.getLineForOffset(mSelectionInfo.mEnd)) + getExtraY(), -1, -1);
+            }
+        }
+
+        public void show(int x, int y) {
+            mTextView.getLocationInWindow(mTempCoors);
+            int offset = isLeft ? mWidth : 0;
+            mPopupWindow.showAtLocation(mTextView, Gravity.NO_GRAVITY, x - offset + getExtraX(), y + getExtraY());
+        }
+
+        public int getExtraX() {
+            return mTempCoors[0] - mPadding + mTextView.getPaddingLeft();
+        }
+
+        public int getExtraY() {
+            return mTempCoors[1] + mTextView.getPaddingTop();
+        }
+    }
+
+    private CursorHandle getCursorHandle(boolean isLeft) {
+        if (mStartHandle.isLeft == isLeft) {
+            return mStartHandle;
+        } else {
+            return mEndHandle;
+        }
+    }
+
+    private class SelectionInfo {
+        public int mStart;
+        public int mEnd;
+        public String mSelectionContent;
+    }
+
+    /**
+     * 处理内容链接跳转
+     */
+    private class LinkMovementMethodInterceptor extends LinkMovementMethod {
+
+        private long downLinkTime;
+
+        @Override
+        public boolean onTouchEvent(TextView widget, Spannable buffer, MotionEvent event) {
+            int action = event.getAction();
+
+            if (action == MotionEvent.ACTION_UP ||
+                    action == MotionEvent.ACTION_DOWN) {
+                int x = (int) event.getX();
+                int y = (int) event.getY();
+
+                x -= widget.getTotalPaddingLeft();
+                y -= widget.getTotalPaddingTop();
+
+                x += widget.getScrollX();
+                y += widget.getScrollY();
+
+                Layout layout = widget.getLayout();
+                int line = layout.getLineForVertical(y);
+                int off = layout.getOffsetForHorizontal(line, x);
+
+                ClickableSpan[] links =
+                        buffer.getSpans(off, off, ClickableSpan.class);
+
+                if (links.length != 0) {
+                    if (action == MotionEvent.ACTION_UP) {
+                        // 长按
+                        if (downLinkTime + ViewConfiguration.getLongPressTimeout() < System.currentTimeMillis()) {
+                            return false;
+                        }
+                        // 点击
+                        if (links[0] instanceof URLSpan) {
+                            URLSpan url = (URLSpan) links[0];
+                            if (!TextUtils.isEmpty(url.getURL())) {
+                                if (null != mSelectListener) {
+                                    usedClickListener = true;
+                                    mSelectListener.onClickUrl(url.getURL());
+                                }
+                                return true;
+                            } else {
+                                links[0].onClick(widget);
+                            }
+                        }
+                    } else if (action == MotionEvent.ACTION_DOWN) {
+                        downLinkTime = System.currentTimeMillis();
+                        Selection.setSelection(buffer,
+                                buffer.getSpanStart(links[0]),
+                                buffer.getSpanEnd(links[0]));
+                    }
+                    return true;
+                } else {
+                    Selection.removeSelection(buffer);
+                }
+            }
+
+            return super.onTouchEvent(widget, buffer, event);
+        }
+
+    }
+
+    // util
+
+    public static int getPreciseOffset(TextView textView, int x, int y) {
+        Layout layout = textView.getLayout();
+        if (layout != null) {
+            int topVisibleLine = layout.getLineForVertical(y);
+            int offset = layout.getOffsetForHorizontal(topVisibleLine, x);
+
+            int offsetX = (int) layout.getPrimaryHorizontal(offset);
+
+            if (offsetX > x) {
+                return layout.getOffsetToLeftOf(offset);
+            } else {
+                return offset;
+            }
+        } else {
+            return -1;
+        }
+    }
+
+    public static int getHysteresisOffset(TextView textView, int x, int y, int previousOffset) {
+        final Layout layout = textView.getLayout();
+        if (layout == null) return -1;
+
+        int line = layout.getLineForVertical(y);
+
+        // The "HACK BLOCK"S in this function is required because of how Android Layout for
+        // TextView works - if 'offset' equals to the last character of a line, then
+        //
+        // * getLineForOffset(offset) will result the NEXT line
+        // * getPrimaryHorizontal(offset) will return 0 because the next insertion point is on the next line
+        // * getOffsetForHorizontal(line, x) will not return the last offset of a line no matter where x is
+        // These are highly undesired and is worked around with the HACK BLOCK
+        //
+        // @see Moon+ Reader/Color Note - see how it can't select the last character of a line unless you move
+        // the cursor to the beginning of the next line.
+        //
+        ////////////////////HACK BLOCK////////////////////////////////////////////////////
+
+        if (isEndOfLineOffset(layout, previousOffset)) {
+            // we have to minus one from the offset so that the code below to find
+            // the previous line can work correctly.
+            int left = (int) layout.getPrimaryHorizontal(previousOffset - 1);
+            int right = (int) layout.getLineRight(line);
+            int threshold = (right - left) / 2; // half the width of the last character
+            if (x > right - threshold) {
+                previousOffset -= 1;
+            }
+        }
+        ///////////////////////////////////////////////////////////////////////////////////
+
+        final int previousLine = layout.getLineForOffset(previousOffset);
+        final int previousLineTop = layout.getLineTop(previousLine);
+        final int previousLineBottom = layout.getLineBottom(previousLine);
+        final int hysteresisThreshold = (previousLineBottom - previousLineTop) / 2;
+
+        // If new line is just before or after previous line and y position is less than
+        // hysteresisThreshold away from previous line, keep cursor on previous line.
+        if (((line == previousLine + 1) && ((y - previousLineBottom) < hysteresisThreshold)) || ((line == previousLine - 1) && ((
+                previousLineTop
+                        - y) < hysteresisThreshold))) {
+            line = previousLine;
+        }
+
+        int offset = layout.getOffsetForHorizontal(line, x);
+
+        // This allow the user to select the last character of a line without moving the
+        // cursor to the next line. (As Layout.getOffsetForHorizontal does not return the
+        // offset of the last character of the specified line)
+        //
+        // But this function will probably get called again immediately, must decrement the offset
+        // by 1 to compensate for the change made below. (see previous HACK BLOCK)
+        /////////////////////HACK BLOCK///////////////////////////////////////////////////
+        if (offset < textView.getText().length() - 1) {
+            if (isEndOfLineOffset(layout, offset + 1)) {
+                int left = (int) layout.getPrimaryHorizontal(offset);
+                int right = (int) layout.getLineRight(line);
+                int threshold = (right - left) / 2; // half the width of the last character
+                if (x > right - threshold) {
+                    offset += 1;
+                }
+            }
+        }
+        //////////////////////////////////////////////////////////////////////////////////
+
+        return offset;
+    }
+
+    private static boolean isEndOfLineOffset(Layout layout, int offset) {
+        return offset > 0 && layout.getLineForOffset(offset) == layout.getLineForOffset(offset - 1) + 1;
+    }
+
+    public static int getDisplayWidth() {
+        return Resources.getSystem().getDisplayMetrics().widthPixels;
+    }
+
+    public static int getDisplayHeight() {
+        return Resources.getSystem().getDisplayMetrics().heightPixels;
+    }
+
+    public static int dp2px(float dpValue) {
+        return (int) (dpValue * Resources.getSystem().getDisplayMetrics().density + 0.5f);
+    }
+
+    /**
+     * 设置宽高
+     *
+     * @param v
+     * @param w
+     * @param h
+     */
+    public static void setWidthHeight(View v, int w, int h) {
+        ViewGroup.LayoutParams params = v.getLayoutParams();
+        params.width = w;
+        params.height = h;
+        v.setLayoutParams(params);
+    }
+
+    /**
+     * 通知栏的高度
+     */
+    private static int STATUS_HEIGHT = 0;
+
+    /**
+     * 获取通知栏的高度
+     */
+    public static int getStatusHeight() {
+        if (0 != STATUS_HEIGHT) {
+            return STATUS_HEIGHT;
+        }
+        int resid = Resources.getSystem().getIdentifier("status_bar_height", "dimen", "android");
+        if (resid > 0) {
+            STATUS_HEIGHT = Resources.getSystem().getDimensionPixelSize(resid);
+            return STATUS_HEIGHT;
+        }
+        return -1;
+    }
+}
\ No newline at end of file
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/ChatFlowReactView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/ChatFlowReactView.java
new file mode 100644
index 0000000..e495794
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/ChatFlowReactView.java
@@ -0,0 +1,256 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.util.TypedValue;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageReactBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.ReactUserBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.Set;
+
+public class ChatFlowReactView extends RecyclerView {
+    private ChatFlowReactLayoutManager layoutManager;
+    private ChatFlowReactAdapter adapter;
+    private int themeColorId;
+    public ChatFlowReactView(@NonNull Context context) {
+        super(context);
+        initView();
+    }
+
+    public ChatFlowReactView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        initView();
+    }
+
+    public ChatFlowReactView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initView();
+    }
+
+    private void initView() {
+
+        DisplayMetrics displayMetrics = getResources().getDisplayMetrics();
+        float spacingVertical = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 7.68f, displayMetrics);
+        float spacingHorizontal = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 5.76f, displayMetrics);
+
+        layoutManager = new ChatFlowReactLayoutManager(spacingHorizontal, spacingVertical);
+        setLayoutManager(layoutManager);
+        adapter = new ChatFlowReactAdapter();
+        setAdapter(adapter);
+    }
+
+    public void setThemeColorId(int themeColorId) {
+        this.themeColorId = themeColorId;
+        adapter.setThemeColorId(themeColorId);
+    }
+
+    public void setReactOnClickListener(ReactOnClickListener reactOnClickListener) {
+        if (adapter != null) {
+            adapter.setReactOnClickListener(reactOnClickListener);
+        }
+    }
+
+    public void setData(MessageReactBean reactBean) {
+        if (adapter != null) {
+            adapter.setData(reactBean);
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    static class ChatFlowReactAdapter extends Adapter<ChatFlowReactViewHolder> {
+        private MessageReactBean data;
+        private ReactOnClickListener reactOnClickListener;
+        private int themeColorId;
+        public void setReactOnClickListener(ReactOnClickListener reactOnClickListener) {
+            this.reactOnClickListener = reactOnClickListener;
+        }
+
+        public void setThemeColorId(int themeColorId) {
+            this.themeColorId = themeColorId;
+        }
+
+        public void setData(MessageReactBean data) {
+            this.data = data;
+        }
+
+        @NonNull
+        @Override
+        public ChatFlowReactViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.chat_flow_react_item_layout, parent, false);
+            return new ChatFlowReactViewHolder(view);
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull ChatFlowReactViewHolder holder, int position) {
+            Map.Entry<String, Set<String>> entry = new ArrayList<>(data.getReacts().entrySet()).get(position);
+            String emojiId = entry.getKey();
+            Set<String> userIds = entry.getValue();
+
+            Bitmap bitmap = FaceManager.getEmoji(emojiId);
+            holder.faceImageView.setImageBitmap(bitmap);
+
+            holder.faceImageView.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (reactOnClickListener != null) {
+                        reactOnClickListener.onClick(emojiId);
+                    }
+                }
+            });
+            if (themeColorId != 0) {
+                holder.userTextView.setTextColor(holder.userTextView.getResources().getColor(themeColorId));
+                holder.userTextView.setTextColor(holder.userTextView.getResources().getColor(themeColorId));
+            } else {
+                holder.userTextView.setTextColor(holder.userTextView.getResources().getColor(
+                        TUIThemeManager.getAttrResId(holder.userTextView.getContext(), R.attr.chat_react_text_color)));
+                holder.userTextView.setTextColor(holder.userTextView.getResources().getColor(
+                        TUIThemeManager.getAttrResId(holder.userTextView.getContext(), R.attr.chat_react_text_color)));
+            }
+            holder.userTextView.setText(formatDisplayUserName(userIds));
+        }
+
+        private String getUserDisplayName(String id) {
+            if (data.getReactUserBeanMap() == null) {
+                return id;
+            } else {
+                ReactUserBean reactUserBean = data.getReactUserBeanMap().get(id);
+                if (reactUserBean == null) {
+                    return id;
+                } else {
+                    return reactUserBean.getDisplayString();
+                }
+            }
+        }
+
+        @Override
+        public int getItemCount() {
+            if (data != null) {
+                return data.getReactSize();
+            }
+            return 0;
+        }
+        
+        private String formatDisplayUserName(Set<String> userIds) {
+            StringBuilder stringBuilder = new StringBuilder();
+            int index = 0;
+            for (String userId : userIds) {
+                stringBuilder.append(getUserDisplayName(userId));
+                index++;
+                if (index != userIds.size()) {
+                    stringBuilder.append("、");
+                }
+            }
+            return stringBuilder.toString();
+        }
+    }
+
+    public interface ReactOnClickListener {
+        void onClick(String emojiId);
+    }
+
+    static class ChatFlowReactViewHolder extends ViewHolder {
+        public TextView userTextView;
+        public ImageView faceImageView;
+        public ChatFlowReactViewHolder(@NonNull View itemView) {
+            super(itemView);
+            userTextView = itemView.findViewById(R.id.users_tv);
+            faceImageView = itemView.findViewById(R.id.face_iv);
+        }
+    }
+
+
+    // ChatReactView is just a simple flowLayout
+    static class ChatFlowReactLayoutManager extends LayoutManager {
+        private int verticalSpacing = 0;
+        private int horizontalSpacing = 0;
+
+        public ChatFlowReactLayoutManager() {}
+
+        public ChatFlowReactLayoutManager(float horizontalSpacing, float verticalSpacing) {
+            this.verticalSpacing = Math.round(verticalSpacing);
+            this.horizontalSpacing = Math.round(horizontalSpacing);
+        }
+
+        @Override
+        public LayoutParams generateDefaultLayoutParams() {
+            return new LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        }
+
+        @Override
+        public void onLayoutChildren(Recycler recycler, State state) {
+            detachAndScrapAttachedViews(recycler);
+            int itemCount = getItemCount();
+            if (itemCount == 0) {
+                return;
+            }
+
+            int offsetTop;
+            int offsetBottom;
+            int offsetLeft;
+            int offsetRight = getPaddingStart();
+
+            boolean isLineFirstItem = true;
+            boolean isFirstLine = true;
+
+            int currentMaxBottom = 0;
+            int nextMaxBottom = 0;
+            for (int i = 0; i < itemCount; i++) {
+                View childView = recycler.getViewForPosition(i);
+                addView(childView);
+                measureChildWithMargins(childView, 0, 0);
+                int childMeasuredWidth = getDecoratedMeasuredWidth(childView);
+                int childMeasuredHeight = getDecoratedMeasuredHeight(childView);
+
+                if (i != 0 && offsetRight + horizontalSpacing + childMeasuredWidth >
+                        getWidth() - getPaddingStart() - getPaddingEnd()) {
+                    // switch a new line
+                    isLineFirstItem = true;
+                    isFirstLine = false;
+                    currentMaxBottom = nextMaxBottom;
+                }
+
+                if (isLineFirstItem) {
+                    offsetLeft = getPaddingStart();
+                } else {
+                    offsetLeft = offsetRight + horizontalSpacing;
+                }
+
+                if (isFirstLine) {
+                    offsetTop = getPaddingTop();
+                } else {
+                    offsetTop = currentMaxBottom + verticalSpacing;
+                }
+
+                offsetRight = offsetLeft + childMeasuredWidth;
+                offsetBottom = offsetTop + childMeasuredHeight;
+                nextMaxBottom = Math.max(nextMaxBottom, offsetBottom);
+
+                layoutDecoratedWithMargins(childView, offsetLeft, offsetTop, offsetRight, offsetBottom);
+
+                isLineFirstItem = false;
+            }
+        }
+
+        @Override
+        public boolean isAutoMeasureEnabled() {
+            return true;
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/FaceReplyQuoteView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/FaceReplyQuoteView.java
new file mode 100644
index 0000000..e6dbdef
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/FaceReplyQuoteView.java
@@ -0,0 +1,39 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply;
+
+import android.content.Context;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.FaceReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+
+public class FaceReplyQuoteView extends TUIReplyQuoteView {
+    private final ImageView contentImage;
+
+    @Override
+    public int getLayoutResourceId() {
+        return R.layout.chat_reply_quote_face_layout;
+    }
+
+    public FaceReplyQuoteView(Context context) {
+        super(context);
+        contentImage = findViewById(R.id.content_image_iv);
+    }
+
+    @Override
+    public void onDrawReplyQuote(TUIReplyQuoteBean quoteBean) {
+        FaceReplyQuoteBean faceReplyQuoteBean = (FaceReplyQuoteBean) quoteBean;
+
+        String faceKey = new String(faceReplyQuoteBean.getData());
+        ViewGroup.LayoutParams params = contentImage.getLayoutParams();
+        if (params != null) {
+            int maxSize = getResources().getDimensionPixelSize(R.dimen.reply_message_image_size);
+            params.width = maxSize;
+            params.height = maxSize;
+            contentImage.setLayoutParams(params);
+        }
+        FaceManager.loadFace(faceReplyQuoteBean.getIndex(), faceKey, contentImage);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/FileReplyQuoteView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/FileReplyQuoteView.java
new file mode 100644
index 0000000..9bdd713
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/FileReplyQuoteView.java
@@ -0,0 +1,46 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.FileReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+
+public class FileReplyQuoteView extends TUIReplyQuoteView {
+
+    private View fileMsgLayout;
+    private ImageView fileMsgIcon;
+    private TextView fileMsgTv;
+    @Override
+    public int getLayoutResourceId() {
+        return R.layout.chat_reply_quote_file_layout;
+    }
+
+    public FileReplyQuoteView(Context context) {
+        super(context);
+        fileMsgLayout = findViewById(R.id.file_msg_layout);
+        fileMsgIcon = findViewById(R.id.file_msg_icon_iv);
+        fileMsgTv = findViewById(R.id.file_msg_name_tv);
+    }
+
+    @Override
+    public void onDrawReplyQuote(TUIReplyQuoteBean quoteBean) {
+        fileMsgLayout.setVisibility(View.VISIBLE);
+        if (quoteBean instanceof FileReplyQuoteBean) {
+            fileMsgTv.setText(((FileReplyQuoteBean) quoteBean).getFileName());
+        }
+    }
+
+    @Override
+    public void setSelf(boolean isSelf) {
+        if (!isSelf) {
+            fileMsgTv.setTextColor(fileMsgTv.getResources().getColor(TUIThemeManager.getAttrResId(fileMsgTv.getContext(), R.attr.chat_other_reply_quote_text_color)));
+        } else {
+            fileMsgTv.setTextColor(fileMsgTv.getResources().getColor(TUIThemeManager.getAttrResId(fileMsgTv.getContext(), R.attr.chat_self_reply_quote_text_color)));
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/ImageReplyQuoteView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/ImageReplyQuoteView.java
new file mode 100644
index 0000000..12b5e1f
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/ImageReplyQuoteView.java
@@ -0,0 +1,128 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import androidx.annotation.Nullable;
+
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.request.RequestListener;
+import com.bumptech.glide.request.target.Target;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.util.ImageUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ImageMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ImageReplyQuoteView extends TUIReplyQuoteView {
+    protected View imageMsgLayout;
+    protected ImageView imageMsgIv;
+    protected ImageView videoPlayIv;
+
+    protected static final int DEFAULT_RADIUS = 2;
+    protected final List<String> downloadEles = new ArrayList<>();
+    protected String mImagePath = null;
+
+    public ImageReplyQuoteView(Context context) {
+        super(context);
+        imageMsgLayout = findViewById(R.id.image_msg_layout);
+        imageMsgIv = findViewById(R.id.image_msg_iv);
+        videoPlayIv = findViewById(R.id.video_play_iv);
+    }
+
+    @Override
+    public int getLayoutResourceId() {
+        return R.layout.chat_reply_quote_image_layout;
+    }
+
+    @Override
+    public void onDrawReplyQuote(TUIReplyQuoteBean quoteBean) {
+        ImageMessageBean messageBean = (ImageMessageBean) quoteBean.getMessageBean();
+        imageMsgLayout.setVisibility(View.VISIBLE);
+        imageMsgIv.setLayoutParams(getImageParams(imageMsgIv.getLayoutParams(), messageBean.getImgWidth(), messageBean.getImgHeight()));
+        final List<ImageMessageBean.ImageBean> imgs = messageBean.getImageBeanList();
+        String imagePath = messageBean.getDataPath();
+        String originImagePath = TUIChatUtils.getOriginImagePath(messageBean);
+        if (!TextUtils.isEmpty(originImagePath)) {
+            imagePath = originImagePath;
+        }
+        if (!TextUtils.isEmpty(imagePath)) {
+            GlideEngine.loadCornerImageWithoutPlaceHolder(imageMsgIv, imagePath, null, DEFAULT_RADIUS);
+        } else {
+            GlideEngine.clear(imageMsgIv);
+            for (int i = 0; i < imgs.size(); i++) {
+                final ImageMessageBean.ImageBean img = imgs.get(i);
+                if (img.getType() == ImageMessageBean.IMAGE_TYPE_THUMB) {
+                    synchronized (downloadEles) {
+                        if (downloadEles.contains(img.getUUID())) {
+                            break;
+                        }
+                        downloadEles.add(img.getUUID());
+                    }
+                    final String path = ImageUtil.generateImagePath(img.getUUID(), ImageMessageBean.IMAGE_TYPE_THUMB);
+                    if (!path.equals(mImagePath)) {
+                        GlideEngine.clear(imageMsgIv);
+                    }
+                    img.downloadImage(path, new ImageMessageBean.ImageBean.ImageDownloadCallback() {
+                        @Override
+                        public void onProgress(long currentSize, long totalSize) {
+                            TUIChatLog.i("downloadImage progress current:",
+                                    currentSize + ", total:" + totalSize);
+                        }
+
+                        @Override
+                        public void onError(int code, String desc) {
+                            downloadEles.remove(img.getUUID());
+                            TUIChatLog.e("MessageAdapter img getImage", code + ":" + desc);
+                        }
+
+                        @Override
+                        public void onSuccess() {
+                            downloadEles.remove(img.getUUID());
+                            messageBean.setDataPath(path);
+                            GlideEngine.loadCornerImageWithoutPlaceHolder(imageMsgIv, messageBean.getDataPath(), new RequestListener() {
+                                @Override
+                                public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) {
+                                    mImagePath = null;
+                                    return false;
+                                }
+
+                                @Override
+                                public boolean onResourceReady(Object resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) {
+                                    mImagePath = path;
+                                    return false;
+                                }
+                            }, DEFAULT_RADIUS);
+                        }
+                    });
+                    break;
+                }
+            }
+        }
+    }
+
+    protected ViewGroup.LayoutParams getImageParams(ViewGroup.LayoutParams params, int width, int height) {
+
+        if (width == 0 || height == 0) {
+            return params;
+        }
+        int maxSize = getResources().getDimensionPixelSize(R.dimen.reply_message_image_size);
+        if (width > height) {
+            params.width = maxSize;
+            params.height = maxSize * height / width;
+        } else {
+            params.width = maxSize * width / height;
+            params.height = maxSize;
+        }
+        return params;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/LocationReplyQuoteView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/LocationReplyQuoteView.java
new file mode 100644
index 0000000..0dcdb22
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/LocationReplyQuoteView.java
@@ -0,0 +1,21 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply;
+
+import android.content.Context;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+
+public class LocationReplyQuoteView extends TUIReplyQuoteView {
+    @Override
+    public int getLayoutResourceId() {
+        return 0;
+    }
+
+    public LocationReplyQuoteView(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void onDrawReplyQuote(TUIReplyQuoteBean quoteBean) {
+
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/MergeReplyQuoteView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/MergeReplyQuoteView.java
new file mode 100644
index 0000000..daf8387
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/MergeReplyQuoteView.java
@@ -0,0 +1,63 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.MergeMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+
+import java.util.List;
+
+public class MergeReplyQuoteView extends TUIReplyQuoteView {
+    private View mergeMsgLayout;
+    private TextView mergeMsgTitle;
+    private TextView mergeMsgContent;
+    @Override
+    public int getLayoutResourceId() {
+        return R.layout.chat_reply_quote_merge_layout;
+    }
+
+    public MergeReplyQuoteView(Context context) {
+        super(context);
+        mergeMsgLayout = findViewById(R.id.merge_msg_layout);
+        mergeMsgTitle = findViewById(R.id.merge_msg_title);
+        mergeMsgContent = findViewById(R.id.merge_msg_content);
+    }
+
+
+    @Override
+    public void setSelf(boolean isSelf) {
+        if (!isSelf) {
+            mergeMsgContent.setTextColor(mergeMsgContent.getResources().getColor(TUIThemeManager.getAttrResId(mergeMsgContent.getContext(), R.attr.chat_other_reply_quote_text_color)));
+            mergeMsgTitle.setTextColor(mergeMsgTitle.getResources().getColor(TUIThemeManager.getAttrResId(mergeMsgTitle.getContext(), R.attr.chat_other_reply_quote_text_color)));
+        } else {
+            mergeMsgContent.setTextColor(mergeMsgContent.getResources().getColor(TUIThemeManager.getAttrResId(mergeMsgContent.getContext(), R.attr.chat_self_reply_quote_text_color)));
+            mergeMsgTitle.setTextColor(mergeMsgTitle.getResources().getColor(TUIThemeManager.getAttrResId(mergeMsgTitle.getContext(), R.attr.chat_self_reply_quote_text_color)));
+        }
+    }
+
+    @Override
+    public void onDrawReplyQuote(TUIReplyQuoteBean quoteBean) {
+        MergeMessageBean messageBean = (MergeMessageBean) quoteBean.getMessageBean();
+        mergeMsgLayout.setVisibility(View.VISIBLE);
+        String title = messageBean.getTitle();
+        List<String> abstractList= messageBean.getAbstractList();
+        mergeMsgTitle.setText(title);
+        String content = "";
+        for (int i = 0; i < abstractList.size(); i++) {
+            if (i >= 2) {
+                break;
+            }
+            if (i != 0) {
+                content += "\n";
+            }
+            content += abstractList.get(i);
+        }
+        content = FaceManager.emojiJudge(content);
+        mergeMsgContent.setText(content);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/ReplyDetailsView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/ReplyDetailsView.java
new file mode 100644
index 0000000..78bc952
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/ReplyDetailsView.java
@@ -0,0 +1,143 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.component.gatherimage.UserIconView;
+import com.tencent.qcloud.tuicore.util.DateTimeUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageRepliesBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.MessageProperties;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+public class ReplyDetailsView extends RecyclerView {
+    private ReplyDetailsAdapter adapter;
+    private LinearLayoutManager layoutManager;
+    private FrameLayout translationContentFrameLayout;
+    private LinearLayout translationResultLayout;
+
+    public ReplyDetailsView(@NonNull Context context) {
+        super(context);
+        initView();
+    }
+
+    public ReplyDetailsView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        initView();
+    }
+
+    public ReplyDetailsView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initView();
+    }
+
+    private void initView() {
+        layoutManager = new LinearLayoutManager(getContext());
+        setLayoutManager(layoutManager);
+        adapter = new ReplyDetailsAdapter();
+        setAdapter(adapter);
+    }
+
+    public void setData(Map<MessageRepliesBean.ReplyBean, TUIMessageBean> messageBeanMap) {
+        adapter.setData(messageBeanMap);
+        adapter.notifyDataSetChanged();
+    }
+
+    public class ReplyDetailsAdapter extends Adapter<ReplyDetailsViewHolder>{
+        Map<MessageRepliesBean.ReplyBean, TUIMessageBean> data;
+
+        public void setData(Map<MessageRepliesBean.ReplyBean, TUIMessageBean> messageBeanMap) {
+            this.data = messageBeanMap;
+        }
+
+        @NonNull
+        @Override
+        public ReplyDetailsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.chat_reply_details_item_layout, parent, false);
+            translationContentFrameLayout = view.findViewById(R.id.translate_content_fl);
+            LayoutInflater.from(view.getContext()).inflate(R.layout.translation_contant_layout, translationContentFrameLayout);
+            translationResultLayout = translationContentFrameLayout.findViewById(R.id.translate_result_ll);
+            return new ReplyDetailsViewHolder(view);
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull ReplyDetailsViewHolder holder, int position) {
+            MessageRepliesBean.ReplyBean replyBean = new ArrayList<>(data.keySet()).get(position);
+            TUIMessageBean messageBean = data.get(replyBean);
+            String userName;
+            String messageText;
+            List<Object> iconList = new ArrayList<>();
+            int translationStatus = TUIMessageBean.MSG_TRANSLATE_STATUS_UNKNOWN;
+            if (messageBean == null) {
+                userName = replyBean.getSenderShowName();
+                messageText = replyBean.getMessageAbstract();
+                iconList.add(replyBean.getSenderFaceUrl());
+            } else {
+                translationStatus = messageBean.getTranslationStatus();
+                messageText = messageBean.getExtra();
+                userName = messageBean.getUserDisplayName();
+                iconList.add(messageBean.getFaceUrl());
+                holder.timeText.setText(DateTimeUtil.getTimeFormatText(new Date(messageBean.getMessageTime() * 1000)));
+            }
+            holder.userFaceView.setIconUrls(iconList);
+            holder.userNameTv.setText(userName);
+            FaceManager.handlerEmojiText(holder.messageText, messageText, false);
+
+            if (translationStatus == TUIMessageBean.MSG_TRANSLATE_STATUS_SHOWN) {
+                translationContentFrameLayout.setVisibility(View.VISIBLE);
+                translationResultLayout.setVisibility(View.VISIBLE);
+                TextView translationText = translationContentFrameLayout.findViewById(R.id.translate_tv);
+                if (MessageProperties.getInstance().getChatContextFontSize() != 0) {
+                    translationText.setTextSize(MessageProperties.getInstance().getChatContextFontSize());
+                }
+                FaceManager.handlerEmojiText(translationText, messageBean.getTranslation(), false);
+            } else if (translationStatus == TUIMessageBean.MSG_TRANSLATE_STATUS_LOADING) {
+                translationContentFrameLayout.setVisibility(View.VISIBLE);
+                translationResultLayout.setVisibility(View.GONE);
+            } else {
+                translationContentFrameLayout.setVisibility(View.GONE);
+            }
+
+        }
+
+        @Override
+        public int getItemCount() {
+            if (data == null) {
+                return 0;
+            }
+            return data.size();
+        }
+    }
+
+    static class ReplyDetailsViewHolder extends ViewHolder {
+        public UserIconView userFaceView;
+        protected TextView userNameTv;
+        protected TextView messageText;
+        protected TextView timeText;
+
+        public ReplyDetailsViewHolder(View itemView) {
+            super(itemView);
+            userFaceView = itemView.findViewById(R.id.user_icon);
+            userNameTv = itemView.findViewById(R.id.user_name_tv);
+            messageText = itemView.findViewById(R.id.msg_abstract);
+            timeText = itemView.findViewById(R.id.msg_time);
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/SoundReplyQuoteView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/SoundReplyQuoteView.java
new file mode 100644
index 0000000..79aad27
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/SoundReplyQuoteView.java
@@ -0,0 +1,45 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.SoundReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+
+public class SoundReplyQuoteView extends TUIReplyQuoteView {
+    private View soundMsgLayout;
+    private ImageView soundMsgIcon;
+    private TextView soundMsgTv;
+    public SoundReplyQuoteView(Context context) {
+        super(context);
+        soundMsgLayout = findViewById(R.id.sound_msg_layout);
+        soundMsgIcon = findViewById(R.id.sound_msg_icon_iv);
+        soundMsgTv = findViewById(R.id.sound_msg_time_tv);
+    }
+
+    @Override
+    public int getLayoutResourceId() {
+        return R.layout.chat_reply_quote_sound_layout;
+    }
+
+    @Override
+    public void onDrawReplyQuote(TUIReplyQuoteBean quoteBean) {
+        soundMsgLayout.setVisibility(View.VISIBLE);
+        if (quoteBean instanceof SoundReplyQuoteBean) {
+            soundMsgTv.setText(((SoundReplyQuoteBean) quoteBean).getDuring() + "''");
+        }
+    }
+
+    @Override
+    public void setSelf(boolean isSelf) {
+        if (!isSelf) {
+            soundMsgTv.setTextColor(soundMsgTv.getResources().getColor(TUIThemeManager.getAttrResId(soundMsgTv.getContext(), R.attr.chat_other_reply_quote_text_color)));
+        } else {
+            soundMsgTv.setTextColor(soundMsgTv.getResources().getColor(TUIThemeManager.getAttrResId(soundMsgTv.getContext(), R.attr.chat_self_reply_quote_text_color)));
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/TUIReplyQuoteView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/TUIReplyQuoteView.java
new file mode 100644
index 0000000..849cb46
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/TUIReplyQuoteView.java
@@ -0,0 +1,32 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.widget.FrameLayout;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+
+public abstract class TUIReplyQuoteView extends FrameLayout {
+
+    public abstract int getLayoutResourceId();
+
+    public TUIReplyQuoteView(Context context) {
+        super(context);
+        int resId = getLayoutResourceId();
+        if (resId != 0) {
+            LayoutInflater.from(context).inflate(resId, this, true);
+        }
+    }
+
+    public abstract void onDrawReplyQuote(TUIReplyQuoteBean quoteBean);
+
+    /**
+     * 原始消息发送者是否为自己 ， 用于不同 UI 展示
+     * 
+     * Whether the original message sender is himself, used for different UI displays
+     * 
+     * @param isSelf
+     */
+    public void setSelf(boolean isSelf) {}
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/TextReplyQuoteView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/TextReplyQuoteView.java
new file mode 100644
index 0000000..08ef1fe
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/TextReplyQuoteView.java
@@ -0,0 +1,41 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply;
+
+import android.content.Context;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TextReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+
+public class TextReplyQuoteView extends TUIReplyQuoteView {
+    protected TextView textView;
+    @Override
+    public int getLayoutResourceId() {
+        return R.layout.chat_reply_quote_text_layout;
+    }
+
+    public TextReplyQuoteView(Context context) {
+        super(context);
+        textView = findViewById(R.id.text_quote_tv);
+    }
+
+    @Override
+    public void setSelf(boolean isSelf) {
+        if (!isSelf) {
+            textView.setTextColor(textView.getResources().getColor(TUIThemeManager.getAttrResId(textView.getContext(), R.attr.chat_other_reply_quote_text_color)));
+        } else {
+            textView.setTextColor(textView.getResources().getColor(TUIThemeManager.getAttrResId(textView.getContext(), R.attr.chat_self_reply_quote_text_color)));
+        }
+    }
+
+    @Override
+    public void onDrawReplyQuote(TUIReplyQuoteBean quoteBean) {
+        if (quoteBean instanceof TextReplyQuoteBean) {
+            String text = ((TextReplyQuoteBean) quoteBean).getText();
+            FaceManager.handlerEmojiText(textView, text, false);
+        }
+
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/VideoReplyQuoteView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/VideoReplyQuoteView.java
new file mode 100644
index 0000000..a2c4e63
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/reply/VideoReplyQuoteView.java
@@ -0,0 +1,61 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.VideoMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+public class VideoReplyQuoteView extends ImageReplyQuoteView {
+
+    public VideoReplyQuoteView(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void onDrawReplyQuote(TUIReplyQuoteBean quoteBean) {
+        VideoMessageBean messageBean = (VideoMessageBean) quoteBean.getMessageBean();
+
+        ViewGroup.LayoutParams layoutParams = getImageParams(imageMsgIv.getLayoutParams(), messageBean.getImgWidth(), messageBean.getImgHeight());
+        imageMsgIv.setLayoutParams(layoutParams);
+        videoPlayIv.setLayoutParams(layoutParams);
+        imageMsgLayout.setVisibility(View.VISIBLE);
+        videoPlayIv.setVisibility(View.VISIBLE);
+        if (!TextUtils.isEmpty(messageBean.getDataPath())) {
+            GlideEngine.loadCornerImageWithoutPlaceHolder(imageMsgIv, messageBean.getDataPath(), null, DEFAULT_RADIUS);
+        } else {
+            GlideEngine.clear(imageMsgIv);
+            synchronized (downloadEles) {
+                if (!downloadEles.contains(messageBean.getSnapshotUUID())) {
+                    downloadEles.add(messageBean.getSnapshotUUID());
+                }
+            }
+
+            final String path = TUIConfig.getImageDownloadDir() + messageBean.getSnapshotUUID();
+            messageBean.downloadSnapshot(path, new VideoMessageBean.VideoDownloadCallback() {
+                @Override
+                public void onProgress(long currentSize, long totalSize) {
+                    TUIChatLog.i("downloadSnapshot progress current:", currentSize + ", total:" + totalSize);
+                }
+
+                @Override
+                public void onError(int code, String desc) {
+                    downloadEles.remove(messageBean.getSnapshotUUID());
+                    TUIChatLog.e("MessageAdapter video getImage", code + ":" + desc);
+                }
+
+                @Override
+                public void onSuccess() {
+                    downloadEles.remove(messageBean.getSnapshotUUID());
+                    messageBean.setDataPath(path);
+                    GlideEngine.loadCornerImageWithoutPlaceHolder(imageMsgIv, messageBean.getDataPath(), null, DEFAULT_RADIUS);
+                }
+            });
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/ArchivesMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/ArchivesMessageHolder.java
new file mode 100644
index 0000000..697877a
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/ArchivesMessageHolder.java
@@ -0,0 +1,64 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder;
+
+import android.os.Bundle;
+import android.text.Html;
+import android.text.Spanned;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ArchivesMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.ArchivesImageAdapter;
+import com.tencent.qcloud.tuikit.tuichat.databinding.MessageAdapterContentArchivesBinding;
+
+/**
+ * 档案
+ * */
+public class ArchivesMessageHolder extends MessageContentHolder{
+    MessageAdapterContentArchivesBinding mBinding;
+    public ArchivesMessageHolder(View itemView) {
+        super(itemView);
+    }
+
+    @Override
+    public int getVariableLayout() {
+        mBinding = MessageAdapterContentArchivesBinding.inflate(LayoutInflater.from(itemView.getContext()), msgContentFrame, true);
+        return 0;
+    }
+    @Override
+    public void layoutViews(TUIMessageBean msg, int position) {
+        super.layoutViews(msg, position);
+        msgArea.setBackgroundResource(R.drawable.chat_bubble_custom_message_bg_serious);
+    }
+    @Override
+    public void layoutVariableViews(TUIMessageBean msg, int position) {
+        if (!(msg instanceof ArchivesMessageBean)) {
+            return;
+        }
+        ArchivesMessageBean archivesMessageBean = (ArchivesMessageBean) msg;
+        mBinding.tvUserName.setText(archivesMessageBean.getName());
+        mBinding.tvGenderAge.setText(itemView.getContext().getString(R.string.chat_message_archives_gender_and_age, archivesMessageBean.getGender(), archivesMessageBean.getAge()));
+        String symptomDescription = itemView.getContext().getString(R.string.chat_message_archives_symptom_description, archivesMessageBean.getSymptomDescription());
+        Spanned symptomDescriptionSpanned;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
+            symptomDescriptionSpanned = Html.fromHtml(symptomDescription, Html.FROM_HTML_MODE_LEGACY);
+        } else {
+            symptomDescriptionSpanned = Html.fromHtml(symptomDescription);
+        }
+        mBinding.tvSymptomDescription.setText(symptomDescriptionSpanned);
+        mBinding.gvPhoto.setColumnCount(2);
+        mBinding.gvPhoto.setAdapter(new ArchivesImageAdapter(itemView.getContext(), archivesMessageBean.getImageList()));
+        mBinding.getRoot().setOnClickListener(v -> {
+            Bundle bundle = new Bundle();
+            bundle.putString("archivesId", archivesMessageBean.getArchivesId());
+            TUICore.startActivity(TUIChatService.getAppContext(), "ArchivesDetailActivity", bundle);
+        });
+    }
+    @Override
+    protected void setMessageAreaPadding() {
+        msgArea.setPadding(0, 0, 0, 0);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/BusinessCardMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/BusinessCardMessageHolder.java
new file mode 100644
index 0000000..508d187
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/BusinessCardMessageHolder.java
@@ -0,0 +1,60 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.BusinessCardMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.databinding.MessageAdapterContentBusinessCardBinding;
+/**
+ * 名片
+ * */
+public class BusinessCardMessageHolder extends MessageContentHolder{
+    MessageAdapterContentBusinessCardBinding mBinding;
+    public BusinessCardMessageHolder(View itemView) {
+        super(itemView);
+    }
+
+    @Override
+    public int getVariableLayout() {
+        mBinding = MessageAdapterContentBusinessCardBinding.inflate(LayoutInflater.from(itemView.getContext()), msgContentFrame, true);
+        return 0;
+    }
+
+
+    @Override
+    public void layoutVariableViews(TUIMessageBean msg, int position) {
+        if (!(msg instanceof BusinessCardMessageBean)) {
+            return;
+        }
+        BusinessCardMessageBean businessCardMessageBean = (BusinessCardMessageBean) msg;
+        String doctorName = businessCardMessageBean.getDoctorName()+(TextUtils.isEmpty(businessCardMessageBean.getDoctorTitle())?"":"（"+businessCardMessageBean.getDoctorTitle()+"）");
+        mBinding.tvDoctorName.setText(doctorName);
+        mBinding.tvOrganization.setText(businessCardMessageBean.getOrganization());
+        //因为这里是专家端，故可用登录用户默认头像
+        GlideEngine.loadUserCircleIcon(mBinding.ivDoctorHead, businessCardMessageBean.getDoctorHeadImg());
+        mBinding.getRoot().setOnClickListener(v -> {
+            Bundle bundle = new Bundle();
+            bundle.putString("doctorId", businessCardMessageBean.getCardId());
+            TUICore.startActivity(TUIChatService.getAppContext(), "DoctorHomepageActivity", bundle);
+        });
+
+    }
+
+    @Override
+    public void layoutViews(TUIMessageBean msg, int position) {
+        super.layoutViews(msg, position);
+        msgArea.setBackgroundResource(R.drawable.chat_bubble_custom_message_bg_serious);
+    }
+
+    @Override
+    protected void setMessageAreaPadding() {
+        msgArea.setPadding(0, 0, 0, 0);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/CallingMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/CallingMessageHolder.java
new file mode 100644
index 0000000..b2fd10c
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/CallingMessageHolder.java
@@ -0,0 +1,67 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder;
+
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CallingMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+public class CallingMessageHolder extends TextMessageHolder{
+
+    private TextView msgBodyText;
+    private ImageView mLeftView, mRightView;
+    private LinearLayout mCallingLayout;
+
+    public CallingMessageHolder(View itemView) {
+        super(itemView);
+        msgBodyText = itemView.findViewById(R.id.msg_body_tv);
+        mLeftView = itemView.findViewById(R.id.left_icon);
+        mRightView = itemView.findViewById(R.id.right_icon);
+        mCallingLayout = itemView.findViewById(R.id.calling_layout);
+    }
+
+    @Override
+    public int getVariableLayout() {
+        return R.layout.message_adapter_content_calling;
+    }
+
+    @Override
+    public void layoutVariableViews(TUIMessageBean msg, int position) {
+        super.layoutVariableViews(msg, position);
+
+        if (!(msg instanceof CallingMessageBean)) {
+            return;
+        }
+        CallingMessageBean callingMessageBean = (CallingMessageBean) msg;
+        if (msg.isSelf()) {
+            mLeftView.setVisibility(View.GONE);
+            mRightView.setVisibility(View.VISIBLE);
+            if (callingMessageBean.getCallType() == CallingMessageBean.ACTION_ID_AUDIO_CALL) {
+                mRightView.setImageResource(R.drawable.ic_audio_call);
+            } else if (callingMessageBean.getCallType() == CallingMessageBean.ACTION_ID_VIDEO_CALL) {
+                mRightView.setImageResource(R.drawable.ic_self_video_call);
+            }
+        } else {
+            mRightView.setVisibility(View.GONE);
+            mLeftView.setVisibility(View.VISIBLE);
+            if (callingMessageBean.getCallType() == CallingMessageBean.ACTION_ID_AUDIO_CALL) {
+                mLeftView.setImageResource(R.drawable.ic_audio_call);
+            } else if (callingMessageBean.getCallType() == CallingMessageBean.ACTION_ID_VIDEO_CALL) {
+                mLeftView.setImageResource(R.drawable.ic_other_video_call);
+            }
+        }
+
+        if (callingMessageBean.getCallType() == CallingMessageBean.ACTION_ID_AUDIO_CALL ||
+                callingMessageBean.getCallType() == CallingMessageBean.ACTION_ID_VIDEO_CALL) {
+            mCallingLayout.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    onItemClickListener.onRecallClick(view, position, msg);
+                }
+            });
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/CustomEvaluationMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/CustomEvaluationMessageHolder.java
new file mode 100644
index 0000000..6800db1
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/CustomEvaluationMessageHolder.java
@@ -0,0 +1,49 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder;
+
+import android.view.LayoutInflater;
+import android.view.View;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CustomEvaluationMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.databinding.MessageAdapterContentEvaluationBinding;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+/**
+ * 评价消息
+ * */
+public class CustomEvaluationMessageHolder extends MessageContentHolder {
+    MessageAdapterContentEvaluationBinding mBinding;
+    public CustomEvaluationMessageHolder(View itemView) {
+        super(itemView);
+    }
+
+    public static final String TAG = CustomEvaluationMessageHolder.class.getSimpleName();
+
+    @Override
+    public int getVariableLayout() {
+        mBinding = MessageAdapterContentEvaluationBinding.inflate(LayoutInflater.from(itemView.getContext()), msgContentFrame, true);
+        return 0;
+    }
+
+    @Override
+    public void layoutVariableViews(TUIMessageBean msg, int position) {
+        float score = 0f;
+        String content = "";
+        if (msg instanceof CustomEvaluationMessageBean) {
+            score = ((CustomEvaluationMessageBean) msg).getScore();
+            content = ((CustomEvaluationMessageBean) msg).getContent();
+        }
+        mBinding.ratingbarScore.setRating(score);
+        TUIChatLog.d(TAG, "score = " + score);
+        mBinding.tvContent.setText(content);
+    }
+    @Override
+    public void layoutViews(TUIMessageBean msg, int position) {
+        super.layoutViews(msg, position);
+        msgArea.setBackgroundResource(R.drawable.chat_bubble_custom_message_bg_serious);
+    }
+    @Override
+    protected void setMessageAreaPadding() {
+        msgArea.setPadding(0, 0, 0, 0);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/CustomLinkMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/CustomLinkMessageHolder.java
new file mode 100644
index 0000000..cc5964b
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/CustomLinkMessageHolder.java
@@ -0,0 +1,65 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.view.View;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CustomLinkMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+
+public class CustomLinkMessageHolder extends MessageContentHolder {
+    private TextView textView;
+    private TextView linkView;
+
+    public CustomLinkMessageHolder(View itemView) {
+        super(itemView);
+        textView = itemView.findViewById(R.id.test_custom_message_tv);
+        linkView = itemView.findViewById(R.id.link_tv);
+    }
+
+    public static final String TAG = CustomLinkMessageHolder.class.getSimpleName();
+
+    @Override
+    public int getVariableLayout() {
+        return R.layout.test_custom_message_layout1;
+    }
+
+    @Override
+    public void layoutVariableViews(TUIMessageBean msg, int position) {
+        String text = "";
+        String link = "";
+        if (msg instanceof CustomLinkMessageBean) {
+            text = ((CustomLinkMessageBean) msg).getText();
+            link = ((CustomLinkMessageBean) msg).getLink();
+        }
+
+        if (!msg.isSelf()) {
+            textView.setTextColor(textView.getResources().getColor(TUIThemeManager.getAttrResId(textView.getContext(), R.attr.chat_other_custom_msg_text_color)));
+            linkView.setTextColor(textView.getResources().getColor(TUIThemeManager.getAttrResId(textView.getContext(), R.attr.chat_other_custom_msg_link_color)));
+        } else {
+            textView.setTextColor(textView.getResources().getColor(TUIThemeManager.getAttrResId(textView.getContext(), R.attr.chat_self_custom_msg_text_color)));
+            linkView.setTextColor(textView.getResources().getColor(TUIThemeManager.getAttrResId(textView.getContext(), R.attr.chat_self_custom_msg_link_color)));
+        }
+
+        textView.setText(text);
+        msgContentFrame.setClickable(true);
+        String finalLink = link;
+        msgContentFrame.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent();
+                intent.setAction("android.intent.action.VIEW");
+                Uri content_url = Uri.parse(finalLink);
+                intent.setData(content_url);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                TUIChatService.getAppContext().startActivity(intent);
+            }
+        });
+
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/CustomOrderMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/CustomOrderMessageHolder.java
new file mode 100644
index 0000000..06dfe00
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/CustomOrderMessageHolder.java
@@ -0,0 +1,89 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.request.RequestListener;
+import com.bumptech.glide.request.target.Target;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CustomOrderMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+public class CustomOrderMessageHolder extends MessageContentHolder{
+    private ImageView imageView;
+    private TextView titleView;
+    private TextView contentView;
+    private TextView priceView;
+
+    public CustomOrderMessageHolder(View itemView) {
+        super(itemView);
+        imageView = itemView.findViewById(R.id.content_image_iv);
+        titleView = itemView.findViewById(R.id.order_title);
+        contentView = itemView.findViewById(R.id.order_description);
+        priceView = itemView.findViewById(R.id.order_price);
+    }
+
+    public static final String TAG = CustomOrderMessageHolder.class.getSimpleName();
+
+    @Override
+    public int getVariableLayout() {
+        return R.layout.custom_order_message_layout;
+    }
+
+    @Override
+    public void layoutVariableViews(TUIMessageBean msg, int position) {
+        String title = "";
+        String content = "";
+        String price = "";
+        String link = "";
+        String imageUrl = "";
+        if (msg instanceof CustomOrderMessageBean) {
+            title = ((CustomOrderMessageBean) msg).getTitle();
+            content = ((CustomOrderMessageBean) msg).getDescription();
+            price = ((CustomOrderMessageBean) msg).getPrice();
+            link = ((CustomOrderMessageBean) msg).getLink();
+            imageUrl = ((CustomOrderMessageBean) msg).getImageUrl();
+        }
+
+        GlideEngine.loadCornerImageWithoutPlaceHolder(imageView, imageUrl, new RequestListener() {
+            @Override
+            public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) {
+                TUIChatLog.e(TAG,"onLoadFailed e=" + e);
+                return false;
+            }
+
+            @Override
+            public boolean onResourceReady(Object resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) {
+                return false;
+            }
+        }, ScreenUtil.dip2px(4));
+
+        titleView.setText(title);
+        contentView.setText(content);
+        priceView.setText(price);
+        msgContentFrame.setClickable(true);
+        String finalLink = link;
+        msgContentFrame.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent();
+                intent.setAction("android.intent.action.VIEW");
+                Uri content_url = Uri.parse(finalLink);
+                intent.setData(content_url);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                TUIChatService.getAppContext().startActivity(intent);
+            }
+        });
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/FaceMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/FaceMessageHolder.java
new file mode 100644
index 0000000..44466c1
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/FaceMessageHolder.java
@@ -0,0 +1,77 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder;
+
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.FaceMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+
+public class FaceMessageHolder extends MessageContentHolder {
+    private static final int DEFAULT_FACE_MAX_SIZE = 80; // dp
+
+    private final ImageView contentImage;
+    private final ImageView videoPlayBtn;
+    private final TextView videoDurationText;
+
+    public FaceMessageHolder(View itemView) {
+        super(itemView);
+        contentImage = itemView.findViewById(R.id.content_image_iv);
+        videoPlayBtn = itemView.findViewById(R.id.video_play_btn);
+        videoDurationText = itemView.findViewById(R.id.video_duration_tv);
+    }
+
+    @Override
+    public int getVariableLayout() {
+        return R.layout.message_adapter_content_image;
+    }
+
+    @Override
+    public void layoutVariableViews(TUIMessageBean msg, int position) {
+        performCustomFace((FaceMessageBean) msg);
+        if (msg.getMessageReactBean() == null || msg.getMessageReactBean().getReactSize() <= 0) {
+            msgArea.setBackground(null);
+            msgArea.setPadding(0, 0, 0, 0);
+        }
+    }
+
+    private void performCustomFace(final FaceMessageBean msg) {
+        int defaultFaceSize = ScreenUtil.dip2px(DEFAULT_FACE_MAX_SIZE);
+        videoPlayBtn.setVisibility(View.GONE);
+        videoDurationText.setVisibility(View.GONE);
+        RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        params.addRule(RelativeLayout.CENTER_IN_PARENT);
+        params.width = defaultFaceSize;
+        params.height = defaultFaceSize;
+        contentImage.setLayoutParams(params);
+        String faceKey = null;
+        if (msg.getData() != null) {
+            faceKey = new String(msg.getData());
+        }
+        FaceManager.loadFace(msg.getIndex(), faceKey, contentImage);
+    }
+
+    @Override
+    public void setHighLightBackground(int color) {
+        Drawable drawable = contentImage.getDrawable();
+        if (drawable != null) {
+            drawable.setColorFilter(color, PorterDuff.Mode.SRC_OVER);
+        }
+    }
+
+    @Override
+    public void clearHighLightBackground() {
+        Drawable drawable = contentImage.getDrawable();
+        if (drawable != null) {
+            drawable.setColorFilter(null);
+        }
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/FileMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/FileMessageHolder.java
new file mode 100644
index 0000000..da6e313
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/FileMessageHolder.java
@@ -0,0 +1,390 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PixelFormat;
+import android.graphics.PorterDuff;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuicore.util.FileUtil;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.FileMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.component.progress.ProgressPresenter;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.NetworkConnectionListener;
+
+public class FileMessageHolder extends MessageContentHolder {
+
+    private TextView fileNameText;
+    private TextView fileSizeText;
+    private TextView fileStatusText;
+
+    private ProgressPresenter.ProgressListener progressListener;
+    private NetworkConnectionListener networkConnectionListener;
+
+    private ProgressDrawable progressDrawable;
+    private Drawable normalBackground;
+    private String msgId;
+
+    public FileMessageHolder(View itemView) {
+        super(itemView);
+        fileNameText = itemView.findViewById(R.id.file_name_tv);
+        fileSizeText = itemView.findViewById(R.id.file_size_tv);
+        fileStatusText = itemView.findViewById(R.id.file_status_tv);
+    }
+
+    @Override
+    public int getVariableLayout() {
+        return R.layout.message_adapter_content_file;
+    }
+
+    @Override
+    public void layoutVariableViews(final TUIMessageBean msg, final int position) {
+        msgArea.setPadding(0, 0, 0, 0);
+        msgId = msg.getId();
+        reactView.setThemeColorId(TUIThemeManager.getAttrResId(reactView.getContext(), R.attr.chat_react_other_text_color));
+        if (isForwardMode || isReplyDetailMode) {
+            msgArea.setBackgroundResource(R.drawable.chat_bubble_other_cavity_bg);
+            statusImage.setVisibility(View.GONE);
+        } else {
+            if (msg.isSelf()) {
+                if (properties.getRightBubble() != null && properties.getRightBubble().getConstantState() != null) {
+                    msgArea.setBackground(properties.getRightBubble().getConstantState().newDrawable());
+                } else {
+                    msgArea.setBackgroundResource(R.drawable.chat_bubble_self_cavity_bg);
+                }
+            } else {
+                if (properties.getLeftBubble() != null && properties.getLeftBubble().getConstantState() != null) {
+                    msgArea.setBackground(properties.getLeftBubble().getConstantState().newDrawable());
+                } else {
+                    msgArea.setBackgroundResource(R.drawable.chat_bubble_other_cavity_bg);
+                }
+            }
+        }
+        normalBackground = msgArea.getBackground();
+
+        progressListener = new ProgressPresenter.ProgressListener() {
+            @Override
+            public void onProgress(int progress) {
+                updateProgress(progress, msg);
+            }
+        };
+
+        sendingProgress.setVisibility(View.GONE);
+        FileMessageBean message = (FileMessageBean) msg;
+        final String path = message.getDataPath();
+        fileNameText.setText(message.getFileName());
+        String size = FileUtil.formatFileSize(message.getFileSize());
+        final String fileName = message.getFileName();
+        fileSizeText.setText(size);
+        if (!isMultiSelectMode) {
+            msgContentFrame.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (message.getDownloadStatus() == TUIMessageBean.MSG_STATUS_DOWNLOADED) {
+                        FileUtil.openFile(path, fileName);
+                    }
+                }
+            });
+        } else {
+            msgContentFrame.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (onItemClickListener != null) {
+                        onItemClickListener.onMessageClick(v, position, msg);
+                    }
+                }
+            });
+        }
+
+        if (message.getStatus() == TUIMessageBean.MSG_STATUS_SEND_SUCCESS
+                && message.getDownloadStatus() == FileMessageBean.MSG_STATUS_DOWNLOADED) {
+            fileStatusText.setText(R.string.sended);
+        } else if (message.getStatus() == TUIMessageBean.MSG_STATUS_SENDING) {
+            fileStatusText.setText(R.string.sending);
+        } else if (message.getStatus() == TUIMessageBean.MSG_STATUS_SEND_FAIL) {
+            fileStatusText.setText(R.string.send_failed);
+        } else {
+            if (message.getDownloadStatus() == TUIMessageBean.MSG_STATUS_DOWNLOADING) {
+                fileStatusText.setText(R.string.downloading);
+            } else if (message.getDownloadStatus() == TUIMessageBean.MSG_STATUS_DOWNLOADED) {
+                if (!message.isSelf()) {
+                    fileStatusText.setText(R.string.downloaded);
+                } else {
+                    fileStatusText.setText(R.string.sended);
+                }
+            } else if (message.getDownloadStatus() == TUIMessageBean.MSG_STATUS_UN_DOWNLOAD) {
+                fileStatusText.setText(R.string.un_download);
+            }
+        }
+
+        if (message.getDownloadStatus() == TUIMessageBean.MSG_STATUS_UN_DOWNLOAD) {
+            if (isMultiSelectMode) {
+                return;
+            }
+            msgContentFrame.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    downloadFile(message, path, fileName, true);
+                }
+            });
+        }
+        networkConnectionListener = new NetworkConnectionListener() {
+            @Override
+            public void onConnected() {
+                if (message.getDownloadStatus() == FileMessageBean.MSG_STATUS_DOWNLOADING) {
+                    downloadFile(message, path, fileName, false);
+                }
+            }
+        };
+        TUIChatService.getInstance().registerNetworkListener(networkConnectionListener);
+        ProgressPresenter.getInstance().registerProgressListener(msg.getId(), progressListener);
+    }
+
+    private void downloadFile(FileMessageBean message, String path, String fileName, boolean isUserClick) {
+        if (message.getDownloadStatus() == TUIMessageBean.MSG_STATUS_DOWNLOADED) {
+            return;
+        }
+
+        if (message.getDownloadStatus() == TUIMessageBean.MSG_STATUS_DOWNLOADING && isUserClick) {
+            return;
+        }
+
+        message.setDownloadStatus(TUIMessageBean.MSG_STATUS_DOWNLOADING);
+        fileStatusText.setText(R.string.downloading);
+        message.downloadFile(path, new FileMessageBean.FileDownloadCallback() {
+            @Override
+            public void onProgress(long currentSize, long totalSize) {
+                int progress = (int) (currentSize * 100 / totalSize);
+                ProgressPresenter.getInstance().updateProgress(message.getId(), progress);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                ToastUtil.toastLongMessage("getToFile fail:" + code + "=" + desc);
+                fileStatusText.setText(R.string.un_download);
+            }
+
+            @Override
+            public void onSuccess() {
+                message.setDataPath(path);
+                if (!message.isSelf()) {
+                    fileStatusText.setText(R.string.downloaded);
+                } else {
+                    fileStatusText.setText(R.string.sended);
+                }
+                message.setDownloadStatus(TUIMessageBean.MSG_STATUS_DOWNLOADED);
+                msgContentFrame.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        if (message.getDownloadStatus() == TUIMessageBean.MSG_STATUS_DOWNLOADED) {
+                            FileUtil.openFile(path, fileName);
+                        }
+                    }
+                });
+            }
+        });
+    }
+
+    private void updateProgress(int progress, TUIMessageBean msg) {
+        if (!TextUtils.equals(msg.getId(), msgId)) {
+            return;
+        }
+
+        if (!msg.isSelf()) {
+            fileStatusText.setText(R.string.downloading);
+        } else {
+            fileStatusText.setText(R.string.sending);
+        }
+
+        msg.setDownloadStatus(TUIMessageBean.MSG_STATUS_DOWNLOADING);
+        if (progress == 0 || progress == 100) {
+            msgArea.setBackground(normalBackground);
+            if (progressDrawable != null) {
+                progressDrawable.setProgress(0);
+            }
+
+            if (progress == 100) {
+                if (!msg.isSelf()) {
+                    fileStatusText.setText(R.string.downloaded);
+                } else {
+                    fileStatusText.setText(R.string.sended);
+                }
+                msg.setDownloadStatus(TUIMessageBean.MSG_STATUS_DOWNLOADED);
+            }
+            return;
+        }
+
+
+        Drawable drawable = msgArea.getBackground();
+        if (drawable != null) {
+            if (progressDrawable == null) {
+                progressDrawable = new ProgressDrawable();
+                progressDrawable.setProgress(progress);
+                Context context = itemView.getContext();
+                progressDrawable.setPaintColor(context.getResources().getColor(TUIThemeManager.getAttrResId(context, com.tencent.qcloud.tuicore.R.attr.core_bubble_bg_color)));
+                progressDrawable.setBorderColor(context.getResources().getColor(R.color.chat_message_bubble_bg_stoke_color));
+                progressDrawable.setSelf(msg.isSelf());
+                progressDrawable.setBackgroundDrawable(drawable);
+                msgArea.setBackground(progressDrawable);
+            } else {
+                progressDrawable.setProgress(progress);
+                msgArea.setBackground(progressDrawable);
+                msgArea.getBackground().invalidateSelf();
+            }
+        }
+    }
+
+    @Override
+    public void setHighLightBackground(int color) {
+        if (normalBackground != null) {
+            normalBackground.setColorFilter(color, PorterDuff.Mode.SRC_IN);
+        }
+        if (progressDrawable != null) {
+            progressDrawable.setHighLightColor(color);
+            progressDrawable.invalidateSelf();
+        }
+    }
+    
+    @Override
+    public void clearHighLightBackground() {
+        if (normalBackground != null) {
+            normalBackground.setColorFilter(null);
+        }
+        if (progressDrawable != null) {
+            progressDrawable.clearHighLightColor();
+            progressDrawable.invalidateSelf();
+        }
+    }
+
+    @Override
+    public void onRecycled() {
+        super.onRecycled();
+        progressListener = null;
+        ProgressPresenter.getInstance().unregisterProgressListener(msgId, progressListener);
+    }
+
+    static class ProgressDrawable extends Drawable {
+
+        private Drawable backgroundDrawable;
+        private int progress;
+        private boolean isSelf;
+        private final Paint paint;
+        private final Paint borderPaint;
+        private final Paint highLightPaint;
+        private final Path rectPath = new Path();
+        private final Path solidPath = new Path();
+        private final Path highLightPath = new Path();
+        private final float borderWidth = ScreenUtil.dip2px(0.96f);
+
+        ProgressDrawable() {
+            paint = new Paint();
+            borderPaint = new Paint();
+            paint.setStyle(Paint.Style.FILL);
+            borderPaint.setStyle(Paint.Style.STROKE);
+            borderPaint.setStrokeWidth(borderWidth);
+            paint.setAntiAlias(true);
+            borderPaint.setAntiAlias(true);
+            highLightPaint = new Paint();
+            highLightPaint.setAntiAlias(true);
+            highLightPaint.setStyle(Paint.Style.FILL);
+            highLightPaint.setColor(Color.TRANSPARENT);
+        }
+
+        public void setPaintColor(int color) {
+            paint.setColor(color);
+        }
+
+        public void setBorderColor(int color) {
+            borderPaint.setColor(color);
+        }
+
+        public void setProgress(int progress) {
+            this.progress = progress;
+        }
+
+        public void setHighLightColor(int color) {
+            highLightPaint.setColor(color);
+        }
+
+        public void clearHighLightColor() {
+            highLightPaint.setColor(Color.TRANSPARENT);
+        }
+
+        public void setBackgroundDrawable(Drawable backgroundDrawable) {
+            this.backgroundDrawable = backgroundDrawable;
+        }
+
+        public void setSelf(boolean self) {
+            isSelf = self;
+        }
+
+        @Override
+        public void draw(@NonNull Canvas canvas) {
+            if (progress == 0) {
+                return;
+            }
+            Rect rect = backgroundDrawable.getBounds();
+            int width = rect.right;
+            int height = rect.bottom;
+
+            int solidWidth = width * progress / 100;
+
+            float[] radius;
+            float normalRadius = ScreenUtil.dip2px(10.96f);
+            float specialRadius = ScreenUtil.dip2px(2.19f);
+            if (isSelf) {
+                radius = new float[]{normalRadius, normalRadius,
+                        specialRadius, specialRadius,
+                        normalRadius, normalRadius,
+                        normalRadius, normalRadius};
+            } else {
+                radius = new float[]{specialRadius, specialRadius,
+                        normalRadius, normalRadius,
+                        normalRadius, normalRadius,
+                        normalRadius, normalRadius};
+            }
+            rectPath.reset();
+            solidPath.reset();
+            highLightPath.reset();
+            rectPath.addRoundRect(new RectF(borderWidth / 2, borderWidth / 2, width - borderWidth / 2, height - borderWidth / 2), radius, Path.Direction.CW);
+            highLightPath.set(rectPath);
+            canvas.drawPath(rectPath, borderPaint);
+            solidPath.addRect(new RectF(borderWidth / 2, borderWidth / 2, solidWidth - borderWidth / 2, height - borderWidth / 2), Path.Direction.CW);
+            rectPath.op(solidPath, Path.Op.INTERSECT);
+            canvas.drawPath(rectPath, paint);
+            canvas.drawPath(highLightPath, highLightPaint);
+        }
+
+        @Override
+        public void setAlpha(int alpha) {
+
+        }
+
+        @Override
+        public void setColorFilter(@Nullable ColorFilter colorFilter) {
+
+        }
+
+        @Override
+        public int getOpacity() {
+            return PixelFormat.UNKNOWN;
+        }
+    }
+}
\ No newline at end of file
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/ImageMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/ImageMessageHolder.java
new file mode 100644
index 0000000..dbf071d
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/ImageMessageHolder.java
@@ -0,0 +1,201 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder;
+
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+
+import android.content.Intent;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.request.RequestListener;
+import com.bumptech.glide.request.target.Target;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.util.ImageUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ImageMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.component.imagevideoscan.ImageVideoScanActivity;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ImageMessageHolder extends MessageContentHolder {
+
+    private static final int DEFAULT_MAX_SIZE = 540;
+    private static final int DEFAULT_RADIUS = 10;
+    private final List<String> downloadEles = new ArrayList<>();
+    private ImageView contentImage;
+    private ImageView videoPlayBtn;
+    private TextView videoDurationText;
+    private String mImagePath = null;
+
+    public ImageMessageHolder(View itemView) {
+        super(itemView);
+        contentImage = itemView.findViewById(R.id.content_image_iv);
+        videoPlayBtn = itemView.findViewById(R.id.video_play_btn);
+        videoDurationText = itemView.findViewById(R.id.video_duration_tv);
+    }
+
+    @Override
+    public int getVariableLayout() {
+        return R.layout.message_adapter_content_image;
+    }
+
+    @Override
+    public void layoutVariableViews(TUIMessageBean msg, int position) {
+        performImage((ImageMessageBean) msg, position);
+    }
+
+    private ViewGroup.LayoutParams getImageParams(ViewGroup.LayoutParams params, final ImageMessageBean msg) {
+        if (msg.getImgWidth() == 0 || msg.getImgHeight() == 0) {
+            params.width = DEFAULT_MAX_SIZE;
+            params.height = DEFAULT_MAX_SIZE;
+            return params;
+        }
+        if (msg.getImgWidth() > msg.getImgHeight()) {
+            params.width = DEFAULT_MAX_SIZE;
+            params.height = DEFAULT_MAX_SIZE * msg.getImgHeight() / msg.getImgWidth();
+        } else {
+            params.width = DEFAULT_MAX_SIZE * msg.getImgWidth() / msg.getImgHeight();
+            params.height = DEFAULT_MAX_SIZE;
+        }
+        return params;
+    }
+
+    private void performImage(final ImageMessageBean msg, final int position) {
+        contentImage.setLayoutParams(getImageParams(contentImage.getLayoutParams(), msg));
+        videoPlayBtn.setVisibility(View.GONE);
+        videoDurationText.setVisibility(View.GONE);
+
+        final List<ImageMessageBean.ImageBean> imgs = msg.getImageBeanList();
+        String imagePath = msg.getDataPath();
+        String originImagePath = TUIChatUtils.getOriginImagePath(msg);
+        if (!TextUtils.isEmpty(originImagePath)) {
+            imagePath = originImagePath;
+        }
+        if (!TextUtils.isEmpty(imagePath)) {
+            GlideEngine.loadCornerImageWithoutPlaceHolder(contentImage, imagePath, null, DEFAULT_RADIUS);
+        } else {
+            GlideEngine.clear(contentImage);
+            for (int i = 0; i < imgs.size(); i++) {
+                final ImageMessageBean.ImageBean img = imgs.get(i);
+                if (img.getType() == ImageMessageBean.IMAGE_TYPE_THUMB) {
+                    synchronized (downloadEles) {
+                        if (downloadEles.contains(img.getUUID())) {
+                            break;
+                        }
+                        downloadEles.add(img.getUUID());
+                    }
+                    final String path = ImageUtil.generateImagePath(img.getUUID(), ImageMessageBean.IMAGE_TYPE_THUMB);
+                    if (!path.equals(mImagePath)) {
+                        GlideEngine.clear(contentImage);
+                    }
+                    img.downloadImage(path, new ImageMessageBean.ImageBean.ImageDownloadCallback() {
+                        @Override
+                        public void onProgress(long currentSize, long totalSize) {
+                            TUIChatLog.i("downloadImage progress current:",
+                                    currentSize + ", total:" + totalSize);
+                        }
+
+                        @Override
+                        public void onError(int code, String desc) {
+                            downloadEles.remove(img.getUUID());
+                            TUIChatLog.e("MessageAdapter img getImage", code + ":" + desc);
+                        }
+
+                        @Override
+                        public void onSuccess() {
+                            downloadEles.remove(img.getUUID());
+                            msg.setDataPath(path);
+                            GlideEngine.loadCornerImageWithoutPlaceHolder(contentImage, msg.getDataPath(), new RequestListener() {
+                                @Override
+                                public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) {
+                                    mImagePath = null;
+                                    return false;
+                                }
+
+                                @Override
+                                public boolean onResourceReady(Object resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) {
+                                    mImagePath = path;
+                                    return false;
+                                }
+                            }, DEFAULT_RADIUS);
+                        }
+                    });
+                    break;
+                }
+            }
+        }
+        if (isMultiSelectMode) {
+            contentImage.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (onItemClickListener != null) {
+                        onItemClickListener.onMessageClick(v, position, msg);
+                    }
+                }
+            });
+            return;
+        }
+        contentImage.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(TUIChatService.getAppContext(), ImageVideoScanActivity.class);
+                intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
+                if (isForwardMode) {
+                    if (getDataSource() != null && !getDataSource().isEmpty()) {
+                        intent.putExtra(TUIChatConstants.OPEN_MESSAGES_SCAN_FORWARD, (Serializable) getDataSource());
+                    }
+                }
+
+                intent.putExtra(TUIChatConstants.OPEN_MESSAGE_SCAN, msg);
+                intent.putExtra(TUIChatConstants.FORWARD_MODE, isForwardMode);
+                TUIChatService.getAppContext().startActivity(intent);
+            }
+        });
+        contentImage.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View view) {
+                if (onItemClickListener != null) {
+                    onItemClickListener.onMessageLongClick(view, position, msg);
+                }
+                return true;
+            }
+        });
+
+        if (msg.getMessageReactBean() == null || msg.getMessageReactBean().getReactSize() <= 0) {
+            msgArea.setBackground(null);
+            msgArea.setPadding(0, 0, 0, 0);
+        }
+    }
+
+    @Override
+    public void setHighLightBackground(int color) {
+        Drawable drawable = contentImage.getDrawable();
+        if (drawable != null) {
+            drawable.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
+        }
+    }
+
+
+    @Override
+    public void clearHighLightBackground() {
+        Drawable drawable = contentImage.getDrawable();
+        if (drawable != null) {
+            drawable.setColorFilter(null);
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/LocationMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/LocationMessageHolder.java
new file mode 100644
index 0000000..b051909
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/LocationMessageHolder.java
@@ -0,0 +1,67 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.LocationMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.databinding.MessageAdapterContentLocationBinding;
+import com.tencent.qcloud.tuikit.tuichat.util.StringUtils;
+/**
+ * 位置
+ * */
+public class LocationMessageHolder extends MessageContentHolder {
+    MessageAdapterContentLocationBinding mBinding;
+    String mapKey = "9e4aac9a04b8296e9039adce3b472f28";
+    String priKey = "4985aa1abb49ce2daa20d032a374eb58";
+    public LocationMessageHolder(View itemView) {
+        super(itemView);
+    }
+
+    @Override
+    public int getVariableLayout() {
+        mBinding = MessageAdapterContentLocationBinding.inflate(LayoutInflater.from(itemView.getContext()), msgContentFrame, true);
+        return R.layout.message_adapter_content_location;
+    }
+
+    @Override
+    public void layoutVariableViews(TUIMessageBean msg, int position) {
+        if (!(msg instanceof LocationMessageBean)) {
+            return;
+        }
+        LocationMessageBean locationMessageBean = (LocationMessageBean) msg;
+        mBinding.tvDesc.setText(locationMessageBean.getDesc());
+        String params = "key="+mapKey+"&location="
+                +locationMessageBean.getLongitude()+","+locationMessageBean.getLatitude()
+                +"&markers=-1,https://a.amap.com/jsapi_demos/static/demo-center/icons/poi-marker-default.png,0:"
+                +locationMessageBean.getLongitude()+","+locationMessageBean.getLatitude()
+                +"&size=700*500&zoom=15";
+        String sig = StringUtils.md5(params+priKey);
+        String mapUrl = "https://restapi.amap.com/v3/staticmap?"
+                +params
+                +"&sig="+sig;
+        GlideEngine.loadImage(mBinding.ivMap, mapUrl);
+        mBinding.getRoot().setOnClickListener(v -> {
+            Bundle bundle = new Bundle();
+            bundle.putDouble("latitude", locationMessageBean.getLatitude());
+            bundle.putDouble("longitude", locationMessageBean.getLongitude());
+            TUICore.startActivity(TUIChatService.getAppContext(), "ViewLocationActivity", bundle);
+        });
+    }
+
+    @Override
+    public void layoutViews(TUIMessageBean msg, int position) {
+        super.layoutViews(msg, position);
+        msgArea.setBackgroundResource(R.drawable.chat_bubble_custom_message_bg_serious);
+    }
+
+    @Override
+    protected void setMessageAreaPadding() {
+        msgArea.setPadding(0, 0, 0, 0);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/MedicalExaminationReportHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/MedicalExaminationReportHolder.java
new file mode 100644
index 0000000..7928ed0
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/MedicalExaminationReportHolder.java
@@ -0,0 +1,69 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.MedicalExaminationReportMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.databinding.MessageAdapterContentMedicalExaminationBinding;
+import com.tencent.qcloud.tuikit.tuichat.util.StringUtils;
+
+/**
+ * 体检报告
+ * */
+public class MedicalExaminationReportHolder extends MessageContentHolder {
+    MessageAdapterContentMedicalExaminationBinding mBinding;
+    public MedicalExaminationReportHolder(View itemView) {
+        super(itemView);
+    }
+
+    @Override
+    public int getVariableLayout() {
+        mBinding = MessageAdapterContentMedicalExaminationBinding.inflate(LayoutInflater.from(itemView.getContext()), msgContentFrame, true);
+        return 0;
+    }
+    @Override
+    protected void setMessageAreaPadding() {
+        msgArea.setPadding(0, 0, 0, 0);
+    }
+    @Override
+    public void layoutViews(TUIMessageBean msg, int position) {
+        super.layoutViews(msg, position);
+        msgArea.setBackgroundResource(R.drawable.chat_bubble_custom_message_bg_serious);
+    }
+    @Override
+    public void layoutVariableViews(TUIMessageBean msg, int position) {
+        if (!(msg instanceof MedicalExaminationReportMessageBean)) {
+            return;
+        }
+        MedicalExaminationReportMessageBean medicalExaminationReportMessageBean = (MedicalExaminationReportMessageBean) msg;
+        if(TextUtils.isEmpty(medicalExaminationReportMessageBean.getGender())){
+            mBinding.tvUserInfo.setText(medicalExaminationReportMessageBean.getName());
+        }else {
+            String age=medicalExaminationReportMessageBean.getAge();
+            if (!age.contains("岁")) {
+                age=age+"岁";
+            }
+            mBinding.tvUserInfo.setText(itemView.getContext().getString(
+                    R.string.chat_message_medical_examination_report_user_info,
+                    medicalExaminationReportMessageBean.getName(),
+                    StringUtils.emptyIfNull(medicalExaminationReportMessageBean.getGender()),
+                    age));
+        }
+
+        mBinding.tvHospital.setText(itemView.getContext().getString(
+                R.string.chat_message_medical_examination_report_hospital,
+                medicalExaminationReportMessageBean.getHospital(),
+                StringUtils.emptyIfNull(medicalExaminationReportMessageBean.getCreateTime())));
+        mBinding.getRoot().setOnClickListener(v -> {
+            Bundle bundle = new Bundle();
+            bundle.putString("id", medicalExaminationReportMessageBean.getRecordId());
+            TUICore.startActivity(TUIChatService.getAppContext(), "CheckUpDetailActivity", bundle);
+        });
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/MergeMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/MergeMessageHolder.java
new file mode 100644
index 0000000..dd0db68
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/MergeMessageHolder.java
@@ -0,0 +1,109 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.MergeMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+
+import java.util.List;
+
+public class MergeMessageHolder extends MessageContentHolder{
+    private LinearLayout mForwardMsgLayout;
+    private TextView msgForwardTitle;
+    private TextView msgForwardContent;
+
+    public MergeMessageHolder(View itemView) {
+        super(itemView);
+        mForwardMsgLayout = itemView.findViewById(R.id.forward_msg_layout);
+        msgForwardTitle = itemView.findViewById(R.id.msg_forward_title);
+        msgForwardContent = itemView.findViewById(R.id.msg_forward_content);
+        mForwardMsgLayout.setClickable(true);
+    }
+
+    @Override
+    public int getVariableLayout() {
+        return R.layout.forward_msg_holder;
+    }
+
+    @Override
+    public void layoutVariableViews(final TUIMessageBean msg, final int position) {
+        if (msg == null){
+            return;
+        }
+        reactView.setThemeColorId(TUIThemeManager.getAttrResId(reactView.getContext(), R.attr.chat_react_other_text_color));
+        if (isForwardMode || isReplyDetailMode) {
+            msgArea.setBackgroundResource(R.drawable.chat_bubble_other_cavity_bg);
+            statusImage.setVisibility(View.GONE);
+        } else {
+            if (msg.isSelf()) {
+                if (properties.getRightBubble() != null && properties.getRightBubble().getConstantState() != null) {
+                    msgArea.setBackground(properties.getRightBubble().getConstantState().newDrawable());
+                } else {
+                    msgArea.setBackgroundResource(R.drawable.chat_bubble_self_cavity_bg);
+                }
+            } else {
+                if (properties.getLeftBubble() != null && properties.getLeftBubble().getConstantState() != null) {
+                    msgArea.setBackground(properties.getLeftBubble().getConstantState().newDrawable());
+                } else {
+                    msgArea.setBackgroundResource(R.drawable.chat_bubble_other_cavity_bg);
+                }
+            }
+        }
+
+        MergeMessageBean messageBean = (MergeMessageBean) msg;
+        String title = messageBean.getTitle();
+        List<String> abstractList= messageBean.getAbstractList();
+        msgForwardTitle.setText(title);
+        String content = "";
+        for (int i = 0; i < abstractList.size(); i++) {
+            if (i > 0) {
+                content += "\n";
+            }
+            content += abstractList.get(i);
+        }
+        content = FaceManager.emojiJudge(content);
+        msgForwardContent.setText(content);
+
+        if (isMultiSelectMode) {
+            mForwardMsgLayout.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (onItemClickListener != null) {
+                        onItemClickListener.onMessageClick(v, position, messageBean);
+                    }
+                }
+            });
+            return;
+        }
+        mForwardMsgLayout.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                if (onItemClickListener != null) {
+                    onItemClickListener.onMessageLongClick(v, position, msg);
+                }
+                return true;
+            }
+        });
+
+        mForwardMsgLayout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Bundle bundle = new Bundle();
+                bundle.putSerializable(TUIChatConstants.FORWARD_MERGE_MESSAGE_KEY, msg);
+                bundle.putSerializable(TUIChatConstants.CHAT_INFO, presenter.getChatInfo());
+                TUICore.startActivity("TUIForwardChatActivity", bundle);
+            }
+        });
+        
+        setMessageAreaPadding();
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/MessageBaseHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/MessageBaseHolder.java
new file mode 100644
index 0000000..0fde0ce
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/MessageBaseHolder.java
@@ -0,0 +1,177 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder;
+
+import android.animation.Animator;
+import android.animation.ArgbEvaluator;
+import android.animation.ValueAnimator;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.util.DateTimeUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.MessageProperties;
+import com.tencent.qcloud.tuikit.tuichat.classicui.interfaces.ICommonMessageAdapter;
+import com.tencent.qcloud.tuikit.tuichat.classicui.interfaces.OnItemClickListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply.ChatFlowReactView;
+
+import java.util.Date;
+
+public abstract class MessageBaseHolder extends RecyclerView.ViewHolder {
+    public static final int MSG_TYPE_HEADER_VIEW = -99;
+
+    public ICommonMessageAdapter mAdapter;
+    public MessageProperties properties = MessageProperties.getInstance();
+    protected OnItemClickListener onItemClickListener;
+
+    public TextView chatTimeText;
+    public FrameLayout msgContentFrame;
+    public LinearLayout msgReplyDetailLayout;
+    public LinearLayout msgArea;
+    public LinearLayout msgAreaAndReply;
+    public ChatFlowReactView reactView;
+    public CheckBox mMutiSelectCheckBox;
+    public RelativeLayout rightGroupLayout;
+    public RelativeLayout mContentLayout;
+
+    private ValueAnimator highLightAnimator;
+    public MessageBaseHolder(View itemView) {
+        super(itemView);
+        chatTimeText = itemView.findViewById(R.id.message_top_time_tv);
+        msgContentFrame = itemView.findViewById(R.id.msg_content_fl);
+        msgReplyDetailLayout = itemView.findViewById(R.id.msg_reply_detail_fl);
+        reactView = itemView.findViewById(R.id.reacts_view);
+        msgArea = itemView.findViewById(R.id.msg_area);
+        msgAreaAndReply = itemView.findViewById(R.id.msg_area_and_reply);
+        mMutiSelectCheckBox = itemView.findViewById(R.id.select_checkbox);
+        rightGroupLayout = itemView.findViewById(R.id.right_group_layout);
+        mContentLayout = itemView.findViewById(R.id.message_content_layout);
+        initVariableLayout();
+    }
+
+    public abstract int getVariableLayout();
+
+    private void setVariableLayout(int resId) {
+        if (msgContentFrame.getChildCount() == 0) {
+            View.inflate(itemView.getContext(), resId, msgContentFrame);
+        }
+    }
+
+    private void initVariableLayout() {
+        if (getVariableLayout() != 0) {
+            setVariableLayout(getVariableLayout());
+        }
+    }
+
+    public void setAdapter(ICommonMessageAdapter adapter) {
+        mAdapter = adapter;
+    }
+
+    public void setOnItemClickListener(OnItemClickListener listener) {
+        this.onItemClickListener = listener;
+    }
+
+    public OnItemClickListener getOnItemClickListener() {
+        return this.onItemClickListener;
+    }
+
+    public void layoutViews(final TUIMessageBean msg, final int position) {
+        if (properties.getChatTimeBubble() != null) {
+            chatTimeText.setBackground(properties.getChatTimeBubble());
+        }
+        if (properties.getChatTimeFontColor() != 0) {
+            chatTimeText.setTextColor(properties.getChatTimeFontColor());
+        }
+        if (properties.getChatTimeFontSize() != 0) {
+            chatTimeText.setTextSize(properties.getChatTimeFontSize());
+        }
+
+        if (position > 1) {
+            TUIMessageBean last = mAdapter.getItem(position - 1);
+            if (last != null) {
+                if (msg.getMessageTime() - last.getMessageTime() >= 5 * 60) {
+                    chatTimeText.setVisibility(View.VISIBLE);
+                    chatTimeText.setText(DateTimeUtil.getTimeFormatText(new Date(msg.getMessageTime() * 1000)));
+                } else {
+                    chatTimeText.setVisibility(View.GONE);
+                }
+            }
+        } else {
+            chatTimeText.setVisibility(View.VISIBLE);
+            chatTimeText.setText(DateTimeUtil.getTimeFormatText(new Date(msg.getMessageTime() * 1000)));
+        }
+    }
+
+    public void stopHighLight() {
+        if (highLightAnimator != null) {
+            highLightAnimator.cancel();
+        }
+        clearHighLightBackground();
+    }
+
+    public void startHighLight() {
+        int highLightColorDark = itemView.getResources().getColor(R.color.chat_message_bubble_high_light_dark_color);
+        int highLightColorLight = itemView.getResources().getColor(R.color.chat_message_bubble_high_light_light_color);
+
+        if (highLightAnimator == null) {
+            ArgbEvaluator argbEvaluator = new ArgbEvaluator();
+            highLightAnimator = new ValueAnimator();
+            highLightAnimator.setIntValues(highLightColorDark, highLightColorLight);
+            highLightAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+                @Override
+                public void onAnimationUpdate(ValueAnimator animation) {
+                    Integer color = (Integer) animation.getAnimatedValue();
+                    setHighLightBackground(color);
+                }
+            });
+            highLightAnimator.addListener(new Animator.AnimatorListener() {
+                @Override
+                public void onAnimationStart(Animator animation) {
+
+                }
+
+                @Override
+                public void onAnimationEnd(Animator animation) {
+                    clearHighLightBackground();
+                }
+
+                @Override
+                public void onAnimationCancel(Animator animation) {
+                    clearHighLightBackground();
+                }
+
+                @Override
+                public void onAnimationRepeat(Animator animation) {
+
+                }
+            });
+            highLightAnimator.setEvaluator(argbEvaluator);
+            highLightAnimator.setRepeatCount(3);
+            highLightAnimator.setDuration(250);
+            highLightAnimator.setRepeatMode(ValueAnimator.REVERSE);
+        }
+        highLightAnimator.start();
+    }
+
+    public void setHighLightBackground(int color) {
+        Drawable drawable = msgArea.getBackground();
+        if (drawable != null) {
+            drawable.setColorFilter(color, PorterDuff.Mode.SRC_IN);
+        }
+    }
+
+    public void clearHighLightBackground() {
+        Drawable drawable = msgArea.getBackground();
+        if (drawable != null) {
+            drawable.setColorFilter(null);
+        }
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/MessageContentHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/MessageContentHolder.java
new file mode 100644
index 0000000..17ab631
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/MessageContentHolder.java
@@ -0,0 +1,623 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.LinearInterpolator;
+import android.view.animation.RotateAnimation;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuicore.component.gatherimage.UserIconView;
+import com.tencent.qcloud.tuicore.util.DateTimeUtil;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageReactBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageRepliesBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.SelectTextHelper;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply.ChatFlowReactView;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+import com.tencent.qcloud.tuikit.tuichat.config.TUIChatConfigs;
+import com.tencent.qcloud.tuikit.tuichat.presenter.ChatPresenter;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public abstract class MessageContentHolder extends MessageBaseHolder {
+
+    public UserIconView leftUserIcon;
+    public UserIconView rightUserIcon;
+    public TextView usernameText;
+    public LinearLayout msgContentLinear;
+    public ProgressBar sendingProgress;
+    public ImageView statusImage;
+    public TextView isReadText;
+    public TextView unreadAudioText;
+    public TextView messageDetailsTimeTv;
+    private FrameLayout translationContentFrameLayout;
+    private ImageView translationLoadingImage;
+    private LinearLayout translationResultLayout;
+    private RotateAnimation translationRotateAnimation;
+
+    public boolean isForwardMode = false;
+    public boolean isReplyDetailMode = false;
+    public boolean isMultiSelectMode = false;
+
+    private List<TUIMessageBean> mDataSource = new ArrayList<>();
+    protected SelectTextHelper selectableTextHelper;
+
+    protected ChatPresenter presenter;
+
+    public MessageContentHolder(View itemView) {
+        super(itemView);
+
+        leftUserIcon = itemView.findViewById(R.id.left_user_icon_view);
+        rightUserIcon = itemView.findViewById(R.id.right_user_icon_view);
+        usernameText = itemView.findViewById(R.id.user_name_tv);
+        msgContentLinear = itemView.findViewById(R.id.msg_content_ll);
+        statusImage = itemView.findViewById(R.id.message_status_iv);
+        sendingProgress = itemView.findViewById(R.id.message_sending_pb);
+        isReadText = itemView.findViewById(R.id.is_read_tv);
+        unreadAudioText = itemView.findViewById(R.id.audio_unread);
+        messageDetailsTimeTv = itemView.findViewById(R.id.msg_detail_time_tv);
+        translationContentFrameLayout = itemView.findViewById(R.id.translate_content_fl);
+        LayoutInflater.from(itemView.getContext()).inflate(R.layout.translation_contant_layout, translationContentFrameLayout);
+        translationLoadingImage = translationContentFrameLayout.findViewById(R.id.translate_loading_iv);
+        translationResultLayout = translationContentFrameLayout.findViewById(R.id.translate_result_ll);
+    }
+
+    public void setPresenter(ChatPresenter chatPresenter) {
+        this.presenter = chatPresenter;
+    }
+
+    public void setDataSource(List<TUIMessageBean> dataSource) {
+        if (dataSource == null || dataSource.isEmpty()) {
+            mDataSource = null;
+        }
+
+        List<TUIMessageBean> mediaSource = new ArrayList<>();
+        for(TUIMessageBean messageBean : dataSource) {
+            int type = messageBean.getMsgType();
+            if (type == V2TIMMessage.V2TIM_ELEM_TYPE_IMAGE || type == V2TIMMessage.V2TIM_ELEM_TYPE_VIDEO) {
+                mediaSource.add(messageBean);
+            }
+        }
+        mDataSource = mediaSource;
+    }
+
+    public List<TUIMessageBean> getDataSource() {
+        return mDataSource;
+    }
+
+    public void resetSelectableText() {
+        if (selectableTextHelper != null) {
+            selectableTextHelper.reset();
+        }
+    }
+
+    @Override
+    public void layoutViews(final TUIMessageBean msg, final int position) {
+        super.layoutViews(msg, position);
+
+        if (isForwardMode || isReplyDetailMode) {
+            leftUserIcon.setVisibility(View.VISIBLE);
+            rightUserIcon.setVisibility(View.GONE);
+        } else {
+            if (msg.isSelf()) {
+                leftUserIcon.setVisibility(View.GONE);
+                rightUserIcon.setVisibility(View.VISIBLE);
+            } else {
+                leftUserIcon.setVisibility(View.VISIBLE);
+                rightUserIcon.setVisibility(View.GONE);
+            }
+        }
+        if (properties.getAvatar() != 0) {
+            leftUserIcon.setDefaultImageResId(R.drawable.ic_default_user_head_icon);
+//            leftUserIcon.setDefaultImageResId(properties.getAvatar());
+            rightUserIcon.setDefaultImageResId(properties.getAvatar());
+        } else {
+            leftUserIcon.setDefaultImageResId(R.drawable.ic_default_user_head_icon);
+            rightUserIcon.setDefaultImageResId(TUIThemeManager.getAttrResId(rightUserIcon.getContext(), com.tencent.qcloud.tuicore.R.attr.core_default_user_icon));
+        }
+        if (properties.getAvatarRadius() != 0) {
+            leftUserIcon.setRadius(properties.getAvatarRadius());
+            rightUserIcon.setRadius(properties.getAvatarRadius());
+        } else {
+            int radius = ScreenUtil.dip2px(4);
+            leftUserIcon.setRadius(radius);
+            rightUserIcon.setRadius(radius);
+        }
+        if (properties.getAvatarSize() != null && properties.getAvatarSize().length == 2) {
+            ViewGroup.LayoutParams params = leftUserIcon.getLayoutParams();
+            params.width = properties.getAvatarSize()[0];
+            params.height = properties.getAvatarSize()[1];
+            leftUserIcon.setLayoutParams(params);
+
+            params = rightUserIcon.getLayoutParams();
+            params.width = properties.getAvatarSize()[0];
+            params.height = properties.getAvatarSize()[1];
+            rightUserIcon.setLayoutParams(params);
+        }
+
+        if (isForwardMode || isReplyDetailMode) {
+            usernameText.setVisibility(View.VISIBLE);
+        } else {
+            if (msg.isSelf()) {
+                if (properties.getRightNameVisibility() == 0) {
+                    usernameText.setVisibility(View.GONE);
+                } else {
+                    usernameText.setVisibility(properties.getRightNameVisibility());
+                }
+            } else {
+                if (properties.getLeftNameVisibility() == 0) {
+                    if (msg.isGroup()) {
+                        usernameText.setVisibility(View.VISIBLE);
+                    } else {
+                        usernameText.setVisibility(View.GONE);
+                    }
+                } else {
+                    usernameText.setVisibility(properties.getLeftNameVisibility());
+                }
+            }
+        }
+        if (properties.getNameFontColor() != 0) {
+            usernameText.setTextColor(properties.getNameFontColor());
+        }
+        if (properties.getNameFontSize() != 0) {
+            usernameText.setTextSize(properties.getNameFontSize());
+        }
+
+        if (!TextUtils.isEmpty(msg.getNameCard())) {
+            usernameText.setText(msg.getNameCard());
+        } else if (!TextUtils.isEmpty(msg.getFriendRemark())) {
+            usernameText.setText(msg.getFriendRemark());
+        } else if (!TextUtils.isEmpty(msg.getNickName())) {
+            usernameText.setText(msg.getNickName());
+        } else {
+            usernameText.setText(msg.getSender());
+        }
+
+        if (!TextUtils.isEmpty(msg.getFaceUrl())) {
+            List<Object> urllist = new ArrayList<>();
+            urllist.add(msg.getFaceUrl());
+            if (isForwardMode || isReplyDetailMode) {
+                leftUserIcon.setIconUrls(urllist);
+            } else {
+                if (msg.isSelf()) {
+                    rightUserIcon.setIconUrls(urllist);
+                } else {
+                    leftUserIcon.setIconUrls(urllist);
+                }
+            }
+        } else {
+            rightUserIcon.setIconUrls(null);
+            leftUserIcon.setIconUrls(null);
+        }
+
+        if (isForwardMode || isReplyDetailMode) {
+            sendingProgress.setVisibility(View.GONE);
+        } else {
+            if (msg.isSelf()) {
+                if (msg.getStatus() == TUIMessageBean.MSG_STATUS_SEND_FAIL
+                        || msg.getStatus() == TUIMessageBean.MSG_STATUS_SEND_SUCCESS
+                        || msg.isPeerRead()) {
+                    sendingProgress.setVisibility(View.GONE);
+                } else {
+                    sendingProgress.setVisibility(View.VISIBLE);
+                }
+            } else {
+                sendingProgress.setVisibility(View.GONE);
+            }
+        }
+
+        if (isForwardMode || isReplyDetailMode) {
+            msgArea.setBackgroundResource(TUIThemeManager.getAttrResId(itemView.getContext(), R.attr.chat_bubble_other_bg));
+            statusImage.setVisibility(View.GONE);
+        } else {
+            if (msg.isSelf()) {
+                if (properties.getRightBubble() != null && properties.getRightBubble().getConstantState() != null) {
+                    msgArea.setBackground(properties.getRightBubble().getConstantState().newDrawable());
+                } else {
+                    msgArea.setBackgroundResource(TUIThemeManager.getAttrResId(itemView.getContext(), R.attr.chat_bubble_self_bg));
+                }
+            } else {
+                if (properties.getLeftBubble() != null && properties.getLeftBubble().getConstantState() != null) {
+                    msgArea.setBackground(properties.getLeftBubble().getConstantState().newDrawable());
+                } else {
+                    msgArea.setBackgroundResource(TUIThemeManager.getAttrResId(itemView.getContext(), R.attr.chat_bubble_other_bg));
+                }
+            }
+
+            if (onItemClickListener != null) {
+                msgContentFrame.setOnLongClickListener(new View.OnLongClickListener() {
+                    @Override
+                    public boolean onLongClick(View v) {
+                        onItemClickListener.onMessageLongClick(v, position, msg);
+                        return true;
+                    }
+                });
+
+                msgArea.setOnLongClickListener(new View.OnLongClickListener() {
+                    @Override
+                    public boolean onLongClick(View v) {
+                        onItemClickListener.onMessageLongClick(msgArea, position, msg);
+                        return true;
+                    }
+                });
+
+                leftUserIcon.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        onItemClickListener.onUserIconClick(view, position, msg);
+                    }
+                });
+                leftUserIcon.setOnLongClickListener(new View.OnLongClickListener() {
+                    @Override
+                    public boolean onLongClick(View view) {
+                        onItemClickListener.onUserIconLongClick(view, position, msg);
+                        return true;
+                    }
+                });
+                rightUserIcon.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        onItemClickListener.onUserIconClick(view, position, msg);
+                    }
+                });
+            }
+
+            if (msg.getStatus() == TUIMessageBean.MSG_STATUS_SEND_FAIL) {
+                statusImage.setVisibility(View.VISIBLE);
+                msgContentFrame.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        if (onItemClickListener != null) {
+                            onItemClickListener.onMessageLongClick(msgContentFrame, position, msg);
+                        }
+                    }
+                });
+                statusImage.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        if (onItemClickListener != null) {
+                            onItemClickListener.onSendFailBtnClick(statusImage, position, msg);
+                        }
+                    }
+                });
+            } else {
+                msgContentFrame.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        if (onItemClickListener != null) {
+                            onItemClickListener.onMessageClick(msgContentFrame, position, msg);
+                        }
+                    }
+                });
+                statusImage.setVisibility(View.GONE);
+            }
+        }
+
+        if (isForwardMode || isReplyDetailMode) {
+            setGravity(true);
+            msgContentLinear.removeView(msgAreaAndReply);
+            msgContentLinear.addView(msgAreaAndReply);
+        } else {
+            if (msg.isSelf()) {
+                setGravity(false);
+                msgContentLinear.removeView(msgAreaAndReply);
+                msgContentLinear.addView(msgAreaAndReply);
+            } else {
+                setGravity(true);
+                msgContentLinear.removeView(msgAreaAndReply);
+                msgContentLinear.addView(msgAreaAndReply, 0);
+            }
+        }
+
+        if (rightGroupLayout != null) {
+            rightGroupLayout.setVisibility(View.VISIBLE);
+        }
+        msgContentLinear.setVisibility(View.VISIBLE);
+
+        // clear isReadText status
+        isReadText.setTextColor(isReadText.getResources().getColor(R.color.text_gray1));
+        isReadText.setOnClickListener(null);
+
+        if (isForwardMode || isReplyDetailMode) {
+            isReadText.setVisibility(View.GONE);
+            unreadAudioText.setVisibility(View.GONE);
+        } else {
+            if (TUIChatConfigs.getConfigs().getGeneralConfig().isShowRead()) {
+                if (msg.isSelf() && TUIMessageBean.MSG_STATUS_SEND_SUCCESS == msg.getStatus()) {
+                    if (!msg.isNeedReadReceipt()) {
+                        isReadText.setVisibility(View.GONE);
+                    } else {
+                        showReadText(msg);
+                    }
+                } else {
+                    isReadText.setVisibility(View.GONE);
+                }
+            }
+            unreadAudioText.setVisibility(View.GONE);
+        }
+
+        if (isReplyDetailMode) {
+            chatTimeText.setVisibility(View.GONE);
+        }
+
+        setReplyContent(msg);
+        setReactContent(msg);
+        if (presenter.isNeedShowTranslation()) {
+            setTranslationContent(msg, position);
+        }
+        setMessageAreaPadding();
+
+        layoutVariableViews(msg, position);
+    }
+
+    protected void setMessageAreaPadding() {
+        // after setting background, the padding will be reset
+        int paddingHorizontal = itemView.getResources().getDimensionPixelSize(R.dimen.chat_message_area_padding_left_right);
+        int paddingVertical = itemView.getResources().getDimensionPixelSize(R.dimen.chat_message_area_padding_top_bottom);;
+        msgArea.setPadding(paddingHorizontal, paddingVertical, paddingHorizontal, paddingVertical);
+    }
+
+    protected void setGravity(boolean isStart) {
+        int gravity = isStart ? Gravity.START : Gravity.END;
+        msgAreaAndReply.setGravity(gravity);
+        ViewGroup.LayoutParams layoutParams = msgContentFrame.getLayoutParams();
+        if (layoutParams instanceof FrameLayout.LayoutParams) {
+            ((FrameLayout.LayoutParams) layoutParams).gravity = gravity;
+        } else if (layoutParams instanceof LinearLayout.LayoutParams) {
+            ((LinearLayout.LayoutParams) layoutParams).gravity = gravity;
+        }
+        msgContentFrame.setLayoutParams(layoutParams);
+    }
+
+    private void setReplyContent(TUIMessageBean messageBean) {
+        MessageRepliesBean messageRepliesBean = messageBean.getMessageRepliesBean();
+        if (messageRepliesBean != null && messageRepliesBean.getRepliesSize() > 0) {
+            TextView replyNumText = msgReplyDetailLayout.findViewById(R.id.reply_num);
+            replyNumText.setText(replyNumText.getResources().getString(R.string.chat_reply_num, messageRepliesBean.getRepliesSize()));
+            msgReplyDetailLayout.setVisibility(View.VISIBLE);
+            msgReplyDetailLayout.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (onItemClickListener != null) {
+                        onItemClickListener.onReplyDetailClick(messageBean);
+                    }
+                }
+            });
+        } else {
+            msgReplyDetailLayout.setVisibility(View.GONE);
+            msgReplyDetailLayout.setOnClickListener(null);
+        }
+        if (!isReplyDetailMode) {
+            messageDetailsTimeTv.setVisibility(View.GONE);
+        } else {
+            messageDetailsTimeTv.setText(DateTimeUtil.getTimeFormatText(new Date(messageBean.getMessageTime() * 1000)));
+            messageDetailsTimeTv.setVisibility(View.VISIBLE);
+            msgReplyDetailLayout.setVisibility(View.GONE);
+        }
+    }
+
+    private void setReactContent(TUIMessageBean messageBean) {
+        MessageReactBean messageReactBean = messageBean.getMessageReactBean();
+        if (messageReactBean != null && messageReactBean.getReactSize() > 0) {
+            reactView.setVisibility(View.VISIBLE);
+            reactView.setData(messageReactBean);
+            reactView.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    if (onItemClickListener != null) {
+                        onItemClickListener.onMessageLongClick(v, 0, messageBean);
+                    }
+                    return true;
+                }
+            });
+            if (!isForwardMode) {
+                reactView.setReactOnClickListener(new ChatFlowReactView.ReactOnClickListener() {
+                    @Override
+                    public void onClick(String emojiId) {
+                        if (onItemClickListener != null) {
+                            onItemClickListener.onReactOnClick(emojiId, messageBean);
+                        }
+                    }
+                });
+            } else {
+                reactView.setOnLongClickListener(null);
+            }
+        } else {
+            reactView.setVisibility(View.GONE);
+            reactView.setOnLongClickListener(null);
+        }
+        if (!messageBean.isSelf() || isForwardMode || isReplyDetailMode) {
+            reactView.setThemeColorId(TUIThemeManager.getAttrResId(reactView.getContext(), R.attr.chat_react_other_text_color));
+        } else {
+            reactView.setThemeColorId(0);
+        }
+    }
+
+    private void showReadText(TUIMessageBean msg) {
+        if (msg.isGroup()) {
+            isReadText.setVisibility(View.VISIBLE);
+            if (msg.isAllRead()) {
+                isReadText.setText(R.string.has_all_read);
+            } else if (msg.isUnread()) {
+                isReadText.setTextColor(isReadText.getResources().getColor(TUIThemeManager.getAttrResId(isReadText.getContext(), R.attr.chat_read_receipt_text_color)));
+                isReadText.setText(R.string.unread);
+                isReadText.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        startShowUnread(msg);
+                    }
+                });
+            } else {
+                long readCount = msg.getReadCount();
+                if (readCount > 0) {
+                    isReadText.setText(isReadText.getResources().getString(R.string.someone_has_read, readCount));
+                    isReadText.setTextColor(isReadText.getResources().getColor(TUIThemeManager.getAttrResId(isReadText.getContext(), R.attr.chat_read_receipt_text_color)));
+                    isReadText.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            startShowUnread(msg);
+                        }
+                    });
+                }
+            }
+        } else {
+            isReadText.setVisibility(View.VISIBLE);
+            if (msg.isPeerRead()) {
+                isReadText.setText(R.string.has_read);
+            } else {
+                isReadText.setText(R.string.unread);
+                isReadText.setTextColor(isReadText.getResources().getColor(TUIThemeManager.getAttrResId(isReadText.getContext(), R.attr.chat_read_receipt_text_color)));
+                isReadText.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        startShowUnread(msg);
+                    }
+                });
+            }
+        }
+    }
+
+    public abstract void layoutVariableViews(final TUIMessageBean msg, final int position);
+
+    public void onRecycled() {
+        if (selectableTextHelper != null) {
+            selectableTextHelper.destroy();
+        }
+    }
+
+    public void startShowUnread(TUIMessageBean messageBean) {
+        Bundle bundle = new Bundle();
+        bundle.putSerializable(TUIChatConstants.MESSAGE_BEAN, messageBean);
+        bundle.putSerializable(TUIChatConstants.CHAT_INFO, presenter.getChatInfo());
+        TUICore.startActivity("MessageReceiptDetailActivity", bundle);
+    }
+
+    protected void setSelectableTextHelper(TUIMessageBean msg, TextView textView, int position, boolean isEmoji) {
+        if (selectableTextHelper != null) {
+            selectableTextHelper.destroy();
+        }
+        selectableTextHelper = new SelectTextHelper
+                .Builder(textView)
+                .setCursorHandleColor(TUIChatService.getAppContext().getResources().getColor(R.color.font_blue))
+                .setCursorHandleSizeInDp(18)
+                .setSelectedColor(TUIChatService.getAppContext().getResources().getColor(R.color.test_blue))
+                .setSelectAll(true)
+                .setIsEmoji(isEmoji)
+                .setScrollShow(false)
+                .setSelectedAllNoPop(true)
+                .setMagnifierShow(false)
+                .build();
+
+        selectableTextHelper.setSelectListener(new SelectTextHelper.OnSelectListener() {
+            @Override
+            public void onClick(View v) {
+            }
+
+            @Override
+            public void onLongClick(View v) {
+            }
+
+            @Override
+            public void onTextSelected(CharSequence content) {
+                String selectedText = content.toString();
+                msg.setSelectText(selectedText);
+                TUIChatLog.d("TextMessageHolder", "onTextSelected selectedText = " + selectedText);
+                if (onItemClickListener != null) {
+                    onItemClickListener.onTextSelected(msgArea, position, msg);
+                }
+            }
+
+            @Override
+            public void onDismiss() {
+                msg.setSelectText(msg.getExtra());
+            }
+
+            @Override
+            public void onClickUrl(String url) {
+            }
+
+            @Override
+            public void onSelectAllShowCustomPop() {
+            }
+
+            @Override
+            public void onReset() {
+                msg.setSelectText(null);
+                msg.setSelectText(msg.getExtra());
+            }
+
+            @Override
+            public void onDismissCustomPop() {
+            }
+
+            @Override
+            public void onScrolling() {
+            }
+        });
+    }
+
+    protected void setTranslationContent(TUIMessageBean msg, int position) {
+        int translationStatus = msg.getTranslationStatus();
+        if (translationStatus == TUIMessageBean.MSG_TRANSLATE_STATUS_SHOWN) {
+            translationContentFrameLayout.setVisibility(View.VISIBLE);
+            stopTranslationLoading();
+            translationResultLayout.setVisibility(View.VISIBLE);
+            TextView translationText = translationContentFrameLayout.findViewById(R.id.translate_tv);
+            if (properties.getChatContextFontSize() != 0) {
+                translationText.setTextSize(properties.getChatContextFontSize());
+            }
+            FaceManager.handlerEmojiText(translationText, msg.getTranslation(), false);
+            translationContentFrameLayout.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View view) {
+                    if (onItemClickListener != null) {
+                        onItemClickListener.onTranslationLongClick(view, position, msg);
+                    }
+                    return true;
+                }
+            });
+        } else if (translationStatus == TUIMessageBean.MSG_TRANSLATE_STATUS_LOADING) {
+            translationContentFrameLayout.setVisibility(View.VISIBLE);
+            startTranslationLoading();
+            translationResultLayout.setVisibility(View.GONE);
+            translationContentFrameLayout.setOnLongClickListener(null);
+        } else {
+            stopTranslationLoading();
+            translationContentFrameLayout.setVisibility(View.GONE);
+            translationContentFrameLayout.setOnLongClickListener(null);
+        }
+    }
+
+    private void startTranslationLoading() {
+        translationLoadingImage.setVisibility(View.VISIBLE);
+        translationRotateAnimation = new RotateAnimation(0, 360, RotateAnimation.RELATIVE_TO_SELF, 0.5f, RotateAnimation.RELATIVE_TO_SELF, 0.5f);
+        translationRotateAnimation.setRepeatCount(-1);
+        translationRotateAnimation.setDuration(1000);
+        translationRotateAnimation.setInterpolator(new LinearInterpolator());
+        translationLoadingImage.startAnimation(translationRotateAnimation);
+    }
+
+    private void stopTranslationLoading() {
+        translationLoadingImage.clearAnimation();
+        translationLoadingImage.setVisibility(View.GONE);
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/MessageHeaderHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/MessageHeaderHolder.java
new file mode 100644
index 0000000..5da2307
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/MessageHeaderHolder.java
@@ -0,0 +1,42 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder;
+
+import android.view.View;
+import android.widget.LinearLayout;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+public class MessageHeaderHolder extends MessageBaseHolder {
+
+    private boolean mLoading;
+
+    public MessageHeaderHolder(View itemView) {
+        super(itemView);
+    }
+
+    @Override
+    public int getVariableLayout() {
+        return 0;
+    }
+
+    public void setLoadingStatus(boolean loading) {
+        mLoading = loading;
+        layoutViews(null, 0);
+    }
+
+    @Override
+    public void layoutViews(TUIMessageBean msg, int position) {
+        RecyclerView.LayoutParams param = (RecyclerView.LayoutParams) itemView.getLayoutParams();
+        if (mLoading) {
+            param.height = LinearLayout.LayoutParams.WRAP_CONTENT;
+            param.width = LinearLayout.LayoutParams.MATCH_PARENT;
+            itemView.setVisibility(View.VISIBLE);
+        } else {
+            param.height = 0;
+            param.width = 0;
+            itemView.setVisibility(View.GONE);
+        }
+        itemView.setLayoutParams(param);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/MessageViewHolderFactory.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/MessageViewHolderFactory.java
new file mode 100644
index 0000000..4d17f13
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/MessageViewHolderFactory.java
@@ -0,0 +1,67 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TipsMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.classicui.ClassicUIService;
+import com.tencent.qcloud.tuikit.tuichat.classicui.interfaces.ICommonMessageAdapter;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+public class MessageViewHolderFactory {
+
+    public static RecyclerView.ViewHolder getInstance(ViewGroup parent, ICommonMessageAdapter adapter, int viewType) {
+
+        LayoutInflater inflater = LayoutInflater.from(parent.getContext());
+        RecyclerView.ViewHolder holder = null;
+        View view = null;
+
+        if (viewType == MessageBaseHolder.MSG_TYPE_HEADER_VIEW) {
+            view = inflater.inflate(R.layout.loading_progress_bar, parent, false);
+            holder = new MessageHeaderHolder(view);
+            return holder;
+        }
+
+        if (viewType == ClassicUIService.getInstance().getViewType(TipsMessageBean.class)) {
+            view = inflater.inflate(R.layout.message_adapter_item_empty, parent, false);
+            holder = new TipsMessageHolder(view);
+        } else {
+            view = inflater.inflate(R.layout.message_adapter_item_content, parent, false);
+            holder = getViewHolder(view, viewType);
+        }
+
+        if (holder == null) {
+            holder = new TextMessageHolder(view);
+        }
+        ((MessageBaseHolder) holder).setAdapter(adapter);
+
+        return holder;
+    }
+
+    private static RecyclerView.ViewHolder getViewHolder(View view, int viewType) {
+        Class<? extends MessageBaseHolder> messageHolderClazz = ClassicUIService.getInstance().getMessageViewHolderClass(viewType);;
+        if (messageHolderClazz != null) {
+            Constructor<? extends MessageBaseHolder> constructor;
+            try {
+                constructor = messageHolderClazz.getConstructor(View.class);
+                return constructor.newInstance(view);
+            } catch (NoSuchMethodException e) {
+                e.printStackTrace();
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            } catch (InstantiationException e) {
+                e.printStackTrace();
+            } catch (InvocationTargetException e) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/QuoteMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/QuoteMessageHolder.java
new file mode 100644
index 0000000..e1efcdc
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/QuoteMessageHolder.java
@@ -0,0 +1,337 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder;
+
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.request.RequestListener;
+import com.bumptech.glide.request.target.Target;
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.util.ImageUtil;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ImageMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.QuoteMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.VideoMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.FaceReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.FileReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.ImageReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.MergeReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.SoundReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TextReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.VideoReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageParser;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class QuoteMessageHolder extends TextMessageHolder {
+
+    private final TextView senderNameTv;
+    private FrameLayout quoteContentFrameLayout;
+
+    // text/merge
+    private final FrameLayout textFrame;
+    private final TextView textTv;
+    // image/video/face
+    private final FrameLayout imageFrame;
+    private final ImageView imageIv;
+    private final ImageView playIv;
+    protected final List<String> downloadEles = new ArrayList<>();
+    protected String mImagePath = null;
+    // file
+    private final FrameLayout fileFrame;
+    private final TextView fileNameTv;
+    private final ImageView fileIconIv;
+    // sound
+    private final FrameLayout soundFrame;
+    private final TextView soundTimeTv;
+    private final ImageView soundIconIv;
+
+    public QuoteMessageHolder(View itemView) {
+        super(itemView);
+        quoteContentFrameLayout = itemView.findViewById(R.id.quote_content_fl);
+        quoteContentFrameLayout.setVisibility(View.VISIBLE);
+        LayoutInflater.from(itemView.getContext()).inflate(R.layout.quote_message_content_layout, quoteContentFrameLayout);
+        senderNameTv = quoteContentFrameLayout.findViewById(R.id.sender_name_tv);
+
+        textFrame = quoteContentFrameLayout.findViewById(R.id.text_msg_area);
+        textTv = quoteContentFrameLayout.findViewById(R.id.msg_abstract_tv);
+
+        imageFrame = quoteContentFrameLayout.findViewById(R.id.image_video_msg_area);
+        imageIv = quoteContentFrameLayout.findViewById(R.id.msg_image_iv);
+        playIv = quoteContentFrameLayout.findViewById(R.id.msg_play_iv);
+
+        fileFrame = quoteContentFrameLayout.findViewById(R.id.file_msg_area);
+        fileNameTv = quoteContentFrameLayout.findViewById(R.id.file_name_tv);
+        fileIconIv = quoteContentFrameLayout.findViewById(R.id.file_icon_iv);
+
+        soundFrame = quoteContentFrameLayout.findViewById(R.id.sound_msg_area);
+        soundTimeTv = quoteContentFrameLayout.findViewById(R.id.sound_msg_time_tv);
+        soundIconIv = quoteContentFrameLayout.findViewById(R.id.sound_msg_icon_iv);
+    }
+
+    @Override
+    public void layoutVariableViews(TUIMessageBean msg, int position) {
+        msg.setSelectText(msg.getExtra());
+        QuoteMessageBean quoteMessageBean = (QuoteMessageBean) msg;
+        TUIMessageBean replyContentBean = quoteMessageBean.getContentMessageBean();
+        String replyContent = replyContentBean.getExtra();
+        String senderName = quoteMessageBean.getOriginMsgSender();
+        senderNameTv.setText(senderName + ": ");
+
+        FaceManager.handlerEmojiText(msgBodyText, replyContent, false);
+
+        performMsgAbstract(quoteMessageBean);
+
+        msgArea.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                selectableTextHelper.selectAll();
+                return true;
+            }
+        });
+
+        quoteContentFrameLayout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (onItemClickListener != null) {
+                    onItemClickListener.onReplyMessageClick(view, position, quoteMessageBean);
+                }
+            }
+        });
+        setThemeColor(msg);
+        if (isForwardMode || isReplyDetailMode) {
+            return;
+        }
+        boolean isEmoji = false;
+        if (!TextUtils.isEmpty(replyContent)) {
+            isEmoji = FaceManager.handlerEmojiText(msgBodyText, replyContent, false);
+        }
+        setSelectableTextHelper(msg, msgBodyText, position, isEmoji);
+    }
+
+    private void setThemeColor(TUIMessageBean messageBean) {
+        if (isForwardMode || isReplyDetailMode || !messageBean.isSelf()) {
+            int otherTextColorResId = TUIThemeManager.getAttrResId(msgBodyText.getContext(), R.attr.chat_other_msg_text_color);
+            int otherTextColor = msgBodyText.getResources().getColor(otherTextColorResId);
+            msgBodyText.setTextColor(otherTextColor);
+        } else {
+            int selfTextColorResId = TUIThemeManager.getAttrResId(msgBodyText.getContext(), R.attr.chat_self_msg_text_color);
+            int selfTextColor = msgBodyText.getResources().getColor(selfTextColorResId);
+            msgBodyText.setTextColor(selfTextColor);
+        }
+    }
+
+    private void performMsgAbstract(QuoteMessageBean quoteMessageBean) {
+        resetAll();
+        TUIMessageBean originMessage = quoteMessageBean.getOriginMessageBean();
+
+        TUIReplyQuoteBean replyQuoteBean = quoteMessageBean.getReplyQuoteBean();
+        if (originMessage != null) {
+            performQuote(replyQuoteBean, quoteMessageBean);
+        } else {
+            performNotFound(replyQuoteBean, quoteMessageBean);
+        }
+
+    }
+
+    private void resetAll() {
+        textFrame.setVisibility(View.GONE);
+        imageFrame.setVisibility(View.GONE);
+        fileFrame.setVisibility(View.GONE);
+        soundFrame.setVisibility(View.GONE);
+        playIv.setVisibility(View.GONE);
+    }
+
+    private void performNotFound(TUIReplyQuoteBean quoteMessageBean, QuoteMessageBean replyMessageBean) {
+        String typeStr = ChatMessageParser.getMsgTypeStr(quoteMessageBean.getMessageType());
+        String abstractStr = quoteMessageBean.getDefaultAbstract();
+        if (ChatMessageParser.isFileType(quoteMessageBean.getMessageType())) {
+            abstractStr = "";
+        }
+        performTextMessage(typeStr + abstractStr);
+    }
+
+    private void performTextMessage(String text) {
+        textFrame.setVisibility(View.VISIBLE);
+        FaceManager.handlerEmojiText(textTv, text, false);
+    }
+
+    private void performImage(TUIReplyQuoteBean replyQuoteBean) {
+        imageFrame.setVisibility(View.VISIBLE);
+        int imageRadius = ScreenUtil.dip2px(1.92f);
+
+        if (replyQuoteBean instanceof FaceReplyQuoteBean) {
+            FaceReplyQuoteBean faceReplyQuoteBean = (FaceReplyQuoteBean) replyQuoteBean;
+            String faceKey = new String(faceReplyQuoteBean.getData());
+            ViewGroup.LayoutParams params = imageIv.getLayoutParams();
+            if (params != null) {
+                int maxSize = itemView.getResources().getDimensionPixelSize(R.dimen.reply_message_image_size);
+                params.width = maxSize;
+                params.height = maxSize;
+                imageIv.setLayoutParams(params);
+            }
+            FaceManager.loadFace(faceReplyQuoteBean.getIndex(), faceKey, imageIv);
+
+        } else if (replyQuoteBean instanceof ImageReplyQuoteBean) {
+            ImageMessageBean messageBean = (ImageMessageBean) replyQuoteBean.getMessageBean();
+            imageIv.setLayoutParams(getImageParams(imageIv.getLayoutParams(), messageBean.getImgWidth(), messageBean.getImgHeight()));
+            final List<ImageMessageBean.ImageBean> imgs = messageBean.getImageBeanList();
+            String imagePath = messageBean.getDataPath();
+            String originImagePath = TUIChatUtils.getOriginImagePath(messageBean);
+            if (!TextUtils.isEmpty(originImagePath)) {
+                imagePath = originImagePath;
+            }
+            if (!TextUtils.isEmpty(imagePath)) {
+                GlideEngine.loadCornerImageWithoutPlaceHolder(imageIv, imagePath, null, imageRadius);
+            } else {
+                GlideEngine.clear(imageIv);
+                for (int i = 0; i < imgs.size(); i++) {
+                    final ImageMessageBean.ImageBean img = imgs.get(i);
+                    if (img.getType() == ImageMessageBean.IMAGE_TYPE_THUMB) {
+                        synchronized (downloadEles) {
+                            if (downloadEles.contains(img.getUUID())) {
+                                break;
+                            }
+                            downloadEles.add(img.getUUID());
+                        }
+                        final String path = ImageUtil.generateImagePath(img.getUUID(), ImageMessageBean.IMAGE_TYPE_THUMB);
+                        if (!path.equals(mImagePath)) {
+                            GlideEngine.clear(imageIv);
+                        }
+                        img.downloadImage(path, new ImageMessageBean.ImageBean.ImageDownloadCallback() {
+                            @Override
+                            public void onProgress(long currentSize, long totalSize) {
+                                TUIChatLog.i("downloadImage progress current:",
+                                        currentSize + ", total:" + totalSize);
+                            }
+
+                            @Override
+                            public void onError(int code, String desc) {
+                                downloadEles.remove(img.getUUID());
+                                TUIChatLog.e("MessageAdapter img getImage", code + ":" + desc);
+                            }
+
+                            @Override
+                            public void onSuccess() {
+                                downloadEles.remove(img.getUUID());
+                                messageBean.setDataPath(path);
+                                GlideEngine.loadCornerImageWithoutPlaceHolder(imageIv, messageBean.getDataPath(), new RequestListener() {
+                                    @Override
+                                    public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) {
+                                        mImagePath = null;
+                                        return false;
+                                    }
+
+                                    @Override
+                                    public boolean onResourceReady(Object resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) {
+                                        mImagePath = path;
+                                        return false;
+                                    }
+                                }, imageRadius);
+                            }
+                        });
+                        break;
+                    }
+                }
+            }
+        } else if (replyQuoteBean instanceof VideoReplyQuoteBean) {
+            VideoMessageBean messageBean = (VideoMessageBean) replyQuoteBean.getMessageBean();
+            ViewGroup.LayoutParams layoutParams = getImageParams(imageIv.getLayoutParams(), messageBean.getImgWidth(), messageBean.getImgHeight());
+            imageIv.setLayoutParams(layoutParams);
+            playIv.setLayoutParams(layoutParams);
+            playIv.setVisibility(View.VISIBLE);
+            if (!TextUtils.isEmpty(messageBean.getDataPath())) {
+                GlideEngine.loadCornerImageWithoutPlaceHolder(imageIv, messageBean.getDataPath(), null, imageRadius);
+            } else {
+                GlideEngine.clear(imageIv);
+                synchronized (downloadEles) {
+                    if (!downloadEles.contains(messageBean.getSnapshotUUID())) {
+                        downloadEles.add(messageBean.getSnapshotUUID());
+                    }
+                }
+
+                final String path = TUIConfig.getImageDownloadDir() + messageBean.getSnapshotUUID();
+                messageBean.downloadSnapshot(path, new VideoMessageBean.VideoDownloadCallback() {
+                    @Override
+                    public void onProgress(long currentSize, long totalSize) {
+                        TUIChatLog.i("downloadSnapshot progress current:", currentSize + ", total:" + totalSize);
+                    }
+
+                    @Override
+                    public void onError(int code, String desc) {
+                        downloadEles.remove(messageBean.getSnapshotUUID());
+                        TUIChatLog.e("MessageAdapter video getImage", code + ":" + desc);
+                    }
+
+                    @Override
+                    public void onSuccess() {
+                        downloadEles.remove(messageBean.getSnapshotUUID());
+                        messageBean.setDataPath(path);
+                        GlideEngine.loadCornerImageWithoutPlaceHolder(imageIv, messageBean.getDataPath(), null, imageRadius);
+                    }
+                });
+            }
+        }
+    }
+
+    protected ViewGroup.LayoutParams getImageParams(ViewGroup.LayoutParams params, int width, int height) {
+        if (width == 0 || height == 0) {
+            return params;
+        }
+        int maxSize = itemView.getResources().getDimensionPixelSize(R.dimen.reply_message_image_size);
+        if (width > height) {
+            params.width = maxSize;
+            params.height = maxSize * height / width;
+        } else {
+            params.width = maxSize * width / height;
+            params.height = maxSize;
+        }
+        return params;
+    }
+
+    private void performFile(FileReplyQuoteBean fileReplyQuoteBean) {
+        fileFrame.setVisibility(View.VISIBLE);
+        fileNameTv.setText(fileReplyQuoteBean.getFileName());
+    }
+
+    private void performSound(SoundReplyQuoteBean soundReplyQuoteBean) {
+        soundFrame.setVisibility(View.VISIBLE);
+        soundTimeTv.setText(soundReplyQuoteBean.getDuring() + "''");
+    }
+
+    private void performQuote(TUIReplyQuoteBean replyQuoteBean, QuoteMessageBean messageBean) {
+        if (replyQuoteBean instanceof TextReplyQuoteBean || replyQuoteBean instanceof MergeReplyQuoteBean) {
+            String text;
+            if (replyQuoteBean instanceof TextReplyQuoteBean) {
+                text = ((TextReplyQuoteBean) replyQuoteBean).getText();
+            } else {
+                text = messageBean.getOriginMsgAbstract();
+            }
+            performTextMessage(text);
+        } else if (replyQuoteBean instanceof FileReplyQuoteBean) {
+            performFile((FileReplyQuoteBean) replyQuoteBean);
+        } else if (replyQuoteBean instanceof SoundReplyQuoteBean) {
+            performSound((SoundReplyQuoteBean) replyQuoteBean);
+        } else if (replyQuoteBean instanceof ImageReplyQuoteBean || replyQuoteBean instanceof VideoReplyQuoteBean
+                || replyQuoteBean instanceof FaceReplyQuoteBean) {
+            performImage(replyQuoteBean);
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/ReplyMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/ReplyMessageHolder.java
new file mode 100644
index 0000000..f0cff81
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/ReplyMessageHolder.java
@@ -0,0 +1,188 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ReplyMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TextReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.classicui.ClassicUIService;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply.TUIReplyQuoteView;
+import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply.TextReplyQuoteView;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageParser;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+public class ReplyMessageHolder extends MessageContentHolder {
+
+    private View originMsgLayout;
+
+    private TextView senderNameTv;
+    private TextView replyContentTv;
+    private FrameLayout quoteFrameLayout;
+    private LinearLayout replyContainer;
+    private View line;
+
+    public ReplyMessageHolder(View itemView) {
+        super(itemView);
+        senderNameTv = itemView.findViewById(R.id.sender_tv);
+        replyContainer = itemView.findViewById(R.id.reply_container);
+        replyContentTv = itemView.findViewById(R.id.reply_content_tv);
+        originMsgLayout = itemView.findViewById(R.id.origin_msg_abs_layout);
+        quoteFrameLayout = itemView.findViewById(R.id.quote_frame_layout);
+        line = itemView.findViewById(R.id.reply_line);
+    }
+
+    @Override
+    public int getVariableLayout() {
+        return R.layout.message_adapter_content_reply;
+    }
+
+    @Override
+    public void layoutVariableViews(TUIMessageBean msg, int position) {
+        msg.setSelectText(msg.getExtra());
+
+        ReplyMessageBean replyMessageBean = (ReplyMessageBean) msg;
+        TUIMessageBean replyContentBean = replyMessageBean.getContentMessageBean();
+        String replyContent = replyContentBean.getExtra();
+        String senderName = replyMessageBean.getOriginMsgSender();
+        senderNameTv.setText(senderName + ":");
+        FaceManager.handlerEmojiText(replyContentTv, replyContent, false);
+
+        performMsgAbstract(replyMessageBean, position);
+
+        msgArea.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                selectableTextHelper.selectAll();
+                return true;
+            }
+        });
+
+        msgContentFrame.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                selectableTextHelper.selectAll();
+                return true;
+            }
+        });
+
+        originMsgLayout.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                selectableTextHelper.selectAll();
+                return true;
+            }
+        });
+
+        setThemeColor(msg);
+        if (isForwardMode || isReplyDetailMode) {
+            return;
+        }
+        boolean isEmoji = false;
+        if (!TextUtils.isEmpty(replyContent)) {
+            isEmoji = FaceManager.handlerEmojiText(replyContentTv, replyContent, false);
+        }
+        setSelectableTextHelper(msg, replyContentTv, position, isEmoji);
+    }
+
+    @Override
+    protected void setGravity(boolean isStart) {
+        super.setGravity(isStart);
+    }
+
+    private void setThemeColor(TUIMessageBean messageBean) {
+        Context context = itemView.getContext();
+        Resources resources = itemView.getResources();
+        if (isReplyDetailMode || isForwardMode || !messageBean.isSelf()) {
+            originMsgLayout.setBackgroundColor(resources.getColor(TUIThemeManager.getAttrResId(context, R.attr.chat_other_reply_quote_bg_color)));
+            senderNameTv.setTextColor(resources.getColor(TUIThemeManager.getAttrResId(context, R.attr.chat_other_reply_quote_text_color)));
+            replyContentTv.setTextColor(resources.getColor(TUIThemeManager.getAttrResId(context, R.attr.chat_other_reply_text_color)));
+            line.setBackgroundColor(resources.getColor(TUIThemeManager.getAttrResId(context, R.attr.chat_other_reply_line_bg_color)));
+        } else {
+            originMsgLayout.setBackgroundColor(resources.getColor(TUIThemeManager.getAttrResId(context, R.attr.chat_self_reply_quote_bg_color)));
+            senderNameTv.setTextColor(resources.getColor(TUIThemeManager.getAttrResId(context, R.attr.chat_self_reply_quote_text_color)));
+            replyContentTv.setTextColor(resources.getColor(TUIThemeManager.getAttrResId(context, R.attr.chat_self_reply_text_color)));
+            line.setBackgroundColor(resources.getColor(TUIThemeManager.getAttrResId(context, R.attr.chat_self_reply_line_bg_color)));
+        }
+    }
+
+    private void performMsgAbstract(ReplyMessageBean replyMessageBean, int position) {
+        TUIMessageBean originMessage = replyMessageBean.getOriginMessageBean();
+
+        TUIReplyQuoteBean replyQuoteBean = replyMessageBean.getReplyQuoteBean();
+        if (originMessage != null) {
+            performQuote(replyQuoteBean, replyMessageBean);
+        } else {
+            performNotFound(replyQuoteBean, replyMessageBean);
+        }
+
+        originMsgLayout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (onItemClickListener != null) {
+                    onItemClickListener.onReplyMessageClick(v, position, replyMessageBean);
+                }
+            }
+        });
+
+    }
+
+    private void performNotFound(TUIReplyQuoteBean replyQuoteBean, ReplyMessageBean replyMessageBean) {
+        String typeStr = ChatMessageParser.getMsgTypeStr(replyQuoteBean.getMessageType());
+        String abstractStr = replyQuoteBean.getDefaultAbstract();
+        if (ChatMessageParser.isFileType(replyQuoteBean.getMessageType())) {
+            abstractStr = "";
+        }
+        TextReplyQuoteBean textReplyQuoteBean = new TextReplyQuoteBean();
+        textReplyQuoteBean.setText(typeStr + abstractStr);
+        TextReplyQuoteView textReplyQuoteView = new TextReplyQuoteView(itemView.getContext());
+        textReplyQuoteView.onDrawReplyQuote(textReplyQuoteBean);
+        if (isForwardMode || isReplyDetailMode) {
+            textReplyQuoteView.setSelf(false);
+        } else {
+            textReplyQuoteView.setSelf(replyMessageBean.isSelf());
+        }
+        quoteFrameLayout.removeAllViews();
+        quoteFrameLayout.addView(textReplyQuoteView);
+    }
+
+    private void performQuote(TUIReplyQuoteBean replyQuoteBean, ReplyMessageBean replyMessageBean) {
+        Class<? extends TUIReplyQuoteView> quoteViewClass = ClassicUIService.getInstance().getReplyMessageViewClass(replyQuoteBean.getClass());
+        if (quoteViewClass != null) {
+            TUIReplyQuoteView quoteView = null;
+            try {
+                Constructor quoteViewConstructor = quoteViewClass.getConstructor(Context.class);
+                quoteView = (TUIReplyQuoteView) quoteViewConstructor.newInstance(itemView.getContext());
+            } catch (NoSuchMethodException e) {
+                e.printStackTrace();
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            } catch (InstantiationException e) {
+                e.printStackTrace();
+            } catch (InvocationTargetException e) {
+                e.printStackTrace();
+            }
+            if (quoteView != null) {
+                quoteView.onDrawReplyQuote(replyQuoteBean);
+                quoteFrameLayout.removeAllViews();
+                quoteFrameLayout.addView(quoteView);
+                if (isForwardMode || isReplyDetailMode) {
+                    quoteView.setSelf(false);
+                } else {
+                    quoteView.setSelf(replyMessageBean.isSelf());
+                }
+            }
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/SoundMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/SoundMessageHolder.java
new file mode 100644
index 0000000..8307c55
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/SoundMessageHolder.java
@@ -0,0 +1,152 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder;
+
+import android.graphics.drawable.AnimationDrawable;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.SoundMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.component.AudioPlayer;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+import java.io.File;
+
+public class SoundMessageHolder extends MessageContentHolder {
+
+    private static final int UNREAD = 0;
+    private static final int READ = 1;
+
+    private TextView audioTimeText;
+    private ImageView audioPlayImage;
+    private LinearLayout audioContentView;
+
+    public SoundMessageHolder(View itemView) {
+        super(itemView);
+        audioTimeText = itemView.findViewById(R.id.audio_time_tv);
+        audioPlayImage = itemView.findViewById(R.id.audio_play_iv);
+        audioContentView = itemView.findViewById(R.id.audio_content_ll);
+    }
+
+    @Override
+    public int getVariableLayout() {
+        return R.layout.message_adapter_content_audio;
+    }
+
+
+    @Override
+    public void layoutVariableViews(final TUIMessageBean msg, final int position) {
+        SoundMessageBean message = (SoundMessageBean) msg;
+        if (message.isSelf()) {
+            audioPlayImage.setImageResource(R.drawable.voice_msg_playing_3);
+            audioPlayImage.setRotation(180f);
+            audioContentView.removeView(audioPlayImage);
+            audioContentView.addView(audioPlayImage);
+            unreadAudioText.setVisibility(View.GONE);
+        } else {
+            audioPlayImage.setImageResource(R.drawable.voice_msg_playing_3);
+            audioContentView.removeView(audioPlayImage);
+            audioContentView.addView(audioPlayImage, 0);
+            if (message.getCustomInt() == UNREAD) {
+                LinearLayout.LayoutParams unreadParams = (LinearLayout.LayoutParams) isReadText.getLayoutParams();
+                unreadParams.gravity = Gravity.CENTER_VERTICAL;
+                unreadParams.leftMargin = 10;
+                unreadAudioText.setVisibility(View.VISIBLE);
+                unreadAudioText.setLayoutParams(unreadParams);
+            } else {
+                unreadAudioText.setVisibility(View.GONE);
+            }
+        }
+
+        int duration = (int) message.getDuration();
+        if (duration == 0) {
+            duration = 1;
+        }
+
+        if (isReplyDetailMode || isForwardMode || !msg.isSelf()) {
+            int otherTextColorResId = TUIThemeManager.getAttrResId(audioTimeText.getContext(), R.attr.chat_other_msg_text_color);
+            int otherTextColor = audioTimeText.getResources().getColor(otherTextColorResId);
+            audioTimeText.setTextColor(otherTextColor);
+        } else {
+            int selfTextColorResId = TUIThemeManager.getAttrResId(audioTimeText.getContext(), R.attr.chat_self_msg_text_color);
+            int selfTextColor = audioTimeText.getResources().getColor(selfTextColorResId);
+            audioTimeText.setTextColor(selfTextColor);
+        }
+
+        audioTimeText.setText(duration + "''");
+        msgContentFrame.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (AudioPlayer.getInstance().isPlaying()) {
+                    AudioPlayer.getInstance().stopPlay();
+                    if (TextUtils.equals(AudioPlayer.getInstance().getPath(), message.getDataPath())) {
+                        return;
+                    }
+                }
+                if (TextUtils.isEmpty(message.getDataPath())) {
+                    ToastUtil.toastShortMessage(TUIChatService.getAppContext().getString(R.string.voice_play_tip));
+                    getSound(message);
+                    return;
+                }
+                audioPlayImage.setImageResource(R.drawable.play_voice_message);
+                if (message.isSelf()) {
+                    audioPlayImage.setRotation(180f);
+                }
+                final AnimationDrawable animationDrawable = (AnimationDrawable) audioPlayImage.getDrawable();
+                animationDrawable.start();
+                message.setCustomInt(READ);
+                unreadAudioText.setVisibility(View.GONE);
+                AudioPlayer.getInstance().startPlay(message.getDataPath(), new AudioPlayer.Callback() {
+                    @Override
+                    public void onCompletion(Boolean success) {
+                        audioPlayImage.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                animationDrawable.stop();
+                                audioPlayImage.setImageResource(R.drawable.voice_msg_playing_3);
+                                if (message.isSelf()) {
+                                    audioPlayImage.setRotation(180f);
+                                }
+                            }
+                        });
+                    }
+                });
+            }
+        });
+    }
+
+    private void getSound(final SoundMessageBean messageBean) {
+        final String path = TUIConfig.getRecordDownloadDir() + messageBean.getUUID();
+        File file = new File(path);
+        if (!file.exists()) {
+            messageBean.downloadSound(path, new SoundMessageBean.SoundDownloadCallback() {
+                @Override
+                public void onProgress(long currentSize, long totalSize) {
+                    TUIChatLog.i("downloadSound progress current:", currentSize + ", total:" + totalSize);
+                }
+
+                @Override
+                public void onError(int code, String desc) {
+                    TUIChatLog.e("getSoundToFile failed code = ", code + ", info = " + desc);
+                    ToastUtil.toastLongMessage("getSoundToFile failed code = " + code + ", info = " + desc);
+                }
+
+                @Override
+                public void onSuccess() {
+                    messageBean.setDataPath(path);
+                }
+            });
+        } else {
+            messageBean.setDataPath(path);
+        }
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/SystemMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/SystemMessageHolder.java
new file mode 100644
index 0000000..1ef272e
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/SystemMessageHolder.java
@@ -0,0 +1,50 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder;
+
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.SystemMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.databinding.MessageAdapterContentSystemBinding;
+
+/**
+ * 系统消息
+ * */
+public class SystemMessageHolder extends MessageContentHolder{
+    MessageAdapterContentSystemBinding mBinding;
+    public SystemMessageHolder(View itemView) {
+        super(itemView);
+    }
+
+    @Override
+    public int getVariableLayout() {
+        mBinding = MessageAdapterContentSystemBinding.inflate(LayoutInflater.from(itemView.getContext()), msgContentFrame, true);
+        return 0;
+    }
+    @Override
+    public void layoutViews(TUIMessageBean msg, int position) {
+        super.layoutViews(msg, position);
+        msgArea.setBackgroundResource(R.drawable.chat_bubble_custom_message_bg_serious);
+    }
+    @Override
+    public void layoutVariableViews(TUIMessageBean msg, int position) {
+        if (!(msg instanceof SystemMessageBean)) {
+            return;
+        }
+        SystemMessageBean systemMessageBean = (SystemMessageBean) msg;
+        mBinding.tvContent.setText(systemMessageBean.getContent());
+        if(TextUtils.isEmpty(systemMessageBean.getMessageImageUrl())){
+            mBinding.ivMessageImage.setVisibility(View.GONE);
+        }else {
+            mBinding.ivMessageImage.setVisibility(View.VISIBLE);
+            GlideEngine.loadImage(mBinding.ivMessageImage, systemMessageBean.getMessageImageUrl());
+        }
+    }
+    @Override
+    protected void setMessageAreaPadding() {
+        msgArea.setPadding(0, 0, 0, 0);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/TextMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/TextMessageHolder.java
new file mode 100644
index 0000000..6f937fa
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/TextMessageHolder.java
@@ -0,0 +1,87 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder;
+
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.animation.LinearInterpolator;
+import android.view.animation.RotateAnimation;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TextMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+
+public class TextMessageHolder extends MessageContentHolder {
+
+    protected TextView msgBodyText;
+
+    public TextMessageHolder(View itemView) {
+        super(itemView);
+        msgBodyText = itemView.findViewById(R.id.msg_body_tv);
+    }
+
+    @Override
+    public int getVariableLayout() {
+        return R.layout.message_adapter_content_text;
+    }
+
+    @Override
+    public void layoutVariableViews(TUIMessageBean msg, int position) {
+        if (!(msg instanceof TextMessageBean)) {
+            return;
+        }
+        TextMessageBean textMessageBean = (TextMessageBean) msg;
+
+        if (isForwardMode || isReplyDetailMode || !textMessageBean.isSelf()) {
+            int otherTextColorResId = TUIThemeManager.getAttrResId(msgBodyText.getContext(), R.attr.chat_other_msg_text_color);
+            int otherTextColor = msgBodyText.getResources().getColor(otherTextColorResId);
+            msgBodyText.setTextColor(otherTextColor);
+        } else {
+            int selfTextColorResId = TUIThemeManager.getAttrResId(msgBodyText.getContext(), R.attr.chat_self_msg_text_color);
+            int selfTextColor = msgBodyText.getResources().getColor(selfTextColorResId);
+            msgBodyText.setTextColor(selfTextColor);
+        }
+
+        msgBodyText.setVisibility(View.VISIBLE);
+
+        if (properties.getChatContextFontSize() != 0) {
+            msgBodyText.setTextSize(properties.getChatContextFontSize());
+        }
+        if (textMessageBean.isSelf()) {
+            if (properties.getRightChatContentFontColor() != 0) {
+                msgBodyText.setTextColor(properties.getRightChatContentFontColor());
+            }
+        } else {
+            if (properties.getLeftChatContentFontColor() != 0) {
+                msgBodyText.setTextColor(properties.getLeftChatContentFontColor());
+            }
+        }
+
+        msgArea.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    selectableTextHelper.selectAll();
+                    return true;
+                }
+            });
+        boolean isEmoji = false;
+        if (textMessageBean.getText() != null) {
+            isEmoji = FaceManager.handlerEmojiText(msgBodyText, textMessageBean.getText(), false);
+        } else if (!TextUtils.isEmpty(textMessageBean.getExtra())) {
+            isEmoji = FaceManager.handlerEmojiText(msgBodyText, textMessageBean.getExtra(), false);
+        } else {
+            isEmoji = FaceManager.handlerEmojiText(msgBodyText, TUIChatService.getAppContext().getString(R.string.no_support_msg), false);
+        }
+        if (isForwardMode || isReplyDetailMode) {
+            return;
+        }
+        setSelectableTextHelper(msg, msgBodyText, position, isEmoji);
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/TipsMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/TipsMessageHolder.java
new file mode 100644
index 0000000..18e1342
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/TipsMessageHolder.java
@@ -0,0 +1,81 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder;
+
+import android.text.Html;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.TextView;
+
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TipsMessageBean;
+
+public class TipsMessageHolder extends MessageBaseHolder {
+
+    protected TextView mChatTipsTv;
+    protected TextView mReEditText;
+
+    public TipsMessageHolder(View itemView) {
+        super(itemView);
+        mChatTipsTv = itemView.findViewById(R.id.chat_tips_tv);
+        mReEditText = itemView.findViewById(R.id.re_edit);
+    }
+
+    @Override
+    public int getVariableLayout() {
+        return R.layout.message_adapter_content_tips;
+    }
+
+    @Override
+    public void layoutViews(TUIMessageBean msg, int position) {
+        super.layoutViews(msg, position);
+
+        if (properties.getTipsMessageBubble() != null) {
+            mChatTipsTv.setBackground(properties.getTipsMessageBubble());
+        }
+        if (properties.getTipsMessageFontColor() != 0) {
+            mChatTipsTv.setTextColor(properties.getTipsMessageFontColor());
+        }
+        if (properties.getTipsMessageFontSize() != 0) {
+            mChatTipsTv.setTextSize(properties.getTipsMessageFontSize());
+        }
+
+        if (msg.getStatus() == TUIMessageBean.MSG_STATUS_REVOKE) {
+            String showString = itemView.getResources().getString(R.string.revoke_tips_other);
+            if (msg.isSelf()) {
+                int msgType = msg.getMsgType();
+                if (msgType == V2TIMMessage.V2TIM_ELEM_TYPE_TEXT) {
+                    long nowtime = V2TIMManager.getInstance().getServerTime();
+                    long msgtime = msg.getMessageTime();
+                    if ((int) (nowtime - msgtime) < 2 * 60) {
+                        mReEditText.setVisibility(View.VISIBLE);
+                        mReEditText.setOnClickListener(new View.OnClickListener() {
+                            @Override
+                            public void onClick(View view) {
+                                onItemClickListener.onReEditRevokeMessage(view, position, msg);
+                            }
+                        });
+                    } else {
+                        mReEditText.setVisibility(View.GONE);
+                    }
+                }
+                showString = itemView.getResources().getString(R.string.revoke_tips_you);
+            } else if (msg.isGroup()) {
+                String sender = TUIChatConstants.covert2HTMLString(
+                        (TextUtils.isEmpty(msg.getNameCard())
+                                ? msg.getSender()
+                                : msg.getNameCard()));
+                showString = sender + itemView.getResources().getString(R.string.revoke_tips);
+            }
+            mChatTipsTv.setText(Html.fromHtml(showString));
+        }
+
+        if (msg instanceof TipsMessageBean) {
+            mChatTipsTv.setText(Html.fromHtml( ((TipsMessageBean) msg).getText()));
+        }
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/VideoMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/VideoMessageHolder.java
new file mode 100644
index 0000000..ace773f
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/VideoMessageHolder.java
@@ -0,0 +1,179 @@
+package com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder;
+
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+
+import android.content.Intent;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.util.DateTimeUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.VideoMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.component.imagevideoscan.ImageVideoScanActivity;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+import java.io.File;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+public class VideoMessageHolder extends MessageContentHolder {
+
+    private static final int DEFAULT_MAX_SIZE = 540;
+    private static final int DEFAULT_RADIUS = 10;
+    private final List<String> downloadEles = new ArrayList<>();
+    private ImageView contentImage;
+    private ImageView videoPlayBtn;
+    private TextView videoDurationText;
+
+    public VideoMessageHolder(View itemView) {
+        super(itemView);
+        contentImage = itemView.findViewById(R.id.content_image_iv);
+        videoPlayBtn = itemView.findViewById(R.id.video_play_btn);
+        videoDurationText = itemView.findViewById(R.id.video_duration_tv);
+    }
+
+    @Override
+    public int getVariableLayout() {
+        return R.layout.message_adapter_content_image;
+    }
+
+    @Override
+    public void layoutVariableViews(TUIMessageBean msg, int position) {
+        performVideo((VideoMessageBean) msg, position);
+    }
+
+    private ViewGroup.LayoutParams getImageParams(ViewGroup.LayoutParams params, final VideoMessageBean msg) {
+        if (msg.getImgWidth() == 0 || msg.getImgHeight() == 0) {
+            params.width = DEFAULT_MAX_SIZE;
+            params.height = DEFAULT_MAX_SIZE;
+            return params;
+        }
+        if (msg.getImgWidth() > msg.getImgHeight()) {
+            params.width = DEFAULT_MAX_SIZE;
+            params.height = DEFAULT_MAX_SIZE * msg.getImgHeight() / msg.getImgWidth();
+        } else {
+            params.width = DEFAULT_MAX_SIZE * msg.getImgWidth() / msg.getImgHeight();
+            params.height = DEFAULT_MAX_SIZE;
+        }
+        return params;
+    }
+
+
+    private void performVideo(final VideoMessageBean msg, final int position) {
+        contentImage.setLayoutParams(getImageParams(contentImage.getLayoutParams(), msg));
+
+        videoPlayBtn.setVisibility(View.VISIBLE);
+        videoDurationText.setVisibility(View.VISIBLE);
+
+        if (!TextUtils.isEmpty(msg.getDataPath())) {
+            GlideEngine.loadCornerImageWithoutPlaceHolder(contentImage, msg.getDataPath(), null, DEFAULT_RADIUS);
+        } else {
+            GlideEngine.clear(contentImage);
+            synchronized (downloadEles) {
+                if (!downloadEles.contains(msg.getSnapshotUUID())) {
+                    downloadEles.add(msg.getSnapshotUUID());
+                }
+            }
+
+            final String path = TUIConfig.getImageDownloadDir() + msg.getSnapshotUUID();
+            msg.downloadSnapshot(path, new VideoMessageBean.VideoDownloadCallback() {
+                @Override
+                public void onProgress(long currentSize, long totalSize) {
+                    TUIChatLog.i("downloadSnapshot progress current:", currentSize + ", total:" + totalSize);
+                }
+
+                @Override
+                public void onError(int code, String desc) {
+                    downloadEles.remove(msg.getSnapshotUUID());
+                    TUIChatLog.e("MessageAdapter video getImage", code + ":" + desc);
+                }
+
+                @Override
+                public void onSuccess() {
+                    downloadEles.remove(msg.getSnapshotUUID());
+                    msg.setDataPath(path);
+                    GlideEngine.loadCornerImageWithoutPlaceHolder(contentImage, msg.getDataPath(), null, DEFAULT_RADIUS);
+                }
+            });
+        }
+
+        String durations = DateTimeUtil.formatSecondsTo00(msg.getDuration());
+        videoDurationText.setText(durations);
+
+        final String videoPath = TUIConfig.getVideoDownloadDir() + msg.getVideoUUID();
+        final File videoFile = new File(videoPath);
+        if (msg.getStatus() == TUIMessageBean.MSG_STATUS_SEND_SUCCESS) {
+            statusImage.setVisibility(View.GONE);
+            sendingProgress.setVisibility(View.GONE);
+        } else if (videoFile.exists() && msg.getStatus() == TUIMessageBean.MSG_STATUS_SENDING) {
+            statusImage.setVisibility(View.GONE);
+            sendingProgress.setVisibility(View.VISIBLE);
+        } else if (msg.getStatus() == TUIMessageBean.MSG_STATUS_SEND_FAIL) {
+            statusImage.setVisibility(View.VISIBLE);
+            sendingProgress.setVisibility(View.GONE);
+
+        }
+
+        if (isMultiSelectMode) {
+            msgContentFrame.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (onItemClickListener != null) {
+                        onItemClickListener.onMessageClick(v, position, msg);
+                    }
+                }
+            });
+            return;
+        }
+
+        msgContentFrame.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(TUIChatService.getAppContext(), ImageVideoScanActivity.class);
+                intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
+                if (isForwardMode) {
+                    if (getDataSource() != null && !getDataSource().isEmpty()) {
+                        intent.putExtra(TUIChatConstants.OPEN_MESSAGES_SCAN_FORWARD, (Serializable) getDataSource());
+                    }
+                }
+
+                intent.putExtra(TUIChatConstants.OPEN_MESSAGE_SCAN, msg);
+                intent.putExtra(TUIChatConstants.FORWARD_MODE, isForwardMode);
+                TUIChatService.getAppContext().startActivity(intent);
+            }
+        });
+
+        if (msg.getMessageReactBean() == null || msg.getMessageReactBean().getReactSize() <= 0) {
+            msgArea.setBackground(null);
+            msgArea.setPadding(0, 0, 0, 0);
+        }
+    }
+
+    @Override
+    public void setHighLightBackground(int color) {
+        Drawable drawable = contentImage.getDrawable();
+        if (drawable != null) {
+            drawable.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
+        }
+    }
+
+
+    @Override
+    public void clearHighLightBackground() {
+        Drawable drawable = contentImage.getDrawable();
+        if (drawable != null) {
+            drawable.setColorFilter(null);
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/AudioPlayer.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/AudioPlayer.java
new file mode 100644
index 0000000..c8fa118
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/AudioPlayer.java
@@ -0,0 +1,85 @@
+package com.tencent.qcloud.tuikit.tuichat.component;
+
+import android.media.MediaPlayer;
+
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+public class AudioPlayer {
+
+    private static final String TAG = AudioPlayer.class.getSimpleName();
+    private static AudioPlayer sInstance = new AudioPlayer();
+    private Callback mPlayCallback;
+
+    private String mAudioRecordPath;
+    private MediaPlayer mPlayer;
+
+    private AudioPlayer() {
+    }
+
+    public static AudioPlayer getInstance() {
+        return sInstance;
+    }
+
+    public void startPlay(String filePath, Callback callback) {
+        mAudioRecordPath = filePath;
+        mPlayCallback = callback;
+        try {
+            mPlayer = new MediaPlayer();
+            mPlayer.setDataSource(filePath);
+            mPlayer.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
+                @Override
+                public void onCompletion(MediaPlayer mp) {
+                    stopInternalPlay();
+                    onPlayCompleted(true);
+                }
+            });
+            mPlayer.prepare();
+            mPlayer.start();
+        } catch (Exception e) {
+            TUIChatLog.w(TAG, "startPlay failed", e);
+            ToastUtil.toastLongMessage(TUIChatService.getAppContext().getString(R.string.play_error_tip));
+            stopInternalPlay();
+            onPlayCompleted(false);
+        }
+    }
+
+    public void stopPlay() {
+        stopInternalPlay();
+        onPlayCompleted(false);
+        mPlayCallback = null;
+    }
+
+    private void stopInternalPlay() {
+        if (mPlayer == null) {
+            return;
+        }
+        mPlayer.release();
+        mPlayer = null;
+    }
+
+    public boolean isPlaying() {
+        if (mPlayer != null && mPlayer.isPlaying()) {
+            return true;
+        }
+        return false;
+    }
+
+    private void onPlayCompleted(boolean success) {
+        if (mPlayCallback != null) {
+            mPlayCallback.onCompletion(success);
+        }
+        mPlayer = null;
+    }
+
+    public String getPath() {
+        return mAudioRecordPath;
+    }
+
+    public interface Callback {
+        void onCompletion(Boolean success);
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/AudioRecorder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/AudioRecorder.java
new file mode 100644
index 0000000..e0f071d
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/AudioRecorder.java
@@ -0,0 +1,299 @@
+package com.tencent.qcloud.tuikit.tuichat.component;
+
+import android.media.MediaPlayer;
+import android.media.MediaRecorder;
+import android.os.Handler;
+import android.text.TextUtils;
+
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.config.TUIChatConfigs;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.AudioRecordEventListener;
+import com.tencent.qcloud.tuikit.tuichat.model.AIDenoiseSignatureManager;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class AudioRecorder {
+
+    private static final String TAG = AudioRecorder.class.getSimpleName();
+    private static AudioRecorder sInstance = new AudioRecorder();
+    private static String CURRENT_RECORD_FILE = TUIConfig.getRecordDir() + "auto_";
+    private static int MAGIC_NUMBER = 500;
+    private static int MIN_RECORD_DURATION = 1000;
+    private Callback mRecordCallback;
+
+    private String mAudioRecordPath;
+    private MediaRecorder mRecorder;
+    private Handler mHandler;
+
+    private boolean mIsCallkitRecorder;
+    private AudioRecordEventListener mCallkitAudioRecordEventListener;
+
+    private AudioRecorder() {
+        mHandler = new Handler();
+        initCallkitAudioRecordListener();
+    }
+
+    public static AudioRecorder getInstance() {
+        return sInstance;
+    }
+
+    private void initCallkitAudioRecordListener() {
+        mCallkitAudioRecordEventListener = new AudioRecordEventListener() {
+            @Override
+            public void onRecordBegin(int errorCode, String path) {
+                TUIChatLog.i(TAG, "callkit recorder begin, errorCode:" + errorCode);
+                switch (errorCode) {
+                    case TUIConstants.TUICalling.ERROR_NONE:
+                        mHandler.postDelayed(new Runnable() {
+                            @Override
+                            public void run() {
+                                stopCallkitRecord();
+                                onRecordCompleted(true);
+                                ToastUtil.toastShortMessage(TUIChatService.getAppContext().getString(R.string.record_limit_tips));
+                            }
+                        }, TUIChatConfigs.getConfigs().getGeneralConfig().getAudioRecordMaxTime() * 1000);
+                        return;
+
+                    case TUIConstants.TUICalling.ERROR_STATUS_IN_CALL:
+                        mHandler.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                onRecordCompleted(false);
+                                ToastUtil.toastShortMessage(TUIChatService.getAppContext().getString(R.string.record_rejected_for_in_call));
+                            }
+                        });
+                        return;
+                    case TUIConstants.TUICalling.ERROR_STATUS_IS_AUDIO_RECORDING:
+                        mHandler.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                onRecordCompleted(false);
+                                ToastUtil.toastShortMessage(TUIChatService.getAppContext().getString(R.string.record_rejected_for_in_recording));
+                            }
+                        });
+                        return;
+                    case TUIConstants.TUICalling.ERROR_MIC_PERMISSION_REFUSED:
+                        mHandler.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                stopCallkitRecord();
+                                onRecordCompleted(false);
+                                ToastUtil.toastShortMessage(TUIChatService.getAppContext().getString(R.string.audio_permission_error));
+                            }
+                        });
+                        return;
+                    case TUIConstants.TUICalling.ERROR_REQUEST_AUDIO_FOCUS_FAILED:
+                    case TUIConstants.TUICalling.ERROR_RECORD_INIT_FAILED:
+                    case TUIConstants.TUICalling.ERR_MIC_START_FAIL:
+                    case TUIConstants.TUICalling.ERR_MIC_NOT_AUTHORIZED:
+                    case TUIConstants.TUICalling.ERR_MIC_SET_PARAM_FAIL:
+                    case TUIConstants.TUICalling.ERR_MIC_OCCUPY:
+                        mHandler.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                stopCallkitRecord();
+                                onRecordCompleted(false);
+                            }
+                        });
+                        return;
+                    case TUIConstants.TUICalling.ERROR_PATH_FORMAT_NOT_SUPPORT:
+                    case TUIConstants.TUICalling.ERROR_INVALID_PARAM:
+                    case TUIConstants.TUICalling.ERROR_SIGNATURE_ERROR:
+                    case TUIConstants.TUICalling.ERROR_SIGNATURE_EXPIRED:
+                    default:
+                        mHandler.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                stopCallkitRecord();
+                                startSystemRecorder();
+                            }
+                        });
+                        return;
+                }
+
+            }
+
+            @Override
+            public void onRecordComplete(int errorCode, String path) {
+                TUIChatLog.i(TAG, "callkit recorder complete, errorCode:" + errorCode);
+                switch (errorCode) {
+                    case TUIConstants.TUICalling.ERROR_NONE:
+                        onRecordCompleted(true);
+                        return;
+                    case TUIConstants.TUICalling.ERROR_NO_MESSAGE_TO_RECORD:
+                    case TUIConstants.TUICalling.ERROR_RECORD_FAILED:
+                        onRecordCompleted(false);
+                        break;
+                    default:
+                        break;
+                }
+            }
+        };
+
+        TUIChatService.getInstance().addAudioRecordEventListener(mCallkitAudioRecordEventListener);
+    }
+
+    public void startRecord(Callback callback) {
+        mRecordCallback = callback;
+        mAudioRecordPath = CURRENT_RECORD_FILE + System.currentTimeMillis() + ".m4a";
+        if (!startCallkitRecorder()) {
+            startSystemRecorder();
+        }
+    }
+
+    private boolean startCallkitRecorder() {
+        if (TUICore.getService(TUIConstants.TUICalling.SERVICE_NAME_AUDIO_RECORD) == null) {
+            TUIChatLog.i(TAG, "audio record service does not exists");
+            return false;
+        }
+
+        String signature = AIDenoiseSignatureManager.getInstance().getSignature();
+        if (TextUtils.isEmpty(signature)) {
+            TUIChatLog.e(TAG, "denoise signature is empty");
+            return false;
+        }
+
+        Map<String, Object> audioRecordParam = new HashMap<>();
+        audioRecordParam.put(TUIConstants.TUICalling.PARAM_NAME_AUDIO_SIGNATURE, signature);
+        audioRecordParam.put(TUIConstants.TUICalling.PARAM_NAME_SDK_APP_ID, TUILogin.getSdkAppId());
+        audioRecordParam.put(TUIConstants.TUICalling.PARAM_NAME_AUDIO_PATH, mAudioRecordPath);
+        TUICore.callService(TUIConstants.TUICalling.SERVICE_NAME_AUDIO_RECORD, TUIConstants.TUICalling.METHOD_NAME_START_RECORD_AUDIO_MESSAGE, audioRecordParam);
+
+        mIsCallkitRecorder = true;
+        TUIChatLog.i(TAG, "use callkit recorder");
+        return true;
+    }
+
+    private void startSystemRecorder() {
+        TUIChatLog.i(TAG, "use system media recorder");
+        mIsCallkitRecorder = false;
+        try {
+            mRecorder = new MediaRecorder();
+            mRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
+            mRecorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4);
+            mRecorder.setOutputFile(mAudioRecordPath);
+            mRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
+            mRecorder.prepare();
+            mRecorder.start();
+            mHandler.removeCallbacksAndMessages(null);
+            mHandler.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    stopInternalRecord();
+                    onRecordCompleted(true);
+                    ToastUtil.toastShortMessage(TUIChatService.getAppContext().getString(R.string.record_limit_tips));
+                }
+            }, TUIChatConfigs.getConfigs().getGeneralConfig().getAudioRecordMaxTime() * 1000);
+            updateMicStatus();
+        } catch (Exception e) {
+            TUIChatLog.w(TAG, "startRecord failed", e);
+            stopInternalRecord();
+            onRecordCompleted(false);
+        }
+    }
+
+    public void stopRecord() {
+        if (mIsCallkitRecorder) {
+            stopCallkitRecord();
+        } else {
+            stopMediaRecord();
+        }
+    }
+
+    private void stopCallkitRecord() {
+        mHandler.removeCallbacksAndMessages(null);
+        TUICore.callService(TUIConstants.TUICalling.SERVICE_NAME_AUDIO_RECORD, TUIConstants.TUICalling.METHOD_NAME_STOP_RECORD_AUDIO_MESSAGE, null);
+    }
+
+    private void stopMediaRecord() {
+        stopInternalRecord();
+        onRecordCompleted(true);
+    }
+
+    private void stopInternalRecord() {
+        mHandler.removeCallbacksAndMessages(null);
+        if (mRecorder == null) {
+            return;
+        }
+        mRecorder.release();
+        mRecorder = null;
+    }
+
+    private void onRecordCompleted(boolean success) {
+        if (mRecordCallback != null) {
+            mRecordCallback.onCompletion(success);
+            mRecordCallback = null;
+        }
+
+        if (!mIsCallkitRecorder && mRecorder != null) {
+            mRecorder = null;
+        }
+    }
+
+    public String getPath() {
+        return mAudioRecordPath;
+    }
+
+    public int getDuration() {
+        if (TextUtils.isEmpty(mAudioRecordPath)) {
+            return 0;
+        }
+        int duration = 0;
+        // 通过初始化播放器的方式来获取真实的音频长度
+        // Get the real audio length by initializing the player
+        try {
+            MediaPlayer mp = new MediaPlayer();
+            mp.setDataSource(mAudioRecordPath);
+            mp.prepare();
+            duration = mp.getDuration();
+            // 语音长度如果是59s多，因为外部会/1000取整，会一直显示59'，所以这里对长度进行处理，达到四舍五入的效果
+            // the length is processed to achieve the effect of rounding
+            if (duration < MIN_RECORD_DURATION) {
+                duration = 0;
+            } else {
+                duration = duration + MAGIC_NUMBER;
+            }
+        } catch (Exception e) {
+            TUIChatLog.w(TAG, "getDuration failed", e);
+        }
+        if (duration < 0) {
+            duration = 0;
+        }
+        return duration;
+    }
+
+    private void updateMicStatus() {
+        if (mRecorder != null) {
+            double ratio = (double) mRecorder.getMaxAmplitude() / 1;   // 参考振幅为 1
+            double db = 0;// 分贝
+            if (ratio > 1) {
+                db = 20 * Math.log10(ratio);
+            }
+            TUIChatLog.d(TAG, "计算分贝值 = " + db + "dB");
+            if (mRecordCallback != null) {
+                mRecordCallback.onVoiceDb(db);
+            }
+            mHandler.postDelayed(mUpdateMicStatusTimer, 100); // 间隔取样时间为100秒
+        }
+    }
+
+    private Runnable mUpdateMicStatusTimer = new Runnable() {
+        public void run() {
+            updateMicStatus();
+        }
+    };
+
+    public interface Callback {
+        void onCompletion(Boolean success);
+        void onVoiceDb(double db);
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/face/ChatFace.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/face/ChatFace.java
new file mode 100644
index 0000000..3cb4167
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/face/ChatFace.java
@@ -0,0 +1,51 @@
+package com.tencent.qcloud.tuikit.tuichat.component.face;
+
+import java.io.Serializable;
+
+public class ChatFace implements Serializable {
+    private int width;
+    private int height;
+    protected String faceUrl;
+    private FaceGroup faceGroup;
+    private String faceKey;
+
+    public void setFaceKey(String faceKey) {
+        this.faceKey = faceKey;
+    }
+
+    public String getFaceKey() {
+        return faceKey;
+    }
+
+    public void setFaceGroup(FaceGroup faceGroup) {
+        this.faceGroup = faceGroup;
+    }
+
+    public FaceGroup getFaceGroup() {
+        return faceGroup;
+    }
+
+    public void setWidth(int width) {
+        this.width = width;
+    }
+
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    public void setFaceUrl(String faceUrl) {
+        this.faceUrl = faceUrl;
+    }
+
+    public String getFaceUrl() {
+        return faceUrl;
+    }
+
+    public int getHeight() {
+        return height;
+    }
+
+    public int getWidth() {
+        return width;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/face/CustomFace.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/face/CustomFace.java
new file mode 100644
index 0000000..971a37b
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/face/CustomFace.java
@@ -0,0 +1,18 @@
+package com.tencent.qcloud.tuikit.tuichat.component.face;
+
+/**
+ * 自定义表情属性类
+ * 
+ * Custom expression attribute class
+ */
+public class CustomFace extends ChatFace {
+
+    /**
+     * 设置表情在asset中的路径
+     *
+     * @param assetPath
+     */
+    public void setAssetPath(String assetPath) {
+        this.faceUrl = "file:///android_asset/" + assetPath;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/face/Emoji.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/face/Emoji.java
new file mode 100644
index 0000000..2d9aeaf
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/face/Emoji.java
@@ -0,0 +1,14 @@
+package com.tencent.qcloud.tuikit.tuichat.component.face;
+
+import android.graphics.Bitmap;
+
+public class Emoji extends ChatFace {
+    private Bitmap icon;
+    public Bitmap getIcon() {
+        return icon;
+    }
+
+    public void setIcon(Bitmap icon) {
+        this.icon = icon;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/face/FaceGroup.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/face/FaceGroup.java
new file mode 100644
index 0000000..2bd4abb
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/face/FaceGroup.java
@@ -0,0 +1,90 @@
+package com.tencent.qcloud.tuikit.tuichat.component.face;
+
+import android.text.TextUtils;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class FaceGroup {
+    private int groupID;
+    private String groupName;
+    private String desc;
+    private String faceGroupIconUrl;
+    private int pageRowCount;
+    private int pageColumnCount;
+    private final Map<String, ChatFace> faces = new LinkedHashMap<>();
+
+    public int getGroupID() {
+        return groupID;
+    }
+
+    public void setGroupID(int groupID) {
+        this.groupID = groupID;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public void setFaceGroupIconUrl(String faceGroupIconUrl) {
+        this.faceGroupIconUrl = faceGroupIconUrl;
+    }
+
+    public String getFaceGroupIconUrl() {
+        return faceGroupIconUrl;
+    }
+
+    public int getPageRowCount() {
+        return pageRowCount;
+    }
+
+    public void setPageRowCount(int pageRowCount) {
+        this.pageRowCount = pageRowCount;
+    }
+
+    public int getPageColumnCount() {
+        return pageColumnCount;
+    }
+
+    public void setPageColumnCount(int pageColumnCount) {
+        this.pageColumnCount = pageColumnCount;
+    }
+
+    public ArrayList<ChatFace> getFaces() {
+        return new ArrayList<>(faces.values());
+    }
+
+    public void addFace(String faceKey, ChatFace face) {
+        face.setFaceGroup(this);
+        faces.put(faceKey, face);
+    }
+
+    public ChatFace getFace(String faceKey) {
+        if (TextUtils.isEmpty(faceKey)) {
+            return null;
+        }
+        ChatFace face = faces.get(faceKey);
+        if (face == null) {
+            int index = faceKey.lastIndexOf("@2x");
+            if (index == -1) {
+                return null;
+            }
+            String oldFaceKey = faceKey.substring(0, index);
+            face = faces.get(oldFaceKey);
+        }
+        return face;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/face/FaceManager.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/face/FaceManager.java
new file mode 100644
index 0000000..86fa308
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/face/FaceManager.java
@@ -0,0 +1,459 @@
+package com.tencent.qcloud.tuikit.tuichat.component.face;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.text.Editable;
+import android.text.Spannable;
+import android.text.SpannableStringBuilder;
+import android.text.TextUtils;
+import android.text.style.ImageSpan;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuicore.util.ThreadHelper;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutionException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class FaceManager {
+    private static final String TAG = "FaceManager";
+
+    private static final class FaceManagerHolder {
+        @SuppressLint("StaticFieldLeak")
+        private static final FaceManager instance = new FaceManager();
+    }
+
+    public static final int EMOJI_GROUP_ID = 0;
+    private static final int EMOJI_SIZE = 20;
+    private static final int EMOJI_COLUMN_COUNT = 8;
+    private static final int EMOJI_ROW_COUNT = 3;
+
+    private final Map<String, Emoji> emojiMap = new LinkedHashMap<>();
+    private final Context context;
+    private final String[] emojiKeys;
+    private final String[] emojiNames;
+
+    private final Map<Integer, FaceGroup> faceGroupMap = new ConcurrentHashMap<>();
+
+    /**
+     * Does the emojis need to be loaded
+     * 表情是否需要加载
+     */
+    private boolean needLoad = true;
+
+    private FaceManager() {
+        context = TUIChatService.getAppContext();
+        emojiKeys = context.getResources().getStringArray(R.array.emoji_key);
+        emojiNames = context.getResources().getStringArray(R.array.emoji_name);
+    }
+
+    public static FaceManager getInstance() {
+        return FaceManagerHolder.instance;
+    }
+
+    public static ArrayList<Emoji> getEmojiList() {
+        return new ArrayList<>(getInstance().emojiMap.values());
+    }
+
+    /**
+     * add a new faceGroup
+     * @param groupID must >= 1
+     * @param faceGroup the faceGroup be added
+     */
+    public static void addFaceGroup(int groupID, FaceGroup faceGroup) {
+        faceGroup.setGroupID(groupID);
+        getInstance().faceGroupMap.put(groupID, faceGroup);
+    }
+
+    public static List<FaceGroup> getFaceGroupList() {
+        return new ArrayList<>(getInstance().faceGroupMap.values());
+    }
+
+    public static String[] getEmojiNames(){
+        return getInstance().emojiNames;
+    }
+
+    public static String[] getEmojiKey(){
+        return getInstance().emojiKeys;
+    }
+
+    public static void loadEmojis() {
+        getInstance().internalLoadEmojis();
+    }
+
+    private synchronized void internalLoadEmojis() {
+        if (!needLoad) {
+            return;
+        }
+        needLoad = false;
+        TUIChatLog.i(TAG, "start load emojis");
+        Thread loadEmojiThread = new Thread() {
+            @Override
+            public void run() {
+                // load chat default emojis
+                FaceGroup emojiFaceGroup = new FaceGroup();
+                for (String emojiKey : getInstance().emojiKeys) {
+                    String emojiFilePath = "emoji/" + emojiKey + "@2x.png";
+                    Emoji emoji = loadAssetEmoji(emojiKey, emojiFilePath);
+                    if (emoji != null) {
+                        emojiMap.put(emojiKey, emoji);
+                        emojiFaceGroup.addFace(emojiKey, emoji);
+                    }
+                }
+                emojiFaceGroup.setPageColumnCount(EMOJI_COLUMN_COUNT);
+                emojiFaceGroup.setPageRowCount(EMOJI_ROW_COUNT);
+                emojiFaceGroup.setFaceGroupIconUrl("file:///android_asset/emoji/[可爱]@2x.png");
+                addFaceGroup(EMOJI_GROUP_ID, emojiFaceGroup);
+                TUIChatLog.i(TAG, "load emojis finished");
+            }
+        };
+        loadEmojiThread.setName("TUIChatLoadEmojiThread");
+        ThreadHelper.INST.execute(loadEmojiThread);
+    }
+
+    private Emoji loadAssetEmoji(String emojiKey, String assetFilePath) {
+        String realPath = "file:///android_asset/" + assetFilePath;
+        int emojiSize = ScreenUtil.dip2px(EMOJI_SIZE);
+        Bitmap bitmap = loadBitmap(realPath, emojiSize, emojiSize);
+        if (bitmap == null) {
+            return null;
+        }
+        Emoji emoji = new Emoji();
+        emoji.setIcon(bitmap);
+        emoji.setFaceKey(emojiKey);
+        return emoji;
+    }
+
+    private Bitmap loadBitmap(String resUrl, int width, int height) {
+        Bitmap bitmap = null;
+        try {
+            bitmap = Glide.with(context)
+                    .asBitmap()
+                    .load(resUrl)
+                    .apply(new RequestOptions().error(android.R.drawable.ic_menu_report_image))
+                    .submit(width, height)
+                    .get();
+        } catch (InterruptedException | ExecutionException e) {
+            TUIChatLog.e(TAG, "load bitmap failed : " + e.getMessage());
+        }
+        return bitmap;
+    }
+
+    public static void loadFace(ChatFace chatFace, ImageView imageView) {
+        getInstance().internalLoadFace(chatFace, imageView, true);
+    }
+
+    private void internalLoadFace(ChatFace chatFace, ImageView imageView, boolean isBitMap) {
+        if (imageView == null || chatFace == null) {
+            return;
+        }
+        if (chatFace instanceof Emoji) {
+            Glide.with(imageView.getContext())
+                    .load(((Emoji) chatFace).getIcon())
+                    .centerInside()
+                    .apply(new RequestOptions().error(android.R.drawable.ic_menu_report_image))
+                    .into(imageView);
+            return;
+        }
+        String faceUrl = "";
+        FaceGroup faceGroup = chatFace.getFaceGroup();
+        if (faceGroup != null) {
+            ChatFace face = faceGroup.getFace(chatFace.getFaceKey());
+            if (face != null) {
+                faceUrl = face.getFaceUrl();
+            }
+        }
+        if (isBitMap) {
+            Glide.with(imageView.getContext())
+                    .asBitmap()
+                    .load(faceUrl)
+                    .centerInside()
+                    .apply(new RequestOptions().error(android.R.drawable.ic_menu_report_image))
+                    .into(imageView);
+        } else {
+            Glide.with(imageView.getContext())
+                    .load(faceUrl)
+                    .centerInside()
+                    .apply(new RequestOptions().error(android.R.drawable.ic_menu_report_image))
+                    .into(imageView);
+        }
+    }
+
+    public static void loadFace(int faceGroupID, String faceKey, ImageView view) {
+        getInstance().internalLoadFace(faceGroupID, faceKey, view);
+    }
+
+    private void internalLoadFace(int faceGroupID, String faceKey, ImageView imageView) {
+        if (imageView == null) {
+            return;
+        }
+        if (TextUtils.isEmpty(faceKey)) {
+            Glide.with(imageView.getContext())
+                    .load(android.R.drawable.ic_menu_report_image)
+                    .centerInside()
+                    .into(imageView);
+            return;
+        }
+        String faceUrl = "";
+        FaceGroup faceGroup = faceGroupMap.get(faceGroupID);
+        if (faceGroup != null) {
+            ChatFace face = faceGroup.getFace(faceKey);
+            if (face != null) {
+                faceUrl = face.getFaceUrl();
+            }
+        }
+        Glide.with(imageView.getContext())
+                .load(faceUrl)
+                .centerInside()
+                .apply(new RequestOptions().error(android.R.drawable.ic_menu_report_image))
+                .into(imageView);
+    }
+
+    public static Map<String, Emoji> getEmojiMap() {
+        return getInstance().emojiMap;
+    }
+
+    public static boolean isFaceChar(String faceChar) {
+        return getEmojiMap().get(faceChar) != null;
+    }
+
+    public static boolean handlerEmojiText(TextView comment, CharSequence content, boolean typing) {
+        if (content == null) {
+            comment.setText(null);
+            return false;
+        }
+
+        Spannable spannable;
+        if (comment instanceof EditText && content instanceof Editable) {
+            spannable = (Editable) content;
+            ImageSpan[] imageSpans = ((Editable) content).getSpans(0, content.length(), ImageSpan.class);
+            for (ImageSpan span : imageSpans) {
+                ((Editable) content).removeSpan(span);
+            }
+        } else {
+            spannable = new SpannableStringBuilder(content);
+        }
+        String regex = "\\[(\\S+?)\\]";
+        Pattern p = Pattern.compile(regex);
+        Matcher m = p.matcher(content);
+        boolean imageFound = false;
+        while (m.find()) {
+            String emojiName = m.group();
+            Emoji emoji = getEmojiMap().get(emojiName);
+            if (emoji != null) {
+                Bitmap bitmap = emoji.getIcon();
+                if (bitmap != null) {
+                    imageFound = true;
+
+                    ImageSpan imageSpan = new ImageSpan(getInstance().context, bitmap);
+                    spannable.setSpan(imageSpan, m.start(), m.end(), Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+                }
+            }
+        }
+        // 如果没有发现表情图片，并且当前是输入状态，不再重设输入框
+        // If no emoticon picture is found, and it is currently in the input state, the input box will not be reset.
+        if (!imageFound && typing) {
+            return false;
+        }
+        int selection = comment.getSelectionStart();
+        if (!(comment instanceof EditText)) {
+            comment.setText(spannable);
+        }
+        if (comment instanceof EditText) {
+            ((EditText) comment).setSelection(selection);
+        }
+
+        return true;
+    }
+
+    public static Bitmap getEmoji(String name) {
+        Emoji emoji = getEmojiMap().get(name);
+        if (emoji != null) {
+            return emoji.getIcon();
+        }
+        return null;
+    }
+
+    public static String emojiJudge(String text){
+        if (TextUtils.isEmpty(text)){
+            return "";
+        }
+
+        String[] emojiList = FaceManager.getEmojiKey();
+        if (emojiList ==null || emojiList.length == 0){
+            return text;
+        }
+        SpannableStringBuilder sb = new SpannableStringBuilder(text);
+        String regex = "\\[(\\S+?)\\]";
+        Pattern p = Pattern.compile(regex);
+        Matcher m = p.matcher(text);
+        ArrayList<EmojiData> emojiDataArrayList = new ArrayList<>();
+        // 遍历找到匹配字符并存储
+        // Traverse to find matching characters and store
+        int lastMentionIndex = -1;
+        while (m.find()) {
+            String emojiName = m.group();
+            int start;
+            if (lastMentionIndex != -1) {
+                start = text.indexOf(emojiName, lastMentionIndex);
+            } else {
+                start = text.indexOf(emojiName);
+            }
+            int end = start + emojiName.length();
+            lastMentionIndex = end;
+
+            int index = findEmoji(emojiName);
+            String[] emojiListValues = FaceManager.getEmojiNames();
+            if (index != -1 && emojiListValues != null && emojiListValues.length >= index){
+                emojiName = emojiListValues[index];
+            }
+
+            EmojiData emojiData =new EmojiData();
+            emojiData.setStart(start);
+            emojiData.setEnd(end);
+            emojiData.setEmojiText(emojiName);
+
+            emojiDataArrayList.add(emojiData);
+        }
+
+        // 倒叙替换
+        // flashback replacement
+        if (emojiDataArrayList.isEmpty()){
+            return text;
+        }
+        for (int i = emojiDataArrayList.size() - 1; i >= 0; i--){
+            EmojiData emojiData = emojiDataArrayList.get(i);
+            String emojiName = emojiData.getEmojiText();
+            int start = emojiData.getStart();
+            int end = emojiData.getEnd();
+
+            if (!TextUtils.isEmpty(emojiName) && start != -1 && end != -1) {
+                sb.replace(start, end, emojiName);
+            }
+        }
+        return sb.toString();
+    }
+
+    public static List<String> findEmojiKeyListFromText(String text) {
+        if (TextUtils.isEmpty(text)) {
+            return null;
+        }
+        List<String> emojiKeyList = new ArrayList<>();
+        // TUIKit custom emoji.
+        String regexOfCustomEmoji = "\\[(\\S+?)\\]";
+        Pattern patternOfCustomEmoji = Pattern.compile(regexOfCustomEmoji);
+        Matcher matcherOfCustomEmoji = patternOfCustomEmoji.matcher(text);
+        while (matcherOfCustomEmoji.find()) {
+            String emojiName = matcherOfCustomEmoji.group();
+            Emoji emoji = getEmojiMap().get(emojiName);
+            if (emoji != null) {
+                Bitmap bitmap = emoji.getIcon();
+                if (bitmap != null) {
+                    emojiKeyList.add(emojiName);
+                }
+            }
+        }
+
+        // Universal standard emoji.
+        String regexOfUniversalEmoji = getRegexOfUniversalEmoji();
+        Pattern patternOfUniversalEmoji = Pattern.compile(regexOfUniversalEmoji);
+        Matcher matcherOfUniversalEmoji = patternOfUniversalEmoji.matcher(text);
+        while (matcherOfUniversalEmoji.find()) {
+            String emojiKey = matcherOfUniversalEmoji.group();
+            if (!TextUtils.isEmpty(emojiKey)) {
+                emojiKeyList.add(matcherOfUniversalEmoji.group());
+            }
+        }
+
+        return emojiKeyList;
+    }
+
+    private static int findEmoji(String text){
+        int result = -1;
+        if (TextUtils.isEmpty(text)){
+            return result;
+        }
+
+        String[] emojiList = FaceManager.getEmojiKey();
+        if (emojiList == null || emojiList.length == 0){
+            return result;
+        }
+
+        for (int i = 0; i < emojiList.length; i++){
+            if (text.equals(emojiList[i])){
+                result = i;
+                break;
+            }
+        }
+
+        return result;
+    }
+
+    private static class EmojiData {
+        private int start;
+        private int end;
+        private String emojiText;
+
+        public int getEnd() {
+            return end;
+        }
+
+        public void setEnd(int end) {
+            this.end = end;
+        }
+
+        public int getStart() {
+            return start;
+        }
+
+        public void setStart(int start) {
+            this.start = start;
+        }
+
+        public String getEmojiText() {
+            return emojiText;
+        }
+
+        public void setEmojiText(String emojiText) {
+            this.emojiText = emojiText;
+        }
+    }
+
+    // Regex of universal emoji, refer to https://unicode.org/reports/tr51/#EBNF_and_Regex
+    private static String getRegexOfUniversalEmoji() {
+        String RI = "[\\U0001F1E6-\\U0001F1FF]";
+        // \u0023(#), \u002A(*), \u0030(keycap 0), \u0039(keycap 9), \u00A9(©), \u00AE(®) couldn't be added to NSString directly, need to transform a little bit.
+        String unsupport = "0x0023|0x002A|[0x0030-0x0039]|";
+        String support = "\\U000000A9|\\U000000AE|\\u203C|\\u2049|\\u2122|\\u2139|[\\u2194-\\u2199]|[\\u21A9-\\u21AA]|[\\u231A-\\u231B]|\\u2328|\\u23CF|[\\u23E9-\\u23EF]|[\\u23F0-\\u23F3]|[\\u23F8-\\u23FA]|\\u24C2|[\\u25AA-\\u25AB]|\\u25B6|\\u25C0|[\\u25FB-\\u25FE]|[\\u2600-\\u2604]|\\u260E|\\u2611|[\\u2614-\\u2615]|\\u2618|\\u261D|\\u2620|[\\u2622-\\u2623]|\\u2626|\\u262A|[\\u262E-\\u262F]|[\\u2638-\\u263A]|\\u2640|\\u2642|[\\u2648-\\u264F]|[\\u2650-\\u2653]|\\u265F|\\u2660|\\u2663|[\\u2665-\\u2666]|\\u2668|\\u267B|[\\u267E-\\u267F]|[\\u2692-\\u2697]|\\u2699|[\\u269B-\\u269C]|[\\u26A0-\\u26A1]|\\u26A7|[\\u26AA-\\u26AB]|[\\u26B0-\\u26B1]|[\\u26BD-\\u26BE]|[\\u26C4-\\u26C5]|\\u26C8|[\\u26CE-\\u26CF]|\\u26D1|[\\u26D3-\\u26D4]|[\\u26E9-\\u26EA]|[\\u26F0-\\u26F5]|[\\u26F7-\\u26FA]|\\u26FD|\\u2702|\\u2705|[\\u2708-\\u270D]|\\u270F|\\u2712|\\u2714|\\u2716|\\u271D|\\u2721|\\u2728|[\\u2733-\\u2734]|\\u2744|\\u2747|\\u274C|\\u274E|[\\u2753-\\u2755]|\\u2757|[\\u2763-\\u2764]|[\\u2795-\\u2797]|\\u27A1|\\u27B0|\\u27BF|[\\u2934-\\u2935]|[\\u2B05-\\u2B07]|[\\u2B1B-\\u2B1C]|\\u2B50|\\u2B55|\\u3030|\\u303D|\\u3297|\\u3299|\\U0001F004|\\U0001F0CF|[\\U0001F170-\\U0001F171]|[\\U0001F17E-\\U0001F17F]|\\U0001F18E|[\\U0001F191-\\U0001F19A]|[\\U0001F1E6-\\U0001F1FF]|[\\U0001F201-\\U0001F202]|\\U0001F21A|\\U0001F22F|[\\U0001F232-\\U0001F23A]|[\\U0001F250-\\U0001F251]|[\\U0001F300-\\U0001F30F]|[\\U0001F310-\\U0001F31F]|[\\U0001F320-\\U0001F321]|[\\U0001F324-\\U0001F32F]|[\\U0001F330-\\U0001F33F]|[\\U0001F340-\\U0001F34F]|[\\U0001F350-\\U0001F35F]|[\\U0001F360-\\U0001F36F]|[\\U0001F370-\\U0001F37F]|[\\U0001F380-\\U0001F38F]|[\\U0001F390-\\U0001F393]|[\\U0001F396-\\U0001F397]|[\\U0001F399-\\U0001F39B]|[\\U0001F39E-\\U0001F39F]|[\\U0001F3A0-\\U0001F3AF]|[\\U0001F3B0-\\U0001F3BF]|[\\U0001F3C0-\\U0001F3CF]|[\\U0001F3D0-\\U0001F3DF]|[\\U0001F3E0-\\U0001F3EF]|\\U0001F3F0|[\\U0001F3F3-\\U0001F3F5]|[\\U0001F3F7-\\U0001F3FF]|[\\U0001F400-\\U0001F40F]|[\\U0001F410-\\U0001F41F]|[\\U0001F420-\\U0001F42F]|[\\U0001F430-\\U0001F43F]|[\\U0001F440-\\U0001F44F]|[\\U0001F450-\\U0001F45F]|[\\U0001F460-\\U0001F46F]|[\\U0001F470-\\U0001F47F]|[\\U0001F480-\\U0001F48F]|[\\U0001F490-\\U0001F49F]|[\\U0001F4A0-\\U0001F4AF]|[\\U0001F4B0-\\U0001F4BF]|[\\U0001F4C0-\\U0001F4CF]|[\\U0001F4D0-\\U0001F4DF]|[\\U0001F4E0-\\U0001F4EF]|[\\U0001F4F0-\\U0001F4FF]|[\\U0001F500-\\U0001F50F]|[\\U0001F510-\\U0001F51F]|[\\U0001F520-\\U0001F52F]|[\\U0001F530-\\U0001F53D]|[\\U0001F549-\\U0001F54E]|[\\U0001F550-\\U0001F55F]|[\\U0001F560-\\U0001F567]|\\U0001F56F|\\U0001F570|[\\U0001F573-\\U0001F57A]|\\U0001F587|[\\U0001F58A-\\U0001F58D]|\\U0001F590|[\\U0001F595-\\U0001F596]|[\\U0001F5A4-\\U0001F5A5]|\\U0001F5A8|[\\U0001F5B1-\\U0001F5B2]|\\U0001F5BC|[\\U0001F5C2-\\U0001F5C4]|[\\U0001F5D1-\\U0001F5D3]|[\\U0001F5DC-\\U0001F5DE]|\\U0001F5E1|\\U0001F5E3|\\U0001F5E8|\\U0001F5EF|\\U0001F5F3|[\\U0001F5FA-\\U0001F5FF]|[\\U0001F600-\\U0001F60F]|[\\U0001F610-\\U0001F61F]|[\\U0001F620-\\U0001F62F]|[\\U0001F630-\\U0001F63F]|[\\U0001F640-\\U0001F64F]|[\\U0001F650-\\U0001F65F]|[\\U0001F660-\\U0001F66F]|[\\U0001F670-\\U0001F67F]|[\\U0001F680-\\U0001F68F]|[\\U0001F690-\\U0001F69F]|[\\U0001F6A0-\\U0001F6AF]|[\\U0001F6B0-\\U0001F6BF]|[\\U0001F6C0-\\U0001F6C5]|[\\U0001F6CB-\\U0001F6CF]|[\\U0001F6D0-\\U0001F6D2]|[\\U0001F6D5-\\U0001F6D7]|[\\U0001F6DD-\\U0001F6DF]|[\\U0001F6E0-\\U0001F6E5]|\\U0001F6E9|[\\U0001F6EB-\\U0001F6EC]|\\U0001F6F0|[\\U0001F6F3-\\U0001F6FC]|[\\U0001F7E0-\\U0001F7EB]|\\U0001F7F0|[\\U0001F90C-\\U0001F90F]|[\\U0001F910-\\U0001F91F]|[\\U0001F920-\\U0001F92F]|[\\U0001F930-\\U0001F93A]|[\\U0001F93C-\\U0001F93F]|[\\U0001F940-\\U0001F945]|[\\U0001F947-\\U0001F94C]|[\\U0001F94D-\\U0001F94F]|[\\U0001F950-\\U0001F95F]|[\\U0001F960-\\U0001F96F]|[\\U0001F970-\\U0001F97F]|[\\U0001F980-\\U0001F98F]|[\\U0001F990-\\U0001F99F]|[\\U0001F9A0-\\U0001F9AF]|[\\U0001F9B0-\\U0001F9BF]|[\\U0001F9C0-\\U0001F9CF]|[\\U0001F9D0-\\U0001F9DF]|[\\U0001F9E0-\\U0001F9EF]|[\\U0001F9F0-\\U0001F9FF]|[\\U0001FA70-\\U0001FA74]|[\\U0001FA78-\\U0001FA7C]|[\\U0001FA80-\\U0001FA86]|[\\U0001FA90-\\U0001FA9F]|[\\U0001FAA0-\\U0001FAAC]|[\\U0001FAB0-\\U0001FABA]|[\\U0001FAC0-\\U0001FAC5]|[\\U0001FAD0-\\U0001FAD9]|[\\U0001FAE0-\\U0001FAE7]|[\\U0001FAF0-\\U0001FAF6]";
+        String Emoji = unsupport + support;
+
+        // Construct regex of emoji by the rules above.
+        String EMod = "[\\U0001F3FB-\\U0001F3FF]";
+
+        String variationSelector = "\\uFE0F";
+        String keycap = "\\u20E3";
+        String tags = "[\\U000E0020-\\U000E007E]";
+        String termTag = "\\U000E007F";
+        String zwj = "\\u200D";
+
+        String RISequence = "[" + RI + "]" + "[" + RI + "]";
+        String element = "[" + Emoji + "]" + "(" + "[" + EMod + "]|" + variationSelector + keycap + "?|[" + tags + "]+" + termTag + "?)?";
+        String regexEmoji = RISequence + "|" + element + "(" + zwj + "(" + RISequence + "|" + element + "))*";
+
+        return regexEmoji;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/face/RecentEmojiManager.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/face/RecentEmojiManager.java
new file mode 100644
index 0000000..f634748
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/face/RecentEmojiManager.java
@@ -0,0 +1,58 @@
+package com.tencent.qcloud.tuikit.tuichat.component.face;
+
+import android.text.TextUtils;
+import android.util.Base64;
+
+import com.tencent.qcloud.tuicore.util.SPUtils;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Collection;
+
+
+public class RecentEmojiManager {
+    public static final String PREFERENCE_NAME = "recentFace";//"preference";
+
+    private static final RecentEmojiManager instance = new RecentEmojiManager();
+
+    private RecentEmojiManager() {}
+
+    public static RecentEmojiManager getInstance() {
+        return instance;
+    }
+
+    public String getString(String key) {
+        return SPUtils.getInstance(PREFERENCE_NAME).getString(key);
+    }
+
+    public RecentEmojiManager putString(String key, String value) {
+        SPUtils.getInstance(PREFERENCE_NAME).put(key, value);
+        return this;
+    }
+
+
+    public RecentEmojiManager putCollection(String key, Collection collection) throws IOException {
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        ObjectOutputStream objectOutputStream = new ObjectOutputStream(byteArrayOutputStream);
+        objectOutputStream.writeObject(collection);
+        String collectionString = new String(Base64.encode(byteArrayOutputStream.toByteArray(), Base64.DEFAULT));
+        objectOutputStream.close();
+        return putString(key, collectionString);
+    }
+
+    public Collection getCollection(String key) throws IOException, ClassNotFoundException {
+        String collectionString = getString(key);
+        if (TextUtils.isEmpty(collectionString) || TextUtils.isEmpty(collectionString.trim())) {
+            return null;
+        }
+        byte[] mobileBytes = Base64.decode(collectionString.getBytes(), Base64.DEFAULT);
+        ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(mobileBytes);
+        ObjectInputStream objectInputStream = new ObjectInputStream(byteArrayInputStream);
+        Collection collection = (Collection) objectInputStream.readObject();
+        objectInputStream.close();
+        return collection;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/imagevideoscan/ImageVideoScanActivity.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/imagevideoscan/ImageVideoScanActivity.java
new file mode 100644
index 0000000..7133ad7
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/imagevideoscan/ImageVideoScanActivity.java
@@ -0,0 +1,128 @@
+package com.tencent.qcloud.tuikit.tuichat.component.imagevideoscan;
+
+import android.app.Activity;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.ImageView;
+
+import androidx.recyclerview.widget.OrientationHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.util.PermissionHelper;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class ImageVideoScanActivity extends Activity {
+    private static final String TAG = ImageVideoScanActivity.class.getSimpleName();
+
+    private RecyclerView mRecyclerView;
+    private ImageVideoScanAdapter mAdapter;
+    private ViewPagerLayoutManager mLayoutManager;
+    private ImageVideoScanPresenter mImageVideoScanPresenter;
+    private ImageView mDownloadView;
+
+    private TUIMessageBean mCurrentMessageBean = null;
+    private List<TUIMessageBean> mForwardDataSource = new ArrayList<>();
+    private boolean mIsForwardMode = false;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        setContentView(R.layout.image_video_scan_layout);
+
+        initView();
+        initData();
+    }
+
+    private void initView() {
+        mRecyclerView = findViewById(R.id.recycler);
+        mDownloadView = findViewById(R.id.download_button);
+        mDownloadView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                TUIChatLog.d(TAG, "onClick");
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    mImageVideoScanPresenter.saveLocal(ImageVideoScanActivity.this);
+                } else {
+                    PermissionHelper.requestPermission(PermissionHelper.PERMISSION_STORAGE, new PermissionHelper.PermissionCallback() {
+                        @Override
+                        public void onGranted() {
+                            mImageVideoScanPresenter.saveLocal(ImageVideoScanActivity.this);
+                        }
+
+                        @Override
+                        public void onDenied() {
+                            ToastUtil.toastShortMessage(getString(R.string.save_failed));
+                        }
+                    });
+                }
+            }
+        });
+
+        mLayoutManager = new ViewPagerLayoutManager(this, OrientationHelper.HORIZONTAL);
+        mAdapter = new ImageVideoScanAdapter();
+        mRecyclerView.setLayoutManager(mLayoutManager);
+        mRecyclerView.setAdapter(mAdapter);
+
+        mImageVideoScanPresenter = new ImageVideoScanPresenter();
+        mImageVideoScanPresenter.setAdapter(mAdapter);
+        mImageVideoScanPresenter.setRecyclerView(mRecyclerView);
+        mImageVideoScanPresenter.setViewPagerLayoutManager(mLayoutManager);
+
+        mAdapter.setOnItemClickListener(new OnItemClickListener() {
+            @Override
+            public void onClickItem() {
+                finish();
+            }
+        });
+    }
+
+    public void initData() {
+        if (getIntent() == null) {
+            return;
+        }
+
+        mIsForwardMode = getIntent().getBooleanExtra(TUIChatConstants.FORWARD_MODE, false);
+        if (mIsForwardMode) {
+            mForwardDataSource = (List<TUIMessageBean>) getIntent().getSerializableExtra(TUIChatConstants.OPEN_MESSAGES_SCAN_FORWARD);
+            if (mForwardDataSource == null || mForwardDataSource.isEmpty()) {
+                TUIChatLog.e(TAG, "mForwardDataSource is null");
+                return;
+            }
+        }
+
+        mCurrentMessageBean = (TUIMessageBean) getIntent().getSerializableExtra(TUIChatConstants.OPEN_MESSAGE_SCAN);
+        if (mCurrentMessageBean == null) {
+            TUIChatLog.e(TAG, "mCurrentMessageBean is null");
+            return;
+        }
+
+        mImageVideoScanPresenter.init(mCurrentMessageBean, mForwardDataSource, mIsForwardMode);
+    }
+
+    public interface OnItemClickListener {
+        void onClickItem();
+    }
+
+    @Override
+    protected void onPause() {
+        TUIChatLog.i(TAG, "onPause");
+        super.onPause();
+        if (mImageVideoScanPresenter != null) {
+            mImageVideoScanPresenter.releaseUI();
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/imagevideoscan/ImageVideoScanAdapter.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/imagevideoscan/ImageVideoScanAdapter.java
new file mode 100644
index 0000000..e707eb8
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/imagevideoscan/ImageVideoScanAdapter.java
@@ -0,0 +1,819 @@
+package com.tencent.qcloud.tuikit.tuichat.component.imagevideoscan;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.Configuration;
+import android.graphics.Bitmap;
+import android.graphics.Matrix;
+import android.graphics.RectF;
+import android.net.Uri;
+import android.os.Handler;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.RelativeLayout;
+import android.widget.SeekBar;
+import android.widget.TextView;
+
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
+import com.tencent.imsdk.v2.V2TIMDownloadCallback;
+import com.tencent.imsdk.v2.V2TIMElem;
+import com.tencent.imsdk.v2.V2TIMImageElem;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.imsdk.v2.V2TIMVideoElem;
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.util.BackgroundTasks;
+import com.tencent.qcloud.tuicore.util.DateTimeUtil;
+import com.tencent.qcloud.tuicore.util.FileUtil;
+import com.tencent.qcloud.tuicore.util.ImageUtil;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ImageMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.VideoMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener.OnMatrixChangedListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener.OnPhotoTapListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.listener.OnSingleFlingListener;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.view.PhotoView;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.video.UIKitVideoView;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.video.proxy.IPlayer;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ImageVideoScanAdapter extends RecyclerView.Adapter<ImageVideoScanAdapter.ViewHolder>{
+    private static final String TAG = ImageVideoScanAdapter.class.getSimpleName();
+
+    private static final String DOWNLOAD_ORIGIN_IMAGE_PATH = "downloadOriginImagePath";
+    private static final String BROADCAST_DOWNLOAD_COMPLETED_ACTION = "PhotoViewActivityDownloadOriginImageCompleted";
+
+    private List<TUIMessageBean> mDataSource = new ArrayList<>();
+    private BroadcastReceiver downloadReceiver;
+    private Context mContext = null;
+
+    private TUIMessageBean mOldLocateMessage, mNewLocateMessage;
+
+    private Handler durationHandler;
+    private boolean mIsVideoPlay = false;
+    private String mCacheImagePath = null;
+
+    public ImageVideoScanAdapter(){
+        mContext = TUIChatService.getAppContext();
+    }
+
+    private ImageVideoScanActivity.OnItemClickListener onItemClickListener;
+
+    private Runnable updateSeekBarTime;
+
+    public void resetVideo(ViewHolder holder) {
+        holder.videoView.stop();
+        holder.videoView.resetVideo();
+        holder.playButton.setImageResource(R.drawable.ic_play_icon);
+        holder.pauseCenterView.setVisibility(View.VISIBLE);
+        holder.snapImageView.setVisibility(View.GONE);
+        holder.loadingView.setVisibility(View.GONE);
+        holder.playSeekBar.setProgress(0);
+        mIsVideoPlay = false;
+        String durations = DateTimeUtil.formatSecondsTo00(0);
+        holder.timeBeginView.setText(durations);
+    }
+
+    public void setOnItemClickListener(ImageVideoScanActivity.OnItemClickListener onItemClickListener) {
+        this.onItemClickListener = onItemClickListener;
+    }
+
+    @Override
+    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.image_video_scan_item, parent,false);
+        return new ViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(ViewHolder holder, int position) {
+        TUIMessageBean messageBean = getItem(position);
+        if (messageBean == null) {
+            return;
+        }
+
+        holder.playSeekBar.setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                v.getParent().requestDisallowInterceptTouchEvent(true);
+                return false;
+            }
+        });
+        V2TIMMessage timMessage = messageBean.getV2TIMMessage();
+        if (timMessage.getElemType() == V2TIMMessage.V2TIM_ELEM_TYPE_IMAGE) {
+            performPhotoView(holder, messageBean, position);
+        } else if (timMessage.getElemType() == V2TIMMessage.V2TIM_ELEM_TYPE_VIDEO) {
+            performVideoView(holder, messageBean, position);
+        } else {
+            TUIChatLog.d(TAG, "error message type");
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        return mDataSource.size();
+    }
+
+    private TUIMessageBean getItem(int position) {
+        if (mDataSource == null || mDataSource.isEmpty()) {
+            return null;
+        }
+
+        return mDataSource.get(position);
+    }
+
+    public void onDataChanged(TUIMessageBean messageBean) {
+        for (TUIMessageBean dataBean : mDataSource) {
+            if (TextUtils.equals(messageBean.getId(), dataBean.getId())) {
+                dataBean.update(messageBean);
+                break;
+            }
+        }
+        notifyDataSetChanged();
+    }
+
+    private void loadPhotoView(ViewHolder holder, ImageMessageBean imageMessageBean,  int positon) {
+        final List<ImageMessageBean.ImageBean> imgs = imageMessageBean.getImageBeanList();
+        String imagePath = imageMessageBean.getDataPath();
+        String originImagePath = TUIChatUtils.getOriginImagePath(imageMessageBean);
+        if (!TextUtils.isEmpty(originImagePath)) {
+            imagePath = originImagePath;
+        }
+
+        if (TextUtils.isEmpty(imagePath)) {
+            for (int i = 0; i < imgs.size(); i++) {
+                final ImageMessageBean.ImageBean img = imgs.get(i);
+                if (img.getType() == ImageMessageBean.IMAGE_TYPE_THUMB) {
+                    final String path = ImageUtil.generateImagePath(img.getUUID(), ImageMessageBean.IMAGE_TYPE_THUMB);
+                    img.downloadImage(path, new ImageMessageBean.ImageBean.ImageDownloadCallback() {
+                        @Override
+                        public void onProgress(long currentSize, long totalSize) {
+                            TUIChatLog.i("downloadImage progress current:",
+                                    currentSize + ", total:" + totalSize);
+                        }
+
+                        @Override
+                        public void onError(int code, String desc) {
+                            TUIChatLog.e("MessageAdapter img getImage", code + ":" + desc);
+                        }
+
+                        @Override
+                        public void onSuccess() {
+                            holder.loadingView.setVisibility(View.GONE);
+                            imageMessageBean.setDataPath(path);
+                            BackgroundTasks.getInstance().runOnUiThread(new Runnable() {
+                                @Override
+                                public void run() {
+                                    notifyDataSetChanged();
+                                }
+                            });
+
+                        }
+                    });
+                    break;
+                }
+            }
+        }
+
+        V2TIMImageElem.V2TIMImage currentOriginalImage = null;
+        String thumbPath = null;
+        for (int i = 0; i < imgs.size(); i++) {
+            ImageMessageBean.ImageBean img = imgs.get(i);
+            if (img.getType() == ImageMessageBean.IMAGE_TYPE_ORIGIN) {
+                currentOriginalImage = img.getV2TIMImage();
+            }
+            if (img.getType() == ImageMessageBean.IMAGE_TYPE_THUMB) {
+                thumbPath = ImageUtil.generateImagePath(img.getUUID(), ImageMessageBean.IMAGE_TYPE_THUMB);
+            }
+        }
+        String localImgPath = TUIChatUtils.getOriginImagePath(imageMessageBean);
+        boolean isOriginImg = localImgPath != null && currentOriginalImage != null && !TextUtils.isEmpty(localImgPath)
+                && currentOriginalImage.getSize() == FileUtil.getFileSize(localImgPath);
+        String previewImgPath;
+        if (!isOriginImg) {
+            previewImgPath = thumbPath;
+        } else {
+            previewImgPath = localImgPath;
+        }
+        Uri uri = FileUtil.getUriFromPath(previewImgPath);
+        if (uri != null) {
+            holder.loadingView.setVisibility(View.GONE);
+        }
+        Matrix mCurrentDisplayMatrix = new Matrix();
+        holder.photoView.setDisplayMatrix(mCurrentDisplayMatrix);
+        holder.photoView.setOnMatrixChangeListener(new MatrixChangeListener());
+        holder.photoView.setOnPhotoTapListener(new PhotoTapListener());
+        holder.photoView.setOnSingleFlingListener(new SingleFlingListener());
+        // 如果是原图就直接显示原图， 否则显示缩略图，点击查看原图按钮后下载原图显示
+        // If it is the original image, the original image will be displayed directly, otherwise, the thumbnail image will be displayed. Click the View Original Image button to download the original image and display it.
+
+        loadImageIntoView(holder.photoView, previewImgPath);
+        if (!isOriginImg) {
+            V2TIMImageElem.V2TIMImage finalMCurrentOriginalImage = currentOriginalImage;
+            holder.viewOriginalButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (finalMCurrentOriginalImage == null) {
+                        TUIChatLog.e(TAG, "finalMCurrentOriginalImage is null");
+                        return;
+                    }
+                    final String path = ImageUtil.generateImagePath(finalMCurrentOriginalImage.getUUID(), finalMCurrentOriginalImage.getType());
+
+                    finalMCurrentOriginalImage.downloadImage(path, new V2TIMDownloadCallback() {
+                        @Override
+                        public void onProgress(V2TIMElem.V2ProgressInfo progressInfo) {
+                            long percent = Math.round(100 * (progressInfo.getCurrentSize() * 1.0d) / progressInfo.getTotalSize());
+                            if (holder.viewOriginalButton.getVisibility() != View.INVISIBLE && holder.viewOriginalButton.getVisibility() != View.GONE) {
+                                holder.viewOriginalButton.setText(percent + "%");
+                            }
+                        }
+
+                        @Override
+                        public void onError(int code, String desc) {
+                            ToastUtil.toastLongMessage("Download origin image failed , errCode = " + code + ", " + desc);
+                        }
+
+                        @Override
+                        public void onSuccess() {
+                            BackgroundTasks.getInstance().runOnUiThread(new Runnable() {
+                                @Override
+                                public void run() {
+                                    loadImageIntoView(holder.photoView, path);
+                                    holder.viewOriginalButton.setText(mContext.getString(R.string.completed));
+                                    holder.viewOriginalButton.setOnClickListener(null);
+                                    holder.viewOriginalButton.setVisibility(View.INVISIBLE);
+                                    Intent intent = new Intent();
+                                    intent.setAction(BROADCAST_DOWNLOAD_COMPLETED_ACTION);
+                                    intent.putExtra(DOWNLOAD_ORIGIN_IMAGE_PATH, path);
+                                    LocalBroadcastManager.getInstance(mContext).sendBroadcast(intent);
+                                }
+                            });
+                        }
+                    });
+                }
+            });
+            // 因为图片还没下载下来 ， 加载失败, 接收下载成功的广播来刷新显示
+            // Because the picture has not been downloaded yet, the loading fails, receive the broadcast of the successful download to refresh the display
+            if (!TextUtils.isEmpty(localImgPath)) {
+                ToastUtil.toastShortMessage(mContext.getString(R.string.downloading));
+                downloadReceiver = new BroadcastReceiver() {
+                    @Override
+                    public void onReceive(Context context, Intent intent) {
+                        String action = intent.getAction();
+                        if (BROADCAST_DOWNLOAD_COMPLETED_ACTION.equals(action)) {
+                            String originImagePath = intent.getStringExtra(DOWNLOAD_ORIGIN_IMAGE_PATH);
+                            if (originImagePath != null) {
+                                loadImageIntoView(holder.photoView, originImagePath);
+                            }
+                        }
+                    }
+                };
+                IntentFilter filter = new IntentFilter();
+                filter.addAction(BROADCAST_DOWNLOAD_COMPLETED_ACTION);
+                LocalBroadcastManager.getInstance(mContext).registerReceiver(downloadReceiver, filter);
+            } else {
+                holder.viewOriginalButton.setVisibility(View.VISIBLE);
+                holder.viewOriginalButton.setText(R.string.view_original_image);
+            }
+        } else {
+            holder.viewOriginalButton.setVisibility(View.INVISIBLE);
+        }
+    }
+
+    private void performPhotoView(ViewHolder holder, TUIMessageBean messageBean, int positon) {
+        holder.photoViewLayout.setVisibility(View.VISIBLE);
+        holder.videoView.setVisibility(View.GONE);
+        holder.closeButton.setVisibility(View.GONE);
+        holder.playControlLayout.setVisibility(View.GONE);
+        holder.pauseCenterView.setVisibility(View.GONE);
+        holder.loadingView.setVisibility(View.VISIBLE);
+        holder.videoViewLayout.setVisibility(View.GONE);
+
+        ImageMessageBean imageMessageBean;
+        if (messageBean instanceof ImageMessageBean) {
+            imageMessageBean = (ImageMessageBean) messageBean;
+        } else {
+            TUIChatLog.e(TAG, "is not ImageMessageBean");
+            return;
+        }
+
+        loadPhotoView(holder, imageMessageBean, positon);
+    }
+
+    private void loadImageIntoView(ImageView imageView, Object resObj) {
+        Glide.with(TUIChatService.getAppContext())
+                .load(resObj)
+                .centerInside()
+                .apply(new RequestOptions().error(android.R.drawable.ic_menu_report_image))
+                .into(imageView);
+    }
+
+    private void loadVideoView(ViewHolder holder, VideoMessageBean videoMessageBean, int position) {
+        if (TextUtils.isEmpty(videoMessageBean.getDataPath())) {
+            final String path = TUIConfig.getImageDownloadDir() + videoMessageBean.getSnapshotUUID();
+            videoMessageBean.downloadSnapshot(path, new VideoMessageBean.VideoDownloadCallback() {
+                @Override
+                public void onProgress(long currentSize, long totalSize) {
+                    TUIChatLog.i("downloadSnapshot progress current:", currentSize + ", total:" + totalSize);
+                }
+
+                @Override
+                public void onError(int code, String desc) {
+                    TUIChatLog.e("MessageAdapter video getImage", code + ":" + desc);
+                }
+
+                @Override
+                public void onSuccess() {
+                    holder.pauseCenterView.setVisibility(View.VISIBLE);
+                    holder.loadingView.setVisibility(View.GONE);
+                    videoMessageBean.setDataPath(path);
+                    mCacheImagePath = path;
+                    holder.snapImageView.setVisibility(View.VISIBLE);
+                    loadImageIntoView(holder.snapImageView, path);
+
+                    Bitmap firstFrame = ImageUtil.getBitmapFormPath(path);
+                    if (firstFrame != null) {
+                        int videoWidth = firstFrame.getWidth();
+                        int videoHeight = firstFrame.getHeight();
+                        updateVideoView(holder, videoWidth, videoHeight);
+                    }
+                }
+            });
+        } else {
+            String imagePath = videoMessageBean.getDataPath();
+            holder.snapImageView.setVisibility(View.VISIBLE);
+            loadImageIntoView(holder.snapImageView, imagePath);
+            updateVideoViewSize(holder, imagePath);
+        }
+
+        if (videoMessageBean.getStatus() == TUIMessageBean.MSG_STATUS_SENDING) {
+            ToastUtil.toastShortMessage(mContext.getString(R.string.sending));
+            return;
+        }
+        if (videoMessageBean.getStatus() == TUIMessageBean.MSG_STATUS_SEND_FAIL) {
+            ToastUtil.toastShortMessage(mContext.getString(R.string.send_failed));
+            holder.loadingView.setVisibility(View.GONE);
+            return;
+        }
+
+        final String videoPath = TUIConfig.getVideoDownloadDir() + videoMessageBean.getVideoUUID();
+        final File videoFile = new File(videoPath);
+        if (videoFile.exists() && videoMessageBean.getVideoSize() == videoFile.length()) {
+            playVideo(holder, videoMessageBean);
+        } else {
+            if (!holder.downloadVideoFailed && !holder.downloadVideoFinished) {
+                getVideo(holder, videoPath, videoMessageBean, true, position);
+            }
+        }
+    }
+    
+    private void updateVideoViewSize(ViewHolder holder, String path) {
+        if (mCacheImagePath == null || !mCacheImagePath.equals(path)) {
+            Bitmap firstFrame = ImageUtil.getBitmapFormPath(path);
+            if (firstFrame != null) {
+                int videoWidth = firstFrame.getWidth();
+                int videoHeight = firstFrame.getHeight();
+                updateVideoView(holder, videoWidth, videoHeight);
+            }
+        }
+    }
+
+    private void performVideoView(ViewHolder holder, TUIMessageBean messageBean, int position) {
+        holder.photoViewLayout.setVisibility(View.GONE);
+        holder.videoView.setVisibility(View.VISIBLE);
+        holder.closeButton.setVisibility(View.VISIBLE);
+        holder.playControlLayout.setVisibility(View.VISIBLE);
+        holder.pauseCenterView.setVisibility(View.GONE);
+        holder.loadingView.setVisibility(View.VISIBLE);
+        holder.videoViewLayout.setVisibility(View.VISIBLE);
+
+        VideoMessageBean videoMessageBean;
+        if (messageBean instanceof VideoMessageBean) {
+            videoMessageBean = (VideoMessageBean) messageBean;
+        } else {
+            TUIChatLog.e(TAG, "is not VideoMessageBean");
+            return;
+        }
+
+        mIsVideoPlay = false;
+        playControlInit(holder);
+        loadVideoView(holder, videoMessageBean, position);
+    }
+
+    private void playControlInit(ViewHolder holder) {
+        holder.closeButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (holder.videoView != null) {
+                    holder.videoView.stop();
+                } else {
+                    TUIChatLog.e(TAG, "videoView is null");
+                }
+                onItemClickListener.onClickItem();
+            }
+        });
+        holder.playButton.setOnClickListener(new View.OnClickListener() {
+           @Override
+           public void onClick(View view) {
+               clickPlayVideo(holder);
+           }
+        });
+
+        holder.playSeekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+            @Override
+            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+                String durations = DateTimeUtil.formatSecondsTo00(progress);
+                holder.timeBeginView.setText(durations);
+            }
+            @Override
+            public void onStartTrackingTouch(SeekBar seekBar) {
+                int progress = seekBar.getProgress();
+                TUIChatLog.i(TAG,"onStartTrackingTouch progress == " + progress);
+                if (holder.videoView != null) {
+                    holder.videoView.seekTo(progress * 1000);
+                }
+            }
+            @Override
+            public void onStopTrackingTouch(SeekBar seekBar) {
+                int progress = seekBar.getProgress();
+                TUIChatLog.i(TAG,"onStopTrackingTouch progress == " + progress);
+                if (holder.videoView != null && holder.videoView.isPlaying()) {
+                    holder.videoView.seekTo(progress * 1000);
+                    holder.videoView.start();
+                } else if (holder.videoView != null) {
+                    holder.videoView.seekTo(progress * 1000);
+                }
+            }
+        });
+
+        holder.pauseCenterView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                clickPlayVideo(holder);
+            }
+        });
+    }
+
+    private void clickPlayVideo(ViewHolder holder) {
+        if (!holder.videoView.isPrepared()) {
+            mIsVideoPlay = false;
+            TUIChatLog.e(TAG, "!holder.videoView.isPrepared()");
+            return;
+        }
+        if (holder.videoView.isPlaying()) {
+            TUIChatLog.d(TAG, "holder.videoView.isPlaying()");
+            holder.videoView.pause();
+            holder.playButton.setImageResource(R.drawable.ic_play_icon);
+            holder.pauseCenterView.setVisibility(View.VISIBLE);
+            holder.loadingView.setVisibility(View.GONE);
+            mIsVideoPlay = false;
+        } else {
+            float times= holder.videoView.getDuration() *1.0f / 1000;
+            if (times <= 0) {
+                TUIChatLog.e(TAG,"onClick, downloading video");
+                //ToastUtil.toastShortMessage("downloading video");
+                holder.pauseCenterView.setVisibility(View.GONE);
+                holder.loadingView.setVisibility(View.VISIBLE);
+                resetVideo(holder);
+                return;
+            }
+
+            int duration= Math.round(holder.videoView.getDuration() * 1.0f / 1000);
+            int progress = Math.round(holder.videoView.getCurrentPosition() * 1.0f / 1000);
+            TUIChatLog.d(TAG,"onClick playSeekBar duration == " + duration + " playSeekBar progress = " + progress);
+            if (holder.playSeekBar.getProgress() >= duration) {
+                TUIChatLog.e(TAG, "getProgress() >= duration");
+                resetVideo(holder);
+                return;
+            }
+            holder.videoView.start();
+            holder.playButton.setImageResource(R.drawable.ic_pause_icon);
+            holder.pauseCenterView.setVisibility(View.GONE);
+            holder.loadingView.setVisibility(View.GONE);
+            holder.snapImageView.setVisibility(View.GONE);
+            mIsVideoPlay = true;
+
+            holder.playSeekBar.setMax(duration);
+            holder.playSeekBar.setProgress(progress);
+            String durations = DateTimeUtil.formatSecondsTo00(duration);
+            holder.timeEndView.setText(durations);
+            if (durationHandler != null) {
+                durationHandler.postDelayed(updateSeekBarTime, 100);
+            }
+        }
+    }
+
+    private Uri processVideoMessage(VideoMessageBean videoMessageBean){
+        V2TIMMessage timMessage = videoMessageBean.getV2TIMMessage();
+        V2TIMVideoElem videoEle = timMessage.getVideoElem();
+        if (timMessage.isSelf() && !TextUtils.isEmpty(videoEle.getSnapshotPath())) {
+            return FileUtil.getUriFromPath(videoEle.getVideoPath());
+        } else {
+            final String videoPath = TUIConfig.getVideoDownloadDir() + videoEle.getVideoUUID();
+            return Uri.parse(videoPath);
+        }
+    }
+
+    private void  playVideo(ViewHolder holder, VideoMessageBean videoMessageBean) {
+        Uri videoUri = processVideoMessage(videoMessageBean);
+
+        holder.pauseCenterView.setVisibility(View.VISIBLE);
+        holder.loadingView.setVisibility(View.GONE);
+
+        if (videoUri == null) {
+            TUIChatLog.e(TAG,"playVideo videoUri == null");
+            return;
+        }
+
+        holder.videoView.setVideoURI(videoUri);
+        holder.videoView.setOnPreparedListener(new IPlayer.OnPreparedListener() {
+            @Override
+            public void onPrepared(IPlayer mediaPlayer) {
+                TUIChatLog.e(TAG, "onPrepared()");
+                holder.videoView.start();
+                holder.videoView.pause();
+                holder.playButton.setImageResource(R.drawable.ic_play_icon);
+                holder.pauseCenterView.setVisibility(View.VISIBLE);
+                holder.loadingView.setVisibility(View.GONE);
+                updateVideoViewSize(holder, videoMessageBean.getDataPath());
+                mIsVideoPlay = false;
+                if (durationHandler != null) {
+                    durationHandler = null;
+                }
+                if (updateSeekBarTime != null) {
+                    updateSeekBarTime = null;
+                }
+                durationHandler = new Handler();
+                updateSeekBarTime = new Runnable() {
+                    public void run() {
+                        //TUIChatLog.e(TAG, "mIsVideoPlay = " + mIsVideoPlay);
+                        //get current position
+                        int timeElapsed = holder.videoView.getCurrentPosition();
+
+                        if (holder.playSeekBar.getProgress() >= holder.playSeekBar.getMax()) {
+                            TUIChatLog.e(TAG, "getProgress() >= getMax()");
+                            resetVideo(holder);
+                            return;
+                        }
+                        //set seekbar progress
+                        //TUIChatLog.e(TAG, "Runnable playSeekBar setProgress = " + (int) timeElapsed/1000);
+                        holder.playSeekBar.setProgress(Math.round(timeElapsed * 1.0f / 1000));
+
+                        String durations = DateTimeUtil.formatSecondsTo00(Math.round(holder.videoView.getCurrentPosition() * 1.0f / 1000));
+                        holder.timeBeginView.setText(durations);
+                        //repeat yourself that again in 100 miliseconds
+                        if (mIsVideoPlay) {
+                            durationHandler.postDelayed(this, 100);
+                        }
+                    }
+                };
+
+                int duration = Math.round(mediaPlayer.getDuration() * 1.0f / 1000);
+                int progress = Math.round(mediaPlayer.getCurrentPosition() *1.0f / 1000);
+                holder.playSeekBar.setMax(duration);
+                holder.playSeekBar.setProgress(progress);
+                String durations = DateTimeUtil.formatSecondsTo00(duration);
+                holder.timeEndView.setText(durations);
+                durationHandler.postDelayed(updateSeekBarTime, 100);
+            }
+        });
+        holder.videoView.setOnSeekCompleteListener(new IPlayer.OnSeekCompleteListener() {
+            @Override
+            public void OnSeekComplete(IPlayer mp) {
+
+            }
+        });
+    }
+
+    private void getVideo(ViewHolder holder, String videoPath, final VideoMessageBean msg, final boolean autoPlay, final int position) {
+        msg.downloadVideo(videoPath, new VideoMessageBean.VideoDownloadCallback() {
+            @Override
+            public void onProgress(long currentSize, long totalSize) {
+                TUIChatLog.i("downloadVideo progress current:", currentSize + ", total:" + totalSize);
+                holder.downloadVideoFinished = false;
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                ToastUtil.toastLongMessage(TUIChatService.getAppContext().getString(R.string.download_file_error) + code + "=" + desc);
+                msg.setStatus(TUIMessageBean.MSG_STATUS_DOWNLOADED);
+                notifyItemChanged(position);
+                holder.downloadVideoFailed = true;
+            }
+
+            @Override
+            public void onSuccess() {
+                holder.pauseCenterView.setVisibility(View.VISIBLE);
+                holder.loadingView.setVisibility(View.GONE);
+                notifyItemChanged(position);
+                holder.downloadVideoFailed = false;
+                holder.downloadVideoFinished = true;
+                if (autoPlay) {
+                    playVideo(holder, msg);
+                }
+            }
+        });
+    }
+
+    private void updateVideoView(ViewHolder holder, int videoWidth, int videoHeight) {
+        TUIChatLog.i(TAG, "updateVideoView videoWidth: " + videoWidth + " videoHeight: " + videoHeight);
+        if (videoWidth <= 0 && videoHeight <= 0) {
+            return;
+        }
+        boolean isLandscape = true;
+        if (mContext.getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
+            isLandscape = false;
+        }
+
+        int deviceWidth;
+        int deviceHeight;
+        if (isLandscape) {
+            deviceWidth = Math.max(ScreenUtil.getScreenWidth(mContext), ScreenUtil.getScreenHeight(mContext));
+            deviceHeight = Math.min(ScreenUtil.getScreenWidth(mContext), ScreenUtil.getScreenHeight(mContext));
+        } else {
+            deviceWidth = Math.min(ScreenUtil.getScreenWidth(mContext), ScreenUtil.getScreenHeight(mContext));
+            deviceHeight = Math.max(ScreenUtil.getScreenWidth(mContext), ScreenUtil.getScreenHeight(mContext));
+        }
+        int[] scaledSize = ScreenUtil.scaledSize(deviceWidth, deviceHeight, videoWidth, videoHeight);
+        TUIChatLog.i(TAG, "scaled width: " + scaledSize[0] + " height: " + scaledSize[1]);
+        ViewGroup.LayoutParams params = holder.videoView.getLayoutParams();
+        params.width = scaledSize[0];
+        params.height = scaledSize[1];
+        holder.videoView.setLayoutParams(params);
+        if (holder.snapImageView.getVisibility() == View.VISIBLE) {
+            holder.snapImageView.setLayoutParams(params);
+        }
+    }
+
+    public void destroyView(RecyclerView mRecyclerView, int index) {
+        View itemView = mRecyclerView.getChildAt(index);
+        if (itemView != null) {
+            UIKitVideoView videoView = itemView.findViewById(R.id.video_play_view);
+            SeekBar playSeekBar = itemView.findViewById(R.id.play_seek);
+            if (videoView != null) {
+                videoView.stop();
+            }
+            if (playSeekBar != null) {
+                playSeekBar.setProgress(0);
+            }
+        }
+
+        if (downloadReceiver != null) {
+            LocalBroadcastManager.getInstance(mContext).unregisterReceiver(downloadReceiver);
+            downloadReceiver = null;
+        }
+    }
+    public void setDataSource(List<TUIMessageBean> dataSource) {
+        if (dataSource != null && !dataSource.isEmpty()) {
+            mOldLocateMessage = dataSource.get(0);
+            mNewLocateMessage = dataSource.get(dataSource.size()-1);
+        } else {
+            TUIChatLog.d(TAG, "setDataSource dataSource is Empty");
+            mOldLocateMessage = null;
+            mNewLocateMessage = null;
+        }
+        this.mDataSource = dataSource;
+        
+        for (TUIMessageBean messageBean : mDataSource) {
+            TUIChatLog.d(TAG, "message seq = " + messageBean.getV2TIMMessage().getSeq());
+        }
+        Log.d(TAG, "mOldLocateMessage seq:" + mOldLocateMessage.getV2TIMMessage().getSeq());
+        Log.d(TAG, "mNewLocateMessage seq:" + mNewLocateMessage.getV2TIMMessage().getSeq());
+    }
+    
+    public List<TUIMessageBean> getDataSource() {
+        return mDataSource;
+    }
+
+    public TUIMessageBean getOldLocateMessage() {
+        return mOldLocateMessage;
+    }
+
+    public TUIMessageBean getNewLocateMessage() {
+        return mNewLocateMessage;
+    }
+
+    public int addDataToSource(List<TUIMessageBean> dataSource, int type, int oldPositon) {
+        int newPositon = oldPositon;
+        if (dataSource == null || dataSource.isEmpty()) {
+            return newPositon;
+        }
+        if (mDataSource == null) {
+            TUIChatLog.e(TAG, "addDataToSource mDataSource is null");
+            return newPositon;
+        }
+
+        TUIMessageBean messageBean = mDataSource.get(oldPositon);
+        if (type == TUIChatConstants.GET_MESSAGE_FORWARD) {
+            mOldLocateMessage = dataSource.get(0);
+            Log.d(TAG, "mOldLocateMessage seq:" + mOldLocateMessage.getV2TIMMessage().getSeq());
+
+            mDataSource.addAll(0, dataSource);
+            newPositon = dataSource.size();
+        } else if (type == TUIChatConstants.GET_MESSAGE_BACKWARD) {
+            mNewLocateMessage = dataSource.get(dataSource.size()-1);
+            Log.d(TAG, "mNewLocateMessage seq:" + mNewLocateMessage.getV2TIMMessage().getSeq());
+
+            mDataSource.addAll(dataSource);
+            newPositon = oldPositon;
+        } else {
+            TUIChatLog.e(TAG, "addDataToSource error type");
+        }
+
+        for (TUIMessageBean tuiMessageBean : mDataSource) {
+            TUIChatLog.d(TAG, "message seq = " + tuiMessageBean.getV2TIMMessage().getSeq());
+        }
+
+
+        if (messageBean == null) {
+            TUIChatLog.e(TAG, "messageBean == null");
+            return newPositon;
+        }
+
+        return newPositon;
+    }
+
+    private class PhotoTapListener implements OnPhotoTapListener {
+        @Override
+        public void onPhotoTap(ImageView view, float x, float y) {
+            if (onItemClickListener != null) {
+                onItemClickListener.onClickItem();
+            }
+        }
+    }
+
+
+    private class MatrixChangeListener implements OnMatrixChangedListener {
+
+        @Override
+        public void onMatrixChanged(RectF rect) {
+
+        }
+    }
+
+    private class SingleFlingListener implements OnSingleFlingListener {
+
+        @Override
+        public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
+            return true;
+        }
+    }
+
+    public class ViewHolder extends RecyclerView.ViewHolder{
+        RelativeLayout photoViewLayout;
+        PhotoView photoView;
+        TextView viewOriginalButton;
+
+        FrameLayout videoViewLayout;
+        UIKitVideoView videoView;
+        boolean downloadVideoFailed = false;
+        boolean downloadVideoFinished = false;
+        ImageView closeButton;
+        LinearLayout playControlLayout;
+        ImageView playButton;
+        SeekBar playSeekBar;
+        TextView timeBeginView, timeEndView;
+        ImageView pauseCenterView, snapImageView;
+        ProgressBar loadingView;
+
+        public ViewHolder(View itemView) {
+            super(itemView);
+            photoViewLayout = itemView.findViewById(R.id.photo_view_layout);
+            photoView = itemView.findViewById(R.id.photo_view);
+            viewOriginalButton = itemView.findViewById(R.id.view_original_btn);
+            videoView = itemView.findViewById(R.id.video_play_view);
+            closeButton = itemView.findViewById(R.id.close_button);
+            playControlLayout = itemView.findViewById(R.id.play_control_layout);
+            playButton = itemView.findViewById(R.id.play_button);
+            playSeekBar = itemView.findViewById(R.id.play_seek);
+            timeEndView = itemView.findViewById(R.id.time_end);
+            timeBeginView = itemView.findViewById(R.id.time_begin);
+            pauseCenterView = itemView.findViewById(R.id.pause_button_center);
+            snapImageView = itemView.findViewById(R.id.content_image_iv);
+            loadingView = itemView.findViewById(R.id.message_sending_pb);
+            videoViewLayout = itemView.findViewById(R.id.video_view_layout);
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/imagevideoscan/ImageVideoScanPresenter.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/imagevideoscan/ImageVideoScanPresenter.java
new file mode 100644
index 0000000..c43494b
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/imagevideoscan/ImageVideoScanPresenter.java
@@ -0,0 +1,265 @@
+package com.tencent.qcloud.tuikit.tuichat.component.imagevideoscan;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.interfaces.ITUINotification;
+import com.tencent.qcloud.tuicore.util.ThreadHelper;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ImageMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.VideoMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.util.FileUtil;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+import java.io.File;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public class ImageVideoScanPresenter {
+    private static final String TAG = ImageVideoScanPresenter.class.getSimpleName();
+
+    private static class MessageChangedListener implements ITUINotification {
+        private WeakReference<ImageVideoScanPresenter> presenterWeakReference;
+
+        @Override
+        public void onNotifyEvent(String key, String subKey, Map<String, Object> param) {
+            if (presenterWeakReference != null && presenterWeakReference.get() != null) {
+                ImageVideoScanPresenter presenter = presenterWeakReference.get();
+                TUIMessageBean messageBean = (TUIMessageBean) param.get(TUIChatConstants.MESSAGE_BEAN);
+                presenter.onMessageStatusChanged(messageBean);
+            }
+        }
+    }
+
+    private static MessageChangedListener messageChangedListener = new MessageChangedListener();
+
+    private RecyclerView mRecyclerView;
+    private ImageVideoScanAdapter mAdapter;
+    private ViewPagerLayoutManager mViewPagerLayoutManager;
+    private ImageVideoScanProvider mImageVideoScanProvider;
+    private String mChatID;
+    private int mCurrentPosition = -1;
+    private int mIndex = 0;
+    private boolean mIsForwardMode = false;
+
+    public ImageVideoScanPresenter () {
+        messageChangedListener.presenterWeakReference = new WeakReference<>(this);
+        TUICore.registerEvent(TUIChatConstants.EVENT_KEY_MESSAGE_STATUS_CHANGED, TUIChatConstants.EVENT_SUB_KEY_MESSAGE_SEND, messageChangedListener);
+    }
+
+    public void onMessageStatusChanged(TUIMessageBean messageBean) {
+        if (mAdapter != null) {
+            mAdapter.onDataChanged(messageBean);
+        }
+    }
+
+    public void setAdapter(ImageVideoScanAdapter mAdapter) {
+        this.mAdapter = mAdapter;
+    }
+
+    public void setRecyclerView(RecyclerView mRecyclerView) {
+        this.mRecyclerView = mRecyclerView;
+    }
+
+    public void setViewPagerLayoutManager(ViewPagerLayoutManager viewPagerLayoutManager) {
+        this.mViewPagerLayoutManager = viewPagerLayoutManager;
+    }
+
+    public void init(TUIMessageBean messageBean, List<TUIMessageBean> messageBeans, boolean isForwardMode) {
+        mIsForwardMode = isForwardMode;
+        if (isForwardMode) {
+            mAdapter.setDataSource(messageBeans);
+            mAdapter.notifyDataSetChanged();
+
+            int postion = 0;
+            for (int i = 0; i < messageBeans.size(); i++) {
+                if (messageBeans.get(i).getId().equals(messageBean.getId())) {
+                    postion = i;
+                    break;
+                }
+            }
+            mRecyclerView.scrollToPosition(postion);
+            mCurrentPosition = postion;
+        } else {
+            List<TUIMessageBean> mDataSource = new ArrayList<>();
+            mDataSource.add(messageBean);
+            mAdapter.setDataSource(mDataSource);
+            mAdapter.notifyDataSetChanged();
+
+            mImageVideoScanProvider = new ImageVideoScanProvider();
+            mChatID = messageBean.isGroup() ? messageBean.getV2TIMMessage().getGroupID() : messageBean.getV2TIMMessage().getUserID();
+            mImageVideoScanProvider.initMessageList(mChatID, messageBean.isGroup(), messageBean, new IUIKitCallback<List<TUIMessageBean>>() {
+                @Override
+                public void onSuccess(List<TUIMessageBean> messageBeans) {
+                    mAdapter.setDataSource(messageBeans);
+                    mAdapter.notifyDataSetChanged();
+
+                    int postion = 0;
+                    for (int i = 0; i < messageBeans.size(); i++) {
+                        if (messageBeans.get(i).getId().equals(messageBean.getId())) {
+                            postion = i;
+                            break;
+                        }
+                    }
+                    mRecyclerView.scrollToPosition(postion);
+                    mCurrentPosition = postion;
+                }
+
+                @Override
+                public void onError(String module, int errCode, String errMsg) {
+                    TUIChatLog.e(TAG, "loadChatMessages initMessageList failed, code = " + errCode + ", desc = " + errMsg);
+                }
+            });
+        }
+
+        mViewPagerLayoutManager.setOnViewPagerListener(new OnViewPagerListener() {
+
+            @Override
+            public void onInitComplete() {
+                Log.i(TAG,"onInitComplete");
+            }
+
+            @Override
+            public void onPageRelease(boolean isNext, int position) {
+                Log.i(TAG,"release position :"+position +" next page:"+isNext);
+                int index = 0;
+                if (isNext){
+                    index = 0;
+                }else {
+                    index = 1;
+                }
+                mIndex = index;
+                releaseUI();
+            }
+
+            @Override
+            public void onPageSelected(int position,boolean isBottom, boolean isLeftScroll) {
+                Log.i(TAG,"select:"+position+" isBottom:"+isBottom + "isLeftScroll:"+isBottom);
+                mCurrentPosition = position;
+                if (mIsForwardMode) {
+                    return;
+                }
+                if (isLeftScroll) {
+                    if (position == 0) {
+                        if (mAdapter.getOldLocateMessage() != null) {
+                            Log.d(TAG, "mAdapter.getOldLocateMessage() seq:" + mAdapter.getOldLocateMessage().getV2TIMMessage().getSeq());
+                        }
+                        mImageVideoScanProvider.loadLocalMediaMessageForward(mChatID, messageBean.isGroup(), mAdapter.getOldLocateMessage(), new IUIKitCallback<List<TUIMessageBean>>() {
+                            @Override
+                            public void onSuccess(List<TUIMessageBean> messageBeans) {
+                                if (messageBeans == null || messageBeans.isEmpty()) {
+                                    return;
+                                }
+                                int newPositon = mAdapter.addDataToSource(messageBeans, TUIChatConstants.GET_MESSAGE_FORWARD, position);
+                                mRecyclerView.scrollToPosition(newPositon);
+                                mAdapter.notifyDataSetChanged();
+                            }
+
+                            @Override
+                            public void onError(String module, int errCode, String errMsg) {
+                                TUIChatLog.e(TAG, "onPageSelected loadLocalMediaMessageForward failed, code = " + errCode + ", desc = " + errMsg);
+                            }
+                        });
+                    }
+                } else {
+                    if (position == mAdapter.getItemCount() -1) {
+                        if (mAdapter.getNewLocateMessage() != null) {
+                            Log.d(TAG, "mAdapter.getNewLocateMessage() seq:" + mAdapter.getNewLocateMessage().getV2TIMMessage().getSeq());
+                        }
+                        mImageVideoScanProvider.loadLocalMediaMessageBackward(mChatID, messageBean.isGroup(), mAdapter.getNewLocateMessage(), new IUIKitCallback<List<TUIMessageBean>>() {
+                            @Override
+                            public void onSuccess(List<TUIMessageBean> messageBeans) {
+                                if (messageBeans == null || messageBeans.isEmpty()) {
+                                    return;
+                                }
+                                int newPositon = mAdapter.addDataToSource(messageBeans, TUIChatConstants.GET_MESSAGE_BACKWARD, position);
+                                mRecyclerView.scrollToPosition(newPositon);
+                                mAdapter.notifyDataSetChanged();
+                            }
+
+                            @Override
+                            public void onError(String module, int errCode, String errMsg) {
+                                TUIChatLog.e(TAG, "onPageSelected loadLocalMediaMessageBackward failed, code = " + errCode + ", desc = " + errMsg);
+                            }
+                        });
+                    }
+                }
+            }
+        });
+    }
+
+    public void releaseUI() {
+        if (mAdapter != null) {
+            mAdapter.destroyView(mRecyclerView, mIndex);
+        }
+    }
+
+    public void saveLocal(Context context) {
+        TUIChatLog.d(TAG, "mCurrentPosition = " + mCurrentPosition);
+        if (mAdapter != null && mCurrentPosition >= 0 && mCurrentPosition < mAdapter.getItemCount()) {
+            TUIMessageBean messageBean = mAdapter.getDataSource().get(mCurrentPosition);
+            if (messageBean instanceof ImageMessageBean) {
+                ImageMessageBean imageMessageBean = (ImageMessageBean) messageBean;
+                String imagePath = imageMessageBean.getDataPath();
+                TUIChatLog.d(TAG, "imagePath = " + imagePath);
+                String originImagePath = TUIChatUtils.getOriginImagePath(imageMessageBean);
+                TUIChatLog.d(TAG, "originImagePath = " + originImagePath);
+                if (!TextUtils.isEmpty(originImagePath)) {
+                    imagePath = originImagePath;
+                }
+                saveImage(context, imagePath);
+            } else if (messageBean instanceof VideoMessageBean) {
+                VideoMessageBean videoMessageBean = (VideoMessageBean) messageBean;
+                final String videoPath = TUIConfig.getVideoDownloadDir() + videoMessageBean.getVideoUUID();
+                File file = new File(videoPath);
+                if (file.exists() && file.length() == videoMessageBean.getVideoSize()) {
+                    saveVideo(context, videoPath);
+                } else {
+                    ToastUtil.toastShortMessage(context.getString(R.string.downloading));
+                }
+            } else {
+                TUIChatLog.d(TAG, "error message type");
+            }
+        }
+    }
+
+    private void saveImage(Context context, String imagePath) {
+        ThreadHelper.INST.execute(new Runnable() {
+            @Override
+            public void run() {
+                boolean success = FileUtil.saveImageToGallery(context, imagePath);
+                if (success) {
+                    ToastUtil.toastShortMessage(context.getString(R.string.save_success));
+                } else {
+                    ToastUtil.toastShortMessage(context.getString(R.string.save_failed));
+                }
+            }
+        });
+    }
+
+    private void saveVideo(Context context, String videoPath) {
+        ThreadHelper.INST.execute(new Runnable() {
+            @Override
+            public void run() {
+                boolean success = FileUtil.saveVideoToGallery(context, videoPath);
+                if (success) {
+                    ToastUtil.toastShortMessage(context.getString(R.string.save_success));
+                } else {
+                    ToastUtil.toastShortMessage(context.getString(R.string.save_failed));
+                }
+            }
+        });
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/imagevideoscan/ImageVideoScanProvider.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/imagevideoscan/ImageVideoScanProvider.java
new file mode 100644
index 0000000..6832fd8
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/imagevideoscan/ImageVideoScanProvider.java
@@ -0,0 +1,149 @@
+package com.tencent.qcloud.tuikit.tuichat.component.imagevideoscan;
+
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.imsdk.v2.V2TIMMessageListGetOption;
+import com.tencent.imsdk.v2.V2TIMValueCallback;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageParser;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class ImageVideoScanProvider {
+    private static final String TAG = ImageVideoScanProvider.class.getSimpleName();
+    public static final int SCAN_MESSAGE_NUM = 10;
+    public static final int SCAN_MESSAGE_REQUEST_NUM = 20;
+
+
+
+    public void MessageProvider() {
+
+    }
+
+    public void initMessageList(String chatId, boolean isGroup, TUIMessageBean locateMessageInfo, IUIKitCallback<List<TUIMessageBean>> callBack) {
+        if (locateMessageInfo.getStatus() == TUIMessageBean.MSG_STATUS_SENDING) {
+            return;
+        }
+        // 1、先向后拉取 SCAN_MESSAGE_REQUEST_NUM 条, 新消息方向
+        // Pull back SCAN_MESSAGE_REQUEST_NUM numbers first, new message direction
+        loadLocalMediaMessageList(chatId, isGroup, SCAN_MESSAGE_REQUEST_NUM, locateMessageInfo, TUIChatConstants.GET_MESSAGE_BACKWARD, new IUIKitCallback<List<TUIMessageBean>>() {
+            @Override
+            public void onSuccess(List<TUIMessageBean> firstData) {
+                firstData.add(0, locateMessageInfo);
+                // 2、再向前拉取 SCAN_MESSAGE_REQUEST_NUM 条，旧消息方向
+                // pull forward SCAN_MESSAGE_REQUEST_NUM numbers, old message direction
+                loadLocalMediaMessageList(chatId, isGroup, SCAN_MESSAGE_REQUEST_NUM, locateMessageInfo, TUIChatConstants.GET_MESSAGE_FORWARD, new IUIKitCallback<List<TUIMessageBean>>() {
+                    @Override
+                    public void onSuccess(List<TUIMessageBean> secondData) {
+                        Collections.reverse(secondData);
+                        secondData.addAll(firstData);
+                        TUIChatUtils.callbackOnSuccess(callBack, secondData);
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        TUIChatUtils.callbackOnSuccess(callBack, firstData);
+                        TUIChatLog.e(TAG, "loadChatMessages getHistoryMessageList GET_MESSAGE_FORWARD failed, code = " + errCode + ", desc = " + errMsg);
+                    }
+                });
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIChatUtils.callbackOnError(callBack, TAG, errCode, errMsg);
+                TUIChatLog.e(TAG, "loadChatMessages getHistoryMessageList GET_MESSAGE_BACKWARD failed, code = " + errCode + ", desc = " + errMsg);
+            }
+        });
+    }
+
+    public void loadLocalMediaMessageForward(String chatId, boolean isGroup, TUIMessageBean locateMessageInfo, IUIKitCallback<List<TUIMessageBean>> callBack) {
+        loadLocalMediaMessageList(chatId, isGroup, SCAN_MESSAGE_REQUEST_NUM, locateMessageInfo, TUIChatConstants.GET_MESSAGE_FORWARD, new IUIKitCallback<List<TUIMessageBean>>() {
+            @Override
+            public void onSuccess(List<TUIMessageBean> secondData) {
+                Collections.reverse(secondData);
+                TUIChatUtils.callbackOnSuccess(callBack, secondData);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIChatUtils.callbackOnError(callBack, TAG, errCode, errMsg);
+                TUIChatLog.e(TAG, "loadChatMessages loadLocalMediaMessageForward failed, code = " + errCode + ", desc = " + errMsg);
+            }
+        });
+    }
+
+    public void loadLocalMediaMessageBackward(String chatId, boolean isGroup, TUIMessageBean locateMessageInfo, IUIKitCallback<List<TUIMessageBean>> callBack) {
+        loadLocalMediaMessageList(chatId, isGroup, SCAN_MESSAGE_REQUEST_NUM, locateMessageInfo, TUIChatConstants.GET_MESSAGE_BACKWARD, new IUIKitCallback<List<TUIMessageBean>>() {
+            @Override
+            public void onSuccess(List<TUIMessageBean> firstData) {
+                TUIChatUtils.callbackOnSuccess(callBack, firstData);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIChatUtils.callbackOnError(callBack, TAG, errCode, errMsg);
+                TUIChatLog.e(TAG, "loadChatMessages loadLocalMediaMessageBackward failed, code = " + errCode + ", desc = " + errMsg);
+            }
+        });
+    }
+
+    public void loadLocalMediaMessageList(String chatId, boolean isGroup, int loadCount,
+                                       TUIMessageBean locateMessageInfo, int getType, IUIKitCallback<List<TUIMessageBean>> callBack) {
+
+        V2TIMMessageListGetOption optionBackward = new V2TIMMessageListGetOption();
+        optionBackward.setCount(loadCount);
+        List<Integer> messageTypeList = new ArrayList<>();
+        messageTypeList.add(V2TIMMessage.V2TIM_ELEM_TYPE_IMAGE);
+        messageTypeList.add(V2TIMMessage.V2TIM_ELEM_TYPE_VIDEO);
+        optionBackward.setMessageTypeList(messageTypeList);
+        if (getType == TUIChatConstants.GET_MESSAGE_FORWARD) {
+            optionBackward.setGetType(V2TIMMessageListGetOption.V2TIM_GET_LOCAL_OLDER_MSG);
+        } else if (getType == TUIChatConstants.GET_MESSAGE_BACKWARD) {
+            optionBackward.setGetType(V2TIMMessageListGetOption.V2TIM_GET_LOCAL_NEWER_MSG);
+        }
+        if (locateMessageInfo != null) {
+            optionBackward.setLastMsg(locateMessageInfo.getV2TIMMessage());
+        }
+        if (isGroup) {
+            optionBackward.setGroupID(chatId);
+        } else {
+            optionBackward.setUserID(chatId);
+        }
+
+        V2TIMManager.getMessageManager().getHistoryMessageList(optionBackward, new V2TIMValueCallback<List<V2TIMMessage>>() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIChatUtils.callbackOnError(callBack, TAG, code, desc);
+                TUIChatLog.e(TAG, "loadChatMessages getHistoryMessageList optionBackward failed, code = " + code + ", desc = " + desc);
+            }
+
+            @Override
+            public void onSuccess(List<V2TIMMessage> v2TIMMessages) {
+                if (v2TIMMessages.isEmpty()) {
+                    TUIChatLog.d(TAG, "getHistoryMessageList is null");
+                    TUIChatUtils.callbackOnSuccess(callBack, new ArrayList<>());
+                    return;
+                }
+
+                List<V2TIMMessage> timMessages = new ArrayList<>();
+                for (V2TIMMessage timMessage : v2TIMMessages) {
+                    TUIChatLog.d(TAG, "loadLocalMediaMessageList getType = " + getType + "timMessage seq = " + timMessage.getSeq());
+                    int status = timMessage.getStatus();
+                    if (status == V2TIMMessage.V2TIM_MSG_STATUS_HAS_DELETED || status == V2TIMMessage.V2TIM_MSG_STATUS_LOCAL_REVOKED) {
+                        continue;
+                    }
+                    timMessages.add(timMessage);
+                }
+
+                List<TUIMessageBean> messageInfoList = ChatMessageParser.parseMessageList(timMessages);
+                TUIChatUtils.callbackOnSuccess(callBack, messageInfoList);
+            }
+        });
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/imagevideoscan/OnViewPagerListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/imagevideoscan/OnViewPagerListener.java
new file mode 100644
index 0000000..2870879
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/imagevideoscan/OnViewPagerListener.java
@@ -0,0 +1,7 @@
+package com.tencent.qcloud.tuikit.tuichat.component.imagevideoscan;
+
+public interface OnViewPagerListener {
+    void onInitComplete();
+    void onPageRelease(boolean isNext,int position);
+    void onPageSelected(int position,boolean isBottom, boolean isLeftScroll);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/imagevideoscan/ViewPagerLayoutManager.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/imagevideoscan/ViewPagerLayoutManager.java
new file mode 100644
index 0000000..b93e8fc
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/imagevideoscan/ViewPagerLayoutManager.java
@@ -0,0 +1,127 @@
+package com.tencent.qcloud.tuikit.tuichat.component.imagevideoscan;
+
+import android.content.Context;
+import android.view.View;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.PagerSnapHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
+
+public class ViewPagerLayoutManager extends LinearLayoutManager {
+    private static final String TAG = "ViewPagerLayoutManager";
+    private PagerSnapHelper mPagerSnapHelper;
+    private OnViewPagerListener mOnViewPagerListener;
+    private RecyclerView mRecyclerView;
+    private int mDrift;//位移，用来判断移动方向 Displacement, used to determine the direction of movement
+    private boolean mIsLeftScroll = false;
+
+    public ViewPagerLayoutManager(Context context, int orientation) {
+        super(context, orientation, false);
+        init();
+    }
+
+    private void init() {
+        mPagerSnapHelper = new PagerSnapHelper();
+    }
+
+    @Override
+    public void onAttachedToWindow(RecyclerView view) {
+        super.onAttachedToWindow(view);
+        mPagerSnapHelper.attachToRecyclerView(view);
+        this.mRecyclerView = view;
+        mRecyclerView.addOnChildAttachStateChangeListener(mChildAttachStateChangeListener);
+    }
+
+    @Override
+    public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {
+        super.onLayoutChildren(recycler, state);
+    }
+
+    /**
+     * 滑动状态的改变
+     * 缓慢拖拽-> SCROLL_STATE_DRAGGING
+     * 快速滚动-> SCROLL_STATE_SETTLING
+     * 空闲状态-> SCROLL_STATE_IDLE
+     * @param state
+     * 
+     * 
+     * Change of sliding state
+     * drag slowly-> SCROLL_STATE_DRAGGING
+     * scroll fast-> SCROLL_STATE_SETTLING
+     * idle state-> SCROLL_STATE_IDLE
+     */
+    @Override
+    public void onScrollStateChanged(int state) {
+        switch (state) {
+            case RecyclerView.SCROLL_STATE_IDLE:
+                View viewIdle = mPagerSnapHelper.findSnapView(this);
+                int positionIdle = getPosition(viewIdle);
+                if (mOnViewPagerListener != null && getChildCount() == 1) {
+                    mOnViewPagerListener.onPageSelected(positionIdle,positionIdle == getItemCount() - 1, mIsLeftScroll);
+                }
+                break;
+        }
+    }
+
+    /**
+     * 监听竖直方向的相对偏移量
+     * 
+     * Monitor the relative offset in the vertical direction
+     * 
+     * @param dy
+     * @param recycler
+     * @param state
+     * @return
+     */
+    @Override
+    public int scrollVerticallyBy(int dy, RecyclerView.Recycler recycler, RecyclerView.State state) {
+        this.mDrift = dy;
+        return super.scrollVerticallyBy(dy, recycler, state);
+    }
+
+
+    /**
+     * 监听水平方向的相对偏移量
+     * 
+     * Monitor the relative offset in the horizontal direction
+     * 
+     * @param dx
+     * @param recycler
+     * @param state
+     * @return
+     */
+    @Override
+    public int scrollHorizontallyBy(int dx, RecyclerView.Recycler recycler, RecyclerView.State state) {
+        if (dx <= 0) {
+            mIsLeftScroll = true;
+        } else {
+            mIsLeftScroll = false;
+        }
+        this.mDrift = dx;
+        return super.scrollHorizontallyBy(dx, recycler, state);
+    }
+
+    public void setOnViewPagerListener(OnViewPagerListener listener){
+        this.mOnViewPagerListener = listener;
+    }
+
+    private RecyclerView.OnChildAttachStateChangeListener mChildAttachStateChangeListener = new RecyclerView.OnChildAttachStateChangeListener() {
+        @Override
+        public void onChildViewAttachedToWindow(View view) {
+            if (mOnViewPagerListener != null && getChildCount() == 1) {
+                mOnViewPagerListener.onInitComplete();
+            }
+        }
+
+        @Override
+        public void onChildViewDetachedFromWindow(View view) {
+            if (mDrift >= 0){
+                if (mOnViewPagerListener != null) mOnViewPagerListener.onPageRelease(true,getPosition(view));
+            }else {
+                if (mOnViewPagerListener != null) mOnViewPagerListener.onPageRelease(false,getPosition(view));
+            }
+
+        }
+    };
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/progress/ProgressPresenter.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/progress/ProgressPresenter.java
new file mode 100644
index 0000000..a10f10e
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/component/progress/ProgressPresenter.java
@@ -0,0 +1,83 @@
+package com.tencent.qcloud.tuikit.tuichat.component.progress;
+
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.lang.ref.WeakReference;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+public class ProgressPresenter {
+    private static final String TAG = ProgressPresenter.class.getSimpleName();
+
+    private static final class ProgressPresenterHolder {
+        private static final ProgressPresenter instance = new ProgressPresenter();
+    }
+
+    private final Map<String, List<WeakReference<ProgressListener>>> progressListenerMap = new ConcurrentHashMap<>();
+
+    public static ProgressPresenter getInstance() {
+        return ProgressPresenterHolder.instance;
+    }
+
+    private ProgressPresenter() {}
+
+    public void registerProgressListener(String progressId, ProgressListener listener) {
+        Log.i(TAG, "registerProgressListener id : " + progressId + ", listener : " + listener);
+        if (TextUtils.isEmpty(progressId) || listener == null) {
+            return;
+        }
+
+        List<WeakReference<ProgressListener>> list = progressListenerMap.get(progressId);
+        if (list == null) {
+            list = new CopyOnWriteArrayList<>();
+            progressListenerMap.put(progressId, list);
+        }
+        WeakReference<ProgressListener> weakReference = new WeakReference<>(listener);
+        list.add(weakReference);
+    }
+
+    public void updateProgress(String progressId, int progress) {
+
+        List<WeakReference<ProgressListener>> referenceList = progressListenerMap.get(progressId);
+        if (referenceList != null && !referenceList.isEmpty()) {
+            Iterator<WeakReference<ProgressListener>> iterator = referenceList.listIterator();
+            while (iterator.hasNext()) {
+                WeakReference<ProgressListener> weakReference = iterator.next();
+                ProgressListener listener = weakReference.get();
+                if (listener != null) {
+                    listener.onProgress(progress);
+                }
+            }
+        } else {
+            progressListenerMap.remove(progressId);
+        }
+    }
+
+    public void unregisterProgressListener(String progressId, ProgressListener listener) {
+        Log.i(TAG, "unregisterProgressListener id : " + progressId + ", listener : " + listener);
+        if (TextUtils.isEmpty(progressId) || listener == null) {
+            return;
+        }
+
+        List<WeakReference<ProgressListener>> list = progressListenerMap.get(progressId);
+        if (list != null) {
+            return;
+        }
+        WeakReference<ProgressListener> remove = null;
+        for (WeakReference<ProgressListener> reference : list) {
+            if (reference.get() == listener) {
+                remove = reference;
+                break;
+            }
+        }
+        list.remove(remove);
+    }
+
+    public interface ProgressListener {
+        void onProgress(int progress);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/config/GeneralConfig.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/config/GeneralConfig.java
new file mode 100644
index 0000000..8092adb
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/config/GeneralConfig.java
@@ -0,0 +1,282 @@
+package com.tencent.qcloud.tuikit.tuichat.config;
+
+public class GeneralConfig {
+
+    public final static int DEFAULT_AUDIO_RECORD_MAX_TIME = 60;
+    public final static int DEFAULT_VIDEO_RECORD_MAX_TIME = 15;
+    private String appCacheDir;
+    private int audioRecordMaxTime = DEFAULT_AUDIO_RECORD_MAX_TIME;
+    private int videoRecordMaxTime = DEFAULT_VIDEO_RECORD_MAX_TIME;
+    private String userNickname = "";
+    private boolean excludedFromUnreadCount;
+    private boolean excludedFromLastMessage;
+
+    private boolean isAndroidPrivateRing;
+    private boolean isEnableMessageTyping = true;
+
+    private boolean showRead = false;
+
+    private boolean reactEnable = true;
+    private boolean replyEnable = true;
+    private boolean quoteEnable = true;
+
+    private boolean enableVoiceCall = true;
+    private boolean enableVideoCall = true;
+
+    private boolean enableFloatWindowForCall = true;
+    private boolean enableMultiDeviceForCall = false;
+
+    private boolean enableTextTranslation = false;
+
+    public boolean isEnableTextTranslation() {
+        return enableTextTranslation;
+    }
+
+    public void setEnableTextTranslation(boolean enableTextTranslation) {
+        this.enableTextTranslation = enableTextTranslation;
+    }
+
+    /**
+     * 是否开启音视频通话悬浮窗
+     * Set to enable the floating window for call
+     */
+    public void setEnableFloatWindowForCall(boolean enableFloatWindowForCall) {
+        this.enableFloatWindowForCall = enableFloatWindowForCall;
+    }
+
+    public boolean isEnableFloatWindowForCall() {
+        return enableFloatWindowForCall;
+    }
+
+    public void setEnableMultiDeviceForCall(boolean enableMultiDeviceForCall) {
+        this.enableMultiDeviceForCall = enableMultiDeviceForCall;
+    }
+
+    public boolean isEnableMultiDeviceForCall() {
+        return enableMultiDeviceForCall;
+    }
+
+    public void setReactEnable(boolean reactEnable) {
+        this.reactEnable = reactEnable;
+    }
+
+    public boolean isReactEnable() {
+        return reactEnable;
+    }
+
+    public void setReplyEnable(boolean replyEnable) {
+        this.replyEnable = replyEnable;
+    }
+
+    public boolean isReplyEnable() {
+        return replyEnable;
+    }
+
+    public void setQuoteEnable(boolean quoteEnable) {
+        this.quoteEnable = quoteEnable;
+    }
+
+    public boolean isQuoteEnable() {
+        return quoteEnable;
+    }
+
+    public void setEnableVideoCall(boolean enableVideoCall) {
+        this.enableVideoCall = enableVideoCall;
+    }
+
+    public void setEnableVoiceCall(boolean enableVoiceCall) {
+        this.enableVoiceCall = enableVoiceCall;
+    }
+
+    public boolean isEnableVideoCall() {
+        return enableVideoCall;
+    }
+
+    public boolean isEnableVoiceCall() {
+        return enableVoiceCall;
+    }
+
+    public String getUserNickname() {
+        return userNickname;
+    }
+
+    public void setUserNickname(String userNickname) {
+        this.userNickname = userNickname;
+    }
+
+    public String getUserFaceUrl() {
+        return userFaceUrl;
+    }
+
+    public void setUserFaceUrl(String userFaceUrl) {
+        this.userFaceUrl = userFaceUrl;
+    }
+
+    private String userFaceUrl = "";
+
+    /**
+     * 获取TUIKit缓存路径
+     * 
+     * Get TUIKit cache path
+     *
+     * @return
+     */
+    public String getAppCacheDir() {
+        return appCacheDir;
+    }
+
+    /**
+     * 设置TUIKit缓存路径
+     * 
+     * Set TUIKit cache path
+     *
+     * @param appCacheDir
+     * @return
+     */
+    public GeneralConfig setAppCacheDir(String appCacheDir) {
+        this.appCacheDir = appCacheDir;
+        return this;
+    }
+
+    /**
+     * 获取录音最大时长
+     * 
+     * Get the maximum duration of the recording
+     *
+     * @return
+     */
+    public int getAudioRecordMaxTime() {
+        return audioRecordMaxTime;
+    }
+
+    /**
+     * 录音最大时长
+     * 
+     * Maximum recording time
+     *
+     * @param audioRecordMaxTime
+     * @return
+     */
+    public GeneralConfig setAudioRecordMaxTime(int audioRecordMaxTime) {
+        this.audioRecordMaxTime = audioRecordMaxTime;
+        return this;
+    }
+
+    /**
+     * 获取录像最大时长
+     * 
+     * Get the maximum duration of the recording
+     *
+     * @return
+     */
+    public int getVideoRecordMaxTime() {
+        return videoRecordMaxTime;
+    }
+
+    /**
+     * 摄像最大时长
+     * 
+     * Maximum camera time
+     *
+     * @param videoRecordMaxTime
+     * @return
+     */
+    public GeneralConfig setVideoRecordMaxTime(int videoRecordMaxTime) {
+        this.videoRecordMaxTime = videoRecordMaxTime;
+        return this;
+    }
+
+    /**
+     * 对方已读的 view 是否展示
+     * 
+     * Whether the view read by the other party is displayed
+     *
+     * @return
+     */
+    public boolean isShowRead() {
+        return showRead;
+    }
+
+    /**
+     * 设置对方已读的 view 是否展示
+     * 
+     * Set whether the view read by the other party is displayed
+     *
+     * @return
+     */
+    public void setShowRead(boolean showRead) {
+        this.showRead = showRead;
+    }
+
+    /**
+     * 获取消息是否不计入会话未读数：默认为 false，表明需要计入会话未读数，设置为 true，表明不需要计入会话未读数
+     * 
+     * Get whether messages are not counted as conversation unread: false, need to be counted; true, do not need to be counted
+     */
+    public boolean isExcludedFromUnreadCount() {
+        return excludedFromUnreadCount;
+    }
+
+    /**
+     * 设置消息是否不计入会话未读数：默认为 false，表明需要计入会话未读数，设置为 true，表明不需要计入会话未读数
+     * 
+     * Set whether messages are not counted as conversation unread: false, need to be counted; true, do not need to be counted
+     */
+    public void setExcludedFromUnreadCount(boolean excludedFromUnreadCount) {
+        this.excludedFromUnreadCount = excludedFromUnreadCount;
+    }
+
+    /**
+     * 获取消息是否不计入会话 lastMsg：默认为 false，表明需要计入会话 lastMsg，设置为 true，表明不需要计入会话 lastMessage
+     * 
+     * Get whether the message does not count as the last message of the session: false, need to be counted; true, do not need to be counted
+     */
+    public boolean isExcludedFromLastMessage() {
+        return excludedFromLastMessage;
+    }
+
+    /**
+     * 设置消息是否不计入会话 lastMsg：默认为 false，表明需要计入会话 lastMsg，设置为 true，表明不需要计入会话 lastMessage
+     * 
+     * Set whether the message does not count as the last message of the session: false, need to be counted; true, do not need to be counted
+     */
+    public void setExcludedFromLastMessage(boolean excludedFromLastMessage) {
+        this.excludedFromLastMessage = excludedFromLastMessage;
+    }
+
+    /**
+     * 获取离线推送提示铃音是否为自定义铃音
+     * 
+     * Get whether the offline push notification ringtone is a custom ringtone
+     */
+    public boolean isAndroidPrivateRing() {
+        return isAndroidPrivateRing;
+    }
+
+    /**
+     * 设置离线推送提示铃音是否为自定义铃音
+     * 
+     * Set whether the offline push notification ringtone is a custom ringtone
+     */
+    public void setAndroidPrivateRing(boolean ring) {
+        this.isAndroidPrivateRing = ring;
+    }
+
+    /**
+     * 获取 "对方正在输入..." 功能是否打开
+     *
+     * Get whether the "Typing..." function is enabled
+     */
+    public boolean isEnableMessageTyping() {
+        return isEnableMessageTyping;
+    }
+
+    /**
+     * 设置 "对方正在输入..." 功能是否打开
+     *
+     * Set whether the "Typing..." function is enabled
+     */
+    public void setEnableMessageTyping(boolean enableMessageTyping) {
+        isEnableMessageTyping = enableMessageTyping;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/config/TUIChatConfigs.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/config/TUIChatConfigs.java
new file mode 100644
index 0000000..b83917e
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/config/TUIChatConfigs.java
@@ -0,0 +1,79 @@
+package com.tencent.qcloud.tuikit.tuichat.config;
+
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.noticelayout.NoticeLayoutConfig;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.IMInputViewActionListener;
+
+public class TUIChatConfigs {
+
+    private static TUIChatConfigs sConfigs;
+    private GeneralConfig generalConfig;
+    private NoticeLayoutConfig noticeLayoutConfig;
+
+    private IMInputViewActionListener imInputViewActionListener;
+
+    private TUIChatConfigs() {
+
+    }
+
+    /**
+     * 获取TUIKit的全部配置
+     * 
+     * Get TUIKit configs
+     *
+     * @return
+     */
+    public static TUIChatConfigs getConfigs() {
+        if (sConfigs == null) {
+            sConfigs = new TUIChatConfigs();
+        }
+        return sConfigs;
+    }
+
+    /**
+     * 获取TUIKit的通用配置
+     * 
+     * Get TUIKit general configs
+     *
+     * @return
+     */
+    public GeneralConfig getGeneralConfig() {
+        if (generalConfig == null) {
+            generalConfig = new GeneralConfig();
+        }
+        return generalConfig;
+    }
+
+    /**
+     * 设置TUIKit的通用配置
+     * 
+     * Set TUIKit general configs
+     *
+     * @param generalConfig
+     * @return
+     */
+    public TUIChatConfigs setGeneralConfig(GeneralConfig generalConfig) {
+        this.generalConfig = generalConfig;
+        return this;
+    }
+
+    /**
+     * 获取聊天界面自定义视图配置
+     *
+     * Get chat interface custom view configuration
+     *
+     * @return
+     */
+    public NoticeLayoutConfig getNoticeLayoutConfig() {
+        if (noticeLayoutConfig == null) {
+            noticeLayoutConfig = new NoticeLayoutConfig();
+        }
+        return noticeLayoutConfig;
+    }
+    public IMInputViewActionListener getImInputViewActionListener() {
+        return imInputViewActionListener;
+    }
+
+    public void setImInputViewActionListener(IMInputViewActionListener imInputViewActionListener) {
+        this.imInputViewActionListener = imInputViewActionListener;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/AudioRecordEventListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/AudioRecordEventListener.java
new file mode 100644
index 0000000..0f8cae9
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/AudioRecordEventListener.java
@@ -0,0 +1,10 @@
+package com.tencent.qcloud.tuikit.tuichat.interfaces;
+
+
+/**
+ * C2C Chat event listener
+ */
+public abstract class AudioRecordEventListener {
+    public void onRecordBegin(int errorCode, String path) {}
+    public void onRecordComplete(int errorCode, String path) {}
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/C2CChatEventListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/C2CChatEventListener.java
new file mode 100644
index 0000000..4f37a1a
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/C2CChatEventListener.java
@@ -0,0 +1,22 @@
+package com.tencent.qcloud.tuikit.tuichat.interfaces;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageReceiptInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+import java.util.List;
+
+/**
+ * C2C Chat event listener
+ */
+public abstract class C2CChatEventListener {
+    public void onReadReport(List<MessageReceiptInfo> receiptList) {}
+    public void handleRevoke(String msgId) {}
+    public void onRecvNewMessage(TUIMessageBean message) {}
+    public void exitC2CChat(String chatId) {}
+    public void onFriendNameChanged(String userId, String newName) {}
+    public void onFriendFaceUrlChanged(String userId, String newFaceUrl) {}
+    public void onRecvMessageModified(TUIMessageBean messageBean) {}
+    public void addMessage(TUIMessageBean messageBean, String chatId) {}
+    public void onMessageChanged(TUIMessageBean messageBean) {}
+    public void clearC2CMessage(String userID) {}
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/GroupChatEventListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/GroupChatEventListener.java
new file mode 100644
index 0000000..1e09c74
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/GroupChatEventListener.java
@@ -0,0 +1,24 @@
+package com.tencent.qcloud.tuikit.tuichat.interfaces;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageReceiptInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+import java.util.List;
+
+/**
+ * Group Chat event listener
+ */
+public abstract class GroupChatEventListener {
+    public void onGroupForceExit(String groupId) {};
+    public void onApplied(int unHandledSize) {}
+    public void handleRevoke(String msgId) {}
+    public void onRecvNewMessage(TUIMessageBean message) {}
+    public void onReadReport(List<MessageReceiptInfo> receiptInfoList) {}
+    public void onGroupNameChanged(String groupId, String newName) {}
+    public void onGroupFaceUrlChanged(String groupId, String faceUrl) {}
+    public void exitGroupChat(String chatId) {}
+    public void clearGroupMessage(String chatId) {}
+    public void onRecvMessageModified(TUIMessageBean messageBean) {}
+    public void addMessage(TUIMessageBean messageBean, String chatId) {}
+    public void onMessageChanged(TUIMessageBean messageBean) {}
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/IBaseMessageSender.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/IBaseMessageSender.java
new file mode 100644
index 0000000..3882582
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/IBaseMessageSender.java
@@ -0,0 +1,17 @@
+package com.tencent.qcloud.tuikit.tuichat.interfaces;
+
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+public interface IBaseMessageSender {
+    /**
+     * 调用 TUIKit 的接口发送消息
+     * 
+     * send message 
+     * 
+     * @param message 消息
+     * @param receiver 接收者 Id
+     * @param isGroup 是否为群组
+     */
+    void sendMessage(final TUIMessageBean message, String receiver, boolean isGroup);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/IMInputViewActionListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/IMInputViewActionListener.java
new file mode 100644
index 0000000..9de93c0
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/IMInputViewActionListener.java
@@ -0,0 +1,9 @@
+package com.tencent.qcloud.tuikit.tuichat.interfaces;
+/**
+ * @author nanfeifei
+ * @time 2023/7/6 17:38
+ * @description  InputView中的功能菜单回调
+ */
+public interface IMInputViewActionListener {
+    void finishAction(int workType, String workId);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/IMessageAdapter.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/IMessageAdapter.java
new file mode 100644
index 0000000..0074eab
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/IMessageAdapter.java
@@ -0,0 +1,12 @@
+package com.tencent.qcloud.tuikit.tuichat.interfaces;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+import java.util.List;
+
+public interface IMessageAdapter {
+    void onDataSourceChanged(List<TUIMessageBean> dataSource);
+    void onViewNeedRefresh(int type, int value);
+    void onViewNeedRefresh(int type, TUIMessageBean locateMessage);
+    void onScrollToEnd();
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/IMessageRecyclerView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/IMessageRecyclerView.java
new file mode 100644
index 0000000..0c39188
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/IMessageRecyclerView.java
@@ -0,0 +1,25 @@
+package com.tencent.qcloud.tuikit.tuichat.interfaces;
+
+public interface IMessageRecyclerView {
+    int DATA_CHANGE_TYPE_REFRESH = 0;
+    int DATA_CHANGE_TYPE_LOAD = 1;
+    int DATA_CHANGE_TYPE_ADD_FRONT = 2;
+    int DATA_CHANGE_TYPE_ADD_BACK = 3;
+    int DATA_CHANGE_TYPE_UPDATE = 4;
+    int DATA_CHANGE_TYPE_DELETE = 5;
+    int DATA_CHANGE_TYPE_CLEAR = 6;
+    // 先刷新消息再定位到消息位置
+    // Refresh the message first and then locate the message location
+    int DATA_CHANGE_LOCATE_TO_POSITION = 7;
+    int DATA_CHANGE_NEW_MESSAGE = 8;
+    // 直接滚动到消息位置
+    // Scroll directly to message location
+    int SCROLL_TO_POSITION = 9;
+    // 先刷新消息再滚动到消息位置
+    // Refresh the message before scrolling to the message position
+    int DATA_CHANGE_SCROLL_TO_POSITION = 10;
+
+    boolean isDisplayJumpMessageLayout();
+    void displayBackToNewMessage(boolean display, String messageId, int count);
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/IReplyMessageHandler.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/IReplyMessageHandler.java
new file mode 100644
index 0000000..08145ef
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/IReplyMessageHandler.java
@@ -0,0 +1,11 @@
+package com.tencent.qcloud.tuikit.tuichat.interfaces;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageRepliesBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+import java.util.Map;
+
+public interface IReplyMessageHandler {
+    void updateData(TUIMessageBean messageBean);
+    void onRepliesMessageFound(Map<MessageRepliesBean.ReplyBean, TUIMessageBean> messageBeanMap);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/NetworkConnectionListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/NetworkConnectionListener.java
new file mode 100644
index 0000000..2fae8ee
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/NetworkConnectionListener.java
@@ -0,0 +1,5 @@
+package com.tencent.qcloud.tuikit.tuichat.interfaces;
+
+public interface NetworkConnectionListener {
+    void onConnected();
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/TotalUnreadCountListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/TotalUnreadCountListener.java
new file mode 100644
index 0000000..adeae8d
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/interfaces/TotalUnreadCountListener.java
@@ -0,0 +1,5 @@
+package com.tencent.qcloud.tuikit.tuichat.interfaces;
+
+public interface TotalUnreadCountListener {
+    void onTotalUnreadCountChanged(long totalUnreadCount);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/MinimalistUIService.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/MinimalistUIService.java
new file mode 100644
index 0000000..cce0943
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/MinimalistUIService.java
@@ -0,0 +1,162 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui;
+
+import android.content.Context;
+
+import com.tencent.qcloud.tuicore.ServiceInitializer;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CallingMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CustomEvaluationMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CustomLinkMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CustomOrderMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.FaceMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.FileMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ImageMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.LocationMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.MergeMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.MessageTypingBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.QuoteMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ReplyMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.SoundMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TextAtMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TextMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TipsMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.VideoMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.CustomEvaluationMessageReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.CustomLinkReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.CustomOrderMessageReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.FaceReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.FileReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.ImageReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.LocationReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.MergeReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.ReplyReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.SoundReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TextReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.VideoReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply.FaceReplyQuoteView;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply.FileReplyQuoteView;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply.ImageReplyQuoteView;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply.LocationReplyQuoteView;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply.MergeReplyQuoteView;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply.SoundReplyQuoteView;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply.TUIReplyQuoteView;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply.TextReplyQuoteView;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply.VideoReplyQuoteView;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.CallingMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.CustomEvaluationMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.CustomLinkMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.CustomOrderMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.FaceMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.FileMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.ImageMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.LocationMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.MergeMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.MessageBaseHolder;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.QuoteMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.ReplyMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.SoundMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.TextMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.TipsMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.VideoMessageHolder;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Internal service for MinimalistUI
+ */
+public class MinimalistUIService extends ServiceInitializer {
+    private static MinimalistUIService instance;
+
+    public static MinimalistUIService getInstance() {
+        return instance;
+    }
+
+    private final Map<Class<? extends TUIMessageBean>, Integer> messageViewTypeMap = new HashMap<>();
+    private final Map<Integer, Class<? extends MessageBaseHolder>> messageViewHolderMap = new HashMap<>();
+    private final Map<Class<? extends TUIReplyQuoteBean>, Class<? extends TUIReplyQuoteView>> replyMessageViewMap = new HashMap<>();
+    private int viewType = 0;
+
+    @Override
+    public void init(Context context) {
+        instance = this;
+        initMessage();
+        initReplyMessage();
+    }
+
+    public void initMessage() {
+        addMessageType(FaceMessageBean.class, FaceMessageHolder.class);
+        addMessageType(FileMessageBean.class, FileMessageHolder.class);
+        addMessageType(ImageMessageBean.class, ImageMessageHolder.class);
+        addMessageType(LocationMessageBean.class, LocationMessageHolder.class);
+        addMessageType(MergeMessageBean.class, MergeMessageHolder.class);
+        addMessageType(SoundMessageBean.class, SoundMessageHolder.class);
+        addMessageType(TextAtMessageBean.class, TextMessageHolder.class);
+        addMessageType(TextMessageBean.class, TextMessageHolder.class);
+        addMessageType(TipsMessageBean.class, TipsMessageHolder.class);
+        addMessageType(VideoMessageBean.class, VideoMessageHolder.class);
+        addMessageType(ReplyMessageBean.class, ReplyMessageHolder.class);
+        addMessageType(QuoteMessageBean.class, QuoteMessageHolder.class);
+        addMessageType(CallingMessageBean.class, CallingMessageHolder.class);
+        addMessageType(CustomLinkMessageBean.class, CustomLinkMessageHolder.class);
+        addMessageType(CustomEvaluationMessageBean.class, CustomEvaluationMessageHolder.class);
+        addMessageType(CustomOrderMessageBean.class, CustomOrderMessageHolder.class);
+        addMessageType(MessageTypingBean.class, null);
+    }
+
+    private void addMessageType(Class<? extends TUIMessageBean> beanClazz, Class<? extends MessageBaseHolder> holderClazz) {
+        viewType++;
+        messageViewTypeMap.put(beanClazz, viewType);
+        messageViewHolderMap.put(viewType, holderClazz);
+    }
+
+    private void initReplyMessage() {
+        replyMessageViewMap.put(CustomEvaluationMessageReplyQuoteBean.class, TextReplyQuoteView.class);
+        replyMessageViewMap.put(CustomLinkReplyQuoteBean.class, TextReplyQuoteView.class);
+        replyMessageViewMap.put(CustomOrderMessageReplyQuoteBean.class, TextReplyQuoteView.class);
+        replyMessageViewMap.put(FaceReplyQuoteBean.class, FaceReplyQuoteView.class);
+        replyMessageViewMap.put(FileReplyQuoteBean.class, FileReplyQuoteView.class);
+        replyMessageViewMap.put(ImageReplyQuoteBean.class, ImageReplyQuoteView.class);
+        replyMessageViewMap.put(LocationReplyQuoteBean.class, LocationReplyQuoteView.class);
+        replyMessageViewMap.put(MergeReplyQuoteBean.class, MergeReplyQuoteView.class);
+        replyMessageViewMap.put(ReplyReplyQuoteBean.class, TextReplyQuoteView.class);
+        replyMessageViewMap.put(SoundReplyQuoteBean.class, SoundReplyQuoteView.class);
+        replyMessageViewMap.put(TextReplyQuoteBean.class, TextReplyQuoteView.class);
+        replyMessageViewMap.put(VideoReplyQuoteBean.class, VideoReplyQuoteView.class);
+    }
+
+    public Class<? extends TUIReplyQuoteView> getReplyMessageViewClass(Class<? extends TUIReplyQuoteBean> replyQuoteBeanType) {
+        return replyMessageViewMap.get(replyQuoteBeanType);
+    }
+
+    public Class<? extends MessageBaseHolder> getMessageViewHolderClass(int viewType) {
+        return messageViewHolderMap.get(viewType);
+    }
+
+    public int getViewType(Class<? extends TUIMessageBean> messageBeanClass) {
+        Integer viewType = messageViewTypeMap.get(messageBeanClass);
+        if (viewType != null) {
+            return viewType;
+        } else {
+            return 0;
+        }
+    }
+
+    @Override
+    public int getLightThemeResId() {
+        return R.style.TUIChatLightTheme;
+    }
+
+    @Override
+    public int getLivelyThemeResId() {
+        return R.style.TUIChatLivelyTheme;
+    }
+
+    @Override
+    public int getSeriousThemeResId() {
+        return R.style.TUIChatSeriousTheme;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/BeginnerGuidePage.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/BeginnerGuidePage.java
new file mode 100644
index 0000000..884ba39
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/BeginnerGuidePage.java
@@ -0,0 +1,182 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component;
+
+import android.animation.ValueAnimator;
+import android.app.Activity;
+import android.graphics.drawable.ColorDrawable;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.view.animation.LinearInterpolator;
+import android.widget.ImageView;
+import android.widget.PopupWindow;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewpager2.widget.ViewPager2;
+
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.util.SPUtils;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuicore.util.SoftKeyBoardUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+
+public class BeginnerGuidePage {
+
+    private PopupWindow popupWindow;
+    private ViewPager2 viewPager;
+    private OnFinishListener onFinishListener;
+    private int[] resIDs;
+    public BeginnerGuidePage(Activity activity) {
+        View popupView = LayoutInflater.from(activity).inflate(R.layout.layout_beginner_guide, null);
+        viewPager = popupView.findViewById(R.id.view_pager);
+
+        popupWindow = new PopupWindow(popupView, WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT, true) {
+            @Override
+            public void showAtLocation(View anchor, int gravity, int x, int y) {
+                if (activity != null && !activity.isFinishing()) {
+                    Window dialogWindow = activity.getWindow();
+                    startAnimation(dialogWindow, true);
+                }
+                super.showAtLocation(anchor, gravity, x, y);
+            }
+
+            @Override
+            public void dismiss() {
+                if (activity != null && !activity.isFinishing()) {
+                    Window dialogWindow = activity.getWindow();
+                    startAnimation(dialogWindow, false);
+                }
+
+                super.dismiss();
+            }
+        };
+        popupWindow.setBackgroundDrawable(new ColorDrawable());
+        popupWindow.setTouchable(true);
+        popupWindow.setOutsideTouchable(false);
+        popupWindow.setAnimationStyle(R.style.BeginnerGuidePopupAnimation);
+        viewPager.setUserInputEnabled(false);
+        viewPager.setAdapter(new GuideAdapter());
+    }
+
+    private void startAnimation(Window window, boolean isShow) {
+        LinearInterpolator interpolator = new LinearInterpolator();
+        ValueAnimator animator;
+        if (isShow) {
+            animator = ValueAnimator.ofFloat(1.0f, 0.5f);
+        } else {
+            animator = ValueAnimator.ofFloat(0.5f, 1.0f);
+        }
+        animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                WindowManager.LayoutParams lp = window.getAttributes();
+                lp.alpha = (float) animation.getAnimatedValue();
+                window.setAttributes(lp);
+            }
+        });
+
+        animator.setDuration(200);
+        animator.setInterpolator(interpolator);
+        animator.start();
+    }
+
+    public void setPagesResIDs(int... imageResIDs) {
+        resIDs = imageResIDs;
+        viewPager.setOffscreenPageLimit(resIDs.length);
+        viewPager.getAdapter().notifyDataSetChanged();
+        viewPager.setCurrentItem(0, false);
+    }
+
+    public void setOnFinishListener(OnFinishListener onFinishListener) {
+        this.onFinishListener = onFinishListener;
+    }
+
+    public void show(View rootView, int gravity) {
+        if (popupWindow != null) {
+            popupWindow.showAtLocation(rootView, gravity, 0, 0);
+        }
+    }
+
+    class GuideAdapter extends RecyclerView.Adapter<GuideAdapter.GuideViewHolder> {
+        @NonNull
+        @Override
+        public GuideViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            return new GuideViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_beginner_guide_item, parent ,false));
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull GuideViewHolder holder, int position) {
+            ViewGroup.LayoutParams params = holder.image.getLayoutParams();
+            if (params != null) {
+                params.width = ScreenUtil.getScreenWidth(holder.image.getContext());
+                params.height = ScreenUtil.getScreenHeight(holder.image.getContext());
+                holder.image.setLayoutParams(params);
+            }
+            GlideEngine.loadImage(holder.image, resIDs[position]);
+            holder.itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (viewPager != null) {
+                        int currentPos = holder.getBindingAdapterPosition();
+                        if (currentPos < getItemCount() - 1) {
+                            viewPager.setCurrentItem(currentPos + 1, true);
+                        } else {
+                            if (onFinishListener != null) {
+                                onFinishListener.onFinish();
+                            }
+                            if (popupWindow != null && popupWindow.isShowing()) {
+                                popupWindow.dismiss();
+                            }
+                        }
+                    }
+                }
+            });
+        }
+
+        @Override
+        public int getItemCount() {
+            if (resIDs == null) {
+                return 0;
+            }
+            return resIDs.length;
+        }
+
+        class GuideViewHolder extends RecyclerView.ViewHolder {
+            private final ImageView image;
+            public GuideViewHolder(@NonNull View itemView) {
+                super(itemView);
+                image = itemView.findViewById(R.id.center_image);
+            }
+        }
+    }
+
+
+    public static void showBeginnerGuideThen(View view, Runnable runnable) {
+        boolean isShowGuide = SPUtils.getInstance(TUIChatConstants.CHAT_SETTINGS_SP_NAME).getBoolean(TUIChatConstants.CHAT_REPLY_GUIDE_SHOW_SP_KEY, true);
+        if (isShowGuide) {
+            SoftKeyBoardUtil.hideKeyBoard(view.getWindowToken());
+            SPUtils.getInstance(TUIChatConstants.CHAT_SETTINGS_SP_NAME).put(TUIChatConstants.CHAT_REPLY_GUIDE_SHOW_SP_KEY, false);
+
+            BeginnerGuidePage guidePage = new BeginnerGuidePage((Activity) view.getContext());
+            guidePage.setPagesResIDs(R.drawable.chat_reply_guide, R.drawable.chat_quote_guide);
+            guidePage.setOnFinishListener(new OnFinishListener() {
+                @Override
+                public void onFinish() {
+                    runnable.run();
+                }
+            });
+            guidePage.show(view, Gravity.NO_GRAVITY);
+        } else {
+            runnable.run();
+        }
+    }
+
+    @FunctionalInterface
+    public interface OnFinishListener {
+        void onFinish();
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/EmojiIndicatorView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/EmojiIndicatorView.java
new file mode 100644
index 0000000..ff5a202
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/EmojiIndicatorView.java
@@ -0,0 +1,169 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component;
+
+import android.animation.Animator;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+
+import java.util.ArrayList;
+
+
+public class EmojiIndicatorView extends LinearLayout {
+
+    private Context mContext;
+    private ArrayList<ImageView> mImageViews;
+    private Bitmap bmpSelect;
+    private Bitmap bmpNomal;
+    private int mHeight = 16;
+    private int mMaxHeight;
+    private AnimatorSet mPlayToAnimatorSet;
+    private AnimatorSet mPlayByInAnimatorSet;
+    private AnimatorSet mPlayByOutAnimatorSet;
+
+    public EmojiIndicatorView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        this.mContext = context;
+        this.setOrientation(HORIZONTAL);
+        mMaxHeight = (int) ScreenUtil.dp2px(mHeight, getResources().getDisplayMetrics());
+        bmpSelect = BitmapFactory.decodeResource(getResources(), R.drawable.indicator_point_select);
+        bmpNomal = BitmapFactory.decodeResource(getResources(), R.drawable.indicator_point_nomal);
+    }
+
+    public EmojiIndicatorView(Context context) {
+        this(context, null);
+    }
+
+    public void init(int count) {
+        mImageViews = new ArrayList<ImageView>();
+        this.removeAllViews();
+        for (int i = 0; i < count; i++) {
+            RelativeLayout rl = new RelativeLayout(mContext);
+            LayoutParams params = new LayoutParams(mMaxHeight, mMaxHeight);
+            RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
+            layoutParams.addRule(RelativeLayout.CENTER_IN_PARENT);
+            ImageView imageView = new ImageView(mContext);
+            if (i == 0) {
+                imageView.setImageBitmap(bmpSelect);
+                rl.addView(imageView, layoutParams);
+            } else {
+                imageView.setImageBitmap(bmpNomal);
+                rl.addView(imageView, layoutParams);
+            }
+            this.addView(rl, params);
+            mImageViews.add(imageView);
+        }
+    }
+
+    public void setIndicatorCount(int count) {
+        if (mImageViews == null || count > mImageViews.size()) {
+            return;
+        }
+        for (int i = 0; i < mImageViews.size(); i++) {
+            if (i >= count) {
+                mImageViews.get(i).setVisibility(GONE);
+                ((View) mImageViews.get(i).getParent()).setVisibility(GONE);
+            } else {
+                mImageViews.get(i).setVisibility(VISIBLE);
+                ((View) mImageViews.get(i).getParent()).setVisibility(VISIBLE);
+            }
+        }
+    }
+
+    public void playTo(int position) {
+        for (ImageView iv : mImageViews) {
+            iv.setImageBitmap(bmpNomal);
+        }
+        mImageViews.get(position).setImageBitmap(bmpSelect);
+        final ImageView imageViewStrat = mImageViews.get(position);
+        ObjectAnimator animIn1 = ObjectAnimator.ofFloat(imageViewStrat, "scaleX", 0.25f, 1.0f);
+        ObjectAnimator animIn2 = ObjectAnimator.ofFloat(imageViewStrat, "scaleY", 0.25f, 1.0f);
+
+        if (mPlayToAnimatorSet != null && mPlayToAnimatorSet.isRunning()) {
+            mPlayToAnimatorSet.cancel();
+            mPlayToAnimatorSet = null;
+        }
+        mPlayToAnimatorSet = new AnimatorSet();
+        mPlayToAnimatorSet.play(animIn1).with(animIn2);
+        mPlayToAnimatorSet.setDuration(100);
+        mPlayToAnimatorSet.start();
+    }
+
+    public void playBy(int startPosition, int nextPosition) {
+        boolean isShowInAnimOnly = false;
+        if (startPosition < 0 || nextPosition < 0 || nextPosition == startPosition) {
+            startPosition = nextPosition = 0;
+        }
+
+        if (startPosition < 0) {
+            isShowInAnimOnly = true;
+            startPosition = nextPosition = 0;
+        }
+
+        final ImageView imageViewStrat = mImageViews.get(startPosition);
+        final ImageView imageViewNext = mImageViews.get(nextPosition);
+
+        ObjectAnimator anim1 = ObjectAnimator.ofFloat(imageViewStrat, "scaleX", 1.0f, 0.25f);
+        ObjectAnimator anim2 = ObjectAnimator.ofFloat(imageViewStrat, "scaleY", 1.0f, 0.25f);
+
+        if (mPlayByOutAnimatorSet != null && mPlayByOutAnimatorSet.isRunning()) {
+            mPlayByOutAnimatorSet.cancel();
+            mPlayByOutAnimatorSet = null;
+        }
+        mPlayByOutAnimatorSet = new AnimatorSet();
+        mPlayByOutAnimatorSet.play(anim1).with(anim2);
+        mPlayByOutAnimatorSet.setDuration(100);
+
+        ObjectAnimator animIn1 = ObjectAnimator.ofFloat(imageViewNext, "scaleX", 0.25f, 1.0f);
+        ObjectAnimator animIn2 = ObjectAnimator.ofFloat(imageViewNext, "scaleY", 0.25f, 1.0f);
+
+        if (mPlayByInAnimatorSet != null && mPlayByInAnimatorSet.isRunning()) {
+            mPlayByInAnimatorSet.cancel();
+            mPlayByInAnimatorSet = null;
+        }
+        mPlayByInAnimatorSet = new AnimatorSet();
+        mPlayByInAnimatorSet.play(animIn1).with(animIn2);
+        mPlayByInAnimatorSet.setDuration(100);
+
+        if (isShowInAnimOnly) {
+            mPlayByInAnimatorSet.start();
+            return;
+        }
+
+        anim1.addListener(new Animator.AnimatorListener() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                imageViewStrat.setImageBitmap(bmpNomal);
+                ObjectAnimator animFil1l = ObjectAnimator.ofFloat(imageViewStrat, "scaleX", 1.0f);
+                ObjectAnimator animFill2 = ObjectAnimator.ofFloat(imageViewStrat, "scaleY", 1.0f);
+                AnimatorSet mFillAnimatorSet = new AnimatorSet();
+                mFillAnimatorSet.play(animFil1l).with(animFill2);
+                mFillAnimatorSet.start();
+                imageViewNext.setImageBitmap(bmpSelect);
+                mPlayByInAnimatorSet.start();
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animation) {
+            }
+
+            @Override
+            public void onAnimationRepeat(Animator animation) {
+            }
+        });
+        mPlayByOutAnimatorSet.start();
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/MessageProperties.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/MessageProperties.java
new file mode 100644
index 0000000..d096321
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/MessageProperties.java
@@ -0,0 +1,224 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component;
+
+import android.graphics.drawable.Drawable;
+
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.interfaces.IMessageProperties;
+
+public class MessageProperties implements IMessageProperties {
+    private static MessageProperties sP = new MessageProperties();
+    private int mAvatarId;
+    private int mAvatarRadius;
+    private int[] avatarSize = null;
+    private int mNameFontSize;
+    private int mNameFontColor;
+    private int mLeftNameVisibility;
+    private int mRightNameVisibility;
+    private int mChatContextFontSize;
+    private int mMyChatContentFontColor;
+    private Drawable mMyBubble;
+    private int mFriendChatContentFontColor;
+    private Drawable mFriendBubble;
+    private int mTipsMessageFontSize;
+    private int mTipsMessageFontColor;
+    private Drawable mTipsMessageBubble;
+    private int mChatTimeFontSize;
+    private int mChatTimeFontColor;
+    private Drawable mChatTimeBubble;
+
+    private MessageProperties() {
+
+    }
+
+    public static MessageProperties getInstance() {
+        if (sP == null) {
+            sP = new MessageProperties();
+        }
+        return sP;
+    }
+
+    @Override
+    public int getAvatarRadius() {
+        return mAvatarRadius;
+    }
+
+    @Override
+    public void setAvatarRadius(int radius) {
+        mAvatarRadius = ScreenUtil.getPxByDp(radius);
+    }
+
+    @Override
+    public int[] getAvatarSize() {
+        return avatarSize;
+    }
+
+    @Override
+    public void setAvatarSize(int[] size) {
+        if (size != null && size.length == 2) {
+            avatarSize = new int[2];
+            avatarSize[0] = ScreenUtil.getPxByDp(size[0]);
+            avatarSize[1] = ScreenUtil.getPxByDp(size[1]);
+        }
+    }
+
+    @Override
+    public int getAvatar() {
+        return mAvatarId;
+    }
+
+    @Override
+    public void setAvatar(int resId) {
+        this.mAvatarId = resId;
+    }
+
+    @Override
+    public Drawable getRightBubble() {
+        return mMyBubble;
+    }
+
+    @Override
+    public void setRightBubble(Drawable bubble) {
+        this.mMyBubble = bubble;
+    }
+
+    @Override
+    public Drawable getLeftBubble() {
+        return mFriendBubble;
+    }
+
+    @Override
+    public void setLeftBubble(Drawable bubble) {
+        this.mFriendBubble = bubble;
+    }
+
+    @Override
+    public int getNameFontSize() {
+        return mNameFontSize;
+    }
+
+    @Override
+    public void setNameFontSize(int size) {
+        this.mNameFontSize = size;
+    }
+
+    @Override
+    public int getNameFontColor() {
+        return mNameFontColor;
+    }
+
+    @Override
+    public void setNameFontColor(int color) {
+        this.mNameFontColor = color;
+    }
+
+    @Override
+    public int getLeftNameVisibility() {
+        return mLeftNameVisibility;
+    }
+
+    @Override
+    public void setLeftNameVisibility(int visibility) {
+        mLeftNameVisibility = visibility;
+    }
+
+    @Override
+    public int getRightNameVisibility() {
+        return mRightNameVisibility;
+    }
+
+    @Override
+    public void setRightNameVisibility(int visibility) {
+        mRightNameVisibility = visibility;
+    }
+
+    @Override
+    public int getChatContextFontSize() {
+        return mChatContextFontSize;
+    }
+
+    @Override
+    public void setChatContextFontSize(int size) {
+        this.mChatContextFontSize = size;
+    }
+
+    @Override
+    public int getRightChatContentFontColor() {
+        return mMyChatContentFontColor;
+    }
+
+    @Override
+    public void setRightChatContentFontColor(int color) {
+        this.mMyChatContentFontColor = color;
+    }
+
+    @Override
+    public int getLeftChatContentFontColor() {
+        return mFriendChatContentFontColor;
+    }
+
+    @Override
+    public void setLeftChatContentFontColor(int color) {
+        this.mFriendChatContentFontColor = color;
+    }
+
+    @Override
+    public Drawable getTipsMessageBubble() {
+        return mTipsMessageBubble;
+    }
+
+    @Override
+    public void setTipsMessageBubble(Drawable bubble) {
+        this.mTipsMessageBubble = bubble;
+    }
+
+    @Override
+    public int getTipsMessageFontSize() {
+        return mTipsMessageFontSize;
+    }
+
+    @Override
+    public void setTipsMessageFontSize(int size) {
+        this.mTipsMessageFontSize = size;
+    }
+
+    @Override
+    public int getTipsMessageFontColor() {
+        return mTipsMessageFontColor;
+    }
+
+    @Override
+    public void setTipsMessageFontColor(int color) {
+        this.mTipsMessageFontColor = color;
+    }
+
+    @Override
+    public Drawable getChatTimeBubble() {
+        return mChatTimeBubble;
+    }
+
+    @Override
+    public void setChatTimeBubble(Drawable bubble) {
+        this.mChatTimeBubble = bubble;
+    }
+
+    @Override
+    public int getChatTimeFontSize() {
+        return mChatTimeFontSize;
+    }
+
+    @Override
+    public void setChatTimeFontSize(int size) {
+        this.mChatTimeFontSize = size;
+    }
+
+    @Override
+    public int getChatTimeFontColor() {
+        return mChatTimeFontColor;
+    }
+
+    @Override
+    public void setChatTimeFontColor(int color) {
+        this.mChatTimeFontColor = color;
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/CameraActivity.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/CameraActivity.java
new file mode 100644
index 0000000..24a4de4
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/CameraActivity.java
@@ -0,0 +1,183 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.graphics.Bitmap;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.FileUtil;
+import com.tencent.qcloud.tuicore.util.TUIBuild;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.listener.ClickListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.listener.ErrorListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.listener.JCameraListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.view.JCameraView;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+public class CameraActivity extends Activity {
+
+    private static final String TAG = CameraActivity.class.getSimpleName();
+    private static final int REQUEST_CODE_PHOTO_AND_VIDEO = 1000;
+    public static IUIKitCallback mCallBack;
+    private JCameraView jCameraView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        TUIChatLog.i(TAG, "onCreate");
+        super.onCreate(savedInstanceState);
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
+        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        setContentView(R.layout.minimalist_activity_camera);
+        jCameraView = findViewById(R.id.jcameraview);
+        //jCameraView.setSaveVideoPath(Environment.getExternalStorageDirectory().getPath() + File.separator + "JCamera");
+
+        int state = getIntent().getIntExtra(TUIChatConstants.CAMERA_TYPE, JCameraView.BUTTON_STATE_BOTH);
+        jCameraView.setFeatures(state);
+        if (state == JCameraView.BUTTON_STATE_ONLY_CAPTURE) {
+            jCameraView.setTip(getString(R.string.tap_capture));
+        } else if (state == JCameraView.BUTTON_STATE_ONLY_RECORDER) {
+            jCameraView.setTip(getString(R.string.tap_video));
+        }
+
+        jCameraView.setMediaQuality(JCameraView.MEDIA_QUALITY_MIDDLE);
+        jCameraView.setErrorLisenter(new ErrorListener() {
+            @Override
+            public void onError() {
+                TUIChatLog.i(TAG, "camera error");
+                Intent intent = new Intent();
+                setResult(103, intent);
+                finish();
+            }
+
+            @Override
+            public void AudioPermissionError() {
+                ToastUtil.toastShortMessage(getString(R.string.audio_permission_error));
+            }
+        });
+
+        jCameraView.setJCameraLisenter(new JCameraListener() {
+            @Override
+            public void captureSuccess(Bitmap bitmap) {
+                String path = FileUtil.saveBitmap("JCamera", bitmap);
+               /* Intent intent = new Intent();
+                intent.putExtra(ILiveConstants.CAMERA_IMAGE_PATH, path);
+                setResult(-1, intent);*/
+                if (mCallBack != null) {
+                    mCallBack.onSuccess(path);
+                }
+                finish();
+            }
+
+            @Override
+            public void recordSuccess(String url, Bitmap firstFrame, long duration) {
+                String path = FileUtil.saveBitmap("JCamera", firstFrame);
+                Intent intent = new Intent();
+                intent.putExtra(TUIChatConstants.IMAGE_WIDTH, firstFrame.getWidth());
+                intent.putExtra(TUIChatConstants.IMAGE_HEIGHT, firstFrame.getHeight());
+                intent.putExtra(TUIChatConstants.VIDEO_TIME, duration);
+                intent.putExtra(TUIChatConstants.CAMERA_IMAGE_PATH, path);
+                intent.putExtra(TUIChatConstants.CAMERA_VIDEO_PATH, url);
+                firstFrame.getWidth();
+                //setResult(-1, intent);
+                if (mCallBack != null) {
+                    mCallBack.onSuccess(intent);
+                }
+                finish();
+            }
+        });
+
+        jCameraView.setLeftClickListener(new ClickListener() {
+            @Override
+            public void onClick() {
+                CameraActivity.this.finish();
+            }
+        });
+        jCameraView.setRightClickListener(new ClickListener() {
+            @Override
+            public void onClick() {
+                startSendPhoto();
+            }
+        });
+        //jCameraView.setVisibility(View.GONE);
+        TUIChatLog.i(TAG, TUIBuild.getDevice());
+    }
+
+    private void startSendPhoto() {
+        TUIChatLog.i(TAG, "startSendPhoto");
+
+        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+        intent.addCategory(Intent.CATEGORY_OPENABLE);
+        intent.setType("*/*");
+        String[] mimeTypes = {"image/*", "video/*"};
+        intent.putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes);
+        startActivityForResult(intent, REQUEST_CODE_PHOTO_AND_VIDEO);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == REQUEST_CODE_PHOTO_AND_VIDEO) {
+            if (resultCode != RESULT_OK) {
+                return;
+            }
+            setResult(RESULT_OK, data);
+            finish();
+        }
+    }
+
+    @Override
+    public void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        if (Build.VERSION.SDK_INT >= 19) {
+            View decorView = getWindow().getDecorView();
+            decorView.setSystemUiVisibility(
+                    View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                            | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                            | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                            | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                            | View.SYSTEM_UI_FLAG_FULLSCREEN
+                            | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
+        } else {
+            View decorView = getWindow().getDecorView();
+            int option = View.SYSTEM_UI_FLAG_FULLSCREEN;
+            decorView.setSystemUiVisibility(option);
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        TUIChatLog.i(TAG, "onResume");
+        super.onResume();
+        jCameraView.onResume();
+    }
+
+    @Override
+    protected void onPause() {
+        TUIChatLog.i(TAG, "onPause");
+        super.onPause();
+        jCameraView.onPause();
+    }
+
+    @Override
+    protected void onDestroy() {
+        TUIChatLog.i(TAG, "onDestroy");
+        super.onDestroy();
+        jCameraView.onDestroy();
+        mCallBack = null;
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/listener/CaptureListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/listener/CaptureListener.java
new file mode 100644
index 0000000..a7c1a61
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/listener/CaptureListener.java
@@ -0,0 +1,16 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.listener;
+
+
+public interface CaptureListener {
+    void takePictures();
+
+    void recordShort(long time);
+
+    void recordStart();
+
+    void recordEnd(long time);
+
+    void recordZoom(float zoom);
+
+    void recordError();
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/listener/ClickListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/listener/ClickListener.java
new file mode 100644
index 0000000..54b907b
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/listener/ClickListener.java
@@ -0,0 +1,6 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.listener;
+
+
+public interface ClickListener {
+    void onClick();
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/listener/ErrorListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/listener/ErrorListener.java
new file mode 100644
index 0000000..d87b939
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/listener/ErrorListener.java
@@ -0,0 +1,8 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.listener;
+
+public interface ErrorListener {
+
+    void onError();
+
+    void AudioPermissionError();
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/listener/JCameraListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/listener/JCameraListener.java
new file mode 100644
index 0000000..110017c
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/listener/JCameraListener.java
@@ -0,0 +1,11 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.listener;
+
+import android.graphics.Bitmap;
+
+public interface JCameraListener {
+
+    void captureSuccess(Bitmap bitmap);
+
+    void recordSuccess(String url, Bitmap firstFrame, long duration);
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/listener/ReturnListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/listener/ReturnListener.java
new file mode 100644
index 0000000..c526b4c
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/listener/ReturnListener.java
@@ -0,0 +1,5 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.listener;
+
+public interface ReturnListener {
+    void onReturn();
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/listener/TypeListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/listener/TypeListener.java
new file mode 100644
index 0000000..e7e7f73
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/listener/TypeListener.java
@@ -0,0 +1,7 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.listener;
+
+public interface TypeListener {
+    void cancel();
+
+    void confirm();
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/state/BorrowPictureState.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/state/BorrowPictureState.java
new file mode 100644
index 0000000..201d48a
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/state/BorrowPictureState.java
@@ -0,0 +1,82 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.state;
+
+import android.view.Surface;
+import android.view.SurfaceHolder;
+
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.view.CameraInterface;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.view.JCameraView;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+public class BorrowPictureState implements State {
+
+    private static final String TAG = BorrowPictureState.class.getSimpleName();
+    private CameraMachine machine;
+
+    public BorrowPictureState(CameraMachine machine) {
+        this.machine = machine;
+    }
+
+    @Override
+    public void start(SurfaceHolder holder, float screenProp) {
+        CameraInterface.getInstance().doStartPreview(holder, screenProp);
+        machine.setState(machine.getPreviewState());
+    }
+
+    @Override
+    public void stop() {
+
+    }
+
+
+    @Override
+    public void foucs(float x, float y, CameraInterface.FocusCallback callback) {
+    }
+
+    @Override
+    public void swtich(SurfaceHolder holder, float screenProp) {
+
+    }
+
+    @Override
+    public void restart() {
+
+    }
+
+    @Override
+    public void capture() {
+
+    }
+
+    @Override
+    public void record(Surface surface, float screenProp) {
+
+    }
+
+    @Override
+    public void stopRecord(boolean isShort, long time) {
+    }
+
+    @Override
+    public void cancle(SurfaceHolder holder, float screenProp) {
+        CameraInterface.getInstance().doStartPreview(holder, screenProp);
+        machine.getView().resetState(JCameraView.TYPE_PICTURE);
+        machine.setState(machine.getPreviewState());
+    }
+
+    @Override
+    public void confirm() {
+        machine.getView().confirmState(JCameraView.TYPE_PICTURE);
+        machine.setState(machine.getPreviewState());
+    }
+
+    @Override
+    public void zoom(float zoom, int type) {
+        TUIChatLog.i(TAG, "zoom");
+    }
+
+    @Override
+    public void flash(String mode) {
+
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/state/BorrowVideoState.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/state/BorrowVideoState.java
new file mode 100644
index 0000000..509d7f1
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/state/BorrowVideoState.java
@@ -0,0 +1,82 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.state;
+
+import android.view.Surface;
+import android.view.SurfaceHolder;
+
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.view.CameraInterface;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.view.JCameraView;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+public class BorrowVideoState implements State {
+
+    private static final String TAG = BorrowVideoState.class.getSimpleName();
+    private CameraMachine machine;
+
+    public BorrowVideoState(CameraMachine machine) {
+        this.machine = machine;
+    }
+
+    @Override
+    public void start(SurfaceHolder holder, float screenProp) {
+        CameraInterface.getInstance().doStartPreview(holder, screenProp);
+        machine.setState(machine.getPreviewState());
+    }
+
+    @Override
+    public void stop() {
+
+    }
+
+    @Override
+    public void foucs(float x, float y, CameraInterface.FocusCallback callback) {
+
+    }
+
+
+    @Override
+    public void swtich(SurfaceHolder holder, float screenProp) {
+
+    }
+
+    @Override
+    public void restart() {
+
+    }
+
+    @Override
+    public void capture() {
+
+    }
+
+    @Override
+    public void record(Surface surface, float screenProp) {
+
+    }
+
+    @Override
+    public void stopRecord(boolean isShort, long time) {
+
+    }
+
+    @Override
+    public void cancle(SurfaceHolder holder, float screenProp) {
+        machine.getView().resetState(JCameraView.TYPE_VIDEO);
+        machine.setState(machine.getPreviewState());
+    }
+
+    @Override
+    public void confirm() {
+        machine.getView().confirmState(JCameraView.TYPE_VIDEO);
+        machine.setState(machine.getPreviewState());
+    }
+
+    @Override
+    public void zoom(float zoom, int type) {
+        TUIChatLog.i(TAG, "zoom");
+    }
+
+    @Override
+    public void flash(String mode) {
+
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/state/CameraMachine.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/state/CameraMachine.java
new file mode 100644
index 0000000..d08ada7
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/state/CameraMachine.java
@@ -0,0 +1,119 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.state;
+
+import android.content.Context;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.view.CameraInterface;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.view.CameraView;
+
+public class CameraMachine implements State {
+
+    private Context context;
+    private State state;
+    private CameraView view;
+//    private CameraInterface.CameraOpenOverCallback cameraOpenOverCallback;
+
+    private State previewState;
+    private State borrowPictureState;
+    private State borrowVideoState;
+
+    public CameraMachine(Context context, CameraView view, CameraInterface.CameraOpenOverCallback
+            cameraOpenOverCallback) {
+        this.context = context;
+        previewState = new PreviewState(this);
+        borrowPictureState = new BorrowPictureState(this);
+        borrowVideoState = new BorrowVideoState(this);
+        this.state = previewState;
+//        this.cameraOpenOverCallback = cameraOpenOverCallback;
+        this.view = view;
+    }
+
+    public CameraView getView() {
+        return view;
+    }
+
+    public Context getContext() {
+        return context;
+    }
+
+    State getBorrowPictureState() {
+        return borrowPictureState;
+    }
+
+    State getBorrowVideoState() {
+        return borrowVideoState;
+    }
+
+    State getPreviewState() {
+        return previewState;
+    }
+
+    @Override
+    public void start(SurfaceHolder holder, float screenProp) {
+        state.start(holder, screenProp);
+    }
+
+    @Override
+    public void stop() {
+        state.stop();
+    }
+
+    @Override
+    public void foucs(float x, float y, CameraInterface.FocusCallback callback) {
+        state.foucs(x, y, callback);
+    }
+
+    @Override
+    public void swtich(SurfaceHolder holder, float screenProp) {
+        state.swtich(holder, screenProp);
+    }
+
+    @Override
+    public void restart() {
+        state.restart();
+    }
+
+    @Override
+    public void capture() {
+        state.capture();
+    }
+
+    @Override
+    public void record(Surface surface, float screenProp) {
+        state.record(surface, screenProp);
+    }
+
+    @Override
+    public void stopRecord(boolean isShort, long time) {
+        state.stopRecord(isShort, time);
+    }
+
+    @Override
+    public void cancle(SurfaceHolder holder, float screenProp) {
+        state.cancle(holder, screenProp);
+    }
+
+    @Override
+    public void confirm() {
+        state.confirm();
+    }
+
+    @Override
+    public void zoom(float zoom, int type) {
+        state.zoom(zoom, type);
+    }
+
+    @Override
+    public void flash(String mode) {
+        state.flash(mode);
+    }
+
+    public State getState() {
+        return this.state;
+    }
+
+    public void setState(State state) {
+        this.state = state;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/state/PreviewState.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/state/PreviewState.java
new file mode 100644
index 0000000..7791db4
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/state/PreviewState.java
@@ -0,0 +1,103 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.state;
+
+import android.graphics.Bitmap;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.view.CameraInterface;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.view.JCameraView;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+class PreviewState implements State {
+    public static final String TAG = "PreviewState";
+
+    private CameraMachine machine;
+
+    PreviewState(CameraMachine machine) {
+        this.machine = machine;
+    }
+
+    @Override
+    public void start(SurfaceHolder holder, float screenProp) {
+        CameraInterface.getInstance().doStartPreview(holder, screenProp);
+    }
+
+    @Override
+    public void stop() {
+        CameraInterface.getInstance().doStopPreview();
+    }
+
+
+    @Override
+    public void foucs(float x, float y, CameraInterface.FocusCallback callback) {
+        TUIChatLog.i(TAG, "preview state foucs");
+        if (machine.getView().handlerFoucs(x, y)) {
+            CameraInterface.getInstance().handleFocus(machine.getContext(), x, y, callback);
+        }
+    }
+
+    @Override
+    public void swtich(SurfaceHolder holder, float screenProp) {
+        CameraInterface.getInstance().switchCamera(holder, screenProp);
+    }
+
+    @Override
+    public void restart() {
+
+    }
+
+    @Override
+    public void capture() {
+        CameraInterface.getInstance().takePicture(new CameraInterface.TakePictureCallback() {
+            @Override
+            public void captureResult(Bitmap bitmap, boolean isVertical) {
+                machine.getView().showPicture(bitmap, isVertical);
+                machine.setState(machine.getBorrowPictureState());
+                TUIChatLog.i(TAG, "capture");
+            }
+        });
+    }
+
+    @Override
+    public void record(Surface surface, float screenProp) {
+        CameraInterface.getInstance().startRecord(surface, screenProp, null);
+    }
+
+    @Override
+    public void stopRecord(final boolean isShort, long time) {
+        CameraInterface.getInstance().stopRecord(isShort, new CameraInterface.StopRecordCallback() {
+            @Override
+            public void recordResult(String url, Bitmap firstFrame) {
+                if (isShort) {
+                    machine.getView().resetState(JCameraView.TYPE_SHORT);
+                } else {
+                    machine.getView().playVideo(firstFrame, url);
+                    machine.setState(machine.getBorrowVideoState());
+                }
+            }
+        });
+    }
+
+    @Override
+    public void cancle(SurfaceHolder holder, float screenProp) {
+        TUIChatLog.i(TAG, TUIChatService.getAppContext().getString(R.string.no_event_cancle_tip));
+    }
+
+    @Override
+    public void confirm() {
+        TUIChatLog.i(TAG, TUIChatService.getAppContext().getString(R.string.no_event_confirm_tip));
+    }
+
+    @Override
+    public void zoom(float zoom, int type) {
+        TUIChatLog.i(TAG, "zoom");
+        CameraInterface.getInstance().setZoom(zoom, type);
+    }
+
+    @Override
+    public void flash(String mode) {
+        CameraInterface.getInstance().setFlashMode(mode);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/state/State.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/state/State.java
new file mode 100644
index 0000000..c8f6dd7
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/state/State.java
@@ -0,0 +1,33 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.state;
+
+import android.view.Surface;
+import android.view.SurfaceHolder;
+
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.view.CameraInterface;
+
+public interface State {
+
+    void start(SurfaceHolder holder, float screenProp);
+
+    void stop();
+
+    void foucs(float x, float y, CameraInterface.FocusCallback callback);
+
+    void swtich(SurfaceHolder holder, float screenProp);
+
+    void restart();
+
+    void capture();
+
+    void record(Surface surface, float screenProp);
+
+    void stopRecord(boolean isShort, long time);
+
+    void cancle(SurfaceHolder holder, float screenProp);
+
+    void confirm();
+
+    void zoom(float zoom, int type);
+
+    void flash(String mode);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/view/CameraInterface.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/view/CameraInterface.java
new file mode 100644
index 0000000..e5b9b73
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/view/CameraInterface.java
@@ -0,0 +1,738 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.view;
+
+import static android.graphics.Bitmap.createBitmap;
+
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.ImageFormat;
+import android.graphics.Matrix;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.graphics.YuvImage;
+import android.hardware.Camera;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.media.MediaRecorder;
+import android.os.Build;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+import android.widget.ImageView;
+
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.util.FileUtil;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.listener.ErrorListener;
+import com.tencent.qcloud.tuikit.tuichat.util.AngleUtil;
+import com.tencent.qcloud.tuikit.tuichat.util.CameraParamUtil;
+import com.tencent.qcloud.tuikit.tuichat.util.CheckPermission;
+import com.tencent.qcloud.tuikit.tuichat.util.DeviceUtil;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
+public class CameraInterface implements Camera.PreviewCallback {
+
+    public static final int TYPE_RECORDER = 0x090;
+    public static final int TYPE_CAPTURE = 0x091;
+    private static final String TAG = CameraInterface.class.getSimpleName();
+    private volatile static CameraInterface mCameraInterface;
+    int handlerTime = 0;
+    private Camera mCamera;
+    private Camera.Parameters mParams;
+    private boolean isPreviewing = false;
+    private int SELECTED_CAMERA = -1;
+    private int CAMERA_POST_POSITION = -1;
+    private int CAMERA_FRONT_POSITION = -1;
+    private SurfaceHolder mHolder = null;
+    private float screenProp = -1.0f;
+    private boolean isRecorder = false;
+    private MediaRecorder mediaRecorder;
+    private String videoFileName;
+    private String saveVideoPath = TUIConfig.getMediaDir();
+    private String videoFileAbsPath;
+    private Bitmap videoFirstFrame = null;
+    private ErrorListener errorLisenter;
+    private ImageView mSwitchView;
+    private ImageView mFlashLamp;
+    private int preview_width;
+    private int preview_height;
+    private int angle = 0;
+    private int cameraAngle = 90;
+    private int rotation = 0;
+    private byte[] firstFrame_data;
+    private int nowScaleRate = 0;
+    private int recordScleRate = 0;
+
+    private int mediaQuality = JCameraView.MEDIA_QUALITY_MIDDLE;
+    private SensorManager sm = null;
+    private SensorEventListener sensorEventListener = new SensorEventListener() {
+        public void onSensorChanged(SensorEvent event) {
+            if (Sensor.TYPE_ACCELEROMETER != event.sensor.getType()) {
+                return;
+            }
+            float[] values = event.values;
+            angle = AngleUtil.getSensorAngle(values[0], values[1]);
+            rotationAnimation();
+        }
+
+        public void onAccuracyChanged(Sensor sensor, int accuracy) {
+        }
+    };
+
+    private int nowAngle;
+
+    private CameraInterface() {
+        findAvailableCameras();
+        SELECTED_CAMERA = CAMERA_POST_POSITION;
+    }
+
+    public static void destroyCameraInterface() {
+        if (mCameraInterface != null) {
+            mCameraInterface.doDestroyCamera();
+            mCameraInterface = null;
+        }
+    }
+
+    public static synchronized CameraInterface getInstance() {
+        if (mCameraInterface == null)
+            synchronized (CameraInterface.class) {
+                if (mCameraInterface == null)
+                    mCameraInterface = new CameraInterface();
+            }
+        return mCameraInterface;
+    }
+
+    private static Rect calculateTapArea(float x, float y, float coefficient, Context context) {
+        float focusAreaSize = 300;
+        int areaSize = Float.valueOf(focusAreaSize * coefficient).intValue();
+        int centerX = (int) (x / ScreenUtil.getScreenWidth(context) * 2000 - 1000);
+        int centerY = (int) (y / ScreenUtil.getScreenHeight(context) * 2000 - 1000);
+        int left = clamp(centerX - areaSize / 2, -1000, 1000);
+        int top = clamp(centerY - areaSize / 2, -1000, 1000);
+        RectF rectF = new RectF(left, top, left + areaSize, top + areaSize);
+        return new Rect(Math.round(rectF.left), Math.round(rectF.top), Math.round(rectF.right), Math.round(rectF
+                .bottom));
+    }
+
+    private static int clamp(int x, int min, int max) {
+        if (x > max) {
+            return max;
+        }
+        if (x < min) {
+            return min;
+        }
+        return x;
+    }
+
+    public void setSwitchView(ImageView mSwitchView, ImageView mFlashLamp) {
+        this.mSwitchView = mSwitchView;
+        this.mFlashLamp = mFlashLamp;
+        if (mSwitchView != null) {
+            cameraAngle = CameraParamUtil.getInstance().getCameraDisplayOrientation(mSwitchView.getContext(),
+                    SELECTED_CAMERA);
+        }
+    }
+
+    private void rotationAnimation() {
+        if (mSwitchView == null) {
+            return;
+        }
+        if (rotation != angle) {
+            int start_rotaion = 0;
+            int end_rotation = 0;
+            switch (rotation) {
+                case 0:
+                    start_rotaion = 0;
+                    switch (angle) {
+                        case 90:
+                            end_rotation = -90;
+                            break;
+                        case 270:
+                            end_rotation = 90;
+                            break;
+                    }
+                    break;
+                case 90:
+                    start_rotaion = -90;
+                    switch (angle) {
+                        case 0:
+                            end_rotation = 0;
+                            break;
+                        case 180:
+                            end_rotation = -180;
+                            break;
+                    }
+                    break;
+                case 180:
+                    start_rotaion = 180;
+                    switch (angle) {
+                        case 90:
+                            end_rotation = 270;
+                            break;
+                        case 270:
+                            end_rotation = 90;
+                            break;
+                    }
+                    break;
+                case 270:
+                    start_rotaion = 90;
+                    switch (angle) {
+                        case 0:
+                            end_rotation = 0;
+                            break;
+                        case 180:
+                            end_rotation = 180;
+                            break;
+                    }
+                    break;
+            }
+            ObjectAnimator animC = ObjectAnimator.ofFloat(mSwitchView, "rotation", start_rotaion, end_rotation);
+            ObjectAnimator animF = ObjectAnimator.ofFloat(mFlashLamp, "rotation", start_rotaion, end_rotation);
+            AnimatorSet set = new AnimatorSet();
+            set.playTogether(animC, animF);
+            set.setDuration(500);
+            set.start();
+            rotation = angle;
+        }
+    }
+
+    public void setZoom(float zoom, int type) {
+        if (mCamera == null) {
+            return;
+        }
+        if (mParams == null) {
+            mParams = mCamera.getParameters();
+        }
+        if (!mParams.isZoomSupported() || !mParams.isSmoothZoomSupported()) {
+            return;
+        }
+        switch (type) {
+            case TYPE_RECORDER:
+                if (!isRecorder) {
+                    return;
+                }
+                if (zoom >= 0) {
+                    // 每移动50个像素缩放一个级别
+                    // Zooms one level every 50 pixels you move
+                    int scaleRate = (int) (zoom / 40);
+                    if (scaleRate <= mParams.getMaxZoom() && scaleRate >= nowScaleRate && recordScleRate != scaleRate) {
+                        mParams.setZoom(scaleRate);
+                        mCamera.setParameters(mParams);
+                        recordScleRate = scaleRate;
+                    }
+                }
+                break;
+            case TYPE_CAPTURE:
+                if (isRecorder) {
+                    return;
+                }
+                // 每移动50个像素缩放一个级别
+                // Zooms one level every 50 pixels you move
+                int scaleRate = (int) (zoom / 50);
+                if (scaleRate < mParams.getMaxZoom()) {
+                    nowScaleRate += scaleRate;
+                    if (nowScaleRate < 0) {
+                        nowScaleRate = 0;
+                    } else if (nowScaleRate > mParams.getMaxZoom()) {
+                        nowScaleRate = mParams.getMaxZoom();
+                    }
+                    mParams.setZoom(nowScaleRate);
+                    mCamera.setParameters(mParams);
+                }
+                TUIChatLog.i(TAG, "setZoom = " + nowScaleRate);
+                break;
+        }
+
+    }
+
+    void setMediaQuality(int quality) {
+        this.mediaQuality = quality;
+    }
+
+    @Override
+    public void onPreviewFrame(byte[] data, Camera camera) {
+        firstFrame_data = data;
+    }
+
+    public void setFlashMode(String flashMode) {
+        if (mCamera == null)
+            return;
+        Camera.Parameters params = mCamera.getParameters();
+        params.setFlashMode(flashMode);
+        mCamera.setParameters(params);
+    }
+
+    /**
+     * open Camera
+     */
+    void doOpenCamera(CameraOpenOverCallback callback) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            if (!CheckPermission.isCameraUseable(SELECTED_CAMERA) && this.errorLisenter != null) {
+                this.errorLisenter.onError();
+                return;
+            }
+        }
+        if (mCamera == null) {
+            openCamera(SELECTED_CAMERA);
+        }
+        callback.cameraHasOpened();
+    }
+
+    private void setFlashModel() {
+        mParams = mCamera.getParameters();
+        mParams.setFlashMode(Camera.Parameters.FLASH_MODE_TORCH);
+        mCamera.setParameters(mParams);
+    }
+
+    private synchronized void openCamera(int id) {
+        try {
+            this.mCamera = Camera.open(id);
+        } catch (Exception var3) {
+            var3.printStackTrace();
+            if (this.errorLisenter != null) {
+                this.errorLisenter.onError();
+            }
+        }
+
+        if (Build.VERSION.SDK_INT > 17 && this.mCamera != null) {
+            try {
+                this.mCamera.enableShutterSound(false);
+            } catch (Exception e) {
+                e.printStackTrace();
+                TUIChatLog.e(TAG, "enable shutter sound faild");
+            }
+        }
+    }
+
+    public synchronized void switchCamera(SurfaceHolder holder, float screenProp) {
+        if (SELECTED_CAMERA == CAMERA_POST_POSITION) {
+            SELECTED_CAMERA = CAMERA_FRONT_POSITION;
+        } else {
+            SELECTED_CAMERA = CAMERA_POST_POSITION;
+        }
+        doDestroyCamera();
+        TUIChatLog.i(TAG, "open start");
+        openCamera(SELECTED_CAMERA);
+//        mCamera = Camera.open();
+        if (Build.VERSION.SDK_INT > 17 && this.mCamera != null) {
+            try {
+                this.mCamera.enableShutterSound(false);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        TUIChatLog.i(TAG, "open end");
+        doStartPreview(holder, screenProp);
+    }
+
+    /**
+     * doStartPreview
+     */
+    public void doStartPreview(SurfaceHolder holder, float screenProp) {
+        if (isPreviewing) {
+            TUIChatLog.i(TAG, "doStartPreview isPreviewing");
+        }
+        if (this.screenProp < 0) {
+            this.screenProp = screenProp;
+        }
+        if (holder == null) {
+            return;
+        }
+        this.mHolder = holder;
+        if (mCamera != null) {
+            try {
+                if (DeviceUtil.isVivoX21()) {
+                    if (mCamera != null) {
+                        mCamera.release();
+                        mCamera = null;
+                    }
+                    openCamera(SELECTED_CAMERA);
+                }
+                mParams = mCamera.getParameters();
+                Camera.Size previewSize = CameraParamUtil.getInstance().getPreviewSize(mParams
+                        .getSupportedPreviewSizes(), 1000, screenProp);
+                Camera.Size pictureSize = CameraParamUtil.getInstance().getPictureSize(mParams
+                        .getSupportedPictureSizes(), 1200, screenProp);
+
+                mParams.setPreviewSize(previewSize.width, previewSize.height);
+
+                preview_width = previewSize.width;
+                preview_height = previewSize.height;
+
+                mParams.setPictureSize(pictureSize.width, pictureSize.height);
+
+                if (CameraParamUtil.getInstance().isSupportedFocusMode(
+                        mParams.getSupportedFocusModes(),
+                        Camera.Parameters.FOCUS_MODE_AUTO)) {
+                    mParams.setFocusMode(Camera.Parameters.FOCUS_MODE_AUTO);
+                }
+                if (CameraParamUtil.getInstance().isSupportedPictureFormats(mParams.getSupportedPictureFormats(),
+                        ImageFormat.JPEG)) {
+                    mParams.setPictureFormat(ImageFormat.JPEG);
+                    mParams.setJpegQuality(100);
+                }
+                mCamera.setParameters(mParams);
+                mParams = mCamera.getParameters();
+                mCamera.setPreviewDisplay(holder);  //SurfaceView
+                mCamera.setDisplayOrientation(cameraAngle);
+                mCamera.setPreviewCallback(this);
+                mCamera.startPreview();
+                isPreviewing = true;
+                TUIChatLog.i(TAG, "=== Start Preview ===");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public void doStopPreview() {
+        if (null != mCamera) {
+            try {
+                mCamera.setPreviewCallback(null);
+                mCamera.stopPreview();
+                mCamera.setPreviewDisplay(null);
+                isPreviewing = false;
+                TUIChatLog.i(TAG, "=== Stop Preview ===");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    void doDestroyCamera() {
+        errorLisenter = null;
+        if (null != mCamera) {
+            try {
+                mCamera.setPreviewCallback(null);
+                mSwitchView = null;
+                mFlashLamp = null;
+                mCamera.stopPreview();
+                mCamera.setPreviewDisplay(null);
+                mHolder = null;
+                isPreviewing = false;
+                mCamera.release();
+                mCamera = null;
+//                destroyCameraInterface();
+                TUIChatLog.i(TAG, "=== Destroy Camera ===");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        } else {
+            TUIChatLog.i(TAG, "=== Camera  Null===");
+        }
+    }
+
+    public void takePicture(final TakePictureCallback callback) {
+        if (mCamera == null) {
+            return;
+        }
+        switch (cameraAngle) {
+            case 90:
+                nowAngle = Math.abs(angle + cameraAngle) % 360;
+                break;
+            case 270:
+                nowAngle = Math.abs(cameraAngle - angle);
+                break;
+        }
+//
+        TUIChatLog.i(TAG, angle + " = " + cameraAngle + " = " + nowAngle);
+        mCamera.takePicture(null, null, new Camera.PictureCallback() {
+            @Override
+            public void onPictureTaken(byte[] data, Camera camera) {
+                Bitmap bitmap = BitmapFactory.decodeByteArray(data, 0, data.length);
+                Matrix matrix = new Matrix();
+                if (SELECTED_CAMERA == CAMERA_POST_POSITION) {
+                    matrix.setRotate(nowAngle);
+                } else if (SELECTED_CAMERA == CAMERA_FRONT_POSITION) {
+                    matrix.setRotate(360 - nowAngle);
+                    matrix.postScale(-1, 1);
+                }
+
+                bitmap = createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);
+                if (callback != null) {
+                    if (nowAngle == 90 || nowAngle == 270) {
+                        callback.captureResult(bitmap, true);
+                    } else {
+                        callback.captureResult(bitmap, false);
+                    }
+                }
+            }
+        });
+    }
+
+    public void startRecord(Surface surface, float screenProp, ErrorCallback callback) {
+        mCamera.setPreviewCallback(null);
+        final int nowAngle = (angle + 90) % 360;
+        Camera.Parameters parameters = mCamera.getParameters();
+        int width = parameters.getPreviewSize().width;
+        int height = parameters.getPreviewSize().height;
+        YuvImage yuv = new YuvImage(firstFrame_data, parameters.getPreviewFormat(), width, height, null);
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        yuv.compressToJpeg(new Rect(0, 0, width, height), 50, out);
+        byte[] bytes = out.toByteArray();
+        videoFirstFrame = BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
+        Matrix matrix = new Matrix();
+        if (SELECTED_CAMERA == CAMERA_POST_POSITION) {
+            matrix.setRotate(nowAngle);
+        } else if (SELECTED_CAMERA == CAMERA_FRONT_POSITION) {
+            matrix.setRotate(270);
+        }
+        videoFirstFrame = createBitmap(videoFirstFrame, 0, 0, videoFirstFrame.getWidth(), videoFirstFrame
+                .getHeight(), matrix, true);
+
+        if (isRecorder) {
+            return;
+        }
+        if (mCamera == null) {
+            openCamera(SELECTED_CAMERA);
+        }
+        if (mediaRecorder == null) {
+            mediaRecorder = new MediaRecorder();
+        }
+        if (mParams == null) {
+            mParams = mCamera.getParameters();
+        }
+        List<String> focusModes = mParams.getSupportedFocusModes();
+        if (focusModes.contains(Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO)) {
+            mParams.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_VIDEO);
+        }
+        mCamera.setParameters(mParams);
+        mCamera.unlock();
+        mediaRecorder.reset();
+        if (DeviceUtil.isVivoX21()) {
+            mCamera.release();
+            mCamera = null;
+            openCamera(SELECTED_CAMERA);
+            mCamera.setDisplayOrientation(90);
+            mCamera.unlock();
+        }
+        mediaRecorder.setCamera(mCamera);
+        mediaRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA);
+
+        mediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
+
+        mediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4);
+        mediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.H264);
+        mediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
+
+
+        Camera.Size videoSize;
+        if (mParams.getSupportedVideoSizes() == null) {
+            videoSize = CameraParamUtil.getInstance().getPreviewSize(mParams.getSupportedPreviewSizes(), 600,
+                    screenProp);
+        } else {
+            videoSize = CameraParamUtil.getInstance().getPreviewSize(mParams.getSupportedVideoSizes(), 600,
+                    screenProp);
+        }
+        TUIChatLog.i(TAG, "setVideoSize    width = " + videoSize.width + "height = " + videoSize.height);
+        if (videoSize.width == videoSize.height) {
+            mediaRecorder.setVideoSize(preview_width, preview_height);
+        } else {
+            mediaRecorder.setVideoSize(videoSize.width, videoSize.height);
+        }
+//        if (SELECTED_CAMERA == CAMERA_FRONT_POSITION) {
+//            mediaRecorder.setOrientationHint(270);
+//        } else {
+//            mediaRecorder.setOrientationHint(nowAngle);
+////            mediaRecorder.setOrientationHint(90);
+//        }
+
+        if (SELECTED_CAMERA == CAMERA_FRONT_POSITION) {
+            if (cameraAngle == 270) {
+                if (nowAngle == 0) {
+                    mediaRecorder.setOrientationHint(180);
+                } else if (nowAngle == 270) {
+                    mediaRecorder.setOrientationHint(270);
+                } else {
+                    mediaRecorder.setOrientationHint(90);
+                }
+            } else {
+                if (nowAngle == 90) {
+                    mediaRecorder.setOrientationHint(270);
+                } else if (nowAngle == 270) {
+                    mediaRecorder.setOrientationHint(90);
+                } else {
+                    mediaRecorder.setOrientationHint(nowAngle);
+                }
+            }
+        } else {
+            mediaRecorder.setOrientationHint(nowAngle);
+        }
+
+
+        if (DeviceUtil.isHuaWeiOrHonor()) {
+            mediaRecorder.setVideoEncodingBitRate(4 * 100000);
+        } else {
+            mediaRecorder.setVideoEncodingBitRate(mediaQuality);
+        }
+        mediaRecorder.setPreviewDisplay(surface);
+
+        videoFileName = "video_" + new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(new Date()) + ".mp4";
+        videoFileAbsPath = saveVideoPath + videoFileName;
+        mediaRecorder.setOutputFile(videoFileAbsPath);
+        try {
+            mediaRecorder.prepare();
+            mediaRecorder.start();
+            isRecorder = true;
+        } catch (IllegalStateException e) {
+            e.printStackTrace();
+            TUIChatLog.i(TAG, "startRecord IllegalStateException");
+            if (this.errorLisenter != null) {
+                this.errorLisenter.onError();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            TUIChatLog.i(TAG, "startRecord IOException");
+            if (this.errorLisenter != null) {
+                this.errorLisenter.onError();
+            }
+        } catch (RuntimeException e) {
+            TUIChatLog.i(TAG, "startRecord RuntimeException");
+        }
+    }
+
+    public void stopRecord(boolean isShort, StopRecordCallback callback) {
+        if (!isRecorder) {
+            return;
+        }
+        if (mediaRecorder != null) {
+            mediaRecorder.setOnErrorListener(null);
+            mediaRecorder.setOnInfoListener(null);
+            mediaRecorder.setPreviewDisplay(null);
+            try {
+                mediaRecorder.stop();
+            } catch (RuntimeException e) {
+                e.printStackTrace();
+                mediaRecorder = null;
+                mediaRecorder = new MediaRecorder();
+            } finally {
+                if (mediaRecorder != null) {
+                    mediaRecorder.release();
+                }
+                mediaRecorder = null;
+                isRecorder = false;
+            }
+            if (isShort) {
+                if (FileUtil.deleteFile(videoFileAbsPath)) {
+                    callback.recordResult(null, null);
+                }
+                return;
+            }
+            doStopPreview();
+            String fileName = saveVideoPath + videoFileName;
+            callback.recordResult(fileName, videoFirstFrame);
+        }
+    }
+
+    private void findAvailableCameras() {
+        Camera.CameraInfo info = new Camera.CameraInfo();
+        int cameraNum = Camera.getNumberOfCameras();
+        for (int i = 0; i < cameraNum; i++) {
+            Camera.getCameraInfo(i, info);
+            switch (info.facing) {
+                case Camera.CameraInfo.CAMERA_FACING_FRONT:
+                    CAMERA_FRONT_POSITION = info.facing;
+                    break;
+                case Camera.CameraInfo.CAMERA_FACING_BACK:
+                    CAMERA_POST_POSITION = info.facing;
+                    break;
+            }
+        }
+    }
+
+    public void handleFocus(final Context context, final float x, final float y, final FocusCallback callback) {
+        if (mCamera == null) {
+            return;
+        }
+        final Camera.Parameters params = mCamera.getParameters();
+        Rect focusRect = calculateTapArea(x, y, 1f, context);
+        mCamera.cancelAutoFocus();
+        if (params.getMaxNumFocusAreas() > 0) {
+            List<Camera.Area> focusAreas = new ArrayList<>();
+            focusAreas.add(new Camera.Area(focusRect, 800));
+            params.setFocusAreas(focusAreas);
+        } else {
+            TUIChatLog.i(TAG, "focus areas not supported");
+            callback.focusSuccess();
+            return;
+        }
+        final String currentFocusMode = params.getFocusMode();
+        try {
+            params.setFocusMode(Camera.Parameters.FOCUS_MODE_AUTO);
+            mCamera.setParameters(params);
+            mCamera.autoFocus(new Camera.AutoFocusCallback() {
+                @Override
+                public void onAutoFocus(boolean success, Camera camera) {
+                    if (success || handlerTime > 10) {
+                        Camera.Parameters params = camera.getParameters();
+                        params.setFocusMode(currentFocusMode);
+                        camera.setParameters(params);
+                        handlerTime = 0;
+                        callback.focusSuccess();
+                    } else {
+                        handlerTime++;
+                        handleFocus(context, x, y, callback);
+                    }
+                }
+            });
+        } catch (Exception e) {
+            TUIChatLog.e(TAG, "autoFocus failer");
+        }
+    }
+
+    void setErrorLinsenter(ErrorListener errorLisenter) {
+        this.errorLisenter = errorLisenter;
+    }
+
+    void registerSensorManager(Context context) {
+        if (sm == null) {
+            sm = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
+        }
+        sm.registerListener(sensorEventListener, sm.getDefaultSensor(Sensor.TYPE_ACCELEROMETER), SensorManager
+                .SENSOR_DELAY_NORMAL);
+    }
+
+    void unregisterSensorManager(Context context) {
+        if (sm == null) {
+            sm = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
+        }
+        sm.unregisterListener(sensorEventListener);
+    }
+
+    void isPreview(boolean res) {
+        this.isPreviewing = res;
+    }
+
+    public interface CameraOpenOverCallback {
+        void cameraHasOpened();
+    }
+
+    public interface StopRecordCallback {
+        void recordResult(String url, Bitmap firstFrame);
+    }
+
+
+    interface ErrorCallback {
+        void onError();
+    }
+
+    public interface TakePictureCallback {
+        void captureResult(Bitmap bitmap, boolean isVertical);
+    }
+
+    public interface FocusCallback {
+        void focusSuccess();
+
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/view/CameraView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/view/CameraView.java
new file mode 100644
index 0000000..381b8a0
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/view/CameraView.java
@@ -0,0 +1,22 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.view;
+
+import android.graphics.Bitmap;
+
+public interface CameraView {
+
+    void resetState(int type);
+
+    void confirmState(int type);
+
+    void showPicture(Bitmap bitmap, boolean isVertical);
+
+    void playVideo(Bitmap firstFrame, String url);
+
+    void stopVideo();
+
+    void setTip(String tip);
+
+    void startPreviewCallback();
+
+    boolean handlerFoucs(float x, float y);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/view/CaptureButton.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/view/CaptureButton.java
new file mode 100644
index 0000000..21be092
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/view/CaptureButton.java
@@ -0,0 +1,346 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.view;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ValueAnimator;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.os.CountDownTimer;
+import android.view.MotionEvent;
+import android.view.View;
+
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.listener.CaptureListener;
+import com.tencent.qcloud.tuikit.tuichat.util.CheckPermission;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+public class CaptureButton extends View {
+
+    public static final int STATE_IDLE = 0x001;        //空闲状态 idle state
+    public static final int STATE_PRESS = 0x002;       //按下状态 pressed state
+    public static final int STATE_LONG_PRESS = 0x003;  //长按状态 long press state
+    public static final int STATE_RECORDERING = 0x004; //录制状态 recording status
+    public static final int STATE_BAN = 0x005;         //禁止状态 forbidden state
+    private static final String TAG = CaptureButton.class.getSimpleName();
+    private int state;              //当前按钮状态 current button state
+    private int button_state;       //按钮可执行的功能状态（拍照,录制,两者）The state of the function that the button can perform (photograph, record, both)
+    private int progress_color = 0xEE16AE16;            //进度条颜色 progress bar color
+    private int outside_color = 0xEEDCDCDC;             //外圆背景色 Outer circle background color
+    private int inside_color = 0xFFFFFFFF;              //内圆背景色 Inner circle background color
+
+
+    private float event_Y;  //Touch_Event_Down时候记录的Y值 Y value recorded when Touch_Event_Down
+
+
+    private Paint mPaint;
+
+    private float strokeWidth;          //进度条宽度 progress bar width
+    private int outside_add_size;       //长按外圆半径变大的Size Long press the Size whose outer circle radius becomes larger
+    private int inside_reduce_size;     //长安内圆缩小的Size The size of the inner circle of Chang'an reduced
+
+    //中心坐标 Center coordinates
+    private float center_X;
+    private float center_Y;
+
+    private float button_radius;            //按钮半径 button radius
+    private float button_outside_radius;    //外圆半径 Outer circle radius
+    private float button_inside_radius;     //内圆半径 Inner circle radius
+    private int button_size;                //按钮大小 button size
+
+    private float progress;         //录制视频的进度 Progress of recording video
+    private int duration;           //录制视频最大时间长度 Maximum length of time to record video
+    private int min_duration;       //最短录制时间限制 Minimum recording time limit
+    private int recorded_time;      //记录当前录制的时间 Record the current recording time
+
+    private RectF rectF;
+
+    private LongPressRunnable longPressRunnable;    //长按后处理的逻辑Runnable Logic of post-processing after long press
+    private CaptureListener captureLisenter;        //按钮回调接口 button callback interface
+    private RecordCountDownTimer timer;             //计时器 timer
+
+    public CaptureButton(Context context) {
+        super(context);
+    }
+
+    public CaptureButton(Context context, int size) {
+        super(context);
+        this.button_size = size;
+        button_radius = size / 2.0f;
+
+        button_outside_radius = button_radius;
+        button_inside_radius = button_radius * 0.75f;
+
+        strokeWidth = size / 15;
+        outside_add_size = size / 5;
+        inside_reduce_size = size / 8;
+
+        mPaint = new Paint();
+        mPaint.setAntiAlias(true);
+
+        progress = 0;
+        longPressRunnable = new LongPressRunnable();
+
+        state = STATE_IDLE;
+        button_state = JCameraView.BUTTON_STATE_BOTH;
+        TUIChatLog.i(TAG, "CaptureButtom start");
+        duration = 10 * 1000;
+        TUIChatLog.i(TAG, "CaptureButtom end");
+        min_duration = 1500;
+
+        center_X = (button_size + outside_add_size * 2) / 2;
+        center_Y = (button_size + outside_add_size * 2) / 2;
+
+        rectF = new RectF(
+                center_X - (button_radius + outside_add_size - strokeWidth / 2),
+                center_Y - (button_radius + outside_add_size - strokeWidth / 2),
+                center_X + (button_radius + outside_add_size - strokeWidth / 2),
+                center_Y + (button_radius + outside_add_size - strokeWidth / 2));
+
+        timer = new RecordCountDownTimer(duration, duration / 360);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        setMeasuredDimension(button_size + outside_add_size * 2, button_size + outside_add_size * 2);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        mPaint.setStyle(Paint.Style.FILL);
+
+        mPaint.setColor(outside_color);
+        canvas.drawCircle(center_X, center_Y, button_outside_radius, mPaint);
+
+        mPaint.setColor(inside_color);
+        canvas.drawCircle(center_X, center_Y, button_inside_radius, mPaint);
+
+        // 如果状态为录制状态，则绘制录制进度条
+        // If the state is recording, draw a recording progress bar
+        if (state == STATE_RECORDERING) {
+            mPaint.setColor(progress_color);
+            mPaint.setStyle(Paint.Style.STROKE);
+            mPaint.setStrokeWidth(strokeWidth);
+            canvas.drawArc(rectF, -90, progress, false, mPaint);
+        }
+    }
+
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                TUIChatLog.i(TAG, "state = " + state);
+                if (event.getPointerCount() > 1 || state != STATE_IDLE)
+                    break;
+                event_Y = event.getY();
+                state = STATE_PRESS;
+
+                if ((button_state == JCameraView.BUTTON_STATE_ONLY_RECORDER || button_state == JCameraView.BUTTON_STATE_BOTH))
+                    postDelayed(longPressRunnable, 500);
+                break;
+            case MotionEvent.ACTION_MOVE:
+                if (captureLisenter != null
+                        && state == STATE_RECORDERING
+                        && (button_state == JCameraView.BUTTON_STATE_ONLY_RECORDER || button_state == JCameraView.BUTTON_STATE_BOTH)) {
+                    // 记录当前Y值与按下时候Y值的差值，调用缩放回调接口
+                    // Record the difference between the current Y value and the Y value when pressed, and call the zoom callback interface
+                    captureLisenter.recordZoom(event_Y - event.getY());
+                }
+                break;
+            case MotionEvent.ACTION_UP:
+                // 根据当前按钮的状态进行相应的处理
+                // Perform corresponding processing according to the current state of the button
+                handlerUnpressByState();
+                break;
+        }
+        return true;
+    }
+
+    private void handlerUnpressByState() {
+        removeCallbacks(longPressRunnable);
+        switch (state) {
+            case STATE_PRESS:
+                if (captureLisenter != null && (button_state == JCameraView.BUTTON_STATE_ONLY_CAPTURE || button_state ==
+                        JCameraView.BUTTON_STATE_BOTH)) {
+                    startCaptureAnimation(button_inside_radius);
+                } else {
+                    state = STATE_IDLE;
+                }
+                break;
+            case STATE_RECORDERING:
+                timer.cancel();
+                recordEnd();
+                break;
+        }
+    }
+
+    private void recordEnd() {
+        if (captureLisenter != null) {
+            if (recorded_time < min_duration)
+                captureLisenter.recordShort(recorded_time);
+            else
+                captureLisenter.recordEnd(recorded_time);
+        }
+        resetRecordAnim();
+    }
+
+    private void resetRecordAnim() {
+        state = STATE_BAN;
+        progress = 0;
+        invalidate();
+        startRecordAnimation(
+                button_outside_radius,
+                button_radius,
+                button_inside_radius,
+                button_radius * 0.75f
+        );
+    }
+
+    private void startCaptureAnimation(float inside_start) {
+        ValueAnimator inside_anim = ValueAnimator.ofFloat(inside_start, inside_start * 0.75f, inside_start);
+        inside_anim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                button_inside_radius = (float) animation.getAnimatedValue();
+                invalidate();
+            }
+        });
+        inside_anim.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                super.onAnimationEnd(animation);
+                captureLisenter.takePictures();
+                state = STATE_BAN;
+            }
+        });
+        inside_anim.setDuration(100);
+        inside_anim.start();
+    }
+
+    private void startRecordAnimation(float outside_start, float outside_end, float inside_start, float inside_end) {
+        ValueAnimator outside_anim = ValueAnimator.ofFloat(outside_start, outside_end);
+        ValueAnimator inside_anim = ValueAnimator.ofFloat(inside_start, inside_end);
+        outside_anim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                button_outside_radius = (float) animation.getAnimatedValue();
+                invalidate();
+            }
+        });
+        inside_anim.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                button_inside_radius = (float) animation.getAnimatedValue();
+                invalidate();
+            }
+        });
+        AnimatorSet set = new AnimatorSet();
+        set.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                super.onAnimationEnd(animation);
+                if (state == STATE_LONG_PRESS) {
+                    if (captureLisenter != null)
+                        captureLisenter.recordStart();
+                    state = STATE_RECORDERING;
+                    timer.start();
+                }
+            }
+        });
+        set.playTogether(outside_anim, inside_anim);
+        set.setDuration(100);
+        set.start();
+    }
+
+    private void updateProgress(long millisUntilFinished) {
+        recorded_time = (int) (duration - millisUntilFinished);
+        progress = 360f - millisUntilFinished / (float) duration * 360f;
+        invalidate();
+    }
+
+    /**************************************************
+     * Call API                     *
+     **************************************************/
+
+    // 设置最长录制时间
+    // Set the maximum recording time
+    public void setDuration(int duration) {
+        this.duration = duration;
+        timer = new RecordCountDownTimer(duration, duration / 360);    //录制定时器
+    }
+
+    // 设置最短录制时间
+    // Set the minimum recording time
+    public void setMinDuration(int duration) {
+        this.min_duration = duration;
+    }
+
+    // 设置回调接口
+    // Set callback interface
+    public void setCaptureLisenter(CaptureListener captureLisenter) {
+        this.captureLisenter = captureLisenter;
+    }
+
+    // 设置按钮功能（拍照和录像）
+    // Set button functions (photo and video)
+    public void setButtonFeatures(int state) {
+        this.button_state = state;
+    }
+
+    // 是否空闲状态
+    // Is it idle
+    public boolean isIdle() {
+        return state == STATE_IDLE;
+    }
+
+    // 设置状态
+    // set state
+    public void resetState() {
+        state = STATE_IDLE;
+    }
+
+    // 录制视频计时器
+    // record video timer
+    private class RecordCountDownTimer extends CountDownTimer {
+        RecordCountDownTimer(long millisInFuture, long countDownInterval) {
+            super(millisInFuture, countDownInterval);
+        }
+
+        @Override
+        public void onTick(long millisUntilFinished) {
+            updateProgress(millisUntilFinished);
+        }
+
+        @Override
+        public void onFinish() {
+            updateProgress(0);
+            recordEnd();
+        }
+    }
+
+    // 长按线程
+    // long press thread
+    private class LongPressRunnable implements Runnable {
+        @Override
+        public void run() {
+            state = STATE_LONG_PRESS;
+            if (CheckPermission.getRecordState() != CheckPermission.STATE_SUCCESS) {
+                state = STATE_IDLE;
+                if (captureLisenter != null) {
+                    captureLisenter.recordError();
+                    return;
+                }
+            }
+            startRecordAnimation(
+                    button_outside_radius,
+                    button_outside_radius + outside_add_size,
+                    button_inside_radius,
+                    button_inside_radius - inside_reduce_size
+            );
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/view/CaptureLayout.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/view/CaptureLayout.java
new file mode 100644
index 0000000..ed08a2b
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/view/CaptureLayout.java
@@ -0,0 +1,351 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.view;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.view.Gravity;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.listener.CaptureListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.listener.ClickListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.listener.ReturnListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.listener.TypeListener;
+
+public class CaptureLayout extends FrameLayout {
+
+    private CaptureListener captureLisenter;    //拍照按钮监听 Camera button Lisenter
+    private TypeListener typeLisenter;          //拍照或录制后接结果按钮监听 Take a picture or record followed by the result button Lisenter
+    private ReturnListener returnListener;      //退出按钮监听 Exit button listener
+    private ClickListener leftClickListener;    //左边按钮监听 left button Lisenter
+    private ClickListener rightClickListener;   //右边按钮监听 Right button Lisenter
+    private CaptureButton btn_capture;      //拍照按钮 photo button
+    private TypeButton btn_confirm;         //确认按钮 Confirm button
+    private TypeButton btn_cancel;          //取消按钮 cancel button
+    private ReturnButton btn_return;        //返回按钮 back button
+    private ImageView iv_custom_left;            //左边自定义按钮 left custom button
+    private ImageView iv_custom_right;            //右边自定义按钮 right custom button
+    private TextView txt_tip;               //提示文本 prompt text
+    private int layout_width;
+    private int layout_height;
+    private int button_size;
+    private int iconLeft = 0;
+    private int iconRight = 0;
+    private boolean isFirst = true;
+
+    public CaptureLayout(Context context) {
+        this(context, null);
+    }
+
+    public CaptureLayout(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public CaptureLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+
+        WindowManager manager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+        DisplayMetrics outMetrics = new DisplayMetrics();
+        manager.getDefaultDisplay().getMetrics(outMetrics);
+
+        if (this.getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) {
+            layout_width = outMetrics.widthPixels;
+        } else {
+            layout_width = outMetrics.widthPixels / 2;
+        }
+        button_size = (int) (layout_width / 4.5f);
+        layout_height = button_size + (button_size / 5) * 2 + 100;
+
+        initView();
+        initEvent();
+    }
+
+    public void setTypeLisenter(TypeListener typeLisenter) {
+        this.typeLisenter = typeLisenter;
+    }
+
+    public void setCaptureLisenter(CaptureListener captureLisenter) {
+        this.captureLisenter = captureLisenter;
+    }
+
+    public void setReturnLisenter(ReturnListener returnListener) {
+        this.returnListener = returnListener;
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        setMeasuredDimension(layout_width, layout_height);
+    }
+
+    public void initEvent() {
+        iv_custom_right.setVisibility(GONE);
+        btn_cancel.setVisibility(GONE);
+        btn_confirm.setVisibility(GONE);
+    }
+
+    public void startTypeBtnAnimator() {
+        if (this.iconLeft != 0)
+            iv_custom_left.setVisibility(GONE);
+        else
+            btn_return.setVisibility(GONE);
+        if (this.iconRight != 0)
+            iv_custom_right.setVisibility(GONE);
+        btn_capture.setVisibility(GONE);
+        btn_cancel.setVisibility(VISIBLE);
+        btn_confirm.setVisibility(VISIBLE);
+        btn_cancel.setClickable(false);
+        btn_confirm.setClickable(false);
+        ObjectAnimator animator_cancel = ObjectAnimator.ofFloat(btn_cancel, "translationX", layout_width / 4, 0);
+        ObjectAnimator animator_confirm = ObjectAnimator.ofFloat(btn_confirm, "translationX", -layout_width / 4, 0);
+
+        AnimatorSet set = new AnimatorSet();
+        set.playTogether(animator_cancel, animator_confirm);
+        set.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                super.onAnimationEnd(animation);
+                btn_cancel.setClickable(true);
+                btn_confirm.setClickable(true);
+            }
+        });
+        set.setDuration(200);
+        set.start();
+    }
+
+
+    private void initView() {
+        setWillNotDraw(false);
+        //拍照按钮
+        btn_capture = new CaptureButton(getContext(), button_size);
+        LayoutParams btn_capture_param = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+        btn_capture_param.gravity = Gravity.CENTER;
+        btn_capture.setLayoutParams(btn_capture_param);
+        btn_capture.setCaptureLisenter(new CaptureListener() {
+            @Override
+            public void takePictures() {
+                if (captureLisenter != null) {
+                    captureLisenter.takePictures();
+                }
+            }
+
+            @Override
+            public void recordShort(long time) {
+                if (captureLisenter != null) {
+                    captureLisenter.recordShort(time);
+                }
+                startAlphaAnimation();
+            }
+
+            @Override
+            public void recordStart() {
+                if (captureLisenter != null) {
+                    captureLisenter.recordStart();
+                }
+                startAlphaAnimation();
+            }
+
+            @Override
+            public void recordEnd(long time) {
+                if (captureLisenter != null) {
+                    captureLisenter.recordEnd(time);
+                }
+                startAlphaAnimation();
+                startTypeBtnAnimator();
+            }
+
+            @Override
+            public void recordZoom(float zoom) {
+                if (captureLisenter != null) {
+                    captureLisenter.recordZoom(zoom);
+                }
+            }
+
+            @Override
+            public void recordError() {
+                if (captureLisenter != null) {
+                    captureLisenter.recordError();
+                }
+            }
+        });
+
+        //取消按钮
+        btn_cancel = new TypeButton(getContext(), TypeButton.TYPE_CANCEL, button_size);
+        final LayoutParams btn_cancel_param = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+        btn_cancel_param.gravity = Gravity.CENTER_VERTICAL;
+        btn_cancel_param.setMargins((layout_width / 4) - button_size / 2, 0, 0, 0);
+        btn_cancel.setLayoutParams(btn_cancel_param);
+        btn_cancel.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (typeLisenter != null) {
+                    typeLisenter.cancel();
+                }
+                startAlphaAnimation();
+//                resetCaptureLayout();
+            }
+        });
+
+        btn_confirm = new TypeButton(getContext(), TypeButton.TYPE_CONFIRM, button_size);
+        LayoutParams btn_confirm_param = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+        btn_confirm_param.gravity = Gravity.CENTER_VERTICAL | Gravity.RIGHT;
+        btn_confirm_param.setMargins(0, 0, (layout_width / 4) - button_size / 2, 0);
+        btn_confirm.setLayoutParams(btn_confirm_param);
+        btn_confirm.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (typeLisenter != null) {
+                    typeLisenter.confirm();
+                }
+                startAlphaAnimation();
+//                resetCaptureLayout();
+            }
+        });
+
+        btn_return = new ReturnButton(getContext(), (int) (button_size / 2.5f));
+        LayoutParams btn_return_param = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+        btn_return_param.gravity = Gravity.CENTER_VERTICAL;
+        btn_return_param.setMargins(layout_width / 6, 0, 0, 0);
+        btn_return.setLayoutParams(btn_return_param);
+        btn_return.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (leftClickListener != null) {
+                    leftClickListener.onClick();
+                }
+            }
+        });
+
+        iv_custom_left = new ImageView(getContext());
+        LayoutParams iv_custom_param_left = new LayoutParams((int) (button_size / 2.5f), (int) (button_size / 2.5f));
+        iv_custom_param_left.gravity = Gravity.CENTER_VERTICAL;
+        iv_custom_param_left.setMargins(layout_width / 6, 0, 0, 0);
+        iv_custom_left.setLayoutParams(iv_custom_param_left);
+        iv_custom_left.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (leftClickListener != null) {
+                    leftClickListener.onClick();
+                }
+            }
+        });
+
+        iv_custom_right = new ImageView(getContext());
+        LayoutParams iv_custom_param_right = new LayoutParams((int) (button_size / 2.5f), (int) (button_size / 2.5f));
+        iv_custom_param_right.gravity = Gravity.CENTER_VERTICAL | Gravity.RIGHT;
+        iv_custom_param_right.setMargins(0, 0, layout_width / 6, 0);
+        iv_custom_right.setLayoutParams(iv_custom_param_right);
+        iv_custom_right.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (rightClickListener != null) {
+                    rightClickListener.onClick();
+                }
+            }
+        });
+
+        txt_tip = new TextView(getContext());
+        LayoutParams txt_param = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
+        txt_param.gravity = Gravity.CENTER_HORIZONTAL;
+        txt_param.setMargins(0, 0, 0, 0);
+        txt_tip.setText(TUIChatService.getAppContext().getString(R.string.tap_tips));
+        txt_tip.setTextColor(0xFFFFFFFF);
+        txt_tip.setGravity(Gravity.CENTER);
+        txt_tip.setLayoutParams(txt_param);
+
+        this.addView(btn_capture);
+        this.addView(btn_cancel);
+        this.addView(btn_confirm);
+        this.addView(btn_return);
+        this.addView(iv_custom_left);
+        this.addView(iv_custom_right);
+        this.addView(txt_tip);
+
+    }
+
+    /**************************************************
+     * Call API                      *
+     **************************************************/
+    public void resetCaptureLayout() {
+        btn_capture.resetState();
+        btn_cancel.setVisibility(GONE);
+        btn_confirm.setVisibility(GONE);
+        btn_capture.setVisibility(VISIBLE);
+        if (this.iconLeft != 0)
+            iv_custom_left.setVisibility(VISIBLE);
+        else
+            btn_return.setVisibility(VISIBLE);
+        if (this.iconRight != 0)
+            iv_custom_right.setVisibility(VISIBLE);
+    }
+
+
+    public void startAlphaAnimation() {
+        if (isFirst) {
+            ObjectAnimator animator_txt_tip = ObjectAnimator.ofFloat(txt_tip, "alpha", 1f, 0f);
+            animator_txt_tip.setDuration(500);
+            animator_txt_tip.start();
+            isFirst = false;
+        }
+    }
+
+    public void setTextWithAnimation(String tip) {
+        txt_tip.setText(tip);
+        ObjectAnimator animator_txt_tip = ObjectAnimator.ofFloat(txt_tip, "alpha", 0f, 1f, 1f, 0f);
+        animator_txt_tip.setDuration(2500);
+        animator_txt_tip.start();
+    }
+
+    public void setDuration(int duration) {
+        btn_capture.setDuration(duration);
+    }
+
+    public void setButtonFeatures(int state) {
+        btn_capture.setButtonFeatures(state);
+    }
+
+    public void setTip(String tip) {
+        txt_tip.setText(tip);
+    }
+
+    public void showTip() {
+        txt_tip.setVisibility(VISIBLE);
+    }
+
+    public void setIconSrc(int iconLeft, int iconRight) {
+        this.iconLeft = iconLeft;
+        this.iconRight = iconRight;
+        if (this.iconLeft != 0) {
+            iv_custom_left.setImageResource(iconLeft);
+            iv_custom_left.setVisibility(VISIBLE);
+            btn_return.setVisibility(GONE);
+        } else {
+            iv_custom_left.setVisibility(GONE);
+            btn_return.setVisibility(VISIBLE);
+        }
+        if (this.iconRight != 0) {
+            iv_custom_right.setImageResource(iconRight);
+            iv_custom_right.setVisibility(VISIBLE);
+        } else {
+            iv_custom_right.setVisibility(GONE);
+        }
+    }
+
+    public void setLeftClickListener(ClickListener leftClickListener) {
+        this.leftClickListener = leftClickListener;
+    }
+
+    public void setRightClickListener(ClickListener rightClickListener) {
+        this.rightClickListener = rightClickListener;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/view/FoucsView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/view/FoucsView.java
new file mode 100644
index 0000000..3336cf9
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/view/FoucsView.java
@@ -0,0 +1,57 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.view;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.util.AttributeSet;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+
+public class FoucsView extends View {
+    private int size;
+    private int center_x;
+    private int center_y;
+    private int length;
+    private Paint mPaint;
+
+    public FoucsView(Context context) {
+        this(context, null);
+    }
+
+    public FoucsView(Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public FoucsView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        this.size = ScreenUtil.getScreenWidth(context) / 3;
+        mPaint = new Paint();
+        mPaint.setAntiAlias(true);
+        mPaint.setDither(true);
+        mPaint.setColor(0xEE16AE16);
+        mPaint.setStrokeWidth(4);
+        mPaint.setStyle(Paint.Style.STROKE);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        center_x = (int) (size / 2.0);
+        center_y = (int) (size / 2.0);
+        length = (int) (size / 2.0) - 2;
+        setMeasuredDimension(size, size);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        canvas.drawRect(center_x - length, center_y - length, center_x + length, center_y + length, mPaint);
+        canvas.drawLine(2, getHeight() / 2, size / 10, getHeight() / 2, mPaint);
+        canvas.drawLine(getWidth() - 2, getHeight() / 2, getWidth() - size / 10, getHeight() / 2, mPaint);
+        canvas.drawLine(getWidth() / 2, 2, getWidth() / 2, size / 10, mPaint);
+        canvas.drawLine(getWidth() / 2, getHeight() - 2, getWidth() / 2, getHeight() - size / 10, mPaint);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/view/JCameraView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/view/JCameraView.java
new file mode 100644
index 0000000..bb456a7
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/view/JCameraView.java
@@ -0,0 +1,551 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.view;
+
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.hardware.Camera;
+import android.media.AudioManager;
+import android.media.MediaPlayer;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.SurfaceHolder;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.VideoView;
+
+import com.tencent.qcloud.tuicore.util.FileUtil;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.config.TUIChatConfigs;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.listener.CaptureListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.listener.ClickListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.listener.ErrorListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.listener.JCameraListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.listener.TypeListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.state.CameraMachine;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+import java.io.IOException;
+
+public class JCameraView extends FrameLayout implements CameraInterface.CameraOpenOverCallback, SurfaceHolder.Callback, CameraView {
+
+    // 拍照浏览时候的类型
+    // camera mode
+    public static final int TYPE_PICTURE = 0x001;
+    public static final int TYPE_VIDEO = 0x002;
+    public static final int TYPE_SHORT = 0x003;
+    public static final int TYPE_DEFAULT = 0x004;
+    // 录制视频比特率
+    // Recording video bit rate
+    public static final int MEDIA_QUALITY_HIGH = 20 * 100000;
+    public static final int MEDIA_QUALITY_MIDDLE = 16 * 100000;
+    public static final int MEDIA_QUALITY_LOW = 12 * 100000;
+    public static final int MEDIA_QUALITY_POOR = 8 * 100000;
+    public static final int MEDIA_QUALITY_FUNNY = 4 * 100000;
+    public static final int MEDIA_QUALITY_DESPAIR = 2 * 100000;
+    public static final int MEDIA_QUALITY_SORRY = 1 * 80000;
+    public static final int BUTTON_STATE_ONLY_CAPTURE = 0x101;      //只能拍照
+    public static final int BUTTON_STATE_ONLY_RECORDER = 0x102;     //只能录像
+    public static final int BUTTON_STATE_BOTH = 0x103;              //两者都可以
+    private static final String TAG = JCameraView.class.getSimpleName();
+    // 闪关灯状态
+    // Flash status
+    private static final int TYPE_FLASH_AUTO = 0x021;
+    private static final int TYPE_FLASH_ON = 0x022;
+    private static final int TYPE_FLASH_OFF = 0x023;
+    // Camera 状态机
+    // Camera state machine
+    private CameraMachine machine;
+    private int type_flash = TYPE_FLASH_OFF;
+    private JCameraListener jCameraLisenter;
+    private ClickListener leftClickListener;
+    private ClickListener rightClickListener;
+
+    private Context mContext;
+    private VideoView mVideoView;
+    private ImageView mPhoto;
+    private ImageView mSwitchCamera;
+    private CaptureLayout mCaptureLayout;
+    private FoucsView mFoucsView;
+    private MediaPlayer mMediaPlayer;
+
+    private int layout_width;
+    private float screenProp = 0f;
+
+    private Bitmap captureBitmap;   //捕获的图片 captured picture
+    private Bitmap firstFrame;      //第一帧图片 first frame picture
+    private String videoUrl;        //视频URL Video URL
+
+
+    // 切换摄像头按钮的参数
+    // Switch camera button parameters
+    private int iconSize = 0;
+    private int iconMargin = 0;
+    private int iconSrc = 0;
+    private int iconLeft = 0;
+    private int iconRight = 0;
+    private int duration = 0;
+    private long recordTime;
+
+    // 缩放梯度
+    // scale gradient
+    private int zoomGradient = 0;
+
+    private boolean firstTouch = true;
+    private float firstTouchLength = 0;
+    private ErrorListener errorLisenter;
+
+    public JCameraView(Context context) {
+        this(context, null);
+    }
+
+    public JCameraView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public JCameraView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        mContext = context;
+        //get AttributeSet
+        TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.JCameraView, defStyleAttr, 0);
+        iconSize = a.getDimensionPixelSize(R.styleable.JCameraView_iconSize, (int) TypedValue.applyDimension(
+                TypedValue.COMPLEX_UNIT_SP, 35, getResources().getDisplayMetrics()));
+        iconMargin = a.getDimensionPixelSize(R.styleable.JCameraView_iconMargin, (int) TypedValue.applyDimension(
+                TypedValue.COMPLEX_UNIT_SP, 15, getResources().getDisplayMetrics()));
+        iconSrc = a.getResourceId(R.styleable.JCameraView_iconSrc, R.drawable.chat_camera_switchcamera);
+        iconLeft = a.getResourceId(R.styleable.JCameraView_iconLeft, 0);
+        iconRight = a.getResourceId(R.styleable.JCameraView_iconRight, 0);
+        duration = TUIChatConfigs.getConfigs().getGeneralConfig().getVideoRecordMaxTime() * 1000;
+        a.recycle();
+        initData();
+        initView();
+    }
+
+    private void initData() {
+        layout_width = ScreenUtil.getScreenWidth(mContext);
+        zoomGradient = (int) (layout_width / 16f);
+        TUIChatLog.i(TAG, "zoom = " + zoomGradient);
+        machine = new CameraMachine(getContext(), this, this);
+    }
+
+    private void initView() {
+        setWillNotDraw(false);
+        View view = LayoutInflater.from(mContext).inflate(R.layout.chat_minimalist_input_camera_view, this);
+        mVideoView = view.findViewById(R.id.video_preview);
+        mPhoto = view.findViewById(R.id.image_photo);
+        mSwitchCamera = view.findViewById(R.id.image_switch);
+        mSwitchCamera.setImageResource(iconSrc);
+        setFlashRes();
+        mCaptureLayout = view.findViewById(R.id.capture_layout);
+        mCaptureLayout.setDuration(duration);
+        mCaptureLayout.setIconSrc(iconLeft, iconRight);
+        mFoucsView = view.findViewById(R.id.fouce_view);
+        mVideoView.getHolder().addCallback(this);
+
+        mSwitchCamera.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                machine.swtich(mVideoView.getHolder(), screenProp);
+            }
+        });
+
+        mCaptureLayout.setCaptureLisenter(new CaptureListener() {
+            @Override
+            public void takePictures() {
+                mSwitchCamera.setVisibility(INVISIBLE);
+                machine.capture();
+            }
+
+            @Override
+            public void recordStart() {
+                mSwitchCamera.setVisibility(INVISIBLE);
+                machine.record(mVideoView.getHolder().getSurface(), screenProp);
+            }
+
+            @Override
+            public void recordShort(final long time) {
+                mCaptureLayout.setTextWithAnimation(TUIChatService.getAppContext().getString(R.string.record_time_tip));
+                mSwitchCamera.setVisibility(VISIBLE);
+                postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        machine.stopRecord(true, time);
+                    }
+                }, 1500 - time);
+            }
+
+            @Override
+            public void recordEnd(long time) {
+                machine.stopRecord(false, time);
+                recordTime = time;
+            }
+
+            @Override
+            public void recordZoom(float zoom) {
+                TUIChatLog.i(TAG, "recordZoom");
+                machine.zoom(zoom, CameraInterface.TYPE_RECORDER);
+            }
+
+            @Override
+            public void recordError() {
+                if (errorLisenter != null) {
+                    errorLisenter.AudioPermissionError();
+                }
+            }
+        });
+
+        mCaptureLayout.setTypeLisenter(new TypeListener() {
+            @Override
+            public void cancel() {
+                machine.cancle(mVideoView.getHolder(), screenProp);
+            }
+
+            @Override
+            public void confirm() {
+                machine.confirm();
+            }
+        });
+
+//        mCaptureLayout.setReturnLisenter(new ReturnListener() {
+//            @Override
+//            public void onReturn() {
+//                if (jCameraLisenter != null) {
+//                    jCameraLisenter.quit();
+//                }
+//            }
+//        });
+        mCaptureLayout.setLeftClickListener(new ClickListener() {
+            @Override
+            public void onClick() {
+                if (leftClickListener != null) {
+                    leftClickListener.onClick();
+                }
+            }
+        });
+        mCaptureLayout.setRightClickListener(new ClickListener() {
+            @Override
+            public void onClick() {
+                if (rightClickListener != null) {
+                    rightClickListener.onClick();
+                }
+            }
+        });
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        float widthSize = mVideoView.getMeasuredWidth();
+        float heightSize = mVideoView.getMeasuredHeight();
+        if (screenProp == 0) {
+            screenProp = heightSize / widthSize;
+        }
+    }
+
+    @Override
+    public void cameraHasOpened() {
+        CameraInterface.getInstance().doStartPreview(mVideoView.getHolder(), screenProp);
+    }
+
+    public void onResume() {
+        TUIChatLog.i(TAG, "JCameraView onResume");
+        resetState(TYPE_DEFAULT);
+        CameraInterface.getInstance().registerSensorManager(mContext);
+        machine.start(mVideoView.getHolder(), screenProp);
+    }
+
+    public void onPause() {
+        TUIChatLog.i(TAG, "JCameraView onPause");
+        machine.stop();
+        CameraInterface.getInstance().unregisterSensorManager(mContext);
+    }
+
+    public void onDestroy() {
+        stopVideo();
+        resetState(TYPE_PICTURE);
+        CameraInterface.getInstance().isPreview(false);
+        CameraInterface.getInstance().unregisterSensorManager(mContext);
+        CameraInterface.destroyCameraInterface();
+    }
+
+    @Override
+    public void surfaceCreated(SurfaceHolder holder) {
+        TUIChatLog.i(TAG, "JCameraView SurfaceCreated");
+        new Thread() {
+            @Override
+            public void run() {
+                CameraInterface.getInstance().doOpenCamera(JCameraView.this);
+            }
+        }.start();
+    }
+
+    @Override
+    public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
+    }
+
+    @Override
+    public void surfaceDestroyed(SurfaceHolder holder) {
+        TUIChatLog.i(TAG, "JCameraView SurfaceDestroyed");
+        CameraInterface.getInstance().doDestroyCamera();
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                if (event.getPointerCount() == 1) {
+                    setFocusViewWidthAnimation(event.getX(), event.getY());
+                }
+                if (event.getPointerCount() == 2) {
+                    TUIChatLog.i(TAG, "ACTION_DOWN = " + 2);
+                }
+                break;
+            case MotionEvent.ACTION_MOVE:
+                if (event.getPointerCount() == 1) {
+                    firstTouch = true;
+                }
+                if (event.getPointerCount() == 2) {
+                    float point_1_X = event.getX(0);
+                    float point_1_Y = event.getY(0);
+                    float point_2_X = event.getX(1);
+                    float point_2_Y = event.getY(1);
+
+                    float result = (float) Math.sqrt(Math.pow(point_1_X - point_2_X, 2) + Math.pow(point_1_Y -
+                            point_2_Y, 2));
+
+                    if (firstTouch) {
+                        firstTouchLength = result;
+                        firstTouch = false;
+                    }
+                    if ((int) (result - firstTouchLength) / zoomGradient != 0) {
+                        firstTouch = true;
+                        machine.zoom(result - firstTouchLength, CameraInterface.TYPE_CAPTURE);
+                    }
+//                    TUIChatLog.i(TAG, "result = " + (result - firstTouchLength));
+                }
+                break;
+            case MotionEvent.ACTION_UP:
+                firstTouch = true;
+                break;
+        }
+        return true;
+    }
+
+    private void setFocusViewWidthAnimation(float x, float y) {
+        machine.foucs(x, y, new CameraInterface.FocusCallback() {
+            @Override
+            public void focusSuccess() {
+                mFoucsView.setVisibility(INVISIBLE);
+            }
+        });
+    }
+
+    private void updateVideoViewSize(float videoWidth, float videoHeight) {
+        if (videoWidth > videoHeight) {
+            LayoutParams videoViewParam;
+            int height = (int) ((videoHeight / videoWidth) * getWidth());
+            videoViewParam = new LayoutParams(LayoutParams.MATCH_PARENT, height);
+            videoViewParam.gravity = Gravity.CENTER;
+            mVideoView.setLayoutParams(videoViewParam);
+        }
+    }
+
+    public void setJCameraLisenter(JCameraListener jCameraLisenter) {
+        this.jCameraLisenter = jCameraLisenter;
+    }
+
+    public void setErrorLisenter(ErrorListener errorLisenter) {
+        this.errorLisenter = errorLisenter;
+        CameraInterface.getInstance().setErrorLinsenter(errorLisenter);
+    }
+
+    public void setFeatures(int state) {
+        this.mCaptureLayout.setButtonFeatures(state);
+    }
+
+    public void setMediaQuality(int quality) {
+        CameraInterface.getInstance().setMediaQuality(quality);
+    }
+
+    @Override
+    public void resetState(int type) {
+        switch (type) {
+            case TYPE_VIDEO:
+                stopVideo();
+                FileUtil.deleteFile(videoUrl);
+                mVideoView.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+                machine.start(mVideoView.getHolder(), screenProp);
+                break;
+            case TYPE_PICTURE:
+                mPhoto.setVisibility(INVISIBLE);
+                break;
+            case TYPE_SHORT:
+                break;
+            case TYPE_DEFAULT:
+                mVideoView.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+                break;
+        }
+        mSwitchCamera.setVisibility(VISIBLE);
+        //mFlashLamp.setVisibility(VISIBLE);
+        mCaptureLayout.resetCaptureLayout();
+    }
+
+    @Override
+    public void confirmState(int type) {
+        switch (type) {
+            case TYPE_VIDEO:
+                stopVideo();
+                mVideoView.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
+                machine.start(mVideoView.getHolder(), screenProp);
+                if (jCameraLisenter != null) {
+                    jCameraLisenter.recordSuccess(videoUrl, firstFrame, recordTime);
+                }
+                break;
+            case TYPE_PICTURE:
+                mPhoto.setVisibility(INVISIBLE);
+                if (jCameraLisenter != null) {
+                    jCameraLisenter.captureSuccess(captureBitmap);
+                }
+                break;
+            case TYPE_SHORT:
+                break;
+            case TYPE_DEFAULT:
+                break;
+        }
+        mCaptureLayout.resetCaptureLayout();
+    }
+
+    @Override
+    public void showPicture(Bitmap bitmap, boolean isVertical) {
+        if (isVertical) {
+            mPhoto.setScaleType(ImageView.ScaleType.FIT_XY);
+        } else {
+            mPhoto.setScaleType(ImageView.ScaleType.FIT_CENTER);
+        }
+        captureBitmap = bitmap;
+        mPhoto.setImageBitmap(bitmap);
+        mPhoto.setVisibility(VISIBLE);
+        mCaptureLayout.startAlphaAnimation();
+        mCaptureLayout.startTypeBtnAnimator();
+    }
+
+    @Override
+    public void playVideo(Bitmap firstFrame, final String url) {
+        videoUrl = url;
+        JCameraView.this.firstFrame = firstFrame;
+        try {
+            if (mMediaPlayer == null) {
+                mMediaPlayer = new MediaPlayer();
+            } else {
+                mMediaPlayer.reset();
+            }
+            mMediaPlayer.setDataSource(url);
+            mMediaPlayer.setSurface(mVideoView.getHolder().getSurface());
+            mMediaPlayer.setVideoScalingMode(MediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT);
+            mMediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
+            mMediaPlayer.setOnVideoSizeChangedListener(new MediaPlayer
+                    .OnVideoSizeChangedListener() {
+                @Override
+                public void
+                onVideoSizeChanged(MediaPlayer mp, int width, int height) {
+                    updateVideoViewSize(mMediaPlayer.getVideoWidth(), mMediaPlayer
+                            .getVideoHeight());
+                }
+            });
+            mMediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
+                @Override
+                public void onPrepared(MediaPlayer mp) {
+                    mMediaPlayer.start();
+                }
+            });
+            mMediaPlayer.setLooping(true);
+            mMediaPlayer.prepareAsync();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void stopVideo() {
+        if (mMediaPlayer != null && mMediaPlayer.isPlaying()) {
+            mMediaPlayer.stop();
+            mMediaPlayer.release();
+            mMediaPlayer = null;
+        }
+    }
+
+    @Override
+    public void setTip(String tip) {
+        mCaptureLayout.setTip(tip);
+    }
+
+    @Override
+    public void startPreviewCallback() {
+        TUIChatLog.i(TAG, "startPreviewCallback");
+        handlerFoucs(mFoucsView.getWidth() / 2, mFoucsView.getHeight() / 2);
+    }
+
+    @Override
+    public boolean handlerFoucs(float x, float y) {
+        if (y > mCaptureLayout.getTop()) {
+            return false;
+        }
+        mFoucsView.setVisibility(VISIBLE);
+        if (x < mFoucsView.getWidth() / 2) {
+            x = mFoucsView.getWidth() / 2;
+        }
+        if (x > layout_width - mFoucsView.getWidth() / 2) {
+            x = layout_width - mFoucsView.getWidth() / 2;
+        }
+        if (y < mFoucsView.getWidth() / 2) {
+            y = mFoucsView.getWidth() / 2;
+        }
+        if (y > mCaptureLayout.getTop() - mFoucsView.getWidth() / 2) {
+            y = mCaptureLayout.getTop() - mFoucsView.getWidth() / 2;
+        }
+        mFoucsView.setX(x - mFoucsView.getWidth() / 2);
+        mFoucsView.setY(y - mFoucsView.getHeight() / 2);
+        ObjectAnimator scaleX = ObjectAnimator.ofFloat(mFoucsView, "scaleX", 1, 0.6f);
+        ObjectAnimator scaleY = ObjectAnimator.ofFloat(mFoucsView, "scaleY", 1, 0.6f);
+        ObjectAnimator alpha = ObjectAnimator.ofFloat(mFoucsView, "alpha", 1f, 0.4f, 1f, 0.4f, 1f, 0.4f, 1f);
+        AnimatorSet animSet = new AnimatorSet();
+        animSet.play(scaleX).with(scaleY).before(alpha);
+        animSet.setDuration(400);
+        animSet.start();
+        return true;
+    }
+
+    public void setLeftClickListener(ClickListener clickListener) {
+        this.leftClickListener = clickListener;
+    }
+
+    public void setRightClickListener(ClickListener clickListener) {
+        this.rightClickListener = clickListener;
+    }
+
+    private void setFlashRes() {
+        switch (type_flash) {
+            case TYPE_FLASH_AUTO:
+                machine.flash(Camera.Parameters.FLASH_MODE_AUTO);
+                break;
+            case TYPE_FLASH_ON:
+                machine.flash(Camera.Parameters.FLASH_MODE_ON);
+                break;
+            case TYPE_FLASH_OFF:
+                machine.flash(Camera.Parameters.FLASH_MODE_OFF);
+                break;
+        }
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/view/ReturnButton.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/view/ReturnButton.java
new file mode 100644
index 0000000..5c0bf10
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/view/ReturnButton.java
@@ -0,0 +1,53 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.view;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.view.View;
+
+public class ReturnButton extends View {
+
+    Path path;
+    private int size;
+    private int center_X;
+    private int center_Y;
+    private float strokeWidth;
+    private Paint paint;
+
+    public ReturnButton(Context context, int size) {
+        this(context);
+        this.size = size;
+        center_X = size / 2;
+        center_Y = size / 2;
+
+        strokeWidth = size / 15f;
+
+        paint = new Paint();
+        paint.setAntiAlias(true);
+        paint.setColor(Color.WHITE);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setStrokeWidth(strokeWidth);
+
+        path = new Path();
+    }
+
+    public ReturnButton(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        setMeasuredDimension(size, size / 2);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        path.moveTo(strokeWidth, strokeWidth / 2);
+        path.lineTo(center_X, center_Y - strokeWidth / 2);
+        path.lineTo(size - strokeWidth, strokeWidth / 2);
+        canvas.drawPath(path, paint);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/view/TypeButton.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/view/TypeButton.java
new file mode 100644
index 0000000..6588ece
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/camera/view/TypeButton.java
@@ -0,0 +1,109 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.view;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.RectF;
+import android.view.View;
+
+/**
+ * 拍照或录制完成后弹出的确认和返回按钮
+ * 
+ * Confirm and return buttons that pop up after taking a photo or recording
+ */
+public class TypeButton extends View {
+
+    public static final int TYPE_CANCEL = 0x001;
+    public static final int TYPE_CONFIRM = 0x002;
+    private int button_type;
+    private int button_size;
+
+    private float center_X;
+    private float center_Y;
+    private float button_radius;
+
+    private Paint mPaint;
+    private Path path;
+    private float strokeWidth;
+
+    private float index;
+    private RectF rectF;
+
+    public TypeButton(Context context) {
+        super(context);
+    }
+
+    public TypeButton(Context context, int type, int size) {
+        super(context);
+        this.button_type = type;
+        button_size = size;
+        button_radius = size / 2.0f;
+        center_X = size / 2.0f;
+        center_Y = size / 2.0f;
+
+        mPaint = new Paint();
+        path = new Path();
+        strokeWidth = size / 50f;
+        index = button_size / 12f;
+        rectF = new RectF(center_X, center_Y - index, center_X + index * 2, center_Y + index);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        setMeasuredDimension(button_size, button_size);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        // 如果类型为取消，则绘制内部为返回箭头
+        // If the type is cancel, draw the return arrow inside
+        if (button_type == TYPE_CANCEL) {
+            mPaint.setAntiAlias(true);
+            mPaint.setColor(0xEEDCDCDC);
+            mPaint.setStyle(Paint.Style.FILL);
+            canvas.drawCircle(center_X, center_Y, button_radius, mPaint);
+
+            mPaint.setColor(Color.BLACK);
+            mPaint.setStyle(Paint.Style.STROKE);
+            mPaint.setStrokeWidth(strokeWidth);
+
+            path.moveTo(center_X - index / 7, center_Y + index);
+            path.lineTo(center_X + index, center_Y + index);
+
+            path.arcTo(rectF, 90, -180);
+            path.lineTo(center_X - index, center_Y - index);
+            canvas.drawPath(path, mPaint);
+            mPaint.setStyle(Paint.Style.FILL);
+            path.reset();
+            path.moveTo(center_X - index, (float) (center_Y - index * 1.5));
+            path.lineTo(center_X - index, (float) (center_Y - index / 2.3));
+            path.lineTo((float) (center_X - index * 1.6), center_Y - index);
+            path.close();
+            canvas.drawPath(path, mPaint);
+
+        }
+        // 如果类型为确认，则绘制绿色勾
+        // If the type is confirmation, draw a green tick
+        if (button_type == TYPE_CONFIRM) {
+            mPaint.setAntiAlias(true);
+            mPaint.setColor(0xFFFFFFFF);
+            mPaint.setStyle(Paint.Style.FILL);
+            canvas.drawCircle(center_X, center_Y, button_radius, mPaint);
+            mPaint.setAntiAlias(true);
+            mPaint.setStyle(Paint.Style.STROKE);
+            mPaint.setColor(0xFF00CC00);
+            mPaint.setStrokeWidth(strokeWidth);
+
+            path.moveTo(center_X - button_size / 6f, center_Y);
+            path.lineTo(center_X - button_size / 21.2f, center_Y + button_size / 7.7f);
+            path.lineTo(center_X + button_size / 4.0f, center_Y - button_size / 8.5f);
+            path.lineTo(center_X - button_size / 21.2f, center_Y + button_size / 9.4f);
+            path.close();
+            canvas.drawPath(path, mPaint);
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/dialog/ChatBottomSelectSheet.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/dialog/ChatBottomSelectSheet.java
new file mode 100644
index 0000000..9b3207c
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/dialog/ChatBottomSelectSheet.java
@@ -0,0 +1,93 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.dialog;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.view.Display;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ChatBottomSelectSheet {
+
+    private List<String> selectList = new ArrayList<>();
+    private Dialog dialog;
+    private ArrayAdapter<String> listAdapter;
+    private BottomSelectSheetOnClickListener onClickListener;
+    public ChatBottomSelectSheet(Context context) {
+        View view = View.inflate(context, R.layout.chat_minimalist_bottom_select_sheet, null);
+        dialog = new Dialog(context, R.style.ChatBottomSelectSheet);
+        dialog.setContentView(view);
+        dialog.setCancelable(true);
+        dialog.setCanceledOnTouchOutside(true);
+        Window window = dialog.getWindow();
+        window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+        WindowManager m = window.getWindowManager();
+        Display d = m.getDefaultDisplay();
+        WindowManager.LayoutParams p = window.getAttributes();
+        p.width = d.getWidth();
+        p.height = ViewGroup.LayoutParams.WRAP_CONTENT;
+        window.setAttributes(p);
+        window.setGravity(Gravity.BOTTOM);
+        window.setWindowAnimations(R.style.ChatBottomSelectSheet_Anim);  //添加动画
+
+        final ListView listView = view.findViewById(R.id.item_list);
+        listAdapter = new ArrayAdapter<>(context, R.layout.chat_minimalist_bottom_sheet_item, R.id.sheet_item, selectList);
+        listView.setAdapter(listAdapter);
+        listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                dismiss();
+                if (onClickListener != null) {
+                    onClickListener.onSheetClick(position);
+                }
+            }
+        });
+
+        TextView cancelButton = view.findViewById(R.id.cancel_button);
+        cancelButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dismiss();
+            }
+        });
+    }
+
+    public void dismiss() {
+        if (dialog != null && dialog.isShowing()) {
+            dialog.dismiss();
+        }
+    }
+
+    public void show() {
+        if (dialog != null && !dialog.isShowing()) {
+            listAdapter.notifyDataSetChanged();
+            dialog.show();
+        }
+    }
+
+    public void setSelectList(List<String> selectList) {
+        this.selectList.clear();
+        this.selectList.addAll(selectList);
+    }
+
+    public void setOnClickListener(BottomSelectSheetOnClickListener onClickListener) {
+        this.onClickListener = onClickListener;
+    }
+
+    public interface BottomSelectSheetOnClickListener {
+        void onSheetClick(int index);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/noticelayout/INoticeLayout.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/noticelayout/INoticeLayout.java
new file mode 100644
index 0000000..72a6cb9
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/noticelayout/INoticeLayout.java
@@ -0,0 +1,65 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.noticelayout;
+
+import android.view.View;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+/**
+ * 通知区域 {@link com.tencent.qcloud.tuikit.tuichat.minimalistui.component.noticelayout.NoticeLayout} 位置固定，只能显示或隐藏，位置不会随聊天内容的滚动而变化，可以用来展示<br>
+ * 待处理的群消息，或者一些广播等。该区域分为两部分，可以用来展示内容主题以及辅助主题。可以设置点击事件来<br>
+ * 响应用户操作。
+ * 
+ * The notification area {@link com.tencent.qcloud.tuikit.tuichat.minimalistui.component.noticelayout.NoticeLayout} has a fixed position and can only be displayed or hidden.
+ * The position will not change with the scrolling of the chat content. It can be used to display pending
+ * group messages, or some broadcasts. This area is divided into two parts, which can be used to display 
+ * content topics and auxiliary topics. Click events can be set up in response to user actions.
+ */
+public interface INoticeLayout {
+
+    /**
+     * 获取父视图
+     *
+     * Get parent view
+     *
+     * @return
+     */
+    RelativeLayout getParentLayout();
+
+    /**
+     * 获取通知的主题信息 View
+     * 
+     * Get the subject information of the notification View
+     *
+     * @return
+     */
+    TextView getContent();
+
+
+    /**
+     * 获取通知的进一步操作 View
+     * 
+     * Get notifications for further actions View
+     *
+     * @return
+     */
+    TextView getContentExtra();
+
+    /**
+     * 设置通知的点击事件
+     * 
+     * Set the click event for the notification
+     *
+     * @param l
+     */
+    void setOnNoticeClickListener(View.OnClickListener l);
+
+    /**
+     * 设置通知区域是否一直显示
+     * 
+     * Set whether the notification area is always displayed
+     *
+     * @param show 一直显示为 true
+     */
+    void alwaysShow(boolean show);
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/noticelayout/NoticeLayout.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/noticelayout/NoticeLayout.java
new file mode 100644
index 0000000..4d8cbd9
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/noticelayout/NoticeLayout.java
@@ -0,0 +1,77 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.noticelayout;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+
+public class NoticeLayout extends RelativeLayout implements INoticeLayout {
+
+    private RelativeLayout mNoticeLayout;
+    private TextView mContentText;
+    private TextView mContentExtraText;
+    private boolean mAwaysShow;
+
+    public NoticeLayout(Context context) {
+        super(context);
+        init();
+    }
+
+    public NoticeLayout(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public NoticeLayout(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private void init() {
+        inflate(getContext(), R.layout.notice_layout, this);
+        mNoticeLayout = findViewById(R.id.notice_layout);
+        mContentText = findViewById(R.id.notice_content);
+        mContentExtraText = findViewById(R.id.notice_content_extra);
+    }
+
+    @Override
+    public RelativeLayout getParentLayout() {
+        return mNoticeLayout;
+    }
+
+    @Override
+    public TextView getContent() {
+        return mContentText;
+    }
+
+    @Override
+    public TextView getContentExtra() {
+        return mContentExtraText;
+    }
+
+    @Override
+    public void setOnNoticeClickListener(OnClickListener l) {
+        setOnClickListener(l);
+    }
+
+    @Override
+    public void setVisibility(int visibility) {
+        if (mAwaysShow) {
+            super.setVisibility(VISIBLE);
+        } else {
+            super.setVisibility(visibility);
+        }
+    }
+
+    @Override
+    public void alwaysShow(boolean show) {
+        mAwaysShow = show;
+        if (mAwaysShow) {
+            super.setVisibility(VISIBLE);
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/noticelayout/NoticeLayoutConfig.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/noticelayout/NoticeLayoutConfig.java
new file mode 100644
index 0000000..d8fd3f2
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/noticelayout/NoticeLayoutConfig.java
@@ -0,0 +1,25 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.noticelayout;
+
+import android.view.ViewGroup;
+
+public class NoticeLayoutConfig {
+    private ViewGroup mCustomNoticeLayout = null;
+
+    /**
+     * 获取聊天界面自定义视图
+     *
+     * Get a custom view of the chat interface
+     */
+    public ViewGroup getCustomNoticeLayout() {
+        return mCustomNoticeLayout;
+    }
+
+    /**
+     * 设置聊天界面自定义视图
+     *
+     * Set a custom view of the chat interface
+     */
+    public void setCustomNoticeLayout(ViewGroup mCustomNoticeLayout) {
+        this.mCustomNoticeLayout = mCustomNoticeLayout;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/listener/OnGestureListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/listener/OnGestureListener.java
new file mode 100644
index 0000000..e08956f
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/listener/OnGestureListener.java
@@ -0,0 +1,27 @@
+/*
+ Copyright 2011, 2012 Chris Banes.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.listener;
+
+public interface OnGestureListener {
+
+    void onDrag(float dx, float dy);
+
+    void onFling(float startX, float startY, float velocityX,
+                 float velocityY);
+
+    void onScale(float scaleFactor, float focusX, float focusY);
+
+}
\ No newline at end of file
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/listener/OnMatrixChangedListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/listener/OnMatrixChangedListener.java
new file mode 100644
index 0000000..ab073ef
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/listener/OnMatrixChangedListener.java
@@ -0,0 +1,18 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.listener;
+
+import android.graphics.RectF;
+
+/**
+ * Interface definition for a callback to be invoked when the internal Matrix has changed for
+ * this View.
+ */
+public interface OnMatrixChangedListener {
+
+    /**
+     * Callback for when the Matrix displaying the Drawable has changed. This could be because
+     * the View's bounds have changed, or the user has zoomed.
+     *
+     * @param rect - Rectangle displaying the Drawable's new bounds.
+     */
+    void onMatrixChanged(RectF rect);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/listener/OnOutsidePhotoTapListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/listener/OnOutsidePhotoTapListener.java
new file mode 100644
index 0000000..bd8c027
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/listener/OnOutsidePhotoTapListener.java
@@ -0,0 +1,14 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.listener;
+
+import android.widget.ImageView;
+
+/**
+ * Callback when the user tapped outside of the photo
+ */
+public interface OnOutsidePhotoTapListener {
+
+    /**
+     * The outside of the photo has been tapped
+     */
+    void onOutsidePhotoTap(ImageView imageView);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/listener/OnPhotoTapListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/listener/OnPhotoTapListener.java
new file mode 100644
index 0000000..8b231fa
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/listener/OnPhotoTapListener.java
@@ -0,0 +1,22 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.listener;
+
+import android.widget.ImageView;
+
+/**
+ * A callback to be invoked when the Photo is tapped with a single
+ * tap.
+ */
+public interface OnPhotoTapListener {
+
+    /**
+     * A callback to receive where the user taps on a photo. You will only receive a callback if
+     * the user taps on the actual photo, tapping on 'whitespace' will be ignored.
+     *
+     * @param view ImageView the user tapped.
+     * @param x    where the user tapped from the of the Drawable, as percentage of the
+     *             Drawable width.
+     * @param y    where the user tapped from the top of the Drawable, as percentage of the
+     *             Drawable height.
+     */
+    void onPhotoTap(ImageView view, float x, float y);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/listener/OnScaleChangedListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/listener/OnScaleChangedListener.java
new file mode 100644
index 0000000..d1e6db4
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/listener/OnScaleChangedListener.java
@@ -0,0 +1,17 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.listener;
+
+
+/**
+ * Interface definition for callback to be invoked when attached ImageView scale changes
+ */
+public interface OnScaleChangedListener {
+
+    /**
+     * Callback for when the scale changes
+     *
+     * @param scaleFactor the scale factor (less than 1 for zoom out, greater than 1 for zoom in)
+     * @param focusX      focal point X position
+     * @param focusY      focal point Y position
+     */
+    void onScaleChange(float scaleFactor, float focusX, float focusY);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/listener/OnSingleFlingListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/listener/OnSingleFlingListener.java
new file mode 100644
index 0000000..72385c5
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/listener/OnSingleFlingListener.java
@@ -0,0 +1,21 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.listener;
+
+import android.view.MotionEvent;
+
+/**
+ * A callback to be invoked when the ImageView is flung with a single
+ * touch
+ */
+public interface OnSingleFlingListener {
+
+    /**
+     * A callback to receive where the user flings on a ImageView. You will receive a callback if
+     * the user flings anywhere on the view.
+     *
+     * @param e1        MotionEvent the user first touch.
+     * @param e2        MotionEvent the user last touch.
+     * @param velocityX distance of user's horizontal fling.
+     * @param velocityY distance of user's vertical fling.
+     */
+    boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/listener/OnViewDragListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/listener/OnViewDragListener.java
new file mode 100644
index 0000000..695586c
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/listener/OnViewDragListener.java
@@ -0,0 +1,16 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.listener;
+
+/**
+ * Interface definition for a callback to be invoked when the photo is experiencing a drag event
+ */
+public interface OnViewDragListener {
+
+    /**
+     * Callback for when the photo is experiencing a drag event. This cannot be invoked when the
+     * user is scaling.
+     *
+     * @param dx The change of the coordinates in the x-direction
+     * @param dy The change of the coordinates in the y-direction
+     */
+    void onDrag(float dx, float dy);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/listener/OnViewTapListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/listener/OnViewTapListener.java
new file mode 100644
index 0000000..c37376c
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/listener/OnViewTapListener.java
@@ -0,0 +1,16 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.listener;
+
+import android.view.View;
+
+public interface OnViewTapListener {
+
+    /**
+     * A callback to receive where the user taps on a ImageView. You will receive a callback if
+     * the user taps anywhere on the view, tapping on 'whitespace' will not be ignored.
+     *
+     * @param view - View the user tapped.
+     * @param x    - where the user tapped from the left of the View.
+     * @param y    - where the user tapped from the top of the View.
+     */
+    void onViewTap(View view, float x, float y);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/view/Compat.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/view/Compat.java
new file mode 100644
index 0000000..1d61992
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/view/Compat.java
@@ -0,0 +1,24 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.view;
+
+import android.annotation.TargetApi;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.view.View;
+
+class Compat {
+
+    private static final int SIXTY_FPS_INTERVAL = 1000 / 60;
+
+    public static void postOnAnimation(View view, Runnable runnable) {
+        if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN) {
+            postOnAnimationJellyBean(view, runnable);
+        } else {
+            view.postDelayed(runnable, SIXTY_FPS_INTERVAL);
+        }
+    }
+
+    @TargetApi(16)
+    private static void postOnAnimationJellyBean(View view, Runnable runnable) {
+        view.postOnAnimation(runnable);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/view/CustomGestureDetector.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/view/CustomGestureDetector.java
new file mode 100644
index 0000000..36575ea
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/view/CustomGestureDetector.java
@@ -0,0 +1,188 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.view;
+
+import android.content.Context;
+import android.view.MotionEvent;
+import android.view.ScaleGestureDetector;
+import android.view.VelocityTracker;
+import android.view.ViewConfiguration;
+
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.listener.OnGestureListener;
+
+/**
+ * Does a whole lot of gesture detecting.
+ */
+class CustomGestureDetector {
+
+    private static final int INVALID_POINTER_ID = -1;
+    private final ScaleGestureDetector mDetector;
+    private final float mTouchSlop;
+    private final float mMinimumVelocity;
+    private int mActivePointerId = INVALID_POINTER_ID;
+    private int mActivePointerIndex = 0;
+    private VelocityTracker mVelocityTracker;
+    private boolean mIsDragging;
+    private float mLastTouchX;
+    private float mLastTouchY;
+    private OnGestureListener mListener;
+
+    CustomGestureDetector(Context context, OnGestureListener listener) {
+        final ViewConfiguration configuration = ViewConfiguration
+                .get(context);
+        mMinimumVelocity = configuration.getScaledMinimumFlingVelocity();
+        mTouchSlop = configuration.getScaledTouchSlop();
+
+        mListener = listener;
+        ScaleGestureDetector.OnScaleGestureListener mScaleListener = new ScaleGestureDetector.OnScaleGestureListener() {
+
+            @Override
+            public boolean onScale(ScaleGestureDetector detector) {
+                float scaleFactor = detector.getScaleFactor();
+
+                if (Float.isNaN(scaleFactor) || Float.isInfinite(scaleFactor))
+                    return false;
+
+                mListener.onScale(scaleFactor,
+                        detector.getFocusX(), detector.getFocusY());
+                return true;
+            }
+
+            @Override
+            public boolean onScaleBegin(ScaleGestureDetector detector) {
+                return true;
+            }
+
+            @Override
+            public void onScaleEnd(ScaleGestureDetector detector) {
+                // NO-OP
+            }
+        };
+        mDetector = new ScaleGestureDetector(context, mScaleListener);
+    }
+
+    private float getActiveX(MotionEvent ev) {
+        try {
+            return ev.getX(mActivePointerIndex);
+        } catch (Exception e) {
+            return ev.getX();
+        }
+    }
+
+    private float getActiveY(MotionEvent ev) {
+        try {
+            return ev.getY(mActivePointerIndex);
+        } catch (Exception e) {
+            return ev.getY();
+        }
+    }
+
+    public boolean isScaling() {
+        return mDetector.isInProgress();
+    }
+
+    public boolean isDragging() {
+        return mIsDragging;
+    }
+
+    public boolean onTouchEvent(MotionEvent ev) {
+        try {
+            mDetector.onTouchEvent(ev);
+            return processTouchEvent(ev);
+        } catch (IllegalArgumentException e) {
+            // Fix for support lib bug, happening when onDestroy is called
+            return true;
+        }
+    }
+
+    private boolean processTouchEvent(MotionEvent ev) {
+        final int action = ev.getAction();
+        switch (action & MotionEvent.ACTION_MASK) {
+            case MotionEvent.ACTION_DOWN:
+                mActivePointerId = ev.getPointerId(0);
+
+                mVelocityTracker = VelocityTracker.obtain();
+                if (null != mVelocityTracker) {
+                    mVelocityTracker.addMovement(ev);
+                }
+
+                mLastTouchX = getActiveX(ev);
+                mLastTouchY = getActiveY(ev);
+                mIsDragging = false;
+                break;
+            case MotionEvent.ACTION_MOVE:
+                final float x = getActiveX(ev);
+                final float y = getActiveY(ev);
+                final float dx = x - mLastTouchX, dy = y - mLastTouchY;
+
+                if (!mIsDragging) {
+                    // Use Pythagoras to see if drag length is larger than
+                    // touch slop
+                    mIsDragging = Math.sqrt((dx * dx) + (dy * dy)) >= mTouchSlop;
+                }
+
+                if (mIsDragging) {
+                    mListener.onDrag(dx, dy);
+                    mLastTouchX = x;
+                    mLastTouchY = y;
+
+                    if (null != mVelocityTracker) {
+                        mVelocityTracker.addMovement(ev);
+                    }
+                }
+                break;
+            case MotionEvent.ACTION_CANCEL:
+                mActivePointerId = INVALID_POINTER_ID;
+                // Recycle Velocity Tracker
+                if (null != mVelocityTracker) {
+                    mVelocityTracker.recycle();
+                    mVelocityTracker = null;
+                }
+                break;
+            case MotionEvent.ACTION_UP:
+                mActivePointerId = INVALID_POINTER_ID;
+                if (mIsDragging) {
+                    if (null != mVelocityTracker) {
+                        mLastTouchX = getActiveX(ev);
+                        mLastTouchY = getActiveY(ev);
+
+                        // Compute velocity within the last 1000ms
+                        mVelocityTracker.addMovement(ev);
+                        mVelocityTracker.computeCurrentVelocity(1000);
+
+                        final float vX = mVelocityTracker.getXVelocity(), vY = mVelocityTracker
+                                .getYVelocity();
+
+                        // If the velocity is greater than minVelocity, call
+                        // listener
+                        if (Math.max(Math.abs(vX), Math.abs(vY)) >= mMinimumVelocity) {
+                            mListener.onFling(mLastTouchX, mLastTouchY, -vX,
+                                    -vY);
+                        }
+                    }
+                }
+
+                // Recycle Velocity Tracker
+                if (null != mVelocityTracker) {
+                    mVelocityTracker.recycle();
+                    mVelocityTracker = null;
+                }
+                break;
+            case MotionEvent.ACTION_POINTER_UP:
+                final int pointerIndex = PhotoViewUtil.getPointerIndex(ev.getAction());
+                final int pointerId = ev.getPointerId(pointerIndex);
+                if (pointerId == mActivePointerId) {
+                    // This was our active pointer going up. Choose a new
+                    // active pointer and adjust accordingly.
+                    final int newPointerIndex = pointerIndex == 0 ? 1 : 0;
+                    mActivePointerId = ev.getPointerId(newPointerIndex);
+                    mLastTouchX = ev.getX(newPointerIndex);
+                    mLastTouchY = ev.getY(newPointerIndex);
+                }
+                break;
+        }
+
+        mActivePointerIndex = ev
+                .findPointerIndex(mActivePointerId != INVALID_POINTER_ID ? mActivePointerId
+                        : 0);
+        return true;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/view/PhotoView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/view/PhotoView.java
new file mode 100644
index 0000000..2bf43d2
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/view/PhotoView.java
@@ -0,0 +1,249 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.view;
+
+import android.content.Context;
+import android.graphics.Matrix;
+import android.graphics.RectF;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.util.AttributeSet;
+import android.view.GestureDetector;
+
+import androidx.appcompat.widget.AppCompatImageView;
+
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.listener.OnMatrixChangedListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.listener.OnOutsidePhotoTapListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.listener.OnPhotoTapListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.listener.OnScaleChangedListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.listener.OnSingleFlingListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.listener.OnViewDragListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.listener.OnViewTapListener;
+
+/**
+ * A zoomable ImageView. See {@link com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.view.PhotoViewAttacher} for most of the details on how the zooming
+ * is accomplished
+ */
+public class PhotoView extends AppCompatImageView {
+
+    private PhotoViewAttacher attacher;
+    private ScaleType pendingScaleType;
+
+    public PhotoView(Context context) {
+        this(context, null);
+    }
+
+    public PhotoView(Context context, AttributeSet attr) {
+        this(context, attr, 0);
+    }
+
+    public PhotoView(Context context, AttributeSet attr, int defStyle) {
+        super(context, attr, defStyle);
+        init();
+    }
+
+    private void init() {
+        attacher = new PhotoViewAttacher(this);
+        //We always pose as a Matrix scale type, though we can change to another scale type
+        //via the attacher
+        super.setScaleType(ScaleType.MATRIX);
+        //apply the previously applied scale type
+        if (pendingScaleType != null) {
+            setScaleType(pendingScaleType);
+            pendingScaleType = null;
+        }
+    }
+
+    /**
+     * Get the current {@link com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.view.PhotoViewAttacher} for this view. Be wary of holding on to references
+     * to this attacher, as it has a reference to this view, which, if a reference is held in the
+     * wrong place, can cause memory leaks.
+     *
+     * @return the attacher.
+     */
+    public PhotoViewAttacher getAttacher() {
+        return attacher;
+    }
+
+    @Override
+    public ScaleType getScaleType() {
+        return attacher.getScaleType();
+    }
+
+    @Override
+    public void setScaleType(ScaleType scaleType) {
+        if (attacher == null) {
+            pendingScaleType = scaleType;
+        } else {
+            attacher.setScaleType(scaleType);
+        }
+    }
+
+    @Override
+    public Matrix getImageMatrix() {
+        return attacher.getImageMatrix();
+    }
+
+    @Override
+    public void setOnLongClickListener(OnLongClickListener l) {
+        attacher.setOnLongClickListener(l);
+    }
+
+    @Override
+    public void setOnClickListener(OnClickListener l) {
+        attacher.setOnClickListener(l);
+    }
+
+    @Override
+    public void setImageDrawable(Drawable drawable) {
+        super.setImageDrawable(drawable);
+        // setImageBitmap calls through to this method
+        if (attacher != null) {
+            attacher.update();
+        }
+    }
+
+    @Override
+    public void setImageResource(int resId) {
+        super.setImageResource(resId);
+        if (attacher != null) {
+            attacher.update();
+        }
+    }
+
+    @Override
+    public void setImageURI(Uri uri) {
+        super.setImageURI(uri);
+        if (attacher != null) {
+            attacher.update();
+        }
+    }
+
+    @Override
+    protected boolean setFrame(int l, int t, int r, int b) {
+        boolean changed = super.setFrame(l, t, r, b);
+        if (changed) {
+            attacher.update();
+        }
+        return changed;
+    }
+
+    public void setRotationTo(float rotationDegree) {
+        attacher.setRotationTo(rotationDegree);
+    }
+
+    public void setRotationBy(float rotationDegree) {
+        attacher.setRotationBy(rotationDegree);
+    }
+
+    public boolean isZoomable() {
+        return attacher.isZoomable();
+    }
+
+    public void setZoomable(boolean zoomable) {
+        attacher.setZoomable(zoomable);
+    }
+
+    public RectF getDisplayRect() {
+        return attacher.getDisplayRect();
+    }
+
+    public void getDisplayMatrix(Matrix matrix) {
+        attacher.getDisplayMatrix(matrix);
+    }
+
+    @SuppressWarnings("UnusedReturnValue")
+    public boolean setDisplayMatrix(Matrix finalRectangle) {
+        return attacher.setDisplayMatrix(finalRectangle);
+    }
+
+    public void getSuppMatrix(Matrix matrix) {
+        attacher.getSuppMatrix(matrix);
+    }
+
+    public boolean setSuppMatrix(Matrix matrix) {
+        return attacher.setDisplayMatrix(matrix);
+    }
+
+    public float getMinimumScale() {
+        return attacher.getMinimumScale();
+    }
+
+    public void setMinimumScale(float minimumScale) {
+        attacher.setMinimumScale(minimumScale);
+    }
+
+    public float getMediumScale() {
+        return attacher.getMediumScale();
+    }
+
+    public void setMediumScale(float mediumScale) {
+        attacher.setMediumScale(mediumScale);
+    }
+
+    public float getMaximumScale() {
+        return attacher.getMaximumScale();
+    }
+
+    public void setMaximumScale(float maximumScale) {
+        attacher.setMaximumScale(maximumScale);
+    }
+
+    public float getScale() {
+        return attacher.getScale();
+    }
+
+    public void setScale(float scale) {
+        attacher.setScale(scale);
+    }
+
+    public void setAllowParentInterceptOnEdge(boolean allow) {
+        attacher.setAllowParentInterceptOnEdge(allow);
+    }
+
+    public void setScaleLevels(float minimumScale, float mediumScale, float maximumScale) {
+        attacher.setScaleLevels(minimumScale, mediumScale, maximumScale);
+    }
+
+    public void setOnMatrixChangeListener(OnMatrixChangedListener listener) {
+        attacher.setOnMatrixChangeListener(listener);
+    }
+
+    public void setOnPhotoTapListener(OnPhotoTapListener listener) {
+        attacher.setOnPhotoTapListener(listener);
+    }
+
+    public void setOnOutsidePhotoTapListener(OnOutsidePhotoTapListener listener) {
+        attacher.setOnOutsidePhotoTapListener(listener);
+    }
+
+    public void setOnViewTapListener(OnViewTapListener listener) {
+        attacher.setOnViewTapListener(listener);
+    }
+
+    public void setOnViewDragListener(OnViewDragListener listener) {
+        attacher.setOnViewDragListener(listener);
+    }
+
+    public void setScale(float scale, boolean animate) {
+        attacher.setScale(scale, animate);
+    }
+
+    public void setScale(float scale, float focalX, float focalY, boolean animate) {
+        attacher.setScale(scale, focalX, focalY, animate);
+    }
+
+    public void setZoomTransitionDuration(int milliseconds) {
+        attacher.setZoomTransitionDuration(milliseconds);
+    }
+
+    public void setOnDoubleTapListener(GestureDetector.OnDoubleTapListener onDoubleTapListener) {
+        attacher.setOnDoubleTapListener(onDoubleTapListener);
+    }
+
+    public void setOnScaleChangeListener(OnScaleChangedListener onScaleChangedListener) {
+        attacher.setOnScaleChangeListener(onScaleChangedListener);
+    }
+
+    public void setOnSingleFlingListener(OnSingleFlingListener onSingleFlingListener) {
+        attacher.setOnSingleFlingListener(onSingleFlingListener);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/view/PhotoViewAttacher.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/view/PhotoViewAttacher.java
new file mode 100644
index 0000000..04f12b3
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/view/PhotoViewAttacher.java
@@ -0,0 +1,793 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.view;
+
+import android.content.Context;
+import android.graphics.Matrix;
+import android.graphics.Matrix.ScaleToFit;
+import android.graphics.RectF;
+import android.graphics.drawable.Drawable;
+import android.view.GestureDetector;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.OnLongClickListener;
+import android.view.ViewParent;
+import android.view.animation.AccelerateDecelerateInterpolator;
+import android.view.animation.Interpolator;
+import android.widget.ImageView;
+import android.widget.ImageView.ScaleType;
+import android.widget.OverScroller;
+
+import com.tencent.qcloud.tuicore.util.BackgroundTasks;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.listener.OnGestureListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.listener.OnMatrixChangedListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.listener.OnOutsidePhotoTapListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.listener.OnPhotoTapListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.listener.OnScaleChangedListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.listener.OnSingleFlingListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.listener.OnViewDragListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.listener.OnViewTapListener;
+
+/**
+ * The component of {@link PhotoView} which does the work allowing for zooming, scaling, panning, etc.
+ * It is made public in case you need to subclass something other than AppCompatImageView and still
+ * gain the functionality that {@link PhotoView} offers
+ */
+public class PhotoViewAttacher implements View.OnTouchListener,
+        View.OnLayoutChangeListener {
+
+    private static final int EDGE_NONE = -1;
+    private static final int EDGE_LEFT = 0;
+    private static final int EDGE_RIGHT = 1;
+    private static final int EDGE_BOTH = 2;
+    private static float DEFAULT_MAX_SCALE = 3.0f;
+    private static float DEFAULT_MID_SCALE = 1.75f;
+    private static float DEFAULT_MIN_SCALE = 1.0f;
+    private static int DEFAULT_ZOOM_DURATION = 200;
+    private static int SINGLE_TOUCH = 1;
+    // These are set so we don't keep allocating them on the heap
+    private final Matrix mBaseMatrix = new Matrix();
+    private final Matrix mDrawMatrix = new Matrix();
+    private final Matrix mSuppMatrix = new Matrix();
+    private final RectF mDisplayRect = new RectF();
+    private final float[] mMatrixValues = new float[9];
+    private Interpolator mInterpolator = new AccelerateDecelerateInterpolator();
+    private int mZoomDuration = DEFAULT_ZOOM_DURATION;
+    private float mMinScale = DEFAULT_MIN_SCALE;
+    private float mMidScale = DEFAULT_MID_SCALE;
+    private float mMaxScale = DEFAULT_MAX_SCALE;
+    private boolean mAllowParentInterceptOnEdge = true;
+    private boolean mBlockParentIntercept = false;
+    private ImageView mImageView;
+    // Gesture Detectors
+    private GestureDetector mGestureDetector;
+    private CustomGestureDetector mScaleDragDetector;
+    // Listeners
+    private OnMatrixChangedListener mMatrixChangeListener;
+    private OnPhotoTapListener mPhotoTapListener;
+    private OnOutsidePhotoTapListener mOutsidePhotoTapListener;
+    private OnViewTapListener mViewTapListener;
+    private View.OnClickListener mOnClickListener;
+    private OnLongClickListener mLongClickListener;
+    private OnScaleChangedListener mScaleChangeListener;
+    private OnSingleFlingListener mSingleFlingListener;
+    private OnViewDragListener mOnViewDragListener;
+
+    private FlingRunnable mCurrentFlingRunnable;
+    private int mScrollEdge = EDGE_BOTH;
+    private float mBaseRotation;
+
+    private boolean mZoomEnabled = true;
+    private ScaleType mScaleType = ScaleType.FIT_CENTER;
+
+    private OnGestureListener onGestureListener = new OnGestureListener() {
+        @Override
+        public void onDrag(float dx, float dy) {
+            if (mScaleDragDetector.isScaling()) {
+                return; // Do not drag if we are already scaling
+            }
+            if (mOnViewDragListener != null) {
+                mOnViewDragListener.onDrag(dx, dy);
+            }
+            mSuppMatrix.postTranslate(dx, dy);
+            checkAndDisplayMatrix();
+
+            /*
+             * Here we decide whether to let the ImageView's parent to start taking
+             * over the touch event.
+             *
+             * First we check whether this function is enabled. We never want the
+             * parent to take over if we're scaling. We then check the edge we're
+             * on, and the direction of the scroll (i.e. if we're pulling against
+             * the edge, aka 'overscrolling', let the parent take over).
+             */
+            ViewParent parent = mImageView.getParent();
+            if (mAllowParentInterceptOnEdge && !mScaleDragDetector.isScaling() && !mBlockParentIntercept) {
+                if (mScrollEdge == EDGE_BOTH
+                        || (mScrollEdge == EDGE_LEFT && dx >= 1f)
+                        || (mScrollEdge == EDGE_RIGHT && dx <= -1f)) {
+                    if (parent != null) {
+                        parent.requestDisallowInterceptTouchEvent(false);
+                    }
+                }
+            } else {
+                if (parent != null) {
+                    parent.requestDisallowInterceptTouchEvent(true);
+                }
+            }
+        }
+
+        @Override
+        public void onFling(float startX, float startY, float velocityX, float velocityY) {
+            mCurrentFlingRunnable = new FlingRunnable(mImageView.getContext());
+            mCurrentFlingRunnable.fling(getImageViewWidth(mImageView),
+                    getImageViewHeight(mImageView), (int) velocityX, (int) velocityY);
+            BackgroundTasks.getInstance().runOnUiThread(mCurrentFlingRunnable);
+        }
+
+        @Override
+        public void onScale(float scaleFactor, float focusX, float focusY) {
+            if ((getScale() < mMaxScale || scaleFactor < 1f) && (getScale() > mMinScale || scaleFactor > 1f)) {
+                if (mScaleChangeListener != null) {
+                    mScaleChangeListener.onScaleChange(scaleFactor, focusX, focusY);
+                }
+                mSuppMatrix.postScale(scaleFactor, scaleFactor, focusX, focusY);
+                checkAndDisplayMatrix();
+            }
+        }
+    };
+
+    public PhotoViewAttacher(ImageView imageView) {
+        mImageView = imageView;
+        imageView.setOnTouchListener(this);
+        imageView.addOnLayoutChangeListener(this);
+        if (imageView.isInEditMode()) {
+            return;
+        }
+        mBaseRotation = 0.0f;
+        // Create Gesture Detectors...
+        mScaleDragDetector = new CustomGestureDetector(imageView.getContext(), onGestureListener);
+        mGestureDetector = new GestureDetector(imageView.getContext(), new GestureDetector.SimpleOnGestureListener() {
+
+            // forward long click listener
+            @Override
+            public void onLongPress(MotionEvent e) {
+                if (mLongClickListener != null) {
+                    mLongClickListener.onLongClick(mImageView);
+                }
+            }
+
+            @Override
+            public boolean onFling(MotionEvent e1, MotionEvent e2,
+                                   float velocityX, float velocityY) {
+                if (mSingleFlingListener != null) {
+                    if (getScale() > DEFAULT_MIN_SCALE) {
+                        return false;
+                    }
+                    if (e1.getPointerCount() > SINGLE_TOUCH
+                            || e2.getPointerCount() > SINGLE_TOUCH) {
+                        return false;
+                    }
+                    return mSingleFlingListener.onFling(e1, e2, velocityX, velocityY);
+                }
+                return false;
+            }
+        });
+        mGestureDetector.setOnDoubleTapListener(new GestureDetector.OnDoubleTapListener() {
+            @Override
+            public boolean onSingleTapConfirmed(MotionEvent e) {
+                if (mOnClickListener != null) {
+                    mOnClickListener.onClick(mImageView);
+                }
+                final RectF displayRect = getDisplayRect();
+                final float x = e.getX(), y = e.getY();
+                if (mViewTapListener != null) {
+                    mViewTapListener.onViewTap(mImageView, x, y);
+                }
+                if (displayRect != null) {
+                    // Check to see if the user tapped on the photo
+                    if (displayRect.contains(x, y)) {
+                        float xResult = (x - displayRect.left)
+                                / displayRect.width();
+                        float yResult = (y - displayRect.top)
+                                / displayRect.height();
+                        if (mPhotoTapListener != null) {
+                            mPhotoTapListener.onPhotoTap(mImageView, xResult, yResult);
+                        }
+                        return true;
+                    } else {
+                        if (mOutsidePhotoTapListener != null) {
+                            mOutsidePhotoTapListener.onOutsidePhotoTap(mImageView);
+                        }
+                    }
+                }
+                return false;
+            }
+
+            @Override
+            public boolean onDoubleTap(MotionEvent ev) {
+                try {
+                    float scale = getScale();
+                    float x = ev.getX();
+                    float y = ev.getY();
+                    if (scale < getMediumScale()) {
+                        setScale(getMediumScale(), x, y, true);
+                    } else if (scale >= getMediumScale() && scale < getMaximumScale()) {
+                        setScale(getMaximumScale(), x, y, true);
+                    } else {
+                        setScale(getMinimumScale(), x, y, true);
+                    }
+                } catch (ArrayIndexOutOfBoundsException e) {
+                    // Can sometimes happen when getX() and getY() is called
+                }
+                return true;
+            }
+
+            @Override
+            public boolean onDoubleTapEvent(MotionEvent e) {
+                // Wait for the confirmed onDoubleTap() instead
+                return false;
+            }
+        });
+    }
+
+    public void setOnDoubleTapListener(GestureDetector.OnDoubleTapListener newOnDoubleTapListener) {
+        this.mGestureDetector.setOnDoubleTapListener(newOnDoubleTapListener);
+    }
+
+    public void setOnScaleChangeListener(OnScaleChangedListener onScaleChangeListener) {
+        this.mScaleChangeListener = onScaleChangeListener;
+    }
+
+    public void setOnSingleFlingListener(OnSingleFlingListener onSingleFlingListener) {
+        this.mSingleFlingListener = onSingleFlingListener;
+    }
+
+    @Deprecated
+    public boolean isZoomEnabled() {
+        return mZoomEnabled;
+    }
+
+    public RectF getDisplayRect() {
+        checkMatrixBounds();
+        return getDisplayRect(getDrawMatrix());
+    }
+
+    public boolean setDisplayMatrix(Matrix finalMatrix) {
+        if (finalMatrix == null) {
+            throw new IllegalArgumentException("Matrix cannot be null");
+        }
+        if (mImageView.getDrawable() == null) {
+            return false;
+        }
+        mSuppMatrix.set(finalMatrix);
+        checkAndDisplayMatrix();
+        return true;
+    }
+
+    public void setBaseRotation(final float degrees) {
+        mBaseRotation = degrees % 360;
+        update();
+        setRotationBy(mBaseRotation);
+        checkAndDisplayMatrix();
+    }
+
+    public void setRotationTo(float degrees) {
+        mSuppMatrix.setRotate(degrees % 360);
+        checkAndDisplayMatrix();
+    }
+
+    public void setRotationBy(float degrees) {
+        mSuppMatrix.postRotate(degrees % 360);
+        checkAndDisplayMatrix();
+    }
+
+    public float getMinimumScale() {
+        return mMinScale;
+    }
+
+    public void setMinimumScale(float minimumScale) {
+        PhotoViewUtil.checkZoomLevels(minimumScale, mMidScale, mMaxScale);
+        mMinScale = minimumScale;
+    }
+
+    public float getMediumScale() {
+        return mMidScale;
+    }
+
+    public void setMediumScale(float mediumScale) {
+        PhotoViewUtil.checkZoomLevels(mMinScale, mediumScale, mMaxScale);
+        mMidScale = mediumScale;
+    }
+
+    public float getMaximumScale() {
+        return mMaxScale;
+    }
+
+    public void setMaximumScale(float maximumScale) {
+        PhotoViewUtil.checkZoomLevels(mMinScale, mMidScale, maximumScale);
+        mMaxScale = maximumScale;
+    }
+
+    public float getScale() {
+        return (float) Math.sqrt((float) Math.pow(getValue(mSuppMatrix, Matrix.MSCALE_X), 2) + (float) Math.pow
+                (getValue(mSuppMatrix, Matrix.MSKEW_Y), 2));
+    }
+
+    public void setScale(float scale) {
+        setScale(scale, false);
+    }
+
+    public ScaleType getScaleType() {
+        return mScaleType;
+    }
+
+    public void setScaleType(ScaleType scaleType) {
+        if (PhotoViewUtil.isSupportedScaleType(scaleType) && scaleType != mScaleType) {
+            mScaleType = scaleType;
+            update();
+        }
+    }
+
+    @Override
+    public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int
+            oldRight, int oldBottom) {
+        // Update our base matrix, as the bounds have changed
+        if (left != oldLeft || top != oldTop || right != oldRight || bottom != oldBottom) {
+            updateBaseMatrix(mImageView.getDrawable());
+        }
+    }
+
+    @Override
+    public boolean onTouch(View v, MotionEvent ev) {
+        boolean handled = false;
+        if (mZoomEnabled && PhotoViewUtil.hasDrawable((ImageView) v)) {
+            switch (ev.getAction()) {
+                case MotionEvent.ACTION_DOWN:
+                    ViewParent parent = v.getParent();
+                    // First, disable the Parent from intercepting the touch
+                    // event
+                    if (parent != null) {
+                        parent.requestDisallowInterceptTouchEvent(true);
+                    }
+                    // If we're flinging, and the user presses down, cancel
+                    // fling
+                    cancelFling();
+                    break;
+                case MotionEvent.ACTION_CANCEL:
+                case MotionEvent.ACTION_UP:
+                    // If the user has zoomed less than min scale, zoom back
+                    // to min scale
+                    if (getScale() < mMinScale) {
+                        RectF rect = getDisplayRect();
+                        if (rect != null) {
+                            v.post(new AnimatedZoomRunnable(getScale(), mMinScale,
+                                    rect.centerX(), rect.centerY()));
+                            handled = true;
+                        }
+                    } else if (getScale() > mMaxScale) {
+                        RectF rect = getDisplayRect();
+                        if (rect != null) {
+                            v.post(new AnimatedZoomRunnable(getScale(), mMaxScale,
+                                    rect.centerX(), rect.centerY()));
+                            handled = true;
+                        }
+                    }
+                    break;
+            }
+            // Try the Scale/Drag detector
+            if (mScaleDragDetector != null) {
+                boolean wasScaling = mScaleDragDetector.isScaling();
+                boolean wasDragging = mScaleDragDetector.isDragging();
+                handled = mScaleDragDetector.onTouchEvent(ev);
+                boolean didntScale = !wasScaling && !mScaleDragDetector.isScaling();
+                boolean didntDrag = !wasDragging && !mScaleDragDetector.isDragging();
+                mBlockParentIntercept = didntScale && didntDrag;
+            }
+            // Check to see if the user double tapped
+            if (mGestureDetector != null && mGestureDetector.onTouchEvent(ev)) {
+                handled = true;
+            }
+
+        }
+        return handled;
+    }
+
+    public void setAllowParentInterceptOnEdge(boolean allow) {
+        mAllowParentInterceptOnEdge = allow;
+    }
+
+    public void setScaleLevels(float minimumScale, float mediumScale, float maximumScale) {
+        PhotoViewUtil.checkZoomLevels(minimumScale, mediumScale, maximumScale);
+        mMinScale = minimumScale;
+        mMidScale = mediumScale;
+        mMaxScale = maximumScale;
+    }
+
+    public void setOnLongClickListener(OnLongClickListener listener) {
+        mLongClickListener = listener;
+    }
+
+    public void setOnClickListener(View.OnClickListener listener) {
+        mOnClickListener = listener;
+    }
+
+    public void setOnMatrixChangeListener(OnMatrixChangedListener listener) {
+        mMatrixChangeListener = listener;
+    }
+
+    public void setOnPhotoTapListener(OnPhotoTapListener listener) {
+        mPhotoTapListener = listener;
+    }
+
+    public void setOnOutsidePhotoTapListener(OnOutsidePhotoTapListener mOutsidePhotoTapListener) {
+        this.mOutsidePhotoTapListener = mOutsidePhotoTapListener;
+    }
+
+    public void setOnViewTapListener(OnViewTapListener listener) {
+        mViewTapListener = listener;
+    }
+
+    public void setOnViewDragListener(OnViewDragListener listener) {
+        mOnViewDragListener = listener;
+    }
+
+    public void setScale(float scale, boolean animate) {
+        setScale(scale,
+                (mImageView.getRight()) / 2,
+                (mImageView.getBottom()) / 2,
+                animate);
+    }
+
+    public void setScale(float scale, float focalX, float focalY,
+                         boolean animate) {
+        // Check to see if the scale is within bounds
+        if (scale < mMinScale || scale > mMaxScale) {
+            throw new IllegalArgumentException("Scale must be within the range of minScale and maxScale");
+        }
+        if (animate) {
+            BackgroundTasks.getInstance().runOnUiThread(new AnimatedZoomRunnable(getScale(), scale,
+                    focalX, focalY));
+        } else {
+            mSuppMatrix.setScale(scale, scale, focalX, focalY);
+            checkAndDisplayMatrix();
+        }
+    }
+
+    /**
+     * Set the zoom interpolator
+     *
+     * @param interpolator the zoom interpolator
+     */
+    public void setZoomInterpolator(Interpolator interpolator) {
+        mInterpolator = interpolator;
+    }
+
+    public boolean isZoomable() {
+        return mZoomEnabled;
+    }
+
+    public void setZoomable(boolean zoomable) {
+        mZoomEnabled = zoomable;
+        update();
+    }
+
+    public void update() {
+        if (mZoomEnabled) {
+            // Update the base matrix using the current drawable
+            updateBaseMatrix(mImageView.getDrawable());
+        } else {
+            // Reset the Matrix...
+            resetMatrix();
+        }
+    }
+
+    /**
+     * Get the display matrix
+     *
+     * @param matrix target matrix to copy to
+     */
+    public void getDisplayMatrix(Matrix matrix) {
+        matrix.set(getDrawMatrix());
+    }
+
+    /**
+     * Get the current support matrix
+     */
+    public void getSuppMatrix(Matrix matrix) {
+        matrix.set(mSuppMatrix);
+    }
+
+    private Matrix getDrawMatrix() {
+        mDrawMatrix.set(mBaseMatrix);
+        mDrawMatrix.postConcat(mSuppMatrix);
+        return mDrawMatrix;
+    }
+
+    public Matrix getImageMatrix() {
+        return mDrawMatrix;
+    }
+
+    public void setZoomTransitionDuration(int milliseconds) {
+        this.mZoomDuration = milliseconds;
+    }
+
+    /**
+     * Helper method that 'unpacks' a Matrix and returns the required value
+     *
+     * @param matrix     Matrix to unpack
+     * @param whichValue Which value from Matrix.M* to return
+     * @return returned value
+     */
+    private float getValue(Matrix matrix, int whichValue) {
+        matrix.getValues(mMatrixValues);
+        return mMatrixValues[whichValue];
+    }
+
+    /**
+     * Resets the Matrix back to FIT_CENTER, and then displays its contents
+     */
+    private void resetMatrix() {
+        mSuppMatrix.reset();
+        setRotationBy(mBaseRotation);
+        setImageViewMatrix(getDrawMatrix());
+        checkMatrixBounds();
+    }
+
+    private void setImageViewMatrix(Matrix matrix) {
+        mImageView.setImageMatrix(matrix);
+        // Call MatrixChangedListener if needed
+        if (mMatrixChangeListener != null) {
+            RectF displayRect = getDisplayRect(matrix);
+            if (displayRect != null) {
+                mMatrixChangeListener.onMatrixChanged(displayRect);
+            }
+        }
+    }
+
+    /**
+     * Helper method that simply checks the Matrix, and then displays the result
+     */
+    private void checkAndDisplayMatrix() {
+        if (checkMatrixBounds()) {
+            setImageViewMatrix(getDrawMatrix());
+        }
+    }
+
+    /**
+     * Helper method that maps the supplied Matrix to the current Drawable
+     *
+     * @param matrix - Matrix to map Drawable against
+     * @return RectF - Displayed Rectangle
+     */
+    private RectF getDisplayRect(Matrix matrix) {
+        Drawable d = mImageView.getDrawable();
+        if (d != null) {
+            mDisplayRect.set(0, 0, d.getIntrinsicWidth(),
+                    d.getIntrinsicHeight());
+            matrix.mapRect(mDisplayRect);
+            return mDisplayRect;
+        }
+        return null;
+    }
+
+    /**
+     * Calculate Matrix for FIT_CENTER
+     *
+     * @param drawable - Drawable being displayed
+     */
+    private void updateBaseMatrix(Drawable drawable) {
+        if (drawable == null) {
+            return;
+        }
+        final float viewWidth = getImageViewWidth(mImageView);
+        final float viewHeight = getImageViewHeight(mImageView);
+        final int drawableWidth = drawable.getIntrinsicWidth();
+        final int drawableHeight = drawable.getIntrinsicHeight();
+        mBaseMatrix.reset();
+        final float widthScale = viewWidth / drawableWidth;
+        final float heightScale = viewHeight / drawableHeight;
+        if (mScaleType == ScaleType.CENTER) {
+            mBaseMatrix.postTranslate((viewWidth - drawableWidth) / 2F,
+                    (viewHeight - drawableHeight) / 2F);
+
+        } else if (mScaleType == ScaleType.CENTER_CROP) {
+            float scale = Math.max(widthScale, heightScale);
+            mBaseMatrix.postScale(scale, scale);
+            mBaseMatrix.postTranslate((viewWidth - drawableWidth * scale) / 2F,
+                    (viewHeight - drawableHeight * scale) / 2F);
+
+        } else if (mScaleType == ScaleType.CENTER_INSIDE) {
+            float scale = Math.min(1.0f, Math.min(widthScale, heightScale));
+            mBaseMatrix.postScale(scale, scale);
+            mBaseMatrix.postTranslate((viewWidth - drawableWidth * scale) / 2F,
+                    (viewHeight - drawableHeight * scale) / 2F);
+
+        } else {
+            RectF mTempSrc = new RectF(0, 0, drawableWidth, drawableHeight);
+            RectF mTempDst = new RectF(0, 0, viewWidth, viewHeight);
+            if ((int) mBaseRotation % 180 != 0) {
+                mTempSrc = new RectF(0, 0, drawableHeight, drawableWidth);
+            }
+            switch (mScaleType) {
+                case FIT_CENTER:
+                    mBaseMatrix.setRectToRect(mTempSrc, mTempDst, ScaleToFit.CENTER);
+                    break;
+                case FIT_START:
+                    mBaseMatrix.setRectToRect(mTempSrc, mTempDst, ScaleToFit.START);
+                    break;
+                case FIT_END:
+                    mBaseMatrix.setRectToRect(mTempSrc, mTempDst, ScaleToFit.END);
+                    break;
+                case FIT_XY:
+                    mBaseMatrix.setRectToRect(mTempSrc, mTempDst, ScaleToFit.FILL);
+                    break;
+                default:
+                    break;
+            }
+        }
+        resetMatrix();
+    }
+
+    private boolean checkMatrixBounds() {
+        final RectF rect = getDisplayRect(getDrawMatrix());
+        if (rect == null) {
+            return false;
+        }
+        final float height = rect.height(), width = rect.width();
+        float deltaX = 0, deltaY = 0;
+        final int viewHeight = getImageViewHeight(mImageView);
+        if (height <= viewHeight) {
+            switch (mScaleType) {
+                case FIT_START:
+                    deltaY = -rect.top;
+                    break;
+                case FIT_END:
+                    deltaY = viewHeight - height - rect.top;
+                    break;
+                default:
+                    deltaY = (viewHeight - height) / 2 - rect.top;
+                    break;
+            }
+        } else if (rect.top > 0) {
+            deltaY = -rect.top;
+        } else if (rect.bottom < viewHeight) {
+            deltaY = viewHeight - rect.bottom;
+        }
+        final int viewWidth = getImageViewWidth(mImageView);
+        if (width <= viewWidth) {
+            switch (mScaleType) {
+                case FIT_START:
+                    deltaX = -rect.left;
+                    break;
+                case FIT_END:
+                    deltaX = viewWidth - width - rect.left;
+                    break;
+                default:
+                    deltaX = (viewWidth - width) / 2 - rect.left;
+                    break;
+            }
+            mScrollEdge = EDGE_BOTH;
+        } else if (rect.left > 0) {
+            mScrollEdge = EDGE_LEFT;
+            deltaX = -rect.left;
+        } else if (rect.right < viewWidth) {
+            deltaX = viewWidth - rect.right;
+            mScrollEdge = EDGE_RIGHT;
+        } else {
+            mScrollEdge = EDGE_NONE;
+        }
+        // Finally actually translate the matrix
+        mSuppMatrix.postTranslate(deltaX, deltaY);
+        return true;
+    }
+
+    private int getImageViewWidth(ImageView imageView) {
+        return imageView.getWidth() - imageView.getPaddingLeft() - imageView.getPaddingRight();
+    }
+
+    private int getImageViewHeight(ImageView imageView) {
+        return imageView.getHeight() - imageView.getPaddingTop() - imageView.getPaddingBottom();
+    }
+
+    private void cancelFling() {
+        if (mCurrentFlingRunnable != null) {
+            mCurrentFlingRunnable.cancelFling();
+            mCurrentFlingRunnable = null;
+        }
+    }
+
+    private class AnimatedZoomRunnable implements Runnable {
+
+        private final float mFocalX, mFocalY;
+        private final long mStartTime;
+        private final float mZoomStart, mZoomEnd;
+
+        public AnimatedZoomRunnable(final float currentZoom, final float targetZoom,
+                                    final float focalX, final float focalY) {
+            mFocalX = focalX;
+            mFocalY = focalY;
+            mStartTime = System.currentTimeMillis();
+            mZoomStart = currentZoom;
+            mZoomEnd = targetZoom;
+        }
+
+        @Override
+        public void run() {
+            float t = interpolate();
+            float scale = mZoomStart + t * (mZoomEnd - mZoomStart);
+            float deltaScale = scale / getScale();
+            onGestureListener.onScale(deltaScale, mFocalX, mFocalY);
+            // We haven't hit our target scale yet, so post ourselves again
+            if (t < 1f) {
+                Compat.postOnAnimation(mImageView, this);
+            }
+        }
+
+        private float interpolate() {
+            float t = 1f * (System.currentTimeMillis() - mStartTime) / mZoomDuration;
+            t = Math.min(1f, t);
+            t = mInterpolator.getInterpolation(t);
+            return t;
+        }
+    }
+
+    private class FlingRunnable implements Runnable {
+
+        private final OverScroller mScroller;
+        private int mCurrentX, mCurrentY;
+
+        public FlingRunnable(Context context) {
+            mScroller = new OverScroller(context);
+        }
+
+        public void cancelFling() {
+            mScroller.forceFinished(true);
+        }
+
+        public void fling(int viewWidth, int viewHeight, int velocityX,
+                          int velocityY) {
+            final RectF rect = getDisplayRect();
+            if (rect == null) {
+                return;
+            }
+            final int startX = Math.round(-rect.left);
+            final int minX, maxX, minY, maxY;
+            if (viewWidth < rect.width()) {
+                minX = 0;
+                maxX = Math.round(rect.width() - viewWidth);
+            } else {
+                minX = maxX = startX;
+            }
+            final int startY = Math.round(-rect.top);
+            if (viewHeight < rect.height()) {
+                minY = 0;
+                maxY = Math.round(rect.height() - viewHeight);
+            } else {
+                minY = maxY = startY;
+            }
+            mCurrentX = startX;
+            mCurrentY = startY;
+            // If we actually can move, fling the scroller
+            if (startX != maxX || startY != maxY) {
+                mScroller.fling(startX, startY, velocityX, velocityY, minX,
+                        maxX, minY, maxY, 0, 0);
+            }
+        }
+
+        @Override
+        public void run() {
+            if (mScroller.isFinished()) {
+                return; // remaining post that should not be handled
+            }
+            if (mScroller.computeScrollOffset()) {
+                final int newX = mScroller.getCurrX();
+                final int newY = mScroller.getCurrY();
+                mSuppMatrix.postTranslate(mCurrentX - newX, mCurrentY - newY);
+                checkAndDisplayMatrix();
+                mCurrentX = newX;
+                mCurrentY = newY;
+                // Post On animation
+                Compat.postOnAnimation(mImageView, this);
+            }
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/view/PhotoViewUtil.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/view/PhotoViewUtil.java
new file mode 100644
index 0000000..b88eef6
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/photoview/view/PhotoViewUtil.java
@@ -0,0 +1,37 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.photoview.view;
+
+import android.view.MotionEvent;
+import android.widget.ImageView;
+
+public class PhotoViewUtil {
+
+    public static void checkZoomLevels(float minZoom, float midZoom,
+                                       float maxZoom) {
+        if (minZoom >= midZoom) {
+            throw new IllegalArgumentException(
+                    "Minimum zoom has to be less than Medium zoom. Call setMinimumZoom() with a more appropriate value");
+        } else if (midZoom >= maxZoom) {
+            throw new IllegalArgumentException(
+                    "Medium zoom has to be less than Maximum zoom. Call setMaximumZoom() with a more appropriate value");
+        }
+    }
+
+    public static boolean hasDrawable(ImageView imageView) {
+        return imageView.getDrawable() != null;
+    }
+
+    public static boolean isSupportedScaleType(final ImageView.ScaleType scaleType) {
+        if (scaleType == null) {
+            return false;
+        }
+        switch (scaleType) {
+            case MATRIX:
+                throw new IllegalStateException("Matrix scale type is not supported");
+        }
+        return true;
+    }
+
+    public static int getPointerIndex(int action) {
+        return (action & MotionEvent.ACTION_POINTER_INDEX_MASK) >> MotionEvent.ACTION_POINTER_INDEX_SHIFT;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/video/UIKitVideoView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/video/UIKitVideoView.java
new file mode 100644
index 0000000..b6349b7
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/video/UIKitVideoView.java
@@ -0,0 +1,368 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.video;
+
+import android.content.Context;
+import android.graphics.SurfaceTexture;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.Surface;
+import android.view.TextureView;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.video.proxy.IPlayer;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.video.proxy.MediaPlayerProxy;
+
+public class UIKitVideoView extends TextureView {
+
+    private static final String TAG = UIKitVideoView.class.getSimpleName();
+
+    private static int STATE_ERROR = -1;
+    private static int STATE_IDLE = 0;
+    private static int STATE_PREPARING = 1;
+    private static int STATE_PREPARED = 2;
+    private static int STATE_PLAYING = 3;
+    private static int STATE_PAUSED = 4;
+    private static int STATE_PLAYBACK_COMPLETED = 5;
+    private static int STATE_STOPPED = 6;
+
+    private int mCurrentState = STATE_IDLE;
+
+    private Context mContext;
+    private Surface mSurface;
+    private MediaPlayerProxy mMediaPlayer;
+
+    private Uri mUri;
+    private int mVideoWidth;
+    private int mVideoHeight;
+    private int mVideoRotationDegree;
+
+    private IPlayer.OnPreparedListener mOutOnPreparedListener;
+    private IPlayer.OnErrorListener mOutOnErrorListener;
+    private IPlayer.OnCompletionListener mOutOnCompletionListener;
+    private IPlayer.OnSeekCompleteListener mOnSeekCompleteListener;
+    private IPlayer.OnPreparedListener mOnPreparedListener = new IPlayer.OnPreparedListener() {
+        public void onPrepared(IPlayer mp) {
+            mCurrentState = STATE_PREPARED;
+            mVideoHeight = mp.getVideoHeight();
+            mVideoWidth = mp.getVideoWidth();
+            Log.i(TAG, "onPrepared mVideoWidth: " + mVideoWidth
+                    + " mVideoHeight: " + mVideoHeight
+                    + " mVideoRotationDegree: " + mVideoRotationDegree);
+            if (mOutOnPreparedListener != null) {
+                mOutOnPreparedListener.onPrepared(mp);
+            }
+        }
+    };
+    private IPlayer.OnErrorListener mOnErrorListener = new IPlayer.OnErrorListener() {
+        public boolean onError(IPlayer mp, int what, int extra) {
+            Log.w(TAG, "onError: what/extra: " + what + "/" + extra);
+            mCurrentState = STATE_ERROR;
+            stop_l();
+            if (mOutOnErrorListener != null) {
+                mOutOnErrorListener.onError(mp, what, extra);
+            }
+            return true;
+        }
+    };
+    private IPlayer.OnInfoListener mOnInfoListener = new IPlayer.OnInfoListener() {
+        public void onInfo(IPlayer mp, int what, int extra) {
+            Log.w(TAG, "onInfo: what/extra: " + what + "/" + extra);
+            if (what == 10001) { // IJK: MEDIA_INFO_VIDEO_ROTATION_CHANGED
+                mVideoRotationDegree = extra;
+                setRotation(mVideoRotationDegree);
+                requestLayout();
+            }
+        }
+    };
+    private IPlayer.OnCompletionListener mOnCompletionListener = new IPlayer.OnCompletionListener() {
+        public void onCompletion(IPlayer mp) {
+            Log.i(TAG, "onCompletion");
+            mCurrentState = STATE_PLAYBACK_COMPLETED;
+            if (mOutOnCompletionListener != null) {
+                mOutOnCompletionListener.onCompletion(mp);
+            }
+        }
+    };
+    private IPlayer.OnVideoSizeChangedListener mOnVideoSizeChangedListener = new IPlayer.OnVideoSizeChangedListener() {
+        @Override
+        public void onVideoSizeChanged(IPlayer mp, int width, int height) {
+            // TUIChatLog.i(TAG, "onVideoSizeChanged width: " + width + " height: " + height);
+        }
+    };
+
+    private IPlayer.OnSeekCompleteListener onSeekCompleteListener = new IPlayer.OnSeekCompleteListener() {
+        @Override
+        public void OnSeekComplete(IPlayer mp) {
+            if (mOnSeekCompleteListener != null) {
+                mOnSeekCompleteListener.OnSeekComplete(mp);
+            }
+        }
+    };
+    private SurfaceTextureListener mSurfaceTextureListener = new SurfaceTextureListener() {
+
+        @Override
+        public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
+            Log.i(TAG, "onSurfaceTextureAvailable");
+            mSurface = new Surface(surface);
+            openVideo();
+        }
+
+        @Override
+        public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
+            Log.i(TAG, "onSurfaceTextureSizeChanged");
+        }
+
+        @Override
+        public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
+            Log.i(TAG, "onSurfaceTextureDestroyed");
+            return true;
+        }
+
+        @Override
+        public void onSurfaceTextureUpdated(SurfaceTexture surface) {
+            // TUIChatLog.i(TAG,"onSurfaceTextureUpdated");
+        }
+    };
+
+    public UIKitVideoView(Context context) {
+        super(context);
+        initVideoView(context);
+    }
+
+    public UIKitVideoView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initVideoView(context);
+    }
+
+    public UIKitVideoView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initVideoView(context);
+    }
+
+    private void initVideoView(Context context) {
+        Log.i(TAG, "initVideoView");
+        mContext = context;
+        setSurfaceTextureListener(mSurfaceTextureListener);
+        mCurrentState = STATE_IDLE;
+    }
+
+    public void setOnPreparedListener(IPlayer.OnPreparedListener l) {
+        mOutOnPreparedListener = l;
+    }
+
+    public void setOnSeekCompleteListener(IPlayer.OnSeekCompleteListener l) {
+        mOnSeekCompleteListener = l;
+    }
+
+    public void setOnErrorListener(IPlayer.OnErrorListener l) {
+        mOutOnErrorListener = l;
+    }
+
+    public void setOnCompletionListener(IPlayer.OnCompletionListener l) {
+        mOutOnCompletionListener = l;
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        //  TUIChatLog.i(TAG, "onMeasure(" + MeasureSpec.toString(widthMeasureSpec) + ", "
+        //        + MeasureSpec.toString(heightMeasureSpec) + ")"
+        //        + " mVideoWidth: " + mVideoWidth
+        //        + " mVideoHeight: " + mVideoHeight);
+
+        int width = getDefaultSize(mVideoWidth, widthMeasureSpec);
+        int height = getDefaultSize(mVideoHeight, heightMeasureSpec);
+        int widthSpecMode = MeasureSpec.getMode(widthMeasureSpec);
+        int widthSpecSize = MeasureSpec.getSize(widthMeasureSpec);
+        int heightSpecMode = MeasureSpec.getMode(heightMeasureSpec);
+        int heightSpecSize = MeasureSpec.getSize(heightMeasureSpec);
+        if (mVideoWidth > 0 && mVideoHeight > 0) {
+            if (widthSpecMode == MeasureSpec.EXACTLY && heightSpecMode == MeasureSpec.EXACTLY) {
+                // the size is fixed
+                width = widthSpecSize;
+                height = heightSpecSize;
+
+                // for compatibility, we adjust size based on aspect ratio
+                if (mVideoWidth * height < width * mVideoHeight) {
+                    //Log.i("@@@", "image too wide, correcting");
+                    width = height * mVideoWidth / mVideoHeight;
+                } else if (mVideoWidth * height > width * mVideoHeight) {
+                    //Log.i("@@@", "image too tall, correcting");
+                    height = width * mVideoHeight / mVideoWidth;
+                }
+            } else if (widthSpecMode == MeasureSpec.EXACTLY) {
+                // only the width is fixed, adjust the height to match aspect ratio if possible
+                width = widthSpecSize;
+                height = width * mVideoHeight / mVideoWidth;
+                if (heightSpecMode == MeasureSpec.AT_MOST && height > heightSpecSize) {
+                    // couldn't match aspect ratio within the constraints
+                    height = heightSpecSize;
+                }
+            } else if (heightSpecMode == MeasureSpec.EXACTLY) {
+                // only the height is fixed, adjust the width to match aspect ratio if possible
+                height = heightSpecSize;
+                width = height * mVideoWidth / mVideoHeight;
+                if (widthSpecMode == MeasureSpec.AT_MOST && width > widthSpecSize) {
+                    // couldn't match aspect ratio within the constraints
+                    width = widthSpecSize;
+                }
+            } else {
+                // neither the width nor the height are fixed, try to use actual video size
+                width = mVideoWidth;
+                height = mVideoHeight;
+                if (heightSpecMode == MeasureSpec.AT_MOST && height > heightSpecSize) {
+                    // too tall, decrease both width and height
+                    height = heightSpecSize;
+                    width = height * mVideoWidth / mVideoHeight;
+                }
+                if (widthSpecMode == MeasureSpec.AT_MOST && width > widthSpecSize) {
+                    // too wide, decrease both width and height
+                    width = widthSpecSize;
+                    height = width * mVideoHeight / mVideoWidth;
+                }
+            }
+        } else {
+            // no size yet, just adopt the given spec sizes
+        }
+        Log.i(TAG, "onMeasure width: " + width + " height: " + height + " rotation degree: " + mVideoRotationDegree);
+        setMeasuredDimension(width, height);
+        if ((mVideoRotationDegree + 180) % 180 != 0) {
+            // 画面旋转之后需要缩放，而且旋转之后宽高的计算都要换为高宽。
+            // After the screen is rotated, it needs to be scaled, and the calculation of width and height after rotation must be changed to height and width.
+            int[] size = ScreenUtil.scaledSize(widthSpecSize, heightSpecSize, height, width);
+            Log.i(TAG, "onMeasure scaled width: " + size[0] + " height: " + size[1]);
+            setScaleX(size[0] / ((float) height));
+            setScaleY(size[1] / ((float) width));
+        }
+    }
+
+    public void setVideoURI(Uri uri) {
+        mUri = uri;
+        openVideo();
+    }
+
+    public void resetVideo() {
+        openVideo();
+    }
+
+    private void openVideo() {
+        if (mUri == null) {
+            Log.e(TAG, "openVideo: mUri is null ");
+            return;
+        }
+        Log.i(TAG, "openVideo: mUri: " + mUri.getPath() + " mSurface: " + mSurface);
+        if (mSurface == null) {
+            Log.e(TAG, "openVideo: mSurface is null ");
+            return;
+        }
+
+        stop_l();
+        try {
+            mMediaPlayer = new MediaPlayerProxy();
+            mMediaPlayer.setOnPreparedListener(mOnPreparedListener);
+            mMediaPlayer.setOnCompletionListener(mOnCompletionListener);
+            mMediaPlayer.setOnErrorListener(mOnErrorListener);
+            mMediaPlayer.setOnInfoListener(mOnInfoListener);
+            mMediaPlayer.setOnVideoSizeChangedListener(mOnVideoSizeChangedListener);
+            mMediaPlayer.setOnSeekCompleteListener(mOnSeekCompleteListener);
+            mMediaPlayer.setSurface(mSurface);
+            mMediaPlayer.setDataSource(getContext(), mUri);
+            mMediaPlayer.prepareAsync();
+            mCurrentState = STATE_PREPARING;
+        } catch (Exception ex) {
+            Log.w(TAG, "ex = " + ex.getMessage());
+            mCurrentState = STATE_ERROR;
+        }
+
+    }
+
+    public boolean start() {
+        Log.i(TAG, "start mCurrentState:" + mCurrentState);
+        if (mMediaPlayer != null) {
+            mMediaPlayer.start();
+            mCurrentState = STATE_PLAYING;
+        }
+        return true;
+    }
+
+    public boolean stop() {
+        Log.i(TAG, "stop mCurrentState:" + mCurrentState);
+        stop_l();
+        return true;
+    }
+
+    public boolean pause() {
+        Log.i(TAG, "pause mCurrentState:" + mCurrentState);
+        if (mMediaPlayer != null) {
+            mMediaPlayer.pause();
+            mCurrentState = STATE_PAUSED;
+        }
+        return true;
+    }
+
+    public void stop_l() {
+        if (mMediaPlayer != null) {
+            mMediaPlayer.stop();
+            mMediaPlayer.release();
+            mMediaPlayer = null;
+            mCurrentState = STATE_IDLE;
+        }
+    }
+
+    public boolean isPlaying() {
+        if (mMediaPlayer != null) {
+            return mMediaPlayer.isPlaying();
+        }
+        return false;
+    }
+
+    public void seekTo(int progress) {
+        if (mMediaPlayer != null) {
+            mMediaPlayer.seekTo(progress);
+        }
+    }
+
+    public boolean isPrepared() {
+        if (mUri == null) {
+            Log.e(TAG, "isPrepared: mUri is null ");
+            return false;
+        }
+        Log.i(TAG, "isPrepared: mUri: " + mUri.getPath() + " mSurface: " + mSurface);
+        if (mSurface == null) {
+            Log.e(TAG, "isPrepared: mSurface is null ");
+            return false;
+        }
+
+        return true;
+    }
+
+    public int getCurrentPosition() {
+        if (mMediaPlayer != null) {
+            return mMediaPlayer.getCurrentPosition();
+        }
+        return 0;
+    }
+
+    public int getDuration() {
+        if (mMediaPlayer != null) {
+            return mMediaPlayer.getDuration();
+        }
+        return 0;
+    }
+
+
+    @Override
+    public void setBackgroundDrawable(Drawable background) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N && background != null) {
+            super.setBackgroundDrawable(background);
+        }
+    }
+
+    @Override
+    public void setOnClickListener(@Nullable OnClickListener l) {
+        super.setOnClickListener(l);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/video/listener/ResultListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/video/listener/ResultListener.java
new file mode 100644
index 0000000..6cb44a4
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/video/listener/ResultListener.java
@@ -0,0 +1,5 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.video.listener;
+
+public interface ResultListener {
+    void callback();
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/video/proxy/IPlayer.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/video/proxy/IPlayer.java
new file mode 100644
index 0000000..34b64cc
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/video/proxy/IPlayer.java
@@ -0,0 +1,73 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.video.proxy;
+
+import android.content.Context;
+import android.net.Uri;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+
+import java.io.IOException;
+
+public interface IPlayer {
+
+    void setOnPreparedListener(final OnPreparedListener l);
+
+    void setOnErrorListener(final OnErrorListener l);
+
+    void setOnCompletionListener(final OnCompletionListener l);
+
+    void setOnVideoSizeChangedListener(final OnVideoSizeChangedListener l);
+
+    void setOnSeekCompleteListener(final OnSeekCompleteListener l);
+
+    void setOnInfoListener(final OnInfoListener l);
+
+    void setDisplay(SurfaceHolder sh);
+
+    void setSurface(Surface sh);
+
+    void setDataSource(Context context, Uri uri) throws IOException, IllegalArgumentException, SecurityException, IllegalStateException;
+
+    void prepareAsync();
+
+    void release();
+
+    void start();
+
+    void stop();
+
+    void pause();
+
+    boolean isPlaying();
+
+    int getVideoWidth();
+
+    int getVideoHeight();
+
+    void seekTo(int progress);
+    int getCurrentPosition();
+    int getDuration();
+
+    interface OnPreparedListener {
+        void onPrepared(IPlayer mp);
+    }
+
+    interface OnErrorListener {
+        boolean onError(IPlayer mp, int what, int extra);
+    }
+
+    interface OnCompletionListener {
+        void onCompletion(IPlayer mp);
+    }
+
+    interface OnVideoSizeChangedListener {
+        void onVideoSizeChanged(IPlayer mp, int width, int height);
+    }
+
+    interface OnInfoListener {
+        void onInfo(IPlayer mp, int what, int extra);
+    }
+
+    interface OnSeekCompleteListener {
+        void OnSeekComplete(IPlayer mp);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/video/proxy/MediaPlayerProxy.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/video/proxy/MediaPlayerProxy.java
new file mode 100644
index 0000000..4de73fe
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/video/proxy/MediaPlayerProxy.java
@@ -0,0 +1,121 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.video.proxy;
+
+import android.content.Context;
+import android.net.Uri;
+import android.util.Log;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+
+import java.io.IOException;
+
+public class MediaPlayerProxy implements IPlayer {
+
+    private static final String TAG = MediaPlayerProxy.class.getSimpleName();
+
+    private IPlayer mMediaPlayer;
+
+    public MediaPlayerProxy() {
+        mMediaPlayer = new SystemMediaPlayerWrapper();
+        Log.i(TAG, "use mMediaPlayer: " + mMediaPlayer);
+    }
+
+    @Override
+    public void setOnPreparedListener(final OnPreparedListener l) {
+        mMediaPlayer.setOnPreparedListener(l);
+    }
+
+    @Override
+    public void setOnErrorListener(final OnErrorListener l) {
+        mMediaPlayer.setOnErrorListener(l);
+    }
+
+    @Override
+    public void setOnCompletionListener(final OnCompletionListener l) {
+        mMediaPlayer.setOnCompletionListener(l);
+    }
+
+    @Override
+    public void setOnVideoSizeChangedListener(final OnVideoSizeChangedListener l) {
+        mMediaPlayer.setOnVideoSizeChangedListener(l);
+    }
+
+    @Override
+    public void setOnSeekCompleteListener(OnSeekCompleteListener l) {
+        mMediaPlayer.setOnSeekCompleteListener(l);
+    }
+
+    @Override
+    public void setOnInfoListener(final OnInfoListener l) {
+        mMediaPlayer.setOnInfoListener(l);
+    }
+
+    @Override
+    public void setDisplay(SurfaceHolder sh) {
+        mMediaPlayer.setDisplay(sh);
+    }
+
+    @Override
+    public void setSurface(Surface sh) {
+        mMediaPlayer.setSurface(sh);
+    }
+
+    @Override
+    public void setDataSource(Context context, Uri uri) throws IOException, IllegalArgumentException, SecurityException, IllegalStateException {
+        mMediaPlayer.setDataSource(context, uri);
+    }
+
+    @Override
+    public void prepareAsync() {
+        mMediaPlayer.prepareAsync();
+    }
+
+    @Override
+    public void release() {
+        mMediaPlayer.release();
+    }
+
+    @Override
+    public void start() {
+        mMediaPlayer.start();
+    }
+
+    @Override
+    public void stop() {
+        mMediaPlayer.stop();
+    }
+
+    @Override
+    public void pause() {
+        mMediaPlayer.pause();
+    }
+
+    @Override
+    public boolean isPlaying() {
+        return mMediaPlayer.isPlaying();
+    }
+
+    @Override
+    public int getVideoWidth() {
+        return mMediaPlayer.getVideoWidth();
+    }
+
+    @Override
+    public int getVideoHeight() {
+        return mMediaPlayer.getVideoHeight();
+    }
+
+    @Override
+    public void seekTo(int progress) {
+        mMediaPlayer.seekTo(progress);
+    }
+
+    @Override
+    public int getCurrentPosition() {
+        return mMediaPlayer.getCurrentPosition();
+    }
+
+    @Override
+    public int getDuration() {
+        return mMediaPlayer.getDuration();
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/video/proxy/SystemMediaPlayerWrapper.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/video/proxy/SystemMediaPlayerWrapper.java
new file mode 100644
index 0000000..6bb8c1d
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/video/proxy/SystemMediaPlayerWrapper.java
@@ -0,0 +1,155 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.video.proxy;
+
+import android.content.Context;
+import android.media.MediaPlayer;
+import android.net.Uri;
+import android.os.Build;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+
+import java.io.IOException;
+
+public class SystemMediaPlayerWrapper implements IPlayer {
+
+    private MediaPlayer mMediaPlayer;
+
+    public SystemMediaPlayerWrapper() {
+        mMediaPlayer = new MediaPlayer();
+    }
+
+    @Override
+    public void setOnPreparedListener(final OnPreparedListener l) {
+        mMediaPlayer.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
+            @Override
+            public void onPrepared(MediaPlayer mp) {
+                l.onPrepared(SystemMediaPlayerWrapper.this);
+            }
+        });
+    }
+
+    @Override
+    public void setOnErrorListener(final OnErrorListener l) {
+        mMediaPlayer.setOnErrorListener(new MediaPlayer.OnErrorListener() {
+            @Override
+            public boolean onError(MediaPlayer mp, int what, int extra) {
+                return l.onError(SystemMediaPlayerWrapper.this, what, extra);
+            }
+        });
+    }
+
+    @Override
+    public void setOnCompletionListener(final OnCompletionListener l) {
+        mMediaPlayer.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
+            @Override
+            public void onCompletion(MediaPlayer mp) {
+                l.onCompletion(SystemMediaPlayerWrapper.this);
+            }
+        });
+    }
+
+    @Override
+    public void setOnSeekCompleteListener(final OnSeekCompleteListener l) {
+        mMediaPlayer.setOnSeekCompleteListener(new MediaPlayer.OnSeekCompleteListener() {
+            @Override
+            public void onSeekComplete(MediaPlayer mediaPlayer) {
+                l.OnSeekComplete(SystemMediaPlayerWrapper.this);
+            }
+        });
+    }
+
+    @Override
+    public void setOnVideoSizeChangedListener(final OnVideoSizeChangedListener l) {
+        mMediaPlayer.setOnVideoSizeChangedListener(new MediaPlayer.OnVideoSizeChangedListener() {
+            @Override
+            public void onVideoSizeChanged(MediaPlayer mp, int width, int height) {
+                l.onVideoSizeChanged(SystemMediaPlayerWrapper.this, width, height);
+            }
+        });
+    }
+
+    @Override
+    public void setOnInfoListener(final OnInfoListener l) {
+        mMediaPlayer.setOnInfoListener(new MediaPlayer.OnInfoListener() {
+            @Override
+            public boolean onInfo(MediaPlayer mp, int what, int extra) {
+                l.onInfo(SystemMediaPlayerWrapper.this, what, extra);
+                return false;
+            }
+        });
+    }
+
+    @Override
+    public void setDisplay(SurfaceHolder sh) {
+        mMediaPlayer.setDisplay(sh);
+    }
+
+    @Override
+    public void setSurface(Surface sh) {
+        mMediaPlayer.setSurface(sh);
+    }
+
+    @Override
+    public void setDataSource(Context context, Uri uri) throws IOException, IllegalArgumentException, SecurityException, IllegalStateException {
+        mMediaPlayer.setDataSource(context, uri);
+    }
+
+    @Override
+    public void prepareAsync() {
+        mMediaPlayer.prepareAsync();
+    }
+
+    @Override
+    public void release() {
+        mMediaPlayer.release();
+    }
+
+    @Override
+    public void start() {
+        mMediaPlayer.start();
+    }
+
+    @Override
+    public void stop() {
+        mMediaPlayer.stop();
+    }
+
+    @Override
+    public void pause() {
+        mMediaPlayer.pause();
+    }
+
+    @Override
+    public boolean isPlaying() {
+        return mMediaPlayer.isPlaying();
+    }
+
+    @Override
+    public int getVideoWidth() {
+        return mMediaPlayer.getVideoWidth();
+    }
+
+    @Override
+    public int getVideoHeight() {
+        return mMediaPlayer.getVideoHeight();
+    }
+
+    @Override
+    public void seekTo(int progress) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            mMediaPlayer.seekTo(progress, MediaPlayer.SEEK_CLOSEST);
+        } else {
+            mMediaPlayer.seekTo(progress);
+        }
+    }
+
+    @Override
+    public int getCurrentPosition() {
+        return mMediaPlayer.getCurrentPosition();
+    }
+
+    @Override
+    public int getDuration() {
+        return mMediaPlayer.getDuration();
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/video/util/AudioUtil.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/video/util/AudioUtil.java
new file mode 100644
index 0000000..10c65a3
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/component/video/util/AudioUtil.java
@@ -0,0 +1,17 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.component.video.util;
+
+import android.content.Context;
+import android.media.AudioManager;
+
+public class AudioUtil {
+
+    public static void setAudioManage(Context context) {
+        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+        audioManager.setStreamMute(AudioManager.STREAM_SYSTEM, true);
+        audioManager.setStreamMute(AudioManager.STREAM_MUSIC, true);
+        audioManager.setStreamVolume(AudioManager.STREAM_ALARM, 0, 0);
+        audioManager.setStreamVolume(AudioManager.STREAM_DTMF, 0, 0);
+        audioManager.setStreamVolume(AudioManager.STREAM_NOTIFICATION, 0, 0);
+        audioManager.setStreamVolume(AudioManager.STREAM_RING, 0, 0);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/interfaces/IChatLayout.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/interfaces/IChatLayout.java
new file mode 100644
index 0000000..33946ff
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/interfaces/IChatLayout.java
@@ -0,0 +1,84 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.interfaces;
+
+import com.tencent.qcloud.tuicore.component.interfaces.ILayout;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.input.InputView;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.MessageRecyclerView;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.noticelayout.NoticeLayout;
+
+/**
+ * 聊天窗口 {@link com.tencent.qcloud.tuikit.tuichat.classicui.widget.ChatView} 提供了消息的展示与发送等功能，界面布局从上到下分为四个部分: <br>
+ * <pre>    标题区 {@link com.tencent.qcloud.tuicore.component.TitleBarLayout}，
+ *  提醒区 {@link com.tencent.qcloud.tuikit.tuichat.minimalistui.component.noticelayout.NoticeLayout}，
+ *  消息区 {@link com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MessageRecyclerView}，
+ *  输入区 {@link com.tencent.qcloud.tuikit.tuichat.classicui.widget.input.InputView}，</pre>
+ * 每个区域提供了多样的方法以供定制使用。
+ * 
+ * 
+ * The chat window {@link com.tencent.qcloud.tuikit.tuichat.classicui.widget.ChatView} provides functions such as displaying and sending messages.
+ * The interface layout is divided into four parts from top to bottom:
+ *  TitleBarLayout {@link com.tencent.qcloud.tuicore.component.TitleBarLayout}，
+ *  NoticeLayout {@link com.tencent.qcloud.tuikit.tuichat.minimalistui.component.noticelayout.NoticeLayout}，
+ *  MessageRecyclerView {@link com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MessageRecyclerView}，
+ *  InputView {@link com.tencent.qcloud.tuikit.tuichat.classicui.widget.input.InputView},
+ *  Each area offers a variety of methods for customization.
+ */
+public interface IChatLayout  {
+
+    /**
+     * 获取聊天窗口 Input 区域 Layout
+     *
+     * @return
+     */
+    InputView getInputLayout();
+
+    /**
+     * 获取聊天窗口 Message 区域 Layout
+     *
+     * @return
+     */
+    MessageRecyclerView getMessageLayout();
+
+    /**
+     * 获取聊天窗口 Notice 区域 Layout
+     *
+     * @return
+     */
+    NoticeLayout getNoticeLayout();
+
+    /**
+     * 获取当前的会话信息
+     */
+    ChatInfo getChatInfo();
+
+    /**
+     * 设置当前的会话信息
+     *
+     * @param chatInfo
+     */
+    void setChatInfo(ChatInfo chatInfo);
+
+    /**
+     * 退出聊天，释放相关资源（一般在 activity finish 时调用）
+     */
+    void exitChat();
+
+    /**
+     * 初始化参数
+     */
+    void initDefault();
+
+    /**
+     * 加载聊天消息
+     */
+    void loadMessages(int type);
+
+    /**
+     * 发送消息
+     *
+     * @param msg   消息
+     * @param retry 是否重试
+     */
+    void sendMessage(TUIMessageBean msg, boolean retry);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/interfaces/ICommonMessageAdapter.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/interfaces/ICommonMessageAdapter.java
new file mode 100644
index 0000000..515d456
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/interfaces/ICommonMessageAdapter.java
@@ -0,0 +1,8 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.interfaces;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+public interface ICommonMessageAdapter {
+    TUIMessageBean getItem(int position);
+    void notifyItemChanged(int position);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/interfaces/IMessageLayout.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/interfaces/IMessageLayout.java
new file mode 100644
index 0000000..2b2be92
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/interfaces/IMessageLayout.java
@@ -0,0 +1,52 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.interfaces;
+
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.MessageAdapter;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.messagepopmenu.ChatPopActivity;
+
+import java.util.List;
+
+/**
+ * 消息区域 {@link com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MessageRecyclerView} 继承自 {@link RecyclerView}，提供了消息的展示功能。<br>
+ * 本类提供了大量的方法以供定制化需求，包括外观设置、事件点击，以及自定义消息的展示等。
+ * 
+ * The message area {@link com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MessageRecyclerView} inherits from {@link RecyclerView} and provides the display function of the message.
+ * This class provides a large number of methods for customization requirements, including appearance settings, event clicks, 
+ * and display of custom messages.
+ */
+public interface IMessageLayout extends IMessageProperties {
+
+    /**
+     * 设置消息列表的适配器 {@link com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MessageAdapter}
+     *
+     * @param adapter
+     */
+    void setAdapter(MessageAdapter adapter);
+
+    /**
+     * 获得消息列表的点击事件
+     *
+     * @return
+     */
+    OnItemClickListener getOnItemClickListener();
+
+    /**
+     * 设置消息列表的事件监听器 {@link com.tencent.qcloud.tuikit.tuichat.minimalistui.interfaces.OnItemClickListener}
+     *
+     * @param listener
+     */
+    void setOnItemClickListener(OnItemClickListener listener);
+
+    /**
+     * 获取 PopMenu 的 Action 列表
+     *
+     * @return
+     */
+    List<ChatPopActivity.ChatPopMenuAction> getPopActions();
+
+    /**
+     * 给 PopMenu 加入一条自定义 action
+     *
+     * @param action 菜单选项 {@link com.tencent.qcloud.tuicore.component.action.PopMenuAction}, 可以自定义图片、文字以及点击事件
+     */
+    void addPopAction(ChatPopActivity.ChatPopMenuAction action);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/interfaces/IMessageProperties.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/interfaces/IMessageProperties.java
new file mode 100644
index 0000000..5894313
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/interfaces/IMessageProperties.java
@@ -0,0 +1,353 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.interfaces;
+
+import android.graphics.drawable.Drawable;
+
+public interface IMessageProperties {
+
+    /// @name 设置头像 Set Avatar
+    /// @{
+
+    /**
+     * 获取默认头像
+     * 
+     * Get default avatar
+     *
+     * @return
+     */
+    int getAvatar();
+
+    /**
+     * 设置默认头像，默认与左边与右边的头像相同
+     * 
+     * Set the default avatar, the default is the same as the avatar on the left and right
+     *
+     * @param resId
+     */
+    void setAvatar(int resId);
+
+    /**
+     * 获取头像圆角
+     * 
+     * Get avatar rounded corners
+     *
+     * @return
+     */
+    int getAvatarRadius();
+
+    /**
+     * 设置头像圆角
+     * 
+     * Set avatar rounded corners
+     *
+     * @param radius
+     */
+    void setAvatarRadius(int radius);
+
+    /**
+     * 获得头像大小
+     * 
+     * Get avatar size
+     *
+     * @return
+     */
+    int[] getAvatarSize();
+
+    /**
+     * 设置头像大小
+     *
+     * Set avatar size
+     * 
+     * @param size
+     */
+    void setAvatarSize(int[] size);
+
+    /// @}
+    /// @name 设置昵称样式 Set nickname style
+    /// @{
+
+    /**
+     * 获得昵称文字大小
+     * 
+     * Get nickname text size
+     *
+     * @return
+     */
+    int getNameFontSize();
+
+    /**
+     * 设置昵称文字大小
+     * 
+     * Set nickname text size
+     *
+     * @param size
+     */
+    void setNameFontSize(int size);
+
+    /**
+     * 获取昵称文字颜色
+     * 
+     * Get nickname text color
+     *
+     * @return
+     */
+    int getNameFontColor();
+
+    /**
+     * 设置昵称文字颜色
+     * 
+     * Set nickname text color
+     *
+     * @param color
+     */
+    void setNameFontColor(int color);
+
+    /**
+     * 获取左边昵称显示状态
+     * 
+     * Get the display status of the nickname on the left
+     *
+     * @return
+     */
+    int getLeftNameVisibility();
+
+    /**
+     * 设置左边昵称是否显示
+     * 
+     * Set the display status of the nickname on the left
+     *
+     * @param visibility
+     */
+    void setLeftNameVisibility(int visibility);
+
+    /**
+     * 获取右边昵称显示状态
+     * 
+     * Get the display status of the nickname on the right
+     *
+     * @return
+     */
+    int getRightNameVisibility();
+
+    /**
+     * 设置右边昵称是否显示
+     * 
+     * Set the display status of the nickname on the right
+     *
+     * @param visibility
+     */
+    void setRightNameVisibility(int visibility);
+
+    /// @}
+    /// @name 设置气泡 set bubbles
+    /// @{
+
+    /**
+     * 获取右边聊天气泡的背景
+     * 
+     * Get the background of the chat bubble on the right
+     *
+     * @return
+     */
+    Drawable getRightBubble();
+
+    /**
+     * 设置右边聊天气泡的背景
+     * 
+     * Set the background of the chat bubble on the right
+     *
+     * @param drawable
+     */
+    void setRightBubble(Drawable drawable);
+
+    /**
+     * 获取左边聊天气泡的背景
+     * 
+     * Get the background of the left chat bubble
+     *
+     * @return
+     */
+    Drawable getLeftBubble();
+
+    /**
+     * 设置左边聊天气泡的背景
+     * 
+     * Set the background of the left chat bubble
+     *
+     * @param drawable
+     */
+    void setLeftBubble(Drawable drawable);
+
+    /// @}
+    /// @name 设置聊天内容 Set chat content
+    /// @{
+
+    /**
+     * 获取聊天内容字体大小
+     * 
+     * Get chat content font size
+     *
+     * @return
+     */
+    int getChatContextFontSize();
+
+    /**
+     * 设置聊天内容字体大小
+     * 
+     * Set chat content font size
+     *
+     * @param size
+     */
+    void setChatContextFontSize(int size);
+
+    /**
+     * 获取右边聊天内容字体颜色
+     * 
+     * Get the font color of the chat content on the right
+     *
+     * @return
+     */
+    int getRightChatContentFontColor();
+
+    /**
+     * 设置右边聊天内容字体颜色
+     * 
+     * Set the font color of the chat content on the right
+     *
+     * @param color
+     */
+    void setRightChatContentFontColor(int color);
+
+    /**
+     * 获取左边聊天内容字体颜色
+     * 
+     * Get the font color of the chat content on the left
+     *
+     * @return
+     */
+    int getLeftChatContentFontColor();
+
+    /**
+     * 设置左边聊天内容字体颜色
+     * 
+     * Set the font color of the chat content on the left
+     *
+     * @param color
+     */
+    void setLeftChatContentFontColor(int color);
+
+    /// @}
+    /// @name 设置聊天时间 Set chat time
+    /// @{
+
+    /**
+     * 获取聊天时间的背景
+     * 
+     * Get the context of the chat time
+     *
+     * @return
+     */
+    Drawable getChatTimeBubble();
+
+    /**
+     * 设置聊天时间的背景
+     * 
+     * Set the context of the chat time
+     *
+     * @param drawable
+     */
+    void setChatTimeBubble(Drawable drawable);
+
+    /**
+     * 获取聊天时间的文字大小
+     * 
+     * Get the text size of the chat time
+     *
+     * @return
+     */
+    int getChatTimeFontSize();
+
+    /**
+     * 设置聊天时间的字体大小
+     * 
+     * Set the text size of the chat time
+     *
+     * @param size
+     */
+    void setChatTimeFontSize(int size);
+
+    /**
+     * 获取聊天时间的字体颜色
+     * 
+     * Get the font color of chat time
+     *
+     * @return
+     */
+    int getChatTimeFontColor();
+
+    /**
+     * 设置聊天时间的字体颜色
+     * 
+     * Set the font color of chat time
+     *
+     * @param color
+     */
+    void setChatTimeFontColor(int color);
+
+    /// @}
+    /// @name 设置聊天的提示信息 Set up chat alerts
+    /// @{
+
+    /**
+     * 获取聊天提示信息的背景
+     * 
+     * Get context for chat alerts
+     *
+     * @return
+     */
+    Drawable getTipsMessageBubble();
+
+    /**
+     * 设置聊天提示信息的背景
+     * 
+     * Set context for chat alerts
+     *
+     * @param drawable
+     */
+    void setTipsMessageBubble(Drawable drawable);
+
+    /**
+     * 获取聊天提示信息的文字大小
+     * 
+     * Get the text size of the chat prompt message
+     *
+     * @return
+     */
+    int getTipsMessageFontSize();
+
+    /**
+     * 设置聊天提示信息的文字大小
+     * 
+     * Set the text size of the chat prompt message
+     *
+     * @param size
+     */
+    void setTipsMessageFontSize(int size);
+
+    /**
+     * 获取聊天提示信息的文字颜色
+     * 
+     * Get the text color of the chat prompt message
+     *
+     * @return
+     */
+    int getTipsMessageFontColor();
+
+    /**
+     * 设置聊天提示信息的文字颜色
+     * 
+     * Set the text color of the chat prompt message
+     *
+     * @param color
+     */
+    void setTipsMessageFontColor(int color);
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/interfaces/OnItemClickListener.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/interfaces/OnItemClickListener.java
new file mode 100644
index 0000000..69b359c
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/interfaces/OnItemClickListener.java
@@ -0,0 +1,32 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.interfaces;
+
+import android.view.View;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.QuoteMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+public abstract class OnItemClickListener {
+    public void onMessageLongClick(View view, int position, TUIMessageBean messageInfo) {};
+
+    public void onMessageClick(View view, int position, TUIMessageBean messageInfo) {};
+
+    public void onUserIconClick(View view, int position, TUIMessageBean messageInfo) {};
+
+    public void onUserIconLongClick(View view, int position, TUIMessageBean messageInfo) {};
+
+    public void onReEditRevokeMessage(View view, int position, TUIMessageBean messageInfo) {};
+
+    public void onRecallClick(View view, int position, TUIMessageBean messageInfo) {};
+
+    public  void onReplyMessageClick(View view, int position, QuoteMessageBean messageBean) {}
+
+    public  void onReplyDetailClick(TUIMessageBean messageBean) {}
+
+    public  void onReactOnClick(String emojiId, TUIMessageBean messageBean) {}
+
+    public  void onSendFailBtnClick(View view, int position, TUIMessageBean messageInfo) {};
+
+    public  void onTextSelected(View view, int position, TUIMessageBean messageInfo) {};
+
+    public void onTranslationLongClick(View view, int position, TUIMessageBean messageInfo) {};
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/MessageDetailMinimalistActivity.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/MessageDetailMinimalistActivity.java
new file mode 100644
index 0000000..282f03d
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/MessageDetailMinimalistActivity.java
@@ -0,0 +1,336 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.page;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.component.CustomLinearLayoutManager;
+import com.tencent.qcloud.tuicore.component.activities.BaseMinimalistLightActivity;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageReceiptInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.GroupMessageReadMembersInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.MinimalistUIService;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.MessageContentHolder;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.MessageViewHolderFactory;
+import com.tencent.qcloud.tuikit.tuichat.presenter.MessageReceiptPresenter;
+import com.tencent.qcloud.tuikit.tuichat.presenter.ReplyPresenter;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MessageDetailMinimalistActivity extends BaseMinimalistLightActivity {
+
+    private static final String TAG = MessageDetailMinimalistActivity.class.getSimpleName();
+
+    private MessageReceiptPresenter presenter;
+    private ReplyPresenter replyPresenter;
+
+    private View readStatusArea;
+    private View readTitle;
+    private View unreadtitle;
+    private FrameLayout messageArea;
+    private RecyclerView readList;
+    private RecyclerView unreadList;
+
+    private TUIMessageBean messageBean;
+    private ChatInfo chatInfo;
+
+    private MemberAdapter readAdapter;
+    private MemberAdapter unreadAdapter;
+
+    private final List<GroupMemberInfo> readMemberList = new ArrayList<>();
+    private final List<GroupMemberInfo> unreadMemberList = new ArrayList<>();
+    private long readNextSeq;
+    private long unreadNextSeq;
+    private boolean readFinished = false;
+    private boolean unreadFinished = false;
+
+    private boolean readLoading = false;
+    private boolean unreadLoading = false;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        TUIChatLog.i(TAG, "onCreate " + this);
+        setContentView(R.layout.chat_minimalist_message_detail_layout);
+
+        initView();
+        initData();
+    }
+
+    private void initView() {
+        messageArea = findViewById(R.id.message_area);
+        readStatusArea = findViewById(R.id.read_status_area);
+        readList = findViewById(R.id.read_list);
+        unreadList = findViewById(R.id.unread_list);
+        unreadtitle = findViewById(R.id.unread_title);
+        readTitle = findViewById(R.id.read_title);
+
+        View backBtn = findViewById(R.id.back_btn_area);
+        backBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onBackPressed();
+            }
+        });
+    }
+
+    private void initData() {
+        Intent intent = getIntent();
+        messageBean = (TUIMessageBean) intent.getSerializableExtra(TUIChatConstants.MESSAGE_BEAN);
+        chatInfo = (ChatInfo) intent.getSerializableExtra(TUIChatConstants.CHAT_INFO);
+        presenter = new MessageReceiptPresenter();
+        presenter.setChatInfo(chatInfo);
+        presenter.setMessageReplyBean(messageBean, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                setMessageAndReceiptDetail();
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                setMessageAndReceiptDetail();
+            }
+        });
+    }
+
+    private void setMessageAndReceiptDetail() {
+        setMsgAbstract();
+
+        if (!messageBean.isSelf()) {
+            readStatusArea.setVisibility(View.GONE);
+            return;
+        }
+
+        readAdapter = new MemberAdapter();
+        unreadAdapter = new MemberAdapter();
+        readList.setLayoutManager(new CustomLinearLayoutManager(this));
+        unreadList.setLayoutManager(new CustomLinearLayoutManager(this));
+        readList.setAdapter(readAdapter);
+        unreadList.setAdapter(unreadAdapter);
+
+        if (!messageBean.isGroup()) {
+            setUserReadStatus(messageBean);
+            return;
+        }
+
+        presenter.getGroupMessageReadReceipt(messageBean, new IUIKitCallback<List<MessageReceiptInfo>>() {
+            @Override
+            public void onSuccess(List<MessageReceiptInfo> data) {
+                MessageReceiptInfo info = data.get(0);
+                if (info.getReadCount() <= 0) {
+                    readTitle.setVisibility(View.GONE);
+                }
+                if (info.getUnreadCount() <= 0) {
+                    unreadtitle.setVisibility(View.GONE);
+                }
+            }
+
+            @Override
+            public void onError(int errCode, String errMsg, List<MessageReceiptInfo> data) {
+                super.onError(errCode, errMsg, data);
+            }
+        });
+
+        readList.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int state) {
+                if (state == RecyclerView.SCROLL_STATE_IDLE) {
+                    if (isLastItemVisibleCompleted(readList) && !readFinished) {
+                        loadGroupMessageReadMembers(readNextSeq);
+                    }
+                }
+            }
+        });
+
+        unreadList.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int state) {
+                if (state == RecyclerView.SCROLL_STATE_IDLE) {
+                    if (isLastItemVisibleCompleted(unreadList) && !unreadFinished) {
+                        loadGroupMessageUnreadMembers(unreadNextSeq);
+                    }
+                }
+            }
+        });
+
+        loadGroupMessageReadMembers(0);
+        loadGroupMessageUnreadMembers(0);
+    }
+
+    private void setUserReadStatus(TUIMessageBean messageBean) {
+        String userId = messageBean.getUserId();
+        GroupMemberInfo groupMemberInfo = new GroupMemberInfo();
+        groupMemberInfo.setAccount(userId);
+        groupMemberInfo.setFriendRemark(chatInfo.getChatName());
+        groupMemberInfo.setIconUrl(chatInfo.getFaceUrl());
+        if (messageBean.isPeerRead()) {
+            unreadtitle.setVisibility(View.GONE);
+            readMemberList.add(groupMemberInfo);
+            readAdapter.setData(readMemberList);
+            readAdapter.notifyDataSetChanged();
+        } else {
+            readTitle.setVisibility(View.GONE);
+            unreadMemberList.add(groupMemberInfo);
+            unreadAdapter.setData(unreadMemberList);
+            unreadAdapter.notifyDataSetChanged();
+        }
+    }
+
+    private void setMsgAbstract() {
+        int type = MinimalistUIService.getInstance().getViewType(messageBean.getClass());
+        RecyclerView.ViewHolder holder = MessageViewHolderFactory.getInstance(messageArea, null, type);
+        if (holder instanceof MessageContentHolder) {
+            ((MessageContentHolder) holder).layoutViews(messageBean, 0);
+            ((MessageContentHolder) holder).setTranslationContent(messageBean, 0);
+        }
+        messageArea.addView(holder.itemView);
+    }
+
+    private void loadGroupMessageReadMembers(long seq) {
+        if (readLoading) {
+            return;
+        }
+        readLoading = true;
+        presenter.getGroupMessageReadMembers(messageBean, true, seq, new IUIKitCallback<GroupMessageReadMembersInfo>() {
+            @Override
+            public void onSuccess(GroupMessageReadMembersInfo data) {
+                readNextSeq = data.getNextSeq();
+                readFinished = data.isFinished();
+                readMemberList.addAll(data.getGroupMemberInfoList());
+                readAdapter.setData(readMemberList);
+                readAdapter.notifyDataSetChanged();
+                readLoading = false;
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                readLoading = false;
+                TUIChatLog.e(TAG, "errCode " + errCode + " errMsg " + errMsg);
+            }
+        });
+    }
+
+    private void loadGroupMessageUnreadMembers(long seq) {
+        if (unreadLoading) {
+            return;
+        }
+        unreadLoading = true;
+        presenter.getGroupMessageReadMembers(messageBean, false, seq, new IUIKitCallback<GroupMessageReadMembersInfo>() {
+            @Override
+            public void onSuccess(GroupMessageReadMembersInfo data) {
+                unreadNextSeq = data.getNextSeq();
+                unreadFinished = data.isFinished();
+                unreadMemberList.addAll(data.getGroupMemberInfoList());
+                unreadAdapter.setData(unreadMemberList);
+                unreadAdapter.notifyDataSetChanged();
+                unreadLoading = false;
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                unreadLoading = false;
+                TUIChatLog.e(TAG, "errCode " + errCode + " errMsg " + errMsg);
+            }
+        });
+    }
+
+    public boolean isLastItemVisibleCompleted(RecyclerView recyclerView) {
+        LinearLayoutManager linearLayoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
+        if (linearLayoutManager == null) {
+            return false;
+        }
+        int lastPosition = linearLayoutManager.findLastCompletelyVisibleItemPosition();
+        int childCount = linearLayoutManager.getChildCount();
+        int firstPosition = linearLayoutManager.findFirstVisibleItemPosition();
+        if (lastPosition >= firstPosition + childCount - 1) {
+            return true;
+        }
+        return false;
+    }
+
+    static class MemberAdapter extends RecyclerView.Adapter<MemberAdapter.MemberViewHolder> {
+
+        private List<GroupMemberInfo> data;
+
+        public void setData(List<GroupMemberInfo> data) {
+            this.data = data;
+        }
+
+        @NonNull
+        @Override
+        public MemberViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.chat_minimalist_group_receipt_member_item, parent, false);
+            return new MemberViewHolder(view);
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull MemberViewHolder holder, int position) {
+            GroupMemberInfo memberInfo = data.get(position);
+            GlideEngine.loadUserIcon(holder.face, memberInfo.getIconUrl());
+            holder.name.setText(getDisplayName(memberInfo));
+            holder.itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Bundle bundle = new Bundle();
+                    bundle.putString(TUIConstants.TUIChat.CHAT_ID, memberInfo.getAccount());
+                    TUICore.startActivity("FriendProfileMinimalistActivity", bundle);
+                }
+            });
+        }
+
+        @Override
+        public int getItemCount() {
+            if (data != null && !data.isEmpty()) {
+                return data.size();
+            }
+            return 0;
+        }
+
+        static class MemberViewHolder extends RecyclerView.ViewHolder {
+            private final ImageView face;
+            private final TextView name;
+
+            public MemberViewHolder(@NonNull View itemView) {
+                super(itemView);
+                face = itemView.findViewById(R.id.avatar_img);
+                name = itemView.findViewById(R.id.name_tv);
+            }
+        }
+
+        private String getDisplayName(GroupMemberInfo memberInfo) {
+            String displayName;
+            if (!TextUtils.isEmpty(memberInfo.getNameCard())) {
+                displayName = memberInfo.getNameCard();
+            } else if (!TextUtils.isEmpty(memberInfo.getFriendRemark())) {
+                displayName = memberInfo.getFriendRemark();
+            } else if (!TextUtils.isEmpty(memberInfo.getNickName())) {
+                displayName = memberInfo.getNickName();
+            } else {
+                displayName = memberInfo.getAccount();
+            }
+            return displayName;
+        }
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/TUIBaseChatMinimalistActivity.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/TUIBaseChatMinimalistActivity.java
new file mode 100644
index 0000000..372d9aa
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/TUIBaseChatMinimalistActivity.java
@@ -0,0 +1,140 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.page;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.imsdk.v2.V2TIMGroupAtInfo;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.component.activities.BaseMinimalistLightActivity;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.DraftInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageBuilder;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+import java.util.HashMap;
+import java.util.List;
+
+public abstract class TUIBaseChatMinimalistActivity extends BaseMinimalistLightActivity {
+
+    private static final String TAG = TUIBaseChatMinimalistActivity.class.getSimpleName();
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        TUIChatLog.i(TAG, "onCreate " + this);
+
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.chat_activity);
+        chat(getIntent());
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        TUIChatLog.i(TAG, "onNewIntent");
+        super.onNewIntent(intent);
+        chat(intent);
+    }
+
+    @Override
+    protected void onResume() {
+        TUIChatLog.i(TAG, "onResume");
+        super.onResume();
+    }
+
+    private void chat(Intent intent) {
+        Bundle bundle = intent.getExtras();
+        TUIChatLog.i(TAG, "bundle: " + bundle + " intent: " + intent);
+        if (!TUILogin.isUserLogined()) {
+            ToastUtil.toastShortMessage(getString(R.string.chat_tips_not_login));
+            finish();
+            return;
+        }
+
+        ChatInfo chatInfo = getChatInfo(intent);
+        TUIChatLog.i(TAG, "start chatActivity chatInfo: " + chatInfo);
+
+        if (chatInfo != null) {
+            initChat(chatInfo);
+        } else {
+            ToastUtil.toastShortMessage("init chat failed , chatInfo is empty.");
+            TUIChatLog.e(TAG, "init chat failed , chatInfo is empty.");
+            finish();
+        }
+    }
+
+    public abstract void initChat(ChatInfo chatInfo);
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == 3 && data != null) {
+            if (requestCode == 11) {
+                List<String> stringList = data.getStringArrayListExtra("list");
+                if (stringList != null && !stringList.isEmpty()) {
+                    String[] stringArray = stringList.toArray(new String[]{});
+                    data.putExtra(TUIConstants.TUICalling.PARAM_NAME_USERIDS, stringArray);
+                    HashMap<String, Object> hashMap = new HashMap<>();
+                    for (String key : data.getExtras().keySet()) {
+                        hashMap.put(key, data.getExtras().get(key));
+                    }
+                    TUICore.callService(TUIConstants.TUICalling.SERVICE_NAME,
+                            TUIConstants.TUICalling.METHOD_NAME_CALL, hashMap);
+                }
+            }
+        }
+
+    }
+
+    private ChatInfo getChatInfo(Intent intent) {
+        int chatType = intent.getIntExtra(TUIConstants.TUIChat.CHAT_TYPE, ChatInfo.TYPE_INVALID);
+        ChatInfo chatInfo;
+        if (chatType == ChatInfo.TYPE_C2C) {
+            chatInfo = new ChatInfo();
+        } else if (chatType == ChatInfo.TYPE_GROUP) {
+            chatInfo = new GroupInfo();
+        } else {
+            return null;
+        }
+        chatInfo.setType(chatType);
+        chatInfo.setId(intent.getStringExtra(TUIConstants.TUIChat.CHAT_ID));
+        chatInfo.setChatName(intent.getStringExtra(TUIConstants.TUIChat.CHAT_NAME));
+        DraftInfo draftInfo = new DraftInfo();
+        draftInfo.setDraftText(intent.getStringExtra(TUIConstants.TUIChat.DRAFT_TEXT));
+        draftInfo.setDraftTime(intent.getLongExtra(TUIConstants.TUIChat.DRAFT_TIME, 0));
+        chatInfo.setDraft(draftInfo);
+        chatInfo.setTopChat(intent.getBooleanExtra(TUIConstants.TUIChat.IS_TOP_CHAT, false));
+        V2TIMMessage v2TIMMessage = (V2TIMMessage) intent.getSerializableExtra(TUIConstants.TUIChat.LOCATE_MESSAGE);
+        TUIMessageBean messageInfo = ChatMessageBuilder.buildMessage(v2TIMMessage);
+        chatInfo.setLocateMessage(messageInfo);
+        chatInfo.setAtInfoList((List<V2TIMGroupAtInfo>) intent.getSerializableExtra(TUIConstants.TUIChat.AT_INFO_LIST));
+        chatInfo.setFaceUrl(intent.getStringExtra(TUIConstants.TUIChat.FACE_URL));
+
+        if (chatType == ChatInfo.TYPE_GROUP) {
+            GroupInfo groupInfo = (GroupInfo) chatInfo;
+            groupInfo.setGroupName(intent.getStringExtra(TUIConstants.TUIChat.GROUP_NAME));
+            groupInfo.setGroupType(intent.getStringExtra(TUIConstants.TUIChat.GROUP_TYPE));
+            groupInfo.setJoinType(intent.getIntExtra(TUIConstants.TUIChat.JOIN_TYPE, 0));
+            groupInfo.setMemberCount(intent.getIntExtra(TUIConstants.TUIChat.MEMBER_COUNT, 0));
+            groupInfo.setMessageReceiveOption(intent.getBooleanExtra(TUIConstants.TUIChat.RECEIVE_OPTION, false));
+            groupInfo.setNotice(intent.getStringExtra(TUIConstants.TUIChat.NOTICE));
+            groupInfo.setOwner(intent.getStringExtra(TUIConstants.TUIChat.OWNER));
+            groupInfo.setMemberDetails((List<GroupMemberInfo>) intent.getSerializableExtra(TUIConstants.TUIChat.MEMBER_DETAILS));
+            groupInfo.setIconUrlList((List<Object>) intent.getSerializableExtra(TUIConstants.TUIChat.FACE_URL_LIST));
+        }
+
+        if (TextUtils.isEmpty(chatInfo.getId())) {
+            return null;
+        }
+        return chatInfo;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/TUIBaseChatMinimalistFragment.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/TUIBaseChatMinimalistFragment.java
new file mode 100644
index 0000000..17deae7
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/TUIBaseChatMinimalistFragment.java
@@ -0,0 +1,504 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.page;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
+import android.webkit.MimeTypeMap;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.target.CustomTarget;
+import com.bumptech.glide.request.transition.Transition;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.component.fragments.BaseFragment;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.FileUtil;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CallingMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.component.AudioPlayer;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.CameraActivity;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.view.JCameraView;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.interfaces.OnItemClickListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.ChatView;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.input.InputView;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.MessageRecyclerView;
+import com.tencent.qcloud.tuikit.tuichat.presenter.ChatPresenter;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageBuilder;
+import com.tencent.qcloud.tuikit.tuichat.util.DataStoreUtil;
+import com.tencent.qcloud.tuikit.tuichat.util.PermissionHelper;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+public class TUIBaseChatMinimalistFragment extends BaseFragment {
+    private static final String TAG = TUIBaseChatMinimalistFragment.class.getSimpleName();
+
+
+    public static final int REQUEST_CODE_PHOTO = 1012;
+
+    public static TUIBaseChatMinimalistFragment fragment;
+
+    protected View baseView;
+
+    protected ChatView chatView;
+
+    private List<TUIMessageBean> mForwardSelectMsgInfos = null;
+    private int mForwardMode;
+    private boolean mOnlyForTranslation;
+
+    private MessageRecyclerView messageRecyclerView;
+    private int messageViewBackgroundHeight;
+    protected String mChatBackgroundUrl;
+    protected String mChatBackgroundThumbnailUrl;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        fragment = this;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        TUIChatLog.i(TAG, "oncreate view " + this);
+
+        baseView = inflater.inflate(R.layout.chat_minimalist_fragment, container, false);
+//        // TODO 通过api设置ChatLayout各种属性的样例
+//        // Example of setting various properties of ChatLayout through api
+//        ChatLayoutSetting helper = new ChatLayoutSetting(getActivity());
+//        helper.setGroupId(mChatInfo.getId());
+//        helper.customizeChatLayout(mChatLayout);
+        return baseView;
+    }
+
+    protected void initView() {
+        chatView = baseView.findViewById(R.id.chat_layout);
+        chatView.initDefault();
+
+        chatView.setOnBackClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+                imm.hideSoftInputFromWindow(chatView.getWindowToken(), 0);
+                getActivity().finish();
+            }
+        });
+
+        chatView.setForwardSelectActivityListener(new ChatView.ForwardSelectActivityListener(){
+            @Override
+            public void onStartForwardSelectActivity(int mode, List<TUIMessageBean> msgIds, boolean onlyForTranslation) {
+                mForwardMode = mode;
+                mForwardSelectMsgInfos = msgIds;
+                mOnlyForTranslation = onlyForTranslation;
+                Bundle bundle = new Bundle();
+                bundle.putInt(TUIChatConstants.FORWARD_MODE, mode);
+                TUICore.startActivity(TUIBaseChatMinimalistFragment.this, "TUIForwardSelectMinimalistActivity", bundle, TUIChatConstants.FORWARD_SELECT_ACTIVTY_CODE);
+
+            }
+        });
+
+        chatView.getMessageLayout().setOnItemClickListener(new OnItemClickListener() {
+            @Override
+            public void onMessageLongClick(View view, int position, TUIMessageBean message) {
+                chatView.getMessageLayout().showItemPopMenu(message, view);
+            }
+
+            @Override
+            public void onUserIconClick(View view, int position, TUIMessageBean message) {
+                if (null == message) {
+                    return;
+                }
+
+                Bundle bundle = new Bundle();
+                bundle.putString(TUIConstants.TUIChat.CHAT_ID, message.getSender());
+                TUICore.startActivity("FriendProfileMinimalistActivity", bundle);
+
+            }
+
+            @Override
+            public void onUserIconLongClick(View view, int position, TUIMessageBean message) {
+
+            }
+
+            @Override
+            public void onReEditRevokeMessage(View view, int position, TUIMessageBean messageInfo) {
+                if (messageInfo == null) {
+                    return;
+                }
+                int messageType = messageInfo.getMsgType();
+                if (messageType == V2TIMMessage.V2TIM_ELEM_TYPE_TEXT){
+                    chatView.getInputLayout().appendText(messageInfo.getV2TIMMessage().getTextElem().getText());
+                } else {
+                    TUIChatLog.e(TAG, "error type: " + messageType);
+                }
+            }
+
+            @Override
+            public void onRecallClick(View view, int position, TUIMessageBean messageInfo) {
+                if (messageInfo == null) {
+                    return;
+                }
+                CallingMessageBean callingMessageBean = (CallingMessageBean) messageInfo;
+                String callTypeString = "";
+                int callType = callingMessageBean.getCallType();
+                if (callType == CallingMessageBean.ACTION_ID_VIDEO_CALL) {
+                    callTypeString = TUIConstants.TUICalling.TYPE_VIDEO;
+                } else if (callType == CallingMessageBean.ACTION_ID_AUDIO_CALL) {
+                    callTypeString = TUIConstants.TUICalling.TYPE_AUDIO;
+                }
+                Map<String, Object> map = new HashMap<>();
+                map.put(TUIConstants.TUICalling.PARAM_NAME_USERIDS, new String[]{messageInfo.getUserId()});
+                map.put(TUIConstants.TUICalling.PARAM_NAME_TYPE, callTypeString);
+                TUICore.callService(TUIConstants.TUICalling.SERVICE_NAME, TUIConstants.TUICalling.METHOD_NAME_CALL, map);
+            }
+
+            @Override
+            public void onTextSelected(View view, int position, TUIMessageBean messageInfo) {
+                chatView.getMessageLayout().setSelectedPosition(position);
+                chatView.getMessageLayout().showItemPopMenu(messageInfo, view);
+            }
+
+            @Override
+            public void onTranslationLongClick(View view, int position, TUIMessageBean messageInfo) {
+                chatView.getMessageLayout().showTranslationItemPopMenu(position - 1, messageInfo, view);
+            }
+        });
+
+        chatView.getInputLayout().setOnInputViewListener(new InputView.OnInputViewListener() {
+            @Override
+            public void onStartGroupMemberSelectActivity() {
+                Bundle param = new Bundle();
+                param.putString(TUIChatConstants.GROUP_ID, getChatInfo().getId());
+                TUICore.startActivity(TUIBaseChatMinimalistFragment.this, "StartGroupMemberSelectActivity", param, 1);
+            }
+
+            @Override
+            public void onClickCapture() {
+                startCapture();
+            }
+
+            @Override
+            public void onUpdateChatBackground() {
+                setChatViewBackground(mChatBackgroundUrl);
+            }
+        });
+
+        messageRecyclerView = chatView.getMessageLayout();
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 1 && resultCode == 3) {
+            ArrayList<String> result_ids = data.getStringArrayListExtra(TUIChatConstants.Selection.USER_ID_SELECT);
+            ArrayList<String> result_names = data.getStringArrayListExtra(TUIChatConstants.Selection.USER_NAMECARD_SELECT);
+            chatView.getInputLayout().updateInputText(result_names, result_ids);
+        } else if (requestCode == TUIChatConstants.FORWARD_SELECT_ACTIVTY_CODE && resultCode == TUIChatConstants.FORWARD_SELECT_ACTIVTY_CODE) {
+            if (data != null) {
+                if (mForwardSelectMsgInfos == null || mForwardSelectMsgInfos.isEmpty()) {
+                    return;
+                }
+
+                HashMap<String, Boolean> chatMap = (HashMap<String, Boolean>) data.getSerializableExtra(TUIChatConstants.FORWARD_SELECT_CONVERSATION_KEY);
+                if (chatMap == null || chatMap.isEmpty()) {
+                    return;
+                }
+
+                for (Map.Entry<String, Boolean> entry : chatMap.entrySet()) {
+                    boolean isGroup = entry.getValue();
+                    String id = entry.getKey();
+                    String title = "";
+                    ChatInfo chatInfo = getChatInfo();
+                    if (chatInfo == null) {
+                        return;
+                    }
+                    if (TUIChatUtils.isGroupChat(chatInfo.getType())) {
+                        title = getString(R.string.forward_chats);
+                    } else {
+                        String senderName;
+                        String userNickName = TUIConfig.getSelfNickName();
+                        if (!TextUtils.isEmpty(userNickName)) {
+                            senderName = userNickName;
+                        } else {
+                            senderName = TUILogin.getLoginUser();
+                        }
+                        String chatName;
+                        if (!TextUtils.isEmpty(getChatInfo().getChatName())) {
+                            chatName = getChatInfo().getChatName();
+                        } else {
+                            chatName = getChatInfo().getId();
+                        }
+                        title = senderName + getString(R.string.and_text) + chatName + getString(R.string.forward_chats_c2c);                    }
+
+                    boolean selfConversation = false;
+                    if (id != null && id.equals(chatInfo.getId())) {
+                        selfConversation = true;
+                    }
+
+                    ChatPresenter chatPresenter = getPresenter();
+                    chatPresenter.forwardMessage(mForwardSelectMsgInfos, isGroup, id, title, mForwardMode, selfConversation, false, new IUIKitCallback() {
+                        @Override
+                        public void onSuccess(Object data) {
+                            TUIChatLog.v(TAG, "sendMessage onSuccess:");
+                        }
+
+                        @Override
+                        public void onError(String module, int errCode, String errMsg) {
+                            TUIChatLog.v(TAG, "sendMessage fail:" + errCode + "=" + errMsg);
+                            ToastUtil.toastLongMessage(getString(R.string.send_failed) + ", " + errMsg);
+                        }
+                    });
+                }
+            }
+        } else if (requestCode == REQUEST_CODE_PHOTO) {
+            if (resultCode != -1) {
+                return;
+            }
+            onCaptureResult(data);
+        }
+    }
+
+    public ChatInfo getChatInfo() {
+        return null;
+    }
+    
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (getPresenter() != null) {
+            getPresenter().setChatFragmentShow(true);
+        }
+        initChatViewBackground();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (chatView != null) {
+            if (chatView.getInputLayout() != null) {
+                chatView.getInputLayout().setDraft();
+            }
+
+            if (getPresenter() != null) {
+                getPresenter().setChatFragmentShow(false);
+            }
+        }
+        AudioPlayer.getInstance().stopPlay();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        if (chatView != null) {
+            chatView.exitChat();
+        }
+    }
+
+    public ChatPresenter getPresenter() {
+        return null;
+    }
+
+    protected void initChatViewBackground() {
+        if (getChatInfo() == null) {
+            TUIChatLog.e(TAG, "initChatViewBackground getChatInfo is null");
+            return;
+        }
+        DataStoreUtil.getInstance().getValueAsync(getChatInfo().getId(), new DataStoreUtil.GetResult<String>() {
+            @Override
+            public void onSuccess(String result) {
+                setChatViewBackground(result);
+            }
+
+            @Override
+            public void onFail() {
+                TUIChatLog.e(TAG, "initChatViewBackground onFail");
+            }
+        }, String.class);
+    }
+
+    protected void setChatViewBackground(String uri){
+        TUIChatLog.d(TAG, "setChatViewBackground uri = " + uri);
+        if (TextUtils.isEmpty(uri)) {
+            return;
+        }
+
+        if (chatView == null) {
+            TUIChatLog.e(TAG, "setChatViewBackground chatview is null");
+            return;
+        }
+
+        if (messageRecyclerView == null) {
+            TUIChatLog.e(TAG, "setChatViewBackground messageRecyclerView is null");
+            return;
+        }
+
+        String[] list = uri.split(",");
+        if (list.length > 0) {
+            mChatBackgroundThumbnailUrl = list[0];
+        }
+
+        if (list.length > 1) {
+            mChatBackgroundUrl = list[1];
+        }
+
+        if (TextUtils.equals(TUIConstants.TUIChat.CHAT_CONVERSATION_BACKGROUND_DEFAULT_URL, mChatBackgroundUrl)) {
+            mChatBackgroundThumbnailUrl = TUIConstants.TUIChat.CHAT_CONVERSATION_BACKGROUND_DEFAULT_URL;
+            messageRecyclerView.setBackgroundResource(R.color.chat_background_color);
+            return;
+        }
+
+        messageRecyclerView.post(new Runnable() {
+            @Override
+            public void run() {
+                int imageWidth = messageRecyclerView.getWidth();
+                int imageHeight = messageRecyclerView.getHeight();
+                if (imageHeight > messageViewBackgroundHeight) {
+                    messageViewBackgroundHeight = imageHeight;
+                }
+                TUIChatLog.d(TAG, "messageRecyclerView  width = " + imageWidth + ", height = " + messageViewBackgroundHeight);
+                if (imageWidth == 0 || messageViewBackgroundHeight == 0) {
+                    return;
+                }
+                Glide.with(getContext()).asBitmap().load(mChatBackgroundUrl).into(new CustomTarget<Bitmap>(imageWidth, messageViewBackgroundHeight) {
+                    @Override
+                    public void onResourceReady(@NonNull Bitmap resource, @Nullable Transition<? super Bitmap> transition) {
+                        TUIChatLog.d(TAG, "messageRecyclerView onGlobalLayout url = " + mChatBackgroundUrl);
+                        Bitmap srcBitmap = zoomImg(resource, imageWidth, messageViewBackgroundHeight);
+                        messageRecyclerView.setBackground(new BitmapDrawable(getResources(), resource) {
+                            @Override
+                            public void draw(@NonNull Canvas canvas) {
+                                // TUIChatLog.d(TAG, "draw canvas =" + canvas.getClipBounds());
+                                canvas.drawBitmap(srcBitmap, canvas.getClipBounds(), canvas.getClipBounds(), null);
+                            }
+                        });
+                    }
+
+                    @Override
+                    public void onLoadCleared(@Nullable Drawable placeholder) {
+
+                    }
+                });
+            }
+        });
+    }
+
+    private Bitmap zoomImg(Bitmap bm, int targetWidth, int targetHeight) {
+        int srcWidth = bm.getWidth();
+        int srcHeight = bm.getHeight();
+        float widthScale = targetWidth * 1.0f / srcWidth;
+        float heightScale = targetHeight * 1.0f / srcHeight;
+        Matrix matrix = new Matrix();
+        matrix.postScale(widthScale, heightScale, 0, 0);
+        Bitmap bmpRet = Bitmap.createBitmap(targetWidth, targetHeight, Bitmap.Config.RGB_565);
+        Canvas canvas = new Canvas(bmpRet);
+        Paint paint = new Paint();
+        canvas.drawBitmap(bm, matrix, paint);
+        return bmpRet;
+    }
+
+
+    protected void startCapture() {
+        PermissionHelper.requestPermission(PermissionHelper.PERMISSION_CAMERA, new PermissionHelper.PermissionCallback() {
+            @Override
+            public void onGranted() {
+                Intent captureIntent = new Intent(getContext(), CameraActivity.class);
+                captureIntent.putExtra(TUIChatConstants.CAMERA_TYPE, JCameraView.BUTTON_STATE_ONLY_CAPTURE);
+                CameraActivity.mCallBack = new IUIKitCallback() {
+                    @Override
+                    public void onSuccess(Object data) {
+                        Uri contentUri = Uri.fromFile(new File(data.toString()));
+                        TUIMessageBean msg = ChatMessageBuilder.buildImageMessage(contentUri);
+                        chatView.sendMessage(msg, false);
+                        chatView.getInputLayout().hideSoftInput();
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+
+                    }
+                };
+
+                startActivityForResult(captureIntent, REQUEST_CODE_PHOTO);
+            }
+
+            @Override
+            public void onDenied() {
+                TUIChatLog.i(TAG, "startCapture checkPermission failed");
+            }
+        });
+    }
+
+    private void onCaptureResult(Intent intent) {
+        TUIChatLog.i(TAG, "onSuccess: " + intent);
+        Uri data = intent.getData();
+        if (data == null){
+            TUIChatLog.e(TAG, "data is null");
+            return;
+        }
+
+        String uri = data.toString();
+        if (TextUtils.isEmpty(uri)){
+            TUIChatLog.e(TAG, "uri is empty");
+            return;
+        }
+
+        String fileName = FileUtil.getFileName(TUIChatService.getAppContext(), (Uri) data);
+        String fileExtension = FileUtil.getFileExtensionFromUrl(fileName);
+        String mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileExtension);
+        if (TextUtils.isEmpty(mimeType)) {
+            TUIChatLog.e(TAG, "mimeType is empty.");
+            return;
+        }
+        if (mimeType.contains("video")){
+            String videoPath = FileUtil.getPathFromUri((Uri) data);
+            TUIMessageBean msg = chatView.getInputLayout().buildVideoMessage(videoPath);
+            if (msg == null){
+                ToastUtil.toastShortMessage(getResources().getString(R.string.send_failed_file_not_exists));
+                TUIChatLog.e(TAG, "start send video error data: " + data);
+            } else {
+                chatView.sendMessage(msg, false);
+                chatView.getInputLayout().hideSoftInput();
+            }
+        } else if (mimeType.contains("image")){
+            TUIMessageBean info = ChatMessageBuilder.buildImageMessage((Uri) data);
+            if (info == null) {
+                TUIChatLog.e(TAG, "start send image error data: " + data);
+                ToastUtil.toastShortMessage(getResources().getString(R.string.send_failed_file_not_exists));
+                return;
+            }
+            chatView.sendMessage(info, false);
+            chatView.getInputLayout().hideSoftInput();
+        } else {
+            TUIChatLog.e(TAG, "Send photo or video failed , invalid mimeType : " + mimeType);
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/TUIC2CChatMinimalistActivity.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/TUIC2CChatMinimalistActivity.java
new file mode 100644
index 0000000..9b69832
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/TUIC2CChatMinimalistActivity.java
@@ -0,0 +1,35 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.page;
+
+import android.os.Bundle;
+
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.presenter.C2CChatPresenter;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+public class TUIC2CChatMinimalistActivity extends TUIBaseChatMinimalistActivity {
+    private static final String TAG = TUIC2CChatMinimalistActivity.class.getSimpleName();
+
+    private TUIC2CChatMinimalistFragment chatFragment;
+    private C2CChatPresenter presenter;
+    @Override
+    public void initChat(ChatInfo chatInfo) {
+        TUIChatLog.i(TAG, "inti chat " + chatInfo);
+
+        if (!TUIChatUtils.isC2CChat(chatInfo.getType())) {
+            TUIChatLog.e(TAG, "init C2C chat failed , chatInfo = " + chatInfo);
+            ToastUtil.toastShortMessage("init c2c chat failed.");
+        }
+        chatFragment = new TUIC2CChatMinimalistFragment();
+        Bundle bundle = new Bundle();
+        bundle.putSerializable(TUIChatConstants.CHAT_INFO, chatInfo);
+        chatFragment.setArguments(bundle);
+        presenter = new C2CChatPresenter();
+        presenter.initListener();
+        chatFragment.setPresenter(presenter);
+        getSupportFragmentManager().beginTransaction().replace(R.id.empty_view, chatFragment).commitAllowingStateLoss();
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/TUIC2CChatMinimalistFragment.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/TUIC2CChatMinimalistFragment.java
new file mode 100644
index 0000000..0a43392
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/TUIC2CChatMinimalistFragment.java
@@ -0,0 +1,74 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.page;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.presenter.C2CChatPresenter;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+public class TUIC2CChatMinimalistFragment extends TUIBaseChatMinimalistFragment {
+    private static final String TAG = TUIC2CChatMinimalistFragment.class.getSimpleName();
+
+    private ChatInfo chatInfo;
+    private C2CChatPresenter presenter;
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        TUIChatLog.i(TAG, "oncreate view " + this);
+
+        baseView = super.onCreateView(inflater, container, savedInstanceState);
+        Bundle bundle = getArguments();
+        if (bundle == null) {
+            return baseView;
+        }
+        chatInfo = (ChatInfo) bundle.getSerializable(TUIChatConstants.CHAT_INFO);
+        if (chatInfo == null) {
+            return baseView;
+        }
+
+        initView();
+
+        return baseView;
+    }
+
+    @Override
+    protected void initView() {
+        super.initView();
+
+        chatView.setOnAvatarClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Bundle bundle = new Bundle();
+                bundle.putString(TUIConstants.TUIChat.CHAT_ID, chatInfo.getId());
+                bundle.putString(TUIConstants.TUIChat.CHAT_BACKGROUND_URI, mChatBackgroundThumbnailUrl);
+                TUICore.startActivity("FriendProfileMinimalistActivity", bundle);
+            }
+        });
+
+        chatView.setPresenter(presenter);
+        presenter.setChatInfo(chatInfo);
+        chatView.setChatInfo(chatInfo);
+    }
+
+    public void setPresenter(C2CChatPresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    @Override
+    public C2CChatPresenter getPresenter() {
+        return presenter;
+    }
+
+    @Override
+    public ChatInfo getChatInfo() {
+        return chatInfo;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/TUIForwardChatMinimalistActivity.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/TUIForwardChatMinimalistActivity.java
new file mode 100644
index 0000000..f21e1e0
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/TUIForwardChatMinimalistActivity.java
@@ -0,0 +1,91 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.page;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.tencent.qcloud.tuicore.component.CustomLinearLayoutManager;
+import com.tencent.qcloud.tuicore.component.activities.BaseMinimalistLightActivity;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.MergeMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.interfaces.OnItemClickListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.MessageAdapter;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.MessageRecyclerView;
+import com.tencent.qcloud.tuikit.tuichat.presenter.ForwardPresenter;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+public class TUIForwardChatMinimalistActivity extends BaseMinimalistLightActivity {
+
+    private static final String TAG = TUIForwardChatMinimalistActivity.class.getSimpleName();
+
+    private MessageRecyclerView mFowardChatMessageRecyclerView;
+    private MessageAdapter mForwardChatAdapter;
+
+    private View backBtn;
+    private MergeMessageBean mMessageInfo;
+    private ChatInfo chatInfo;
+
+    private ForwardPresenter presenter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.chat_minimalist_forward_layout);
+        mFowardChatMessageRecyclerView = (MessageRecyclerView) findViewById(R.id.chat_message_layout);
+        mFowardChatMessageRecyclerView.setLayoutManager(new CustomLinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
+        mForwardChatAdapter = new MessageAdapter();
+        mForwardChatAdapter.setForwardMode(true);
+        presenter = new ForwardPresenter();
+        presenter.setMessageListAdapter(mForwardChatAdapter);
+        presenter.setNeedShowTranslation(false);
+        mForwardChatAdapter.setPresenter(presenter);
+
+        mFowardChatMessageRecyclerView.setAdapter(mForwardChatAdapter);
+        mFowardChatMessageRecyclerView.setPresenter(presenter);
+        backBtn = findViewById(R.id.back_btn_area);
+        backBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
+        mFowardChatMessageRecyclerView.setOnItemClickListener(new OnItemClickListener() {
+
+            @Override
+            public void onUserIconClick(View view, int position, TUIMessageBean messageInfo) {
+                if (!(messageInfo instanceof MergeMessageBean)) {
+                    return;
+                }
+
+                Intent intent = new Intent(getBaseContext(), TUIForwardChatMinimalistActivity.class);
+                Bundle bundle=new Bundle();
+                bundle.putSerializable(TUIChatConstants.FORWARD_MERGE_MESSAGE_KEY, messageInfo);
+                intent.putExtras(bundle);
+                startActivity(intent);
+            }
+        });
+
+        init();
+    }
+
+    private void init(){
+        Intent intent = getIntent();
+        if (intent != null) {
+            mMessageInfo = (MergeMessageBean) intent.getSerializableExtra(TUIChatConstants.FORWARD_MERGE_MESSAGE_KEY);
+            chatInfo = (ChatInfo) intent.getSerializableExtra(TUIChatConstants.CHAT_INFO);
+            if (null == mMessageInfo) {
+                TUIChatLog.e(TAG, "mMessageInfo is null");
+                return;
+            }
+            presenter.setChatInfo(chatInfo);
+            presenter.downloadMergerMessage(mMessageInfo);
+        }
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/TUIGroupChatMinimalistActivity.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/TUIGroupChatMinimalistActivity.java
new file mode 100644
index 0000000..94be2a3
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/TUIGroupChatMinimalistActivity.java
@@ -0,0 +1,39 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.page;
+
+import android.os.Bundle;
+
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuichat.presenter.GroupChatPresenter;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+public class TUIGroupChatMinimalistActivity extends TUIBaseChatMinimalistActivity {
+    private static final String TAG = TUIGroupChatMinimalistActivity.class.getSimpleName();
+
+    private TUIGroupChatMinimalistFragment chatFragment;
+    private GroupChatPresenter presenter;
+
+    @Override
+    public void initChat(ChatInfo chatInfo) {
+        TUIChatLog.i(TAG, "inti chat " + chatInfo);
+
+        if (!TUIChatUtils.isGroupChat(chatInfo.getType())) {
+            TUIChatLog.e(TAG, "init group chat failed , chatInfo = " + chatInfo);
+            ToastUtil.toastShortMessage("init group chat failed.");
+        }
+        GroupInfo groupInfo = (GroupInfo) chatInfo;
+
+        chatFragment = new TUIGroupChatMinimalistFragment();
+        Bundle bundle = new Bundle();
+        bundle.putSerializable(TUIChatConstants.CHAT_INFO, groupInfo);
+        chatFragment.setArguments(bundle);
+        presenter = new GroupChatPresenter();
+        presenter.initListener();
+        chatFragment.setPresenter(presenter);
+        getSupportFragmentManager().beginTransaction().replace(R.id.empty_view, chatFragment).commitAllowingStateLoss();
+    }
+}
\ No newline at end of file
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/TUIGroupChatMinimalistFragment.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/TUIGroupChatMinimalistFragment.java
new file mode 100644
index 0000000..4df6dad
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/page/TUIGroupChatMinimalistFragment.java
@@ -0,0 +1,141 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.page;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.interfaces.OnItemClickListener;
+import com.tencent.qcloud.tuikit.tuichat.presenter.GroupChatPresenter;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+public class TUIGroupChatMinimalistFragment extends TUIBaseChatMinimalistFragment {
+    private static final String TAG = TUIGroupChatMinimalistFragment.class.getSimpleName();
+
+    private GroupChatPresenter presenter;
+    private GroupInfo groupInfo;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        TUIChatLog.i(TAG, "oncreate view " + this);
+
+        baseView = super.onCreateView(inflater, container, savedInstanceState);
+        Bundle bundle = getArguments();
+        if (bundle == null) {
+            return baseView;
+        }
+        groupInfo = (GroupInfo) bundle.getSerializable(TUIChatConstants.CHAT_INFO);
+        if (groupInfo == null) {
+            return baseView;
+        }
+
+        initView();
+        return baseView;
+    }
+
+    @Override
+    protected void initView() {
+        super.initView();
+        chatView.setPresenter(presenter);
+        presenter.setGroupInfo(groupInfo);
+        chatView.setChatInfo(groupInfo);
+        chatView.getMessageLayout().setOnItemClickListener(new OnItemClickListener() {
+            @Override
+            public void onMessageLongClick(View view, int position, TUIMessageBean messageBean) {
+                chatView.getMessageLayout().showItemPopMenu(messageBean, view);
+            }
+
+            @Override
+            public void onUserIconClick(View view, int position, TUIMessageBean messageBean) {
+                if (null == messageBean) {
+                    return;
+                }
+
+                ChatInfo info = new ChatInfo();
+                info.setId(messageBean.getSender());
+
+                Bundle bundle = new Bundle();
+                bundle.putString(TUIConstants.TUIChat.CHAT_ID, info.getId());
+                TUICore.startActivity("FriendProfileMinimalistActivity", bundle);
+
+            }
+
+            @Override
+            public void onUserIconLongClick(View view, int position, TUIMessageBean messageBean) {
+                String result_id = messageBean.getV2TIMMessage().getSender();
+                String result_name = messageBean.getV2TIMMessage().getNickName();
+                chatView.getInputLayout().addInputText(result_name, result_id);
+            }
+
+            @Override
+            public void onReEditRevokeMessage(View view, int position, TUIMessageBean messageInfo) {
+                if (messageInfo == null) {
+                    return;
+                }
+                int messageType = messageInfo.getMsgType();
+                if (messageType == V2TIMMessage.V2TIM_ELEM_TYPE_TEXT){
+                    chatView.getInputLayout().appendText(messageInfo.getV2TIMMessage().getTextElem().getText());
+                } else {
+                    TUIChatLog.e(TAG, "error type: " + messageType);
+                }
+            }
+
+            @Override
+            public void onRecallClick(View view, int position, TUIMessageBean messageInfo) {
+
+            }
+
+            @Override
+            public void onTextSelected(View view, int position, TUIMessageBean messageInfo) {
+                chatView.getMessageLayout().setSelectedPosition(position);
+                chatView.getMessageLayout().showItemPopMenu(messageInfo, view);
+            }
+
+            @Override
+            public void onTranslationLongClick(View view, int position, TUIMessageBean messageInfo) {
+                chatView.getMessageLayout().showTranslationItemPopMenu(position - 1, messageInfo, view);
+            }
+        });
+
+        chatView.setOnAvatarClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (TUIChatUtils.isTopicGroup(groupInfo.getId())) {
+                    Bundle bundle = new Bundle();
+                    bundle.putString(TUIConstants.TUICommunity.TOPIC_ID, groupInfo.getId());
+                    TUICore.startActivity(getContext(), "TopicInfoActivity", bundle);
+                } else {
+                    Bundle bundle = new Bundle();
+                    bundle.putString(TUIChatConstants.Group.GROUP_ID, groupInfo.getId());
+                    bundle.putString(TUIConstants.TUIChat.CHAT_BACKGROUND_URI, mChatBackgroundThumbnailUrl);
+                    TUICore.startActivity(getContext(), "GroupInfoMinimalistActivity", bundle);
+                }
+            }
+        });
+    }
+
+    public void setPresenter(GroupChatPresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    @Override
+    public GroupChatPresenter getPresenter() {
+        return presenter;
+    }
+
+    @Override
+    public ChatInfo getChatInfo() {
+        return groupInfo;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/setting/ChatLayoutSetting.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/setting/ChatLayoutSetting.java
new file mode 100644
index 0000000..9e37d9a
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/setting/ChatLayoutSetting.java
@@ -0,0 +1,259 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.setting;
+
+import android.content.Context;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+import android.widget.FrameLayout;
+
+import com.google.gson.Gson;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.bean.CustomHelloMessage;
+import com.tencent.qcloud.tuikit.tuichat.bean.InputMoreActionUnit;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.config.TUIChatConfigs;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.ChatView;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.input.InputView;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.MessageRecyclerView;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageBuilder;
+
+public class ChatLayoutSetting {
+
+    private static final String TAG = ChatLayoutSetting.class.getSimpleName();
+
+    private Context mContext;
+    private String groupId;
+
+    public ChatLayoutSetting(Context context) {
+        mContext = context;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
+    public void customizeMessageLayout(final MessageRecyclerView messageRecyclerView) {
+        if (messageRecyclerView == null) {
+            return;
+        }
+    }
+
+    public void customizeChatLayout(final ChatView layout) {
+
+//        //====== NoticeLayout使用范例 ======//
+          //====== NoticeLayout example======//
+//        NoticeLayout noticeLayout = layout.getNoticeLayout();
+//        noticeLayout.alwaysShow(true);
+//        noticeLayout.getContent().setText("现在插播一条广告");
+//        noticeLayout.getContentExtra().setText("参看有奖");
+//        noticeLayout.setOnNoticeClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                ToastUtil.toastShortMessage("赏白银五千两");
+//            }
+//        });
+
+        // 设置聊天界面自定义视图为安全提示
+        // Set custom view of chat interface as security prompt
+        ViewGroup customNoticeLayout = TUIChatConfigs.getConfigs().getNoticeLayoutConfig().getCustomNoticeLayout();
+        FrameLayout customView = layout.getCustomView();
+        if (customNoticeLayout != null && customView.getVisibility() == View.GONE) {
+            ViewParent viewParent = customNoticeLayout.getParent();
+            if (viewParent instanceof ViewGroup) {
+                ViewGroup parentView = (ViewGroup) viewParent;
+                parentView.removeAllViews();
+            }
+            customView.addView(customNoticeLayout);
+            customView.setVisibility(View.VISIBLE);
+        }
+
+
+        //====== MessageLayout使用范例 ======//
+        //====== MessageLayout example ======//
+        MessageRecyclerView messageRecyclerView = layout.getMessageLayout();
+//        ////// 设置聊天背景 Set chat background//////
+//        messageRecyclerView.setBackground(new ColorDrawable(0xFFEFE5D4));
+//        ////// 设置头像 Set Avatar//////
+//        // 设置默认头像，默认与朋友与自己的头像相同
+          // Set the default avatar, the default is the same as your friend's and your own avatar
+//        messageRecyclerView.setAvatar(R.drawable.ic_more_file);
+//        // 设置头像圆角 Set avatar rounded corners
+        messageRecyclerView.setAvatarRadius(100);
+//        // 设置头像大小 Set avatar size
+//        messageRecyclerView.setAvatarSize(new int[]{48, 48});
+//
+//        ////// 设置昵称样式（对方与自己的样式保持一致）//////
+//        ////// Set the nickname style (the other party is consistent with their own style) //////
+//        messageRecyclerView.setNameFontSize(12);
+//        messageRecyclerView.setNameFontColor(0xFF8B5A2B);
+//
+//        ////// 设置气泡 set bubbles///////
+//        // 设置自己聊天气泡的背景
+//        // Set the background of your own chat bubble
+//        messageRecyclerView.setRightBubble(new ColorDrawable(0xFFCCE4FC));
+//        // 设置朋友聊天气泡的背景
+//        // Set the background of friends chat bubbles
+//        messageRecyclerView.setLeftBubble(new ColorDrawable(0xFFE4E7EB));
+//
+//        ////// 设置聊天内容 Set up chat content//////
+//        // 设置聊天内容字体字体大小，朋友和自己用一种字体大小
+//        // Set the font size of chat content, friends and yourself use a font size
+//        messageRecyclerView.setChatContextFontSize(15);
+//        // 设置自己聊天内容字体颜色
+//        // Set your own chat content font color
+//        messageRecyclerView.setRightChatContentFontColor(0xFFA9A9A9);
+//        // 设置朋友聊天内容字体颜色
+//        // Set friend chat content font color
+//        messageRecyclerView.setLeftChatContentFontColor(0xFFA020F0);
+//
+//        ////// 设置聊天时间 Set chat time//////
+//        // 设置聊天时间线的背景
+//        // Set the background of the chat timeline
+//        messageRecyclerView.setChatTimeBubble(new ColorDrawable(0xFFE4E7EB));
+//        // 设置聊天时间的字体大小
+//        // Set the font size of chat time
+//        messageRecyclerView.setChatTimeFontSize(12);
+//        // 设置聊天时间的字体颜色
+//        // Set the font color of chat time
+//        messageRecyclerView.setChatTimeFontColor(0xFF7E848C);
+//
+//        ////// 设置聊天的提示信息 Set up chat alerts//////
+//        // 设置提示的背景
+//        // Set the background of the prompt
+//        messageRecyclerView.setTipsMessageBubble(new ColorDrawable(0xFFE4E7EB));
+//        // 设置提示的字体大小
+//        // Set the font size of the prompt
+//        messageRecyclerView.setTipsMessageFontSize(12);
+//        // 设置提示的字体颜色
+//        // Set the font color of the prompt
+//        messageRecyclerView.setTipsMessageFontColor(0xFF7E848C);
+//
+
+//
+//        // 新增一个PopMenuAction
+//        // Add a PopMenuAction
+//        PopMenuAction action = new PopMenuAction();
+//        action.setActionName("test");
+//        action.setActionClickListener(new PopActionClickListener() {
+//            @Override
+//            public void onActionClick(int position, Object data) {
+//                ToastUtil.toastShortMessage("新增一个pop action");
+//            }
+//        });
+//        messageRecyclerView.addPopAction(action);
+//
+//        final MessageRecyclerView.OnItemClickListener l = messageRecyclerView.getOnItemClickListener();
+//        messageRecyclerView.setOnItemClickListener(new MessageRecyclerView.OnItemClickListener() {
+//            @Override
+//            public void onMessageLongClick(View view, int position, MessageInfo messageInfo) {
+//                l.onMessageLongClick(view, position, messageInfo);
+//                ToastUtil.toastShortMessage("demo中自定义长按item");
+//            }
+//
+//            @Override
+//            public void onUserIconClick(View view, int position, MessageInfo messageInfo) {
+//                l.onUserIconClick(view, position, messageInfo);
+//                ToastUtil.toastShortMessage("demo中自定义点击头像");
+//            }
+//        });
+
+
+        //====== InputLayout使用范例 ======//
+        //====== InputLayout example ======//
+        final InputView inputView = layout.getInputLayout();
+
+//        // TODO 隐藏音频输入的入口，可以打开下面代码测试
+//        // To hide the entrance of audio input, you can open the following code to test
+//        inputView.disableAudioInput(true);
+//        // TODO 隐藏表情输入的入口，可以打开下面代码测试
+//        // To hide the entry of expression input, you can open the following code test
+//        inputView.disableEmojiInput(true);
+//        // TODO 隐藏更多功能的入口，可以打开下面代码测试
+//        // To hide the entrance of more functions, you can open the following code test
+//        inputView.disableMoreInput(true);
+//        // TODO 可以用自定义的事件来替换更多功能的入口，可以打开下面代码测试
+//        // You can replace the entry of more functions with custom events, you can open the following code test
+//        inputView.replaceMoreInput(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                ToastUtil.toastShortMessage("自定义的更多功能按钮事件");
+//                MessageInfo info = ChatMessageInfoUtil.buildTextMessage("自定义的消息");
+//                layout.sendMessage(info, false);
+//            }
+//        });
+//        // TODO 可以用自定义的fragment来替换更多功能，可以打开下面代码测试
+//        // You can replace more functions with custom fragments, you can open the following code to test
+//        inputView.replaceMoreInput(new CustomInputFragment().setChatLayout(layout));
+//
+//        // TODO 可以disable更多面板上的各个功能，可以打开下面代码测试
+//        // You can disable various functions on more panels, you can open the following code test
+//        inputView.disableCaptureAction(true);
+//        inputView.disableSendFileAction(true);
+//        inputView.disableSendPhotoAction(true);
+//        inputView.disableVideoRecordAction(true);
+
+        // TODO 可以自己增加一些功能，可以打开下面代码测试
+        // You can add some functions yourself, you can open the following code to test
+
+        // 增加一个欢迎提示富文本
+        // Add a welcome prompt with rich text
+        InputMoreActionUnit unit = new InputMoreActionUnit() {};
+        unit.setIconResId(R.drawable.chat_minimalist_more_action_custom_icon);
+        unit.setTitleId(R.string.test_custom_action);
+        unit.setActionId(CustomHelloMessage.CUSTOM_HELLO_ACTION_ID);
+        unit.setPriority(10);
+        unit.setOnClickListener(unit.new OnActionClickListener() {
+            @Override
+            public void onClick() {
+                Gson gson = new Gson();
+                CustomHelloMessage customHelloMessage = new CustomHelloMessage();
+                customHelloMessage.version = TUIChatConstants.version;
+
+                String data = gson.toJson(customHelloMessage);
+                TUIMessageBean info = ChatMessageBuilder.buildCustomMessage(data, customHelloMessage.text, customHelloMessage.text.getBytes());
+                layout.sendMessage(info, false);
+            }
+        });
+        inputView.addAction(unit);
+    }
+
+//    public static class CustomInputFragment extends BaseInputFragment {
+//        @Nullable
+//        @Override
+//        public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+//            View baseView = inflater.inflate(R.layout.test_chat_input_custom_fragment, container, false);
+//            Button btn1 = baseView.findViewById(R.id.test_send_message_btn1);
+//            btn1.setOnClickListener(new View.OnClickListener() {
+//                @Override
+//                public void onClick(View v) {
+//                    ToastUtil.toastShortMessage("自定义的按钮1");
+//                    if (getChatLayout() != null) {
+//                        Gson gson = new Gson();
+//                        CustomHelloMessage customHelloMessage = new CustomHelloMessage();
+//                        String data = gson.toJson(customHelloMessage);
+//                        MessageInfo info = ChatMessageInfoUtil.buildCustomMessage(data);
+//                        getChatLayout().sendMessage(info, false);
+//                    }
+//                }
+//            });
+//            Button btn2 = baseView.findViewById(R.id.test_send_message_btn2);
+//            btn2.setOnClickListener(new View.OnClickListener() {
+//                @Override
+//                public void onClick(View v) {
+//                    ToastUtil.toastShortMessage("自定义的按钮2");
+//                    if (getChatLayout() != null) {
+//                        Gson gson = new Gson();
+//                        CustomHelloMessage customHelloMessage = new CustomHelloMessage();
+//                        String data = gson.toJson(customHelloMessage);
+//                        MessageInfo info = ChatMessageInfoUtil.buildCustomMessage(data);
+//                        getChatLayout().sendMessage(info, false);
+//                    }
+//                }
+//            });
+//            return baseView;
+//        }
+
+//    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/ChatView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/ChatView.java
new file mode 100644
index 0000000..feb706c
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/ChatView.java
@@ -0,0 +1,1396 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget;
+
+import android.app.Activity;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Color;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.TextPaint;
+import android.text.TextUtils;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
+import android.text.style.ForegroundColorSpan;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
+import com.google.gson.Gson;
+import com.tencent.imsdk.v2.V2TIMGroupAtInfo;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuicore.component.dialog.TUIKitDialog;
+import com.tencent.qcloud.tuicore.component.gatherimage.SynthesizedImageView;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.BackgroundTasks;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.GroupApplyInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageTyping;
+import com.tencent.qcloud.tuikit.tuichat.bean.ReplyPreviewBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.UserStatusBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ReplyMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.component.AudioPlayer;
+import com.tencent.qcloud.tuikit.tuichat.component.AudioRecorder;
+import com.tencent.qcloud.tuikit.tuichat.component.face.Emoji;
+import com.tencent.qcloud.tuikit.tuichat.component.progress.ProgressPresenter;
+import com.tencent.qcloud.tuikit.tuichat.config.TUIChatConfigs;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.dialog.ChatBottomSelectSheet;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.noticelayout.NoticeLayout;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.interfaces.IChatLayout;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.page.MessageDetailMinimalistActivity;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.setting.ChatLayoutSetting;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.input.InputView;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.MessageAdapter;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.MessageRecyclerView;
+import com.tencent.qcloud.tuikit.tuichat.presenter.C2CChatPresenter;
+import com.tencent.qcloud.tuikit.tuichat.presenter.ChatPresenter;
+import com.tencent.qcloud.tuikit.tuichat.presenter.GroupChatPresenter;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageBuilder;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+public class ChatView extends LinearLayout  implements IChatLayout {
+    private static final String TAG = ChatView.class.getSimpleName();
+    // 逐条转发消息数量限制
+    // Limit the number of messages forwarded one by one
+    private static final int FORWARD_MSG_NUM_LIMIT = 30;
+    protected static final int CALL_MEMBER_LIMIT = 8;
+
+    protected MessageAdapter mAdapter;
+    private ForwardSelectActivityListener mForwardSelectActivityListener;
+
+    private ChatInfo mChatInfo;
+
+    protected FrameLayout mCustomView;
+    protected NoticeLayout mGroupApplyLayout;
+    protected View mRecordingGroup;
+    protected TextView mRecordingTips;
+    private MessageRecyclerView mMessageRecyclerView;
+    private InputView mInputView;
+    private NoticeLayout mNoticeLayout;
+    private LinearLayout mJumpMessageLayout;
+    private ImageView mArrowImageView;
+    private TextView mJumpMessageTextView;
+    private boolean mJumpNewMessageShow;
+    private boolean mJumpGroupAtInfoShow;
+    private boolean mClickLastMessageShow;
+
+    private View forwardArea;
+    private View forwardButton;
+    private View deleteButton;
+    private View forwardCancelButton;
+    private ChatBottomSelectSheet forwardSelectSheet;
+    private TextView forwardText;
+    private long lastTypingTime = 0;
+    private boolean isSupportTyping = false;
+
+    private View voiceCallBtn;
+    private View videoCallBtn;
+    private View chatHeaderBackBtn;
+    private TextView chatName;
+    private TextView chatDescription;
+    private SynthesizedImageView chatAvatar;
+    private View userNameArea;
+    private OnClickListener onBackClickListener;
+    private OnClickListener onAvatarClickListener;
+    private ChatPresenter presenter;
+
+    public ChatView(Context context) {
+        super(context);
+        initViews();
+    }
+
+    public ChatView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        initViews();
+    }
+
+    public ChatView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initViews();
+    }
+
+    private void initViews() {
+        inflate(getContext(), R.layout.chat_minimalist_layout, this);
+
+        mMessageRecyclerView = findViewById(R.id.chat_message_layout);
+        mInputView = findViewById(R.id.chat_input_layout);
+        mInputView.setChatLayout(this);
+        mRecordingGroup = findViewById(R.id.voice_recording_view);
+        mRecordingTips = findViewById(R.id.recording_tips);
+        mGroupApplyLayout = findViewById(R.id.chat_group_apply_layout);
+        mNoticeLayout = findViewById(R.id.chat_notice_layout);
+        mCustomView = findViewById(R.id.custom_layout);
+        mCustomView.setVisibility(GONE);
+
+        forwardArea = findViewById(R.id.forward_area);
+        forwardButton = findViewById(R.id.forward_image);
+        deleteButton = findViewById(R.id.delete_image);
+        forwardText = findViewById(R.id.forward_select_text);
+        forwardCancelButton = findViewById(R.id.forward_cancel_btn);
+
+        mJumpMessageLayout = findViewById(R.id.jump_message_layout);
+        mJumpMessageTextView = findViewById(R.id.jump_message_content);
+        mArrowImageView = findViewById(R.id.arrow_icon);
+        mJumpNewMessageShow = false;
+        hideJumpMessageLayouts();
+
+        voiceCallBtn = findViewById(R.id.voice_call);
+        videoCallBtn = findViewById(R.id.video_call);
+        chatName = findViewById(R.id.chat_name);
+        chatDescription = findViewById(R.id.chat_description);
+        chatAvatar = findViewById(R.id.avatar_img);
+        chatHeaderBackBtn = findViewById(R.id.back_btn);
+        userNameArea = findViewById(R.id.user_name_area);
+
+        lastTypingTime = 0;
+        isSupportTyping = false;
+    }
+
+    public void displayBackToLastMessages(String messageId) {
+        mJumpMessageLayout.setVisibility(VISIBLE);
+        mArrowImageView.setBackgroundResource(R.drawable.chat_minimalist_jump_down_icon);
+        mJumpMessageTextView.setVisibility(GONE);
+        mJumpMessageLayout.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                locateOriginMessage(messageId);
+                mClickLastMessageShow = true;
+            }
+        });
+    }
+
+    public void displayBackToNewMessages(String messageId, int count) {
+        mJumpNewMessageShow = true;
+        mJumpMessageLayout.setVisibility(VISIBLE);
+        mArrowImageView.setBackgroundResource(R.drawable.chat_minimalist_jump_down_icon);
+        mJumpMessageTextView.setVisibility(VISIBLE);
+        mJumpMessageTextView.setText(String.valueOf(count));
+        mJumpMessageLayout.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                locateOriginMessage(messageId);
+                presenter.markMessageAsRead(mChatInfo);
+                mJumpNewMessageShow = false;
+                presenter.resetNewMessageCount();
+            }
+        });
+    }
+
+    public void displayBackToAtMessages(List<V2TIMGroupAtInfo> groupAtInfos) {
+        mJumpGroupAtInfoShow = true;
+        mJumpMessageLayout.setVisibility(VISIBLE);
+        mArrowImageView.setBackgroundResource(R.drawable.chat_minimalist_jump_at_icon);
+        int atTimes = groupAtInfos.size();
+        mJumpMessageTextView.setText(atTimes + "");
+        mJumpMessageTextView.setVisibility(VISIBLE);
+        mJumpMessageLayout.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                locateOriginMessageBySeq(groupAtInfos.get(0).getSeq());
+                hideJumpMessageLayouts();
+                mJumpGroupAtInfoShow = false;
+            }
+        });
+    }
+
+    public void hideJumpMessageLayouts() {
+        mJumpMessageLayout.setVisibility(GONE);
+    }
+
+    public void hideBackToAtMessages() {
+        if (mJumpGroupAtInfoShow) {
+            mJumpGroupAtInfoShow = false;
+            hideJumpMessageLayouts();
+        }
+    }
+
+    private void initGroupAtInfoLayout() {
+        if (mChatInfo != null) {
+            List<V2TIMGroupAtInfo> groupAtInfos = mChatInfo.getAtInfoList();
+            if (groupAtInfos != null && groupAtInfos.size() > 0) {
+                displayBackToAtMessages(groupAtInfos);
+            } else {
+                TUIChatLog.d(TAG, "initGroupAtInfoLayout groupAtInfos == null");
+                mJumpGroupAtInfoShow = false;
+                hideJumpMessageLayouts();
+            }
+        } else {
+            TUIChatLog.d(TAG, "initGroupAtInfoLayout mChatInfo == null");
+            mJumpGroupAtInfoShow = false;
+            hideJumpMessageLayouts();
+        }
+    }
+
+    private void locateOriginMessageBySeq(long seq) {
+        presenter.locateMessageBySeq(mChatInfo.getId(), seq, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                hideJumpMessageLayouts();
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                hideJumpMessageLayouts();
+                ToastUtil.toastShortMessage(getContext().getString(R.string.locate_origin_msg_failed_tip));
+            }
+        });
+    }
+
+    private void locateOriginMessage(String originMsgId) {
+        if (TextUtils.isEmpty(originMsgId)) {
+            ToastUtil.toastShortMessage(getContext().getString(R.string.locate_origin_msg_failed_tip));
+            return;
+        }
+        presenter.locateMessage(originMsgId, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                hideJumpMessageLayouts();
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                hideJumpMessageLayouts();
+                ToastUtil.toastShortMessage(getContext().getString(R.string.locate_origin_msg_failed_tip));
+            }
+        });
+        hideJumpMessageLayouts();
+    }
+
+    public void setPresenter(ChatPresenter presenter) {
+        this.presenter = presenter;
+        mMessageRecyclerView.setPresenter(presenter);
+        mInputView.setPresenter(presenter);
+        presenter.setMessageListAdapter(mAdapter);
+        mAdapter.setPresenter(presenter);
+        presenter.setMessageRecycleView(mMessageRecyclerView);
+    }
+
+    public void setOnBackClickListener(OnClickListener onBackClickListener) {
+        this.onBackClickListener = onBackClickListener;
+    }
+
+    public void setOnAvatarClickListener(OnClickListener onAvatarClickListener) {
+        this.onAvatarClickListener = onAvatarClickListener;
+    }
+
+    public void setChatInfo(ChatInfo chatInfo) {
+        mChatInfo = chatInfo;
+        if (chatInfo == null) {
+            return;
+        }
+        mInputView.setChatInfo(chatInfo);
+        setChatHandler();
+
+        if (!TUIChatUtils.isC2CChat(chatInfo.getType())) {
+            loadApplyList();
+            mGroupApplyLayout.setOnNoticeClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    Bundle bundle = new Bundle();
+                    bundle.putString(TUIChatConstants.GROUP_ID, chatInfo.getId());
+                    TUICore.startActivity(getContext(), "GroupApplyManagerMinimalistActivity", bundle);
+                }
+            });
+        }
+        mMessageRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+                LinearLayoutManager linearLayoutManager = (LinearLayoutManager) getMessageLayout().getLayoutManager();
+                int firstVisiblePosition = linearLayoutManager.findFirstCompletelyVisibleItemPosition();
+                int lastVisiblePosition = linearLayoutManager.findLastCompletelyVisibleItemPosition();
+                sendMsgReadReceipt(firstVisiblePosition, lastVisiblePosition);
+            }
+        });
+
+        mMessageRecyclerView.setMenuEmojiOnClickListener(new MessageRecyclerView.OnMenuEmojiClickListener() {
+            @Override
+            public void onClick(Emoji emoji, TUIMessageBean messageBean) {
+                reactMessage(emoji, messageBean);
+            }
+        });
+
+        loadMessages(chatInfo.getLocateMessage(), chatInfo.getLocateMessage() == null ? TUIChatConstants.GET_MESSAGE_FORWARD : TUIChatConstants.GET_MESSAGE_TWO_WAY);
+        initHeader();
+
+    }
+
+    private void initHeader() {
+        initCall();
+        chatName.setText(mChatInfo.getChatName());
+        if (TUIChatUtils.isGroupChat(mChatInfo.getType())) {
+            String chatId = mChatInfo.getId();
+            chatAvatar.setImageId(chatId);
+            chatAvatar.displayImage(mChatInfo.getIconUrlList()).load(chatId);
+            ((GroupChatPresenter) presenter).loadGroupMembers(mChatInfo.getId(), new IUIKitCallback<List<GroupMemberInfo>>() {
+                @Override
+                public void onSuccess(List<GroupMemberInfo> data) {
+                    StringBuilder builder = new StringBuilder();
+                    for (GroupMemberInfo memberInfo : data) {
+                        builder.append(memberInfo.getDisplayName());
+                        builder.append("、");
+                    }
+                    builder.deleteCharAt(builder.lastIndexOf("、"));
+                    chatDescription.setText(builder);
+                }
+
+                @Override
+                public void onError(String module, int errCode, String errMsg) {
+                    chatDescription.setText(R.string.chat_user_status_unknown);
+                }
+            });
+        } else {
+            Glide.with(this)
+                    .load(mChatInfo.getFaceUrl())
+                    .apply(new RequestOptions()
+                            .error(com.tencent.qcloud.tuicore.R.drawable.core_default_user_icon_light)
+                            .placeholder(com.tencent.qcloud.tuicore.R.drawable.core_default_user_icon_light))
+                    .into(chatAvatar);
+            presenter.loadUserStatus(Collections.singletonList(mChatInfo.getId()), new IUIKitCallback<Map<String, UserStatusBean>>() {
+                @Override
+                public void onSuccess(Map<String, UserStatusBean> data) {
+                    UserStatusBean statusBean = data.get(mChatInfo.getId());
+                    if (statusBean == null || statusBean.getOnlineStatus() != UserStatusBean.STATUS_ONLINE) {
+                        chatDescription.setText(R.string.chat_user_status_offline);
+                    } else {
+                        chatDescription.setText(R.string.chat_user_status_online);
+                    }
+                }
+
+                @Override
+                public void onError(String module, int errCode, String errMsg) {
+                    chatDescription.setText(R.string.chat_user_status_unknown);
+                }
+            });
+
+        }
+        chatAvatar.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onHeaderUserClick(v);
+            }
+        });
+
+        userNameArea.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onHeaderUserClick(v);
+            }
+        });
+
+        chatHeaderBackBtn.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (onBackClickListener != null) {
+                    onBackClickListener.onClick(v);
+                }
+            }
+        });
+    }
+
+    private void onHeaderUserClick(View v) {
+        if (onAvatarClickListener != null) {
+            onAvatarClickListener.onClick(v);
+        }
+    }
+
+    private void initCall() {
+        // topic not support call yet.
+        if (TUIChatUtils.isTopicGroup(mChatInfo.getId())) {
+            return;
+        }
+
+        HashMap<String, Object> param = new HashMap<>();
+        param.put(TUIConstants.TUIChat.CHAT_ID, mChatInfo.getId());
+        param.put(TUIConstants.TUIChat.CHAT_NAME, mChatInfo.getChatName());
+        param.put(TUIConstants.TUIChat.CHAT_TYPE, mChatInfo.getType());
+        param.put(TUIConstants.TUIChat.CONTEXT, getContext());
+
+        Map<String, Object> voiceCallExtension = TUICore.getExtensionInfo(TUIConstants.TUIChat.EXTENSION_INPUT_MORE_AUDIO_CALL, param);
+        if (voiceCallExtension != null && TUIChatConfigs.getConfigs().getGeneralConfig().isEnableVoiceCall()) {
+            voiceCallBtn.setVisibility(VISIBLE);
+        }
+
+        Map<String, Object> videoCallExtension = TUICore.getExtensionInfo(TUIConstants.TUIChat.EXTENSION_INPUT_MORE_VIDEO_CALL, param);
+        if (videoCallExtension != null && TUIChatConfigs.getConfigs().getGeneralConfig().isEnableVideoCall()) {
+            videoCallBtn.setVisibility(VISIBLE);
+        }
+
+        voiceCallBtn.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                startCall(TUIConstants.TUICalling.ACTION_ID_AUDIO_CALL);
+            }
+        });
+
+        videoCallBtn.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                startCall(TUIConstants.TUICalling.ACTION_ID_VIDEO_CALL);
+            }
+        });
+    }
+
+    private void startCall(int callActionType) {
+        if (callActionType == TUIConstants.TUICalling.ACTION_ID_AUDIO_CALL || callActionType == TUIConstants.TUICalling.ACTION_ID_VIDEO_CALL) {
+            String type = callActionType == TUIConstants.TUICalling.ACTION_ID_AUDIO_CALL ? TUIConstants.TUICalling.TYPE_AUDIO
+                    : TUIConstants.TUICalling.TYPE_VIDEO;
+            if (TUIChatUtils.isGroupChat(getChatInfo().getType())) {
+                Bundle bundle = new Bundle();
+                bundle.putString(TUIConstants.TUICalling.GROUP_ID, getChatInfo().getId());
+                bundle.putString(TUIConstants.TUICalling.PARAM_NAME_TYPE, type);
+                bundle.putString(TUIChatConstants.GROUP_ID, getChatInfo().getId());
+                bundle.putBoolean(TUIChatConstants.SELECT_FOR_CALL, true);
+                bundle.putInt(TUIChatConstants.Selection.LIMIT, CALL_MEMBER_LIMIT);
+                TUICore.startActivity(getContext(), "StartGroupMemberSelectMinimalistActivity", bundle, 11);
+            } else {
+                Map<String, Object> map = new HashMap<>();
+                map.put(TUIConstants.TUICalling.PARAM_NAME_USERIDS, new String[]{getChatInfo().getId()});
+                map.put(TUIConstants.TUICalling.PARAM_NAME_TYPE, type);
+                TUICore.callService(TUIConstants.TUICalling.SERVICE_NAME, TUIConstants.TUICalling.METHOD_NAME_CALL, map);
+            }
+        }
+    }
+
+    private void sendMsgReadReceipt(int firstPosition, int lastPosition) {
+        if (mAdapter == null || presenter == null) {
+            return;
+        }
+        List<TUIMessageBean> tuiMessageBeans = mAdapter.getItemList(firstPosition, lastPosition);
+        presenter.sendMessageReadReceipt(tuiMessageBeans, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                if (errCode == TUIConstants.BuyingFeature.ERR_SDK_INTERFACE_NOT_SUPPORT) {
+                    showNotSupportDialog();
+                }
+            }
+        });
+    }
+
+    private void setChatHandler() {
+        if (presenter instanceof GroupChatPresenter) {
+            presenter.setChatNotifyHandler(new ChatPresenter.ChatNotifyHandler() {
+                @Override
+                public void onGroupForceExit() {
+                    ChatView.this.onExitChat();
+                }
+
+                @Override
+                public void onGroupNameChanged(String newName) {
+                    ChatView.this.onGroupNameChanged(newName);
+                }
+
+                @Override
+                public void onGroupFaceUrlChanged(String faceUrl) {
+                    Glide.with(getContext())
+                            .load(faceUrl)
+                            .apply(new RequestOptions()
+                                    .error(com.tencent.qcloud.tuicore.R.drawable.core_default_user_icon_light)
+                                    .placeholder(com.tencent.qcloud.tuicore.R.drawable.core_default_user_icon_light))
+                            .into(chatAvatar);
+                }
+
+                @Override
+                public void onApplied(int size) {
+                    ChatView.this.onApplied(size);
+                }
+
+                @Override
+                public void onExitChat(String chatId) {
+                    ChatView.this.onExitChat();
+                }
+            });
+        } else if (presenter instanceof C2CChatPresenter) {
+            presenter.setChatNotifyHandler(new ChatPresenter.ChatNotifyHandler() {
+                @Override
+                public void onExitChat(String chatId) {
+                    ChatView.this.onExitChat();
+                }
+
+                @Override
+                public void onFriendNameChanged(String newName) {
+                    if (isActivityDestroyed()) {
+                        return;
+                    }
+                    ChatView.this.onFriendNameChanged(newName);
+                }
+
+                @Override
+                public void onFriendFaceUrlChanged(String faceUrl) {
+                    if (isActivityDestroyed()) {
+                        return;
+                    }
+                    Glide.with(getContext())
+                            .load(faceUrl)
+                            .apply(new RequestOptions()
+                                    .error(com.tencent.qcloud.tuicore.R.drawable.core_default_user_icon_light)
+                                    .placeholder(com.tencent.qcloud.tuicore.R.drawable.core_default_user_icon_light))
+                            .into(chatAvatar);
+                }
+            });
+        }
+    }
+
+    private boolean isActivityDestroyed() {
+        Context context = getContext();
+        if (context instanceof Activity) {
+            if (((Activity) context).isFinishing() || ((Activity) context).isDestroyed()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void loadApplyList() {
+        presenter.loadApplyList(new IUIKitCallback<List<GroupApplyInfo>>() {
+            @Override
+            public void onSuccess(List<GroupApplyInfo> data) {
+                if (data != null && data.size() > 0) {
+                    mGroupApplyLayout.getContent().setText(getContext().getString(R.string.group_apply_tips, data.size()));
+                    mGroupApplyLayout.setVisibility(View.VISIBLE);
+                }
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIChatLog.e(TAG, "loadApplyList onError: " + errMsg);
+            }
+        });
+    }
+
+    public void onExitChat() {
+        if (getContext() instanceof Activity) {
+            ((Activity) getContext()).finish();
+        }
+    }
+
+    public void onGroupNameChanged(String newName) {
+        chatName.setText(newName);
+    }
+
+    public void onFriendNameChanged(String newName) {
+        chatName.setText(newName);
+    }
+
+    public void onApplied(int size) {
+        if (size == 0) {
+            mGroupApplyLayout.setVisibility(View.GONE);
+        } else {
+            mGroupApplyLayout.getContent().setText(getContext().getString(R.string.group_apply_tips, size));
+            mGroupApplyLayout.setVisibility(View.VISIBLE);
+        }
+    }
+
+    public void loadMessages(TUIMessageBean lastMessage, int type) {
+        if (presenter != null) {
+            presenter.loadMessage(type, lastMessage);
+        }
+    }
+
+    @Override
+    public InputView getInputLayout() {
+        return mInputView;
+    }
+
+    @Override
+    public MessageRecyclerView getMessageLayout() {
+        return mMessageRecyclerView;
+    }
+
+    @Override
+    public NoticeLayout getNoticeLayout() {
+        return mNoticeLayout;
+    }
+
+    public FrameLayout getCustomView() {
+        return mCustomView;
+    }
+
+    @Override
+    public ChatInfo getChatInfo() {
+        return mChatInfo;
+    }
+
+    private void initListener() {
+        getMessageLayout().setPopActionClickListener(new MessageRecyclerView.OnPopActionClickListener() {
+            @Override
+            public void onCopyClick(TUIMessageBean msg) {
+                ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+                if (clipboard == null || msg == null) {
+                    return;
+                }
+                String copyContent = msg.getSelectText();
+                ClipData clip = ClipData.newPlainText("message", copyContent);
+                clipboard.setPrimaryClip(clip);
+
+                if (!TextUtils.isEmpty(copyContent)) {
+                    String copySuccess = getResources().getString(R.string.copy_success_tip);
+                    ToastUtil.toastShortMessage(copySuccess);
+                }
+            }
+
+            @Override
+            public void onSendMessageClick(TUIMessageBean msg, boolean retry) {
+                sendMessage(msg, retry);
+            }
+
+            @Override
+            public void onDeleteMessageClick(TUIMessageBean msg) {
+                TUIKitDialog tipsDialog = new TUIKitDialog(getContext())
+                        .builder()
+                        .setCancelable(true)
+                        .setCancelOutside(true)
+                        .setTitle(getContext().getString(R.string.chat_delete_msg_tip))
+                        .setDialogWidth(0.75f)
+                        .setPositiveButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.sure), new OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                deleteMessage(msg);
+                            }
+                        })
+                        .setNegativeButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.cancel), new OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+
+                            }
+                        });
+                tipsDialog.show();
+            }
+
+            @Override
+            public void onRevokeMessageClick(TUIMessageBean msg) {
+                revokeMessage(msg);
+            }
+
+            @Override
+            public void onMultiSelectMessageClick(TUIMessageBean msg) {
+                multiSelectMessage(msg);
+            }
+
+            @Override
+            public void onForwardMessageClick(TUIMessageBean msg){
+                forwardMessage(msg, false);
+            }
+
+            @Override
+            public void onReplyMessageClick(TUIMessageBean msg) {
+                replyMessage(msg);
+            }
+
+            @Override
+            public void onQuoteMessageClick(TUIMessageBean msg) {
+                quoteMessage(msg);
+            }
+
+            @Override
+            public void onInfoMessageClick(TUIMessageBean msg) {
+                showMessageInfo(msg);
+            }
+
+            @Override
+            public void onTranslateMessageClick(TUIMessageBean msg) {
+                translateMessage(msg);
+            }
+        });
+        getMessageLayout().setTranslationPopActionClickListener(new MessageRecyclerView.OnTranslationPopActionClickListener() {
+            @Override
+            public void onCopyTranslationClick(String translationContent) {
+                ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
+                if (clipboard == null || TextUtils.isEmpty(translationContent)) {
+                    return;
+                }
+                ClipData clip = ClipData.newPlainText("message", translationContent);
+                clipboard.setPrimaryClip(clip);
+                String copySuccess = getResources().getString(R.string.copy_success_tip);
+                ToastUtil.toastShortMessage(copySuccess);
+            }
+
+            @Override
+            public void onForwardTranslationClick(TUIMessageBean msg) {
+                forwardMessage(msg, true);
+            }
+
+            @Override
+            public void onHideTranslationClick(TUIMessageBean msg) {
+                msg.setTranslationStatus(TUIMessageBean.MSG_TRANSLATE_STATUS_HIDDEN);
+                presenter.updateTranslationMessage(msg);
+            }
+        });
+        getMessageLayout().setLoadMoreMessageHandler(new MessageRecyclerView.OnLoadMoreHandler() {
+            @Override
+            public void loadMore(int type) {
+                loadMessages(type);
+            }
+
+            @Override
+            public boolean isListEnd(int position) {
+                return getMessageLayout().isLastItemVisibleCompleted();
+            }
+
+            @Override
+            public void displayBackToLastMessage(boolean display) {
+                if (mJumpNewMessageShow) {
+                    return;
+                }
+                if (display) {
+                    if (mAdapter != null) {
+                        TUIMessageBean messageBean = null;
+                        for (int i = mAdapter.getItemCount() - 1; i >= 0; i--) {
+                            TUIMessageBean tuiMessageBean = mAdapter.getItem(i);
+                            if (tuiMessageBean == null || tuiMessageBean.getStatus() == TUIMessageBean.MSG_STATUS_REVOKE) {
+                                continue;
+                            } else {
+                                messageBean = mAdapter.getItem(i);
+                                break;
+                            }
+                        }
+
+                        if (messageBean != null) {
+                            displayBackToLastMessages(messageBean.getId());
+                        } else {
+                            TUIChatLog.e(TAG, "displayJumpLayout messageBean is null");
+                        }
+                    } else {
+                        TUIChatLog.e(TAG, "displayJumpLayout mAdapter is null");
+                    }
+                } else {
+                    hideJumpMessageLayouts();
+                }
+            }
+
+            @Override
+            public void displayBackToNewMessage(boolean display, String messageId, int count) {
+                if (display) {
+                    displayBackToNewMessages(messageId, count);
+                } else {
+                    mJumpNewMessageShow = false;
+                    hideJumpMessageLayouts();
+                }
+            }
+
+            @Override
+            public void hideBackToAtMessage() {
+                hideBackToAtMessages();
+            }
+
+            @Override
+            public void loadMessageFinish() {
+                initGroupAtInfoLayout();
+            }
+
+            @Override
+            public void scrollMessageFinish() {
+                if (mClickLastMessageShow && mMessageRecyclerView != null) {
+                    mClickLastMessageShow = false;
+                    mMessageRecyclerView.setHighShowPosition(-1);
+                }
+            }
+        });
+        getMessageLayout().setEmptySpaceClickListener(new MessageRecyclerView.OnEmptySpaceClickListener() {
+            @Override
+            public void onClick() {
+                getInputLayout().onEmptyClick();
+            }
+        });
+
+        getInputLayout().setChatInputHandler(new InputView.ChatInputHandler() {
+            @Override
+            public void onInputAreaClick() {
+                post(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (presenter != null) {
+                            presenter.scrollToNewestMessage();
+                        }
+                    }
+                });
+            }
+
+            @Override
+            public void onRecordStatusChanged(int status) {
+                switch (status) {
+                    case RECORD_START:
+                        startRecording();
+                        break;
+                    case RECORD_STOP:
+                        stopRecording();
+                        break;
+                    case RECORD_CANCEL:
+                        cancelRecording();
+                        break;
+                    case RECORD_TOO_SHORT:
+                    case RECORD_FAILED:
+                        stopAbnormally(status);
+                        break;
+                    default:
+                        break;
+                }
+            }
+
+            @Override
+            public void onUserTyping(boolean status, long curTime) {
+                if (!TUIChatConfigs.getConfigs().getGeneralConfig().isEnableMessageTyping()) {
+                    return;
+                }
+
+                if (!isSupportTyping) {
+                    if (!isSupportTyping(curTime)) {
+                        TUIChatLog.d(TAG, "onUserTyping trigger condition not met");
+                        return;
+                    } else {
+                        isSupportTyping = true;
+                    }
+                }
+
+                if (!status) {
+                    sendTypingStatusMessage(false);
+                    return;
+                }
+
+                if (lastTypingTime != 0) {
+                    if ((curTime - lastTypingTime) < TUIChatConstants.TYPING_SEND_MESSAGE_INTERVAL) {
+                        return;
+                    }
+                }
+
+                lastTypingTime = curTime;
+                sendTypingStatusMessage(true);
+            }
+
+            private void startRecording() {
+                post(new Runnable() {
+                    @Override
+                    public void run() {
+                        AudioPlayer.getInstance().stopPlay();
+                        mRecordingGroup.setVisibility(View.VISIBLE);
+                        mRecordingTips.setText(TUIChatService.getAppContext().getString(R.string.left_cancle_send));
+                    }
+                });
+            }
+
+            private void stopRecording() {
+                postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        mRecordingGroup.setVisibility(View.GONE);
+                    }
+                }, 500);
+            }
+
+            private void stopAbnormally(final int status) {
+                post(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (status == RECORD_TOO_SHORT) {
+                            mRecordingTips.setText(TUIChatService.getAppContext().getString(R.string.say_time_short));
+                        } else {
+                            mRecordingTips.setText(TUIChatService.getAppContext().getString(R.string.record_fail));
+                        }
+                    }
+                });
+                postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        mRecordingGroup.setVisibility(View.GONE);
+                    }
+                }, 1000);
+            }
+
+            private void cancelRecording() {
+                post(new Runnable() {
+                    @Override
+                    public void run() {
+                        mRecordingTips.setText(TUIChatService.getAppContext().getString(R.string.up_cancle_send));
+                    }
+                });
+            }
+        });
+
+        forwardCancelButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                resetForwardState();
+            }
+        });
+
+    }
+
+    public boolean isSupportTyping(long time) {
+        return presenter.isSupportTyping(time);
+    }
+
+    @Override
+    public void initDefault() {
+        getInputLayout().setMessageHandler(new InputView.MessageHandler() {
+            @Override
+            public void sendMessage(TUIMessageBean msg) {
+                if (msg instanceof ReplyMessageBean) {
+                    ChatView.this.sendReplyMessage(msg, false);
+                } else {
+                    ChatView.this.sendMessage(msg, false);
+                }
+            }
+
+            @Override
+            public void scrollToEnd() {
+                ChatView.this.scrollToEnd();
+            }
+        });
+        getInputLayout().clearCustomActionList();
+        if (getMessageLayout().getAdapter() == null) {
+            mAdapter = new MessageAdapter();
+            mMessageRecyclerView.setAdapter(mAdapter);
+        }
+        ChatLayoutSetting chatLayoutSetting = new ChatLayoutSetting(getContext());
+        chatLayoutSetting.customizeChatLayout(this);
+        initListener();
+        resetForwardState();
+    }
+
+    public void scrollToEnd() {
+        getMessageLayout().scrollToEnd();
+    }
+
+    @Override
+    public void loadMessages(int type) {
+        if (type == TUIChatConstants.GET_MESSAGE_FORWARD) {
+            loadMessages(mAdapter.getItemCount() > 0 ? mAdapter.getItem(1) : null, type);
+        } else if (type == TUIChatConstants.GET_MESSAGE_BACKWARD){
+            loadMessages(mAdapter.getItemCount() > 0 ? mAdapter.getItem(mAdapter.getItemCount() -1) : null, type);
+        }
+    }
+
+    protected void deleteMessage(TUIMessageBean msg) {
+        presenter.deleteMessage(msg);
+    }
+
+    protected void deleteMessages(final List<Integer> positions) {
+        presenter.deleteMessages(positions);
+    }
+
+    protected void deleteMessageInfos(final List<TUIMessageBean> msgIds) {
+        presenter.deleteMessageInfos(msgIds);
+    }
+
+    protected boolean checkFailedMessageInfos(final List<TUIMessageBean> msgIds){
+        return presenter.checkFailedMessageInfos(msgIds);
+    }
+
+    protected void revokeMessage(TUIMessageBean msg) {
+        presenter.revokeMessage(msg);
+    }
+
+    protected void multiSelectMessage(TUIMessageBean msg) {
+        if(mAdapter != null){
+            mInputView.hideSoftInput();
+            mAdapter.setShowMultiSelectCheckBox(true);
+            mAdapter.setOnCheckListChangedListener(new MessageAdapter.OnCheckListChangedListener() {
+                @Override
+                public void onCheckListChanged(List<TUIMessageBean> checkedList) {
+                    int size = checkedList != null ? checkedList.size() : 0;
+                    forwardText.setText(getResources().getString(R.string.chat_forward_checked_num, size));
+                }
+            });
+            mAdapter.setItemChecked(msg.getId(), true);
+            mAdapter.notifyDataSetChanged();
+            setTitleBarWhenMultiSelectMessage();
+        }
+    }
+
+    protected void forwardMessage(TUIMessageBean msg, boolean onlyForTranslation) {
+        if (mAdapter != null) {
+            mInputView.hideSoftInput();
+            mAdapter.setItemChecked(msg.getId(), true);
+            mAdapter.notifyDataSetChanged();
+            showForwardDialog(false, true, onlyForTranslation);
+        }
+    }
+
+    // Reply Message need MessageRootId
+    protected void replyMessage(TUIMessageBean messageBean) {
+        ReplyPreviewBean replyPreviewBean = ChatMessageBuilder.buildReplyPreviewBean(messageBean);
+        mInputView.showReplyPreview(replyPreviewBean);
+    }
+
+    // Quote Message not need MessageRootId
+    protected void quoteMessage(TUIMessageBean messageBean) {
+        ReplyPreviewBean replyPreviewBean = ChatMessageBuilder.buildReplyPreviewBean(messageBean);
+        replyPreviewBean.setMessageRootID(null);
+        mInputView.showReplyPreview(replyPreviewBean);
+    }
+
+    protected void reactMessage(Emoji emoji, TUIMessageBean messageBean) {
+        presenter.reactMessage(emoji.getFaceKey(), messageBean);
+    }
+
+    protected void translateMessage(TUIMessageBean messageBean) {
+        presenter.translateMessage(messageBean);
+    }
+
+    protected void showMessageInfo(TUIMessageBean messageBean) {
+        Intent intent = new Intent(getContext(), MessageDetailMinimalistActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.putExtra(TUIChatConstants.MESSAGE_BEAN, messageBean);
+        intent.putExtra(TUIChatConstants.CHAT_INFO, presenter.getChatInfo());
+        getContext().startActivity(intent);
+    }
+
+    private void resetForwardState(){
+        if(mAdapter != null){
+            mAdapter.setShowMultiSelectCheckBox(false);
+            mAdapter.notifyDataSetChanged();
+        }
+        forwardArea.setVisibility(GONE);
+        forwardText.setText("");
+        getInputLayout().setVisibility(VISIBLE);
+    }
+
+    private void setTitleBarWhenMultiSelectMessage(){
+        getInputLayout().setVisibility(GONE);
+        forwardArea.setVisibility(VISIBLE);
+        requestFocus();
+        forwardButton.setOnClickListener(new OnClickListener(){
+            @Override
+            public void onClick(View v) {
+                forwardSelectSheet = new ChatBottomSelectSheet(getContext());
+                List<String> stringList = new ArrayList<>();
+                String forwardOneByOne = getResources().getString(R.string.forward_mode_onebyone);
+                String forwardMerge = getResources().getString(R.string.forward_mode_merge);
+                stringList.add(forwardOneByOne);
+                stringList.add(forwardMerge);
+                forwardSelectSheet.setSelectList(stringList);
+                forwardSelectSheet.setOnClickListener(new ChatBottomSelectSheet.BottomSelectSheetOnClickListener() {
+                    @Override
+                    public void onSheetClick(int index) {
+                        if (index == 0) {
+                            showForwardDialog(true, true, false);
+                        } else if (index == 1) {
+                            showForwardDialog(true, false, false);
+                        }
+                    }
+                });
+                forwardSelectSheet.show();
+            }
+
+        });
+
+        deleteButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                final List<TUIMessageBean> messageInfoList = mAdapter.getSelectedItem();
+                if (messageInfoList == null || messageInfoList.isEmpty()) {
+                    return;
+                }
+                TUIKitDialog tipsDialog = new TUIKitDialog(getContext())
+                        .builder()
+                        .setCancelable(true)
+                        .setCancelOutside(true)
+                        .setTitle(getContext().getString(R.string.chat_delete_msg_tip))
+                        .setDialogWidth(0.75f)
+                        .setPositiveButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.sure), new OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                final List<TUIMessageBean> messageInfoList = mAdapter.getSelectedItem();
+                                deleteMessageInfos(messageInfoList);
+                                resetForwardState();
+                            }
+                        })
+                        .setNegativeButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.cancel), new OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+
+                            }
+                        });
+                tipsDialog.show();
+            }
+        });
+    }
+
+    private void showForwardDialog(boolean isMultiSelect, boolean isOneByOne, boolean onlyForTranslation) {
+        if (mAdapter == null){
+            return;
+        }
+
+        final List<TUIMessageBean> messageInfoList = mAdapter.getSelectedItem();
+
+        if(messageInfoList == null || messageInfoList.isEmpty()){
+            ToastUtil.toastShortMessage(getContext().getString(R.string.forward_tip));
+            return;
+        }
+
+        if(!onlyForTranslation && checkFailedMessageInfos(messageInfoList)){
+            ToastUtil.toastShortMessage(getContext().getString(R.string.forward_failed_tip));
+            return;
+        }
+
+        if (!isMultiSelect) {
+            mAdapter.setShowMultiSelectCheckBox(false);
+        }
+
+        if (isOneByOne) {
+            if (messageInfoList.size() > FORWARD_MSG_NUM_LIMIT) {
+                showForwardLimitDialog(messageInfoList);
+            } else {
+                startSelectForwardActivity(TUIChatConstants.FORWARD_MODE_ONE_BY_ONE, messageInfoList, onlyForTranslation);
+                resetForwardState();
+            }
+        } else {
+            startSelectForwardActivity(TUIChatConstants.FORWARD_MODE_MERGE, messageInfoList, onlyForTranslation);
+            resetForwardState();
+        }
+    }
+
+    private void showForwardLimitDialog(final List<TUIMessageBean> messageInfoList) {
+        TUIKitDialog tipsDialog = new TUIKitDialog(getContext())
+                .builder()
+                .setCancelable(true)
+                .setCancelOutside(true)
+                .setTitle(getContext().getString(R.string.forward_oneByOne_limit_number_tip))
+                .setDialogWidth(0.75f)
+                .setPositiveButton(getContext().getString(R.string.forward_mode_merge), new OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        startSelectForwardActivity(TUIChatConstants.FORWARD_MODE_MERGE, messageInfoList, false);
+                        resetForwardState();
+                    }
+                })
+                .setNegativeButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.cancel), new OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+
+                    }
+                });
+        tipsDialog.show();
+    }
+
+    private void startSelectForwardActivity(int mode, List<TUIMessageBean> msgIds, boolean onlyForTranslation){
+        if (mForwardSelectActivityListener != null) {
+            mForwardSelectActivityListener.onStartForwardSelectActivity(mode, msgIds, onlyForTranslation);
+        }
+    }
+
+    public void setForwardSelectActivityListener(ForwardSelectActivityListener listener) {
+        this.mForwardSelectActivityListener = listener;
+    }
+
+    @Override
+    public void sendMessage(TUIMessageBean msg, boolean retry) {
+        presenter.sendMessage(msg, retry, new IUIKitCallback<TUIMessageBean>() {
+            @Override
+            public void onSuccess(TUIMessageBean data) {
+                BackgroundTasks.getInstance().runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        scrollToEnd();
+                    }
+                });
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                String toastMsg = errCode + ", " + errMsg;
+                if (errCode == TUIConstants.BuyingFeature.ERR_SDK_INTERFACE_NOT_SUPPORT) {
+                    showNotSupportDialog();
+                    if (msg.isNeedReadReceipt()) {
+                        toastMsg = getResources().getString(R.string.chat_message_read_receipt)
+                                + getResources().getString(com.tencent.qcloud.tuicore.R.string.TUIKitErrorUnsupporInterfaceSuffix);
+                    }
+                }
+                ToastUtil.toastLongMessage(toastMsg);
+            }
+
+            @Override
+            public void onProgress(Object data) {
+                ProgressPresenter.getInstance().updateProgress(msg.getId(), (Integer) data);
+            }
+        });
+    }
+
+    public void sendReplyMessage(TUIMessageBean msg, boolean retry) {
+        presenter.sendMessage(msg, retry, new IUIKitCallback<TUIMessageBean>() {
+            @Override
+            public void onSuccess(TUIMessageBean data) {
+                BackgroundTasks.getInstance().runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        scrollToEnd();
+                    }
+                });
+                presenter.modifyRootMessageToAddReplyInfo((ReplyMessageBean) data, new IUIKitCallback<Void>() {
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        ToastUtil.toastShortMessage("modify message failed code = " + errCode + " message = " + errMsg);
+                    }
+                });
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                String toastMsg = errCode + ", " + errMsg;
+                if (errCode == TUIConstants.BuyingFeature.ERR_SDK_INTERFACE_NOT_SUPPORT) {
+                    showNotSupportDialog();
+                    if (msg.isNeedReadReceipt()) {
+                        toastMsg = getResources().getString(R.string.chat_message_read_receipt)
+                                + getResources().getString(com.tencent.qcloud.tuicore.R.string.TUIKitErrorUnsupporInterfaceSuffix);
+                    }
+                }
+                ToastUtil.toastLongMessage(toastMsg);
+            }
+        });
+    }
+
+    public void sendTypingStatusMessage(boolean status) {
+        if (mChatInfo == null || TextUtils.isEmpty(getChatInfo().getId())) {
+            TUIChatLog.e(TAG, "sendTypingStatusMessage receiver is invalid");
+            return;
+        }
+
+        Gson gson = new Gson();
+        MessageTyping typingMessageBean = new MessageTyping();
+        typingMessageBean.setTypingStatus(status);
+        String data = gson.toJson(typingMessageBean);
+        TUIChatLog.d(TAG, "sendTypingStatusMessage data = " + data);
+        TUIMessageBean msg = ChatMessageBuilder.buildCustomMessage(data, "", null);
+
+        presenter.sendTypingStatusMessage(msg, mChatInfo.getId(), new IUIKitCallback<TUIMessageBean>() {
+            @Override
+            public void onSuccess(TUIMessageBean data) {
+                TUIChatLog.d(TAG, "sendTypingStatusMessage onSuccess:" + data.getId());
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIChatLog.d(TAG, "sendTypingStatusMessage fail:" + errCode + "=" + errMsg);
+            }
+        });
+    }
+
+    public void exitChat() {
+//        getTitleBar().getMiddleTitle().removeCallbacks(mTypingRunnable);
+        AudioRecorder.getInstance().stopRecord();
+        AudioPlayer.getInstance().stopPlay();
+        presenter.markMessageAsRead(mChatInfo);
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        mCustomView.removeAllViews();
+        exitChat();
+    }
+
+    public interface ForwardSelectActivityListener {
+        public void onStartForwardSelectActivity(int mode, List<TUIMessageBean> msgIds, boolean onlyForTranslation);
+    }
+
+    @Override
+    protected void onVisibilityChanged(@NonNull View changedView, int visibility) {
+        // 从其他界面会到 Chat ，也要上报一次已读回执
+        // You will go to Chat from other interfaces, and you must also report a read receipt
+        if (visibility == VISIBLE) {
+            if (getMessageLayout() == null) {
+                return;
+            }
+            LinearLayoutManager linearLayoutManager = (LinearLayoutManager) getMessageLayout().getLayoutManager();
+            if (linearLayoutManager == null) {
+                return;
+            }
+            int firstVisiblePosition = linearLayoutManager.findFirstCompletelyVisibleItemPosition();
+            int lastVisiblePosition = linearLayoutManager.findLastCompletelyVisibleItemPosition();
+            sendMsgReadReceipt(firstVisiblePosition, lastVisiblePosition);
+        }
+    }
+
+    private void showNotSupportDialog() {
+        String string = getResources().getString(R.string.chat_im_flagship_edition_update_tip, getResources().getString(R.string.chat_message_read_receipt));
+        String buyingGuidelines = getResources().getString(R.string.chat_buying_guidelines);
+        int buyingGuidelinesIndex = string.lastIndexOf(buyingGuidelines);
+        final int foregroundColor = getResources().getColor(TUIThemeManager.getAttrResId(getContext(), com.tencent.qcloud.tuicore.R.attr.core_primary_color));
+        SpannableString spannedString = new SpannableString(string);
+        ForegroundColorSpan colorSpan2 = new ForegroundColorSpan(foregroundColor);
+        spannedString.setSpan(colorSpan2, buyingGuidelinesIndex, buyingGuidelinesIndex + buyingGuidelines.length(), Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
+
+        ClickableSpan clickableSpan2 = new ClickableSpan() {
+            @Override
+            public void onClick(View view) {
+                if (TextUtils.equals(TUIThemeManager.getInstance().getCurrentLanguage(), "zh")) {
+                    openWebUrl(TUIConstants.BuyingFeature.BUYING_PRICE_DESC);
+                } else {
+                    openWebUrl(TUIConstants.BuyingFeature.BUYING_PRICE_DESC_EN);
+                }
+            }
+
+            @Override
+            public void updateDrawState(TextPaint ds) {
+                ds.setUnderlineText(false);
+            }
+        };
+        spannedString.setSpan(clickableSpan2, buyingGuidelinesIndex, buyingGuidelinesIndex + buyingGuidelines.length(), Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
+        TUIKitDialog.TUIIMUpdateDialog.getInstance()
+                .createDialog(getContext())
+                .setShowOnlyDebug(true)
+                .setMovementMethod(LinkMovementMethod.getInstance())
+                .setHighlightColor(Color.TRANSPARENT)
+                .setCancelable(true)
+                .setCancelOutside(true)
+                .setTitle(spannedString)
+                .setDialogWidth(0.75f)
+                .setDialogFeatureName(TUIConstants.BuyingFeature.BUYING_FEATURE_MESSAGE_RECEIPT)
+                .setPositiveButton(getResources().getString(R.string.chat_no_more_reminders), new OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        TUIKitDialog.TUIIMUpdateDialog.getInstance().dismiss();
+                        TUIKitDialog.TUIIMUpdateDialog.getInstance().setNeverShow(true);
+                    }
+                })
+                .setNegativeButton(getResources().getString(R.string.chat_i_know), new OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        TUIKitDialog.TUIIMUpdateDialog.getInstance().dismiss();
+                    }
+                })
+                .show();
+    }
+
+    private void openWebUrl(String url) {
+        Intent intent = new Intent();
+        intent.setAction(Intent.ACTION_VIEW);
+        Uri contentUrl = Uri.parse(url);
+        intent.setData(contentUrl);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        getContext().startActivity(intent);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/input/BaseInputFragment.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/input/BaseInputFragment.java
new file mode 100644
index 0000000..76a2b36
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/input/BaseInputFragment.java
@@ -0,0 +1,18 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.input;
+
+import com.tencent.qcloud.tuicore.component.fragments.BaseFragment;
+import com.tencent.qcloud.tuikit.tuichat.classicui.interfaces.IChatLayout;
+
+public class BaseInputFragment extends BaseFragment {
+
+    private IChatLayout mChatLayout;
+
+    public IChatLayout getChatLayout() {
+        return mChatLayout;
+    }
+
+    public BaseInputFragment setChatLayout(IChatLayout layout) {
+        mChatLayout = layout;
+        return this;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/input/InputView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/input/InputView.java
new file mode 100644
index 0000000..ac8cb61
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/input/InputView.java
@@ -0,0 +1,1806 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.input;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.Rect;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.webkit.MimeTypeMap;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.FragmentManager;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.BackgroundTasks;
+import com.tencent.qcloud.tuicore.util.FileUtil;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.DraftInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.InputMoreActionUnit;
+import com.tencent.qcloud.tuikit.tuichat.bean.ReplyPreviewBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.FileMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.component.AudioPlayer;
+import com.tencent.qcloud.tuikit.tuichat.component.AudioRecorder;
+import com.tencent.qcloud.tuikit.tuichat.component.face.CustomFace;
+import com.tencent.qcloud.tuikit.tuichat.component.face.Emoji;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.CameraActivity;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.view.JCameraView;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.interfaces.IChatLayout;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.input.face.FaceFragment;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.input.inputmore.InputMoreDialogFragment;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.input.waveview.VoiceWaveView.VoiceWaveView;
+import com.tencent.qcloud.tuikit.tuichat.presenter.ChatPresenter;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageBuilder;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageParser;
+import com.tencent.qcloud.tuikit.tuichat.util.PermissionHelper;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
+
+/**
+ * 聊天界面，底部发送图片、拍照、摄像、文件面板
+ * 
+ * Chat interface, send pictures, take pictures, video, file panels at the bottom
+ */
+
+public class InputView extends LinearLayout implements View.OnClickListener, TextWatcher {
+    private static final String TAG = InputView.class.getSimpleName();
+
+    // 音视频通话成员数限制
+    // Membership limit for audio and video calls
+    protected static final int CALL_MEMBER_LIMIT = 8;
+
+    protected ImageView faceKeyboardInputButton;
+    protected ImageView inputMoreBtn;
+    protected Button voiceBtn;
+    protected ImageView imageBtn;
+    protected boolean mEmojiInputDisable;
+    protected ImageView voiceDeleteImage;
+
+    protected Object mMoreInputEvent;
+    protected boolean mMoreInputDisable;
+
+    /**
+     * 文本输入框
+     * 
+     * input text
+     */
+    protected TIMMentionEditText mTextInput;
+    private LinearLayout mTextInputLayout;
+    private boolean mIsSending = false;
+
+    protected View mInputMoreLayout;
+    protected Button mSendAudioButton;
+    protected ViewGroup mSendAudioButtonLayout;
+    protected VoiceWaveView mVoiceWaveView;
+    private Timer mTimer;
+    private int times;
+
+    protected ChatInfo mChatInfo;
+    protected List<InputMoreActionUnit> mInputMoreActionList = new ArrayList<>();
+    protected List<InputMoreActionUnit> mInputMoreCustomActionList = new ArrayList<>();
+    private AlertDialog mPermissionDialog;
+    private boolean mSendPhotoDisable;
+    private boolean mCaptureDisable;
+    private boolean mVideoRecordDisable;
+    private boolean mSendFileDisable;
+
+    private InputMoreDialogFragment mInputMoreFragment;
+    private FaceFragment faceFragment;
+    private ChatInputHandler mChatInputHandler;
+    private MessageHandler mMessageHandler;
+    private IChatLayout mChatLayout;
+    private boolean mSendEnable;
+    private boolean mAudioCancel;
+    private int mCurrentState;
+    private int mLastMsgLineCount;
+    private float mStartRecordY;
+    private float mStartRecordX;
+    private String mInputContent;
+    private OnInputViewListener mOnInputViewListener;
+
+    private Map<String,String> atUserInfoMap = new HashMap<>();
+    private String displayInputString;
+
+    private ChatPresenter presenter;
+
+    private boolean isReplyModel = false;
+    private boolean isQuoteModel = false;
+    private ReplyPreviewBean replyPreviewBean;
+    private View replyPreviewBar;
+    private ImageView replyCloseBtn;
+    private TextView replyTv;
+    private TextView replyUserNameTv;
+    private View quotePreviewBar;
+    private TextView quoteTv;
+    private ImageView quoteCloseBtn;
+    private boolean isShowCustomFace = true;
+    private FragmentManager fragmentManager;
+    // Input state machine
+    private InputMachine inputMachine;
+    public InputView(Context context) {
+        super(context);
+        initViews();
+    }
+
+    public InputView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        initViews();
+    }
+
+    public InputView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initViews();
+    }
+
+    public void setPresenter(ChatPresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    private void initViews() {
+        inflate(getContext(), R.layout.chat_minimalist_input_layout, this);
+        faceKeyboardInputButton = findViewById(R.id.input_face_btn);
+        mTextInput = findViewById(R.id.input_edit_text);
+        inputMoreBtn = findViewById(R.id.input_more_btn);
+        voiceBtn = findViewById(R.id.input_voice_btn);
+        imageBtn = findViewById(R.id.input_image_btn);
+        mInputMoreLayout = findViewById(R.id.more_groups);
+        mSendAudioButton = findViewById(R.id.chat_voice_input);
+        mSendAudioButtonLayout = findViewById(R.id.chat_voice_input_layout);
+        mTextInputLayout = findViewById(R.id.text_input_layout);
+        voiceDeleteImage = findViewById(R.id.voice_delete);
+        mSendAudioButton.setTextColor(getResources().getColor(R.color.white));
+        mVoiceWaveView = findViewById(R.id.voice_wave_view);
+
+        replyPreviewBar = findViewById(R.id.reply_preview_bar);
+        replyTv = replyPreviewBar.findViewById(R.id.reply_preview_bar_text);
+        replyUserNameTv = findViewById(R.id.reply_preview_bar_name);
+        replyCloseBtn = findViewById(R.id.reply_preview_bar_close_btn);
+        quotePreviewBar = findViewById(R.id.quote_preview_bar);
+        quoteTv = quotePreviewBar.findViewById(R.id.quote_text);
+        quoteCloseBtn = quotePreviewBar.findViewById(R.id.quote_close_btn);
+        mIsSending = false;
+        times = 0;
+
+        init();
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    protected void init() {
+        initInputMachine();
+        fragmentManager = getActivity().getSupportFragmentManager();
+        faceKeyboardInputButton.setOnClickListener(this);
+        mTextInput.setMaxLines(6);
+        mTextInput.setInputType(EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE);
+        mTextInput.setSingleLine(false);
+        mTextInput.setImeOptions(EditorInfo.IME_ACTION_SEND);
+        mTextInput.addTextChangedListener(this);
+
+        inputMoreBtn.setOnClickListener(this);
+        imageBtn.setOnClickListener(this);
+
+        mTextInput.setOnTouchListener(new OnTouchListener() {
+            @Override
+            public boolean onTouch(View view, MotionEvent motionEvent) {
+                if(motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
+                    if (presenter != null) {
+                        presenter.scrollToNewestMessage();
+                    }
+                    inputMachine.execute(InputAction.INPUT_CLICKED);
+                }
+                return false;
+            }
+        });
+
+        mTextInput.setOnKeyListener(new OnKeyListener() {
+            @Override
+            public boolean onKey(View view, int keyCode, KeyEvent keyEvent) {
+                if (keyCode == KeyEvent.KEYCODE_DEL && keyEvent.getAction() == KeyEvent.ACTION_DOWN) {
+                    if ((isQuoteModel || isReplyModel) && TextUtils.isEmpty(mTextInput.getText().toString())) {
+                        exitReply();
+                    }
+                }
+                return false;
+            }
+        });
+
+        mTextInput.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
+                return false;
+            }
+        });
+
+        mTextInput.setOnFocusChangeListener(new OnFocusChangeListener() {
+            @Override
+            public void onFocusChange(View view, boolean focus) {
+                if (!focus && mChatInputHandler != null) {
+                    mChatInputHandler.onUserTyping(false, V2TIMManager.getInstance().getServerTime());
+                }
+            }
+        });
+
+        voiceBtn.setOnTouchListener(new OnTouchListener() {
+
+            @Override
+            public boolean onTouch(View view, MotionEvent motionEvent) {
+                int action = motionEvent.getAction();
+                TUIChatLog.i(TAG, "mSendAudioButton onTouch action:" + action);
+
+                if (action == MotionEvent.ACTION_CANCEL || action == MotionEvent.ACTION_UP) {
+                    inputMachine.execute(InputAction.AUDIO_CLICKED);
+                }
+                PermissionHelper.requestPermission(PermissionHelper.PERMISSION_MICROPHONE, new PermissionHelper.PermissionCallback() {
+                    @Override
+                    public void onGranted() {
+                        switch (action) {
+                            case MotionEvent.ACTION_DOWN:
+                                mAudioCancel = true;
+                                mStartRecordY = motionEvent.getY();
+                                mStartRecordX = motionEvent.getX();
+                                inputMachine.execute(InputAction.AUDIO_CLICKED);
+                                voiceDeleteImage.setBackgroundResource(R.drawable.minimalist_delete_icon);
+                                mSendAudioButton.setBackground(getResources().getDrawable(R.drawable.minimalist_corner_bg_blue));
+                                break;
+                            case MotionEvent.ACTION_MOVE:
+                                if (motionEvent.getX() - mStartRecordX < -100) {
+                                    mAudioCancel = true;
+                                    if (mChatInputHandler != null) {
+                                        mChatInputHandler.onRecordStatusChanged(ChatInputHandler.RECORD_CANCEL);
+                                    }
+                                    voiceDeleteImage.setBackgroundResource(R.drawable.minimalist_delete_start_icon);
+                                    mSendAudioButton.setBackground(getResources().getDrawable(R.drawable.minimalist_corner_bg_red));
+                                } else {
+                                    if (mAudioCancel) {
+                                        if (mChatInputHandler != null) {
+                                            mChatInputHandler.onRecordStatusChanged(ChatInputHandler.RECORD_START);
+                                        }
+                                    }
+                                    mAudioCancel = false;
+                                    voiceDeleteImage.setBackgroundResource(R.drawable.minimalist_delete_icon);
+                                    mSendAudioButton.setBackground(getResources().getDrawable(R.drawable.minimalist_corner_bg_blue));
+                                }
+                                //mSendAudioButton.setText(TUIChatService.getAppContext().getString(R.string.release_end));
+                                break;
+                            case MotionEvent.ACTION_CANCEL:
+                            case MotionEvent.ACTION_UP:
+                                mAudioCancel = motionEvent.getX() - mStartRecordX < -100;
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+
+                    @Override
+                    public void onDenied() {
+                        TUIChatLog.i(TAG, "audio record checkPermission failed");
+
+                    }
+                });
+                return false;
+            }
+        });
+
+        mTextInput.setOnMentionInputListener(new TIMMentionEditText.OnMentionInputListener() {
+            @Override
+            public void onMentionCharacterInput(String tag) {
+                if ((tag.equals(TIMMentionEditText.TIM_MENTION_TAG) || tag.equals(TIMMentionEditText.TIM_MENTION_TAG_FULL))
+                        && TUIChatUtils.isGroupChat(mChatLayout.getChatInfo().getType())) {
+                    if (mOnInputViewListener != null) {
+                        mOnInputViewListener.onStartGroupMemberSelectActivity();
+                    }
+                }
+            }
+        });
+
+        mTextInput.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_SEND) {
+                    send();
+                }
+                return true;
+            }
+        });
+
+
+        replyCloseBtn.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                exitReply();
+            }
+        });
+
+        quoteCloseBtn.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                exitReply();
+            }
+        });
+    }
+
+    private void updateChatBackground() {
+        if (mOnInputViewListener != null) {
+            mOnInputViewListener.onUpdateChatBackground();
+        }
+    }
+    
+    private void send() {
+        if (mSendEnable) {
+            if (mMessageHandler != null) {
+                if (mChatLayout == null) {
+                    mMessageHandler.sendMessage(ChatMessageBuilder.buildTextMessage(mTextInput.getText().toString()));
+                } else {
+                    if ((isQuoteModel || isReplyModel) && replyPreviewBean != null) {
+                        if (TUIChatUtils.isGroupChat(mChatLayout.getChatInfo().getType()) && !mTextInput.getMentionIdList().isEmpty()) {
+                            List<String> atUserList = new ArrayList<>(mTextInput.getMentionIdList());
+                            mMessageHandler.sendMessage(ChatMessageBuilder.buildAtReplyMessage(mTextInput.getText().toString(), atUserList, replyPreviewBean));
+                        } else {
+                            mMessageHandler.sendMessage(ChatMessageBuilder.buildReplyMessage(mTextInput.getText().toString(), replyPreviewBean));
+                        }
+                        exitReply();
+                    } else {
+                        if (TUIChatUtils.isGroupChat(mChatLayout.getChatInfo().getType()) && !mTextInput.getMentionIdList().isEmpty()) {
+                            //发送时通过获取输入框匹配上@的昵称list，去从map中获取ID list。
+                            // When sending, get the ID list from the map by getting the nickname list that matches the @ in the input box.
+                            List<String> atUserList = new ArrayList<>(mTextInput.getMentionIdList());
+                            if (atUserList.isEmpty()) {
+                                mMessageHandler.sendMessage(ChatMessageBuilder.buildTextMessage(mTextInput.getText().toString()));
+                            } else {
+                                mMessageHandler.sendMessage(ChatMessageBuilder.buildTextAtMessage(atUserList, mTextInput.getText().toString()));
+                            }
+                        } else {
+                            mMessageHandler.sendMessage(ChatMessageBuilder.buildTextMessage(mTextInput.getText().toString()));
+                        }
+                    }
+                }
+            }
+            mIsSending = true;
+            mTextInput.setText("");
+        }
+    }
+
+    private void initVoiceWaveView() {
+        if (mVoiceWaveView == null) {
+            return;
+        }
+
+        mVoiceWaveView.addHeader(2);
+        for (int i = 0; i < 100; i++) {
+            mVoiceWaveView.addBody(2);
+        }
+        mVoiceWaveView.addFooter(2);
+    }
+
+    private String formatMiss(int miss) {
+        //String hh = miss / 3600 > 9 ? miss / 3600 + "" : "0" + miss / 3600;
+        String mm = (miss % 3600) / 60 > 9 ? (miss % 3600) / 60 + "" : "0" + (miss % 3600) / 60;
+        String ss = (miss % 3600) % 60 > 9 ? (miss % 3600) % 60 + "" : "0" + (miss % 3600) % 60;
+        return mm + ":" + ss;
+    }
+
+    public void addInputText(String name, String id){
+        if (id == null || id.isEmpty()){
+            return;
+        }
+
+        ArrayList<String> nameList = new ArrayList<String>() {
+            {
+                add(name);
+            }
+        };
+        ArrayList<String> idList = new ArrayList<String>() {
+            {
+                add(id);
+            }
+        };
+
+        updateAtUserInfoMap(nameList, idList);
+        if (mTextInput != null) {
+            Map<String, String> displayAtNameMap = new HashMap<>();
+            displayAtNameMap.put(TIMMentionEditText.TIM_MENTION_TAG + displayInputString, id);
+            mTextInput.setMentionMap(displayAtNameMap);
+            int selectedIndex = mTextInput.getSelectionEnd();
+            if (selectedIndex != -1) {
+                String insertStr = TIMMentionEditText.TIM_MENTION_TAG + displayInputString;
+                String text = mTextInput.getText().insert(selectedIndex, insertStr).toString();
+                FaceManager.handlerEmojiText(mTextInput, text, true);
+                mTextInput.setSelection(selectedIndex + insertStr.length());
+            }
+            showSoftInput();
+        }
+    }
+
+    public void updateInputText(ArrayList<String> names, ArrayList<String> ids){
+        if (ids == null || ids.isEmpty()){
+            return;
+        }
+
+        updateAtUserInfoMap(names, ids);
+        if (mTextInput != null) {
+            Map<String, String> displayAtNameList = getDisplayAtNameMap(names, ids);
+            mTextInput.setMentionMap(displayAtNameList);
+
+            int selectedIndex = mTextInput.getSelectionEnd();
+            if (selectedIndex != -1) {
+                String text = mTextInput.getText().insert(selectedIndex, displayInputString).toString();
+                FaceManager.handlerEmojiText(mTextInput, text, true);
+                mTextInput.setSelection(selectedIndex + displayInputString.length());
+            }
+            // @ 之后要显示软键盘。Activity 没有 onResume 导致无法显示软键盘
+            // Afterwards @, the soft keyboard is to be displayed. Activity does not have onResume, so the soft keyboard cannot be displayed
+            BackgroundTasks.getInstance().postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    showSoftInput();
+                }
+            }, 200);
+        }
+    }
+
+    private Map<String, String> getDisplayAtNameMap(List<String> names, List<String> ids) {
+        Map<String, String> displayNameList = new HashMap<>();
+        String mentionTag = TIMMentionEditText.TIM_MENTION_TAG;
+        if (mTextInput != null) {
+            Editable editable = mTextInput.getText();
+            int selectionIndex = mTextInput.getSelectionEnd();
+            if (editable != null && selectionIndex > 0) {
+                String text = editable.toString();
+                if (!TextUtils.isEmpty(text)) {
+                    mentionTag = text.substring(selectionIndex - 1, selectionIndex);
+                }
+            }
+        }
+
+        for (int i = 0; i < ids.size(); i++) {
+            if (i == 0) {
+                if (TextUtils.isEmpty(names.get(0))) {
+                    displayNameList.put(mentionTag + ids.get(0) + " ", ids.get(0));
+                } else {
+                    displayNameList.put(mentionTag + names.get(0) + " ", ids.get(0));
+                }
+                continue;
+            }
+            String str = TIMMentionEditText.TIM_MENTION_TAG;
+            if (TextUtils.isEmpty(names.get(i))) {
+                str += ids.get(i);
+            } else {
+                str += names.get(i);
+            }
+            str += " ";
+            displayNameList.put(str, ids.get(i));
+        }
+        return displayNameList;
+    }
+
+    private void updateAtUserInfoMap(ArrayList<String> names, ArrayList<String> ids){
+        displayInputString = "";
+
+        for (int i = 0; i < ids.size(); i++) {
+            atUserInfoMap.put(ids.get(i), names.get(i));
+
+            //for display
+            if (TextUtils.isEmpty(names.get(i))) {
+                displayInputString += ids.get(i);
+                displayInputString += " ";
+                displayInputString += TIMMentionEditText.TIM_MENTION_TAG;
+            } else {
+                displayInputString += names.get(i);
+                displayInputString += " ";
+                displayInputString += TIMMentionEditText.TIM_MENTION_TAG;
+            }
+        }
+
+        if(!displayInputString.isEmpty()) {
+            displayInputString = displayInputString.substring(0, displayInputString.length() - 1);
+        }
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        mTextInput.removeTextChangedListener(this);
+        atUserInfoMap.clear();
+
+        if (mChatInputHandler != null) {
+            mChatInputHandler.onUserTyping(false, V2TIMManager.getInstance().getServerTime());
+        }
+    }
+
+    protected void startSendPhoto() {
+        TUIChatLog.i(TAG, "startSendPhoto");
+
+        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+        intent.addCategory(Intent.CATEGORY_OPENABLE);
+        intent.setType("*/*");
+        String[] mimetypes = {"image/*", "video/*"};
+        intent.putExtra(Intent.EXTRA_MIME_TYPES, mimetypes);
+
+        setOpenPhotoCallback();
+        mInputMoreFragment.startActivityForResult(intent, InputMoreDialogFragment.REQUEST_CODE_PHOTO);
+    }
+
+    private void setOpenPhotoCallback() {
+        mInputMoreFragment.setCallback(new IUIKitCallback() {
+            @Override
+            public void onSuccess(Object data) {
+                TUIChatLog.i(TAG, "onSuccess: " + data);
+                if (data == null){
+                    TUIChatLog.e(TAG, "data is null");
+                    return;
+                }
+
+                String uri = data.toString();
+                if (TextUtils.isEmpty(uri)){
+                    TUIChatLog.e(TAG, "uri is empty");
+                    return;
+                }
+
+                String fileName = FileUtil.getFileName(TUIChatService.getAppContext(), (Uri) data);
+                String fileExtension = FileUtil.getFileExtensionFromUrl(fileName);
+                String mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileExtension);
+                if (TextUtils.isEmpty(mimeType)) {
+                    TUIChatLog.e(TAG, "mimeType is empty.");
+                    return;
+                }
+                if (mimeType.contains("video")){
+                    String videoPath = FileUtil.getPathFromUri((Uri) data);
+                    TUIMessageBean msg = buildVideoMessage(videoPath);
+                    if (msg == null){
+                        ToastUtil.toastShortMessage(getResources().getString(R.string.send_failed_file_not_exists));
+                        TUIChatLog.e(TAG, "start send video error data: " + data);
+                    } else if (mMessageHandler != null) {
+                        mMessageHandler.sendMessage(msg);
+                        hideSoftInput();
+                    }
+                } else if (mimeType.contains("image")){
+                    TUIMessageBean info = ChatMessageBuilder.buildImageMessage((Uri) data);
+                    if (info == null) {
+                        TUIChatLog.e(TAG, "start send image error data: " + data);
+                        ToastUtil.toastShortMessage(getResources().getString(R.string.send_failed_file_not_exists));
+                        return;
+                    }
+                    if (mMessageHandler != null) {
+                        mMessageHandler.sendMessage(info);
+                        hideSoftInput();
+                    }
+                } else {
+                    TUIChatLog.e(TAG, "Send photo or video failed , invalid mimeType : " + mimeType);
+                }
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIChatLog.i(TAG, "errCode: " + errCode);
+                ToastUtil.toastLongMessage(errMsg);
+            }
+        });
+    }
+
+    public TUIMessageBean buildVideoMessage(String mUri) {
+        android.media.MediaMetadataRetriever mmr = new android.media.MediaMetadataRetriever();
+        try {
+            mmr.setDataSource(mUri);
+            String sDuration = mmr.extractMetadata(android.media.MediaMetadataRetriever.METADATA_KEY_DURATION);
+            Bitmap bitmap = mmr.getFrameAtTime(0, android.media.MediaMetadataRetriever.OPTION_NEXT_SYNC);
+
+            if (bitmap == null){
+                TUIChatLog.e(TAG, "buildVideoMessage() bitmap is null");
+                return null;
+            }
+
+            String imgPath = FileUtil.saveBitmap("JCamera", bitmap);
+            String videoPath = mUri;
+            int imgWidth = bitmap.getWidth();
+            int imgHeight = bitmap.getHeight();
+            long duration = Long.valueOf(sDuration);
+            TUIMessageBean msg = ChatMessageBuilder.buildVideoMessage(imgPath, videoPath, imgWidth, imgHeight, duration);
+
+            return msg;
+        } catch (Exception ex) {
+            TUIChatLog.e(TAG, "MediaMetadataRetriever exception " + ex);
+        } finally {
+            mmr.release();
+        }
+
+        return null;
+    }
+
+    protected void startCapture() {
+        TUIChatLog.i(TAG, "startCapture");
+
+        PermissionHelper.requestPermission(PermissionHelper.PERMISSION_CAMERA, new PermissionHelper.PermissionCallback() {
+            @Override
+            public void onGranted() {
+                Intent captureIntent = new Intent(getContext(), CameraActivity.class);
+                captureIntent.putExtra(TUIChatConstants.CAMERA_TYPE, JCameraView.BUTTON_STATE_ONLY_CAPTURE);
+                CameraActivity.mCallBack = new IUIKitCallback() {
+                    @Override
+                    public void onSuccess(Object data) {
+                        Uri contentUri = Uri.fromFile(new File(data.toString()));
+                        TUIMessageBean msg = ChatMessageBuilder.buildImageMessage(contentUri);
+                        if (mMessageHandler != null) {
+                            mMessageHandler.sendMessage(msg);
+                            hideSoftInput();
+                        }
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+
+                    }
+                };
+                setOpenPhotoCallback();
+                mInputMoreFragment.startActivityForResult(captureIntent, mInputMoreFragment.REQUEST_CODE_PHOTO);
+            }
+
+            @Override
+            public void onDenied() {
+                TUIChatLog.i(TAG, "startCapture checkPermission failed");
+            }
+        });
+    }
+
+    protected void startVideoRecord() {
+        TUIChatLog.i(TAG, "startVideoRecord");
+
+        PermissionHelper.requestPermission(PermissionHelper.PERMISSION_CAMERA, new PermissionHelper.PermissionCallback() {
+            @Override
+            public void onGranted() {
+                PermissionHelper.requestPermission(PermissionHelper.PERMISSION_MICROPHONE, new PermissionHelper.PermissionCallback() {
+                    @Override
+                    public void onGranted() {
+                        Intent captureIntent = new Intent(getContext(), CameraActivity.class);
+                        captureIntent.putExtra(TUIChatConstants.CAMERA_TYPE, JCameraView.BUTTON_STATE_ONLY_RECORDER);
+                        CameraActivity.mCallBack = new IUIKitCallback() {
+                            @Override
+                            public void onSuccess(Object data) {
+                                Intent videoData = (Intent) data;
+                                String imgPath = videoData.getStringExtra(TUIChatConstants.CAMERA_IMAGE_PATH);
+                                String videoPath = videoData.getStringExtra(TUIChatConstants.CAMERA_VIDEO_PATH);
+                                int imgWidth = videoData.getIntExtra(TUIChatConstants.IMAGE_WIDTH, 0);
+                                int imgHeight = videoData.getIntExtra(TUIChatConstants.IMAGE_HEIGHT, 0);
+                                long duration = videoData.getLongExtra(TUIChatConstants.VIDEO_TIME, 0);
+                                TUIMessageBean msg = ChatMessageBuilder.buildVideoMessage(imgPath, videoPath, imgWidth, imgHeight, duration);
+                                if (mMessageHandler != null) {
+                                    mMessageHandler.sendMessage(msg);
+                                    hideSoftInput();
+                                }
+                            }
+
+                            @Override
+                            public void onError(String module, int errCode, String errMsg) {
+
+                            }
+                        };
+                        setOpenPhotoCallback();
+                        mInputMoreFragment.startActivityForResult(captureIntent, mInputMoreFragment.REQUEST_CODE_PHOTO);
+                    }
+
+                    @Override
+                    public void onDenied() {
+                        TUIChatLog.i(TAG, "startVideoRecord checkPermission failed");
+                    }
+                });
+            }
+
+            @Override
+            public void onDenied() {
+                TUIChatLog.i(TAG, "startVideoRecord checkPermission failed");
+            }
+        });
+
+    }
+
+    protected void startSendFile() {
+        TUIChatLog.i(TAG, "startSendFile");
+
+        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+        intent.setType("*/*");
+        intent.addCategory(Intent.CATEGORY_OPENABLE);
+        mInputMoreFragment.setCallback(new IUIKitCallback() {
+            @Override
+            public void onSuccess(Object data) {
+                TUIMessageBean info = ChatMessageBuilder.buildFileMessage((Uri) data);
+                if (info == null) {
+                    ToastUtil.toastShortMessage(getResources().getString(R.string.send_failed_file_not_exists));
+                    return;
+                }
+                if (mMessageHandler != null) {
+                    mMessageHandler.sendMessage(info);
+                    hideSoftInput();
+                }
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastLongMessage(errMsg);
+            }
+        });
+        mInputMoreFragment.startActivityForResult(intent, InputMoreDialogFragment.REQUEST_CODE_FILE);
+    }
+
+    public void setChatInputHandler(ChatInputHandler handler) {
+        this.mChatInputHandler = handler;
+    }
+
+    public void setMessageHandler(MessageHandler handler) {
+        this.mMessageHandler = handler;
+    }
+
+    public void setOnInputViewListener(OnInputViewListener listener) {
+        this.mOnInputViewListener = listener;
+    }
+
+    static class InputAction {
+        static final int MORE_CLICKED = 1;
+        static final int INPUT_CLICKED = 2;
+        static final int FACE_KEYBOARD_CLICKED = 3;
+        static final int AUDIO_CLICKED = 4;
+        static final int IMAGE_CLICKED = 5;
+        static final int EMPTY_CLICKED = 6;
+    }
+
+    static class InputState {
+        static final int STATE_NONE = 1;
+        static final int STATE_MORE_INPUT = 2;
+        static final int STATE_SOFT_INPUT = 3;
+        static final int STATE_FACE_INPUT = 4;
+        static final int STATE_AUDIO_INPUT = 5;
+        static final int STATE_IMAGE_INPUT = 6;
+    }
+
+
+    @FunctionalInterface
+    interface InputMachineEvent {
+        void onEvent();
+    }
+
+    static class InputMachineTransaction {
+        int currentState;
+        int nextState;
+        int action;
+        InputMachineEvent event;
+
+        InputMachineTransaction currentState(int currentState) {
+            this.currentState = currentState;
+            return this;
+        }
+
+        InputMachineTransaction nextState(int nextState) {
+            this.nextState = nextState;
+            return this;
+        }
+
+        InputMachineTransaction action(int action) {
+            this.action = action;
+            return this;
+        }
+
+        InputMachineTransaction event(InputMachineEvent event) {
+            this.event = event;
+            return this;
+        }
+
+    }
+
+    static class InputMachine {
+
+        private final List<InputMachineTransaction> transactionList;
+        private int currentState;
+
+        public InputMachine(int currentState, List<InputMachineTransaction> transactionList) {
+            this.currentState = currentState;
+            this.transactionList = transactionList;
+        }
+
+        void execute(int action) {
+            for(InputMachineTransaction transaction : transactionList) {
+                if (transaction.currentState == currentState && transaction.action == action) {
+                    transaction.event.onEvent();
+                    currentState = transaction.nextState;
+                    break;
+                }
+            }
+        }
+
+        public void clean() {
+            if (transactionList != null) {
+                transactionList.clear();
+            }
+
+            currentState = InputState.STATE_NONE;
+        }
+    }
+
+    public void initInputMachine() {
+        if (inputMachine != null) {
+            inputMachine.clean();
+        }
+        List<InputMachineTransaction> transactionList = Arrays.asList(
+                /**
+                 *  transition to {@link InputState.STATE_FACE_INPUT}
+                 */
+                new InputMachineTransaction()
+                        .currentState(InputState.STATE_SOFT_INPUT)
+                        .action(InputAction.FACE_KEYBOARD_CLICKED)
+                        .event(this::hideSoftInputAndShowFace)
+                        .nextState(InputState.STATE_FACE_INPUT),
+
+                new InputMachineTransaction()
+                        .currentState(InputState.STATE_NONE)
+                        .action(InputAction.FACE_KEYBOARD_CLICKED)
+                        .event(this::showFace)
+                        .nextState(InputState.STATE_FACE_INPUT),
+
+
+                /**
+                 *  transition to {@link InputState.STATE_SOFT_INPUT}
+                 */
+                new InputMachineTransaction()
+                        .currentState(InputState.STATE_FACE_INPUT)
+                        .action(InputAction.INPUT_CLICKED)
+                        .event(this::showSoftInputAndHideFace)
+                        .nextState(InputState.STATE_SOFT_INPUT),
+
+                new InputMachineTransaction()
+                        .currentState(InputState.STATE_FACE_INPUT)
+                        .action(InputAction.FACE_KEYBOARD_CLICKED)
+                        .event(this::showSoftInputAndHideFace)
+                        .nextState(InputState.STATE_SOFT_INPUT),
+
+                new InputMachineTransaction()
+                        .currentState(InputState.STATE_NONE)
+                        .action(InputAction.INPUT_CLICKED)
+                        .event(this::showSoftInputAndHideFace)
+                        .nextState(InputState.STATE_SOFT_INPUT),
+
+                new InputMachineTransaction()
+                        .currentState(InputState.STATE_SOFT_INPUT)
+                        .action(InputAction.INPUT_CLICKED)
+                        .event(this::showSoftInputAndHideFace)
+                        .nextState(InputState.STATE_SOFT_INPUT),
+
+                /**
+                 *  transition to {@link InputState.STATE_NONE}
+                 */
+                new InputMachineTransaction()
+                        .currentState(InputState.STATE_FACE_INPUT)
+                        .action(InputAction.EMPTY_CLICKED)
+                        .event(this::hideFace)
+                        .nextState(InputState.STATE_NONE),
+
+                new InputMachineTransaction()
+                        .currentState(InputState.STATE_SOFT_INPUT)
+                        .action(InputAction.EMPTY_CLICKED)
+                        .event(this::hideSoftInput)
+                        .nextState(InputState.STATE_NONE),
+
+                new InputMachineTransaction()
+                        .currentState(InputState.STATE_NONE)
+                        .action(InputAction.EMPTY_CLICKED)
+                        .event(this::restoreInput)
+                        .nextState(InputState.STATE_NONE),
+
+                new InputMachineTransaction()
+                        .currentState(InputState.STATE_FACE_INPUT)
+                        .action(InputAction.MORE_CLICKED)
+                        .event(this::restoreInput)
+                        .nextState(InputState.STATE_NONE),
+
+                new InputMachineTransaction()
+                        .currentState(InputState.STATE_SOFT_INPUT)
+                        .action(InputAction.MORE_CLICKED)
+                        .event(this::restoreInput)
+                        .nextState(InputState.STATE_NONE),
+
+                new InputMachineTransaction()
+                        .currentState(InputState.STATE_AUDIO_INPUT)
+                        .action(InputAction.AUDIO_CLICKED)
+                        .event(this::hideVoiceLayout)
+                        .nextState(InputState.STATE_NONE),
+
+
+                /**
+                 *  transition to {@link InputState.STATE_AUDIO_INPUT}
+                 */
+                new InputMachineTransaction()
+                        .currentState(InputState.STATE_SOFT_INPUT)
+                        .action(InputAction.AUDIO_CLICKED)
+                        .event(this::showVoiceLayout)
+                        .nextState(InputState.STATE_AUDIO_INPUT),
+
+                new InputMachineTransaction()
+                        .currentState(InputState.STATE_FACE_INPUT)
+                        .action(InputAction.AUDIO_CLICKED)
+                        .event(this::showVoiceLayout)
+                        .nextState(InputState.STATE_AUDIO_INPUT),
+
+                new InputMachineTransaction()
+                        .currentState(InputState.STATE_NONE)
+                        .action(InputAction.AUDIO_CLICKED)
+                        .event(this::showVoiceLayout)
+                        .nextState(InputState.STATE_AUDIO_INPUT)
+
+                );
+        inputMachine = new InputMachine(InputState.STATE_NONE, transactionList);
+    }
+
+    private void showSoftInputAndHideFace() {
+        showSoftInputAndThen(this::hideFace);
+        faceKeyboardInputButton.setBackgroundResource(R.drawable.chat_minimalist_input_face_icon);
+    }
+
+    private void hideSoftInputAndShowFace() {
+        showFace();
+        hideSoftInput();
+        faceKeyboardInputButton.setBackgroundResource(R.drawable.chat_input_keyboard);
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (view == faceKeyboardInputButton) {
+            inputMachine.execute(InputAction.FACE_KEYBOARD_CLICKED);
+        } else if (view == inputMoreBtn) {
+            inputMachine.execute(InputAction.MORE_CLICKED);
+            showInputMoreLayout();
+        } else if (view == imageBtn) {
+            if (mOnInputViewListener != null) {
+                mOnInputViewListener.onClickCapture();
+            }
+        }/*else if (view.getId() == R.id.send_btn) {
+            if (mSendEnable) {
+                if (mMessageHandler != null) {
+                    if (mChatLayout == null) {
+                        mMessageHandler.sendMessage(ChatMessageBuilder.buildTextMessage(mTextInput.getText().toString().trim()));
+                    } else {
+                        if ((isQuoteModel || isReplyModel) && replyPreviewBean != null) {
+                            if (TUIChatUtils.isGroupChat(mChatLayout.getChatInfo().getType()) && !mTextInput.getMentionIdList().isEmpty()) {
+                                List<String> atUserList = new ArrayList<>(mTextInput.getMentionIdList());
+                                mMessageHandler.sendMessage(ChatMessageBuilder.buildAtReplyMessage(mTextInput.getText().toString().trim(), atUserList, replyPreviewBean));
+                            } else {
+                                mMessageHandler.sendMessage(ChatMessageBuilder.buildReplyMessage(mTextInput.getText().toString().trim(), replyPreviewBean));
+                            }
+                            exitReply();
+                        } else {
+                            if (TUIChatUtils.isGroupChat(mChatLayout.getChatInfo().getType()) && !mTextInput.getMentionIdList().isEmpty()) {
+                                //发送时通过获取输入框匹配上@的昵称list，去从map中获取ID list。
+                                // When sending, get the ID list from the map by getting the nickname list that matches the @ in the input box.
+                                List<String> atUserList = new ArrayList<>(mTextInput.getMentionIdList());
+                                if (atUserList.isEmpty()) {
+                                    mMessageHandler.sendMessage(ChatMessageBuilder.buildTextMessage(mTextInput.getText().toString().trim()));
+                                } else {
+                                    mMessageHandler.sendMessage(ChatMessageBuilder.buildTextAtMessage(atUserList, mTextInput.getText().toString().trim()));
+                                }
+                            } else {
+                                mMessageHandler.sendMessage(ChatMessageBuilder.buildTextMessage(mTextInput.getText().toString().trim()));
+                            }
+                        }
+                    }
+                }
+                mIsSending = true;
+                mTextInput.setText("");
+            }
+        }*/
+    }
+
+    @FunctionalInterface
+    interface Callback {
+        void onCall();
+    }
+
+    public void showSoftInputAndThen(Callback callback) {
+        InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+        if (!isSoftInputShown()) {
+            imm.toggleSoftInput(0, 0);
+        }
+        mTextInput.requestFocus();
+        postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                if (callback != null) {
+                    callback.onCall();
+                }
+                Context context = getContext();
+                if (context instanceof Activity) {
+                    Window window = ((Activity) context).getWindow();
+                    if (window != null) {
+                        window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
+                    }
+                }
+                postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (mChatInputHandler != null) {
+                            mChatInputHandler.onInputAreaClick();
+                        }
+                    }
+                }, 100);
+            }
+        }, 180);
+    }
+
+    public void showSoftInput() {
+        showSoftInputAndThen(null);
+    }
+
+    public void hideSoftInput() {
+        TUIChatLog.i(TAG, "hideSoftInput");
+        faceKeyboardInputButton.setBackgroundResource(R.drawable.chat_minimalist_input_face_icon);
+        InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(mTextInput.getWindowToken(), 0);
+        mTextInput.clearFocus();
+        Context context = getContext();
+        if (context instanceof Activity) {
+            Window window = ((Activity) context).getWindow();
+            if (window != null) {
+                window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING);
+            }
+        }
+    }
+
+    public void onEmptyClick() {
+        inputMachine.execute(InputAction.EMPTY_CLICKED);
+    }
+
+    private boolean isSoftInputShown() {
+        View decorView = ((Activity) getContext()).getWindow().getDecorView();
+        int screenHeight = decorView.getHeight();
+        Rect rect = new Rect();
+        decorView.getWindowVisibleDisplayFrame(rect);
+        return screenHeight - rect.bottom - getNavigateBarHeight() >= 0;
+    }
+
+    private int getNavigateBarHeight() {
+        DisplayMetrics metrics = new DisplayMetrics();
+        WindowManager windowManager  = (WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE);
+        windowManager.getDefaultDisplay().getMetrics(metrics);
+        int usableHeight = metrics.heightPixels;
+        windowManager.getDefaultDisplay().getRealMetrics(metrics);
+        int realHeight = metrics.heightPixels;
+        if (realHeight > usableHeight) {
+            return realHeight - usableHeight;
+        } else {
+            return 0;
+        }
+    }
+
+    public void disableShowCustomFace(boolean disable) {
+        isShowCustomFace = !disable;
+    }
+
+    private AppCompatActivity getActivity() {
+        return (AppCompatActivity) getContext();
+    }
+
+
+    private void showFace() {
+        TUIChatLog.i(TAG, "showFaceViewGroup");
+        if (faceFragment == null) {
+            faceFragment = new FaceFragment();
+        }
+        hideSoftInput();
+        faceKeyboardInputButton.setBackgroundResource(R.drawable.chat_input_keyboard);
+        mTextInput.requestFocus();
+        faceFragment.setShowCustomFace(isShowCustomFace);
+        faceFragment.setListener(new FaceFragment.OnEmojiClickListener() {
+            @Override
+            public void onEmojiDelete() {
+                int index = mTextInput.getSelectionStart();
+                Editable editable = mTextInput.getText();
+                boolean isFace = false;
+                if (index <= 0) {
+                    return;
+                }
+                if (editable.charAt(index - 1) == ']') {
+                    for (int i = index - 2; i >= 0; i--) {
+                        if (editable.charAt(i) == '[') {
+                            String faceChar = editable.subSequence(i, index).toString();
+                            if (FaceManager.isFaceChar(faceChar)) {
+                                editable.delete(i, index);
+                                isFace = true;
+                            }
+                            break;
+                        }
+                    }
+                }
+                if (!isFace) {
+                    editable.delete(index - 1, index);
+                }
+            }
+
+            @Override
+            public void onEmojiClick(Emoji emoji) {
+                int index = mTextInput.getSelectionStart();
+                Editable editable = mTextInput.getText();
+                editable.insert(index, emoji.getFaceKey());
+                FaceManager.handlerEmojiText(mTextInput, editable, true);
+            }
+
+            @Override
+            public void onCustomFaceClick(int groupIndex, CustomFace customFace) {
+                mMessageHandler.sendMessage(ChatMessageBuilder.buildFaceMessage(groupIndex, customFace.getFaceKey()));
+            }
+
+            @Override
+            public void sendEmoji() {
+                send();
+            }
+        });
+        mInputMoreLayout.setVisibility(VISIBLE);
+        fragmentManager.beginTransaction().replace(R.id.more_groups, faceFragment).commitAllowingStateLoss();
+        if (mChatInputHandler != null) {
+            postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    mChatInputHandler.onInputAreaClick();
+                }
+            }, 100);
+        }
+    }
+
+    private void showInputMoreButton() {
+        inputMoreBtn.setVisibility(VISIBLE);
+    }
+
+    private void hideInputMoreButton() {
+        inputMoreBtn.setVisibility(GONE);
+    }
+
+    private void hideFace() {
+        mInputMoreLayout.setVisibility(GONE);
+        faceKeyboardInputButton.setBackgroundResource(R.drawable.chat_minimalist_input_face_icon);
+    }
+
+    private void restoreInput() {
+        if (mInputMoreLayout.getVisibility() == VISIBLE) {
+            mInputMoreLayout.setVisibility(GONE);
+        }
+        faceKeyboardInputButton.setBackgroundResource(R.drawable.chat_minimalist_input_face_icon);
+        hideSoftInput();
+    }
+
+    private void hideVoiceLayout() {
+        voiceBtn.setVisibility(VISIBLE);
+        mSendAudioButtonLayout.setVisibility(GONE);
+        showInputMoreButton();
+        showTextInputLayout();
+        showImageButton();
+        hideVoiceDeleteImage();
+        stopAudioRecord();
+    }
+
+    private void showVoiceLayout() {
+        mSendAudioButtonLayout.setVisibility(VISIBLE);
+        voiceBtn.setVisibility(GONE);
+        hideInputMoreButton();
+        hideTextInputLayout();
+        hideImageButton();
+        showVoiceDeleteImage();
+        startAudioRecord();
+    }
+
+    private void startAudioRecord() {
+        initVoiceWaveView();
+        if (mChatInputHandler != null) {
+            mChatInputHandler.onRecordStatusChanged(ChatInputHandler.RECORD_START);
+        }
+        if (mTimer == null) {
+            mTimer = new Timer();
+        }
+        mTimer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                BackgroundTasks.getInstance().runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        times++;
+                        String s = formatMiss(times);
+                        mSendAudioButton.setText(s);
+                    }
+                });
+            }
+        }, 0, 1000);
+
+        AudioRecorder.getInstance().startRecord(new AudioRecorder.Callback() {
+            @Override
+            public void onCompletion(Boolean success) {
+                recordComplete(success);
+            }
+
+            @Override
+            public void onVoiceDb(double db) {
+                if (mSendAudioButtonLayout.getVisibility() == VISIBLE) {
+                    if (db == 0) db = 2;
+                    mVoiceWaveView.addBody((int) db);
+                    mVoiceWaveView.start();
+                }
+            }
+        });
+    }
+
+    private void stopAudioRecord() {
+        if (mChatInputHandler != null) {
+            mChatInputHandler.onRecordStatusChanged(ChatInputHandler.RECORD_STOP);
+        }
+        AudioRecorder.getInstance().stopRecord();
+        if (mVoiceWaveView != null) {
+            mVoiceWaveView.stop();
+        }
+        initVoiceWaveView();
+        if (mTimer != null) {
+            mTimer.cancel();
+            mTimer = null;
+        }
+        mSendAudioButton.setText("0:00");
+        times = 0;
+    }
+
+    private void showVoiceDeleteImage() {
+        voiceDeleteImage.setVisibility(VISIBLE);
+    }
+
+    private void hideVoiceDeleteImage() {
+        voiceDeleteImage.setVisibility(GONE);
+    }
+
+    private void hideTextInputLayout() {
+        mTextInputLayout.setVisibility(GONE);
+    }
+
+    private void showTextInputLayout() {
+        mTextInputLayout.setVisibility(VISIBLE);
+    }
+
+    private void hideImageButton() {
+        imageBtn.setVisibility(GONE);
+    }
+
+    private void showImageButton() {
+        imageBtn.setVisibility(VISIBLE);
+    }
+
+    private void recordComplete(boolean success) {
+        int duration = AudioRecorder.getInstance().getDuration();
+        TUIChatLog.i(TAG, "recordComplete duration:" + duration);
+        if (mChatInputHandler != null) {
+            if (!success || duration == 0) {
+                mChatInputHandler.onRecordStatusChanged(ChatInputHandler.RECORD_FAILED);
+                return;
+            }
+            if (mAudioCancel) {
+                mChatInputHandler.onRecordStatusChanged(ChatInputHandler.RECORD_CANCEL);
+                return;
+            }
+            if (duration < 1000) {
+                mChatInputHandler.onRecordStatusChanged(ChatInputHandler.RECORD_TOO_SHORT);
+                return;
+            }
+            mChatInputHandler.onRecordStatusChanged(ChatInputHandler.RECORD_STOP);
+        }
+
+        if (mMessageHandler != null && success) {
+            mMessageHandler.sendMessage(ChatMessageBuilder.buildAudioMessage(AudioRecorder.getInstance().getPath(), duration));
+        }
+    }
+
+    @Override
+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+        mInputContent = s.toString();
+    }
+
+    @Override
+    public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+    }
+
+    @Override
+    public void afterTextChanged(Editable s) {
+        if (TextUtils.isEmpty(s.toString().trim())) {
+            mSendEnable = false;
+            showMoreInputButton(View.VISIBLE);
+
+            if (mChatInputHandler != null) {
+                mChatInputHandler.onUserTyping(false, V2TIMManager.getInstance().getServerTime());
+            }
+        } else {
+            mSendEnable = true;
+            showMoreInputButton(View.GONE);
+            if (mTextInput.getLineCount() != mLastMsgLineCount) {
+                mLastMsgLineCount = mTextInput.getLineCount();
+                if (mChatInputHandler != null) {
+                    mChatInputHandler.onInputAreaClick();
+                }
+            }
+            if (!TextUtils.equals(mInputContent, mTextInput.getText().toString())) {
+                FaceManager.handlerEmojiText(mTextInput, mTextInput.getText(), true);
+            }
+        }
+
+        if (mChatInputHandler != null && !mIsSending) {
+            mChatInputHandler.onUserTyping(true, V2TIMManager.getInstance().getServerTime());
+        }
+
+        if (mIsSending) {
+            mIsSending = false;
+        }
+    }
+
+    public void setDraft() {
+        if (mChatInfo == null) {
+            TUIChatLog.e(TAG, "set drafts error :  chatInfo is null");
+            return;
+        }
+        if (mTextInput == null) {
+            TUIChatLog.e(TAG, "set drafts error :  textInput is null");
+            return;
+        }
+
+        String draftText = mTextInput.getText().toString();
+        if ((isQuoteModel || isReplyModel) && replyPreviewBean != null) {
+            Gson gson = new Gson();
+            Map<String, String> draftMap = new HashMap<>();
+            draftMap.put("content", draftText);
+            draftMap.put("reply", gson.toJson(replyPreviewBean));
+            draftText = gson.toJson(draftMap);
+        }
+        if (presenter != null) {
+            presenter.setDraft(draftText);
+        }
+    }
+
+    public void appendText(String text) {
+        if (mChatInfo == null) {
+            TUIChatLog.e(TAG, "appendText error :  chatInfo is null");
+            return;
+        }
+        if (mTextInput == null) {
+            TUIChatLog.e(TAG, "appendText error :  textInput is null");
+            return;
+        }
+        String draftText = mTextInput.getText().toString();
+        draftText += text;
+        mTextInput.setText(draftText);
+        mTextInput.setSelection(mTextInput.getText().length());
+    }
+
+    public void setChatInfo(ChatInfo chatInfo) {
+        this.mChatInfo = chatInfo;
+        if (chatInfo != null) {
+            DraftInfo draftInfo = chatInfo.getDraft();
+            if (draftInfo != null && !TextUtils.isEmpty(draftInfo.getDraftText()) && mTextInput != null) {
+                Gson gson = new Gson();
+                HashMap draftJsonMap;
+                String content = draftInfo.getDraftText();
+                try {
+                    draftJsonMap = gson.fromJson(draftInfo.getDraftText(), HashMap.class);
+                    if (draftJsonMap != null) {
+                        content = (String) draftJsonMap.get("content");
+                        String draftStr = (String) draftJsonMap.get("reply");
+                        ReplyPreviewBean bean = gson.fromJson(draftStr, ReplyPreviewBean.class);
+                        if (bean != null) {
+                            showReplyPreview(bean);
+                        }
+                    }
+                } catch (JsonSyntaxException e) {
+                    TUIChatLog.e(TAG, " getCustomJsonMap error ");
+                }
+
+                mTextInput.setText(content);
+                mTextInput.setSelection(mTextInput.getText().length());
+            }
+        }
+    }
+
+    public void setChatLayout(IChatLayout chatLayout) {
+        mChatLayout = chatLayout;
+    }
+
+    protected void assembleActions() {
+        mInputMoreActionList.clear();
+        InputMoreActionUnit actionUnit;
+        if (!mSendPhotoDisable) {
+            actionUnit = new InputMoreActionUnit() {
+                @Override
+                public void onAction(String chatInfoId, int chatType) {
+                    startSendPhoto();
+                }
+            };
+            actionUnit.setIconResId(R.drawable.chat_minimalist_more_action_picture_icon);
+            actionUnit.setTitleId(R.string.pic);
+            actionUnit.setActionType(1);
+            mInputMoreActionList.add(actionUnit);
+        }
+
+        if (!mCaptureDisable) {
+            actionUnit = new InputMoreActionUnit() {
+                @Override
+                public void onAction(String chatInfoId, int chatType) {
+                    startCapture();
+                }
+            };
+            actionUnit.setIconResId(R.drawable.chat_minimalist_more_action_camera_icon);
+            actionUnit.setActionType(1);
+            actionUnit.setTitleId(R.string.photo);
+            mInputMoreActionList.add(actionUnit);
+        }
+
+        if (!mVideoRecordDisable) {
+            actionUnit = new InputMoreActionUnit() {
+                @Override
+                public void onAction(String chatInfoId, int chatType) {
+                    startVideoRecord();
+                }
+            };
+            actionUnit.setIconResId(R.drawable.chat_minimalist_more_action_record_icon);
+            actionUnit.setActionType(1);
+            actionUnit.setTitleId(R.string.video);
+            mInputMoreActionList.add(actionUnit);
+        }
+
+        if (!mSendFileDisable) {
+            actionUnit = new InputMoreActionUnit() {
+                @Override
+                public void onAction(String chatInfoId, int chatType) {
+                    startSendFile();
+                }
+            };
+            actionUnit.setIconResId(R.drawable.chat_minimalist_more_action_file_icon);
+            actionUnit.setActionType(1);
+            actionUnit.setTitleId(R.string.file);
+            mInputMoreActionList.add(actionUnit);
+        }
+
+        mInputMoreActionList.addAll(mInputMoreCustomActionList);
+        Collections.sort(mInputMoreActionList, new Comparator<InputMoreActionUnit>() {
+            @Override
+            public int compare(InputMoreActionUnit o1, InputMoreActionUnit o2) {
+                return o1.getPriority() - o2.getPriority();
+            }
+        });
+    }
+
+    private void addActionsFromListeners() {
+        if (mChatInfo == null) {
+            return;
+        }
+
+        HashMap<String, Object> param = new HashMap<>();
+        param.put(TUIConstants.TUIChat.CHAT_ID, mChatInfo.getId());
+        param.put(TUIConstants.TUIChat.CHAT_NAME, mChatInfo.getChatName());
+        param.put(TUIConstants.TUIChat.CHAT_TYPE, mChatInfo.getType());
+        param.put(TUIConstants.TUIChat.CONTEXT, getContext());
+        Map<String, Object> customMessageExtension = TUICore.getExtensionInfo(TUIConstants.TUIChat.EXTENSION_INPUT_MORE_CUSTOM_MESSAGE, param);
+        if (customMessageExtension != null) {
+            Integer icon = (Integer) customMessageExtension.get(TUIConstants.TUIChat.INPUT_MORE_ICON);
+            Integer title = (Integer) customMessageExtension.get(TUIConstants.TUIChat.INPUT_MORE_TITLE);
+            Integer id = (Integer) customMessageExtension.get(TUIConstants.TUIChat.INPUT_MORE_ACTION_ID);
+            InputMoreActionUnit unit = new InputMoreActionUnit();
+            unit.setActionId(id);
+            unit.setIconResId(icon);
+            unit.setTitleId(title);
+            unit.setPriority(10);
+            unit.setOnClickListener(unit.new OnActionClickListener() {
+                @Override
+                public void onClick() {
+                    onCustomActionClick(unit.getActionId());
+                }
+            });
+            mInputMoreActionList.add(unit);
+        }
+
+        // topic not support call yet.
+        if (TUIChatUtils.isTopicGroup(mChatInfo.getId())) {
+            return;
+        }
+
+        Map<String, Object> audioCallExtension = TUICore.getExtensionInfo(TUIConstants.TUIChat.EXTENSION_INPUT_MORE_AUDIO_CALL, param);
+        if (audioCallExtension != null) {
+            View audioView = (View) audioCallExtension.get(TUIConstants.TUIChat.INPUT_MORE_VIEW);
+            int audioActionId = (Integer) audioCallExtension.get(TUIConstants.TUIChat.INPUT_MORE_ACTION_ID);
+            InputMoreActionUnit audioUnit = new InputMoreActionUnit();
+            audioUnit.setActionId(audioActionId);
+            audioUnit.setUnitView(audioView);
+            audioUnit.setPriority(2);
+            audioUnit.setOnClickListener(audioUnit.new OnActionClickListener() {
+                @Override
+                public void onClick() {
+                    PermissionHelper.requestPermission(PermissionHelper.PERMISSION_MICROPHONE, new PermissionHelper.PermissionCallback() {
+                        @Override
+                        public void onGranted() {
+                            onCustomActionClick(audioUnit.getActionId());
+                        }
+
+                        @Override
+                        public void onDenied() {
+
+                        }
+                    });
+                }
+            });
+            mInputMoreActionList.add(audioUnit);
+        }
+
+        Map<String, Object> videoCallExtension = TUICore.getExtensionInfo(TUIConstants.TUIChat.EXTENSION_INPUT_MORE_VIDEO_CALL, param);
+        if (videoCallExtension != null) {
+            View videoView = (View) videoCallExtension.get(TUIConstants.TUIChat.INPUT_MORE_VIEW);
+            int videoActionId = (Integer) videoCallExtension.get(TUIConstants.TUIChat.INPUT_MORE_ACTION_ID);
+            InputMoreActionUnit videoUnit = new InputMoreActionUnit();
+            videoUnit.setActionId(videoActionId);
+            videoUnit.setUnitView(videoView);
+            videoUnit.setPriority(1);
+            videoUnit.setOnClickListener(videoUnit.new OnActionClickListener() {
+                @Override
+                public void onClick() {
+                    PermissionHelper.requestPermission(PermissionHelper.PERMISSION_MICROPHONE, new PermissionHelper.PermissionCallback() {
+                        @Override
+                        public void onGranted() {
+                            PermissionHelper.requestPermission(PermissionHelper.PERMISSION_CAMERA, new PermissionHelper.PermissionCallback() {
+                                @Override
+                                public void onGranted() {
+                                    onCustomActionClick(videoUnit.getActionId());
+                                }
+
+                                @Override
+                                public void onDenied() {
+
+                                }
+                            });
+                        }
+
+                        @Override
+                        public void onDenied() {
+
+                        }
+                    });
+                }
+            });
+            mInputMoreActionList.add(videoUnit);
+        }
+
+    }
+
+    private void onCustomActionClick(int id) {
+        if (id == TUIConstants.TUICalling.ACTION_ID_AUDIO_CALL || id == TUIConstants.TUICalling.ACTION_ID_VIDEO_CALL) {
+            String type = id == TUIConstants.TUICalling.ACTION_ID_AUDIO_CALL ? TUIConstants.TUICalling.TYPE_AUDIO
+                    : TUIConstants.TUICalling.TYPE_VIDEO;
+            if (TUIChatUtils.isGroupChat(getChatInfo().getType())) {
+                Bundle bundle = new Bundle();
+                bundle.putString(TUIConstants.TUICalling.GROUP_ID, getChatInfo().getId());
+                bundle.putString(TUIConstants.TUICalling.PARAM_NAME_TYPE, type);
+                bundle.putString(TUIChatConstants.GROUP_ID, getChatInfo().getId());
+                bundle.putBoolean(TUIChatConstants.SELECT_FOR_CALL, true);
+                bundle.putInt(TUIChatConstants.Selection.LIMIT, CALL_MEMBER_LIMIT);
+                TUICore.startActivity(getContext(), "StartGroupMemberSelectActivity", bundle, 11);
+            }
+            return;
+        }
+        HashMap<String, Object> param = new HashMap<>();
+        param.put(TUIConstants.TUIChat.INPUT_MORE_ACTION_ID, id);
+        param.put(TUIConstants.TUIChat.CHAT_ID, mChatInfo.getId());
+        param.put(TUIConstants.TUIChat.CHAT_NAME, mChatInfo.getChatName());
+        param.put(TUIConstants.TUIChat.CHAT_TYPE, mChatInfo.getType());
+        TUICore.notifyEvent(TUIConstants.TUIChat.EVENT_KEY_INPUT_MORE, TUIConstants.TUIChat.EVENT_SUB_KEY_ON_CLICK, param);
+    }
+
+    public void disableAudioInput(boolean disable) {
+
+    }
+
+    public void disableEmojiInput(boolean disable) {
+        mEmojiInputDisable = disable;
+        if (disable) {
+            faceKeyboardInputButton.setVisibility(GONE);
+        } else {
+            faceKeyboardInputButton.setVisibility(VISIBLE);
+        }
+    }
+
+    public void disableMoreInput(boolean disable) {
+        mMoreInputDisable = disable;
+
+    }
+
+    public void replaceMoreInput(BaseInputFragment fragment) {
+        mMoreInputEvent = fragment;
+    }
+
+    public void replaceMoreInput(OnClickListener listener) {
+        mMoreInputEvent = listener;
+    }
+
+    public void disableSendPhotoAction(boolean disable) {
+        mSendPhotoDisable = disable;
+    }
+
+    public void disableCaptureAction(boolean disable) {
+        mCaptureDisable = disable;
+    }
+
+    public void disableVideoRecordAction(boolean disable) {
+        mVideoRecordDisable = disable;
+    }
+
+    public void disableSendFileAction(boolean disable) {
+        mSendFileDisable = disable;
+    }
+
+    public void addAction(InputMoreActionUnit action) {
+        mInputMoreCustomActionList.add(action);
+    }
+
+    public EditText getInputText() {
+        return mTextInput;
+    }
+
+    protected void showMoreInputButton(int visibility) {
+
+    }
+
+    public void showReplyPreview(ReplyPreviewBean previewBean) {
+        exitReply();
+        replyPreviewBean = previewBean;
+        String replyMessageAbstract = previewBean.getMessageAbstract();
+        String msgTypeStr = ChatMessageParser.getMsgTypeStr(previewBean.getMessageType());
+        // If replying to a text message, the middle part of the file name is displayed in abbreviated form
+        if (previewBean.isReplyMessage()) {
+            String text = msgTypeStr + " " + replyMessageAbstract;
+            text = FaceManager.emojiJudge(text);
+            isReplyModel = true;
+            replyTv.setText(text);
+            replyUserNameTv.setText(previewBean.getMessageSender());
+            replyPreviewBar.setVisibility(View.VISIBLE);
+        } else {
+            String text = previewBean.getMessageSender() + " : " + msgTypeStr + " " + replyMessageAbstract;
+            text = FaceManager.emojiJudge(text);
+            isQuoteModel = true;
+            quoteTv.setText(text);
+            quotePreviewBar.setVisibility(View.VISIBLE);
+        }
+
+        if (previewBean.getOriginalMessageBean() instanceof FileMessageBean) {
+            replyTv.setEllipsize(TextUtils.TruncateAt.MIDDLE);
+            quoteTv.setEllipsize(TextUtils.TruncateAt.MIDDLE);
+        } else {
+            replyTv.setEllipsize(TextUtils.TruncateAt.END);
+            quoteTv.setEllipsize(TextUtils.TruncateAt.END);
+        }
+
+        if (mMessageHandler != null) {
+            mMessageHandler.scrollToEnd();
+        }
+
+        inputMachine.execute(InputAction.INPUT_CLICKED);
+    }
+
+    public void exitReply() {
+        isReplyModel = false;
+        replyPreviewBean = null;
+        replyPreviewBar.setVisibility(View.GONE);
+        isQuoteModel = false;
+        quotePreviewBar.setVisibility(View.GONE);
+        updateChatBackground();
+    }
+
+    private void showInputMoreLayout() {
+        TUIChatLog.i(TAG, "showInputMoreLayout");
+        if (fragmentManager == null) {
+            fragmentManager = getActivity().getSupportFragmentManager();
+        }
+        if (mInputMoreFragment == null) {
+            mInputMoreFragment = new InputMoreDialogFragment();
+            mInputMoreFragment.setMoreActionsListener(new OnMoreActionsClickLisener() {
+                @Override
+                public void startCapture() {
+                    InputView.this.startCapture();
+                }
+
+                @Override
+                public void startSendPhoto() {
+                    InputView.this.startSendPhoto();
+                }
+
+                @Override
+                public void startVideoRecord() {
+                    InputView.this.startVideoRecord();
+                }
+
+                @Override
+                public void startSendFile() {
+                    InputView.this.startSendFile();
+                }
+            });
+        }
+
+        assembleActions();
+        mInputMoreFragment.setActions(mInputMoreActionList);
+        if (!mInputMoreFragment.isAdded() && null == fragmentManager.findFragmentByTag(mInputMoreFragment.getTag())) {
+            mInputMoreFragment.show(fragmentManager, "mInputMoreFragment");
+        }
+    }
+
+    public void clearCustomActionList() {
+        mInputMoreCustomActionList.clear();
+    }
+
+    public ChatInfo getChatInfo() {
+        return mChatInfo;
+    }
+
+    public interface MessageHandler {
+        void sendMessage(TUIMessageBean msg);
+        void scrollToEnd();
+    }
+
+    public interface ChatInputHandler {
+
+        int RECORD_START = 1;
+        int RECORD_STOP = 2;
+        int RECORD_CANCEL = 3;
+        int RECORD_TOO_SHORT = 4;
+        int RECORD_FAILED = 5;
+
+        void onInputAreaClick();
+
+        void onRecordStatusChanged(int status);
+
+        void onUserTyping(boolean status, long time);
+    }
+
+    public interface OnInputViewListener {
+        void onStartGroupMemberSelectActivity();
+        void onClickCapture();
+        void onUpdateChatBackground();
+    }
+
+    public interface OnMoreActionsClickLisener {
+        void startCapture();
+        void startSendPhoto();
+        void startVideoRecord();
+        void startSendFile();
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/input/TIMMentionEditText.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/input/TIMMentionEditText.java
new file mode 100644
index 0000000..eaee4e3
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/input/TIMMentionEditText.java
@@ -0,0 +1,287 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.input;
+
+import android.content.Context;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.util.AttributeSet;
+import android.view.KeyEvent;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputConnectionWrapper;
+import android.widget.EditText;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class TIMMentionEditText extends EditText {
+    public static final String TIM_MENTION_TAG = "@";
+    public static final String TIM_MENTION_TAG_FULL = "＠";
+
+    private List<String> mentionTagList = new ArrayList<>();
+
+    private boolean mIsSelected;
+    private Range mLastSelectedRange;
+    private List<Range> mRangeArrayList = new ArrayList<>();
+    private Map<String, String> mentionList = new HashMap<>();
+
+    private OnMentionInputListener mOnMentionInputListener;
+
+    public TIMMentionEditText(Context context) {
+        super(context);
+        init();
+    }
+
+    public TIMMentionEditText(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public TIMMentionEditText(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    @Override
+    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+        return new HackInputConnection(super.onCreateInputConnection(outAttrs), true, this);
+    }
+
+    @Override
+    protected void onTextChanged(CharSequence text, int start, int lengthBefore, int lengthAfter) {
+        setMentionStringRange();
+    }
+
+    @Override
+    protected void onSelectionChanged(int selStart, int selEnd) {
+        super.onSelectionChanged(selStart, selEnd);
+
+        if (mLastSelectedRange != null && mLastSelectedRange.isEqual(selStart, selEnd)) {
+            return;
+        }
+
+        Range closestRange = getRangeOfClosestMentionString(selStart, selEnd);
+        if (closestRange != null && closestRange.to == selEnd) {
+            mIsSelected = false;
+        }
+
+        Range nearbyRange = getRangeOfNearbyMentionString(selStart, selEnd);
+        if (nearbyRange == null) {
+            return;
+        }
+
+        //forbid cursor located in the mention string.
+        if (selStart == selEnd) {
+            setSelection(nearbyRange.getAnchorPosition(selStart));
+        } else {
+            if (selEnd < nearbyRange.to) {
+                setSelection(selStart, nearbyRange.to);
+            }
+            if (selStart > nearbyRange.from) {
+                setSelection(nearbyRange.from, selEnd);
+            }
+        }
+    }
+
+    public void setOnMentionInputListener(OnMentionInputListener onMentionInputListener) {
+        mOnMentionInputListener = onMentionInputListener;
+    }
+
+    private void init() {
+        mentionTagList.clear();
+        mentionTagList.add(TIM_MENTION_TAG);
+        mentionTagList.add(TIM_MENTION_TAG_FULL);
+        addTextChangedListener(new MentionTextWatcher());
+    }
+
+    public void setMentionMap(Map<String, String> mentionList) {
+        this.mentionList.putAll(mentionList);
+    }
+
+    public List<String> getMentionIdList() {
+        return new ArrayList<>(mentionList.values());
+    }
+
+    private void setMentionStringRange() {
+        updateMentionList();
+        mIsSelected = false;
+        if (mRangeArrayList != null) {
+            mRangeArrayList.clear();
+        }
+
+        Editable spannableText = getText();
+        if (spannableText == null || TextUtils.isEmpty(spannableText.toString())) {
+            return;
+        }
+
+        String text = spannableText.toString();
+        if (TextUtils.isEmpty(text)) {
+            return;
+        }
+        for (String name : mentionList.keySet()) {
+            if (TextUtils.isEmpty(name)) {
+                continue;
+            }
+            int nameStartIndex = 0;
+            while (true) {
+                int findIndex = text.indexOf(name, nameStartIndex);
+                if (findIndex == -1) {
+                    break;
+                } else {
+                    int end = findIndex + name.length();
+                    mRangeArrayList.add(new Range(findIndex, end));
+                    nameStartIndex = end;
+                }
+            }
+
+        }
+    }
+
+    private void updateMentionList() {
+        if (mentionList == null) {
+            return;
+        }
+        Editable spannableText = getText();
+        if (spannableText == null) {
+            return;
+        }
+        String text = spannableText.toString();
+        if (TextUtils.isEmpty(text)) {
+            mentionList.clear();
+        }
+        for (String name : new ArrayList<>(mentionList.keySet())) {
+            if (!text.contains(name)) {
+                mentionList.remove(name);
+            }
+        }
+    }
+
+    private Range getRangeOfClosestMentionString(int selStart, int selEnd) {
+        if (mRangeArrayList == null) {
+            return null;
+        }
+        for (Range range : mRangeArrayList) {
+            if (range.contains(selStart, selEnd)) {
+                return range;
+            }
+        }
+        return null;
+    }
+
+    private Range getRangeOfNearbyMentionString(int selStart, int selEnd) {
+        if (mRangeArrayList == null) {
+            return null;
+        }
+        for (Range range : mRangeArrayList) {
+            if (range.isWrappedBy(selStart, selEnd)) {
+                return range;
+            }
+        }
+        return null;
+    }
+
+
+    private class MentionTextWatcher implements TextWatcher {
+        @Override
+        public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+        }
+
+        @Override
+        public void onTextChanged(CharSequence charSequence, int index, int i1, int count) {
+            if (count == 1 && !TextUtils.isEmpty(charSequence) && hasFocus()) {
+                char mentionChar = charSequence.toString().charAt(index);
+                for (String mentionTag: mentionTagList) {
+                    if (mentionTag.equals(String.valueOf(mentionChar)) && mOnMentionInputListener != null) {
+                        mOnMentionInputListener.onMentionCharacterInput(mentionTag);
+                    }
+                }
+            }
+        }
+
+        @Override
+        public void afterTextChanged(Editable editable) {
+        }
+    }
+
+
+    private class HackInputConnection extends InputConnectionWrapper {
+        private EditText editText;
+
+        HackInputConnection(InputConnection target, boolean mutable, TIMMentionEditText editText) {
+            super(target, mutable);
+            this.editText = editText;
+        }
+
+        @Override
+        public boolean sendKeyEvent(KeyEvent event) {
+            if (event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_DEL) {
+                int selectionStart = editText.getSelectionStart();
+                int selectionEnd = editText.getSelectionEnd();
+                Range closestRange = getRangeOfClosestMentionString(selectionStart, selectionEnd);
+                if (closestRange == null) {
+                    mIsSelected = false;
+                    return super.sendKeyEvent(event);
+                }
+
+                if (mIsSelected || selectionStart == closestRange.from) {
+                    mIsSelected = false;
+                    return super.sendKeyEvent(event);
+                } else {
+                    mIsSelected = true;
+                    mLastSelectedRange = closestRange;
+                    setSelection(closestRange.to, closestRange.from);
+                    sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL));
+                }
+
+                return true;
+            }
+            return super.sendKeyEvent(event);
+        }
+
+        @Override
+        public boolean deleteSurroundingText(int beforeLength, int afterLength) {
+            if (beforeLength == 1 && afterLength == 0) {
+                return sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL))
+                        && sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DEL));
+            }
+            return super.deleteSurroundingText(beforeLength, afterLength);
+        }
+    }
+
+    private class Range {
+        int from;
+        int to;
+
+        Range(int from, int to) {
+            this.from = from;
+            this.to = to;
+        }
+
+        boolean isWrappedBy(int start, int end) {
+            return (start > from && start < to) || (end > from && end < to);
+        }
+
+        boolean contains(int start, int end) {
+            return from <= start && to >= end;
+        }
+
+        boolean isEqual(int start, int end) {
+            return (from == start && to == end) || (from == end && to == start);
+        }
+
+        int getAnchorPosition(int value) {
+            if ((value - from) - (to - value) >= 0) {
+                return to;
+            } else {
+                return from;
+            }
+        }
+    }
+
+    public interface OnMentionInputListener {
+        void onMentionCharacterInput(String tag);
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/input/face/FaceFragment.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/input/face/FaceFragment.java
new file mode 100644
index 0000000..84fc267
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/input/face/FaceFragment.java
@@ -0,0 +1,434 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.input.face;
+
+import android.app.Activity;
+import android.content.Context;
+import android.graphics.BitmapFactory;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.FrameLayout;
+import android.widget.GridView;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
+import androidx.viewpager2.widget.ViewPager2;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.component.face.ChatFace;
+import com.tencent.qcloud.tuikit.tuichat.component.face.CustomFace;
+import com.tencent.qcloud.tuikit.tuichat.component.face.Emoji;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceGroup;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+import com.tencent.qcloud.tuikit.tuichat.component.face.RecentEmojiManager;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.EmojiIndicatorView;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.input.BaseInputFragment;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class FaceFragment extends BaseInputFragment {
+
+    ViewPager2 faceViewPager;
+    RecyclerView faceTabListView;
+    FaceTabListAdapter faceTabListAdapter;
+    ArrayList<Emoji> recentlyEmojiList;
+    private OnEmojiClickListener listener;
+    private RecentEmojiManager recentManager;
+    private TextView sendButton;
+
+    private boolean showCustomFace = true;
+
+    public void setListener(OnEmojiClickListener listener) {
+        this.listener = listener;
+    }
+
+    public void setShowCustomFace(boolean showCustomFace) {
+        this.showCustomFace = showCustomFace;
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        if (activity instanceof OnEmojiClickListener) {
+            this.listener = (OnEmojiClickListener) activity;
+        }
+        recentManager = RecentEmojiManager.getInstance();
+        super.onAttach(activity);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        try {
+            if (recentManager.getCollection(RecentEmojiManager.PREFERENCE_NAME) != null) {
+                recentlyEmojiList = (ArrayList<Emoji>) recentManager.getCollection(RecentEmojiManager.PREFERENCE_NAME);
+            } else {
+                recentlyEmojiList = new ArrayList<>();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.minimalist_fragment_face, container, false);
+        faceViewPager = view.findViewById(R.id.face_viewPager);
+        faceTabListView = view.findViewById(R.id.face_view_group);
+        sendButton = view.findViewById(R.id.send_btn);
+        sendButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (listener != null) {
+                    listener.sendEmoji();
+                }
+            }
+        });
+        initViews();
+        return view;
+    }
+
+    private void initViews() {
+        faceTabListAdapter = new FaceTabListAdapter();
+        List<FaceGroup> faceGroups = new ArrayList<>();
+        if (!showCustomFace) {
+            faceGroups.add(FaceManager.getFaceGroupList().get(0));
+        } else {
+            faceGroups.addAll(FaceManager.getFaceGroupList());
+        }
+        faceTabListAdapter.setFaceGroups(faceGroups);
+        faceTabListView.setLayoutManager(new LinearLayoutManager(getContext(), RecyclerView.HORIZONTAL, false));
+        faceTabListView.setAdapter(faceTabListAdapter);
+
+        FaceVPAdapter vpAdapter = new FaceVPAdapter();
+        vpAdapter.setFaceGroups(faceGroups);
+        faceViewPager.setAdapter(vpAdapter);
+        faceViewPager.setUserInputEnabled(false);
+        faceViewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
+            int oldPosition = 0;
+
+            @Override
+            public void onPageSelected(int position) {
+                oldPosition = position;
+                faceTabListAdapter.setSelected(position);
+            }
+        });
+        faceViewPager.setCurrentItem(0);
+    }
+
+    private int getPagerCount(List<? extends ChatFace> list, int columns, int rows, boolean isShowDelete) {
+        int count = list.size();
+        int dit = 1;
+        if (!isShowDelete) {
+            dit = 0;
+        }
+        return count % (columns * rows - dit) == 0 ? count / (columns * rows - dit)
+                : count / (columns * rows - dit) + 1;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        try {
+            recentManager.putCollection(RecentEmojiManager.PREFERENCE_NAME, recentlyEmojiList);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    class FaceTabListAdapter extends RecyclerView.Adapter<FaceTabListAdapter.FaceTabListViewHolder> {
+        private List<FaceGroup> faceGroups;
+        private int selected = 0;
+
+        public void setFaceGroups(List<FaceGroup> faceGroups) {
+            this.faceGroups = faceGroups;
+        }
+
+        public void setSelected(int selected) {
+            this.selected = selected;
+            notifyDataSetChanged();
+        }
+
+        @NonNull
+        @Override
+        public FaceTabListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.minimalist_face_group_icon, parent, false);
+            return new FaceTabListViewHolder(view);
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull FaceTabListViewHolder holder, int position) {
+            FaceGroup faceGroup = faceGroups.get(position);
+            Glide.with(holder.itemView)
+                    .load(faceGroup.getFaceGroupIconUrl())
+                    .apply(new RequestOptions().error(android.R.drawable.ic_menu_report_image))
+                    .into(holder.faceGroupIcon);
+            if (selected == position) {
+                holder.selectBorder.setVisibility(View.VISIBLE);
+            } else {
+                holder.selectBorder.setVisibility(View.GONE);
+            }
+            holder.itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    int index = faceGroups.indexOf(faceGroup);
+                    if (index == -1) {
+                        return;
+                    }
+                    faceViewPager.setCurrentItem(index);
+                }
+            });
+        }
+
+        @Override
+        public int getItemCount() {
+            if (faceGroups == null) {
+                return 0;
+            }
+            return faceGroups.size();
+        }
+
+        class FaceTabListViewHolder extends ViewHolder {
+            private View selectBorder;
+            private ImageView faceGroupIcon;
+            public FaceTabListViewHolder(@NonNull View itemView) {
+                super(itemView);
+                selectBorder = itemView.findViewById(R.id.select_border);
+                faceGroupIcon = itemView.findViewById(R.id.face_group_tab_icon);
+            }
+        }
+    }
+
+    public interface OnEmojiClickListener {
+        void onEmojiDelete();
+
+        void onEmojiClick(Emoji emoji);
+
+        void onCustomFaceClick(int groupIndex, CustomFace customFace);
+
+        void sendEmoji();
+    }
+
+    static class FaceGVAdapter extends BaseAdapter {
+        private List<ChatFace> faceList;
+        private final Context mContext;
+
+        public FaceGVAdapter(Context mContext) {
+            super();
+            this.mContext = mContext;
+        }
+
+        public void setFaceList(List<ChatFace> faceList) {
+            this.faceList = faceList;
+        }
+
+        @Override
+        public int getCount() {
+            if (faceList == null) {
+                return 0;
+            }
+            return faceList.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            // TODO Auto-generated method stub
+            return faceList.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            // TODO Auto-generated method stub
+            return position;
+        }
+
+        @Override
+        public View getView(final int position, View convertView, ViewGroup parent) {
+            ViewHolder holder;
+            ChatFace chatFace = faceList.get(position);
+            if (convertView == null) {
+                holder = new ViewHolder();
+                convertView = LayoutInflater.from(mContext).inflate(R.layout.item_face, null);
+                holder.iv = convertView.findViewById(R.id.face_image);
+                FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) holder.iv.getLayoutParams();
+                if (chatFace != null && chatFace.getHeight() != 0 && chatFace.getWidth() != 0) {
+                    params.width = chatFace.getWidth();
+                    params.height = chatFace.getHeight();
+                }
+                holder.iv.setLayoutParams(params);
+                convertView.setTag(holder);
+            } else {
+                holder = (ViewHolder) convertView.getTag();
+            }
+
+            if (chatFace != null) {
+                FaceManager.loadFace(chatFace, holder.iv);
+            }
+            return convertView;
+        }
+
+        class ViewHolder {
+            ImageView iv;
+        }
+    }
+
+    class FaceVPAdapter extends RecyclerView.Adapter<FaceVPAdapter.FaceVPHolder> {
+
+        private List<FaceGroup> faceGroups;
+
+        public void setFaceGroups(List<FaceGroup> faceGroups) {
+            this.faceGroups = faceGroups;
+        }
+
+        @NonNull
+        @Override
+        public FaceVPHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.chat_minimalist_face_view_pager_item, parent, false);
+            FaceVPHolder holder = new FaceVPHolder(view);
+            holder.faceGridAdapter = new FaceGridAdapter();
+            holder.viewPager2.setAdapter(holder.faceGridAdapter);
+            return new FaceVPHolder(view);
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull FaceVPHolder holder, int position) {
+            FaceGridAdapter adapter = holder.faceGridAdapter;
+            FaceGroup faceGroup = faceGroups.get(position);
+            holder.setData(faceGroup);
+            adapter.notifyDataSetChanged();
+        }
+
+        @Override
+        public int getItemCount() {
+            if (faceGroups == null) {
+                return 0;
+            }
+            return faceGroups.size();
+        }
+
+        class FaceVPHolder extends ViewHolder {
+            private int oldPosition = 0;
+            private ViewPager2 viewPager2;
+            private FaceGridAdapter faceGridAdapter;
+            private EmojiIndicatorView indicatorView;
+            public FaceVPHolder(@NonNull View itemView) {
+                super(itemView);
+                viewPager2 = itemView.findViewById(R.id.face_group_view_pager2);
+                indicatorView = itemView.findViewById(R.id.face_indicator);
+                faceGridAdapter = new FaceGridAdapter();
+                viewPager2.setAdapter(faceGridAdapter);
+                viewPager2.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
+                    @Override
+                    public void onPageSelected(int position) {
+                        indicatorView.playBy(oldPosition, position);
+                        oldPosition = position;
+                    }
+                });
+            }
+
+            void setData(FaceGroup faceGroup) {
+                faceGridAdapter.setFaceGroup(faceGroup);
+                indicatorView.init(getPagerCount(faceGroup.getFaces(),
+                        faceGroup.getPageColumnCount(),
+                        faceGroup.getPageRowCount(),
+                        faceGroup.getGroupID() == 0));
+                oldPosition = 0;
+                faceGridAdapter.notifyDataSetChanged();
+            }
+        }
+
+        class FaceGridAdapter extends RecyclerView.Adapter<FaceGridAdapter.FaceGridHolder> {
+            private FaceGroup faceGroup;
+
+            public void setFaceGroup(FaceGroup faceGroup) {
+                this.faceGroup = faceGroup;
+            }
+
+            @NonNull
+            @Override
+            public FaceGridAdapter.FaceGridHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+                GridView gridView = (GridView) LayoutInflater.from(parent.getContext()).inflate(R.layout.layout_face_grid, parent, false);
+                gridView.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+                return new FaceGridHolder(gridView);
+            }
+
+            @Override
+            public void onBindViewHolder(@NonNull FaceGridAdapter.FaceGridHolder holder, int position) {
+                boolean isShowDelete = faceGroup.getGroupID() == 0;
+                int dit = 1;
+                if (!isShowDelete) {
+                    dit = 0;
+                }
+                int columns = faceGroup.getPageColumnCount();
+                int rows = faceGroup.getPageRowCount();
+
+                List<ChatFace> faces = faceGroup.getFaces();
+                List<ChatFace> subList = faces.subList(position * (columns * rows - dit), Math.min((columns * rows - dit) * (position + 1), faces.size()));
+
+                if (isShowDelete && subList.size() < (columns * rows - dit)) {
+                    for (int i = subList.size(); i < (columns * rows - dit); i++) {
+                        subList.add(null);
+                    }
+                }
+                if (isShowDelete) {
+                    Emoji deleteEmoji = new Emoji();
+                    deleteEmoji.setIcon(BitmapFactory.decodeResource(getResources(), R.drawable.face_delete));
+                    subList.add(deleteEmoji);
+                }
+                FaceGVAdapter adapter = (FaceGVAdapter) holder.faceGrid.getAdapter();
+                adapter.setFaceList(subList);
+                holder.faceGrid.setNumColumns(faceGroup.getPageColumnCount());
+                holder.faceGrid.setAdapter(adapter);
+                holder.faceGrid.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                    @Override
+                    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                        if (subList.get(position) instanceof CustomFace) {
+                            listener.onCustomFaceClick(faceGroup.getGroupID(), (CustomFace) subList.get(position));
+                        } else if (subList.get(position) instanceof Emoji){
+                            if (position == columns * rows - 1) {
+                                if (listener != null) {
+                                    listener.onEmojiDelete();
+                                }
+                                return;
+                            }
+                            if (listener != null) {
+                                listener.onEmojiClick((Emoji) subList.get(position));
+                            }
+                        }
+                    }
+                });
+            }
+
+            @Override
+            public int getItemCount() {
+                if (faceGroup == null) {
+                    return 0;
+                }
+                return getPagerCount(faceGroup.getFaces(),
+                        faceGroup.getPageColumnCount(),
+                        faceGroup.getPageRowCount(),
+                        faceGroup.getGroupID() == 0);
+            }
+
+            class FaceGridHolder extends ViewHolder {
+                private GridView faceGrid;
+                public FaceGridHolder(@NonNull View itemView) {
+                    super(itemView);
+                    faceGrid = (GridView) itemView;
+                    faceGrid.setAdapter(new FaceGVAdapter(itemView.getContext()));
+                }
+            }
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/input/inputmore/InputMoreDialogFragment.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/input/inputmore/InputMoreDialogFragment.java
new file mode 100644
index 0000000..89e56cb
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/input/inputmore/InputMoreDialogFragment.java
@@ -0,0 +1,177 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.input.inputmore;
+
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.graphics.drawable.ColorDrawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.component.CustomLinearLayoutManager;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.InputMoreActionUnit;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.input.InputView;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class InputMoreDialogFragment extends DialogFragment {
+    public static final int REQUEST_CODE_FILE = 1011;
+    public static final int REQUEST_CODE_PHOTO = 1012;
+    private IUIKitCallback mCallback;
+    private InputView.OnMoreActionsClickLisener mMoreActionsListener;
+    private Dialog moreDialog;
+    private List<InputMoreActionUnit> mInputMoreList = new ArrayList<>();
+    private RecyclerView mInputActionView;
+    private SelectAdapter mAdapter;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.minimalist_input_more, container, false);
+        mInputActionView = view.findViewById(R.id.input_extra_area);
+        TextView cancelView = view.findViewById(R.id.cancel_button);
+        moreDialog = getDialog();
+
+        mAdapter = new SelectAdapter();
+        mInputActionView.setAdapter(mAdapter);
+        mInputActionView.setLayoutManager(new CustomLinearLayoutManager(getContext()));
+
+        cancelView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (moreDialog != null) {
+                    moreDialog.dismiss();
+                }
+            }
+        });
+
+        if (moreDialog != null) {
+            Window win = moreDialog.getWindow();
+            WindowManager.LayoutParams lp = win.getAttributes();
+            lp.width = lp.width - ScreenUtil.getPxByDp(16f);
+            lp.y = ScreenUtil.getPxByDp(34f);
+            moreDialog.getWindow().setBackgroundDrawable(new ColorDrawable());
+            win.setGravity(Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM);
+            win.setAttributes(lp);
+            moreDialog.setOnKeyListener(new DialogInterface.OnKeyListener() {
+                @Override
+                public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
+                    if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN) {
+                        moreDialog.dismiss();
+                    }
+                    return false;
+                }
+            });
+        }
+        return view;
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    public void setMoreActionsListener(InputView.OnMoreActionsClickLisener mMoreActionsListener) {
+        this.mMoreActionsListener = mMoreActionsListener;
+    }
+
+    public void setActions(List<InputMoreActionUnit> actions) {
+        this.mInputMoreList = actions;
+    }
+
+    public void setCallback(IUIKitCallback callback) {
+        mCallback = callback;
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == REQUEST_CODE_FILE
+                || requestCode == REQUEST_CODE_PHOTO) {
+            if (resultCode != -1) {
+                if (moreDialog != null) {
+                    moreDialog.dismiss();
+                }
+                return;
+            }
+            Uri uri = data.getData();
+            if (mCallback != null) {
+                mCallback.onSuccess(uri);
+            }
+
+            if (moreDialog != null) {
+                moreDialog.dismiss();
+            }
+        }
+    }
+
+    class SelectAdapter extends RecyclerView.Adapter<SelectAdapter.SelectViewHolder> {
+
+        @NonNull
+        @Override
+        public SelectAdapter.SelectViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            View view = LayoutInflater.from(getContext()).inflate(R.layout.minimalist_input_more_item,parent, false);
+            return new SelectAdapter.SelectViewHolder(view);
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull SelectAdapter.SelectViewHolder holder, int position) {
+            InputMoreActionUnit actionUnit = mInputMoreList.get(position);
+            if (actionUnit.getTitleId() > 0) {
+                holder.itemText.setText(getContext().getString(actionUnit.getTitleId()));
+            }
+            if (actionUnit.getIconResId() > 0) {
+                holder.itemImage.setImageResource(actionUnit.getIconResId());
+            }
+            holder.itemLayout.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    actionUnit.getOnClickListener().onClick();
+                    if (actionUnit.getActionType() == 0) {
+                        if (moreDialog != null) {
+                            moreDialog.dismiss();
+                        }
+                    }
+                }
+            });
+            if (position == mInputMoreList.size() - 1) {
+                holder.itemLine.setVisibility(View.GONE);
+            }
+        }
+
+        @Override
+        public int getItemCount() {
+            return mInputMoreList.size();
+        }
+
+        class SelectViewHolder extends RecyclerView.ViewHolder {
+            RelativeLayout itemLayout;
+            TextView itemText;
+            ImageView itemImage;
+            TextView itemLine;
+            public SelectViewHolder(@NonNull View itemView) {
+                super(itemView);
+                itemLayout = itemView.findViewById(R.id.item_layout);
+                itemText = itemView.findViewById(R.id.item_text);
+                itemImage = itemView.findViewById(R.id.item_icon);
+                itemLine = itemView.findViewById(R.id.divide_line);
+            }
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/input/waveview/VoiceWaveView.kt b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/input/waveview/VoiceWaveView.kt
new file mode 100644
index 0000000..102700c
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/input/waveview/VoiceWaveView.kt
@@ -0,0 +1,308 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.input.waveview.VoiceWaveView
+
+import android.animation.ValueAnimator
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.graphics.Path
+import android.os.Handler
+import android.os.Parcelable
+import android.util.AttributeSet
+import android.view.Gravity
+import android.view.View
+import com.tencent.qcloud.tuikit.tuichat.R
+import java.util.*
+
+class VoiceWaveView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyle: Int = 0
+) : View(context, attrs, defStyle) {
+
+    var bodyWaveList = LinkedList<Int>()
+        private set
+    var headerWaveList = LinkedList<Int>()
+        private set
+    var footerWaveList = LinkedList<Int>()
+        private set
+
+    private var waveList = LinkedList<Int>()
+
+    /**
+     * 线间距 px
+     */
+    var lineSpace: Float = 10f
+    /**
+     * 线宽 px
+     */
+    var lineWidth: Float = 20f
+
+    /**
+     * 动画持续时间
+     */
+    var duration: Long = Long.MAX_VALUE
+    /**
+     * 线颜色
+     */
+    var lineColor: Int = Color.BLUE
+    var paintLine: Paint? = null
+    var paintPathLine: Paint? = null
+
+    private var valueAnimator = ValueAnimator.ofFloat(0f, 1f)
+
+    private var valueAnimatorOffset: Float = 1f
+
+    private var valHandler = Handler()
+    val linePath = Path()
+
+    @Volatile
+    var isStart: Boolean = false
+        private set
+
+    /**
+     * 跳动模式
+     */
+    var waveMode: WaveMode = WaveMode.UP_DOWN
+
+    /**
+     * 线条样式
+     */
+    var lineType: LineType = LineType.BAR_CHART
+
+    /**
+     * 显示位置
+     */
+    var showGravity: Int = Gravity.LEFT or Gravity.BOTTOM
+
+    private var runnable: Runnable? = null
+
+
+    init {
+        attrs?.let {
+            val typedArray = context.theme.obtainStyledAttributes(
+                attrs,
+                R.styleable.VoiceWaveView, 0, 0
+            )
+
+            lineWidth = typedArray.getDimension(R.styleable.VoiceWaveView_lineWidth, 5f)
+            lineSpace = typedArray.getDimension(R.styleable.VoiceWaveView_lineSpace, 5f)
+            duration = typedArray.getInt(R.styleable.VoiceWaveView_duration, 200).toLong()
+            showGravity = typedArray.getInt(R.styleable.VoiceWaveView_android_gravity, Gravity.LEFT or Gravity.BOTTOM)
+            lineColor = typedArray.getInt(R.styleable.VoiceWaveView_lineColor, Color.BLUE)
+            val mode = typedArray.getInt(R.styleable.VoiceWaveView_waveMode, 0)
+            when (mode) {
+                0 -> waveMode = WaveMode.UP_DOWN
+                1 -> waveMode = WaveMode.LEFT_RIGHT
+            }
+
+            val lType = typedArray.getInt(R.styleable.VoiceWaveView_lineType, 0)
+            when (lType) {
+                0 -> lineType = LineType.BAR_CHART
+                1 -> lineType = LineType.LINE_GRAPH
+            }
+
+            typedArray.recycle()
+        }
+
+        paintLine = Paint()
+        paintLine?.isAntiAlias = true
+        paintLine?.strokeCap = Paint.Cap.ROUND
+
+        paintPathLine = Paint()
+        paintPathLine?.isAntiAlias = true
+        paintPathLine?.setStyle(Paint.Style.STROKE);
+    }
+
+    /**
+     * 线的高度 0,100 百分数
+     */
+    fun addBody(num: Int) {
+        checkNum(num)
+        bodyWaveList.add(num)
+    }
+
+    /**
+     * 头部线的高度 0,100 百分数
+     */
+    fun addHeader(num: Int) {
+        checkNum(num)
+        headerWaveList.add(num)
+    }
+
+    /**
+     * 尾部线的高度 0,100 百分数
+     */
+    fun addFooter(num: Int) {
+        checkNum(num)
+        footerWaveList.add(num)
+    }
+
+    private fun checkNum(num: Int) {
+        if (num < 0 || num > 100) {
+            throw Exception("num must between 0 and 100")
+        }
+    }
+
+    /**
+     * 开始
+     */
+    fun start() {
+        if (isStart) {
+            return
+        }
+        isStart = true
+        if (waveMode == WaveMode.UP_DOWN) {
+            valueAnimator.duration = duration
+            valueAnimator.repeatMode = ValueAnimator.REVERSE
+            valueAnimator.repeatCount = ValueAnimator.INFINITE
+            valueAnimator.addUpdateListener {
+                valueAnimatorOffset = it.getAnimatedValue() as Float
+                invalidate()
+            }
+            valueAnimator.start()
+        } else if (waveMode == WaveMode.LEFT_RIGHT) {
+            runnable = object : Runnable {
+                override fun run() {
+                    val last = bodyWaveList.pollLast()
+                    bodyWaveList.addFirst(last)
+                    invalidate()
+                    valHandler.postDelayed(this, duration);
+                }
+            }
+            valHandler.post(runnable as Runnable)
+        } else {
+
+        }
+    }
+
+    override fun onDraw(canvas: Canvas?) {
+        super.onDraw(canvas)
+
+        waveList.clear()
+        waveList.addAll(headerWaveList)
+        waveList.addAll(bodyWaveList)
+        waveList.addAll(footerWaveList)
+
+        linePath.reset()
+        paintPathLine?.strokeWidth = lineWidth
+        paintPathLine?.color = lineColor
+
+        paintLine?.strokeWidth = lineWidth
+        paintLine?.color = lineColor
+        for (i in waveList.indices) {
+            var startX = 0f
+            var startY = 0f
+            var endX = 0f
+            var endY = 0f
+
+            var offset = 1f
+            if (i >= headerWaveList.size && i < (waveList.size - footerWaveList.size)) {//模式1 ，排除掉头尾
+                offset = valueAnimatorOffset
+            }
+
+            val lineHeight = waveList[i] / 100.0 * measuredHeight * offset
+
+            val absoluteGravity = Gravity.getAbsoluteGravity(showGravity, layoutDirection);
+
+            when (absoluteGravity and Gravity.HORIZONTAL_GRAVITY_MASK) {
+                Gravity.CENTER_HORIZONTAL -> {
+                    val lineSize = waveList.size
+                    val allLineWidth = lineSize * (lineSpace + lineWidth)
+                    if (allLineWidth < measuredWidth) {
+                        startX = (i * (lineSpace + lineWidth) + lineWidth / 2) + ((measuredWidth - allLineWidth) / 2)
+                    } else {
+                        startX = i * (lineSpace + lineWidth) + lineWidth / 2
+                    }
+                    endX = startX
+                }
+
+                Gravity.RIGHT -> {
+                    val lineSize = waveList.size
+                    val allLineWidth = lineSize * (lineSpace + lineWidth)
+                    if (allLineWidth < measuredWidth) {
+                        startX = (i * (lineSpace + lineWidth) + lineWidth / 2) + (measuredWidth - allLineWidth)
+                    } else {
+                        startX = i * (lineSpace + lineWidth) + lineWidth / 2
+                    }
+                    endX = startX
+                }
+
+                Gravity.LEFT -> {
+                    startX = i * (lineSpace + lineWidth) + lineWidth / 2
+                    endX = startX
+                }
+            }
+
+
+            when (showGravity and Gravity.VERTICAL_GRAVITY_MASK) {
+                Gravity.TOP -> {
+                    startY = 0f
+                    endY = lineHeight.toFloat()
+                }
+
+                Gravity.CENTER_VERTICAL -> {
+                    startY = (measuredHeight / 2 - lineHeight / 2).toFloat()
+                    endY = (measuredHeight / 2 + lineHeight / 2).toFloat()
+                }
+
+                Gravity.BOTTOM -> {
+                    startY = (measuredHeight - lineHeight).toFloat()
+                    endY = measuredHeight.toFloat()
+                }
+
+            }
+            if (lineType == LineType.BAR_CHART) {
+                paintLine?.let {
+                    canvas?.drawLine(
+                        startX,
+                        startY,
+                        endX,
+                        endY,
+                        it
+                    )
+                }
+            }
+            if (lineType == LineType.LINE_GRAPH) {
+                if (i == 0) {
+                    linePath.moveTo(startX, startY)
+                    val pathEndX = endX + (lineWidth / 2) + (lineSpace / 2)
+                    linePath.lineTo(pathEndX, endY)
+                } else {
+                    linePath.lineTo(startX, startY)
+                    val pathEndX = endX + (lineWidth / 2) + (lineSpace / 2)
+                    linePath.lineTo(pathEndX, endY)
+                }
+            }
+        }
+        if (lineType == LineType.LINE_GRAPH) {
+            paintPathLine?.let { canvas?.drawPath(linePath, it) }
+        }
+    }
+
+    /**
+     * 停止 onDestroy call
+     */
+    fun stop() {
+        isStart = false
+        if (runnable != null) {
+            valHandler.removeCallbacks(runnable!!)
+        }
+        valueAnimator.cancel()
+        waveList.clear()
+        bodyWaveList.clear()
+        headerWaveList.clear()
+        footerWaveList.clear()
+        linePath.reset()
+    }
+
+    override fun onSaveInstanceState(): Parcelable? {
+        //TODO onSaveInstanceState
+        return super.onSaveInstanceState()
+    }
+
+    override fun onRestoreInstanceState(state: Parcelable?) {
+        //TODO onRestoreInstanceState
+        super.onRestoreInstanceState(state)
+    }
+}
\ No newline at end of file
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/input/waveview/WaveMode.kt b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/input/waveview/WaveMode.kt
new file mode 100644
index 0000000..a496763
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/input/waveview/WaveMode.kt
@@ -0,0 +1,9 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.input.waveview.VoiceWaveView
+
+enum class WaveMode {
+    UP_DOWN, LEFT_RIGHT
+}
+
+enum class LineType {
+    LINE_GRAPH, BAR_CHART
+}
\ No newline at end of file
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/ChatReactDialogFragment.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/ChatReactDialogFragment.java
new file mode 100644
index 0000000..155acf5
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/ChatReactDialogFragment.java
@@ -0,0 +1,327 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message;
+
+import android.app.Dialog;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Pair;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewpager2.widget.ViewPager2;
+
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageReactBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.ReactUserBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+import com.tencent.qcloud.tuikit.tuichat.presenter.ReactPresenter;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class ChatReactDialogFragment extends DialogFragment {
+
+    private BottomSheetDialog dialog;
+
+    private TUIMessageBean messageBean;
+
+    private RecyclerView reactCategoryList;
+
+    private ViewPager2 reactViewPager;
+
+    private ReactPresenter reactPresenter;
+
+    private OnReactClickListener onReactClickListener;
+
+    private ChatInfo chatInfo;
+
+    private int selectedIndex = 0;
+
+    public void setMessageBean(TUIMessageBean messageBean) {
+        this.messageBean = messageBean;
+    }
+
+    public void setChatInfo(ChatInfo chatInfo) {
+        this.chatInfo = chatInfo;
+    }
+
+    public void setOnReactClickListener(OnReactClickListener onReactClickListener) {
+        this.onReactClickListener = onReactClickListener;
+    }
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        dialog = new BottomSheetDialog(getContext(), R.style.ChatPopActivityStyle);
+        dialog.setCanceledOnTouchOutside(true);
+        BottomSheetBehavior<FrameLayout> bottomSheetBehavior = dialog.getBehavior();
+        bottomSheetBehavior.setFitToContents(false);
+        bottomSheetBehavior.setHalfExpandedRatio(0.45f);
+        bottomSheetBehavior.setSkipCollapsed(true);
+        bottomSheetBehavior.setExpandedOffset(ScreenUtil.dip2px(36));
+        bottomSheetBehavior.setState(BottomSheetBehavior.STATE_HALF_EXPANDED);
+        return dialog;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.chat_react_dialog_layout, container);
+        reactViewPager = view.findViewById(R.id.react_view_pager);
+        reactCategoryList = view.findViewById(R.id.react_category_list);
+        initView();
+        initData();
+        return view;
+    }
+
+    private void initView() {
+        reactViewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
+            @Override
+            public void onPageSelected(int position) {
+                selectedIndex = position;
+                reactCategoryList.getAdapter().notifyDataSetChanged();
+                reactCategoryList.smoothScrollToPosition(position);
+            }
+        });
+    }
+
+    private void initData() {
+        reactPresenter = new ReactPresenter();
+        reactPresenter.setChatInfo(chatInfo);
+        reactPresenter.setMessageId(messageBean.getId());
+        reactPresenter.setChatEventListener();
+        reactPresenter.setMessageListener(new ReactPresenter.OnMessageChangedListener() {
+            @Override
+            public void onMessageChanged(TUIMessageBean messageBean) {
+                if (!isAdded()) {
+                    return;
+                }
+                ChatReactDialogFragment.this.messageBean = messageBean;
+                reactCategoryList.getAdapter().notifyDataSetChanged();
+                reactViewPager.getAdapter().notifyDataSetChanged();
+            }
+        });
+        reactCategoryList.setLayoutManager(new LinearLayoutManager(getContext(), RecyclerView.HORIZONTAL, false));
+        reactCategoryList.setAdapter(new ReactCategoryAdapter());
+        reactViewPager.setAdapter(new ReactDetailAdapter());
+    }
+
+    class ReactDetailAdapter extends RecyclerView.Adapter<ReactDetailAdapter.ReactDetailHolder> {
+        @NonNull
+        @Override
+        public ReactDetailHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.minimalist_react_view_pager_layout, parent, false);
+            ReactDetailHolder holder = new ReactDetailHolder(view);
+            holder.recyclerView.setLayoutManager(new LinearLayoutManager(parent.getContext()));
+            holder.recyclerView.setAdapter(new ReactUserAdapter());
+            return holder;
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull ReactDetailHolder holder, int position) {
+            ReactUserAdapter adapter = (ReactUserAdapter) holder.recyclerView.getAdapter();
+            List<Pair<String, String>> data = new ArrayList<>();
+                MessageReactBean reactBean = messageBean.getMessageReactBean();
+                Map<String, Set<String>> reacts = reactBean.getReacts();
+            if (position == 0) {
+                for (String emojiKey : reacts.keySet()) {
+                    Set<String> userSet = reacts.get(emojiKey);
+                    if (userSet != null) {
+                        for (String userID : userSet) {
+                            data.add(new Pair<>(userID, emojiKey));
+                        }
+                    }
+                }
+            } else {
+                List<String> emojiKeys = new ArrayList<>(reacts.keySet());
+                String emojiKey = emojiKeys.get(position - 1);
+                Set<String> userSet = reacts.get(emojiKey);
+                if (userSet != null) {
+                    for (String userID : userSet) {
+                        data.add(new Pair<>(userID, emojiKey));
+                    }
+                }
+            }
+            adapter.setData(data);
+            adapter.notifyDataSetChanged();
+        }
+
+        @Override
+        public int getItemCount() {
+            if (messageBean == null) {
+                return 0;
+            } else {
+                MessageReactBean reactBean = messageBean.getMessageReactBean();
+                if (reactBean == null) {
+                    return 0;
+                } else {
+                    return reactBean.getReactSize() + 1;
+                }
+            }
+        }
+
+        class ReactDetailHolder extends RecyclerView.ViewHolder {
+            private RecyclerView recyclerView;
+
+            public ReactDetailHolder(@NonNull View itemView) {
+                super(itemView);
+                recyclerView = itemView.findViewById(R.id.react_user_list);
+            }
+        }
+    }
+
+    class ReactUserAdapter extends RecyclerView.Adapter<ReactUserAdapter.ReactUserViewHolder> {
+
+        private List<Pair<String, String>> data;
+
+        public void setData(List<Pair<String, String>> data) {
+            this.data = data;
+        }
+
+        @NonNull
+        @Override
+        public ReactUserViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.minimalist_react_details_layout, parent, false);
+            return new ReactUserViewHolder(view);
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull ReactUserViewHolder holder, int position) {
+            Pair<String, String> pair = data.get(position);
+            Map<String, ReactUserBean> userBeanMap = messageBean.getMessageReactBean().getReactUserBeanMap();
+            ReactUserBean reactUserBean = userBeanMap.get(pair.first);
+            GlideEngine.loadImage(holder.userFace, reactUserBean.getFaceUrl());
+            if (pair.second != null) {
+                GlideEngine.loadImage(holder.emojiIcon, FaceManager.getEmoji(pair.second));
+            }
+            holder.userName.setText(reactUserBean.getDisplayString());
+            if (TextUtils.equals(pair.first, TUILogin.getLoginUser())) {
+                holder.tips.setText(getResources().getString(R.string.chat_tap_to_remove));
+                holder.itemView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        if (onReactClickListener != null) {
+                            onReactClickListener.onClick(reactUserBean.getUserId(), pair.second);
+                        }
+                    }
+                });
+            } else {
+                holder.tips.setVisibility(View.GONE);
+                holder.itemView.setOnClickListener(null);
+            }
+        }
+
+        @Override
+        public int getItemCount() {
+            if (data != null) {
+                return data.size();
+            }
+            return 0;
+        }
+
+        class ReactUserViewHolder extends RecyclerView.ViewHolder {
+            private ImageView userFace;
+            private ImageView emojiIcon;
+            private TextView userName;
+            private TextView tips;
+
+            public ReactUserViewHolder(@NonNull View itemView) {
+                super(itemView);
+                userFace = itemView.findViewById(R.id.user_face);
+                emojiIcon = itemView.findViewById(R.id.emoji_icon);
+                userName = itemView.findViewById(R.id.user_name);
+                tips = itemView.findViewById(R.id.tips);
+            }
+        }
+    }
+
+    class ReactCategoryAdapter extends RecyclerView.Adapter<ReactCategoryAdapter.ReactCategoryHolder> {
+
+        @NonNull
+        @Override
+        public ReactCategoryHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.minimalist_react_category_layout, parent, false);
+            return new ReactCategoryHolder(view);
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull ReactCategoryHolder holder, int position) {
+            if (selectedIndex == position) {
+                holder.itemView.setBackgroundResource(R.drawable.chat_gray_round_rect_bg);
+            } else {
+                holder.itemView.setBackground(null);
+            }
+            if (position == 0) {
+                holder.categoryName.setText("All");
+                Map<String, Set<String>> reactsMap = messageBean.getMessageReactBean().getReacts();
+                int num = 0;
+                for (Set<String> strings : reactsMap.values()) {
+                    num += strings.size();
+                }
+                holder.reactNum.setText(num + "");
+                holder.reactImg.setVisibility(View.GONE);
+            } else {
+                Map<String, Set<String>> reactsMap = messageBean.getMessageReactBean().getReacts();
+                List<String> reactKeys = new ArrayList<>(reactsMap.keySet());
+                holder.reactImg.setImageBitmap(FaceManager.getEmoji(reactKeys.get(position - 1)));
+                Set<String> users = reactsMap.get(reactKeys.get(position - 1));
+                holder.reactNum.setText(users.size() + "");
+            }
+            holder.itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    reactViewPager.setCurrentItem(position);
+                }
+            });
+        }
+
+        @Override
+        public int getItemCount() {
+            if (messageBean == null) {
+                return 0;
+            } else {
+                MessageReactBean reactBean = messageBean.getMessageReactBean();
+                if (reactBean == null) {
+                    return 0;
+                } else {
+                    return reactBean.getReactSize() + 1;
+                }
+            }
+        }
+
+        class ReactCategoryHolder extends RecyclerView.ViewHolder {
+            private TextView categoryName;
+            private ImageView reactImg;
+            private TextView reactNum;
+
+            public ReactCategoryHolder(@NonNull View itemView) {
+                super(itemView);
+                categoryName = itemView.findViewById(R.id.category_name);
+                reactNum = itemView.findViewById(R.id.react_num);
+                reactImg = itemView.findViewById(R.id.react_img);
+            }
+        }
+    }
+
+    interface OnReactClickListener {
+        void onClick(String userID, String emojiKey);
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/ChatReplyDialogFragment.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/ChatReplyDialogFragment.java
new file mode 100644
index 0000000..131ec70
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/ChatReplyDialogFragment.java
@@ -0,0 +1,136 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message;
+
+import android.app.Dialog;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageRepliesBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.IReplyMessageHandler;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.MinimalistUIService;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply.ReplyDetailsView;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.MessageBaseHolder;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.MessageContentHolder;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.MessageViewHolderFactory;
+import com.tencent.qcloud.tuikit.tuichat.presenter.ReplyPresenter;
+
+import java.util.Map;
+
+public class ChatReplyDialogFragment extends DialogFragment implements IReplyMessageHandler {
+
+    private BottomSheetDialog dialog;
+
+    private TUIMessageBean originMessage;
+
+    private View cancelBtn;
+    private TextView title;
+    private FrameLayout messageContent;
+
+    private ReplyDetailsView repliesList;
+    private ReplyPresenter presenter;
+
+    private ChatInfo chatInfo;
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        dialog = new BottomSheetDialog(getContext(), R.style.ChatPopActivityStyle);
+        dialog.setCanceledOnTouchOutside(true);
+        BottomSheetBehavior<FrameLayout> bottomSheetBehavior = dialog.getBehavior();
+        bottomSheetBehavior.setFitToContents(false);
+        bottomSheetBehavior.setHalfExpandedRatio(0.45f);
+        bottomSheetBehavior.setSkipCollapsed(true);
+        bottomSheetBehavior.setExpandedOffset(ScreenUtil.dip2px(36));
+        bottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
+        return dialog;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        if (originMessage == null) {
+            return super.onCreateView(inflater, container, savedInstanceState);
+        }
+        View view = inflater.inflate(R.layout.chat_reply_dialog_layout, container);
+        cancelBtn = view.findViewById(R.id.cancel_btn);
+        title = view.findViewById(R.id.title);
+        messageContent = view.findViewById(R.id.message_content);
+        repliesList = view.findViewById(R.id.replies_list);
+
+        initData();
+        return view;
+    }
+
+    public void setOriginMessage(TUIMessageBean originMessage) {
+        this.originMessage = originMessage;
+    }
+
+    public void setChatInfo(ChatInfo chatInfo) {
+        this.chatInfo = chatInfo;
+    }
+
+    private void initData() {
+        if (originMessage != null) {
+            messageContent.removeAllViews();
+            int type = MinimalistUIService.getInstance().getViewType(originMessage.getClass());
+            RecyclerView.ViewHolder holder = MessageViewHolderFactory.getInstance(messageContent, null, type);
+            if (holder instanceof MessageBaseHolder) {
+                ((MessageContentHolder) holder).isMessageDetailMode = true;
+                ((MessageContentHolder) holder).setTranslationContent(originMessage, 0);
+                ((MessageBaseHolder) holder).layoutViews(originMessage, 0);
+            }
+            messageContent.addView(holder.itemView);
+
+            presenter = new ReplyPresenter();
+            presenter.setMessageId(originMessage.getId());
+            presenter.setChatInfo(chatInfo);
+            presenter.setChatEventListener();
+            presenter.setReplyHandler(this);
+
+            MessageRepliesBean repliesBean = originMessage.getMessageRepliesBean();
+            if (repliesBean != null) {
+                presenter.findReplyMessages(repliesBean);
+                title.setText(getResources().getString(R.string.chat_reply_num, repliesBean.getRepliesSize()));
+            }
+
+            cancelBtn.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    dismiss();
+                }
+            });
+
+        }
+    }
+
+    @Override
+    public void updateData(TUIMessageBean messageBean) {
+        this.originMessage = messageBean;
+        if (!isAdded()) {
+            return;
+        }
+        initData();
+    }
+
+    @Override
+    public void onRepliesMessageFound(Map<MessageRepliesBean.ReplyBean, TUIMessageBean> messageBeanMap) {
+        if (repliesList != null) {
+            repliesList.setData(messageBeanMap);
+        }
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/MaxWidthFrameLayout.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/MaxWidthFrameLayout.java
new file mode 100644
index 0000000..03d0285
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/MaxWidthFrameLayout.java
@@ -0,0 +1,45 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.widget.FrameLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+
+public class MaxWidthFrameLayout extends FrameLayout {
+
+    int maxWidthPx;
+
+    public MaxWidthFrameLayout(@NonNull Context context) {
+        super(context);
+    }
+
+    public MaxWidthFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public MaxWidthFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs);
+    }
+
+    private void init(Context context, AttributeSet attributeSet) {
+        TypedArray array = context.obtainStyledAttributes(attributeSet, R.styleable.max_width_style);
+        maxWidthPx = array.getDimensionPixelSize(R.styleable.max_width_style_maxWidth, 0);
+        array.recycle();
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int measuredWidth = MeasureSpec.getSize(widthMeasureSpec);
+        if(maxWidthPx > 0 && maxWidthPx < measuredWidth) {
+            widthMeasureSpec = MeasureSpec.makeMeasureSpec(maxWidthPx, MeasureSpec.AT_MOST);
+        }
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/MaxWidthLinearLayout.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/MaxWidthLinearLayout.java
new file mode 100644
index 0000000..2ad90f3
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/MaxWidthLinearLayout.java
@@ -0,0 +1,45 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+
+public class MaxWidthLinearLayout extends LinearLayout {
+
+    int maxWidthPx;
+
+    public MaxWidthLinearLayout(@NonNull Context context) {
+        super(context);
+    }
+
+    public MaxWidthLinearLayout(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public MaxWidthLinearLayout(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs);
+    }
+
+    private void init(Context context, AttributeSet attributeSet) {
+        TypedArray array = context.obtainStyledAttributes(attributeSet, R.styleable.max_width_style);
+        maxWidthPx = array.getDimensionPixelSize(R.styleable.max_width_style_maxWidth, 0);
+        array.recycle();
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int measuredWidth = MeasureSpec.getSize(widthMeasureSpec);
+        if(maxWidthPx > 0 && maxWidthPx < measuredWidth) {
+            widthMeasureSpec = MeasureSpec.makeMeasureSpec(maxWidthPx, MeasureSpec.AT_MOST);
+        }
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/MessageAdapter.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/MessageAdapter.java
new file mode 100644
index 0000000..0a91559
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/MessageAdapter.java
@@ -0,0 +1,479 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message;
+
+import static com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.MessageBaseHolder.MSG_TYPE_HEADER_VIEW;
+
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.QuoteMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TipsMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.IMessageAdapter;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.MinimalistUIService;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.interfaces.ICommonMessageAdapter;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.interfaces.OnItemClickListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.MessageBaseHolder;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.MessageContentHolder;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.MessageHeaderHolder;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.MessageViewHolderFactory;
+import com.tencent.qcloud.tuikit.tuichat.presenter.ChatPresenter;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+
+public class MessageAdapter extends RecyclerView.Adapter implements IMessageAdapter, ICommonMessageAdapter {
+
+    private static final String TAG = MessageAdapter.class.getSimpleName();
+    private static final int ITEM_POSITION_UNKNOWN = -1;
+
+    private boolean mLoading = true;
+    private MessageRecyclerView mRecycleView;
+    private List<TUIMessageBean> mDataSource = new ArrayList<>();
+    private OnItemClickListener mOnItemClickListener;
+    private OnCheckListChangedListener onCheckListChangedListener;
+    private HashMap<String, Boolean> mSelectedPositions = new HashMap<String, Boolean>();
+    protected boolean isShowMultiSelectCheckBox = false;
+
+    private int mHighShowPosition;
+
+    private boolean isForwardMode = false;
+    private boolean isReplyDetailMode = false;
+
+    private ChatPresenter presenter;
+
+    public void setPresenter(ChatPresenter chatPresenter) {
+        this.presenter = chatPresenter;
+    }
+
+    public void setForwardMode(boolean forwardMode) {
+        isForwardMode = forwardMode;
+    }
+
+    public void setReplyDetailMode(boolean replyDetailMode) {
+        isReplyDetailMode = replyDetailMode;
+    }
+
+    public ArrayList<TUIMessageBean> getSelectedItem() {
+        if (mSelectedPositions == null || mSelectedPositions.size() == 0) {
+            return null;
+        }
+        ArrayList<TUIMessageBean> selectList = new ArrayList<>();
+        for (int i = 0; i < getItemCount() - 1; i++) {
+            if (isItemChecked(mDataSource.get(i).getId())) {
+                selectList.add(mDataSource.get(i));
+            }
+        }
+
+        return selectList;
+    }
+
+    public void setOnCheckListChangedListener(OnCheckListChangedListener onCheckListChangedListener) {
+        this.onCheckListChangedListener = onCheckListChangedListener;
+    }
+
+    public void setShowMultiSelectCheckBox(boolean show) {
+        isShowMultiSelectCheckBox = show;
+
+        if (!isShowMultiSelectCheckBox && mSelectedPositions != null) {
+            mSelectedPositions.clear();
+        }
+
+    }
+
+    public boolean isShowMultiSelectCheckBox() {
+        return isShowMultiSelectCheckBox;
+    }
+
+    public void setItemChecked(String msgID, boolean isChecked) {
+        if (mSelectedPositions == null) {
+            return;
+        }
+
+        mSelectedPositions.put(msgID, isChecked);
+
+        if (onCheckListChangedListener != null) {
+            onCheckListChangedListener.onCheckListChanged(getSelectedItem());
+        }
+    }
+
+    private boolean isItemChecked(String id) {
+        if (mSelectedPositions.size() <= 0) {
+            return false;
+        }
+
+        if (mSelectedPositions.containsKey(id)) {
+            return mSelectedPositions.get(id);
+        } else {
+            return false;
+        }
+    }
+
+    public OnItemClickListener getOnItemClickListener() {
+        return this.mOnItemClickListener;
+    }
+
+    public void setOnItemClickListener(OnItemClickListener listener) {
+        this.mOnItemClickListener = listener;
+    }
+
+    public void setHighShowPosition(int mHighShowPosition) {
+        this.mHighShowPosition = mHighShowPosition;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        RecyclerView.ViewHolder holder = MessageViewHolderFactory.getInstance(parent, this, viewType);
+        if (holder instanceof MessageContentHolder) {
+            MessageContentHolder messageContentHolder = (MessageContentHolder) holder;
+            messageContentHolder.isForwardMode = isForwardMode;
+            messageContentHolder.isMessageDetailMode = isReplyDetailMode;
+            messageContentHolder.setPresenter(presenter);
+
+            if (isForwardMode) {
+                messageContentHolder.setDataSource(mDataSource);
+            }
+        }
+        return holder;
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, final int position) {
+        final TUIMessageBean msg = getItem(position);
+        if (holder instanceof MessageBaseHolder) {
+            if (holder instanceof MessageContentHolder) {
+                ((MessageContentHolder) holder).isMultiSelectMode = isShowMultiSelectCheckBox;
+            }
+            final MessageBaseHolder baseHolder = (MessageBaseHolder) holder;
+            baseHolder.setOnItemClickListener(mOnItemClickListener);
+            String msgId = "";
+            if (msg != null) {
+                msgId = msg.getId();
+            }
+
+            setCheckBoxStatus(position, msgId, baseHolder);
+            baseHolder.layoutViews(msg, position);
+
+            if (getItemViewType(position) == MSG_TYPE_HEADER_VIEW) {
+                if (isForwardMode) {
+                    ((MessageHeaderHolder) baseHolder).setLoadingStatus(false);
+                } else {
+                    ((MessageHeaderHolder) baseHolder).setLoadingStatus(mLoading);
+                }
+                return;
+            } else {
+                if (position == mHighShowPosition && baseHolder.mContentLayout != null) {
+                    baseHolder.startHighLight();
+                    mHighShowPosition = -1;
+                }
+            }
+        }
+    }
+
+    private void setCheckBoxStatus(final int position, final String msgId, MessageBaseHolder baseHolder) {
+        if (baseHolder.mMutiSelectCheckBox == null) {
+            return;
+        }
+        if (!isShowMultiSelectCheckBox) {
+            baseHolder.mMutiSelectCheckBox.setVisibility(View.GONE);
+            baseHolder.setOnItemClickListener(mOnItemClickListener);
+            if (baseHolder.msgContentFrame != null) {
+                baseHolder.msgContentFrame.setOnClickListener(null);
+            }
+        } else {
+            baseHolder.mMutiSelectCheckBox.setVisibility(View.VISIBLE);
+            baseHolder.mMutiSelectCheckBox.setChecked(isItemChecked(msgId));
+            baseHolder.mMutiSelectCheckBox.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    changeCheckedStatus(msgId, position);
+                }
+            });
+            baseHolder.itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    changeCheckedStatus(msgId, position);
+                }
+            });
+
+            baseHolder.setOnItemClickListener(new OnItemClickListener() {
+                @Override
+                public void onMessageLongClick(View view, int position, TUIMessageBean messageInfo) {
+                }
+
+                @Override
+                public void onUserIconClick(View view, int position, TUIMessageBean messageInfo) {
+                    changeCheckedStatus(msgId, position);
+                }
+
+                @Override
+                public void onUserIconLongClick(View view, int position, TUIMessageBean messageInfo) {
+                    changeCheckedStatus(msgId, position);
+                }
+
+                @Override
+                public void onReEditRevokeMessage(View view, int position, TUIMessageBean messageInfo) {
+
+                }
+
+                @Override
+                public void onRecallClick(View view, int position, TUIMessageBean messageInfo) {
+
+                }
+
+                @Override
+                public void onReplyMessageClick(View view, int position, QuoteMessageBean messageBean) {
+                    changeCheckedStatus(msgId, position);
+                }
+
+                @Override
+                public void onMessageClick(View view, int position, TUIMessageBean messageInfo) {
+                    changeCheckedStatus(msgId, position);
+                }
+            });
+
+            if (baseHolder.msgContentFrame != null) {
+                baseHolder.msgContentFrame.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        changeCheckedStatus(msgId, position);
+                    }
+                });
+            }
+        }
+    }
+
+    public void changeCheckedStatus(String msgId, int position) {
+        if (isItemChecked(msgId)) {
+            setItemChecked(msgId, false);
+        } else {
+            setItemChecked(msgId, true);
+        }
+        notifyItemChanged(position);
+    }
+
+    @Override
+    public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
+        super.onAttachedToRecyclerView(recyclerView);
+        mRecycleView = (MessageRecyclerView) recyclerView;
+        mRecycleView.setItemViewCacheSize(5);
+    }
+
+    public void showLoading() {
+        if (isForwardMode) {
+            return;
+        }
+        if (mLoading) {
+            return;
+        }
+        mLoading = true;
+        notifyItemChanged(0);
+    }
+
+    @Override
+    public void onViewRecycled(@NonNull RecyclerView.ViewHolder holder) {
+        if (holder instanceof MessageContentHolder) {
+            ((MessageContentHolder) holder).msgArea.setBackground(null);
+            ((MessageContentHolder) holder).stopHighLight();
+            ((MessageContentHolder) holder).onRecycled();
+        }
+    }
+
+    @Override
+    public void onViewNeedRefresh(final int type, TUIMessageBean messageBean) {
+        mLoading = false;
+        refreshLoadView();
+        if (type == MessageRecyclerView.DATA_CHANGE_LOCATE_TO_POSITION) {
+            notifyDataSetChanged();
+            int position = getMessagePosition(messageBean);
+            if (position == ITEM_POSITION_UNKNOWN) {
+                return;
+            }
+            mRecycleView.scrollToPosition(position);
+            mRecycleView.setHighShowPosition(position);
+        } else if (type == MessageRecyclerView.SCROLL_TO_POSITION) {
+            int position = getMessagePosition(messageBean);
+            if (position == ITEM_POSITION_UNKNOWN) {
+                return;
+            }
+            mRecycleView.scrollToPosition(position);
+            mRecycleView.setHighShowPosition(position);
+            onItemChanged(position);
+            mRecycleView.scrollMessageFinish();
+        } else if (type == MessageRecyclerView.DATA_CHANGE_SCROLL_TO_POSITION) {
+            notifyDataSetChanged();
+            int position = getMessagePosition(messageBean);
+            if (position == ITEM_POSITION_UNKNOWN) {
+                return;
+            }
+            mRecycleView.scrollToEnd();
+            mRecycleView.smoothScrollToPosition(position);
+            mRecycleView.setHighShowPosition(position);
+            onItemChanged(position);
+            mRecycleView.scrollMessageFinish();
+        } else if (type == MessageRecyclerView.DATA_CHANGE_TYPE_UPDATE) {
+            int position = getMessagePosition(messageBean);
+            if (position == ITEM_POSITION_UNKNOWN) {
+                return;
+            }
+            onItemChanged(position);
+        } else if (type == MessageRecyclerView.DATA_CHANGE_TYPE_DELETE) {
+            int position = getMessagePosition(messageBean);
+            if (position == ITEM_POSITION_UNKNOWN) {
+                return;
+            }
+            onItemRemove(position);
+        }
+    }
+
+    @Override
+    public void onViewNeedRefresh(final int type, final int value) {
+        mLoading = false;
+        if (type == MessageRecyclerView.DATA_CHANGE_TYPE_REFRESH) {
+            notifyDataSetChanged();
+            mRecycleView.scrollToEnd();
+        } else if (type == MessageRecyclerView.DATA_CHANGE_TYPE_ADD_BACK) {
+            onItemInsert(mDataSource.size() + 1, value);
+        } else if (type == MessageRecyclerView.DATA_CHANGE_NEW_MESSAGE) {
+            onItemInsert(mDataSource.size() + 1, value);
+            mRecycleView.onMsgAddBack();
+        } else if (type == MessageRecyclerView.DATA_CHANGE_TYPE_UPDATE) {
+            notifyDataSetChanged();
+        } else if (type == MessageRecyclerView.DATA_CHANGE_TYPE_ADD_FRONT) {
+            // 加载条目为数0，只更新动画
+            // The number of loaded entries is 0, only the animation is updated
+            if (value != 0) {
+                // 加载过程中有可能之前第一条与新加载的最后一条的时间间隔不超过5分钟，时间条目需去掉，所以这里的刷新要多一个条目
+                // During the loading process, it is possible that the time interval between the first item before
+                // and the last item newly loaded is not more than 5 minutes, and the time entry needs to be removed,
+                // so the refresh here needs one more entry
+                onItemInsert(0, value);
+            }
+        } else if (type == MessageRecyclerView.DATA_CHANGE_TYPE_LOAD) {
+            notifyDataSetChanged();
+            mRecycleView.scrollToEnd();
+            mRecycleView.loadMessageFinish();
+        }
+        refreshLoadView();
+    }
+
+    private void refreshLoadView() {
+        notifyItemChanged(0);
+    }
+
+    private void onItemChanged(int position) {
+        int start = position - 1;
+        int end = position + 1;
+        if (start < 0) {
+            start = 0;
+        }
+        if (end > getItemCount()) {
+            end = position;
+        }
+        int count = end - start;
+        notifyItemRangeChanged(start, count);
+    }
+
+    private void onItemInsert(int start, int count) {
+        notifyItemRangeInserted(start, count);
+        int startTemp = start - 2;
+        int endTemp = start + count + 2;
+        notifyItemRangeChanged(startTemp, endTemp - startTemp);
+    }
+
+    private void onItemRemove(int position) {
+        int start = position - 1;
+        int end = position + 1;
+        if (start >= 0) {
+            notifyItemChanged(start);
+        }
+        if (end <= getItemCount()) {
+            notifyItemChanged(end);
+        }
+        notifyItemRemoved(position);
+    }
+
+    @Override
+    public int getItemCount() {
+        return mDataSource.size() + 1;
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        if (position == 0) {
+            return MSG_TYPE_HEADER_VIEW;
+        }
+        TUIMessageBean msg = getItem(position);
+        if (msg.getStatus() == TUIMessageBean.MSG_STATUS_REVOKE) {
+            return MinimalistUIService.getInstance().getViewType(TipsMessageBean.class);
+        }
+        return MinimalistUIService.getInstance().getViewType(msg.getClass());
+    }
+
+    @Override
+    public void onDataSourceChanged(List<TUIMessageBean> dataSource) {
+        mDataSource = dataSource;
+    }
+
+
+    @Override
+    public void onScrollToEnd() {
+        if (mRecycleView != null) {
+            mRecycleView.scrollToEnd();
+        }
+    }
+
+    private int getMessagePosition(TUIMessageBean message) {
+        int position = ITEM_POSITION_UNKNOWN;
+        if (mDataSource == null || mDataSource.isEmpty()) {
+            return position;
+        }
+
+        position = mDataSource.indexOf(message);
+        if (position == -1) {
+            return ITEM_POSITION_UNKNOWN;
+        }
+        return position + 1;
+    }
+
+    public TUIMessageBean getItem(int position) {
+        if (position == 0 || mDataSource == null || mDataSource.size() == 0) {
+            return null;
+        }
+        if (position >= mDataSource.size() + 1) {
+            return null;
+        }
+        return mDataSource.get(position - 1);
+    }
+
+    public List<TUIMessageBean> getItemList(int first, int last) {
+        if (first < 0 || last < 0) {
+            return new ArrayList<>(0);
+        }
+        if (first == 0) {
+            first = 1;
+        }
+        if (last == 0) {
+            last = 1;
+        }
+        if (mDataSource == null || mDataSource.size() == 0 || first > last) {
+            return new ArrayList<>(0);
+        }
+        if (first >= mDataSource.size() + 1 || last >= mDataSource.size() + 1) {
+            return new ArrayList<>(0);
+        }
+
+        return new ArrayList<>(mDataSource.subList(first - 1, last));
+    }
+
+
+    public interface OnCheckListChangedListener {
+        void onCheckListChanged(List<TUIMessageBean> checkedList);
+    }
+
+}
\ No newline at end of file
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/MessageRecyclerView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/MessageRecyclerView.java
new file mode 100644
index 0000000..b907df0
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/MessageRecyclerView.java
@@ -0,0 +1,939 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.GestureDetector;
+import android.view.MotionEvent;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.SimpleItemAnimator;
+
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.component.CustomLinearLayoutManager;
+import com.tencent.qcloud.tuicore.component.RoundCornerImageView;
+import com.tencent.qcloud.tuicore.component.dialog.TUIKitDialog;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.QuoteMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ReplyMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TextMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.popmenu.ChatPopMenu;
+import com.tencent.qcloud.tuikit.tuichat.component.face.Emoji;
+import com.tencent.qcloud.tuikit.tuichat.config.TUIChatConfigs;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.IMessageRecyclerView;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.MessageProperties;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.interfaces.IMessageLayout;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.interfaces.OnItemClickListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.messagepopmenu.ChatPopActivity;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.messagepopmenu.ChatPopDataHolder;
+import com.tencent.qcloud.tuikit.tuichat.presenter.ChatPresenter;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MessageRecyclerView extends RecyclerView implements IMessageRecyclerView, IMessageLayout {
+    private static final String TAG = MessageRecyclerView.class.getSimpleName();
+
+    // 120s
+    public static final int REVOKE_TIME_OUT = 120;
+
+    // 取一个足够大的偏移保证能一次性滚动到最底部
+    // Take a large enough offset to scroll to the bottom at one time
+    private static final int SCROLL_TO_END_OFFSET = -999999;
+
+    protected OnItemClickListener mOnItemClickListener;
+    protected OnLoadMoreHandler mHandler;
+    protected OnEmptySpaceClickListener mEmptySpaceClickListener;
+    protected MessageAdapter mAdapter;
+    protected List<ChatPopActivity.ChatPopMenuAction> mPopActions = new ArrayList<>();
+    protected ChatPopActivity.EmojiOnClickListener emojiOnClickListener;
+    private Bitmap dialogBgBitmap;
+    protected List<ChatPopActivity.ChatPopMenuAction> mMorePopActions = new ArrayList<>();
+    protected OnPopActionClickListener mOnPopActionClickListener;
+    protected List<ChatPopMenu.ChatPopMenuAction> mTranslationPopActions = new ArrayList<>();
+    protected OnTranslationPopActionClickListener mOnTranslationPopActionClickListener;
+    private ChatPopMenu mTranslationChatPopMenu;
+    private final MessageProperties properties = MessageProperties.getInstance();
+
+    private OnMenuEmojiClickListener menuEmojiOnClickListener;
+
+    private ChatPresenter presenter;
+
+    private int mSelectedPosition = -1;
+
+    public MessageRecyclerView(Context context) {
+        super(context);
+        init();
+    }
+
+    public MessageRecyclerView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public MessageRecyclerView(Context context, @Nullable AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init();
+    }
+
+    private void init() {
+        TUIChatLog.d(TAG, "init()");
+        setLayoutFrozen(false);
+        setItemViewCacheSize(0);
+        setHasFixedSize(true);
+        setFocusableInTouchMode(false);
+        setFocusable(true);
+        setClickable(true);
+        LinearLayoutManager linearLayoutManager = new CustomLinearLayoutManager(getContext());
+        linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
+        setLayoutManager(linearLayoutManager);
+        SimpleItemAnimator animator = (SimpleItemAnimator) getItemAnimator();
+        if (animator != null) {
+            animator.setSupportsChangeAnimations(false);
+        }
+        setClickEmptySpaceEvent();
+    }
+
+    public void setPresenter(ChatPresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    private void setClickEmptySpaceEvent() {
+        GestureDetector.OnGestureListener gestureListener = new GestureDetector.SimpleOnGestureListener() {
+            @Override
+            public boolean onSingleTapUp(MotionEvent e) {
+                if (mEmptySpaceClickListener != null) {
+                    mEmptySpaceClickListener.onClick();
+                    return true;
+                }
+                return false;
+            }
+        };
+
+        GestureDetector gestureDetector = new GestureDetector(getContext(), gestureListener);
+        setOnTouchListener(new OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                if (v instanceof RecyclerView) {
+                    gestureDetector.onTouchEvent(event);
+                }
+                return false;
+            }
+        });
+    }
+
+    public void setSelectedPosition(int position) {
+        this.mSelectedPosition = position;
+    }
+
+    public int getSelectedPosition() {
+        return mSelectedPosition;
+    }
+
+    public void showItemPopMenu(final TUIMessageBean messageInfo, View view) {
+        initPopActions(messageInfo);
+
+        stopScroll();
+        ChatPopDataHolder.setMsgAreaBackground(view.getBackground());
+        RoundCornerImageView roundCornerImageView = view.findViewById(R.id.content_image_iv);
+        ChatPopDataHolder.setImageMessageView(roundCornerImageView);
+        Rect rect = new Rect();
+        int[] location = new int[2];
+        view.getLocationInWindow(location);
+        rect.left = location[0];
+        rect.top = location[1];
+        rect.right = rect.left + view.getWidth();
+        rect.bottom = rect.top + view.getHeight();
+        ChatPopDataHolder.setMessageViewGlobalRect(rect);
+        view.setVisibility(INVISIBLE);
+        View decorView = ((Activity)getContext()).getWindow().getDecorView();
+        decorView.setDrawingCacheEnabled(true);
+        decorView.buildDrawingCache();
+        dialogBgBitmap = Bitmap.createBitmap(decorView.getDrawingCache());
+        ChatPopDataHolder.setChatPopBgBitmap(dialogBgBitmap);
+        decorView.setDrawingCacheEnabled(false);
+
+        emojiOnClickListener = new ChatPopActivity.EmojiOnClickListener() {
+
+            @Override
+            public void onClick(Emoji emoji) {
+                if (menuEmojiOnClickListener != null) {
+                    menuEmojiOnClickListener.onClick(emoji, messageInfo);
+                }
+            }
+        };
+        ChatPopDataHolder.setEmojiOnClickListener(emojiOnClickListener);
+        ChatPopDataHolder.setActionList(mPopActions);
+        Intent intent = new Intent(getContext(), ChatPopActivity.class);
+        ActivityOptionsCompat optionsCompat = ActivityOptionsCompat.makeSceneTransitionAnimation(getActivity(), view, "messageAreaTransition");
+        Bundle bundle = optionsCompat.toBundle();
+        intent.putExtra(TUIChatConstants.MESSAGE_BEAN, messageInfo);
+        getActivity().startActivity(intent, bundle);
+    }
+
+    public void showTranslationItemPopMenu(int index, TUIMessageBean messageInfo, View view) {
+        initTranslationPopActions(messageInfo);
+        if (mTranslationPopActions.size() == 0) {
+            return;
+        }
+
+        if (mTranslationChatPopMenu != null) {
+            mTranslationChatPopMenu.hide();
+            mTranslationChatPopMenu = null;
+        }
+        mTranslationChatPopMenu = new ChatPopMenu(getContext());
+        mTranslationChatPopMenu.setShowFaces(false);
+        mTranslationChatPopMenu.setChatPopMenuActionList(mTranslationPopActions);
+
+        int[] location = new int[2];
+        getLocationOnScreen(location);
+        mTranslationChatPopMenu.show(view, location[1]);
+    }
+
+    private void initTranslationPopActions(TUIMessageBean msg) {
+        if (msg == null) {
+            return;
+        }
+
+        ChatPopMenu.ChatPopMenuAction copyAction = null;
+        ChatPopMenu.ChatPopMenuAction forwardAction = null;
+        ChatPopMenu.ChatPopMenuAction hiddenAction = null;
+
+        copyAction = new ChatPopMenu.ChatPopMenuAction();
+        copyAction.setActionName(getContext().getString(R.string.copy_action));
+        copyAction.setActionIcon(R.drawable.pop_menu_copy);
+        copyAction.setActionClickListener(() -> mOnTranslationPopActionClickListener.onCopyTranslationClick(msg.getTranslation()));
+
+        if (msg.getStatus() != TUIMessageBean.MSG_STATUS_SEND_FAIL) {
+            forwardAction = new ChatPopMenu.ChatPopMenuAction();
+            forwardAction.setActionName(getContext().getString(R.string.forward_button));
+            forwardAction.setActionIcon(R.drawable.pop_menu_forward);
+            forwardAction.setActionClickListener(()-> mOnTranslationPopActionClickListener.onForwardTranslationClick(msg));
+        }
+
+        hiddenAction = new ChatPopMenu.ChatPopMenuAction();
+        hiddenAction.setActionName(getContext().getString(R.string.hide_action));
+        hiddenAction.setActionIcon(R.drawable.pop_menu_hide);
+        hiddenAction.setActionClickListener(() -> mOnTranslationPopActionClickListener.onHideTranslationClick(msg));
+
+        mTranslationPopActions.clear();
+        mTranslationPopActions.add(copyAction);
+        if (forwardAction != null) {
+            mTranslationPopActions.add(forwardAction);
+        }
+        mTranslationPopActions.add(hiddenAction);
+    }
+
+    public AppCompatActivity getActivity() {
+        return (AppCompatActivity) getContext();
+    }
+
+    public void onMsgAddBack() {
+        if (mAdapter != null) {
+            if (isLastItemVisibleCompleted()) {
+                scrollToEnd();
+            }
+        }
+    }
+
+    public boolean isDisplayJumpMessageLayout() {
+        TUIChatLog.d(TAG, "computeVerticalScrollRange() = " + computeVerticalScrollRange() + ", computeVerticalScrollExtent() = "
+                + computeVerticalScrollExtent() + ", computeVerticalScrollOffset() = " + computeVerticalScrollOffset());
+        int toBottom = computeVerticalScrollRange() - computeVerticalScrollExtent() - computeVerticalScrollOffset();
+        TUIChatLog.d(TAG, "toBottom = " + toBottom);
+        if (toBottom > 0 && toBottom >= 2 * computeVerticalScrollExtent()) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public boolean isLastItemVisibleCompleted() {
+        LinearLayoutManager linearLayoutManager = (LinearLayoutManager) getLayoutManager();
+        if (linearLayoutManager == null) {
+            return false;
+        }
+        int lastPosition = linearLayoutManager.findLastCompletelyVisibleItemPosition();
+        int childCount = linearLayoutManager.getChildCount();
+        int firstPosition = linearLayoutManager.findFirstVisibleItemPosition();
+        if (lastPosition >= firstPosition + childCount - 1) {
+            return true;
+        }
+        return false;
+    }
+
+    private void initPopActions(final TUIMessageBean msg) {
+        if (msg == null) {
+            return;
+        }
+
+        boolean textIsAllSelected = true;
+        if (msg instanceof TextMessageBean || msg instanceof QuoteMessageBean) {
+            String selectText = msg.getSelectText();
+            if (!TextUtils.isEmpty(selectText)) {
+                String text = msg.getExtra();
+                if (!text.equals(selectText)) {
+                    textIsAllSelected = false;
+                }
+            }
+        }
+
+        ChatPopActivity.ChatPopMenuAction copyAction = null;
+        ChatPopActivity.ChatPopMenuAction forwardAction = null;
+        ChatPopActivity.ChatPopMenuAction multiSelectAction = null;
+        ChatPopActivity.ChatPopMenuAction quoteAction = null;
+        ChatPopActivity.ChatPopMenuAction replyAction = null;
+        ChatPopActivity.ChatPopMenuAction translateAction = null;
+        ChatPopActivity.ChatPopMenuAction revokeAction = null;
+        ChatPopActivity.ChatPopMenuAction deleteAction = null;
+        ChatPopActivity.ChatPopMenuAction infoAction = null;
+
+        if (msg instanceof TextMessageBean || msg instanceof QuoteMessageBean) {
+            copyAction = new ChatPopActivity.ChatPopMenuAction();
+            copyAction.setActionName(getContext().getString(R.string.copy_action));
+            copyAction.setActionIcon(R.drawable.chat_minimalist_pop_menu_copy);
+            copyAction.setActionClickListener(() -> mOnPopActionClickListener.onCopyClick(msg));
+        }
+
+        if (textIsAllSelected) {
+            deleteAction = new ChatPopActivity.ChatPopMenuAction();
+            deleteAction.setActionName(getContext().getString(R.string.delete_action));
+            deleteAction.setTextColor(0xFFFF584C);
+            deleteAction.setActionIcon(R.drawable.chat_minimalist_pop_menu_delete);
+            deleteAction.setActionClickListener(() -> mOnPopActionClickListener.onDeleteMessageClick(msg));
+            if (msg.isSelf()) {
+                if (msg.getStatus() != TUIMessageBean.MSG_STATUS_SEND_FAIL) {
+                    long timeInterval = TUIChatUtils.getServerTime() - msg.getMessageTime();
+                    if (timeInterval <= REVOKE_TIME_OUT) {
+                        revokeAction = new ChatPopActivity.ChatPopMenuAction();
+                        revokeAction.setActionName(getContext().getString(R.string.revoke_action));
+                        revokeAction.setActionIcon(R.drawable.chat_minimalist_pop_menu_revoke);
+                        revokeAction.setActionClickListener(() -> mOnPopActionClickListener.onRevokeMessageClick(msg));
+                    }
+                }
+
+                infoAction = new ChatPopActivity.ChatPopMenuAction();
+                infoAction.setActionName(getContext().getString(R.string.info_button));
+                infoAction.setActionIcon(R.drawable.chat_minimalist_pop_menu_info);
+                infoAction.setActionClickListener(() -> mOnPopActionClickListener.onInfoMessageClick(msg));
+            }
+
+            multiSelectAction = new ChatPopActivity.ChatPopMenuAction();
+            multiSelectAction.setActionName(getContext().getString(R.string.titlebar_mutiselect));
+            multiSelectAction.setActionIcon(R.drawable.chat_minimalist_pop_menu_multi_select);
+            multiSelectAction.setActionClickListener(() -> mOnPopActionClickListener.onMultiSelectMessageClick(msg));
+
+            if (TUIChatConfigs.getConfigs().getGeneralConfig().isEnableTextTranslation() &&
+                    msg.getTranslationStatus() != TUIMessageBean.MSG_TRANSLATE_STATUS_SHOWN) {
+                translateAction = new ChatPopActivity.ChatPopMenuAction();
+                translateAction.setActionName(getContext().getString(R.string.translate_action));
+                translateAction.setActionIcon(R.drawable.chat_minimalist_pop_menu_translation);
+                translateAction.setActionClickListener(() -> mOnPopActionClickListener.onTranslateMessageClick(msg));
+            }
+        }
+
+        if (msg.getStatus() != TUIMessageBean.MSG_STATUS_SEND_FAIL) {
+            forwardAction = new ChatPopActivity.ChatPopMenuAction();
+            forwardAction.setActionName(getContext().getString(R.string.forward_button));
+            forwardAction.setActionIcon(R.drawable.chat_minimalist_pop_menu_forward);
+            forwardAction.setActionClickListener(()-> mOnPopActionClickListener.onForwardMessageClick(msg));
+        }
+
+        if (textIsAllSelected) {
+            if (msg.getStatus() != TUIMessageBean.MSG_STATUS_SEND_FAIL) {
+                replyAction = new ChatPopActivity.ChatPopMenuAction();
+                replyAction.setActionName(getContext().getString(R.string.reply_button));
+                replyAction.setActionIcon(R.drawable.chat_minimalist_pop_menu_reply);
+                replyAction.setActionClickListener(() -> mOnPopActionClickListener.onReplyMessageClick(msg));
+
+                quoteAction = new ChatPopActivity.ChatPopMenuAction();
+                quoteAction.setActionName(getContext().getString(R.string.quote_button));
+                quoteAction.setActionIcon(R.drawable.chat_minimalist_pop_menu_quote);
+                quoteAction.setActionClickListener(() -> mOnPopActionClickListener.onQuoteMessageClick(msg));
+
+            }
+        }
+
+        mPopActions.clear();
+        if (copyAction != null) {
+            mPopActions.add(copyAction);
+        }
+        if (forwardAction != null) {
+            mPopActions.add(forwardAction);
+        }
+        if (multiSelectAction != null) {
+            mPopActions.add(multiSelectAction);
+        }
+        if (quoteAction != null && TUIChatConfigs.getConfigs().getGeneralConfig().isQuoteEnable()) {
+            mPopActions.add(quoteAction);
+        }
+        if (replyAction != null && TUIChatConfigs.getConfigs().getGeneralConfig().isReplyEnable()) {
+            mPopActions.add(replyAction);
+        }
+        if (translateAction != null) {
+            mPopActions.add(translateAction);
+        }
+        if (revokeAction != null) {
+            mPopActions.add(revokeAction);
+        }
+        if (deleteAction != null) {
+            mPopActions.add(deleteAction);
+        }
+        if (infoAction != null) {
+            mPopActions.add(infoAction);
+        }
+        mPopActions.addAll(mMorePopActions);
+    }
+
+    @Override
+    public void onScrollStateChanged(int state) {
+        super.onScrollStateChanged(state);
+        if (state == RecyclerView.SCROLL_STATE_IDLE) {
+            if (mHandler != null) {
+                LinearLayoutManager layoutManager = (LinearLayoutManager) getLayoutManager();
+                int firstPosition = layoutManager.findFirstCompletelyVisibleItemPosition();
+                int lastPosition = layoutManager.findLastCompletelyVisibleItemPosition();
+                if (firstPosition == 0 && ((lastPosition - firstPosition + 1) < getAdapter().getItemCount())) {
+                    if (getAdapter() instanceof MessageAdapter) {
+                        ((MessageAdapter) getAdapter()).showLoading();
+                    }
+                    mHandler.loadMore(TUIChatConstants.GET_MESSAGE_FORWARD);
+                } else if (isListEnd(lastPosition)){
+                    if (getAdapter() instanceof MessageAdapter) {
+                        ((MessageAdapter) getAdapter()).showLoading();
+                    }
+                    mHandler.loadMore(TUIChatConstants.GET_MESSAGE_BACKWARD);
+
+                    mHandler.displayBackToLastMessage(false);
+                    mHandler.displayBackToNewMessage(false, "", 0);
+                    presenter.resetCurrentChatUnreadCount();
+                }
+
+                if (isDisplayJumpMessageLayout()) {
+                    mHandler.displayBackToLastMessage(true);
+                } else {
+                    mHandler.displayBackToLastMessage(false);
+                }
+            }
+        } else if (state == RecyclerView.SCROLL_STATE_DRAGGING) {
+            if (mHandler != null) {
+                mHandler.hideBackToAtMessage();
+            }
+        }
+    }
+
+    public void displayBackToNewMessage(boolean display, String messageId, int count) {
+        if (mHandler != null) {
+            mHandler.displayBackToNewMessage(display, messageId, count);
+        }
+    }
+
+    private boolean isListEnd(int lastPosition) {
+       return mHandler.isListEnd(lastPosition);
+    }
+
+    public void scrollToEnd() {
+        if (getAdapter() != null) {
+            LayoutManager layoutManager = getLayoutManager();
+            int itemCount = getAdapter().getItemCount();
+            if (layoutManager instanceof LinearLayoutManager && itemCount > 0) {
+                ((LinearLayoutManager) layoutManager).scrollToPositionWithOffset(itemCount - 1, SCROLL_TO_END_OFFSET);
+            }
+        }
+    }
+
+    @Override
+    public void scrollToPosition(int position) {
+        if (getAdapter() != null && position < getAdapter().getItemCount()) {
+            super.scrollToPosition(position);
+        }
+    }
+
+    public void smoothScrollToPosition(int position) {
+        if (getAdapter() != null && position < getAdapter().getItemCount()) {
+            super.smoothScrollToPosition(position);
+        }
+    }
+
+    public void setHighShowPosition(int position) {
+        if (mAdapter != null) {
+            mAdapter.setHighShowPosition(position);
+        }
+    }
+
+    public OnLoadMoreHandler getLoadMoreHandler() {
+        return mHandler;
+    }
+
+    public void setLoadMoreMessageHandler(OnLoadMoreHandler mHandler) {
+        this.mHandler = mHandler;
+    }
+
+    public OnEmptySpaceClickListener getEmptySpaceClickListener() {
+        return mEmptySpaceClickListener;
+    }
+
+    public void setEmptySpaceClickListener(OnEmptySpaceClickListener mEmptySpaceClickListener) {
+        this.mEmptySpaceClickListener = mEmptySpaceClickListener;
+    }
+
+    public void setPopActionClickListener(OnPopActionClickListener listener) {
+        mOnPopActionClickListener = listener;
+    }
+
+    public void setTranslationPopActionClickListener(OnTranslationPopActionClickListener listener) {
+        mOnTranslationPopActionClickListener = listener;
+    }
+
+    public void setMenuEmojiOnClickListener(OnMenuEmojiClickListener menuEmojiOnClickListener) {
+        this.menuEmojiOnClickListener = menuEmojiOnClickListener;
+    }
+
+    public void setAdapterListener() {
+        mAdapter.setOnItemClickListener(new OnItemClickListener() {
+            @Override
+            public void onMessageLongClick(View view, int position, TUIMessageBean messageInfo) {
+                if (mOnItemClickListener != null) {
+                    mOnItemClickListener.onMessageLongClick(view, position, messageInfo);
+                }
+            }
+
+            @Override
+            public void onUserIconClick(View view, int position, TUIMessageBean info) {
+                if (mOnItemClickListener != null) {
+                    mOnItemClickListener.onUserIconClick(view, position, info);
+                }
+            }
+
+            @Override
+            public void onUserIconLongClick(View view, int position, TUIMessageBean messageInfo) {
+                if (mOnItemClickListener != null) {
+                    mOnItemClickListener.onUserIconLongClick(view, position, messageInfo);
+                }
+            }
+
+            @Override
+            public void onReEditRevokeMessage(View view, int position, TUIMessageBean messageInfo) {
+                if (mOnItemClickListener != null) {
+                    mOnItemClickListener.onReEditRevokeMessage(view, position, messageInfo);
+                }
+            }
+
+            @Override
+            public void onRecallClick(View view, int position, TUIMessageBean messageInfo) {
+                if (mOnItemClickListener != null) {
+                    mOnItemClickListener.onRecallClick(view, position, messageInfo);
+                }
+            }
+
+            @Override
+            public void onReplyMessageClick(View view, int position, QuoteMessageBean messageBean) {
+                if (messageBean instanceof ReplyMessageBean) {
+                    showRootMessageReplyDetail(((ReplyMessageBean) messageBean).getMsgRootId());
+                } else {
+                    locateOriginMessage(messageBean.getOriginMsgId());
+                }
+            }
+
+            @Override
+            public void onReplyDetailClick(TUIMessageBean messageBean) {
+                showRootMessageReplyDetail(messageBean);
+            }
+
+            @Override
+            public void onReactOnClick(String emojiId, TUIMessageBean messageBean) {
+                showMessageReactDetail(messageBean);
+            }
+
+            @Override
+            public void onSendFailBtnClick(View view, int position, TUIMessageBean messageInfo) {
+                new TUIKitDialog(getContext())
+                        .builder()
+                        .setCancelable(true)
+                        .setCancelOutside(true)
+                        .setTitle(getContext().getString(R.string.resend_tips))
+                        .setDialogWidth(0.75f)
+                        .setPositiveButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.sure), new OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                mOnPopActionClickListener.onSendMessageClick(messageInfo, true);
+                            }
+                        })
+                        .setNegativeButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.cancel), new OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+
+                            }
+                        })
+                        .show();
+            }
+
+            @Override
+            public void onTextSelected(View view, int position, TUIMessageBean messageInfo) {
+                if (mOnItemClickListener != null) {
+                    mOnItemClickListener.onTextSelected(view, position, messageInfo);
+                }
+            }
+
+            @Override
+            public void onTranslationLongClick(View view, int position, TUIMessageBean messageInfo) {
+                if (mOnItemClickListener != null) {
+                    mOnItemClickListener.onTranslationLongClick(view, position, messageInfo);
+                }
+            }
+        });
+    }
+
+    private void showMessageReactDetail(TUIMessageBean messageBean) {
+        ChatReactDialogFragment fragment = new ChatReactDialogFragment();
+        fragment.setMessageBean(messageBean);
+        fragment.setChatInfo(presenter.getChatInfo());
+        fragment.setOnReactClickListener(new ChatReactDialogFragment.OnReactClickListener() {
+            @Override
+            public void onClick(String userID, String emojiKey) {
+                if (TextUtils.equals(userID, TUILogin.getLoginUser())) {
+                    presenter.reactMessage(emojiKey, messageBean);
+                }
+            }
+        });
+        fragment.show(getActivity().getSupportFragmentManager(), "react");
+    }
+
+    private void locateOriginMessage(String originMsgId) {
+        if (TextUtils.isEmpty(originMsgId)) {
+            ToastUtil.toastShortMessage(getContext().getString(R.string.locate_origin_msg_failed_tip));
+            return;
+        }
+        presenter.locateMessage(originMsgId, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage(getContext().getString(R.string.locate_origin_msg_failed_tip));
+            }
+        });
+    }
+
+    private void showRootMessageReplyDetail(TUIMessageBean messageBean) {
+        ChatReplyDialogFragment replyDialogFragment = new ChatReplyDialogFragment();
+        replyDialogFragment.setOriginMessage(messageBean);
+        replyDialogFragment.setChatInfo(presenter.getChatInfo());
+        replyDialogFragment.show(getActivity().getSupportFragmentManager(), "reply");
+
+    }
+
+    private void showRootMessageReplyDetail(String rootMessageId) {
+        if (presenter.getChatInfo() == null) {
+            return;
+        }
+        presenter.findMessage(rootMessageId, new IUIKitCallback<TUIMessageBean>() {
+            @Override
+            public void onSuccess(TUIMessageBean data) {
+                if (data.getStatus() == TUIMessageBean.MSG_STATUS_REVOKE) {
+                    ToastUtil.toastShortMessage(getContext().getString(R.string.locate_origin_msg_failed_tip));
+                    return;
+                }
+                ChatReplyDialogFragment replyDialogFragment = new ChatReplyDialogFragment();
+                replyDialogFragment.setOriginMessage(data);
+                replyDialogFragment.setChatInfo(presenter.getChatInfo());
+                replyDialogFragment.show(getActivity().getSupportFragmentManager(), "reply");
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage(getContext().getString(R.string.locate_origin_msg_failed_tip) + " code = " + errCode + " message = " + errMsg);
+            }
+        });
+
+    }
+
+    @Override
+    public int getAvatarRadius() {
+        return properties.getAvatarRadius();
+    }
+
+    @Override
+    public void setAvatarRadius(int radius) {
+        properties.setAvatarRadius(radius);
+    }
+
+    @Override
+    public int[] getAvatarSize() {
+        return properties.getAvatarSize();
+    }
+
+    @Override
+    public void setAvatarSize(int[] size) {
+        properties.setAvatarSize(size);
+    }
+
+    @Override
+    public int getAvatar() {
+        return properties.getAvatar();
+    }
+
+    @Override
+    public void setAvatar(int resId) {
+        properties.setAvatar(resId);
+    }
+
+    @Override
+    public Drawable getRightBubble() {
+        return properties.getRightBubble();
+    }
+
+    @Override
+    public void setRightBubble(Drawable bubble) {
+        properties.setRightBubble(bubble);
+    }
+
+    @Override
+    public Drawable getLeftBubble() {
+        return properties.getLeftBubble();
+    }
+
+    @Override
+    public void setLeftBubble(Drawable bubble) {
+        properties.setLeftBubble(bubble);
+    }
+
+    @Override
+    public int getNameFontSize() {
+        return properties.getNameFontSize();
+    }
+
+    @Override
+    public void setNameFontSize(int size) {
+        properties.setNameFontSize(size);
+    }
+
+    @Override
+    public int getNameFontColor() {
+        return properties.getNameFontColor();
+    }
+
+    @Override
+    public void setNameFontColor(int color) {
+        properties.setNameFontColor(color);
+    }
+
+    @Override
+    public int getLeftNameVisibility() {
+        return properties.getLeftNameVisibility();
+    }
+
+    @Override
+    public void setLeftNameVisibility(int visibility) {
+        properties.setLeftNameVisibility(visibility);
+    }
+
+    @Override
+    public int getRightNameVisibility() {
+        return properties.getRightNameVisibility();
+    }
+
+    @Override
+    public void setRightNameVisibility(int visibility) {
+        properties.setRightNameVisibility(visibility);
+    }
+
+    @Override
+    public int getChatContextFontSize() {
+        return properties.getChatContextFontSize();
+    }
+
+    @Override
+    public void setChatContextFontSize(int size) {
+        properties.setChatContextFontSize(size);
+    }
+
+    @Override
+    public int getRightChatContentFontColor() {
+        return properties.getRightChatContentFontColor();
+    }
+
+    @Override
+    public void setRightChatContentFontColor(int color) {
+        properties.setRightChatContentFontColor(color);
+    }
+
+    @Override
+    public int getLeftChatContentFontColor() {
+        return properties.getLeftChatContentFontColor();
+    }
+
+    @Override
+    public void setLeftChatContentFontColor(int color) {
+        properties.setLeftChatContentFontColor(color);
+    }
+
+    @Override
+    public Drawable getTipsMessageBubble() {
+        return properties.getTipsMessageBubble();
+    }
+
+    @Override
+    public void setTipsMessageBubble(Drawable bubble) {
+        properties.setTipsMessageBubble(bubble);
+    }
+
+    @Override
+    public int getTipsMessageFontSize() {
+        return properties.getTipsMessageFontSize();
+    }
+
+    @Override
+    public void setTipsMessageFontSize(int size) {
+        properties.setTipsMessageFontSize(size);
+    }
+
+    @Override
+    public int getTipsMessageFontColor() {
+        return properties.getTipsMessageFontColor();
+    }
+
+    @Override
+    public void setTipsMessageFontColor(int color) {
+        properties.setTipsMessageFontColor(color);
+    }
+
+    @Override
+    public Drawable getChatTimeBubble() {
+        return properties.getChatTimeBubble();
+    }
+
+    @Override
+    public void setChatTimeBubble(Drawable bubble) {
+        properties.setChatTimeBubble(bubble);
+    }
+
+    @Override
+    public int getChatTimeFontSize() {
+        return properties.getChatTimeFontSize();
+    }
+
+    @Override
+    public void setChatTimeFontSize(int size) {
+        properties.setChatTimeFontSize(size);
+    }
+
+    @Override
+    public int getChatTimeFontColor() {
+        return properties.getChatTimeFontColor();
+    }
+
+    @Override
+    public void setChatTimeFontColor(int color) {
+        properties.setChatTimeFontColor(color);
+    }
+
+    @Override
+    public OnItemClickListener getOnItemClickListener() {
+        return mAdapter.getOnItemClickListener();
+    }
+
+    @Override
+    public void setOnItemClickListener(OnItemClickListener listener) {
+        mOnItemClickListener = listener;
+        setAdapterListener();
+    }
+
+    @Override
+    public void setAdapter(MessageAdapter adapter) {
+        super.setAdapter(adapter);
+        mAdapter = adapter;
+    }
+
+    @Override
+    public List<ChatPopActivity.ChatPopMenuAction> getPopActions() {
+        return mPopActions;
+    }
+
+    @Override
+    public void addPopAction(ChatPopActivity.ChatPopMenuAction action) {
+        mMorePopActions.add(action);
+    }
+
+    public void loadMessageFinish() {
+        if (mHandler != null) {
+            mHandler.loadMessageFinish();
+        }
+    }
+
+    public void scrollMessageFinish() {
+        if (mHandler != null) {
+            mHandler.scrollMessageFinish();
+        }
+    }
+
+    public interface OnMenuEmojiClickListener {
+        void onClick(Emoji emoji, TUIMessageBean messageBean);
+    }
+
+
+    public interface OnLoadMoreHandler {
+        void loadMore(int type);
+        boolean isListEnd(int position);
+        void displayBackToLastMessage(boolean display);
+        void displayBackToNewMessage(boolean display, String messageId, int count);
+        void hideBackToAtMessage();
+        void loadMessageFinish();
+        void scrollMessageFinish();
+    }
+
+    public interface OnEmptySpaceClickListener {
+        void onClick();
+    }
+
+    public interface OnPopActionClickListener {
+
+        void onCopyClick(TUIMessageBean msg);
+
+        void onSendMessageClick(TUIMessageBean msg, boolean retry);
+
+        void onDeleteMessageClick(TUIMessageBean msg);
+
+        void onTranslateMessageClick(TUIMessageBean msg);
+
+        void onRevokeMessageClick(TUIMessageBean msg);
+
+        void onMultiSelectMessageClick(TUIMessageBean msg);
+
+        void onForwardMessageClick(TUIMessageBean msg);
+
+        void onReplyMessageClick(TUIMessageBean msg);
+
+        void onQuoteMessageClick(TUIMessageBean msg);
+
+        void onInfoMessageClick(TUIMessageBean msg);
+
+    }
+
+    public interface OnTranslationPopActionClickListener {
+        void onCopyTranslationClick(String translationContent);
+
+        void onForwardTranslationClick(TUIMessageBean msg);
+
+        void onHideTranslationClick(TUIMessageBean msg);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/MessageStatusTimeView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/MessageStatusTimeView.java
new file mode 100644
index 0000000..8e9203c
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/MessageStatusTimeView.java
@@ -0,0 +1,63 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message;
+
+import android.content.Context;
+import android.graphics.drawable.Animatable;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+
+public class MessageStatusTimeView extends FrameLayout {
+    private TextView timeView;
+    private ImageView statusIconView;
+
+    public MessageStatusTimeView(@NonNull Context context) {
+        super(context);
+        init(context, null);
+    }
+
+    public MessageStatusTimeView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public MessageStatusTimeView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs);
+    }
+
+    private void init(Context context, AttributeSet attrs) {
+        LayoutInflater.from(context).inflate(R.layout.chat_minimalist_text_status_layout, this);
+        statusIconView = findViewById(R.id.status_icon);
+        timeView = findViewById(R.id.time);
+    }
+
+    public void setStatusIcon(int resID) {
+        if (resID == 0) {
+            statusIconView.setVisibility(GONE);
+        } else {
+            statusIconView.setBackgroundResource(resID);
+            Drawable drawable = statusIconView.getBackground();
+            if (drawable instanceof Animatable) {
+                ((Animatable) drawable).start();
+            }
+            statusIconView.setVisibility(VISIBLE);
+        }
+    }
+
+    public void setTimeText(CharSequence charSequence) {
+        timeView.setText(charSequence);
+    }
+
+    public void setTimeColor(int color) {
+        timeView.setTextColor(color);
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/MinimalistMessageLayout.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/MinimalistMessageLayout.java
new file mode 100644
index 0000000..f361051
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/MinimalistMessageLayout.java
@@ -0,0 +1,165 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.Rect;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.RelativeLayout;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+
+public class MinimalistMessageLayout extends RelativeLayout {
+    private View msgArea;
+    private View quoteArea;
+    private View translationArea;
+    private View replyArea;
+
+    private boolean isStart = false;
+    private Paint paint;
+    private Path quotePath;
+    private Path translationPath;
+    private Path replyPath;
+
+    private Rect msgAreaRect;
+    private Rect translationRect;
+    private Rect quoteRect;
+    private Rect replyRect;
+    private float strokeWidth;
+
+    public MinimalistMessageLayout(Context context) {
+        super(context);
+        init();
+    }
+
+    public MinimalistMessageLayout(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public MinimalistMessageLayout(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    public MinimalistMessageLayout(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init();
+    }
+
+    private void init() {
+        setWillNotDraw(false);
+        quotePath = new Path();
+        translationPath = new Path();
+        replyPath = new Path();
+        msgAreaRect = new Rect();
+        translationRect = new Rect();
+        quoteRect = new Rect();
+        replyRect = new Rect();
+        paint = new Paint();
+        strokeWidth = getResources().getDimension(R.dimen.chat_minimalist_message_quato_line_width);
+        paint.setStrokeWidth(strokeWidth);
+        paint.setStyle(Paint.Style.STROKE);
+        paint.setAntiAlias(true);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        msgArea = findViewById(R.id.msg_area);
+        translationArea = findViewById(R.id.translate_content_fl);
+        quoteArea = findViewById(R.id.quote_content_fl);
+        replyArea = findViewById(R.id.msg_reply_preview);
+        drawLine(canvas);
+    }
+
+    public void setIsStart(boolean isStart) {
+        this.isStart = isStart;
+    }
+
+    private Rect getChildRectInParent(View child) {
+        int[] location = new int[2];
+        getLocationInWindow(location);
+
+        Rect rect = new Rect();
+        int[] childLocation = new int[2];
+        child.getLocationInWindow(childLocation);
+        int left = childLocation[0] - location[0];
+        int top = childLocation[1] - location[1];
+        int right = left + child.getWidth();
+        int bottom = top + child.getHeight();
+        rect.set(left, top, right, bottom);
+        return rect;
+    }
+
+    private void drawLine(Canvas canvas) {
+        canvas.drawColor(0x00FFFFFF);
+        if (msgArea.getVisibility() == VISIBLE) {
+            float msgX, msgCenterY;
+            msgAreaRect = getChildRectInParent(msgArea);
+            if (isStart) {
+                paint.setColor(getResources().getColor(R.color.chat_minimalist_left_message_bubble_color));
+                msgX = msgAreaRect.left + strokeWidth / 2;
+            } else {
+                paint.setColor(getResources().getColor(R.color.chat_minimalist_right_message_bubble_color));
+                msgX = msgAreaRect.right - strokeWidth / 2;
+            }
+            msgCenterY = msgAreaRect.top + msgAreaRect.height() * 1.0f / 2;
+            if (translationArea.getVisibility() == VISIBLE) {
+                float translationX, translationCenterY;
+                translationRect = getChildRectInParent(translationArea);
+                if (isStart) {
+                    translationX = translationRect.left;
+                } else {
+                    translationX = translationRect.right;
+                }
+                translationCenterY = translationRect.top + translationRect.height() * 1.0f / 2;
+                int translationControlRadius = (int) Math.abs(translationX - msgX);
+                translationPath.reset();
+                translationPath.moveTo(msgX, msgCenterY);
+                translationPath.quadTo(msgX, translationCenterY - translationControlRadius, msgX, translationCenterY - translationControlRadius);
+                translationPath.quadTo(msgX, translationCenterY, translationX, translationCenterY);
+                canvas.drawPath(translationPath, paint);
+            }
+            if (quoteArea.getVisibility() == VISIBLE) {
+                float quoteX, quoteCenterY;
+                quoteRect = getChildRectInParent(quoteArea);
+                if (isStart) {
+                    quoteX = quoteRect.left;
+                } else {
+                    quoteX = quoteRect.right;
+                }
+                quoteCenterY = quoteRect.top + quoteRect.height() * 1.0f / 2;
+                int quoteControlRadius = (int) Math.abs(quoteX - msgX);
+                quotePath.reset();
+                quotePath.moveTo(msgX, msgCenterY);
+                quotePath.quadTo(msgX, quoteCenterY - quoteControlRadius, msgX, quoteCenterY - quoteControlRadius);
+                quotePath.quadTo(msgX, quoteCenterY, quoteX, quoteCenterY);
+                canvas.drawPath(quotePath, paint);
+            }
+            if (replyArea.getVisibility() == VISIBLE) {
+                float replyX, replyCenterY;
+                replyRect = getChildRectInParent(replyArea);
+                if (isStart) {
+                    replyX = replyRect.left;
+                } else {
+                    replyX = replyRect.right;
+                }
+                replyCenterY = replyRect.top + replyRect.height() * 1.0f / 2;
+                int replyControlRadius = (int) Math.abs(replyX - msgX);
+                replyPath.reset();
+                replyPath.moveTo(msgX, msgCenterY);
+                replyPath.quadTo(msgX, replyCenterY - replyControlRadius, msgX, replyCenterY - replyControlRadius);
+                replyPath.quadTo(msgX, replyCenterY, replyX, replyCenterY);
+                canvas.drawPath(replyPath, paint);
+            }
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/SelectTextHelper.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/SelectTextHelper.java
new file mode 100644
index 0000000..9c3eb9f
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/SelectTextHelper.java
@@ -0,0 +1,937 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
+import android.graphics.drawable.ShapeDrawable;
+import android.os.Build;
+import android.text.Layout;
+import android.text.Selection;
+import android.text.Spannable;
+import android.text.Spanned;
+import android.text.TextUtils;
+import android.text.method.LinkMovementMethod;
+import android.text.style.BackgroundColorSpan;
+import android.text.style.ClickableSpan;
+import android.text.style.ImageSpan;
+import android.text.style.URLSpan;
+import android.util.Pair;
+import android.view.Gravity;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+import android.widget.Magnifier;
+import android.widget.PopupWindow;
+import android.widget.TextView;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.StringRes;
+
+import com.tencent.qcloud.tuikit.tuichat.classicui.component.BeginnerGuidePage;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+public class SelectTextHelper {
+    private static final String TAG = SelectTextHelper.class.getSimpleName();
+
+    private static int DEFAULT_SELECTION_LENGTH = 2;
+    private static int DEFAULT_SHOW_DURATION = 100;
+
+    private CursorHandle mStartHandle;
+    private CursorHandle mEndHandle;
+    private Magnifier mMagnifier;
+    private SelectionInfo mSelectionInfo = new SelectionInfo();
+    private OnSelectListener mSelectListener;
+
+    private Context mContext;
+    private TextView mTextView;
+    private Spannable mSpannable;
+
+    private int mTouchX;
+    private int mTouchY;
+    private int mTextViewMarginStart = 0;// textView的marginStart值
+
+    private int mSelectedColor;
+    private int mCursorHandleColor;
+    private int mCursorHandleSize;
+    private boolean mSelectAll;
+    private boolean mSelectedAllNoPop;
+    private boolean mScrollShow;
+    private boolean mMagnifierShow;
+    private int mPopSpanCount;
+    private int mPopBgResource;
+    private int mPopArrowImg;
+    private boolean mIsEmoji = false;
+    private List<Pair<Integer, String>> itemTextList;
+    private List<Builder.onSeparateItemClickListener> itemListenerList = new LinkedList<>();
+
+    private BackgroundColorSpan mSpan;
+    private boolean isHideWhenScroll;
+    private boolean isHide = true;
+    private boolean usedClickListener = false;
+
+    private ViewTreeObserver.OnPreDrawListener mOnPreDrawListener;
+    private ViewTreeObserver.OnScrollChangedListener mOnScrollChangedListener;
+    private View.OnTouchListener mRootTouchListener;
+
+
+    public interface OnSelectListener {
+        void onClick(View v);// 点击textView
+
+        void onLongClick(View v);// 长按textView
+
+        void onTextSelected(CharSequence content);// 选中文本回调
+
+        void onDismiss();// 解除弹窗回调
+
+        void onClickUrl(String url);// 点击文本里的url回调
+
+        void onSelectAllShowCustomPop();// 全选显示自定义弹窗回调
+
+        void onReset();// 重置回调
+
+        void onDismissCustomPop();// 解除自定义弹窗回调
+
+        void onScrolling();// 正在滚动回调
+    }
+
+    public static class Builder {
+        private TextView mTextView;
+        private int mCursorHandleColor = 0xFF1379D6;
+        private int mSelectedColor = 0xFFAFE1F4;
+        private float mCursorHandleSizeInDp = 24;
+        private boolean mSelectAll = true;
+        private boolean mSelectedAllNoPop = false;
+        private boolean mScrollShow = true;
+        private boolean mMagnifierShow = true;
+        private int mPopSpanCount = 5;
+        private int mPopBgResource = 0;
+        private int mPopArrowImg = 0;
+        private boolean mIsEmoji = false;
+        private List<Pair<Integer, String>> itemTextList = new LinkedList<>();
+        private List<onSeparateItemClickListener> itemListenerList = new LinkedList<>();
+
+        public Builder(TextView textView) {
+            mTextView = textView;
+        }
+
+        /**
+         * 选择游标颜色
+         */
+        public Builder setCursorHandleColor(@ColorInt int cursorHandleColor) {
+            mCursorHandleColor = cursorHandleColor;
+            return this;
+        }
+
+        /**
+         * 选择游标大小
+         */
+        public Builder setCursorHandleSizeInDp(float cursorHandleSizeInDp) {
+            mCursorHandleSizeInDp = cursorHandleSizeInDp;
+            return this;
+        }
+
+        /**
+         * 选中文本的颜色
+         */
+        public Builder setSelectedColor(@ColorInt int selectedBgColor) {
+            mSelectedColor = selectedBgColor;
+            return this;
+        }
+
+        /**
+         * 全选
+         */
+        public Builder setSelectAll(boolean selectAll) {
+            mSelectAll = selectAll;
+            return this;
+        }
+
+        /**
+         * 已经全选无弹窗
+         */
+        public Builder setSelectedAllNoPop(boolean selectedAllNoPop) {
+            mSelectedAllNoPop = selectedAllNoPop;
+            return this;
+        }
+
+        /**
+         * 滑动依然显示弹窗
+         */
+        public Builder setScrollShow(boolean scrollShow) {
+            mScrollShow = scrollShow;
+            return this;
+        }
+
+        /**
+         * 显示放大镜
+         */
+        public Builder setMagnifierShow(boolean magnifierShow) {
+            mMagnifierShow = magnifierShow;
+            return this;
+        }
+
+        /**
+         * 弹窗每行个数
+         */
+        public Builder setPopSpanCount(int popSpanCount) {
+            mPopSpanCount = popSpanCount;
+            return this;
+        }
+
+        /**
+         * 弹窗背景颜色、弹窗箭头
+         */
+        public Builder setPopStyle(int popBgResource, int popArrowImg) {
+            mPopBgResource = popBgResource;
+            mPopArrowImg = popArrowImg;
+            return this;
+        }
+
+        public Builder setIsEmoji(boolean isEmoji) {
+            mIsEmoji = isEmoji;
+            return this;
+        }
+
+        public Builder addItem(@DrawableRes int drawableId, @StringRes int textResId, onSeparateItemClickListener listener) {
+            itemTextList.add(new Pair<>(drawableId, mTextView.getContext().getResources().getString(textResId)));
+            itemListenerList.add(listener);
+            return this;
+        }
+
+        public Builder addItem(@DrawableRes int drawableId, String itemText, onSeparateItemClickListener listener) {
+            itemTextList.add(new Pair<>(drawableId, itemText));
+            itemListenerList.add(listener);
+            return this;
+        }
+
+        public SelectTextHelper build() {
+            return new SelectTextHelper(this);
+        }
+
+        public interface onSeparateItemClickListener {
+            void onClick();
+        }
+    }
+
+    public SelectTextHelper(Builder builder) {
+        mTextView = builder.mTextView;
+        mContext = mTextView.getContext();
+        mSelectedColor = builder.mSelectedColor;
+        mCursorHandleColor = builder.mCursorHandleColor;
+        mSelectAll = builder.mSelectAll;
+        mIsEmoji = builder.mIsEmoji;
+        mScrollShow = builder.mScrollShow;
+        mMagnifierShow = builder.mMagnifierShow;
+        mPopSpanCount = builder.mPopSpanCount;
+        mPopBgResource = builder.mPopBgResource;
+        mPopArrowImg = builder.mPopArrowImg;
+        mSelectedAllNoPop = builder.mSelectedAllNoPop;
+        itemTextList = builder.itemTextList;
+        itemListenerList = builder.itemListenerList;
+        mCursorHandleSize = dp2px(builder.mCursorHandleSizeInDp);
+        init();
+    }
+
+    /**
+     * 重置弹窗
+     */
+    public void reset() {
+        TUIChatLog.d(TAG, "reset");
+        hideSelectView();
+        resetSelectionInfo();
+        // 重置弹窗回调
+        if (mSelectListener != null) {
+            mSelectListener.onReset();
+        }
+    }
+
+
+    /**
+     * 选择文本监听
+     */
+    public void setSelectListener(OnSelectListener selectListener) {
+        mSelectListener = selectListener;
+    }
+
+    /**
+     * 销毁
+     */
+    public void destroy() {
+        mTextView.getViewTreeObserver().removeOnScrollChangedListener(mOnScrollChangedListener);
+        mTextView.getViewTreeObserver().removeOnPreDrawListener(mOnPreDrawListener);
+        mTextView.getRootView().setOnTouchListener(null);
+        reset();
+        mStartHandle = null;
+        mEndHandle = null;
+    }
+
+    /**
+     * 全选
+     */
+    public void selectAll() {
+        showAllView();
+    }
+
+    /**
+     * public end
+     */
+
+    private void init() {
+        mTextView.setText(mTextView.getText(), TextView.BufferType.SPANNABLE);
+
+        mTextView.setOnTouchListener((v, event) -> {
+            mTouchX = (int) event.getX();
+            mTouchY = (int) event.getY();
+            return false;
+        });
+
+        mTextView.setOnClickListener(v -> {
+            if (usedClickListener) {
+                usedClickListener = false;
+                return;
+            }
+            if (null != mSelectListener) {
+                mSelectListener.onDismiss();
+            }
+            reset();
+            if (null != mSelectListener) {
+                mSelectListener.onClick(mTextView);
+            }
+        });
+
+        mTextView.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                BeginnerGuidePage.showBeginnerGuideThen(mTextView, new Runnable() {
+                    @Override
+                    public void run() {
+                        onLongTextViewClick();
+                    }
+                });
+                return true;
+            }
+
+            private void onLongTextViewClick() {
+                mTextView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
+                    @Override
+                    public void onViewAttachedToWindow(View v) {
+                    }
+
+                    @Override
+                    public void onViewDetachedFromWindow(View v) {
+                        destroy();
+                    }
+                });
+
+                mOnPreDrawListener = new ViewTreeObserver.OnPreDrawListener() {
+                    @Override
+                    public boolean onPreDraw() {
+                        if (isHideWhenScroll) {
+                            isHideWhenScroll = false;
+                            postShowSelectView(DEFAULT_SHOW_DURATION);
+                        }
+                        // 拿textView的x坐标
+                        if (0 == mTextViewMarginStart) {
+                            int[] location = new int[2];
+                            mTextView.getLocationInWindow(location);
+                            mTextViewMarginStart = location[0];
+                        }
+                        return true;
+                    }
+                };
+                mTextView.getViewTreeObserver().addOnPreDrawListener(mOnPreDrawListener);
+
+                // 根布局监听
+                mRootTouchListener = new View.OnTouchListener() {
+                    @Override
+                    public boolean onTouch(View v, MotionEvent event) {
+                        reset();
+                        mTextView.getRootView().setOnTouchListener(null);
+                        return false;
+                    }
+                };
+                mTextView.getRootView().setOnTouchListener(mRootTouchListener);
+
+                mOnScrollChangedListener = new ViewTreeObserver.OnScrollChangedListener() {
+                    @Override
+                    public void onScrollChanged() {
+                        if (mScrollShow) {
+                            if (!isHideWhenScroll && !isHide) {
+                                isHideWhenScroll = true;
+                                if (mStartHandle != null) {
+                                    mStartHandle.dismiss();
+                                }
+                                if (mEndHandle != null) {
+                                    mEndHandle.dismiss();
+                                }
+                            }
+                            if (null != mSelectListener) {
+                                mSelectListener.onScrolling();
+                            }
+                        } else {
+                            reset();
+                        }
+                    }
+                };
+                mTextView.getViewTreeObserver().addOnScrollChangedListener(mOnScrollChangedListener);
+
+                if (mSelectAll) {
+                    showAllView();
+                } else {
+                    showSelectView(mTouchX, mTouchY);
+                }
+                if (null != mSelectListener) {
+                    mSelectListener.onLongClick(mTextView);
+                }
+            }
+        });
+        // 此setMovementMethod可被修改
+        mTextView.setMovementMethod(new LinkMovementMethodInterceptor());
+    }
+
+    private void postShowSelectView(int duration) {
+        mTextView.removeCallbacks(mShowSelectViewRunnable);
+        if (duration <= 0) {
+            mShowSelectViewRunnable.run();
+        } else {
+            mTextView.postDelayed(mShowSelectViewRunnable, duration);
+        }
+    }
+
+    private final Runnable mShowSelectViewRunnable = new Runnable() {
+        @Override
+        public void run() {
+            if (isHide) return;
+            if (mStartHandle != null) {
+                showCursorHandle(mStartHandle);
+            }
+            if (mEndHandle != null) {
+                showCursorHandle(mEndHandle);
+            }
+        }
+    };
+
+    private void hideSelectView() {
+        isHide = true;
+        usedClickListener = false;
+        if (mStartHandle != null) {
+            TUIChatLog.d(TAG, "mStartHandle.dismiss();");
+            mStartHandle.dismiss();
+        }
+        if (mEndHandle != null) {
+            TUIChatLog.d(TAG, "mEndHandle.dismiss();");
+            mEndHandle.dismiss();
+        }
+    }
+
+    private void resetSelectionInfo() {
+        mSelectionInfo.mSelectionContent = null;
+        if (mSpannable != null && mSpan != null) {
+            TUIChatLog.d(TAG, "mSpannable.removeSpan(mSpan);");
+            mSpannable.removeSpan(mSpan);
+            mSpan = null;
+        }
+    }
+
+    private void showSelectView(int x, int y) {
+        reset();
+        isHide = false;
+        if (mStartHandle == null) mStartHandle = new CursorHandle(true);
+        if (mEndHandle == null) mEndHandle = new CursorHandle(false);
+
+        int startOffset = getPreciseOffset(mTextView, x, y);
+        int endOffset = startOffset + DEFAULT_SELECTION_LENGTH;
+        if (mTextView.getText() instanceof Spannable) {
+            mSpannable = (Spannable) mTextView.getText();
+        }
+        if (mSpannable == null || endOffset - 1 >= mTextView.getText().length()) {
+            return;
+        }
+        selectText(startOffset, endOffset);
+        showCursorHandle(mStartHandle);
+        showCursorHandle(mEndHandle);
+    }
+
+    /**
+     * 全选
+     * Select all
+     */
+    private void showAllView() {
+        reset();
+        isHide = false;
+        if (mStartHandle == null) mStartHandle = new CursorHandle(true);
+        if (mEndHandle == null) mEndHandle = new CursorHandle(false);
+
+        if (mTextView.getText() instanceof Spannable) {
+            mSpannable = (Spannable) mTextView.getText();
+        }
+        if (mSpannable == null) {
+            return;
+        }
+        selectText(0, mTextView.getText().length());
+        showCursorHandle(mStartHandle);
+        showCursorHandle(mEndHandle);
+    }
+
+    private void showCursorHandle(CursorHandle cursorHandle) {
+        Layout layout = mTextView.getLayout();
+        if (layout == null) {
+            return;
+        }
+        int offset = cursorHandle.isLeft ? mSelectionInfo.mStart : mSelectionInfo.mEnd;
+        cursorHandle.show((int) layout.getPrimaryHorizontal(offset), layout.getLineBottom(layout.getLineForOffset(offset)));
+    }
+
+    private void selectText(int startPos, int endPos) {
+        if (startPos != -1) {
+            mSelectionInfo.mStart = startPos;
+        }
+        if (endPos != -1) {
+            mSelectionInfo.mEnd = endPos;
+        }
+        if (mSelectionInfo.mStart > mSelectionInfo.mEnd) {
+            int temp = mSelectionInfo.mStart;
+            mSelectionInfo.mStart = mSelectionInfo.mEnd;
+            mSelectionInfo.mEnd = temp;
+        }
+
+        if (mSpannable != null) {
+            if (mSpan == null) {
+                mSpan = new BackgroundColorSpan(mSelectedColor);
+            }
+            mSelectionInfo.mSelectionContent = mSpannable.subSequence(mSelectionInfo.mStart, mSelectionInfo.mEnd).toString();
+            mSpannable.setSpan(mSpan, mSelectionInfo.mStart, mSelectionInfo.mEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+            if (mSelectListener != null) {
+                mSelectListener.onTextSelected(mSelectionInfo.mSelectionContent);
+            }
+
+            if (mIsEmoji) {
+                //handlerEmojiSelectText();
+            }
+        }
+    }
+
+    private void handlerEmojiSelectText() {
+        String regex = "\\[(\\S+?)\\]";
+        Pattern p = Pattern.compile(regex);
+        Matcher m = p.matcher(mSelectionInfo.mSelectionContent);
+
+        while (m.find()) {
+            String emojiName = m.group();
+            Bitmap bitmap = FaceManager.getEmoji(emojiName);
+            if (bitmap != null) {
+
+                Drawable drawable = new BitmapDrawable(bitmap);
+                ShapeDrawable background = new ShapeDrawable();
+                background.getPaint().setColor(mTextView.getContext().getResources().getColor(com.tencent.qcloud.tuicore.R.color.text_select_color));
+                LayerDrawable layerDrawable = new LayerDrawable(new Drawable[]{background, drawable});
+                layerDrawable.setBounds(0, 0, 64, 64);
+                ImageSpan image = new ImageSpan(layerDrawable, ImageSpan.ALIGN_BASELINE);
+                mSpannable.setSpan(image, mSelectionInfo.mStart, mSelectionInfo.mEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+            }
+        }
+    }
+
+    /**
+     * 游标
+     */
+    private class CursorHandle extends View {
+
+        private PopupWindow mPopupWindow;
+        private Paint mPaint;
+
+        private int mCircleRadius = mCursorHandleSize / 2;
+        private int mWidth = mCursorHandleSize;
+        private int mHeight = mCursorHandleSize;
+        private int mPadding = 32;// 游标padding
+        private boolean isLeft;
+
+        public CursorHandle(boolean isLeft) {
+            super(mContext);
+            this.isLeft = isLeft;
+            mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+            mPaint.setColor(mCursorHandleColor);
+
+            mPopupWindow = new PopupWindow(this);
+            mPopupWindow.setClippingEnabled(false);
+            mPopupWindow.setWidth(mWidth + mPadding * 2);
+            mPopupWindow.setHeight(mHeight + mPadding / 2);
+            invalidate();
+        }
+
+        @Override
+        protected void onDraw(Canvas canvas) {
+            canvas.drawCircle(mCircleRadius + mPadding, mCircleRadius, mCircleRadius, mPaint);
+            if (isLeft) {
+                canvas.drawRect(mCircleRadius + mPadding, 0, mCircleRadius * 2 + mPadding, mCircleRadius, mPaint);
+            } else {
+                canvas.drawRect(mPadding, 0, mCircleRadius + mPadding, mCircleRadius, mPaint);
+            }
+        }
+
+        private int mAdjustX;
+        private int mAdjustY;
+
+        private int mBeforeDragStart;
+        private int mBeforeDragEnd;
+
+        @Override
+        public boolean onTouchEvent(MotionEvent event) {
+            switch (event.getAction()) {
+                case MotionEvent.ACTION_DOWN:
+                    mBeforeDragStart = mSelectionInfo.mStart;
+                    mBeforeDragEnd = mSelectionInfo.mEnd;
+                    mAdjustX = (int) event.getX();
+                    mAdjustY = (int) event.getY();
+                    break;
+                case MotionEvent.ACTION_UP:
+                case MotionEvent.ACTION_CANCEL:
+                    if (mMagnifierShow) {
+                        // android 9 放大镜
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P
+                                && null != mMagnifier) {
+                            mMagnifier.dismiss();
+                        }
+                    }
+                    break;
+                case MotionEvent.ACTION_MOVE:
+                    if (null != mSelectListener) {
+                        mSelectListener.onDismissCustomPop();
+                    }
+                    int rawX = (int) event.getRawX();
+                    int rawY = (int) event.getRawY();
+                    // x y不准 x 减去textView距离x轴距离值  y减去字体大小的像素值
+                    update(rawX + mAdjustX - mWidth - mTextViewMarginStart,
+                            rawY + mAdjustY - mHeight - (int) mTextView.getTextSize());
+                    if (mMagnifierShow) {
+                        // android 9 放大镜功能
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                            if (null == mMagnifier) {
+                                mMagnifier = new Magnifier(mTextView);
+                                mMagnifier.getWidth();
+                            }
+                            final int[] viewPosition = new int[2];
+                            mTextView.getLocationOnScreen(viewPosition);
+                            int magnifierX = rawX - viewPosition[0];
+                            int magnifierY = rawY - viewPosition[1] - dp2px(32);
+                            mMagnifier.show(magnifierX, Math.max(magnifierY, 0));
+                        }
+                    }
+                    break;
+            }
+            return true;
+        }
+
+        private void changeDirection() {
+            isLeft = !isLeft;
+            invalidate();
+        }
+
+        public void dismiss() {
+            mPopupWindow.dismiss();
+        }
+
+        private int[] mTempCoors = new int[2];
+
+        public void update(int x, int y) {
+            mTextView.getLocationInWindow(mTempCoors);
+            int oldOffset;
+            if (isLeft) {
+                oldOffset = mSelectionInfo.mStart;
+            } else {
+                oldOffset = mSelectionInfo.mEnd;
+            }
+
+            y -= mTempCoors[1];
+
+            int offset = getHysteresisOffset(mTextView, x, y, oldOffset);
+
+            if (offset != oldOffset) {
+                resetSelectionInfo();
+                if (isLeft) {
+                    if (offset > mBeforeDragEnd) {
+                        CursorHandle handle = getCursorHandle(false);
+                        changeDirection();
+                        handle.changeDirection();
+                        mBeforeDragStart = mBeforeDragEnd;
+                        selectText(mBeforeDragEnd, offset);
+                        handle.updateCursorHandle();
+                    } else {
+                        selectText(offset, -1);
+                    }
+                    updateCursorHandle();
+                } else {
+                    if (offset < mBeforeDragStart) {
+                        CursorHandle handle = getCursorHandle(true);
+                        handle.changeDirection();
+                        changeDirection();
+                        mBeforeDragEnd = mBeforeDragStart;
+                        selectText(offset, mBeforeDragStart);
+                        handle.updateCursorHandle();
+                    } else {
+                        selectText(mBeforeDragStart, offset);
+                    }
+                    updateCursorHandle();
+                }
+            }
+        }
+
+        private void updateCursorHandle() {
+            mTextView.getLocationInWindow(mTempCoors);
+            Layout layout = mTextView.getLayout();
+            if (isLeft) {
+                mPopupWindow.update((int) layout.getPrimaryHorizontal(mSelectionInfo.mStart) - mWidth + getExtraX(),
+                        layout.getLineBottom(layout.getLineForOffset(mSelectionInfo.mStart)) + getExtraY(), -1, -1);
+            } else {
+                mPopupWindow.update((int) layout.getPrimaryHorizontal(mSelectionInfo.mEnd) + getExtraX(),
+                        layout.getLineBottom(layout.getLineForOffset(mSelectionInfo.mEnd)) + getExtraY(), -1, -1);
+            }
+        }
+
+        public void show(int x, int y) {
+            mTextView.getLocationInWindow(mTempCoors);
+            int offset = isLeft ? mWidth : 0;
+            mPopupWindow.showAtLocation(mTextView, Gravity.NO_GRAVITY, x - offset + getExtraX(), y + getExtraY());
+        }
+
+        public int getExtraX() {
+            return mTempCoors[0] - mPadding + mTextView.getPaddingLeft();
+        }
+
+        public int getExtraY() {
+            return mTempCoors[1] + mTextView.getPaddingTop();
+        }
+    }
+
+    private CursorHandle getCursorHandle(boolean isLeft) {
+        if (mStartHandle.isLeft == isLeft) {
+            return mStartHandle;
+        } else {
+            return mEndHandle;
+        }
+    }
+
+    private class SelectionInfo {
+        public int mStart;
+        public int mEnd;
+        public String mSelectionContent;
+    }
+
+    /**
+     * 处理内容链接跳转
+     */
+    private class LinkMovementMethodInterceptor extends LinkMovementMethod {
+
+        private long downLinkTime;
+
+        @Override
+        public boolean onTouchEvent(TextView widget, Spannable buffer, MotionEvent event) {
+            int action = event.getAction();
+
+            if (action == MotionEvent.ACTION_UP ||
+                    action == MotionEvent.ACTION_DOWN) {
+                int x = (int) event.getX();
+                int y = (int) event.getY();
+
+                x -= widget.getTotalPaddingLeft();
+                y -= widget.getTotalPaddingTop();
+
+                x += widget.getScrollX();
+                y += widget.getScrollY();
+
+                Layout layout = widget.getLayout();
+                int line = layout.getLineForVertical(y);
+                int off = layout.getOffsetForHorizontal(line, x);
+
+                ClickableSpan[] links =
+                        buffer.getSpans(off, off, ClickableSpan.class);
+
+                if (links.length != 0) {
+                    if (action == MotionEvent.ACTION_UP) {
+                        // 长按
+                        if (downLinkTime + ViewConfiguration.getLongPressTimeout() < System.currentTimeMillis()) {
+                            return false;
+                        }
+                        // 点击
+                        if (links[0] instanceof URLSpan) {
+                            URLSpan url = (URLSpan) links[0];
+                            if (!TextUtils.isEmpty(url.getURL())) {
+                                if (null != mSelectListener) {
+                                    usedClickListener = true;
+                                    mSelectListener.onClickUrl(url.getURL());
+                                }
+                                return true;
+                            } else {
+                                links[0].onClick(widget);
+                            }
+                        }
+                    } else if (action == MotionEvent.ACTION_DOWN) {
+                        downLinkTime = System.currentTimeMillis();
+                        Selection.setSelection(buffer,
+                                buffer.getSpanStart(links[0]),
+                                buffer.getSpanEnd(links[0]));
+                    }
+                    return true;
+                } else {
+                    Selection.removeSelection(buffer);
+                }
+            }
+
+            return super.onTouchEvent(widget, buffer, event);
+        }
+
+    }
+
+    // util
+
+    public static int getPreciseOffset(TextView textView, int x, int y) {
+        Layout layout = textView.getLayout();
+        if (layout != null) {
+            int topVisibleLine = layout.getLineForVertical(y);
+            int offset = layout.getOffsetForHorizontal(topVisibleLine, x);
+
+            int offsetX = (int) layout.getPrimaryHorizontal(offset);
+
+            if (offsetX > x) {
+                return layout.getOffsetToLeftOf(offset);
+            } else {
+                return offset;
+            }
+        } else {
+            return -1;
+        }
+    }
+
+    public static int getHysteresisOffset(TextView textView, int x, int y, int previousOffset) {
+        final Layout layout = textView.getLayout();
+        if (layout == null) return -1;
+
+        int line = layout.getLineForVertical(y);
+
+        // The "HACK BLOCK"S in this function is required because of how Android Layout for
+        // TextView works - if 'offset' equals to the last character of a line, then
+        //
+        // * getLineForOffset(offset) will result the NEXT line
+        // * getPrimaryHorizontal(offset) will return 0 because the next insertion point is on the next line
+        // * getOffsetForHorizontal(line, x) will not return the last offset of a line no matter where x is
+        // These are highly undesired and is worked around with the HACK BLOCK
+        //
+        // @see Moon+ Reader/Color Note - see how it can't select the last character of a line unless you move
+        // the cursor to the beginning of the next line.
+        //
+        ////////////////////HACK BLOCK////////////////////////////////////////////////////
+
+        if (isEndOfLineOffset(layout, previousOffset)) {
+            // we have to minus one from the offset so that the code below to find
+            // the previous line can work correctly.
+            int left = (int) layout.getPrimaryHorizontal(previousOffset - 1);
+            int right = (int) layout.getLineRight(line);
+            int threshold = (right - left) / 2; // half the width of the last character
+            if (x > right - threshold) {
+                previousOffset -= 1;
+            }
+        }
+        ///////////////////////////////////////////////////////////////////////////////////
+
+        final int previousLine = layout.getLineForOffset(previousOffset);
+        final int previousLineTop = layout.getLineTop(previousLine);
+        final int previousLineBottom = layout.getLineBottom(previousLine);
+        final int hysteresisThreshold = (previousLineBottom - previousLineTop) / 2;
+
+        // If new line is just before or after previous line and y position is less than
+        // hysteresisThreshold away from previous line, keep cursor on previous line.
+        if (((line == previousLine + 1) && ((y - previousLineBottom) < hysteresisThreshold)) || ((line == previousLine - 1) && ((
+                previousLineTop
+                        - y) < hysteresisThreshold))) {
+            line = previousLine;
+        }
+
+        int offset = layout.getOffsetForHorizontal(line, x);
+
+        // This allow the user to select the last character of a line without moving the
+        // cursor to the next line. (As Layout.getOffsetForHorizontal does not return the
+        // offset of the last character of the specified line)
+        //
+        // But this function will probably get called again immediately, must decrement the offset
+        // by 1 to compensate for the change made below. (see previous HACK BLOCK)
+        /////////////////////HACK BLOCK///////////////////////////////////////////////////
+        if (offset < textView.getText().length() - 1) {
+            if (isEndOfLineOffset(layout, offset + 1)) {
+                int left = (int) layout.getPrimaryHorizontal(offset);
+                int right = (int) layout.getLineRight(line);
+                int threshold = (right - left) / 2; // half the width of the last character
+                if (x > right - threshold) {
+                    offset += 1;
+                }
+            }
+        }
+        //////////////////////////////////////////////////////////////////////////////////
+
+        return offset;
+    }
+
+    private static boolean isEndOfLineOffset(Layout layout, int offset) {
+        return offset > 0 && layout.getLineForOffset(offset) == layout.getLineForOffset(offset - 1) + 1;
+    }
+
+    public static int getDisplayWidth() {
+        return Resources.getSystem().getDisplayMetrics().widthPixels;
+    }
+
+    public static int getDisplayHeight() {
+        return Resources.getSystem().getDisplayMetrics().heightPixels;
+    }
+
+    public static int dp2px(float dpValue) {
+        return (int) (dpValue * Resources.getSystem().getDisplayMetrics().density + 0.5f);
+    }
+
+    /**
+     * 设置宽高
+     *
+     * @param v
+     * @param w
+     * @param h
+     */
+    public static void setWidthHeight(View v, int w, int h) {
+        ViewGroup.LayoutParams params = v.getLayoutParams();
+        params.width = w;
+        params.height = h;
+        v.setLayoutParams(params);
+    }
+
+    /**
+     * 通知栏的高度
+     */
+    private static int STATUS_HEIGHT = 0;
+
+    /**
+     * 获取通知栏的高度
+     */
+    public static int getStatusHeight() {
+        if (0 != STATUS_HEIGHT) {
+            return STATUS_HEIGHT;
+        }
+        int resid = Resources.getSystem().getIdentifier("status_bar_height", "dimen", "android");
+        if (resid > 0) {
+            STATUS_HEIGHT = Resources.getSystem().getDimensionPixelSize(resid);
+            return STATUS_HEIGHT;
+        }
+        return -1;
+    }
+}
\ No newline at end of file
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/TimeInLineTextLayout.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/TimeInLineTextLayout.java
new file mode 100644
index 0000000..ff37681
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/TimeInLineTextLayout.java
@@ -0,0 +1,135 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.text.Layout;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+
+public class TimeInLineTextLayout extends FrameLayout {
+
+    private TextView textView;
+    private MessageStatusTimeView statusArea;
+
+    public TimeInLineTextLayout(@NonNull Context context) {
+        super(context);
+        init(context, null);
+    }
+
+    public TimeInLineTextLayout(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public TimeInLineTextLayout(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs);
+    }
+
+    private void init(Context context, AttributeSet attrs) {
+        textView = new TextView(context, null, R.style.ChatMinimalistMessageTextStyle);
+        textView.setTextColor(Color.BLACK);
+        textView.setTextSize(TypedValue.COMPLEX_UNIT_PX, textView.getResources().getDimension(R.dimen.chat_minimalist_message_text_size));
+        LayoutParams textViewParams = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+        addView(textView, textViewParams);
+        statusArea = new MessageStatusTimeView(context);
+        LayoutParams statusAreaParams = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+        addView(statusArea, statusAreaParams);
+    }
+
+    public void setText(CharSequence charSequence) {
+        textView.setText(charSequence);
+    }
+
+    public void setText(int resID) {
+        textView.setText(resID);
+    }
+
+    public void setStatusIcon(int resID) {
+        statusArea.setStatusIcon(resID);
+    }
+
+    public void setTimeText(CharSequence charSequence) {
+        statusArea.setTimeText(charSequence);
+    }
+
+    public void setTimeColor(int color) {
+        statusArea.setTimeColor(color);
+    }
+
+    public void setTextColor(int color) {
+        textView.setTextColor(color);
+    }
+
+    public void setTextSize(int size) {
+        textView.setTextSize(size);
+    }
+
+    public TextView getTextView() {
+        return textView;
+    }
+
+    public void setOnStatusAreaClickListener(OnClickListener listener) {
+        statusArea.setOnClickListener(listener);
+    }
+
+    public void setOnStatusAreaLongClickListener(OnLongClickListener listener) {
+        statusArea.setOnLongClickListener(listener);
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        int textViewWidth = textView.getMeasuredWidth();
+        int textViewHeight = textView.getMeasuredHeight();
+        textView.layout(0, 0, textViewWidth, textViewHeight);
+        int statusAreaWidth = statusArea.getMeasuredWidth();
+        int statusAreaHeight = statusArea.getMeasuredHeight();
+        statusArea.layout(right - left - statusAreaWidth, bottom - top - statusAreaHeight, right - left, bottom - top);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int maxWidth, maxHeight;
+        // measure text view
+        measureChildren(widthMeasureSpec, heightMeasureSpec);
+
+        int textWidth = textView.getMeasuredWidth();
+        int textHeight = textView.getMeasuredHeight();
+        int lineCount = textView.getLineCount();
+
+        // get last line's width
+        int lastLineWidth = 0;
+        Layout layout = textView.getLayout();
+        if (layout != null) {
+            int start = layout.getLineStart(lineCount - 1);
+            int end = layout.getLineEnd(lineCount - 1);
+            float startX = layout.getPrimaryHorizontal(start);
+            float endX = layout.getSecondaryHorizontal(end);
+            lastLineWidth = (int) (endX - startX);
+        }
+
+        int statusAreaWidth = statusArea.getMeasuredWidth();
+        int statusAreaHeight = statusArea.getMeasuredHeight();
+        MarginLayoutParams lp = (MarginLayoutParams) statusArea.getLayoutParams();
+        statusAreaWidth += lp.leftMargin + lp.rightMargin;
+
+        int layoutWidth = MeasureSpec.getSize(widthMeasureSpec);
+        // switch a new line
+        if (lastLineWidth + statusAreaWidth > layoutWidth) {
+            maxHeight = textHeight + statusAreaHeight;
+            maxWidth = Math.max(textWidth, statusAreaWidth);
+        } else {
+            maxHeight = Math.max(textHeight, statusAreaHeight);
+            maxWidth = Math.max(textWidth, lastLineWidth + statusAreaWidth);
+        }
+
+        setMeasuredDimension(maxWidth, maxHeight);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/ChatReactView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/ChatReactView.java
new file mode 100644
index 0000000..9f2a168
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/ChatReactView.java
@@ -0,0 +1,118 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageReactBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.Set;
+
+public class ChatReactView extends FrameLayout {
+
+    private static final int EMOJI_LIMIT = 5;
+    private LinearLayoutManager layoutManager;
+    private TextView reactNumText;
+    private View moreIcon;
+    private RecyclerView reactRecyclerView;
+    private ChatReactAdapter adapter;
+    public ChatReactView(@NonNull Context context) {
+        super(context);
+        initView();
+    }
+
+    public ChatReactView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        initView();
+    }
+
+    public ChatReactView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initView();
+    }
+
+    private void initView() {
+        View view = LayoutInflater.from(getContext()).inflate(R.layout.chat_minimalist_react_preview_layout, this);
+        reactRecyclerView = view.findViewById(R.id.reacts_emoji_list);
+        reactNumText = view.findViewById(R.id.reacts_num_text);
+        moreIcon = view.findViewById(R.id.more_icon);
+        layoutManager = new LinearLayoutManager(getContext());
+        layoutManager.setOrientation(RecyclerView.HORIZONTAL);
+        reactRecyclerView.setLayoutManager(layoutManager);
+        adapter = new ChatReactAdapter();
+        reactRecyclerView.setAdapter(adapter);
+    }
+
+    public void setData(MessageReactBean reactBean) {
+        Map<String, Set<String>> reactsMap = reactBean.getReacts();
+        int num = 0;
+        for (Set<String> strings : reactsMap.values()) {
+            num += strings.size();
+        }
+        reactNumText.setText(num + "");
+        if (num > EMOJI_LIMIT) {
+            moreIcon.setVisibility(VISIBLE);
+        } else {
+            moreIcon.setVisibility(GONE);
+        }
+        if (adapter != null) {
+            adapter.setData(reactBean);
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    static class ChatReactAdapter extends RecyclerView.Adapter<ChatReactViewHolder> {
+        private MessageReactBean data;
+
+        public void setData(MessageReactBean data) {
+            this.data = data;
+        }
+
+        @NonNull
+        @Override
+        public ChatReactViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.chat_minimalist_react_item_layout, parent, false);
+            return new ChatReactViewHolder(view);
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull ChatReactViewHolder holder, int position) {
+            Map.Entry<String, Set<String>> entry = new ArrayList<>(data.getReacts().entrySet()).get(position);
+            String emojiId = entry.getKey();
+            Bitmap bitmap = FaceManager.getEmoji(emojiId);
+            holder.faceImageView.setImageBitmap(bitmap);
+        }
+
+        @Override
+        public int getItemCount() {
+            if (data != null) {
+                return Math.min(data.getReactSize(), EMOJI_LIMIT);
+            }
+            return 0;
+        }
+    }
+
+    static class ChatReactViewHolder extends RecyclerView.ViewHolder {
+        public ImageView faceImageView;
+        public ChatReactViewHolder(@NonNull View itemView) {
+            super(itemView);
+            faceImageView = itemView.findViewById(R.id.face_iv);
+        }
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/FaceReplyQuoteView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/FaceReplyQuoteView.java
new file mode 100644
index 0000000..f653eb0
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/FaceReplyQuoteView.java
@@ -0,0 +1,39 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply;
+
+import android.content.Context;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.FaceReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+
+public class FaceReplyQuoteView extends TUIReplyQuoteView {
+    private final ImageView contentImage;
+
+    @Override
+    public int getLayoutResourceId() {
+        return R.layout.chat_reply_quote_face_layout;
+    }
+
+    public FaceReplyQuoteView(Context context) {
+        super(context);
+        contentImage = findViewById(R.id.content_image_iv);
+    }
+
+    @Override
+    public void onDrawReplyQuote(TUIReplyQuoteBean quoteBean) {
+        FaceReplyQuoteBean faceReplyQuoteBean = (FaceReplyQuoteBean) quoteBean;
+
+        String faceKey = new String(faceReplyQuoteBean.getData());
+        ViewGroup.LayoutParams params = contentImage.getLayoutParams();
+        if (params != null) {
+            int maxSize = getResources().getDimensionPixelSize(R.dimen.reply_message_image_size);
+            params.width = maxSize;
+            params.height = maxSize;
+            contentImage.setLayoutParams(params);
+        }
+        FaceManager.loadFace(faceReplyQuoteBean.getIndex(), faceKey, contentImage);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/FileReplyQuoteView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/FileReplyQuoteView.java
new file mode 100644
index 0000000..ff03494
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/FileReplyQuoteView.java
@@ -0,0 +1,46 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.FileReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+
+public class FileReplyQuoteView extends TUIReplyQuoteView {
+
+    private View fileMsgLayout;
+    private ImageView fileMsgIcon;
+    private TextView fileMsgTv;
+    @Override
+    public int getLayoutResourceId() {
+        return R.layout.chat_reply_quote_file_layout;
+    }
+
+    public FileReplyQuoteView(Context context) {
+        super(context);
+        fileMsgLayout = findViewById(R.id.file_msg_layout);
+        fileMsgIcon = findViewById(R.id.file_msg_icon_iv);
+        fileMsgTv = findViewById(R.id.file_msg_name_tv);
+    }
+
+    @Override
+    public void onDrawReplyQuote(TUIReplyQuoteBean quoteBean) {
+        fileMsgLayout.setVisibility(View.VISIBLE);
+        if (quoteBean instanceof FileReplyQuoteBean) {
+            fileMsgTv.setText(((FileReplyQuoteBean) quoteBean).getFileName());
+        }
+    }
+
+    @Override
+    public void setSelf(boolean isSelf) {
+        if (!isSelf) {
+            fileMsgTv.setTextColor(fileMsgTv.getResources().getColor(TUIThemeManager.getAttrResId(fileMsgTv.getContext(), R.attr.chat_other_reply_quote_text_color)));
+        } else {
+            fileMsgTv.setTextColor(fileMsgTv.getResources().getColor(TUIThemeManager.getAttrResId(fileMsgTv.getContext(), R.attr.chat_self_reply_quote_text_color)));
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/ImageReplyQuoteView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/ImageReplyQuoteView.java
new file mode 100644
index 0000000..b9f34a5
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/ImageReplyQuoteView.java
@@ -0,0 +1,128 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import androidx.annotation.Nullable;
+
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.request.RequestListener;
+import com.bumptech.glide.request.target.Target;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.util.ImageUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ImageMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ImageReplyQuoteView extends TUIReplyQuoteView {
+    protected View imageMsgLayout;
+    protected ImageView imageMsgIv;
+    protected ImageView videoPlayIv;
+
+    protected static final int DEFAULT_RADIUS = 2;
+    protected final List<String> downloadEles = new ArrayList<>();
+    protected String mImagePath = null;
+
+    public ImageReplyQuoteView(Context context) {
+        super(context);
+        imageMsgLayout = findViewById(R.id.image_msg_layout);
+        imageMsgIv = findViewById(R.id.image_msg_iv);
+        videoPlayIv = findViewById(R.id.video_play_iv);
+    }
+
+    @Override
+    public int getLayoutResourceId() {
+        return R.layout.chat_reply_quote_image_layout;
+    }
+
+    @Override
+    public void onDrawReplyQuote(TUIReplyQuoteBean quoteBean) {
+        ImageMessageBean messageBean = (ImageMessageBean) quoteBean.getMessageBean();
+        imageMsgLayout.setVisibility(View.VISIBLE);
+        imageMsgIv.setLayoutParams(getImageParams(imageMsgIv.getLayoutParams(), messageBean.getImgWidth(), messageBean.getImgHeight()));
+        final List<ImageMessageBean.ImageBean> imgs = messageBean.getImageBeanList();
+        String imagePath = messageBean.getDataPath();
+        String originImagePath = TUIChatUtils.getOriginImagePath(messageBean);
+        if (!TextUtils.isEmpty(originImagePath)) {
+            imagePath = originImagePath;
+        }
+        if (!TextUtils.isEmpty(imagePath)) {
+            GlideEngine.loadCornerImageWithoutPlaceHolder(imageMsgIv, imagePath, null, DEFAULT_RADIUS);
+        } else {
+            GlideEngine.clear(imageMsgIv);
+            for (int i = 0; i < imgs.size(); i++) {
+                final ImageMessageBean.ImageBean img = imgs.get(i);
+                if (img.getType() == ImageMessageBean.IMAGE_TYPE_THUMB) {
+                    synchronized (downloadEles) {
+                        if (downloadEles.contains(img.getUUID())) {
+                            break;
+                        }
+                        downloadEles.add(img.getUUID());
+                    }
+                    final String path = ImageUtil.generateImagePath(img.getUUID(), ImageMessageBean.IMAGE_TYPE_THUMB);
+                    if (!path.equals(mImagePath)) {
+                        GlideEngine.clear(imageMsgIv);
+                    }
+                    img.downloadImage(path, new ImageMessageBean.ImageBean.ImageDownloadCallback() {
+                        @Override
+                        public void onProgress(long currentSize, long totalSize) {
+                            TUIChatLog.i("downloadImage progress current:",
+                                    currentSize + ", total:" + totalSize);
+                        }
+
+                        @Override
+                        public void onError(int code, String desc) {
+                            downloadEles.remove(img.getUUID());
+                            TUIChatLog.e("MessageAdapter img getImage", code + ":" + desc);
+                        }
+
+                        @Override
+                        public void onSuccess() {
+                            downloadEles.remove(img.getUUID());
+                            messageBean.setDataPath(path);
+                            GlideEngine.loadCornerImageWithoutPlaceHolder(imageMsgIv, messageBean.getDataPath(), new RequestListener() {
+                                @Override
+                                public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) {
+                                    mImagePath = null;
+                                    return false;
+                                }
+
+                                @Override
+                                public boolean onResourceReady(Object resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) {
+                                    mImagePath = path;
+                                    return false;
+                                }
+                            }, DEFAULT_RADIUS);
+                        }
+                    });
+                    break;
+                }
+            }
+        }
+    }
+
+    protected ViewGroup.LayoutParams getImageParams(ViewGroup.LayoutParams params, int width, int height) {
+
+        if (width == 0 || height == 0) {
+            return params;
+        }
+        int maxSize = getResources().getDimensionPixelSize(R.dimen.reply_message_image_size);
+        if (width > height) {
+            params.width = maxSize;
+            params.height = maxSize * height / width;
+        } else {
+            params.width = maxSize * width / height;
+            params.height = maxSize;
+        }
+        return params;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/LocationReplyQuoteView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/LocationReplyQuoteView.java
new file mode 100644
index 0000000..2ee623f
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/LocationReplyQuoteView.java
@@ -0,0 +1,21 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply;
+
+import android.content.Context;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+
+public class LocationReplyQuoteView extends TUIReplyQuoteView {
+    @Override
+    public int getLayoutResourceId() {
+        return 0;
+    }
+
+    public LocationReplyQuoteView(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void onDrawReplyQuote(TUIReplyQuoteBean quoteBean) {
+
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/MergeReplyQuoteView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/MergeReplyQuoteView.java
new file mode 100644
index 0000000..bcba190
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/MergeReplyQuoteView.java
@@ -0,0 +1,63 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.MergeMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+
+import java.util.List;
+
+public class MergeReplyQuoteView extends TUIReplyQuoteView {
+    private View mergeMsgLayout;
+    private TextView mergeMsgTitle;
+    private TextView mergeMsgContent;
+    @Override
+    public int getLayoutResourceId() {
+        return R.layout.chat_reply_quote_merge_layout;
+    }
+
+    public MergeReplyQuoteView(Context context) {
+        super(context);
+        mergeMsgLayout = findViewById(R.id.merge_msg_layout);
+        mergeMsgTitle = findViewById(R.id.merge_msg_title);
+        mergeMsgContent = findViewById(R.id.merge_msg_content);
+    }
+
+
+    @Override
+    public void setSelf(boolean isSelf) {
+        if (!isSelf) {
+            mergeMsgContent.setTextColor(mergeMsgContent.getResources().getColor(TUIThemeManager.getAttrResId(mergeMsgContent.getContext(), R.attr.chat_other_reply_quote_text_color)));
+            mergeMsgTitle.setTextColor(mergeMsgTitle.getResources().getColor(TUIThemeManager.getAttrResId(mergeMsgTitle.getContext(), R.attr.chat_other_reply_quote_text_color)));
+        } else {
+            mergeMsgContent.setTextColor(mergeMsgContent.getResources().getColor(TUIThemeManager.getAttrResId(mergeMsgContent.getContext(), R.attr.chat_self_reply_quote_text_color)));
+            mergeMsgTitle.setTextColor(mergeMsgTitle.getResources().getColor(TUIThemeManager.getAttrResId(mergeMsgTitle.getContext(), R.attr.chat_self_reply_quote_text_color)));
+        }
+    }
+
+    @Override
+    public void onDrawReplyQuote(TUIReplyQuoteBean quoteBean) {
+        MergeMessageBean messageBean = (MergeMessageBean) quoteBean.getMessageBean();
+        mergeMsgLayout.setVisibility(View.VISIBLE);
+        String title = messageBean.getTitle();
+        List<String> abstractList= messageBean.getAbstractList();
+        mergeMsgTitle.setText(title);
+        String content = "";
+        for (int i = 0; i < abstractList.size(); i++) {
+            if (i >= 2) {
+                break;
+            }
+            if (i != 0) {
+                content += "\n";
+            }
+            content += abstractList.get(i);
+        }
+        content = FaceManager.emojiJudge(content);
+        mergeMsgContent.setText(content);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/ReplyDetailsView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/ReplyDetailsView.java
new file mode 100644
index 0000000..290200e
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/ReplyDetailsView.java
@@ -0,0 +1,177 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
+import com.tencent.qcloud.tuicore.util.DateTimeUtil;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageRepliesBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.MessageProperties;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.TimeInLineTextLayout;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+public class ReplyDetailsView extends RecyclerView {
+    private ReplyDetailsAdapter adapter;
+    private LinearLayoutManager layoutManager;
+    private FrameLayout translationContentFrameLayout;
+    private LinearLayout translationResultLayout;
+
+    public ReplyDetailsView(@NonNull Context context) {
+        super(context);
+        initView();
+    }
+
+    public ReplyDetailsView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        initView();
+    }
+
+    public ReplyDetailsView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initView();
+    }
+
+    private void initView() {
+        layoutManager = new LinearLayoutManager(getContext());
+        setLayoutManager(layoutManager);
+        adapter = new ReplyDetailsAdapter();
+        setAdapter(adapter);
+    }
+
+    public void setData(Map<MessageRepliesBean.ReplyBean, TUIMessageBean> messageBeanMap) {
+        adapter.setData(messageBeanMap);
+        adapter.notifyDataSetChanged();
+    }
+
+    public class ReplyDetailsAdapter extends Adapter<ReplyDetailsViewHolder> {
+        Map<MessageRepliesBean.ReplyBean, TUIMessageBean> data;
+
+        public void setData(Map<MessageRepliesBean.ReplyBean, TUIMessageBean> messageBeanMap) {
+            this.data = messageBeanMap;
+        }
+
+        @NonNull
+        @Override
+        public ReplyDetailsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.chat_minimalist_reply_details_item_layout, parent, false);
+            translationContentFrameLayout = view.findViewById(R.id.translate_content_fl);
+            LayoutInflater.from(view.getContext()).inflate(R.layout.translation_contant_layout, translationContentFrameLayout);
+            translationResultLayout = translationContentFrameLayout.findViewById(R.id.translate_result_ll);
+            return new ReplyDetailsViewHolder(view);
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull ReplyDetailsViewHolder holder, int position) {
+            List<MessageRepliesBean.ReplyBean> replyBeanList = new ArrayList<>(data.keySet());
+            MessageRepliesBean.ReplyBean replyBean = replyBeanList.get(position);
+            TUIMessageBean messageBean = data.get(replyBean);
+            String messageText;
+            String faceUrl;
+            int translationStatus = TUIMessageBean.MSG_TRANSLATE_STATUS_UNKNOWN;
+            if (messageBean == null) {
+                messageText = replyBean.getMessageAbstract();
+                faceUrl = replyBean.getSenderFaceUrl();
+            } else {
+                translationStatus = messageBean.getTranslationStatus();
+                messageText = messageBean.getExtra();
+                faceUrl = messageBean.getFaceUrl();
+                holder.timeInLineTextLayout.setTimeText(DateTimeUtil.getTimeFormatText(new Date(messageBean.getMessageTime() * 1000)));
+            }
+            Glide.with(holder.itemView.getContext())
+                    .load(faceUrl)
+                    .apply(new RequestOptions().error(com.tencent.qcloud.tuicore.R.drawable.core_default_user_icon_light))
+                    .into(holder.userFaceView);
+            FaceManager.handlerEmojiText(holder.timeInLineTextLayout.getTextView(), messageText, false);
+
+            if (translationStatus == TUIMessageBean.MSG_TRANSLATE_STATUS_SHOWN) {
+                translationContentFrameLayout.setVisibility(View.VISIBLE);
+                translationResultLayout.setVisibility(View.VISIBLE);
+                TextView translationText = translationContentFrameLayout.findViewById(R.id.translate_tv);
+                translationText.setTextSize(TypedValue.COMPLEX_UNIT_PX, translationText.getResources().getDimension(R.dimen.chat_minimalist_message_text_size));
+                if (MessageProperties.getInstance().getChatContextFontSize() != 0) {
+                    translationText.setTextSize(MessageProperties.getInstance().getChatContextFontSize());
+                }
+                FaceManager.handlerEmojiText(translationText, messageBean.getTranslation(), false);
+            } else if (translationStatus == TUIMessageBean.MSG_TRANSLATE_STATUS_LOADING) {
+                translationContentFrameLayout.setVisibility(View.VISIBLE);
+                translationResultLayout.setVisibility(View.GONE);
+            } else {
+                translationContentFrameLayout.setVisibility(View.GONE);
+            }
+
+            optimizeBackgroundAndAvatar(holder, replyBeanList, position);
+        }
+
+        void optimizeBackgroundAndAvatar(ReplyDetailsViewHolder holder, List<MessageRepliesBean.ReplyBean> replyBeanList, int position) {
+            boolean isShowAvatar = true;
+            MessageRepliesBean.ReplyBean nextReplyBean = null;
+            MessageRepliesBean.ReplyBean replyBean = replyBeanList.get(position);
+            if (replyBeanList.size() > position + 1) {
+                nextReplyBean = replyBeanList.get(position + 1);
+            }
+            String sender = replyBean.getMessageSender();
+            if (nextReplyBean != null) {
+                String nextSender = nextReplyBean.getMessageSender();
+                if (TextUtils.equals(sender, nextSender)) {
+                    isShowAvatar = false;
+                }
+            }
+            int horizontalPadding = ScreenUtil.dip2px(36);
+            int verticalPadding = ScreenUtil.dip2px(20f);
+            if (isShowAvatar) {
+                holder.userFaceView.setVisibility(View.VISIBLE);
+                holder.msgContent.setBackgroundResource(R.drawable.chat_message_popup_stroke_border_left);
+            } else {
+                horizontalPadding = ScreenUtil.dip2px(36);
+                verticalPadding = ScreenUtil.dip2px(2);
+                holder.userFaceView.setVisibility(View.INVISIBLE);
+                holder.msgContent.setBackgroundResource(R.drawable.chat_message_popup_stroke_border);
+            }
+            holder.itemView.setPadding(0, 0, horizontalPadding, verticalPadding);
+        }
+
+        @Override
+        public int getItemCount() {
+            if (data == null) {
+                return 0;
+            }
+            return data.size();
+        }
+    }
+
+    static class ReplyDetailsViewHolder extends RecyclerView.ViewHolder {
+        public ImageView userFaceView;
+        public View msgContent;
+        public TimeInLineTextLayout timeInLineTextLayout;
+
+        public ReplyDetailsViewHolder(View itemView) {
+            super(itemView);
+            userFaceView = itemView.findViewById(R.id.user_icon);
+            timeInLineTextLayout = itemView.findViewById(R.id.time_in_line_text);
+            msgContent = itemView.findViewById(R.id.msg_content);
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/ReplyPreviewView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/ReplyPreviewView.java
new file mode 100644
index 0000000..bbce2c9
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/ReplyPreviewView.java
@@ -0,0 +1,162 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.Rect;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
+import com.bumptech.glide.load.resource.bitmap.CircleCrop;
+import com.bumptech.glide.request.RequestOptions;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageRepliesBean;
+
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+public class ReplyPreviewView extends FrameLayout {
+
+    private ImageView firstImg;
+    private ImageView secondImg;
+    private ImageView thirdImg;
+    private TextView replyText;
+
+    private MessageRepliesBean messageRepliesBean;
+
+    public ReplyPreviewView(@NonNull Context context) {
+        super(context);
+        init(context);
+    }
+
+    public ReplyPreviewView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context);
+    }
+
+    public ReplyPreviewView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context);
+    }
+
+    public void setMessageRepliesBean(MessageRepliesBean messageRepliesBean) {
+        this.messageRepliesBean = messageRepliesBean;
+        setView();
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    public ReplyPreviewView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init(context);
+    }
+
+    private void init(Context context) {
+        LayoutInflater.from(context).inflate(R.layout.chat_minimalist_reply_preview_layout, this);
+        firstImg = findViewById(R.id.first_avatar);
+        secondImg = findViewById(R.id.second_avatar);
+        thirdImg = findViewById(R.id.third_avatar);
+        replyText = findViewById(R.id.reply_text);
+    }
+
+    private void setView() {
+        if (messageRepliesBean != null && messageRepliesBean.getRepliesSize() > 0) {
+            setVisibility(VISIBLE);
+            firstImg.setVisibility(GONE);
+            secondImg.setVisibility(GONE);
+            thirdImg.setVisibility(GONE);
+            replyText.setText(getResources().getString(R.string.chat_reply_num, messageRepliesBean.getRepliesSize()));
+            List<MessageRepliesBean.ReplyBean> repliesBeanList = messageRepliesBean.getReplies();
+            List<String> iconList = getReplyUserIconLt(repliesBeanList);
+            if (iconList == null || iconList.isEmpty()) {
+                return;
+            }
+            String firstIconUrl = iconList.get(0);
+            String secondIconUrl = null;
+            String thirdIconUrl = null;
+
+            if (iconList.size() > 1) {
+                secondIconUrl = iconList.get(1);
+            }
+            if (iconList.size() > 2) {
+                thirdIconUrl = iconList.get(2);
+            }
+
+            firstImg.setVisibility(VISIBLE);
+            loadAvatar(firstImg, firstIconUrl);
+            if (secondIconUrl != null) {
+                secondImg.setVisibility(VISIBLE);
+                loadAvatar(secondImg, secondIconUrl);
+            }
+
+            if (iconList.size() == 3 && thirdIconUrl != null) {
+                thirdImg.setVisibility(VISIBLE);
+                loadAvatar(thirdImg, thirdIconUrl);
+            } else if (iconList.size() > 3){
+                thirdImg.setVisibility(VISIBLE);
+                loadAvatar(thirdImg, R.drawable.chat_reply_more_icon);
+            }
+        } else {
+            setVisibility(GONE);
+        }
+    }
+
+    private List<String> getReplyUserIconLt(List<MessageRepliesBean.ReplyBean> repliesBeanList) {
+        Set<String> iconUrlSet = new LinkedHashSet<>();
+        for (MessageRepliesBean.ReplyBean replyBean : repliesBeanList) {
+            iconUrlSet.add(replyBean.getSenderFaceUrl());
+            if (iconUrlSet.size() >= 3) {
+                break;
+            }
+        }
+        return new ArrayList<>(iconUrlSet);
+    }
+
+    private void loadAvatar(ImageView imageView, Object url) {
+        Glide.with(getContext())
+                .load(url)
+                .centerCrop()
+                .apply(new RequestOptions()
+                        .transform(new ReplyRingCircleCrop())
+                        .error(com.tencent.qcloud.tuicore.R.drawable.core_default_user_icon_light))
+                .into(imageView);
+    }
+
+    static class ReplyRingCircleCrop extends CircleCrop {
+        @Override
+        protected Bitmap transform(@NonNull BitmapPool pool, @NonNull Bitmap toTransform, int outWidth, int outHeight) {
+            Bitmap outBitmap = pool.get(outWidth, outHeight, Bitmap.Config.ARGB_8888);
+            int borderWidth = ScreenUtil.dip2px(1);
+            int innerWidth = outWidth - 2 * borderWidth;
+            int innerHeight = outHeight - 2 * borderWidth;
+            Bitmap bitmap = super.transform(pool, toTransform, innerWidth, innerHeight);
+            Canvas canvas = new Canvas(outBitmap);
+            Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);
+            paint.setColor(Color.WHITE);
+            canvas.drawCircle(outWidth / 2, outHeight / 2, innerWidth / 2, paint);
+            paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
+            Rect rect = new Rect(borderWidth, borderWidth, outWidth - borderWidth, outHeight - borderWidth);
+            canvas.drawBitmap(bitmap, null, rect, paint);
+            paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.DST_OVER));
+            canvas.drawCircle(outWidth / 2, outHeight / 2, outWidth / 2, paint);
+            return outBitmap;
+        }
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/SoundReplyQuoteView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/SoundReplyQuoteView.java
new file mode 100644
index 0000000..7e65c40
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/SoundReplyQuoteView.java
@@ -0,0 +1,45 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.SoundReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+
+public class SoundReplyQuoteView extends TUIReplyQuoteView {
+    private View soundMsgLayout;
+    private ImageView soundMsgIcon;
+    private TextView soundMsgTv;
+    public SoundReplyQuoteView(Context context) {
+        super(context);
+        soundMsgLayout = findViewById(R.id.sound_msg_layout);
+        soundMsgIcon = findViewById(R.id.sound_msg_icon_iv);
+        soundMsgTv = findViewById(R.id.sound_msg_time_tv);
+    }
+
+    @Override
+    public int getLayoutResourceId() {
+        return R.layout.chat_reply_quote_sound_layout;
+    }
+
+    @Override
+    public void onDrawReplyQuote(TUIReplyQuoteBean quoteBean) {
+        soundMsgLayout.setVisibility(View.VISIBLE);
+        if (quoteBean instanceof SoundReplyQuoteBean) {
+            soundMsgTv.setText(((SoundReplyQuoteBean) quoteBean).getDuring() + "''");
+        }
+    }
+
+    @Override
+    public void setSelf(boolean isSelf) {
+        if (!isSelf) {
+            soundMsgTv.setTextColor(soundMsgTv.getResources().getColor(TUIThemeManager.getAttrResId(soundMsgTv.getContext(), R.attr.chat_other_reply_quote_text_color)));
+        } else {
+            soundMsgTv.setTextColor(soundMsgTv.getResources().getColor(TUIThemeManager.getAttrResId(soundMsgTv.getContext(), R.attr.chat_self_reply_quote_text_color)));
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/TUIReplyQuoteView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/TUIReplyQuoteView.java
new file mode 100644
index 0000000..741c73b
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/TUIReplyQuoteView.java
@@ -0,0 +1,32 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.widget.FrameLayout;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+
+public abstract class TUIReplyQuoteView extends FrameLayout {
+
+    public abstract int getLayoutResourceId();
+
+    public TUIReplyQuoteView(Context context) {
+        super(context);
+        int resId = getLayoutResourceId();
+        if (resId != 0) {
+            LayoutInflater.from(context).inflate(resId, this, true);
+        }
+    }
+
+    public abstract void onDrawReplyQuote(TUIReplyQuoteBean quoteBean);
+
+    /**
+     * 原始消息发送者是否为自己 ， 用于不同 UI 展示
+     * 
+     * Whether the original message sender is himself, used for different UI displays
+     * 
+     * @param isSelf
+     */
+    public void setSelf(boolean isSelf) {}
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/TextReplyQuoteView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/TextReplyQuoteView.java
new file mode 100644
index 0000000..4282271
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/TextReplyQuoteView.java
@@ -0,0 +1,41 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply;
+
+import android.content.Context;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TextReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+
+public class TextReplyQuoteView extends TUIReplyQuoteView {
+    protected TextView textView;
+    @Override
+    public int getLayoutResourceId() {
+        return R.layout.chat_reply_quote_text_layout;
+    }
+
+    public TextReplyQuoteView(Context context) {
+        super(context);
+        textView = findViewById(R.id.text_quote_tv);
+    }
+
+    @Override
+    public void setSelf(boolean isSelf) {
+        if (!isSelf) {
+            textView.setTextColor(textView.getResources().getColor(TUIThemeManager.getAttrResId(textView.getContext(), R.attr.chat_other_reply_quote_text_color)));
+        } else {
+            textView.setTextColor(textView.getResources().getColor(TUIThemeManager.getAttrResId(textView.getContext(), R.attr.chat_self_reply_quote_text_color)));
+        }
+    }
+
+    @Override
+    public void onDrawReplyQuote(TUIReplyQuoteBean quoteBean) {
+        if (quoteBean instanceof TextReplyQuoteBean) {
+            String text = ((TextReplyQuoteBean) quoteBean).getText();
+            FaceManager.handlerEmojiText(textView, text, false);
+        }
+
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/VideoReplyQuoteView.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/VideoReplyQuoteView.java
new file mode 100644
index 0000000..8ad7153
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/reply/VideoReplyQuoteView.java
@@ -0,0 +1,61 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.VideoMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+public class VideoReplyQuoteView extends ImageReplyQuoteView {
+
+    public VideoReplyQuoteView(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void onDrawReplyQuote(TUIReplyQuoteBean quoteBean) {
+        VideoMessageBean messageBean = (VideoMessageBean) quoteBean.getMessageBean();
+
+        ViewGroup.LayoutParams layoutParams = getImageParams(imageMsgIv.getLayoutParams(), messageBean.getImgWidth(), messageBean.getImgHeight());
+        imageMsgIv.setLayoutParams(layoutParams);
+        videoPlayIv.setLayoutParams(layoutParams);
+        imageMsgLayout.setVisibility(View.VISIBLE);
+        videoPlayIv.setVisibility(View.VISIBLE);
+        if (!TextUtils.isEmpty(messageBean.getDataPath())) {
+            GlideEngine.loadCornerImageWithoutPlaceHolder(imageMsgIv, messageBean.getDataPath(), null, DEFAULT_RADIUS);
+        } else {
+            GlideEngine.clear(imageMsgIv);
+            synchronized (downloadEles) {
+                if (!downloadEles.contains(messageBean.getSnapshotUUID())) {
+                    downloadEles.add(messageBean.getSnapshotUUID());
+                }
+            }
+
+            final String path = TUIConfig.getImageDownloadDir() + messageBean.getSnapshotUUID();
+            messageBean.downloadSnapshot(path, new VideoMessageBean.VideoDownloadCallback() {
+                @Override
+                public void onProgress(long currentSize, long totalSize) {
+                    TUIChatLog.i("downloadSnapshot progress current:", currentSize + ", total:" + totalSize);
+                }
+
+                @Override
+                public void onError(int code, String desc) {
+                    downloadEles.remove(messageBean.getSnapshotUUID());
+                    TUIChatLog.e("MessageAdapter video getImage", code + ":" + desc);
+                }
+
+                @Override
+                public void onSuccess() {
+                    downloadEles.remove(messageBean.getSnapshotUUID());
+                    messageBean.setDataPath(path);
+                    GlideEngine.loadCornerImageWithoutPlaceHolder(imageMsgIv, messageBean.getDataPath(), null, DEFAULT_RADIUS);
+                }
+            });
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/CallingMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/CallingMessageHolder.java
new file mode 100644
index 0000000..57f1eae
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/CallingMessageHolder.java
@@ -0,0 +1,89 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder;
+
+import android.graphics.Color;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ForegroundColorSpan;
+import android.text.style.ImageSpan;
+import android.view.View;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CallingMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+public class CallingMessageHolder extends TextMessageHolder {
+
+    public CallingMessageHolder(View itemView) {
+        super(itemView);
+    }
+
+    @Override
+    public void layoutVariableViews(TUIMessageBean msg, int position) {
+        super.layoutVariableViews(msg, position);
+
+        if (!(msg instanceof CallingMessageBean)) {
+            return;
+        }
+        CallingMessageBean callingMessageBean = (CallingMessageBean) msg;
+        SpannableStringBuilder stringBuilder = new SpannableStringBuilder(timeInLineTextLayout.getTextView().getText());
+        int resID = R.drawable.ic_audio_call;
+        if (msg.isSelf()) {
+            if (callingMessageBean.getCallType() == CallingMessageBean.ACTION_ID_AUDIO_CALL) {
+                resID = R.drawable.ic_audio_call;
+            } else if (callingMessageBean.getCallType() == CallingMessageBean.ACTION_ID_VIDEO_CALL) {
+                resID = R.drawable.ic_self_video_call;
+            }
+            appendIcon(false, stringBuilder, resID);
+            timeInLineTextLayout.setText(stringBuilder);
+        } else {
+            if (callingMessageBean.getCallType() == CallingMessageBean.ACTION_ID_AUDIO_CALL) {
+                resID = R.drawable.ic_audio_call;
+            } else if (callingMessageBean.getCallType() == CallingMessageBean.ACTION_ID_VIDEO_CALL) {
+                resID = R.drawable.ic_other_video_call;
+            }
+            appendIcon(true, stringBuilder, resID);
+            timeInLineTextLayout.setText(stringBuilder);
+        }
+
+        if (callingMessageBean.getCallType() == CallingMessageBean.ACTION_ID_AUDIO_CALL ||
+                callingMessageBean.getCallType() == CallingMessageBean.ACTION_ID_VIDEO_CALL) {
+            timeInLineTextLayout.getTextView().setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    if (onItemClickListener != null) {
+                        onItemClickListener.onRecallClick(view, position, msg);
+                    }
+                }
+            });
+            timeInLineTextLayout.getTextView().setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    if (onItemClickListener != null) {
+                        onItemClickListener.onMessageLongClick(msgArea, position, callingMessageBean);
+                    }
+                    return true;
+                }
+            });
+        } else {
+            timeInLineTextLayout.getTextView().setOnLongClickListener(null);
+            timeInLineTextLayout.getTextView().setOnClickListener(null);
+        }
+    }
+
+    private void appendIcon(boolean isStart, SpannableStringBuilder stringBuilder, int resID) {
+        ImageSpan imageSpan;
+        if (isStart) {
+            imageSpan = new ImageSpan(itemView.getContext(), resID);
+            stringBuilder.insert(0, "iconA");
+            stringBuilder.setSpan(new ForegroundColorSpan(Color.TRANSPARENT), "icon".length(), "iconA".length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            stringBuilder.setSpan(imageSpan, 0, "icon".length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        } else {
+            imageSpan = new ImageSpan(itemView.getContext(), resID);
+            stringBuilder.append("Aicon");
+            stringBuilder.setSpan(new ForegroundColorSpan(Color.TRANSPARENT), stringBuilder.length() - "Aicon".length(), stringBuilder.length() - "icon".length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            stringBuilder.setSpan(imageSpan, stringBuilder.length() - "icon".length(), stringBuilder.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/CustomEvaluationMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/CustomEvaluationMessageHolder.java
new file mode 100644
index 0000000..dd46dba
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/CustomEvaluationMessageHolder.java
@@ -0,0 +1,43 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder;
+
+import android.view.LayoutInflater;
+import android.view.View;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CustomEvaluationMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.databinding.MessageAdapterContentEvaluationBinding;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+public class CustomEvaluationMessageHolder extends MessageContentHolder {
+    MessageAdapterContentEvaluationBinding mBinding;
+    public CustomEvaluationMessageHolder(View itemView) {
+        super(itemView);
+    }
+
+    public static final String TAG = com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.viewholder.CustomEvaluationMessageHolder.class.getSimpleName();
+
+    @Override
+    public int getVariableLayout() {
+        mBinding = MessageAdapterContentEvaluationBinding.inflate(LayoutInflater.from(itemView.getContext()), msgContentFrame, true);
+        return 0;
+    }
+
+    @Override
+    public void layoutVariableViews(TUIMessageBean msg, int position) {
+        float score = 0;
+        String content = "";
+        if (msg instanceof CustomEvaluationMessageBean) {
+            score = ((CustomEvaluationMessageBean) msg).getScore();
+            content = ((CustomEvaluationMessageBean) msg).getContent();
+        }
+//        msgContentFrame.setClickable(true);
+        if (score == 0) {
+            mBinding.ratingbarScore.setVisibility(View.GONE);
+        } else {
+            mBinding.ratingbarScore.setRating(score);
+            mBinding.ratingbarScore.setIsIndicator(true);
+        }
+        TUIChatLog.d(TAG, "score = " + score);
+        mBinding.tvContent.setText(content);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/CustomLinkMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/CustomLinkMessageHolder.java
new file mode 100644
index 0000000..f50af60
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/CustomLinkMessageHolder.java
@@ -0,0 +1,66 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.view.View;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CustomLinkMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+
+public class CustomLinkMessageHolder extends MessageContentHolder {
+    private TextView textView;
+    private TextView linkView;
+
+    public CustomLinkMessageHolder(View itemView) {
+        super(itemView);
+        textView = itemView.findViewById(R.id.test_custom_message_tv);
+        linkView = itemView.findViewById(R.id.link_tv);
+        timeInLineTextLayout = itemView.findViewById(R.id.time_in_line_text);
+    }
+
+    public static final String TAG = CustomLinkMessageHolder.class.getSimpleName();
+
+    @Override
+    public int getVariableLayout() {
+        return R.layout.test_custom_message_layout1;
+    }
+
+    @Override
+    public void layoutVariableViews(TUIMessageBean msg, int position) {
+        String text = "";
+        String link = "";
+        if (msg instanceof CustomLinkMessageBean) {
+            text = ((CustomLinkMessageBean) msg).getText();
+            link = ((CustomLinkMessageBean) msg).getLink();
+        }
+
+        if (!msg.isSelf()) {
+            textView.setTextColor(textView.getResources().getColor(TUIThemeManager.getAttrResId(textView.getContext(), R.attr.chat_other_custom_msg_text_color)));
+            linkView.setTextColor(textView.getResources().getColor(TUIThemeManager.getAttrResId(textView.getContext(), R.attr.chat_other_custom_msg_link_color)));
+        } else {
+            textView.setTextColor(textView.getResources().getColor(TUIThemeManager.getAttrResId(textView.getContext(), R.attr.chat_self_custom_msg_text_color)));
+            linkView.setTextColor(textView.getResources().getColor(TUIThemeManager.getAttrResId(textView.getContext(), R.attr.chat_self_custom_msg_link_color)));
+        }
+
+        textView.setText(text);
+        msgContentFrame.setClickable(true);
+        String finalLink = link;
+        msgContentFrame.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent();
+                intent.setAction("android.intent.action.VIEW");
+                Uri content_url = Uri.parse(finalLink);
+                intent.setData(content_url);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                TUIChatService.getAppContext().startActivity(intent);
+            }
+        });
+
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/CustomOrderMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/CustomOrderMessageHolder.java
new file mode 100644
index 0000000..f2cf39a
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/CustomOrderMessageHolder.java
@@ -0,0 +1,89 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.request.RequestListener;
+import com.bumptech.glide.request.target.Target;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CustomOrderMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+public class CustomOrderMessageHolder extends MessageContentHolder {
+    private ImageView imageView;
+    private TextView titleView;
+    private TextView contentView;
+    private TextView priceView;
+
+    public CustomOrderMessageHolder(View itemView) {
+        super(itemView);
+        imageView = itemView.findViewById(R.id.content_image_iv);
+        titleView = itemView.findViewById(R.id.order_title);
+        contentView = itemView.findViewById(R.id.order_description);
+        priceView = itemView.findViewById(R.id.order_price);
+    }
+
+    public static final String TAG = CustomOrderMessageHolder.class.getSimpleName();
+
+    @Override
+    public int getVariableLayout() {
+        return R.layout.custom_order_message_layout;
+    }
+
+    @Override
+    public void layoutVariableViews(TUIMessageBean msg, int position) {
+        String title = "";
+        String content = "";
+        String price = "";
+        String link = "";
+        String imageUrl = "";
+        if (msg instanceof CustomOrderMessageBean) {
+            title = ((CustomOrderMessageBean) msg).getTitle();
+            content = ((CustomOrderMessageBean) msg).getDescription();
+            price = ((CustomOrderMessageBean) msg).getPrice();
+            link = ((CustomOrderMessageBean) msg).getLink();
+            imageUrl = ((CustomOrderMessageBean) msg).getImageUrl();
+        }
+
+        GlideEngine.loadCornerImageWithoutPlaceHolder(imageView, imageUrl, new RequestListener() {
+            @Override
+            public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) {
+                TUIChatLog.e(TAG,"onLoadFailed e=" + e);
+                return false;
+            }
+
+            @Override
+            public boolean onResourceReady(Object resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) {
+                return false;
+            }
+        }, ScreenUtil.dip2px(4));
+
+        titleView.setText(title);
+        contentView.setText(content);
+        priceView.setText(price);
+        msgContentFrame.setClickable(true);
+        String finalLink = link;
+        msgContentFrame.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent();
+                intent.setAction("android.intent.action.VIEW");
+                Uri content_url = Uri.parse(finalLink);
+                intent.setData(content_url);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                TUIChatService.getAppContext().startActivity(intent);
+            }
+        });
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/FaceMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/FaceMessageHolder.java
new file mode 100644
index 0000000..7055a64
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/FaceMessageHolder.java
@@ -0,0 +1,74 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder;
+
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.FaceMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+
+public class FaceMessageHolder extends MessageContentHolder {
+    private static final int DEFAULT_FACE_MAX_SIZE = 80; // dp
+
+    private final ImageView contentImage;
+    private final LinearLayout faceLayout;
+
+    public FaceMessageHolder(View itemView) {
+        super(itemView);
+        contentImage = itemView.findViewById(R.id.face_image);
+        timeInLineTextLayout = itemView.findViewById(R.id.time_in_line_text);
+        faceLayout = itemView.findViewById(R.id.face_message_content_layout);
+    }
+
+    @Override
+    public int getVariableLayout() {
+        return R.layout.minimalist_face_message_content_layout;
+    }
+
+    @Override
+    public void layoutVariableViews(TUIMessageBean msg, int position) {
+        performCustomFace((FaceMessageBean) msg);
+    }
+
+    private void performCustomFace(final FaceMessageBean msg) {
+        int defaultFaceSize = ScreenUtil.dip2px(DEFAULT_FACE_MAX_SIZE);
+        LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        params.width = defaultFaceSize;
+        params.height = defaultFaceSize;
+        contentImage.setLayoutParams(params);
+        String faceKey = null;
+        if (msg.getData() != null) {
+            faceKey = new String(msg.getData());
+        }
+        FaceManager.loadFace(msg.getIndex(), faceKey, contentImage);
+    }
+
+    @Override
+    protected void setGravity(boolean isStart) {
+        faceLayout.setGravity(Gravity.END);
+    }
+
+    @Override
+    public void setHighLightBackground(int color) {
+        Drawable drawable = contentImage.getDrawable();
+        if (drawable != null) {
+            drawable.setColorFilter(color, PorterDuff.Mode.SRC_OVER);
+        }
+    }
+
+    @Override
+    public void clearHighLightBackground() {
+        Drawable drawable = contentImage.getDrawable();
+        if (drawable != null) {
+            drawable.setColorFilter(null);
+        }
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/FileMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/FileMessageHolder.java
new file mode 100644
index 0000000..d6dcd8e
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/FileMessageHolder.java
@@ -0,0 +1,217 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder;
+
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.util.FileUtil;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.FileMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.component.progress.ProgressPresenter;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.NetworkConnectionListener;
+
+public class FileMessageHolder extends MessageContentHolder {
+
+    private TextView fileNameText;
+    private TextView fileSizeText;
+    private View fileContent;
+
+    private ProgressPresenter.ProgressListener progressListener;
+    private NetworkConnectionListener networkConnectionListener;
+
+    private Drawable normalBackground;
+    private Drawable fileContentBackground;
+    private String msgId;
+
+    public FileMessageHolder(View itemView) {
+        super(itemView);
+        fileNameText = itemView.findViewById(R.id.file_name_tv);
+        fileSizeText = itemView.findViewById(R.id.file_size_tv);
+        fileContent = itemView.findViewById(R.id.file_content);
+        timeInLineTextLayout = itemView.findViewById(R.id.file_msg_time_in_line_text);
+    }
+
+    @Override
+    public int getVariableLayout() {
+        return R.layout.minimalist_message_adapter_content_file;
+    }
+
+    @Override
+    public void layoutVariableViews(final TUIMessageBean msg, final int position) {
+        msgArea.setPadding(0, 0, 0, 0);
+        msgId = msg.getId();
+        if (isForwardMode || isMessageDetailMode) {
+            fileStatusImage.setVisibility(View.GONE);
+        }
+        normalBackground = msgArea.getBackground();
+        fileContentBackground = fileContent.getBackground();
+
+        progressListener = new ProgressPresenter.ProgressListener() {
+            @Override
+            public void onProgress(int progress) {
+                updateProgress(progress, (FileMessageBean) msg);
+            }
+        };
+
+        FileMessageBean message = (FileMessageBean) msg;
+        final String path = message.getDataPath();
+        fileNameText.setText(message.getFileName());
+        String size = FileUtil.formatFileSize(message.getFileSize());
+        final String fileName = message.getFileName();
+        fileSizeText.setText(size);
+        if (!isMultiSelectMode) {
+            msgContentFrame.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (message.getDownloadStatus() == TUIMessageBean.MSG_STATUS_DOWNLOADED) {
+                        FileUtil.openFile(path, fileName);
+                    }
+                }
+            });
+        } else {
+            msgContentFrame.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (onItemClickListener != null) {
+                        onItemClickListener.onMessageClick(v, position, msg);
+                    }
+                }
+            });
+        }
+
+        if (message.getStatus() == TUIMessageBean.MSG_STATUS_SEND_SUCCESS
+                && message.getDownloadStatus() == FileMessageBean.MSG_STATUS_DOWNLOADED) {
+            fileStatusImage.setVisibility(View.GONE);
+
+        } else if (message.getStatus() == TUIMessageBean.MSG_STATUS_SENDING) {
+        } else if (message.getStatus() == TUIMessageBean.MSG_STATUS_SEND_FAIL) {
+        } else {
+            if (message.getDownloadStatus() == TUIMessageBean.MSG_STATUS_DOWNLOADING) {
+                fileStatusImage.setVisibility(View.GONE);
+            } else if (message.getDownloadStatus() == TUIMessageBean.MSG_STATUS_DOWNLOADED) {
+                fileStatusImage.setVisibility(View.GONE);
+            } else if (message.getDownloadStatus() == TUIMessageBean.MSG_STATUS_UN_DOWNLOAD) {
+                fileStatusImage.setImageResource(R.drawable.chat_minimalist_file_download_icon);
+                fileStatusImage.setVisibility(View.VISIBLE);
+            }
+        }
+
+        if (message.getDownloadStatus() == TUIMessageBean.MSG_STATUS_UN_DOWNLOAD) {
+            if (isMultiSelectMode) {
+                return;
+            }
+            msgContentFrame.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    downloadFile(message, path, fileName, true);
+                }
+            });
+            fileStatusImage.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    downloadFile(message, path, fileName, true);
+                }
+            });
+        }
+        networkConnectionListener = new NetworkConnectionListener() {
+            @Override
+            public void onConnected() {
+                if (message.getDownloadStatus() == FileMessageBean.MSG_STATUS_DOWNLOADING) {
+                    downloadFile(message, path, fileName, false);
+                }
+            }
+        };
+        TUIChatService.getInstance().registerNetworkListener(networkConnectionListener);
+        ProgressPresenter.getInstance().registerProgressListener(msg.getId(), progressListener);
+    }
+
+    private void downloadFile(FileMessageBean message, String path, String fileName, boolean isUserClick) {
+        if (message.getDownloadStatus() == TUIMessageBean.MSG_STATUS_DOWNLOADED) {
+            return;
+        }
+
+        if (message.getDownloadStatus() == TUIMessageBean.MSG_STATUS_DOWNLOADING && isUserClick) {
+            return;
+        }
+
+        fileStatusImage.setVisibility(View.GONE);
+
+        message.setDownloadStatus(TUIMessageBean.MSG_STATUS_DOWNLOADING);
+        message.downloadFile(path, new FileMessageBean.FileDownloadCallback() {
+            @Override
+            public void onProgress(long currentSize, long totalSize) {
+                int progress = (int) (currentSize * 100 / totalSize);
+                ProgressPresenter.getInstance().updateProgress(message.getId(), progress);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                ToastUtil.toastLongMessage("download file failed:" + code + "=" + desc);
+                fileStatusImage.setImageResource(R.drawable.chat_minimalist_file_download_icon);
+                fileStatusImage.setVisibility(View.VISIBLE);
+            }
+
+            @Override
+            public void onSuccess() {
+                message.setDataPath(path);
+                message.setDownloadStatus(TUIMessageBean.MSG_STATUS_DOWNLOADED);
+                msgContentFrame.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        if (message.getDownloadStatus() == TUIMessageBean.MSG_STATUS_DOWNLOADED) {
+                            FileUtil.openFile(path, fileName);
+                        }
+                    }
+                });
+            }
+        });
+    }
+
+    private void updateProgress(int progress, FileMessageBean msg) {
+        if (!TextUtils.equals(msg.getId(), msgId)) {
+            return;
+        }
+
+        msg.setDownloadStatus(TUIMessageBean.MSG_STATUS_DOWNLOADING);
+        if (progress == 0 || progress == 100) {
+            if (progress == 100) {
+                String size = FileUtil.formatFileSize(msg.getFileSize());
+                fileSizeText.setText(size);
+                msg.setDownloadStatus(TUIMessageBean.MSG_STATUS_DOWNLOADED);
+            }
+        } else {
+            fileSizeText.setText(progress + "%");
+        }
+    }
+
+    @Override
+    public void setHighLightBackground(int color) {
+        if (normalBackground != null) {
+            normalBackground.setColorFilter(color, PorterDuff.Mode.SRC_IN);
+        }
+        if (fileContentBackground != null) {
+            fileContentBackground.setColorFilter(color, PorterDuff.Mode.SRC_OVER);
+        }
+    }
+    
+    @Override
+    public void clearHighLightBackground() {
+        if (normalBackground != null) {
+            normalBackground.setColorFilter(null);
+        }
+        if (fileContentBackground != null) {
+            fileContentBackground.setColorFilter(null);
+        }
+    }
+
+    @Override
+    public void onRecycled() {
+        ProgressPresenter.getInstance().unregisterProgressListener(msgId, progressListener);
+        progressListener = null;
+    }
+}
\ No newline at end of file
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/ImageMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/ImageMessageHolder.java
new file mode 100644
index 0000000..d5dd559
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/ImageMessageHolder.java
@@ -0,0 +1,216 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder;
+
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+
+import android.content.Intent;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import androidx.annotation.Nullable;
+
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.request.RequestListener;
+import com.bumptech.glide.request.target.Target;
+import com.tencent.qcloud.tuicore.component.RoundCornerImageView;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.util.ImageUtil;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ImageMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.component.imagevideoscan.ImageVideoScanActivity;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ImageMessageHolder extends MessageContentHolder {
+
+    protected static final int DEFAULT_MAX_SIZE = 540;
+    protected static final int DEFAULT_RADIUS = 0;
+    protected final List<String> downloadEles = new ArrayList<>();
+    public RoundCornerImageView contentImage;
+    protected ImageView videoPlayBtn;
+    private String mImagePath = null;
+
+    public ImageMessageHolder(View itemView) {
+        super(itemView);
+        contentImage = itemView.findViewById(R.id.content_image_iv);
+        videoPlayBtn = itemView.findViewById(R.id.video_play_btn);
+        timeInLineTextLayout = itemView.findViewById(R.id.image_msg_time_in_line_text);
+        timeInLineTextLayout.setTimeColor(0xFFFFFFFF);
+    }
+
+    @Override
+    public int getVariableLayout() {
+        return R.layout.minimalist_message_adapter_content_image;
+    }
+
+    @Override
+    public void layoutVariableViews(TUIMessageBean msg, int position) {
+        performImage((ImageMessageBean) msg, position);
+    }
+
+    private ViewGroup.LayoutParams getImageParams(ViewGroup.LayoutParams params, final ImageMessageBean msg) {
+        if (msg.getImgWidth() == 0 || msg.getImgHeight() == 0) {
+            params.width = DEFAULT_MAX_SIZE;
+            params.height = DEFAULT_MAX_SIZE;
+            return params;
+        }
+        if (msg.getImgWidth() > msg.getImgHeight()) {
+            params.width = DEFAULT_MAX_SIZE;
+            params.height = DEFAULT_MAX_SIZE * msg.getImgHeight() / msg.getImgWidth();
+        } else {
+            params.width = DEFAULT_MAX_SIZE * msg.getImgWidth() / msg.getImgHeight();
+            params.height = DEFAULT_MAX_SIZE;
+        }
+        return params;
+    }
+
+    private void performImage(final ImageMessageBean msg, final int position) {
+        contentImage.setLayoutParams(getImageParams(contentImage.getLayoutParams(), msg));
+        videoPlayBtn.setVisibility(View.GONE);
+
+        final List<ImageMessageBean.ImageBean> imgs = msg.getImageBeanList();
+        String imagePath = msg.getDataPath();
+        String originImagePath = TUIChatUtils.getOriginImagePath(msg);
+        if (!TextUtils.isEmpty(originImagePath)) {
+            imagePath = originImagePath;
+        }
+        if (!TextUtils.isEmpty(imagePath)) {
+            GlideEngine.loadCornerImageWithoutPlaceHolder(contentImage, imagePath, null, DEFAULT_RADIUS);
+        } else {
+            GlideEngine.clear(contentImage);
+            for (int i = 0; i < imgs.size(); i++) {
+                final ImageMessageBean.ImageBean img = imgs.get(i);
+                if (img.getType() == ImageMessageBean.IMAGE_TYPE_THUMB) {
+                    synchronized (downloadEles) {
+                        if (downloadEles.contains(img.getUUID())) {
+                            break;
+                        }
+                        downloadEles.add(img.getUUID());
+                    }
+                    final String path = ImageUtil.generateImagePath(img.getUUID(), ImageMessageBean.IMAGE_TYPE_THUMB);
+                    if (!path.equals(mImagePath)) {
+                        GlideEngine.clear(contentImage);
+                    }
+                    img.downloadImage(path, new ImageMessageBean.ImageBean.ImageDownloadCallback() {
+                        @Override
+                        public void onProgress(long currentSize, long totalSize) {
+                            TUIChatLog.i("downloadImage progress current:",
+                                    currentSize + ", total:" + totalSize);
+                        }
+
+                        @Override
+                        public void onError(int code, String desc) {
+                            downloadEles.remove(img.getUUID());
+                            TUIChatLog.e("MessageAdapter img getImage", code + ":" + desc);
+                        }
+
+                        @Override
+                        public void onSuccess() {
+                            downloadEles.remove(img.getUUID());
+                            msg.setDataPath(path);
+                            GlideEngine.loadCornerImageWithoutPlaceHolder(contentImage, msg.getDataPath(), new RequestListener() {
+                                @Override
+                                public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) {
+                                    mImagePath = null;
+                                    return false;
+                                }
+
+                                @Override
+                                public boolean onResourceReady(Object resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) {
+                                    mImagePath = path;
+                                    return false;
+                                }
+                            }, DEFAULT_RADIUS);
+                        }
+                    });
+                    break;
+                }
+            }
+        }
+        if (isMultiSelectMode) {
+            contentImage.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (onItemClickListener != null) {
+                        onItemClickListener.onMessageClick(v, position, msg);
+                    }
+                }
+            });
+        } else {
+            contentImage.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Intent intent = new Intent(TUIChatService.getAppContext(), ImageVideoScanActivity.class);
+                    intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
+                    if (isForwardMode) {
+                        if (getDataSource() != null && !getDataSource().isEmpty()) {
+                            intent.putExtra(TUIChatConstants.OPEN_MESSAGES_SCAN_FORWARD, (Serializable) getDataSource());
+                        }
+                    }
+
+                    intent.putExtra(TUIChatConstants.OPEN_MESSAGE_SCAN, msg);
+                    intent.putExtra(TUIChatConstants.FORWARD_MODE, isForwardMode);
+                    TUIChatService.getAppContext().startActivity(intent);
+                }
+            });
+            contentImage.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View view) {
+                    if (onItemClickListener != null) {
+                        onItemClickListener.onMessageLongClick(msgArea, position, msg);
+                    }
+                    return true;
+                }
+            });
+        }
+        setImagePadding(msg);
+    }
+
+    protected void setImagePadding(TUIMessageBean messageBean) {
+        int padding = ScreenUtil.dip2px(1);
+        msgArea.setPadding(padding, padding, padding, padding);
+    }
+
+    @Override
+    protected void optimizeMessageContent(boolean isShowAvatar) {
+        if (!isShowAvatar) {
+            contentImage.setRadius(ScreenUtil.dip2px(16));
+        } else {
+            if (isShowStart) {
+                contentImage.setRadius(ScreenUtil.dip2px(16));
+                contentImage.setLeftBottomRadius(0);
+            } else {
+                contentImage.setRadius(ScreenUtil.dip2px(16));
+                contentImage.setRightBottomRadius(0);
+            }
+        }
+    }
+
+    @Override
+    public void setHighLightBackground(int color) {
+        Drawable drawable = contentImage.getDrawable();
+        if (drawable != null) {
+            drawable.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
+        }
+    }
+
+    @Override
+    public void clearHighLightBackground() {
+        Drawable drawable = contentImage.getDrawable();
+        if (drawable != null) {
+            drawable.setColorFilter(null);
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/LocationMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/LocationMessageHolder.java
new file mode 100644
index 0000000..2f530bf
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/LocationMessageHolder.java
@@ -0,0 +1,23 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder;
+
+import android.view.View;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+public class LocationMessageHolder extends MessageContentHolder {
+
+    public LocationMessageHolder(View itemView) {
+        super(itemView);
+    }
+
+    @Override
+    public int getVariableLayout() {
+        return 0;
+    }
+
+    @Override
+    public void layoutVariableViews(TUIMessageBean msg, int position) {
+
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/MergeMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/MergeMessageHolder.java
new file mode 100644
index 0000000..cb8a2a6
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/MergeMessageHolder.java
@@ -0,0 +1,106 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder;
+
+import android.content.Intent;
+import android.view.View;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.MergeMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.page.TUIForwardChatMinimalistActivity;
+
+import java.util.List;
+
+public class MergeMessageHolder extends MessageContentHolder {
+    private View mForwardMsgLayout;
+    private TextView msgForwardTitle;
+    private TextView msgForwardContent;
+
+    public MergeMessageHolder(View itemView) {
+        super(itemView);
+        mForwardMsgLayout = itemView.findViewById(R.id.forward_msg_layout);
+        msgForwardTitle = itemView.findViewById(R.id.msg_forward_title);
+        msgForwardContent = itemView.findViewById(R.id.msg_forward_content);
+        timeInLineTextLayout = itemView.findViewById(R.id.merge_msg_time_in_line_text);
+        mForwardMsgLayout.setClickable(true);
+    }
+
+    @Override
+    public int getVariableLayout() {
+        return R.layout.minimalist_forward_msg_holder;
+    }
+
+    @Override
+    public void layoutVariableViews(final TUIMessageBean msg, final int position) {
+        if (msg == null){
+            return;
+        }
+        msgArea.setBackgroundResource(R.drawable.chat_minimalist_merge_message_border);
+        if (!isForwardMode && !isMessageDetailMode) {
+            if (msg.isSelf()) {
+                if (properties.getRightBubble() != null && properties.getRightBubble().getConstantState() != null) {
+                    msgArea.setBackground(properties.getRightBubble().getConstantState().newDrawable());
+                }
+            } else {
+                if (properties.getLeftBubble() != null && properties.getLeftBubble().getConstantState() != null) {
+                    msgArea.setBackground(properties.getLeftBubble().getConstantState().newDrawable());
+                }
+            }
+        }
+
+        MergeMessageBean messageBean = (MergeMessageBean) msg;
+        String title = messageBean.getTitle();
+        List<String> abstractList= messageBean.getAbstractList();
+        msgForwardTitle.setText(title);
+        String content = "";
+        for (int i = 0; i < abstractList.size(); i++) {
+            if (i > 0) {
+                content += "\n";
+            }
+            content += abstractList.get(i);
+        }
+        content = FaceManager.emojiJudge(content);
+        msgForwardContent.setText(content);
+
+        if (isMultiSelectMode) {
+            mForwardMsgLayout.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (onItemClickListener != null) {
+                        onItemClickListener.onMessageClick(v, position, messageBean);
+                    }
+                }
+            });
+            return;
+        }
+        if (!isMessageDetailMode) {
+            mForwardMsgLayout.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    if (onItemClickListener != null) {
+                        onItemClickListener.onMessageLongClick(msgArea, position, msg);
+                    }
+                    return true;
+                }
+            });
+
+            mForwardMsgLayout.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    if (presenter == null || presenter.getChatInfo() == null) {
+                        return;
+                    }
+                    Intent intent = new Intent(view.getContext(), TUIForwardChatMinimalistActivity.class);
+                    intent.putExtra(TUIChatConstants.FORWARD_MERGE_MESSAGE_KEY, msg);
+                    intent.putExtra(TUIChatConstants.CHAT_INFO, presenter.getChatInfo());
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    view.getContext().startActivity(intent);
+                }
+            });
+        }
+        setMessageAreaPadding();
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/MessageBaseHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/MessageBaseHolder.java
new file mode 100644
index 0000000..b116c13
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/MessageBaseHolder.java
@@ -0,0 +1,183 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder;
+
+import android.animation.Animator;
+import android.animation.ArgbEvaluator;
+import android.animation.ValueAnimator;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.FrameLayout;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.util.DateTimeUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.component.MessageProperties;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.interfaces.ICommonMessageAdapter;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.interfaces.OnItemClickListener;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply.ChatReactView;
+
+import java.util.Date;
+
+public abstract class MessageBaseHolder extends RecyclerView.ViewHolder {
+    public static final int MSG_TYPE_HEADER_VIEW = -99;
+
+    public ICommonMessageAdapter mAdapter;
+    public MessageProperties properties = MessageProperties.getInstance();
+    protected OnItemClickListener onItemClickListener;
+
+    public FrameLayout msgContentFrame;
+    public LinearLayout msgReplyDetailLayout;
+    public LinearLayout msgArea;
+    public LinearLayout msgAreaAndReply;
+    public ChatReactView reactView;
+    public CheckBox mMutiSelectCheckBox;
+    public View mContentLayout;
+
+    private ValueAnimator highLightAnimator;
+    public TextView chatTimeText;
+
+    protected boolean floatMode = false;
+
+    protected boolean isShowStart = true;
+
+    public MessageBaseHolder(View itemView) {
+        super(itemView);
+        msgContentFrame = itemView.findViewById(R.id.msg_content_fl);
+        msgReplyDetailLayout = itemView.findViewById(R.id.msg_reply_detail_fl);
+        reactView = itemView.findViewById(R.id.reacts_view);
+        msgArea = itemView.findViewById(R.id.msg_area);
+        msgAreaAndReply = itemView.findViewById(R.id.msg_area_and_reply);
+        mMutiSelectCheckBox = itemView.findViewById(R.id.select_checkbox);
+        chatTimeText = itemView.findViewById(R.id.message_top_time_tv);
+        mContentLayout = itemView.findViewById(R.id.message_content_layout);
+        initVariableLayout();
+    }
+
+    public abstract int getVariableLayout();
+
+    private void setVariableLayout(int resId) {
+        if (msgContentFrame.getChildCount() == 0) {
+            View.inflate(itemView.getContext(), resId, msgContentFrame);
+        }
+    }
+
+    private void initVariableLayout() {
+        if (getVariableLayout() != 0) {
+            setVariableLayout(getVariableLayout());
+        }
+    }
+
+    public void setAdapter(ICommonMessageAdapter adapter) {
+        mAdapter = adapter;
+    }
+
+    public void setOnItemClickListener(OnItemClickListener listener) {
+        this.onItemClickListener = listener;
+    }
+
+    public OnItemClickListener getOnItemClickListener() {
+        return this.onItemClickListener;
+    }
+
+    public void layoutViews(final TUIMessageBean msg, final int position) {
+        if (properties.getChatTimeBubble() != null) {
+            chatTimeText.setBackground(properties.getChatTimeBubble());
+        }
+        if (properties.getChatTimeFontColor() != 0) {
+            chatTimeText.setTextColor(properties.getChatTimeFontColor());
+        }
+        if (properties.getChatTimeFontSize() != 0) {
+            chatTimeText.setTextSize(properties.getChatTimeFontSize());
+        }
+
+        if (position > 1) {
+            TUIMessageBean last = mAdapter.getItem(position - 1);
+            if (last != null) {
+                if (msg.getMessageTime() - last.getMessageTime() >= 5 * 60) {
+                    chatTimeText.setVisibility(View.VISIBLE);
+                    chatTimeText.setText(DateTimeUtil.getTimeFormatText(new Date(msg.getMessageTime() * 1000)));
+                } else {
+                    chatTimeText.setVisibility(View.GONE);
+                }
+            }
+        } else {
+            chatTimeText.setVisibility(View.VISIBLE);
+            chatTimeText.setText(DateTimeUtil.getTimeFormatText(new Date(msg.getMessageTime() * 1000)));
+        }
+    }
+
+    public void setFloatMode(boolean floatMode) {
+        this.floatMode = floatMode;
+    }
+
+    public void stopHighLight() {
+        if (highLightAnimator != null) {
+            highLightAnimator.cancel();
+        }
+        clearHighLightBackground();
+    }
+
+    public void startHighLight() {
+        int highLightColorDark = itemView.getResources().getColor(R.color.chat_message_bubble_high_light_dark_color);
+        int highLightColorLight = itemView.getResources().getColor(R.color.chat_message_bubble_high_light_light_color);
+
+        if (highLightAnimator == null) {
+            ArgbEvaluator argbEvaluator = new ArgbEvaluator();
+            highLightAnimator = new ValueAnimator();
+            highLightAnimator.setIntValues(highLightColorDark, highLightColorLight);
+            highLightAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+                @Override
+                public void onAnimationUpdate(ValueAnimator animation) {
+                    Integer color = (Integer) animation.getAnimatedValue();
+                    setHighLightBackground(color);
+                }
+            });
+            highLightAnimator.addListener(new Animator.AnimatorListener() {
+                @Override
+                public void onAnimationStart(Animator animation) {
+
+                }
+
+                @Override
+                public void onAnimationEnd(Animator animation) {
+                    clearHighLightBackground();
+                }
+
+                @Override
+                public void onAnimationCancel(Animator animation) {
+                    clearHighLightBackground();
+                }
+
+                @Override
+                public void onAnimationRepeat(Animator animation) {
+
+                }
+            });
+            highLightAnimator.setEvaluator(argbEvaluator);
+            highLightAnimator.setRepeatCount(3);
+            highLightAnimator.setDuration(250);
+            highLightAnimator.setRepeatMode(ValueAnimator.REVERSE);
+        }
+        highLightAnimator.start();
+    }
+
+    public void setHighLightBackground(int color) {
+        Drawable drawable = msgArea.getBackground();
+        if (drawable != null) {
+            drawable.setColorFilter(color, PorterDuff.Mode.SRC_IN);
+        }
+    }
+
+    public void clearHighLightBackground() {
+        Drawable drawable = msgArea.getBackground();
+        if (drawable != null) {
+            drawable.setColorFilter(null);
+        }
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/MessageContentHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/MessageContentHolder.java
new file mode 100644
index 0000000..c485de9
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/MessageContentHolder.java
@@ -0,0 +1,667 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder;
+
+import android.content.Intent;
+import android.text.TextUtils;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.LinearInterpolator;
+import android.view.animation.RotateAnimation;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuicore.component.gatherimage.UserIconView;
+import com.tencent.qcloud.tuicore.util.DateTimeUtil;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageReactBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageRepliesBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.MergeMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TipsMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+import com.tencent.qcloud.tuikit.tuichat.config.TUIChatConfigs;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.page.MessageDetailMinimalistActivity;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.MinimalistMessageLayout;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.TimeInLineTextLayout;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply.ReplyPreviewView;
+import com.tencent.qcloud.tuikit.tuichat.presenter.ChatPresenter;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public abstract class MessageContentHolder extends MessageBaseHolder {
+
+    protected static final int READ_STATUS_UNREAD = 1;
+    protected static final  int READ_STATUS_PART_READ = 2;
+    protected static final  int READ_STATUS_ALL_READ = 3;
+    protected static final  int READ_STATUS_HIDE = 4;
+    protected static final  int READ_STATUS_SENDING = 5;
+
+    public UserIconView leftUserIcon;
+    public UserIconView rightUserIcon;
+    public TextView usernameText;
+    public LinearLayout msgContentLinear;
+    public ImageView messageStatusImage;
+    public ImageView fileStatusImage;
+    public TextView messageDetailsTimeTv;
+    public LinearLayout extraInfoArea;
+    private FrameLayout translationContentFrameLayout;
+    private ImageView translationLoadingImage;
+    private LinearLayout translationResultLayout;
+    private RotateAnimation translationRotateAnimation;
+
+    public boolean isForwardMode = false;
+    public boolean isMessageDetailMode = false;
+    public boolean isMultiSelectMode = false;
+    public boolean isOptimize = true;
+    public boolean isShowSelfAvatar = false;
+
+    protected TimeInLineTextLayout timeInLineTextLayout;
+    protected MinimalistMessageLayout rootLayout;
+    protected ReplyPreviewView replyPreviewView;
+
+    private List<TUIMessageBean> mDataSource = new ArrayList<>();
+
+    protected ChatPresenter presenter;
+
+    public MessageContentHolder(View itemView) {
+        super(itemView);
+        rootLayout = (MinimalistMessageLayout) itemView;
+        leftUserIcon = itemView.findViewById(R.id.left_user_icon_view);
+        rightUserIcon = itemView.findViewById(R.id.right_user_icon_view);
+        usernameText = itemView.findViewById(R.id.user_name_tv);
+        msgContentLinear = itemView.findViewById(R.id.msg_content_ll);
+        messageStatusImage = itemView.findViewById(R.id.message_status_iv);
+        fileStatusImage = itemView.findViewById(R.id.file_status_iv);
+        messageDetailsTimeTv = itemView.findViewById(R.id.msg_detail_time_tv);
+        replyPreviewView = itemView.findViewById(R.id.msg_reply_preview);
+        extraInfoArea = itemView.findViewById(R.id.extra_info_area);
+        translationContentFrameLayout = itemView.findViewById(R.id.translate_content_fl);
+        LayoutInflater.from(itemView.getContext()).inflate(R.layout.translation_contant_layout, translationContentFrameLayout);
+        translationLoadingImage = translationContentFrameLayout.findViewById(R.id.translate_loading_iv);
+        translationResultLayout = translationContentFrameLayout.findViewById(R.id.translate_result_ll);
+    }
+
+    public void setPresenter(ChatPresenter chatPresenter) {
+        this.presenter = chatPresenter;
+    }
+
+    public void setDataSource(List<TUIMessageBean> dataSource) {
+        if (dataSource == null || dataSource.isEmpty()) {
+            mDataSource = null;
+        }
+
+        List<TUIMessageBean> mediaSource = new ArrayList<>();
+        for(TUIMessageBean messageBean : dataSource) {
+            int type = messageBean.getMsgType();
+            if (type == V2TIMMessage.V2TIM_ELEM_TYPE_IMAGE || type == V2TIMMessage.V2TIM_ELEM_TYPE_VIDEO) {
+                mediaSource.add(messageBean);
+            }
+        }
+        mDataSource = mediaSource;
+    }
+
+    public List<TUIMessageBean> getDataSource() {
+        return mDataSource;
+    }
+
+    @Override
+    public void layoutViews(final TUIMessageBean msg, final int position) {
+        super.layoutViews(msg, position);
+
+        if (isForwardMode || isMessageDetailMode) {
+            isShowStart = true;
+        } else {
+            if (msg.isSelf()) {
+                isShowStart = false;
+            } else {
+                isShowStart = true;
+            }
+        }
+
+        setMessageGravity(msg);
+
+        if (isForwardMode || isMessageDetailMode) {
+            usernameText.setVisibility(View.GONE);
+        } else {
+            if (msg.isSelf()) {
+                if (properties.getRightNameVisibility() == 0) {
+                    usernameText.setVisibility(View.GONE);
+                } else {
+                    usernameText.setVisibility(properties.getRightNameVisibility());
+                }
+            } else {
+                if (properties.getLeftNameVisibility() == 0) {
+                    if (msg.isGroup()) {
+                        usernameText.setVisibility(View.GONE);
+                    } else {
+                        usernameText.setVisibility(View.GONE);
+                    }
+                } else {
+                    usernameText.setVisibility(properties.getLeftNameVisibility());
+                }
+            }
+        }
+        if (properties.getNameFontColor() != 0) {
+            usernameText.setTextColor(properties.getNameFontColor());
+        }
+        if (properties.getNameFontSize() != 0) {
+            usernameText.setTextSize(properties.getNameFontSize());
+        }
+
+        if (!TextUtils.isEmpty(msg.getNameCard())) {
+            usernameText.setText(msg.getNameCard());
+        } else if (!TextUtils.isEmpty(msg.getFriendRemark())) {
+            usernameText.setText(msg.getFriendRemark());
+        } else if (!TextUtils.isEmpty(msg.getNickName())) {
+            usernameText.setText(msg.getNickName());
+        } else {
+            usernameText.setText(msg.getSender());
+        }
+
+        if (isForwardMode || isMessageDetailMode) {
+            msgArea.setBackgroundResource(R.drawable.chat_message_popup_stroke_border_left);
+            messageStatusImage.setVisibility(View.GONE);
+        } else {
+            if (msg.isSelf()) {
+                if (properties.getRightBubble() != null && properties.getRightBubble().getConstantState() != null) {
+                    msgArea.setBackground(properties.getRightBubble().getConstantState().newDrawable());
+                } else {
+                    msgArea.setBackgroundResource(R.drawable.chat_message_popup_fill_border_right);
+                }
+            } else {
+                if (properties.getLeftBubble() != null && properties.getLeftBubble().getConstantState() != null) {
+                    msgArea.setBackground(properties.getLeftBubble().getConstantState().newDrawable());
+                } else {
+                    msgArea.setBackgroundResource(R.drawable.chat_message_popup_stroke_border_left);
+                }
+            }
+
+            if (onItemClickListener != null) {
+                msgContentFrame.setOnLongClickListener(new View.OnLongClickListener() {
+                    @Override
+                    public boolean onLongClick(View v) {
+                        onItemClickListener.onMessageLongClick(msgArea, position, msg);
+                        return true;
+                    }
+                });
+
+                msgArea.setOnLongClickListener(new View.OnLongClickListener() {
+                    @Override
+                    public boolean onLongClick(View v) {
+                        onItemClickListener.onMessageLongClick(msgArea, position, msg);
+                        return true;
+                    }
+                });
+
+                leftUserIcon.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        onItemClickListener.onUserIconClick(view, position, msg);
+                    }
+                });
+                leftUserIcon.setOnLongClickListener(new View.OnLongClickListener() {
+                    @Override
+                    public boolean onLongClick(View view) {
+                        onItemClickListener.onUserIconLongClick(view, position, msg);
+                        return true;
+                    }
+                });
+                rightUserIcon.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        onItemClickListener.onUserIconClick(view, position, msg);
+                    }
+                });
+            }
+
+            if (msg.getStatus() == TUIMessageBean.MSG_STATUS_SEND_FAIL) {
+                messageStatusImage.setVisibility(View.VISIBLE);
+
+                messageStatusImage.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        if (onItemClickListener != null) {
+                            onItemClickListener.onSendFailBtnClick(messageStatusImage, position, msg);
+                        }
+                    }
+                });
+            } else {
+                msgContentFrame.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        if (onItemClickListener != null) {
+                            onItemClickListener.onMessageClick(msgContentFrame, position, msg);
+                        }
+                    }
+                });
+                messageStatusImage.setVisibility(View.GONE);
+            }
+        }
+
+        if (isForwardMode || isMessageDetailMode) {
+            rootLayout.setIsStart(true);
+            msgContentLinear.removeView(msgAreaAndReply);
+            msgContentLinear.addView(msgAreaAndReply);
+        } else {
+            if (msg.isSelf()) {
+                msgContentLinear.removeView(msgAreaAndReply);
+                msgContentLinear.addView(msgAreaAndReply);
+            } else {
+                msgContentLinear.removeView(msgAreaAndReply);
+                msgContentLinear.addView(msgAreaAndReply, 0);
+            }
+        }
+        setGravity(isShowStart);
+        rootLayout.setIsStart(isShowStart);
+
+        msgContentLinear.setVisibility(View.VISIBLE);
+
+        if (!isForwardMode && !isMessageDetailMode) {
+            setTimeInLineStatus(msg);
+            setShowReadStatusClickListener(msg);
+        }
+
+        if (timeInLineTextLayout != null) {
+            timeInLineTextLayout.setTimeText(DateTimeUtil.getHMTimeString(new Date(msg.getMessageTime() * 1000)));
+        }
+
+        extraInfoArea.setVisibility(View.GONE);
+        setReplyContent(msg);
+        setReactContent(msg);
+        if (presenter != null && presenter.isNeedShowTranslation()) {
+            setTranslationContent(msg, position);
+        }
+        setMessageAreaPadding();
+        if (floatMode) {
+            itemView.setPadding(0, 0, 0, 0);
+            leftUserIcon.setVisibility(View.GONE);
+            rightUserIcon.setVisibility(View.GONE);
+            usernameText.setVisibility(View.GONE);
+            messageStatusImage.setVisibility(View.GONE);
+            replyPreviewView.setVisibility(View.GONE);
+            reactView.setVisibility(View.GONE);
+            chatTimeText.setVisibility(View.GONE);
+        }
+        if (isMessageDetailMode) {
+            replyPreviewView.setVisibility(View.GONE);
+        }
+
+        optimizeAvatarAndPadding(position, msg);
+        loadAvatar(msg);
+        layoutVariableViews(msg, position);
+    }
+
+    private void loadAvatar(TUIMessageBean msg) {
+        if (!TextUtils.isEmpty(msg.getFaceUrl())) {
+            List<Object> urllist = new ArrayList<>();
+            urllist.add(msg.getFaceUrl());
+            if (isForwardMode || isMessageDetailMode) {
+                leftUserIcon.setIconUrls(urllist);
+            } else {
+                if (msg.isSelf()) {
+                    rightUserIcon.setIconUrls(urllist);
+                } else {
+                    leftUserIcon.setIconUrls(urllist);
+                }
+            }
+        } else {
+            rightUserIcon.setIconUrls(null);
+            leftUserIcon.setIconUrls(null);
+        }
+        if (isShowSelfAvatar) {
+            rightUserIcon.setVisibility(View.VISIBLE);
+        } else {
+            rightUserIcon.setVisibility(View.GONE);
+        }
+    }
+
+    private void optimizeAvatarAndPadding(int position, TUIMessageBean messageBean) {
+        if (mAdapter == null) {
+            return;
+        }
+        if (isMessageDetailMode || !isOptimize) {
+            return;
+        }
+        TUIMessageBean nextMessage = mAdapter.getItem(position + 1);
+        boolean isShowAvatar = true;
+        boolean isNeedChangedBackground = true;
+        if (nextMessage != null) {
+            if (TextUtils.equals(messageBean.getSender(), nextMessage.getSender())) {
+                boolean longPeriod = nextMessage.getMessageTime() - messageBean.getMessageTime() >= 5 * 60;
+                if (!(nextMessage instanceof TipsMessageBean)
+                        && nextMessage.getStatus() != TUIMessageBean.MSG_STATUS_REVOKE
+                        && !longPeriod) {
+                    isShowAvatar = false;
+                }
+            }
+        }
+        if (messageBean instanceof MergeMessageBean) {
+            isNeedChangedBackground = false;
+        }
+        int horizontalPadding = ScreenUtil.dip2px(16);
+        int verticalPadding = ScreenUtil.dip2px(25f);
+        if (isShowAvatar) {
+            if (isShowStart) {
+                leftUserIcon.setVisibility(View.VISIBLE);
+                rightUserIcon.setVisibility(View.INVISIBLE);
+                if (isNeedChangedBackground) {
+                    msgArea.setBackgroundResource(R.drawable.chat_message_popup_stroke_border_left);
+                }
+            } else {
+                leftUserIcon.setVisibility(View.INVISIBLE);
+                rightUserIcon.setVisibility(View.VISIBLE);
+                if (isNeedChangedBackground) {
+                    msgArea.setBackgroundResource(R.drawable.chat_message_popup_fill_border_right);
+                }
+            }
+        } else {
+            if (isNeedChangedBackground) {
+                if (isShowStart) {
+                    msgArea.setBackgroundResource(R.drawable.chat_message_popup_stroke_border);
+                } else {
+                    msgArea.setBackgroundResource(R.drawable.chat_message_popup_fill_border);
+                }
+            }
+            horizontalPadding = ScreenUtil.dip2px(16);
+            verticalPadding = ScreenUtil.dip2px(2);
+            leftUserIcon.setVisibility(View.INVISIBLE);
+            rightUserIcon.setVisibility(View.INVISIBLE);
+        }
+        rootLayout.setPadding(horizontalPadding, 0, horizontalPadding, verticalPadding);
+        optimizeMessageContent(isShowAvatar);
+    }
+
+    protected void optimizeMessageContent(boolean isShowAvatar) {}
+
+    private void setMessageGravity(TUIMessageBean messageBean) {
+        if (isForwardMode || isMessageDetailMode) {
+            leftUserIcon.setVisibility(View.VISIBLE);
+            rightUserIcon.setVisibility(View.GONE);
+        } else {
+            if (messageBean.isSelf()) {
+                msgContentLinear.setGravity(Gravity.END);
+                leftUserIcon.setVisibility(View.GONE);
+                rightUserIcon.setVisibility(View.VISIBLE);
+                extraInfoArea.setGravity(Gravity.END);
+            } else {
+                msgContentLinear.setGravity(Gravity.START);
+                leftUserIcon.setVisibility(View.VISIBLE);
+                rightUserIcon.setVisibility(View.GONE);
+                extraInfoArea.setGravity(Gravity.START);
+            }
+        }
+        if (properties.getAvatar() != 0) {
+            leftUserIcon.setDefaultImageResId(properties.getAvatar());
+            rightUserIcon.setDefaultImageResId(properties.getAvatar());
+        } else {
+            leftUserIcon.setDefaultImageResId(TUIThemeManager.getAttrResId(leftUserIcon.getContext(), com.tencent.qcloud.tuicore.R.attr.core_default_user_icon));
+            rightUserIcon.setDefaultImageResId(TUIThemeManager.getAttrResId(rightUserIcon.getContext(), com.tencent.qcloud.tuicore.R.attr.core_default_user_icon));
+        }
+        if (properties.getAvatarRadius() != 0) {
+            leftUserIcon.setRadius(properties.getAvatarRadius());
+            rightUserIcon.setRadius(properties.getAvatarRadius());
+        } else {
+            int radius = ScreenUtil.dip2px(4);
+            leftUserIcon.setRadius(radius);
+            rightUserIcon.setRadius(radius);
+        }
+        if (properties.getAvatarSize() != null && properties.getAvatarSize().length == 2) {
+            ViewGroup.LayoutParams params = leftUserIcon.getLayoutParams();
+            params.width = properties.getAvatarSize()[0];
+            params.height = properties.getAvatarSize()[1];
+            leftUserIcon.setLayoutParams(params);
+
+            params = rightUserIcon.getLayoutParams();
+            params.width = properties.getAvatarSize()[0];
+            params.height = properties.getAvatarSize()[1];
+            rightUserIcon.setLayoutParams(params);
+        }
+    }
+
+    private void setTimeInLineStatus(TUIMessageBean msg) {
+        if (TUIChatConfigs.getConfigs().getGeneralConfig().isShowRead()) {
+            if (msg.isSelf()) {
+                if (TUIMessageBean.MSG_STATUS_SEND_SUCCESS == msg.getStatus()) {
+                    if (!msg.isNeedReadReceipt()) {
+                        setReadStatus(READ_STATUS_HIDE);
+                    } else {
+                        processReadStatus(msg);
+                    }
+                } else if (TUIMessageBean.MSG_STATUS_SENDING == msg.getStatus()) {
+                    setReadStatus(READ_STATUS_SENDING);
+                } else {
+                    setReadStatus(READ_STATUS_HIDE);
+                }
+            } else {
+                setReadStatus(READ_STATUS_HIDE);
+            }
+        }
+    }
+
+    protected void setReadStatus(int readStatus) {
+        if (timeInLineTextLayout != null) {
+            int statusIconResID = 0;
+            switch (readStatus) {
+                case READ_STATUS_UNREAD: {
+                    statusIconResID = R.drawable.chat_minimalist_message_status_send_no_read;
+                    break;
+                }
+                case READ_STATUS_PART_READ: {
+                    statusIconResID = R.drawable.chat_minimalist_message_status_send_part_read;
+                    break;
+                }
+                case READ_STATUS_ALL_READ: {
+                    statusIconResID = R.drawable.chat_minimalist_message_status_send_all_read;
+                    break;
+                }
+                case READ_STATUS_SENDING: {
+                    statusIconResID = R.drawable.chat_minimalist_status_loading_anim;
+                    break;
+                }
+                default: {
+                }
+            }
+            timeInLineTextLayout.setStatusIcon(statusIconResID);
+        }
+    }
+
+    protected void setMessageAreaPadding() {
+        // after setting background, the padding will be reset
+        int paddingHorizontal = itemView.getResources().getDimensionPixelSize(R.dimen.chat_minimalist_message_area_padding_left_right);
+        int paddingVertical = itemView.getResources().getDimensionPixelSize(R.dimen.chat_minimalist_message_area_padding_top_bottom);
+        msgArea.setPadding(paddingHorizontal, paddingVertical, paddingHorizontal, paddingVertical);
+    }
+
+    protected void setGravity(boolean isStart) {
+        int gravity = isStart ? Gravity.START : Gravity.END;
+        msgAreaAndReply.setGravity(gravity);
+        ViewGroup.LayoutParams layoutParams = msgContentFrame.getLayoutParams();
+        if (layoutParams instanceof FrameLayout.LayoutParams) {
+            ((FrameLayout.LayoutParams) layoutParams).gravity = gravity;
+        } else if (layoutParams instanceof LinearLayout.LayoutParams) {
+            ((LinearLayout.LayoutParams) layoutParams).gravity = gravity;
+        }
+        msgContentFrame.setLayoutParams(layoutParams);
+    }
+
+    private void setReplyContent(TUIMessageBean messageBean) {
+        MessageRepliesBean messageRepliesBean = messageBean.getMessageRepliesBean();
+        if (messageRepliesBean != null && messageRepliesBean.getRepliesSize() > 0) {
+            extraInfoArea.setVisibility(View.VISIBLE);
+            replyPreviewView.setVisibility(View.VISIBLE);
+            replyPreviewView.setMessageRepliesBean(messageRepliesBean);
+            replyPreviewView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (onItemClickListener != null) {
+                        onItemClickListener.onReplyDetailClick(messageBean);
+                    }
+                }
+            });
+        } else {
+            replyPreviewView.setVisibility(View.GONE);
+        }
+    }
+
+    private void setReactContent(TUIMessageBean messageBean) {
+        MessageReactBean messageReactBean = messageBean.getMessageReactBean();
+        if (messageReactBean != null && messageReactBean.getReactSize() > 0) {
+            reactView.setVisibility(View.VISIBLE);
+            reactView.setData(messageReactBean);
+            reactView.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    if (onItemClickListener != null) {
+                        onItemClickListener.onMessageLongClick(msgArea, 0, messageBean);
+                    }
+                    return true;
+                }
+            });
+
+            reactView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (onItemClickListener != null) {
+                        onItemClickListener.onReactOnClick(null, messageBean);
+                    }
+                }
+            });
+
+            if (isForwardMode) {
+                reactView.setOnLongClickListener(null);
+            }
+        } else {
+            reactView.setVisibility(View.GONE);
+            reactView.setOnLongClickListener(null);
+        }
+    }
+
+    private void processReadStatus(TUIMessageBean msg) {
+        if (msg.isGroup()) {
+            if (msg.isAllRead()) {
+                setReadStatus(READ_STATUS_ALL_READ);
+            } else if (msg.isUnread()) {
+                setReadStatus(READ_STATUS_UNREAD);
+            } else {
+                long readCount = msg.getReadCount();
+                if (readCount > 0) {
+                    setReadStatus(READ_STATUS_PART_READ);
+                }
+            }
+        } else {
+            if (msg.isPeerRead()) {
+                setReadStatus(READ_STATUS_ALL_READ);
+            } else {
+                setReadStatus(READ_STATUS_UNREAD);
+            }
+        }
+    }
+
+    private void setShowReadStatusClickListener(TUIMessageBean messageBean) {
+        if (timeInLineTextLayout != null) {
+            if (messageBean.isSelf()) {
+                timeInLineTextLayout.setOnStatusAreaClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        showMessageDetail(messageBean);
+                    }
+                });
+            } else {
+                timeInLineTextLayout.setOnStatusAreaClickListener(null);
+            }
+            timeInLineTextLayout.setOnStatusAreaLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    if (onItemClickListener != null) {
+                        onItemClickListener.onMessageLongClick(msgArea, 0, messageBean);
+                    }
+                    return true;
+                }
+            });
+
+            timeInLineTextLayout.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    if (onItemClickListener != null) {
+                        onItemClickListener.onMessageLongClick(msgArea, 0, messageBean);
+                    }
+                    return true;
+                }
+            });
+        }
+    }
+
+    public abstract void layoutVariableViews(final TUIMessageBean msg, final int position);
+
+    public void onRecycled() {}
+
+    public void showMessageDetail(TUIMessageBean messageBean) {
+        if (presenter != null) {
+            Intent intent = new Intent(itemView.getContext(), MessageDetailMinimalistActivity.class);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra(TUIChatConstants.MESSAGE_BEAN, messageBean);
+            intent.putExtra(TUIChatConstants.CHAT_INFO, presenter.getChatInfo());
+            itemView.getContext().startActivity(intent);
+        }
+    }
+
+    public void setTranslationContent(TUIMessageBean msg, int position) {
+        int translationStatus = msg.getTranslationStatus();
+        if (translationStatus == TUIMessageBean.MSG_TRANSLATE_STATUS_SHOWN) {
+            extraInfoArea.setVisibility(View.VISIBLE);
+            translationContentFrameLayout.setVisibility(View.VISIBLE);
+            stopTranslationLoading();
+            translationResultLayout.setVisibility(View.VISIBLE);
+            TextView translationText = translationContentFrameLayout.findViewById(R.id.translate_tv);
+            translationText.setTextSize(TypedValue.COMPLEX_UNIT_PX, translationText.getResources().getDimension(R.dimen.chat_minimalist_message_text_size));
+            if (properties.getChatContextFontSize() != 0) {
+                translationText.setTextSize(properties.getChatContextFontSize());
+            }
+            FaceManager.handlerEmojiText(translationText, msg.getTranslation(), false);
+            translationContentFrameLayout.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View view) {
+                    if (onItemClickListener != null) {
+                        onItemClickListener.onTranslationLongClick(view, position, msg);
+                    }
+                    return true;
+                }
+            });
+        } else if (translationStatus == TUIMessageBean.MSG_TRANSLATE_STATUS_LOADING) {
+            extraInfoArea.setVisibility(View.VISIBLE);
+            translationContentFrameLayout.setVisibility(View.VISIBLE);
+            startTranslationLoading();
+            translationResultLayout.setVisibility(View.GONE);
+            translationContentFrameLayout.setOnLongClickListener(null);
+        } else {
+            stopTranslationLoading();
+            translationContentFrameLayout.setVisibility(View.GONE);
+            translationContentFrameLayout.setOnLongClickListener(null);
+        }
+    }
+
+    private void startTranslationLoading() {
+        translationLoadingImage.setVisibility(View.VISIBLE);
+        translationRotateAnimation = new RotateAnimation(0, 360, RotateAnimation.RELATIVE_TO_SELF, 0.5f, RotateAnimation.RELATIVE_TO_SELF, 0.5f);
+        translationRotateAnimation.setRepeatCount(-1);
+        translationRotateAnimation.setDuration(1000);
+        translationRotateAnimation.setInterpolator(new LinearInterpolator());
+        translationLoadingImage.startAnimation(translationRotateAnimation);
+    }
+
+    private void stopTranslationLoading() {
+        translationLoadingImage.clearAnimation();
+        translationLoadingImage.setVisibility(View.GONE);
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/MessageHeaderHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/MessageHeaderHolder.java
new file mode 100644
index 0000000..a5ca440
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/MessageHeaderHolder.java
@@ -0,0 +1,42 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder;
+
+import android.view.View;
+import android.widget.LinearLayout;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+
+public class MessageHeaderHolder extends MessageBaseHolder {
+
+    private boolean mLoading;
+
+    public MessageHeaderHolder(View itemView) {
+        super(itemView);
+    }
+
+    @Override
+    public int getVariableLayout() {
+        return 0;
+    }
+
+    public void setLoadingStatus(boolean loading) {
+        mLoading = loading;
+        layoutViews(null, 0);
+    }
+
+    @Override
+    public void layoutViews(TUIMessageBean msg, int position) {
+        RecyclerView.LayoutParams param = (RecyclerView.LayoutParams) itemView.getLayoutParams();
+        if (mLoading) {
+            param.height = LinearLayout.LayoutParams.WRAP_CONTENT;
+            param.width = LinearLayout.LayoutParams.MATCH_PARENT;
+            itemView.setVisibility(View.VISIBLE);
+        } else {
+            param.height = 0;
+            param.width = 0;
+            itemView.setVisibility(View.GONE);
+        }
+        itemView.setLayoutParams(param);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/MessageViewHolderFactory.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/MessageViewHolderFactory.java
new file mode 100644
index 0000000..9ee6d7c
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/MessageViewHolderFactory.java
@@ -0,0 +1,67 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TipsMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.MinimalistUIService;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.interfaces.ICommonMessageAdapter;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+public class MessageViewHolderFactory {
+
+    public static RecyclerView.ViewHolder getInstance(ViewGroup parent, ICommonMessageAdapter adapter, int viewType) {
+
+        LayoutInflater inflater = LayoutInflater.from(parent.getContext());
+        RecyclerView.ViewHolder holder = null;
+        View view = null;
+
+        if (viewType == MessageBaseHolder.MSG_TYPE_HEADER_VIEW) {
+            view = inflater.inflate(R.layout.loading_progress_bar, parent, false);
+            holder = new MessageHeaderHolder(view);
+            return holder;
+        }
+
+        if (viewType == MinimalistUIService.getInstance().getViewType(TipsMessageBean.class)) {
+            view = inflater.inflate(R.layout.message_adapter_item_empty, parent, false);
+            holder = new TipsMessageHolder(view);
+        } else {
+            view = inflater.inflate(R.layout.minimalist_message_adapter_item_content, parent, false);
+            holder = getViewHolder(view, viewType);
+        }
+
+        if (holder == null) {
+            holder = new TextMessageHolder(view);
+        }
+        ((MessageBaseHolder) holder).setAdapter(adapter);
+
+        return holder;
+    }
+
+    private static RecyclerView.ViewHolder getViewHolder(View view, int viewType) {
+        Class<? extends MessageBaseHolder> messageHolderClazz = MinimalistUIService.getInstance().getMessageViewHolderClass(viewType);;
+        if (messageHolderClazz != null) {
+            Constructor<? extends MessageBaseHolder> constructor;
+            try {
+                constructor = messageHolderClazz.getConstructor(View.class);
+                return constructor.newInstance(view);
+            } catch (NoSuchMethodException e) {
+                e.printStackTrace();
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            } catch (InstantiationException e) {
+                e.printStackTrace();
+            } catch (InvocationTargetException e) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/QuoteMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/QuoteMessageHolder.java
new file mode 100644
index 0000000..cea6c3f
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/QuoteMessageHolder.java
@@ -0,0 +1,327 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder;
+
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.request.RequestListener;
+import com.bumptech.glide.request.target.Target;
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.util.ImageUtil;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ImageMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.QuoteMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.VideoMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.FaceReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.FileReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.ImageReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.MergeReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.SoundReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TextReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.VideoReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageParser;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class QuoteMessageHolder extends TextMessageHolder {
+
+    private final TextView senderNameTv;
+    private FrameLayout quoteContentFrameLayout;
+
+    // text/merge
+    private final FrameLayout textFrame;
+    private final TextView textTv;
+    // image/video/face
+    private final FrameLayout imageFrame;
+    private final ImageView imageIv;
+    private final ImageView playIv;
+    protected final List<String> downloadEles = new ArrayList<>();
+    protected String mImagePath = null;
+    // file
+    private final FrameLayout fileFrame;
+    private final TextView fileNameTv;
+    private final ImageView fileIconIv;
+    // sound
+    private final FrameLayout soundFrame;
+    private final TextView soundTimeTv;
+    private final ImageView soundIconIv;
+
+    public QuoteMessageHolder(View itemView) {
+        super(itemView);
+        quoteContentFrameLayout = itemView.findViewById(R.id.quote_content_fl);
+        quoteContentFrameLayout.setVisibility(View.VISIBLE);
+        LayoutInflater.from(itemView.getContext()).inflate(R.layout.minimalist_quote_message_content_layout, quoteContentFrameLayout);
+        senderNameTv = quoteContentFrameLayout.findViewById(R.id.sender_name_tv);
+
+        textFrame = quoteContentFrameLayout.findViewById(R.id.text_msg_area);
+        textTv = quoteContentFrameLayout.findViewById(R.id.msg_abstract_tv);
+
+        imageFrame = quoteContentFrameLayout.findViewById(R.id.image_video_msg_area);
+        imageIv = quoteContentFrameLayout.findViewById(R.id.msg_image_iv);
+        playIv = quoteContentFrameLayout.findViewById(R.id.msg_play_iv);
+
+        fileFrame = quoteContentFrameLayout.findViewById(R.id.file_msg_area);
+        fileNameTv = quoteContentFrameLayout.findViewById(R.id.file_name_tv);
+        fileIconIv = quoteContentFrameLayout.findViewById(R.id.file_icon_iv);
+
+        soundFrame = quoteContentFrameLayout.findViewById(R.id.sound_msg_area);
+        soundTimeTv = quoteContentFrameLayout.findViewById(R.id.sound_msg_time_tv);
+        soundIconIv = quoteContentFrameLayout.findViewById(R.id.sound_msg_icon_iv);
+    }
+
+    @Override
+    public void layoutVariableViews(TUIMessageBean msg, int position) {
+        extraInfoArea.setVisibility(View.VISIBLE);
+
+        msg.setSelectText(msg.getExtra());
+        QuoteMessageBean quoteMessageBean = (QuoteMessageBean) msg;
+        TUIMessageBean replyContentBean = quoteMessageBean.getContentMessageBean();
+        String replyContent = replyContentBean.getExtra();
+        FaceManager.handlerEmojiText(timeInLineTextLayout.getTextView(), replyContent, false);
+        String senderName = quoteMessageBean.getOriginMsgSender();
+        senderNameTv.setText(senderName + ": ");
+
+        performMsgAbstract(quoteMessageBean);
+
+        msgArea.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                return true;
+            }
+        });
+
+        quoteContentFrameLayout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (onItemClickListener != null) {
+                    onItemClickListener.onReplyMessageClick(view, position, quoteMessageBean);
+                }
+            }
+        });
+        if (isForwardMode || isMessageDetailMode) {
+            return;
+        }
+        if (!TextUtils.isEmpty(replyContent)) {
+            FaceManager.handlerEmojiText(timeInLineTextLayout.getTextView(), replyContent, false);
+        }
+
+        if (floatMode) {
+            quoteContentFrameLayout.setVisibility(View.GONE);
+        }
+
+    }
+
+
+    private void performMsgAbstract(QuoteMessageBean quoteMessageBean) {
+        resetAll();
+        TUIMessageBean originMessage = quoteMessageBean.getOriginMessageBean();
+
+        TUIReplyQuoteBean replyQuoteBean = quoteMessageBean.getReplyQuoteBean();
+        if (originMessage != null) {
+            performQuote(replyQuoteBean, quoteMessageBean);
+        } else {
+            performNotFound(replyQuoteBean, quoteMessageBean);
+        }
+
+    }
+
+    private void resetAll() {
+        textFrame.setVisibility(View.GONE);
+        imageFrame.setVisibility(View.GONE);
+        fileFrame.setVisibility(View.GONE);
+        soundFrame.setVisibility(View.GONE);
+        playIv.setVisibility(View.GONE);
+    }
+
+    private void performNotFound(TUIReplyQuoteBean quoteMessageBean, QuoteMessageBean replyMessageBean) {
+        String typeStr = ChatMessageParser.getMsgTypeStr(quoteMessageBean.getMessageType());
+        String abstractStr = quoteMessageBean.getDefaultAbstract();
+        if (ChatMessageParser.isFileType(quoteMessageBean.getMessageType())) {
+            abstractStr = "";
+        }
+        performTextMessage(typeStr + abstractStr);
+    }
+
+    private void performTextMessage(String text) {
+        textFrame.setVisibility(View.VISIBLE);
+        FaceManager.handlerEmojiText(textTv, text, false);
+    }
+
+    private void performImage(TUIReplyQuoteBean replyQuoteBean) {
+        imageFrame.setVisibility(View.VISIBLE);
+        int imageRadius = ScreenUtil.dip2px(1.92f);
+
+        if (replyQuoteBean instanceof FaceReplyQuoteBean) {
+            FaceReplyQuoteBean faceReplyQuoteBean = (FaceReplyQuoteBean) replyQuoteBean;
+            String faceKey = new String(faceReplyQuoteBean.getData());
+            ViewGroup.LayoutParams params = imageIv.getLayoutParams();
+            if (params != null) {
+                int maxSize = itemView.getResources().getDimensionPixelSize(R.dimen.reply_message_image_size);
+                params.width = maxSize;
+                params.height = maxSize;
+                imageIv.setLayoutParams(params);
+            }
+            FaceManager.loadFace(faceReplyQuoteBean.getIndex(), faceKey, imageIv);
+
+        } else if (replyQuoteBean instanceof ImageReplyQuoteBean) {
+            ImageMessageBean messageBean = (ImageMessageBean) replyQuoteBean.getMessageBean();
+            imageIv.setLayoutParams(getImageParams(imageIv.getLayoutParams(), messageBean.getImgWidth(), messageBean.getImgHeight()));
+            final List<ImageMessageBean.ImageBean> imgs = messageBean.getImageBeanList();
+            String imagePath = messageBean.getDataPath();
+            String originImagePath = TUIChatUtils.getOriginImagePath(messageBean);
+            if (!TextUtils.isEmpty(originImagePath)) {
+                imagePath = originImagePath;
+            }
+            if (!TextUtils.isEmpty(imagePath)) {
+                GlideEngine.loadCornerImageWithoutPlaceHolder(imageIv, imagePath, null, imageRadius);
+            } else {
+                GlideEngine.clear(imageIv);
+                for (int i = 0; i < imgs.size(); i++) {
+                    final ImageMessageBean.ImageBean img = imgs.get(i);
+                    if (img.getType() == ImageMessageBean.IMAGE_TYPE_THUMB) {
+                        synchronized (downloadEles) {
+                            if (downloadEles.contains(img.getUUID())) {
+                                break;
+                            }
+                            downloadEles.add(img.getUUID());
+                        }
+                        final String path = ImageUtil.generateImagePath(img.getUUID(), ImageMessageBean.IMAGE_TYPE_THUMB);
+                        if (!path.equals(mImagePath)) {
+                            GlideEngine.clear(imageIv);
+                        }
+                        img.downloadImage(path, new ImageMessageBean.ImageBean.ImageDownloadCallback() {
+                            @Override
+                            public void onProgress(long currentSize, long totalSize) {
+                                TUIChatLog.i("downloadImage progress current:",
+                                        currentSize + ", total:" + totalSize);
+                            }
+
+                            @Override
+                            public void onError(int code, String desc) {
+                                downloadEles.remove(img.getUUID());
+                                TUIChatLog.e("MessageAdapter img getImage", code + ":" + desc);
+                            }
+
+                            @Override
+                            public void onSuccess() {
+                                downloadEles.remove(img.getUUID());
+                                messageBean.setDataPath(path);
+                                GlideEngine.loadCornerImageWithoutPlaceHolder(imageIv, messageBean.getDataPath(), new RequestListener() {
+                                    @Override
+                                    public boolean onLoadFailed(@Nullable GlideException e, Object model, Target target, boolean isFirstResource) {
+                                        mImagePath = null;
+                                        return false;
+                                    }
+
+                                    @Override
+                                    public boolean onResourceReady(Object resource, Object model, Target target, DataSource dataSource, boolean isFirstResource) {
+                                        mImagePath = path;
+                                        return false;
+                                    }
+                                }, imageRadius);
+                            }
+                        });
+                        break;
+                    }
+                }
+            }
+        } else if (replyQuoteBean instanceof VideoReplyQuoteBean) {
+            VideoMessageBean messageBean = (VideoMessageBean) replyQuoteBean.getMessageBean();
+            ViewGroup.LayoutParams layoutParams = getImageParams(imageIv.getLayoutParams(), messageBean.getImgWidth(), messageBean.getImgHeight());
+            imageIv.setLayoutParams(layoutParams);
+            playIv.setLayoutParams(layoutParams);
+            playIv.setVisibility(View.VISIBLE);
+            if (!TextUtils.isEmpty(messageBean.getDataPath())) {
+                GlideEngine.loadCornerImageWithoutPlaceHolder(imageIv, messageBean.getDataPath(), null, imageRadius);
+            } else {
+                GlideEngine.clear(imageIv);
+                synchronized (downloadEles) {
+                    if (!downloadEles.contains(messageBean.getSnapshotUUID())) {
+                        downloadEles.add(messageBean.getSnapshotUUID());
+                    }
+                }
+
+                final String path = TUIConfig.getImageDownloadDir() + messageBean.getSnapshotUUID();
+                messageBean.downloadSnapshot(path, new VideoMessageBean.VideoDownloadCallback() {
+                    @Override
+                    public void onProgress(long currentSize, long totalSize) {
+                        TUIChatLog.i("downloadSnapshot progress current:", currentSize + ", total:" + totalSize);
+                    }
+
+                    @Override
+                    public void onError(int code, String desc) {
+                        downloadEles.remove(messageBean.getSnapshotUUID());
+                        TUIChatLog.e("MessageAdapter video getImage", code + ":" + desc);
+                    }
+
+                    @Override
+                    public void onSuccess() {
+                        downloadEles.remove(messageBean.getSnapshotUUID());
+                        messageBean.setDataPath(path);
+                        GlideEngine.loadCornerImageWithoutPlaceHolder(imageIv, messageBean.getDataPath(), null, imageRadius);
+                    }
+                });
+            }
+        }
+    }
+
+    protected ViewGroup.LayoutParams getImageParams(ViewGroup.LayoutParams params, int width, int height) {
+        if (width == 0 || height == 0) {
+            return params;
+        }
+        int maxSize = itemView.getResources().getDimensionPixelSize(R.dimen.reply_message_image_size);
+        if (width > height) {
+            params.width = maxSize;
+            params.height = maxSize * height / width;
+        } else {
+            params.width = maxSize * width / height;
+            params.height = maxSize;
+        }
+        return params;
+    }
+
+    private void performFile(FileReplyQuoteBean fileReplyQuoteBean) {
+        fileFrame.setVisibility(View.VISIBLE);
+        fileNameTv.setText(fileReplyQuoteBean.getFileName());
+    }
+
+    private void performSound(SoundReplyQuoteBean soundReplyQuoteBean) {
+        soundFrame.setVisibility(View.VISIBLE);
+        soundTimeTv.setText(soundReplyQuoteBean.getDuring() + "''");
+    }
+
+    private void performQuote(TUIReplyQuoteBean replyQuoteBean, QuoteMessageBean messageBean) {
+        if (replyQuoteBean instanceof TextReplyQuoteBean || replyQuoteBean instanceof MergeReplyQuoteBean) {
+            String text;
+            if (replyQuoteBean instanceof TextReplyQuoteBean) {
+                text = ((TextReplyQuoteBean) replyQuoteBean).getText();
+            } else {
+                text = messageBean.getOriginMsgAbstract();
+            }
+            performTextMessage(text);
+        } else if (replyQuoteBean instanceof FileReplyQuoteBean) {
+            performFile((FileReplyQuoteBean) replyQuoteBean);
+        } else if (replyQuoteBean instanceof SoundReplyQuoteBean) {
+            performSound((SoundReplyQuoteBean) replyQuoteBean);
+        } else if (replyQuoteBean instanceof ImageReplyQuoteBean || replyQuoteBean instanceof VideoReplyQuoteBean
+                || replyQuoteBean instanceof FaceReplyQuoteBean) {
+            performImage(replyQuoteBean);
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/ReplyMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/ReplyMessageHolder.java
new file mode 100644
index 0000000..f690d69
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/ReplyMessageHolder.java
@@ -0,0 +1,143 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ReplyMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TUIReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.reply.TextReplyQuoteBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.MinimalistUIService;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply.TUIReplyQuoteView;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply.TextReplyQuoteView;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageParser;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+public class ReplyMessageHolder extends MessageContentHolder {
+
+    private View originMsgLayout;
+
+    private TextView senderNameTv;
+    private FrameLayout quoteFrameLayout;
+    public ReplyMessageHolder(View itemView) {
+        super(itemView);
+        senderNameTv = itemView.findViewById(R.id.sender_tv);
+        originMsgLayout = itemView.findViewById(R.id.origin_msg_abs_layout);
+        quoteFrameLayout = itemView.findViewById(R.id.quote_frame_layout);
+        timeInLineTextLayout = itemView.findViewById(R.id.time_in_line_text);
+    }
+
+    @Override
+    public int getVariableLayout() {
+        return R.layout.minimalist_message_adapter_content_reply;
+    }
+
+    @Override
+    public void layoutVariableViews(TUIMessageBean msg, int position) {
+        msg.setSelectText(msg.getExtra());
+        timeInLineTextLayout.setTextSize(14);
+        timeInLineTextLayout.setTextColor(0xFF000000);
+        ReplyMessageBean replyMessageBean = (ReplyMessageBean) msg;
+        TUIMessageBean replyContentBean = replyMessageBean.getContentMessageBean();
+        String replyContent = replyContentBean.getExtra();
+        String senderName = replyMessageBean.getOriginMsgSender();
+        senderNameTv.setText(senderName + ":");
+
+        performMsgAbstract(replyMessageBean, position);
+        if (!TextUtils.isEmpty(replyContent)) {
+            FaceManager.handlerEmojiText(timeInLineTextLayout.getTextView(), replyContent, false);
+        }
+    }
+
+    @Override
+    protected void setGravity(boolean isStart) {
+        super.setGravity(isStart);
+    }
+
+
+    private void performMsgAbstract(ReplyMessageBean replyMessageBean, int position) {
+        TUIMessageBean originMessage = replyMessageBean.getOriginMessageBean();
+
+        TUIReplyQuoteBean replyQuoteBean = replyMessageBean.getReplyQuoteBean();
+        if (originMessage != null) {
+            performReply(replyQuoteBean, replyMessageBean);
+        } else {
+            performNotFound(replyQuoteBean, replyMessageBean);
+        }
+
+        originMsgLayout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (onItemClickListener != null) {
+                    onItemClickListener.onReplyMessageClick(v, position, replyMessageBean);
+                }
+            }
+        });
+
+        originMsgLayout.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                if (onItemClickListener != null) {
+                    onItemClickListener.onMessageLongClick(msgArea, position, replyMessageBean);
+                }
+                return true;
+            }
+        });
+
+    }
+
+    private void performNotFound(TUIReplyQuoteBean replyQuoteBean, ReplyMessageBean replyMessageBean) {
+        String typeStr = ChatMessageParser.getMsgTypeStr(replyQuoteBean.getMessageType());
+        String abstractStr = replyQuoteBean.getDefaultAbstract();
+        if (ChatMessageParser.isFileType(replyQuoteBean.getMessageType())) {
+            abstractStr = "";
+        }
+        TextReplyQuoteBean textReplyQuoteBean = new TextReplyQuoteBean();
+        textReplyQuoteBean.setText(typeStr + abstractStr);
+        TextReplyQuoteView textReplyQuoteView = new TextReplyQuoteView(itemView.getContext());
+        textReplyQuoteView.onDrawReplyQuote(textReplyQuoteBean);
+        if (isForwardMode || isMessageDetailMode) {
+            textReplyQuoteView.setSelf(false);
+        } else {
+            textReplyQuoteView.setSelf(replyMessageBean.isSelf());
+        }
+        quoteFrameLayout.removeAllViews();
+        quoteFrameLayout.addView(textReplyQuoteView);
+    }
+
+    private void performReply(TUIReplyQuoteBean replyQuoteBean, ReplyMessageBean replyMessageBean) {
+        Class<? extends TUIReplyQuoteView> quoteViewClass = MinimalistUIService.getInstance().getReplyMessageViewClass(replyQuoteBean.getClass());
+        if (quoteViewClass != null) {
+            TUIReplyQuoteView quoteView = null;
+            try {
+                Constructor quoteViewConstructor = quoteViewClass.getConstructor(Context.class);
+                quoteView = (TUIReplyQuoteView) quoteViewConstructor.newInstance(itemView.getContext());
+            } catch (NoSuchMethodException e) {
+                e.printStackTrace();
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            } catch (InstantiationException e) {
+                e.printStackTrace();
+            } catch (InvocationTargetException e) {
+                e.printStackTrace();
+            }
+            if (quoteView != null) {
+                quoteView.onDrawReplyQuote(replyQuoteBean);
+                quoteFrameLayout.removeAllViews();
+                quoteFrameLayout.addView(quoteView);
+                if (isForwardMode || isMessageDetailMode) {
+                    quoteView.setSelf(false);
+                } else {
+                    quoteView.setSelf(replyMessageBean.isSelf());
+                }
+            }
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/SoundMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/SoundMessageHolder.java
new file mode 100644
index 0000000..e9fb8e0
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/SoundMessageHolder.java
@@ -0,0 +1,150 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder;
+
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.util.BackgroundTasks;
+import com.tencent.qcloud.tuicore.util.DateTimeUtil;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.SoundMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.component.AudioPlayer;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+import java.io.File;
+import java.util.Timer;
+import java.util.TimerTask;
+
+public class SoundMessageHolder extends MessageContentHolder {
+
+    private static final int UNREAD = 0;
+    private static final int READ = 1;
+
+    private TextView audioTimeText;
+    private ImageView audioPlayImage;
+    private Timer mTimer;
+    private int times = 0;
+
+    public SoundMessageHolder(View itemView) {
+        super(itemView);
+        audioTimeText = itemView.findViewById(R.id.audio_time_tv);
+        audioPlayImage = itemView.findViewById(R.id.audio_play_iv);
+        timeInLineTextLayout = itemView.findViewById(R.id.time_in_line_text);
+    }
+
+    @Override
+    public int getVariableLayout() {
+        return R.layout.minimalist_message_adapter_content_audio;
+    }
+
+
+    @Override
+    public void layoutVariableViews(final TUIMessageBean msg, final int position) {
+        SoundMessageBean message = (SoundMessageBean) msg;
+
+        int duration = (int) message.getDuration();
+        if (duration == 0) {
+            duration = 1;
+        }
+
+        String timeString = DateTimeUtil.formatSecondsTo00(duration);
+        int finalDuration = duration;
+        resetTimerStatus(timeString);
+        msgContentFrame.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (AudioPlayer.getInstance().isPlaying()) {
+                    AudioPlayer.getInstance().stopPlay();
+                    resetTimerStatus(timeString);
+                    if (TextUtils.equals(AudioPlayer.getInstance().getPath(), message.getDataPath())) {
+                        return;
+                    }
+                }
+                if (TextUtils.isEmpty(message.getDataPath())) {
+                    ToastUtil.toastShortMessage(TUIChatService.getAppContext().getString(R.string.voice_play_tip));
+                    getSound(message);
+                    return;
+                }
+
+                if (finalDuration > 1) {
+                    if (mTimer == null) {
+                        mTimer = new Timer();
+                    }
+                    mTimer.schedule(new TimerTask() {
+                        @Override
+                        public void run() {
+                            BackgroundTasks.getInstance().runOnUiThread(new Runnable() {
+                                @Override
+                                public void run() {
+                                    if (times < finalDuration) {
+                                        times++;
+                                        String s = DateTimeUtil.formatSecondsTo00(times);
+                                        audioTimeText.setText(s);
+                                    } else {
+                                        audioTimeText.setText(timeString);
+                                    }
+                                }
+                            });
+                        }
+                    }, 0, 1000);
+                }
+
+                audioPlayImage.setImageResource(R.drawable.chat_audio_stop_btn_ic);
+                message.setCustomInt(READ);
+                AudioPlayer.getInstance().startPlay(message.getDataPath(), new AudioPlayer.Callback() {
+                    @Override
+                    public void onCompletion(Boolean success) {
+                        audioPlayImage.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                audioPlayImage.setImageResource(R.drawable.chat_audio_play_btn_ic);
+                            }
+                        });
+                        resetTimerStatus(timeString);
+                    }
+                });
+            }
+        });
+    }
+
+    private void resetTimerStatus(String timeString) {
+        if (mTimer != null) {
+            mTimer.cancel();
+            mTimer = null;
+        }
+        audioTimeText.setText(timeString);
+        times = 0;
+    }
+
+    private void getSound(final SoundMessageBean messageBean) {
+        final String path = TUIConfig.getRecordDownloadDir() + messageBean.getUUID();
+        File file = new File(path);
+        if (!file.exists()) {
+            messageBean.downloadSound(path, new SoundMessageBean.SoundDownloadCallback() {
+                @Override
+                public void onProgress(long currentSize, long totalSize) {
+                    TUIChatLog.i("downloadSound progress current:", currentSize + ", total:" + totalSize);
+                }
+
+                @Override
+                public void onError(int code, String desc) {
+                    TUIChatLog.e("getSoundToFile failed code = ", code + ", info = " + desc);
+                    ToastUtil.toastLongMessage("getSoundToFile failed code = " + code + ", info = " + desc);
+                }
+
+                @Override
+                public void onSuccess() {
+                    messageBean.setDataPath(path);
+                }
+            });
+        } else {
+            messageBean.setDataPath(path);
+        }
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/TextMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/TextMessageHolder.java
new file mode 100644
index 0000000..e89b256
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/TextMessageHolder.java
@@ -0,0 +1,60 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder;
+
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.animation.LinearInterpolator;
+import android.view.animation.RotateAnimation;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TextMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+
+public class TextMessageHolder extends MessageContentHolder {
+
+    public TextMessageHolder(View itemView) {
+        super(itemView);
+        timeInLineTextLayout = itemView.findViewById(R.id.text_message_layout);
+    }
+
+    @Override
+    public int getVariableLayout() {
+        return R.layout.chat_minimalist_message_adapter_content_text;
+    }
+
+    @Override
+    public void layoutVariableViews(TUIMessageBean msg, int position) {
+        if (!(msg instanceof TextMessageBean)) {
+            return;
+        }
+        TextMessageBean textMessageBean = (TextMessageBean) msg;
+        textMessageBean.setSelectText(textMessageBean.getText());
+        if (properties.getChatContextFontSize() != 0) {
+            timeInLineTextLayout.setTextSize(properties.getChatContextFontSize());
+        }
+        if (textMessageBean.isSelf()) {
+            if (properties.getRightChatContentFontColor() != 0) {
+                timeInLineTextLayout.setTextColor(properties.getRightChatContentFontColor());
+            }
+        } else {
+            if (properties.getLeftChatContentFontColor() != 0) {
+                timeInLineTextLayout.setTextColor(properties.getLeftChatContentFontColor());
+            }
+        }
+
+        if (textMessageBean.getText() != null) {
+            FaceManager.handlerEmojiText(timeInLineTextLayout.getTextView(), textMessageBean.getText(), false);
+        } else if (!TextUtils.isEmpty(textMessageBean.getExtra())) {
+            FaceManager.handlerEmojiText(timeInLineTextLayout.getTextView(), textMessageBean.getExtra(), false);
+        } else {
+            FaceManager.handlerEmojiText(timeInLineTextLayout.getTextView(), TUIChatService.getAppContext().getString(R.string.no_support_msg), false);
+        }
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/TipsMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/TipsMessageHolder.java
new file mode 100644
index 0000000..7acf51f
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/TipsMessageHolder.java
@@ -0,0 +1,81 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder;
+
+import android.text.Html;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.TextView;
+
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TipsMessageBean;
+
+public class TipsMessageHolder extends MessageBaseHolder {
+
+    protected TextView mChatTipsTv;
+    protected TextView mReEditText;
+
+    public TipsMessageHolder(View itemView) {
+        super(itemView);
+        mChatTipsTv = itemView.findViewById(R.id.chat_tips_tv);
+        mReEditText = itemView.findViewById(R.id.re_edit);
+    }
+
+    @Override
+    public int getVariableLayout() {
+        return R.layout.message_adapter_content_tips;
+    }
+
+    @Override
+    public void layoutViews(TUIMessageBean msg, int position) {
+        super.layoutViews(msg, position);
+
+        if (properties.getTipsMessageBubble() != null) {
+            mChatTipsTv.setBackground(properties.getTipsMessageBubble());
+        }
+        if (properties.getTipsMessageFontColor() != 0) {
+            mChatTipsTv.setTextColor(properties.getTipsMessageFontColor());
+        }
+        if (properties.getTipsMessageFontSize() != 0) {
+            mChatTipsTv.setTextSize(properties.getTipsMessageFontSize());
+        }
+
+        if (msg.getStatus() == TUIMessageBean.MSG_STATUS_REVOKE) {
+            String showString = itemView.getResources().getString(R.string.revoke_tips_other);
+            if (msg.isSelf()) {
+                int msgType = msg.getMsgType();
+                if (msgType == V2TIMMessage.V2TIM_ELEM_TYPE_TEXT) {
+                    long nowtime = V2TIMManager.getInstance().getServerTime();
+                    long msgtime = msg.getMessageTime();
+                    if ((int) (nowtime - msgtime) < 2 * 60) {
+                        mReEditText.setVisibility(View.VISIBLE);
+                        mReEditText.setOnClickListener(new View.OnClickListener() {
+                            @Override
+                            public void onClick(View view) {
+                                onItemClickListener.onReEditRevokeMessage(view, position, msg);
+                            }
+                        });
+                    } else {
+                        mReEditText.setVisibility(View.GONE);
+                    }
+                }
+                showString = itemView.getResources().getString(R.string.revoke_tips_you);
+            } else if (msg.isGroup()) {
+                String sender = TUIChatConstants.covert2HTMLString(
+                        (TextUtils.isEmpty(msg.getNameCard())
+                                ? msg.getSender()
+                                : msg.getNameCard()));
+                showString = sender + itemView.getResources().getString(R.string.revoke_tips);
+            }
+            mChatTipsTv.setText(Html.fromHtml(showString));
+        }
+
+        if (msg instanceof TipsMessageBean) {
+            mChatTipsTv.setText(Html.fromHtml( ((TipsMessageBean) msg).getText()));
+        }
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/VideoMessageHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/VideoMessageHolder.java
new file mode 100644
index 0000000..19cd0ca
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/viewholder/VideoMessageHolder.java
@@ -0,0 +1,134 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder;
+
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+
+import android.content.Intent;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.VideoMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.component.imagevideoscan.ImageVideoScanActivity;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+import java.io.Serializable;
+
+public class VideoMessageHolder extends ImageMessageHolder {
+
+    public VideoMessageHolder(View itemView) {
+        super(itemView);
+    }
+
+    @Override
+    public void layoutVariableViews(TUIMessageBean msg, int position) {
+        performVideo((VideoMessageBean) msg, position);
+    }
+
+    private ViewGroup.LayoutParams getImageParams(ViewGroup.LayoutParams params, final VideoMessageBean msg) {
+        if (msg.getImgWidth() == 0 || msg.getImgHeight() == 0) {
+            params.width = DEFAULT_MAX_SIZE;
+            params.height = DEFAULT_MAX_SIZE;
+            return params;
+        }
+        if (msg.getImgWidth() > msg.getImgHeight()) {
+            params.width = DEFAULT_MAX_SIZE;
+            params.height = DEFAULT_MAX_SIZE * msg.getImgHeight() / msg.getImgWidth();
+        } else {
+            params.width = DEFAULT_MAX_SIZE * msg.getImgWidth() / msg.getImgHeight();
+            params.height = DEFAULT_MAX_SIZE;
+        }
+        return params;
+    }
+
+
+    private void performVideo(final VideoMessageBean msg, final int position) {
+        contentImage.setLayoutParams(getImageParams(contentImage.getLayoutParams(), msg));
+
+        videoPlayBtn.setVisibility(View.VISIBLE);
+
+        if (!TextUtils.isEmpty(msg.getDataPath())) {
+            GlideEngine.loadCornerImageWithoutPlaceHolder(contentImage, msg.getDataPath(), null, DEFAULT_RADIUS);
+        } else {
+            GlideEngine.clear(contentImage);
+            synchronized (downloadEles) {
+                if (!downloadEles.contains(msg.getSnapshotUUID())) {
+                    downloadEles.add(msg.getSnapshotUUID());
+                }
+            }
+
+            final String path = TUIConfig.getImageDownloadDir() + msg.getSnapshotUUID();
+            msg.downloadSnapshot(path, new VideoMessageBean.VideoDownloadCallback() {
+                @Override
+                public void onProgress(long currentSize, long totalSize) {
+                    TUIChatLog.i("downloadSnapshot progress current:", currentSize + ", total:" + totalSize);
+                }
+
+                @Override
+                public void onError(int code, String desc) {
+                    downloadEles.remove(msg.getSnapshotUUID());
+                    TUIChatLog.e("MessageAdapter video getImage", code + ":" + desc);
+                }
+
+                @Override
+                public void onSuccess() {
+                    downloadEles.remove(msg.getSnapshotUUID());
+                    msg.setDataPath(path);
+                    GlideEngine.loadCornerImageWithoutPlaceHolder(contentImage, msg.getDataPath(), null, DEFAULT_RADIUS);
+                }
+            });
+        }
+
+        if (isMultiSelectMode) {
+            msgContentFrame.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (onItemClickListener != null) {
+                        onItemClickListener.onMessageClick(v, position, msg);
+                    }
+                }
+            });
+        } else {
+            msgContentFrame.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Intent intent = new Intent(TUIChatService.getAppContext(), ImageVideoScanActivity.class);
+                    intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
+                    if (isForwardMode) {
+                        if (getDataSource() != null && !getDataSource().isEmpty()) {
+                            intent.putExtra(TUIChatConstants.OPEN_MESSAGES_SCAN_FORWARD, (Serializable) getDataSource());
+                        }
+                    }
+
+                    intent.putExtra(TUIChatConstants.OPEN_MESSAGE_SCAN, msg);
+                    intent.putExtra(TUIChatConstants.FORWARD_MODE, isForwardMode);
+                    TUIChatService.getAppContext().startActivity(intent);
+                }
+            });
+        }
+
+        setImagePadding(msg);
+    }
+
+    @Override
+    public void setHighLightBackground(int color) {
+        Drawable drawable = contentImage.getDrawable();
+        if (drawable != null) {
+            drawable.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
+        }
+    }
+
+    @Override
+    public void clearHighLightBackground() {
+        Drawable drawable = contentImage.getDrawable();
+        if (drawable != null) {
+            drawable.setColorFilter(null);
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/messagepopmenu/ChatPopActivity.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/messagepopmenu/ChatPopActivity.java
new file mode 100644
index 0000000..b948774
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/messagepopmenu/ChatPopActivity.java
@@ -0,0 +1,545 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.messagepopmenu;
+
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.LightingColorFilter;
+import android.graphics.Rect;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.GestureDetector;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.ScrollView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.component.RoundCornerImageView;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.Emoji;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+import com.tencent.qcloud.tuikit.tuichat.component.face.RecentEmojiManager;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.MinimalistUIService;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.ImageMessageHolder;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.MessageContentHolder;
+import com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.viewholder.MessageViewHolderFactory;
+import com.tencent.qcloud.tuikit.tuichat.util.BlurUtils;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ChatPopActivity extends AppCompatActivity {
+    private static final String TAG = ChatPopActivity.class.getSimpleName();
+
+    private static final int ACTION_MAX_NUM_PER_PAGE = 4;
+    private static final int RECENT_EMOJI_NUM = 6;
+    private static final String RECENT_EMOJI_KEY = "recentEmoji";
+
+    private List<ChatPopMenuAction> chatPopMenuActionList;
+    private final List<Emoji> emojiList = new ArrayList<>();
+    private final List<String> recentEmojiList = new ArrayList<>();
+
+    private boolean isShowFaces = true;
+
+    private ViewGroup popupView;
+    private View actionArea;
+    private RecyclerView actionRecyclerView;
+    private RecyclerView recentFaceView;
+    private MenuActionAdapter menuActionAdapter;
+
+    private FrameLayout frameLayout;
+    private RelativeLayout dialogContainer;
+    private ScrollView scrollMessageContainer;
+    private View moreBtn;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.chat_minimalist_pop_menu_layout);
+        popupView = findViewById(android.R.id.content);
+        dialogContainer = popupView.findViewById(R.id.dialog_content_layout);
+        moreBtn = popupView.findViewById(R.id.more_btn);
+        actionArea = popupView.findViewById(R.id.action_area);
+        actionRecyclerView = popupView.findViewById(R.id.chat_pop_menu_action_view);
+        recentFaceView = popupView.findViewById(R.id.recent_faces);
+        scrollMessageContainer = popupView.findViewById(R.id.scroll_container);
+        // message container can not scroll
+        scrollMessageContainer.setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                return true;
+            }
+        });
+        chatPopMenuActionList = ChatPopDataHolder.getActionList();
+        if (chatPopMenuActionList == null || chatPopMenuActionList.size() <= ACTION_MAX_NUM_PER_PAGE) {
+            moreBtn.setVisibility(View.GONE);
+        }
+        Window window = getWindow();
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            Bitmap bitmap = BlurUtils.fastBlur(this, ChatPopDataHolder.getChatPopBgBitmap());
+            if (bitmap != null) {
+                BitmapDrawable bitmapDrawable = new BitmapDrawable(null, bitmap);
+                ColorFilter colorFilter = new LightingColorFilter(0x666666, 0);
+                bitmapDrawable.setColorFilter(colorFilter);
+                window.setBackgroundDrawable(bitmapDrawable);
+            } else {
+                window.setBackgroundDrawable(new ColorDrawable(0xBF000000));
+            }
+        } else {
+            window.setBackgroundDrawable(new ColorDrawable(0xBF000000));
+        }
+        frameLayout = findViewById(R.id.message_frame);
+        setLocation();
+        init();
+    }
+
+    private void setLocation() {
+        Rect messageRect = ChatPopDataHolder.getMessageViewGlobalRect();
+        int actionAreaHeight = ScreenUtil.dip2px(214);
+        if (chatPopMenuActionList != null && chatPopMenuActionList.size() <= ACTION_MAX_NUM_PER_PAGE) {
+            actionAreaHeight = ScreenUtil.dip2px(40) * chatPopMenuActionList.size() + ScreenUtil.dip2px(8);
+        }
+
+        int emojiHeight = ScreenUtil.dip2px(48);
+        int screenHeight = ScreenUtil.getScreenHeight(this);
+
+        int statusBarHeight = getStatusBarHeight();
+
+        if (messageRect.top - emojiHeight >= statusBarHeight &&
+                messageRect.bottom + actionAreaHeight <= screenHeight) {
+            // no need to move container
+            dialogContainer.setY(messageRect.top - emojiHeight - statusBarHeight);
+        } else {
+            // need to move container
+            int messageHeight = messageRect.height();
+            if (messageHeight + actionAreaHeight + emojiHeight <= screenHeight - statusBarHeight) {
+                // no need to move action list
+                int dialogContainerHeight = emojiHeight + actionAreaHeight + messageHeight;
+                int remainingSpace = screenHeight - dialogContainerHeight;
+                if ((remainingSpace / 2) > actionAreaHeight) {
+                    dialogContainer.setY(remainingSpace / 2 + statusBarHeight);
+                } else {
+                    dialogContainer.setY(screenHeight - dialogContainerHeight - statusBarHeight - remainingSpace / 2);
+                }
+            } else {
+                // need to move action list
+                RelativeLayout.LayoutParams actionAreaLayoutParams = (RelativeLayout.LayoutParams) actionArea.getLayoutParams();
+                actionAreaLayoutParams.removeRule(RelativeLayout.BELOW);
+                actionAreaLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM);
+                actionAreaLayoutParams.bottomMargin = emojiHeight;
+                actionArea.setLayoutParams(actionAreaLayoutParams);
+            }
+        }
+    }
+
+    private int getStatusBarHeight() {
+        int statusBarHeight = 0;
+        try {
+            int resourceId = getResources().getIdentifier("status_bar_height",
+                    "dimen", "android");
+            statusBarHeight = getResources().getDimensionPixelSize(resourceId);
+        } catch (Exception e) {
+            Log.e(TAG, "setLocation getStatusBarHeight exception");
+        }
+        if (statusBarHeight == 0) {
+            statusBarHeight = ScreenUtil.dip2px(32);
+        }
+        return statusBarHeight;
+    }
+
+    private void init() {
+        Intent intent = getIntent();
+        TUIMessageBean messageBean = (TUIMessageBean) intent.getSerializableExtra(TUIChatConstants.MESSAGE_BEAN);
+        int type = MinimalistUIService.getInstance().getViewType(messageBean.getClass());
+        RecyclerView.ViewHolder holder = MessageViewHolderFactory.getInstance(frameLayout, null, type);
+        if (holder instanceof MessageContentHolder) {
+            ((MessageContentHolder) holder).setFloatMode(true);
+            if (holder instanceof ImageMessageHolder) {
+                RoundCornerImageView roundCornerImageView = ChatPopDataHolder.getImageMessageView();
+                if (roundCornerImageView != null) {
+                    ((ImageMessageHolder) holder).contentImage.setLeftTopRadius(roundCornerImageView.getLeftTopRadius());
+                    ((ImageMessageHolder) holder).contentImage.setLeftBottomRadius(roundCornerImageView.getLeftBottomRadius());
+                    ((ImageMessageHolder) holder).contentImage.setRightBottomRadius(roundCornerImageView.getRightBottomRadius());
+                    ((ImageMessageHolder) holder).contentImage.setRightTopRadius(roundCornerImageView.getRightTopRadius());
+                }
+            }
+            ((MessageContentHolder) holder).layoutViews(messageBean, 0);
+            ((MessageContentHolder) holder).msgArea.setBackground(ChatPopDataHolder.getMsgAreaBackground());
+        }
+        if (messageBean.isSelf()) {
+            RelativeLayout.LayoutParams faceViewLayoutParams = (RelativeLayout.LayoutParams) recentFaceView.getLayoutParams();
+            faceViewLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_END);
+            faceViewLayoutParams.removeRule(RelativeLayout.ALIGN_PARENT_START);
+            recentFaceView.setLayoutParams(faceViewLayoutParams);
+            RelativeLayout.LayoutParams messageContainerLayoutParams = (RelativeLayout.LayoutParams) scrollMessageContainer.getLayoutParams();
+            messageContainerLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_END);
+            messageContainerLayoutParams.removeRule(RelativeLayout.ALIGN_PARENT_START);
+            scrollMessageContainer.setLayoutParams(messageContainerLayoutParams);
+            RelativeLayout.LayoutParams actionAreaLayoutParams = (RelativeLayout.LayoutParams) actionArea.getLayoutParams();
+            actionAreaLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_END);
+            actionAreaLayoutParams.removeRule(RelativeLayout.ALIGN_PARENT_START);
+            actionArea.setLayoutParams(actionAreaLayoutParams);
+        } else {
+            RelativeLayout.LayoutParams faceViewLayoutParams = (RelativeLayout.LayoutParams) recentFaceView.getLayoutParams();
+            faceViewLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_START);
+            faceViewLayoutParams.removeRule(RelativeLayout.ALIGN_PARENT_END);
+            recentFaceView.setLayoutParams(faceViewLayoutParams);
+            RelativeLayout.LayoutParams messageContainerLayoutParams = (RelativeLayout.LayoutParams) scrollMessageContainer.getLayoutParams();
+            messageContainerLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_START);
+            messageContainerLayoutParams.removeRule(RelativeLayout.ALIGN_PARENT_END);
+            scrollMessageContainer.setLayoutParams(messageContainerLayoutParams);
+            RelativeLayout.LayoutParams actionAreaLayoutParams = (RelativeLayout.LayoutParams) actionArea.getLayoutParams();
+            actionAreaLayoutParams.addRule(RelativeLayout.ALIGN_PARENT_START);
+            actionAreaLayoutParams.removeRule(RelativeLayout.ALIGN_PARENT_END);
+            actionArea.setLayoutParams(actionAreaLayoutParams);
+        }
+        frameLayout.addView(holder.itemView);
+        moreBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                menuActionAdapter.switchNextPage();
+            }
+        });
+        GestureDetector detector = new GestureDetector(this, new GestureDetector.SimpleOnGestureListener() {
+            @Override
+            public boolean onSingleTapUp(MotionEvent e) {
+                onBackPressed();
+                return true;
+            }
+        });
+        popupView.setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                if (v == popupView) {
+                    detector.onTouchEvent(event);
+                    return true;
+                }
+                return false;
+            }
+        });
+        initEmojiList();
+
+        // actions
+        actionRecyclerView.setLayoutManager(new LinearLayoutManager(this));
+        menuActionAdapter = new MenuActionAdapter();
+        actionRecyclerView.setAdapter(menuActionAdapter);
+
+        // recent faces
+        recentFaceView.setItemAnimator(null);
+        LinearLayoutManager recentLayoutManager = new LinearLayoutManager(this, RecyclerView.HORIZONTAL, false);
+        int recentSpacing = ScreenUtil.dip2px(8f);
+        recentFaceView.addItemDecoration(new ChatPopActivity.GridDecoration(null, RECENT_EMOJI_NUM + 1, recentSpacing, 0));
+        recentFaceView.setLayoutManager(recentLayoutManager);
+        RecentFaceAdapter recentFaceAdapter = new RecentFaceAdapter();
+        recentFaceView.setAdapter(recentFaceAdapter);
+        if (!isShowFaces) {
+            recentFaceView.setVisibility(View.GONE);
+        }
+    }
+
+    private void initEmojiList() {
+        emojiList.addAll(FaceManager.getEmojiList());
+        initDefaultEmoji();
+    }
+
+    private void initDefaultEmoji() {
+        List<String> emojis = null;
+        try {
+            emojis = (List<String>) RecentEmojiManager.getInstance().getCollection(RECENT_EMOJI_KEY);
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+        if (emojis == null) {
+            List<Emoji> subList = emojiList.subList(0, RECENT_EMOJI_NUM);
+            List<String> emojiKeys = new ArrayList<>();
+            for (Emoji emoji : subList) {
+                emojiKeys.add(emoji.getFaceKey());
+            }
+            emojis = new ArrayList<>(emojiKeys);
+            try {
+                RecentEmojiManager.getInstance().putCollection(RECENT_EMOJI_KEY, emojis);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        recentEmojiList.addAll(emojis);
+    }
+
+    private void updateRecentEmoji(Emoji emoji) {
+        recentEmojiList.remove(emoji.getFaceKey());
+        recentEmojiList.add(0, emoji.getFaceKey());
+        try {
+            RecentEmojiManager.getInstance().putCollection(RECENT_EMOJI_KEY, recentEmojiList);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    class RecentFaceAdapter extends RecyclerView.Adapter<RecentFaceAdapter.RecentFaceViewHolder> {
+
+        private Emoji moreBtn;
+
+        @NonNull
+        @Override
+        public RecentFaceAdapter.RecentFaceViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            View faceView = LayoutInflater.from(parent.getContext()).inflate(R.layout.chat_menu_recent_face_item_layout, parent, false);
+            moreBtn = new Emoji();
+            Bitmap bitMap = BitmapFactory.decodeResource(parent.getResources(), R.drawable.chat_pop_menu_add_icon);
+            moreBtn.setIcon(bitMap);
+            return new RecentFaceAdapter.RecentFaceViewHolder(faceView);
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull RecentFaceAdapter.RecentFaceViewHolder holder, int position) {
+            Emoji emoji;
+            if (position == RECENT_EMOJI_NUM) {
+                emoji = moreBtn;
+            } else {
+                emoji = getEmoji(recentEmojiList.get(position));
+            }
+            if (emoji == null) {
+                return;
+            }
+            holder.faceIv.setImageBitmap(emoji.getIcon());
+            holder.faceIv.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    onEmojiClicked(emoji);
+                }
+            });
+        }
+
+        private void onEmojiClicked(Emoji emoji) {
+            if (emoji == moreBtn) {
+                ChatPopMenuEmojiDialogFragment dialogFragment = new ChatPopMenuEmojiDialogFragment();
+                dialogFragment.setEmojiClickListener(new ChatPopMenuEmojiDialogFragment.EmojiClickListener() {
+                    @Override
+                    public void onClick(Emoji clickedEmoji) {
+                        onEmojiClicked(clickedEmoji);
+                    }
+                });
+                dialogFragment.show(getSupportFragmentManager(), "ChatEmoji");
+                return;
+            }
+            ChatPopActivity.EmojiOnClickListener listener = ChatPopDataHolder.getEmojiOnClickListener();
+            if (listener != null) {
+                listener.onClick(emoji);
+                updateRecentEmoji(emoji);
+                hide();
+            }
+        }
+
+        private Emoji getEmoji(String emojiKey) {
+            for (Emoji emoji : emojiList) {
+                if (TextUtils.equals(emoji.getFaceKey(), emojiKey)) {
+                    return emoji;
+                }
+            }
+            return null;
+        }
+
+        @Override
+        public int getItemCount() {
+            return RECENT_EMOJI_NUM + 1;
+        }
+
+        class RecentFaceViewHolder extends RecyclerView.ViewHolder {
+            ImageView faceIv;
+
+            public RecentFaceViewHolder(@NonNull View itemView) {
+                super(itemView);
+                faceIv = itemView.findViewById(R.id.face_iv);
+            }
+        }
+    }
+
+    private void hide() {
+        onBackPressed();
+    }
+
+    private ChatPopMenuAction getChatPopMenuAction(int position) {
+        return chatPopMenuActionList.get(position);
+    }
+
+    class MenuActionAdapter extends RecyclerView.Adapter<MenuActionAdapter.MenuItemViewHolder> {
+        private int page = 1;
+
+        @NonNull
+        @Override
+        public MenuActionAdapter.MenuItemViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.chat_minimalist_pop_menu_action_item_layou, parent, false);
+            return new MenuActionAdapter.MenuItemViewHolder(view);
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull MenuActionAdapter.MenuItemViewHolder holder, int position) {
+            int realPosition = (page - 1) * ACTION_MAX_NUM_PER_PAGE + position;
+            ChatPopMenuAction chatPopMenuAction = getChatPopMenuAction(realPosition);
+            if (chatPopMenuAction.textColor != Integer.MAX_VALUE) {
+                holder.title.setTextColor(chatPopMenuAction.textColor);
+            } else {
+                holder.title.setTextColor(Color.BLACK);
+            }
+            holder.title.setText(chatPopMenuAction.actionName);
+            Drawable drawable = ResourcesCompat.getDrawable(holder.itemView.getResources(), chatPopMenuAction.actionIcon, null);
+            holder.icon.setImageDrawable(drawable);
+            holder.itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    chatPopMenuAction.actionClickListener.onClick();
+                    hide();
+                }
+            });
+        }
+
+        public void switchNextPage() {
+            page++;
+            if (page * ACTION_MAX_NUM_PER_PAGE - chatPopMenuActionList.size() >= ACTION_MAX_NUM_PER_PAGE) {
+                page = 1;
+            }
+            notifyDataSetChanged();
+        }
+
+        @Override
+        public int getItemCount() {
+            if (chatPopMenuActionList == null) {
+                return 0;
+            }
+            return Math.min(chatPopMenuActionList.size() - (page - 1) * ACTION_MAX_NUM_PER_PAGE, ACTION_MAX_NUM_PER_PAGE);
+        }
+
+        class MenuItemViewHolder extends RecyclerView.ViewHolder {
+            public TextView title;
+            public ImageView icon;
+
+            public MenuItemViewHolder(@NonNull View itemView) {
+                super(itemView);
+                title = itemView.findViewById(R.id.action_name);
+                icon = itemView.findViewById(R.id.action_icon);
+            }
+        }
+    }
+
+    static class GridDecoration extends RecyclerView.ItemDecoration {
+
+        private final int columnNum;
+        private final int leftRightSpace;
+        private final int topBottomSpace;
+        private final Drawable divider;
+
+        public GridDecoration(Drawable divider, int columnNum, int leftRightSpace, int topBottomSpace) {
+            this.divider = divider;
+            this.columnNum = columnNum;
+            this.leftRightSpace = leftRightSpace;
+            this.topBottomSpace = topBottomSpace;
+        }
+
+        @Override
+        public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+            int position = parent.getChildAdapterPosition(view);
+            int column = position % columnNum;
+
+            outRect.left = column * leftRightSpace / columnNum;
+            outRect.right = leftRightSpace * (columnNum - 1 - column) / columnNum;
+
+            if (position >= columnNum) {
+                outRect.top = topBottomSpace;
+            }
+        }
+
+        @Override
+        public void onDraw(@NonNull Canvas canvas, @NonNull RecyclerView parent, @NonNull RecyclerView.State state) {
+            if (divider == null) {
+                return;
+            }
+            canvas.save();
+            final int childCount = parent.getChildCount();
+            int rowNum = (int) Math.ceil(childCount * 1.0f / columnNum);
+            final int divideLine = rowNum - 1;
+            for (int i = 0; i < divideLine; i++) {
+                View startChild = parent.getChildAt(i * columnNum);
+                View endChild = parent.getChildAt((i + 1) * columnNum - 1);
+                final int bottom = startChild.getBottom();
+                final int top = bottom - divider.getIntrinsicHeight();
+                divider.setBounds(startChild.getLeft(), top + topBottomSpace / 2, endChild.getRight(), bottom + topBottomSpace / 2);
+                divider.draw(canvas);
+            }
+            canvas.restore();
+        }
+    }
+
+
+    public interface EmojiOnClickListener {
+        void onClick(Emoji emoji);
+    }
+
+    public static class ChatPopMenuAction {
+        private String actionName;
+
+        private int textColor = Integer.MAX_VALUE;
+
+        private int actionIcon;
+        private ChatPopMenuAction.OnClickListener actionClickListener;
+
+        public void setActionName(String actionName) {
+            this.actionName = actionName;
+        }
+
+        public String getActionName() {
+            return actionName;
+        }
+
+        public void setActionIcon(int actionIcon) {
+            this.actionIcon = actionIcon;
+        }
+
+        public int getActionIcon() {
+            return actionIcon;
+        }
+
+        public void setTextColor(int color) {
+            this.textColor = color;
+        }
+
+        public void setActionClickListener(ChatPopMenuAction.OnClickListener actionClickListener) {
+            this.actionClickListener = actionClickListener;
+        }
+
+        public ChatPopMenuAction.OnClickListener getActionClickListener() {
+            return actionClickListener;
+        }
+
+        @FunctionalInterface
+        public interface OnClickListener {
+            void onClick();
+        }
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/messagepopmenu/ChatPopDataHolder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/messagepopmenu/ChatPopDataHolder.java
new file mode 100644
index 0000000..aee849e
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/messagepopmenu/ChatPopDataHolder.java
@@ -0,0 +1,90 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.messagepopmenu;
+
+import android.graphics.Bitmap;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+
+import com.tencent.qcloud.tuicore.component.RoundCornerImageView;
+
+import java.lang.ref.WeakReference;
+import java.util.List;
+
+public class ChatPopDataHolder {
+
+    private static final ChatPopDataHolder instance = new ChatPopDataHolder();
+
+    private ChatPopDataHolder() {
+    }
+
+    private WeakReference<ChatPopActivity.EmojiOnClickListener> emojiOnClickListener;
+
+    private WeakReference<Bitmap> chatPopBgBitmap;
+    private WeakReference<List<ChatPopActivity.ChatPopMenuAction>> actionList;
+    private WeakReference<Drawable> msgAreaBackground;
+    private WeakReference<RoundCornerImageView> imageMessageView;
+    private Rect messageViewGlobalRect;
+
+    public static void setActionList(List<ChatPopActivity.ChatPopMenuAction> actionList) {
+        instance.actionList = new WeakReference<>(actionList);
+    }
+
+    public static void setChatPopBgBitmap(Bitmap chatPopBgBitmap) {
+        instance.chatPopBgBitmap = new WeakReference<>(chatPopBgBitmap);
+    }
+
+    public static Bitmap getChatPopBgBitmap() {
+        if (instance.chatPopBgBitmap == null) {
+            return null;
+        }
+        return instance.chatPopBgBitmap.get();
+    }
+
+    public static List<ChatPopActivity.ChatPopMenuAction> getActionList() {
+        if (instance.actionList == null) {
+            return null;
+        }
+        return instance.actionList.get();
+    }
+
+    public static void setEmojiOnClickListener(ChatPopActivity.EmojiOnClickListener emojiOnClickListener) {
+        instance.emojiOnClickListener = new WeakReference<>(emojiOnClickListener);
+    }
+
+    public static ChatPopActivity.EmojiOnClickListener getEmojiOnClickListener() {
+        if (instance.emojiOnClickListener != null) {
+            return instance.emojiOnClickListener.get();
+        } else {
+            return null;
+        }
+    }
+
+    public static void setMsgAreaBackground(Drawable msgAreaBackground) {
+        instance.msgAreaBackground = new WeakReference<>(msgAreaBackground);
+    }
+
+    public static Drawable getMsgAreaBackground() {
+        if (instance.msgAreaBackground == null) {
+            return null;
+        }
+        return instance.msgAreaBackground.get();
+    }
+
+    public static void setImageMessageView(RoundCornerImageView imageMessageView) {
+        instance.imageMessageView = new WeakReference<>(imageMessageView);
+    }
+
+    public static RoundCornerImageView getImageMessageView() {
+        if (instance.imageMessageView == null) {
+            return null;
+        }
+        return instance.imageMessageView.get();
+    }
+
+    public static void setMessageViewGlobalRect(Rect messageViewGlobalRect) {
+        instance.messageViewGlobalRect = messageViewGlobalRect;
+    }
+
+    public static Rect getMessageViewGlobalRect() {
+        return instance.messageViewGlobalRect;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/messagepopmenu/ChatPopMenuEmojiDialogFragment.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/messagepopmenu/ChatPopMenuEmojiDialogFragment.java
new file mode 100644
index 0000000..f5f17cb
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/messagepopmenu/ChatPopMenuEmojiDialogFragment.java
@@ -0,0 +1,174 @@
+package com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.messagepopmenu;
+
+import android.app.Dialog;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.component.face.Emoji;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+
+import java.util.List;
+
+public class ChatPopMenuEmojiDialogFragment extends DialogFragment {
+
+    public static final int SPAN_COUNT = 7;
+
+    private BottomSheetDialog dialog;
+
+    private RecyclerView emojiGridList;
+
+    private List<Emoji> emojiList;
+
+    private EmojiClickListener emojiClickListener;
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        dialog = new BottomSheetDialog(getContext(), R.style.ChatPopActivityStyle);
+        dialog.setCanceledOnTouchOutside(true);
+        BottomSheetBehavior<FrameLayout> bottomSheetBehavior = dialog.getBehavior();
+        bottomSheetBehavior.setFitToContents(false);
+        bottomSheetBehavior.setHalfExpandedRatio(0.45f);
+        bottomSheetBehavior.setSkipCollapsed(true);
+        bottomSheetBehavior.setExpandedOffset(ScreenUtil.dip2px(36));
+        bottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED);
+        return dialog;
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.chat_popmenu_emoji_dialog_layout, container);
+        emojiGridList = view.findViewById(R.id.emoji_grid_list);
+        initData();
+        return view;
+    }
+
+    private void initData() {
+        emojiList = FaceManager.getEmojiList();
+        emojiGridList.setLayoutManager(new GridLayoutManager(getContext(), SPAN_COUNT));
+        emojiGridList.setAdapter(new EmojiAdapter());
+        emojiGridList.post(new Runnable() {
+            @Override
+            public void run() {
+                FaceGridDecoration decoration = new FaceGridDecoration(SPAN_COUNT)
+                        .setTopBottomSpace(ScreenUtil.dip2px(10))
+                        .setWidth(emojiGridList.getWidth())
+                        .setItemWidth(emojiGridList.getChildAt(0).getWidth());
+                emojiGridList.addItemDecoration(decoration);
+            }
+        });
+    }
+
+    public void setEmojiClickListener(EmojiClickListener emojiClickListener) {
+        this.emojiClickListener = emojiClickListener;
+    }
+
+    class EmojiAdapter extends RecyclerView.Adapter<EmojiAdapter.EmojiHolder> {
+
+        @NonNull
+        @Override
+        public EmojiHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.chat_pop_menu_emoji_item_layout, parent, false);
+            return new EmojiHolder(view);
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull EmojiHolder holder, int position) {
+            Emoji emoji = emojiList.get(position);
+            holder.emojiImg.setImageBitmap(emoji.getIcon());
+            holder.itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (emojiClickListener != null) {
+                        emojiClickListener.onClick(emoji);
+                    }
+                    dismiss();
+                }
+            });
+        }
+
+        @Override
+        public int getItemCount() {
+            if (emojiList == null) {
+                return 0;
+            } else {
+                return emojiList.size();
+            }
+        }
+
+        class EmojiHolder extends RecyclerView.ViewHolder {
+            private final ImageView emojiImg;
+
+            public EmojiHolder(@NonNull View itemView) {
+                super(itemView);
+                emojiImg = itemView.findViewById(R.id.emoji_img);
+            }
+        }
+    }
+
+    static class FaceGridDecoration extends RecyclerView.ItemDecoration {
+
+        private final int columnNum;
+        private int topBottomSpace;
+        private int width;
+        private int itemWidth;
+
+        public FaceGridDecoration(int columnNum) {
+            this.columnNum = columnNum;
+        }
+
+        public FaceGridDecoration setTopBottomSpace(int space) {
+            this.topBottomSpace = space;
+            return this;
+        }
+
+
+        public FaceGridDecoration setWidth(int width) {
+            this.width = width;
+            return this;
+        }
+
+
+        public FaceGridDecoration setItemWidth(int itemWidth) {
+            this.itemWidth = itemWidth;
+            return this;
+        }
+
+        private int getLeftRightSpace() {
+            return (width - (columnNum * itemWidth)) / (columnNum - 1);
+        }
+
+        @Override
+        public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+            int position = parent.getChildAdapterPosition(view);
+            int column = position % columnNum;
+            int leftRightSpace = getLeftRightSpace();
+            outRect.left = column * leftRightSpace / columnNum;
+            outRect.right = leftRightSpace * (columnNum - 1 - column) / columnNum;
+
+            outRect.top = topBottomSpace;
+            outRect.bottom = topBottomSpace;
+        }
+    }
+
+    interface EmojiClickListener {
+        void onClick(Emoji emoji);
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/model/AIDenoiseSignatureManager.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/model/AIDenoiseSignatureManager.java
new file mode 100644
index 0000000..ba677d8
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/model/AIDenoiseSignatureManager.java
@@ -0,0 +1,63 @@
+package com.tencent.qcloud.tuikit.tuichat.model;
+
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMValueCallback;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+
+import java.util.HashMap;
+
+public class AIDenoiseSignatureManager {
+    private static final String TAG = AIDenoiseSignatureManager.class.getSimpleName();
+    private String aiDenoiseSignature = "";
+    private int expiredTime;
+
+    private static class AIDenoiseSignatureManagerHolder {
+        private static final AIDenoiseSignatureManager aiDenoiseSignatureManager = new AIDenoiseSignatureManager();
+    }
+
+    public static AIDenoiseSignatureManager getInstance() {
+        return AIDenoiseSignatureManager.AIDenoiseSignatureManagerHolder.aiDenoiseSignatureManager;
+    }
+
+    public void updateSignature() {
+        long currentTime = System.currentTimeMillis() / 1000;
+        if (currentTime < expiredTime) {
+            return;
+        }
+
+        V2TIMManager.getInstance().callExperimentalAPI("getAIDenoiseSignature", null, new V2TIMValueCallback<Object>() {
+            @Override
+            public void onSuccess(Object object) {
+                if (object == null) {
+                    return;
+                }
+
+                if (!(object instanceof HashMap)) {
+                    return;
+                }
+
+                HashMap<String, String> hashMap = (HashMap<String, String>) object;
+                Object signatureObject = hashMap.get("signature");
+                Object expiredTimeObject = hashMap.get("expired_time");
+                if (signatureObject != null) {
+                    aiDenoiseSignature = (String) signatureObject;
+                }
+
+                if (expiredTimeObject != null) {
+                    String expiredTimeString = (String)expiredTimeObject;
+                    expiredTime = Integer.parseInt(expiredTimeString);
+                }
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIChatLog.e(TAG, "getAIDenoiseSignature error, code:" + code + ", desc:" + desc);
+            }
+        });
+    }
+
+    public String getSignature() {
+        updateSignature();
+        return aiDenoiseSignature;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/model/ChatProvider.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/model/ChatProvider.java
new file mode 100644
index 0000000..76b49ad
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/model/ChatProvider.java
@@ -0,0 +1,928 @@
+package com.tencent.qcloud.tuikit.tuichat.model;
+
+import static com.tencent.imsdk.BaseConstants.ERR_SDK_MSG_MODIFY_CONFLICT;
+import static com.tencent.imsdk.v2.V2TIMMessage.V2TIM_ELEM_TYPE_TEXT;
+import static com.tencent.imsdk.v2.V2TIMMessage.V2TIM_MSG_STATUS_SEND_FAIL;
+
+import android.text.TextUtils;
+import android.util.Log;
+import android.util.Pair;
+
+import com.google.gson.Gson;
+import com.tencent.imsdk.BaseConstants;
+import com.tencent.imsdk.message.MessageAtInfo;
+import com.tencent.imsdk.v2.V2TIMCallback;
+import com.tencent.imsdk.v2.V2TIMCompleteCallback;
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.imsdk.v2.V2TIMConversationOperationResult;
+import com.tencent.imsdk.v2.V2TIMFriendInfoResult;
+import com.tencent.imsdk.v2.V2TIMGroupApplication;
+import com.tencent.imsdk.v2.V2TIMGroupApplicationResult;
+import com.tencent.imsdk.v2.V2TIMGroupChangeInfo;
+import com.tencent.imsdk.v2.V2TIMGroupMemberFullInfo;
+import com.tencent.imsdk.v2.V2TIMGroupMemberInfo;
+import com.tencent.imsdk.v2.V2TIMGroupMemberInfoResult;
+import com.tencent.imsdk.v2.V2TIMGroupMessageReadMemberList;
+import com.tencent.imsdk.v2.V2TIMGroupTipsElem;
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMMergerElem;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.imsdk.v2.V2TIMMessageListGetOption;
+import com.tencent.imsdk.v2.V2TIMMessageReceipt;
+import com.tencent.imsdk.v2.V2TIMOfflinePushInfo;
+import com.tencent.imsdk.v2.V2TIMSendCallback;
+import com.tencent.imsdk.v2.V2TIMTextElem;
+import com.tencent.imsdk.v2.V2TIMUserFullInfo;
+import com.tencent.imsdk.v2.V2TIMUserStatus;
+import com.tencent.imsdk.v2.V2TIMValueCallback;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ErrorMessageConverter;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.GroupApplyInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageFeature;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageReceiptInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.OfflineMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.OfflineMessageContainerBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.OfflinePushInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.ReactUserBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.UserStatusBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.GroupMessageReadMembersInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.MergeMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TipsMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.config.TUIChatConfigs;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageBuilder;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageParser;
+import com.tencent.qcloud.tuikit.tuichat.util.OfflinePushInfoUtils;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+import org.json.JSONException;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ChatProvider {
+    private static final String TAG = ChatProvider.class.getSimpleName();
+
+    public static final int ERR_REVOKE_TIME_LIMIT_EXCEED = BaseConstants.ERR_REVOKE_TIME_LIMIT_EXCEED;
+    public static final int ERR_REVOKE_TIME_LIMIT_SVR_GROUP = BaseConstants.ERR_SVR_GROUP_REVOKE_MSG_TIME_LIMIT;
+    public static final int ERR_REVOKE_TIME_LIMIT_SVR_MESSAGE = BaseConstants.ERR_SVR_MSG_REVOKE_TIME_LIMIT;
+
+    public void loadC2CMessage(String userId, int count, TUIMessageBean lastMessageInfo, IUIKitCallback<List<TUIMessageBean>> callBack) {
+        V2TIMMessage lastTIMMsg = null;
+        if (lastMessageInfo != null) {
+            lastTIMMsg = lastMessageInfo.getV2TIMMessage();
+        }
+        V2TIMManager.getMessageManager().getC2CHistoryMessageList(userId, count, lastTIMMsg, new V2TIMValueCallback<List<V2TIMMessage>>() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIChatUtils.callbackOnError(callBack, TAG, code, desc);
+                TUIChatLog.e(TAG, "loadChatMessages getC2CHistoryMessageList failed, code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+            }
+
+            @Override
+            public void onSuccess(List<V2TIMMessage> v2TIMMessages) {
+                List<TUIMessageBean> messageInfoList = ChatMessageParser.parseMessageList(v2TIMMessages);
+                TUIChatUtils.callbackOnSuccess(callBack, messageInfoList);
+            }
+        });
+    }
+
+    public void loadGroupMessage(String groupId, int count, TUIMessageBean lastMessageInfo, IUIKitCallback<List<TUIMessageBean>> callBack) {
+        V2TIMMessage lastTimMsg = null;
+        if (lastMessageInfo != null) {
+            lastTimMsg = lastMessageInfo.getV2TIMMessage();
+        }
+        V2TIMManager.getMessageManager().getGroupHistoryMessageList(groupId, count, lastTimMsg, new V2TIMValueCallback<List<V2TIMMessage>>() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIChatUtils.callbackOnError(callBack, TAG, code, desc);
+                TUIChatLog.e(TAG, "loadChatMessages getC2CHistoryMessageList failed, code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+            }
+
+            @Override
+            public void onSuccess(List<V2TIMMessage> v2TIMMessages) {
+                List<TUIMessageBean> messageInfoList = ChatMessageParser.parseMessageList(v2TIMMessages);
+//                messageInfoList.addAll(messageInfoList);
+                TUIChatUtils.callbackOnSuccess(callBack, messageInfoList);
+            }
+        });
+    }
+
+    public void loadHistoryMessageList(String chatId, boolean isGroup, int loadCount,
+                                       TUIMessageBean locateMessageInfo, int getType, IUIKitCallback<List<TUIMessageBean>> callBack) {
+        V2TIMMessageListGetOption optionBackward = new V2TIMMessageListGetOption();
+        optionBackward.setCount(loadCount);
+        if (getType == TUIChatConstants.GET_MESSAGE_FORWARD) {
+            optionBackward.setGetType(V2TIMMessageListGetOption.V2TIM_GET_CLOUD_OLDER_MSG);
+        } else if (getType == TUIChatConstants.GET_MESSAGE_BACKWARD) {
+            optionBackward.setGetType(V2TIMMessageListGetOption.V2TIM_GET_CLOUD_NEWER_MSG);
+        }
+        if (locateMessageInfo != null) {
+            optionBackward.setLastMsg(locateMessageInfo.getV2TIMMessage());
+        }
+        if (isGroup) {
+            optionBackward.setGroupID(chatId);
+        } else {
+            optionBackward.setUserID(chatId);
+        }
+
+        V2TIMManager.getMessageManager().getHistoryMessageList(optionBackward, new V2TIMValueCallback<List<V2TIMMessage>>() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIChatUtils.callbackOnError(callBack, TAG, code, desc);
+                TUIChatLog.e(TAG, "loadChatMessages getHistoryMessageList optionBackward failed, code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+            }
+
+            @Override
+            public void onSuccess(List<V2TIMMessage> v2TIMMessages) {
+                List<TUIMessageBean> messageInfoList = ChatMessageParser.parseMessageList(v2TIMMessages);
+                TUIChatUtils.callbackOnSuccess(callBack, messageInfoList);
+            }
+        });
+    }
+
+    public void c2cReadReport(String userId) {
+        V2TIMManager.getMessageManager().markC2CMessageAsRead(userId, new V2TIMCallback() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIChatLog.e(TAG, "markC2CMessageAsRead setReadMessage failed, code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+            }
+
+            @Override
+            public void onSuccess() {
+                TUIChatLog.d(TAG, "markC2CMessageAsRead setReadMessage success");
+            }
+        });
+
+        String conversationID = "c2c_" + userId;
+        List<String> conversationIDList = new ArrayList<>();
+        conversationIDList.add(conversationID);
+        V2TIMManager.getConversationManager().markConversation(conversationIDList, V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_UNREAD, false, new V2TIMValueCallback<List<V2TIMConversationOperationResult>>() {
+            @Override
+            public void onSuccess(List<V2TIMConversationOperationResult> v2TIMConversationOperationResults) {
+                if (v2TIMConversationOperationResults.size() > 0) {
+                    V2TIMConversationOperationResult result = v2TIMConversationOperationResults.get(0);
+                    TUIChatLog.d(TAG, "mark C2C conversation unread disable success, code:" + result.getResultCode() + "|msg:" + result.getResultInfo());
+                } else {
+                    TUIChatLog.e(TAG, "mark C2C conversation unread disable failed, results size = 0");
+                }
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIChatLog.e(TAG, "mark C2C conversation unread disable failed, code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+            }
+        });
+    }
+
+    public void groupReadReport(String groupId) {
+        V2TIMManager.getMessageManager().markGroupMessageAsRead(groupId, new V2TIMCallback() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIChatLog.e(TAG, "markGroupMessageAsRead failed, code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+            }
+
+            @Override
+            public void onSuccess() {
+                TUIChatLog.d(TAG, "markGroupMessageAsRead success");
+            }
+        });
+
+        String conversationID = "group_" + groupId;
+        List<String> conversationIDList = new ArrayList<>();
+        conversationIDList.add(conversationID);
+        V2TIMManager.getConversationManager().markConversation(conversationIDList, V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_UNREAD, false, new V2TIMValueCallback<List<V2TIMConversationOperationResult>>() {
+            @Override
+            public void onSuccess(List<V2TIMConversationOperationResult> v2TIMConversationOperationResults) {
+                if (v2TIMConversationOperationResults.size() > 0) {
+                    V2TIMConversationOperationResult result = v2TIMConversationOperationResults.get(0);
+                    TUIChatLog.d(TAG, "mark group conversation unread disable success, code:" + result.getResultCode() + "|msg:" + result.getResultInfo());
+                } else {
+                    TUIChatLog.e(TAG, "mark group conversation unread disable failed, results size = 0");
+                }
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIChatLog.e(TAG, "mark group conversation unread disable failed, code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+            }
+        });
+    }
+
+    public void loadApplyInfo(final IUIKitCallback<List<GroupApplyInfo>> callBack) {
+        final List<GroupApplyInfo> applies = new ArrayList<>();
+
+        V2TIMManager.getGroupManager().getGroupApplicationList(new V2TIMValueCallback<V2TIMGroupApplicationResult>() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIChatLog.e(TAG, "getGroupPendencyList failed, code: " + code + "|desc: " + ErrorMessageConverter.convertIMError(code, desc));
+                callBack.onError(TAG, code, ErrorMessageConverter.convertIMError(code, desc));
+            }
+
+            @Override
+            public void onSuccess(V2TIMGroupApplicationResult v2TIMGroupApplicationResult) {
+                List<V2TIMGroupApplication> v2TIMGroupApplicationList = v2TIMGroupApplicationResult.getGroupApplicationList();
+                for (int i = 0; i < v2TIMGroupApplicationList.size(); i++) {
+                    GroupApplyInfo info = new GroupApplyInfo(v2TIMGroupApplicationList.get(i));
+                    info.setStatus(0);
+                    applies.add(info);
+                }
+                callBack.onSuccess(applies);
+            }
+        });
+    }
+
+    private void setMessageTypingFeature(TUIMessageBean messageBean) {
+        MessageFeature messageFeature = new MessageFeature();
+        messageFeature.setNeedTyping(1);
+        messageBean.setMessageTypingFeature(messageFeature);
+    }
+
+    public String sendMessage(TUIMessageBean message, ChatInfo chatInfo, IUIKitCallback<TUIMessageBean> callBack) {
+        // support message typing flag
+        setMessageTypingFeature(message);
+
+        OfflineMessageContainerBean containerBean = new OfflineMessageContainerBean();
+        OfflineMessageBean entity = new OfflineMessageBean();
+        entity.content = message.getExtra();
+        entity.sender = message.getSender();
+        entity.nickname = chatInfo.getChatName();
+        entity.faceUrl = TUIChatConfigs.getConfigs().getGeneralConfig().getUserFaceUrl();
+        containerBean.entity = entity;
+
+        String userID = "";
+        String groupID = "";
+        boolean isGroup = false;
+        if (chatInfo.getType() == V2TIMConversation.V2TIM_GROUP) {
+            groupID = chatInfo.getId();
+            isGroup = true;
+            entity.chatType = V2TIMConversation.V2TIM_GROUP;
+            entity.sender = groupID;
+        } else {
+            userID = chatInfo.getId();
+        }
+
+        V2TIMOfflinePushInfo v2TIMOfflinePushInfo = new V2TIMOfflinePushInfo();
+        v2TIMOfflinePushInfo.setExt(new Gson().toJson(containerBean).getBytes());
+        // OPPO必须设置ChannelID才可以收到推送消息，这个channelID需要和控制台一致
+        // OPPO must set a ChannelID to receive push messages. This channelID needs to be the same as the console.
+        v2TIMOfflinePushInfo.setAndroidOPPOChannelID("tuikit");
+        if (TUIChatConfigs.getConfigs().getGeneralConfig().isAndroidPrivateRing()) {
+            v2TIMOfflinePushInfo.setAndroidSound(OfflinePushInfoUtils.PRIVATE_RING_NAME);
+            v2TIMOfflinePushInfo.setAndroidFCMChannelID(OfflinePushInfoUtils.FCM_PUSH_CHANNEL_ID);
+        }
+        v2TIMOfflinePushInfo.setAndroidHuaWeiCategory("IM");
+
+        final V2TIMMessage v2TIMMessage = message.getV2TIMMessage();
+        v2TIMMessage.setExcludedFromUnreadCount(TUIChatConfigs.getConfigs().getGeneralConfig().isExcludedFromUnreadCount());
+        v2TIMMessage.setExcludedFromLastMessage(TUIChatConfigs.getConfigs().getGeneralConfig().isExcludedFromLastMessage());
+
+        String msgID = V2TIMManager.getMessageManager().sendMessage(v2TIMMessage, isGroup ? null : userID, isGroup ? groupID : null,
+                V2TIMMessage.V2TIM_PRIORITY_DEFAULT, false, v2TIMOfflinePushInfo, new V2TIMSendCallback<V2TIMMessage>() {
+                    @Override
+                    public void onProgress(int progress) {
+                        TUIChatUtils.callbackOnProgress(callBack, progress);
+                    }
+
+                    @Override
+                    public void onError(int code, String desc) {
+                        TUIChatUtils.callbackOnError(callBack, TAG, code, desc);
+                    }
+
+                    @Override
+                    public void onSuccess(V2TIMMessage v2TIMMessage) {
+                        TUIChatLog.v(TAG, "sendMessage onSuccess:" + v2TIMMessage.getMsgID());
+                        message.setV2TIMMessage(v2TIMMessage);
+                        TUIChatUtils.callbackOnSuccess(callBack, message);
+                        Map<String, Object> param = new HashMap<>();
+                        param.put(TUIConstants.TUIChat.CHAT_ID, chatInfo.getId());
+                        TUICore.notifyEvent(TUIConstants.TUIChat.EVENT_KEY_MESSAGE_EVENT, TUIConstants.TUIChat.EVENT_SUB_KEY_SEND_MESSAGE_SUCCESS, param);
+                    }
+                });
+        return msgID;
+    }
+
+    public String sendTypingStatusMessage(TUIMessageBean message, String receiver, IUIKitCallback<TUIMessageBean> callBack) {
+        String msgID = V2TIMManager.getMessageManager().sendMessage(message.getV2TIMMessage(), receiver, null, V2TIMMessage.V2TIM_PRIORITY_DEFAULT,
+                true, null, new V2TIMSendCallback<V2TIMMessage>() {
+
+                    @Override
+                    public void onError(int code, String desc) {
+                        TUIChatLog.v(TAG, "sendMessage fail:" + code + "=" + ErrorMessageConverter.convertIMError(code, desc));
+                        TUIChatUtils.callbackOnError(callBack, TAG, code, desc);
+                    }
+
+                    @Override
+                    public void onSuccess(V2TIMMessage v2TIMMessage) {
+                        TUIChatLog.v(TAG, "sendMessage onSuccess:" + v2TIMMessage.getMsgID());
+                        message.setStatus(TUIMessageBean.MSG_STATUS_SEND_SUCCESS);
+                        message.setV2TIMMessage(v2TIMMessage);
+                        TUIChatUtils.callbackOnSuccess(callBack, message);
+                        Map<String, Object> param = new HashMap<>();
+                        param.put(TUIConstants.TUIChat.CHAT_ID, receiver);
+                        TUICore.notifyEvent(TUIConstants.TUIChat.EVENT_KEY_MESSAGE_EVENT, TUIConstants.TUIChat.EVENT_SUB_KEY_SEND_MESSAGE_SUCCESS, param);
+                    }
+
+                    @Override
+                    public void onProgress(int progress) {
+
+                    }
+                });
+        return msgID;
+    }
+
+    public String sendMessage(TUIMessageBean messageInfo, boolean isGroup, String id, OfflinePushInfo offlinePushInfo, IUIKitCallback<TUIMessageBean> callBack) {
+        V2TIMMessage forwardMessage = messageInfo.getV2TIMMessage();
+        forwardMessage.setExcludedFromUnreadCount(TUIChatConfigs.getConfigs().getGeneralConfig().isExcludedFromUnreadCount());
+        forwardMessage.setExcludedFromLastMessage(TUIChatConfigs.getConfigs().getGeneralConfig().isExcludedFromLastMessage());
+
+        V2TIMOfflinePushInfo v2TIMOfflinePushInfo = OfflinePushInfoUtils.convertOfflinePushInfoToV2PushInfo(offlinePushInfo);
+        String msgId = V2TIMManager.getMessageManager().sendMessage(forwardMessage, isGroup ? null : id, isGroup ? id : null,
+                V2TIMMessage.V2TIM_PRIORITY_DEFAULT, false, v2TIMOfflinePushInfo, new V2TIMSendCallback<V2TIMMessage>() {
+                    @Override
+                    public void onProgress(int progress) {
+
+                    }
+
+                    @Override
+                    public void onError(int code, String desc) {
+                        TUIChatUtils.callbackOnError(callBack, TAG, code, desc);
+                    }
+
+                    @Override
+                    public void onSuccess(V2TIMMessage v2TIMMessage) {
+                        TUIMessageBean data = ChatMessageParser.parseMessage(v2TIMMessage);
+                        TUIChatUtils.callbackOnSuccess(callBack, data);
+                        Map<String, Object> param = new HashMap<>();
+                        param.put(TUIConstants.TUIChat.CHAT_ID, id);
+                        TUICore.notifyEvent(TUIConstants.TUIChat.EVENT_KEY_MESSAGE_EVENT, TUIConstants.TUIChat.EVENT_SUB_KEY_SEND_MESSAGE_SUCCESS, param);
+                    }
+                });
+        return msgId;
+    }
+
+
+    public void revokeMessage(TUIMessageBean messageInfo, IUIKitCallback<Void> callBack) {
+        V2TIMManager.getMessageManager().revokeMessage(messageInfo.getV2TIMMessage(), new V2TIMCallback() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIChatUtils.callbackOnError(callBack, TAG, code, desc);
+            }
+
+            @Override
+            public void onSuccess() {
+                TUIChatUtils.callbackOnSuccess(callBack, null);
+            }
+        });
+    }
+
+    public void deleteMessages(List<TUIMessageBean> messageInfoList, IUIKitCallback<Void> callBack) {
+
+        List<V2TIMMessage> v2TIMDeleteMessages = new ArrayList<>();
+        for (int i = 0; i < messageInfoList.size(); i++) {
+            v2TIMDeleteMessages.add(messageInfoList.get(i).getV2TIMMessage());
+        }
+
+        V2TIMManager.getMessageManager().deleteMessages(v2TIMDeleteMessages, new V2TIMCallback() {
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIChatUtils.callbackOnError(callBack, TAG, code, desc);
+                TUIChatLog.w(TAG, "deleteMessages code:" + code + "|desc:" + ErrorMessageConverter.convertIMError(code, desc));
+            }
+
+            @Override
+            public void onSuccess() {
+                TUIChatLog.i(TAG, "deleteMessages success");
+                TUIChatUtils.callbackOnSuccess(callBack, null);
+            }
+        });
+    }
+
+    public void setDraft(String conversationId, String draft) {
+        V2TIMManager.getConversationManager().setConversationDraft(conversationId, draft, new V2TIMCallback() {
+            @Override
+            public void onSuccess() {
+                TUIChatLog.i(TAG, "set draft success " + draft);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIChatLog.e(TAG, "set drafts error : " + code + " " + ErrorMessageConverter.convertIMError(code, desc));
+            }
+        });
+    }
+
+    public void getConversationLastMessage(String conversationId, IUIKitCallback<TUIMessageBean> callback) {
+        V2TIMManager.getConversationManager().getConversation(conversationId, new V2TIMValueCallback<V2TIMConversation>() {
+            @Override
+            public void onError(int code, String desc) {
+                Log.e(TAG, "getConversationLastMessage error:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
+            }
+
+            @Override
+            public void onSuccess(V2TIMConversation v2TIMConversation) {
+                V2TIMMessage lastMessage = v2TIMConversation.getLastMessage();
+                TUIMessageBean messageInfo = ChatMessageParser.parseMessage(lastMessage);
+                TUIChatUtils.callbackOnSuccess(callback, messageInfo);
+            }
+        });
+    }
+
+    public void sendGroupTipsMessage(String groupId, String message, IUIKitCallback<TUIMessageBean> callback) {
+        V2TIMMessage createTips = ChatMessageBuilder.buildGroupCustomMessage(message);
+        V2TIMManager.getMessageManager().sendMessage(createTips, null, groupId,
+                V2TIMMessage.V2TIM_PRIORITY_DEFAULT, false, null, new V2TIMSendCallback<V2TIMMessage>() {
+                    @Override
+                    public void onProgress(int progress) {
+
+                    }
+
+                    @Override
+                    public void onError(int code, String desc) {
+                        TUIChatUtils.callbackOnError(callback, TAG, code, desc);
+                    }
+
+                    @Override
+                    public void onSuccess(V2TIMMessage v2TIMMessage) {
+                        TUIChatLog.i(TAG, "sendTipsMessage onSuccess");
+                        TUIMessageBean messageInfo = ChatMessageParser.parseMessage(v2TIMMessage);
+                        TUIChatUtils.callbackOnSuccess(callback, messageInfo);
+                    }
+                });
+
+    }
+
+    public void addJoinGroupMessage(TUIMessageBean messageInfo, IUIKitCallback<List<GroupMemberInfo>> callback) {
+        V2TIMGroupTipsElem groupTips = null;
+        V2TIMMessage v2TIMMessage = messageInfo.getV2TIMMessage();
+        if (v2TIMMessage != null) {
+            groupTips = v2TIMMessage.getGroupTipsElem();
+        }
+        if (groupTips == null) {
+            TUIChatUtils.callbackOnError(callback, TAG, -1, "groupTips is null");
+            return;
+        }
+        List<V2TIMGroupMemberInfo> memberInfos = groupTips.getMemberList();
+        List<GroupMemberInfo> groupMemberInfoList = new ArrayList<>();
+        if (memberInfos.size() > 0) {
+            for (V2TIMGroupMemberInfo v2TIMGroupMemberInfo : memberInfos) {
+                GroupMemberInfo member = new GroupMemberInfo();
+                member.covertTIMGroupMemberInfo(v2TIMGroupMemberInfo);
+                groupMemberInfoList.add(member);
+            }
+        } else {
+            GroupMemberInfo member = new GroupMemberInfo();
+            member.covertTIMGroupMemberInfo(groupTips.getOpMember());
+            groupMemberInfoList.add(member);
+        }
+        TUIChatUtils.callbackOnSuccess(callback, groupMemberInfoList);
+    }
+
+    public void addLeaveGroupMessage(TUIMessageBean messageInfo, IUIKitCallback<List<String>> callback) {
+        V2TIMGroupTipsElem groupTips = null;
+        V2TIMMessage v2TIMMessage = messageInfo.getV2TIMMessage();
+        if (v2TIMMessage != null) {
+            groupTips = v2TIMMessage.getGroupTipsElem();
+        }
+        if (groupTips == null) {
+            TUIChatUtils.callbackOnError(callback, TAG, -1, "groupTips is null");
+            return;
+        }
+        List<V2TIMGroupMemberInfo> memberInfos = groupTips.getMemberList();
+        List<String> memberUserIds = new ArrayList<>();
+        if (memberInfos.size() > 0) {
+            for (V2TIMGroupMemberInfo v2TIMGroupMemberInfo : memberInfos) {
+                String memberUserID = v2TIMGroupMemberInfo.getUserID();
+                memberUserIds.add(memberUserID);
+            }
+        } else {
+            V2TIMGroupMemberInfo memberInfo = groupTips.getOpMember();
+            memberUserIds.add(memberInfo.getUserID());
+        }
+        TUIChatUtils.callbackOnSuccess(callback, memberUserIds);
+    }
+
+    public void addModifyGroupMessage(TUIMessageBean message, IUIKitCallback<Pair<Integer, String>> callback) {
+        V2TIMGroupTipsElem groupTips = null;
+        V2TIMMessage v2TIMMessage = message.getV2TIMMessage();
+        if (v2TIMMessage != null) {
+            groupTips = v2TIMMessage.getGroupTipsElem();
+        }
+        if (groupTips == null) {
+            TUIChatUtils.callbackOnError(callback, TAG, -1, "groupTips is null");
+            return;
+        }
+        List<V2TIMGroupChangeInfo> modifyList = groupTips.getGroupChangeInfoList();
+        if (modifyList.size() > 0) {
+            V2TIMGroupChangeInfo modifyInfo = modifyList.get(0);
+            int modifyType = modifyInfo.getType();
+            if (modifyType == V2TIMGroupChangeInfo.V2TIM_GROUP_INFO_CHANGE_TYPE_NAME) {
+                TUIChatUtils.callbackOnSuccess(callback, new Pair<>(TipsMessageBean.MSG_TYPE_GROUP_MODIFY_NAME, modifyInfo.getValue()));
+            } else if (modifyType == V2TIMGroupChangeInfo.V2TIM_GROUP_INFO_CHANGE_TYPE_NOTIFICATION) {
+                TUIChatUtils.callbackOnSuccess(callback, new Pair<>(TipsMessageBean.MSG_TYPE_GROUP_MODIFY_NOTICE, modifyInfo.getValue()));
+            }
+        }
+    }
+
+    public boolean checkFailedMessageInfo(TUIMessageBean message) {
+        if (message == null) {
+            return true;
+        }
+        V2TIMMessage v2TIMMessage = message.getV2TIMMessage();
+        if (v2TIMMessage.getStatus() == V2TIM_MSG_STATUS_SEND_FAIL) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public void getFriendName(String id, IUIKitCallback<String[]> callback) {
+        List<String> userIdList = new ArrayList<>();
+        userIdList.add(id);
+        V2TIMManager.getFriendshipManager().getFriendsInfo(userIdList, new V2TIMValueCallback<List<V2TIMFriendInfoResult>>() {
+            @Override
+            public void onSuccess(List<V2TIMFriendInfoResult> v2TIMFriendInfoResults) {
+                V2TIMFriendInfoResult result = v2TIMFriendInfoResults.get(0);
+                String[] nameArray = {result.getFriendInfo().getFriendRemark(), result.getFriendInfo().getUserProfile().getNickName()};
+                TUIChatUtils.callbackOnSuccess(callback, nameArray);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIChatUtils.callbackOnError(callback, code, desc);
+            }
+        });
+    }
+
+    public void findMessage(List<String> msgIds, IUIKitCallback<List<TUIMessageBean>> callback) {
+        V2TIMManager.getMessageManager().findMessages(msgIds, new V2TIMValueCallback<List<V2TIMMessage>>() {
+            @Override
+            public void onSuccess(List<V2TIMMessage> messages) {
+                List<TUIMessageBean> messageBeans = ChatMessageParser.parseMessageList(messages);
+                TUIChatUtils.callbackOnSuccess(callback, messageBeans);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIChatUtils.callbackOnError(callback, code, desc);
+            }
+        });
+
+    }
+
+    public void getGroupMessageBySeq(String chatId, long seq, IUIKitCallback<List<TUIMessageBean>> callback) {
+        V2TIMMessageListGetOption optionBackward = new V2TIMMessageListGetOption();
+        optionBackward.setCount(1);
+        optionBackward.setGetType(V2TIMMessageListGetOption.V2TIM_GET_LOCAL_OLDER_MSG);
+        optionBackward.setLastMsgSeq(seq);
+        optionBackward.setGroupID(chatId);
+
+        V2TIMManager.getMessageManager().getHistoryMessageList(optionBackward, new V2TIMValueCallback<List<V2TIMMessage>>() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIChatUtils.callbackOnError(callback, TAG, code, desc);
+                TUIChatLog.e(TAG, "loadChatMessages getHistoryMessageList optionBackward failed, code = " + code + ", desc = " + desc);
+            }
+
+            @Override
+            public void onSuccess(List<V2TIMMessage> v2TIMMessages) {
+                List<TUIMessageBean> messageInfoList = ChatMessageParser.parseMessageList(v2TIMMessages);
+                TUIChatUtils.callbackOnSuccess(callback, messageInfoList);
+            }
+        });
+    }
+
+    public void downloadMergerMessage(MergeMessageBean messageBean, IUIKitCallback<List<TUIMessageBean>> callback) {
+        V2TIMMergerElem mergerElem = messageBean.getMergerElem();
+        if (mergerElem != null) {
+            mergerElem.downloadMergerMessage(new V2TIMValueCallback<List<V2TIMMessage>>() {
+                @Override
+                public void onSuccess(List<V2TIMMessage> messageList) {
+                    List<TUIMessageBean> messageInfoList = ChatMessageParser.parseMessageList(messageList);
+                    TUIChatUtils.callbackOnSuccess(callback, messageInfoList);
+                }
+
+                @Override
+                public void onError(int code, String desc) {
+                    TUIChatUtils.callbackOnError(callback, "MergeMessageElemBean", code, desc);
+                }
+            });
+        }
+    }
+
+    public void getMessageReadReceipt(List<TUIMessageBean> messageBeanList, IUIKitCallback<List<MessageReceiptInfo>> callback) {
+        List<V2TIMMessage> messageList = new ArrayList<>();
+        for (TUIMessageBean messageBean : messageBeanList) {
+            messageList.add(messageBean.getV2TIMMessage());
+        }
+
+        V2TIMManager.getMessageManager().getMessageReadReceipts(messageList, new V2TIMValueCallback<List<V2TIMMessageReceipt>>() {
+            @Override
+            public void onSuccess(List<V2TIMMessageReceipt> v2TIMGroupMessageReceipts) {
+                List<MessageReceiptInfo> messageReceiptInfoList = new ArrayList<>();
+                for (V2TIMMessageReceipt receipt : v2TIMGroupMessageReceipts) {
+                    MessageReceiptInfo messageReceiptInfo = new MessageReceiptInfo();
+                    messageReceiptInfo.setMessageReceipt(receipt);
+                    messageReceiptInfoList.add(messageReceiptInfo);
+                }
+                TUIChatUtils.callbackOnSuccess(callback, messageReceiptInfoList);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIChatUtils.callbackOnError(callback, code, desc);
+            }
+        });
+    }
+
+    public void sendMessageReadReceipt(List<TUIMessageBean> messageBeanList, IUIKitCallback<Void> callback) {
+        List<V2TIMMessage> messageList = new ArrayList<>();
+        for (TUIMessageBean messageBean : messageBeanList) {
+            messageList.add(messageBean.getV2TIMMessage());
+        }
+
+        V2TIMManager.getMessageManager().sendMessageReadReceipts(messageList, new V2TIMCallback() {
+            @Override
+            public void onSuccess() {
+                TUIChatUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIChatUtils.callbackOnError(callback, code, desc);
+            }
+        });
+    }
+
+    public void getGroupMessageReadMembers(TUIMessageBean messageBean, boolean isRead, int count, long nextSeq, IUIKitCallback<GroupMessageReadMembersInfo> callback) {
+        V2TIMMessage message = messageBean.getV2TIMMessage();
+        int filter = isRead ? V2TIMMessage.V2TIM_GROUP_MESSAGE_READ_MEMBERS_FILTER_READ : V2TIMMessage.V2TIM_GROUP_MESSAGE_READ_MEMBERS_FILTER_UNREAD;
+        V2TIMManager.getMessageManager().getGroupMessageReadMemberList(message, filter, nextSeq, count, new V2TIMValueCallback<V2TIMGroupMessageReadMemberList>() {
+            @Override
+            public void onSuccess(V2TIMGroupMessageReadMemberList v2TIMGroupMessageReadMembers) {
+                GroupMessageReadMembersInfo messageReadMembersInfo = new GroupMessageReadMembersInfo();
+                messageReadMembersInfo.setReadMembers(v2TIMGroupMessageReadMembers);
+                TUIChatUtils.callbackOnSuccess(callback, messageReadMembersInfo);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIChatUtils.callbackOnError(callback, code, desc);
+            }
+        });
+    }
+
+    public void modifyMessage(TUIMessageBean messageBean, IUIKitCallback<TUIMessageBean> callback) {
+        V2TIMMessage v2TIMMessage = messageBean.getV2TIMMessage();
+        V2TIMManager.getMessageManager().modifyMessage(v2TIMMessage, new V2TIMCompleteCallback<V2TIMMessage>() {
+            @Override
+            public void onComplete(int code, String desc, V2TIMMessage v2TIMMessage) {
+                TUIMessageBean modifiedMessage = ChatMessageParser.parseMessage(v2TIMMessage);
+                if (code == ERR_SDK_MSG_MODIFY_CONFLICT) {
+                    TUIChatUtils.callbackOnError(callback, code, desc, modifiedMessage);
+                } else {
+                    TUIChatUtils.callbackOnSuccess(callback, modifiedMessage);
+                }
+            }
+        });
+    }
+
+    public void translateMessage(TUIMessageBean messageBean, IUIKitCallback<String> callback) {
+        V2TIMMessage v2TIMMessage = messageBean.getV2TIMMessage();
+        if (v2TIMMessage == null) {
+            TUIChatUtils.callbackOnError(callback, TAG, BaseConstants.ERR_INVALID_PARAMETERS, "translateMessage v2TIMMessage is null");
+            return;
+        }
+
+        if (v2TIMMessage.getElemType() != V2TIM_ELEM_TYPE_TEXT) {
+            TUIChatUtils.callbackOnError(callback, TAG, BaseConstants.ERR_INVALID_PARAMETERS, "translateMessage v2TIMMessage is not text type");
+            return;
+        }
+
+        if (messageBean.getTranslationStatus() == TUIMessageBean.MSG_TRANSLATE_STATUS_HIDDEN) {
+            messageBean.setTranslationStatus(TUIMessageBean.MSG_TRANSLATE_STATUS_SHOWN);
+            TUIChatUtils.callbackOnSuccess(callback, messageBean.getTranslation());
+            return;
+        }
+
+        messageBean.setTranslationStatus(TUIMessageBean.MSG_TRANSLATE_STATUS_LOADING);
+        String targetLanguage;
+        if (TextUtils.equals(TUIThemeManager.getInstance().getCurrentLanguage(), TUIThemeManager.LANGUAGE_ZH_CN)) {
+            targetLanguage = TUIThemeManager.LANGUAGE_ZH_CN;
+        } else {
+            targetLanguage = TUIThemeManager.LANGUAGE_EN;
+        }
+
+        List<String> atUserIDList = v2TIMMessage.getGroupAtUserList();
+        List<String> atRealUserIDList = new ArrayList<>();
+        List<String> groupAtUserNicknameList = new ArrayList<>();
+        List<Integer> atAllIndexList = new ArrayList<>();
+        for (int i = 0; i < atUserIDList.size(); i++) {
+            String userID = atUserIDList.get(i);
+            if (userID.equals(MessageAtInfo.AT_ALL_TAG)) {
+                atAllIndexList.add(i);
+            } else {
+                atRealUserIDList.add(userID);
+            }
+        }
+
+        if (atRealUserIDList.size() == 0) {
+            for (Integer atAllIndex : atAllIndexList) {
+                groupAtUserNicknameList.add(TUIChatService.getAppContext().getString(R.string.at_all));
+            }
+
+            translateMessage(messageBean, groupAtUserNicknameList, targetLanguage, callback);
+        } else {
+            V2TIMManager.getInstance().getUsersInfo(atRealUserIDList, new V2TIMValueCallback<List<V2TIMUserFullInfo>>() {
+                @Override
+                public void onSuccess(List<V2TIMUserFullInfo> v2TIMUserFullInfos) {
+                    for (String userID : v2TIMMessage.getGroupAtUserList()) {
+                        for (V2TIMUserFullInfo userFullInfo : v2TIMUserFullInfos) {
+                            if (userID.equals(MessageAtInfo.AT_ALL_TAG)) {
+                                groupAtUserNicknameList.add(userID);
+                                break;
+                            }
+
+                            if (userID.equals(userFullInfo.getUserID())) {
+                                groupAtUserNicknameList.add(userFullInfo.getNickName());
+                                break;
+                            }
+                        }
+                    }
+
+                    for (Integer atAllIndex : atAllIndexList) {
+                        groupAtUserNicknameList.set(atAllIndex, TUIChatService.getAppContext().getString(R.string.at_all));
+                    }
+
+                    translateMessage(messageBean, groupAtUserNicknameList, targetLanguage, callback);
+                }
+
+                @Override
+                public void onError(int code, String desc) {
+                    messageBean.setTranslationStatus(TUIMessageBean.MSG_TRANSLATE_STATUS_UNKNOWN);
+                    TUIChatLog.e(TAG, "translateMessage getUsersInfo error code = " + code + ",des = " + desc);
+                    TUIChatUtils.callbackOnError(callback, TAG, BaseConstants.ERR_INVALID_PARAMETERS, "translateMessage-getUsersInfo failed");
+                }
+            });
+        }
+    }
+
+    private void translateMessage(TUIMessageBean messageBean, List<String> groupAtUserNicknameList, String targetLanguage, IUIKitCallback<String> callback) {
+        V2TIMMessage v2TIMMessage = messageBean.getV2TIMMessage();
+        V2TIMTextElem timTextElem = v2TIMMessage.getTextElem();
+        HashMap<String, List<String>> splitMap = TUIChatUtils.splitTextByEmojiAndAtUsers(timTextElem.getText(), groupAtUserNicknameList);
+        List<String> toTranslateTextList = splitMap.get(TUIChatUtils.SPLIT_TEXT_FOR_TRANSLATION);
+
+        if (toTranslateTextList == null || toTranslateTextList.isEmpty()) {
+            List<String> splitTextList = splitMap.get(TUIChatUtils.SPLIT_TEXT);
+            String translateResult = "";
+            if (splitTextList != null) {
+                for (String result : splitTextList) {
+                    translateResult += result;
+                }
+            }
+            messageBean.setTranslation(translateResult);
+            TUIChatUtils.callbackOnSuccess(callback, translateResult);
+            return;
+        }
+
+        V2TIMManager.getMessageManager().translateText(toTranslateTextList, null, targetLanguage, new V2TIMValueCallback<HashMap<String, String>>() {
+            @Override
+            public void onSuccess(HashMap<String, String> translateHashMap) {
+                List<String> splitTextList = splitMap.get(TUIChatUtils.SPLIT_TEXT);
+                List<String> translationIndexList = splitMap.get(TUIChatUtils.SPLIT_TEXT_INDEX_FOR_TRANSLATION);
+                for (String indexString : translationIndexList) {
+                    int index = Integer.valueOf(indexString);
+                    String originText = splitTextList.get(index);
+                    String translatedResult = translateHashMap.get(originText);
+                    if (!TextUtils.isEmpty(translatedResult)) {
+                        splitTextList.set(index, translatedResult);
+                    }
+                }
+
+                String translateResult = "";
+                for (String result : splitTextList) {
+                    translateResult += result;
+                }
+
+                messageBean.setTranslation(translateResult);
+                TUIChatUtils.callbackOnSuccess(callback, translateResult);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                messageBean.setTranslationStatus(TUIMessageBean.MSG_TRANSLATE_STATUS_UNKNOWN);
+                TUIChatLog.e(TAG, "translateText error code = " + code + ",des = " + desc);
+                TUIChatUtils.callbackOnError(callback, code, desc);
+            }
+        });
+    }
+
+    public void getReactUserBean(List<String> userIds, IUIKitCallback<List<ReactUserBean>> callback) {
+        V2TIMManager.getFriendshipManager().getFriendsInfo(userIds, new V2TIMValueCallback<List<V2TIMFriendInfoResult>>() {
+            @Override
+            public void onSuccess(List<V2TIMFriendInfoResult> v2TIMFriendInfoResults) {
+                List<ReactUserBean> reactUserBeanList = new ArrayList<>();
+                for (V2TIMFriendInfoResult result : v2TIMFriendInfoResults) {
+                    ReactUserBean reactUserBean = new ReactUserBean();
+                    reactUserBean.setUserId(result.getFriendInfo().getUserID());
+                    reactUserBean.setFriendRemark(result.getFriendInfo().getFriendRemark());
+                    reactUserBean.setFaceUrl(result.getFriendInfo().getUserProfile().getFaceUrl());
+                    if (result.getFriendInfo().getUserProfile() != null) {
+                        reactUserBean.setNikeName(result.getFriendInfo().getUserProfile().getNickName());
+                    }
+                    reactUserBeanList.add(reactUserBean);
+                }
+                TUIChatUtils.callbackOnSuccess(callback, reactUserBeanList);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIChatUtils.callbackOnError(callback, code, desc);
+            }
+        });
+    }
+
+    public void getGroupMembersInfo(String groupId, List<String> groupMemberIds, IUIKitCallback<List<GroupMemberInfo>> callback) {
+        if (TUIChatUtils.isTopicGroup(groupId)) {
+            groupId = TUIChatUtils.getGroupIDFromTopicID(groupId);
+        }
+        V2TIMManager.getGroupManager().getGroupMembersInfo(groupId, groupMemberIds, new V2TIMValueCallback<List<V2TIMGroupMemberFullInfo>>() {
+            @Override
+            public void onSuccess(List<V2TIMGroupMemberFullInfo> v2TIMGroupMemberFullInfos) {
+                List<GroupMemberInfo> groupMemberInfos = new ArrayList<>();
+                for (V2TIMGroupMemberFullInfo fullInfo : v2TIMGroupMemberFullInfos) {
+                    groupMemberInfos.add(new GroupMemberInfo().covertTIMGroupMemberInfo(fullInfo));
+                }
+                TUIChatUtils.callbackOnSuccess(callback, groupMemberInfos);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIChatUtils.callbackOnError(callback, code, desc);
+            }
+        });
+    }
+
+    public void loadUserStatus(List<String> userIDs, IUIKitCallback<Map<String, UserStatusBean>> callback) {
+        if (userIDs == null || userIDs.size() == 0) {
+            TUIChatLog.d(TAG, "loadContactUserStatus datasource is null");
+            TUIChatUtils.callbackOnError(callback, -1, "data list is empty");
+            return;
+        }
+
+        V2TIMManager.getInstance().getUserStatus(userIDs, new V2TIMValueCallback<List<V2TIMUserStatus>>() {
+            @Override
+            public void onSuccess(List<V2TIMUserStatus> v2TIMUserStatuses) {
+                TUIChatLog.i(TAG, "getUserStatus success");
+                Map<String, UserStatusBean> userStatusBeanMap = new HashMap<>();
+                for (V2TIMUserStatus item : v2TIMUserStatuses) {
+                    UserStatusBean statusBean = new UserStatusBean();
+                    statusBean.setUserID(item.getUserID());
+                    statusBean.setOnlineStatus(item.getStatusType());
+                    userStatusBeanMap.put(item.getUserID(), statusBean);
+                }
+                TUIChatUtils.callbackOnSuccess(callback, userStatusBeanMap);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIChatLog.e(TAG, "getUserStatus error code = " + code + ",des = " + desc);
+                TUIChatUtils.callbackOnError(callback, code, desc);
+            }
+        });
+    }
+
+    public void loadGroupMembers(String groupID, long nextSeq, final IUIKitCallback<List<GroupMemberInfo>> callBack) {
+        int filter = V2TIMGroupMemberFullInfo.V2TIM_GROUP_MEMBER_FILTER_ALL;
+        V2TIMManager.getGroupManager().getGroupMemberList(groupID, filter, nextSeq, new V2TIMValueCallback<V2TIMGroupMemberInfoResult>() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIChatLog.e(TAG, "loadGroupMembers failed, code: " + code + "|desc: " + ErrorMessageConverter.convertIMError(code, desc));
+                TUIChatUtils.callbackOnError(callBack, code, desc);
+            }
+
+            @Override
+            public void onSuccess(V2TIMGroupMemberInfoResult v2TIMGroupMemberInfoResult) {
+                List<GroupMemberInfo> members = new ArrayList<>();
+                for (int i = 0; i < v2TIMGroupMemberInfoResult.getMemberInfoList().size(); i++) {
+                    GroupMemberInfo member = new GroupMemberInfo();
+                    members.add(member.covertTIMGroupMemberInfo(v2TIMGroupMemberInfoResult.getMemberInfoList().get(i)));
+                }
+                TUIChatUtils.callbackOnSuccess(callBack, members);
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/presenter/C2CChatPresenter.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/presenter/C2CChatPresenter.java
new file mode 100644
index 0000000..7fb9b82
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/presenter/C2CChatPresenter.java
@@ -0,0 +1,302 @@
+package com.tencent.qcloud.tuikit.tuichat.presenter;
+
+import android.text.TextUtils;
+
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageFeature;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageReceiptInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.MessageTypingBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.C2CChatEventListener;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class C2CChatPresenter extends ChatPresenter {
+    private static final String TAG = C2CChatPresenter.class.getSimpleName();
+
+    private ChatInfo chatInfo;
+
+    private C2CChatEventListener chatEventListener;
+
+    private TypingListener typingListener;
+
+    public C2CChatPresenter() {
+        super();
+        TUIChatLog.i(TAG, "C2CChatPresenter Init");
+    }
+
+    public void initListener() {
+        chatEventListener = new C2CChatEventListener() {
+            @Override
+            public void onReadReport(List<MessageReceiptInfo> receiptList) {
+                C2CChatPresenter.this.onReadReport(receiptList);
+            }
+
+            @Override
+            public void exitC2CChat(String chatId) {
+                C2CChatPresenter.this.onExitChat(chatId);
+            }
+
+            @Override
+            public void handleRevoke(String msgId) {
+                C2CChatPresenter.this.handleRevoke(msgId);
+            }
+
+            @Override
+            public void onRecvNewMessage(TUIMessageBean message) {
+                if (chatInfo == null || !TextUtils.equals(message.getUserId(), chatInfo.getId())) {
+                    TUIChatLog.i(TAG, "receive a new message , not belong to current chat.");
+                } else {
+                    if (message instanceof MessageTypingBean) {
+                        parseTypingMessage((MessageTypingBean) message);
+                        return;
+                    }
+                    C2CChatPresenter.this.onRecvNewMessage(message);
+                }
+            }
+
+            @Override
+            public void onFriendNameChanged(String userId, String newName) {
+                if (chatInfo == null || !TextUtils.equals(userId, chatInfo.getId())) {
+                    return;
+                }
+                C2CChatPresenter.this.onFriendInfoChanged();
+            }
+
+            @Override
+            public void onFriendFaceUrlChanged(String userId, String newFaceUrl) {
+                C2CChatPresenter.this.onFriendFaceUrlChanged(userId, newFaceUrl);
+            }
+
+            @Override
+            public void onRecvMessageModified(TUIMessageBean messageBean) {
+                if (chatInfo == null || !TextUtils.equals(messageBean.getUserId(), chatInfo.getId())) {
+                    return;
+                }
+                C2CChatPresenter.this.onRecvMessageModified(messageBean);
+            }
+
+            @Override
+            public void addMessage(TUIMessageBean messageBean, String chatId) {
+                if (TextUtils.equals(chatId, chatInfo.getId())) {
+                    addMessageInfo(messageBean);
+                }
+            }
+
+            @Override
+            public void clearC2CMessage(String userID) {
+                if (TextUtils.equals(userID, chatInfo.getId())) {
+                    clearMessage();
+                }
+            }
+
+            @Override
+            public void onMessageChanged(TUIMessageBean messageBean) {
+                updateMessageInfo(messageBean);
+            }
+        };
+        TUIChatService.getInstance().addC2CChatEventListener(chatEventListener);
+        initMessageSender();
+    }
+
+    /**
+     * 拉取消息
+     * @param type 向前，向后或者前后同时拉取
+     * @param lastMessageInfo 拉取消息的起始点
+     * 
+     * 
+     * pull message
+     * @param type Pull forward, backward, or both
+     * @param lastMessageInfo The starting point for pulling messages
+     */
+    @Override
+    public void loadMessage(int type, TUIMessageBean lastMessageInfo, IUIKitCallback<List<TUIMessageBean>> callback) {
+        if (chatInfo == null || isLoading) {
+            return;
+        }
+        isLoading = true;
+
+        String chatId = chatInfo.getId();
+        // 向前拉取更旧的消息
+        // Pull older messages forward
+        if (type == TUIChatConstants.GET_MESSAGE_FORWARD) {
+            provider.loadC2CMessage(chatId, MSG_PAGE_COUNT, lastMessageInfo, new IUIKitCallback<List<TUIMessageBean>>() {
+
+                @Override
+                public void onSuccess(List<TUIMessageBean> data) {
+                    TUIChatLog.i(TAG, "load c2c message success " + data.size());
+                    if (lastMessageInfo == null) {
+                        isHaveMoreNewMessage = false;
+                    }
+                    if (data.size() < MSG_PAGE_COUNT) {
+                        isHaveMoreOldMessage = false;
+                    }
+                    TUIChatUtils.callbackOnSuccess(callback, data);
+                    onMessageLoadCompleted(data, type);
+                }
+
+                @Override
+                public void onError(String module, int errCode, String errMsg) {
+                    TUIChatLog.e(TAG, "load c2c message failed " + errCode + "  " + errMsg);
+                    TUIChatUtils.callbackOnError(callback, errCode, errMsg);
+                }
+            });
+        } else { 
+            // 向后拉更新的消息 或者 前后同时拉消息
+            // Pull the updated message backward or pull the message forward and backward at the same time
+            loadHistoryMessageList(chatId, false, type, MSG_PAGE_COUNT, lastMessageInfo, callback);
+        }
+    }
+
+    // 加载消息成功之后会调用此方法
+    // This method is called after the message is loaded successfully
+    @Override
+    protected void onMessageLoadCompleted(List<TUIMessageBean> data, int getType) {
+        c2cReadReport(chatInfo.getId());
+        getMessageReadReceipt(data, getType);
+    }
+
+    public void setChatInfo(ChatInfo chatInfo) {
+        this.chatInfo = chatInfo;
+    }
+
+    public void setTypingListener(TypingListener typingListener) {
+        this.typingListener = typingListener;
+    }
+
+    private void parseTypingMessage(MessageTypingBean messageTypingBean) {
+        if (typingListener == null) {
+            TUIChatLog.e(TAG, "parseTypingMessage typingListener is null");
+            return;
+        }
+        typingListener.onTyping(messageTypingBean.getTypingStatus());
+    }
+
+    @Override
+    public ChatInfo getChatInfo() {
+        return chatInfo;
+    }
+
+    public void onFriendNameChanged(String newName) {
+        if (chatNotifyHandler != null) {
+            chatNotifyHandler.onFriendNameChanged(newName);
+        }
+    }
+
+    public void onFriendFaceUrlChanged(String userID, String faceUrl) {
+        if (TextUtils.equals(userID, chatInfo.getId())) {
+            if (chatNotifyHandler != null) {
+                chatNotifyHandler.onFriendFaceUrlChanged(faceUrl);
+            }
+        }
+    }
+
+
+    public void onReadReport(List<MessageReceiptInfo> receiptList) {
+        if (chatInfo != null) {
+            List<MessageReceiptInfo> processReceipts = new ArrayList<>();
+            for (MessageReceiptInfo messageReceiptInfo : receiptList) {
+                if (!TextUtils.equals(messageReceiptInfo.getUserID(), chatInfo.getId())) {
+                    continue;
+                }
+                processReceipts.add(messageReceiptInfo);
+            }
+            onMessageReadReceiptUpdated(loadedMessageInfoList, processReceipts);
+        }
+    }
+
+    public void onFriendInfoChanged() {
+        provider.getFriendName(chatInfo.getId(), new IUIKitCallback<String[]>() {
+            @Override
+            public void onSuccess(String[] data) {
+                String displayName = chatInfo.getId();
+                if (!TextUtils.isEmpty(data[0])) {
+                    displayName = data[0];
+                } else if (!TextUtils.isEmpty(data[1])) {
+                    displayName = data[1];
+                }
+                onFriendNameChanged(displayName);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+
+            }
+        });
+    }
+
+    public void sendTypingStatusMessage(TUIMessageBean message, String receiver, IUIKitCallback<TUIMessageBean> callBack) {
+        if (!safetyCall()) {
+            TUIChatLog.e(TAG, "sendTypingStatusMessage unSafetyCall");
+            return;
+        }
+        if (message == null || message.getStatus() == TUIMessageBean.MSG_STATUS_SENDING) {
+            TUIChatLog.e(TAG, "message is null");
+            return;
+        }
+
+        String msgId = provider.sendTypingStatusMessage(message, receiver, new IUIKitCallback<TUIMessageBean>() {
+                    @Override
+                    public void onSuccess(TUIMessageBean data) {
+                        TUIChatLog.v(TAG, "sendTypingStatusMessage onSuccess:" + data.getId());
+                        if (!safetyCall()) {
+                            TUIChatLog.w(TAG, "sendTypingStatusMessage unSafetyCall");
+                            return;
+                        }
+                        message.setStatus(TUIMessageBean.MSG_STATUS_SEND_SUCCESS);
+                        TUIChatUtils.callbackOnSuccess(callBack, data);
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        TUIChatLog.v(TAG, "sendTypingStatusMessage fail:" + errCode + "=" + errMsg);
+                        if (!safetyCall()) {
+                            TUIChatLog.w(TAG, "sendTypingStatusMessage unSafetyCall");
+                            return;
+                        }
+
+                        TUIChatUtils.callbackOnError(callBack, TAG, errCode, errMsg);
+                        message.setStatus(TUIMessageBean.MSG_STATUS_SEND_FAIL);
+                    }
+
+                    @Override
+                    public void onProgress(Object data) {
+                        TUIChatUtils.callbackOnProgress(callBack, data);
+                    }
+                });
+        //消息先展示，通过状态来确认发送是否成功
+        TUIChatLog.i(TAG, "sendTypingStatusMessage msgID:" + msgId);
+        message.setId(msgId);
+        message.setStatus(TUIMessageBean.MSG_STATUS_SENDING);
+    }
+
+    public boolean isSupportTyping(long time) {
+        if (loadedMessageInfoList == null || loadedMessageInfoList.size() == 0) {
+            return false;
+        }
+
+        int size = loadedMessageInfoList.size();
+        for (int i = size - 1; i >= 0 ; i--) {
+            TUIMessageBean tuiMessageBean = loadedMessageInfoList.get(i);
+            if (!tuiMessageBean.isSelf()) {
+                MessageFeature messageFeature = tuiMessageBean.isSupportTyping();
+                if (messageFeature != null && messageFeature.getNeedTyping() == 1) {
+                    int diff = (int) (time - tuiMessageBean.getMessageTime());
+                    if (diff < TUIChatConstants.TYPING_TRIGGER_CHAT_TIME) {
+                        return true;
+                    }
+
+                    return false;
+                }
+                break;
+            }
+        }
+        return false;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/presenter/ChatModifyMessageHelper.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/presenter/ChatModifyMessageHelper.java
new file mode 100644
index 0000000..f19f6c0
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/presenter/ChatModifyMessageHelper.java
@@ -0,0 +1,114 @@
+package com.tencent.qcloud.tuikit.tuichat.presenter;
+
+import android.os.Handler;
+
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.C2CChatEventListener;
+import com.tencent.qcloud.tuikit.tuichat.model.ChatProvider;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+
+// A modify message task queue which has a retry mechanism
+public class ChatModifyMessageHelper {
+    private static final int RETRY_TIMES = 3;
+    private static final int RETRY_MIN_TIME = 500;
+    private static final int RETRY_MAX_TIME = 3000;
+
+    private static final ChatModifyMessageHelper helper = new ChatModifyMessageHelper();
+    private final Handler handler;
+    private final ChatProvider provider;
+
+    // a cache to get newest be modified message
+    // it is visited in main thread , it is thread-safe
+    private final Map<String, TUIMessageBean> cache = new HashMap<>();
+
+    private ChatModifyMessageHelper() {
+        provider = new ChatProvider();
+        handler = new Handler();
+        // Only need to register c2c listener can also receive group message
+        C2CChatEventListener messageModifiedListener = new C2CChatEventListener() {
+            @Override
+            public void onRecvMessageModified(TUIMessageBean messageBean) {
+                onUpdateCache(messageBean);
+            }
+        };
+        TUIChatService.getInstance().addC2CChatEventListener(messageModifiedListener);
+    }
+
+    private void onUpdateCache(TUIMessageBean messageBean) {
+        if (cache.get(messageBean.getId()) != null) {
+            cache.put(messageBean.getId(), messageBean);
+        }
+    }
+
+    public static void enqueueTask(ModifyMessageTask task) {
+        enqueueTask(task, 0);
+    }
+
+    private static void enqueueTask(ModifyMessageTask task, long delay) {
+        helper.handler.postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                if (task.messageBean == null) {
+                    TUIChatUtils.callbackOnError(task.callback, -1, "params error , message is null");
+                    return;
+                }
+                TUIMessageBean beModifiedMessage = helper.cache.get(task.messageBean.getId());
+                if (beModifiedMessage != null) {
+                    task.messageBean = beModifiedMessage;
+                }
+                TUIMessageBean messageBean = task.packageMessage(task.messageBean);
+                if (messageBean == null) {
+                    helper.cache.remove(task.messageBean.getId());
+                    TUIChatUtils.callbackOnError(task.callback, -1, "message is null");
+                    return;
+                }
+                helper.provider.modifyMessage(messageBean, new IUIKitCallback<TUIMessageBean>() {
+                    @Override
+                    public void onSuccess(TUIMessageBean data) {
+                        helper.cache.remove(task.messageBean.getId());
+                        TUIChatUtils.callbackOnSuccess(task.callback, data);
+                    }
+
+                    @Override
+                    public void onError(int errCode, String errMsg, TUIMessageBean data) {
+                        // update message and post to task queue
+                        helper.cache.put(data.getId(), data);
+                        if (task.retryTimes <= RETRY_TIMES) {
+                            int delay = helper.getRetryDelay();
+                            task.retryTimes++;
+                            task.messageBean = data;
+                            ChatModifyMessageHelper.enqueueTask(task, delay);
+                        } else {
+                            helper.cache.remove(task.messageBean.getId());
+                            TUIChatUtils.callbackOnError(task.callback, errCode, errMsg);
+                        }
+                    }
+                });
+            }
+        }, delay);
+    }
+
+    // RETRY_MIN_TIME ~ RETRY_MAX_TIME ms
+    private int getRetryDelay() {
+        return new Random().nextInt(RETRY_MAX_TIME - RETRY_MIN_TIME + 1) + RETRY_MIN_TIME;
+    }
+
+    public abstract static class ModifyMessageTask {
+        private int retryTimes = 0;
+        private TUIMessageBean messageBean;
+        private final IUIKitCallback<TUIMessageBean> callback;
+
+        public ModifyMessageTask(TUIMessageBean messageBean, IUIKitCallback<TUIMessageBean> callback) {
+            this.messageBean = messageBean;
+            this.callback = callback;
+        }
+
+        public abstract TUIMessageBean packageMessage(TUIMessageBean originMessage);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/presenter/ChatPresenter.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/presenter/ChatPresenter.java
new file mode 100644
index 0000000..a391628
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/presenter/ChatPresenter.java
@@ -0,0 +1,1883 @@
+package com.tencent.qcloud.tuikit.tuichat.presenter;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+import android.text.TextUtils;
+
+import com.google.gson.Gson;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.BackgroundTasks;
+import com.tencent.qcloud.tuicore.util.ThreadHelper;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.GroupApplyInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageReactBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageReceiptInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageRepliesBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.OfflineMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.OfflineMessageContainerBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.OfflinePushInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.ReactUserBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.UserStatusBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.FaceMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.FileMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ImageMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.MergeMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.QuoteMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ReplyMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.SoundMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TextMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TipsMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.VideoMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.config.TUIChatConfigs;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.IBaseMessageSender;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.IMessageAdapter;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.IMessageRecyclerView;
+import com.tencent.qcloud.tuikit.tuichat.model.AIDenoiseSignatureManager;
+import com.tencent.qcloud.tuikit.tuichat.model.ChatProvider;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageBuilder;
+import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageParser;
+import com.tencent.qcloud.tuikit.tuichat.util.OfflinePushInfoUtils;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+
+public abstract class ChatPresenter {
+    private static final String TAG = ChatPresenter.class.getSimpleName();
+    // 逐条转发 Group 消息发送消息的时间间隔
+    // Time interval for forwarding Group messages one by one
+    private static final int FORWARD_GROUP_INTERVAL = 90; // 单位： 毫秒 ms
+    // 逐条转发 C2C 消息发送消息的时间间隔
+    // Time interval for forwarding C2C messages one by one
+    private static final int FORWARD_C2C_INTERVAL = 50; // 单位： 毫秒 ms
+    // 消息已读上报时间间隔
+    // Message read reporting interval
+    private static final int READ_REPORT_INTERVAL = 1000; // 单位： 毫秒 ms
+
+    protected static final int MSG_PAGE_COUNT = 20;
+
+    protected final ChatProvider provider;
+    protected List<TUIMessageBean> loadedMessageInfoList = new ArrayList<>();
+
+    protected IMessageAdapter messageListAdapter;
+
+    private IMessageRecyclerView messageRecyclerView;
+    private int currentChatUnreadCount = 0;
+    private TUIMessageBean mCacheNewMessage = null;
+
+    protected ChatNotifyHandler chatNotifyHandler;
+
+    private long lastReadReportTime = 0L;
+    private boolean canReadReport = true;
+    private final MessageReadReportHandler readReportHandler = new MessageReadReportHandler();
+
+    // 当前聊天界面是否显示，用来判断接收到消息是否设置已读
+    // Whether the current chat interface is displayed, used to determine whether the received message is set to read
+    private boolean isChatFragmentShow = false;
+
+    // 用来定位消息搜索时消息的位置
+    // Used to locate the location of the message when searching for a message
+    private TUIMessageBean locateMessage;
+
+    // 对其他模块暴露的消息发送接口
+    // Message sending interface exposed to other modules
+    private IBaseMessageSender baseMessageSender;
+
+    // 标识是否有 更新的 消息没有更新下来
+    // Identifies whether there is an updated message that has not been updated
+    protected boolean isHaveMoreNewMessage = true;
+
+    // 标识是否有 更旧的 消息没有更新下来
+    // Identifies if there are older messages that have not been updated
+    protected boolean isHaveMoreOldMessage = true;
+
+    protected boolean isLoading = false;
+
+    // 是否显示翻译的内容。合并转发的消息详情界面不用展示翻译内容。
+    // Whether to display the translated content. The merged-forwarded message details activity does not display the translated content.
+    protected boolean isNeedShowTranslation = true;
+
+    public ChatPresenter() {
+        TUIChatLog.i(TAG, "ChatPresenter Init");
+
+        provider = new ChatProvider();
+        AIDenoiseSignatureManager.getInstance().updateSignature();
+    }
+
+    protected void initMessageSender() {
+        baseMessageSender = new IBaseMessageSender() {
+
+            @Override
+            public void sendMessage(TUIMessageBean message, String receiver, boolean isGroup) {
+                ChatPresenter.this.sendMessage(message, receiver, isGroup);
+            }
+        };
+        TUIChatService.getInstance().setMessageSender(baseMessageSender);
+    }
+
+    public void loadMessage(int type, TUIMessageBean locateMessage) {
+        if (type == TUIChatConstants.GET_MESSAGE_BACKWARD && !isHaveMoreNewMessage) {
+            return;
+        }
+        if (type == TUIChatConstants.GET_MESSAGE_FORWARD && !isHaveMoreOldMessage) {
+            updateAdapter(IMessageRecyclerView.DATA_CHANGE_TYPE_ADD_FRONT, 0);
+            return;
+        }
+        loadMessage(type, locateMessage, null);
+    }
+
+    public void loadMessage(int type, TUIMessageBean locateMessage, IUIKitCallback<List<TUIMessageBean>> callback) {}
+
+    public void clearMessage() {
+        loadedMessageInfoList.clear();
+        messageListAdapter.onViewNeedRefresh(IMessageRecyclerView.DATA_CHANGE_TYPE_REFRESH, 0);
+    }
+
+    public void scrollToNewestMessage() {
+        if (!isHaveMoreNewMessage) {
+            messageListAdapter.onScrollToEnd();
+            return;
+        }
+        loadedMessageInfoList.clear();
+        messageListAdapter.onViewNeedRefresh(IMessageRecyclerView.DATA_CHANGE_TYPE_REFRESH, 0);
+        isHaveMoreOldMessage = true;
+        loadMessage(TUIChatConstants.GET_MESSAGE_FORWARD, null);
+    }
+
+    public void locateMessageBySeq(String chatId, long seq, IUIKitCallback<Void> callback) {
+        if (seq < 0) {
+            TUIChatUtils.callbackOnError(callback, -1, "invalid param");
+            return;
+        }
+
+        provider.getGroupMessageBySeq(chatId, seq, new IUIKitCallback<List<TUIMessageBean>>() {
+            @Override
+            public void onSuccess(List<TUIMessageBean> data) {
+                if (data == null || data.size() == 0) {
+                    TUIChatUtils.callbackOnError(callback, -1, "null message");
+                    return;
+                }
+                TUIMessageBean messageBean = data.get(0);
+                if (messageBean.getMsgSeq() != seq) {
+                    TUIChatUtils.callbackOnError(callback, - 1, "can't find origin message");
+                    return;
+                }
+                if (messageBean.getStatus() == TUIMessageBean.MSG_STATUS_REVOKE) {
+                    TUIChatUtils.callbackOnError(callback, -1, "origin msg is revoked");
+                    return;
+                }
+
+                locateMessage(messageBean.getId(), new IUIKitCallback<Void>() {
+                    @Override
+                    public void onSuccess(Void data) {
+
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        TUIChatUtils.callbackOnError(callback, errCode, errMsg);
+                    }
+                });
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIChatUtils.callbackOnError(callback, errCode, errMsg);
+            }
+        });
+    }
+
+    public void locateMessage(String originMsgId, IUIKitCallback<Void> callback) {
+        // 如果已经在列表中，直接跳转到对应位置，否则清空重新加载
+        // If it is already in the list, jump directly to the corresponding position, otherwise clear and reload
+        for (TUIMessageBean loadedMessage : loadedMessageInfoList) {
+            if (TextUtils.equals(originMsgId, loadedMessage.getId())) {
+                if (loadedMessage.getStatus() == TUIMessageBean.MSG_STATUS_REVOKE) {
+                    TUIChatUtils.callbackOnError(callback, -1, "origin msg is revoked");
+                    return;
+                }
+                updateAdapter(IMessageRecyclerView.SCROLL_TO_POSITION, loadedMessage);
+                return;
+            }
+        }
+
+        findMessage(originMsgId, new IUIKitCallback<TUIMessageBean>() {
+            @Override
+            public void onSuccess(TUIMessageBean data) {
+                if (data.getStatus() == TUIMessageBean.MSG_STATUS_REVOKE) {
+                    TUIChatUtils.callbackOnError(callback, -1, "origin msg is revoked");
+                    return;
+                }
+                loadedMessageInfoList.clear();
+                updateAdapter(IMessageRecyclerView.DATA_CHANGE_TYPE_REFRESH, 0);
+                loadMessage(TUIChatConstants.GET_MESSAGE_LOCATE, data, new IUIKitCallback<List<TUIMessageBean>>() {
+                    @Override
+                    public void onSuccess(List<TUIMessageBean> data) {
+
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                       TUIChatUtils.callbackOnError(callback, errCode, errMsg);
+                    }
+                });
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIChatUtils.callbackOnError(callback, errCode, errMsg);
+            }
+        });
+    }
+
+    public ChatInfo getChatInfo() {
+        return null;
+    }
+
+    protected void c2cReadReport(String userId) {
+        provider.c2cReadReport(userId);
+    };
+
+    protected void groupReadReport(String groupId) {
+        provider.groupReadReport(groupId);
+    };
+
+    public void setMessageListAdapter(IMessageAdapter messageListAdapter) {
+        this.messageListAdapter = messageListAdapter;
+    }
+
+    public void setMessageRecycleView(IMessageRecyclerView recycleView) {
+        this.messageRecyclerView = recycleView;
+        this.currentChatUnreadCount = 0;
+        this.mCacheNewMessage = null;
+    }
+
+    private void loadToWayMessageAsync(String chatId, boolean isGroup, int getType, int loadCount,
+                                       TUIMessageBean locateMessageInfo, IUIKitCallback<List<TUIMessageBean>> callback) {
+        List<TUIMessageBean> firstLoadedData = new ArrayList<>();
+        List<TUIMessageBean> secondLoadedData = new ArrayList<>();
+        firstLoadedData.add(locateMessageInfo);
+        ChatPresenter.this.locateMessage = locateMessageInfo;
+        CountDownLatch latch = new CountDownLatch(2);
+        final boolean[] isFailed = {false};
+        Runnable forwardRunnable = new Runnable() {
+            @Override
+            public void run() {
+                provider.loadHistoryMessageList(chatId, isGroup, loadCount / 2, locateMessageInfo, TUIChatConstants.GET_MESSAGE_BACKWARD, new IUIKitCallback<List<TUIMessageBean>>() {
+                    @Override
+                    public void onSuccess(List<TUIMessageBean> firstData) {
+                        if (firstData.size() >= loadCount / 2) {
+                            isHaveMoreNewMessage = true;
+                        } else {
+                            isHaveMoreNewMessage = false;
+                        }
+                        firstLoadedData.addAll(firstData);
+                        latch.countDown();
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        TUIChatUtils.callbackOnError(callback, errCode, errMsg);
+                        isFailed[0] = true;
+                        latch.countDown();
+                    }
+                });
+            }
+        };
+
+        Runnable backwardRunnable = new Runnable() {
+            @Override
+            public void run() {
+                // 拉取历史消息的时候不会把 lastMsg 返回，需要手动添加上
+                // LastMsg will not be returned when pulling historical messages, you need to add it manually
+                provider.loadHistoryMessageList(chatId, isGroup, loadCount / 2, locateMessageInfo, TUIChatConstants.GET_MESSAGE_FORWARD, new IUIKitCallback<List<TUIMessageBean>>() {
+                    @Override
+                    public void onSuccess(List<TUIMessageBean> secondData) {
+                        if (secondData.size() < loadCount / 2) {
+                            isHaveMoreOldMessage = false;
+                        }
+                        secondLoadedData.addAll(secondData);
+                        latch.countDown();
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        isFailed[0] = true;
+                        latch.countDown();
+                    }
+                });
+            }
+        };
+
+        Runnable mergeRunnable = new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    latch.await();
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+                if (isFailed[0]) {
+                    TUIChatUtils.callbackOnError(callback, -1, "load failed");
+                    return;
+                }
+                Collections.reverse(firstLoadedData);
+                secondLoadedData.addAll(0, firstLoadedData);
+                BackgroundTasks.getInstance().runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        onMessageLoadCompleted(secondLoadedData, getType);
+                    }
+                });
+                TUIChatUtils.callbackOnSuccess(callback, secondLoadedData);
+            }
+        };
+
+        ThreadHelper.INST.execute(forwardRunnable);
+        ThreadHelper.INST.execute(backwardRunnable);
+        ThreadHelper.INST.execute(mergeRunnable);
+
+    }
+
+    public void loadHistoryMessageList(String chatId, boolean isGroup, int getType, int loadCount,
+                                          TUIMessageBean locateMessageInfo, IUIKitCallback<List<TUIMessageBean>> callback) {
+        // 如果是前后同时拉取消息，需要拉取两次，第一次向后拉取，第二次向前拉取
+        // 例如现在有消息 1,2,3,4,5,6,7  locateMessageInfo 是 4
+        // 如果 getType 为 GET_MESSAGE_FORWARD， 就会拉取到消息 1,2,3
+        // 如果 getType 为 GET_MESSAGE_BACKWARD， 就会拉取到消息 5,6,7
+        // 如果 getType 为 GET_MESSAGE_TWO_WAY， 就会拉取到消息 1,2,3,5,6,7 ， 4 要手动加上
+        // If you are pulling messages before and after the same time, you need to pull twice, the first time to pull back, 
+        // the second time to pull forward
+        if (getType == TUIChatConstants.GET_MESSAGE_TWO_WAY || getType == TUIChatConstants.GET_MESSAGE_LOCATE) {
+            loadToWayMessageAsync(chatId, isGroup, getType, loadCount, locateMessageInfo, callback);
+            return;
+        }
+
+        provider.loadHistoryMessageList(chatId, isGroup, loadCount, locateMessageInfo, getType, new IUIKitCallback<List<TUIMessageBean>>() {
+            @Override
+            public void onSuccess(List<TUIMessageBean> firstData) {
+                if (getType == TUIChatConstants.GET_MESSAGE_BACKWARD) {
+                    if (firstData.size() >= loadCount) {
+                        isHaveMoreNewMessage = true;
+                    } else {
+                        isHaveMoreNewMessage = false;
+                    }
+                }
+                onMessageLoadCompleted(firstData, getType);
+                TUIChatUtils.callbackOnSuccess(callback, firstData);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIChatUtils.callbackOnError(callback, errCode, errMsg);
+            }
+        });
+    }
+
+    protected void onMessageLoadCompleted(List<TUIMessageBean> data, int getType) {};
+
+    // 加载消息成功之后会调用此方法
+    // This method is called after the message is loaded successfully
+    protected void getMessageReadReceipt(List<TUIMessageBean> data, int getType) {
+        getMessageReadReceipt(data, new IUIKitCallback<List<MessageReceiptInfo>>() {
+            @Override
+            public void onSuccess(List<MessageReceiptInfo> receiptInfoList) {
+                for (MessageReceiptInfo messageReceiptInfo : receiptInfoList) {
+                    for (TUIMessageBean messageBean : data) {
+                        if (TextUtils.equals(messageBean.getId(), messageReceiptInfo.getMsgID())) {
+                            messageBean.setMessageReceiptInfo(messageReceiptInfo);
+                        }
+                    }
+                }
+                processLoadedMessage(data, getType);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                processLoadedMessage(data, getType);
+            }
+        });
+    }
+
+    protected void processLoadedMessage(List<TUIMessageBean> data, int type) {
+        preProcessMessage(data, new IUIKitCallback<List<TUIMessageBean>>() {
+            @Override
+            public void onSuccess(List<TUIMessageBean> processedData) {
+                onLoadedMessageProcessed(processedData, type);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                onLoadedMessageProcessed(data, type);
+            }
+        });
+    }
+
+    public void getMessageReadReceipt(List<TUIMessageBean> messageBeanList, IUIKitCallback<List<MessageReceiptInfo>> callback) {
+        provider.getMessageReadReceipt(messageBeanList, callback);
+    }
+
+    private void removeDuplication(List<TUIMessageBean> messageBeans) {
+        onMessageListDeleted(messageBeans);
+    }
+
+    private void onMessageListDeleted(List<TUIMessageBean> messageBeanList) {
+        if (messageBeanList == null || messageBeanList.isEmpty()) {
+            return;
+        }
+        for (TUIMessageBean messageBean : messageBeanList) {
+            onMessageDeleted(messageBean);
+        }
+    }
+
+    private void onMessageDeleted(TUIMessageBean messageBean) {
+        if (messageBean == null) {
+            return;
+        }
+        Iterator<TUIMessageBean> iterator = loadedMessageInfoList.listIterator();
+        while (iterator.hasNext()) {
+            TUIMessageBean loadedMessageBean = iterator.next();
+            if (TextUtils.equals(loadedMessageBean.getId(), messageBean.getId())) {
+                updateAdapter(IMessageRecyclerView.DATA_CHANGE_TYPE_DELETE, loadedMessageBean);
+                iterator.remove();
+            }
+        }
+    }
+
+    private void onLoadedMessageProcessed(List<TUIMessageBean> data, int type) {
+
+        boolean isForward = type == TUIChatConstants.GET_MESSAGE_FORWARD;
+        boolean isTwoWay = type == TUIChatConstants.GET_MESSAGE_TWO_WAY;
+        boolean isLocate = type == TUIChatConstants.GET_MESSAGE_LOCATE;
+        if (isForward || isTwoWay || isLocate) {
+            Collections.reverse(data);
+        }
+        if (isForward || isTwoWay || isLocate) {
+            removeDuplication(data);
+            loadedMessageInfoList.addAll(0, data);
+            if (isForward) {
+                // 如果是初次加载，要强制跳转到底部
+                // If it is the first load, force jump to the bottom
+                if (loadedMessageInfoList.size() == data.size()) {
+                    updateAdapter(IMessageRecyclerView.DATA_CHANGE_TYPE_LOAD, data.size());
+                } else {
+                    updateAdapter(IMessageRecyclerView.DATA_CHANGE_TYPE_ADD_FRONT, data.size());
+                }
+            } else if (isTwoWay) {
+                updateAdapter(IMessageRecyclerView.DATA_CHANGE_LOCATE_TO_POSITION, locateMessage);
+            } else {
+                updateAdapter(IMessageRecyclerView.DATA_CHANGE_SCROLL_TO_POSITION, locateMessage);
+            }
+        } else {
+            removeDuplication(data);
+            loadedMessageInfoList.addAll(data);
+            updateAdapter(IMessageRecyclerView.DATA_CHANGE_TYPE_ADD_BACK, data.size());
+        }
+
+        isLoading = false;
+    }
+
+    private void preProcessMessage(TUIMessageBean messageBean, IUIKitCallback<TUIMessageBean> callback) {
+        List<TUIMessageBean> messageBeans = new ArrayList<>();
+        messageBeans.add(messageBean);
+        preProcessMessage(messageBeans, new IUIKitCallback<List<TUIMessageBean>>() {
+            @Override
+            public void onSuccess(List<TUIMessageBean> data) {
+                if (data != null && data.size() == 1) {
+                    TUIChatUtils.callbackOnSuccess(callback, data.get(0));
+                } else {
+                    TUIChatUtils.callbackOnError(callback, -1 , "preProcessReplyMessage failed");
+                }
+
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIChatUtils.callbackOnError(callback, errCode , "preProcessReplyMessage failed");
+            }
+        });
+    }
+
+    /**
+     * 预查找回复消息，成功说明成功查找到原始消息，否则未查找到原始消息
+     * 
+     * Pre-find the reply message, success indicates that the original message was found successfully,
+     * otherwise the original message was not found
+     */
+    protected void preProcessMessage(List<TUIMessageBean> data, IUIKitCallback<List<TUIMessageBean>> callback) {
+        List<String> msgIdList = new ArrayList<>();
+        for (TUIMessageBean messageBean : data) {
+            if (messageBean instanceof QuoteMessageBean) {
+                msgIdList.add(((QuoteMessageBean) messageBean).getOriginMsgId());
+            }
+        }
+        CountDownLatch latch = new CountDownLatch(2);
+        Runnable findMessageRunnable = new Runnable() {
+            @Override
+            public void run() {
+                if (msgIdList.isEmpty()) {
+                    latch.countDown();
+                    return;
+                }
+                findMessage(msgIdList, new IUIKitCallback<List<TUIMessageBean>>() {
+                    @Override
+                    public void onSuccess(List<TUIMessageBean> originData) {
+                        for (int i = 0; i < originData.size(); i++) {
+                            TUIMessageBean originMessageBean = originData.get(i);
+                            if (originMessageBean == null) {
+                                continue;
+                            }
+                            for (TUIMessageBean messageBean : data) {
+                                if (messageBean instanceof QuoteMessageBean) {
+                                    if (TextUtils.equals(((QuoteMessageBean) messageBean).getOriginMsgId(), originMessageBean.getId())) {
+                                        ((QuoteMessageBean) messageBean).setOriginMessageBean(originMessageBean);
+                                    }
+                                }
+                            }
+                        }
+                        latch.countDown();
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        latch.countDown();
+                    }
+                });
+            }
+        };
+        ThreadHelper.INST.execute(findMessageRunnable);
+
+        Runnable parseReactUserNameRunnable = new Runnable() {
+            @Override
+            public void run() {
+                Set<String> userIdSet = getReactUserNames(data);
+                userIdSet.addAll(getReplyUserNames(data));
+                if (userIdSet.isEmpty()) {
+                    latch.countDown();
+                    return;
+                }
+                getReactUserBean(userIdSet, new IUIKitCallback<Map<String, ReactUserBean>>() {
+                    @Override
+                    public void onSuccess(Map<String, ReactUserBean> map) {
+                        for (TUIMessageBean messageBean : data) {
+                            MessageReactBean reactBean = messageBean.getMessageReactBean();
+                            if (reactBean != null) {
+                                reactBean.setReactUserBeanMap(map);
+                            }
+                            MessageRepliesBean repliesBean = messageBean.getMessageRepliesBean();
+                            if (repliesBean != null) {
+                                setMessageReplyBean(repliesBean, map);
+                            }
+                        }
+                        latch.countDown();
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        latch.countDown();
+                    }
+                });
+            }
+        };
+        ThreadHelper.INST.execute(parseReactUserNameRunnable);
+
+        Runnable mergeRunnable = new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    latch.await();
+                } catch (InterruptedException e) {
+                    TUIChatUtils.callbackOnError(callback, -1, "mergeRunnable error");
+
+                    e.printStackTrace();
+                }
+                Runnable runnable = new Runnable() {
+                    @Override
+                    public void run() {
+                        TUIChatUtils.callbackOnSuccess(callback, data);
+                    }
+                };
+                BackgroundTasks.getInstance().runOnUiThread(runnable);
+            }
+        };
+        ThreadHelper.INST.execute(mergeRunnable);
+    }
+
+    public void setMessageReplyBean(MessageRepliesBean repliesBean, Map<String, ReactUserBean> map) {
+        List<MessageRepliesBean.ReplyBean> replyBeanList = repliesBean.getReplies();
+        if (replyBeanList != null && replyBeanList.size() > 0) {
+            for (MessageRepliesBean.ReplyBean replyBean : replyBeanList) {
+                ReactUserBean userBean = map.get(replyBean.getMessageSender());
+                if (userBean != null) {
+                    replyBean.setSenderFaceUrl(userBean.getFaceUrl());
+                    replyBean.setSenderShowName(userBean.getDisplayString());
+                }
+            }
+        }
+    }
+
+    public Set<String> getReplyUserNames(List<TUIMessageBean> messageBeans) {
+        Set<String> userIdSet = new HashSet<>();
+        for (TUIMessageBean messageBean : messageBeans) {
+            MessageRepliesBean messageRepliesBean = messageBean.getMessageRepliesBean();
+            if (messageRepliesBean != null && messageRepliesBean.getRepliesSize() > 0) {
+                List<MessageRepliesBean.ReplyBean> replyBeanList = messageRepliesBean.getReplies();
+                for (MessageRepliesBean.ReplyBean replyBean : replyBeanList) {
+                    userIdSet.add(replyBean.getMessageSender());
+                }
+            }
+        }
+        return userIdSet;
+    }
+
+    public Set<String> getReactUserNames(List<TUIMessageBean> messageBeans) {
+        Set<String> userIdSet = new HashSet<>();
+        for (TUIMessageBean messageBean : messageBeans) {
+            MessageReactBean bean = messageBean.getMessageReactBean();
+            if (bean == null) {
+                continue;
+            }
+            Map<String, Set<String>> map = bean.getReacts();
+            if (map == null) {
+                continue;
+            }
+            for (Set<String> idSet : map.values()) {
+                userIdSet.addAll(idSet);
+            }
+        }
+        return userIdSet;
+    }
+
+    protected void addMessageInfo(TUIMessageBean messageInfo) {
+        if (messageInfo == null) {
+            return;
+        }
+        if (checkExist(messageInfo)) {
+            return;
+        }
+        loadedMessageInfoList.add(messageInfo);
+        updateAdapter(IMessageRecyclerView.DATA_CHANGE_NEW_MESSAGE, 1);
+    }
+
+    protected void onRecvNewMessage(TUIMessageBean msg) {
+        TUIChatLog.i(TAG, "onRecvNewMessage msgID:" + msg.getId());
+        if (chatNotifyHandler != null) {
+            chatNotifyHandler.onRecvNewMessage(msg);
+        }
+        if (!isHaveMoreNewMessage) {
+            addMessage(msg);
+        }
+    }
+
+    protected void addMessage(TUIMessageBean messageInfo) {
+        if (!safetyCall()) {
+            TUIChatLog.w(TAG, "addMessage unSafetyCall");
+            return;
+        }
+
+        preProcessMessage(messageInfo, new IUIKitCallback<TUIMessageBean>() {
+            @Override
+            public void onSuccess(TUIMessageBean data) {
+                addMessageAfterPreProcess(data);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                addMessageAfterPreProcess(messageInfo);
+            }
+        });
+    }
+
+    private void addMessageAfterPreProcess(TUIMessageBean messageInfo) {
+        if (messageInfo != null) {
+            boolean isGroupMessage = false;
+            String groupID = null;
+            String userID = null;
+            if (!TextUtils.isEmpty(messageInfo.getGroupId())) {
+                isGroupMessage = true;
+                groupID = messageInfo.getGroupId();
+            } else if (!TextUtils.isEmpty(messageInfo.getUserId())) {
+                userID = messageInfo.getUserId();
+            } else {
+                return;
+            }
+
+            addMessageInfo(messageInfo);
+
+            if (isChatFragmentShow()) {
+                if (messageRecyclerView != null && messageRecyclerView.isDisplayJumpMessageLayout()) {
+                    if (messageInfo.getStatus() != TUIMessageBean.MSG_STATUS_REVOKE) {
+                        currentChatUnreadCount ++;
+                        if (mCacheNewMessage == null) {
+                            mCacheNewMessage = messageInfo;
+                        }
+                        messageRecyclerView.displayBackToNewMessage(true, mCacheNewMessage.getId(), currentChatUnreadCount);
+                    } else if (messageInfo.getStatus() == TUIMessageBean.MSG_STATUS_REVOKE){
+                        currentChatUnreadCount --;
+                        if (currentChatUnreadCount == 0) {
+                            messageRecyclerView.displayBackToNewMessage(false, "", 0);
+                            mCacheNewMessage = null;
+                        } else {
+                            messageRecyclerView.displayBackToNewMessage(true, mCacheNewMessage.getId(), currentChatUnreadCount);
+                        }
+                    }
+                } else {
+                    mCacheNewMessage = null;
+                    currentChatUnreadCount = 0;
+                    if (isGroupMessage) {
+                        limitReadReport(groupID, true);
+                    } else {
+                        limitReadReport(userID, false);
+                    }
+                }
+            }
+        }
+    }
+
+    public void resetNewMessageCount() {
+        currentChatUnreadCount = 0;
+        mCacheNewMessage = null;
+    }
+
+    public void sendMessageReadReceipt(List<TUIMessageBean> messageBeanList, IUIKitCallback<Void> callback) {
+        List<TUIMessageBean> messageBeans = new ArrayList<>();
+        for (TUIMessageBean messageBean : messageBeanList) {
+            if (messageBean.isNeedReadReceipt()) {
+                messageBeans.add(messageBean);
+            }
+        }
+        if (messageBeans.isEmpty()) {
+            return;
+        }
+        provider.sendMessageReadReceipt(messageBeans, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                TUIChatUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIChatLog.e(TAG, "sendMessageReadReceipt failed, errCode " + errCode + " errMsg " + errMsg);
+                TUIChatUtils.callbackOnError(callback, errCode, errMsg);
+            }
+        });
+    }
+
+    public void onMessageReadReceiptUpdated(List<TUIMessageBean> messageBeanList, List<MessageReceiptInfo> data) {
+        for (MessageReceiptInfo receiptInfo : data) {
+            for (int i = 0; i < messageBeanList.size(); i++) {
+                TUIMessageBean messageBean = loadedMessageInfoList.get(i);
+                if (TextUtils.equals(messageBean.getId(), receiptInfo.getMsgID())) {
+                    messageBean.setMessageReceiptInfo(receiptInfo);
+                    updateAdapter(IMessageRecyclerView.DATA_CHANGE_TYPE_UPDATE, i);
+                }
+            }
+        }
+    }
+
+    public void resetCurrentChatUnreadCount() {
+        this.currentChatUnreadCount = 0;
+        this.mCacheNewMessage = null;
+    }
+
+    public boolean isChatFragmentShow() {
+        return isChatFragmentShow;
+    }
+
+    public void setChatFragmentShow(boolean isChatFragmentShow) {
+        this.isChatFragmentShow = isChatFragmentShow;
+    }
+
+    public boolean isNeedShowTranslation() {
+        return isNeedShowTranslation;
+    }
+
+    public void setNeedShowTranslation(boolean needShowTranslation) {
+        isNeedShowTranslation = needShowTranslation;
+    }
+
+    private void notifyTyping() {
+        if (!safetyCall()) {
+            TUIChatLog.w(TAG, "notifyTyping unSafetyCall");
+            return;
+        }
+    }
+
+    public void sendMessage(final TUIMessageBean messageInfo, String receiver, boolean isGroup) {
+        if (!TextUtils.isEmpty(receiver)) {
+            if (!TextUtils.equals(getChatInfo().getId(), receiver) || isGroup != TUIChatUtils.isGroupChat(getChatInfo().getType())) {
+                return;
+            }
+        }
+        sendMessage(messageInfo, false, null);
+    }
+
+    public void sendMessage(final TUIMessageBean message, boolean retry, final IUIKitCallback<TUIMessageBean> callBack) {
+        if (Thread.currentThread() != Looper.getMainLooper().getThread()) {
+            BackgroundTasks.getInstance().runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    sendMessage(message, retry, callBack);
+                }
+            });
+            return;
+        }
+        if (!safetyCall()) {
+            TUIChatLog.w(TAG, "sendMessage unSafetyCall");
+            return;
+        }
+        if (message == null || message.getStatus() == TUIMessageBean.MSG_STATUS_SENDING) {
+            return;
+        }
+        assembleGroupMessage(message);
+        notifyConversationInfo(getChatInfo());
+
+        String msgId = provider.sendMessage(message, getChatInfo(), new IUIKitCallback<TUIMessageBean>() {
+
+            @Override
+            public void onSuccess(TUIMessageBean data) {
+                TUIChatLog.v(TAG, "sendMessage onSuccess:" + data.getId());
+                if (!safetyCall()) {
+                    TUIChatLog.w(TAG, "sendMessage unSafetyCall");
+                    return;
+                }
+                message.setStatus(TUIMessageBean.MSG_STATUS_SEND_SUCCESS);
+                if (message instanceof FileMessageBean) {
+                    message.setDownloadStatus(FileMessageBean.MSG_STATUS_DOWNLOADED);
+                }
+                TUIChatUtils.callbackOnSuccess(callBack, data);
+                updateMessageInfo(message);
+                Map<String, Object> param = new HashMap<>();
+                param.put(TUIChatConstants.MESSAGE_BEAN, data);
+                TUICore.notifyEvent(TUIChatConstants.EVENT_KEY_MESSAGE_STATUS_CHANGED, TUIChatConstants.EVENT_SUB_KEY_MESSAGE_SEND, param);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIChatLog.v(TAG, "sendMessage fail:" + errCode + "=" + errMsg);
+                if (!safetyCall()) {
+                    TUIChatLog.w(TAG, "sendMessage unSafetyCall");
+                    return;
+                }
+
+                TUIChatUtils.callbackOnError(callBack, TAG, errCode, errMsg);
+
+                message.setStatus(TUIMessageBean.MSG_STATUS_SEND_FAIL);
+                updateMessageInfo(message);
+            }
+
+            @Override
+            public void onProgress(Object data) {
+                TUIChatUtils.callbackOnProgress(callBack, data);
+            }
+        });
+        // 消息先展示，通过状态来确认发送是否成功
+        // The message is displayed first, and the status is used to confirm whether the sending is successful
+        TUIChatLog.i(TAG, "sendMessage msgID:" + msgId);
+        message.setId(msgId);
+        message.setStatus(TUIMessageBean.MSG_STATUS_SENDING);
+        if (retry) {
+            resendMessageInfo(message);
+        } else {
+            addMessageInfo(message);
+        }
+    }
+
+    private void notifyConversationInfo(ChatInfo chatInfo) {
+        String conversationId;
+        if (ChatInfo.TYPE_GROUP == chatInfo.getType()) {
+            conversationId = "group_" + chatInfo.getId();
+        } else {
+            conversationId = "c2c_" + chatInfo.getId();
+        }
+
+        Map<String, Object> param = new HashMap<>();
+        param.put(TUIConstants.TUIConversation.CONVERSATION_ID, conversationId);
+        TUICore.notifyEvent(TUIConstants.TUIConversation.EVENT_KEY_MESSAGE_SEND_FOR_CONVERSATION, TUIConstants.TUIConversation.EVENT_SUB_KEY_MESSAGE_SEND_FOR_CONVERSATION, param);
+    }
+
+    public void sendTypingStatusMessage(TUIMessageBean message, String receiver, IUIKitCallback<TUIMessageBean> callBack) {}
+
+    public boolean isSupportTyping(long time) {
+        return false;
+    }
+
+    protected void updateMessageInfo(TUIMessageBean messageInfo) {
+        for (int i = 0; i < loadedMessageInfoList.size(); i++) {
+            if (loadedMessageInfoList.get(i) == null) {
+                continue;
+            }
+            if (loadedMessageInfoList.get(i).getId().equals(messageInfo.getId())) {
+                loadedMessageInfoList.set(i, messageInfo);
+                updateAdapter(IMessageRecyclerView.DATA_CHANGE_TYPE_UPDATE, messageInfo);
+                return;
+            }
+        }
+    }
+
+    private void resendMessageInfo(TUIMessageBean messageInfo) {
+        onMessageDeleted(messageInfo);
+        addMessageInfo(messageInfo);
+    }
+
+    public void deleteMessage(TUIMessageBean messageInfo) {
+        if (!safetyCall()) {
+            TUIChatLog.w(TAG, "deleteMessage unSafetyCall");
+            return;
+        }
+
+        List<TUIMessageBean> msgs = new ArrayList<>();
+        msgs.add(messageInfo);
+
+        provider.deleteMessages(msgs, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                onMessageDeleted(messageInfo);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+
+            }
+        });
+
+    }
+
+
+    public void handleRevoke(String msgId) {
+        if (!safetyCall()) {
+            TUIChatLog.w(TAG, "handleInvoke unSafetyCall");
+            return;
+        }
+        TUIChatLog.i(TAG, "handleInvoke msgID = " + msgId);
+        for (int i = 0; i < loadedMessageInfoList.size(); i++) {
+            TUIMessageBean messageInfo = loadedMessageInfoList.get(i);
+            // 一条包含多条元素的消息，撤回时，会把所有元素都撤回，所以下面的判断即使满足条件也不能return
+            // A message containing multiple elements, when withdrawn, will withdraw all elements, 
+            // so the following judgment cannot return even if the conditions are met
+            if (messageInfo.getId().equals(msgId)) {
+                messageInfo.setStatus(TUIMessageBean.MSG_STATUS_REVOKE);
+                updateAdapter(IMessageRecyclerView.DATA_CHANGE_TYPE_UPDATE, i);
+
+                if (isChatFragmentShow()) {
+                    if (messageRecyclerView != null && messageRecyclerView.isDisplayJumpMessageLayout()) {
+                        if (messageInfo.getStatus() == TUIMessageBean.MSG_STATUS_REVOKE){
+                            currentChatUnreadCount --;
+                            if (currentChatUnreadCount <= 0) {
+                                messageRecyclerView.displayBackToNewMessage(false, "", 0);
+                                mCacheNewMessage = null;
+                                currentChatUnreadCount = 0;
+                            } else {
+                                boolean isNeedRefreshCacheNewMessage = false;
+                                ChatInfo chatInfo = getChatInfo();
+                                if (chatInfo != null) {
+                                    if (chatInfo.getType() == ChatInfo.TYPE_GROUP) {
+                                        isNeedRefreshCacheNewMessage = messageInfo.getV2TIMMessage().getSeq() <= mCacheNewMessage.getV2TIMMessage().getSeq() ? true : false;
+                                    } else {
+                                        isNeedRefreshCacheNewMessage = messageInfo.getV2TIMMessage().getTimestamp() <= mCacheNewMessage.getV2TIMMessage().getTimestamp() ? true : false;
+                                    }
+                                }
+
+                                if (!isNeedRefreshCacheNewMessage) {
+                                    messageRecyclerView.displayBackToNewMessage(true, mCacheNewMessage.getId(), currentChatUnreadCount);
+                                    return;
+                                }
+
+                                if ((i + 1) < loadedMessageInfoList.size()) {
+                                    mCacheNewMessage = loadedMessageInfoList.get(i + 1);
+                                    messageRecyclerView.displayBackToNewMessage(true, mCacheNewMessage.getId(), currentChatUnreadCount);
+                                } else {
+                                    messageRecyclerView.displayBackToNewMessage(false, "", 0);
+                                    mCacheNewMessage = null;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    protected boolean safetyCall() {
+        if (getChatInfo() == null) {
+            return false;
+        }
+        return true;
+    }
+
+    public void markMessageAsRead(ChatInfo chatInfo) {
+        if (chatInfo == null) {
+            TUIChatLog.i(TAG, "markMessageAsRead() chatInfo is null");
+            return;
+        }
+
+        boolean isGroup;
+        if (chatInfo.getType() == ChatInfo.TYPE_C2C) {
+            isGroup = false;
+        } else {
+            isGroup = true;
+        }
+        String chatId = chatInfo.getId();
+        if (isGroup) {
+            groupReadReport(chatId);
+        } else {
+            c2cReadReport(chatId);
+        }
+    }
+
+    /**
+     * 收到消息上报已读加频率限制
+     * @param chatId 如果是 C2C 消息， chatId 是 userId, 如果是 Group 消息 chatId 是 groupId
+     * @param isGroup 是否为 Group 消息
+     * 
+     * Receive a message and report that it has been read and add frequency limit
+     */
+    private void limitReadReport(final String chatId, boolean isGroup) {
+        final long currentTime = System.currentTimeMillis();
+        long timeDifference = currentTime - lastReadReportTime;
+        if (timeDifference >= READ_REPORT_INTERVAL) {
+            readReport(chatId, isGroup);
+            lastReadReportTime = currentTime;
+        } else {
+            if (!canReadReport) {
+                TUIChatLog.d(TAG, "limitReadReport : Reporting , please wait.");
+                return;
+            }
+            long delay = READ_REPORT_INTERVAL - timeDifference;
+            TUIChatLog.d(TAG, "limitReadReport : Please retry after " + delay + " ms.");
+            canReadReport = false;
+            readReportHandler.postDelayed(new Runnable() {
+                @Override
+                public void run() {
+                    readReport(chatId, isGroup);
+                    lastReadReportTime = System.currentTimeMillis();
+                    canReadReport = true;
+                }
+            }, delay);
+        }
+    }
+
+    private void readReport(String userId, boolean isGroup) {
+        if (!isGroup) {
+            TUIChatLog.i(TAG, "C2C message ReadReport userId is " + userId);
+            c2cReadReport(userId);
+        } else {
+            TUIChatLog.i(TAG, "Group message ReadReport groupId is " + userId);
+            groupReadReport(userId);
+        }
+    }
+
+    protected void updateAdapter(int type, int value) {
+        if (messageListAdapter != null) {
+            messageListAdapter.onDataSourceChanged(loadedMessageInfoList);
+            messageListAdapter.onViewNeedRefresh(type, value);
+        }
+    }
+
+    protected void updateAdapter(int type, TUIMessageBean locateMessage) {
+        if (messageListAdapter != null) {
+            messageListAdapter.onDataSourceChanged(loadedMessageInfoList);
+            messageListAdapter.onViewNeedRefresh(type, locateMessage);
+        }
+    }
+
+    protected boolean checkExist(TUIMessageBean msg) {
+        if (msg != null) {
+            String msgId = msg.getId();
+            for (int i = loadedMessageInfoList.size() - 1; i >= 0; i--) {
+                if (loadedMessageInfoList.get(i).getId().equals(msgId)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    public void deleteMessageInfos(final List<TUIMessageBean> messageInfos) {
+        if (!safetyCall() || messageInfos == null || messageInfos.isEmpty()) {
+            TUIChatLog.w(TAG, "deleteMessages unSafetyCall");
+            return;
+        }
+
+        provider.deleteMessages(messageInfos, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                onMessageListDeleted(messageInfos);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+
+            }
+        });
+    }
+
+    public void deleteMessages(final List<Integer> positions) {
+        if (!safetyCall() || positions == null || positions.isEmpty()) {
+            TUIChatLog.w(TAG, "deleteMessages unSafetyCall");
+            return;
+        }
+        List<TUIMessageBean> msgs = new ArrayList<>();
+        for(int i = 0; i < positions.size(); i++) {
+            msgs.add(loadedMessageInfoList.get(positions.get(i)));
+        }
+
+        provider.deleteMessages(msgs, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                onMessageListDeleted(msgs);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+
+            }
+        });
+    }
+
+    public boolean checkFailedMessageInfos(final List<TUIMessageBean> messageInfos){
+        if (!safetyCall() || messageInfos == null || messageInfos.isEmpty()) {
+            TUIChatLog.w(TAG, "checkFailedMessagesById unSafetyCall");
+            return false;
+        }
+
+        boolean failed = false;
+        for (int i = 0; i < messageInfos.size(); i++) {
+            if (provider.checkFailedMessageInfo(messageInfos.get(i))) {
+                failed = true;
+                break;
+            }
+        }
+
+        return failed;
+    }
+
+    public List<TUIMessageBean> getSelectPositionMessage(final List<Integer> positions){
+        if (!safetyCall() || positions == null || positions.isEmpty()) {
+            TUIChatLog.w(TAG, "getSelectPositionMessage unSafetyCall");
+            return null;
+        }
+
+        List<TUIMessageBean> msgs = new ArrayList<>();
+        for(int i = 0; i < positions.size(); i++) {
+            if (positions.get(i) < loadedMessageInfoList.size()) {
+                msgs.add(loadedMessageInfoList.get(positions.get(i)));
+            } else {
+                TUIChatLog.d(TAG, "mCurrentProvider not include SelectPosition ");
+            }
+        }
+        return msgs;
+    }
+
+    public List<TUIMessageBean> getSelectPositionMessageById(final List<String> msgIds){
+        if (!safetyCall() || msgIds == null || msgIds.isEmpty()) {
+            TUIChatLog.w(TAG, "getSelectPositionMessageById unSafetyCall");
+            return null;
+        }
+
+        List<TUIMessageBean> messageInfos = loadedMessageInfoList;
+        if (messageInfos == null || messageInfos.size() <= 0) {
+            return null;
+        }
+
+        final List<TUIMessageBean> msgSelectedMsgInfos = new ArrayList<>();
+        for (int i = 0; i < msgIds.size(); i++) {
+            for (int j = 0; j < messageInfos.size(); j++) {
+                if (msgIds.get(i).equals(messageInfos.get(j).getId())) {
+                    msgSelectedMsgInfos.add(messageInfos.get(j));
+                    break;
+                }
+            }
+        }
+
+        return msgSelectedMsgInfos;
+    }
+
+    public void revokeMessage(final TUIMessageBean message) {
+        if (!safetyCall()) {
+            TUIChatLog.w(TAG, "revokeMessage unSafetyCall");
+            return;
+        }
+        provider.revokeMessage(message, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                if (message instanceof ReplyMessageBean) {
+                    modifyRootMessageToRemoveReplyInfo((ReplyMessageBean) message, new IUIKitCallback<Void>() {
+                        @Override
+                        public void onError(String module, int errCode, String errMsg) {
+                            ToastUtil.toastShortMessage("modify message failed code = " + errCode + " message = " + errMsg);
+                        }
+                    });
+                }
+                updateMessageRevoked(message.getId());
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                if (errCode == ChatProvider.ERR_REVOKE_TIME_LIMIT_EXCEED
+                        || errCode == ChatProvider.ERR_REVOKE_TIME_LIMIT_SVR_GROUP
+                        || errCode == ChatProvider.ERR_REVOKE_TIME_LIMIT_SVR_MESSAGE) {
+                    ToastUtil.toastLongMessage(TUIChatService.getAppContext().getString(R.string.send_two_mins));
+                } else {
+                    ToastUtil.toastLongMessage(TUIChatService.getAppContext().getString(R.string.revoke_fail) + errCode + "=" + errMsg);
+                }
+            }
+        });
+    }
+
+    public boolean updateMessageRevoked(String msgId) {
+        for (int i = 0; i < loadedMessageInfoList.size(); i++) {
+            TUIMessageBean messageInfo = loadedMessageInfoList.get(i);
+            // 一条包含多条元素的消息，撤回时，会把所有元素都撤回，所以下面的判断即使满足条件也不能return
+            // A message containing multiple elements, when withdrawn, will withdraw all elements, 
+            // so the following judgment cannot return even if the conditions are met
+            if (messageInfo.getId().equals(msgId)) {
+                messageInfo.setStatus(TUIMessageBean.MSG_STATUS_REVOKE);
+                updateAdapter(IMessageRecyclerView.DATA_CHANGE_TYPE_UPDATE, i);
+            }
+        }
+        return false;
+    }
+
+    public List<TUIMessageBean> forwardTextMessageForSelected(List<TUIMessageBean> msgInfos) {
+        // 选择文字转发只能是一条消息的操作
+        // Selecting text forwarding can only be a message operation
+        if (msgInfos != null && msgInfos.size() >1) {
+            return msgInfos;
+        }
+
+        List<TUIMessageBean> forwardMsgInfos = new ArrayList<>();
+        TUIMessageBean messageBean = msgInfos.get(0);
+        if (messageBean instanceof TextMessageBean) {
+            TextMessageBean textMessageBean = (TextMessageBean) messageBean;
+            if (textMessageBean.getText().equals(textMessageBean.getSelectText())) {
+                return msgInfos;
+            } else {
+                TUIMessageBean selectedMessageBean = ChatMessageBuilder.buildTextMessage(textMessageBean.getSelectText());
+                forwardMsgInfos.add(selectedMessageBean);
+                return forwardMsgInfos;
+            }
+        } else {
+            return msgInfos;
+        }
+    }
+    public void forwardMessage(List<TUIMessageBean> msgInfos, boolean isGroup, String id, String offlineTitle, int forwardMode, boolean selfConversation, boolean onlyForTranslation, final IUIKitCallback callBack) {
+        if (!safetyCall()) {
+            TUIChatLog.w(TAG, "sendMessage unSafetyCall");
+            return;
+        }
+
+        for (TUIMessageBean messageBean : msgInfos) {
+            if (messageBean instanceof  TextMessageBean) {
+                TUIChatLog.d(TAG, "chatprensetor forwardMessage onTextSelected selectedText = " + ((TextMessageBean) messageBean).getSelectText());
+            }
+        }
+
+        // 选中转发暂不做特殊处理，转发原消息
+        // If forwarding is selected, no special treatment will be performed for the time being, and the original message will be forwarded.
+        //List<TUIMessageBean> forwardMsgInfos = forwardTextMessageForSelected(msgInfos);
+        if (forwardMode == TUIChatConstants.FORWARD_MODE_ONE_BY_ONE) {
+            forwardMessageOneByOne(msgInfos, isGroup, id, offlineTitle, selfConversation, onlyForTranslation, callBack);
+        } else if (forwardMode == TUIChatConstants.FORWARD_MODE_MERGE) {
+            forwardMessageMerge(msgInfos, isGroup, id, offlineTitle, selfConversation, callBack);
+        } else {
+            TUIChatLog.d(TAG, "invalid forwardMode");
+        }
+    }
+
+    public void forwardMessageOneByOne(final List<TUIMessageBean> msgInfos, final boolean isGroup,
+                                       final String id, final String offlineTitle, final boolean selfConversation,
+                                       final boolean onlyForTranslation, final IUIKitCallback callBack) {
+        if (msgInfos == null || msgInfos.isEmpty()){
+            return;
+        }
+
+        Runnable forwardMessageRunnable = new Runnable() {
+            @Override
+            public void run() {
+                int timeInterval = isGroup ? FORWARD_GROUP_INTERVAL : FORWARD_C2C_INTERVAL;
+                for(int j = 0; j < msgInfos.size(); j++){
+                    TUIMessageBean info = msgInfos.get(j);
+                    TUIMessageBean message;
+                    if (onlyForTranslation) {
+                        message = ChatMessageBuilder.buildTextMessage(info.getTranslation());
+                    } else {
+                        message = ChatMessageBuilder.buildForwardMessage(info.getV2TIMMessage());
+                    }
+
+                    if (selfConversation) {
+                        sendMessage(message, false, callBack);
+                        try {
+                            Thread.sleep(timeInterval);
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                        continue;
+                    }
+
+                    if (message == null || message.getStatus() == TUIMessageBean.MSG_STATUS_SENDING) {
+                        continue;
+                    }
+                    if (isGroup) {
+                        filterGroupMessageReceipt(message, id);
+                    }
+                    OfflineMessageContainerBean containerBean = new OfflineMessageContainerBean();
+                    OfflineMessageBean entity = new OfflineMessageBean();
+                    entity.content = message.getExtra().toString();
+                    entity.sender = message.getSender();
+                    entity.nickname = TUIChatConfigs.getConfigs().getGeneralConfig().getUserNickname();
+                    entity.faceUrl = TUIChatConfigs.getConfigs().getGeneralConfig().getUserFaceUrl();
+                    containerBean.entity = entity;
+
+                    if (isGroup) {
+                        entity.chatType = ChatInfo.TYPE_GROUP;
+                        entity.sender = id;
+                    }
+
+                    OfflinePushInfo offlinePushInfo = new OfflinePushInfo();
+                    offlinePushInfo.setExtension(new Gson().toJson(containerBean).getBytes());
+                    offlinePushInfo.setDescription(offlineTitle);
+                    // OPPO必须设置ChannelID才可以收到推送消息，这个channelID需要和控制台一致
+                    // OPPO must set a ChannelID to receive push messages. This channelID needs to be the same as the console.
+                    offlinePushInfo.setAndroidOPPOChannelID("tuikit");
+                    if (TUIChatConfigs.getConfigs().getGeneralConfig().isAndroidPrivateRing()) {
+                        offlinePushInfo.setAndroidSound(OfflinePushInfoUtils.PRIVATE_RING_NAME);
+                    }
+
+                    forwardMessageInternal(message, isGroup, id, offlinePushInfo, callBack);
+                    try {
+                        Thread.sleep(timeInterval);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        };
+        Thread forwardThread = new Thread(forwardMessageRunnable);
+        forwardThread.setName("ForwardMessageThread");
+        ThreadHelper.INST.execute(forwardThread);
+    }
+
+
+    private void filterGroupMessageReceipt(TUIMessageBean messageBean, String groupID) {
+        if (TUIChatUtils.isCommunityGroup(groupID)) {
+            messageBean.setNeedReadReceipt(false);
+        }
+    }
+
+    protected void assembleGroupMessage(TUIMessageBean message) {
+    }
+
+    public void forwardMessageMerge(List<TUIMessageBean> msgInfos, boolean isGroup, String id, String offlineTitle, boolean selfConversation, final IUIKitCallback callBack) {
+        if (msgInfos == null || msgInfos.isEmpty()){
+            return;
+        }
+
+        Context context = TUIChatService.getAppContext();
+        if (context == null) {
+            TUIChatLog.d(TAG, "context == null");
+            return;
+        }
+        //abstractList
+        List<String> abstractList = new ArrayList<>();
+        for(int j = 0; j < msgInfos.size() && j < 3; j++){
+            TUIMessageBean messageBean = msgInfos.get(j);
+            String userid = ChatMessageParser.getDisplayName(messageBean.getV2TIMMessage());
+            if (messageBean instanceof TipsMessageBean) {
+                // do nothing
+            } else if (messageBean instanceof TextMessageBean) {
+                abstractList.add(userid + ":" + messageBean.getExtra());
+            } else if (messageBean instanceof FaceMessageBean) {
+                abstractList.add(userid + ":" + context.getString(R.string.custom_emoji));
+            } else if (messageBean instanceof SoundMessageBean) {
+                abstractList.add(userid + ":" + context.getString(R.string.audio_extra));
+            } else if (messageBean instanceof ImageMessageBean) {
+                abstractList.add(userid + ":" + context.getString(R.string.picture_extra));
+            } else if (messageBean instanceof VideoMessageBean) {
+                abstractList.add(userid + ":" + context.getString(R.string.video_extra));
+            } else if (messageBean instanceof FileMessageBean) {
+                abstractList.add(userid + ":" + context.getString(R.string.file_extra));
+            } else if (messageBean instanceof MergeMessageBean) {
+                abstractList.add(userid + ":" + context.getString(R.string.forward_extra));
+            } else {
+                abstractList.add(userid + ":" + messageBean.getExtra());
+            }
+        }
+
+        //createMergerMessage
+        TUIMessageBean msgInfo = ChatMessageBuilder.buildMergeMessage(msgInfos, offlineTitle, abstractList,
+                TUIChatService.getAppContext().getString(R.string.forward_compatible_text));
+
+        if (selfConversation) {
+            sendMessage(msgInfo, false, callBack);
+            return;
+        }
+        if (isGroup) {
+            filterGroupMessageReceipt(msgInfo, id);
+        }
+
+        OfflineMessageContainerBean containerBean = new OfflineMessageContainerBean();
+        OfflineMessageBean entity = new OfflineMessageBean();
+        entity.content = msgInfo.getExtra().toString();
+        entity.sender = msgInfo.getSender();
+        entity.nickname = TUIChatConfigs.getConfigs().getGeneralConfig().getUserNickname();
+        entity.faceUrl = TUIChatConfigs.getConfigs().getGeneralConfig().getUserFaceUrl();
+        containerBean.entity = entity;
+
+        if (isGroup) {
+            entity.chatType = ChatInfo.TYPE_GROUP;
+            entity.sender = id;
+        }
+
+        OfflinePushInfo offlinePushInfo = new OfflinePushInfo();
+        offlinePushInfo.setExtension(new Gson().toJson(containerBean).getBytes());
+        offlinePushInfo.setDescription(offlineTitle);
+        // OPPO必须设置ChannelID才可以收到推送消息，这个channelID需要和控制台一致
+        // OPPO must set a ChannelID to receive push messages. This channelID needs to be the same as the console.
+        offlinePushInfo.setAndroidOPPOChannelID("tuikit");
+        if (TUIChatConfigs.getConfigs().getGeneralConfig().isAndroidPrivateRing()) {
+            offlinePushInfo.setAndroidSound(OfflinePushInfoUtils.PRIVATE_RING_NAME);
+        }
+
+        forwardMessageInternal(msgInfo, isGroup, id, offlinePushInfo, callBack);
+    }
+
+    public void forwardMessageInternal(final TUIMessageBean message, boolean isGroup, String id, OfflinePushInfo offlinePushInfo, final IUIKitCallback callBack) {
+        if (message == null) {
+            TUIChatLog.e(TAG, "forwardMessageInternal null message!");
+            return;
+        }
+
+        String msgId = provider.sendMessage(message, isGroup, id, offlinePushInfo, new IUIKitCallback<TUIMessageBean>() {
+
+            @Override
+            public void onSuccess(TUIMessageBean data) {
+                if (!safetyCall()) {
+                    TUIChatLog.w(TAG, "sendMessage unSafetyCall");
+                    return;
+                }
+
+                TUIChatUtils.callbackOnSuccess(callBack, data);
+                message.setStatus(TUIMessageBean.MSG_STATUS_SEND_SUCCESS);
+                updateMessageInfo(message);
+                Map<String, Object> param = new HashMap<>();
+                param.put(TUIChatConstants.MESSAGE_BEAN, data);
+                TUICore.notifyEvent(TUIChatConstants.EVENT_KEY_MESSAGE_STATUS_CHANGED, TUIChatConstants.EVENT_SUB_KEY_MESSAGE_SEND, param);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIChatLog.v(TAG, "sendMessage fail:" + errCode + "=" + errMsg);
+                if (!safetyCall()) {
+                    TUIChatLog.w(TAG, "sendMessage unSafetyCall");
+                    return;
+                }
+                TUIChatUtils.callbackOnError(callBack, errCode, errMsg);
+                message.setStatus(TUIMessageBean.MSG_STATUS_SEND_FAIL);
+                updateMessageInfo(message);
+            }
+        });
+        // 消息先展示，通过状态来确认发送是否成功
+        // The message is displayed first, and the status is used to confirm whether the sending is successful
+        TUIChatLog.i(TAG, "sendMessage msgID:" + msgId);
+        message.setId(msgId);
+        message.setStatus(TUIMessageBean.MSG_STATUS_SENDING);
+    }
+
+    public void loadApplyList(IUIKitCallback<List<GroupApplyInfo>> callBack) {
+        provider.loadApplyInfo(new IUIKitCallback<List<GroupApplyInfo>>() {
+            @Override
+            public void onSuccess(List<GroupApplyInfo> data) {
+                if (!(getChatInfo() instanceof GroupInfo)) {
+                    return;
+                }
+                String groupId = getChatInfo().getId();
+                List<GroupApplyInfo> applyInfos = new ArrayList<>();
+                for (int i = 0; i < data.size(); i++) {
+                    GroupApplyInfo applyInfo = data.get(i);
+                    if (groupId.equals(applyInfo.getGroupApplication().getGroupID())
+                            && !applyInfo.isStatusHandled()) {
+                        applyInfos.add(applyInfo);
+                    }
+                }
+                TUIChatUtils.callbackOnSuccess(callBack, applyInfos);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIChatUtils.callbackOnError(callBack, module, errCode, errMsg);
+            }
+        });
+
+    }
+
+    public void setDraft(String draft) {
+        ChatInfo chatInfo = getChatInfo();
+        if (chatInfo == null) {
+            return;
+        }
+        String conversationId = TUIChatUtils.getConversationIdByUserId(chatInfo.getId(), TUIChatUtils.isGroupChat(chatInfo.getType()));
+        provider.setDraft(conversationId, draft);
+    }
+
+    public void getConversationLastMessage(String conversationId, IUIKitCallback<TUIMessageBean> callback) {
+        provider.getConversationLastMessage(conversationId, callback);
+    }
+
+    public void findMessage(String msgId, IUIKitCallback<TUIMessageBean> callback) {
+        for (TUIMessageBean messageBean : loadedMessageInfoList) {
+            if (TextUtils.equals(msgId, messageBean.getId())) {
+                TUIChatUtils.callbackOnSuccess(callback, messageBean);
+                return;
+            }
+        }
+        List<String> msgList = new ArrayList<>();
+        msgList.add(msgId);
+        provider.findMessage(msgList, new IUIKitCallback<List<TUIMessageBean>>() {
+            @Override
+            public void onSuccess(List<TUIMessageBean> data) {
+                if (data != null && !data.isEmpty()) {
+                    TUIChatUtils.callbackOnSuccess(callback, data.get(0));
+                } else {
+                    TUIChatUtils.callbackOnError(callback, -1, "can't find message");
+                }
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIChatUtils.callbackOnError(callback, errCode, errMsg);
+            }
+        });
+    }
+
+    public void findMessage(List<String> msgList, IUIKitCallback<List<TUIMessageBean>> callback) {
+        provider.findMessage(msgList, new IUIKitCallback<List<TUIMessageBean>>() {
+            @Override
+            public void onSuccess(List<TUIMessageBean> data) {
+                if (data != null && !data.isEmpty()) {
+                    TUIChatUtils.callbackOnSuccess(callback, data);
+                } else {
+                    TUIChatUtils.callbackOnError(callback, 0, "");
+                }
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIChatUtils.callbackOnError(callback, errCode, errMsg);
+            }
+        });
+    }
+
+    public void setChatNotifyHandler(ChatNotifyHandler chatNotifyHandler) {
+        this.chatNotifyHandler = chatNotifyHandler;
+    }
+
+    public void onExitChat(String chatId) {
+        if (chatNotifyHandler != null) {
+            chatNotifyHandler.onExitChat(chatId);
+        }
+    }
+
+    protected void onRecvMessageModified(TUIMessageBean messageBean) {
+        int size = loadedMessageInfoList.size();
+        boolean isFound = false;
+        for (int i = 0; i < size; i++) {
+            TUIMessageBean replacedMessage = loadedMessageInfoList.get(i);
+            if (TextUtils.equals(replacedMessage.getId(), messageBean.getId())) {
+                loadedMessageInfoList.set(i, messageBean);
+                isFound = true;
+                break;
+            }
+        }
+        if (!isFound) {
+            return;
+        }
+        preProcessMessage(messageBean, new IUIKitCallback<TUIMessageBean>() {
+            @Override
+            public void onSuccess(TUIMessageBean data) {
+                getReadReceiptAndRefresh(data);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                getReadReceiptAndRefresh(messageBean);
+            }
+        });
+    }
+
+    private void getReadReceiptAndRefresh(TUIMessageBean messageBean) {
+        List<TUIMessageBean> list = new ArrayList<>();
+        list.add(messageBean);
+        getMessageReadReceipt(list, new IUIKitCallback<List<MessageReceiptInfo>>() {
+            @Override
+            public void onSuccess(List<MessageReceiptInfo> data) {
+                messageBean.setMessageReceiptInfo(data.get(0));
+                refreshData(messageBean);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                refreshData(messageBean);
+            }
+        });
+    }
+
+    private void refreshData(TUIMessageBean messageBean) {
+        if (messageListAdapter != null) {
+            messageListAdapter.onViewNeedRefresh(IMessageRecyclerView.DATA_CHANGE_TYPE_UPDATE, messageBean);
+        }
+    }
+
+    public void modifyRootMessageToRemoveReplyInfo(ReplyMessageBean replyMessageBean, IUIKitCallback<Void> callback) {
+        String messageRootId = replyMessageBean.getMsgRootId();
+        findMessage(messageRootId, new IUIKitCallback<TUIMessageBean>() {
+            @Override
+            public void onSuccess(TUIMessageBean data) {
+                modifyRootMessageToRemoveReplyInfo(data, replyMessageBean);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIChatUtils.callbackOnError(callback, errCode, errMsg);
+            }
+        });
+    }
+
+    private void modifyRootMessageToRemoveReplyInfo(TUIMessageBean rootMessage, ReplyMessageBean replyMessage) {
+        IUIKitCallback<TUIMessageBean> callback = new IUIKitCallback<TUIMessageBean>() {
+            @Override
+            public void onSuccess(TUIMessageBean data) {
+                // do nothing, when modifyRootMessage successfully ,you can receive onRecvMessageModified callback in TUIChatService.java
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage("modifyRootMessageRemoveReply failed code=" + errCode + " msg=" +errMsg);
+            }
+        };
+        ChatModifyMessageHelper.ModifyMessageTask task = new ChatModifyMessageHelper.ModifyMessageTask(rootMessage, callback) {
+            @Override
+            public TUIMessageBean packageMessage(TUIMessageBean originMessage) {
+                MessageRepliesBean repliesBean = originMessage.getMessageRepliesBean();
+                if (repliesBean == null) {
+                    return originMessage;
+                }
+                repliesBean.removeReplyMessage(replyMessage.getId());
+                originMessage.setMessageRepliesBean(repliesBean);
+                return originMessage;
+            }
+        };
+        ChatModifyMessageHelper.enqueueTask(task);
+    }
+
+    public void modifyRootMessageToAddReplyInfo(ReplyMessageBean replyMessageBean, IUIKitCallback<Void> callback) {
+        String messageRootId = replyMessageBean.getMsgRootId();
+        findMessage(messageRootId, new IUIKitCallback<TUIMessageBean>() {
+            @Override
+            public void onSuccess(TUIMessageBean data) {
+                modifyRootMessageToAddReplyInfo(data, replyMessageBean);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIChatUtils.callbackOnError(callback, errCode, errMsg);
+            }
+        });
+    }
+
+    private void modifyRootMessageToAddReplyInfo(TUIMessageBean rootMessage, ReplyMessageBean replyMessage) {
+        IUIKitCallback<TUIMessageBean> callback = new IUIKitCallback<TUIMessageBean>() {
+            @Override
+            public void onSuccess(TUIMessageBean data) {
+                // do nothing, when modifyRootMessage successfully ,you can receive onRecvMessageModified callback in TUIChatService.java
+                Map<String, Object> param = new HashMap<>();
+                param.put(TUIConstants.TUIChat.CHAT_ID, rootMessage.getGroupId());
+                TUICore.notifyEvent(TUIConstants.TUIChat.EVENT_KEY_MESSAGE_EVENT, TUIConstants.TUIChat.EVENT_SUB_KEY_REPLY_MESSAGE_SUCCESS, param);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage("modifyRootMessageAddReply failed code=" + errCode + " msg=" +errMsg);
+            }
+        };
+        ChatModifyMessageHelper.ModifyMessageTask task = new ChatModifyMessageHelper.ModifyMessageTask(rootMessage, callback) {
+            @Override
+            public TUIMessageBean packageMessage(TUIMessageBean originMessage) {
+                MessageRepliesBean repliesBean = originMessage.getMessageRepliesBean();
+                if (repliesBean == null) {
+                    repliesBean = new MessageRepliesBean();
+                }
+                repliesBean.addReplyMessage(replyMessage.getId(),
+                        replyMessage.getContentMessageBean().getExtra(), replyMessage.getSender());
+                originMessage.setMessageRepliesBean(repliesBean);
+                return originMessage;
+            }
+        };
+        ChatModifyMessageHelper.enqueueTask(task);
+    }
+
+    public void reactMessage(String emojiId, TUIMessageBean messageBean) {
+        IUIKitCallback<TUIMessageBean> callback = new IUIKitCallback<TUIMessageBean>() {
+            @Override
+            public void onSuccess(TUIMessageBean data) {
+                // do nothing, when reactMessage successfully ,you can receive onRecvMessageModified callback in TUIChatService.java
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage("reactMessage failed code=" + errCode + " msg=" +errMsg);
+            }
+        };
+        ChatModifyMessageHelper.ModifyMessageTask task = new ChatModifyMessageHelper.ModifyMessageTask(messageBean, callback) {
+            @Override
+            public TUIMessageBean packageMessage(TUIMessageBean originMessage) {
+
+                MessageReactBean reactBean = originMessage.getMessageReactBean();
+                if (reactBean == null) {
+                    reactBean = new MessageReactBean();
+                }
+
+                reactBean.operateUser(emojiId, TUILogin.getLoginUser());
+                originMessage.setMessageReactBean(reactBean);
+                return originMessage;
+            }
+        };
+        ChatModifyMessageHelper.enqueueTask(task);
+    }
+
+    public void translateMessage(TUIMessageBean messageBean) {
+        provider.translateMessage(messageBean, new IUIKitCallback<String>() {
+            @Override
+            public void onSuccess(String data) {
+                TUIChatLog.i(TAG, "translateMessage success:" + data);
+                updateAdapter(IMessageRecyclerView.DATA_CHANGE_TYPE_UPDATE, messageBean);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIChatLog.e(TAG, "translateMessage failed code:" + errCode + ", msg:" + errMsg);
+                ToastUtil.toastShortMessage(TUIChatService.getAppContext().getString(R.string.translation_fail));
+                updateAdapter(IMessageRecyclerView.DATA_CHANGE_TYPE_UPDATE, messageBean);
+            }
+        });
+        updateAdapter(IMessageRecyclerView.DATA_CHANGE_TYPE_UPDATE, messageBean);
+    }
+
+    public void updateTranslationMessage(TUIMessageBean messageBean) {
+        updateMessageInfo(messageBean);
+    }
+
+    public void modifyMessage(TUIMessageBean messageBean) {
+        provider.modifyMessage(messageBean, new IUIKitCallback<TUIMessageBean>() {
+            @Override
+            public void onSuccess(TUIMessageBean data) {
+                onRecvMessageModified(data);
+            }
+
+            @Override
+            public void onError(int errCode, String errMsg, TUIMessageBean data) {
+                ToastUtil.toastShortMessage("modify failed code=" + errCode + " msg=" +errMsg);
+            }
+        });
+    }
+
+    public void getReactUserBean(Set<String> userIds, IUIKitCallback<Map<String, ReactUserBean>> callback) {
+        Map<String, ReactUserBean> reactUserBeanMap = new HashMap<>();
+        for (String id : userIds) {
+            reactUserBeanMap.put(id, null);
+        }
+        ChatInfo chatInfo = getChatInfo();
+        if (chatInfo instanceof GroupInfo) {
+            provider.getGroupMembersInfo(chatInfo.getId(), new ArrayList<>(userIds), new IUIKitCallback<List<GroupMemberInfo>>() {
+                @Override
+                public void onSuccess(List<GroupMemberInfo> data) {
+                    for (GroupMemberInfo memberInfo : data) {
+                        ReactUserBean reactUserBean = new ReactUserBean();
+                        reactUserBean.setUserId(memberInfo.getAccount());
+                        reactUserBean.setFriendRemark(memberInfo.getFriendRemark());
+                        reactUserBean.setNameCard(memberInfo.getNameCard());
+                        reactUserBean.setNikeName(memberInfo.getNickName());
+                        reactUserBean.setFaceUrl(memberInfo.getIconUrl());
+                        reactUserBeanMap.put(reactUserBean.getUserId(), reactUserBean);
+                    }
+                    TUIChatUtils.callbackOnSuccess(callback, reactUserBeanMap);
+                }
+
+                @Override
+                public void onError(String module, int errCode, String errMsg) {
+                    TUIChatUtils.callbackOnError(callback, errCode, errMsg);
+                }
+            });
+        } else {
+            provider.getReactUserBean(new ArrayList<>(userIds), new IUIKitCallback<List<ReactUserBean>>() {
+                @Override
+                public void onSuccess(List<ReactUserBean> data) {
+                    for (ReactUserBean userBean : data) {
+                        reactUserBeanMap.put(userBean.getUserId(), userBean);
+                    }
+                    TUIChatUtils.callbackOnSuccess(callback, reactUserBeanMap);
+                }
+
+                @Override
+                public void onError(String module, int errCode, String errMsg) {
+                    TUIChatUtils.callbackOnError(callback, errCode, errMsg);
+                }
+            });
+        }
+    }
+
+    public void loadUserStatus(List<String> userIDs, IUIKitCallback<Map<String, UserStatusBean>> callback) {
+        provider.loadUserStatus(userIDs, callback);
+    }
+
+    static class MessageReadReportHandler extends Handler {
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+        }
+    }
+
+    public interface TypingListener {
+        void onTyping(int status);
+    }
+
+
+    public interface ChatNotifyHandler {
+
+        default void onGroupForceExit() {}
+
+        default void onGroupNameChanged(String newName) {}
+
+        default void onFriendNameChanged(String newName) {}
+
+        default void onApplied(int size) {}
+        default void onFriendFaceUrlChanged(String faceUrl){}
+        default void onGroupFaceUrlChanged(String faceUrl){}
+        /**
+         * 接收新消息
+         * @param message
+         */
+        default void onRecvNewMessage(TUIMessageBean message){}
+        void onExitChat(String chatId);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/presenter/ForwardPresenter.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/presenter/ForwardPresenter.java
new file mode 100644
index 0000000..aa33818
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/presenter/ForwardPresenter.java
@@ -0,0 +1,111 @@
+package com.tencent.qcloud.tuikit.tuichat.presenter;
+
+import android.text.TextUtils;
+
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.MergeMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.IMessageAdapter;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.IMessageRecyclerView;
+import com.tencent.qcloud.tuikit.tuichat.model.ChatProvider;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ForwardPresenter extends ChatPresenter {
+    public static final String TAG = ForwardPresenter.class.getSimpleName();
+
+    private IMessageAdapter messageListAdapter;
+    private ChatInfo chatInfo;
+    private final ChatProvider provider;
+
+    List<TUIMessageBean> loadedData = new ArrayList<>();
+
+    public ForwardPresenter() {
+        TUIChatLog.i(TAG, "ChatPresenter Init");
+        provider = new ChatProvider();
+    }
+
+    public void setMessageListAdapter(IMessageAdapter messageListAdapter) {
+        this.messageListAdapter = messageListAdapter;
+    }
+
+    public void setChatInfo(ChatInfo chatInfo) {
+        this.chatInfo = chatInfo;
+    }
+
+    @Override
+    public ChatInfo getChatInfo() {
+        return chatInfo;
+    }
+
+    public void downloadMergerMessage(MergeMessageBean messageBean) {
+        if (messageBean != null) {
+            if (messageBean.isLayersOverLimit()) {
+                TUIChatLog.e(TAG, "merge message Layers Over Limit");
+            } else {
+                provider.downloadMergerMessage(messageBean, new IUIKitCallback<List<TUIMessageBean>>() {
+                    @Override
+                    public void onSuccess(List<TUIMessageBean> mergeMessageData) {
+                        preProcessMessage(mergeMessageData, new IUIKitCallback<List<TUIMessageBean>>() {
+                            @Override
+                            public void onSuccess(List<TUIMessageBean> data) {
+                                onMergeMessageDownloaded(data);
+                            }
+
+                            @Override
+                            public void onError(String module, int errCode, String errMsg) {
+                                onMergeMessageDownloaded(mergeMessageData);
+                            }
+                        });
+
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        TUIChatLog.e(TAG, "downloadMergerMessage error , code = " + errCode + "  message = " + errMsg);
+                    }
+                });
+
+            }
+        }
+    }
+
+    private void onMergeMessageDownloaded(List<TUIMessageBean> mergeMessageData) {
+        loadedData.clear();
+        loadedData.addAll(mergeMessageData);
+        if (messageListAdapter != null) {
+            messageListAdapter.onDataSourceChanged(loadedData);
+            messageListAdapter.onViewNeedRefresh(IMessageRecyclerView.DATA_CHANGE_TYPE_UPDATE, loadedData.size());
+        }
+    }
+
+    @Override
+    public void locateMessage(String originMsgID, IUIKitCallback<Void> callback) {
+        // 如果已经在列表中，直接跳转到对应位置
+        // If already in the list, jump directly to the corresponding position
+        boolean isFind = false;
+        for (TUIMessageBean loadedMessage : loadedData) {
+            if (TextUtils.equals(originMsgID, loadedMessage.getId())) {
+                isFind = true;
+                updateAdapter(IMessageRecyclerView.SCROLL_TO_POSITION, loadedMessage);
+                break;
+            }
+        }
+        if (isFind) {
+            TUIChatUtils.callbackOnSuccess(callback, null);
+        } else {
+            TUIChatUtils.callbackOnError(callback, -1, "not find");
+        }
+    }
+
+    @Override
+    protected void updateAdapter(int type, TUIMessageBean locateMessage) {
+        if (messageListAdapter != null) {
+            messageListAdapter.onViewNeedRefresh(type, locateMessage);
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/presenter/GroupChatPresenter.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/presenter/GroupChatPresenter.java
new file mode 100644
index 0000000..fba356c
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/presenter/GroupChatPresenter.java
@@ -0,0 +1,302 @@
+package com.tencent.qcloud.tuikit.tuichat.presenter;
+
+import android.text.TextUtils;
+import android.util.Pair;
+
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.GroupApplyInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageReceiptInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TipsMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.GroupChatEventListener;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class GroupChatPresenter extends ChatPresenter {
+    private static final String TAG = GroupChatPresenter.class.getSimpleName();
+
+    private GroupInfo groupInfo;
+    private List<GroupApplyInfo> currentApplies = new ArrayList<>();
+    private List<GroupMemberInfo> currentGroupMembers = new ArrayList<>();
+
+    private GroupChatEventListener groupChatEventListener;
+
+    public GroupChatPresenter() {
+        super();
+        TUIChatLog.i(TAG, "GroupChatPresenter Init");
+    }
+
+    public void initListener() {
+        groupChatEventListener = new GroupChatEventListener() {
+
+            @Override
+            public void onGroupForceExit(String groupId) {
+                GroupChatPresenter.this.onGroupForceExit(groupId);
+            }
+
+            @Override
+            public void exitGroupChat(String chatId) {
+                GroupChatPresenter.this.onExitChat(chatId);
+            }
+
+            @Override
+            public void clearGroupMessage(String chatId) {
+                if (TextUtils.equals(chatId, groupInfo.getId())) {
+                    GroupChatPresenter.this.clearMessage();
+                }
+            }
+
+            @Override
+            public void onApplied(int unHandledSize) {
+                GroupChatPresenter.this.onApplied(unHandledSize);
+            }
+
+            @Override
+            public void handleRevoke(String msgId) {
+                GroupChatPresenter.this.handleRevoke(msgId);
+            }
+
+            @Override
+            public void onRecvNewMessage(TUIMessageBean message) {
+                if (groupInfo == null || !TextUtils.equals(message.getGroupId(), groupInfo.getId())) {
+                    TUIChatLog.i(TAG, "receive a new message , not belong to current chat.");
+                } else {
+                    GroupChatPresenter.this.onRecvNewMessage(message);
+                }
+            }
+
+            @Override
+            public void onReadReport(List<MessageReceiptInfo> receiptInfoList) {
+                GroupChatPresenter.this.onReadReport(receiptInfoList);
+            }
+
+            @Override
+            public void onGroupNameChanged(String groupId, String newName) {
+                if (groupInfo == null || !TextUtils.equals(groupId, groupInfo.getId())) {
+                    return;
+                }
+                GroupChatPresenter.this.onGroupNameChanged(newName);
+            }
+
+            @Override
+            public void onGroupFaceUrlChanged(String groupId, String faceUrl) {
+                if (groupInfo == null || !TextUtils.equals(groupId, groupInfo.getId())) {
+                    return;
+                }
+                GroupChatPresenter.this.onGroupFaceUrlChanged(faceUrl);
+            }
+
+            @Override
+            public void onRecvMessageModified(TUIMessageBean messageBean) {
+                if (groupInfo != null && TextUtils.equals(messageBean.getGroupId(), groupInfo.getId())) {
+                    GroupChatPresenter.this.onRecvMessageModified(messageBean);
+                }
+            }
+
+            @Override
+            public void addMessage(TUIMessageBean messageBean, String chatId) {
+                if (TextUtils.equals(chatId, groupInfo.getId())) {
+                    addMessageInfo(messageBean);
+                }
+            }
+
+            @Override
+            public void onMessageChanged(TUIMessageBean messageBean) {
+                updateMessageInfo(messageBean);
+            }
+        };
+        TUIChatService.getInstance().addGroupChatEventListener(groupChatEventListener);
+        initMessageSender();
+    }
+
+    public void onReadReport(List<MessageReceiptInfo> receiptList) {
+        if (groupInfo != null) {
+            List<MessageReceiptInfo> processReceipts = new ArrayList<>();
+            for (MessageReceiptInfo messageReceiptInfo : receiptList) {
+                if (!TextUtils.equals(messageReceiptInfo.getGroupID(), groupInfo.getId())) {
+                    continue;
+                }
+                processReceipts.add(messageReceiptInfo);
+            }
+            onMessageReadReceiptUpdated(loadedMessageInfoList, processReceipts);
+        }
+    }
+
+    @Override
+    public void loadMessage(int type, TUIMessageBean lastMessageInfo, IUIKitCallback<List<TUIMessageBean>> callback) {
+        if (groupInfo == null || isLoading) {
+            return;
+        }
+        isLoading = true;
+        String chatId = groupInfo.getId();
+        if (type == TUIChatConstants.GET_MESSAGE_FORWARD) {
+            provider.loadGroupMessage(chatId, MSG_PAGE_COUNT, lastMessageInfo, new IUIKitCallback<List<TUIMessageBean>>() {
+
+                @Override
+                public void onSuccess(List<TUIMessageBean> data) {
+                    TUIChatLog.i(TAG, "load group message success " + data.size());
+                    if (lastMessageInfo == null) {
+                        isHaveMoreNewMessage = false;
+                    }
+                    if (data.size() < MSG_PAGE_COUNT) {
+                        isHaveMoreOldMessage = false;
+                    }
+                    onMessageLoadCompleted(data, type);
+                    TUIChatUtils.callbackOnSuccess(callback, data);
+                }
+
+                @Override
+                public void onError(String module, int errCode, String errMsg) {
+                    TUIChatLog.e(TAG, "load group message failed " + errCode + "  " + errMsg);
+                    TUIChatUtils.callbackOnError(callback, errCode, errMsg);
+                }
+            });
+        } else {
+            loadHistoryMessageList(chatId, true, type, MSG_PAGE_COUNT, lastMessageInfo, callback);
+        }
+    }
+
+    // 加载消息成功之后会调用此方法
+    // This method is called after the message is loaded successfully
+    @Override
+    protected void onMessageLoadCompleted(List<TUIMessageBean> data, int getType) {
+        groupReadReport(groupInfo.getId());
+        getMessageReadReceipt(data, getType);
+    }
+
+    private void sendGroupTipsMessage(String groupId, String message, final IUIKitCallback<String> callBack) {
+        provider.sendGroupTipsMessage(groupId, message, new IUIKitCallback<TUIMessageBean>() {
+            @Override
+            public void onSuccess(TUIMessageBean data) {
+                TUIChatUtils.callbackOnSuccess(callBack, groupId);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIChatUtils.callbackOnError(callBack, module, errCode, errMsg);
+            }
+        });
+    }
+
+    protected void addMessageInfo(TUIMessageBean messageInfo) {
+        super.addMessageInfo(messageInfo);
+        addGroupMessage(messageInfo);
+    }
+
+
+    private void addGroupMessage(TUIMessageBean message) {
+        if (!(message instanceof TipsMessageBean)) {
+            return;
+        }
+        TipsMessageBean tipsMessage = (TipsMessageBean) message;
+        if (tipsMessage.getTipType() == TipsMessageBean.MSG_TYPE_GROUP_JOIN) {
+            provider.addJoinGroupMessage(tipsMessage, new IUIKitCallback<List<GroupMemberInfo>>() {
+                @Override
+                public void onSuccess(List<GroupMemberInfo> data) {
+                    currentGroupMembers.addAll(data);
+                    groupInfo.setMemberDetails(currentGroupMembers);
+                }
+
+                @Override
+                public void onError(String module, int errCode, String errMsg) {
+                    TUIChatLog.e(TAG, "addJoinGroupMessage error : " + errMsg);
+                }
+            });
+
+        } else if (tipsMessage.getTipType() == TipsMessageBean.MSG_TYPE_GROUP_QUITE || tipsMessage.getTipType() == TipsMessageBean.MSG_TYPE_GROUP_KICK) {
+            provider.addLeaveGroupMessage(tipsMessage, new IUIKitCallback<List<String>>() {
+                @Override
+                public void onSuccess(List<String> data) {
+                    for (String memberUserId : data) {
+                        for (int i = 0; i < currentGroupMembers.size(); i++) {
+                            if (currentGroupMembers.get(i).getAccount().equals(memberUserId)) {
+                                currentGroupMembers.remove(i);
+                                break;
+                            }
+                        }
+                    }
+                    groupInfo.setMemberDetails(currentGroupMembers);
+                }
+
+                @Override
+                public void onError(String module, int errCode, String errMsg) {
+
+                }
+            });
+        } else if (tipsMessage.getTipType() == TipsMessageBean.MSG_TYPE_GROUP_MODIFY_NAME || tipsMessage.getTipType() == TipsMessageBean.MSG_TYPE_GROUP_MODIFY_NOTICE) {
+            provider.addModifyGroupMessage(tipsMessage, new IUIKitCallback<Pair<Integer, String>>() {
+                @Override
+                public void onSuccess(Pair<Integer, String> data) {
+                    if (data.first == TipsMessageBean.MSG_TYPE_GROUP_MODIFY_NAME) {
+                        groupInfo.setGroupName(data.second);
+                        if (chatNotifyHandler != null) {
+                            chatNotifyHandler.onGroupNameChanged(data.second);
+                        }
+                    }
+                    if (data.first == TipsMessageBean.MSG_TYPE_GROUP_MODIFY_NOTICE) {
+                        groupInfo.setNotice(data.second);
+                    }
+                }
+
+                @Override
+                public void onError(String module, int errCode, String errMsg) {
+                    TUIChatLog.e(TAG, "addModifyGroupMessage error " + errMsg);
+                }
+            });
+        }
+    }
+
+    protected void assembleGroupMessage(TUIMessageBean message) {
+        message.setGroup(true);
+        String groupType = groupInfo.getGroupType();
+        if (TextUtils.equals(groupType, GroupInfo.GROUP_TYPE_AVCHATROOM) || TextUtils.equals(groupType, GroupInfo.GROUP_TYPE_COMMUNITY)
+                || (TUIChatUtils.isCommunityGroup(groupInfo.getId()))) {
+            message.setNeedReadReceipt(false);
+        }
+    }
+
+    public void loadGroupMembers(String groupID, IUIKitCallback<List<GroupMemberInfo>> callback) {
+        provider.loadGroupMembers(groupID, 0, callback);
+    }
+
+    public void onGroupForceExit(String groupId) {
+        if (chatNotifyHandler != null && TextUtils.equals(groupId, groupInfo.getId())) {
+            chatNotifyHandler.onGroupForceExit();
+        }
+    }
+
+    public void onApplied(int unHandledSize) {
+        if (chatNotifyHandler != null) {
+            chatNotifyHandler.onApplied(unHandledSize);
+        }
+    }
+
+    public void onGroupNameChanged(String newName) {
+        if (chatNotifyHandler != null) {
+            chatNotifyHandler.onGroupNameChanged(newName);
+        }
+    }
+
+    public void onGroupFaceUrlChanged(String faceUrl) {
+        if (chatNotifyHandler != null) {
+            chatNotifyHandler.onGroupFaceUrlChanged(faceUrl);
+        }
+    }
+
+    @Override
+    public ChatInfo getChatInfo() {
+        return groupInfo;
+    }
+
+    public void setGroupInfo(GroupInfo groupInfo) {
+        this.groupInfo = groupInfo;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/presenter/MessageReceiptPresenter.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/presenter/MessageReceiptPresenter.java
new file mode 100644
index 0000000..e75976f
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/presenter/MessageReceiptPresenter.java
@@ -0,0 +1,72 @@
+package com.tencent.qcloud.tuikit.tuichat.presenter;
+
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageReceiptInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageRepliesBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.ReactUserBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.GroupMessageReadMembersInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.model.ChatProvider;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public class MessageReceiptPresenter {
+    public static final int GET_MEMBERS_COUNT = 100;
+
+    private final ChatProvider provider;
+    private ChatPresenter chatPresenter;
+    private ChatInfo chatInfo;
+    public MessageReceiptPresenter() {
+        provider = new ChatProvider();
+    }
+
+    public void setChatInfo(ChatInfo chatInfo) {
+        this.chatInfo = chatInfo;
+        if (chatInfo.getType() == ChatInfo.TYPE_C2C) {
+            chatPresenter = new C2CChatPresenter();
+            ((C2CChatPresenter) chatPresenter).setChatInfo(chatInfo);
+        } else {
+            chatPresenter = new GroupChatPresenter();
+            ((GroupChatPresenter) chatPresenter).setGroupInfo((GroupInfo) chatInfo);
+        }
+    }
+
+    public void setMessageReplyBean(TUIMessageBean message, IUIKitCallback<Void> callback) {
+        if (message == null || message.getMessageRepliesBean() == null) {
+            TUIChatUtils.callbackOnSuccess(callback, null);
+            return;
+        }
+        Set<String> userIds = new HashSet<>(chatPresenter.getReplyUserNames(Collections.singletonList(message)));
+        chatPresenter.getReactUserBean(userIds, new IUIKitCallback<Map<String, ReactUserBean>>() {
+            @Override
+            public void onSuccess(Map<String, ReactUserBean> data) {
+                MessageRepliesBean repliesBean = message.getMessageRepliesBean();
+                chatPresenter.setMessageReplyBean(repliesBean, data);
+                TUIChatUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIChatUtils.callbackOnError(callback, errCode, errMsg);
+            }
+        });
+    }
+
+    public void getGroupMessageReadMembers(TUIMessageBean messageBean, boolean isRead, long nextSeq, IUIKitCallback<GroupMessageReadMembersInfo> callback) {
+        provider.getGroupMessageReadMembers(messageBean, isRead, GET_MEMBERS_COUNT, nextSeq, callback);
+    }
+
+    public void getGroupMessageReadReceipt(TUIMessageBean messageBean, IUIKitCallback<List<MessageReceiptInfo>> callback) {
+        List<TUIMessageBean> messageBeanList = new ArrayList<>();
+        messageBeanList.add(messageBean);
+        provider.getMessageReadReceipt(messageBeanList, callback);
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/presenter/ReactPresenter.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/presenter/ReactPresenter.java
new file mode 100644
index 0000000..cc1810d
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/presenter/ReactPresenter.java
@@ -0,0 +1,99 @@
+package com.tencent.qcloud.tuikit.tuichat.presenter;
+
+import android.text.TextUtils;
+
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.C2CChatEventListener;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.GroupChatEventListener;
+import com.tencent.qcloud.tuikit.tuichat.model.ChatProvider;
+
+import java.util.Collections;
+import java.util.List;
+
+
+public class ReactPresenter {
+    private ChatProvider provider;
+    private ChatPresenter chatPresenter;
+    private ChatInfo chatInfo;
+    private OnMessageChangedListener onMessageChangedListener;
+    private GroupChatEventListener groupChatEventListener;
+    private C2CChatEventListener c2CChatEventListener;
+    private String messageId;
+
+    public interface OnMessageChangedListener {
+        void onMessageChanged(TUIMessageBean messageBean);
+    }
+
+    public ReactPresenter() {
+        provider = new ChatProvider();
+    }
+
+    public void setChatInfo(ChatInfo chatInfo) {
+        this.chatInfo = chatInfo;
+        if (chatInfo.getType() == ChatInfo.TYPE_C2C) {
+            chatPresenter = new C2CChatPresenter();
+            ((C2CChatPresenter) chatPresenter).setChatInfo(chatInfo);
+        } else {
+            chatPresenter = new GroupChatPresenter();
+            ((GroupChatPresenter) chatPresenter).setGroupInfo((GroupInfo) chatInfo);
+        }
+
+    }
+
+    public void setMessageId(String messageId) {
+        this.messageId = messageId;
+    }
+
+    public void setChatEventListener() {
+        if (chatPresenter instanceof C2CChatPresenter) {
+            c2CChatEventListener = new C2CChatEventListener() {
+
+                @Override
+                public void onRecvMessageModified(TUIMessageBean messageBean) {
+                    if (TextUtils.equals(messageBean.getId(), messageId)) {
+                        ReactPresenter.this.onMessageChanged(messageBean);
+                    }
+                }
+            };
+            TUIChatService.getInstance().addC2CChatEventListener(c2CChatEventListener);
+        } else {
+            groupChatEventListener = new GroupChatEventListener() {
+
+                @Override
+                public void onRecvMessageModified(TUIMessageBean messageBean) {
+                    if (TextUtils.equals(messageBean.getId(), messageId)) {
+                        ReactPresenter.this.onMessageChanged(messageBean);
+                    }
+                }
+            };
+            TUIChatService.getInstance().addGroupChatEventListener(groupChatEventListener);
+        }
+    }
+
+    private void onMessageChanged(TUIMessageBean messageBean) {
+        chatPresenter.preProcessMessage(Collections.singletonList(messageBean), new IUIKitCallback<List<TUIMessageBean>>() {
+            @Override
+            public void onSuccess(List<TUIMessageBean> data) {
+                if (onMessageChangedListener != null) {
+                    onMessageChangedListener.onMessageChanged(data.get(0));
+                }
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                if (onMessageChangedListener != null) {
+                    onMessageChangedListener.onMessageChanged(messageBean);
+                }
+            }
+        });
+    }
+
+    public void setMessageListener(OnMessageChangedListener listener) {
+        this.onMessageChangedListener = listener;
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/presenter/ReplyPresenter.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/presenter/ReplyPresenter.java
new file mode 100644
index 0000000..4e2944d
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/presenter/ReplyPresenter.java
@@ -0,0 +1,229 @@
+package com.tencent.qcloud.tuikit.tuichat.presenter;
+
+import android.text.TextUtils;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageReactBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageRepliesBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.ReactUserBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ReplyMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.C2CChatEventListener;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.GroupChatEventListener;
+import com.tencent.qcloud.tuikit.tuichat.interfaces.IReplyMessageHandler;
+import com.tencent.qcloud.tuikit.tuichat.model.ChatProvider;
+import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+
+public class ReplyPresenter {
+    private ChatProvider provider;
+    private GroupChatEventListener groupChatEventListener;
+    private C2CChatEventListener c2CChatEventListener;
+    private ChatPresenter chatPresenter;
+    private ChatInfo chatInfo;
+    private String messageId;
+    private IReplyMessageHandler replyHandler;
+    public ReplyPresenter() {
+        provider = new ChatProvider();
+    }
+
+    public void setMessageId(String messageId) {
+        this.messageId = messageId;
+    }
+
+    public void setChatInfo(ChatInfo chatInfo) {
+        this.chatInfo = chatInfo;
+        if (chatInfo.getType() == ChatInfo.TYPE_C2C) {
+            chatPresenter = new C2CChatPresenter();
+            ((C2CChatPresenter) chatPresenter).setChatInfo(chatInfo);
+        } else {
+            chatPresenter = new GroupChatPresenter();
+            ((GroupChatPresenter) chatPresenter).setGroupInfo((GroupInfo) chatInfo);
+        }
+    }
+
+    public ChatPresenter getChatPresenter() {
+        return chatPresenter;
+    }
+
+    public void setChatEventListener() {
+        if (chatPresenter instanceof C2CChatPresenter) {
+            c2CChatEventListener = new C2CChatEventListener() {
+
+                @Override
+                public void onRecvMessageModified(TUIMessageBean messageBean) {
+                    if (TextUtils.equals(messageBean.getId(), messageId)) {
+                        onMessageModified(messageBean);
+                    }
+                }
+            };
+            TUIChatService.getInstance().addC2CChatEventListener(c2CChatEventListener);
+        } else {
+            groupChatEventListener = new GroupChatEventListener() {
+
+                @Override
+                public void onRecvMessageModified(TUIMessageBean messageBean) {
+                    if (TextUtils.equals(messageBean.getId(), messageId)) {
+                        onMessageModified(messageBean);
+                    }
+                }
+            };
+            TUIChatService.getInstance().addGroupChatEventListener(groupChatEventListener);
+        }
+    }
+
+    public void findReplyMessages(MessageRepliesBean repliesBean) {
+        if (repliesBean == null || repliesBean.getRepliesSize() == 0) {
+            return;
+        }
+        List<MessageRepliesBean.ReplyBean> replyBeanList = repliesBean.getReplies();
+        List<String> msgIdList = new ArrayList<>(replyBeanList.size());
+        for (MessageRepliesBean.ReplyBean replyBean : replyBeanList) {
+            msgIdList.add(replyBean.getMessageID());
+        }
+        Map<MessageRepliesBean.ReplyBean, TUIMessageBean> messageBeanMap = new LinkedHashMap<>();
+        for (MessageRepliesBean.ReplyBean replyBean : replyBeanList) {
+            messageBeanMap.put(replyBean, null);
+        }
+        chatPresenter.findMessage(msgIdList, new IUIKitCallback<List<TUIMessageBean>>() {
+            @Override
+            public void onSuccess(List<TUIMessageBean> data) {
+                for (MessageRepliesBean.ReplyBean replyBean : replyBeanList) {
+                    Iterator<TUIMessageBean> iterator = data.listIterator();
+                    while(iterator.hasNext()) {
+                        TUIMessageBean messageBean = iterator.next();
+                        if (TextUtils.equals(messageBean.getId(), replyBean.getMessageID())) {
+                            messageBeanMap.put(replyBean, messageBean);
+                            iterator.remove();
+                            break;
+                        }
+                    }
+                }
+                processReplyBeanList(messageBeanMap);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                processReplyBeanList(messageBeanMap);
+            }
+        });
+    }
+
+    private void processReplyBeanList(Map<MessageRepliesBean.ReplyBean, TUIMessageBean> replyBeanDataMap) {
+        Set<String> userIDSet = new HashSet<>();
+        for (Map.Entry<MessageRepliesBean.ReplyBean, TUIMessageBean> entry : replyBeanDataMap.entrySet()) {
+            if (entry.getValue() == null) {
+                userIDSet.add(entry.getKey().getMessageSender());
+            }
+        }
+        if (userIDSet.isEmpty()) {
+            if (replyHandler != null) {
+                replyHandler.onRepliesMessageFound(replyBeanDataMap);
+            }
+            return;
+        }
+        chatPresenter.getReactUserBean(userIDSet, new IUIKitCallback<Map<String, ReactUserBean>>() {
+            @Override
+            public void onSuccess(Map<String, ReactUserBean> data) {
+                for (Map.Entry<String, ReactUserBean> dataEntry : data.entrySet()) {
+                    if (dataEntry.getValue() != null) {
+                        String userID = dataEntry.getKey();
+                        ReactUserBean userBean = dataEntry.getValue();
+                        for (Map.Entry<MessageRepliesBean.ReplyBean, TUIMessageBean> entry : replyBeanDataMap.entrySet()) {
+                            if (TextUtils.equals(entry.getKey().getMessageSender(), userID)) {
+                                entry.getKey().setSenderShowName(userBean.getDisplayString());
+                                entry.getKey().setSenderFaceUrl(userBean.getFaceUrl());
+                            }
+                        }
+                    }
+                }
+                if (replyHandler != null) {
+                    replyHandler.onRepliesMessageFound(replyBeanDataMap);
+                }
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                if (replyHandler != null) {
+                    replyHandler.onRepliesMessageFound(replyBeanDataMap);
+                }
+            }
+        });
+    }
+
+    public void setReplyHandler(IReplyMessageHandler replyHandler) {
+        this.replyHandler = replyHandler;
+    }
+
+    private void onMessageModified(TUIMessageBean messageBean) {
+        if (replyHandler != null) {
+            replyHandler.updateData(messageBean);
+        }
+    }
+
+    public void sendReplyMessage(TUIMessageBean replyMessageBean, IUIKitCallback<TUIMessageBean> callback) {
+        chatPresenter.sendMessage(replyMessageBean, false, new IUIKitCallback<TUIMessageBean>() {
+            @Override
+            public void onSuccess(TUIMessageBean data) {
+                Map<String, Object> param = new HashMap<>();
+                param.put(TUIConstants.TUIChat.CHAT_ID, chatInfo.getId());
+                param.put(TUIConstants.TUIChat.MESSAGE_BEAN, data);
+                param.put(TUIConstants.TUIChat.IS_GROUP_CHAT, chatInfo.getType() == ChatInfo.TYPE_GROUP);
+                TUICore.callService(TUIConstants.TUIChat.SERVICE_NAME, TUIConstants.TUIChat.METHOD_ADD_MESSAGE_TO_CHAT, param);
+                chatPresenter.modifyRootMessageToAddReplyInfo((ReplyMessageBean) data, new IUIKitCallback<Void>() {
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        TUIChatUtils.callbackOnError(callback, errCode, errMsg);
+                    }
+                });
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIChatUtils.callbackOnError(callback, errCode, errMsg);
+            }
+        });
+    }
+
+    public void getReactUserBean(TUIMessageBean messageBean, IUIKitCallback<Void> callback) {
+        List<TUIMessageBean> messageBeanList = new ArrayList<>();
+        messageBeanList.add(messageBean);
+        Set<String> userIdSet = chatPresenter.getReactUserNames(messageBeanList);
+        if (userIdSet.isEmpty()) {
+            TUIChatUtils.callbackOnSuccess(callback, null);
+            return;
+        }
+        chatPresenter.getReactUserBean(userIdSet, new IUIKitCallback<Map<String, ReactUserBean>>() {
+            @Override
+            public void onSuccess(Map<String, ReactUserBean> map) {
+                for (TUIMessageBean messageBean : messageBeanList) {
+                    MessageReactBean reactBean = messageBean.getMessageReactBean();
+                    if (reactBean != null) {
+                        reactBean.setReactUserBeanMap(map);
+                    }
+                }
+                TUIChatUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIChatUtils.callbackOnError(callback, errCode, errMsg);
+            }
+        });
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/ActionIdConstant.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/ActionIdConstant.java
new file mode 100644
index 0000000..84cab39
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/ActionIdConstant.java
@@ -0,0 +1,14 @@
+package com.tencent.qcloud.tuikit.tuichat.util;
+
+/**
+ * 自定义消息发送事件ID定义，防止ID重复，统一进行管理
+ */
+public class ActionIdConstant {
+    public static final int ACTION_ID_BUSINESS_CARD = 0x101;
+    public static final int ACTION_ID_ARCHIVES = 0x102;
+    public static final int ACTION_ID_LOCATION = 0x103;
+    public static final int ACTION_ID_MEDICAL_EXAMINATION_REPORT = 0x104;
+    public static final int ACTION_ID_END_CONSULT = 0x105;
+    public static final int ACTION_ID_APPRAISE = 0x106;
+    public static final int ACTION_ID_SYSTEM = 0x107;
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/AngleUtil.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/AngleUtil.java
new file mode 100644
index 0000000..f96c8a0
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/AngleUtil.java
@@ -0,0 +1,59 @@
+package com.tencent.qcloud.tuikit.tuichat.util;
+
+
+public class AngleUtil {
+    public static int getSensorAngle(float x, float y) {
+        if (Math.abs(x) > Math.abs(y)) {
+            /**
+             * 横屏倾斜角度比较大
+             * 
+             * The tilt angle of the horizontal screen is relatively large
+             */
+            if (x > 4) {
+                /**
+                 * 左边倾斜
+                 * 
+                 * left tilt
+                 */
+                return 270;
+            } else if (x < -4) {
+                /**
+                 * 右边倾斜
+                 * 
+                 * right tilt
+                 */
+                return 90;
+            } else {
+                /**
+                 * 倾斜角度不够大
+                 * 
+                 * The angle of inclination is not large enough
+                 */
+                return 0;
+            }
+        } else {
+            if (y > 7) {
+                /**
+                 * 左边倾斜
+                 * 
+                 * left tilt
+                 */
+                return 0;
+            } else if (y < -7) {
+                /**
+                 * 右边倾斜
+                 * 
+                 * right tilt
+                 */
+                return 180;
+            } else {
+                /**
+                 * 倾斜角度不够大
+                 * 
+                 * The angle of inclination is not large enough
+                 */
+                return 0;
+            }
+        }
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/BlurUtils.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/BlurUtils.java
new file mode 100644
index 0000000..6b74522
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/BlurUtils.java
@@ -0,0 +1,33 @@
+package com.tencent.qcloud.tuikit.tuichat.util;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.os.Build;
+import android.renderscript.Allocation;
+import android.renderscript.Element;
+import android.renderscript.RenderScript;
+import android.renderscript.ScriptIntrinsicBlur;
+
+import androidx.annotation.RequiresApi;
+
+public class BlurUtils {
+
+    @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR1)
+    public static Bitmap fastBlur(Context context, Bitmap bitmap) {
+        if (context == null || bitmap ==  null) {
+            return null;
+        }
+        RenderScript renderScript = RenderScript.create(context);
+        ScriptIntrinsicBlur scriptIntrinsicBlur = ScriptIntrinsicBlur.create(renderScript, Element.U8_4(renderScript));
+        Bitmap outBitmap = Bitmap.createBitmap(bitmap.getWidth(), bitmap.getHeight(), Bitmap.Config.ARGB_8888);
+        Allocation in = Allocation.createFromBitmap(renderScript, bitmap);
+        Allocation out = Allocation.createFromBitmap(renderScript, outBitmap);
+        scriptIntrinsicBlur.setRadius(25);
+        scriptIntrinsicBlur.setInput(in);
+        scriptIntrinsicBlur.forEach(out);
+        out.copyTo(outBitmap);
+        scriptIntrinsicBlur.destroy();
+        bitmap.recycle();
+        return outBitmap;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/CameraParamUtil.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/CameraParamUtil.java
new file mode 100644
index 0000000..a318306
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/CameraParamUtil.java
@@ -0,0 +1,150 @@
+package com.tencent.qcloud.tuikit.tuichat.util;
+
+import android.content.Context;
+import android.hardware.Camera;
+import android.view.Surface;
+import android.view.WindowManager;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+public class CameraParamUtil {
+
+    private static final String TAG = CameraParamUtil.class.getSimpleName();
+    private static CameraParamUtil cameraParamUtil = null;
+    private CameraSizeComparator sizeComparator = new CameraSizeComparator();
+
+    private CameraParamUtil() {
+
+    }
+
+    public static CameraParamUtil getInstance() {
+        if (cameraParamUtil == null) {
+            cameraParamUtil = new CameraParamUtil();
+            return cameraParamUtil;
+        } else {
+            return cameraParamUtil;
+        }
+    }
+
+    public Camera.Size getPreviewSize(List<Camera.Size> list, int th, float rate) {
+        Collections.sort(list, sizeComparator);
+        int i = 0;
+        for (Camera.Size s : list) {
+            if ((s.width > th) && equalRate(s, rate)) {
+                TUIChatLog.i(TAG, "MakeSure Preview :w = " + s.width + " h = " + s.height);
+                break;
+            }
+            i++;
+        }
+        if (i == list.size()) {
+            return getBestSize(list, rate);
+        } else {
+            return list.get(i);
+        }
+    }
+
+    public Camera.Size getPictureSize(List<Camera.Size> list, int th, float rate) {
+        Collections.sort(list, sizeComparator);
+        int i = 0;
+        for (Camera.Size s : list) {
+            if ((s.width > th) && equalRate(s, rate)) {
+                TUIChatLog.i(TAG, "MakeSure Picture :w = " + s.width + " h = " + s.height);
+                break;
+            }
+            i++;
+        }
+        if (i == list.size()) {
+            return getBestSize(list, rate);
+        } else {
+            return list.get(i);
+        }
+    }
+
+    private Camera.Size getBestSize(List<Camera.Size> list, float rate) {
+        float previewDisparity = 100;
+        int index = 0;
+        for (int i = 0; i < list.size(); i++) {
+            Camera.Size cur = list.get(i);
+            float prop = (float) cur.width / (float) cur.height;
+            if (Math.abs(rate - prop) < previewDisparity) {
+                previewDisparity = Math.abs(rate - prop);
+                index = i;
+            }
+        }
+        return list.get(index);
+    }
+
+
+    private boolean equalRate(Camera.Size s, float rate) {
+        float r = (float) (s.width) / (float) (s.height);
+        return Math.abs(r - rate) <= 0.2;
+    }
+
+    public boolean isSupportedFocusMode(List<String> focusList, String focusMode) {
+        for (int i = 0; i < focusList.size(); i++) {
+            if (focusMode.equals(focusList.get(i))) {
+                TUIChatLog.i(TAG, "FocusMode supported " + focusMode);
+                return true;
+            }
+        }
+        TUIChatLog.i(TAG, "FocusMode not supported " + focusMode);
+        return false;
+    }
+
+    public boolean isSupportedPictureFormats(List<Integer> supportedPictureFormats, int jpeg) {
+        for (int i = 0; i < supportedPictureFormats.size(); i++) {
+            if (jpeg == supportedPictureFormats.get(i)) {
+                TUIChatLog.i(TAG, "Formats supported " + jpeg);
+                return true;
+            }
+        }
+        TUIChatLog.i(TAG, "Formats not supported " + jpeg);
+        return false;
+    }
+
+    public int getCameraDisplayOrientation(Context context, int cameraId) {
+        Camera.CameraInfo info = new Camera.CameraInfo();
+        Camera.getCameraInfo(cameraId, info);
+        WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+        int rotation = wm.getDefaultDisplay().getRotation();
+        int degrees = 0;
+        switch (rotation) {
+            case Surface.ROTATION_0:
+                degrees = 0;
+                break;
+            case Surface.ROTATION_90:
+                degrees = 90;
+                break;
+            case Surface.ROTATION_180:
+                degrees = 180;
+                break;
+            case Surface.ROTATION_270:
+                degrees = 270;
+                break;
+        }
+        int result;
+        if (info.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
+            result = (info.orientation + degrees) % 360;
+            result = (360 - result) % 360;   // compensate the mirror
+        } else {
+            // back-facing
+            result = (info.orientation - degrees + 360) % 360;
+        }
+        return result;
+    }
+
+    private class CameraSizeComparator implements Comparator<Camera.Size> {
+        public int compare(Camera.Size lhs, Camera.Size rhs) {
+            if (lhs.width == rhs.width) {
+                return 0;
+            } else if (lhs.width > rhs.width) {
+                return 1;
+            } else {
+                return -1;
+            }
+        }
+
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/ChatMessageBuilder.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/ChatMessageBuilder.java
new file mode 100644
index 0000000..f85b81c
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/ChatMessageBuilder.java
@@ -0,0 +1,364 @@
+package com.tencent.qcloud.tuikit.tuichat.util;
+
+import android.net.Uri;
+import android.text.TextUtils;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuicore.util.FileUtil;
+import com.tencent.qcloud.tuicore.util.ImageUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.ReplyPreviewBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.FaceMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.FileMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ImageMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.LocationMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.MergeMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.QuoteMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ReplyMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.SoundMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TextAtMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TextMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.VideoMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.config.TUIChatConfigs;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ChatMessageBuilder {
+    public static final String TAG = ChatMessageBuilder.class.getSimpleName();
+
+    public static TextMessageBean buildTextMessage(String message) {
+        V2TIMMessage v2TIMMessage = V2TIMManager.getMessageManager().createTextMessage(message);
+        v2TIMMessage.setNeedReadReceipt(TUIChatConfigs.getConfigs().getGeneralConfig().isShowRead());
+
+        TextMessageBean textMessageBean = new TextMessageBean();
+        textMessageBean.setCommonAttribute(v2TIMMessage);
+        textMessageBean.onProcessMessage(v2TIMMessage);
+        return textMessageBean;
+    }
+
+    public static TextAtMessageBean buildTextAtMessage(List<String> atUserList, String message) {
+        V2TIMMessage v2TIMMessage = V2TIMManager.getMessageManager().createTextAtMessage(message, atUserList);
+        v2TIMMessage.setNeedReadReceipt(TUIChatConfigs.getConfigs().getGeneralConfig().isShowRead());
+        TextAtMessageBean textAtMessageBean = new TextAtMessageBean();
+        textAtMessageBean.setCommonAttribute(v2TIMMessage);
+        textAtMessageBean.onProcessMessage(v2TIMMessage);
+        return textAtMessageBean;
+    }
+
+    /**
+     * 创建一条自定义表情的消息
+     *
+     * @param groupId  自定义表情所在的表情组id
+     * @param faceName 表情的名称
+     * @param groupId  The expression group id where the custom expression is located
+     * @param faceName name
+     * @return Create a message with a custom emoji
+     * @return
+     */
+    public static TUIMessageBean buildFaceMessage(int groupId, String faceName) {
+        V2TIMMessage v2TIMMessage = V2TIMManager.getMessageManager().createFaceMessage(groupId, faceName.getBytes());
+        v2TIMMessage.setNeedReadReceipt(TUIChatConfigs.getConfigs().getGeneralConfig().isShowRead());
+
+        FaceMessageBean message = new FaceMessageBean();
+        message.setCommonAttribute(v2TIMMessage);
+        message.onProcessMessage(v2TIMMessage);
+        return message;
+    }
+
+    /**
+     * 创建一条图片消息
+     * <p>
+     * Create a image message
+     *
+     * @param uri 图片 URI
+     * @return
+     */
+    public static TUIMessageBean buildImageMessage(final Uri uri) {
+        String path = ImageUtil.getImagePathAfterRotate(uri);
+        if (TextUtils.isEmpty(path)) {
+            return null;
+        }
+        V2TIMMessage v2TIMMessage = V2TIMManager.getMessageManager().createImageMessage(path);
+        v2TIMMessage.setNeedReadReceipt(TUIChatConfigs.getConfigs().getGeneralConfig().isShowRead());
+
+        final ImageMessageBean messageBean = new ImageMessageBean();
+        messageBean.setCommonAttribute(v2TIMMessage);
+        messageBean.onProcessMessage(v2TIMMessage);
+
+        messageBean.setDataUri(uri);
+        int[] size = ImageUtil.getImageSize(path);
+        messageBean.setDataPath(path);
+        messageBean.setImgWidth(size[0]);
+        messageBean.setImgHeight(size[1]);
+        return messageBean;
+    }
+
+    /**
+     * 创建一条视频消息
+     * <p>
+     * create a video message
+     *
+     * @param imgPath   视频缩略图路径
+     * @param videoPath 视频路径
+     * @param width     视频的宽
+     * @param height    视频的高
+     * @param duration  视频的时长
+     * @return
+     */
+    public static TUIMessageBean buildVideoMessage(String imgPath, String videoPath, int width, int height, long duration) {
+        if (TextUtils.isEmpty(imgPath) || TextUtils.isEmpty(videoPath)) {
+            return null;
+        }
+        V2TIMMessage v2TIMMessage = V2TIMManager.getMessageManager().createVideoMessage(videoPath, "mp4", Math.round(duration * 1.0f / 1000), imgPath);
+        v2TIMMessage.setNeedReadReceipt(TUIChatConfigs.getConfigs().getGeneralConfig().isShowRead());
+
+        VideoMessageBean messageBean = new VideoMessageBean();
+        messageBean.setCommonAttribute(v2TIMMessage);
+        messageBean.onProcessMessage(v2TIMMessage);
+
+        Uri videoUri = Uri.fromFile(new File(videoPath));
+        messageBean.setImgWidth(width);
+        messageBean.setImgHeight(height);
+        messageBean.setDataPath(imgPath);
+        messageBean.setDataUri(videoUri);
+        return messageBean;
+    }
+
+    /**
+     * 创建一条音频消息
+     * <p>
+     * create a audio message
+     *
+     * @param recordPath 音频路径
+     * @param duration   音频的时长
+     * @return
+     */
+    public static TUIMessageBean buildAudioMessage(String recordPath, int duration) {
+        V2TIMMessage v2TIMMessage = V2TIMManager.getMessageManager().createSoundMessage(recordPath, Math.round(duration * 1.0f / 1000));
+        v2TIMMessage.setNeedReadReceipt(TUIChatConfigs.getConfigs().getGeneralConfig().isShowRead());
+
+        SoundMessageBean messageBean = new SoundMessageBean();
+        messageBean.setCommonAttribute(v2TIMMessage);
+        messageBean.onProcessMessage(v2TIMMessage);
+
+        messageBean.setDataPath(recordPath);
+        return messageBean;
+    }
+
+    /**
+     * 创建一条位置消息
+     * <p>
+     * create a audio message
+     *
+     * @param desc  位置信息描述
+     * @param longitude 经度
+     * @param latitude 维度
+     * @return
+     */
+    public static TUIMessageBean buildLocationMessage(String desc, double longitude, double latitude) {
+        V2TIMMessage v2TIMMessage = V2TIMManager.getMessageManager()
+                .createLocationMessage(desc, longitude,
+                        latitude);
+        v2TIMMessage.setNeedReadReceipt(TUIChatConfigs.getConfigs().getGeneralConfig().isShowRead());
+
+        LocationMessageBean messageBean = new LocationMessageBean();
+        messageBean.setCommonAttribute(v2TIMMessage);
+        messageBean.onProcessMessage(v2TIMMessage);
+        return messageBean;
+    }
+
+    /**
+     * 创建一条文件消息
+     * <p>
+     * create a text message
+     *
+     * @param fileUri 文件路径
+     * @return
+     */
+    public static TUIMessageBean buildFileMessage(Uri fileUri) {
+        String filePath = FileUtil.getPathFromUri(fileUri);
+        if (TextUtils.isEmpty(filePath)) {
+            return null;
+        }
+        File file = new File(filePath);
+        if (file.exists()) {
+            V2TIMMessage v2TIMMessage = V2TIMManager.getMessageManager().createFileMessage(filePath, file.getName());
+            v2TIMMessage.setNeedReadReceipt(TUIChatConfigs.getConfigs().getGeneralConfig().isShowRead());
+
+            FileMessageBean messageBean = new FileMessageBean();
+            messageBean.setCommonAttribute(v2TIMMessage);
+            messageBean.onProcessMessage(v2TIMMessage);
+
+            messageBean.setDataPath(filePath);
+            return messageBean;
+        }
+        return null;
+    }
+
+    /**
+     * 创建一条 onebyone 转发消息
+     * <p>
+     * create a forward message
+     *
+     * @param v2TIMMessage 要转发的消息
+     * @return
+     */
+    public static TUIMessageBean buildForwardMessage(V2TIMMessage v2TIMMessage) {
+        V2TIMMessage forwardMessage = V2TIMManager.getMessageManager().createForwardMessage(v2TIMMessage);
+        forwardMessage.setNeedReadReceipt(TUIChatConfigs.getConfigs().getGeneralConfig().isShowRead());
+
+        return buildMessage(forwardMessage);
+    }
+
+    /**
+     * 创建一条 merge 转发消息
+     * <p>
+     * create a merge message
+     *
+     * @return
+     */
+    public static TUIMessageBean buildMergeMessage(List<TUIMessageBean> messageInfoList,
+                                                   String title,
+                                                   List<String> abstractList,
+                                                   String compatibleText) {
+        if (messageInfoList == null || messageInfoList.isEmpty()) {
+            return null;
+        }
+        List<V2TIMMessage> msgList = new ArrayList<>();
+        for (int i = 0; i < messageInfoList.size(); i++) {
+            msgList.add(messageInfoList.get(i).getV2TIMMessage());
+        }
+        V2TIMMessage mergeMsg = V2TIMManager.getMessageManager()
+                .createMergerMessage(msgList, title, abstractList, compatibleText);
+        mergeMsg.setNeedReadReceipt(TUIChatConfigs.getConfigs().getGeneralConfig().isShowRead());
+
+        MergeMessageBean messageBean = new MergeMessageBean();
+        messageBean.setCommonAttribute(mergeMsg);
+        messageBean.onProcessMessage(mergeMsg);
+        return messageBean;
+    }
+
+    /**
+     * 创建一条自定义消息
+     * <p>
+     * create a custom message
+     *
+     * @param data        自定义消息内容，可以是任何内容
+     * @param description 自定义消息描述内容，可以被搜索到
+     * @param extension   扩展内容
+     * @return
+     */
+    public static TUIMessageBean buildCustomMessage(String data, String description, byte[] extension) {
+        V2TIMMessage v2TIMMessage = V2TIMManager.getMessageManager().createCustomMessage(data.getBytes(), description, extension);
+        v2TIMMessage.setNeedReadReceipt(TUIChatConfigs.getConfigs().getGeneralConfig().isShowRead());
+
+        TUIMessageBean message = ChatMessageParser.parseMessage(v2TIMMessage);
+        if (message.getExtra() == null) {
+            message.setExtra(TUIChatService.getAppContext().getString(R.string.custom_msg));
+        }
+        return message;
+    }
+
+    /**
+     * 创建一条群消息自定义内容
+     * <p>
+     * create a custom message for group
+     *
+     * @param customMessage 消息内容
+     * @return
+     */
+    public static V2TIMMessage buildGroupCustomMessage(String customMessage) {
+        return V2TIMManager.getMessageManager().createCustomMessage(customMessage.getBytes());
+    }
+
+    public static TUIMessageBean buildMessage(V2TIMMessage message) {
+        return ChatMessageParser.parseMessage(message);
+    }
+
+    public static TUIMessageBean buildAtReplyMessage(String content, List<String> atList, ReplyPreviewBean previewBean) {
+        V2TIMMessage v2TIMMessage = V2TIMManager.getMessageManager().createTextAtMessage(content, atList);
+        v2TIMMessage.setNeedReadReceipt(TUIChatConfigs.getConfigs().getGeneralConfig().isShowRead());
+
+        return buildReplyMessage(v2TIMMessage, previewBean);
+    }
+
+    public static TUIMessageBean buildReplyMessage(String content, ReplyPreviewBean previewBean) {
+        V2TIMMessage v2TIMMessage = V2TIMManager.getMessageManager().createTextMessage(content);
+        v2TIMMessage.setNeedReadReceipt(TUIChatConfigs.getConfigs().getGeneralConfig().isShowRead());
+
+        return buildReplyMessage(v2TIMMessage, previewBean);
+    }
+
+    private static TUIMessageBean buildReplyMessage(V2TIMMessage v2TIMMessage, ReplyPreviewBean previewBean) {
+        Map<String, ReplyPreviewBean> cloudData = new HashMap<>();
+        Gson gson = new Gson();
+        cloudData.put(TUIChatConstants.MESSAGE_REPLY_KEY, previewBean);
+        v2TIMMessage.setCloudCustomData(gson.toJson(cloudData));
+
+        QuoteMessageBean replyMessageBean;
+        if (TextUtils.isEmpty(previewBean.getMessageRootID())) {
+            replyMessageBean = new QuoteMessageBean(previewBean);
+        } else {
+            replyMessageBean = new ReplyMessageBean(previewBean);
+        }
+        replyMessageBean.setCommonAttribute(v2TIMMessage);
+        replyMessageBean.onProcessMessage(v2TIMMessage);
+        return replyMessageBean;
+    }
+
+    public static ReplyPreviewBean buildReplyPreviewBean(TUIMessageBean messageBean) {
+        String messageAbstract = ChatMessageParser.getReplyMessageAbstract(messageBean);
+        String sender = messageBean.getNickName();
+        if (TextUtils.isEmpty(sender)) {
+            sender = messageBean.getSender();
+        }
+
+        ReplyPreviewBean previewBean = new ReplyPreviewBean();
+        if (messageBean instanceof ReplyMessageBean) {
+            String msgRootId = ((ReplyMessageBean) messageBean).getMsgRootId();
+            previewBean.setMessageRootID(msgRootId);
+        } else {
+            previewBean.setMessageRootID(messageBean.getId());
+        }
+        previewBean.setOriginalMessageBean(messageBean);
+        previewBean.setMessageID(messageBean.getId());
+        previewBean.setMessageAbstract(messageAbstract);
+        previewBean.setMessageSender(sender);
+        previewBean.setMessageTime(messageBean.getMessageTime());
+        previewBean.setMessageSequence(messageBean.getMsgSeq());
+        previewBean.setMessageType(messageBean.getMsgType());
+
+        return previewBean;
+    }
+
+    public static void mergeCloudCustomData(TUIMessageBean messageBean, String key, Object data) {
+        String cloudCustomData = messageBean.getV2TIMMessage().getCloudCustomData();
+        Gson gson = new Gson();
+        HashMap hashMap = null;
+        if (TextUtils.isEmpty(cloudCustomData)) {
+            hashMap = new HashMap();
+        } else {
+            try {
+                hashMap = gson.fromJson(cloudCustomData, HashMap.class);
+            } catch (JsonSyntaxException e) {
+                TUIChatLog.e(TAG, " mergeCloudCustomData error " + e.getMessage());
+            }
+        }
+        if (hashMap != null) {
+            hashMap.put(key, data);
+            cloudCustomData = gson.toJson(hashMap);
+        }
+        messageBean.getV2TIMMessage().setCloudCustomData(cloudCustomData);
+    }
+
+}
\ No newline at end of file
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/ChatMessageParser.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/ChatMessageParser.java
new file mode 100644
index 0000000..10cf2b7
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/ChatMessageParser.java
@@ -0,0 +1,612 @@
+package com.tencent.qcloud.tuikit.tuichat.util;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
+import com.tencent.imsdk.v2.V2TIMCustomElem;
+import com.tencent.imsdk.v2.V2TIMImageElem;
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.imsdk.v2.V2TIMSignalingInfo;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.util.DateTimeUtil;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+import com.tencent.qcloud.tuikit.tuichat.bean.CallModel;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageCustom;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageFeature;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageReactBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageRepliesBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.MessageTyping;
+import com.tencent.qcloud.tuikit.tuichat.bean.ReplyPreviewBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CallingMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.CustomLinkMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.FaceMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.FileMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ImageMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.LocationMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.MergeMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.QuoteMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.ReplyMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.SoundMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TextMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TipsMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.VideoMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ChatMessageParser {
+    private static final String TAG = ChatMessageParser.class.getSimpleName();
+
+    public static TUIMessageBean parseMessage(V2TIMMessage v2TIMMessage) {
+        System.out.println("聊天消息接受"+v2TIMMessage);
+        return parseMessage(v2TIMMessage, false);
+    }
+
+    public static TUIMessageBean parseMessage(V2TIMMessage v2TIMMessage, boolean isIgnoreReply) {
+        if (v2TIMMessage == null) {
+            return null;
+        }
+        if (v2TIMMessage.getStatus() == V2TIMMessage.V2TIM_MSG_STATUS_HAS_DELETED || v2TIMMessage.getElemType() == V2TIMMessage.V2TIM_ELEM_TYPE_NONE) {
+            return null;
+        }
+        TUIMessageBean message = null;
+        if (!isIgnoreReply) {
+            message = parseReplyMessage(v2TIMMessage);
+        }
+        if (message == null) {
+            int msgType = v2TIMMessage.getElemType();
+            switch (msgType) {
+                case V2TIMMessage.V2TIM_ELEM_TYPE_TEXT:
+                    message = new TextMessageBean();
+                    break;
+                case V2TIMMessage.V2TIM_ELEM_TYPE_IMAGE:
+                    message = new ImageMessageBean();
+                    break;
+                case V2TIMMessage.V2TIM_ELEM_TYPE_SOUND:
+                    message = new SoundMessageBean();
+                    break;
+                case V2TIMMessage.V2TIM_ELEM_TYPE_VIDEO:
+                    message = new VideoMessageBean();
+                    break;
+                case V2TIMMessage.V2TIM_ELEM_TYPE_FILE:
+                    message = new FileMessageBean();
+                    break;
+                case V2TIMMessage.V2TIM_ELEM_TYPE_LOCATION:
+                    message = new LocationMessageBean();
+                    break;
+                case V2TIMMessage.V2TIM_ELEM_TYPE_FACE:
+                    message = new FaceMessageBean();
+                    break;
+                case V2TIMMessage.V2TIM_ELEM_TYPE_GROUP_TIPS:
+                    message = new TipsMessageBean();
+                    break;
+                case V2TIMMessage.V2TIM_ELEM_TYPE_MERGER:
+                    message = new MergeMessageBean();
+                    break;
+                case V2TIMMessage.V2TIM_ELEM_TYPE_CUSTOM:
+                    message = parseCustomMessage(v2TIMMessage);
+                    break;
+                default:
+                    break;
+            }
+        }
+        if (message != null) {
+            message.setCommonAttribute(v2TIMMessage);
+            message.onProcessMessage(v2TIMMessage);
+        }
+        return message;
+    }
+
+    private static TUIMessageBean parseCustomMessage(V2TIMMessage v2TIMMessage) {
+        TUIMessageBean messageBean = parseCallingMessage(v2TIMMessage);
+        if (messageBean == null) {
+            messageBean = parseGroupCreateMessage(v2TIMMessage);
+        }
+        if (messageBean == null) {
+            messageBean = parseCustomMessageFromMap(v2TIMMessage);
+        }
+        if (messageBean == null) {
+            messageBean = new TextMessageBean();
+            String text = TUIChatService.getAppContext().getString(R.string.no_support_msg);
+            ((TextMessageBean) messageBean).setText(text);
+        }
+        return messageBean;
+    }
+
+    private static TUIMessageBean parseCustomMessageFromMap(V2TIMMessage v2TIMMessage) {
+        String businessId = getCustomBusinessId(v2TIMMessage);
+        Class<? extends TUIMessageBean> messageBeanClazz = TUIChatService.getInstance().getMessageBeanClass(businessId);
+        if (messageBeanClazz != null) {
+            try {
+                return messageBeanClazz.newInstance();
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            } catch (InstantiationException e) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
+
+    private static TUIMessageBean parseReplyMessage(V2TIMMessage v2TIMMessage) {
+        String cloudCustomData = v2TIMMessage.getCloudCustomData();
+        if (TextUtils.isEmpty(cloudCustomData)) {
+            return null;
+        }
+        try {
+            Gson gson = new Gson();
+            HashMap replyHashMap = gson.fromJson(cloudCustomData, HashMap.class);
+            if (replyHashMap != null) {
+                Object replyContentObj = replyHashMap.get(TUIChatConstants.MESSAGE_REPLY_KEY);
+                ReplyPreviewBean replyPreviewBean = null;
+                if (replyContentObj instanceof Map) {
+                    replyPreviewBean = gson.fromJson(gson.toJson(replyContentObj), ReplyPreviewBean.class);
+                }
+                if (replyPreviewBean != null) {
+                    if (replyPreviewBean.getVersion() > ReplyPreviewBean.VERSION) {
+                        return null;
+                    }
+                    if (TextUtils.isEmpty(replyPreviewBean.getMessageRootID())) {
+                        return new QuoteMessageBean(replyPreviewBean);
+                    } else {
+                        return new ReplyMessageBean(replyPreviewBean);
+                    }
+                }
+            }
+        } catch (JsonSyntaxException e) {
+            TUIChatLog.e(TAG, " getCustomJsonMap error ");
+        }
+        return null;
+    }
+
+    public static MessageReactBean parseMessageReact(TUIMessageBean messageBean) {
+        V2TIMMessage message = messageBean.getV2TIMMessage();
+        String cloudCustomData = message.getCloudCustomData();
+
+        try {
+            Gson gson = new Gson();
+            HashMap hashMap = gson.fromJson(cloudCustomData, HashMap.class);
+            if (hashMap != null) {
+                Object reactContentObj = hashMap.get(TUIChatConstants.MESSAGE_REACT_KEY);
+                MessageReactBean reactBean = null;
+                if (reactContentObj instanceof Map) {
+                    reactBean = gson.fromJson(gson.toJson(reactContentObj), MessageReactBean.class);
+                }
+                if (reactBean != null) {
+                    if (reactBean.getVersion() > MessageReactBean.VERSION) {
+                        return null;
+                    }
+                    return reactBean;
+                }
+            }
+        } catch (JsonSyntaxException e) {
+            TUIChatLog.e(TAG, " getCustomJsonMap error ");
+        }
+        return null;
+    }
+
+    public static MessageRepliesBean parseMessageReplies(TUIMessageBean messageBean) {
+        V2TIMMessage message = messageBean.getV2TIMMessage();
+        String cloudCustomData = message.getCloudCustomData();
+
+        try {
+            Gson gson = new Gson();
+            HashMap hashMap = gson.fromJson(cloudCustomData, HashMap.class);
+            if (hashMap != null) {
+                Object repliesContentObj = hashMap.get(TUIChatConstants.MESSAGE_REPLIES_KEY);
+                MessageRepliesBean repliesBean = null;
+                if (repliesContentObj instanceof Map) {
+                    repliesBean = gson.fromJson(gson.toJson(repliesContentObj), MessageRepliesBean.class);
+                }
+                if (repliesBean != null) {
+                    if (repliesBean.getVersion() > MessageRepliesBean.VERSION) {
+                        return null;
+                    }
+                    return repliesBean;
+                }
+            }
+        } catch (JsonSyntaxException e) {
+            TUIChatLog.e(TAG, " getCustomJsonMap error ");
+        }
+        return null;
+    }
+
+    public static boolean isTyping(byte[] data) {
+        try {
+            String str = new String(data, "UTF-8");
+            MessageTyping typing = new Gson().fromJson(str, MessageTyping.class);
+            if (typing != null
+                    && typing.userAction == MessageTyping.TYPE_TYPING
+                    && TextUtils.equals(typing.actionParam, MessageTyping.EDIT_START)) {
+                return true;
+            }
+            return false;
+        } catch (Exception e) {
+            TUIChatLog.e(TAG, "parse json error");
+        }
+        return false;
+    }
+
+    private static String getCustomBusinessId(V2TIMMessage v2TIMMessage) {
+        V2TIMCustomElem customElem =  v2TIMMessage.getCustomElem();
+        if (customElem == null || customElem.getData() == null || customElem.getData().length == 0) {
+            return null;
+        }
+        String data = new String(customElem.getData());
+
+        Gson gson = new Gson();
+        HashMap customJsonMap = null;
+        try {
+            customJsonMap = gson.fromJson(data, HashMap.class);
+        } catch (JsonSyntaxException e) {
+            TUIChatLog.e(TAG, " getCustomJsonMap error ");
+        }
+        String businessId = null;
+        Object businessIdObj = null;
+        if (customJsonMap != null) {
+            businessIdObj = customJsonMap.get(TUIConstants.Message.CUSTOM_BUSINESS_ID_KEY);
+        }
+        if (businessIdObj instanceof String) {
+            businessId = (String) businessIdObj;
+        }
+        return businessId;
+    }
+
+    /**
+     * 把 IMSDK 的消息 bean 列表转化为 TUIKit 的消息bean列表
+     * 
+     * Convert IMSDK's message bean list to TUIKit's message bean list
+     *
+     * @param v2TIMMessageList IMSDK 的消息 bean 列表
+     * @return 转换后的 TUIKit bean 列表
+     */
+    public static List<TUIMessageBean> parseMessageList(List<V2TIMMessage> v2TIMMessageList) {
+        if (v2TIMMessageList == null) {
+            return null;
+        }
+        List<TUIMessageBean> messageList = new ArrayList<>();
+        for (int i = 0; i < v2TIMMessageList.size(); i++) {
+            V2TIMMessage timMessage = v2TIMMessageList.get(i);
+            TUIMessageBean message = parseMessage(timMessage);
+            if (message != null) {
+                messageList.add(message);
+            }
+        }
+        return messageList;
+    }
+
+    private static TUIMessageBean parseCallingMessage(V2TIMMessage v2TIMMessage) {
+        V2TIMSignalingInfo signalingInfo = V2TIMManager.getSignalingManager().getSignalingInfo(v2TIMMessage);
+        if (signalingInfo != null) {
+            String businessId = null;
+            Double businessIdForTimeout = 0.0;
+            Object businessIdObj = null;
+            Gson gson = new Gson();
+            try {
+                HashMap signalDataMap = gson.fromJson(signalingInfo.getData(), HashMap.class);
+                if (signalDataMap != null) {
+                    businessIdObj = signalDataMap.get(TUIConstants.Message.CUSTOM_BUSINESS_ID_KEY);
+                }
+            } catch (JsonSyntaxException e) {
+                TUIChatLog.e(TAG, " get signalingInfoCustomJsonMap error ");
+            }
+            if (businessIdObj instanceof String) {
+                businessId = (String) businessIdObj;
+            } else if (businessIdObj instanceof Double) {
+                businessIdForTimeout = (Double) businessIdObj;
+            }
+
+            if (TextUtils.equals(businessId, TUIConstants.TUICalling.CUSTOM_MESSAGE_BUSINESS_ID) ||
+                    Math.abs(businessIdForTimeout - TUIConstants.TUICalling.CALL_TIMEOUT_BUSINESS_ID) < 0.000001) {
+                return getCallingMessage(v2TIMMessage);
+            } else {
+                return null;
+            }
+        }
+        return null;
+    }
+
+    private static TUIMessageBean getCallingMessage(V2TIMMessage timMessage) {
+        TUIMessageBean message;
+        boolean isGroup = !TextUtils.isEmpty(timMessage.getGroupID());
+
+        CallModel callModel = CallModel.convert2VideoCallData(timMessage);
+        if (callModel == null) {
+            return null;
+        }
+        String senderShowName = getDisplayName(timMessage);
+        String content = "";
+        Context context = TUIChatService.getAppContext();
+        switch (callModel.action) {
+            case CallModel.VIDEO_CALL_ACTION_DIALING:
+                content = isGroup ? ("\"" + senderShowName + "\"" +
+                        context.getString(R.string.start_group_call)) : (context.getString(R.string.start_call));
+                break;
+            case CallModel.VIDEO_CALL_ACTION_SPONSOR_CANCEL:
+                content = isGroup ? context.getString(R.string.cancle_group_call) : context.getString(R.string.cancle_call);
+                break;
+            case CallModel.VIDEO_CALL_ACTION_LINE_BUSY:
+                content = isGroup ? ("\"" + senderShowName + "\"" +
+                        context.getString(R.string.line_busy)) : context.getString(R.string.other_line_busy);
+                break;
+            case CallModel.VIDEO_CALL_ACTION_REJECT:
+                content = isGroup ? ("\"" + senderShowName + "\"" +
+                        context.getString(R.string.reject_group_calls)) : context.getString(R.string.reject_calls);
+                break;
+            case CallModel.VIDEO_CALL_ACTION_SPONSOR_TIMEOUT:
+                if (isGroup && callModel.invitedList != null && callModel.invitedList.size() == 1
+                        && callModel.invitedList.get(0).equals(timMessage.getSender())) {
+                    content = "\"" + senderShowName + "\"" + context.getString(R.string.no_response_call);
+                } else {
+                    StringBuilder inviteeShowStringBuilder = new StringBuilder();
+                    if (callModel.invitedList != null && callModel.invitedList.size() > 0) {
+                        for (String invitee : callModel.invitedList) {
+                            inviteeShowStringBuilder.append(invitee).append("、");
+                        }
+                        if (inviteeShowStringBuilder.length() > 0) {
+                            inviteeShowStringBuilder.delete(inviteeShowStringBuilder.length() - 1, inviteeShowStringBuilder.length());
+                        }
+                    }
+                    content = isGroup ? ("\"" + inviteeShowStringBuilder.toString() + "\""
+                            + context.getString(R.string.no_response_call)) : context.getString(R.string.no_response_call);
+                }
+                break;
+            case CallModel.VIDEO_CALL_ACTION_ACCEPT:
+                content = isGroup ? ("\"" + senderShowName + "\"" +
+                        context.getString(R.string.accept_call)) : context.getString(R.string.accept_call);
+                break;
+            case CallModel.VIDEO_CALL_ACTION_HANGUP:
+                content = isGroup ? context.getString(R.string.stop_group_call) :
+                        context.getString(R.string.stop_call_tip) + DateTimeUtil.formatSecondsTo00(callModel.duration);
+                break;
+            case CallModel.VIDEO_CALL_ACTION_SWITCH_TO_AUDIO:
+                content = context.getString(R.string.chat_calling_switch_to_audio);
+                break;
+            case CallModel.VIDEO_CALL_ACTION_SWITCH_TO_AUDIO_ACCEPT:
+                content = context.getString(R.string.chat_calling_switch_to_audio_accept);
+                break;
+            case CallModel.VIDEO_CALL_ACTION_UNKNOWN_INVITE:
+                content = context.getString(R.string.chat_calling_unknown_invitation);
+                break;
+            default:
+                content = context.getString(R.string.invalid_command);
+                break;
+        }
+        if (isGroup) {
+            TipsMessageBean tipsMessageBean = new TipsMessageBean();
+            tipsMessageBean.setCommonAttribute(timMessage);
+            tipsMessageBean.setText(content);
+            tipsMessageBean.setExtra(content);
+            message = tipsMessageBean;
+        } else {
+            CallingMessageBean callingMessageBean = new CallingMessageBean();
+            callingMessageBean.setCommonAttribute(timMessage);
+            callingMessageBean.setText(content);
+            callingMessageBean.setExtra(content);
+            callingMessageBean.setCallType(callModel.callType);
+            message = callingMessageBean;
+        }
+        return message;
+    }
+
+    private static TUIMessageBean parseGroupCreateMessage(V2TIMMessage v2TIMMessage) {
+        V2TIMCustomElem customElem = v2TIMMessage.getCustomElem();
+        if (customElem == null || customElem.getData() == null || customElem.getData().length == 0) {
+            return null;
+        }
+        String data = new String(customElem.getData());
+        Gson gson = new Gson();
+
+        if (data.equals(MessageCustom.BUSINESS_ID_GROUP_CREATE)) {
+            // 兼容4.7版本以前的 tuikit
+            // Compatible with tuikit prior to version 4.7
+            TipsMessageBean messageBean = new TipsMessageBean();
+            messageBean.setCommonAttribute(v2TIMMessage);
+            messageBean.setTipType(TipsMessageBean.MSG_TYPE_GROUP_CREATE);
+            String message = TUIChatConstants.covert2HTMLString(getDisplayName(v2TIMMessage)) + TUIChatService.getAppContext().getString(R.string.create_group);
+            messageBean.setText(message);
+            messageBean.setExtra(message);
+            return messageBean;
+        } else {
+            if (isTyping(customElem.getData())) {
+                // 忽略正在输入，它不能作为真正的消息展示
+                // Ignore being typed, it cannot be displayed as a real message
+                return null;
+            }
+            TUIChatLog.i(TAG, "custom data:" + data);
+            MessageCustom messageCustom = null;
+            try {
+                messageCustom = gson.fromJson(data, MessageCustom.class);
+                if (!TextUtils.isEmpty(messageCustom.businessID) && messageCustom.businessID.equals(MessageCustom.BUSINESS_ID_GROUP_CREATE)) {
+                    TipsMessageBean messageBean = new TipsMessageBean();
+                    messageBean.setCommonAttribute(v2TIMMessage);
+                    messageBean.setTipType(TipsMessageBean.MSG_TYPE_GROUP_CREATE);
+                    String message = TUIChatConstants.covert2HTMLString(getDisplayName(v2TIMMessage)) + messageCustom.content;
+                    messageBean.setText(message);
+                    messageBean.setExtra(message);
+                    return messageBean;
+                }
+            } catch (Exception e) {
+                TUIChatLog.e(TAG, "invalid json: " + data + ", exception:" + e);
+            }
+        }
+        return null;
+    }
+
+    public static String getDisplayName(V2TIMMessage timMessage) {
+        String displayName;
+        if (timMessage == null) {
+            return null;
+        }
+        if (!TextUtils.isEmpty(timMessage.getNameCard())) {
+            displayName = timMessage.getNameCard();
+        } else if (!TextUtils.isEmpty(timMessage.getFriendRemark())) {
+            displayName = timMessage.getFriendRemark();
+        } else if (!TextUtils.isEmpty(timMessage.getNickName())) {
+            displayName = timMessage.getNickName();
+        } else {
+            displayName = timMessage.getSender();
+        }
+        return displayName;
+    }
+
+    /**
+     * 获取图片在本地的原始路径 (可能是沙盒中的路径)
+     * @param messageBean 图片消息元组
+     * @return 图片原始路径，如果不存在返回 null
+     * 
+     * Get the original path of the image locally (maybe the path in the sandbox)
+     * @param messageBean message bean
+     * @return The original path of the image, or null if it does not exist
+     */
+    public static String getLocalImagePath(TUIMessageBean messageBean) {
+        if (messageBean == null || !messageBean.isSelf()) {
+            return null;
+        }
+        V2TIMMessage message = messageBean.getV2TIMMessage();
+        if (message == null || message.getElemType() != V2TIMMessage.V2TIM_ELEM_TYPE_IMAGE) {
+            return null;
+        }
+        V2TIMImageElem imageElem = message.getImageElem();
+        if (imageElem == null) {
+            return null;
+        }
+        String path = imageElem.getPath();
+        File file = new File(path);
+        if (file.exists()) {
+            return path;
+        }
+        return null;
+    }
+
+    public static String getDisplayString(V2TIMMessage v2TIMMessage) {
+        if (v2TIMMessage == null) {
+            return null;
+        }
+        TUIMessageBean messageBean = parseMessage(v2TIMMessage);
+        if (messageBean == null) {
+            return null;
+        }
+        String displayString;
+        if (messageBean.getStatus() == TUIMessageBean.MSG_STATUS_REVOKE) {
+            if (messageBean.isSelf()) {
+                displayString = TUIChatService.getAppContext().getString(R.string.revoke_tips_you);
+            } else if (messageBean.isGroup()) {
+                String message = TUIChatConstants.covert2HTMLString(
+                        TextUtils.isEmpty(messageBean.getNameCard())
+                                ? messageBean.getSender()
+                                : messageBean.getNameCard());
+                displayString = message + TUIChatService.getAppContext().getString(R.string.revoke_tips);
+            } else {
+                displayString = TUIChatService.getAppContext().getString(R.string.revoke_tips_other);
+            }
+        } else {
+            displayString = messageBean.onGetDisplayString();
+        }
+        displayString = FaceManager.emojiJudge(displayString);
+        return displayString;
+    }
+
+    public static String getReplyMessageAbstract(TUIMessageBean messageBean) {
+        String result = "";
+        if (messageBean != null) {
+            String extra = "";
+            if (messageBean instanceof TextMessageBean) {
+                extra = ((TextMessageBean) messageBean).getText();
+            } else if (messageBean instanceof MergeMessageBean) {
+                extra = ((MergeMessageBean) messageBean).getTitle();
+            } else if (messageBean instanceof FileMessageBean) {
+                extra = ((FileMessageBean) messageBean).getFileName();
+            } else if (messageBean instanceof CustomLinkMessageBean) {
+                extra = ((CustomLinkMessageBean) messageBean).getText();
+            } else if (messageBean instanceof SoundMessageBean
+                    || messageBean instanceof ImageMessageBean
+                    || messageBean instanceof VideoMessageBean
+                    || messageBean instanceof LocationMessageBean
+                    || messageBean instanceof FaceMessageBean) {
+                extra = "";
+            } else {
+                extra = messageBean.getExtra();
+            }
+            result = result + extra;
+        }
+        return result;
+    }
+
+    public static boolean isFileType(int msgType) {
+        return msgType == V2TIMMessage.V2TIM_ELEM_TYPE_FILE;
+    }
+
+    public static String getMsgTypeStr(int msgType) {
+        String typeStr;
+        switch (msgType) {
+            case V2TIMMessage.V2TIM_ELEM_TYPE_SOUND: {
+                typeStr = TUIChatService.getAppContext().getString(R.string.audio_extra);
+                break;
+            }
+            case V2TIMMessage.V2TIM_ELEM_TYPE_FILE: {
+                typeStr = TUIChatService.getAppContext().getString(R.string.file_extra);
+                break;
+            }
+            case V2TIMMessage.V2TIM_ELEM_TYPE_IMAGE: {
+                typeStr = TUIChatService.getAppContext().getString(R.string.picture_extra);
+                break;
+            }
+            case V2TIMMessage.V2TIM_ELEM_TYPE_LOCATION: {
+                typeStr = TUIChatService.getAppContext().getString(R.string.location_extra);
+                break;
+            }
+            case V2TIMMessage.V2TIM_ELEM_TYPE_VIDEO: {
+                typeStr = TUIChatService.getAppContext().getString(R.string.video_extra);
+                break;
+            }
+            case V2TIMMessage.V2TIM_ELEM_TYPE_FACE: {
+                typeStr = TUIChatService.getAppContext().getString(R.string.custom_emoji);
+                break;
+            }
+            default: {
+                typeStr = "";
+            }
+        }
+        return typeStr;
+    }
+
+    public static MessageFeature isSupportTyping(TUIMessageBean messageBean) {
+        String cloudCustomData = messageBean.getV2TIMMessage().getCloudCustomData();
+        if (TextUtils.isEmpty(cloudCustomData)) {
+            return null;
+        }
+        try {
+            Gson gson = new Gson();
+            HashMap featureHashMap = gson.fromJson(cloudCustomData, HashMap.class);
+            if (featureHashMap != null) {
+                Object featureContentObj = featureHashMap.get(TUIChatConstants.MESSAGE_FEATURE_KEY);
+                MessageFeature messageFeature = null;
+                if (featureContentObj instanceof Map) {
+                    messageFeature = gson.fromJson(gson.toJson(featureContentObj), MessageFeature.class);
+                }
+                if (messageFeature != null) {
+                    if (messageFeature.getVersion() > MessageFeature.VERSION) {
+                        return null;
+                    }
+
+                    return messageFeature;
+                }
+            }
+        } catch (JsonSyntaxException e) {
+            TUIChatLog.e(TAG, " isSupportTyping exception e = " + e);
+        }
+        return null;
+    }
+    
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/CheckPermission.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/CheckPermission.java
new file mode 100644
index 0000000..9de67c4
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/CheckPermission.java
@@ -0,0 +1,99 @@
+package com.tencent.qcloud.tuikit.tuichat.util;
+
+import android.hardware.Camera;
+import android.media.AudioFormat;
+import android.media.AudioRecord;
+import android.media.MediaRecorder;
+import android.util.Log;
+
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+
+public class CheckPermission {
+
+    public static final int STATE_RECORDING = -1;
+    public static final int STATE_NO_PERMISSION = -2;
+    public static final int STATE_SUCCESS = 1;
+    private static final String TAG = CheckPermission.class.getSimpleName();
+
+    /**
+     * 用于检测是否具有录音权限
+     * 
+     * Used to detect whether there is recording permission
+     *
+     * @return
+     */
+    public static int getRecordState() {
+        int minBuffer = AudioRecord.getMinBufferSize(44100, AudioFormat.CHANNEL_IN_MONO, AudioFormat
+                .ENCODING_PCM_16BIT);
+        AudioRecord audioRecord = new AudioRecord(MediaRecorder.AudioSource.DEFAULT, 44100, AudioFormat
+                .CHANNEL_IN_MONO, AudioFormat.ENCODING_PCM_16BIT, (minBuffer * 100));
+        short[] point = new short[minBuffer];
+        int readSize = 0;
+        try {
+
+            audioRecord.startRecording();
+        } catch (Exception e) {
+            if (audioRecord != null) {
+                audioRecord.release();
+                audioRecord = null;
+            }
+            return STATE_NO_PERMISSION;
+        }
+        if (audioRecord.getRecordingState() != AudioRecord.RECORDSTATE_RECORDING) {
+            if (audioRecord != null) {
+                audioRecord.stop();
+                audioRecord.release();
+                audioRecord = null;
+                Log.i(TAG, TUIChatService.getAppContext().getString(R.string.record_occupied));
+            }
+            return STATE_RECORDING;
+        } else {
+            readSize = audioRecord.read(point, 0, point.length);
+
+            if (readSize <= 0) {
+                if (audioRecord != null) {
+                    audioRecord.stop();
+                    audioRecord.release();
+                    audioRecord = null;
+
+                }
+                Log.i(TAG, TUIChatService.getAppContext().getString(R.string.record_null));
+                return STATE_NO_PERMISSION;
+
+            } else {
+                if (audioRecord != null) {
+                    audioRecord.stop();
+                    audioRecord.release();
+                    audioRecord = null;
+
+                }
+
+                return STATE_SUCCESS;
+            }
+        }
+    }
+
+    public synchronized static boolean isCameraUseable(int cameraID) {
+        boolean canUse = true;
+        Camera mCamera = null;
+        try {
+            mCamera = Camera.open(cameraID);
+            // setParameters 是针对魅族MX5。MX5通过Camera.open()拿到的Camera对象不为null
+            // setParameters is for Meizu MX5. The Camera object obtained by MX5 through Camera.open() is not null
+            Camera.Parameters mParameters = mCamera.getParameters();
+            mCamera.setParameters(mParameters);
+        } catch (Exception e) {
+            e.printStackTrace();
+            canUse = false;
+        } finally {
+            if (mCamera != null) {
+                mCamera.release();
+            } else {
+                canUse = false;
+            }
+            mCamera = null;
+        }
+        return canUse;
+    }
+}
\ No newline at end of file
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/DataStoreUtil.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/DataStoreUtil.java
new file mode 100644
index 0000000..8b1640b
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/DataStoreUtil.java
@@ -0,0 +1,114 @@
+package com.tencent.qcloud.tuikit.tuichat.util;
+
+import androidx.datastore.preferences.core.MutablePreferences;
+import androidx.datastore.preferences.core.Preferences;
+import androidx.datastore.preferences.core.PreferencesKeys;
+import androidx.datastore.rxjava3.RxDataStore;
+
+import com.google.gson.Gson;
+
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+
+public class DataStoreUtil {
+    private static final String TAG = DataStoreUtil.class.getSimpleName();
+
+    private static DataStoreUtil instance;
+    private RxDataStore<Preferences> dataStore = null;
+
+    public static DataStoreUtil getInstance() {
+        if (instance == null) {
+            instance = new DataStoreUtil();
+        }
+
+        return instance;
+    }
+
+    private DataStoreUtil() {
+
+    }
+
+    public void setDataStore (RxDataStore<Preferences> dataStore) {
+        this.dataStore = dataStore;
+    }
+
+    public  <T> T getValue(String key, Class<T> cls){
+        if (dataStore == null) {
+            TUIChatLog.e(TAG, "dataStore is null");
+            return null;
+        }
+        Preferences.Key<String> dstKey = PreferencesKeys.stringKey(key);
+        Flowable<String> currentFlow = dataStore.data().map(prefs -> prefs.get(dstKey));
+        String content = currentFlow.blockingFirst();
+        Gson gson = new Gson();
+        T result = gson.fromJson(content, cls);
+        return result;
+    }
+
+    public  <T> void getValueAsync(String key, GetResult<T> callback, Class<T> cls){
+        if (dataStore == null) {
+            TUIChatLog.e(TAG, "dataStore is null");
+            callback.onFail();
+            return;
+        }
+        Preferences.Key<String> dstKey = PreferencesKeys.stringKey(key);
+        Flowable<String> currentFlow = dataStore.data().map(prefs -> prefs.get(dstKey));
+        final DisponseHandler disponseHandler = new DisponseHandler();
+        disponseHandler.disposable = currentFlow
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Consumer<String>() {
+                    @Override
+                    public void accept(String data) throws Throwable {
+                        String content = currentFlow.blockingFirst();
+                        Gson gson = new Gson();
+                        T result = gson.fromJson(content, cls);
+                        callback.onSuccess(result);
+                        if (disponseHandler.disposable != null && !disponseHandler.disposable.isDisposed()){
+                            disponseHandler.disposable.dispose();
+                        }
+                    }
+                }, new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable throwable) throws Throwable {
+                        TUIChatLog.e(TAG, "dataStore throwable = " + throwable);
+                        callback.onFail();
+                        if (disponseHandler.disposable != null && !disponseHandler.disposable.isDisposed()){
+                            disponseHandler.disposable.dispose();
+                        }
+                    }
+                });
+
+    }
+
+    public <T> void putValue(String key, T value) {
+        if (dataStore == null) {
+            TUIChatLog.e(TAG, "dataStore is null");
+            return;
+        }
+
+        Preferences.Key<String> dstKey = PreferencesKeys.stringKey(key);
+        Single<Preferences> updateResult = dataStore.updateDataAsync(prefsIn -> {
+            MutablePreferences mutablePreferences = prefsIn.toMutablePreferences();
+            Gson gson = new Gson();
+            String content = gson.toJson(value);
+            mutablePreferences.set(dstKey, content);
+            return Single.just(mutablePreferences);
+        });
+        updateResult.subscribe();
+    }
+
+    class DisponseHandler{
+        Disposable disposable;
+    }
+
+    public interface GetResult<T> {
+        void onSuccess(T result);
+
+        void onFail();
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/DeviceUtil.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/DeviceUtil.java
new file mode 100644
index 0000000..4fa3726
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/DeviceUtil.java
@@ -0,0 +1,44 @@
+package com.tencent.qcloud.tuikit.tuichat.util;
+
+import android.util.DisplayMetrics;
+
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.util.TUIBuild;
+
+public class DeviceUtil {
+
+    private static String[] huaweiAndHonorDevice = {
+            "hwH60",    //荣耀6
+            "hwPE",     //荣耀6 plus
+            "hwH30",    //3c
+            "hwHol",    //3c畅玩版
+            "hwG750",   //3x
+            "hw7D",      //x1
+            "hwChe2",      //x1
+    };
+
+    public static boolean isHuaWeiOrHonor() {
+        String device = TUIBuild.getDevice();
+        int length = huaweiAndHonorDevice.length;
+        for (int i = 0; i < length; i++) {
+            if (huaweiAndHonorDevice[i].equals(device)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    public static boolean isVivoX21() {
+        String model = TUIBuild.getModel();
+        return "vivo X21".equalsIgnoreCase(model);
+    }
+
+    public static int[] getScreenSize() {
+        int size[] = new int[2];
+        DisplayMetrics dm = TUIConfig.getAppContext().getResources().getDisplayMetrics();
+        size[0] = dm.widthPixels;
+        size[1] = dm.heightPixels;
+        return size;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/FileUtil.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/FileUtil.java
new file mode 100644
index 0000000..14a23c3
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/FileUtil.java
@@ -0,0 +1,245 @@
+package com.tencent.qcloud.tuikit.tuichat.util;
+
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.media.MediaScannerConnection;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Environment;
+import android.provider.MediaStore;
+import android.text.TextUtils;
+import android.webkit.MimeTypeMap;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class FileUtil {
+    private static final String TAG = FileUtil.class.getSimpleName();
+
+    public static boolean saveVideoToGallery(Context context, String videoPath) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            return saveVideoToGalleryByMediaStore(context, videoPath);
+        } else {
+            return saveVideoToGalleryByFile(context, videoPath);
+        }
+    }
+
+    public static boolean saveImageToGallery(Context context, String videoPath) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            return saveImageToGalleryByMediaStore(context, videoPath);
+        } else {
+            return saveImageToGalleryByFile(context, videoPath);
+        }
+    }
+
+
+    public static boolean saveVideoToGalleryByMediaStore(Context context, String videoPath) {
+        if (TextUtils.isEmpty(videoPath) || context == null) {
+            TUIChatLog.e(TAG, "param invalid");
+            return false;
+        }
+
+        String videoFileName = getFileName(videoPath);
+        String videoMimeType = getMimeType(videoPath);
+        final long now = System.currentTimeMillis();
+        ContentValues videoImageValues = new ContentValues();
+        videoImageValues.put(MediaStore.Video.Media.DATE_ADDED, now / 1000);
+        videoImageValues.put(MediaStore.Video.Media.DATE_MODIFIED, now / 1000);
+        videoImageValues.put(MediaStore.Video.Media.DISPLAY_NAME,videoFileName);
+        videoImageValues.put(MediaStore.Video.Media.MIME_TYPE, videoMimeType);
+        // insert to gallery
+        Uri videoExternalContentUri = MediaStore.Video.Media
+                .getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY);
+        videoImageValues.put(MediaStore.Video.Media.IS_PENDING, 1);
+        videoImageValues.put(MediaStore.Video.Media.RELATIVE_PATH, Environment.DIRECTORY_MOVIES + "/" + getAppName(context) + "/");
+
+        ContentResolver resolver = context.getContentResolver();
+        Uri uri;
+        try {
+            uri = resolver.insert(videoExternalContentUri, videoImageValues);
+        } catch (IllegalArgumentException e) {
+            TUIChatLog.e(TAG, "saveVideoToGalleryByMediaStore failed, " + e.getMessage());
+            return false;
+        }
+        if (uri == null) {
+            return false;
+        }
+        // got permission, write file to public media dir
+        boolean saveSuccess = saveFileToUri(resolver, uri, videoPath);
+        if (!saveSuccess) {
+            resolver.delete(uri, null, null);
+            return false;
+        }
+        videoImageValues.clear();
+        videoImageValues.put(MediaStore.Images.Media.IS_PENDING, 0);
+        resolver.update(uri, videoImageValues, null, null);
+
+        // update system gallery
+        MediaScannerConnection.scanFile(context, new String[]{uri.toString()}, new String[]{videoMimeType}, null);
+        return true;
+    }
+
+    public static boolean saveVideoToGalleryByFile(Context context, String videoPath) {
+        String videoDirPath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES) + "/" + getAppName(context) + "/";
+        File dir = new File(videoDirPath);
+        if (!dir.exists()) {
+            dir.mkdirs();
+        }
+        String videoName = getFileName(videoPath);
+        String outputPath = videoDirPath + videoName;
+        File outputFile = new File(outputPath);
+        if (outputFile.exists()) {
+            outputFile.delete();
+        }
+        boolean isSuccess = saveFileFromPath(outputFile, videoPath);
+        if (!isSuccess) {
+            return false;
+        }
+        String videoMimeType = getMimeType(videoPath);
+        MediaScannerConnection.scanFile(context, new String[]{outputPath}, new String[]{videoMimeType}, null);
+        return true;
+    }
+
+    public static boolean saveImageToGalleryByMediaStore(Context context, String imagePath) {
+        if (TextUtils.isEmpty(imagePath) || context == null) {
+            TUIChatLog.e(TAG, "param invalid");
+            return false;
+        }
+
+        String imageFileName = getFileName(imagePath);
+        String imageMimeType = getMimeType(imagePath);
+        final long now = System.currentTimeMillis();
+
+        ContentValues newImageValues = new ContentValues();
+        newImageValues.put(MediaStore.Images.Media.DATE_ADDED, now / 1000);
+        newImageValues.put(MediaStore.Images.Media.DATE_MODIFIED, now / 1000);
+        newImageValues.put(MediaStore.Images.Media.DISPLAY_NAME,imageFileName);
+        newImageValues.put(MediaStore.Images.Media.MIME_TYPE, imageMimeType);
+        // insert to gallery
+        Uri imageExternalContentUri = MediaStore.Images.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY);
+        newImageValues.put(MediaStore.Images.Media.IS_PENDING, 1);
+        newImageValues.put(MediaStore.Images.Media.RELATIVE_PATH, Environment.DIRECTORY_PICTURES + "/" + getAppName(context) + "/");
+
+        ContentResolver resolver = context.getContentResolver();
+        Uri uri;
+        try {
+            uri = resolver.insert(imageExternalContentUri, newImageValues);
+        } catch (IllegalArgumentException e) {
+            TUIChatLog.e(TAG, "saveImageToGalleryByMediaStore failed, " + e.getMessage());
+            return false;
+        }
+        if (uri == null) {
+            return false;
+        }
+        // got permission, write file to public media dir
+        boolean saveSuccess = saveFileToUri(resolver, uri, imagePath);
+        if (!saveSuccess) {
+            resolver.delete(uri, null, null);
+            return false;
+        }
+        newImageValues.clear();
+        newImageValues.put(MediaStore.Images.Media.IS_PENDING, 0);
+        resolver.update(uri, newImageValues, null, null);
+
+        // update system gallery
+        MediaScannerConnection.scanFile(context, new String[]{uri.toString()}, new String[]{imageMimeType}, null);
+        return true;
+    }
+
+    public static boolean saveImageToGalleryByFile(Context context, String imagePath) {
+        String imageDirPath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES) + "/" + getAppName(context) + "/";
+        File dir = new File(imageDirPath);
+        if (!dir.exists()) {
+            dir.mkdirs();
+        }
+        String imageName = getFileName(imagePath);
+        String outputPath = imageDirPath + imageName;
+        if (!outputPath.endsWith(".jpg")) {
+            outputPath += ".jpg";
+        }
+        File outputFile = new File(outputPath);
+        if (outputFile.exists()) {
+            outputFile.delete();
+        }
+        boolean isSuccess = saveFileFromPath(outputFile, imagePath);
+        if (!isSuccess) {
+            return false;
+        }
+        String imageMimeType = getMimeType(imagePath);
+        MediaScannerConnection.scanFile(context, new String[]{outputPath}, new String[]{imageMimeType}, null);
+        return true;
+    }
+
+    public static String getMimeType(String filePath) {
+        String fileExtension = com.tencent.qcloud.tuicore.util.FileUtil.getFileExtensionFromUrl(filePath);
+        return MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileExtension);
+    }
+
+    public static String getFileName(String path) {
+        int filenamePos = path.lastIndexOf('/');
+        return 0 <= filenamePos ? path.substring(filenamePos + 1) : path;
+    }
+
+    public static boolean saveFileToUri(ContentResolver contentResolver, Uri destinationUri, String srcPath) {
+        InputStream is = null;
+        BufferedOutputStream bos = null;
+        try {
+            bos = new BufferedOutputStream(contentResolver.openOutputStream(destinationUri));
+            is = new FileInputStream(srcPath);
+            byte[] buf = new byte[1024];
+
+            int actualBytes;
+            while ((actualBytes = is.read(buf)) != -1) {
+                bos.write(buf, 0, actualBytes);
+            }
+        } catch (IOException e) {
+            return false;
+        } finally {
+            try {
+                if (is != null) is.close();
+                if (bos != null) bos.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return true;
+    }
+
+    public static boolean saveFileFromPath(File desFile, String srcFilePath) {
+        InputStream is = null;
+        BufferedOutputStream bos = null;
+        try {
+            bos = new BufferedOutputStream(new FileOutputStream(desFile));
+            is = new FileInputStream(srcFilePath);
+            byte[] buf = new byte[1024];
+
+            int actualBytes;
+            while ((actualBytes = is.read(buf)) != -1) {
+                bos.write(buf, 0, actualBytes);
+            }
+        } catch (IOException e) {
+            return false;
+        } finally {
+            try {
+                if (is != null) is.close();
+                if (bos != null) bos.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return true;
+    }
+
+    private static String getAppName(Context context) {
+        ApplicationInfo applicationInfo = context.getApplicationInfo();
+        return String.valueOf(context.getPackageManager().getApplicationLabel(applicationInfo));
+    }
+
+}
+
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/OfflinePushInfoUtils.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/OfflinePushInfoUtils.java
new file mode 100644
index 0000000..9287ff2
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/OfflinePushInfoUtils.java
@@ -0,0 +1,24 @@
+package com.tencent.qcloud.tuikit.tuichat.util;
+
+import com.tencent.imsdk.v2.V2TIMOfflinePushInfo;
+import com.tencent.qcloud.tuikit.tuichat.bean.OfflinePushInfo;
+
+public class OfflinePushInfoUtils {
+    public static final String PRIVATE_RING_NAME   = "private_ring";
+    public static final String FCM_PUSH_CHANNEL_ID   = "fcm_push_channel";
+    public static V2TIMOfflinePushInfo convertOfflinePushInfoToV2PushInfo(OfflinePushInfo offlinePushInfo) {
+        if (offlinePushInfo == null) {
+            return null;
+        }
+        V2TIMOfflinePushInfo v2TIMOfflinePushInfo = new V2TIMOfflinePushInfo();
+        v2TIMOfflinePushInfo.setTitle(offlinePushInfo.getTitle());
+        v2TIMOfflinePushInfo.setDesc(offlinePushInfo.getDescription());
+        v2TIMOfflinePushInfo.setExt(offlinePushInfo.getExtension());
+        v2TIMOfflinePushInfo.setAndroidOPPOChannelID(offlinePushInfo.getOppoChannelID());
+        v2TIMOfflinePushInfo.setAndroidVIVOClassification(offlinePushInfo.getVivoClassification());
+        v2TIMOfflinePushInfo.setIOSSound(offlinePushInfo.getIOSSoundFilePath());
+        v2TIMOfflinePushInfo.setIgnoreIOSBadge(offlinePushInfo.isIgnoreIOSBadge());
+        v2TIMOfflinePushInfo.setAndroidSound(offlinePushInfo.getAndroidSound());
+        return v2TIMOfflinePushInfo;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/PermissionHelper.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/PermissionHelper.java
new file mode 100644
index 0000000..cc53db4
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/PermissionHelper.java
@@ -0,0 +1,89 @@
+package com.tencent.qcloud.tuikit.tuichat.util;
+
+import android.content.pm.ApplicationInfo;
+import android.content.res.Resources;
+import android.text.TextUtils;
+
+import androidx.annotation.IntDef;
+
+import com.tencent.qcloud.tuicore.util.PermissionRequester;
+import com.tencent.qcloud.tuikit.tuichat.R;
+import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
+
+public class PermissionHelper {
+    public static final int PERMISSION_MICROPHONE = 1;
+    public static final int PERMISSION_CAMERA = 2;
+    public static final int PERMISSION_STORAGE = 3;
+
+    @IntDef({PERMISSION_MICROPHONE, PERMISSION_CAMERA, PERMISSION_STORAGE})
+    public @interface PermissionType {
+    }
+
+    public static void requestPermission(@PermissionType int type, PermissionCallback callback) {
+        String permission = null;
+        String reason = null;
+        String reasonTitle = null;
+        String deniedAlert = null;
+        ApplicationInfo applicationInfo = TUIChatService.getAppContext().getApplicationInfo();
+        int permissionIcon = 0;
+        Resources resources = TUIChatService.getAppContext().getResources();
+        String appName = resources.getString(applicationInfo.labelRes);
+        switch (type) {
+            case PERMISSION_MICROPHONE: {
+                permission = PermissionRequester.PermissionConstants.MICROPHONE;
+                reasonTitle = resources.getString(R.string.chat_permission_mic_reason_title, appName);
+                reason = resources.getString(R.string.chat_permission_mic_reason);
+                deniedAlert = resources.getString(R.string.chat_permission_mic_dialog_alert, appName);
+                permissionIcon = R.drawable.chat_permission_icon_mic;
+                break;
+            }
+            case PERMISSION_CAMERA: {
+                permission = PermissionRequester.PermissionConstants.CAMERA;
+                reasonTitle = resources.getString(R.string.chat_permission_camera_reason_title, appName);
+                reason = resources.getString(R.string.chat_permission_camera_reason);
+                deniedAlert = resources.getString(R.string.chat_permission_camera_dialog_alert, appName);
+                permissionIcon = R.drawable.chat_permission_icon_camera;
+                break;
+            }
+            case PERMISSION_STORAGE: {
+                permission = PermissionRequester.PermissionConstants.STORAGE;
+                reasonTitle = resources.getString(R.string.chat_permission_storage_reason_title, appName);
+                reason = resources.getString(R.string.chat_permission_storage_reason);
+                deniedAlert = resources.getString(R.string.chat_permission_storage_dialog_alert, appName);
+                permissionIcon = R.drawable.chat_permission_icon_file;
+                break;
+            }
+            default:
+                break;
+        }
+        PermissionRequester.SimpleCallback simpleCallback = new PermissionRequester.SimpleCallback() {
+            @Override
+            public void onGranted() {
+                if (callback != null) {
+                    callback.onGranted();
+                }
+            }
+
+            @Override
+            public void onDenied() {
+                if (callback != null) {
+                    callback.onDenied();
+                }
+            }
+        };
+        if (!TextUtils.isEmpty(permission)) {
+            PermissionRequester.permission(permission)
+                    .reason(reason)
+                    .reasonTitle(reasonTitle)
+                    .reasonIcon(permissionIcon)
+                    .deniedAlert(deniedAlert)
+                    .callback(simpleCallback)
+                    .request();
+        }
+    }
+
+    public interface PermissionCallback {
+        void onGranted();
+        void onDenied();
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/StringUtils.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/StringUtils.java
new file mode 100644
index 0000000..aa46593
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/StringUtils.java
@@ -0,0 +1,30 @@
+package com.tencent.qcloud.tuikit.tuichat.util;
+
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public class StringUtils {
+    public static String md5(String content) {
+        byte[] hash;
+        try {
+            hash = MessageDigest.getInstance("MD5").digest(content.getBytes("UTF-8"));
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException("NoSuchAlgorithmException",e);
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException("UnsupportedEncodingException", e);
+        }
+
+        StringBuilder hex = new StringBuilder(hash.length * 2);
+        for (byte b : hash) {
+            if ((b & 0xFF) < 0x10){
+                hex.append("0");
+            }
+            hex.append(Integer.toHexString(b & 0xFF));
+        }
+        return hex.toString();
+    }
+    public static String emptyIfNull(String str) {
+        return str == null ? "" : str;
+    }
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/TUIChatLog.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/TUIChatLog.java
new file mode 100644
index 0000000..fa8640e
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/TUIChatLog.java
@@ -0,0 +1,85 @@
+package com.tencent.qcloud.tuikit.tuichat.util;
+
+import com.tencent.imsdk.common.IMLog;
+
+public class TUIChatLog extends IMLog {
+
+    private static final String PRE = "TUIChat-";
+
+    private static String mixTag(String tag) {
+        return PRE + tag;
+    }
+
+    /**
+     * 打印INFO级别日志
+     * 
+     * print INFO level log
+     *
+     * @param strTag  TAG
+     * @param strInfo 消息
+     */
+    public static void v(String strTag, String strInfo) {
+        IMLog.v(mixTag(strTag), strInfo);
+    }
+
+    /**
+     * 打印DEBUG级别日志
+     * 
+     * print DEBUG level log
+     *
+     * @param strTag  TAG
+     * @param strInfo 消息
+     */
+    public static void d(String strTag, String strInfo) {
+        IMLog.d(mixTag(strTag), strInfo);
+    }
+
+    /**
+     * 打印INFO级别日志
+     * 
+     * print INFO level log
+     *
+     * @param strTag  TAG
+     * @param strInfo 消息
+     */
+    public static void i(String strTag, String strInfo) {
+        IMLog.i(mixTag(strTag), strInfo);
+    }
+
+    /**
+     * 打印WARN级别日志
+     * 
+     * print WARN level log
+     *
+     * @param strTag  TAG
+     * @param strInfo 消息
+     */
+    public static void w(String strTag, String strInfo) {
+        IMLog.w(mixTag(strTag), strInfo);
+    }
+
+    /**
+     * 打印WARN级别日志
+     * 
+     * print WARN level log
+     *
+     * @param strTag  TAG
+     * @param strInfo 消息
+     */
+    public static void w(String strTag, String strInfo, Throwable e) {
+        IMLog.w(mixTag(strTag), strInfo + e.getMessage());
+    }
+
+    /**
+     * 打印ERROR级别日志
+     * 
+     * print ERROR level log
+     *
+     * @param strTag  TAG
+     * @param strInfo 消息
+     */
+    public static void e(String strTag, String strInfo) {
+        IMLog.e(mixTag(strTag), strInfo);
+    }
+
+}
diff --git a/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/TUIChatUtils.java b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/TUIChatUtils.java
new file mode 100644
index 0000000..d8f88fa
--- /dev/null
+++ b/system/tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/util/TUIChatUtils.java
@@ -0,0 +1,245 @@
+package com.tencent.qcloud.tuikit.tuichat.util;
+
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.imsdk.v2.V2TIMImageElem;
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ErrorMessageConverter;
+import com.tencent.qcloud.tuicore.util.ImageUtil;
+import com.tencent.qcloud.tuikit.tuichat.bean.message.TUIMessageBean;
+import com.tencent.qcloud.tuikit.tuichat.component.face.FaceManager;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import static com.tencent.qcloud.tuicore.TUIConstants.TUIConversation.CONVERSATION_C2C_PREFIX;
+import static com.tencent.qcloud.tuicore.TUIConstants.TUIConversation.CONVERSATION_GROUP_PREFIX;
+
+import android.text.TextUtils;
+
+public class TUIChatUtils {
+
+    public static final String SPLIT_TEXT = "split_result";
+    public static final String SPLIT_TEXT_FOR_TRANSLATION = "split_translation";
+    public static final String SPLIT_TEXT_INDEX_FOR_TRANSLATION = "split_translation_index";
+
+    public static <T> void callbackOnError(IUIKitCallback<T> callBack, String module, int errCode, String desc) {
+        if (callBack != null) {
+            callBack.onError(module, errCode, ErrorMessageConverter.convertIMError(errCode, desc));
+        }
+    }
+
+    public static <T> void callbackOnError(IUIKitCallback<T> callBack, int errCode, String desc, T data) {
+        if (callBack != null) {
+            callBack.onError(errCode, ErrorMessageConverter.convertIMError(errCode, desc), data);
+        }
+    }
+
+    public static <T> void callbackOnError(IUIKitCallback<T> callBack, int errCode, String desc) {
+        if (callBack != null) {
+            callBack.onError(null, errCode, ErrorMessageConverter.convertIMError(errCode, desc));
+        }
+    }
+
+    public static <T> void callbackOnSuccess(IUIKitCallback<T> callBack, T data) {
+        if (callBack != null) {
+            callBack.onSuccess(data);
+        }
+    }
+
+    public static void callbackOnProgress(IUIKitCallback callBack, Object data) {
+        if (callBack != null) {
+            callBack.onProgress(data);
+        }
+    }
+
+    public static String getConversationIdByUserId(String id, boolean isGroup) {
+        String conversationIdPrefix = isGroup ? CONVERSATION_GROUP_PREFIX : CONVERSATION_C2C_PREFIX;
+        return conversationIdPrefix + id;
+    }
+
+    public static boolean isC2CChat(int chatType) {
+        return chatType == V2TIMConversation.V2TIM_C2C;
+    }
+
+    public static boolean isGroupChat(int chatType) {
+        return chatType == V2TIMConversation.V2TIM_GROUP;
+    }
+
+    public static String getOriginImagePath(final TUIMessageBean msg) {
+        if (msg == null) {
+            return null;
+        }
+        V2TIMMessage v2TIMMessage = msg.getV2TIMMessage();
+        if (v2TIMMessage == null) {
+            return null;
+        }
+        V2TIMImageElem v2TIMImageElem = v2TIMMessage.getImageElem();
+        if (v2TIMImageElem == null) {
+            return null;
+        }
+        String localImgPath = ChatMessageParser.getLocalImagePath(msg);
+        if (localImgPath == null) {
+            String originUUID = null;
+            for(V2TIMImageElem.V2TIMImage image : v2TIMImageElem.getImageList()) {
+                if (image.getType() == V2TIMImageElem.V2TIM_IMAGE_TYPE_ORIGIN) {
+                    originUUID = image.getUUID();
+                    break;
+                }
+            }
+            String originPath = ImageUtil.generateImagePath(originUUID, V2TIMImageElem.V2TIM_IMAGE_TYPE_ORIGIN);
+            File file = new File(originPath);
+            if (file.exists()) {
+                localImgPath = originPath;
+            }
+        }
+        return localImgPath;
+    }
+
+    public static boolean isCommunityGroup(String groupID) {
+        if (TextUtils.isEmpty(groupID)) {
+            return false;
+        }
+
+        return groupID.startsWith("@TGS#_");
+
+    }
+
+    public static boolean isTopicGroup(String groupID) {
+        // topicID 格式：@TGS#_xxxx@TOPIC#_xxxx
+        if (!isCommunityGroup(groupID)) {
+            return false;
+        }
+        return groupID.contains("@TOPIC#_");
+    }
+
+
+    public static String getGroupIDFromTopicID(String topicID) {
+        // topicID 格式：@TGS#_xxxx@TOPIC#_xxxx
+        int index = topicID.indexOf("@TOPIC#_");
+        return topicID.substring(0, index);
+    }
+
+    public static long getServerTime() {
+        return V2TIMManager.getInstance().getServerTime();
+    }
+
+    /**
+     * Slice string using both emoji and @user. For instance,
+     * Origin string is "hello[Grin]world, @user1 see you!", and users is ["user1"];
+     * Return value is:
+     * {
+     *    "split_result": ["hello", "[Grin]", "world, ", "@user1", " see you!"],
+     *    "split_translation": ["hello", "world, ", "see you!"],
+     *    "split_translation_index": [0, 2, 4]
+     * }
+     * split_result contains all elements after splited.
+     * split_translation contains all text elements in split_result, excluding emoji an @user infos.
+     * split_translation_index contains the position of texts in textArray located in split_result.
+     *
+     */
+    public static HashMap<String, List<String>> splitTextByEmojiAndAtUsers(String text, List<String> userList) {
+        if (TextUtils.isEmpty(text)) {
+            return null;
+        }
+
+        HashMap<String, List<String>> resultMap = new HashMap<>();
+        List<String> result = new ArrayList<>();
+        List<String> atUsers = new ArrayList<>();
+        if (userList != null && userList.size() > 0) {
+            for (String user : userList) {
+                String atUser = "@" + user;
+                atUsers.add(atUser);
+            }
+        }
+
+        List<String> splitResultByAtUsers = splitByKeyList(atUsers, text);
+        int textIndex = 0;
+        List<String> needTranslationTextIndexList = new ArrayList<>();
+        for (int i = 0; i < splitResultByAtUsers.size(); i++) {
+            String splitString = splitResultByAtUsers.get(i);
+            String atUser = "";
+            if (atUsers.size() > 0) {
+                atUser = atUsers.get(0);
+            }
+
+            if (!TextUtils.isEmpty(atUser) && splitString.equals(atUser)) {
+                result.add(splitString);
+                atUsers.remove(0);
+                textIndex++;
+            } else {
+                List<String> emojiKeyList = FaceManager.findEmojiKeyListFromText(splitString);
+                if (emojiKeyList != null && emojiKeyList.size() > 0) {
+                    List<String> splitByEmojiResultList = splitByKeyList(emojiKeyList, splitString);
+                    for (int j = 0; j < splitByEmojiResultList.size(); j++) {
+                        String splitStringByEmoji = splitByEmojiResultList.get(j);
+                        result.add(splitStringByEmoji);
+                        String emojiKey = "";
+                        if (emojiKeyList.size() > 0) {
+                            emojiKey = emojiKeyList.get(0);
+                        }
+
+                        if (!TextUtils.isEmpty(emojiKey) && splitStringByEmoji.equals(emojiKey)) {
+                            emojiKeyList.remove(0);
+                        } else {
+                            needTranslationTextIndexList.add(String.valueOf(textIndex));
+                        }
+                        textIndex++;
+                    }
+                } else {
+                    if (!TextUtils.isEmpty(splitString.trim())) {
+                        needTranslationTextIndexList.add(String.valueOf(textIndex));
+                    }
+                    result.add(splitString);
+                    textIndex++;
+                }
+            }
+        }
+
+        List<String> needTranslationTextList = new ArrayList<>();
+        for (int i = 0; i < needTranslationTextIndexList.size(); i++) {
+            int needTranslationIndex = Integer.valueOf(needTranslationTextIndexList.get(i));
+            needTranslationTextList.add(result.get(needTranslationIndex));
+        }
+
+        resultMap.put(SPLIT_TEXT, result);
+        resultMap.put(SPLIT_TEXT_FOR_TRANSLATION, needTranslationTextList);
+        resultMap.put(SPLIT_TEXT_INDEX_FOR_TRANSLATION, needTranslationTextIndexList);
+
+        return resultMap;
+    }
+
+    public static List<String> splitByKeyList(List<String> keyList, String text) {
+        List<String> splitResultByKeyList = new ArrayList<>();
+        if (TextUtils.isEmpty(text)) {
+            return splitResultByKeyList;
+        }
+
+        if (keyList == null || keyList.isEmpty()) {
+            splitResultByKeyList.add(text);
+            return splitResultByKeyList;
+        }
+
+        int fromIndex = 0;
+        for (String key : keyList) {
+            int keyIndex = text.indexOf(key, fromIndex);
+            if (keyIndex >= 0) {
+                if (fromIndex < keyIndex) {
+                    String resultBeforeKeyCharacter = text.substring(fromIndex, keyIndex);
+                    splitResultByKeyList.add(resultBeforeKeyCharacter);
+                }
+                splitResultByKeyList.add(key);
+                fromIndex = keyIndex + key.length();
+            }
+        }
+
+        if (fromIndex < text.length()) {
+            splitResultByKeyList.add(text.substring(fromIndex));
+        }
+
+        return splitResultByKeyList;
+    }
+}
diff --git a/system/tuichat/src/main/res-light/drawable-xxhdpi/chat_ic_arrow_down_light.png b/system/tuichat/src/main/res-light/drawable-xxhdpi/chat_ic_arrow_down_light.png
new file mode 100644
index 0000000..2f137f7
Binary files /dev/null and b/system/tuichat/src/main/res-light/drawable-xxhdpi/chat_ic_arrow_down_light.png differ
diff --git a/system/tuichat/src/main/res-light/drawable-xxhdpi/chat_ic_arrow_up_light.png b/system/tuichat/src/main/res-light/drawable-xxhdpi/chat_ic_arrow_up_light.png
new file mode 100644
index 0000000..446f1a3
Binary files /dev/null and b/system/tuichat/src/main/res-light/drawable-xxhdpi/chat_ic_arrow_up_light.png differ
diff --git a/system/tuichat/src/main/res-light/drawable-xxhdpi/chat_reply_icon_light.png b/system/tuichat/src/main/res-light/drawable-xxhdpi/chat_reply_icon_light.png
new file mode 100644
index 0000000..19e4b81
Binary files /dev/null and b/system/tuichat/src/main/res-light/drawable-xxhdpi/chat_reply_icon_light.png differ
diff --git a/system/tuichat/src/main/res-light/drawable-xxhdpi/chat_title_bar_more_menu_light.png b/system/tuichat/src/main/res-light/drawable-xxhdpi/chat_title_bar_more_menu_light.png
new file mode 100644
index 0000000..24e0f05
Binary files /dev/null and b/system/tuichat/src/main/res-light/drawable-xxhdpi/chat_title_bar_more_menu_light.png differ
diff --git a/system/tuichat/src/main/res-light/drawable/chat_bubble_other_bg_light.xml b/system/tuichat/src/main/res-light/drawable/chat_bubble_other_bg_light.xml
new file mode 100644
index 0000000..ad3338f
--- /dev/null
+++ b/system/tuichat/src/main/res-light/drawable/chat_bubble_other_bg_light.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid
+        android:color="@color/chat_bubble_other_color_light"/>
+
+    <corners
+        android:radius="10.96dp"
+        android:topLeftRadius="2.19dp" />
+
+    <padding
+        android:bottom="5.4dp"
+        android:top="5.4dp"
+        android:left="5.4dp"
+        android:right="5.4dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-light/drawable/chat_bubble_self_bg_light.xml b/system/tuichat/src/main/res-light/drawable/chat_bubble_self_bg_light.xml
new file mode 100644
index 0000000..493753c
--- /dev/null
+++ b/system/tuichat/src/main/res-light/drawable/chat_bubble_self_bg_light.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid
+        android:color="@color/chat_bubble_self_color_light"/>
+
+    <corners
+        android:radius="10.96dp"
+        android:topRightRadius="2.19dp" />
+
+    <padding
+        android:bottom="5.4dp"
+        android:top="5.4dp"
+        android:left="5.4dp"
+        android:right="5.4dp"/>
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-light/values/light_colors.xml b/system/tuichat/src/main/res-light/values/light_colors.xml
new file mode 100644
index 0000000..c1cea0b
--- /dev/null
+++ b/system/tuichat/src/main/res-light/values/light_colors.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="chat_bubble_other_color_light">#ECECEC</color>
+    <color name="chat_bubble_self_color_light">@color/core_bubble_bg_color_light</color>
+    <color name="chat_input_layout_bg_light">#EBF0F6</color>
+
+    <color name="chat_unread_dot_bg_color_light">#FFAABCDE</color>
+    <color name="chat_unread_dot_text_color_light">#FFFFFFFF</color>
+
+    <color name="chat_other_msg_text_color_light">#000000</color>
+    <color name="chat_self_msg_text_color_light">#000000</color>
+
+    <color name="chat_self_custom_msg_text_color_light">#000000</color>
+    <color name="chat_self_custom_msg_link_color_light">#147AFF</color>
+    <color name="chat_other_custom_msg_text_color_light">#000000</color>
+    <color name="chat_other_custom_msg_link_color_light">#147AFF</color>
+
+    <color name="chat_tip_text_color_light">#147AFF</color>
+
+    <color name="chat_self_reply_quote_bg_color_light">#0D444444</color>
+    <color name="chat_self_reply_line_bg_color_light">#1A444444</color>
+    <color name="chat_self_reply_quote_text_color_light">#888888</color>
+    <color name="chat_self_reply_text_color_light">#000000</color>
+
+    <color name="chat_other_reply_quote_bg_color_light">#0D444444</color>
+    <color name="chat_other_reply_line_bg_color_light">#1A444444</color>
+    <color name="chat_other_reply_quote_text_color_light">#FF888888</color>
+    <color name="chat_other_reply_text_color_light">#000000</color>
+
+    <color name="chat_read_receipt_text_color_light">#679CE1</color>
+    <color name="chat_react_text_color_light">#888888</color>
+    <color name="chat_react_other_text_color_light">#888888</color>
+
+    <color name="chat_pressed_bg_color_light">#19006EFF</color>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-light/values/light_styles.xml b/system/tuichat/src/main/res-light/values/light_styles.xml
new file mode 100644
index 0000000..ce146eb
--- /dev/null
+++ b/system/tuichat/src/main/res-light/values/light_styles.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TUIChatLightTheme" parent="TUIBaseLightTheme">
+        <item name="chat_bubble_self_bg_color">@color/chat_bubble_self_color_light</item>
+        <item name="chat_bubble_other_bg_color">@color/chat_bubble_other_color_light</item>
+        <item name="chat_bubble_self_bg">@drawable/chat_bubble_self_bg_light</item>
+        <item name="chat_bubble_other_bg">@drawable/chat_bubble_other_bg_light</item>
+
+        <item name="chat_input_area_bg">@color/chat_input_layout_bg_light</item>
+
+        <item name="chat_unread_dot_bg_color">@color/chat_unread_dot_bg_color_light</item>
+        <item name="chat_unread_dot_text_color">@color/chat_unread_dot_text_color_light</item>
+
+        <item name="chat_title_bar_more_menu">@drawable/chat_title_bar_more_menu_light</item>
+
+        <item name="chat_other_msg_text_color">@color/chat_other_msg_text_color_light</item>
+        <item name="chat_self_msg_text_color">@color/chat_self_msg_text_color_light</item>
+        <item name="chat_self_custom_msg_text_color">@color/chat_self_custom_msg_text_color_light</item>
+        <item name="chat_other_custom_msg_text_color">@color/chat_other_custom_msg_text_color_light</item>
+        <item name="chat_self_custom_msg_link_color">@color/chat_self_custom_msg_link_color_light</item>
+        <item name="chat_other_custom_msg_link_color">@color/chat_other_custom_msg_link_color_light</item>
+
+        <item name="chat_tip_text_color">@color/chat_tip_text_color_light</item>
+
+        <item name="chat_self_reply_quote_bg_color">@color/chat_self_reply_quote_bg_color_light</item>
+        <item name="chat_other_reply_quote_bg_color">@color/chat_other_reply_quote_bg_color_light</item>
+        <item name="chat_self_reply_line_bg_color">@color/chat_self_reply_line_bg_color_light</item>
+        <item name="chat_other_reply_line_bg_color">@color/chat_other_reply_line_bg_color_light</item>
+        <item name="chat_self_reply_quote_text_color">@color/chat_self_reply_quote_text_color_light</item>
+        <item name="chat_other_reply_quote_text_color">@color/chat_other_reply_quote_text_color_light</item>
+        <item name="chat_self_reply_text_color">@color/chat_self_reply_text_color_light</item>
+        <item name="chat_other_reply_text_color">@color/chat_other_reply_text_color_light</item>
+
+        <item name="chat_read_receipt_text_color">@color/chat_read_receipt_text_color_light</item>
+        <item name="chat_react_text_color">@color/chat_react_text_color_light</item>
+        <item name="chat_react_other_text_color">@color/chat_react_other_text_color_light</item>
+        <item name="chat_reply_detail_icon">@drawable/chat_reply_icon_light</item>
+        <item name="chat_jump_recent_down_icon">@drawable/chat_ic_arrow_down_light</item>
+        <item name="chat_jump_recent_up_icon">@drawable/chat_ic_arrow_up_light</item>
+
+        <item name="chat_pressed_bg_color">@color/chat_pressed_bg_color_light</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-lively/drawable-xxhdpi/chat_ic_arrow_down_lively.png b/system/tuichat/src/main/res-lively/drawable-xxhdpi/chat_ic_arrow_down_lively.png
new file mode 100644
index 0000000..f53a7d4
Binary files /dev/null and b/system/tuichat/src/main/res-lively/drawable-xxhdpi/chat_ic_arrow_down_lively.png differ
diff --git a/system/tuichat/src/main/res-lively/drawable-xxhdpi/chat_ic_arrow_up_lively.png b/system/tuichat/src/main/res-lively/drawable-xxhdpi/chat_ic_arrow_up_lively.png
new file mode 100644
index 0000000..4dc1525
Binary files /dev/null and b/system/tuichat/src/main/res-lively/drawable-xxhdpi/chat_ic_arrow_up_lively.png differ
diff --git a/system/tuichat/src/main/res-lively/drawable-xxhdpi/chat_reply_icon_lively.png b/system/tuichat/src/main/res-lively/drawable-xxhdpi/chat_reply_icon_lively.png
new file mode 100644
index 0000000..5e9158c
Binary files /dev/null and b/system/tuichat/src/main/res-lively/drawable-xxhdpi/chat_reply_icon_lively.png differ
diff --git a/system/tuichat/src/main/res-lively/drawable-xxhdpi/chat_title_bar_more_menu_lively.png b/system/tuichat/src/main/res-lively/drawable-xxhdpi/chat_title_bar_more_menu_lively.png
new file mode 100644
index 0000000..cbc3fef
Binary files /dev/null and b/system/tuichat/src/main/res-lively/drawable-xxhdpi/chat_title_bar_more_menu_lively.png differ
diff --git a/system/tuichat/src/main/res-lively/drawable/chat_bubble_other_bg_lively.xml b/system/tuichat/src/main/res-lively/drawable/chat_bubble_other_bg_lively.xml
new file mode 100644
index 0000000..a3cd187
--- /dev/null
+++ b/system/tuichat/src/main/res-lively/drawable/chat_bubble_other_bg_lively.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid
+        android:color="@color/chat_bubble_other_color_lively"/>
+
+    <corners
+        android:radius="10.96dp"
+        android:topLeftRadius="2.19dp" />
+
+    <stroke
+        android:color="#DDDDDD"
+        android:width="0.96dp"/>
+
+    <padding
+        android:bottom="5.4dp"
+        android:top="5.4dp"
+        android:left="5.4dp"
+        android:right="5.4dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-lively/drawable/chat_bubble_self_bg_lively.xml b/system/tuichat/src/main/res-lively/drawable/chat_bubble_self_bg_lively.xml
new file mode 100644
index 0000000..b757580
--- /dev/null
+++ b/system/tuichat/src/main/res-lively/drawable/chat_bubble_self_bg_lively.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid
+        android:color="@color/chat_bubble_self_color_lively"/>
+
+    <corners
+        android:radius="10.96dp"
+        android:topRightRadius="2.19dp" />
+
+    <padding
+        android:bottom="5.4dp"
+        android:top="5.4dp"
+        android:left="5.4dp"
+        android:right="5.4dp"/>
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-lively/values/lively_colors.xml b/system/tuichat/src/main/res-lively/values/lively_colors.xml
new file mode 100644
index 0000000..c7d39b0
--- /dev/null
+++ b/system/tuichat/src/main/res-lively/values/lively_colors.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="chat_bubble_other_color_lively">#F8F8F9</color>
+    <color name="chat_bubble_self_color_lively">@color/core_bubble_bg_color_lively</color>
+    <color name="chat_input_layout_bg_lively">#F4F6F9</color>
+
+    <color name="chat_unread_dot_bg_color_lively">#FFFFFFFF</color>
+
+    <color name="chat_custom_msg_text_color_lively">#FFFFFF</color>
+    <color name="chat_custom_msg_link_color_lively">#C23D26</color>
+
+    <color name="chat_other_msg_text_color_lively">#000000</color>
+    <color name="chat_self_msg_text_color_lively">#FFFFFF</color>
+
+    <color name="chat_self_custom_msg_text_color_lively">#FFFFFF</color>
+    <color name="chat_self_custom_msg_link_color_lively">#C23D26</color>
+    <color name="chat_other_custom_msg_text_color_lively">#000000</color>
+    <color name="chat_other_custom_msg_link_color_lively">#C23D26</color>
+
+    <color name="chat_tip_text_color_lively">#FF7756</color>
+
+    <color name="chat_self_reply_quote_bg_color_lively">#17000000</color>
+    <color name="chat_self_reply_line_bg_color_lively">#66DF4924</color>
+    <color name="chat_self_reply_quote_text_color_lively">#FFE1EC</color>
+    <color name="chat_self_reply_text_color_lively">#FFFFFF</color>
+
+    <color name="chat_other_reply_quote_bg_color_lively">#0D444444</color>
+    <color name="chat_other_reply_line_bg_color_lively">#1A444444</color>
+    <color name="chat_other_reply_quote_text_color_lively">#FF888888</color>
+    <color name="chat_other_reply_text_color_lively">#000000</color>
+
+    <color name="chat_read_receipt_text_color_lively">#ECA08E</color>
+    <color name="chat_react_text_color_lively">#FFFFFF</color>
+    <color name="chat_react_other_text_color_lively">#888888</color>
+
+    <color name="chat_pressed_bg_color_lively">#19FF8E82</color>
+</resources>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-lively/values/lively_styles.xml b/system/tuichat/src/main/res-lively/values/lively_styles.xml
new file mode 100644
index 0000000..7768b57
--- /dev/null
+++ b/system/tuichat/src/main/res-lively/values/lively_styles.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TUIChatLivelyTheme" parent="TUIBaseLivelyTheme">
+        <item name="chat_bubble_self_bg_color">@color/chat_bubble_self_color_lively</item>
+        <item name="chat_bubble_other_bg_color">@color/chat_bubble_other_color_lively</item>
+
+        <item name="chat_bubble_self_bg">@drawable/chat_bubble_self_bg_lively</item>
+        <item name="chat_bubble_other_bg">@drawable/chat_bubble_other_bg_lively</item>
+
+        <item name="chat_input_area_bg">@color/chat_input_layout_bg_lively</item>
+
+        <item name="chat_unread_dot_bg_color">@color/chat_unread_dot_bg_color_lively</item>
+        <item name="chat_unread_dot_text_color">?attr/core_primary_color</item>
+
+        <item name="chat_title_bar_more_menu">@drawable/chat_title_bar_more_menu_lively</item>
+
+        <item name="chat_other_msg_text_color">@color/chat_other_msg_text_color_lively</item>
+        <item name="chat_self_msg_text_color">@color/chat_self_msg_text_color_lively</item>
+        <item name="chat_self_custom_msg_text_color">@color/chat_self_custom_msg_text_color_lively</item>
+        <item name="chat_other_custom_msg_text_color">@color/chat_other_custom_msg_text_color_lively</item>
+        <item name="chat_self_custom_msg_link_color">@color/chat_self_custom_msg_link_color_lively</item>
+        <item name="chat_other_custom_msg_link_color">@color/chat_other_custom_msg_link_color_lively</item>
+
+        <item name="chat_tip_text_color">@color/chat_tip_text_color_lively</item>
+
+        <item name="chat_self_reply_quote_bg_color">@color/chat_self_reply_quote_bg_color_lively</item>
+        <item name="chat_other_reply_quote_bg_color">@color/chat_other_reply_quote_bg_color_lively</item>
+        <item name="chat_self_reply_line_bg_color">@color/chat_self_reply_line_bg_color_lively</item>
+        <item name="chat_other_reply_line_bg_color">@color/chat_other_reply_line_bg_color_lively</item>
+        <item name="chat_self_reply_quote_text_color">@color/chat_self_reply_quote_text_color_lively</item>
+        <item name="chat_other_reply_quote_text_color">@color/chat_other_reply_quote_text_color_lively</item>
+        <item name="chat_self_reply_text_color">@color/chat_self_reply_text_color_lively</item>
+        <item name="chat_other_reply_text_color">@color/chat_other_reply_text_color_lively</item>
+
+        <item name="chat_read_receipt_text_color">@color/chat_read_receipt_text_color_lively</item>
+        <item name="chat_react_text_color">@color/chat_react_text_color_lively</item>
+        <item name="chat_react_other_text_color">@color/chat_react_other_text_color_lively</item>
+        <item name="chat_reply_detail_icon">@drawable/chat_reply_icon_lively</item>
+        <item name="chat_jump_recent_down_icon">@drawable/chat_ic_arrow_down_lively</item>
+        <item name="chat_jump_recent_up_icon">@drawable/chat_ic_arrow_up_lively</item>
+
+        <item name="chat_pressed_bg_color">@color/chat_pressed_bg_color_lively</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/anim/chat_bottom_select_sheet_enter.xml b/system/tuichat/src/main/res-minimalistui/anim/chat_bottom_select_sheet_enter.xml
new file mode 100644
index 0000000..b3d4b5c
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/anim/chat_bottom_select_sheet_enter.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromXDelta="0"
+    android:fromYDelta="100%"
+    android:toXDelta="0"
+    android:toYDelta="0"
+    android:duration="150">
+</translate>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/anim/chat_bottom_select_sheet_exit.xml b/system/tuichat/src/main/res-minimalistui/anim/chat_bottom_select_sheet_exit.xml
new file mode 100644
index 0000000..802d60a
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/anim/chat_bottom_select_sheet_exit.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromXDelta="0"
+    android:fromYDelta="0"
+    android:toXDelta="0"
+    android:toYDelta="100"
+    android:duration="150">
+</translate>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_audio_play_btn_ic.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_audio_play_btn_ic.png
new file mode 100644
index 0000000..47986a6
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_audio_play_btn_ic.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_audio_stop_btn_ic.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_audio_stop_btn_ic.png
new file mode 100644
index 0000000..7aad209
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_audio_stop_btn_ic.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_bottom_sheet_border.xml b/system/tuichat/src/main/res-minimalistui/drawable/chat_bottom_sheet_border.xml
new file mode 100644
index 0000000..7a4ca9f
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/drawable/chat_bottom_sheet_border.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#ffffff" />
+    <corners android:radius="10dp" />
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_bottom_sheet_dialog_border.xml b/system/tuichat/src/main/res-minimalistui/drawable/chat_bottom_sheet_dialog_border.xml
new file mode 100644
index 0000000..1ffbe93
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/drawable/chat_bottom_sheet_dialog_border.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#ffffff" />
+    <corners android:radius="20dp" android:bottomLeftRadius="0dp" android:bottomRightRadius="0dp"/>
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_bottom_sheet_hide.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_bottom_sheet_hide.png
new file mode 100644
index 0000000..448b5e6
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_bottom_sheet_hide.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_face_group_list_item_select_border.xml b/system/tuichat/src/main/res-minimalistui/drawable/chat_face_group_list_item_select_border.xml
new file mode 100644
index 0000000..f4c6da2
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/drawable/chat_face_group_list_item_select_border.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke android:color="#FF147AFF" android:width="1dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_file_type_icon_image.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_file_type_icon_image.png
new file mode 100644
index 0000000..0b815f7
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_file_type_icon_image.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_file_type_icon_none.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_file_type_icon_none.png
new file mode 100644
index 0000000..a4b2909
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_file_type_icon_none.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_file_type_icon_pdf.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_file_type_icon_pdf.png
new file mode 100644
index 0000000..d5f7bbc
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_file_type_icon_pdf.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_file_type_icon_ppt.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_file_type_icon_ppt.png
new file mode 100644
index 0000000..93b6338
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_file_type_icon_ppt.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_file_type_icon_text.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_file_type_icon_text.png
new file mode 100644
index 0000000..826be4c
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_file_type_icon_text.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_file_type_icon_word.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_file_type_icon_word.png
new file mode 100644
index 0000000..c24b183
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_file_type_icon_word.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_file_type_icon_xls.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_file_type_icon_xls.png
new file mode 100644
index 0000000..c96cf0e
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_file_type_icon_xls.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_file_type_icon_zip.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_file_type_icon_zip.png
new file mode 100644
index 0000000..4e38d64
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_file_type_icon_zip.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_gray_round_rect_bg.xml b/system/tuichat/src/main/res-minimalistui/drawable/chat_gray_round_rect_bg.xml
new file mode 100644
index 0000000..900bad8
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/drawable/chat_gray_round_rect_bg.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="12.5dp"/>
+    <solid android:color="#F0F9F9F9"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_message_popup_fill_border.xml b/system/tuichat/src/main/res-minimalistui/drawable/chat_message_popup_fill_border.xml
new file mode 100644
index 0000000..b4c5cdf
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/drawable/chat_message_popup_fill_border.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="16dp"/>
+    <solid android:color="#F2F7FF"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_message_popup_fill_border_right.xml b/system/tuichat/src/main/res-minimalistui/drawable/chat_message_popup_fill_border_right.xml
new file mode 100644
index 0000000..306aac3
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/drawable/chat_message_popup_fill_border_right.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="16dp" android:bottomRightRadius="0dp"/>
+    <solid android:color="#F2F7FF"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_message_popup_stroke_border.xml b/system/tuichat/src/main/res-minimalistui/drawable/chat_message_popup_stroke_border.xml
new file mode 100644
index 0000000..9b0dba2
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/drawable/chat_message_popup_stroke_border.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="16dp"/>
+    <stroke android:color="#ECEBEB" android:width="1dp"/>
+    <solid android:color="@color/white"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_message_popup_stroke_border_left.xml b/system/tuichat/src/main/res-minimalistui/drawable/chat_message_popup_stroke_border_left.xml
new file mode 100644
index 0000000..b1547a6
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/drawable/chat_message_popup_stroke_border_left.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="16dp" android:bottomLeftRadius="0dp"/>
+    <stroke android:color="#ECEBEB" android:width="1dp"/>
+    <solid android:color="@color/white"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_message_popup_stroke_border_right.xml b/system/tuichat/src/main/res-minimalistui/drawable/chat_message_popup_stroke_border_right.xml
new file mode 100644
index 0000000..a95f4c0
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/drawable/chat_message_popup_stroke_border_right.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="16dp" android:bottomRightRadius="0dp"/>
+    <stroke android:color="#ECEBEB" android:width="1dp"/>
+    <solid android:color="@color/white"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading00.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading00.png
new file mode 100644
index 0000000..062ce9d
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading00.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading01.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading01.png
new file mode 100644
index 0000000..41c1724
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading01.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading02.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading02.png
new file mode 100644
index 0000000..23aac51
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading02.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading03.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading03.png
new file mode 100644
index 0000000..32cc0f6
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading03.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading04.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading04.png
new file mode 100644
index 0000000..ef8899f
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading04.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading05.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading05.png
new file mode 100644
index 0000000..4141cdd
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading05.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading06.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading06.png
new file mode 100644
index 0000000..9002deb
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading06.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading07.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading07.png
new file mode 100644
index 0000000..8443261
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading07.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading08.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading08.png
new file mode 100644
index 0000000..7879c4b
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading08.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading09.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading09.png
new file mode 100644
index 0000000..da9929a
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading09.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading10.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading10.png
new file mode 100644
index 0000000..3e7c121
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading10.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading11.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading11.png
new file mode 100644
index 0000000..7b0c309
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading11.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading12.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading12.png
new file mode 100644
index 0000000..884cdff
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading12.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading13.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading13.png
new file mode 100644
index 0000000..917feba
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading13.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading14.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading14.png
new file mode 100644
index 0000000..b5f1ad3
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading14.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading15.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading15.png
new file mode 100644
index 0000000..8cd3a40
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading15.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading16.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading16.png
new file mode 100644
index 0000000..f2cc6ee
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading16.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading17.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading17.png
new file mode 100644
index 0000000..e6305cb
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading17.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading18.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading18.png
new file mode 100644
index 0000000..06f9008
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading18.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading19.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading19.png
new file mode 100644
index 0000000..672181d
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading19.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading20.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading20.png
new file mode 100644
index 0000000..e4ba599
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading20.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading21.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading21.png
new file mode 100644
index 0000000..afc12d5
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading21.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading22.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading22.png
new file mode 100644
index 0000000..ca5d98a
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading22.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading23.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading23.png
new file mode 100644
index 0000000..ebc5872
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading23.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading24.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading24.png
new file mode 100644
index 0000000..b08f26b
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading24.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading25.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading25.png
new file mode 100644
index 0000000..5830e1c
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading25.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading26.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading26.png
new file mode 100644
index 0000000..819db1a
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading26.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading27.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading27.png
new file mode 100644
index 0000000..f9653c1
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading27.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading28.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading28.png
new file mode 100644
index 0000000..842fef4
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading28.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading29.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading29.png
new file mode 100644
index 0000000..6025ba7
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading29.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading30.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading30.png
new file mode 100644
index 0000000..a6ebf21
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading30.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading31.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading31.png
new file mode 100644
index 0000000..281a9e3
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading31.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading32.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading32.png
new file mode 100644
index 0000000..0dc299c
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading32.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading33.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading33.png
new file mode 100644
index 0000000..7ebe0b1
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading33.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading34.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading34.png
new file mode 100644
index 0000000..58f97e5
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading34.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading35.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading35.png
new file mode 100644
index 0000000..040edf7
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading35.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading36.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading36.png
new file mode 100644
index 0000000..2135b47
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading36.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading37.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading37.png
new file mode 100644
index 0000000..f5582bf
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading37.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading38.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading38.png
new file mode 100644
index 0000000..e6a366c
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading38.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading39.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading39.png
new file mode 100644
index 0000000..bf0cc02
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading39.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading40.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading40.png
new file mode 100644
index 0000000..43a4f7e
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading40.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading41.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading41.png
new file mode 100644
index 0000000..a0960b5
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading41.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading42.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading42.png
new file mode 100644
index 0000000..d52b140
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading42.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading43.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading43.png
new file mode 100644
index 0000000..c2aae37
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading43.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading44.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading44.png
new file mode 100644
index 0000000..a7d64da
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_anim_loading44.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_arrow_left.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_arrow_left.png
new file mode 100644
index 0000000..fbc961b
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_arrow_left.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_delete_icon.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_delete_icon.png
new file mode 100644
index 0000000..423dec1
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_delete_icon.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_file_download_icon.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_file_download_icon.png
new file mode 100644
index 0000000..022c26b
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_file_download_icon.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_forward_icon.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_forward_icon.png
new file mode 100644
index 0000000..61a37a6
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_forward_icon.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_input_add_icon.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_input_add_icon.png
new file mode 100644
index 0000000..dc787bc
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_input_add_icon.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_input_camera_icon.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_input_camera_icon.png
new file mode 100644
index 0000000..c29df57
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_input_camera_icon.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_input_edittext_border.xml b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_input_edittext_border.xml
new file mode 100644
index 0000000..86851e2
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_input_edittext_border.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="18dp"/>
+
+    <stroke android:color="#DDDDDD" android:width="1dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_input_face_icon.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_input_face_icon.png
new file mode 100644
index 0000000..68d7873
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_input_face_icon.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_input_voice_icon.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_input_voice_icon.png
new file mode 100644
index 0000000..03dd255
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_input_voice_icon.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_jump_at_icon.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_jump_at_icon.png
new file mode 100644
index 0000000..336ab26
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_jump_at_icon.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_jump_down_icon.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_jump_down_icon.png
new file mode 100644
index 0000000..a7bc46a
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_jump_down_icon.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_menu_emoji_list_border.xml b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_menu_emoji_list_border.xml
new file mode 100644
index 0000000..d0eccf0
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_menu_emoji_list_border.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="22dp"/>
+    <solid android:color="#FFFFFFFF"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_menu_popup_border.xml b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_menu_popup_border.xml
new file mode 100644
index 0000000..0c7571c
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_menu_popup_border.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="16dp"/>
+    <solid android:color="#FFF9F9F9"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_merge_message_border.xml b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_merge_message_border.xml
new file mode 100644
index 0000000..9b047b8
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_merge_message_border.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+
+    <solid android:color="#F0F9F9F9"/>
+    <corners android:radius="4dp"/>
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_message_deatail_read_border.xml b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_message_deatail_read_border.xml
new file mode 100644
index 0000000..1e7875d
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_message_deatail_read_border.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#F0F9F9F9"/>
+    <corners android:radius="40dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_message_status_send_all_read.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_message_status_send_all_read.png
new file mode 100644
index 0000000..02f2508
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_message_status_send_all_read.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_message_status_send_failed.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_message_status_send_failed.png
new file mode 100644
index 0000000..2b1f0c8
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_message_status_send_failed.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_message_status_send_no_read.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_message_status_send_no_read.png
new file mode 100644
index 0000000..ec9f7eb
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_message_status_send_no_read.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_message_status_send_part_read.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_message_status_send_part_read.png
new file mode 100644
index 0000000..1b90013
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_message_status_send_part_read.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_message_status_sending.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_message_status_sending.png
new file mode 100644
index 0000000..adf38bc
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_message_status_sending.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_more_action_camera_icon.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_more_action_camera_icon.png
new file mode 100644
index 0000000..59d3a61
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_more_action_camera_icon.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_more_action_custom_icon.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_more_action_custom_icon.png
new file mode 100644
index 0000000..1837171
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_more_action_custom_icon.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_more_action_file_icon.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_more_action_file_icon.png
new file mode 100644
index 0000000..74a673b
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_more_action_file_icon.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_more_action_picture_icon.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_more_action_picture_icon.png
new file mode 100644
index 0000000..794e979
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_more_action_picture_icon.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_more_action_record_icon.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_more_action_record_icon.png
new file mode 100644
index 0000000..69f9267
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_more_action_record_icon.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_play_icon.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_play_icon.png
new file mode 100644
index 0000000..3bf0247
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_play_icon.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_copy.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_copy.png
new file mode 100644
index 0000000..deb7da9
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_copy.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_delete.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_delete.png
new file mode 100644
index 0000000..ee65de1
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_delete.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_forward.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_forward.png
new file mode 100644
index 0000000..319687e
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_forward.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_info.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_info.png
new file mode 100644
index 0000000..987eda1
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_info.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_more.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_more.png
new file mode 100644
index 0000000..790c2ad
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_more.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_multi_select.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_multi_select.png
new file mode 100644
index 0000000..ded14e4
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_multi_select.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_quote.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_quote.png
new file mode 100644
index 0000000..d10f45a
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_quote.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_reply.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_reply.png
new file mode 100644
index 0000000..322125f
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_reply.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_revoke.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_revoke.png
new file mode 100644
index 0000000..a76c3bf
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_revoke.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_translation.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_translation.png
new file mode 100644
index 0000000..50d1bb4
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_pop_menu_translation.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_status_loading_anim.xml b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_status_loading_anim.xml
new file mode 100644
index 0000000..964ff92
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_status_loading_anim.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android" android:oneshot="false">
+    <item android:drawable="@drawable/chat_minimalist_anim_loading00"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading01"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading02"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading03"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading04"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading05"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading06"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading07"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading08"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading09"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading10"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading11"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading12"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading13"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading14"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading15"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading16"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading17"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading18"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading19"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading20"
+    android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading21"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading22"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading23"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading24"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading25"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading26"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading27"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading28"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading29"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading30"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading31"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading32"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading33"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading34"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading35"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading36"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading37"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading38"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading39"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading40"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading41"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading42"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading43"
+        android:duration="50"/>
+    <item android:drawable="@drawable/chat_minimalist_anim_loading44"
+        android:duration="50"/>
+
+</animation-list>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_video_call_icon.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_video_call_icon.png
new file mode 100644
index 0000000..f4a8c12
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_video_call_icon.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_voice_call_icon.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_voice_call_icon.png
new file mode 100644
index 0000000..38a2476
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_minimalist_voice_call_icon.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_pop_menu_add_icon.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_pop_menu_add_icon.png
new file mode 100644
index 0000000..772bd50
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_pop_menu_add_icon.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_reply_more_icon.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_reply_more_icon.png
new file mode 100644
index 0000000..e2e29fb
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_reply_more_icon.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/chat_voice_sound_waves.png b/system/tuichat/src/main/res-minimalistui/drawable/chat_voice_sound_waves.png
new file mode 100644
index 0000000..117a930
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/chat_voice_sound_waves.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/gray_round_rect_border.xml b/system/tuichat/src/main/res-minimalistui/drawable/gray_round_rect_border.xml
new file mode 100644
index 0000000..d0bbfe9
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/drawable/gray_round_rect_border.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#CCF2F2F2"/>
+    <corners android:radius="16dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/minimalist_corner_bg_blue.xml b/system/tuichat/src/main/res-minimalistui/drawable/minimalist_corner_bg_blue.xml
new file mode 100644
index 0000000..d4db806
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/drawable/minimalist_corner_bg_blue.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/minimalist_voice_normal" />
+    <corners android:radius="30dp" />
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/minimalist_corner_bg_red.xml b/system/tuichat/src/main/res-minimalistui/drawable/minimalist_corner_bg_red.xml
new file mode 100644
index 0000000..471e4f4
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/drawable/minimalist_corner_bg_red.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/minimalist_voice_pressed" />
+    <corners android:radius="30dp" />
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/minimalist_delete_icon.png b/system/tuichat/src/main/res-minimalistui/drawable/minimalist_delete_icon.png
new file mode 100644
index 0000000..58a3afd
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/minimalist_delete_icon.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/minimalist_delete_start_icon.png b/system/tuichat/src/main/res-minimalistui/drawable/minimalist_delete_start_icon.png
new file mode 100644
index 0000000..f6d4217
Binary files /dev/null and b/system/tuichat/src/main/res-minimalistui/drawable/minimalist_delete_start_icon.png differ
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/minimalist_selector_face_text.xml b/system/tuichat/src/main/res-minimalistui/drawable/minimalist_selector_face_text.xml
new file mode 100644
index 0000000..2de5343
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/drawable/minimalist_selector_face_text.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true">
+        <shape>
+            <solid android:color="?attr/chat_input_area_bg" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="#FFFFFF" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/drawable/white_round_rect_border.xml b/system/tuichat/src/main/res-minimalistui/drawable/white_round_rect_border.xml
new file mode 100644
index 0000000..9adab2c
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/drawable/white_round_rect_border.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white"/>
+    <corners android:radius="16dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_bottom_select_sheet.xml b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_bottom_select_sheet.xml
new file mode 100644
index 0000000..c9d1d4e
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_bottom_select_sheet.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:background="@null"
+    android:paddingBottom="15dp"
+    android:paddingLeft="10dp"
+    android:paddingRight="10dp"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ListView
+        android:id="@+id/item_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/chat_bottom_sheet_border" />
+
+    <TextView
+        android:id="@+id/cancel_button"
+        android:text="@string/cancel"
+        android:textSize="17sp"
+        android:gravity="center"
+        android:textColor="?attr/core_primary_color"
+        android:textStyle="bold"
+        android:background="@drawable/chat_bottom_sheet_border"
+        android:layout_marginTop="10dp"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_bottom_sheet_item.xml b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_bottom_sheet_item.xml
new file mode 100644
index 0000000..94adbc7
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_bottom_sheet_item.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/sheet_item"
+        android:textSize="17sp"
+        android:gravity="center"
+        android:background="@null"
+        android:textColor="?attr/core_primary_color"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_face_view_pager_item.xml b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_face_view_pager_item.xml
new file mode 100644
index 0000000..b5427f6
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_face_view_pager_item.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/face_group_view_pager2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+
+    <com.tencent.qcloud.tuikit.tuichat.minimalistui.component.EmojiIndicatorView
+        android:id="@+id/face_indicator"
+        android:layout_marginTop="16dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_forward_layout.xml b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_forward_layout.xml
new file mode 100644
index 0000000..b137e06
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_forward_layout.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/chat_background_color">
+
+
+    <RelativeLayout
+        android:id="@+id/forward_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginBottom="16dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:id="@+id/back_btn_area"
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:id="@+id/back_icon"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_marginEnd="8dp"
+                android:src="@drawable/chat_minimalist_arrow_left" />
+
+            <TextView
+                android:id="@+id/back_btn"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignTop="@id/back_icon"
+                android:layout_toEndOf="@id/back_icon"
+                android:text="@string/titlebar_back"
+                android:textStyle="bold"
+                android:textColor="#FF0365F9"
+                android:textSize="14sp" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/middle_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_weight="0.33"
+            android:gravity="center"
+            android:textStyle="bold"
+            android:text="@string/forward_chat_record"
+            android:textColor="#FF000000"
+            android:textSize="14sp" />
+
+    </RelativeLayout>
+
+    <View
+        android:id="@+id/view_line"
+        android:layout_width="match_parent"
+        android:layout_height="0.3dp"
+        android:layout_marginBottom="20dp"
+        android:layout_below="@+id/forward_title"
+        android:background="@color/chat_title_line_color" />
+
+    <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.MessageRecyclerView
+        android:id="@+id/chat_message_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/view_line"
+        android:baselineAligned="false"
+        android:clickable="false"
+        android:descendantFocusability="blocksDescendants" />
+
+</RelativeLayout>
diff --git a/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_fragment.xml b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_fragment.xml
new file mode 100644
index 0000000..6d4cb7e
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_fragment.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.ChatView
+        android:id="@+id/chat_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</LinearLayout>
diff --git a/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_group_receipt_member_item.xml b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_group_receipt_member_item.xml
new file mode 100644
index 0000000..966acd1
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_group_receipt_member_item.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/selectable_contact_item"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="#FFFFFF"
+    android:focusable="true"
+    android:paddingStart="24dp"
+    android:paddingTop="7.5dp"
+    android:paddingBottom="7.5dp"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
+
+    <com.tencent.qcloud.tuicore.component.gatherimage.ShadeImageView
+        android:id="@+id/avatar_img"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        app:round_radius="16dp" />
+
+    <TextView
+        android:id="@+id/name_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
+        android:ellipsize="end"
+        android:lineHeight="23.04sp"
+        android:singleLine="true"
+        android:textColor="@color/black_font_color"
+        android:textSize="14sp"
+        android:textStyle="bold"
+        tools:text="Bob"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_header_layout.xml b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_header_layout.xml
new file mode 100644
index 0000000..adc934f
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_header_layout.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/chat_header"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/back_btn"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginRight="8dp"
+        android:scaleType="centerInside"
+        android:background="@drawable/chat_back"/>
+
+    <com.tencent.qcloud.tuicore.component.gatherimage.SynthesizedImageView
+        android:id="@+id/avatar_img"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        tools:background="@android:drawable/ic_menu_gallery"
+        app:round_radius = "25dp"/>
+
+    <LinearLayout
+        android:id="@+id/user_name_area"
+        android:orientation="vertical"
+        android:layout_weight="1"
+        android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/chat_name"
+            android:textSize="14sp"
+            android:lineHeight="16.7sp"
+            android:textFontWeight="700"
+            android:textStyle="bold"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:textColor="@color/black_font_color"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="DanielDanielDanielDanielDanielDanielDanielDanielDanielDaniel"/>
+
+        <TextView
+            android:id="@+id/chat_description"
+            android:textSize="12sp"
+            android:lineHeight="14.32sp"
+            android:textFontWeight="400"
+            android:textColor="#666666"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:hint="@string/chat_header_not_desc"
+            tools:text="onlineonlineonlineonlineonlineonlineonlineonlineonlineonlineonline"
+            />
+
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/video_call"
+        android:layout_width="22dp"
+        android:layout_height="22dp"
+        android:layout_marginStart="19dp"
+        android:layout_marginLeft="19dp"
+        android:background="@drawable/chat_minimalist_video_call_icon"
+        android:visibility="gone"
+        tools:visibility="visible"/>
+
+    <ImageView
+        android:id="@+id/voice_call"
+        android:layout_width="22dp"
+        android:layout_height="22dp"
+        android:layout_marginStart="18dp"
+        android:layout_marginLeft="18dp"
+        android:background="@drawable/chat_minimalist_voice_call_icon"
+        android:visibility="gone"
+        tools:visibility="visible"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_input_camera_view.xml b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_input_camera_view.xml
new file mode 100644
index 0000000..662005b
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_input_camera_view.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#000000"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <VideoView
+            android:id="@+id/video_preview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+        <ImageView
+            android:id="@+id/image_photo"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#000"
+            android:visibility="invisible" />
+    </FrameLayout>
+
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/image_switch"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dp"
+            android:src="@drawable/chat_camera_switchcamera" />
+
+    </LinearLayout>
+
+
+    <com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.view.CaptureLayout
+        android:id="@+id/capture_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom" />
+
+    <com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.view.FoucsView
+        android:id="@+id/fouce_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="invisible" />
+</FrameLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_input_layout.xml b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_input_layout.xml
new file mode 100644
index 0000000..934c7f1
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_input_layout.xml
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:id="@+id/reply_preview_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="62dp"
+        android:background="#F0F9F9F9"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <View
+            android:id="@+id/reply_preview_bar_line"
+            android:layout_width="6dp"
+            android:layout_height="match_parent"
+            android:layout_alignParentStart="true"
+            android:background="#D9D9D9" />
+
+        <TextView
+            android:id="@+id/reply_preview_bar_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="10dp"
+            android:layout_toStartOf="@id/reply_preview_bar_close_btn"
+            android:layout_toEndOf="@id/reply_preview_bar_line"
+            android:textColor="#000000"
+            android:textSize="14sp"
+            android:maxLines="1"
+            android:ellipsize="end"
+            tools:text="name" />
+
+        <TextView
+            android:id="@+id/reply_preview_bar_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/reply_preview_bar_name"
+            android:layout_alignStart="@id/reply_preview_bar_name"
+            android:layout_toStartOf="@id/reply_preview_bar_close_btn"
+            android:layout_marginTop="8dp"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:textColor="#99000000"
+            android:textSize="14sp"
+            tools:text="desc" />
+
+        <ImageView
+            android:id="@+id/reply_preview_bar_close_btn"
+            android:layout_width="14dp"
+            android:layout_height="14dp"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="16dp"
+            android:background="@drawable/reply_close_btn" />
+
+
+    </RelativeLayout>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="bottom"
+        android:orientation="horizontal"
+        android:paddingStart="16dp"
+        android:paddingTop="7dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="7dp">
+
+        <ImageView
+            android:id="@+id/input_more_btn"
+            android:layout_width="21dp"
+            android:layout_height="21dp"
+            android:layout_gravity="center_vertical"
+            android:background="@drawable/chat_minimalist_input_add_icon" />
+
+        <ImageView
+            android:id="@+id/voice_delete"
+            android:layout_width="21dp"
+            android:layout_height="21dp"
+            android:layout_gravity="center_vertical"
+            android:visibility="gone" />
+
+        <LinearLayout
+            android:id="@+id/text_input_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_weight="1"
+            android:background="@drawable/chat_minimalist_input_edittext_border"
+            android:orientation="horizontal"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp">
+
+            <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.input.TIMMentionEditText
+                android:id="@+id/input_edit_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@null"
+                android:hint="@string/chat_input_edit_hint_text"
+                android:paddingTop="9.5dp"
+                android:paddingBottom="9.5dp"
+                android:textColor="@color/black_font_color"
+                android:textColorHint="#666666"
+                android:textCursorDrawable="@drawable/my_cursor"
+                android:textFontWeight="400"
+                android:textSize="14sp" />
+
+            <ImageView
+                android:id="@+id/input_face_btn"
+                android:layout_width="18.76dp"
+                android:layout_height="18.76dp"
+                android:layout_gravity="bottom"
+                android:layout_marginStart="16dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginBottom="9.5dp"
+                android:background="@drawable/chat_minimalist_input_face_icon" />
+
+        </LinearLayout>
+
+        <FrameLayout
+            android:id="@+id/chat_voice_input_layout"
+            android:layout_width="match_parent"
+            android:layout_marginLeft="14dp"
+            android:layout_marginRight="16dp"
+            android:layout_height="36dp"
+            android:layout_weight="1"
+            android:visibility="gone">
+        <Button
+            android:id="@+id/chat_voice_input"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="36dp"
+            android:layout_gravity="center_vertical"
+            android:gravity="left|center_vertical"
+            android:text="0:00"
+            android:textAllCaps="false"
+            android:textColor="@color/text_color_gray"
+            android:visibility="visible" />
+
+            <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.input.waveview.VoiceWaveView.VoiceWaveView
+                android:id="@+id/voice_wave_view"
+                android:layout_width="match_parent"
+                android:layout_height="36dp"
+                android:layout_gravity="center_vertical"
+                app:lineWidth="2dp"
+                app:lineSpace="2dp"
+                android:layout_marginLeft="55dp"
+                app:lineColor="@color/white"
+                app:waveMode="left_right"
+                android:gravity="center" />
+        </FrameLayout>
+
+        <Button
+            android:id="@+id/input_voice_btn"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
+            android:layout_gravity="center_vertical"
+            android:background="@drawable/chat_minimalist_input_voice_icon" />
+
+        <ImageView
+            android:id="@+id/input_image_btn"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="center_vertical"
+            android:background="@drawable/chat_minimalist_input_camera_icon" />
+
+    </LinearLayout>
+
+
+    <LinearLayout
+        android:id="@+id/quote_preview_bar"
+        android:orientation="horizontal"
+        android:paddingBottom="10dp"
+        android:paddingTop="10dp"
+        android:visibility="gone"
+        tools:visibility="visible"
+        android:gravity="center_vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/quote_text"
+            android:layout_weight="1"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:layout_marginLeft="12dp"
+            tools:text="test"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:textSize="@dimen/reply_text_size"/>
+
+        <ImageView
+            android:id="@+id/quote_close_btn"
+            android:layout_width="14dp"
+            android:layout_height="14dp"
+            android:layout_marginEnd="16dp"
+            android:src="@drawable/reply_close_btn" />
+    </LinearLayout>
+
+    <FrameLayout
+        android:id="@+id/more_groups"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone" />
+</LinearLayout>
diff --git a/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_layout.xml b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_layout.xml
new file mode 100644
index 0000000..cbebb38
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_layout.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@color/white">
+
+    <include layout="@layout/chat_minimalist_header_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        />
+
+    <View
+        android:id="@+id/view_line"
+        android:layout_below="@id/chat_header"
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:background="#1F000000" />
+
+    <FrameLayout
+        android:id="@+id/custom_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/view_line"
+        android:layout_marginTop="0dp"
+        android:visibility="gone" />
+
+    <com.tencent.qcloud.tuikit.tuichat.minimalistui.component.noticelayout.NoticeLayout
+        android:id="@+id/chat_group_apply_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/custom_layout"
+        android:visibility="gone" />
+
+    <com.tencent.qcloud.tuikit.tuichat.minimalistui.component.noticelayout.NoticeLayout
+        android:id="@+id/chat_notice_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/chat_group_apply_layout"
+        android:layout_marginTop="1dp"
+        android:visibility="gone" />
+
+    <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.MessageRecyclerView
+        android:id="@+id/chat_message_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/chat_input_layout"
+        android:layout_below="@+id/chat_notice_layout"
+        android:layout_marginBottom="-20dp"
+        android:baselineAligned="false"
+        android:clickable="false"
+        android:descendantFocusability="blocksDescendants" />
+
+    <androidx.cardview.widget.CardView
+        app:cardCornerRadius="16dp"
+        app:contentPaddingRight="16dp"
+        app:cardElevation="6dp"
+        android:layout_marginEnd="-16dp"
+        android:layout_above="@+id/chat_input_layout"
+        android:layout_alignParentEnd="true"
+        android:layout_marginBottom="35dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:id="@+id/jump_message_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:paddingTop="6dp"
+            android:paddingBottom="6dp"
+            android:background="#FFFFFF"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:visibility="visible">
+
+            <ImageView
+                android:id="@+id/arrow_icon"
+                android:layout_width="18.76dp"
+                android:layout_height="18.76dp"
+                android:clickable="false"
+                android:scaleType="fitCenter"
+                android:background="@drawable/chat_minimalist_jump_down_icon" />
+
+            <TextView
+                android:id="@+id/jump_message_content"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:textColor="#147AFF"
+                android:textSize="14sp"
+                tools:text="8"/>
+
+        </LinearLayout>
+    </androidx.cardview.widget.CardView>
+
+
+    <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.input.InputView
+        android:id="@+id/chat_input_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/white"
+        android:layout_above="@id/forward_area"
+        android:layout_marginBottom="20dp"
+        android:layout_alignParentBottom="true" />
+
+    <RelativeLayout
+        android:id="@+id/voice_recording_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/chat_input_layout"
+        android:layout_centerHorizontal="true"
+        android:visibility="gone">
+
+        <TextView
+            android:id="@+id/recording_tips"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:textSize="14sp"
+            android:textColor="@color/black"
+            android:layout_marginTop="10dp" />
+
+    </RelativeLayout>
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/forward_area"
+        android:layout_alignParentBottom="true"
+        app:cardBackgroundColor="#FFFFFFFF"
+        app:contentPaddingBottom="26dp"
+        app:cardElevation="4dp"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <RelativeLayout
+            android:orientation="horizontal"
+            android:paddingTop="16dp"
+            android:paddingBottom="16dp"
+            android:paddingStart="24dp"
+            android:paddingEnd="24dp"
+            android:gravity="center_vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:id="@+id/forward_image"
+                android:background="@drawable/chat_minimalist_forward_icon"
+                android:layout_alignParentStart="true"
+                android:layout_gravity="start"
+                android:scaleType="centerCrop"
+                android:layout_width="16dp"
+                android:layout_height="16dp"/>
+
+            <ImageView
+                android:id="@+id/delete_image"
+                android:background="@drawable/chat_minimalist_delete_icon"
+                android:layout_toEndOf="@id/forward_image"
+                android:layout_gravity="start"
+                android:scaleType="centerCrop"
+                android:layout_marginStart="16dp"
+                android:layout_width="16dp"
+                android:layout_height="16dp"/>
+
+            <TextView
+                android:id="@+id/forward_select_text"
+                android:textSize="14sp"
+                android:textColor="#FF000000"
+                android:layout_centerInParent="true"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:text="2 Selected"/>
+
+            <TextView
+                android:id="@+id/forward_cancel_btn"
+                android:textSize="14sp"
+                android:textColor="#FF147AFF"
+                android:layout_alignParentEnd="true"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/cancel"/>
+
+        </RelativeLayout>
+    </androidx.cardview.widget.CardView>
+</RelativeLayout>
diff --git a/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_message_adapter_content_calling.xml b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_message_adapter_content_calling.xml
new file mode 100644
index 0000000..44acb4a
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_message_adapter_content_calling.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/calling_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/left_icon"
+        android:layout_width="15.36dp"
+        android:layout_height="15.36dp"
+        android:layout_centerInParent="true"
+        android:clickable="false"
+        android:scaleType="fitCenter"
+        android:src="@drawable/ic_audio_call" />
+
+    <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.TimeInLineTextLayout
+        android:id="@+id/text_message_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <ImageView
+        android:id="@+id/right_icon"
+        android:layout_width="15.36dp"
+        android:layout_height="15.36dp"
+        android:layout_centerInParent="true"
+        android:scaleType="fitCenter"
+        android:clickable="false"
+        android:src="@drawable/ic_audio_call" />
+</LinearLayout>
+
diff --git a/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_message_adapter_content_text.xml b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_message_adapter_content_text.xml
new file mode 100644
index 0000000..5136e44
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_message_adapter_content_text.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/text_frame"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.TimeInLineTextLayout
+        android:id="@+id/text_message_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</FrameLayout>
+
diff --git a/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_message_detail_layout.xml b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_message_detail_layout.xml
new file mode 100644
index 0000000..b031ee6
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_message_detail_layout.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/chat_background_color"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginBottom="16dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:id="@+id/back_btn_area"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@+id/back_icon"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_marginEnd="8dp"
+                android:src="@drawable/chat_minimalist_arrow_left" />
+
+            <TextView
+                android:id="@+id/back_btn"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignTop="@id/back_icon"
+                android:layout_toEndOf="@id/back_icon"
+                android:text="@string/titlebar_back"
+                android:textColor="#FF0365F9"
+                android:textSize="14sp"
+                android:textStyle="bold" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/middle_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_weight="0.33"
+            android:gravity="center"
+            android:text="@string/chat_message_detail"
+            android:textColor="#FF000000"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+
+    </RelativeLayout>
+
+    <View
+        android:id="@+id/view_line"
+        android:layout_width="match_parent"
+        android:layout_height="0.3dp"
+        android:background="@color/chat_title_line_color" />
+
+    <FrameLayout
+        android:id="@+id/message_area"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <LinearLayout
+        android:id="@+id/read_status_area"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:id="@+id/read_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="4dp"
+            android:background="@drawable/chat_minimalist_message_deatail_read_border"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingStart="20dp"
+            android:paddingTop="20dp"
+            android:paddingEnd="20dp"
+            android:paddingBottom="20dp">
+
+            <ImageView
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:layout_marginEnd="11dp"
+                android:src="@drawable/chat_minimalist_message_status_send_all_read" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/has_read"
+                android:textColor="#FF000000"
+                android:textSize="14sp" />
+
+        </LinearLayout>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/read_list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+
+        <LinearLayout
+            android:id="@+id/unread_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:background="@drawable/chat_minimalist_message_deatail_read_border"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingStart="20dp"
+            android:paddingTop="20dp"
+            android:paddingEnd="20dp"
+            android:paddingBottom="20dp">
+
+            <ImageView
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:layout_marginEnd="11dp"
+                android:src="@drawable/chat_minimalist_message_status_send_part_read" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/delivered"
+                android:textColor="#FF000000"
+                android:textSize="14sp" />
+
+        </LinearLayout>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/unread_list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_pop_menu_action_item_layou.xml b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_pop_menu_action_item_layou.xml
new file mode 100644
index 0000000..805e16e
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_pop_menu_action_item_layou.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:paddingTop="10.5dp"
+    android:paddingBottom="10.5dp"
+    android:layout_width="150dp"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/action_name"
+        android:layout_weight="1"
+        android:textColor="#FF000000"
+        android:textSize="16sp"
+        android:textFontWeight="500"
+        android:lineHeight="19sp"
+        android:layout_gravity="start|center_vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <ImageView
+        android:id="@+id/action_icon"
+        android:layout_gravity="end|center_vertical"
+        android:scaleType="centerCrop"
+        android:layout_width="16dp"
+        android:layout_height="16dp"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_pop_menu_layout.xml b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_pop_menu_layout.xml
new file mode 100644
index 0000000..62fc0ab
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_pop_menu_layout.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/transparent"
+    android:paddingStart="56dp"
+    android:paddingEnd="16dp">
+
+    <RelativeLayout
+        android:id="@+id/dialog_content_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:background="@color/transparent">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recent_faces"
+            android:layout_alignParentEnd="true"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:layout_alignParentTop="true"
+            android:background="@drawable/chat_minimalist_menu_emoji_list_border"
+            android:paddingStart="8dp"
+            android:paddingTop="10dp"
+            android:paddingEnd="8dp"
+            android:paddingBottom="10dp" />
+
+        <ScrollView
+            android:id="@+id/scroll_container"
+            android:scrollbars="none"
+            android:layout_alignParentEnd="true"
+            android:layout_below="@id/recent_faces"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+            <FrameLayout
+                android:id="@+id/message_frame"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                tools:background="#006666"
+                tools:layout_height="30dp"
+                tools:layout_width="150dp" />
+
+        </ScrollView>
+
+        <LinearLayout
+            android:id="@+id/action_area"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_below="@id/scroll_container"
+            android:background="@drawable/chat_minimalist_menu_popup_border"
+            android:orientation="vertical">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/chat_pop_menu_action_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingStart="16dp"
+                android:paddingTop="6dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="6dp" />
+
+
+            <LinearLayout
+                android:id="@+id/more_btn"
+                android:layout_width="180dp"
+                android:layout_height="40dp"
+                android:orientation="vertical">
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="#DDDDDD" />
+
+                <LinearLayout
+                    android:layout_width="180dp"
+                    android:layout_height="40dp"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:paddingStart="16dp"
+                    android:paddingEnd="16dp"
+                    android:paddingBottom="6dp">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="@string/chat_minimalist_pop_more"
+                        android:textColor="#147AFF"
+                        android:textSize="16sp" />
+
+                    <ImageView
+                        android:layout_width="16dp"
+                        android:layout_height="16dp"
+                        android:background="@drawable/chat_minimalist_pop_menu_more" />
+
+
+                </LinearLayout>
+
+            </LinearLayout>
+
+
+        </LinearLayout>
+
+
+    </RelativeLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_react_item_layout.xml b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_react_item_layout.xml
new file mode 100644
index 0000000..a41b7f9
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_react_item_layout.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_marginEnd="4dp"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/face_iv"
+        android:layout_width="12dp"
+        android:layout_height="12dp"
+        android:layout_gravity="center"
+        android:scaleType="fitCenter" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_react_preview_layout.xml b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_react_preview_layout.xml
new file mode 100644
index 0000000..461c82f
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_react_preview_layout.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal"
+    android:background="@drawable/chat_message_popup_stroke_border"
+    android:paddingStart="8dp"
+    android:paddingEnd="8dp"
+    android:paddingTop="4dp"
+    android:paddingBottom="4dp"
+    android:gravity="center_vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/reacts_emoji_list"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <ImageView
+        android:id="@+id/more_icon"
+        android:layout_width="12dp"
+        android:layout_height="12dp"
+        android:background="@drawable/chat_reply_more_icon"
+        android:layout_marginEnd="4dp"
+        tools:visibility="visible"
+        android:visibility="gone"/>
+
+    <TextView
+        android:id="@+id/reacts_num_text"
+        android:textSize="12sp"
+        android:textColor="#999999"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_reply_details_item_layout.xml b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_reply_details_item_layout.xml
new file mode 100644
index 0000000..71edf3c
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_reply_details_item_layout.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="20dp"
+    android:background="#FFFFFFFF"
+    android:orientation="horizontal">
+
+    <com.tencent.qcloud.tuicore.component.RoundCornerImageView
+        android:id="@+id/user_icon"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginEnd="6dp"
+        android:layout_gravity="bottom|start"
+        app:corner_radius="16dp"
+        tools:visibility="visible" />
+
+    <FrameLayout
+        android:id="@+id/msg_content"
+        android:layout_toRightOf="@id/user_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/chat_message_popup_stroke_border_left"
+        android:paddingStart="16dp"
+        android:paddingTop="8dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="8dp">
+
+        <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.TimeInLineTextLayout
+            android:id="@+id/time_in_line_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+    </FrameLayout>
+
+    <!-- translation content area -->
+    <com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MaxWidthFrameLayout
+        android:id="@+id/translate_content_fl"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@id/user_icon"
+        android:layout_below="@id/msg_content"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="4dp"
+        android:background="@drawable/translation_area_bg"
+        app:maxWidth="@dimen/chat_message_content_max_width"
+        android:visibility="gone"
+        tools:visibility="visible"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_reply_preview_layout.xml b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_reply_preview_layout.xml
new file mode 100644
index 0000000..e98ec46
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_reply_preview_layout.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+
+    <ImageView
+        android:id="@+id/first_avatar"
+        android:scaleType="centerCrop"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:visibility="gone"
+        tools:visibility="visible"
+        tools:src="@android:drawable/ic_menu_gallery"
+        />
+
+
+    <ImageView
+        android:id="@+id/second_avatar"
+        android:scaleType="centerCrop"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_marginStart="-8dp"
+        android:visibility="gone"
+        tools:visibility="visible"
+        tools:src="@android:drawable/ic_menu_gallery"
+        />
+
+
+    <ImageView
+        android:id="@+id/third_avatar"
+        android:scaleType="centerCrop"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_marginStart="-8dp"
+        android:visibility="gone"
+        tools:visibility="visible"
+        tools:src="@android:drawable/ic_menu_gallery"
+        />
+
+    <TextView
+        android:id="@+id/reply_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="12sp"
+        android:textColor="#FF005FFF"
+        tools:text="3Reply"
+        />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_text_layout.xml b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_text_layout.xml
new file mode 100644
index 0000000..ddd4062
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_text_layout.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/text"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:gravity="center_vertical"
+    android:lineHeight="16.7sp"
+    android:textColor="?attr/chat_self_msg_text_color"
+    android:textFontWeight="500"
+    android:textSize="14sp" />
diff --git a/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_text_status_layout.xml b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_text_status_layout.xml
new file mode 100644
index 0000000..701a258
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/chat_minimalist_text_status_layout.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/status_area"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="bottom"
+    android:paddingTop="3dp"
+    android:paddingStart="10dp"
+    android:paddingLeft="10dp">
+
+    <ImageView
+        android:id="@+id/status_icon"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:paddingEnd="3dp"
+        android:paddingRight="3dp"
+        android:scaleType="centerCrop"
+        android:visibility="gone"/>
+
+    <TextView
+        android:id="@+id/time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="#666666"
+        android:textFontWeight="400"
+        android:textSize="12sp" />
+
+</LinearLayout>
diff --git a/system/tuichat/src/main/res-minimalistui/layout/chat_pop_menu_emoji_item_layout.xml b/system/tuichat/src/main/res-minimalistui/layout/chat_pop_menu_emoji_item_layout.xml
new file mode 100644
index 0000000..93adeca
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/chat_pop_menu_emoji_item_layout.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/emoji_img"
+        android:scaleType="centerCrop"
+        android:layout_width="26dp"
+        android:layout_height="26dp"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/chat_popmenu_emoji_dialog_layout.xml b/system/tuichat/src/main/res-minimalistui/layout/chat_popmenu_emoji_dialog_layout.xml
new file mode 100644
index 0000000..621e06a
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/chat_popmenu_emoji_dialog_layout.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:minHeight="1000dp"
+    android:background="@drawable/chat_bottom_sheet_dialog_border"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingTop="22dp"
+        android:paddingBottom="22dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:fillViewport="true">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/emoji_grid_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+    </androidx.core.widget.NestedScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/chat_react_dialog_layout.xml b/system/tuichat/src/main/res-minimalistui/layout/chat_react_dialog_layout.xml
new file mode 100644
index 0000000..8dc1025
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/chat_react_dialog_layout.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:background="@drawable/chat_bottom_sheet_dialog_border"
+    android:minHeight="1000dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:fillViewport="true">
+
+        <LinearLayout
+            android:orientation="vertical"
+            android:paddingStart="27dp"
+            android:paddingEnd="27dp"
+            android:paddingTop="22dp"
+            android:paddingBottom="22dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <ImageView
+                android:layout_width="24dp"
+                android:layout_height="6dp"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginBottom="25dp"
+                android:background="@drawable/chat_bottom_sheet_hide"
+                />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/react_category_list"
+            android:layout_marginBottom="20dp"
+            android:layout_gravity="start"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+
+        <androidx.viewpager2.widget.ViewPager2
+            android:id="@+id/react_view_pager"
+            android:layout_width="match_parent"
+            android:layout_height="380dp"/>
+
+        </LinearLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/chat_reply_dialog_layout.xml b/system/tuichat/src/main/res-minimalistui/layout/chat_reply_dialog_layout.xml
new file mode 100644
index 0000000..454415f
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/chat_reply_dialog_layout.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:minHeight="1000dp"
+    android:orientation="vertical"
+    android:layout_marginTop="36dp"
+    android:background="@drawable/chat_bottom_sheet_dialog_border"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/cancel_btn"
+            android:layout_weight="0.33"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="28.5dp"
+            android:layout_marginBottom="30dp"
+            android:text="@string/cancel"
+            android:textColor="#0365F9"
+            android:textSize="16sp" />
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:textColor="#000000"
+            android:layout_weight="0.33"
+            android:layout_marginTop="28.5dp"
+            android:layout_marginBottom="30dp"
+            android:gravity="center"
+            android:textSize="16sp"
+            tools:text="3条回复" />
+
+        <View
+            android:layout_weight="0.33"
+            android:layout_width="0dp"
+            android:layout_height="1dp"/>
+        
+    </LinearLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="10dp"
+        android:fillViewport="true">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
+
+            <FrameLayout
+                android:id="@+id/message_content"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+
+            <View
+                android:id="@+id/divide_line"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_below="@id/message_content"
+                android:layout_marginTop="16dp"
+                android:background="#1A000000" />
+
+            <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply.ReplyDetailsView
+                android:id="@+id/replies_list"
+                android:layout_marginTop="10dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_below="@id/divide_line"/>
+
+        </RelativeLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/minimalist_activity_camera.xml b/system/tuichat/src/main/res-minimalistui/layout/minimalist_activity_camera.xml
new file mode 100644
index 0000000..2abac90
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/minimalist_activity_camera.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuikit.tuichat.minimalistui.component.camera.view.JCameraView
+        android:id="@+id/jcameraview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:duration_max="10000"
+        app:iconLeft="@drawable/ic_back"
+        app:iconMargin="20dp"
+        app:iconRight="@drawable/ic_photo"
+        app:iconSize="30dp"
+        app:iconSrc="@drawable/chat_camera_switchcamera" />
+</LinearLayout>
diff --git a/system/tuichat/src/main/res-minimalistui/layout/minimalist_face_group_icon.xml b/system/tuichat/src/main/res-minimalistui/layout/minimalist_face_group_icon.xml
new file mode 100644
index 0000000..f3ac045
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/minimalist_face_group_icon.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="40dp"
+    android:layout_height="40dp">
+
+    <View
+        android:id="@+id/select_border"
+        android:background="@drawable/chat_face_group_list_item_select_border"
+        android:layout_gravity="center"
+        android:layout_width="28dp"
+        android:layout_height="28dp"/>
+    
+    <ImageView
+        android:id="@+id/face_group_tab_icon"
+        android:layout_width="28dp"
+        android:layout_height="28dp"
+        android:layout_gravity="center"
+        android:clickable="false"
+        android:scaleType="fitXY"
+        android:src="@drawable/emoji_default" />
+
+</FrameLayout>
diff --git a/system/tuichat/src/main/res-minimalistui/layout/minimalist_face_message_content_layout.xml b/system/tuichat/src/main/res-minimalistui/layout/minimalist_face_message_content_layout.xml
new file mode 100644
index 0000000..c168824
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/minimalist_face_message_content_layout.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/face_message_content_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:clickable="false">
+
+    <ImageView
+        android:layout_gravity="center_horizontal"
+        android:id="@+id/face_image"
+        android:background="#F0F9F9F9"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.TimeInLineTextLayout
+        android:layout_marginTop="8dp"
+        android:id="@+id/time_in_line_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/minimalist_forward_msg_holder.xml b/system/tuichat/src/main/res-minimalistui/layout/minimalist_forward_msg_holder.xml
new file mode 100644
index 0000000..0fcae32
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/minimalist_forward_msg_holder.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/forward_msg_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:id="@+id/forward_msg_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/msg_forward_title"
+            android:layout_width="@dimen/forward_text_max_length"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:maxWidth="@dimen/forward_text_max_length"
+            android:maxLines="1"
+            android:textColor="#CC000000"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/msg_forward_content"
+            android:layout_width="@dimen/forward_text_max_length"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:ellipsize="end"
+            android:includeFontPadding="false"
+            android:lineHeight="20sp"
+            android:maxWidth="@dimen/forward_text_max_length"
+            android:maxLines="4"
+            android:textColor="#999999"
+            android:textSize="12sp" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="6dp"
+            android:background="#EEEEEE" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/chat_record_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:text="@string/forward_chat_record"
+        android:textColor="#999999"
+        android:textSize="10sp"
+        app:layout_constraintEnd_toStartOf="@id/merge_msg_time_in_line_text"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintHorizontal_chainStyle="spread_inside"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/forward_msg_content" />
+
+    <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.TimeInLineTextLayout
+        android:id="@+id/merge_msg_time_in_line_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="-3dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/chat_record_tv"
+        app:layout_constraintTop_toTopOf="@id/chat_record_tv" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+
+
diff --git a/system/tuichat/src/main/res-minimalistui/layout/minimalist_fragment_face.xml b/system/tuichat/src/main/res-minimalistui/layout/minimalist_fragment_face.xml
new file mode 100644
index 0000000..4a3dc30
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/minimalist_fragment_face.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:paddingStart="16dp"
+        android:layout_width="match_parent"
+        android:layout_height="40dp">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/face_view_group"
+            android:layout_weight="1"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:orientation="horizontal"/>
+
+        <TextView
+            android:id="@+id/send_btn"
+            android:layout_width="50dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="end"
+            android:gravity="center"
+            android:background="#FF147AFF"
+            android:text="@string/send"
+            android:textColor="#fff"
+            android:textSize="14sp"
+            android:visibility="visible" />
+
+    </LinearLayout>
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/face_viewPager"
+        android:paddingStart="22dp"
+        android:paddingEnd="22dp"
+        android:paddingTop="16dp"
+        android:layout_width="match_parent"
+        android:layout_height="200dp"
+        android:layout_gravity="center_horizontal" />
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/minimalist_input_more.xml b/system/tuichat/src/main/res-minimalistui/layout/minimalist_input_more.xml
new file mode 100644
index 0000000..e815d9b
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/minimalist_input_more.xml
@@ -0,0 +1,31 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/more_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="34dp"
+    android:background="@color/transparent"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:visibility="visible"
+    tools:visibility="visible">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:background="@drawable/gray_round_rect_border"
+        android:id="@+id/input_extra_area"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:id="@+id/cancel_button"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:layout_below="@id/input_extra_area"
+        android:layout_marginTop="12dp"
+        android:background="@drawable/white_round_rect_border"
+        android:gravity="center"
+        android:text="@string/cancel"
+        android:textColor="#007AFF"
+        android:textSize="17sp" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/minimalist_input_more_item.xml b/system/tuichat/src/main/res-minimalistui/layout/minimalist_input_more_item.xml
new file mode 100644
index 0000000..1344321
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/minimalist_input_more_item.xml
@@ -0,0 +1,40 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout_actions"
+    android:layout_width="match_parent"
+    android:layout_height="56dp"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:id="@+id/item_layout"
+        android:paddingStart="22dp"
+        android:paddingEnd="22dp"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/item_icon"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:scaleType="centerInside"
+            android:layout_centerVertical="true"/>
+
+        <TextView
+            android:id="@+id/item_text"
+            android:layout_width="match_parent"
+            android:layout_height="56dp"
+            android:layout_marginLeft="12.5dp"
+            android:layout_toRightOf="@id/item_icon"
+            android:gravity="start|center"
+            android:textColor="#147AFF"
+            android:textSize="17sp" />
+    </RelativeLayout>
+
+    <TextView
+        android:id="@+id/divide_line"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="#E5E5EA" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/minimalist_message_adapter_content_audio.xml b/system/tuichat/src/main/res-minimalistui/layout/minimalist_message_adapter_content_audio.xml
new file mode 100644
index 0000000..beeae49
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/minimalist_message_adapter_content_audio.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/audio_content_ll"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+
+        <ImageView
+            android:id="@+id/audio_play_iv"
+            android:layout_width="12dp"
+            android:layout_height="12dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="8dp"
+            android:src="@drawable/chat_audio_play_btn_ic" />
+
+        <ImageView
+            android:layout_weight="1"
+            android:layout_width="148dp"
+            android:layout_height="21dp"
+            android:scaleType="center"
+            android:background="@drawable/chat_voice_sound_waves"
+            />
+
+        <TextView
+            android:id="@+id/audio_time_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="7dp"
+            android:textColor="#000000"
+            android:textSize="14.5sp"
+            tools:text="0:12"/>
+
+    </LinearLayout>
+
+    <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.TimeInLineTextLayout
+        android:id="@+id/time_in_line_text"
+        android:layout_gravity="end"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+</LinearLayout>
+
diff --git a/system/tuichat/src/main/res-minimalistui/layout/minimalist_message_adapter_content_file.xml b/system/tuichat/src/main/res-minimalistui/layout/minimalist_message_adapter_content_file.xml
new file mode 100644
index 0000000..f292158
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/minimalist_message_adapter_content_file.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingLeft="16dp"
+    android:paddingTop="8dp"
+    android:paddingRight="16dp"
+    android:paddingBottom="8dp"
+    app:maxWidth="270dp">
+
+
+    <LinearLayout
+        android:id="@+id/file_content"
+        android:layout_width="wrap_content"
+        android:layout_height="48dp"
+        android:background="@drawable/white_round_rect_border"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:padding="12dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/file_icon_iv"
+            android:background="@color/transparent"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginRight="8dp"
+            android:scaleType="fitXY"
+            android:src="@drawable/chat_file_type_icon_none" />
+
+        <TextView
+            android:id="@+id/file_name_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="middle"
+            android:lineHeight="16.71sp"
+            android:singleLine="true"
+            android:textColor="@color/black_font_color"
+            android:textFontWeight="500"
+            android:textSize="14sp"
+            tools:text="数字生态大会.ppt" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/file_size_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="11dp"
+        android:textColor="#FF7A7A7A"
+        android:textSize="12sp"
+        app:layout_constraintEnd_toStartOf="@id/file_msg_time_in_line_text"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintHorizontal_chainStyle="spread_inside"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/file_content" />
+
+        <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.TimeInLineTextLayout
+            android:id="@+id/file_msg_time_in_line_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="-3dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toEndOf="@+id/file_size_tv"
+            app:layout_constraintTop_toTopOf="@id/file_size_tv" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/minimalist_message_adapter_content_image.xml b/system/tuichat/src/main/res-minimalistui/layout/minimalist_message_adapter_content_image.xml
new file mode 100644
index 0000000..41699ac
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/minimalist_message_adapter_content_image.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <com.tencent.qcloud.tuicore.component.RoundCornerImageView
+        android:id="@+id/content_image_iv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:clickable="false"
+        android:scaleType="fitCenter" />
+
+    <ImageView
+        android:id="@+id/video_play_btn"
+        android:layout_width="43dp"
+        android:layout_height="43dp"
+        android:layout_centerInParent="true"
+        android:clickable="false"
+        android:src="@drawable/chat_minimalist_play_icon" />
+
+    <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.TimeInLineTextLayout
+        android:id="@+id/image_msg_time_in_line_text"
+        android:layout_alignEnd="@id/content_image_iv"
+        android:layout_alignBottom="@id/content_image_iv"
+        android:layout_marginEnd="9dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/minimalist_message_adapter_content_reply.xml b/system/tuichat/src/main/res-minimalistui/layout/minimalist_message_adapter_content_reply.xml
new file mode 100644
index 0000000..be5a8b6
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/minimalist_message_adapter_content_reply.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/reply_container"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:minWidth="@dimen/reply_message_content_min_width"
+    app:maxWidth="@dimen/reply_message_content_max_width"
+    android:orientation="vertical">
+
+    <!--原始消息摘要-->
+    <LinearLayout
+        android:id="@+id/origin_msg_abs_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        android:background="?attr/chat_self_reply_quote_bg_color"
+        android:orientation="horizontal">
+
+        <!--左边细线-->
+        <View
+            android:id="@+id/reply_line"
+            android:layout_width="6dp"
+            android:layout_height="match_parent"
+            android:background="#D9D9D9"
+            android:layout_marginRight="@dimen/reply_line_margin_right"
+            android:layout_marginEnd="@dimen/reply_line_margin_right" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/reply_sender_margin_top"
+            android:paddingBottom="@dimen/reply_abstract_padding_bottom"
+            android:orientation="vertical">
+
+            <!--发送者昵称-->
+            <TextView
+                android:id="@+id/sender_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="6.5dp"
+                android:layout_marginRight="6.5dp"
+                android:layout_marginBottom="@dimen/reply_abstract_margin_bottom"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textColor="#000000"
+                android:textStyle="bold"
+                android:textSize="14sp" />
+
+            <FrameLayout
+                android:id="@+id/quote_frame_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+        </LinearLayout>
+
+    </LinearLayout>
+
+
+    <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.TimeInLineTextLayout
+        android:id="@+id/time_in_line_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="-3dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/origin_msg_abs_layout" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/minimalist_message_adapter_item_content.xml b/system/tuichat/src/main/res-minimalistui/layout/minimalist_message_adapter_item_content.xml
new file mode 100644
index 0000000..afc9b84
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/minimalist_message_adapter_item_content.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.MinimalistMessageLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/message_content_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:clickable="false"
+    android:paddingLeft="16dp"
+    android:paddingTop="0dp"
+    android:paddingRight="16dp"
+    android:paddingBottom="25dp">
+
+    <TextView
+        android:id="@+id/message_top_time_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp"
+        android:includeFontPadding="false"
+        android:textColor="@color/text_tips_color"
+        android:textSize="12.6sp"
+        tools:text="12:00" />
+
+    <CheckBox
+        android:id="@+id/select_checkbox"
+        android:layout_width="21.12dp"
+        android:layout_height="21.12dp"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        android:layout_marginRight="11.52dp"
+        android:background="@drawable/chat_checkbox_selector"
+        android:button="@null"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+    <com.tencent.qcloud.tuicore.component.gatherimage.UserIconView
+        android:id="@+id/left_user_icon_view"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_alignBottom="@id/msg_content_ll"
+        android:layout_marginEnd="8dp"
+        android:layout_toEndOf="@id/select_checkbox"
+        android:visibility="gone"
+        app:default_image="?attr/core_default_user_icon"
+        app:image_radius="20dp"
+        tools:visibility="visible" />
+
+    <com.tencent.qcloud.tuicore.component.gatherimage.UserIconView
+        android:id="@+id/right_user_icon_view"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_alignBottom="@id/msg_content_ll"
+        android:layout_alignParentRight="true"
+        android:layout_marginStart="8dp"
+        android:visibility="gone"
+        app:default_image="?attr/core_default_user_icon"
+        app:image_radius="20dp"
+        tools:visibility="visible" />
+
+
+    <LinearLayout
+        android:id="@+id/msg_content_ll"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/message_top_time_tv"
+        android:layout_toLeftOf="@id/right_user_icon_view"
+        android:layout_toRightOf="@id/left_user_icon_view"
+        android:gravity="start"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/message_status_iv"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="5dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginEnd="5dp"
+            android:layout_marginBottom="5dp"
+            android:scaleType="fitCenter"
+            android:src="@drawable/message_send_fail"
+            android:visibility="gone"
+            tools:visibility="visible" />
+
+        <ImageView
+            android:id="@+id/file_status_iv"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginStart="5dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginEnd="5dp"
+            android:layout_marginBottom="5dp"
+            android:scaleType="fitCenter"
+            android:src="@drawable/chat_minimalist_file_download_icon"
+            android:visibility="gone"
+            tools:visibility="visible" />
+
+        <LinearLayout
+            android:id="@+id/msg_area_and_reply"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.MaxWidthLinearLayout
+                android:id="@+id/msg_area"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:transitionName="messageAreaTransition"
+                app:maxWidth="@dimen/chat_message_content_max_width">
+
+                <TextView
+                    android:id="@+id/user_name_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
+                    android:layout_marginBottom="2dp"
+                    android:layout_toRightOf="@id/left_user_icon_view"
+                    android:textColor="#0365F9"
+                    android:textSize="12sp"
+                    android:visibility="gone"
+                    tools:text="Leo"
+                    tools:visibility="visible" />
+
+                <!-- message content area -->
+                <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.MaxWidthFrameLayout
+                    android:id="@+id/msg_content_fl"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:maxWidth="@dimen/chat_message_content_max_width" />
+
+
+            </com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.MaxWidthLinearLayout>
+
+            <!-- emoji react area -->
+            <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply.ChatReactView
+                android:id="@+id/reacts_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="-3dp"
+                android:layout_marginEnd="16dp" />
+
+        </LinearLayout>
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/extra_info_area"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:gravity="start"
+        android:layout_marginTop="4dp"
+        android:layout_below="@id/msg_content_ll"
+        android:layout_toLeftOf="@id/right_user_icon_view"
+        android:layout_toRightOf="@id/left_user_icon_view">
+        <!-- translation content area -->
+        <com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MaxWidthFrameLayout
+            android:id="@+id/translate_content_fl"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/minimalist_translation_area_bg"
+            app:maxWidth="@dimen/chat_message_content_max_width"
+            android:visibility="gone"
+            tools:visibility="visible"/>
+        <!-- message quote area -->
+        <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.MaxWidthFrameLayout
+            android:id="@+id/quote_content_fl"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:background="@drawable/chat_gray_round_rect_bg"
+            android:visibility="gone"
+            app:maxWidth="@dimen/chat_message_content_max_width"
+            tools:visibility="visible" />
+
+        <!-- reply preview -->
+        <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply.ReplyPreviewView
+            android:id="@+id/msg_reply_preview"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_below="@id/quote_content_fl" />
+    </LinearLayout>
+</com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.MinimalistMessageLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/minimalist_message_react_detail.xml b/system/tuichat/src/main/res-minimalistui/layout/minimalist_message_react_detail.xml
new file mode 100644
index 0000000..c9d78ba
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/minimalist_message_react_detail.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+
+    <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.MessageRecyclerView
+        android:id="@+id/message_view"
+        android:layout_marginTop="12.6dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <View
+        android:id="@+id/divide_line"
+        android:layout_width="match_parent"
+        android:layout_height="0.48dp"
+        android:background="#DBDBDB" />
+
+    <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply.ReplyDetailsView
+        android:id="@+id/replies_detail"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.input.InputView
+        android:id="@+id/reply_input_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/minimalist_message_reply_detail.xml b/system/tuichat/src/main/res-minimalistui/layout/minimalist_message_reply_detail.xml
new file mode 100644
index 0000000..c9d78ba
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/minimalist_message_reply_detail.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+
+    <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.MessageRecyclerView
+        android:id="@+id/message_view"
+        android:layout_marginTop="12.6dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <View
+        android:id="@+id/divide_line"
+        android:layout_width="match_parent"
+        android:layout_height="0.48dp"
+        android:background="#DBDBDB" />
+
+    <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.reply.ReplyDetailsView
+        android:id="@+id/replies_detail"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.input.InputView
+        android:id="@+id/reply_input_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/minimalist_quote_message_content_layout.xml b/system/tuichat/src/main/res-minimalistui/layout/minimalist_quote_message_content_layout.xml
new file mode 100644
index 0000000..2e51ba5
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/minimalist_quote_message_content_layout.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MaxWidthLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="7.68dp"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_weight="1"
+        android:id="@+id/sender_name_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:ellipsize="middle"
+        android:singleLine="true" />
+
+    <FrameLayout
+        android:id="@+id/text_msg_area"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <TextView
+            android:id="@+id/msg_abstract_tv"
+            android:textSize="14sp"
+            android:textColor="#66000000"
+            android:maxLines="3"
+            android:ellipsize="end"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+    </FrameLayout>
+
+    <FrameLayout
+        android:id="@+id/image_video_msg_area"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <ImageView
+            android:id="@+id/msg_image_iv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <ImageView
+            android:id="@+id/msg_play_iv"
+            android:src="@drawable/ic_chat_play_icon"
+            android:layout_centerInParent="true"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+    </FrameLayout>
+
+    <FrameLayout
+        android:id="@+id/file_msg_area"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <TextView
+            android:id="@+id/file_name_tv"
+            android:textSize="14sp"
+            android:textColor="#66000000"
+            android:maxLines="2"
+            android:ellipsize="middle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <ImageView
+            android:id="@+id/file_icon_iv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+    </FrameLayout>
+
+    <FrameLayout
+        android:id="@+id/sound_msg_area"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <ImageView
+            android:id="@+id/sound_msg_icon_iv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            android:id="@+id/sound_msg_time_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+    </FrameLayout>
+
+</com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MaxWidthLinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/minimalist_react_category_layout.xml b/system/tuichat/src/main/res-minimalistui/layout/minimalist_react_category_layout.xml
new file mode 100644
index 0000000..d8165bc
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/minimalist_react_category_layout.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:paddingStart="8dp"
+    android:paddingEnd="8dp"
+    android:paddingTop="4dp"
+    android:paddingBottom="4dp"
+    android:gravity="center_vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/category_name"
+        android:textSize="12sp"
+        android:textColor="#999999"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <ImageView
+        android:id="@+id/react_img"
+        android:layout_width="12dp"
+        android:layout_height="12dp"/>
+
+    <TextView
+        android:id="@+id/react_num"
+        android:textSize="12sp"
+        android:textColor="#999999"
+        android:layout_marginStart="4dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/minimalist_react_details_layout.xml b/system/tuichat/src/main/res-minimalistui/layout/minimalist_react_details_layout.xml
new file mode 100644
index 0000000..8080546
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/minimalist_react_details_layout.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="8dp"
+    android:paddingBottom="8dp">
+
+    <com.tencent.qcloud.tuicore.component.RoundCornerImageView
+        android:id="@+id/user_face"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_alignParentStart="true"
+        app:corner_radius="20dp" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_toEndOf="@id/user_face"
+        android:gravity="center_vertical|start"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/user_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="#666666"
+            android:textSize="16sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/tips"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="#666666"
+            android:layout_marginTop="4dp"
+            android:textSize="12sp" />
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/emoji_icon"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/layout/minimalist_react_view_pager_layout.xml b/system/tuichat/src/main/res-minimalistui/layout/minimalist_react_view_pager_layout.xml
new file mode 100644
index 0000000..513c5d7
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/layout/minimalist_react_view_pager_layout.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/react_user_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/values-zh-rCN/mininmalist_strings.xml b/system/tuichat/src/main/res-minimalistui/values-zh-rCN/mininmalist_strings.xml
new file mode 100644
index 0000000..c7c910b
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/values-zh-rCN/mininmalist_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="camera">相机</string>
+    <string name="left_cancle_send">松开手指发送，左滑取消发送</string>
+    <string name="chat_tap_to_remove">点击删除</string>
+    <string name="chat_forward_checked_num">已选择 %d 个</string>
+    <string name="chat_minimalist_pop_more">更多</string>
+</resources>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/values/attrs.xml b/system/tuichat/src/main/res-minimalistui/values/attrs.xml
new file mode 100644
index 0000000..b3dfcc3
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/values/attrs.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="VoiceWaveView">
+        <attr name="lineSpace" format="dimension"/>
+        <attr name="lineWidth" format="dimension"/>
+        <attr name="duration" format="integer"/>
+
+        <attr name="waveMode" format="enum">
+            <enum name="up_down" value="0"/>
+            <enum name="left_right" value="1"/>
+        </attr>
+
+        <attr name="lineType" format="enum">
+            <enum name="bar_chart" value="0"/>
+            <enum name="line_graph" value="1"/>
+        </attr>
+
+        <attr name="lineColor" format="color"/>
+        <attr name="android:gravity"/>
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/values/colors.xml b/system/tuichat/src/main/res-minimalistui/values/colors.xml
new file mode 100644
index 0000000..8da6651
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/values/colors.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="minimalist_voice_pressed">#FF584C</color>
+    <color name="minimalist_voice_normal">#147AFF</color>
+    <color name="chat_minimalist_left_message_bubble_color">#FFECEBEB</color>
+    <color name="chat_minimalist_right_message_bubble_color">#FFF2F7FF</color>
+</resources>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/values/dimens.xml b/system/tuichat/src/main/res-minimalistui/values/dimens.xml
new file mode 100644
index 0000000..9d5cb0f
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/values/dimens.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="chat_minimalist_file_name_text_size">12sp</dimen>
+    <dimen name="chat_minimalist_message_area_padding_left_right">16dp</dimen>
+    <dimen name="chat_minimalist_message_area_padding_top_bottom">8dp</dimen>
+    <dimen name="chat_minimalist_message_quato_line_width">1dp</dimen>
+    <dimen name="chat_minimalist_message_reply_quato_line_offset">2dp</dimen>
+    <dimen name="chat_minimalist_message_text_size">14sp</dimen>
+</resources>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/values/minimalist_strings.xml b/system/tuichat/src/main/res-minimalistui/values/minimalist_strings.xml
new file mode 100644
index 0000000..5e7d621
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/values/minimalist_strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="camera">Camera</string>
+    <string name="left_cancle_send">Swipe left to cancel or release to send</string>
+    <string name="chat_tap_to_remove">Tap to remove</string>
+    <string name="chat_forward_checked_num">%d Selected</string>
+    <string name="chat_minimalist_pop_more">More</string>
+</resources>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-minimalistui/values/minimalist_styles.xml b/system/tuichat/src/main/res-minimalistui/values/minimalist_styles.xml
new file mode 100644
index 0000000..1499c47
--- /dev/null
+++ b/system/tuichat/src/main/res-minimalistui/values/minimalist_styles.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="ChatTransparentPopActivityStyle" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:backgroundDimEnabled">false</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
+    </style>
+
+    <style name="ChatPopActivityStyle" parent="Theme.AppCompat.NoActionBar">
+        <item name="android:windowBackground">#BF000000</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowEnterAnimation">@anim/translate_dialog_in</item>
+        <item name="android:windowExitAnimation">@anim/translate_dialog_out</item>
+    </style>
+
+    <style name="ChatMinimalistMessageTextStyle">
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">#FF000000</item>
+        <item name="android:textFontWeight">500</item>
+        <item name="android:lineHeight">16.7sp</item>
+    </style>
+
+    <style name="ChatBottomSelectSheet" parent="@android:style/Theme.Dialog">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowFrame">@null</item>
+        <item name="android:backgroundDimEnabled">true</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+    </style>
+
+    <style name="ChatBottomSelectSheet_Anim">
+        <item name="android:windowExitAnimation">@anim/chat_bottom_select_sheet_exit</item>
+        <item name="android:windowEnterAnimation">@anim/chat_bottom_select_sheet_enter</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-serious/drawable-xxhdpi/chat_ic_arrow_down_serious.png b/system/tuichat/src/main/res-serious/drawable-xxhdpi/chat_ic_arrow_down_serious.png
new file mode 100644
index 0000000..5c11279
Binary files /dev/null and b/system/tuichat/src/main/res-serious/drawable-xxhdpi/chat_ic_arrow_down_serious.png differ
diff --git a/system/tuichat/src/main/res-serious/drawable-xxhdpi/chat_ic_arrow_up_serious.png b/system/tuichat/src/main/res-serious/drawable-xxhdpi/chat_ic_arrow_up_serious.png
new file mode 100644
index 0000000..c3994fe
Binary files /dev/null and b/system/tuichat/src/main/res-serious/drawable-xxhdpi/chat_ic_arrow_up_serious.png differ
diff --git a/system/tuichat/src/main/res-serious/drawable-xxhdpi/chat_reply_icon_serious.png b/system/tuichat/src/main/res-serious/drawable-xxhdpi/chat_reply_icon_serious.png
new file mode 100644
index 0000000..19e4b81
Binary files /dev/null and b/system/tuichat/src/main/res-serious/drawable-xxhdpi/chat_reply_icon_serious.png differ
diff --git a/system/tuichat/src/main/res-serious/drawable-xxhdpi/chat_title_bar_more_menu_serious.png b/system/tuichat/src/main/res-serious/drawable-xxhdpi/chat_title_bar_more_menu_serious.png
new file mode 100644
index 0000000..cbc3fef
Binary files /dev/null and b/system/tuichat/src/main/res-serious/drawable-xxhdpi/chat_title_bar_more_menu_serious.png differ
diff --git a/system/tuichat/src/main/res-serious/drawable/chat_bubble_other_bg_serious.xml b/system/tuichat/src/main/res-serious/drawable/chat_bubble_other_bg_serious.xml
new file mode 100644
index 0000000..6676701
--- /dev/null
+++ b/system/tuichat/src/main/res-serious/drawable/chat_bubble_other_bg_serious.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid
+        android:color="@color/chat_bubble_other_color_serious"/>
+
+    <corners
+        android:radius="10.96dp"
+        android:topLeftRadius="2.19dp" />
+
+    <stroke
+        android:color="#DDDDDD"
+        android:width="0.96dp"/>
+
+    <padding
+        android:bottom="5.4dp"
+        android:top="5.4dp"
+        android:left="5.4dp"
+        android:right="5.4dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-serious/drawable/chat_bubble_self_bg_serious.xml b/system/tuichat/src/main/res-serious/drawable/chat_bubble_self_bg_serious.xml
new file mode 100644
index 0000000..5e21bac
--- /dev/null
+++ b/system/tuichat/src/main/res-serious/drawable/chat_bubble_self_bg_serious.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid
+        android:color="@color/chat_bubble_self_color_serious"/>
+
+    <corners
+        android:radius="10.96dp"
+        android:topRightRadius="2.19dp" />
+
+    <padding
+        android:bottom="5.4dp"
+        android:top="5.4dp"
+        android:left="5.4dp"
+        android:right="5.4dp"/>
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-serious/values/serious_colors.xml b/system/tuichat/src/main/res-serious/values/serious_colors.xml
new file mode 100644
index 0000000..d138399
--- /dev/null
+++ b/system/tuichat/src/main/res-serious/values/serious_colors.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="chat_bubble_other_color_serious">#F8F8F9</color>
+    <color name="chat_bubble_self_color_serious">@color/core_bubble_bg_color_serious</color>
+    <color name="chat_input_layout_bg_serious">#F4F6F9</color>
+
+    <color name="chat_unread_dot_bg_color_serious">#FFFFFFFF</color>
+
+    <color name="chat_other_msg_text_color_serious">#FFFFFF</color>
+    <color name="chat_self_msg_text_color_serious">#333333</color>
+
+    <color name="chat_self_custom_msg_text_color_serious">#FFFFFF</color>
+    <color name="chat_self_custom_msg_link_color_serious">#00286F</color>
+    <color name="chat_other_custom_msg_text_color_serious">#000000</color>
+    <color name="chat_other_custom_msg_link_color_serious">#00286F</color>
+
+    <color name="chat_tip_text_color_serious">#147AFF</color>
+
+    <color name="chat_self_reply_quote_bg_color_serious">#17000000</color>
+    <color name="chat_self_reply_line_bg_color_serious">#66FFFFFF</color>
+    <color name="chat_self_reply_quote_text_color_serious">#D4E2FF</color>
+    <color name="chat_self_reply_text_color_serious">#FFFFFF</color>
+
+    <color name="chat_other_reply_quote_bg_color_serious">#0D444444</color>
+    <color name="chat_other_reply_line_bg_color_serious">#1A444444</color>
+    <color name="chat_other_reply_quote_text_color_serious">#FF888888</color>
+    <color name="chat_other_reply_text_color_serious">#000000</color>
+
+    <color name="chat_read_receipt_text_color_serious">#5695E7</color>
+    <color name="chat_react_text_color_serious">#FFFFFF</color>
+    <color name="chat_react_other_text_color_serious">#888888</color>
+
+    <color name="chat_pressed_bg_color_serious">#190052FF</color>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res-serious/values/serious_styles.xml b/system/tuichat/src/main/res-serious/values/serious_styles.xml
new file mode 100644
index 0000000..2326048
--- /dev/null
+++ b/system/tuichat/src/main/res-serious/values/serious_styles.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TUIChatSeriousTheme" parent="TUIBaseSeriousTheme">
+        <item name="chat_bubble_self_bg_color">@color/chat_bubble_self_color_serious</item>
+        <item name="chat_bubble_other_bg_color">@color/chat_bubble_other_color_serious</item>
+
+        <item name="chat_bubble_self_bg">@drawable/chat_bubble_self_bg_serious</item>
+        <item name="chat_bubble_other_bg">@drawable/chat_bubble_other_bg_serious</item>
+
+        <item name="chat_input_area_bg">@color/chat_input_layout_bg_serious</item>
+
+        <item name="chat_unread_dot_bg_color">@color/chat_unread_dot_bg_color_serious</item>
+        <item name="chat_unread_dot_text_color">?attr/core_primary_color</item>
+
+        <item name="chat_title_bar_more_menu">@drawable/chat_title_bar_more_menu_serious</item>
+
+        <item name="chat_other_msg_text_color">@color/chat_other_msg_text_color_serious</item>
+        <item name="chat_self_msg_text_color">@color/chat_self_msg_text_color_serious</item>
+        <item name="chat_self_custom_msg_text_color">@color/chat_self_custom_msg_text_color_serious</item>
+        <item name="chat_other_custom_msg_text_color">@color/chat_other_custom_msg_text_color_serious</item>
+        <item name="chat_self_custom_msg_link_color">@color/chat_self_custom_msg_link_color_serious</item>
+        <item name="chat_other_custom_msg_link_color">@color/chat_other_custom_msg_link_color_serious</item>
+
+        <item name="chat_tip_text_color">@color/chat_tip_text_color_serious</item>
+
+        <item name="chat_self_reply_quote_bg_color">@color/chat_self_reply_quote_bg_color_serious</item>
+        <item name="chat_other_reply_quote_bg_color">@color/chat_other_reply_quote_bg_color_serious</item>
+        <item name="chat_self_reply_line_bg_color">@color/chat_self_reply_line_bg_color_serious</item>
+        <item name="chat_other_reply_line_bg_color">@color/chat_other_reply_line_bg_color_serious</item>
+        <item name="chat_self_reply_quote_text_color">@color/chat_self_reply_quote_text_color_serious</item>
+        <item name="chat_other_reply_quote_text_color">@color/chat_other_reply_quote_text_color_serious</item>
+        <item name="chat_self_reply_text_color">@color/chat_self_reply_text_color_serious</item>
+        <item name="chat_other_reply_text_color">@color/chat_other_reply_text_color_serious</item>
+
+        <item name="chat_read_receipt_text_color">@color/chat_read_receipt_text_color_serious</item>
+        <item name="chat_react_text_color">@color/chat_react_text_color_serious</item>
+        <item name="chat_react_other_text_color">@color/chat_react_other_text_color_serious</item>
+        <item name="chat_reply_detail_icon">@drawable/chat_reply_icon_serious</item>
+        <item name="chat_jump_recent_down_icon">@drawable/chat_ic_arrow_down_serious</item>
+        <item name="chat_jump_recent_up_icon">@drawable/chat_ic_arrow_up_serious</item>
+
+        <item name="chat_pressed_bg_color">@color/chat_pressed_bg_color_serious</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/anim/beginner_guide_in_anim.xml b/system/tuichat/src/main/res/anim/beginner_guide_in_anim.xml
new file mode 100644
index 0000000..94ce416
--- /dev/null
+++ b/system/tuichat/src/main/res/anim/beginner_guide_in_anim.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <alpha
+        android:duration="200"
+        android:fromAlpha="0"
+        android:toAlpha="1"/>
+</set>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/anim/beginner_guide_out_anim.xml b/system/tuichat/src/main/res/anim/beginner_guide_out_anim.xml
new file mode 100644
index 0000000..aa23020
--- /dev/null
+++ b/system/tuichat/src/main/res/anim/beginner_guide_out_anim.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <alpha
+        android:duration="200"
+        android:fromAlpha="1"
+        android:toAlpha="0"/>
+</set>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/anim/chat_pop_menu_in_anim.xml b/system/tuichat/src/main/res/anim/chat_pop_menu_in_anim.xml
new file mode 100644
index 0000000..b0e0255
--- /dev/null
+++ b/system/tuichat/src/main/res/anim/chat_pop_menu_in_anim.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <alpha
+        android:duration="0"
+        android:fromAlpha="0"
+        android:toAlpha="1"/>
+</set>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/anim/chat_pop_menu_out_anim.xml b/system/tuichat/src/main/res/anim/chat_pop_menu_out_anim.xml
new file mode 100644
index 0000000..07fa89b
--- /dev/null
+++ b/system/tuichat/src/main/res/anim/chat_pop_menu_out_anim.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <alpha
+        android:duration="300"
+        android:fromAlpha="1"
+        android:toAlpha="0"/>
+</set>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/anim/translate_dialog_in.xml b/system/tuichat/src/main/res/anim/translate_dialog_in.xml
new file mode 100644
index 0000000..9c5e2b9
--- /dev/null
+++ b/system/tuichat/src/main/res/anim/translate_dialog_in.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="300"
+    android:fromXDelta="0"
+    android:fromYDelta="100%"
+    android:toXDelta="0"
+    android:toYDelta="0">
+</translate>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/anim/translate_dialog_out.xml b/system/tuichat/src/main/res/anim/translate_dialog_out.xml
new file mode 100644
index 0000000..c92f9ea
--- /dev/null
+++ b/system/tuichat/src/main/res/anim/translate_dialog_out.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="300"
+    android:fromXDelta="0"
+    android:fromYDelta="0"
+    android:toXDelta="0"
+    android:toYDelta="100%">
+</translate>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable-hdpi/alert_bg.9.png b/system/tuichat/src/main/res/drawable-hdpi/alert_bg.9.png
new file mode 100644
index 0000000..84a042e
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-hdpi/alert_bg.9.png differ
diff --git a/system/tuichat/src/main/res/drawable-hdpi/indicator_point_nomal.png b/system/tuichat/src/main/res/drawable-hdpi/indicator_point_nomal.png
new file mode 100644
index 0000000..b970edc
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-hdpi/indicator_point_nomal.png differ
diff --git a/system/tuichat/src/main/res/drawable-hdpi/indicator_point_select.png b/system/tuichat/src/main/res/drawable-hdpi/indicator_point_select.png
new file mode 100644
index 0000000..15930e3
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-hdpi/indicator_point_select.png differ
diff --git a/system/tuichat/src/main/res/drawable-hdpi/message_send_fail.png b/system/tuichat/src/main/res/drawable-hdpi/message_send_fail.png
new file mode 100644
index 0000000..cb0b524
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-hdpi/message_send_fail.png differ
diff --git a/system/tuichat/src/main/res/drawable-hdpi/trans_bg.png b/system/tuichat/src/main/res/drawable-hdpi/trans_bg.png
new file mode 100644
index 0000000..0a4c3cd
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-hdpi/trans_bg.png differ
diff --git a/system/tuichat/src/main/res/drawable-hdpi/voice_msg_playing_1.png b/system/tuichat/src/main/res/drawable-hdpi/voice_msg_playing_1.png
new file mode 100644
index 0000000..422c002
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-hdpi/voice_msg_playing_1.png differ
diff --git a/system/tuichat/src/main/res/drawable-hdpi/voice_msg_playing_2.png b/system/tuichat/src/main/res/drawable-hdpi/voice_msg_playing_2.png
new file mode 100644
index 0000000..af6f80e
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-hdpi/voice_msg_playing_2.png differ
diff --git a/system/tuichat/src/main/res/drawable-hdpi/voice_msg_playing_3.png b/system/tuichat/src/main/res/drawable-hdpi/voice_msg_playing_3.png
new file mode 100644
index 0000000..37581aa
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-hdpi/voice_msg_playing_3.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/chat_back.png b/system/tuichat/src/main/res/drawable-xxhdpi/chat_back.png
new file mode 100644
index 0000000..125d7c9
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/chat_back.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/chat_camera_switchcamera.png b/system/tuichat/src/main/res/drawable-xxhdpi/chat_camera_switchcamera.png
new file mode 100644
index 0000000..c2498bc
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/chat_camera_switchcamera.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/chat_input_face.png b/system/tuichat/src/main/res/drawable-xxhdpi/chat_input_face.png
new file mode 100644
index 0000000..d0714fd
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/chat_input_face.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/chat_input_keyboard.png b/system/tuichat/src/main/res/drawable-xxhdpi/chat_input_keyboard.png
new file mode 100644
index 0000000..316e9d8
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/chat_input_keyboard.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/chat_input_more.png b/system/tuichat/src/main/res/drawable-xxhdpi/chat_input_more.png
new file mode 100644
index 0000000..fc70d88
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/chat_input_more.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/chat_input_voice.png b/system/tuichat/src/main/res/drawable-xxhdpi/chat_input_voice.png
new file mode 100644
index 0000000..f204995
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/chat_input_voice.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/chat_menu_face_hide_more.png b/system/tuichat/src/main/res/drawable-xxhdpi/chat_menu_face_hide_more.png
new file mode 100644
index 0000000..311666b
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/chat_menu_face_hide_more.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/chat_menu_face_show_more.png b/system/tuichat/src/main/res/drawable-xxhdpi/chat_menu_face_show_more.png
new file mode 100644
index 0000000..f058eae
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/chat_menu_face_show_more.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/chat_other_bg.9.png b/system/tuichat/src/main/res/drawable-xxhdpi/chat_other_bg.9.png
new file mode 100644
index 0000000..643d421
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/chat_other_bg.9.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/chat_permission_icon_camera.png b/system/tuichat/src/main/res/drawable-xxhdpi/chat_permission_icon_camera.png
new file mode 100644
index 0000000..96fa6fb
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/chat_permission_icon_camera.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/chat_permission_icon_file.png b/system/tuichat/src/main/res/drawable-xxhdpi/chat_permission_icon_file.png
new file mode 100644
index 0000000..f530ec6
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/chat_permission_icon_file.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/chat_permission_icon_mic.png b/system/tuichat/src/main/res/drawable-xxhdpi/chat_permission_icon_mic.png
new file mode 100644
index 0000000..dbef7a3
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/chat_permission_icon_mic.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/chat_quote_guide.png b/system/tuichat/src/main/res/drawable-xxhdpi/chat_quote_guide.png
new file mode 100644
index 0000000..b153933
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/chat_quote_guide.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/chat_reply_guide.png b/system/tuichat/src/main/res/drawable-xxhdpi/chat_reply_guide.png
new file mode 100644
index 0000000..be44c5a
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/chat_reply_guide.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/chat_right_live_group_bg.9.png b/system/tuichat/src/main/res/drawable-xxhdpi/chat_right_live_group_bg.9.png
new file mode 100644
index 0000000..22f4d13
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/chat_right_live_group_bg.9.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/chat_unselected_icon.png b/system/tuichat/src/main/res/drawable-xxhdpi/chat_unselected_icon.png
new file mode 100644
index 0000000..2258889
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/chat_unselected_icon.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/check_box_selected.png b/system/tuichat/src/main/res/drawable-xxhdpi/check_box_selected.png
new file mode 100644
index 0000000..273e525
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/check_box_selected.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/custom.png b/system/tuichat/src/main/res/drawable-xxhdpi/custom.png
new file mode 100644
index 0000000..c338b14
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/custom.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/emoji_default.png b/system/tuichat/src/main/res/drawable-xxhdpi/emoji_default.png
new file mode 100644
index 0000000..a235324
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/emoji_default.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/face_delete.png b/system/tuichat/src/main/res/drawable-xxhdpi/face_delete.png
new file mode 100644
index 0000000..5584e9d
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/face_delete.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/file_icon.png b/system/tuichat/src/main/res/drawable-xxhdpi/file_icon.png
new file mode 100644
index 0000000..d66bbe4
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/file_icon.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/ic_chat_play_icon.png b/system/tuichat/src/main/res/drawable-xxhdpi/ic_chat_play_icon.png
new file mode 100644
index 0000000..f0d9e2a
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/ic_chat_play_icon.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/ic_default_head_img.webp b/system/tuichat/src/main/res/drawable-xxhdpi/ic_default_head_img.webp
new file mode 100644
index 0000000..793c482
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/ic_default_head_img.webp differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/ic_default_user_head_icon.png b/system/tuichat/src/main/res/drawable-xxhdpi/ic_default_user_head_icon.png
new file mode 100644
index 0000000..68bb06f
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/ic_default_user_head_icon.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/ic_more_archives.png b/system/tuichat/src/main/res/drawable-xxhdpi/ic_more_archives.png
new file mode 100644
index 0000000..2338427
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/ic_more_archives.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/ic_more_camera.png b/system/tuichat/src/main/res/drawable-xxhdpi/ic_more_camera.png
new file mode 100644
index 0000000..953f621
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/ic_more_camera.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/ic_more_end_consultation.png b/system/tuichat/src/main/res/drawable-xxhdpi/ic_more_end_consultation.png
new file mode 100644
index 0000000..1501318
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/ic_more_end_consultation.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/ic_more_file.png b/system/tuichat/src/main/res/drawable-xxhdpi/ic_more_file.png
new file mode 100644
index 0000000..309f69c
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/ic_more_file.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/ic_more_location.png b/system/tuichat/src/main/res/drawable-xxhdpi/ic_more_location.png
new file mode 100644
index 0000000..9600b12
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/ic_more_location.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/ic_more_medical_examination_report.png b/system/tuichat/src/main/res/drawable-xxhdpi/ic_more_medical_examination_report.png
new file mode 100644
index 0000000..3e1b78f
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/ic_more_medical_examination_report.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/ic_more_picture.png b/system/tuichat/src/main/res/drawable-xxhdpi/ic_more_picture.png
new file mode 100644
index 0000000..0b0121d
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/ic_more_picture.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/ic_more_video.png b/system/tuichat/src/main/res/drawable-xxhdpi/ic_more_video.png
new file mode 100644
index 0000000..cf5d49e
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/ic_more_video.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/ic_my_location.png b/system/tuichat/src/main/res/drawable-xxhdpi/ic_my_location.png
new file mode 100644
index 0000000..537a124
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/ic_my_location.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/ic_personal_member.png b/system/tuichat/src/main/res/drawable-xxhdpi/ic_personal_member.png
new file mode 100644
index 0000000..e6cb21c
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/ic_personal_member.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/ic_translate_support.png b/system/tuichat/src/main/res/drawable-xxhdpi/ic_translate_support.png
new file mode 100644
index 0000000..bfaf389
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/ic_translate_support.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_1.png b/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_1.png
new file mode 100644
index 0000000..769f0d2
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_1.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_2.png b/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_2.png
new file mode 100644
index 0000000..64bd921
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_2.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_3.png b/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_3.png
new file mode 100644
index 0000000..c1840f4
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_3.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_4.png b/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_4.png
new file mode 100644
index 0000000..8a235ee
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_4.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_5.png b/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_5.png
new file mode 100644
index 0000000..da138b2
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_5.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_6.png b/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_6.png
new file mode 100644
index 0000000..86ec3d8
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_6.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_7.png b/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_7.png
new file mode 100644
index 0000000..7779753
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_7.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_8.png b/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_8.png
new file mode 100644
index 0000000..b9987df
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_8.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_dialog_bg.9.png b/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_dialog_bg.9.png
new file mode 100644
index 0000000..792e1bf
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_dialog_bg.9.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_dialog_cancel.png b/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_dialog_cancel.png
new file mode 100644
index 0000000..3d0d6f3
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_dialog_cancel.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_dialog_length_short.png b/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_dialog_length_short.png
new file mode 100644
index 0000000..9ed0dc1
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/ic_volume_dialog_length_short.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/live_ic_group_live.png b/system/tuichat/src/main/res/drawable-xxhdpi/live_ic_group_live.png
new file mode 100644
index 0000000..7dec99b
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/live_ic_group_live.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/multi_select_delete.png b/system/tuichat/src/main/res/drawable-xxhdpi/multi_select_delete.png
new file mode 100644
index 0000000..3fd8779
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/multi_select_delete.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/multi_select_forward_merge.png b/system/tuichat/src/main/res/drawable-xxhdpi/multi_select_forward_merge.png
new file mode 100644
index 0000000..c0f5b4b
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/multi_select_forward_merge.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/multi_select_forward_one.png b/system/tuichat/src/main/res/drawable-xxhdpi/multi_select_forward_one.png
new file mode 100644
index 0000000..4371004
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/multi_select_forward_one.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/pop_menu_copy.png b/system/tuichat/src/main/res/drawable-xxhdpi/pop_menu_copy.png
new file mode 100644
index 0000000..9bb8983
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/pop_menu_copy.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/pop_menu_delete.png b/system/tuichat/src/main/res/drawable-xxhdpi/pop_menu_delete.png
new file mode 100644
index 0000000..ca6a795
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/pop_menu_delete.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/pop_menu_forward.png b/system/tuichat/src/main/res/drawable-xxhdpi/pop_menu_forward.png
new file mode 100644
index 0000000..c6a80f2
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/pop_menu_forward.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/pop_menu_hide.png b/system/tuichat/src/main/res/drawable-xxhdpi/pop_menu_hide.png
new file mode 100644
index 0000000..894a8f2
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/pop_menu_hide.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/pop_menu_multi_select.png b/system/tuichat/src/main/res/drawable-xxhdpi/pop_menu_multi_select.png
new file mode 100644
index 0000000..9c064a3
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/pop_menu_multi_select.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/pop_menu_quote.png b/system/tuichat/src/main/res/drawable-xxhdpi/pop_menu_quote.png
new file mode 100644
index 0000000..a662e2e
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/pop_menu_quote.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/pop_menu_reply.png b/system/tuichat/src/main/res/drawable-xxhdpi/pop_menu_reply.png
new file mode 100644
index 0000000..41fa1d7
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/pop_menu_reply.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/pop_menu_revoke.png b/system/tuichat/src/main/res/drawable-xxhdpi/pop_menu_revoke.png
new file mode 100644
index 0000000..0f05998
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/pop_menu_revoke.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxhdpi/reply_close_btn.png b/system/tuichat/src/main/res/drawable-xxhdpi/reply_close_btn.png
new file mode 100644
index 0000000..d9b5d06
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxhdpi/reply_close_btn.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxxhdpi/indicator_point_nomal.png b/system/tuichat/src/main/res/drawable-xxxhdpi/indicator_point_nomal.png
new file mode 100644
index 0000000..8507489
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxxhdpi/indicator_point_nomal.png differ
diff --git a/system/tuichat/src/main/res/drawable-xxxhdpi/indicator_point_select.png b/system/tuichat/src/main/res/drawable-xxxhdpi/indicator_point_select.png
new file mode 100644
index 0000000..20736c5
Binary files /dev/null and b/system/tuichat/src/main/res/drawable-xxxhdpi/indicator_point_select.png differ
diff --git a/system/tuichat/src/main/res/drawable/action_audio_selector.xml b/system/tuichat/src/main/res/drawable/action_audio_selector.xml
new file mode 100644
index 0000000..dabe635
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/action_audio_selector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/chat_input_voice" android:state_pressed="true" />
+    <item android:drawable="@drawable/chat_input_voice" android:state_pressed="false" />
+
+</selector>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/action_face_selector.xml b/system/tuichat/src/main/res/drawable/action_face_selector.xml
new file mode 100644
index 0000000..116beef
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/action_face_selector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/chat_input_face" android:state_pressed="true" />
+    <item android:drawable="@drawable/chat_input_face" android:state_pressed="false" />
+
+</selector>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/action_more_selector.xml b/system/tuichat/src/main/res/drawable/action_more_selector.xml
new file mode 100644
index 0000000..954898f
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/action_more_selector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/chat_input_more" android:state_pressed="true" />
+    <item android:drawable="@drawable/chat_input_more" android:state_pressed="false" />
+
+</selector>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/chat_bubble_button_bg_serious.xml b/system/tuichat/src/main/res/drawable/chat_bubble_button_bg_serious.xml
new file mode 100644
index 0000000..3921f27
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/chat_bubble_button_bg_serious.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid
+        android:color="@color/green"/>
+
+    <corners
+        android:radius="15dp" />
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/chat_bubble_custom_message_bg_serious.xml b/system/tuichat/src/main/res/drawable/chat_bubble_custom_message_bg_serious.xml
new file mode 100644
index 0000000..58d839a
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/chat_bubble_custom_message_bg_serious.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid
+        android:color="@color/white"/>
+
+    <corners
+        android:radius="15dp"
+        android:topRightRadius="2.19dp" />
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/chat_bubble_custom_other_bg_serious.xml b/system/tuichat/src/main/res/drawable/chat_bubble_custom_other_bg_serious.xml
new file mode 100644
index 0000000..c6d5beb
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/chat_bubble_custom_other_bg_serious.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid
+        android:color="#466AFA"/>
+
+    <corners
+        android:radius="15dp"
+        android:topLeftRadius="2.19dp" />
+
+<!--    <stroke-->
+<!--        android:color="#DDDDDD"-->
+<!--        android:width="0.96dp"/>-->
+
+    <padding
+        android:bottom="5.4dp"
+        android:top="5.4dp"
+        android:left="5.4dp"
+        android:right="5.4dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/chat_bubble_custom_self_bg_serious.xml b/system/tuichat/src/main/res/drawable/chat_bubble_custom_self_bg_serious.xml
new file mode 100644
index 0000000..7838c6c
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/chat_bubble_custom_self_bg_serious.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid
+        android:color="@color/white"/>
+
+    <corners
+        android:radius="15dp"
+        android:topRightRadius="2.19dp" />
+
+    <padding
+        android:bottom="5.4dp"
+        android:top="5.4dp"
+        android:left="5.4dp"
+        android:right="5.4dp"/>
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/chat_bubble_other_cavity_bg.xml b/system/tuichat/src/main/res/drawable/chat_bubble_other_cavity_bg.xml
new file mode 100644
index 0000000..f5d77b5
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/chat_bubble_other_cavity_bg.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:color="@color/chat_message_bubble_bg_stoke_color"
+        android:width="@dimen/chat_message_bg_stoke_width"/>
+
+    <corners
+        android:radius="10.96dp"
+        android:topLeftRadius="2.19dp" />
+
+    <padding
+        android:bottom="5.4dp"
+        android:top="5.4dp"
+        android:left="5.4dp"
+        android:right="5.4dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/chat_bubble_self_cavity_bg.xml b/system/tuichat/src/main/res/drawable/chat_bubble_self_cavity_bg.xml
new file mode 100644
index 0000000..9487167
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/chat_bubble_self_cavity_bg.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:color="@color/chat_message_bubble_bg_stoke_color"
+        android:width="@dimen/chat_message_bg_stoke_width"/>
+
+    <corners
+        android:radius="10.96dp"
+        android:topRightRadius="2.19dp" />
+
+    <padding
+        android:bottom="5.4dp"
+        android:top="5.4dp"
+        android:left="5.4dp"
+        android:right="5.4dp"/>
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/chat_checkbox_selector.xml b/system/tuichat/src/main/res/drawable/chat_checkbox_selector.xml
new file mode 100644
index 0000000..8333620
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/chat_checkbox_selector.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/check_box_selected" android:state_checked="true" />
+    <item android:drawable="@drawable/chat_unselected_icon" android:state_checked="false" />
+    <item android:drawable="@drawable/chat_unselected_icon" />
+
+</selector>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/chat_divide_line.xml b/system/tuichat/src/main/res/drawable/chat_divide_line.xml
new file mode 100644
index 0000000..e9f4404
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/chat_divide_line.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid
+        android:color="#DDDDDD"/>
+
+    <size
+        android:height="0.6dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/chat_pop_item_bg.xml b/system/tuichat/src/main/res/drawable/chat_pop_item_bg.xml
new file mode 100644
index 0000000..f9b7bcb
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/chat_pop_item_bg.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="?attr/chat_pressed_bg_color" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="#00FFFFFF" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/chat_pop_menu_divider.xml b/system/tuichat/src/main/res/drawable/chat_pop_menu_divider.xml
new file mode 100644
index 0000000..a036ea1
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/chat_pop_menu_divider.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid
+        android:color="#E5E5E5"/>
+
+    <size
+        android:height="0.96dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/chat_react_bg.xml b/system/tuichat/src/main/res/drawable/chat_react_bg.xml
new file mode 100644
index 0000000..52af45a
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/chat_react_bg.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="11.52dp"/>
+    <solid android:color="#1A444444"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/chat_time_border.xml b/system/tuichat/src/main/res/drawable/chat_time_border.xml
new file mode 100644
index 0000000..e1d239c
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/chat_time_border.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#d2d2d2" />
+
+    <corners android:radius="3dp" />
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/group_msg_receipt_line_bg.xml b/system/tuichat/src/main/res/drawable/group_msg_receipt_line_bg.xml
new file mode 100644
index 0000000..588481d
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/group_msg_receipt_line_bg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="?attr/core_primary_color"/>
+
+    <corners android:radius="1.44dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/ic_audio_call.xml b/system/tuichat/src/main/res/drawable/ic_audio_call.xml
new file mode 100644
index 0000000..38e51f7
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/ic_audio_call.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="15dp"
+    android:height="15dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M10.6362,20.0292L10.673,17.6472L10.673,17.6472C11.6292,17.369 13.5482,16.9274 16.0961,16.9274C18.6443,16.9274 20.5804,17.3691 21.5479,17.6477L21.5621,19.9748C21.5689,21.0721 22.4585,21.9591 23.5559,21.9625L29.9831,21.9825C31.0876,21.9857 31.9858,21.0932 31.9895,19.9887L32,16.6806L32,16.6806C32,14.6582 30.7746,12.8576 28.9507,12.2C26.1675,11.1964 21.6615,10 16,10C10.3386,10 5.8326,11.1964 3.0493,12.2C2.3898,12.4378 1.8088,12.8249 1.3354,13.3181C0.4997,14.1886 0,15.3895 0,16.6806L0.0056,19.9959C0.0074,21.0985 0.9013,21.9916 2.0039,21.9926L8.6347,21.9983C9.7279,21.9992 10.6193,21.1223 10.6362,20.0292Z"
+      android:fillColor="#333"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/system/tuichat/src/main/res/drawable/ic_back.xml b/system/tuichat/src/main/res/drawable/ic_back.xml
new file mode 100644
index 0000000..38fbc26
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/ic_back.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>
diff --git a/system/tuichat/src/main/res/drawable/ic_camera.xml b/system/tuichat/src/main/res/drawable/ic_camera.xml
new file mode 100644
index 0000000..f8535a5
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/ic_camera.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M9,3L7.17,5L4,5c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,7c0,-1.1 -0.9,-2 -2,-2h-3.17L15,3L9,3zM12,18c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,17l1.25,-2.75L16,13l-2.75,-1.25L12,9l-1.25,2.75L8,13l2.75,1.25z"/>
+</vector>
diff --git a/system/tuichat/src/main/res/drawable/ic_close_button.xml b/system/tuichat/src/main/res/drawable/ic_close_button.xml
new file mode 100644
index 0000000..dde2cd7
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/ic_close_button.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="62"
+    android:viewportHeight="62">
+  <path
+      android:pathData="M31,0A31,31 0,1 0,31 62A31,31 0,1 0,31 0Z"
+      android:fillColor="#4D4D4D"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M20.7687,18.3379L31,28.569L41.2313,18.3379C41.5918,17.9774 42.159,17.9497 42.5513,18.2547L42.6455,18.3379L43.6621,19.3545C44.0526,19.745 44.0526,20.3782 43.6621,20.7687L43.6621,20.7687L33.431,31L43.6621,41.2313C44.0526,41.6218 44.0526,42.255 43.6621,42.6455L42.6455,43.6621C42.255,44.0526 41.6218,44.0526 41.2313,43.6621L31,33.431L20.7687,43.6621C20.4082,44.0226 19.841,44.0503 19.4487,43.7453L19.3545,43.6621L18.3379,42.6455C17.9474,42.255 17.9474,41.6218 18.3379,41.2313L18.3379,41.2313L28.569,31L18.3379,20.7687C17.9474,20.3782 17.9474,19.745 18.3379,19.3545L19.3545,18.3379C19.745,17.9474 20.3782,17.9474 20.7687,18.3379Z"
+      android:fillColor="#FFF"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/system/tuichat/src/main/res/drawable/ic_download_button.xml b/system/tuichat/src/main/res/drawable/ic_download_button.xml
new file mode 100644
index 0000000..7432711
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/ic_download_button.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="62"
+    android:viewportHeight="62">
+  <path
+      android:pathData="M31,0A31,31 0,1 0,31 62A31,31 0,1 0,31 0Z"
+      android:fillColor="#4D4D4D"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M31.7359,17C32.2882,17 32.7359,17.4477 32.7359,18L32.735,38.344L40.758,30.6969C41.1578,30.3159 41.7908,30.331 42.1719,30.7307L43.5518,32.1784C43.9329,32.5781 43.9177,33.2111 43.518,33.5922L31.4479,45.098C31.0647,45.4633 30.4633,45.4667 30.076,45.1057L17.7315,33.5994C17.3275,33.2228 17.3053,32.5901 17.6818,32.1861L19.0455,30.7231C19.4221,30.3191 20.0548,30.2968 20.4589,30.6734L28.735,38.388L28.7359,18C28.7359,17.4477 29.1836,17 29.7359,17L31.7359,17Z"
+      android:fillColor="#FFF"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/system/tuichat/src/main/res/drawable/ic_other_video_call.xml b/system/tuichat/src/main/res/drawable/ic_other_video_call.xml
new file mode 100644
index 0000000..370ac52
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/ic_other_video_call.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="15dp"
+    android:height="15dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M4,5.3333L18.6667,5.3333C20.8758,5.3333 22.6667,7.1242 22.6667,9.3333L22.6667,23.3333C22.6667,25.5425 20.8758,27.3333 18.6667,27.3333L4,27.3333C1.7909,27.3333 0,25.5425 0,23.3333L0,9.3333C0,7.1242 1.7909,5.3333 4,5.3333ZM31,8.8587C31.5128,8.8587 31.9355,9.2448 31.9933,9.7421L32,9.8587L32,22.9122C32,23.1053 31.9441,23.2942 31.8391,23.4562C31.5601,23.8865 31.0062,24.0312 30.5575,23.8091L30.456,23.7513L25.3333,20.43L25.3333,12.1239L30.4817,9.0036C30.638,8.9088 30.8172,8.8587 31,8.8587ZM7,9.4583C7.5523,9.4583 8,9.906 8,10.4583L8,12.5833C8,13.1356 7.5523,13.5833 7,13.5833L5,13.5833C4.4477,13.5833 4,13.1356 4,12.5833L4,10.4583C4,9.906 4.4477,9.4583 5,9.4583L7,9.4583Z"
+      android:fillColor="#333"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/system/tuichat/src/main/res/drawable/ic_pause_center.xml b/system/tuichat/src/main/res/drawable/ic_pause_center.xml
new file mode 100644
index 0000000..e1ee5af
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/ic_pause_center.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="130dp"
+    android:height="130dp"
+    android:viewportWidth="130"
+    android:viewportHeight="130">
+  <path
+      android:pathData="M82.442,61.917L56.261,45.553C55.14,44.852 53.727,44.815 52.57,45.456C51.414,46.097 50.697,47.314 50.697,48.636L50.697,81.364C50.697,82.686 51.414,83.903 52.57,84.544C53.12,84.849 53.727,85 54.333,85C55.003,85 55.672,84.815 56.26,84.447L82.442,68.084C83.506,67.419 84.151,66.254 84.151,65C84.151,63.746 83.506,62.581 82.442,61.917"
+      android:fillColor="#FFF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M65,25C42.944,25 25,42.944 25,65C25,87.056 42.944,105 65,105C87.056,105 105,87.056 105,65C105,42.944 87.056,25 65,25"
+      android:strokeWidth="6"
+      android:fillColor="#00000000"
+      android:strokeColor="#FFF"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/system/tuichat/src/main/res/drawable/ic_pause_icon.xml b/system/tuichat/src/main/res/drawable/ic_pause_icon.xml
new file mode 100644
index 0000000..7abf2aa
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/ic_pause_icon.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="60"
+    android:viewportHeight="60">
+  <path
+      android:pathData="M19,11C21.2091,11 23,12.7909 23,15L23,45C23,47.2091 21.2091,49 19,49C16.7909,49 15,47.2091 15,45L15,15C15,12.7909 16.7909,11 19,11ZM41,11C43.2091,11 45,12.7909 45,15L45,45C45,47.2091 43.2091,49 41,49C38.7909,49 37,47.2091 37,45L37,15C37,12.7909 38.7909,11 41,11Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M19,11C21.2091,11 23,12.7909 23,15L23,45C23,47.2091 21.2091,49 19,49C16.7909,49 15,47.2091 15,45L15,15C15,12.7909 16.7909,11 19,11ZM41,11C43.2091,11 45,12.7909 45,15L45,45C45,47.2091 43.2091,49 41,49C38.7909,49 37,47.2091 37,45L37,15C37,12.7909 38.7909,11 41,11Z"
+      android:fillColor="#FFF"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/system/tuichat/src/main/res/drawable/ic_photo.xml b/system/tuichat/src/main/res/drawable/ic_photo.xml
new file mode 100644
index 0000000..0b56f71
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/ic_photo.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
+</vector>
diff --git a/system/tuichat/src/main/res/drawable/ic_play_icon.xml b/system/tuichat/src/main/res/drawable/ic_play_icon.xml
new file mode 100644
index 0000000..21fba01
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/ic_play_icon.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="25dp"
+    android:viewportWidth="60"
+    android:viewportHeight="60">
+  <path
+      android:pathData="M47.1315,33.5045L17.4437,53.3066C16.1674,54.1569 14.5321,54.2304 13.1861,53.4981C11.84,52.7657 11.0004,51.3457 11,49.8007L11,10.2002C11,8.6548 11.8399,7.2342 13.1864,6.5017C14.533,5.7693 16.1688,5.8433 17.4452,6.6944L47.133,26.4965C48.2986,27.2739 49,28.591 49,30.0024C49,31.4138 48.2986,32.7309 47.133,33.5082L47.1315,33.5045Z"
+      android:fillColor="#000"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M47.1315,33.5045L17.4437,53.3066C16.1674,54.1569 14.5321,54.2304 13.1861,53.4981C11.84,52.7657 11.0004,51.3457 11,49.8007L11,10.2002C11,8.6548 11.8399,7.2342 13.1864,6.5017C14.533,5.7693 16.1688,5.8433 17.4452,6.6944L47.133,26.4965C48.2986,27.2739 49,28.591 49,30.0024C49,31.4138 48.2986,32.7309 47.133,33.5082L47.1315,33.5045Z"
+      android:fillColor="#FFF"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/system/tuichat/src/main/res/drawable/ic_self_video_call.xml b/system/tuichat/src/main/res/drawable/ic_self_video_call.xml
new file mode 100644
index 0000000..1ec83fa
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/ic_self_video_call.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="15dp"
+    android:height="15dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M28,5.3333L13.3333,5.3333C11.1242,5.3333 9.3333,7.1242 9.3333,9.3333L9.3333,23.3333C9.3333,25.5425 11.1242,27.3333 13.3333,27.3333L28,27.3333C30.2091,27.3333 32,25.5425 32,23.3333L32,9.3333C32,7.1242 30.2091,5.3333 28,5.3333ZM1,8.8587C0.4477,8.8587 0,9.3065 0,9.8587L0,9.8587L0,22.9122C0,23.1053 0.0559,23.2942 0.1609,23.4562C0.4614,23.9196 1.0806,24.0517 1.544,23.7513L1.544,23.7513L6.6667,20.43L6.6667,12.1239L1.5183,9.0036C1.362,8.9088 1.1828,8.8587 1,8.8587ZM25,9.4583C24.4477,9.4583 24,9.906 24,10.4583L24,12.5833C24,13.1356 24.4477,13.5833 25,13.5833L27,13.5833C27.5523,13.5833 28,13.1356 28,12.5833L28,10.4583C28,9.906 27.5523,9.4583 27,9.4583L25,9.4583Z"
+      android:fillColor="#333"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/system/tuichat/src/main/res/drawable/layer_live_rating_bar.xml b/system/tuichat/src/main/res/drawable/layer_live_rating_bar.xml
new file mode 100644
index 0000000..0650b08
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/layer_live_rating_bar.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@android:id/background"
+        android:drawable="@drawable/ratingbar_opreview_grey">
+    </item>
+    <item
+        android:id="@android:id/secondaryProgress"
+        android:drawable="@drawable/ratingbar_opreview_grey">
+    </item>
+    <item
+        android:id="@android:id/progress"
+        android:drawable="@drawable/ratingbar_opreview">
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/layer_progress.xml b/system/tuichat/src/main/res/drawable/layer_progress.xml
new file mode 100644
index 0000000..8154fb3
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/layer_progress.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape>
+            <corners android:radius="3dp" />
+            <solid android:color="#ECF0F1" />
+        </shape>
+    </item>
+    <item android:id="@android:id/secondaryProgress">
+        <clip>
+            <shape>
+                <corners android:radius="3dp" />
+                <solid android:color="#C6CACE" />
+            </shape>
+        </clip>
+    </item>
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <corners android:radius="3dp" />
+                <solid android:color="#ECF0F1" />
+            </shape>
+        </clip>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/message_send_border.xml b/system/tuichat/src/main/res/drawable/message_send_border.xml
new file mode 100644
index 0000000..177c519
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/message_send_border.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/green" />
+
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/minimalist_translation_area_bg.xml b/system/tuichat/src/main/res/drawable/minimalist_translation_area_bg.xml
new file mode 100644
index 0000000..64d5036
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/minimalist_translation_area_bg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#F3F5F9"/>
+
+    <corners android:radius="16dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/msg_editor_border.xml b/system/tuichat/src/main/res/drawable/msg_editor_border.xml
new file mode 100644
index 0000000..fce88ac
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/msg_editor_border.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#fff" />
+    <stroke
+        android:width="1px"
+        android:color="#bfbfbf" />
+    <corners android:radius="3dp" />
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/my_cursor.xml b/system/tuichat/src/main/res/drawable/my_cursor.xml
new file mode 100644
index 0000000..31599ac
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/my_cursor.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/green" />
+    <size android:width="1dp" />
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/play_voice_message.xml b/system/tuichat/src/main/res/drawable/play_voice_message.xml
new file mode 100644
index 0000000..609bce0
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/play_voice_message.xml
@@ -0,0 +1,7 @@
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android" android:oneshot="false">
+
+    <item android:drawable="@drawable/voice_msg_playing_1" android:duration="400"/>
+    <item android:drawable="@drawable/voice_msg_playing_2" android:duration="400"/>
+    <item android:drawable="@drawable/voice_msg_playing_3" android:duration="400"/>
+
+</animation-list>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/pop_menu_translate.png b/system/tuichat/src/main/res/drawable/pop_menu_translate.png
new file mode 100644
index 0000000..2235dde
Binary files /dev/null and b/system/tuichat/src/main/res/drawable/pop_menu_translate.png differ
diff --git a/system/tuichat/src/main/res/drawable/quote_message_area_bg.xml b/system/tuichat/src/main/res/drawable/quote_message_area_bg.xml
new file mode 100644
index 0000000..87bd817
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/quote_message_area_bg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#F2F2F2"/>
+
+    <corners android:radius="4.8dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/ratingbar_opreview.png b/system/tuichat/src/main/res/drawable/ratingbar_opreview.png
new file mode 100644
index 0000000..321b30c
Binary files /dev/null and b/system/tuichat/src/main/res/drawable/ratingbar_opreview.png differ
diff --git a/system/tuichat/src/main/res/drawable/ratingbar_opreview_grey.png b/system/tuichat/src/main/res/drawable/ratingbar_opreview_grey.png
new file mode 100644
index 0000000..ff31e55
Binary files /dev/null and b/system/tuichat/src/main/res/drawable/ratingbar_opreview_grey.png differ
diff --git a/system/tuichat/src/main/res/drawable/recording_volume.xml b/system/tuichat/src/main/res/drawable/recording_volume.xml
new file mode 100644
index 0000000..00e8936
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/recording_volume.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<animation-list xmlns:android="http://schemas.android.com/apk/res/android" android:oneshot="false">
+    <item
+        android:drawable="@drawable/ic_volume_1"
+        android:duration="125" />
+    <item
+        android:drawable="@drawable/ic_volume_2"
+        android:duration="125" />
+    <item
+        android:drawable="@drawable/ic_volume_3"
+        android:duration="125" />
+    <item
+        android:drawable="@drawable/ic_volume_4"
+        android:duration="125" />
+    <item
+        android:drawable="@drawable/ic_volume_5"
+        android:duration="125" />
+    <item
+        android:drawable="@drawable/ic_volume_6"
+        android:duration="125" />
+    <item
+        android:drawable="@drawable/ic_volume_7"
+        android:duration="125" />
+    <item
+        android:drawable="@drawable/ic_volume_8"
+        android:duration="125" />
+
+</animation-list>
diff --git a/system/tuichat/src/main/res/drawable/selector_face_text.xml b/system/tuichat/src/main/res/drawable/selector_face_text.xml
new file mode 100644
index 0000000..6f39ad8
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/selector_face_text.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true">
+        <shape>
+            <solid android:color="#FFFFFF" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="?attr/chat_input_area_bg" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/shape_circle.xml b/system/tuichat/src/main/res/drawable/shape_circle.xml
new file mode 100644
index 0000000..f8b50b9
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/shape_circle.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <!-- solid表示远的填充色 -->
+    <solid android:color="#FFFFFF" />
+    <!-- stroke则代表远的边框线 -->
+    <stroke
+        android:width="1dp"
+        android:color="#FFFFFF" />
+    <!-- size控制高宽 -->
+    <size
+        android:height="20dp"
+        android:width="20dp" />
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/shape_dialog.xml b/system/tuichat/src/main/res/drawable/shape_dialog.xml
new file mode 100644
index 0000000..86a2349
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/shape_dialog.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="8dp"/>
+    <solid android:color="@android:color/white"/>
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/translation_area_bg.xml b/system/tuichat/src/main/res/drawable/translation_area_bg.xml
new file mode 100644
index 0000000..198b891
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/translation_area_bg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#F2F7FF"/>
+
+    <corners android:radius="10dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/translation_loading.png b/system/tuichat/src/main/res/drawable/translation_loading.png
new file mode 100644
index 0000000..3cc15d5
Binary files /dev/null and b/system/tuichat/src/main/res/drawable/translation_loading.png differ
diff --git a/system/tuichat/src/main/res/drawable/view_original_image_border.xml b/system/tuichat/src/main/res/drawable/view_original_image_border.xml
new file mode 100644
index 0000000..ba2e0de
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/view_original_image_border.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="1px"
+        android:color="@color/white" />
+    <solid android:color="#80000000" />
+
+</shape>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/drawable/voice_btn_selector.xml b/system/tuichat/src/main/res/drawable/voice_btn_selector.xml
new file mode 100644
index 0000000..99bc167
--- /dev/null
+++ b/system/tuichat/src/main/res/drawable/voice_btn_selector.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/voice_pressed" />
+            <corners android:radius="3dp" />
+        </shape>
+    </item>
+    <item>
+
+        <shape>
+            <solid android:color="@color/voice_normal" />
+            <corners android:radius="3dp" />
+        </shape>
+    </item> <!-- default -->
+
+</selector>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/activity_camera.xml b/system/tuichat/src/main/res/layout/activity_camera.xml
new file mode 100644
index 0000000..1f60948
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/activity_camera.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.view.JCameraView
+        android:id="@+id/jcameraview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:duration_max="10000"
+        app:iconLeft="@drawable/ic_back"
+        app:iconMargin="20dp"
+        app:iconRight="@drawable/ic_photo"
+        app:iconSize="30dp"
+        app:iconSrc="@drawable/chat_camera_switchcamera" />
+</LinearLayout>
diff --git a/system/tuichat/src/main/res/layout/activity_message_reply_detail.xml b/system/tuichat/src/main/res/layout/activity_message_reply_detail.xml
new file mode 100644
index 0000000..b14015b
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/activity_message_reply_detail.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".classicui.page.MessageReplyDetailActivity">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/reply_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+
+    <com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MessageRecyclerView
+        android:id="@+id/message_view"
+        android:layout_marginTop="12.6dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <View
+        android:id="@+id/divide_line"
+        android:layout_width="match_parent"
+        android:layout_height="0.48dp"
+        android:background="#DBDBDB" />
+
+    <com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply.ReplyDetailsView
+        android:id="@+id/replies_detail"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <com.tencent.qcloud.tuikit.tuichat.classicui.widget.input.InputView
+        android:id="@+id/reply_input_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/chat_activity.xml b/system/tuichat/src/main/res/layout/chat_activity.xml
new file mode 100644
index 0000000..8eb03bd
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/chat_activity.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:id="@+id/empty_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+
+</LinearLayout>
diff --git a/system/tuichat/src/main/res/layout/chat_flow_react_item_layout.xml b/system/tuichat/src/main/res/layout/chat_flow_react_item_layout.xml
new file mode 100644
index 0000000..4e8b1bb
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/chat_flow_react_item_layout.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal"
+    android:paddingStart="7.68dp"
+    android:paddingEnd="7.68dp"
+    android:background="@drawable/chat_react_bg"
+    android:layout_width="wrap_content"
+    android:layout_height="23.04dp">
+
+    <ImageView
+        android:id="@+id/face_iv"
+        android:layout_width="15.36dp"
+        android:layout_height="15.36dp"
+        android:layout_gravity="center"
+        android:scaleType="fitCenter" />
+
+    <View
+        android:background="#33444444"
+        android:layout_marginStart="3.84dp"
+        android:layout_marginEnd="3.84dp"
+        android:layout_gravity="center"
+        android:layout_marginTop="4.32dp"
+        android:layout_marginBottom="4.32dp"
+        android:layout_width="0.96dp"
+        android:layout_height="match_parent"/>
+
+    <TextView
+        android:id="@+id/users_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:layout_gravity="center"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:textSize="10.56sp"
+        android:textColor="?attr/chat_react_text_color"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/chat_fragment.xml b/system/tuichat/src/main/res/layout/chat_fragment.xml
new file mode 100644
index 0000000..b8affcd
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/chat_fragment.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <com.tencent.qcloud.tuikit.tuichat.classicui.widget.ChatView
+            android:id="@+id/chat_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+        <ImageView
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_marginTop="48dp"
+            android:layout_alignParentRight="true"
+            android:src="@drawable/ic_download_button"
+            android:visibility="gone"/>
+    </RelativeLayout>
+
+
+</LinearLayout>
diff --git a/system/tuichat/src/main/res/layout/chat_input_camera_view.xml b/system/tuichat/src/main/res/layout/chat_input_camera_view.xml
new file mode 100644
index 0000000..d2e2985
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/chat_input_camera_view.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#000000"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <VideoView
+            android:id="@+id/video_preview"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+        <ImageView
+            android:id="@+id/image_photo"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="#000"
+            android:visibility="invisible" />
+    </FrameLayout>
+
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/image_switch"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="16dp"
+            android:src="@drawable/chat_camera_switchcamera" />
+
+    </LinearLayout>
+
+
+    <com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.view.CaptureLayout
+        android:id="@+id/capture_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom" />
+
+    <com.tencent.qcloud.tuikit.tuichat.classicui.component.camera.view.FoucsView
+        android:id="@+id/fouce_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="invisible" />
+</FrameLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/chat_input_layout.xml b/system/tuichat/src/main/res/layout/chat_input_layout.xml
new file mode 100644
index 0000000..3469470
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/chat_input_layout.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="?attr/chat_input_area_bg"
+    android:orientation="vertical">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/input_title_line_color" />
+
+    <com.tencent.qcloud.tuikit.tuichat.classicui.widget.input.ReplyPreviewBar
+        android:id="@+id/reply_preview_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="5dp"
+        android:visibility="gone"
+        tools:visibility="visible"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="5dp"
+        android:gravity="center_vertical">
+
+        <ImageView
+            android:id="@+id/voice_input_switch"
+            android:layout_width="@dimen/chat_input_icon_size"
+            android:layout_height="@dimen/chat_input_icon_size"
+            android:layout_margin="5dp"
+            android:scaleType="fitXY"
+            android:src="@drawable/action_audio_selector" />
+
+        <com.tencent.qcloud.tuikit.tuichat.classicui.widget.input.TIMMentionEditText
+            android:id="@+id/chat_message_input"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dp"
+            android:layout_weight="1"
+            android:background="@drawable/msg_editor_border"
+            android:textSize="@dimen/chat_input_text_size"
+            android:maxHeight="120dp"
+            android:minHeight="@dimen/chat_input_editor_height"
+            android:textCursorDrawable="@drawable/my_cursor"
+            android:padding="5dp" />
+
+        <Button
+            android:id="@+id/chat_voice_input"
+            style="?android:attr/borderlessButtonStyle"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_margin="5dp"
+            android:layout_weight="1"
+            android:background="@drawable/voice_btn_selector"
+            android:text="@string/hold_say"
+            android:textAllCaps="false"
+            android:textColor="@color/text_color_gray"
+            android:visibility="gone" />
+
+        <ImageView
+            android:id="@+id/face_btn"
+            android:layout_width="@dimen/chat_input_icon_size"
+            android:layout_height="@dimen/chat_input_icon_size"
+            android:layout_margin="5dp"
+            android:scaleType="fitXY"
+            android:src="@drawable/action_face_selector" />
+
+        <ImageView
+            android:id="@+id/more_btn"
+            android:layout_width="@dimen/chat_input_icon_size"
+            android:layout_height="@dimen/chat_input_icon_size"
+            android:layout_margin="5dp"
+            android:scaleType="fitXY"
+            android:src="@drawable/action_more_selector" />
+
+        <TextView
+            android:id="@+id/send_btn"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/chat_input_icon_size"
+            android:background="@drawable/message_send_border"
+            android:text="@string/send"
+            android:paddingStart="6dp"
+            android:paddingEnd="6dp"
+            android:gravity="center"
+            android:textColor="#fff"
+            android:textSize="13sp"
+            android:visibility="gone"
+            android:maxLines="1"
+            tools:visibility="visible"/>
+
+    </LinearLayout>
+
+    <com.tencent.qcloud.tuikit.tuichat.classicui.widget.input.ReplyPreviewBar
+        android:id="@+id/quote_preview_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:paddingBottom="9.6dp"
+        tools:visibility="visible"/>
+
+    <RelativeLayout
+        android:id="@+id/more_groups"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone" />
+
+</LinearLayout>
diff --git a/system/tuichat/src/main/res/layout/chat_input_layout_actoin.xml b/system/tuichat/src/main/res/layout/chat_input_layout_actoin.xml
new file mode 100644
index 0000000..d902c7d
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/chat_input_layout_actoin.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        android:gravity="center">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:scaleType="centerCrop" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:includeFontPadding="false"
+        android:textAlignment="center"
+        android:layout_marginTop="6.5dp"
+        android:textColor="@color/text_color_gray"
+        android:textSize="10sp" />
+
+</LinearLayout>
diff --git a/system/tuichat/src/main/res/layout/chat_inputmore_fragment.xml b/system/tuichat/src/main/res/layout/chat_inputmore_fragment.xml
new file mode 100644
index 0000000..30ea5e5
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/chat_inputmore_fragment.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="240dp"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuikit.tuichat.classicui.widget.input.inputmore.InputMoreLayout
+        android:id="@+id/input_extra_area"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/chat_inputmore_layout.xml b/system/tuichat/src/main/res/layout/chat_inputmore_layout.xml
new file mode 100644
index 0000000..e8e1bd6
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/chat_inputmore_layout.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/input_title_line_color" />
+
+    <androidx.viewpager.widget.ViewPager
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="33dp"
+        android:layout_marginLeft="29dp"
+        android:layout_marginRight="29dp"
+        android:id="@+id/viewPager"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/chat_layout.xml b/system/tuichat/src/main/res/layout/chat_layout.xml
new file mode 100644
index 0000000..9c77080
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/chat_layout.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@color/chat_background_color">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/chat_title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/page_title_height" />
+
+    <View
+        android:id="@+id/view_line"
+        android:layout_below="@+id/chat_title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="0.3dp"
+        android:background="@color/chat_title_line_color" />
+
+    <FrameLayout
+        android:id="@+id/custom_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/view_line"
+        android:layout_marginTop="0dp"
+        android:visibility="gone" />
+
+    <com.tencent.qcloud.tuikit.tuichat.classicui.component.noticelayout.NoticeLayout
+        android:id="@+id/chat_group_apply_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/custom_layout"
+        android:visibility="gone" />
+
+    <com.tencent.qcloud.tuikit.tuichat.classicui.component.noticelayout.NoticeLayout
+        android:id="@+id/chat_notice_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/chat_group_apply_layout"
+        android:layout_marginTop="1dp"
+        android:visibility="gone" />
+
+    <com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MessageRecyclerView
+        android:id="@+id/chat_message_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/chat_input_layout"
+        android:layout_below="@+id/chat_notice_layout"
+        android:baselineAligned="false"
+        android:clickable="false"
+        android:descendantFocusability="blocksDescendants" />
+
+    <androidx.cardview.widget.CardView
+        app:cardCornerRadius="4dp"
+        app:cardElevation="6dp"
+        app:cardUseCompatPadding="true"
+        android:layout_above="@+id/chat_input_layout"
+        android:layout_alignParentEnd="true"
+        android:layout_marginEnd="@dimen/btn_margin_right"
+        android:layout_marginBottom="@dimen/btn_margin_right"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="@dimen/btn_margin_right"
+        android:layout_alignParentRight="true"
+        android:visibility="gone">
+
+        <LinearLayout
+            android:id="@+id/jump_message_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="33.6dp"
+            android:paddingTop="9.12dp"
+            android:paddingBottom="8.64dp"
+            android:paddingLeft="10.08dp"
+            android:paddingRight="9.6dp"
+            android:background="#FFFFFF"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:visibility="visible">
+
+            <ImageView
+                android:id="@+id/arrow_icon"
+                android:layout_width="11.52dp"
+                android:layout_height="11.52dp"
+                android:layout_gravity="center"
+                android:clickable="false"
+                android:scaleType="fitCenter"
+                android:background="?attr/chat_jump_recent_down_icon" />
+
+            <TextView
+                android:id="@+id/jump_message_content"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5.76dp"
+                android:gravity="center_vertical"
+                android:singleLine="true"
+                android:textColor="?attr/core_primary_color"
+                android:textSize="11.52sp" />
+
+        </LinearLayout>
+    </androidx.cardview.widget.CardView>
+
+
+    <com.tencent.qcloud.tuikit.tuichat.classicui.widget.input.InputView
+        android:id="@+id/chat_input_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/forward_layout"
+        android:layout_alignParentBottom="true" />
+
+    <RelativeLayout
+        android:id="@+id/voice_recording_view"
+        android:layout_width="150dp"
+        android:layout_height="150dp"
+        android:layout_centerInParent="true"
+        android:background="@drawable/ic_volume_dialog_bg"
+        android:visibility="gone">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_centerInParent="true"
+            android:gravity="center_horizontal"
+            android:orientation="vertical">
+
+
+            <ImageView
+                android:id="@+id/recording_icon"
+                android:layout_width="match_parent"
+                android:layout_height="100dp"
+                android:layout_marginTop="10dp"/>
+
+
+            <TextView
+                android:id="@+id/recording_tips"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="12sp"
+                android:layout_marginTop="10dp" />
+
+        </LinearLayout>
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/forward_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:background="#E6E9EB"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal"
+        android:paddingLeft="38.4dp"
+        android:paddingTop="15.36dp"
+        android:paddingRight="38.4dp"
+        android:paddingBottom="46.08dp"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <LinearLayout
+            android:id="@+id/forward_one_by_one_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.33"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="38.4dp"
+                android:layout_height="38.4dp"
+                android:background="@drawable/multi_select_forward_one" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5.76dp"
+                android:text="@string/forward_mode_onebyone"
+                android:textColor="#444444"
+                android:textSize="11.52sp" />
+
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:id="@+id/forward_merge_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.33"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="38.4dp"
+                android:layout_height="38.4dp"
+                android:background="@drawable/multi_select_forward_merge" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5.76dp"
+                android:text="@string/forward_mode_merge"
+                android:textColor="#444444"
+                android:textSize="11.52sp" />
+
+        </LinearLayout>
+
+
+        <LinearLayout
+            android:id="@+id/delete_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.33"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <ImageView
+                android:layout_width="38.4dp"
+                android:layout_height="38.4dp"
+                android:background="@drawable/multi_select_delete" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5.76dp"
+                android:text="@string/delete_button"
+                android:textColor="#444444"
+                android:textSize="11.52sp" />
+        </LinearLayout>
+
+    </LinearLayout>
+</RelativeLayout>
diff --git a/system/tuichat/src/main/res/layout/chat_menu_face_item_layout.xml b/system/tuichat/src/main/res/layout/chat_menu_face_item_layout.xml
new file mode 100644
index 0000000..0cbbb97
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/chat_menu_face_item_layout.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/face_iv"
+        android:scaleType="fitCenter"
+        android:layout_width="20dp"
+        android:layout_height="20dp"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/chat_menu_recent_face_item_layout.xml b/system/tuichat/src/main/res/layout/chat_menu_recent_face_item_layout.xml
new file mode 100644
index 0000000..0cbbb97
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/chat_menu_recent_face_item_layout.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/face_iv"
+        android:scaleType="fitCenter"
+        android:layout_width="20dp"
+        android:layout_height="20dp"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/chat_pop_menu_item_layout.xml b/system/tuichat/src/main/res/layout/chat_pop_menu_item_layout.xml
new file mode 100644
index 0000000..4f3fd59
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/chat_pop_menu_item_layout.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/chat_pop_item_bg"
+    android:paddingTop="15.48dp"
+    android:paddingRight="16.32dp"
+    android:paddingLeft="16.32dp"
+    android:paddingBottom="10.69dp"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/menu_icon"
+        android:layout_width="@dimen/chat_pop_menu_icon_size"
+        android:layout_height="@dimen/chat_pop_menu_icon_size"
+        android:layout_gravity="center_horizontal"
+        android:scaleType="fitCenter" />
+
+    <TextView
+        android:id="@+id/menu_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="@dimen/chat_pop_menu_text_margin_top"
+        android:maxLines="1"
+        android:textSize="@dimen/chat_pop_menu_font_size" />
+
+</LinearLayout>
diff --git a/system/tuichat/src/main/res/layout/chat_pop_menu_layout.xml b/system/tuichat/src/main/res/layout/chat_pop_menu_layout.xml
new file mode 100644
index 0000000..9bf95a5
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/chat_pop_menu_layout.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/menu_content_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recent_faces"
+        android:layout_marginLeft="20.16dp"
+        android:layout_marginRight="20.16dp"
+        android:layout_marginTop="9.13dp"
+        android:layout_width="wrap_content"
+        android:layout_height="42.24dp"/>
+
+    <View
+        android:id="@+id/divide_line"
+        android:layout_width="match_parent"
+        android:layout_height="0.96dp"
+        android:layout_marginLeft="20.16dp"
+        android:layout_marginRight="20.16dp"
+        android:background="#E5E5E5"/>
+
+    <LinearLayout
+        android:id="@+id/face_grid_ll"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_marginLeft="20.16dp"
+        android:layout_marginRight="20.16dp"
+        android:layout_marginBottom="7.44dp"
+        android:layout_marginTop="7.44dp">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/face_grid"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+        <com.tencent.qcloud.tuikit.tuichat.classicui.component.EmojiIndicatorView
+            android:id="@+id/face_indicator"
+            android:layout_marginTop="7.44dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center" />
+
+    </LinearLayout>
+
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/chat_pop_menu_content_view"
+        android:layout_marginLeft="3.84dp"
+        android:layout_marginRight="3.84dp"
+        android:layout_marginTop="3.84dp"
+        android:layout_marginBottom="3.84dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
+
diff --git a/system/tuichat/src/main/res/layout/chat_profile_icon_view.xml b/system/tuichat/src/main/res/layout/chat_profile_icon_view.xml
new file mode 100644
index 0000000..85970f2
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/chat_profile_icon_view.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/profile_icon_group"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="#00000000">
+
+    <com.tencent.qcloud.tuicore.component.gatherimage.SynthesizedImageView
+        android:id="@+id/profile_icon"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="fitCenter" />
+
+</RelativeLayout>
diff --git a/system/tuichat/src/main/res/layout/chat_reply_details_item_layout.xml b/system/tuichat/src/main/res/layout/chat_reply_details_item_layout.xml
new file mode 100644
index 0000000..62617ab
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/chat_reply_details_item_layout.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/item_left"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="#FFFFFF"
+    android:paddingLeft="12.6dp"
+    android:paddingTop="11.52dp">
+
+    <com.tencent.qcloud.tuicore.component.gatherimage.UserIconView
+        android:id="@+id/user_icon"
+        android:layout_width="41dp"
+        android:layout_height="41dp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginRight="6.23dp"
+        app:default_image="?attr/core_default_user_icon"
+        app:image_radius="4dp"
+        tools:visibility="visible"/>
+
+    <TextView
+        android:id="@+id/user_name_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toEndOf="@id/user_icon"
+        android:layout_toRightOf="@id/user_icon"
+        android:layout_alignTop="@id/user_icon"
+        android:layout_marginLeft="6.67dp"
+        android:layout_marginTop="2.4dp"
+        android:gravity="top|left"
+        android:ellipsize="end"
+        android:maxWidth="180dp"
+        android:singleLine="true"
+        android:textColor="#999999"
+        android:lineHeight="23.04sp"
+        android:textSize="13.44sp"
+        tools:text="Teemo"/>
+
+    <TextView
+        android:id="@+id/msg_abstract"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/user_name_tv"
+        android:layout_alignStart="@id/user_name_tv"
+        android:layout_alignLeft="@id/user_name_tv"
+        android:layout_marginTop="3.36dp"
+        android:lineHeight="21.6sp"
+        android:textColor="@color/black"
+        android:textSize="15.36sp"
+        tools:text="吃饭" />
+
+    <!-- translation content area -->
+    <com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MaxWidthFrameLayout
+        android:id="@+id/translate_content_fl"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@id/user_icon"
+        android:layout_below="@id/msg_abstract"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="4dp"
+        android:background="@drawable/translation_area_bg"
+        app:maxWidth="@dimen/chat_message_content_max_width"
+        android:visibility="gone"
+        tools:visibility="visible"/>
+
+    <TextView
+        android:id="@+id/msg_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignTop="@id/user_name_tv"
+        android:layout_marginRight="15.36dp"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:textColor="#B0B0B0"
+        android:textSize="11.52sp"
+        tools:text="18:00" />
+
+    <View
+        android:id="@+id/view_line"
+        android:layout_width="match_parent"
+        android:layout_height="0.48dp"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="1dp"
+        android:background="#DBDBDB" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/chat_reply_quote_face_layout.xml b/system/tuichat/src/main/res/layout/chat_reply_quote_face_layout.xml
new file mode 100644
index 0000000..321c41f
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/chat_reply_quote_face_layout.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+        <ImageView
+            android:id="@+id/content_image_iv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+</FrameLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/chat_reply_quote_file_layout.xml b/system/tuichat/src/main/res/layout/chat_reply_quote_file_layout.xml
new file mode 100644
index 0000000..ea70098
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/chat_reply_quote_file_layout.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!--文件消息-->
+    <LinearLayout
+        android:id="@+id/file_msg_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/file_msg_icon_iv"
+            android:src="@drawable/file_icon"
+            android:layout_width="@dimen/reply_icon_size"
+            android:layout_height="@dimen/reply_icon_size" />
+
+        <TextView
+            android:id="@+id/file_msg_name_tv"
+            android:ellipsize="middle"
+            android:layout_gravity="center_vertical"
+            android:textColor="?attr/chat_self_reply_quote_text_color"
+            android:layout_marginLeft="@dimen/reply_abstract_margin_left"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/reply_origin_text_size"
+            android:singleLine="true" />
+    </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/chat_reply_quote_image_layout.xml b/system/tuichat/src/main/res/layout/chat_reply_quote_image_layout.xml
new file mode 100644
index 0000000..844a08d
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/chat_reply_quote_image_layout.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!--图片消息缩略图-->
+    <RelativeLayout
+        android:id="@+id/image_msg_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/image_msg_iv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true" />
+
+        <ImageView
+            android:id="@+id/video_play_iv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:clickable="false"
+            android:src="@drawable/ic_chat_play_icon"
+            android:visibility="gone"/>
+    </RelativeLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/chat_reply_quote_merge_layout.xml b/system/tuichat/src/main/res/layout/chat_reply_quote_merge_layout.xml
new file mode 100644
index 0000000..58aa37c
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/chat_reply_quote_merge_layout.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!--合并转发消息-->
+    <LinearLayout
+        android:id="@+id/merge_msg_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/merge_msg_title"
+            android:textSize="@dimen/reply_merge_text_size"
+            android:textStyle="bold"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="?attr/chat_self_reply_quote_text_color"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            android:id="@+id/merge_msg_content"
+            android:textColor="?attr/chat_self_reply_quote_text_color"
+            android:textSize="@dimen/reply_merge_text_size"
+            android:maxLines="3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/chat_reply_quote_sound_layout.xml b/system/tuichat/src/main/res/layout/chat_reply_quote_sound_layout.xml
new file mode 100644
index 0000000..d5a0596
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/chat_reply_quote_sound_layout.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!--音频消息-->
+    <LinearLayout
+        android:id="@+id/sound_msg_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/sound_msg_icon_iv"
+            android:src="@drawable/voice_msg_playing_3"
+            android:layout_width="@dimen/reply_icon_size"
+            android:layout_height="@dimen/reply_icon_size"
+            android:layout_marginRight="@dimen/reply_msg_padding"
+            android:layout_marginEnd="@dimen/reply_msg_padding" />
+
+        <TextView
+            android:id="@+id/sound_msg_time_tv"
+            android:textColor="@color/reply_msg_abstract_text_color"
+            android:textSize="@dimen/reply_origin_text_size"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/chat_reply_quote_text_layout.xml b/system/tuichat/src/main/res/layout/chat_reply_quote_text_layout.xml
new file mode 100644
index 0000000..2e10bc4
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/chat_reply_quote_text_layout.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!--文本消息内容-->
+    <TextView
+        android:id="@+id/text_quote_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="?attr/chat_self_reply_quote_text_color"
+        android:layout_marginRight="6.5dp"
+        android:layout_marginEnd="6.5dp"
+        android:maxLines="2"
+        android:ellipsize="end"
+        android:textSize="@dimen/reply_origin_text_size" />
+</FrameLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/custom_order_message_layout.xml b/system/tuichat/src/main/res/layout/custom_order_message_layout.xml
new file mode 100644
index 0000000..3776198
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/custom_order_message_layout.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/transparent"
+    android:focusable="true"
+    android:gravity="center"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/content_image_iv"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_centerVertical="true"
+        android:clickable="false"
+        android:scaleType="fitCenter" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@+id/content_image_iv"
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        android:paddingLeft="8dp" >
+
+        <TextView
+            android:id="@+id/order_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_centerInParent="true"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:textSize="12sp"
+            android:lineHeight="17sp"
+            android:textStyle="bold"
+            android:clickable="false"
+            android:focusable="false"
+            android:textColor="@color/chat_text_color"
+            android:text="order_title"/>
+
+        <TextView
+            android:id="@+id/order_description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_centerInParent="true"
+            android:layout_marginTop="3dp"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:textSize="12sp"
+            android:lineHeight="17sp"
+            android:clickable="false"
+            android:focusable="false"
+            android:textColor="#999999"
+            android:text="order_description" />
+
+        <TextView
+            android:id="@+id/order_price"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_centerInParent="true"
+            android:layout_marginTop="2dp"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:textStyle="bold"
+            android:textSize="18sp"
+            android:lineHeight="25sp"
+            android:clickable="false"
+            android:focusable="false"
+            android:textColor="@color/order_message_color"
+            android:text="order_price" />
+
+     </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/face_group_icon.xml b/system/tuichat/src/main/res/layout/face_group_icon.xml
new file mode 100644
index 0000000..86176f7
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/face_group_icon.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="40dp"
+    android:layout_height="match_parent"
+    android:background="@drawable/selector_face_text">
+
+    <ImageView
+        android:id="@+id/face_group_tab_icon"
+        android:layout_width="28dp"
+        android:layout_height="28dp"
+        android:layout_centerHorizontal="true"
+        android:clickable="false"
+        android:scaleType="fitXY"
+        android:src="@drawable/emoji_default" />
+
+</RelativeLayout>
diff --git a/system/tuichat/src/main/res/layout/forward_chat_layout.xml b/system/tuichat/src/main/res/layout/forward_chat_layout.xml
new file mode 100644
index 0000000..31c0363
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/forward_chat_layout.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/chat_background_color">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/chat_title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/page_title_height" />
+
+    <View
+        android:id="@+id/view_line"
+        android:layout_below="@+id/chat_title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="0.3dp"
+        android:background="@color/chat_title_line_color" />
+
+    <com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MessageRecyclerView
+        android:id="@+id/chat_message_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/view_line"
+        android:baselineAligned="false"
+        android:clickable="false"
+        android:descendantFocusability="blocksDescendants" />
+
+</RelativeLayout>
diff --git a/system/tuichat/src/main/res/layout/forward_dialog_layout.xml b/system/tuichat/src/main/res/layout/forward_dialog_layout.xml
new file mode 100644
index 0000000..4ce8cd1
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/forward_dialog_layout.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/shape_dialog"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <Button
+        android:id="@+id/forward_one_by_one"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/selectableItemBackground"
+        android:clickable="true"
+        android:drawablePadding="16dp"
+        android:gravity="center"
+        android:padding="16dp"
+        android:text="@string/forward_mode_onebyone"
+        android:textColor="#666666"
+        android:textSize="14sp"/>
+
+    <Button
+        android:id="@+id/forward_merge"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/selectableItemBackground"
+        android:clickable="true"
+        android:drawablePadding="16dp"
+        android:gravity="center"
+        android:padding="16dp"
+        android:text="@string/forward_mode_merge"
+        android:textColor="#666666"
+        android:textSize="14sp"/>
+
+    <Button
+        android:id="@+id/cancel_action"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/selectableItemBackground"
+        android:clickable="true"
+        android:drawablePadding="16dp"
+        android:gravity="center"
+        android:padding="16dp"
+        android:text="@string/cancel"
+        android:textColor="#666666"
+        android:textSize="14sp"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/forward_msg_holder.xml b/system/tuichat/src/main/res/layout/forward_msg_holder.xml
new file mode 100644
index 0000000..8d413b5
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/forward_msg_holder.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:id="@+id/forward_msg_layout"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/msg_forward_title"
+        android:layout_width="@dimen/forward_text_max_length"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:textColor="@color/black"
+        android:maxLines="1"
+        android:maxWidth="@dimen/forward_text_max_length"
+        android:ellipsize="end"
+        android:textSize="15.36sp" />
+
+    <TextView
+        android:id="@+id/msg_forward_content"
+        android:layout_width="@dimen/forward_text_max_length"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:textColor="#BBBBBB"
+        android:maxLines="4"
+        android:ellipsize="end"
+        android:maxWidth="@dimen/forward_text_max_length"
+        android:includeFontPadding="false"
+        android:lineHeight="20sp"
+        android:textSize="11.52sp" />
+
+    <View
+        android:background="@drawable/chat_divide_line"
+        android:layout_marginTop="6dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/forward_chat_record"
+        android:layout_marginTop="8dp"
+        android:textColor="#888888"
+        android:textSize="8.6sp" />
+
+</LinearLayout>
+
diff --git a/system/tuichat/src/main/res/layout/fragment_face.xml b/system/tuichat/src/main/res/layout/fragment_face.xml
new file mode 100644
index 0000000..5f39cb1
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/fragment_face.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <View
+        android:background="#1A000000"
+        android:layout_width="match_parent"
+        android:layout_height="0.96dp"/>
+
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/face_viewPager"
+        android:layout_width="match_parent"
+        android:layout_height="170dp"
+        android:layout_gravity="center_horizontal"
+        android:paddingTop="19.2dp"
+        android:paddingBottom="10dp"
+        android:paddingLeft="23.04dp"
+        android:paddingRight="23.04dp" />
+
+    <com.tencent.qcloud.tuikit.tuichat.classicui.component.EmojiIndicatorView
+        android:id="@+id/face_indicator"
+        android:layout_marginBottom="10dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal" />
+
+    <LinearLayout
+        android:id="@+id/face_view_group"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:background="?attr/chat_input_area_bg"
+        android:orientation="horizontal">
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/group_receipt_member_item.xml b/system/tuichat/src/main/res/layout/group_receipt_member_item.xml
new file mode 100644
index 0000000..8fa618d
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/group_receipt_member_item.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/selectable_contact_item"
+    android:layout_width="match_parent"
+    android:layout_height="58.58dp"
+    android:background="#FFFFFF"
+    android:focusable="true"
+    android:paddingLeft="15.36dp"
+    android:paddingStart="15.36dp"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuicore.component.gatherimage.ShadeImageView
+        android:id="@+id/avatar_img"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_width="38.4dp"
+        android:layout_height="38.4dp"
+        android:layout_marginTop="9.6dp"
+        android:layout_alignParentLeft="true" />
+
+    <TextView
+        android:id="@+id/name_tv"
+        android:layout_alignTop="@id/avatar_img"
+        android:layout_toEndOf="@id/avatar_img"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_marginStart="11.52dp"
+        android:layout_marginLeft="11.52dp"
+        android:layout_marginRight="11.52dp"
+        android:layout_marginTop="7.68dp"
+        android:ellipsize="end"
+        android:lineHeight="23.04sp"
+        android:singleLine="true"
+        android:textColor="@color/black_font_color"
+        android:textSize="17.28sp"
+        tools:text="Bob"
+        android:layout_toRightOf="@id/avatar_img" />
+
+    <View
+        android:id="@+id/view_line"
+        android:layout_width="match_parent"
+        android:layout_alignParentBottom="true"
+        android:layout_alignStart="@id/name_tv"
+        android:layout_height="0.5dp"
+        android:background="#DBDBDB"
+        android:layout_alignLeft="@id/name_tv" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/image_video_scan_item.xml b/system/tuichat/src/main/res/layout/image_video_scan_item.xml
new file mode 100644
index 0000000..95d7dfc
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/image_video_scan_item.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/background_dark"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:id="@+id/video_view_layout"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <ImageView
+            android:id="@+id/content_image_iv"
+            android:layout_centerInParent="true"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <com.tencent.qcloud.tuikit.tuichat.classicui.component.video.UIKitVideoView
+            android:id="@+id/video_play_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            android:layout_centerInParent="true"/>
+
+        <ImageView
+            android:id="@+id/pause_button_center"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:clickable="true"
+            android:visibility="gone"
+            android:src="@drawable/ic_pause_center" />
+
+        <ProgressBar
+            android:id="@+id/message_sending_pb"
+            android:indeterminateTint="@color/white"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:layout_margin="10dp"
+            android:visibility="visible" />
+    </FrameLayout>
+
+    <RelativeLayout
+        android:id="@+id/photo_view_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone">
+
+        <com.tencent.qcloud.tuikit.tuichat.classicui.component.photoview.view.PhotoView
+            android:id="@+id/photo_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+
+        <TextView
+            android:id="@+id/view_original_btn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="20dp"
+            android:background="@drawable/view_original_image_border"
+            android:padding="6dp"
+            android:text="@string/view_original_image"
+            android:textColor="#fff"
+            android:textSize="14sp"
+            android:visibility="gone" />
+
+    </RelativeLayout>
+
+    <ImageView
+        android:id="@+id/close_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="@dimen/btn_margin_bottom"
+        android:layout_marginLeft="@dimen/btn_padding_left"
+        android:clickable="true"
+        android:visibility="gone"
+        android:src="@drawable/ic_close_button" />
+
+    <LinearLayout
+        android:id="@+id/play_control_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/close_button"
+        android:layout_marginBottom="@dimen/btn_margin_top"
+        android:layout_marginLeft="4dp"
+        android:layout_marginRight="@dimen/btn_padding_right"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:orientation="horizontal"
+        android:visibility="gone"
+        android:gravity="center_vertical" >
+
+        <ImageView
+            android:id="@+id/play_button"
+            android:layout_weight="2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_alignParentLeft="true"
+            android:clickable="true"
+            android:src="@drawable/ic_play_icon" />
+
+        <TextView
+            android:id="@+id/time_begin"
+            android:layout_weight="2"
+            android:layout_toRightOf="@+id/play_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="8dp"
+            android:text="00:00"
+            android:textColor="#ffffff"
+            android:textSize="14sp" />
+
+        <SeekBar
+            android:id="@+id/play_seek"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:layout_toRightOf="@+id/time_begin"
+            android:layout_centerVertical="true"
+            android:maxHeight="2dp"
+            android:minHeight="2dp"
+            android:paddingBottom="3dp"
+            android:paddingLeft="12dp"
+            android:max="200"
+            android:paddingRight="12dp"
+            android:paddingTop="3dp"
+            android:progressDrawable="@drawable/layer_progress"
+            android:thumb="@drawable/shape_circle" />
+
+        <TextView
+            android:id="@+id/time_end"
+            android:layout_weight="2"
+            android:layout_marginRight="0dp"
+            android:layout_alignParentRight="true"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="8dp"
+            android:text="00:00"
+            android:textColor="#ffffff"
+            android:textSize="14sp" />
+
+    </LinearLayout>
+
+</RelativeLayout>
diff --git a/system/tuichat/src/main/res/layout/image_video_scan_layout.xml b/system/tuichat/src/main/res/layout/image_video_scan_layout.xml
new file mode 100644
index 0000000..5cf53c0
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/image_video_scan_layout.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".component.imagevideoscan.ImageVideoScanActivity">
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <ImageView
+        android:id="@+id/download_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="@dimen/btn_margin_bottom"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="@dimen/btn_padding_right"
+        android:clickable="true"
+        android:src="@drawable/ic_download_button" />
+
+</RelativeLayout>
diff --git a/system/tuichat/src/main/res/layout/item_face.xml b/system/tuichat/src/main/res/layout/item_face.xml
new file mode 100644
index 0000000..7888dff
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/item_face.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/face_image"
+        android:layout_width="28.32dp"
+        android:layout_height="28.32dp"
+        android:layout_gravity="center"
+        android:scaleType="fitCenter" />
+</FrameLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/layout_beginner_guide.xml b/system/tuichat/src/main/res/layout/layout_beginner_guide.xml
new file mode 100644
index 0000000..a8ffd6b
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/layout_beginner_guide.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tool="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:gravity="center"
+    android:background="#80FFFFFF"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/view_pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/layout_beginner_guide_item.xml b/system/tuichat/src/main/res/layout/layout_beginner_guide_item.xml
new file mode 100644
index 0000000..dbde9ef
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/layout_beginner_guide_item.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tool="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:gravity="center"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/center_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:scaleType="centerCrop"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/layout_face_grid.xml b/system/tuichat/src/main/res/layout/layout_face_grid.xml
new file mode 100644
index 0000000..7030189
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/layout_face_grid.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<GridView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/chart_face_gv"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:gravity="center"
+    android:horizontalSpacing="12dp"
+    android:verticalSpacing="21.6dp"
+    android:listSelector="#00000000">
+</GridView>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/loading_progress_bar.xml b/system/tuichat/src/main/res/layout/loading_progress_bar.xml
new file mode 100644
index 0000000..f659806
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/loading_progress_bar.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="60dp"
+    android:orientation="vertical">
+
+    <ProgressBar
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_centerInParent="true" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/message_adapter_content_archives.xml b/system/tuichat/src/main/res/layout/message_adapter_content_archives.xml
new file mode 100644
index 0000000..55b9895
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/message_adapter_content_archives.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minWidth="@dimen/chat_message_content_max_width"
+    android:paddingHorizontal="15dp"
+    android:paddingTop="21dp"
+    android:paddingBottom="12dp"
+    android:descendantFocusability="blocksDescendants">
+    <TextView
+        android:id="@+id/tv_user_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/text_color_black_33"
+        android:textSize="14sp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:includeFontPadding="false"
+        tools:text="@string/app_name" />
+
+
+
+    <TextView
+        android:id="@+id/tv_gender_age"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:textColor="@color/text_color_black_66"
+        android:textSize="12sp"
+        app:layout_constraintLeft_toRightOf="@+id/tv_user_name"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/tv_user_name"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_user_name"
+        android:includeFontPadding="false"
+        android:layout_marginLeft="9dp"
+        tools:text="@string/app_name" />
+    <TextView
+        android:id="@+id/tv_symptom_description"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_user_name"
+        android:paddingVertical="12dp"
+        android:textColor="@color/text_color_black_4A"
+        android:textSize="12sp"
+        android:text="@string/app_name"/>
+    <com.lzy.ninegrid.NineGridView
+        android:id="@+id/gv_photo"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_symptom_description"
+        app:ngv_gridSpacing="10dp"
+        app:ngv_maxSize="4"
+        app:ngv_mode="fill"
+        app:ngv_singleImageRatio="1"
+        app:ngv_singleImageSize="150dp"
+        android:visibility="visible"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/message_adapter_content_audio.xml b/system/tuichat/src/main/res/layout/message_adapter_content_audio.xml
new file mode 100644
index 0000000..105c117
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/message_adapter_content_audio.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/audio_content_ll"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_centerVertical="true"
+    android:orientation="horizontal">
+
+    <TextView
+        android:id="@+id/audio_time_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="5dp"
+        android:layout_marginRight="5dp"
+        android:textColor="#000000"
+        android:textSize="14.5sp" />
+
+    <ImageView
+        android:id="@+id/audio_play_iv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="2dp"
+        android:layout_marginRight="2dp"
+        android:scaleType="centerCrop"
+        android:src="@drawable/voice_msg_playing_3" />
+
+</LinearLayout>
+
diff --git a/system/tuichat/src/main/res/layout/message_adapter_content_business_card.xml b/system/tuichat/src/main/res/layout/message_adapter_content_business_card.xml
new file mode 100644
index 0000000..97745fb
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/message_adapter_content_business_card.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingHorizontal="14dp">
+    <ImageView
+        android:id="@+id/iv_doctor_head"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintDimensionRatio="1:1"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintWidth_percent="0.21"
+        android:layout_marginTop="17dp"
+        tools:src='@drawable/core_default_user_icon_serious' />
+
+    <TextView
+        android:id="@+id/tv_doctor_name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="9dp"
+        android:textColor="@color/text_color_black_33"
+        android:textSize="14sp"
+        app:layout_constraintLeft_toRightOf="@+id/iv_doctor_head"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/iv_doctor_head"
+        app:layout_constraintBottom_toTopOf="@+id/tv_organization"
+        android:includeFontPadding="false"
+        tools:text="@string/app_name" />
+
+    <TextView
+        android:id="@+id/tv_organization"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:textColor="@color/text_color_black_66"
+        android:textSize="14sp"
+        app:layout_constraintTop_toBottomOf="@+id/tv_doctor_name"
+        app:layout_constraintLeft_toLeftOf="@+id/tv_doctor_name"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_doctor_head"
+        android:layout_marginTop="8dp"
+        android:includeFontPadding="false"
+        tools:text="@string/app_name" />
+    <View
+        android:id="@+id/line"
+        android:layout_width="0dp"
+        android:layout_height="1dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/iv_doctor_head"
+        android:layout_marginTop="12dp"
+        android:background="#EFEFEF"/>
+    <TextView
+        android:id="@+id/tv_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/line"
+        android:paddingTop="6dp"
+        android:paddingBottom="9dp"
+        android:textColor="@color/text_color_black_99"
+        android:textSize="12sp"
+        android:text="@string/chat_message_business_card_title"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/message_adapter_content_calling.xml b/system/tuichat/src/main/res/layout/message_adapter_content_calling.xml
new file mode 100644
index 0000000..7e4ff57
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/message_adapter_content_calling.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/calling_layout"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/left_icon"
+        android:layout_width="15.36dp"
+        android:layout_height="15.36dp"
+        android:layout_centerInParent="true"
+        android:clickable="false"
+        android:scaleType="fitCenter"
+        android:src="@drawable/ic_audio_call" />
+
+    <TextView
+        android:id="@+id/msg_body_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:textColor="?attr/chat_self_msg_text_color"
+        android:paddingLeft="7dp"
+        android:paddingRight="7dp"
+        android:maxWidth="276dp"
+        android:textSize="@dimen/chat_message_text_size" />
+
+    <ImageView
+        android:id="@+id/right_icon"
+        android:layout_width="15.36dp"
+        android:layout_height="15.36dp"
+        android:layout_centerInParent="true"
+        android:scaleType="fitCenter"
+        android:clickable="false"
+        android:src="@drawable/ic_audio_call" />
+</LinearLayout>
+
diff --git a/system/tuichat/src/main/res/layout/message_adapter_content_evaluation.xml b/system/tuichat/src/main/res/layout/message_adapter_content_evaluation.xml
new file mode 100644
index 0000000..b43aca8
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/message_adapter_content_evaluation.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingHorizontal="16dp"
+    android:paddingVertical="15dp">
+
+    <TextView
+        android:id="@+id/tv_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/chat_message_appraise_title"
+        android:textColor="@color/text_color_black_4A"
+        android:textSize="14sp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/ratingbar_score"/>
+
+    <RatingBar
+        android:id="@+id/ratingbar_score"
+        style="@style/Widget.AppCompat.RatingBar.Small"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="8dp"
+        android:layout_marginStart="8dp"
+        android:numStars="5"
+        android:rating="4"
+        android:stepSize="0.5"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_title"
+        app:layout_constraintLeft_toRightOf="@+id/tv_title"
+        android:progressTint="@color/rating_bar_color"
+        android:secondaryProgressTint="@color/rating_bar_color"/>
+
+    <TextView
+        android:id="@+id/tv_content"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="14dp"
+        tools:text="@string/test_custom_message"
+        android:textColor="@color/text_color_black_4A"
+        android:textSize="13sp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_title" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/message_adapter_content_file.xml b/system/tuichat/src/main/res/layout/message_adapter_content_file.xml
new file mode 100644
index 0000000..b6ab402
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/message_adapter_content_file.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MaxWidthLinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    app:maxWidth="200dp"
+    android:paddingTop="9.6dp"
+    android:paddingBottom="9.6dp"
+    android:paddingLeft="11.52dp"
+    android:paddingRight="11.52dp"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/file_name_tv"
+            android:layout_width="wrap_content"
+            android:singleLine="true"
+            android:ellipsize="middle"
+            android:layout_height="wrap_content"
+            android:textColor="@color/black"
+            android:textSize="15.36sp" />
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp">
+
+            <TextView
+                android:id="@+id/file_size_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:textColor="#888888"
+                android:textSize="13sp" />
+
+
+            <TextView
+                android:id="@+id/file_status_tv"
+                android:layout_marginStart="5dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_toEndOf="@id/file_size_tv"
+                android:includeFontPadding="false"
+                android:text="@string/un_download"
+                android:ellipsize="end"
+                android:singleLine="true"
+                android:textColor="#888888"
+                android:textSize="13sp"
+                android:layout_marginLeft="5dp"
+                android:layout_toRightOf="@id/file_size_tv" />
+        </RelativeLayout>
+
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/file_icon_iv"
+        android:layout_width="30dp"
+        android:layout_height="38dp"
+        android:layout_marginLeft="12dp"
+        android:scaleType="fitXY"
+        android:src="@drawable/file_icon"/>
+
+</com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MaxWidthLinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/message_adapter_content_image.xml b/system/tuichat/src/main/res/layout/message_adapter_content_image.xml
new file mode 100644
index 0000000..ba0881e
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/message_adapter_content_image.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/content_image_iv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:clickable="false"
+        android:scaleType="fitCenter" />
+
+    <ImageView
+        android:id="@+id/video_play_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:clickable="false"
+        android:src="@drawable/ic_chat_play_icon" />
+
+    <TextView
+        android:id="@+id/video_duration_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/content_image_iv"
+        android:layout_alignRight="@+id/content_image_iv"
+        android:layout_marginBottom="4dp"
+        android:layout_marginRight="6.5dp"
+        android:textColor="@color/white"
+        android:textSize="11sp" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/message_adapter_content_location.xml b/system/tuichat/src/main/res/layout/message_adapter_content_location.xml
new file mode 100644
index 0000000..27b5574
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/message_adapter_content_location.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minWidth="@dimen/chat_message_content_max_width"
+    android:orientation="vertical">
+    <TextView
+        android:id="@+id/tv_desc"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="@dimen/chat_message_location_padding"
+        android:textColor="@color/text_color_black_33"
+        android:textSize="@dimen/chat_message_location_title"
+        tools:text="@string/app_name"/>
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/chat_message_location_map_height"
+        android:background="@color/white"
+        android:maxWidth="@dimen/chat_message_content_max_width"
+        android:scaleType="centerCrop"
+        android:id="@+id/iv_map"
+        />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/message_adapter_content_medical_examination.xml b/system/tuichat/src/main/res/layout/message_adapter_content_medical_examination.xml
new file mode 100644
index 0000000..642bc52
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/message_adapter_content_medical_examination.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minWidth="@dimen/chat_message_content_max_width"
+    android:paddingHorizontal="19dp"
+    android:paddingVertical="18dp">
+    <TextView
+        android:id="@+id/tv_user_info"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:textColor="@color/text_color_black_33"
+        android:textSize="14sp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:includeFontPadding="false"
+        tools:text="@string/app_name" />
+
+    <TextView
+        android:id="@+id/tv_hospital"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_user_info"
+        android:layout_marginTop="12dp"
+        android:textColor="@color/text_color_black_99"
+        android:textSize="13sp"
+        android:text="@string/app_name"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/message_adapter_content_reply.xml b/system/tuichat/src/main/res/layout/message_adapter_content_reply.xml
new file mode 100644
index 0000000..15e4cab
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/message_adapter_content_reply.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MaxWidthLinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/reply_container"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:minWidth="@dimen/reply_message_content_min_width"
+    app:maxWidth="@dimen/reply_message_content_max_width"
+    android:orientation="vertical">
+
+    <!--原始消息摘要-->
+    <LinearLayout
+        android:id="@+id/origin_msg_abs_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/chat_self_reply_quote_bg_color"
+        android:orientation="horizontal">
+
+        <!--左边细线-->
+        <View
+            android:id="@+id/reply_line"
+            android:layout_width="2dp"
+            android:layout_height="match_parent"
+            android:background="?attr/chat_self_reply_line_bg_color"
+            android:layout_marginRight="@dimen/reply_line_margin_right"
+            android:layout_marginEnd="@dimen/reply_line_margin_right" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/reply_sender_margin_top"
+            android:paddingBottom="@dimen/reply_abstract_padding_bottom"
+            android:orientation="vertical">
+
+            <!--发送者昵称-->
+            <TextView
+                android:id="@+id/sender_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="6.5dp"
+                android:layout_marginRight="6.5dp"
+                android:layout_marginBottom="@dimen/reply_abstract_margin_bottom"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textColor="?attr/chat_self_reply_quote_text_color"
+                android:textStyle="bold"
+                android:textSize="@dimen/reply_origin_text_size" />
+
+            <FrameLayout
+                android:id="@+id/quote_frame_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <!--回复内容-->
+    <TextView
+        android:id="@+id/reply_content_tv"
+        android:ellipsize="end"
+        android:textSize="@dimen/reply_text_size"
+        android:includeFontPadding="false"
+        android:layout_marginTop="@dimen/chat_item_padding_bottom"
+        android:textColor="?attr/chat_self_reply_text_color"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MaxWidthLinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/message_adapter_content_system.xml b/system/tuichat/src/main/res/layout/message_adapter_content_system.xml
new file mode 100644
index 0000000..7126d20
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/message_adapter_content_system.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minWidth="@dimen/chat_message_content_max_width"
+    android:paddingHorizontal="15dp"
+    android:paddingVertical="15dp">
+    <TextView
+        android:id="@+id/tv_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:textColor="@color/text_color_black_33"
+        android:textSize="14sp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:includeFontPadding="false"
+        android:text="@string/chat_message_system_title" />
+    <TextView
+        android:id="@+id/tv_content"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_title"
+        android:paddingVertical="12dp"
+        android:textColor="@color/text_color_black_4A"
+        android:textSize="13sp"
+        android:text="@string/app_name"/>
+    <ImageView
+        android:id="@+id/iv_message_image"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_content"
+        android:scaleType="fitXY"
+        android:adjustViewBounds="true"
+        tools:src="@drawable/custom"/>
+    <Button
+        android:id="@+id/btn_operate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/iv_message_image"
+        android:background="@drawable/chat_bubble_button_bg_serious"
+        android:layout_marginTop="12dp"
+        android:minHeight="0dp"
+        android:minWidth="0dp"
+        android:paddingVertical="7dp"
+        android:paddingHorizontal="12dp"
+        android:textColor="@color/white"
+        android:textSize="12sp"
+        android:text="@string/chat_message_system_go_appraise"
+        android:visibility="gone"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/message_adapter_content_text.xml b/system/tuichat/src/main/res/layout/message_adapter_content_text.xml
new file mode 100644
index 0000000..039865e
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/message_adapter_content_text.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/text_frame"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <TextView
+        android:id="@+id/msg_body_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center_vertical"
+        android:textColor="?attr/chat_self_msg_text_color"
+        android:maxWidth="276dp"
+        android:lineHeight="20.16sp"
+        android:textSize="@dimen/chat_message_text_size" />
+
+</FrameLayout>
+
diff --git a/system/tuichat/src/main/res/layout/message_adapter_content_tips.xml b/system/tuichat/src/main/res/layout/message_adapter_content_tips.xml
new file mode 100644
index 0000000..e58e730
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/message_adapter_content_tips.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:orientation="horizontal">
+
+    <TextView
+        android:id="@+id/chat_tips_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:includeFontPadding="false"
+        android:gravity="center"
+        android:textColor="@color/text_tips_color"
+        android:clickable="true"
+        android:textSize="14.2sp" />
+
+    <TextView
+        android:id="@+id/re_edit"
+        android:layout_marginLeft="@dimen/btn_margin_left"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:includeFontPadding="false"
+        android:gravity="center"
+        android:text="@string/reedit_msg"
+        android:textColor="?attr/chat_tip_text_color"
+        android:visibility="gone"
+        android:clickable="true"
+        android:textSize="14.2sp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/message_adapter_content_trtc.xml b/system/tuichat/src/main/res/layout/message_adapter_content_trtc.xml
new file mode 100644
index 0000000..41af844
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/message_adapter_content_trtc.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:orientation="vertical"
+    android:paddingLeft="7dp"
+    android:paddingRight="7dp">
+
+    <TextView
+        android:id="@+id/msg_tv_live_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:gravity="center_vertical"
+        android:textColor="@color/black_font_color"
+        android:textSize="16.5sp" />
+
+    <TextView
+        android:id="@+id/msg_tv_live_status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:textColor="@android:color/darker_gray"
+        android:textSize="16sp" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:layout_marginTop="10dp"
+        android:background="@android:color/darker_gray" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingTop="3dp"
+        android:paddingBottom="3dp">
+
+        <ImageView
+            android:layout_width="14dp"
+            android:layout_height="14dp"
+            android:src="@drawable/live_ic_group_live" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="6dp"
+            android:text="@string/live_group_live"
+            android:textColor="@android:color/darker_gray"
+            android:textSize="14sp" />
+    </LinearLayout>
+
+</LinearLayout>
+
diff --git a/system/tuichat/src/main/res/layout/message_adapter_item_content.xml b/system/tuichat/src/main/res/layout/message_adapter_item_content.xml
new file mode 100644
index 0000000..9e4cdbb
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/message_adapter_item_content.xml
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/message_content_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:clickable="false"
+    android:paddingTop="8.6dp"
+    android:paddingBottom="8.6dp"
+    android:paddingLeft="15.36dp"
+    android:paddingRight="15.36dp">
+
+    <TextView
+        android:id="@+id/message_top_time_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="10dp"
+        android:layout_marginTop="10dp"
+        android:layout_alignParentTop="true"
+        android:includeFontPadding="false"
+        android:textColor="@color/text_tips_color"
+        android:textSize="12.6sp"
+        tools:text="12:00"/>
+
+    <CheckBox
+        android:id="@+id/select_checkbox"
+        android:layout_width="21.12dp"
+        android:layout_height="21.12dp"
+        android:layout_below="@id/message_top_time_tv"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        android:layout_marginRight="11.52dp"
+        android:button="@null"
+        android:background="@drawable/chat_checkbox_selector"
+        android:visibility="gone"
+        tools:visibility="visible"/>
+
+    <RelativeLayout
+        android:id="@+id/right_group_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/message_top_time_tv"
+        android:layout_toRightOf="@id/select_checkbox">
+
+        <com.tencent.qcloud.tuicore.component.gatherimage.UserIconView
+            android:id="@+id/left_user_icon_view"
+            android:layout_width="41dp"
+            android:layout_height="41dp"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentTop="true"
+            android:layout_marginRight="11.52dp"
+            android:visibility="gone"
+            app:default_image="@drawable/ic_default_user_head_icon"
+            app:image_radius="20dp"
+            tools:visibility="visible" />
+
+        <com.tencent.qcloud.tuicore.component.gatherimage.UserIconView
+            android:id="@+id/right_user_icon_view"
+            android:layout_width="41dp"
+            android:layout_height="41dp"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:layout_marginLeft="11.52dp"
+            android:visibility="gone"
+            app:default_image="?attr/core_default_user_icon"
+            app:image_radius="20dp" />
+
+        <TextView
+            android:id="@+id/user_name_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_marginBottom="3.84dp"
+            android:layout_toRightOf="@id/left_user_icon_view"
+            android:textColor="@color/text_tips_color"
+            android:textSize="12.6sp"
+            android:visibility="gone"
+            tools:text="Leo"
+            tools:visibility="visible" />
+
+        <TextView
+            android:id="@+id/msg_detail_time_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignTop="@id/user_name_tv"
+            android:layout_marginRight="3.36dp"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textColor="#B0B0B0"
+            android:textSize="11.52sp"
+            android:visibility="gone"
+            tools:visibility="visible"
+            tools:text="18:00" />
+
+        <LinearLayout
+            android:id="@+id/msg_content_ll"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/user_name_tv"
+            android:layout_toLeftOf="@id/right_user_icon_view"
+            android:layout_toRightOf="@id/left_user_icon_view"
+            android:orientation="horizontal">
+
+            <com.tencent.qcloud.tuicore.component.UnreadCountTextView
+                android:id="@+id/audio_unread"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                tools:visibility="visible" />
+
+            <ProgressBar
+                android:id="@+id/message_sending_pb"
+                android:layout_width="10dp"
+                android:layout_height="10dp"
+                android:layout_gravity="center_vertical"
+                android:layout_margin="10dp"
+                android:visibility="gone"
+                tools:visibility="visible" />
+
+            <TextView
+                android:id="@+id/is_read_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:layout_marginRight="6dp"
+                android:layout_marginBottom="2.88dp"
+                android:textColor="@color/text_gray1"
+                android:textSize="11sp"
+                tools:text="read" />
+
+            <ImageView
+                android:id="@+id/message_status_iv"
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="5dp"
+                android:layout_marginTop="5dp"
+                android:layout_marginEnd="5dp"
+                android:layout_marginBottom="5dp"
+                android:scaleType="fitCenter"
+                android:src="@drawable/message_send_fail"
+                android:visibility="gone"
+                tools:visibility="visible" />
+
+            <LinearLayout
+                android:id="@+id/msg_area_and_reply"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MaxWidthLinearLayout
+                    android:id="@+id/msg_area"
+                    android:transitionName="testImg"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    app:maxWidth="@dimen/chat_message_content_max_width">
+
+                    <!-- message content area -->
+                    <com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MaxWidthFrameLayout
+                        android:id="@+id/msg_content_fl"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        app:maxWidth="@dimen/chat_message_content_max_width" />
+
+                    <!-- emoji react area -->
+                    <com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.reply.ChatFlowReactView
+                        android:id="@+id/reacts_view"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingTop="5dp"/>
+
+                </com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MaxWidthLinearLayout>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <!-- translation content area -->
+        <com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MaxWidthFrameLayout
+            android:id="@+id/translate_content_fl"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/msg_content_ll"
+            android:layout_marginTop="4dp"
+            android:layout_toLeftOf="@id/right_user_icon_view"
+            android:layout_toRightOf="@id/left_user_icon_view"
+            android:background="@drawable/translation_area_bg"
+            app:maxWidth="@dimen/chat_message_content_max_width"
+            android:visibility="gone"
+            tools:visibility="visible"/>
+
+        <!-- quote content area -->
+        <com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MaxWidthFrameLayout
+            android:id="@+id/quote_content_fl"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5.76dp"
+            android:layout_below="@id/translate_content_fl"
+            android:layout_toRightOf="@id/left_user_icon_view"
+            android:layout_toLeftOf="@id/right_user_icon_view"
+            android:background="@drawable/quote_message_area_bg"
+            android:visibility="gone"
+            app:maxWidth="@dimen/chat_message_content_max_width"
+            tools:visibility="visible" />
+
+        <!-- reply details -->
+        <LinearLayout
+            android:id="@+id/msg_reply_detail_fl"
+            android:layout_width="wrap_content"
+            android:layout_height="14.4dp"
+            android:layout_marginTop="3.84dp"
+            android:layout_below="@id/quote_content_fl"
+            android:layout_toRightOf="@id/left_user_icon_view"
+            android:layout_toLeftOf="@id/right_user_icon_view"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="11.52dp"
+                android:layout_height="11.52dp"
+                android:background="?attr/chat_reply_detail_icon" />
+
+            <TextView
+                android:id="@+id/reply_num"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="3.84dp"
+                android:textColor="?attr/core_primary_color"
+                android:textSize="11.52sp" />
+        </LinearLayout>
+
+    </RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/message_adapter_item_empty.xml b/system/tuichat/src/main/res/layout/message_adapter_item_empty.xml
new file mode 100644
index 0000000..9c3f0df
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/message_adapter_item_empty.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:clickable="true"
+    android:orientation="vertical"
+    android:paddingTop="8.6dp"
+    android:paddingBottom="8.6dp"
+    android:paddingLeft="15.36dp"
+    android:paddingRight="15.36dp">
+
+    <TextView
+        android:id="@+id/message_top_time_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:includeFontPadding="false"
+        android:layout_marginBottom="19.2dp"
+        android:textColor="@color/text_tips_color"
+        android:textSize="12.6sp" />
+
+    <FrameLayout
+        android:id="@+id/msg_content_fl"
+        android:layout_below="@+id/message_top_time_tv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/message_content_layout.xml b/system/tuichat/src/main/res/layout/message_content_layout.xml
new file mode 100644
index 0000000..24f3d6b
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/message_content_layout.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/msg_receipt_detail_layout.xml b/system/tuichat/src/main/res/layout/msg_receipt_detail_layout.xml
new file mode 100644
index 0000000..1bcca58
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/msg_receipt_detail_layout.xml
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="?attr/core_bg_color"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/receipt_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <LinearLayout
+        android:id="@+id/msg_abstract_area"
+        android:orientation="vertical"
+        android:background="@color/white"
+        android:paddingStart="15.36dp"
+        android:paddingRight="15.36dp"
+        android:layout_marginBottom="9.6dp"
+        android:layout_marginTop="0.96dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="15.36dp">
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:paddingTop="11.52dp"
+            android:paddingBottom="5.76dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/name_tv"
+                android:gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="11.52dp"
+                android:layout_marginRight="11.52dp" />
+
+            <TextView
+                android:id="@+id/time_tv"
+                android:gravity="center"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_marginBottom="11.52dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:id="@+id/msg_abstract_iv"
+                android:scaleType="fitCenter"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
+            <TextView
+                android:id="@+id/msg_abstract"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="#111111"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:textSize="15.36sp"
+                android:lineHeight="23.04dp" />
+
+        </LinearLayout>
+    </LinearLayout>
+
+    <RelativeLayout
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/user_read_detail"
+        android:layout_width="match_parent"
+        android:layout_height="58.58dp"
+        android:background="#FFFFFF"
+        android:focusable="true"
+        android:visibility="gone"
+        android:paddingLeft="15.36dp"
+        android:paddingStart="15.36dp"
+        android:paddingEnd="15.36dp"
+        android:paddingRight="15.36dp"
+        android:orientation="vertical">
+
+        <com.tencent.qcloud.tuicore.component.gatherimage.ShadeImageView
+            android:id="@+id/user_face"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
+            android:layout_width="38.4dp"
+            android:layout_height="38.4dp"
+            android:layout_marginTop="9.6dp"
+            android:layout_alignParentLeft="true" />
+
+        <TextView
+            android:id="@+id/user_name_tv"
+            android:layout_alignTop="@id/user_face"
+            android:layout_toEndOf="@id/user_face"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginStart="11.52dp"
+            android:layout_marginLeft="11.52dp"
+            android:layout_marginRight="11.52dp"
+            android:layout_marginTop="7.68dp"
+            android:ellipsize="end"
+            android:lineHeight="23.04sp"
+            android:singleLine="true"
+            android:textColor="@color/black_font_color"
+            android:textSize="17.28sp"
+            tools:text="Bob"
+            android:layout_toRightOf="@id/user_face" />
+
+        <TextView
+            android:id="@+id/user_read_status"
+            android:text="@string/chat_not_read"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:textColor="@color/black_font_color"
+            android:textSize="15.36sp"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true" />
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/group_read_details"
+        android:orientation="vertical"
+        android:background="@color/white"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:paddingTop="11.52dp"
+            android:paddingBottom="5.28dp"
+            android:layout_height="46.08dp">
+
+            <LinearLayout
+                android:id="@+id/read_title"
+                android:orientation="vertical"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:id="@+id/read_title_tv"
+                    android:gravity="center"
+                    android:textSize="15.36sp"
+                    android:lineHeight="23.04sp"
+                    android:textColor="?attr/core_primary_color"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+
+                <View
+                    android:id="@+id/read_title_line"
+                    android:background="@drawable/group_msg_receipt_line_bg"
+                    android:layout_marginTop="3.84dp"
+                    android:layout_width="55.68dp"
+                    android:layout_height="2.4dp"/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/unread_title"
+                android:orientation="vertical"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:id="@+id/unread_title_tv"
+                    android:gravity="center"
+                    android:textSize="15.36sp"
+                    android:lineHeight="23.04sp"
+                    android:textColor="#444444"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+
+                <View
+                    android:id="@+id/unread_title_line"
+                    android:background="@drawable/group_msg_receipt_line_bg"
+                    android:visibility="invisible"
+                    android:layout_marginTop="3.84dp"
+                    android:layout_width="55.68dp"
+                    android:layout_height="2.4dp"/>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/read_list"
+            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/unread_list"
+            android:visibility="gone"
+            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/notice_layout.xml b/system/tuichat/src/main/res/layout/notice_layout.xml
new file mode 100644
index 0000000..22cd896
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/notice_layout.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/notice_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="5dp"
+    android:background="#f6ebbc">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/notice_content"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            android:id="@+id/notice_content_extra"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/page_margin"
+            android:text="@string/group_apply_click_handle"
+            android:textColor="@color/font_blue"/>
+
+    </LinearLayout>
+
+</RelativeLayout>
diff --git a/system/tuichat/src/main/res/layout/quote_message_content_layout.xml b/system/tuichat/src/main/res/layout/quote_message_content_layout.xml
new file mode 100644
index 0000000..4f6b854
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/quote_message_content_layout.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MaxWidthLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="7.68dp"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_weight="1"
+        android:id="@+id/sender_name_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:ellipsize="middle"
+        android:singleLine="true" />
+
+    <FrameLayout
+        android:id="@+id/text_msg_area"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <TextView
+            android:id="@+id/msg_abstract_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+    </FrameLayout>
+
+    <FrameLayout
+        android:id="@+id/image_video_msg_area"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <ImageView
+            android:id="@+id/msg_image_iv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <ImageView
+            android:id="@+id/msg_play_iv"
+            android:src="@drawable/ic_chat_play_icon"
+            android:layout_centerInParent="true"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+    </FrameLayout>
+
+    <FrameLayout
+        android:id="@+id/file_msg_area"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <TextView
+            android:id="@+id/file_name_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <ImageView
+            android:id="@+id/file_icon_iv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+    </FrameLayout>
+
+    <FrameLayout
+        android:id="@+id/sound_msg_area"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <ImageView
+            android:id="@+id/sound_msg_icon_iv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            android:id="@+id/sound_msg_time_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+    </FrameLayout>
+
+</com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MaxWidthLinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/reply_preview_layout.xml b/system/tuichat/src/main/res/layout/reply_preview_layout.xml
new file mode 100644
index 0000000..0f9c2e5
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/reply_preview_layout.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal"
+    android:layout_marginTop="5dp"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/reply_text"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
+        android:layout_toStartOf="@id/reply_close_btn"
+        android:layout_toLeftOf="@id/reply_close_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:layout_marginStart="12dp"
+        android:layout_marginLeft="12dp"
+        tools:text="test"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:textSize="@dimen/reply_text_size"/>
+
+    <ImageView
+        android:id="@+id/reply_close_btn"
+        android:layout_width="18dp"
+        android:layout_height="18dp"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_centerInParent="true"
+        android:layout_marginHorizontal="12dp"
+        android:scaleType="fitXY"
+        android:src="@drawable/reply_close_btn" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/test_chat_input_custom_fragment.xml b/system/tuichat/src/main/res/layout/test_chat_input_custom_fragment.xml
new file mode 100644
index 0000000..d3e8a0d
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/test_chat_input_custom_fragment.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <Button
+        android:id="@+id/test_send_message_btn1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="发送一条超链接消息"/>
+
+    <Button
+        android:id="@+id/test_send_message_btn2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="发送一条视频文字混合消息"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/test_custom_message_layout1.xml b/system/tuichat/src/main/res/layout/test_custom_message_layout1.xml
new file mode 100644
index 0000000..b7f674a
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/test_custom_message_layout1.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/test_custom_message_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="?attr/chat_self_custom_msg_text_color" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/link_tv"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/test_custom_message"
+            android:textColor="?attr/chat_self_custom_msg_link_color" />
+
+        <com.tencent.qcloud.tuikit.tuichat.minimalistui.widget.message.TimeInLineTextLayout
+            android:id="@+id/time_in_line_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/layout/translation_contant_layout.xml b/system/tuichat/src/main/res/layout/translation_contant_layout.xml
new file mode 100644
index 0000000..484d175
--- /dev/null
+++ b/system/tuichat/src/main/res/layout/translation_contant_layout.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+    <ImageView
+        android:id="@+id/translate_loading_iv"
+        android:layout_width="15dp"
+        android:layout_height="15dp"
+        android:layout_margin="10dp"
+        android:background="@drawable/translation_loading"
+        android:visibility="gone"
+        tools:visibility="visible" />
+
+    <LinearLayout
+        android:id="@+id/translate_result_ll"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="10dp"
+        android:visibility="gone"
+        tools:visibility="visible" >
+
+        <TextView
+            android:id="@+id/translate_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:lineHeight="20.16sp"
+            android:textColor="@color/black"
+            android:textSize="@dimen/chat_message_text_size"
+            tools:text="test" />
+
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp">
+
+            <ImageView
+                android:id="@+id/translate_iv"
+                android:layout_width="13dp"
+                android:layout_height="13dp"
+                android:layout_centerVertical="true"
+                android:alpha="0.4"
+                android:background="@drawable/ic_translate_support" />
+
+            <TextView
+                android:id="@+id/translate_supporter_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="4dp"
+                android:layout_toRightOf="@id/translate_iv"
+                android:alpha="0.4"
+                android:text="@string/translation_support"
+                android:textColor="@color/black"
+                android:textSize="12sp" />
+        </RelativeLayout>
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/values-zh-rCN/strings-emoji.xml b/system/tuichat/src/main/res/values-zh-rCN/strings-emoji.xml
new file mode 100644
index 0000000..9081ff9
--- /dev/null
+++ b/system/tuichat/src/main/res/values-zh-rCN/strings-emoji.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="ciya">[龇牙]</string>
+    <string name="tiaopi">[调皮]</string>
+    <string name="liuhan">[流汗]</string>
+    <string name="touxiao">[偷笑]</string>
+    <string name="zaijian">[再见]</string>
+    <string name="qiaoda">[敲打]</string>
+    <string name="cahan">[擦汗]</string>
+    <string name="zhutou">[猪头]</string>
+    <string name="meigui">[玫瑰]</string>
+    <string name="liulei">[流泪]</string>
+    <string name="daku">[大哭]</string>
+    <string name="xu">[嘘]</string>
+    <string name="ku">[酷]</string>
+    <string name="zhukuang">[抓狂]</string>
+    <string name="weiqu">[委屈]</string>
+    <string name="bianbian">[便便]</string>
+    <string name="zhadan">[炸弹]</string>
+    <string name="caidao">[菜刀]</string>
+    <string name="keai">[可爱]</string>
+    <string name="se">[色]</string>
+    <string name="haixiu">[害羞]</string>
+    <string name="deyi">[得意]</string>
+    <string name="tu">[吐]</string>
+    <string name="weixiao">[微笑]</string>
+    <string name="nu">[怒]</string>
+    <string name="ganga">[尴尬]</string>
+    <string name="jingkong">[惊恐]</string>
+    <string name="lenghan">[冷汗]</string>
+    <string name="aixin">[爱心]</string>
+    <string name="shiai">[示爱]</string>
+    <string name="baiyan">[白眼]</string>
+    <string name="aoman">[傲慢]</string>
+    <string name="nanguo">[难过]</string>
+    <string name="jingya">[惊讶]</string>
+    <string name="yiwen">[疑问]</string>
+    <string name="kun">[困]</string>
+    <string name="memeda">[么么哒]</string>
+    <string name="hanxiao">[憨笑]</string>
+    <string name="aiqing">[爱情]</string>
+    <string name="suan">[衰]</string>
+    <string name="piezui">[撇嘴]</string>
+    <string name="yinxian">[阴险]</string>
+    <string name="fendou">[奋斗]</string>
+    <string name="fadai">[发呆]</string>
+    <string name="youhengheng">[右哼哼]</string>
+    <string name="baobao">[抱抱]</string>
+    <string name="huaixiao">[坏笑]</string>
+    <string name="feiwen">[飞吻]</string>
+    <string name="bishi">[鄙视]</string>
+    <string name="yun">[晕]</string>
+    <string name="dabing">[大兵]</string>
+    <string name="kelian">[可怜]</string>
+    <string name="qiang">[强]</string>
+    <string name="ruo">[弱]</string>
+    <string name="woshou">[握手]</string>
+    <string name="shengli">[胜利]</string>
+    <string name="baoquan">[抱拳]</string>
+    <string name="diaoxie">[凋谢]</string>
+    <string name="mifan">[米饭]</string>
+    <string name="dangao">[蛋糕]</string>
+    <string name="xigua">[西瓜]</string>
+    <string name="pijiu">[啤酒]</string>
+    <string name="piaochong">[瓢虫]</string>
+    <string name="gouyin">[勾引]</string>
+    <string name="ok_emoji">[OK]</string>
+    <string name="aini">[爱你]</string>
+    <string name="kafei">[咖啡]</string>
+    <string name="yueliang">[月亮]</string>
+    <string name="dao">[刀]</string>
+    <string name="fadou">[发抖]</string>
+    <string name="chajin">[差劲]</string>
+    <string name="quantou">[拳头]</string>
+    <string name="xinsuile">[心碎了]</string>
+    <string name="taiyang">[太阳]</string>
+    <string name="liwu">[礼物]</string>
+    <string name="piqiu">[皮球]</string>
+    <string name="kulou">[骷髅]</string>
+    <string name="huishou">[挥手]</string>
+    <string name="shandian">[闪电]</string>
+    <string name="jie">[饥饿]</string>
+    <string name="kun2">[困]</string>
+    <string name="zhouma">[咒骂]</string>
+    <string name="zhemo">[折磨]</string>
+    <string name="koubi">[抠鼻]</string>
+    <string name="guzhang">[鼓掌]</string>
+    <string name="qiudale">[糗大了]</string>
+    <string name="zuohengheng">[左哼哼]</string>
+    <string name="dahaqian">[打哈欠]</string>
+    <string name="kuaikule">[快哭了]</string>
+    <string name="xia">[吓]</string>
+    <string name="lanqiu">[篮球]</string>
+    <string name="pingpang">[乒乓]</string>
+    <string name="no_emoji">[NO]</string>
+    <string name="tiaotiao">[跳跳]</string>
+    <string name="ouhuo">[怄火]</string>
+    <string name="zuanquan">[转圈]</string>
+    <string name="ketou">[磕头]</string>
+    <string name="huitou">[回头]</string>
+    <string name="tiaosheng">[跳绳]</string>
+    <string name="jidong">[激动]</string>
+    <string name="jiewu">[街舞]</string>
+    <string name="xianwen">[献吻]</string>
+    <string name="zuotaiji">[左太极]</string>
+    <string name="youtaiji">[右太极]</string>
+    <string name="bizui">[闭嘴]</string>
+    <string name="maomi">[猫咪]</string>
+    <string name="hongshuangxi">[红双喜]</string>
+    <string name="bianpao">[鞭炮]</string>
+    <string name="hongdenglong">[红灯笼]</string>
+    <string name="majiang">[麻将]</string>
+    <string name="maikefeng">[麦克风]</string>
+    <string name="lipindai">[礼品袋]</string>
+    <string name="xinfeng">[信封]</string>
+    <string name="xiangqi">[象棋]</string>
+    <string name="caidai">[彩带]</string>
+    <string name="lazhu">[蜡烛]</string>
+    <string name="baojin">[爆筋]</string>
+    <string name="bangbangtang">[棒棒糖]</string>
+    <string name="naiping">[奶瓶]</string>
+    <string name="miantiao">[面条]</string>
+    <string name="xiangjiao">[香蕉]</string>
+    <string name="feiji">[飞机]</string>
+    <string name="zuochetou">[左车头]</string>
+    <string name="chexiang">[车厢]</string>
+    <string name="youchetou">[右车头]</string>
+    <string name="duoyun">[多云]</string>
+    <string name="xiayu">[下雨]</string>
+    <string name="chaopiao">[钞票]</string>
+    <string name="xiongmao">[熊猫]</string>
+    <string name="dengpao">[灯泡]</string>
+    <string name="fengche">[风车]</string>
+    <string name="naozhong">[闹钟]</string>
+    <string name="yusan">[雨伞]</string>
+    <string name="caiqiu">[彩球]</string>
+    <string name="zuanjie">[钻戒]</string>
+    <string name="shafa">[沙发]</string>
+    <string name="zhijin">[纸巾]</string>
+    <string name="shouqiang">[手枪]</string>
+    <string name="qingwa">[青蛙]</string>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/values-zh-rCN/strings.xml b/system/tuichat/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..36ca724
--- /dev/null
+++ b/system/tuichat/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,265 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ExtraTranslation">
+
+    <string name="pic">图片</string>
+    <string name="photo">拍照</string>
+    <string name="video">摄像</string>
+    <string name="file">文件</string>
+
+    <string name="release_end">松开结束</string>
+    <string name="hold_say">按住说话</string>
+
+    <string name="copy_action">复制</string>
+    <string name="translate_action">翻译</string>
+    <string name="delete_action">删除</string>
+    <string name="revoke_action">撤回</string>
+    <string name="resend_action">重发</string>
+    <string name="hide_action">隐藏</string>
+
+    <string name="copy_success_tip">复制成功</string>
+
+    <string name="chat_message_detail">消息详情</string>
+
+    <string name="translation_support">由腾讯云 IM 提供翻译支持</string>
+    <string name="translation_fail">翻译失败</string>
+    <!-- 消息转发 -->
+
+    <string name="titlebar_back">返回</string>
+    <string name="forward_tip">请选择要操作的消息！</string>
+    <string name="forward_mode_onebyone">逐条转发</string>
+    <string name="forward_mode_merge">合并转发</string>
+    <string name="forward_button">转发</string>
+    <string name="reply_button">回复</string>
+    <string name="quote_button">引用</string>
+    <string name="info_button">详情</string>
+    <string name="delete_button">删除</string>
+    <string name="chat_delete_msg_tip">确定删除已选消息</string>
+    <string name="forward_chats">群聊的聊天记录</string>
+    <string name="and_text">和</string>
+    <string name="forward_chats_c2c">的聊天记录</string>
+    <string name="forward_compatible_text">不支持合并转发消息，请升级到新版本。</string>
+
+    <string name="forward_failed_tip">发送失败消息不支持转发！</string>
+    <string name="forward_chat_record">聊天记录</string>
+    <string name="forward_oneByOne_limit_number_tip">转发消息过多，暂不支持逐条转发</string>
+
+    <string name="and_and">已和</string>
+    <string name="be_friend">成为好友</string>
+
+    <string name="join_group_tip">您已被邀请进群: </string>
+    <string name="joined_tip">您已加入群: </string>
+    <string name="reject_join_tip">您被拒绝加入群: </string>
+    <string name="kick_group">您已被踢出群: </string>
+
+    <string name="send_two_mins">消息发送已超过2分钟</string>
+    <string name="revoke_fail">撤回失败</string>
+
+    <string name="group_apply_tips">%1$d 条入群申请</string>
+    <string name="wait_tip">请稍后再试试</string>
+
+    <string name="dismiss_tip_before">您所在的群</string>
+    <string name="dismiss_tip_after">已解散</string>
+    <string name="get_system_notice">收到自定义系统通知: </string>
+
+    <string name="down_cancle_send">手指上滑，取消发送</string>
+    <string name="say_time_short">说话时间太短</string>
+    <string name="record_fail">录音失败</string>
+    <string name="up_cancle_send">松开手指，取消发送</string>
+
+    <string name="send">发送</string>
+
+    <string name="custom_msg">[自定义消息]</string>
+    <string name="custom_emoji">[动画表情]</string>
+    <string name="picture_extra">[图片]</string>
+    <string name="video_extra">[视频]</string>
+    <string name="audio_extra">[语音]</string>
+    <string name="file_extra">[文件]</string>
+    <string name="location_extra">[地理位置]</string>
+
+    <string name="locate_origin_msg_failed_tip">无法定位到原消息</string>
+
+    <string name="forward_extra">[聊天记录]</string>
+    <string name="revoke_tips_you">您撤回了一条消息</string>
+    <string name="revoke_tips">撤回了一条消息</string>
+    <string name="revoke_tips_other">对方撤回了一条消息</string>
+
+    <string name="create_group">创建群组</string>
+    <string name="etc">等</string>
+    <string name="join_group">加入群组</string>
+    <string name="invite_joined_group">被邀请进群</string>
+    <string name="quit_group">退出群组</string>
+    <string name="kick_group_tip">被踢出群组</string>
+    <string name="be_group_manager">被设置管理员</string>
+    <string name="cancle_group_manager">被取消管理员</string>
+    <string name="modify_group_name_is">修改群名称为</string>
+    <string name="modify_notice">修改群公告为</string>
+    <string name="modify_introduction">修改群简介为</string>
+    <string name="modify_shut_up_all">禁言全员</string>
+    <string name="modify_cancel_shut_up_all">取消禁言全员</string>
+    <string name="move_owner">转让群主给</string>
+    <string name="modify_group_avatar">修改了群头像</string>
+    <string name="banned">被禁言</string>
+    <string name="cancle_banned">被取消禁言</string>
+    <string name="modify_group_add_opt">修改加群方式为</string>
+    <string name="group_add_opt_auto_approval">自动审批</string>
+    <string name="group_add_opt_admin_approve">管理员审批</string>
+    <string name="group_add_opt_join_disable">禁止加群</string>
+
+    <string name="typing">对方正在输入...</string>
+    <string name="titlebar_mutiselect">多选</string>
+    <string name="audio_permission_error">需要打开录音权限</string>
+    <string name="record_occupied">录音机被占用</string>
+    <string name="record_null">录音的结果为空</string>
+    <string name="record_limit_tips">已达到最大语音长度</string>
+    <string name="record_rejected_for_in_call">正在音视频通话，请稍后再试</string>
+    <string name="record_rejected_for_in_recording">当前录音未结束</string>
+    <string name="play_error_tip">语音文件已损坏或不存在</string>
+    <string name="input_tip">没有输入昵称，请重新填写</string>
+
+    <string name="has_read">已读</string>
+    <string name="delivered">已送达</string>
+    <string name="unread">未读</string>
+    <string name="has_all_read">全部已读</string>
+    <string name="someone_has_read">%d人已读</string>
+    <string name="someone_unread">%d人未读</string>
+    <string name="someone_have_read">%d人已读</string>
+
+    <string name="un_download">未下载</string>
+    <string name="downloaded">已下载</string>
+    <string name="downloading">下载中...</string>
+    <string name="sended">已发送</string>
+    <string name="send_failed">发送失败</string>
+    <string name="send_failed_file_not_exists">发送失败，文件不存在</string>
+    <string name="open_file_tips">选择要打开此文件的应用</string>
+    <string name="sending">发送中...</string>
+    <string name="download_file_error">下载视频失败: </string>
+    <string name="voice_play_tip">语音文件还未下载完成</string>
+
+    <string name="device_info">手机型号:</string>
+    <string name="system_version">\n系统版本:</string>
+    <string name="sdk_version">\nSDK版本:</string>
+
+    <string name="permission_content">使用该功能，需要开启权限，鉴于您禁用相关权限，请手动设置开启权限</string>
+    <string name="setting">设置</string>
+
+    <string name="no_event_cancle_tip">浏览状态下,没有 cancle 事件</string>
+    <string name="no_event_confirm_tip">浏览状态下,没有 confirm 事件</string>
+
+    <string name="record_time_tip">录制时间过短</string>
+    <string name="tap_tips">轻触拍照，长按摄像</string>
+    <string name="tap_capture">点击拍照</string>
+    <string name="tap_video">长按摄像</string>
+
+    <string name="completed">已完成</string>
+    <string name="view_original_image">查看原图</string>
+
+    <string name="at_all">所有人</string>
+    <string name="ui_at_all">[@所有人]</string>
+    <string name="ui_at_me">[有人@我]</string>
+    <string name="ui_at_all_me">[@所有人][有人@我]</string>
+    <string name="drafts">[草稿]</string>
+
+    <string name="group_apply_click_handle">点击处理</string>
+    <string name="no_support_msg">不支持的自定义消息</string>
+
+    <string name="live">的直播</string>
+    <string name="live_group_live_streaming">正在直播</string>
+    <string name="live_group_live_end">结束直播</string>
+    <string name="live_group_user_live">%s的直播</string>
+    <string name="live_group_live">群直播</string>
+
+    <string name="start_group_call">发起群通话</string>
+    <string name="start_call">发起通话</string>
+    <string name="cancle_group_call">取消群通话</string>
+    <string name="cancle_call">取消通话</string>
+    <string name="other_line_busy">对方忙线</string>
+    <string name="reject_group_calls">拒绝群通话</string>
+    <string name="no_response_call">无应答</string>
+    <string name="accept_call">已接听</string>
+    <string name="stop_group_call">结束群通话</string>
+    <string name="stop_call_tip">通话时长：</string>
+    <string name="line_busy">忙线</string>
+    <string name="reject_call">拒绝通话</string>
+    <string name="invalid_command">不能识别的通话指令</string>
+    <string name="reject_calls">拒绝通话</string>
+    <string name="chat_calling_switch_to_audio">视频转语音</string>
+    <string name="chat_calling_switch_to_audio_accept">确认视频转语音</string>
+    <string name="chat_calling_unknown_invitation">未知邀请</string>
+
+    <string name="test_custom_message">查看详情>></string>
+
+    <string name="test_custom_action">自定义消息</string>
+    <string name="welcome_tip">欢迎加入腾讯云IM大家庭！</string>
+
+    <string name="resend_tips">确定重发吗？</string>
+    <string name="delete_tips">是否删除该消息？</string>
+    <string name="reedit_msg">重新编辑</string>
+    <string name="save_success">保存成功</string>
+    <string name="save_failed">保存失败</string>
+    <string name="saving_tips">保存中...</string>
+
+    <string name="back_to_lastmessage">回到最新位置</string>
+    <string name="back_to_newmessage">条新消息</string>
+    <string name="back_to_atmessage_all">\@所有人</string>
+    <string name="back_to_atmessage_me">有人@我</string>
+
+    <!--  权限相关 start -->
+    <string name="chat_permission_mic_reason_title">%s申请获取麦克风权限</string>
+    <string name="chat_permission_mic_reason">为方便您发送语音消息，进行摄像和音视频通话，请允许我们访问麦克风。</string>
+    <string name="chat_permission_camera_reason_title">%s申请获取相机权限</string>
+    <string name="chat_permission_camera_reason">为方便您拍摄照片或视频以发送给朋友，以及进行视频通话，请允许我们访问摄像头。</string>
+    <string name="chat_permission_storage_reason_title">%s申请获取存储权限</string>
+    <string name="chat_permission_storage_reason">为方便您保存照片和视频到设备，请允许我们写入照片和视频到设备。</string>
+    <string name="chat_permission_mic_dialog_alert">在设置-应用-%s-权限中开启麦克风权限，以正常使用语音消息、摄像和音视频通话功能</string>
+    <string name="chat_permission_camera_dialog_alert">在设置-应用-%s-权限中开启相机权限，以正常使用拍照、摄像和视频通话功能</string>
+    <string name="chat_permission_storage_dialog_alert">在设置-应用-%s-权限中开启存储权限，以正常使用保存照片和视频功能</string>
+    <!--  权限相关 end -->
+
+    <string name="chat_message_read_receipt">消息已读回执</string>
+    <string name="chat_i_know">我知道了</string>
+    <string name="chat_no_more_reminders">不再提醒</string>
+    <string name="chat_im_flagship">旗舰版</string>
+    <string name="chat_buying_guidelines">价格说明</string>
+    <string name="chat_im_flagship_edition_update_tip">%s功能为IM旗舰版功能，购买旗舰版套餐包后可使用，详见价格说明。</string>
+
+    <string name="chat_reply_num">%d条回复</string>
+    <string name="chat_reply_detail">回复详情</string>
+
+    <string name="chat_not_read">尚未阅读</string>
+
+    <string name="custom_evaluation_message">对本次服务评价</string>
+
+    <string name="chat_input_edit_hint_text">发送消息</string>
+    <string name="chat_header_not_desc">暂无简介</string>
+    <string name="chat_tips_not_login">未登录</string>
+
+    <string name="chat_user_status_online">在线</string>
+    <string name="chat_user_status_offline">离线</string>
+    <string name="chat_user_status_unknown">未知</string>
+
+    <!--自定义消息名称-->
+    <string name="chat_message_type_location">位置</string>
+    <string name="chat_message_type_archives">档案</string>
+    <string name="chat_message_type_business_card">名片</string>
+    <string name="chat_message_type_medical_examination_report">体检报告</string>
+    <string name="chat_message_type_health_info">健康信息</string>
+    <string name="chat_message_type_end_consultation">结束咨询</string>
+    <string name="chat_message_type_system">系统消息</string>
+    <!--名片-->
+    <string name="chat_message_business_card_title">个人名片</string>
+    <!--档案-->
+    <string name="chat_message_archives_gender_and_age">%s&#160;&#160;|&#160;&#160;%d岁</string>
+    <string name="chat_message_archives_symptom_description">
+        <![CDATA[ <font color="#333333">症状描述：</font> %s]]>
+    </string>
+    <!--体检报告-->
+    <string name="chat_message_medical_examination_report_user_info" formatted="false">%s-%s-%s</string>
+    <string name="chat_message_medical_examination_report_hospital" formatted="false">%s&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;%s</string>
+    <!--系统消息-->
+    <string name="chat_message_system_title">系统消息</string>
+    <string name="chat_message_system_go_appraise">去评价</string>
+    <string name="chat_message_system_go_perfect">去完善</string>
+    <!--评价-->
+    <string name="chat_message_appraise_title">服务评价</string>
+</resources>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/values/arrays.xml b/system/tuichat/src/main/res/values/arrays.xml
new file mode 100644
index 0000000..41bba28
--- /dev/null
+++ b/system/tuichat/src/main/res/values/arrays.xml
@@ -0,0 +1,287 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="emoji_key">
+        <item>[龇牙]</item>
+        <item>[调皮]</item>
+        <item>[流汗]</item>
+        <item>[偷笑]</item>
+        <item>[再见]</item>
+        <item>[敲打]</item>
+        <item>[擦汗]</item>
+        <item>[猪头]</item>
+        <item>[玫瑰]</item>
+        <item>[流泪]</item>
+        <item>[大哭]</item>
+        <item>[嘘]</item>
+        <item>[酷]</item>
+        <item>[抓狂]</item>
+        <item>[委屈]</item>
+        <item>[便便]</item>
+        <item>[炸弹]</item>
+        <item>[菜刀]</item>
+        <item>[可爱]</item>
+        <item>[色]</item>
+        <item>[害羞]</item>
+        <item>[得意]</item>
+        <item>[吐]</item>
+        <item>[微笑]</item>
+        <item>[怒]</item>
+        <item>[尴尬]</item>
+        <item>[惊恐]</item>
+        <item>[冷汗]</item>
+        <item>[爱心]</item>
+        <item>[示爱]</item>
+        <item>[白眼]</item>
+        <item>[傲慢]</item>
+        <item>[难过]</item>
+        <item>[惊讶]</item>
+        <item>[疑问]</item>
+        <item>[困]</item>
+        <item>[么么哒]</item>
+        <item>[憨笑]</item>
+        <item>[爱情]</item>
+        <item>[衰]</item>
+        <item>[撇嘴]</item>
+        <item>[阴险]</item>
+        <item>[奋斗]</item>
+        <item>[发呆]</item>
+        <item>[右哼哼]</item>
+        <item>[抱抱]</item>
+        <item>[坏笑]</item>
+        <item>[飞吻]</item>
+        <item>[鄙视]</item>
+        <item>[晕]</item>
+        <item>[大兵]</item>
+        <item>[可怜]</item>
+        <item>[强]</item>
+        <item>[弱]</item>
+        <item>[握手]</item>
+        <item>[胜利]</item>
+        <item>[抱拳]</item>
+        <item>[凋谢]</item>
+        <item>[米饭]</item>
+        <item>[蛋糕]</item>
+        <item>[西瓜]</item>
+        <item>[啤酒]</item>
+        <item>[瓢虫]</item>
+        <item>[勾引]</item>
+        <item>[OK]</item>
+        <item>[爱你]</item>
+        <item>[咖啡]</item>
+        <item>[月亮]</item>
+        <item>[刀]</item>
+        <item>[发抖]</item>
+        <item>[差劲]</item>
+        <item>[拳头]</item>
+        <item>[心碎了]</item>
+        <item>[太阳]</item>
+        <item>[礼物]</item>
+        <item>[皮球]</item>
+        <item>[骷髅]</item>
+        <item>[挥手]</item>
+        <item>[闪电]</item>
+        <item>[饥饿]</item>
+        <item>[困]</item>
+        <item>[咒骂]</item>
+        <item>[折磨]</item>
+        <item>[抠鼻]</item>
+        <item>[鼓掌]</item>
+        <item>[糗大了]</item>
+        <item>[左哼哼]</item>
+        <item>[打哈欠]</item>
+        <item>[快哭了]</item>
+        <item>[吓]</item>
+        <item>[篮球]</item>
+        <item>[乒乓]</item>
+        <item>[NO]</item>
+        <item>[跳跳]</item>
+        <item>[怄火]</item>
+        <item>[转圈]</item>
+        <item>[磕头]</item>
+        <item>[回头]</item>
+        <item>[跳绳]</item>
+        <item>[激动]</item>
+        <item>[街舞]</item>
+        <item>[献吻]</item>
+        <item>[左太极]</item>
+        <item>[右太极]</item>
+        <item>[闭嘴]</item>
+        <item>[猫咪]</item>
+        <item>[红双喜]</item>
+        <item>[鞭炮]</item>
+        <item>[红灯笼]</item>
+        <item>[麻将]</item>
+        <item>[麦克风]</item>
+        <item>[礼品袋]</item>
+        <item>[信封]</item>
+        <item>[象棋]</item>
+        <item>[彩带]</item>
+        <item>[蜡烛]</item>
+        <item>[爆筋]</item>
+        <item>[棒棒糖]</item>
+        <item>[奶瓶]</item>
+        <item>[面条]</item>
+        <item>[香蕉]</item>
+        <item>[飞机]</item>
+        <item>[左车头]</item>
+        <item>[车厢]</item>
+        <item>[右车头]</item>
+        <item>[多云]</item>
+        <item>[下雨]</item>
+        <item>[钞票]</item>
+        <item>[熊猫]</item>
+        <item>[灯泡]</item>
+        <item>[风车]</item>
+        <item>[闹钟]</item>
+        <item>[雨伞]</item>
+        <item>[彩球]</item>
+        <item>[钻戒]</item>
+        <item>[沙发]</item>
+        <item>[纸巾]</item>
+        <item>[手枪]</item>
+        <item>[青蛙]</item>
+    </string-array>
+
+    <string-array name="emoji_name">
+        <item>@string/ciya</item>
+        <item>@string/tiaopi</item>
+        <item>@string/liuhan</item>
+        <item>@string/touxiao</item>
+        <item>@string/zaijian</item>
+        <item>@string/qiaoda</item>
+        <item>@string/cahan</item>
+        <item>@string/zhutou</item>
+        <item>@string/meigui</item>
+        <item>@string/liulei</item>
+        <item>@string/daku</item>
+        <item>@string/xu</item>
+        <item>@string/ku</item>
+        <item>@string/zhukuang</item>
+        <item>@string/weiqu</item>
+        <item>@string/bianbian</item>
+        <item>@string/zhadan</item>
+        <item>@string/caidao</item>
+        <item>@string/keai</item>
+        <item>@string/se</item>
+        <item>@string/haixiu</item>
+        <item>@string/deyi</item>
+        <item>@string/tu</item>
+        <item>@string/weixiao</item>
+        <item>@string/nu</item>
+        <item>@string/ganga</item>
+        <item>@string/jingkong</item>
+        <item>@string/lenghan</item>
+        <item>@string/aixin</item>
+        <item>@string/shiai</item>
+        <item>@string/baiyan</item>
+        <item>@string/aoman</item>
+        <item>@string/nanguo</item>
+        <item>@string/jingya</item>
+        <item>@string/yiwen</item>
+        <item>@string/kun</item>
+        <item>@string/memeda</item>
+        <item>@string/hanxiao</item>
+        <item>@string/aiqing</item>
+        <item>@string/suan</item>
+        <item>@string/piezui</item>
+        <item>@string/yinxian</item>
+        <item>@string/fendou</item>
+        <item>@string/fadai</item>
+        <item>@string/youhengheng</item>
+        <item>@string/baobao</item>
+        <item>@string/huaixiao</item>
+        <item>@string/feiwen</item>
+        <item>@string/bishi</item>
+        <item>@string/yun</item>
+        <item>@string/dabing</item>
+        <item>@string/kelian</item>
+        <item>@string/qiang</item>
+        <item>@string/ruo</item>
+        <item>@string/woshou</item>
+        <item>@string/shengli</item>
+        <item>@string/baoquan</item>
+        <item>@string/diaoxie</item>
+        <item>@string/mifan</item>
+        <item>@string/dangao</item>
+        <item>@string/xigua</item>
+        <item>@string/pijiu</item>
+        <item>@string/piaochong</item>
+        <item>@string/gouyin</item>
+        <item>@string/ok_emoji</item>
+        <item>@string/aini</item>
+        <item>@string/kafei</item>
+        <item>@string/yueliang</item>
+        <item>@string/dao</item>
+        <item>@string/fadou</item>
+        <item>@string/chajin</item>
+        <item>@string/quantou</item>
+        <item>@string/xinsuile</item>
+        <item>@string/taiyang</item>
+        <item>@string/liwu</item>
+        <item>@string/piqiu</item>
+        <item>@string/kulou</item>
+        <item>@string/huishou</item>
+        <item>@string/shandian</item>
+        <item>@string/jie</item>
+        <item>@string/kun2</item>
+        <item>@string/zhouma</item>
+        <item>@string/zhemo</item>
+        <item>@string/koubi</item>
+        <item>@string/guzhang</item>
+        <item>@string/qiudale</item>
+        <item>@string/zuohengheng</item>
+        <item>@string/dahaqian</item>
+        <item>@string/kuaikule</item>
+        <item>@string/xia</item>
+        <item>@string/lanqiu</item>
+        <item>@string/pingpang</item>
+        <item>@string/no_emoji</item>
+        <item>@string/tiaotiao</item>
+        <item>@string/ouhuo</item>
+        <item>@string/zuanquan</item>
+        <item>@string/ketou</item>
+        <item>@string/huitou</item>
+        <item>@string/tiaosheng</item>
+        <item>@string/jidong</item>
+        <item>@string/jiewu</item>
+        <item>@string/xianwen</item>
+        <item>@string/zuotaiji</item>
+        <item>@string/youtaiji</item>
+        <item>@string/bizui</item>
+        <item>@string/maomi</item>
+        <item>@string/hongshuangxi</item>
+        <item>@string/bianpao</item>
+        <item>@string/hongdenglong</item>
+        <item>@string/majiang</item>
+        <item>@string/maikefeng</item>
+        <item>@string/lipindai</item>
+        <item>@string/xinfeng</item>
+        <item>@string/xiangqi</item>
+        <item>@string/caidai</item>
+        <item>@string/lazhu</item>
+        <item>@string/baojin</item>
+        <item>@string/bangbangtang</item>
+        <item>@string/naiping</item>
+        <item>@string/miantiao</item>
+        <item>@string/xiangjiao</item>
+        <item>@string/feiji</item>
+        <item>@string/zuochetou</item>
+        <item>@string/chexiang</item>
+        <item>@string/youchetou</item>
+        <item>@string/duoyun</item>
+        <item>@string/xiayu</item>
+        <item>@string/chaopiao</item>
+        <item>@string/xiongmao</item>
+        <item>@string/dengpao</item>
+        <item>@string/fengche</item>
+        <item>@string/naozhong</item>
+        <item>@string/yusan</item>
+        <item>@string/caiqiu</item>
+        <item>@string/zuanjie</item>
+        <item>@string/shafa</item>
+        <item>@string/zhijin</item>
+        <item>@string/shouqiang</item>
+        <item>@string/qingwa</item>
+    </string-array>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/values/attrs.xml b/system/tuichat/src/main/res/values/attrs.xml
new file mode 100644
index 0000000..3254b0d
--- /dev/null
+++ b/system/tuichat/src/main/res/values/attrs.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <attr name="iconSize" format="dimension" />
+    <attr name="iconMargin" format="dimension" />
+    <attr name="iconSrc" format="reference" />
+    <attr name="iconLeft" format="reference" />
+    <attr name="iconRight" format="reference" />
+    <attr name="duration_max" format="integer" />
+
+    <declare-styleable name="JCameraView">
+        <attr name="iconSize" />
+        <attr name="iconMargin" />
+        <attr name="iconSrc" />
+        <attr name="iconLeft" />
+        <attr name="iconRight" />
+        <attr name="duration_max" />
+    </declare-styleable>
+
+
+
+    <declare-styleable name="SynthesizedImageView">
+        <!--合成图片的背景-->
+        <attr name="synthesized_image_bg" format="color" />
+        <!--合成图片的默认图片-->
+        <attr name="synthesized_default_image" format="reference" />
+        <!--合成图片的尺寸-->
+        <attr name="synthesized_image_size" format="dimension" />
+        <!--多图片之间的空隙间隔-->
+        <attr name="synthesized_image_gap" format="dimension" />
+    </declare-styleable>
+
+    <declare-styleable name="max_width_style">
+        <attr name="maxWidth" format="dimension" />
+    </declare-styleable>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/values/colors.xml b/system/tuichat/src/main/res/values/colors.xml
new file mode 100644
index 0000000..d929aea
--- /dev/null
+++ b/system/tuichat/src/main/res/values/colors.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="chat_background_color">#FFFFFF</color>
+
+    <color name="chat_bubble_other_color">#ECECEC</color>
+    <color name="chat_bubble_self_color">#DCEAFD</color>
+
+    <!-- 线 -->
+    <color name="chat_title_line_color">#E6E6E6</color>
+    <color name="input_title_line_color">#D2D2D2</color>
+
+    <color name="chat_title_bar_bg">#EBF0F6</color>
+
+    <color name="voice_pressed">#DEDEDE</color>
+    <color name="voice_normal">#ffffff</color>
+    <color name="test_blue">#338BFF</color>
+
+    <color name="line">#DDDDDD</color>
+    <color name="navigation_bar_color">#F7F7F7</color>
+    <color name="transparent">#00000000</color>
+
+    <color name="green">#21BEBD</color>
+    <color name="white">#FFFFFF</color>
+    <color name="text_color_gray">#696969</color>
+    <color name="black_font_color">#181818</color>
+    <color name="text_tips_color">#A5A5A5</color>
+
+    <color name="list_bottom_text_bg">#999999</color>
+    <color name="font_blue">#066fff</color>
+
+    <color name="text_gray1">#777777</color>
+    <color name="split_lint_color">#D9D9D9</color>
+
+    <color name="black">#333030</color>
+    <color name="dialog_line_bg">#c6c6c6</color>
+
+    <color name="chat_text_color">#000000</color>
+    <color name="chat_message_bubble_bg_stoke_color">#DDDDDD</color>
+
+    <color name="reply_preview_text_color">#EBF0F6</color>
+    <color name="reply_msg_sender_text_color">#FF888888</color>
+    <color name="reply_msg_abstract_text_color">#FF888888</color>
+
+    <color name="reply_abstract_bg">#0D444444</color>
+    <color name="reply_abstract_line_bg">#1A444444</color>
+    <color name="reply_msg_text">#FF888888</color>
+
+    <color name="chat_message_bubble_high_light_light_color">#33FF9800</color>
+    <color name="chat_message_bubble_high_light_dark_color">#80FF9800</color>
+
+    <color name="chat_unread_count_tip_color">#AABCD1</color>
+    <color name="jum_message_text_color">#147AFF</color>
+
+    <color name="order_message_color">#FF7201</color>
+
+    <color name="text_color_black_33">#333333</color>
+    <color name="text_color_black_66">#666666</color>
+    <color name="text_color_black_99">#999999</color>
+    <color name="text_color_black_4A">#4A4A4A</color>
+
+    <color name="rating_bar_color">#F19927</color>
+</resources>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/values/dimens.xml b/system/tuichat/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..4b5f0ab
--- /dev/null
+++ b/system/tuichat/src/main/res/values/dimens.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="page_title_height">48dp</dimen>
+    <dimen name="page_margin">10dp</dimen>
+
+    <dimen name="btn_margin_top">36dp</dimen>
+    <dimen name="btn_margin_left">12dp</dimen>
+    <dimen name="btn_margin_right">12dp</dimen>
+    <dimen name="btn_margin_bottom">8dp</dimen>
+    <dimen name="btn_margin_middle">10dp</dimen>
+    <dimen name="btn_padding_left">16dp</dimen>
+    <dimen name="btn_padding_right">16dp</dimen>
+
+    <dimen name="item_height">49.35dp</dimen>
+    <dimen name="item_width">49.35dp</dimen>
+
+    <dimen name="forward_text_max_length">180dp</dimen>
+
+    <dimen name="chat_message_content_max_width">235dp</dimen>
+
+    <dimen name="chat_message_bg_stoke_width">1dp</dimen>
+    <dimen name="chat_item_padding_bottom">7dp</dimen>
+    <dimen name="chat_message_text_size">15.55sp</dimen>
+    <dimen name="chat_input_editor_height">32.64dp</dimen>
+    <dimen name="chat_input_icon_size">26.88dp</dimen>
+
+    <dimen name="chat_input_text_size">15.55sp</dimen>
+
+    <dimen name="reply_msg_padding">8dp</dimen>
+    <dimen name="reply_line_margin_right">7.78dp</dimen>
+
+    <dimen name="reply_sender_margin_top">3.29dp</dimen>
+
+    <dimen name="reply_text_size">15.55sp</dimen>
+    <dimen name="reply_origin_text_size">12.07sp</dimen>
+
+    <dimen name="reply_message_content_max_width">175dp</dimen>
+    <dimen name="reply_message_content_min_width">100dp</dimen>
+    <dimen name="reply_message_image_size">50dp</dimen>
+
+    <dimen name="reply_abstract_padding_bottom">4.39dp</dimen>
+    <dimen name="reply_abstract_margin_bottom">4.39dp</dimen>
+    <dimen name="reply_abstract_margin_right">8dp</dimen>
+    <dimen name="reply_abstract_margin_left">6dp</dimen>
+    <dimen name="reply_merge_text_size">12sp</dimen>
+    <dimen name="reply_icon_size">16dp</dimen>
+
+    <dimen name="chat_pop_menu_padding_top">15.48dp</dimen>
+    <dimen name="chat_pop_menu_padding_left_right">16.32dp</dimen>
+    <dimen name="chat_pop_menu_padding_bottom">10.96dp</dimen>
+    <dimen name="chat_pop_menu_item_height">35.8dp</dimen>
+    <dimen name="chat_pop_menu_icon_size">19.2dp</dimen>
+    <dimen name="chat_pop_menu_icon_margin_top">15.48dp</dimen>
+    <dimen name="chat_pop_menu_font_size">9.6sp</dimen>
+    <dimen name="chat_pop_menu_text_margin_top">3.92dp</dimen>
+    <dimen name="chat_pop_menu_indicator_height">7dp</dimen>
+    <dimen name="chat_pop_menu_radius">8dp</dimen>
+    <dimen name="chat_pop_menu_item_space_width">5.28dp</dimen>
+    <dimen name="chat_pop_menu_item_space_height">3.84dp</dimen>
+
+    <dimen name="chat_message_area_padding_left_right">11.52dp</dimen>
+    <dimen name="chat_message_area_padding_top_bottom">9.6dp</dimen>
+    <!--位置消息-->
+    <dimen name="chat_message_location_title">14sp</dimen>
+    <dimen name="chat_message_location_map_height">100dp</dimen>
+    <dimen name="chat_message_location_padding">10dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/values/strings-emoji.xml b/system/tuichat/src/main/res/values/strings-emoji.xml
new file mode 100644
index 0000000..5413abb
--- /dev/null
+++ b/system/tuichat/src/main/res/values/strings-emoji.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="ciya">[Grin]</string>
+    <string name="tiaopi">[Tongue]</string>
+    <string name="liuhan">[Sweat]</string>
+    <string name="touxiao">[Chuckle]</string>
+    <string name="zaijian">[Bye]</string>
+    <string name="qiaoda">[Hammer]</string>
+    <string name="cahan">[Speechless]</string>
+    <string name="zhutou">[Pig]</string>
+    <string name="meigui">[Rose]</string>
+    <string name="liulei">[Sob]</string>
+    <string name="daku">[Cry]</string>
+    <string name="xu">[Shhh]</string>
+    <string name="ku">[Cool]</string>
+    <string name="zhukuang">[Scream]</string>
+    <string name="weiqu">[Shrunken]</string>
+    <string name="bianbian">[Poop]</string>
+    <string name="zhadan">[Bomb]</string>
+    <string name="caidao">[Cleaver]</string>
+    <string name="keai">[Cute]</string>
+    <string name="se">[Drool]</string>
+    <string name="haixiu">[Shy]</string>
+    <string name="deyi">[Cool Guy]</string>
+    <string name="tu">[Puke]</string>
+    <string name="weixiao">[Smile]</string>
+    <string name="nu">[Angry]</string>
+    <string name="ganga">[Awkward]</string>
+    <string name="jingkong">[Panic]</string>
+    <string name="lenghan">[Cold Sweat]</string>
+    <string name="aixin">[Heart]</string>
+    <string name="shiai">[I Love You]</string>
+    <string name="baiyan">[Slight]</string>
+    <string name="aoman">[Smug]</string>
+    <string name="nanguo">[Frown]</string>
+    <string name="jingya">[Surprise]</string>
+    <string name="yiwen">[Shocked]</string>
+    <string name="kun">[Drowsy]</string>
+    <string name="memeda">[Kiss]</string>
+    <string name="hanxiao">[Laugh]</string>
+    <string name="aiqing">[In Love]</string>
+    <string name="suan">[Toasted]</string>
+    <string name="piezui">[Grimace]</string>
+    <string name="yinxian">[Sly]</string>
+    <string name="fendou">[Determined]</string>
+    <string name="fadai">[Scowl]</string>
+    <string name="youhengheng">[Bah! R]</string>
+    <string name="baobao">[Hug]</string>
+    <string name="huaixiao">[Trick]</string>
+    <string name="feiwen">[Blowkiss]</string>
+    <string name="bishi">[Pooh-pooh]</string>
+    <string name="yun">[Dizzy]</string>
+    <string name="dabing">[Soldier]</string>
+    <string name="kelian">[Whimper]</string>
+    <string name="qiang">[Thumbs Up]</string>
+    <string name="ruo">[Thumbs Down]</string>
+    <string name="woshou">[Shake]</string>
+    <string name="shengli">[Peace]</string>
+    <string name="baoquan">[Salute]</string>
+    <string name="diaoxie">[Wilt]</string>
+    <string name="mifan">[Rice]</string>
+    <string name="dangao">[Cake]</string>
+    <string name="xigua">[Watermelon]</string>
+    <string name="pijiu">[Beer]</string>
+    <string name="piaochong">[Ladybug]</string>
+    <string name="gouyin">[Beckon]</string>
+    <string name="ok_emoji">[OK]</string>
+    <string name="aini">[Love]</string>
+    <string name="kafei">[Coffee]</string>
+    <string name="yueliang">[Moon]</string>
+    <string name="dao">[Dagger]</string>
+    <string name="fadou">[Tremble]</string>
+    <string name="chajin">[Pinky]</string>
+    <string name="quantou">[Fist]</string>
+    <string name="xinsuile">[Broken Heart]</string>
+    <string name="taiyang">[Sun]</string>
+    <string name="liwu">[Gift]</string>
+    <string name="piqiu">[Ball]</string>
+    <string name="kulou">[Skull]</string>
+    <string name="huishou">[Waving Hand]</string>
+    <string name="shandian">[Lightning]</string>
+    <string name="jie">[Hungry]</string>
+    <string name="kun2">[Drowsy]</string>
+    <string name="zhouma">[Scold]</string>
+    <string name="zhemo">[Torture]</string>
+    <string name="koubi">[Nosepick]</string>
+    <string name="guzhang">[Clap]</string>
+    <string name="qiudale">[Shame]</string>
+    <string name="zuohengheng">[Bah! L]</string>
+    <string name="dahaqian">[Yawn]</string>
+    <string name="kuaikule">[Tearing Up]</string>
+    <string name="xia">[Uh Oh]</string>
+    <string name="lanqiu">[Basketball]</string>
+    <string name="pingpang">[PingPong]</string>
+    <string name="no_emoji">[NO]</string>
+    <string name="tiaotiao">[Waddle]</string>
+    <string name="ouhuo">[Aaagh!]</string>
+    <string name="zuanquan">[Twirl]</string>
+    <string name="ketou">[Kowtow]</string>
+    <string name="huitou">[Lookback]</string>
+    <string name="tiaosheng">[Jump]</string>
+    <string name="jidong">[Hooray]</string>
+    <string name="jiewu">[HeyHey]</string>
+    <string name="xianwen">[Smooch]</string>
+    <string name="zuotaiji">[Tai Ji L]</string>
+    <string name="youtaiji">[Tai Ji R]</string>
+    <string name="bizui">[Silent]</string>
+    <string name="maomi">[Cat]</string>
+    <string name="hongshuangxi">[Double Happines]</string>
+    <string name="bianpao">[Firecracker]</string>
+    <string name="hongdenglong">[Red Lantern]</string>
+    <string name="majiang">[Mahjong]</string>
+    <string name="maikefeng">[Mic]</string>
+    <string name="lipindai">[Gift Bag]</string>
+    <string name="xinfeng">[Envelope]</string>
+    <string name="xiangqi">[Chess]</string>
+    <string name="caidai">[Ribbon]</string>
+    <string name="lazhu">[Candle]</string>
+    <string name="baojin">[Blue Veins]</string>
+    <string name="bangbangtang">[Lollipop]</string>
+    <string name="naiping">[Milk Bottle]</string>
+    <string name="miantiao">[Noodles]</string>
+    <string name="xiangjiao">[Banana]</string>
+    <string name="feiji">[Plane]</string>
+    <string name="zuochetou">[Locomotive L]</string>
+    <string name="chexiang">[Carriage]</string>
+    <string name="youchetou">[Locomotive R]</string>
+    <string name="duoyun">[Cloud]</string>
+    <string name="xiayu">[Rain]</string>
+    <string name="chaopiao">[Money]</string>
+    <string name="xiongmao">[Panda]</string>
+    <string name="dengpao">[Light Bulb]</string>
+    <string name="fengche">[Windmill]</string>
+    <string name="naozhong">[Alarm]</string>
+    <string name="yusan">[Umbrella]</string>
+    <string name="caiqiu">[Colored Ball]</string>
+    <string name="zuanjie">[Ring]</string>
+    <string name="shafa">[Sofa]</string>
+    <string name="zhijin">[Tissue]</string>
+    <string name="shouqiang">[Pistol]</string>
+    <string name="qingwa">[Frog]</string>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/values/strings.xml b/system/tuichat/src/main/res/values/strings.xml
new file mode 100644
index 0000000..876ce2b
--- /dev/null
+++ b/system/tuichat/src/main/res/values/strings.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ExtraTranslation">
+
+    <string name="pic">Album</string>
+    <string name="photo">Take Photo</string>
+    <string name="video">Record Video</string>
+    <string name="file">File</string>
+
+    <string name="release_end">Release to Send</string>
+    <string name="hold_say">Hold to Talk</string>
+
+    <string name="copy_action">Copy</string>
+    <string name="translate_action">Translate</string>
+    <string name="delete_action">Delete</string>
+    <string name="revoke_action">Recall</string>
+    <string name="resend_action">Resend</string>
+    <string name="hide_action">Hide</string>
+
+    <string name="copy_success_tip">Copy Success</string>
+
+    <string name="chat_message_detail">Message details</string>
+
+    <string name="translation_support">Translated by IM</string>
+    <string name="translation_fail">Translation failed</string>
+    <!-- 消息转发 -->
+
+    <string name="titlebar_back">Back</string>
+    <string name="forward_tip">please select message!</string>
+    <string name="forward_mode_onebyone">One-by-one forward</string>
+    <string name="forward_mode_merge">Combine and forward</string>
+    <string name="forward_button">Forward</string>
+    <string name="reply_button">Reply</string>
+    <string name="quote_button">Quote</string>
+    <string name="info_button">Info</string>
+    <string name="delete_button">Delete</string>
+    <string name="chat_delete_msg_tip">Delete now</string>
+
+    <string name="forward_chats">Group Chat History</string>
+    <string name="and_text">and</string>
+    <string name="forward_chats_c2c">Chat History</string>
+    <string name="forward_compatible_text">Combine and Forward is not available. Upgrade to the latest version first.</string>
+    <string name="forward_chat_record">Chat Record</string>
+
+    <string name="forward_failed_tip">Unable to forward failed messages.</string>
+    <string name="forward_oneByOne_limit_number_tip">Unable to forward the messages one by one because there are too many messages.</string>
+
+    <string name="and_and"> </string>
+    <string name="be_friend">is your friend now.</string>
+
+    <string name="join_group_tip">You have been invited to the group: </string>
+    <string name="joined_tip">You have joined the group: </string>
+    <string name="reject_join_tip">You are rejected from joining the group: </string>
+    <string name="kick_group">You have been kicked out of the group: </string>
+
+
+    <string name="send_two_mins">Message sent more than 2 min ago</string>
+    <string name="revoke_fail">Failed to recall</string>
+
+    <string name="wait_tip">please try again later</string>
+    <string name="group_apply_tips">%1$d group joining request(s)</string>
+
+    <string name="dismiss_tip_before">Your group</string>
+    <string name="dismiss_tip_after">is disbanded.</string>
+    <string name="get_system_notice">Received a custom system notification: </string>
+
+    <string name="down_cancle_send">Slide up to cancel</string>
+    <string name="say_time_short">Message too short</string>
+    <string name="record_fail">Recording failed</string>
+    <string name="up_cancle_send">Release to Cancel</string>
+
+    <string name="send">Send</string>
+
+    <string name="custom_msg">[Custom Messages]</string>
+    <string name="custom_emoji">[Animated Sticker]</string>
+    <string name="picture_extra">[Image]</string>
+    <string name="video_extra">[Video]</string>
+    <string name="audio_extra">[Voice]</string>
+    <string name="file_extra">[File]</string>
+    <string name="location_extra">[Location]</string>
+
+    <string name="locate_origin_msg_failed_tip">Unable to locate the original message.</string>
+
+    <string name="forward_extra">[Chat Record]</string>
+    <string name="revoke_tips_you">You recalled a message.</string>
+    <string name="revoke_tips">recalled a message.</string>
+    <string name="revoke_tips_other">A message is recalled.</string>
+
+    <string name="create_group">Create Group</string>
+    <string name="etc">, etc.</string>
+    <string name="join_group">Join Group</string>
+    <string name="invite_joined_group">is invited to the group.</string>
+    <string name="quit_group">Leave Group</string>
+    <string name="kick_group_tip">is removed from the group.</string>
+    <string name="be_group_manager">is set as admin.</string>
+    <string name="cancle_group_manager">\'s admin status is terminated.</string>
+    <string name="modify_group_name_is">Change the group name to</string>
+    <string name="modify_notice">Change the group notice to</string>
+    <string name="modify_introduction">Change the group introduction to</string>
+    <string name="modify_shut_up_all">Mute All</string>
+    <string name="modify_cancel_shut_up_all">Unmute All</string>
+    <string name="move_owner">Transfer group ownership to</string>
+    <string name="modify_group_avatar">changed the group profile photo.</string>
+    <string name="banned">is blocked from posting</string>
+    <string name="cancle_banned">is unblocked and can post now</string>
+    <string name="modify_group_add_opt">changed group add option to </string>
+    <string name="group_add_opt_auto_approval">Auto Approval</string>
+    <string name="group_add_opt_admin_approve">Admin Approval</string>
+    <string name="group_add_opt_join_disable">Prohibited from Joining</string>
+
+    <string name="typing">Typing...</string>
+    <string name="titlebar_mutiselect">Select</string>
+    <string name="audio_permission_error">Need audio permission</string>
+    <string name="record_occupied">record occupied</string>
+    <string name="record_null">record is null</string>
+    <string name="record_limit_tips">Maximum voice length reached</string>
+    <string name="record_rejected_for_in_call">An audio and video call is in progress, please try again later</string>
+    <string name="record_rejected_for_in_recording">The current recording is not over</string>
+    <string name="play_error_tip">The voice file is damaged or does not exist</string>
+    <string name="input_tip">No nickname. Enter again.</string>
+
+    <string name="has_read">Read</string>
+    <string name="unread">Unread</string>
+    <string name="delivered">Delivered to</string>
+    <string name="has_all_read">All read</string>
+    <string name="someone_has_read">%d read</string>
+    <string name="someone_unread">%d unread</string>
+    <string name="someone_have_read">%d have read</string>
+
+    <string name="un_download">Not downloaded</string>
+    <string name="downloaded">Downloaded</string>
+    <string name="downloading">Downloading...</string>
+    <string name="send_failed">Send Failed</string>
+    <string name="send_failed_file_not_exists">Send failed, file not exists</string>
+    <string name="sended">Sent</string>
+    <string name="sending">Sending...</string>
+    <string name="open_file_tips">Select an app to open the file</string>
+    <string name="download_file_error">Failed to download video: </string>
+    <string name="voice_play_tip">Voice file not downloaded.</string>
+
+    <string name="device_info">device info:</string>
+    <string name="system_version">\n system version:</string>
+    <string name="sdk_version">\n SDK version:</string>
+
+    <string name="permission_content">To use this feature, you need to grant permission. Since you have disabled related permission, please manually enable the permission.</string>
+    <string name="setting">Settings</string>
+
+    <string name="no_event_cancle_tip">no cancle event on browser</string>
+    <string name="no_event_confirm_tip">no confirm event on browser</string>
+
+    <string name="record_time_tip">The recording time is too short.</string>
+    <string name="tap_tips">tap for photo, hold for record</string>
+    <string name="tap_capture">tap to take photo</string>
+    <string name="tap_video">hold to record video</string>
+
+    <string name="completed">completed</string>
+    <string name="view_original_image">View Full Image</string>
+
+    <string name="at_all">All</string>
+    <string name="ui_at_all">[@All]</string>
+    <string name="ui_at_me">[Someone @ me]</string>
+    <string name="ui_at_all_me">[@All][Someone @ me]</string>
+    <string name="drafts">[Drafts]</string>
+
+    <string name="group_apply_click_handle">Tap to Process</string>
+    <string name="no_support_msg">Unsupported custom messages</string>
+
+    <string name="live">\'s live stream</string>
+    <string name="live_group_live_streaming">Live Streaming</string>
+    <string name="live_group_live_end">Live Over</string>
+    <string name="live_group_user_live">%s Live</string>
+    <string name="live_group_live">Live Group</string>
+
+
+    <string name="start_group_call">Start Group Call</string>
+    <string name="start_call">Start Call</string>
+    <string name="cancle_group_call">Cancel Group Call</string>
+    <string name="cancle_call">Cancel Call</string>
+    <string name="other_line_busy">Line busy</string>
+    <string name="reject_group_calls">Decline Group Call</string>
+    <string name="no_response_call">No answer</string>
+    <string name="accept_call">Answered</string>
+    <string name="line_busy">Line busy</string>
+    <string name="reject_call">reject</string>
+    <string name="invalid_command">invalid command</string>
+    <string name="stop_group_call">End Group Call</string>
+    <string name="stop_call_tip">Duration:</string>
+    <string name="reject_calls">Decline Call</string>
+    <string name="chat_calling_switch_to_audio">Switch to voice call</string>
+    <string name="chat_calling_switch_to_audio_accept">Confirm video to voice</string>
+    <string name="chat_calling_unknown_invitation">Unknown invitation</string>
+
+    <string name="test_custom_message">View Details>></string>
+
+    <string name="test_custom_action">Custom</string>
+    <string name="welcome_tip">Welcome to Tencent Cloud Instant Messaging!</string>
+
+    <string name="resend_tips">Are you sure you want to resend?</string>
+    <string name="delete_tips">Are you sure you want to delete this message?</string>
+    <string name="reedit_msg">Re-edit</string>
+    <string name="save_success">Saved successfully</string>
+    <string name="save_failed">Saved failed</string>
+    <string name="saving_tips">Saving</string>
+
+    <string name="back_to_lastmessage">Go to Latest Message</string>
+    <string name="back_to_newmessage"> New Message(s)</string>
+    <string name="back_to_atmessage_all">\@All</string>
+    <string name="back_to_atmessage_me">Someone @ me</string>
+
+    <string name="chat_permission_mic_reason_title">%s applies for access to the microphone</string>
+    <string name="chat_permission_mic_reason">In order for you to send voice messages, make video and audio and video calls, please allow us to access the microphone.</string>
+    <string name="chat_permission_camera_reason_title">%s applies for camera permission</string>
+    <string name="chat_permission_camera_reason">In order for you to take photos or videos to send to friends, and to make video calls, please allow us to access the webcam.</string>
+    <string name="chat_permission_storage_reason_title">%s applies for storage permission</string>
+    <string name="chat_permission_storage_reason">In order for you to save photos and videos to your device, please allow us to write photos and videos to your device.</string>
+    <string name="chat_permission_mic_dialog_alert">Allow microphone access in Settings->Apps->%s to use voice messages, video cameras, and audio and video calls as normal</string>
+    <string name="chat_permission_camera_dialog_alert">Allow camera access in Settings->Apps->%s to use the photo, video and video calling functions as normal</string>
+    <string name="chat_permission_storage_dialog_alert">Allow storage access in Settings->Apps->%s to use the function of saving photos and videos normally</string>
+
+    <string name="chat_message_read_receipt">Message Read Receipt</string>
+    <string name="chat_i_know">I got it</string>
+    <string name="chat_no_more_reminders">No more reminders</string>
+    <string name="chat_im_flagship">Ultimate Edition</string>
+    <string name="chat_buying_guidelines">price description</string>
+    <string name="chat_im_flagship_edition_update_tip">%s feature is only available to the Ultimate edition, which can be used after purchasing the Ultimate Edition. See the price guidelines for details.</string>
+
+    <string name="chat_reply_num">%d replied</string>
+    <string name="chat_reply_detail">Reply detail</string>
+
+    <string name="chat_not_read">Unread</string>
+
+    <string name="custom_evaluation_message">Evaluation of this service</string>
+    
+    <string name="chat_input_edit_hint_text">Send a message</string>
+    <string name="chat_header_not_desc">No description yet.</string>
+    <string name="chat_tips_not_login">Not logged in.</string>
+
+    <string name="chat_user_status_online">online</string>
+    <string name="chat_user_status_offline">offline</string>
+    <string name="chat_user_status_unknown">unknown</string>
+
+    <!--自定义消息名称-->
+    <string name="chat_message_type_location">位置</string>
+    <string name="chat_message_type_archives">档案</string>
+    <string name="chat_message_type_business_card">名片</string>
+    <string name="chat_message_type_medical_examination_report">体检报告</string>
+    <string name="chat_message_type_end_consultation">结束咨询</string>
+    <string name="chat_message_type_system">系统消息</string>
+    <!--名片-->
+    <string name="chat_message_business_card_title">个人名片</string>
+    <!--档案-->
+    <string name="chat_message_archives_gender_and_age" formatted="false">%s&#160;&#160;|&#160;&#160;%d岁</string>
+    <string name="chat_message_archives_symptom_description" formatted="false">
+        <![CDATA[ <font color="#333333">症状描述：</font> %s]]>
+    </string>
+    <!--体检报告-->
+    <string name="chat_message_medical_examination_report_user_info" formatted="false">%s-%s-%s</string>
+    <string name="chat_message_medical_examination_report_hospital" formatted="false">%s&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;%s</string>
+    <!--系统消息-->
+    <string name="chat_message_system_title">系统消息</string>
+    <string name="chat_message_system_go_appraise">去评价</string>
+    <string name="chat_message_system_go_perfect">去完善</string>
+    <!--评价-->
+    <string name="chat_message_appraise_title">服务评价</string>
+</resources>
diff --git a/system/tuichat/src/main/res/values/styles.xml b/system/tuichat/src/main/res/values/styles.xml
new file mode 100644
index 0000000..eae6a82
--- /dev/null
+++ b/system/tuichat/src/main/res/values/styles.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="BottomDialog" parent="@style/Base.V7.Theme.AppCompat.Light.Dialog">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+    </style>
+    <style name="BottomDialog.Animation" parent="Animation.AppCompat.Dialog">
+        <item name="android:windowEnterAnimation">@anim/translate_dialog_in</item>
+        <item name="android:windowExitAnimation">@anim/translate_dialog_out</item>
+    </style>
+
+    <style name="ChatPopMenuAnimation">
+        <item name="android:windowEnterAnimation">@anim/chat_pop_menu_in_anim</item>
+        <item name="android:windowExitAnimation">@anim/chat_pop_menu_out_anim</item>
+    </style>
+
+    <style name="RatingBaropreview" parent="@android:style/Widget.RatingBar">
+        <item name="android:progressDrawable">@drawable/layer_live_rating_bar</item>
+        <item name="android:minHeight">25dp</item>
+        <item name="android:maxHeight">25dp</item>
+    </style>
+
+    <style name="BeginnerGuidePopupAnimation">
+        <item name="android:windowEnterAnimation">@anim/beginner_guide_in_anim</item>
+        <item name="android:windowExitAnimation">@anim/beginner_guide_out_anim</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/system/tuichat/src/main/res/values/tui_theme_attrs.xml b/system/tuichat/src/main/res/values/tui_theme_attrs.xml
new file mode 100644
index 0000000..68ebfcf
--- /dev/null
+++ b/system/tuichat/src/main/res/values/tui_theme_attrs.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- 参与换肤的属性 -->
+    <attr name="chat_bubble_self_bg" format="reference"/>
+    <attr name="chat_bubble_other_bg" format="reference"/>
+    <attr name="chat_bubble_self_bg_color" format="reference|color"/>
+    <attr name="chat_bubble_other_bg_color" format="reference|color"/>
+
+    <attr name="chat_input_area_bg" format="reference|color"/>
+
+    <attr name="chat_unread_dot_bg_color" format="color|reference"/>
+    <attr name="chat_unread_dot_text_color" format="color|reference"/>
+
+    <attr name="chat_title_bar_more_menu" format="reference"/>
+
+    <attr name="chat_other_msg_text_color" format="reference|color"/>
+    <attr name="chat_self_msg_text_color" format="reference|color"/>
+
+    <attr name="chat_self_custom_msg_text_color" format="reference|color"/>
+    <attr name="chat_other_custom_msg_text_color" format="reference|color"/>
+    <attr name="chat_self_custom_msg_link_color" format="reference|color"/>
+    <attr name="chat_other_custom_msg_link_color" format="reference|color"/>
+
+    <attr name="chat_tip_text_color" format="reference|color"/>
+
+    <attr name="chat_self_reply_quote_bg_color" format="reference|color"/>
+    <attr name="chat_other_reply_quote_bg_color" format="reference|color"/>
+    <attr name="chat_self_reply_line_bg_color" format="reference|color"/>
+    <attr name="chat_other_reply_line_bg_color" format="reference|color"/>
+    <attr name="chat_self_reply_quote_text_color" format="reference|color"/>
+    <attr name="chat_other_reply_quote_text_color" format="reference|color"/>
+    <attr name="chat_self_reply_text_color" format="reference|color"/>
+    <attr name="chat_other_reply_text_color" format="reference|color"/>
+
+    <attr name="chat_read_receipt_text_color" format="reference|color"/>
+    <attr name="chat_react_text_color" format="reference|color"/>
+    <attr name="chat_react_other_text_color" format="reference|color"/>
+    <attr name="chat_reply_detail_icon" format="reference"/>
+    <attr name="chat_jump_recent_down_icon" format="reference"/>
+    <attr name="chat_jump_recent_up_icon" format="reference"/>
+
+    <attr name="chat_pressed_bg_color" format="reference|color"/>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicontact/.gitignore b/system/tuicontact/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/system/tuicontact/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/system/tuicontact/build.gradle b/system/tuicontact/build.gradle
new file mode 100644
index 0000000..f8f13e5
--- /dev/null
+++ b/system/tuicontact/build.gradle
@@ -0,0 +1,50 @@
+plugins {
+    id 'com.android.library'
+}
+
+android {
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+
+    defaultConfig {
+        minSdkVersion 16
+        targetSdkVersion 30
+        versionCode 1
+        versionName "1.0"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    sourceSets {
+        main {
+            res.srcDirs += "src/main/res-light"
+            res.srcDirs += "src/main/res-lively"
+            res.srcDirs += "src/main/res-serious"
+            res.srcDirs += "src/main/res-minimalist"
+        }
+    }
+
+}
+
+afterEvaluate{
+    generateReleaseBuildConfig.enabled =false
+    generateDebugBuildConfig.enabled =false
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar','*.aar'], dir: 'libs')
+
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'com.google.android.material:material:1.3.0'
+
+    implementation 'com.google.code.gson:gson:2.8.7'
+    api project(':system:tuicore')
+}
\ No newline at end of file
diff --git a/system/tuicontact/libs/tinypinyin-2.0.1.jar b/system/tuicontact/libs/tinypinyin-2.0.1.jar
new file mode 100644
index 0000000..ab07af9
Binary files /dev/null and b/system/tuicontact/libs/tinypinyin-2.0.1.jar differ
diff --git a/system/tuicontact/src/main/AndroidManifest.xml b/system/tuicontact/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..0188a33
--- /dev/null
+++ b/system/tuicontact/src/main/AndroidManifest.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.tencent.qcloud.tuikit.tuicontact">
+    <application>
+        <provider
+            android:name=".TUIContactService"
+            android:authorities="${applicationId}.TUIContact.Init"
+            android:enabled="true"
+            android:exported="false"/>
+
+
+
+        <!-- **************** Classic UI Activity Start **************** -->
+        <activity
+            android:name=".classicui.pages.AddMoreActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".classicui.pages.FriendProfileActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".classicui.pages.NewFriendActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".classicui.pages.BlackListActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".classicui.pages.GroupListActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".classicui.pages.StartC2CChatActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".classicui.pages.StartGroupChatActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateAlwaysHidden|adjustPan" />
+
+        <activity
+            android:name=".classicui.pages.ForwardSelectGroupActivity"
+            android:launchMode="singleInstance"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".classicui.pages.StartGroupMemberSelectActivity"
+            android:launchMode="singleInstance"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".classicui.pages.CreateGroupActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".classicui.pages.GroupTypeSelectActivity"
+            android:screenOrientation="portrait" />
+        <!-- **************** Classic UI Activity End **************** -->
+
+
+
+
+
+        <!-- **************** Minimalist UI Activity Start **************** -->
+        <activity
+            android:name=".minimalistui.pages.AddMoreMinimalistActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".minimalistui.pages.FriendProfileMinimalistActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".minimalistui.pages.NewFriendMinimalistActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".minimalistui.pages.BlackListMinimalistActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".minimalistui.pages.GroupListMinimalistActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".minimalistui.pages.StartC2CChatMinimalistActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".minimalistui.pages.StartGroupChatMinimalistActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateAlwaysHidden|adjustPan" />
+
+        <activity
+            android:name=".minimalistui.pages.ForwardSelectGroupMinimalistActivity"
+            android:launchMode="singleInstance"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".minimalistui.pages.StartGroupMemberSelectMinimalistActivity"
+            android:launchMode="singleInstance"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".minimalistui.pages.CreateGroupMinimalistActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".minimalistui.pages.GroupTypeSelectMinimalistActivity"
+            android:screenOrientation="portrait" />
+        <!-- **************** Minimalist UI Activity End **************** -->
+
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/ITUIContactService.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/ITUIContactService.java
new file mode 100644
index 0000000..3520323
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/ITUIContactService.java
@@ -0,0 +1,27 @@
+package com.tencent.qcloud.tuikit.tuicontact;
+
+
+import com.tencent.qcloud.tuicore.interfaces.ITUINotification;
+import com.tencent.qcloud.tuicore.interfaces.ITUIService;
+
+import java.util.Map;
+
+public interface ITUIContactService extends ITUIService, ITUINotification {
+    @Override
+    Object onCall(String method, Map<String, Object> param);
+
+    /**
+     * 接收好友备注修改通知
+     * @param key TUIConstants.TUIContact.EVENT_FRIEND_INFO_CHANGED
+     * @param subKey TUIConstants.TUIContact.EVENT_SUB_KEY_FRIEND_REMARK_CHANGED
+     * @param param {TUIConstants.TUIContact.FRIEND_ID : String, TUIConstants.TUIContact.FRIEND_REMARK : String}
+     * 
+     * 
+     * Receive notification of friend's note modification
+     * @param key TUIConstants.TUIContact.EVENT_FRIEND_INFO_CHANGED
+     * @param subKey TUIConstants.TUIContact.EVENT_SUB_KEY_FRIEND_REMARK_CHANGED
+     * @param param {TUIConstants.TUIContact.FRIEND_ID : String, TUIConstants.TUIContact.FRIEND_REMARK : String}
+     */
+    @Override
+    void onNotifyEvent(String key, String subKey, Map<String, Object> param);
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/TUIContactConstants.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/TUIContactConstants.java
new file mode 100644
index 0000000..10ddda8
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/TUIContactConstants.java
@@ -0,0 +1,71 @@
+package com.tencent.qcloud.tuikit.tuicontact;
+
+import com.tencent.imsdk.BaseConstants;
+import com.tencent.imsdk.v2.V2TIMGroupAtInfo;
+
+public class TUIContactConstants {
+
+    public static final String FORWARD_SELECT_CONVERSATION_KEY = "forward_select_conversation_key";
+    public static final int FORWARD_SELECT_MEMBERS_CODE = 102;
+    public static final int FORWARD_CREATE_GROUP_CODE = 103;
+
+    public static final String FORWARD_CREATE_NEW_CHAT = "forward_create_new_chat";
+    public static final String IM_PRODUCT_DOC_URL = "https://cloud.tencent.com/product/im";
+    public static final String IM_PRODUCT_DOC_URL_EN = "https://www.tencentcloud.com/products/im?lang=en&pg=";
+    /**
+     * 1: 仅仅是一个带链接的文本消息
+     * 2: iOS支持的视频通话版本，后续已经不兼容
+     * 3: 未发布版本
+     * 4: Android/iOS/Web互通的视频通话版本
+     * 
+     * 1: Just a text message with a link
+     * 2: The video calling version supported by iOS is no longer compatible
+     * 3: unreleased version
+     * 4: Android/iOS/Web interoperable version for video call
+     */
+    public static final int JSON_VERSION_UNKNOWN = 0;
+    public static final int JSON_VERSION_1       = 1;
+    public static final int JSON_VERSION_4       = 4;
+    public static int version = JSON_VERSION_4;
+
+    public static final class Group {
+
+        public static final String GROUP_ID = "group_id";
+    }
+
+    public static class Selection {
+        public static final String SELECT_ALL = V2TIMGroupAtInfo.AT_ALL_TAG;
+        public static final String SELECT_FRIENDS = "select_friends";
+        public static final String SELECT_FOR_CALL = "isSelectForCall";
+        public static final String CONTENT = "content";
+        public static final String TYPE = "type";
+        public static final String TITLE = "title";
+        public static final String INIT_CONTENT = "init_content";
+        public static final String DEFAULT_SELECT_ITEM_INDEX = "default_select_item_index";
+        public static final String LIST = "list";
+        public static final String LIMIT = "limit";
+        public static final String SELECTED_LIST = "selectedList";
+
+        public static final int TYPE_TEXT = 1;
+        public static final int TYPE_LIST = 2;
+
+        public static final String USER_ID_SELECT = "user_id_select";
+        public static final String USER_NAMECARD_SELECT = "user_namecard_select";
+    }
+
+    public static class ProfileType {
+        public static final String CONTENT = "content";
+    }
+
+    public static class GroupType {
+        public static final String TYPE = "type";
+        public static final String GROUP = "isGroup";
+        public static final int PRIVATE = 0;
+        public static final int PUBLIC = 1;
+        public static final int CHAT_ROOM = 2;
+        public static final int COMMUNITY = 3;
+
+        public static final String TYPE_PUBLIC = "Public";
+    }
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/TUIContactService.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/TUIContactService.java
new file mode 100644
index 0000000..d8fb8c6
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/TUIContactService.java
@@ -0,0 +1,228 @@
+package com.tencent.qcloud.tuikit.tuicontact;
+
+import android.content.Context;
+
+import com.tencent.imsdk.v2.V2TIMFriendApplication;
+import com.tencent.imsdk.v2.V2TIMFriendInfo;
+import com.tencent.imsdk.v2.V2TIMFriendshipListener;
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMSDKListener;
+import com.tencent.imsdk.v2.V2TIMUserStatus;
+import com.tencent.qcloud.tuicore.ServiceInitializer;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.bean.FriendApplicationBean;
+import com.tencent.qcloud.tuikit.tuicontact.interfaces.ContactEventListener;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+public class TUIContactService extends ServiceInitializer implements ITUIContactService {
+    public static final String TAG = TUIContactService.class.getSimpleName();
+
+    private static TUIContactService instance;
+
+    public static TUIContactService getInstance() {
+        return instance;
+    }
+
+    private final List<WeakReference<ContactEventListener>> contactEventListenerList = new ArrayList<>();
+
+    @Override
+    public void init(Context context) {
+        instance = this;
+        initService();
+        initEvent();
+        initIMListener();
+    }
+
+    @Override
+    public Object onCall(String method, Map<String, Object> param) {
+        return null;
+    }
+
+
+    private void initService() {
+        TUICore.registerService(TUIConstants.TUIContact.SERVICE_NAME, this);
+    }
+
+    private void initEvent() {
+        TUICore.registerEvent(TUIConstants.TUIContact.EVENT_FRIEND_INFO_CHANGED, TUIConstants.TUIContact.EVENT_SUB_KEY_FRIEND_REMARK_CHANGED, this);
+    }
+
+    @Override
+    public void onNotifyEvent(String key, String subKey, Map<String, Object> param) {
+        if (key.equals(TUIConstants.TUIContact.EVENT_FRIEND_INFO_CHANGED)) {
+            if (subKey.equals(TUIConstants.TUIContact.EVENT_SUB_KEY_FRIEND_REMARK_CHANGED)) {
+                List<ContactEventListener> contactEventListenerList = getInstance().getContactEventListenerList();
+                if (param == null || param.isEmpty()) {
+                    return;
+                }
+                String id = (String) param.get(TUIConstants.TUIContact.FRIEND_ID);
+                String remark = (String) param.get(TUIConstants.TUIContact.FRIEND_REMARK);
+                for (ContactEventListener contactEventListener : contactEventListenerList) {
+                    contactEventListener.onFriendRemarkChanged(id ,remark);
+                }
+            }
+        }
+    }
+
+    private void initIMListener() {
+        V2TIMManager.getFriendshipManager().addFriendListener(new V2TIMFriendshipListener() {
+            @Override
+            public void onFriendApplicationListAdded(List<V2TIMFriendApplication> applicationList) {
+                List<ContactEventListener> contactEventListenerList = getInstance().getContactEventListenerList();
+                List<FriendApplicationBean> friendApplicationBeanList = new ArrayList<>();
+                for(V2TIMFriendApplication v2TIMFriendApplication : applicationList) {
+                    FriendApplicationBean friendApplicationBean = new FriendApplicationBean();
+                    friendApplicationBean.convertFromTimFriendApplication(v2TIMFriendApplication);
+                    friendApplicationBeanList.add(friendApplicationBean);
+                }
+                for (ContactEventListener contactEventListener : contactEventListenerList) {
+                    contactEventListener.onFriendApplicationListAdded(friendApplicationBeanList);
+                }
+            }
+
+            @Override
+            public void onFriendApplicationListDeleted(List<String> userIDList) {
+                List<ContactEventListener> contactEventListenerList = getInstance().getContactEventListenerList();
+                for (ContactEventListener contactEventListener : contactEventListenerList) {
+                    contactEventListener.onFriendApplicationListDeleted(userIDList);
+                }
+            }
+
+            @Override
+            public void onFriendApplicationListRead() {
+                List<ContactEventListener> contactEventListenerList = getInstance().getContactEventListenerList();
+                for (ContactEventListener contactEventListener : contactEventListenerList) {
+                    contactEventListener.onFriendApplicationListRead();
+                }
+            }
+
+            @Override
+            public void onFriendListAdded(List<V2TIMFriendInfo> users) {
+                List<ContactEventListener> contactEventListenerList = getInstance().getContactEventListenerList();
+                List<ContactItemBean> contactItemBeanList = new ArrayList<>();
+                for(V2TIMFriendInfo v2TIMFriendInfo : users) {
+                    ContactItemBean contactItemBean = new ContactItemBean();
+                    contactItemBean.setFriend(true);
+                    contactItemBean.covertTIMFriend(v2TIMFriendInfo);
+                    contactItemBeanList.add(contactItemBean);
+                }
+                for (ContactEventListener contactEventListener : contactEventListenerList) {
+                    contactEventListener.onFriendListAdded(contactItemBeanList);
+                }
+            }
+
+            @Override
+            public void onFriendListDeleted(List<String> userList) {
+                List<ContactEventListener> contactEventListenerList = getInstance().getContactEventListenerList();
+                for (ContactEventListener contactEventListener : contactEventListenerList) {
+                    contactEventListener.onFriendListDeleted(userList);
+                }
+                HashMap<String, Object> bundle = new HashMap<>();
+                bundle.put(TUIConstants.TUIContact.FRIEND_ID_LIST, new ArrayList<>(userList));
+                TUICore.notifyEvent(TUIConstants.TUIContact.EVENT_FRIEND_STATE_CHANGED,
+                        TUIConstants.TUIContact.EVENT_SUB_KEY_FRIEND_DELETE, bundle);
+            }
+
+            @Override
+            public void onBlackListAdd(List<V2TIMFriendInfo> infoList) {
+                List<ContactEventListener> contactEventListenerList = getInstance().getContactEventListenerList();
+                List<ContactItemBean> contactItemBeanList = new ArrayList<>();
+                for(V2TIMFriendInfo v2TIMFriendInfo : infoList) {
+                    ContactItemBean contactItemBean = new ContactItemBean();
+                    contactItemBean.covertTIMFriend(v2TIMFriendInfo);
+                    contactItemBeanList.add(contactItemBean);
+                }
+                for (ContactEventListener contactEventListener : contactEventListenerList) {
+                    contactEventListener.onBlackListAdd(contactItemBeanList);
+                }
+            }
+
+            @Override
+            public void onBlackListDeleted(List<String> userList) {
+                List<ContactEventListener> contactEventListenerList = getInstance().getContactEventListenerList();
+                for (ContactEventListener contactEventListener : contactEventListenerList) {
+                    contactEventListener.onBlackListDeleted(userList);
+                }
+            }
+
+            @Override
+            public void onFriendInfoChanged(List<V2TIMFriendInfo> infoList) {
+                List<ContactEventListener> contactEventListenerList = getInstance().getContactEventListenerList();
+                List<ContactItemBean> contactItemBeanList = new ArrayList<>();
+                for(V2TIMFriendInfo v2TIMFriendInfo : infoList) {
+                    ContactItemBean contactItemBean = new ContactItemBean();
+                    contactItemBean.setFriend(true);
+                    contactItemBean.covertTIMFriend(v2TIMFriendInfo);
+                    contactItemBeanList.add(contactItemBean);
+                }
+                for (ContactEventListener contactEventListener : contactEventListenerList) {
+                    contactEventListener.onFriendInfoChanged(contactItemBeanList);
+                }
+            }
+        });
+
+        V2TIMSDKListener v2TIMSDKListener = new V2TIMSDKListener() {
+            @Override
+            public void onUserStatusChanged(List<V2TIMUserStatus> userStatusList) {
+                List<ContactEventListener> contactEventListenerList = getInstance().getContactEventListenerList();
+                for (ContactEventListener contactEventListener : contactEventListenerList) {
+                    contactEventListener.onUserStatusChanged(userStatusList);
+                }
+            }
+        };
+        V2TIMManager.getInstance().addIMSDKListener(v2TIMSDKListener);
+    }
+
+    public List<ContactEventListener> getContactEventListenerList() {
+        List<ContactEventListener> contactEventListeners = new ArrayList<>();
+        Iterator<WeakReference<ContactEventListener>> iterator = contactEventListenerList.iterator();
+        while(iterator.hasNext()) {
+            WeakReference<ContactEventListener> weakReference = iterator.next();
+            if (weakReference.get() == null) {
+                iterator.remove();
+                continue;
+            }
+            contactEventListeners.add(weakReference.get());
+        }
+        return contactEventListeners;
+    }
+
+    public void addContactEventListener(ContactEventListener contactEventListener) {
+        WeakReference<ContactEventListener> reference = new WeakReference<>(contactEventListener);
+        Iterator<WeakReference<ContactEventListener>> iterator = contactEventListenerList.iterator();
+        while(iterator.hasNext()) {
+            WeakReference<ContactEventListener> weakReference = iterator.next();
+            if (weakReference.get() == null) {
+                iterator.remove();
+                continue;
+            }
+            if (weakReference.get() == contactEventListener) {
+                return;
+            }
+        }
+        contactEventListenerList.add(reference);
+    }
+
+    @Override
+    public int getLightThemeResId() {
+        return R.style.TUIContactLightTheme;
+    }
+
+    @Override
+    public int getLivelyThemeResId() {
+        return R.style.TUIContactLivelyTheme;
+    }
+
+    @Override
+    public int getSeriousThemeResId() {
+        return R.style.TUIContactSeriousTheme;
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/ChatInfo.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/ChatInfo.java
new file mode 100644
index 0000000..6f6bfdf
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/ChatInfo.java
@@ -0,0 +1,138 @@
+package com.tencent.qcloud.tuikit.tuicontact.bean;
+
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.imsdk.v2.V2TIMGroupAtInfo;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class ChatInfo implements Serializable {
+
+    public static final int TYPE_C2C = V2TIMConversation.V2TIM_C2C;
+    public static final int TYPE_GROUP = V2TIMConversation.V2TIM_GROUP;
+    public static final int TYPE_INVALID = V2TIMConversation.CONVERSATION_TYPE_INVALID;
+
+    private static List<V2TIMGroupAtInfo> atInfoList;
+
+    private String chatName;
+    private int type = V2TIMConversation.V2TIM_C2C;
+    private String id;
+    private String groupType;
+    private boolean isTopChat;
+
+
+    public ChatInfo() {
+
+    }
+
+    /**
+     * 获取聊天的标题，单聊一般为对方名称，群聊为群名字
+     * 
+     * Get the title of the chat, usually the name of the other party for a single chat, and the group name for a group chat
+     *
+     * @return
+     */
+    public String getChatName() {
+        return chatName;
+    }
+
+    /**
+     * 设置聊天的标题，单聊一般为对方名称，群聊为群名字
+     * 
+     * Set the title of the chat, usually the name of the other party for a single chat, and the group name for a group chat
+     *
+     * @param chatName
+     */
+    public void setChatName(String chatName) {
+        this.chatName = chatName;
+    }
+
+    /**
+     * 获取聊天类型，C2C为单聊，Group为群聊
+     * 
+     * Get the chat type, C2C is a single chat, Group is a group chat
+     *
+     * @return
+     */
+    public int getType() {
+        return type;
+    }
+
+    /**
+     * 设置聊天类型，C2C为单聊，Group为群聊
+     * 
+     * Set the chat type, C2C is a single chat, Group is a group chat
+     *
+     * @param type
+     */
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    /**
+     * 获取聊天唯一标识
+     * 
+     * Get chat unique ID
+     *
+     * @return
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * 设置聊天唯一标识
+     *
+     * Set chat unique ID
+     * 
+     * @param id
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取群组类型
+     * 
+     * Get the group type
+     */
+    public String getGroupType() {
+        return groupType;
+    }
+
+    /**
+     * 设置群组类型
+     * 
+     * Set the group type
+     */
+    public void setGroupType(String groupType) {
+        this.groupType = groupType;
+    }
+
+    /**
+     * 是否为置顶的会话
+     * 
+     * Is it a pinned conversation
+     *
+     * @return
+     */
+    public boolean isTopChat() {
+        return isTopChat;
+    }
+
+    /**
+     * 设置会话是否置顶
+     * 
+     * Set as a pinned conversation
+     *
+     * @param topChat
+     */
+    public void setTopChat(boolean topChat) {
+        isTopChat = topChat;
+    }
+
+    public List<V2TIMGroupAtInfo> getAtInfoList() {
+        return atInfoList;
+    }
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/ContactGroupApplyInfo.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/ContactGroupApplyInfo.java
new file mode 100644
index 0000000..b6fc7e6
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/ContactGroupApplyInfo.java
@@ -0,0 +1,45 @@
+package com.tencent.qcloud.tuikit.tuicontact.bean;
+
+import com.tencent.imsdk.v2.V2TIMGroupApplication;
+
+import java.io.Serializable;
+
+public class ContactGroupApplyInfo implements Serializable {
+
+    private String fromUser;
+    private String fromUserNickName;
+    private String requestMsg;
+    private V2TIMGroupApplication timGroupApplication;
+
+    public String getFromUser() {
+        return fromUser;
+    }
+
+    public void setFromUser(String fromUser) {
+        this.fromUser = fromUser;
+    }
+
+    public String getFromUserNickName() {
+        return fromUserNickName;
+    }
+
+    public void setFromUserNickName(String fromUserNickName) {
+        this.fromUserNickName = fromUserNickName;
+    }
+
+    public String getRequestMsg() {
+        return requestMsg;
+    }
+
+    public void setRequestMsg(String requestMsg) {
+        this.requestMsg = requestMsg;
+    }
+
+    public void setTimGroupApplication(V2TIMGroupApplication timGroupApplication) {
+        this.timGroupApplication = timGroupApplication;
+    }
+
+    public V2TIMGroupApplication getTimGroupApplication() {
+        return timGroupApplication;
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/ContactItemBean.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/ContactItemBean.java
new file mode 100644
index 0000000..735ed1a
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/ContactItemBean.java
@@ -0,0 +1,216 @@
+package com.tencent.qcloud.tuikit.tuicontact.bean;
+
+import android.text.TextUtils;
+
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.imsdk.v2.V2TIMFriendInfo;
+import com.tencent.imsdk.v2.V2TIMGroupInfo;
+import com.tencent.imsdk.v2.V2TIMGroupMemberFullInfo;
+import com.tencent.imsdk.v2.V2TIMUserStatus;
+import com.tencent.qcloud.tuikit.tuicontact.component.indexlib.IndexBar.bean.BaseIndexPinyinBean;
+
+public class ContactItemBean extends BaseIndexPinyinBean {
+    public static final int TYPE_C2C = V2TIMConversation.V2TIM_C2C;
+    public static final int TYPE_GROUP = V2TIMConversation.V2TIM_GROUP;
+    public static final int TYPE_INVALID = V2TIMConversation.CONVERSATION_TYPE_INVALID;
+
+    public static final String INDEX_STRING_TOP = "↑";
+    private String id;
+    private boolean isTop;
+    private boolean isSelected;
+    private boolean isBlackList;
+    private String remark;
+    private String nickName;
+    private String avatarUrl;
+    private String signature;
+    private boolean isGroup;
+    private String groupType;
+    private boolean isFriend = false;
+    private boolean isEnable = true;
+    private int role;
+    private int statusType = V2TIMUserStatus.V2TIM_USER_STATUS_UNKNOWN;
+
+    public ContactItemBean() {
+    }
+
+    public ContactItemBean(String id) {
+        this.id = id;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public ContactItemBean setId(String id) {
+        this.id = id;
+        return this;
+    }
+
+    public boolean isTop() {
+        return isTop;
+    }
+
+    public ContactItemBean setTop(boolean top) {
+        isTop = top;
+        return this;
+    }
+
+    @Override
+    public String getTarget() {
+        if (!TextUtils.isEmpty(remark)) {
+            return remark;
+        }
+        if (!TextUtils.isEmpty(nickName)) {
+            return nickName;
+        }
+        return id;
+    }
+
+    @Override
+    public boolean isNeedToPinyin() {
+        return !isTop;
+    }
+
+    @Override
+    public boolean isShowSuspension() {
+        return !isTop;
+    }
+
+    public boolean isSelected() {
+        return isSelected;
+    }
+
+    public void setSelected(boolean selected) {
+        isSelected = selected;
+    }
+
+    public boolean isEnable() {
+        return isEnable;
+    }
+
+    public void setEnable(boolean enable) {
+        isEnable = enable;
+    }
+
+    public boolean isBlackList() {
+        return isBlackList;
+    }
+
+    public void setBlackList(boolean blacklist) {
+        isBlackList = blacklist;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getSignature() {
+        return signature;
+    }
+
+    public void setSignature(String signature) {
+        this.signature = signature;
+    }
+
+    public ContactItemBean covertTIMFriend(V2TIMFriendInfo friendInfo) {
+        if (friendInfo == null) {
+            return this;
+        }
+        setId(friendInfo.getUserID());
+        setNickName(friendInfo.getUserProfile().getNickName());
+        setAvatarUrl(friendInfo.getUserProfile().getFaceUrl());
+        setSignature(friendInfo.getUserProfile().getSelfSignature());
+        setRemark(friendInfo.getFriendRemark());
+        return this;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public boolean isGroup() {
+        return isGroup;
+    }
+
+    public void setGroup(boolean group) {
+        isGroup = group;
+    }
+
+    public String getGroupType() {
+        return groupType;
+    }
+
+    public void setGroupType(String groupType) {
+        this.groupType = groupType;
+    }
+
+    public boolean isFriend() {
+        return isFriend;
+    }
+
+    public void setFriend(boolean friend) {
+        isFriend = friend;
+    }
+
+    public String getAvatarUrl() {
+        return avatarUrl;
+    }
+
+    public void setAvatarUrl(String avatarUrl) {
+        this.avatarUrl = avatarUrl;
+    }
+
+    public int getStatusType() {
+        return statusType;
+    }
+
+    public void setStatusType(int statusType) {
+        this.statusType = statusType;
+    }
+
+    public int getRole() {
+        return role;
+    }
+
+    public void setRole(int role) {
+        this.role = role;
+    }
+
+    public ContactItemBean covertTIMGroupBaseInfo(V2TIMGroupInfo group) {
+        if (group == null) {
+            return this;
+        }
+        setId(group.getGroupID());
+        setRemark(group.getGroupName());
+        setAvatarUrl(group.getFaceUrl());
+        setGroup(true);
+        setGroupType(group.getGroupType());
+        return this;
+    }
+
+    public ContactItemBean covertTIMGroupMemberFullInfo(V2TIMGroupMemberFullInfo member) {
+        if (member == null) {
+            return this;
+        }
+        setId(member.getUserID());
+        setRole(member.getRole());
+        if(TextUtils.isEmpty(member.getNickName())){
+            setRemark(member.getNameCard());
+            setNickName(member.getNameCard());
+        }else{
+            setRemark(member.getNickName());
+            setNickName(member.getNickName());
+        }
+        setAvatarUrl(member.getFaceUrl());
+        setGroup(false);
+        return this;
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/ConversationBean.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/ConversationBean.java
new file mode 100644
index 0000000..0bd1e50
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/ConversationBean.java
@@ -0,0 +1,72 @@
+package com.tencent.qcloud.tuikit.tuicontact.bean;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class ConversationBean implements Parcelable {
+    private String conversationID;
+    private int isGroup;
+    private String title;
+
+    public ConversationBean()
+    {}
+
+    public ConversationBean(String conversationID, int isGroup, String title)
+    {
+        this.conversationID = conversationID;
+        this.isGroup = isGroup;
+        this.title = title;
+    }
+    public String getConversationID()
+    {
+        return this.conversationID;
+    }
+
+    public void setConversationID(String conversationID)
+    {
+        this.conversationID = conversationID;
+    }
+
+    public int getIsGroup()
+    {
+        return this.isGroup;
+    }
+
+    public void setIsGroup(int isGroup)
+    {
+        this.isGroup = isGroup;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    @Override public int describeContents() {
+
+        return 0;
+    }
+    
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(conversationID);
+        dest.writeInt(isGroup);
+        dest.writeString(title);
+    }
+
+    public static final Creator<ConversationBean> CREATOR = new Creator<ConversationBean>() {
+        @Override
+        public ConversationBean createFromParcel(Parcel source) {
+            return new ConversationBean(source.readString(), source.readInt(),source.readString());
+        }
+        @Override
+        public ConversationBean[] newArray(int size) {
+
+            return new ConversationBean[size];
+        }
+
+    };
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/ConversationInfo.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/ConversationInfo.java
new file mode 100644
index 0000000..c1cab36
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/ConversationInfo.java
@@ -0,0 +1,235 @@
+package com.tencent.qcloud.tuikit.tuicontact.bean;
+
+import androidx.annotation.NonNull;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ConversationInfo implements Serializable, Comparable<ConversationInfo> {
+
+    public static final int TYPE_COMMON = 1;
+    public static final int TYPE_CUSTOM = 2;
+
+    public static final int TYPE_FORWAR_SELECT = 3;
+    public static final int TYPE_RECENT_LABEL = 4;
+    /**
+     * 会话类型，自定义会话or普通会话
+     * 
+     * conversation type
+     */
+    private int type;
+
+    /**
+     * 消息未读数
+     * 
+     * unread message number
+     */
+    private int unRead;
+    /**
+     * 会话ID
+     * 
+     * conversation ID
+     */
+    private String conversationId;
+    /**
+     * 会话标识，C2C为对方用户ID，群聊为群组ID
+     * 
+     * ID, C2C is UserID, Group is group ID
+     */
+    private String id;
+    /**
+     * 会话头像url
+     * 
+     * conversation avatar url
+     */
+    private List<Object> iconUrlList = new ArrayList<>();
+
+    public List<Object> getIconUrlList() {
+        return iconUrlList;
+    }
+
+    public void setIconUrlList(List<Object> iconUrlList) {
+        this.iconUrlList = iconUrlList;
+    }
+
+    private String title;
+    private String iconPath;
+    private boolean isGroup;
+    private boolean top;
+    private long lastMessageTime;
+
+
+    /**
+     * 会话界面显示的@提示消息
+     * 
+     * "@" message in group
+     */
+    private String atInfoText;
+
+    /**
+     * 会话界面显示消息免打扰图标
+     * 
+     * the conversation item displays the icon of Do Not Disturb
+     */
+    private boolean showDisturbIcon;
+
+    private String groupType;
+
+    /**
+     * 会话排序键值
+     * 
+     * conversation sort key
+     */
+    private long orderKey;
+
+    public ConversationInfo() {
+
+    }
+
+    public String getConversationId() {
+        return conversationId;
+    }
+
+    public void setConversationId(String conversationId) {
+        this.conversationId = conversationId;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public int getUnRead() {
+        return unRead;
+    }
+
+    public void setUnRead(int unRead) {
+        this.unRead = unRead;
+    }
+
+    public boolean isGroup() {
+        return isGroup;
+    }
+
+    public void setGroup(boolean group) {
+        isGroup = group;
+    }
+
+    public boolean isTop() {
+        return top;
+    }
+
+    public void setTop(boolean top) {
+        this.top = top;
+    }
+
+    /**
+     * 获得最后一条消息的时间，单位是秒
+     * 
+     * Get the time of the last message, in seconds
+     */
+    public long getLastMessageTime() {
+        return lastMessageTime;
+    }
+
+    /**
+     * 设置最后一条消息的时间，单位是秒
+     * 
+     * Set the time to the last message, in seconds
+     * 
+     * @param lastMessageTime
+     */
+    public void setLastMessageTime(long lastMessageTime) {
+        this.lastMessageTime = lastMessageTime;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public void setAtInfoText(String atInfoText) {
+        this.atInfoText = atInfoText;
+    }
+
+    public String getAtInfoText() {
+        return atInfoText;
+    }
+
+    public boolean isShowDisturbIcon() {
+        return showDisturbIcon;
+    }
+
+    public void setShowDisturbIcon(boolean showDisturbIcon) {
+        this.showDisturbIcon = showDisturbIcon;
+    }
+
+    public String getGroupType() {
+        return groupType;
+    }
+
+    public void setGroupType(String groupType) {
+        this.groupType = groupType;
+    }
+
+    public String getIconPath() {
+        return iconPath;
+    }
+
+    public void setIconPath(String iconPath) {
+        this.iconPath = iconPath;
+    }
+
+    public void setOrderKey(long orderKey) {
+        this.orderKey = orderKey;
+    }
+
+    public long getOrderKey() {
+        return orderKey;
+    }
+
+    @Override
+    public int compareTo(@NonNull ConversationInfo other) {
+        long thisOrderKey = this.orderKey;
+        long otherOrderKey = other.orderKey;
+        if (thisOrderKey > otherOrderKey) {
+            return -1;
+        } else if (thisOrderKey == otherOrderKey) {
+            return 0;
+        } else {
+            return 1;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "ConversationInfo{" +
+                "type=" + type +
+                ", unRead=" + unRead +
+                ", conversationId='" + conversationId + '\'' +
+                ", id='" + id + '\'' +
+                ", iconUrl='" + iconUrlList.size() + '\'' +
+                ", title='" + title + '\'' +
+                ", iconPath=" + iconPath +
+                ", isGroup=" + isGroup +
+                ", top=" + top +
+                ", lastMessageTime=" + lastMessageTime +
+                ", groupType=" + groupType +
+                '}';
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/FriendApplicationBean.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/FriendApplicationBean.java
new file mode 100644
index 0000000..6b9b5aa
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/FriendApplicationBean.java
@@ -0,0 +1,130 @@
+package com.tencent.qcloud.tuikit.tuicontact.bean;
+
+import com.tencent.imsdk.BaseConstants;
+import com.tencent.imsdk.v2.V2TIMFriendApplication;
+
+import java.io.Serializable;
+
+public class FriendApplicationBean implements Serializable {
+    /**
+     * ## 别人发给我的加好友请求
+     * 
+     * ## Friend request received by me
+     */
+    public static final int FRIEND_APPLICATION_COME_IN = V2TIMFriendApplication.V2TIM_FRIEND_APPLICATION_COME_IN;
+
+    /**
+     * ## 我发给别人的加好友请求
+     * 
+     * ## Friend request sent by me
+     */
+    public static final int FRIEND_APPLICATION_SEND_OUT = V2TIMFriendApplication.V2TIM_FRIEND_APPLICATION_SEND_OUT;
+
+    /**
+     * ## 别人发给我的和我发给别人的加好友请求。仅在拉取时有效。
+     * 
+     * ## Friend requests received and sent by me. Valid only during pulling
+     */
+    public static final int FRIEND_APPLICATION_BOTH = V2TIMFriendApplication.V2TIM_FRIEND_APPLICATION_BOTH;
+
+    /**
+     * ## 同意加好友（建立单向好友）
+     * 
+     * ## Accept the friend request (build a one-way friend relationship)
+     */
+    public static final int FRIEND_ACCEPT_AGREE = V2TIMFriendApplication.V2TIM_FRIEND_ACCEPT_AGREE;
+
+    /**
+     * ## 同意加好友并加对方为好友（建立双向好友）
+     * 
+     * ## Accept the friend request and add the peer party as a friend (build a two-way friend relationship)
+     */
+    public static final int FRIEND_ACCEPT_AGREE_AND_ADD = V2TIMFriendApplication.V2TIM_FRIEND_ACCEPT_AGREE_AND_ADD;
+
+    public static final int ERR_SUCC = BaseConstants.ERR_SUCC;
+    public static final int ERR_SVR_FRIENDSHIP_INVALID_PARAMETERS = BaseConstants.ERR_SVR_FRIENDSHIP_INVALID_PARAMETERS;
+    public static final int ERR_SVR_FRIENDSHIP_COUNT_LIMIT = BaseConstants.ERR_SVR_FRIENDSHIP_COUNT_LIMIT;
+    public static final int ERR_SVR_FRIENDSHIP_PEER_FRIEND_LIMIT = BaseConstants.ERR_SVR_FRIENDSHIP_PEER_FRIEND_LIMIT;
+    public static final int ERR_SVR_FRIENDSHIP_IN_SELF_BLACKLIST = BaseConstants.ERR_SVR_FRIENDSHIP_IN_SELF_BLACKLIST;
+    public static final int ERR_SVR_FRIENDSHIP_ALLOW_TYPE_DENY_ANY = BaseConstants.ERR_SVR_FRIENDSHIP_ALLOW_TYPE_DENY_ANY;
+    public static final int ERR_SVR_FRIENDSHIP_IN_PEER_BLACKLIST = BaseConstants.ERR_SVR_FRIENDSHIP_IN_PEER_BLACKLIST;
+    public static final int ERR_SVR_FRIENDSHIP_ALLOW_TYPE_NEED_CONFIRM = BaseConstants.ERR_SVR_FRIENDSHIP_ALLOW_TYPE_NEED_CONFIRM;
+
+    private String userId;
+    private String nickName;
+    private String addWording;
+    private int addType;
+    private String faceUrl;
+    private V2TIMFriendApplication friendApplication;
+    private boolean isAccept = false;
+    public FriendApplicationBean() {}
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getAddWording() {
+        return addWording;
+    }
+
+    public void setAddWording(String addWording) {
+        this.addWording = addWording;
+    }
+
+    public int getAddType() {
+        return addType;
+    }
+
+    public void setAddType(int addType) {
+        this.addType = addType;
+    }
+
+    public void setAccept(boolean accept) {
+        isAccept = accept;
+    }
+
+    public boolean isAccept() {
+        return isAccept;
+    }
+
+    public void setFriendApplication(V2TIMFriendApplication friendApplication) {
+        this.friendApplication = friendApplication;
+    }
+
+    public void setFaceUrl(String faceUrl) {
+        this.faceUrl = faceUrl;
+    }
+
+    public String getFaceUrl() {
+        return faceUrl;
+    }
+
+    public V2TIMFriendApplication getFriendApplication() {
+        return friendApplication;
+    }
+
+    public FriendApplicationBean convertFromTimFriendApplication(V2TIMFriendApplication v2TIMFriendApplication) {
+        if (v2TIMFriendApplication == null) {
+            return this;
+        }
+        setAddType(v2TIMFriendApplication.getType());
+        setNickName(v2TIMFriendApplication.getNickname());
+        setAddWording(v2TIMFriendApplication.getAddWording());
+        setUserId(v2TIMFriendApplication.getUserID());
+        setFriendApplication(v2TIMFriendApplication);
+        setFaceUrl(v2TIMFriendApplication.getFaceUrl());
+        return this;
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/GroupInfo.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/GroupInfo.java
new file mode 100644
index 0000000..f2f0cef
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/GroupInfo.java
@@ -0,0 +1,239 @@
+package com.tencent.qcloud.tuikit.tuicontact.bean;
+
+import com.tencent.imsdk.BaseConstants;
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.imsdk.v2.V2TIMGroupInfoResult;
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMMessage;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class GroupInfo extends ChatInfo {
+
+    public static final int ERR_SVR_GROUP_ALLREADY_MEMBER = BaseConstants.ERR_SVR_GROUP_ALLREADY_MEMBER;
+    public static final int ERR_SVR_GROUP_PERMISSION_DENY = BaseConstants.ERR_SVR_GROUP_PERMISSION_DENY;
+    public static final int ERR_SVR_GROUP_NOT_FOUND = BaseConstants.ERR_SVR_GROUP_NOT_FOUND; // 群组不存在
+    public static final int ERR_SVR_GROUP_FULL_MEMBER_COUNT = BaseConstants.ERR_SVR_GROUP_FULL_MEMBER_COUNT;
+
+    private String groupType;
+    private int memberCount;
+    private String groupName;
+    private String notice;
+    private List<GroupMemberInfo> memberDetails = new ArrayList<>();
+    private int joinType;
+    private String owner;
+    private boolean messageReceiveOption;
+    private String faceUrl;
+    private boolean communitySupportTopic = false;
+
+    public GroupInfo() {
+        setType(V2TIMConversation.V2TIM_GROUP);
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    /**
+     * 获取群公告
+     * 
+     * Get group announcements 
+     *
+     * @return
+     */
+    public String getNotice() {
+        return notice;
+    }
+
+    /**
+     * 设置群公告
+     *
+     * Set group announcements
+     * 
+     * @param signature
+     */
+    public void setNotice(String signature) {
+        this.notice = signature;
+    }
+
+    /**
+     * 获取加群验证方式
+     * 
+     * Get the group verification method
+     *
+     * @return
+     */
+    public int getJoinType() {
+        return joinType;
+    }
+
+    /**
+     * 设置加群验证方式
+     * 
+     * Set the group verification method
+     *
+     * @param joinType
+     */
+    public void setJoinType(int joinType) {
+        this.joinType = joinType;
+    }
+
+    /**
+     * 获取群类型，Public/Private/ChatRoom
+     * 
+     * Get the group type, Public/Private/ChatRoom
+     *
+     * @return
+     */
+    public String getGroupType() {
+        return groupType;
+    }
+
+    /**
+     * 设置群类型
+     * 
+     * Set the group type
+     *
+     * @param groupType
+     */
+    public void setGroupType(String groupType) {
+        this.groupType = groupType;
+    }
+
+    /**
+     * 获取成员详细信息
+     * 
+     * Get member details
+     *
+     * @return
+     */
+    public List<GroupMemberInfo> getMemberDetails() {
+        return memberDetails;
+    }
+
+    /**
+     * 设置成员详细信息
+     * 
+     * Set member details
+     *
+     * @param memberDetails
+     */
+    public void setMemberDetails(List<GroupMemberInfo> memberDetails) {
+        this.memberDetails = memberDetails;
+    }
+
+    /**
+     * 获取群成员数量
+     * 
+     * Get the number of members that have joined the group
+     *
+     * @return
+     */
+    public int getMemberCount() {
+        if (memberDetails != null) {
+            return memberDetails.size();
+        }
+        return memberCount;
+    }
+
+    /**
+     * 设置群成员数量
+     * 
+     * Set the number of members that have joined the group
+     *
+     * @param memberCount
+     */
+    public void setMemberCount(int memberCount) {
+        this.memberCount = memberCount;
+    }
+
+    /**
+     * 返回是否是群主
+     *
+     * Returns whether it is the owner of the group
+     * 
+     * @return
+     */
+    public boolean isOwner() {
+        return V2TIMManager.getInstance().getLoginUser().equals(owner);
+    }
+
+    /**
+     * 设置是否是群主
+     * 
+     * Set whether it is the owner of the group
+     *
+     * @param owner
+     */
+    public void setOwner(String owner) {
+        this.owner = owner;
+    }
+
+    /**
+     * 获取消息接收选项
+     * 
+     * Get the current user's message receiving option in the group. To modify the group message receiving option, please call the setReceiveMessageOpt API.
+     *
+     * @return
+     */
+    public boolean getMessageReceiveOption() {
+        return messageReceiveOption;
+    }
+
+    /**
+     * 设置消息接收选项
+     * @param messageReceiveOption, true,免打扰； false，接收消息
+     * 
+     * 
+     * Set the current user's message receiving option in the group.
+     * @param messageReceiveOption, true,no message will be received； false，messages will be received.
+     */
+    public void setMessageReceiveOption(boolean messageReceiveOption) {
+        this.messageReceiveOption = messageReceiveOption;
+    }
+
+    public String getFaceUrl() {
+        return faceUrl;
+    }
+
+    public void setFaceUrl(String faceUrl) {
+        this.faceUrl = faceUrl;
+    }
+
+    public boolean isCommunitySupportTopic() {
+        return communitySupportTopic;
+    }
+
+    public void setCommunitySupportTopic(boolean communitySupportTopic) {
+        this.communitySupportTopic = communitySupportTopic;
+    }
+
+    /**
+     * 从SDK转化为TUIKit的群信息bean
+     *
+     * @param infoResult
+     * @return
+     */
+    public GroupInfo covertTIMGroupDetailInfo(V2TIMGroupInfoResult infoResult) {
+        if (infoResult.getResultCode() != 0) {
+            return this;
+        }
+        setChatName(infoResult.getGroupInfo().getGroupName());
+        setGroupName(infoResult.getGroupInfo().getGroupName());
+        setId(infoResult.getGroupInfo().getGroupID());
+        setNotice(infoResult.getGroupInfo().getNotification());
+        setMemberCount(infoResult.getGroupInfo().getMemberCount());
+        setGroupType(infoResult.getGroupInfo().getGroupType());
+        setOwner(infoResult.getGroupInfo().getOwner());
+        setJoinType(infoResult.getGroupInfo().getGroupAddOpt());
+        setMessageReceiveOption(infoResult.getGroupInfo().getRecvOpt() == V2TIMMessage.V2TIM_RECEIVE_NOT_NOTIFY_MESSAGE ? true : false);
+        setCommunitySupportTopic(infoResult.getGroupInfo().isSupportTopic());
+        return this;
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/GroupMemberInfo.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/GroupMemberInfo.java
new file mode 100644
index 0000000..88aec94
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/GroupMemberInfo.java
@@ -0,0 +1,143 @@
+package com.tencent.qcloud.tuikit.tuicontact.bean;
+
+import android.text.TextUtils;
+
+import com.tencent.imsdk.v2.V2TIMGroupMemberFullInfo;
+import com.tencent.imsdk.v2.V2TIMGroupMemberInfo;
+
+import java.io.Serializable;
+
+public class GroupMemberInfo implements Serializable {
+
+    private String iconUrl;
+    private String account;
+    private String signature;
+    private String location;
+    private String birthday;
+    private String nameCard;
+    private String nickName;
+    private boolean isTopChat;
+    private boolean isFriend;
+    private long joinTime;
+    private long tinyId;
+    private int memberType;
+
+    public String getIconUrl() {
+        return iconUrl;
+    }
+
+    public void setIconUrl(String iconUrl) {
+        this.iconUrl = iconUrl;
+    }
+
+    public String getAccount() {
+        return account;
+    }
+
+    public void setAccount(String account) {
+        this.account = account;
+    }
+
+    public String getSignature() {
+        return signature;
+    }
+
+    public void setSignature(String signature) {
+        this.signature = signature;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public String getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(String birthday) {
+        this.birthday = birthday;
+    }
+
+    public void setNameCard(String nameCard) {
+        this.nameCard = nameCard;
+    }
+
+    public String getNameCard() {
+        return nameCard;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getNickName() {
+        return this.nickName;
+    }
+
+    public boolean isTopChat() {
+        return isTopChat;
+    }
+
+    public void setTopChat(boolean topChat) {
+        isTopChat = topChat;
+    }
+
+    public boolean isFriend() {
+        return isFriend;
+    }
+
+    public void setFriend(boolean friend) {
+        isFriend = friend;
+    }
+
+    public long getJoinTime() {
+        return joinTime;
+    }
+
+    public void setJoinTime(long joinTime) {
+        this.joinTime = joinTime;
+    }
+
+    public long getTinyId() {
+        return tinyId;
+    }
+
+    public void setTinyId(long tinyId) {
+        this.tinyId = tinyId;
+    }
+
+    public int getMemberType() {
+        return memberType;
+    }
+
+    public void setMemberType(int memberType) {
+        this.memberType = memberType;
+    }
+
+    public String getDisplayName() {
+        String displayName = account;
+        if (!TextUtils.isEmpty(nameCard)) {
+            displayName = nameCard;
+        } else if (!TextUtils.isEmpty(nickName)) {
+            displayName = nickName;
+        }
+        return displayName;
+    }
+
+    public GroupMemberInfo covertTIMGroupMemberInfo(V2TIMGroupMemberInfo info) {
+        if (info instanceof V2TIMGroupMemberFullInfo) {
+            V2TIMGroupMemberFullInfo v2TIMGroupMemberFullInfo = (V2TIMGroupMemberFullInfo)info;
+            setJoinTime(v2TIMGroupMemberFullInfo.getJoinTime());
+            setMemberType(v2TIMGroupMemberFullInfo.getRole());
+        }
+        setAccount(info.getUserID());
+        setNameCard(info.getNameCard());
+        setIconUrl(info.getFaceUrl());
+        setNickName(info.getNickName());
+        return this;
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/MessageCustom.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/MessageCustom.java
new file mode 100644
index 0000000..1dd4dd7
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/bean/MessageCustom.java
@@ -0,0 +1,11 @@
+package com.tencent.qcloud.tuikit.tuicontact.bean;
+
+public class MessageCustom {
+    public static final String BUSINESS_ID_GROUP_CREATE = "group_create";
+
+    public int version = 0;
+    public String businessID;
+    public String opUser;
+    public String content;
+    public String data;
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/interfaces/IContactLayout.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/interfaces/IContactLayout.java
new file mode 100644
index 0000000..0b2a138
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/interfaces/IContactLayout.java
@@ -0,0 +1,10 @@
+package com.tencent.qcloud.tuikit.tuicontact.classicui.interfaces;
+
+import com.tencent.qcloud.tuicore.component.interfaces.ILayout;
+import com.tencent.qcloud.tuikit.tuicontact.classicui.widget.ContactListView;
+
+public interface IContactLayout extends ILayout {
+
+    ContactListView getContactListView();
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/AddMoreActivity.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/AddMoreActivity.java
new file mode 100644
index 0000000..017d8c5
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/AddMoreActivity.java
@@ -0,0 +1,216 @@
+package com.tencent.qcloud.tuikit.tuicontact.classicui.pages;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.TUIUtil;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactConstants;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactService;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuicontact.interfaces.IAddMoreActivity;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.AddMorePresenter;
+
+public class AddMoreActivity extends BaseLightActivity implements IAddMoreActivity {
+
+    private static final String TAG = AddMoreActivity.class.getSimpleName();
+
+    private TitleBarLayout mTitleBar;
+    private EditText searchEdit;
+    private TextView idLabel;
+    private TextView notFoundTip;
+    private TextView searchBtn;
+    private View detailArea;
+
+    private ImageView faceImgView;
+    private TextView idTextView;
+    private TextView groupTypeView;
+    private TextView groupTypeTagView;
+    private TextView nickNameView;
+
+    private boolean mIsGroup;
+
+    private AddMorePresenter presenter;
+
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.contact_add_activity);
+        if (getIntent() != null) {
+            mIsGroup = getIntent().getExtras().getBoolean(TUIContactConstants.GroupType.GROUP);
+        }
+
+        presenter = new AddMorePresenter();
+        presenter.setAddMoreActivity(this);
+
+        faceImgView = findViewById(R.id.friend_icon);
+        idTextView = findViewById(R.id.friend_account);
+        groupTypeView = findViewById(R.id.group_type);
+        nickNameView = findViewById(R.id.friend_nick_name);
+        groupTypeTagView = findViewById(R.id.group_type_tag);
+
+        mTitleBar = findViewById(R.id.add_friend_titlebar);
+        mTitleBar.setTitle(mIsGroup ? getResources().getString(R.string.add_group) : getResources().getString(R.string.add_friend), ITitleBarLayout.Position.MIDDLE);
+        mTitleBar.setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        mTitleBar.getRightGroup().setVisibility(View.GONE);
+
+        searchEdit = findViewById(R.id.search_edit);
+        if (mIsGroup) {
+            searchEdit.setHint(R.string.hint_search_group_id);
+        }
+
+        idLabel = findViewById(R.id.id_label);
+        notFoundTip = findViewById(R.id.not_found_tip);
+        searchBtn = findViewById(R.id.search_button);
+        detailArea = findViewById(R.id.friend_detail_area);
+        searchBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                notFoundTip.setVisibility(View.GONE);
+                String id = searchEdit.getText().toString();
+
+                if (mIsGroup) {
+                    presenter.getGroupInfo(id, new IUIKitCallback<GroupInfo>() {
+                        @Override
+                        public void onSuccess(GroupInfo data) {
+                            setGroupDetail(data);
+                            detailArea.setOnClickListener(new View.OnClickListener() {
+                                @Override
+                                public void onClick(View v) {
+                                    Intent intent = new Intent(TUIContactService.getAppContext(), FriendProfileActivity.class);
+                                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                    intent.putExtra(TUIContactConstants.ProfileType.CONTENT, data);
+                                    TUIContactService.getAppContext().startActivity(intent);
+                                }
+                            });
+                        }
+
+                        @Override
+                        public void onError(String module, int errCode, String errMsg) {
+                            setNotFound(true);
+                        }
+                    });
+                    return;
+                }
+
+                presenter.getUserInfo(id, new IUIKitCallback<ContactItemBean>() {
+                    @Override
+                    public void onSuccess(ContactItemBean data) {
+                        setFriendDetail(data.getAvatarUrl(), data.getId(), data.getNickName());
+                        detailArea.setOnClickListener(new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                Intent intent = new Intent(TUIContactService.getAppContext(), FriendProfileActivity.class);
+                                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                intent.putExtra(TUIContactConstants.ProfileType.CONTENT, data);
+                                TUIContactService.getAppContext().startActivity(intent);
+                            }
+                        });
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        setNotFound(false);
+                    }
+                });
+            }
+        });
+
+        if (!mIsGroup) {
+            idLabel.setText(getString(R.string.contact_my_user_id, TUILogin.getLoginUser()));
+        }
+
+        searchEdit.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+            @Override
+            public void onFocusChange(View v, boolean hasFocus) {
+                if (hasFocus) {
+                    idLabel.setVisibility(View.GONE);
+                }
+            }
+        });
+
+        searchEdit.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                if (TextUtils.isEmpty(searchEdit.getText())) {
+                    detailArea.setVisibility(View.GONE);
+                    notFoundTip.setVisibility(View.GONE);
+                }
+            }
+        });
+
+    }
+
+    private void setGroupDetail(GroupInfo groupInfo) {
+        int radius = getResources().getDimensionPixelSize(R.dimen.contact_profile_face_radius);
+        GlideEngine.loadUserIcon(faceImgView, groupInfo.getFaceUrl(),
+                TUIUtil.getDefaultGroupIconResIDByGroupType(this, groupInfo.getGroupType()), radius);
+        idTextView.setText(groupInfo.getId());
+        nickNameView.setText(groupInfo.getGroupName());
+        groupTypeTagView.setVisibility(View.VISIBLE);
+        groupTypeView.setVisibility(View.VISIBLE);
+        groupTypeView.setText(groupInfo.getGroupType());
+        detailArea.setVisibility(View.VISIBLE);
+    }
+
+    private void setFriendDetail(String faceUrl, String id, String nickName) {
+        int radius = getResources().getDimensionPixelSize(R.dimen.contact_profile_face_radius);
+        GlideEngine.loadUserIcon(faceImgView, faceUrl, radius);
+        idTextView.setText(id);
+        if (TextUtils.isEmpty(nickName)) {
+            nickNameView.setText(id);
+        } else {
+            nickNameView.setText(nickName);
+        }
+        groupTypeTagView.setVisibility(View.GONE);
+        groupTypeView.setVisibility(View.GONE);
+        detailArea.setVisibility(View.VISIBLE);
+    }
+
+    private void setNotFound(boolean isGroup) {
+        detailArea.setVisibility(View.GONE);
+        if (isGroup) {
+            notFoundTip.setText(getString(R.string.contact_no_such_group));
+        } else {
+            notFoundTip.setText(getString(R.string.contact_no_such_user));
+        }
+        notFoundTip.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void finish() {
+        super.finish();
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/BlackListActivity.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/BlackListActivity.java
new file mode 100644
index 0000000..6f20c85
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/BlackListActivity.java
@@ -0,0 +1,74 @@
+package com.tencent.qcloud.tuikit.tuicontact.classicui.pages;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+import android.view.View;
+
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactConstants;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.ContactPresenter;
+import com.tencent.qcloud.tuikit.tuicontact.classicui.widget.ContactListView;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+
+public class BlackListActivity extends BaseLightActivity {
+
+    private TitleBarLayout mTitleBar;
+    private ContactListView mListView;
+
+    private ContactPresenter presenter;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.contact_blacklist_activity);
+
+        init();
+    }
+
+    private void init() {
+        mTitleBar = findViewById(R.id.black_list_titlebar);
+        mTitleBar.setTitle(getResources().getString(R.string.blacklist), ITitleBarLayout.Position.MIDDLE);
+        mTitleBar.setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        mTitleBar.getRightGroup().setVisibility(View.GONE);
+
+        mListView = findViewById(R.id.black_list);
+        mListView.setOnItemClickListener(new ContactListView.OnItemClickListener() {
+            @Override
+            public void onItemClick(int position, ContactItemBean contact) {
+                Intent intent = new Intent(BlackListActivity.this, FriendProfileActivity.class);
+                intent.putExtra(TUIContactConstants.ProfileType.CONTENT, contact);
+                startActivity(intent);
+            }
+        });
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        loadDataSource();
+    }
+
+    public void loadDataSource() {
+        presenter = new ContactPresenter();
+        mListView.setPresenter(presenter);
+        mListView.setNotFoundTip(getString(R.string.contact_no_block_list));
+        presenter.setContactListView(mListView);
+        presenter.setBlackListListener();
+        mListView.loadDataSource(ContactListView.DataSource.BLACK_LIST);
+    }
+
+    @Override
+    public void finish() {
+        super.finish();
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/CreateGroupActivity.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/CreateGroupActivity.java
new file mode 100644
index 0000000..8089578
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/CreateGroupActivity.java
@@ -0,0 +1,456 @@
+package com.tencent.qcloud.tuikit.tuicontact.classicui.pages;
+
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.TextPaint;
+import android.text.TextUtils;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
+import android.text.style.ForegroundColorSpan;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuicore.component.LineControllerView;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.activities.ImageSelectActivity;
+import com.tencent.qcloud.tuicore.component.dialog.TUIKitDialog;
+import com.tencent.qcloud.tuicore.component.gatherimage.SynthesizedImageView;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.component.popupcard.PopupInputCard;
+import com.tencent.qcloud.tuicore.util.ImageUtil;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactConstants;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuicontact.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuicontact.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuicontact.classicui.util.ContactStartChatUtils;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.ContactPresenter;
+import com.tencent.qcloud.tuikit.tuicontact.util.TUIContactLog;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CreateGroupActivity extends BaseLightActivity implements View.OnClickListener {
+    private static final String TAG = CreateGroupActivity.class.getSimpleName();
+
+    private static final int CHOOSE_AVATAR_REQUEST_CODE = 1;
+    private static final int CHOOSE_GROUP_TYPE_REQUEST_CODE = 2;
+    private TitleBarLayout titleBarLayout;
+    private SynthesizedImageView groupAvatar;
+    private LineControllerView groupNameLv;
+    private LineControllerView groupIdLv;
+    private LineControllerView groupTypeLv;
+    private View groupAvatarLayout;
+    private TextView confirmButton;
+    private TextView groupTypeContentView, groupTypeContentUrlView;
+
+    private String groupName;
+    private String groupId;
+    private String groupType = V2TIMManager.GROUP_TYPE_WORK;
+    private String groupAvatarUrl;
+    private List<Object> groupAvatarUrlList;
+    private int joinTypeIndex;
+    private String groupAvatarImageId = "";
+
+    private ArrayList<GroupMemberInfo> mGroupMembers = new ArrayList<>();
+    private boolean mCreating;
+    
+    private ContactPresenter presenter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.create_group_layout);
+
+        titleBarLayout = findViewById(R.id.create_group_bar);
+        groupNameLv = findViewById(R.id.group_name_layout);
+        groupIdLv = findViewById(R.id.group_id_layout);
+        groupTypeLv = findViewById(R.id.group_type_layout);
+        groupAvatarLayout = findViewById(R.id.group_avatar_layout);
+        groupAvatar = findViewById(R.id.group_avatar);
+        confirmButton = findViewById(R.id.confirm_button);
+        groupTypeContentView = findViewById(R.id.group_type_text);
+        groupTypeContentUrlView = findViewById(R.id.group_type_text_url);
+
+        initData();
+        setupViews();
+    }
+
+    private void initData() {
+        Intent intent = getIntent();
+        if (intent == null) {
+            TUIContactLog.e(TAG, "intent is null");
+            return;
+        }
+        Bundle bundle = intent.getExtras();
+        if (bundle == null) {
+            TUIContactLog.e(TAG, "bundle is null");
+            return;
+        }
+
+        mGroupMembers = (ArrayList<GroupMemberInfo>) bundle.getSerializable(TUIConstants.TUIGroup.GROUP_MEMBER_ID_LIST);
+
+        if (mGroupMembers == null || mGroupMembers.size() <= 1) {
+            TUIContactLog.e(TAG, "mGroupMemberIcons <= 1");
+        }
+
+        int num = mGroupMembers.size();
+        if (num > 9) {
+            num = 9;
+        }
+        for (int i = 0; i < num; i++) {
+            groupAvatarImageId += mGroupMembers.get(i).getAccount();
+        }
+
+        groupName = bundle.getString(TUIConstants.TUIGroup.GROUP_NAME);
+        groupNameLv.setContent(groupName);
+
+        groupTypeLv.setContent(groupType);
+
+        if (TUIConfig.isEnableGroupGridAvatar()) {
+            groupAvatarUrlList = fillGroupGridAvatar();
+            groupAvatar.setImageId(groupAvatarImageId);
+            groupAvatar.displayImage(groupAvatarUrlList).load(groupAvatarImageId);
+            groupAvatarUrl = null;
+        }
+
+        joinTypeIndex = bundle.getInt(TUIConstants.TUIGroup.JOIN_TYPE_INDEX, 2);
+    }
+
+    private void setupViews() {
+        titleBarLayout.getRightIcon().setVisibility(View.GONE);
+        titleBarLayout.setTitle(getString(R.string.create_group_chat), ITitleBarLayout.Position.MIDDLE);
+        titleBarLayout.setOnLeftClickListener(this);
+
+        int radius = getResources().getDimensionPixelSize(R.dimen.contact_profile_face_radius);
+        groupAvatar.setRadius(radius);
+        groupAvatar.setOnClickListener(this);
+        groupAvatarLayout.setOnClickListener(this);
+        groupNameLv.setOnClickListener(this);
+        groupIdLv.setOnClickListener(this);
+        groupTypeLv.setOnClickListener(this);
+        groupAvatarLayout.setOnClickListener(this);
+
+        confirmButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                createGroupChat();
+            }
+        });
+
+        presenter = new ContactPresenter();
+        initGroupTypeContentView();
+    }
+
+    private void initGroupTypeContentView() {
+        switch(groupType) {
+            case V2TIMManager.GROUP_TYPE_WORK:
+                groupTypeContentView.setText(getString(R.string.group_work_content));
+                break;
+            case V2TIMManager.GROUP_TYPE_PUBLIC:
+                groupTypeContentView.setText(getString(R.string.group_public_des));
+                break;
+            case V2TIMManager.GROUP_TYPE_MEETING:
+                groupTypeContentView.setText(getString(R.string.group_meeting_des));
+                break;
+            case V2TIMManager.GROUP_TYPE_COMMUNITY:
+                groupTypeContentView.setText(getString(R.string.group_commnity_des));
+                break;
+            default:
+                groupTypeContentView.setText(getString(R.string.group_work_content));
+                break;
+        }
+
+        String groupTypeContent = getResources().getString(R.string.group_type_content_title);
+        String urlContent = getResources().getString(R.string.group_type_content_url);
+        int urlContentIndex = groupTypeContent.lastIndexOf(urlContent);
+
+        final int foregroundColor;
+        int currentTheme = TUIThemeManager.getInstance().getCurrentTheme();
+        if (currentTheme == TUIThemeManager.THEME_LIVELY) {
+            foregroundColor = getResources().getColor(com.tencent.qcloud.tuicore.R.color.core_primary_color_lively);
+        } else if (currentTheme == TUIThemeManager.THEME_SERIOUS) {
+            foregroundColor = getResources().getColor(com.tencent.qcloud.tuicore.R.color.core_primary_color_serious);
+        } else {
+            foregroundColor = getResources().getColor(com.tencent.qcloud.tuicore.R.color.core_primary_color_light);
+        }
+
+        SpannableString spannedString = new SpannableString(groupTypeContent);
+        ForegroundColorSpan colorSpan = new ForegroundColorSpan(foregroundColor);
+        spannedString.setSpan(colorSpan, urlContentIndex, urlContentIndex + urlContent.length(), Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
+
+        ClickableSpan clickableSpan = new ClickableSpan() {
+            @Override
+            public void onClick(View view) {
+                if (TextUtils.equals(TUIThemeManager.getInstance().getCurrentLanguage(), "zh")) {
+                    openWebUrl(TUIContactConstants.IM_PRODUCT_DOC_URL);
+                } else {
+                    openWebUrl(TUIContactConstants.IM_PRODUCT_DOC_URL_EN);
+                }
+            }
+
+            @Override
+            public void updateDrawState(TextPaint ds) {
+                ds.setUnderlineText(false);
+            }
+        };
+        spannedString.setSpan(clickableSpan, urlContentIndex, urlContentIndex + urlContent.length(), Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
+        groupTypeContentUrlView.setText(spannedString);
+        groupTypeContentUrlView.setMovementMethod(LinkMovementMethod.getInstance());
+    }
+    @Override
+    public void onClick(View v) {
+        if (v == groupAvatar || v == groupAvatarLayout) {
+            ArrayList<ImageSelectActivity.ImageBean> faceList = new ArrayList<>();
+            if (TUIConfig.isEnableGroupGridAvatar()) {
+                ImageSelectActivity.ImageBean imageBean = new ImageSelectActivity.ImageBean();
+                imageBean.setGroupGridAvatar(fillGroupGridAvatar());
+                imageBean.setImageId(groupAvatarImageId);
+                faceList.add(imageBean);
+            }
+
+            for (int i = 0; i < TUIConstants.TUIContact.GROUP_FACE_COUNT; i++) {
+                ImageSelectActivity.ImageBean imageBean = new ImageSelectActivity.ImageBean();
+                imageBean.setThumbnailUri(String.format(TUIConstants.TUIContact.GROUP_FACE_URL, (i + 1) + ""));
+                faceList.add(imageBean);
+            }
+
+            Intent intent = new Intent(CreateGroupActivity.this, ImageSelectActivity.class);
+            intent.putExtra(ImageSelectActivity.TITLE, getString(R.string.group_choose_avatar));
+            intent.putExtra(ImageSelectActivity.SPAN_COUNT, 4);
+            intent.putExtra(ImageSelectActivity.PLACEHOLDER, com.tencent.qcloud.tuicore.R.drawable.core_default_user_icon_light);
+            intent.putExtra(ImageSelectActivity.ITEM_WIDTH, ScreenUtil.dip2px(77));
+            intent.putExtra(ImageSelectActivity.ITEM_HEIGHT, ScreenUtil.dip2px(77));
+            intent.putExtra(ImageSelectActivity.DATA, faceList);
+            intent.putExtra(ImageSelectActivity.SELECTED, faceList.get(0));
+            startActivityForResult(intent, CHOOSE_AVATAR_REQUEST_CODE);
+        } else if (v == groupNameLv) {
+            PopupInputCard popupInputCard = new PopupInputCard(this);
+            popupInputCard.setContent(groupNameLv.getContent().toString());
+            popupInputCard.setTitle(getResources().getString(R.string.modify_group_name));
+            popupInputCard.setMaxLimit(30);
+            popupInputCard.setOnPositive(new PopupInputCard.OnClickListener() {
+                @Override
+                public void onClick(String result) {
+                    if (!TextUtils.isEmpty(result)) {
+                        groupName = result;
+                        groupNameLv.setContent(groupName);
+
+                    } else {
+                        ToastUtil.toastLongMessage(getResources().getString(R.string.group_name_edit_null_tips));
+                    }
+                }
+            });
+            popupInputCard.setTextExceedListener(new PopupInputCard.OnTextExceedListener() {
+                @Override
+                public void onTextExceedMax() {
+                    ToastUtil.toastLongMessage(getResources().getString(R.string.group_name_edit_exceed_tips));
+                }
+            });
+            popupInputCard.show(groupNameLv, Gravity.BOTTOM);
+        } else if (v == groupIdLv) {
+            PopupInputCard popupInputCard = new PopupInputCard(this);
+            popupInputCard.setContent(groupIdLv.getContent().toString());
+            popupInputCard.setTitle(getResources().getString(R.string.modify_group_id));
+            popupInputCard.setMaxLimit(48);
+            popupInputCard.setOnPositive(new PopupInputCard.OnClickListener() {
+                @Override
+                public void onClick(String result) {
+                    if (!TextUtils.isEmpty(result) && result.startsWith("@TGS#")) {
+                        ToastUtil.toastLongMessage(getResources().getString(R.string.group_id_edit_format_tips));
+                        groupIdLv.setContent("");
+                        groupId = "";
+                        return;
+                    }
+
+                    groupIdLv.setContent(result);
+                    groupId = result;
+                }
+            });
+            popupInputCard.setTextExceedListener(new PopupInputCard.OnTextExceedListener() {
+                @Override
+                public void onTextExceedMax(){
+                    ToastUtil.toastLongMessage(getResources().getString(R.string.group_id_edit_exceed_tips));
+                }
+            });
+            popupInputCard.show(groupIdLv, Gravity.BOTTOM);
+        } else if (v == groupTypeLv) {
+            Intent intent = new Intent(this, GroupTypeSelectActivity.class);
+            startActivityForResult(intent, CHOOSE_GROUP_TYPE_REQUEST_CODE);
+        } else if (v == titleBarLayout.getLeftGroup()) {
+            finish();
+        }
+    }
+
+    private List<Object> fillGroupGridAvatar() {
+        final List<Object> urlList = new ArrayList<>();
+        String savedIcon = ImageUtil.getGroupConversationAvatar(groupAvatarImageId);
+        if (TextUtils.isEmpty(savedIcon)) {
+            int faceSize = Math.min(mGroupMembers.size(), 9);
+            for (int i = 0; i < faceSize; i++) {
+                String iconUrl = mGroupMembers.get(i).getIconUrl();
+                urlList.add(TextUtils.isEmpty(iconUrl) ? TUIConfig.getDefaultAvatarImage() : iconUrl);
+            }
+        } else {
+            urlList.add(savedIcon);
+        }
+
+        return urlList;
+    }
+
+    private void createGroupChat() {
+        if (mCreating) {
+            return;
+        }
+
+        final GroupInfo groupInfo = new GroupInfo();
+        groupInfo.setChatName(groupName);
+        groupInfo.setGroupName(groupName);
+        groupInfo.setMemberDetails(mGroupMembers);
+        groupInfo.setGroupType(groupType);
+        groupInfo.setJoinType(joinTypeIndex);
+        groupInfo.setCommunitySupportTopic(false);
+        groupInfo.setFaceUrl(groupAvatarUrl);
+        groupInfo.setId(groupId);
+
+        mCreating = true;
+
+        presenter.createGroupChat(groupInfo, new IUIKitCallback<String>() {
+            @Override
+            public void onSuccess(String data) {
+                ContactStartChatUtils.startChatActivity(data, ChatInfo.TYPE_GROUP, groupInfo.getGroupName(), groupInfo.getGroupType());
+                finish();
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                mCreating = false;
+                //mGroupMembers.remove(selfInfo);
+                if (errCode == TUIConstants.BuyingFeature.ERR_SDK_INTERFACE_NOT_SUPPORT || errCode == 11000) {
+                    showNotSupportDialog();
+                }
+                ToastUtil.toastLongMessage("createGroupChat fail:" + errCode + "=" + errMsg);
+            }
+        });
+    }
+
+    private void showNotSupportDialog() {
+        String string = getResources().getString(R.string.contact_im_flagship_edition_update_tip, getString(R.string.contact_community));
+        String buyingGuidelines = getResources().getString(R.string.contact_buying_guidelines);
+        int buyingGuidelinesIndex = string.lastIndexOf(buyingGuidelines);
+        final int foregroundColor = getResources().getColor(TUIThemeManager.getAttrResId(this, com.tencent.qcloud.tuicore.R.attr.core_primary_color));
+        SpannableString spannedString = new SpannableString(string);
+        ForegroundColorSpan colorSpan2 = new ForegroundColorSpan(foregroundColor);
+        spannedString.setSpan(colorSpan2, buyingGuidelinesIndex, buyingGuidelinesIndex + buyingGuidelines.length(), Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
+
+        ClickableSpan clickableSpan2 = new ClickableSpan() {
+            @Override
+            public void onClick(View view) {
+                if (TextUtils.equals(TUIThemeManager.getInstance().getCurrentLanguage(), "zh")) {
+                    openWebUrl(TUIConstants.BuyingFeature.BUYING_PRICE_DESC);
+                } else {
+                    openWebUrl(TUIConstants.BuyingFeature.BUYING_PRICE_DESC_EN);
+                }
+            }
+
+            @Override
+            public void updateDrawState(TextPaint ds) {
+                ds.setUnderlineText(false);
+            }
+        };
+        spannedString.setSpan(clickableSpan2, buyingGuidelinesIndex, buyingGuidelinesIndex + buyingGuidelines.length(), Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
+
+        TUIKitDialog.TUIIMUpdateDialog.getInstance()
+                .createDialog(this)
+                .setMovementMethod(LinkMovementMethod.getInstance())
+                .setShowOnlyDebug(true)
+                .setCancelable(true)
+                .setCancelOutside(true)
+                .setTitle(spannedString)
+                .setDialogWidth(0.75f)
+                .setDialogFeatureName(TUIConstants.BuyingFeature.BUYING_FEATURE_COMMUNITY)
+                .setPositiveButton(getString(R.string.contact_no_more_reminders), new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        TUIKitDialog.TUIIMUpdateDialog.getInstance().dismiss();
+                        TUIKitDialog.TUIIMUpdateDialog.getInstance().setNeverShow(true);
+                    }
+                })
+                .setNegativeButton(getString(R.string.contact_i_know), new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        TUIKitDialog.TUIIMUpdateDialog.getInstance().dismiss();
+                    }
+                })
+                .show();
+    }
+
+    private void openWebUrl(String url) {
+        Intent intent = new Intent();
+        intent.setAction(Intent.ACTION_VIEW);
+        Uri contentUrl = Uri.parse(url);
+        intent.setData(contentUrl);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        startActivity(intent);
+    }
+    
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == CHOOSE_AVATAR_REQUEST_CODE && resultCode == ImageSelectActivity.RESULT_CODE_SUCCESS) {
+            if (data != null) {
+                ImageSelectActivity.ImageBean imageBean = (ImageSelectActivity.ImageBean) data.getSerializableExtra(ImageSelectActivity.DATA);
+                if (imageBean == null) {
+                    return;
+                }
+
+                List<Object> faceUrl = imageBean.getGroupGridAvatar();
+                if (faceUrl != null && !faceUrl.isEmpty()) {
+                    groupAvatar.setImageId(groupAvatarImageId);
+                    groupAvatar.displayImage(faceUrl).load(groupAvatarImageId);
+                    groupAvatarUrlList = faceUrl;
+                    groupAvatarUrl = null;
+                } else {
+                    groupAvatarUrl = imageBean.getThumbnailUri();
+                    GlideEngine.loadImage(groupAvatar, groupAvatarUrl);
+                }
+            }
+        } else if (requestCode == CHOOSE_GROUP_TYPE_REQUEST_CODE) {
+            if (data != null) {
+                String type = data.getStringExtra(TUIContactConstants.Selection.TYPE);
+                if (TextUtils.isEmpty(type)) {
+                    TUIContactLog.e(TAG, "onActivityResult type is null");
+                    return;
+                }
+
+                groupType = type;
+                groupTypeLv.setContent(type);
+                initGroupTypeContentView();
+                if (TextUtils.equals(groupType, V2TIMManager.GROUP_TYPE_COMMUNITY)) {
+                    groupIdLv.setOnClickListener(null);
+                    groupIdLv.setClickable(false);
+                } else {
+                    groupIdLv.setClickable(true);
+                    groupIdLv.setOnClickListener(this);
+                }
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/ForwardSelectGroupActivity.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/ForwardSelectGroupActivity.java
new file mode 100644
index 0000000..a00d639
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/ForwardSelectGroupActivity.java
@@ -0,0 +1,279 @@
+package com.tencent.qcloud.tuikit.tuicontact.classicui.pages;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.component.CustomLinearLayoutManager;
+import com.tencent.qcloud.tuicore.component.LineControllerView;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.activities.SelectionActivity;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactConstants;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ConversationInfo;
+import com.tencent.qcloud.tuikit.tuicontact.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuicontact.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuicontact.classicui.widget.ContactListView;
+import com.tencent.qcloud.tuikit.tuicontact.classicui.widget.ForwardContactSelectorAdapter;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.ContactPresenter;
+import com.tencent.qcloud.tuikit.tuicontact.util.ContactUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+public class ForwardSelectGroupActivity extends BaseLightActivity {
+
+    private static final String TAG = ForwardSelectGroupActivity.class.getSimpleName();
+
+    private TitleBarLayout mTitleBar;
+    private ContactListView mContactListView;
+    private LineControllerView mJoinType;
+    private ArrayList<GroupMemberInfo> mMembers = new ArrayList<>();
+    private int mGroupType = -1;
+    private int mJoinTypeIndex = 2;
+    private ArrayList<String> mJoinTypes = new ArrayList<>();
+    private ArrayList<String> mGroupTypeValue = new ArrayList<>();
+    private boolean mCreating;
+    private boolean isCreateNewChat = true;
+
+    private RecyclerView mForwardSelectlistView;
+    private ForwardContactSelectorAdapter mAdapter;
+    private List<String> mSelectConversationIcons = new ArrayList<>();
+    private RelativeLayout mForwardSelectlistViewLayout;
+    private TextView mSureView;
+
+    private List<ConversationInfo> mContactDataSource = new ArrayList<>();
+
+    private ContactPresenter presenter;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.forward_select_group_contact);
+
+        init();
+    }
+
+    private String getMembersUserId(){
+        if (mMembers.size() == 0) {
+            return "";
+        }
+
+        String userIdString = "";
+        for(int i = 0; i < mMembers.size(); i++){
+            userIdString += mMembers.get(i).getAccount();
+            userIdString += " ";
+        }
+        return userIdString;
+    }
+
+    private void refreshMembers(){
+        if (mContactDataSource == null || mContactDataSource.size() ==0){
+            mMembers.clear();
+            return;
+        }
+
+        for (int i=0;i<mContactDataSource.size();i++){
+            GroupMemberInfo memberInfo = new GroupMemberInfo();
+            memberInfo.setAccount(mContactDataSource.get(i).getId());
+            memberInfo.setIconUrl((String)mContactDataSource.get(i).getIconUrlList().get(0));
+            mMembers.add(memberInfo);
+        }
+    }
+
+    private void init() {
+        Intent intent = getIntent();
+        if (intent != null){
+            isCreateNewChat = intent.getBooleanExtra(TUIContactConstants.FORWARD_CREATE_NEW_CHAT, false);
+        }
+
+        mTitleBar = findViewById(R.id.group_create_title_bar);
+        mTitleBar.getRightGroup().setVisibility(View.GONE);
+        mTitleBar.setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
+        mJoinType = findViewById(R.id.group_type_join);
+        mJoinType.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showJoinTypePickerView();
+            }
+        });
+        mJoinType.setCanNav(true);
+        mJoinType.setContent("Public");
+        mJoinType.setVisibility(View.GONE);
+
+        mContactListView = findViewById(R.id.group_create_member_list);
+
+        presenter = new ContactPresenter();
+        mContactListView.setPresenter(presenter);
+        presenter.setFriendListListener();
+        presenter.setContactListView(mContactListView);
+
+        mContactListView.loadDataSource(ContactListView.DataSource.FRIEND_LIST);
+        mContactListView.setOnSelectChangeListener(new ContactListView.OnSelectChangedListener() {
+            @Override
+            public void onSelectChanged(ContactItemBean contact, boolean selected) {
+                if (selected) {
+                    GroupMemberInfo memberInfo = new GroupMemberInfo();
+                    memberInfo.setAccount(contact.getId());
+                    memberInfo.setIconUrl(contact.getAvatarUrl());
+                    mMembers.add(memberInfo);
+                } else {
+                    for (int i = mMembers.size() - 1; i >= 0; i--) {
+                        if (mMembers.get(i).getAccount().equals(contact.getId())) {
+                            mMembers.remove(i);
+                        }
+                    }
+                }
+                refreshSelectConversations();
+            }
+        });
+
+        setGroupType(TUIContactConstants.GroupType.PUBLIC);
+
+        mForwardSelectlistViewLayout = findViewById(R.id.forward_contact_select_list_layout);
+        mForwardSelectlistViewLayout.setVisibility(View.VISIBLE);
+        mForwardSelectlistView = findViewById(R.id.forward_contact_select_list);
+        mForwardSelectlistView.setLayoutManager(new CustomLinearLayoutManager(this, CustomLinearLayoutManager.HORIZONTAL, false));
+        mAdapter = new ForwardContactSelectorAdapter(this);
+        mForwardSelectlistView.setAdapter(mAdapter);
+
+        mSureView = findViewById(R.id.btn_msg_ok);
+        mSureView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (isCreateNewChat){
+                    createGroupChat();
+                } else {
+                    Intent intent = new Intent();
+                    HashMap<String, String> conversationMap = new HashMap<>();
+                    if (mMembers != null && mMembers.size() != 0){
+                        for (int i=0;i<mMembers.size();i++){
+                            conversationMap.put(mMembers.get(i).getAccount(), mMembers.get(i).getIconUrl());
+                        }
+                    }
+
+                    intent.putExtra(TUIContactConstants.FORWARD_SELECT_CONVERSATION_KEY, conversationMap);
+                    setResult(TUIContactConstants.FORWARD_SELECT_MEMBERS_CODE, intent);
+
+                    finish();
+                }
+            }
+        });
+
+        refreshSelectConversations();
+    }
+
+    private void refreshSelectConversations(){
+        mSelectConversationIcons.clear();
+        if (mMembers != null && mMembers.size() != 0){
+            for (int i=0;i<mMembers.size();i++){
+                mSelectConversationIcons.add(mMembers.get(i).getIconUrl());
+            }
+        }
+        mAdapter.setDataSource(mSelectConversationIcons);
+
+        if (mSelectConversationIcons == null || mSelectConversationIcons.size() == 0){
+            mSureView.setText(getString(com.tencent.qcloud.tuicore.R.string.sure));
+            mSureView.setVisibility(View.GONE);
+            mForwardSelectlistViewLayout.setVisibility(View.GONE);
+        } else {
+            mForwardSelectlistViewLayout.setVisibility(View.VISIBLE);
+            mSureView.setVisibility(View.VISIBLE);
+            mSureView.setText(getString(com.tencent.qcloud.tuicore.R.string.sure) + "(" + mSelectConversationIcons.size() + ")");
+        }
+    }
+
+    public void setGroupType(int type) {
+        mGroupType = type;
+        mTitleBar.setTitle(getResources().getString(R.string.contact_title), ITitleBarLayout.Position.MIDDLE);
+        mJoinType.setVisibility(View.GONE);
+    }
+
+    private void showJoinTypePickerView() {
+        Bundle bundle = new Bundle();
+        bundle.putString(SelectionActivity.Selection.TITLE, getResources().getString(R.string.group_join_type));
+        bundle.putStringArrayList(SelectionActivity.Selection.LIST, mJoinTypes);
+        bundle.putInt(SelectionActivity.Selection.DEFAULT_SELECT_ITEM_INDEX, mJoinTypeIndex);
+        SelectionActivity.startListSelection(this, bundle, new SelectionActivity.OnResultReturnListener() {
+            @Override
+            public void onReturn(Object text) {
+                mJoinType.setContent(mJoinTypes.get((Integer) text));
+                mJoinTypeIndex = (Integer) text;
+            }
+        });
+    }
+
+    private void createGroupChat() {
+        if (mCreating || mMembers.isEmpty()) {
+            return;
+        }
+       
+        if (mMembers.size() == 1){
+            Intent intent = new Intent();
+            HashMap<String, Boolean> conversationMap = new HashMap<>();
+            conversationMap.put(mMembers.get(0).getAccount(), false);
+            intent.putExtra(TUIContactConstants.FORWARD_SELECT_CONVERSATION_KEY, conversationMap);
+            setResult(TUIContactConstants.FORWARD_CREATE_GROUP_CODE, intent);
+
+            finish();
+            return;
+        }
+        GroupMemberInfo memberInfo = new GroupMemberInfo();
+        memberInfo.setAccount(ContactUtils.getLoginUser());
+        mMembers.add(memberInfo);
+
+        final GroupInfo groupInfo = new GroupInfo();
+        String groupName = ContactUtils.getLoginUser();
+        for (int i = 1; i < mMembers.size(); i++) {
+            groupName = groupName + "、" + mMembers.get(i).getAccount();
+        }
+        if (groupName.length() > 20) {
+            groupName = groupName.substring(0, 17) + "...";
+        }
+        groupInfo.setChatName(groupName);
+        groupInfo.setGroupName(groupName);
+        groupInfo.setMemberDetails(mMembers);
+        groupInfo.setGroupType(TUIContactConstants.GroupType.TYPE_PUBLIC);
+        groupInfo.setJoinType(0);
+
+        mCreating = true;
+        
+        presenter.createGroupChat(groupInfo, new IUIKitCallback<String>() {
+            @Override
+            public void onSuccess(String data) {
+                Intent intent = new Intent();
+                HashMap<String, Boolean> conversationMap = new HashMap<>();
+                conversationMap.put(data, true);
+
+                intent.putExtra(TUIContactConstants.FORWARD_SELECT_CONVERSATION_KEY, conversationMap);
+                setResult(TUIContactConstants.FORWARD_CREATE_GROUP_CODE, intent);
+
+                finish();
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                mCreating = false;
+                ToastUtil.toastLongMessage("createGroupChat fail:" + errCode + "=" + errMsg);
+            }
+        });
+
+    }
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/FriendProfileActivity.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/FriendProfileActivity.java
new file mode 100644
index 0000000..7fcd672
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/FriendProfileActivity.java
@@ -0,0 +1,135 @@
+package com.tencent.qcloud.tuikit.tuicontact.classicui.pages;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.imsdk.v2.V2TIMGroupApplication;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.activities.ImageSelectActivity;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactConstants;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactGroupApplyInfo;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.classicui.util.ContactStartChatUtils;
+import com.tencent.qcloud.tuikit.tuicontact.classicui.widget.FriendProfileLayout;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.FriendProfilePresenter;
+import com.tencent.qcloud.tuikit.tuicontact.util.TUIContactLog;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+public class FriendProfileActivity extends BaseLightActivity {
+
+    private FriendProfilePresenter presenter;
+    private FriendProfileLayout layout;
+    private String mChatId;
+    private String mChatBackgroundThumbnailUrl;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.contact_friend_profile_activity);
+        layout = findViewById(R.id.friend_profile);
+        System.out.println("聊天界面");
+        presenter = new FriendProfilePresenter();
+        layout.setPresenter(presenter);
+        presenter.setFriendProfileLayout(layout);
+        Intent intent = getIntent();
+        mChatId = intent.getStringExtra(TUIConstants.TUIChat.CHAT_ID);
+        mChatBackgroundThumbnailUrl = intent.getStringExtra(TUIConstants.TUIChat.CHAT_BACKGROUND_URI);
+        String fromUser = intent.getStringExtra("fromUser");
+        String fromUserNickName = intent.getStringExtra("fromUserNickName");
+        String requestMsg = intent.getStringExtra("requestMsg");
+        V2TIMGroupApplication application = (V2TIMGroupApplication) intent.getSerializableExtra("groupApplication");
+
+        if (!TextUtils.isEmpty(mChatId)) {
+            layout.initData(mChatId);
+        } else if (!TextUtils.isEmpty(fromUser)) {
+            ContactGroupApplyInfo contactGroupApplyInfo = new ContactGroupApplyInfo();
+            contactGroupApplyInfo.setFromUser(fromUser);
+            contactGroupApplyInfo.setFromUserNickName(fromUserNickName);
+            contactGroupApplyInfo.setRequestMsg(requestMsg);
+            contactGroupApplyInfo.setTimGroupApplication(application);
+            layout.initData(contactGroupApplyInfo);
+        } else {
+            layout.initData(intent.getSerializableExtra(TUIContactConstants.ProfileType.CONTENT));
+        }
+        layout.setOnButtonClickListener(new FriendProfileLayout.OnButtonClickListener() {
+            @Override
+            public void onStartConversationClick(ContactItemBean info) {
+                String chatName = info.getId();
+                if (!TextUtils.isEmpty(info.getRemark())) {
+                    chatName = info.getRemark();
+                } else if (!TextUtils.isEmpty(info.getNickName())) {
+                    chatName = info.getNickName();
+                }
+                ContactStartChatUtils.startChatActivity(info.getId(), ContactItemBean.TYPE_C2C, chatName, "");
+            }
+
+            @Override
+            public void onDeleteFriendClick(String id) {
+                finish();
+            }
+
+            @Override
+            public void onSetChatBackground() {
+                ArrayList<ImageSelectActivity.ImageBean> faceList = new ArrayList<>();
+                ImageSelectActivity.ImageBean defaultFace = new ImageSelectActivity.ImageBean();
+                defaultFace.setDefault(true);
+                faceList.add(defaultFace);
+                for (int i = 0; i < TUIConstants.TUIChat.CHAT_CONVERSATION_BACKGROUND_COUNT; i++) {
+                    ImageSelectActivity.ImageBean imageBean = new ImageSelectActivity.ImageBean();
+                    imageBean.setImageUri(String.format(TUIConstants.TUIChat.CHAT_CONVERSATION_BACKGROUND_URL, (i + 1) + ""));
+                    imageBean.setThumbnailUri(String.format(TUIConstants.TUIChat.CHAT_CONVERSATION_BACKGROUND_THUMBNAIL_URL, (i + 1) + ""));
+                    faceList.add(imageBean);
+                }
+
+                Intent intent = new Intent(FriendProfileActivity.this, ImageSelectActivity.class);
+                intent.putExtra(ImageSelectActivity.TITLE, getResources().getString(R.string.chat_background_title));
+                intent.putExtra(ImageSelectActivity.SPAN_COUNT, 2);
+                intent.putExtra(ImageSelectActivity.ITEM_WIDTH, ScreenUtil.dip2px(186));
+                intent.putExtra(ImageSelectActivity.ITEM_HEIGHT, ScreenUtil.dip2px(124));
+                intent.putExtra(ImageSelectActivity.DATA, faceList);
+                if (TextUtils.isEmpty(mChatBackgroundThumbnailUrl) || TextUtils.equals(TUIConstants.TUIChat.CHAT_CONVERSATION_BACKGROUND_DEFAULT_URL, mChatBackgroundThumbnailUrl)) {
+                    intent.putExtra(ImageSelectActivity.SELECTED, defaultFace);
+                } else {
+                    intent.putExtra(ImageSelectActivity.SELECTED, new ImageSelectActivity.ImageBean(mChatBackgroundThumbnailUrl, "", false));
+                }
+                intent.putExtra(ImageSelectActivity.NEED_DOWLOAD_LOCAL, true);
+                startActivityForResult(intent, TUIConstants.TUIChat.CHAT_REQUEST_BACKGROUND_CODE);
+            }
+        });
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == TUIConstants.TUIChat.CHAT_REQUEST_BACKGROUND_CODE) {
+            if (data == null) {
+                return;
+            }
+            ImageSelectActivity.ImageBean imageBean = (ImageSelectActivity.ImageBean) data.getSerializableExtra(ImageSelectActivity.DATA);
+            if (imageBean == null) {
+                TUIContactLog.e("FriendProfileActivity", "onActivityResult imageBean is null");
+                return;
+            }
+
+            String backgroundUri = imageBean.getLocalPath();
+            String thumbnailUri = imageBean.getThumbnailUri();
+            String dataUri = thumbnailUri + "," + backgroundUri;
+            TUIContactLog.d("FriendProfileActivity", "onActivityResult backgroundUri = " + backgroundUri);
+            mChatBackgroundThumbnailUrl = thumbnailUri;
+            HashMap<String, Object> param = new HashMap<>();
+            param.put(TUIConstants.TUIChat.CHAT_ID, mChatId);
+            param.put(TUIConstants.TUIChat.CHAT_BACKGROUND_URI, dataUri);
+            TUICore.callService(TUIConstants.TUIChat.SERVICE_NAME, TUIConstants.TUIChat.METHOD_UPDATE_DATA_STORE_CHAT_URI, param);
+        }
+    }
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/GroupListActivity.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/GroupListActivity.java
new file mode 100644
index 0000000..e8a83f7
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/GroupListActivity.java
@@ -0,0 +1,91 @@
+package com.tencent.qcloud.tuikit.tuicontact.classicui.pages;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.classicui.util.ContactStartChatUtils;
+import com.tencent.qcloud.tuikit.tuicontact.classicui.widget.ContactListView;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.ContactPresenter;
+
+public class GroupListActivity extends BaseLightActivity {
+
+    private static final String TAG = GroupListActivity.class.getSimpleName();
+
+    private TitleBarLayout mTitleBar;
+    private ContactListView mListView;
+
+    private ContactPresenter presenter;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.group_list_activity);
+
+        init();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        loadDataSource();
+    }
+
+    private void init() {
+        mTitleBar = findViewById(R.id.group_list_titlebar);
+        mTitleBar.setTitle(getResources().getString(R.string.group), ITitleBarLayout.Position.LEFT);
+        mTitleBar.setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        mTitleBar.setTitle(getResources().getString(R.string.add_group), ITitleBarLayout.Position.RIGHT);
+        mTitleBar.getRightIcon().setVisibility(View.GONE);
+        mTitleBar.setOnRightClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(GroupListActivity.this, AddMoreActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                intent.putExtra("isGroup", true);
+                startActivity(intent);
+            }
+        });
+
+        mListView = findViewById(R.id.group_list);
+        mListView.setOnItemClickListener(new ContactListView.OnItemClickListener() {
+            @Override
+            public void onItemClick(int position, ContactItemBean contact) {
+                String chatName = contact.getId();
+                if (!TextUtils.isEmpty(contact.getRemark())) {
+                    chatName = contact.getRemark();
+                } else if (!TextUtils.isEmpty(contact.getNickName())) {
+                    chatName = contact.getNickName();
+                }
+                ContactStartChatUtils.startChatActivity(contact.getId(), ContactItemBean.TYPE_GROUP, chatName, contact.getGroupType());
+            }
+        });
+    }
+
+    public void loadDataSource() {
+        presenter = new ContactPresenter();
+        presenter.setFriendListListener();
+        mListView.setIsGroupList(true);
+        mListView.setPresenter(presenter);
+        mListView.setNotFoundTip(getString(R.string.contact_no_group));
+        presenter.setContactListView(mListView);
+        mListView.loadDataSource(ContactListView.DataSource.GROUP_LIST);
+    }
+
+    @Override
+    public void finish() {
+        super.finish();
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/GroupTypeSelectActivity.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/GroupTypeSelectActivity.java
new file mode 100644
index 0000000..0d6ce0b
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/GroupTypeSelectActivity.java
@@ -0,0 +1,167 @@
+package com.tencent.qcloud.tuikit.tuicontact.classicui.pages;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.util.TUIUtil;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactConstants;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class GroupTypeSelectActivity extends BaseLightActivity implements View.OnClickListener {
+    private static final String TAG = GroupTypeSelectActivity.class.getSimpleName();
+
+    private RecyclerView mRecyclerView;
+    private RecyclerView.LayoutManager mLayoutManager;
+    private RecyclerView.Adapter mAdapter;
+    private List<String> mDatas = new ArrayList<>();
+    private TitleBarLayout titleBarLayout;
+    private TextView groupTypeTextView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.group_type_select_layout);
+
+        initData();
+        initView();
+    }
+
+    private void initView() {
+        mLayoutManager = new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false);
+        mAdapter = new MyAdapter(mDatas);
+        mRecyclerView = (RecyclerView) findViewById(R.id.recycler);
+        mRecyclerView.setLayoutManager(mLayoutManager);
+        mRecyclerView.setAdapter(mAdapter);
+        titleBarLayout = findViewById(R.id.create_group_bar);
+        titleBarLayout.getRightIcon().setVisibility(View.GONE);
+        titleBarLayout.setTitle(getString(R.string.group_type_select_text), ITitleBarLayout.Position.MIDDLE);
+        titleBarLayout.setOnLeftClickListener(this);
+        groupTypeTextView = findViewById(R.id.group_type_text);
+        groupTypeTextView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                String url = "";
+                if (TextUtils.equals(TUIThemeManager.getInstance().getCurrentLanguage(), "zh")) {
+                    url = TUIContactConstants.IM_PRODUCT_DOC_URL;
+                } else {
+                    url = TUIContactConstants.IM_PRODUCT_DOC_URL_EN;
+                }
+                Intent intent = new Intent();
+                intent.setAction(Intent.ACTION_VIEW);
+                Uri contentUrl = Uri.parse(url);
+                intent.setData(contentUrl);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                startActivity(intent);
+            }
+        });
+    }
+
+    private void initData() {
+        String[] array = getResources().getStringArray(R.array.group_type);
+        mDatas.addAll(Arrays.asList(array));
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (view == titleBarLayout.getLeftGroup()) {
+            finish();
+        }
+    }
+
+
+    public class MyAdapter extends RecyclerView.Adapter<MyAdapter.ViewHolder>{
+        private List<String> mDatas;
+
+        public MyAdapter(List<String> datas) {
+            this.mDatas = datas;
+        }
+
+        @Override
+        public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.group_type_item, parent, false);
+            ViewHolder viewHolder = new ViewHolder(v);
+            return viewHolder;
+        }
+
+        @Override
+        public void onBindViewHolder(ViewHolder holder, int position) {
+            String type = this.mDatas.get(position);
+            holder.imageView.setImageResource(TUIUtil.getDefaultGroupIconResIDByGroupType(getApplicationContext(), type));
+            switch(type) {
+                case V2TIMManager.GROUP_TYPE_WORK:
+                    holder.textView.setText(getString(R.string.group_work_type));
+                    holder.subTextView.setText(getString(R.string.group_work_content));
+                    break;
+                case V2TIMManager.GROUP_TYPE_PUBLIC:
+                    holder.textView.setText(getString(R.string.group_public_type));
+                    holder.subTextView.setText(getString(R.string.group_public_des));
+                    break;
+                case V2TIMManager.GROUP_TYPE_MEETING:
+                    holder.textView.setText(getString(R.string.group_meeting_type));
+                    holder.subTextView.setText(getString(R.string.group_meeting_des));
+                    break;
+                case V2TIMManager.GROUP_TYPE_COMMUNITY:
+                    holder.textView.setText(getString(R.string.group_commnity_type));
+                    holder.subTextView.setText(getString(R.string.group_commnity_des));
+                    break;
+                default:
+                    holder.textView.setText(getString(R.string.group_work_type));
+                    holder.subTextView.setText(getString(R.string.group_work_content));
+                    break;
+            }
+
+            holder.rootView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    Intent intent = new Intent();
+                    intent.putExtra(TUIContactConstants.Selection.TYPE, type);
+                    setResult(0, intent);
+                    finish();
+                }
+            });
+        }
+
+        @Override
+        public int getItemCount() {
+            return this.mDatas == null ? 0 : this.mDatas.size();
+        }
+
+        public class ViewHolder extends RecyclerView.ViewHolder {
+            View rootView;
+            RelativeLayout itemLayout;
+            ImageView imageView;
+            TextView textView, subTextView;
+
+            public ViewHolder(View itemView) {
+                super(itemView);
+                rootView = itemView;
+                itemLayout = (RelativeLayout) itemView.findViewById(R.id.item_layout);
+                imageView = (ImageView) itemView.findViewById(R.id.group_type_icon);
+                textView = (TextView) itemView.findViewById(R.id.group_type_text);
+                subTextView = (TextView) itemView.findViewById(R.id.group_type_content);
+            }
+        }
+    }
+
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/NewFriendActivity.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/NewFriendActivity.java
new file mode 100644
index 0000000..b8bd59d
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/NewFriendActivity.java
@@ -0,0 +1,97 @@
+package com.tencent.qcloud.tuikit.tuicontact.classicui.pages;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.bean.FriendApplicationBean;
+import com.tencent.qcloud.tuikit.tuicontact.classicui.widget.NewFriendListAdapter;
+import com.tencent.qcloud.tuikit.tuicontact.interfaces.INewFriendActivity;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.NewFriendPresenter;
+import com.tencent.qcloud.tuikit.tuicontact.util.TUIContactLog;
+
+import java.util.List;
+
+public class NewFriendActivity extends BaseLightActivity implements INewFriendActivity {
+
+    private static final String TAG = NewFriendActivity.class.getSimpleName();
+
+    private TitleBarLayout mTitleBar;
+    private ListView mNewFriendLv;
+    private NewFriendListAdapter mAdapter;
+    private TextView notFoundTip;
+
+    private NewFriendPresenter presenter;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.contact_new_friend_activity);
+        init();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        initPendency();
+    }
+
+    private void init() {
+        mTitleBar = findViewById(R.id.new_friend_titlebar);
+        mTitleBar.setTitle(getResources().getString(R.string.new_friend), ITitleBarLayout.Position.MIDDLE);
+        mTitleBar.setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        mTitleBar.getRightIcon().setVisibility(View.GONE);
+        presenter = new NewFriendPresenter();
+        presenter.setFriendActivity(this);
+        presenter.setFriendApplicationListAllRead(new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+
+            }
+        });
+        mNewFriendLv = findViewById(R.id.new_friend_list);
+        notFoundTip = findViewById(R.id.not_found_tip);
+    }
+
+    private void initPendency() {
+        presenter.loadFriendApplicationList();
+    }
+
+    @Override
+    public void onDataSourceChanged(List<FriendApplicationBean> dataSource) {
+        TUIContactLog.i(TAG, "getFriendApplicationList success");
+        if (dataSource == null || dataSource.isEmpty()) {
+            notFoundTip.setVisibility(View.VISIBLE);
+        } else {
+            notFoundTip.setVisibility(View.GONE);
+        }
+        mNewFriendLv.setVisibility(View.VISIBLE);
+        mAdapter = new NewFriendListAdapter(NewFriendActivity.this, R.layout.contact_new_friend_item, dataSource);
+        mAdapter.setPresenter(presenter);
+        mNewFriendLv.setAdapter(mAdapter);
+        mAdapter.notifyDataSetChanged();
+    }
+
+    @Override
+    public void finish() {
+        super.finish();
+    }
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/StartC2CChatActivity.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/StartC2CChatActivity.java
new file mode 100644
index 0000000..8a1781b
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/StartC2CChatActivity.java
@@ -0,0 +1,98 @@
+package com.tencent.qcloud.tuikit.tuicontact.classicui.pages;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.classicui.util.ContactStartChatUtils;
+import com.tencent.qcloud.tuikit.tuicontact.classicui.widget.ContactListView;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.ContactPresenter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class StartC2CChatActivity extends BaseLightActivity {
+
+    private static final String TAG = StartC2CChatActivity.class.getSimpleName();
+
+    private TitleBarLayout mTitleBar;
+    private ContactListView mContactListView;
+    private ContactItemBean mSelectedItem;
+    private List<ContactItemBean> mContacts = new ArrayList<>();
+
+    private ContactPresenter presenter;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.popup_start_c2c_chat_activity);
+
+        mTitleBar = findViewById(R.id.start_c2c_chat_title);
+        mTitleBar.setTitle(getResources().getString(com.tencent.qcloud.tuicore.R.string.sure), ITitleBarLayout.Position.RIGHT);
+        mTitleBar.getRightIcon().setVisibility(View.GONE);
+        mTitleBar.setOnRightClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startConversation();
+            }
+        });
+        mTitleBar.setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
+        mContactListView = findViewById(R.id.contact_list_view);
+        mContactListView.setSingleSelectMode(true);
+
+        presenter = new ContactPresenter();
+        presenter.setFriendListListener();
+        mContactListView.setPresenter(presenter);
+        presenter.setContactListView(mContactListView);
+
+        mContactListView.loadDataSource(ContactListView.DataSource.FRIEND_LIST);
+        mContactListView.setOnSelectChangeListener(new ContactListView.OnSelectChangedListener() {
+            @Override
+            public void onSelectChanged(ContactItemBean contact, boolean selected) {
+                if (selected) {
+                    if (mSelectedItem == contact) {
+                        
+                    } else {
+                        if (mSelectedItem != null) {
+                            mSelectedItem.setSelected(false);
+                        }
+                        mSelectedItem = contact;
+                    }
+                } else {
+                    if (mSelectedItem == contact) {
+                        mSelectedItem.setSelected(false);
+                    }
+                }
+            }
+        });
+    }
+
+    public void startConversation() {
+        if (mSelectedItem == null || !mSelectedItem.isSelected()) {
+            ToastUtil.toastLongMessage(getString(R.string.select_chat));
+            return;
+        }
+        String chatName = mSelectedItem.getId();
+        if (!TextUtils.isEmpty(mSelectedItem.getRemark())) {
+            chatName = mSelectedItem.getRemark();
+        } else if (!TextUtils.isEmpty(mSelectedItem.getNickName())) {
+            chatName = mSelectedItem.getNickName();
+        }
+
+        ContactStartChatUtils.startChatActivity(mSelectedItem.getId(), ContactItemBean.TYPE_C2C, chatName, "");
+        finish();
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/StartGroupChatActivity.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/StartGroupChatActivity.java
new file mode 100644
index 0000000..f722afe
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/StartGroupChatActivity.java
@@ -0,0 +1,334 @@
+package com.tencent.qcloud.tuikit.tuicontact.classicui.pages;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.TextPaint;
+import android.text.TextUtils;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
+import android.text.style.ForegroundColorSpan;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuicore.component.LineControllerView;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.activities.SelectionActivity;
+import com.tencent.qcloud.tuicore.component.dialog.TUIKitDialog;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactConstants;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuicontact.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuicontact.classicui.util.ContactStartChatUtils;
+import com.tencent.qcloud.tuikit.tuicontact.classicui.widget.ContactListView;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.ContactPresenter;
+import com.tencent.qcloud.tuikit.tuicontact.util.ContactUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class StartGroupChatActivity extends BaseLightActivity {
+
+    private static final String TAG = StartGroupChatActivity.class.getSimpleName();
+
+    private TitleBarLayout mTitleBar;
+    private ContactListView mContactListView;
+    private LineControllerView mJoinType;
+    private ArrayList<GroupMemberInfo> mMembers = new ArrayList<>();
+    private int mGroupType = -1;
+    private boolean communitySupportTopic = false;
+    private int mJoinTypeIndex = 2;
+    private ArrayList<String> mJoinTypes = new ArrayList<>();
+    private ArrayList<String> mGroupTypeValue = new ArrayList<>();
+    private boolean mCreating;
+    private RecyclerView selectedList;
+    private StartGroupMemberSelectActivity.SelectedAdapter selectedListAdapter;
+    private TextView confirmButton;
+    private ContactPresenter presenter;
+    private GroupMemberInfo selfInfo;
+    private int limit;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.popup_start_group_chat_activity);
+        selfInfo = new GroupMemberInfo();
+        selfInfo.setAccount(ContactUtils.getLoginUser());
+        selfInfo.setNickName(TUIConfig.getSelfNickName());
+        init();
+    }
+
+    private void init() {
+        limit = getIntent().getIntExtra(TUIContactConstants.Selection.LIMIT, Integer.MAX_VALUE);
+        String[] array = getResources().getStringArray(R.array.group_type);
+        mGroupTypeValue.addAll(Arrays.asList(array));
+        array = getResources().getStringArray(R.array.group_join_type);
+        mJoinTypes.addAll(Arrays.asList(array));
+
+        mTitleBar = findViewById(R.id.group_create_title_bar);
+        mTitleBar.setTitle(getResources().getString(com.tencent.qcloud.tuicore.R.string.sure), ITitleBarLayout.Position.RIGHT);
+        mTitleBar.getRightIcon().setVisibility(View.GONE);
+        mTitleBar.setOnRightClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                toCreateGroupChat();
+            }
+        });
+        mTitleBar.setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
+        mJoinType = findViewById(R.id.group_type_join);
+        mJoinType.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showJoinTypePickerView();
+            }
+        });
+        mJoinType.setCanNav(true);
+        mJoinType.setContent(mJoinTypes.get(2));
+
+        mContactListView = findViewById(R.id.group_create_member_list);
+        confirmButton = findViewById(R.id.confirm_button);
+        selectedList = findViewById(R.id.selected_list);
+        selectedListAdapter = new StartGroupMemberSelectActivity.SelectedAdapter();
+        selectedList.setLayoutManager(new LinearLayoutManager(this, RecyclerView.HORIZONTAL, false));
+        selectedList.setAdapter(selectedListAdapter);
+        presenter = new ContactPresenter();
+        presenter.setFriendListListener();
+        mContactListView.setPresenter(presenter);
+        presenter.setContactListView(mContactListView);
+
+        ArrayList<String> alreadySelectedList = new ArrayList<>();
+        alreadySelectedList.add(TUILogin.getLoginUser());
+        mContactListView.setAlreadySelectedList(alreadySelectedList);
+        mContactListView.loadDataSource(ContactListView.DataSource.FRIEND_LIST);
+        mContactListView.setOnSelectChangeListener(new ContactListView.OnSelectChangedListener() {
+            @Override
+            public void onSelectChanged(ContactItemBean contact, boolean selected) {
+                if (selected) {
+                    GroupMemberInfo memberInfo = new GroupMemberInfo();
+                    memberInfo.setAccount(contact.getId());
+                    memberInfo.setNickName(contact.getNickName());
+                    memberInfo.setIconUrl(contact.getAvatarUrl());
+                    mMembers.add(memberInfo);
+                } else {
+                    for (int i = mMembers.size() - 1; i >= 0; i--) {
+                        if (mMembers.get(i).getAccount().equals(contact.getId())) {
+                            mMembers.remove(i);
+                        }
+                    }
+                }
+                selectedListAdapter.setMembers(mMembers);
+                selectedListAdapter.notifyDataSetChanged();
+                if (mMembers.size() > 0) {
+                    confirmButton.setAlpha(1f);
+                    confirmButton.setEnabled(true);
+                } else {
+                    confirmButton.setAlpha(0.5f);
+                    confirmButton.setEnabled(false);
+                }
+            }
+        });
+        confirmButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                toCreateGroupChat();
+            }
+        });
+        confirmButton.setAlpha(0.5f);
+        confirmButton.setEnabled(false);
+        Intent intent = getIntent();
+        communitySupportTopic = intent.getBooleanExtra(TUIConstants.TUIContact.COMMUNITY_SUPPORT_TOPIC_KEY, false);
+        setGroupType(intent.getIntExtra(TUIConstants.TUIContact.GROUP_TYPE_KEY, TUIContactConstants.GroupType.PRIVATE));
+    }
+
+    public void setGroupType(int type) {
+        mGroupType = type;
+        switch (type) {
+            case TUIContactConstants.GroupType.PUBLIC:
+                mTitleBar.setTitle(getResources().getString(R.string.create_group_chat), ITitleBarLayout.Position.MIDDLE);
+                break;
+            case TUIContactConstants.GroupType.CHAT_ROOM:
+                mTitleBar.setTitle(getResources().getString(R.string.create_chat_room), ITitleBarLayout.Position.MIDDLE);
+                break;
+            case TUIContactConstants.GroupType.COMMUNITY:
+                mTitleBar.setTitle(getResources().getString(R.string.create_community), ITitleBarLayout.Position.MIDDLE);
+                break;
+            case TUIContactConstants.GroupType.PRIVATE:
+            default:
+                mTitleBar.setTitle(getResources().getString(R.string.create_private_group), ITitleBarLayout.Position.MIDDLE);
+                break;
+        }
+    }
+
+    private void showJoinTypePickerView() {
+        Bundle bundle = new Bundle();
+        bundle.putString(SelectionActivity.Selection.TITLE, getResources().getString(R.string.group_join_type));
+        bundle.putStringArrayList(SelectionActivity.Selection.LIST, mJoinTypes);
+        bundle.putInt(SelectionActivity.Selection.DEFAULT_SELECT_ITEM_INDEX, mJoinTypeIndex);
+        SelectionActivity.startListSelection(this, bundle, new SelectionActivity.OnResultReturnListener() {
+            @Override
+            public void onReturn(Object text) {
+                mJoinType.setContent(mJoinTypes.get((Integer) text));
+                mJoinTypeIndex = (Integer) text;
+            }
+        });
+    }
+
+    private void toCreateGroupChat() {
+        mMembers.add(0, selfInfo);
+        if (mMembers.size() == 1) {
+            ToastUtil.toastLongMessage(getResources().getString(R.string.tips_empty_group_member));
+            return;
+        }
+
+        String groupName = selfInfo.getDisplayName();
+        for (int i = 1; i < mMembers.size(); i++) {
+            groupName = groupName + "、" + mMembers.get(i).getDisplayName();
+        }
+        if (groupName.length() >= 10) {
+            groupName = groupName.substring(0, 7) + "..";
+        }
+
+        Bundle bundle = new Bundle();
+        bundle.putString(TUIConstants.TUIGroup.GROUP_NAME, groupName);
+        bundle.putInt(TUIConstants.TUIGroup.JOIN_TYPE_INDEX, mJoinTypeIndex);
+        bundle.putSerializable(TUIConstants.TUIGroup.GROUP_MEMBER_ID_LIST, mMembers);
+        TUICore.startActivity("CreateGroupActivity", bundle);
+        finish();
+    }
+
+    private void createGroupChat() {
+        if (mCreating) {
+            return;
+        }
+        mMembers.add(0, selfInfo);
+        if (mGroupType < 3 && mMembers.size() == 1) {
+            ToastUtil.toastLongMessage(getResources().getString(R.string.tips_empty_group_member));
+            return;
+        }
+        if (mGroupType > 0 && mJoinTypeIndex == -1) {
+            ToastUtil.toastLongMessage(getResources().getString(R.string.tips_empty_group_type));
+            return;
+        }
+        if (mGroupType == 0) {
+            mJoinTypeIndex = -1;
+        }
+        final GroupInfo groupInfo = new GroupInfo();
+        String groupName = selfInfo.getDisplayName();
+        for (int i = 1; i < mMembers.size(); i++) {
+            groupName = groupName + "、" + mMembers.get(i).getDisplayName();
+        }
+        if (groupName.length() >= 10) {
+            groupName = groupName.substring(0, 7) + "..";
+        }
+        groupInfo.setChatName(groupName);
+        groupInfo.setGroupName(groupName);
+        groupInfo.setMemberDetails(mMembers);
+        groupInfo.setGroupType(mGroupTypeValue.get(mGroupType));
+        groupInfo.setJoinType(mJoinTypeIndex);
+        groupInfo.setCommunitySupportTopic(communitySupportTopic);
+
+        mCreating = true;
+
+        presenter.createGroupChat(groupInfo, new IUIKitCallback<String>() {
+            @Override
+            public void onSuccess(String data) {
+                if (!communitySupportTopic) {
+                    ContactStartChatUtils.startChatActivity(data, ChatInfo.TYPE_GROUP, groupInfo.getGroupName(), groupInfo.getGroupType());
+                }
+                finish();
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                mCreating = false;
+                mMembers.remove(selfInfo);
+                if (errCode == TUIConstants.BuyingFeature.ERR_SDK_INTERFACE_NOT_SUPPORT || errCode == 11000) {
+                    showNotSupportDialog();
+                }
+                ToastUtil.toastLongMessage("createGroupChat fail:" + errCode + "=" + errMsg);
+            }
+        });
+    }
+
+    private void showNotSupportDialog() {
+        String string = getResources().getString(R.string.contact_im_flagship_edition_update_tip, getString(R.string.contact_community));
+        String buyingGuidelines = getResources().getString(R.string.contact_buying_guidelines);
+        int buyingGuidelinesIndex = string.lastIndexOf(buyingGuidelines);
+        final int foregroundColor = getResources().getColor(TUIThemeManager.getAttrResId(this, com.tencent.qcloud.tuicore.R.attr.core_primary_color));
+        SpannableString spannedString = new SpannableString(string);
+        ForegroundColorSpan colorSpan2 = new ForegroundColorSpan(foregroundColor);
+        spannedString.setSpan(colorSpan2, buyingGuidelinesIndex, buyingGuidelinesIndex + buyingGuidelines.length(), Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
+
+        ClickableSpan clickableSpan2 = new ClickableSpan() {
+            @Override
+            public void onClick(View view) {
+                if (TextUtils.equals(TUIThemeManager.getInstance().getCurrentLanguage(), "zh")) {
+                    openWebUrl(TUIConstants.BuyingFeature.BUYING_PRICE_DESC);
+                } else {
+                    openWebUrl(TUIConstants.BuyingFeature.BUYING_PRICE_DESC_EN);
+                }
+            }
+
+            @Override
+            public void updateDrawState(TextPaint ds) {
+                ds.setUnderlineText(false);
+            }
+        };
+        spannedString.setSpan(clickableSpan2, buyingGuidelinesIndex, buyingGuidelinesIndex + buyingGuidelines.length(), Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
+
+        TUIKitDialog.TUIIMUpdateDialog.getInstance()
+                .createDialog(this)
+                .setMovementMethod(LinkMovementMethod.getInstance())
+                .setShowOnlyDebug(true)
+                .setCancelable(true)
+                .setCancelOutside(true)
+                .setTitle(spannedString)
+                .setDialogWidth(0.75f)
+                .setDialogFeatureName(TUIConstants.BuyingFeature.BUYING_FEATURE_COMMUNITY)
+                .setPositiveButton(getString(R.string.contact_no_more_reminders), new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        TUIKitDialog.TUIIMUpdateDialog.getInstance().dismiss();
+                        TUIKitDialog.TUIIMUpdateDialog.getInstance().setNeverShow(true);
+                    }
+                })
+                .setNegativeButton(getString(R.string.contact_i_know), new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        TUIKitDialog.TUIIMUpdateDialog.getInstance().dismiss();
+                    }
+                })
+                .show();
+    }
+
+    private void openWebUrl(String url) {
+        Intent intent = new Intent();
+        intent.setAction(Intent.ACTION_VIEW);
+        Uri contentUrl = Uri.parse(url);
+        intent.setData(contentUrl);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        startActivity(intent);
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/StartGroupMemberSelectActivity.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/StartGroupMemberSelectActivity.java
new file mode 100644
index 0000000..3f3ce15
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/StartGroupMemberSelectActivity.java
@@ -0,0 +1,224 @@
+package com.tencent.qcloud.tuikit.tuicontact.classicui.pages;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactConstants;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuicontact.classicui.widget.ContactListView;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.ContactPresenter;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class StartGroupMemberSelectActivity extends BaseLightActivity {
+
+    private static final String TAG = StartGroupMemberSelectActivity.class.getSimpleName();
+
+    private TitleBarLayout mTitleBar;
+    private ContactListView mContactListView;
+    private ArrayList<GroupMemberInfo> mMembers = new ArrayList<>();
+    private ArrayList<String> alreadySelectedList;
+    private RecyclerView selectedList;
+    private SelectedAdapter selectedListAdapter;
+    private TextView confirmButton;
+    private ContactPresenter presenter;
+    private int limit;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.popup_start_group_select_activity);
+
+        init();
+    }
+
+    private ArrayList<String> getMembersNameCard(){
+        if (mMembers.size() == 0) {
+            return new ArrayList<>();
+        }
+
+        ArrayList<String> nameCards = new ArrayList<>();
+        for(int i = 0; i < mMembers.size(); i++){
+            nameCards.add(mMembers.get(i).getNameCard());
+        }
+        return nameCards;
+    }
+
+    private ArrayList<String> getMembersUserId(){
+        if (mMembers.size() == 0) {
+            return new ArrayList<>();
+        }
+
+        ArrayList<String> userIds = new ArrayList<>();
+        for(int i = 0; i < mMembers.size(); i++){
+            userIds.add(mMembers.get(i).getAccount());
+        }
+        return userIds;
+    }
+
+    private void init() {
+        mMembers.clear();
+
+        String groupId = getIntent().getStringExtra(TUIContactConstants.Group.GROUP_ID);
+        boolean isSelectFriends = getIntent().getBooleanExtra(TUIContactConstants.Selection.SELECT_FRIENDS, false);
+        boolean isSelectForCall = getIntent().getBooleanExtra(TUIContactConstants.Selection.SELECT_FOR_CALL, true);
+        limit = getIntent().getIntExtra(TUIContactConstants.Selection.LIMIT, Integer.MAX_VALUE);
+        alreadySelectedList = getIntent().getStringArrayListExtra(TUIContactConstants.Selection.SELECTED_LIST);
+        mTitleBar = findViewById(R.id.group_create_title_bar);
+        mTitleBar.setTitle(getResources().getString(com.tencent.qcloud.tuicore.R.string.sure), ITitleBarLayout.Position.RIGHT);
+        mTitleBar.getRightIcon().setVisibility(View.GONE);
+        mTitleBar.setOnRightClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                confirmAndFinish();
+            }
+        });
+        mTitleBar.setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        confirmButton = findViewById(R.id.confirm_button);
+        selectedList = findViewById(R.id.selected_list);
+        selectedListAdapter = new SelectedAdapter();
+        selectedList.setLayoutManager(new LinearLayoutManager(this, RecyclerView.HORIZONTAL, false));
+        selectedList.setAdapter(selectedListAdapter);
+        mContactListView = findViewById(R.id.group_create_member_list);
+        mContactListView.setAlreadySelectedList(alreadySelectedList);
+        presenter = new ContactPresenter();
+        presenter.setFriendListListener();
+        presenter.setIsForCall(isSelectForCall);
+        mContactListView.setPresenter(presenter);
+        presenter.setContactListView(mContactListView);
+
+        mContactListView.setGroupId(groupId);
+        if (isSelectFriends) {
+            mTitleBar.setTitle(getString(R.string.add_group_member), TitleBarLayout.Position.MIDDLE);
+            mContactListView.loadDataSource(ContactListView.DataSource.FRIEND_LIST);
+        } else {
+            mContactListView.loadDataSource(ContactListView.DataSource.GROUP_MEMBER_LIST);
+        }
+
+        if (!isSelectForCall && !isSelectFriends) {
+            mContactListView.setOnItemClickListener(new ContactListView.OnItemClickListener() {
+                @Override
+                public void onItemClick(int position, ContactItemBean contact) {
+                    if (position == 0) {
+                        mMembers.clear();
+
+                        Intent i = new Intent();
+                        i.putStringArrayListExtra(TUIContactConstants.Selection.USER_NAMECARD_SELECT, new ArrayList<String>(Arrays.asList(getString(R.string.at_all))));
+                        i.putStringArrayListExtra(TUIContactConstants.Selection.USER_ID_SELECT, new ArrayList<String>(Arrays.asList(TUIContactConstants.Selection.SELECT_ALL)));
+                        setResult(3, i);
+
+                        finish();
+                    }
+                }
+            });
+        }
+        mContactListView.setOnSelectChangeListener(new ContactListView.OnSelectChangedListener() {
+            @Override
+            public void onSelectChanged(ContactItemBean contact, boolean selected) {
+                if (selected) {
+                    GroupMemberInfo memberInfo = new GroupMemberInfo();
+                    memberInfo.setAccount(contact.getId());
+                    memberInfo.setIconUrl(contact.getAvatarUrl());
+                    memberInfo.setNameCard(TextUtils.isEmpty(contact.getNickName()) ? contact.getId() : contact.getNickName());
+                    mMembers.add(memberInfo);
+                } else {
+                    for (int i = mMembers.size() - 1; i >= 0; i--) {
+                        if (mMembers.get(i).getAccount().equals(contact.getId())) {
+                            mMembers.remove(i);
+                        }
+                    }
+                }
+                selectedListAdapter.setMembers(mMembers);
+                selectedListAdapter.notifyDataSetChanged();
+            }
+        });
+        confirmButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                confirmAndFinish();
+            }
+        });
+
+    }
+
+    private void confirmAndFinish() {
+        if (mMembers.size() > limit) {
+            String overLimitTip = getString(R.string.contact_over_limit_tip, limit);
+            ToastUtil.toastShortMessage(overLimitTip);
+            return;
+        }
+        Intent i = new Intent();
+        List<String> friendIdList = new ArrayList<>();
+        for (GroupMemberInfo memberInfo : mMembers) {
+            friendIdList.add(memberInfo.getAccount());
+        }
+        i.putExtra(TUIContactConstants.Selection.LIST, (Serializable) friendIdList);
+        i.putStringArrayListExtra(TUIContactConstants.Selection.USER_NAMECARD_SELECT, getMembersNameCard());
+        i.putStringArrayListExtra(TUIContactConstants.Selection.USER_ID_SELECT, getMembersUserId());
+        i.putExtras(getIntent());
+        setResult(3, i);
+
+        finish();
+    }
+
+    public static class SelectedAdapter extends RecyclerView.Adapter<SelectedAdapter.SelectedViewHolder> {
+        private List<GroupMemberInfo> mMembers;
+
+        public void setMembers(List<GroupMemberInfo> mMembers) {
+            this.mMembers = mMembers;
+        }
+
+        @NonNull
+        @Override
+        public SelectedViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            return new SelectedViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.forward_contact_selector_item, parent, false));
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull StartGroupMemberSelectActivity.SelectedAdapter.SelectedViewHolder holder, int position) {
+            GlideEngine.loadImage(holder.userIconView, mMembers.get(position).getIconUrl());
+        }
+
+        @Override
+        public int getItemCount() {
+            if (mMembers == null) {
+                return 0;
+            }
+            return mMembers.size();
+        }
+
+        public class SelectedViewHolder extends RecyclerView.ViewHolder {
+            public ImageView userIconView;
+            public SelectedViewHolder(@NonNull View itemView) {
+                super(itemView);
+                userIconView = (ImageView) itemView.findViewById(R.id.ivAvatar);
+            }
+        }
+    }
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/TUIContactFragment.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/TUIContactFragment.java
new file mode 100644
index 0000000..13ac356
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/pages/TUIContactFragment.java
@@ -0,0 +1,75 @@
+package com.tencent.qcloud.tuikit.tuicontact.classicui.pages;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.tencent.qcloud.tuicore.component.fragments.BaseFragment;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactService;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.ContactPresenter;
+import com.tencent.qcloud.tuikit.tuicontact.classicui.widget.ContactLayout;
+import com.tencent.qcloud.tuikit.tuicontact.classicui.widget.ContactListView;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactConstants;
+import com.tencent.qcloud.tuikit.tuicontact.util.TUIContactLog;
+
+public class TUIContactFragment extends BaseFragment {
+
+    private static final String TAG = TUIContactFragment.class.getSimpleName();
+    private ContactLayout mContactLayout;
+
+    private ContactPresenter presenter;
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        View baseView = inflater.inflate(R.layout.contact_fragment, container, false);
+        initViews(baseView);
+
+        return baseView;
+    }
+
+    private void initViews(View view) {
+        mContactLayout = view.findViewById(R.id.contact_layout);
+
+        presenter = new ContactPresenter();
+        presenter.setFriendListListener();
+        mContactLayout.setPresenter(presenter);
+        mContactLayout.initDefault();
+
+        mContactLayout.getContactListView().setOnItemClickListener(new ContactListView.OnItemClickListener() {
+            @Override
+            public void onItemClick(int position, ContactItemBean contact) {
+                if (position == 0) {
+                    Intent intent = new Intent(TUIContactService.getAppContext(), NewFriendActivity.class);
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    TUIContactService.getAppContext().startActivity(intent);
+                } else if (position == 1) {
+                    Intent intent = new Intent(TUIContactService.getAppContext(), GroupListActivity.class);
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    TUIContactService.getAppContext().startActivity(intent);
+                } else if (position == 2) {
+                    Intent intent = new Intent(TUIContactService.getAppContext(), BlackListActivity.class);
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    TUIContactService.getAppContext().startActivity(intent);
+                } else {
+                    Intent intent = new Intent(TUIContactService.getAppContext(), FriendProfileActivity.class);
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    intent.putExtra(TUIContactConstants.ProfileType.CONTENT, contact);
+                    TUIContactService.getAppContext().startActivity(intent);
+                }
+            }
+        });
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        TUIContactLog.i(TAG, "onResume");
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/util/ContactStartChatUtils.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/util/ContactStartChatUtils.java
new file mode 100644
index 0000000..9262e35
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/util/ContactStartChatUtils.java
@@ -0,0 +1,39 @@
+package com.tencent.qcloud.tuikit.tuicontact.classicui.util;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+
+public class ContactStartChatUtils {
+    public static boolean isC2CChat(int chatType) {
+        return chatType == V2TIMConversation.V2TIM_C2C;
+    }
+
+    public static boolean isGroupChat(int chatType) {
+        return chatType == V2TIMConversation.V2TIM_GROUP;
+    }
+
+    public static void startChatActivity(String chatId, int chatType, String chatName, String groupType) {
+        if (TextUtils.isEmpty(chatId)) {
+            return;
+        }
+        Bundle bundle = new Bundle();
+        bundle.putString(TUIConstants.TUIChat.CHAT_ID, chatId);
+        bundle.putString(TUIConstants.TUIChat.CHAT_NAME, chatName);
+        bundle.putInt(TUIConstants.TUIChat.CHAT_TYPE, chatType);
+        if (isC2CChat(chatType)) {
+            TUICore.startActivity(TUIConstants.TUIChat.C2C_CHAT_ACTIVITY_NAME, bundle);
+        } else if (isGroupChat(chatType)) {
+            bundle.putString(TUIConstants.TUIChat.GROUP_TYPE, groupType);
+            TUICore.startActivity(TUIConstants.TUIChat.GROUP_CHAT_ACTIVITY_NAME, bundle);
+        }
+    }
+
+    public static String getLoginUser() {
+        return V2TIMManager.getInstance().getLoginUser();
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/widget/ContactAdapter.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/widget/ContactAdapter.java
new file mode 100644
index 0000000..a8b3cce
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/widget/ContactAdapter.java
@@ -0,0 +1,237 @@
+package com.tencent.qcloud.tuikit.tuicontact.classicui.widget;
+
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.imsdk.v2.V2TIMUserStatus;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.TUIUtil;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactService;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.config.TUIContactConfig;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.ContactPresenter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ViewHolder> {
+
+    protected List<ContactItemBean> mData;
+    private ContactListView.OnSelectChangedListener mOnSelectChangedListener;
+    private ContactListView.OnItemClickListener mOnClickListener;
+
+    private int mPreSelectedPosition;
+    private boolean isSingleSelectMode;
+    private ContactPresenter presenter;
+    private boolean isGroupList = false;
+    private int dataSourceType = ContactListView.DataSource.UNKNOWN;
+    private ArrayList<String> alreadySelectedList;
+
+    public ContactAdapter(List<ContactItemBean> data) {
+        this.mData = data;
+    }
+
+    public void setPresenter(ContactPresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    public void setIsGroupList(boolean groupList) {
+        isGroupList = groupList;
+    }
+
+    public void setAlreadySelectedList(ArrayList<String> alreadySelectedList) {
+        this.alreadySelectedList = alreadySelectedList;
+    }
+
+    @Override
+    public ContactAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        return new ContactAdapter.ViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.contact_selecable_adapter_item, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(final ContactAdapter.ViewHolder holder, final int position) {
+        final ContactItemBean contactBean = mData.get(position);
+        RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams)holder.line.getLayoutParams();
+        if (position < mData.size() - 1) {
+            String tag1 = contactBean.getSuspensionTag();
+            String tag2 = mData.get(position + 1).getSuspensionTag();
+
+            if (TextUtils.equals(tag1, tag2)) {
+                params.leftMargin = holder.tvName.getLeft();
+            } else {
+                params.leftMargin = 0;
+            }
+        } else {
+            params.leftMargin = 0;
+        }
+        holder.line.setLayoutParams(params);
+        if (!TextUtils.isEmpty(contactBean.getRemark())) {
+            holder.tvName.setText(contactBean.getRemark());
+        } else if (!TextUtils.isEmpty(contactBean.getNickName())) {
+            holder.tvName.setText(contactBean.getNickName());
+        } else {
+            holder.tvName.setText(contactBean.getId());
+        }
+        if (mOnSelectChangedListener != null) {
+            holder.ccSelect.setVisibility(View.VISIBLE);
+            holder.ccSelect.setChecked(contactBean.isSelected());
+        }
+
+        holder.content.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (!contactBean.isEnable()) {
+                    return;
+                }
+                holder.ccSelect.setChecked(!holder.ccSelect.isChecked());
+                if (mOnSelectChangedListener != null) {
+                    mOnSelectChangedListener.onSelectChanged(getItem(position), holder.ccSelect.isChecked());
+                }
+                contactBean.setSelected(holder.ccSelect.isChecked());
+                if (mOnClickListener != null) {
+                    mOnClickListener.onItemClick(position, contactBean);
+                }
+                if (isSingleSelectMode && position != mPreSelectedPosition && contactBean.isSelected()) {
+                    mData.get(mPreSelectedPosition).setSelected(false);
+                    notifyItemChanged(mPreSelectedPosition);
+                }
+                mPreSelectedPosition = position;
+            }
+        });
+        holder.unreadText.setVisibility(View.GONE);
+        holder.userStatusView.setVisibility(View.GONE);
+        if (TextUtils.equals(TUIContactService.getAppContext().getResources().getString(R.string.new_friend), contactBean.getId())) {
+            holder.avatar.setImageResource(TUIThemeManager.getAttrResId(holder.itemView.getContext(), R.attr.contact_new_friend_icon));
+
+            presenter.getFriendApplicationUnreadCount(new IUIKitCallback<Integer>() {
+                @Override
+                public void onSuccess(Integer data) {
+                    if (data == 0) {
+                        holder.unreadText.setVisibility(View.GONE);
+                    } else {
+                        holder.unreadText.setVisibility(View.VISIBLE);
+                        holder.unreadText.setText("" + data);
+                    }
+                }
+
+                @Override
+                public void onError(String module, int errCode, String errMsg) {
+                    ToastUtil.toastShortMessage("Error code = " + errCode + ", desc = " + errMsg);
+                }
+            });
+
+        } else if (TextUtils.equals(TUIContactService.getAppContext().getResources().getString(R.string.group), contactBean.getId())) {
+            holder.avatar.setImageResource(TUIThemeManager.getAttrResId(holder.itemView.getContext(), R.attr.contact_group_list_icon));
+        } else if (TextUtils.equals(TUIContactService.getAppContext().getResources().getString(R.string.blacklist), contactBean.getId())) {
+            holder.avatar.setImageResource(TUIThemeManager.getAttrResId(holder.itemView.getContext(), R.attr.contact_black_list_icon));
+        } else {
+            int radius = holder.itemView.getResources().getDimensionPixelSize(R.dimen.contact_profile_face_radius);
+            if (isGroupList) {
+                int defaultIconResId = TUIUtil.getDefaultGroupIconResIDByGroupType(holder.itemView.getContext(), contactBean.getGroupType());
+                GlideEngine.loadUserIcon(holder.avatar, contactBean.getAvatarUrl(), defaultIconResId, radius);
+            } else {
+                GlideEngine.loadUserIcon(holder.avatar, contactBean.getAvatarUrl(), radius);
+            }
+            if (dataSourceType == ContactListView.DataSource.CONTACT_LIST && TUIContactConfig.getInstance().isShowUserStatus()) {
+                holder.userStatusView.setVisibility(View.VISIBLE);
+                if (contactBean.getStatusType() == V2TIMUserStatus.V2TIM_USER_STATUS_ONLINE) {
+                    holder.userStatusView.setBackgroundResource(TUIThemeManager.getAttrResId(TUIContactService.getAppContext(), com.tencent.qcloud.tuicore.R.attr.user_status_online));
+                } else {
+                    holder.userStatusView.setBackgroundResource(TUIThemeManager.getAttrResId(TUIContactService.getAppContext(), com.tencent.qcloud.tuicore.R.attr.user_status_offline));
+                }
+            } else {
+                holder.userStatusView.setVisibility(View.GONE);
+            }
+        }
+        setAlreadySelected(holder, contactBean);
+    }
+
+    private void setAlreadySelected(ContactAdapter.ViewHolder holder, ContactItemBean contactItemBean) {
+        if (alreadySelectedList != null && alreadySelectedList.contains(contactItemBean.getId())) {
+            holder.ccSelect.setChecked(true);
+            holder.itemView.setEnabled(false);
+            holder.ccSelect.setEnabled(false);
+        } else {
+            holder.itemView.setEnabled(true);
+            holder.ccSelect.setEnabled(true);
+            holder.ccSelect.setSelected(contactItemBean.isSelected());
+        }
+    }
+
+    @Override
+    public void onViewRecycled(ContactAdapter.ViewHolder holder) {
+        if (holder != null) {
+            GlideEngine.clear(holder.avatar);
+            holder.avatar.setImageResource(0);
+
+        }
+        super.onViewRecycled(holder);
+    }
+
+    private ContactItemBean getItem(int position) {
+        if (position < mData.size()) {
+            return mData.get(position);
+        }
+        return null;
+    }
+
+    @Override
+    public int getItemCount() {
+        return mData != null ? mData.size() : 0;
+    }
+
+    public void setDataSource(List<ContactItemBean> datas) {
+        this.mData = datas;
+        notifyDataSetChanged();
+    }
+
+    public void setSingleSelectMode(boolean mode) {
+        isSingleSelectMode = mode;
+    }
+
+    public void setOnSelectChangedListener(ContactListView.OnSelectChangedListener selectListener) {
+        mOnSelectChangedListener = selectListener;
+    }
+
+    public void setOnItemClickListener(ContactListView.OnItemClickListener listener) {
+        mOnClickListener = listener;
+    }
+
+    public void setDataSourceType(int dataSourceType) {
+        this.dataSourceType = dataSourceType;
+    }
+
+    public static class ViewHolder extends RecyclerView.ViewHolder {
+        TextView tvName;
+        TextView unreadText;
+        ImageView avatar;
+        CheckBox ccSelect;
+        View content;
+        View line;
+        View userStatusView;
+
+        public ViewHolder(View itemView) {
+            super(itemView);
+            tvName = itemView.findViewById(R.id.tvCity);
+            unreadText = itemView.findViewById(R.id.conversation_unread);
+            unreadText.setVisibility(View.GONE);
+            avatar = itemView.findViewById(R.id.ivAvatar);
+            ccSelect = itemView.findViewById(R.id.contact_check_box);
+            content = itemView.findViewById(R.id.selectable_contact_item);
+            line = itemView.findViewById(R.id.view_line);
+            userStatusView = itemView.findViewById(R.id.user_status);
+        }
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/widget/ContactLayout.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/widget/ContactLayout.java
new file mode 100644
index 0000000..21deeb5
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/widget/ContactLayout.java
@@ -0,0 +1,68 @@
+package com.tencent.qcloud.tuikit.tuicontact.classicui.widget;
+
+import android.content.Context;
+
+import androidx.annotation.Nullable;
+
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
+
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.ContactPresenter;
+import com.tencent.qcloud.tuikit.tuicontact.classicui.interfaces.IContactLayout;
+
+
+public class ContactLayout extends LinearLayout implements IContactLayout {
+
+    private static final String TAG = ContactLayout.class.getSimpleName();
+
+    private ContactListView mContactListView;
+
+    private ContactPresenter presenter;
+
+    public ContactLayout(Context context) {
+        super(context);
+        init();
+    }
+
+    public ContactLayout(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public ContactLayout(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    public void setPresenter(ContactPresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    private void init() {
+        inflate(getContext(), R.layout.contact_layout, this);
+        mContactListView = findViewById(R.id.contact_listview);
+    }
+
+    public void initDefault() {
+        mContactListView.setPresenter(presenter);
+        presenter.setContactListView(mContactListView);
+        mContactListView.loadDataSource(ContactListView.DataSource.CONTACT_LIST);
+    }
+
+    @Override
+    public ContactListView getContactListView() {
+        return mContactListView;
+    }
+
+    @Override
+    public TitleBarLayout getTitleBar() {
+        return null;
+    }
+
+    @Override
+    public void setParentLayout(Object parent) {
+
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/widget/ContactListView.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/widget/ContactListView.java
new file mode 100644
index 0000000..f0d8d90
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/widget/ContactListView.java
@@ -0,0 +1,187 @@
+package com.tencent.qcloud.tuikit.tuicontact.classicui.widget;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.component.CustomLinearLayoutManager;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.component.indexlib.IndexBar.widget.IndexBar;
+import com.tencent.qcloud.tuikit.tuicontact.component.indexlib.suspension.SuspensionDecoration;
+import com.tencent.qcloud.tuikit.tuicontact.interfaces.IContactListView;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.ContactPresenter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class ContactListView extends LinearLayout implements IContactListView {
+
+    private static final String TAG = ContactListView.class.getSimpleName();
+
+    private RecyclerView mRv;
+    private ContactAdapter mAdapter;
+    private CustomLinearLayoutManager mManager;
+    private List<ContactItemBean> mData = new ArrayList<>();
+    private SuspensionDecoration mDecoration;
+    private ProgressBar mContactLoadingBar;
+    private String groupId;
+    private boolean isGroupList = false;
+
+    private TextView notFoundTip;
+    /**
+     * 右侧边栏导航区域
+     */
+    private IndexBar mIndexBar;
+
+    private TextView mTvSideBarHint;
+
+    private ContactPresenter presenter;
+
+    private int dataSourceType = DataSource.UNKNOWN;
+    private ArrayList<String> alreadySelectedList;
+
+    public ContactListView(Context context) {
+        super(context);
+        init();
+    }
+
+    public ContactListView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public ContactListView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    public void setPresenter(ContactPresenter presenter) {
+        this.presenter = presenter;
+        if (mAdapter != null) {
+            mAdapter.setPresenter(presenter);
+            mAdapter.setIsGroupList(isGroupList);
+        }
+    }
+
+    public void setIsGroupList(boolean isGroupList) {
+        this.isGroupList = isGroupList;
+    }
+
+    public void setAlreadySelectedList(ArrayList<String> alreadySelectedList) {
+        this.alreadySelectedList = alreadySelectedList;
+        mAdapter.setAlreadySelectedList(alreadySelectedList);
+    }
+
+    private void init() {
+        inflate(getContext(), R.layout.contact_list, this);
+        mRv = findViewById(R.id.contact_member_list);
+        notFoundTip = findViewById(R.id.not_found_tip);
+        mManager = new CustomLinearLayoutManager(getContext());
+        mRv.setLayoutManager(mManager);
+
+        mAdapter = new ContactAdapter(mData);
+        mRv.setAdapter(mAdapter);
+        mRv.addItemDecoration(mDecoration = new SuspensionDecoration(getContext(), mData));
+        mRv.addOnScrollListener(new RecyclerView.OnScrollListener() {
+
+            @Override
+            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+                super.onScrolled(recyclerView, dx, dy);
+                LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
+                int lastCompletelyVisibleItemPosition = layoutManager.findLastCompletelyVisibleItemPosition();
+                if(lastCompletelyVisibleItemPosition==layoutManager.getItemCount()-1) {
+                    if (presenter.getNextSeq() > 0) {
+                        presenter.loadGroupMemberList(groupId);
+                    }
+                }
+            }
+        });
+        mTvSideBarHint = findViewById(R.id.contact_tvSideBarHint);
+        mIndexBar = findViewById(R.id.contact_indexBar);
+        mIndexBar.setPressedShowTextView(mTvSideBarHint)
+                .setNeedRealIndex(false)
+                .setLayoutManager(mManager);
+        mContactLoadingBar = findViewById(R.id.contact_loading_bar);
+    }
+
+    public ContactAdapter getAdapter() {
+        return mAdapter;
+    }
+
+    public void setNotFoundTip(String text) {
+        notFoundTip.setText(text);
+    }
+
+    @Override
+    public void onDataSourceChanged(List<ContactItemBean> data) {
+        if (data == null || data.isEmpty()) {
+            if (!TextUtils.isEmpty(notFoundTip.getText())) {
+                notFoundTip.setVisibility(VISIBLE);
+            }
+        } else {
+            notFoundTip.setVisibility(GONE);
+        }
+        mContactLoadingBar.setVisibility(GONE);
+        this.mData = data;
+        mAdapter.setDataSource(mData);
+        mIndexBar.setSourceDatas(mData).invalidate();
+        mDecoration.setDatas(mData);
+    }
+
+    @Override
+    public void onFriendApplicationChanged() {
+        if (dataSourceType == DataSource.CONTACT_LIST) {
+            mAdapter.notifyItemChanged(0);
+        }
+    }
+
+    public void setSingleSelectMode(boolean mode) {
+        mAdapter.setSingleSelectMode(mode);
+    }
+
+    public void setOnSelectChangeListener(OnSelectChangedListener selectChangeListener) {
+        mAdapter.setOnSelectChangedListener(selectChangeListener);
+    }
+
+    public void setOnItemClickListener(OnItemClickListener listener) {
+        mAdapter.setOnItemClickListener(listener);
+    }
+
+    public void loadDataSource(int dataSource) {
+        this.dataSourceType = dataSource;
+        if (presenter == null) {
+            return;
+        }
+        if (mAdapter != null) {
+            mAdapter.setDataSourceType(dataSource);
+        }
+        mContactLoadingBar.setVisibility(VISIBLE);
+        if (dataSource == ContactListView.DataSource.GROUP_MEMBER_LIST) {
+            presenter.loadGroupMemberList(groupId);
+        } else {
+            presenter.loadDataSource(dataSource);
+        }
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
+    public interface OnSelectChangedListener {
+        void onSelectChanged(ContactItemBean contact, boolean selected);
+    }
+
+    public interface OnItemClickListener {
+        void onItemClick(int position, ContactItemBean contact);
+    }
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/widget/ForwardContactSelectorAdapter.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/widget/ForwardContactSelectorAdapter.java
new file mode 100644
index 0000000..3e246fa
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/widget/ForwardContactSelectorAdapter.java
@@ -0,0 +1,74 @@
+package com.tencent.qcloud.tuikit.tuicontact.classicui.widget;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+
+import java.util.List;
+
+public class ForwardContactSelectorAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>{
+    private Context context;
+    private List<String> list;
+    private RecyclerView mRecycleView;
+
+    public ForwardContactSelectorAdapter(Context context) {
+        this.context = context;
+    }
+
+    @Override
+    public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
+        super.onAttachedToRecyclerView(recyclerView);
+        mRecycleView = (RecyclerView) recyclerView;
+        //mRecycleView.setItemViewCacheSize(5);
+    }
+
+    @Override
+    public ContactViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        return new ContactViewHolder(LayoutInflater.from(context).inflate(R.layout.forward_contact_selector_item, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        ContactViewHolder viewHolder = (ContactViewHolder) holder;
+        if (viewHolder != null){
+            if (!TextUtils.isEmpty(list.get(position))) {
+                GlideEngine.loadImage(viewHolder.userIconView, list.get(position));
+            }
+        }
+
+    }
+
+    public void setDataSource(List<String> provider) {
+        if (provider == null) {
+            if (list != null) {
+                list.clear();
+            }
+        } else {
+            list = provider;
+        }
+
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public int getItemCount() {
+        return list == null ? 0 : list.size();
+    }
+}
+
+class ContactViewHolder extends RecyclerView.ViewHolder {
+    public ImageView userIconView;
+    public ContactViewHolder(View itemView) {
+        super(itemView);
+        userIconView = (ImageView) itemView.findViewById(R.id.ivAvatar);
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/widget/FriendProfileLayout.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/widget/FriendProfileLayout.java
new file mode 100644
index 0000000..03c2416
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/widget/FriendProfileLayout.java
@@ -0,0 +1,660 @@
+package com.tencent.qcloud.tuikit.tuicontact.classicui.widget;
+
+import android.app.Activity;
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.util.Pair;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.Button;
+import android.widget.CompoundButton;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.component.LineControllerView;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.dialog.TUIKitDialog;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.component.popupcard.PopupInputCard;
+import com.tencent.qcloud.tuicore.util.TUIUtil;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactGroupApplyInfo;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.bean.FriendApplicationBean;
+import com.tencent.qcloud.tuikit.tuicontact.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuicontact.interfaces.IFriendProfileLayout;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.FriendProfilePresenter;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class FriendProfileLayout extends LinearLayout implements View.OnClickListener, IFriendProfileLayout {
+
+    private static final String TAG = FriendProfileLayout.class.getSimpleName();
+
+    private final int CHANGE_REMARK_CODE = 200;
+
+    private TitleBarLayout mTitleBar;
+    private ImageView mHeadImageView;
+    private TextView mNickNameView;
+    private TextView mIDView;
+    private TextView mSignatureView;
+    private TextView mSignatureTagView;
+    private TextView remarkAndGroupTip;
+    private LineControllerView mRemarkView;
+    private LineControllerView mAddBlackView;
+    private LineControllerView mChatTopView;
+    private LineControllerView mMessageOptionView;
+    private LineControllerView addFriendRemarkLv;
+    private LineControllerView addFriendGroupLv;
+    private LineControllerView mChatBackground;
+    private Button deleteFriendBtn;
+    private Button clearMessageBtn;
+    private Button chatBtn;
+    private Button audioCallBtn;
+    private Button videoCallBtn;
+    private Button addFriendSendBtn;
+    private Button acceptFriendBtn;
+    private Button refuseFriendBtn;
+    private View addFriendArea;
+    private EditText addWordingEditText;
+    private View friendApplicationVerifyArea;
+    private TextView friendApplicationAddWording;
+
+    private ContactItemBean mContactInfo;
+    private FriendApplicationBean friendApplicationBean;
+    private OnButtonClickListener mListener;
+    private String mId;
+    private String mNickname;
+    private String mRemark;
+    private String mAddWords;
+    private boolean isFriend;
+    private boolean isGroup = false;
+
+    private FriendProfilePresenter presenter;
+
+    public FriendProfileLayout(Context context) {
+        super(context);
+        init();
+    }
+
+    public FriendProfileLayout(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public FriendProfileLayout(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    public void setPresenter(FriendProfilePresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    private void init() {
+        inflate(getContext(), R.layout.contact_friend_profile_layout, this);
+
+        mHeadImageView = findViewById(R.id.friend_icon);
+        mNickNameView = findViewById(R.id.friend_nick_name);
+        mIDView = findViewById(R.id.friend_account);
+        mRemarkView = findViewById(R.id.remark);
+        mRemarkView.setOnClickListener(this);
+        mSignatureTagView = findViewById(R.id.friend_signature_tag);
+        mSignatureView = findViewById(R.id.friend_signature);
+        mMessageOptionView = findViewById(R.id.msg_rev_opt);
+        mMessageOptionView.setOnClickListener(this);
+        mChatTopView = findViewById(R.id.chat_to_top);
+        mAddBlackView = findViewById(R.id.blackList);
+        deleteFriendBtn = findViewById(R.id.btn_delete);
+        deleteFriendBtn.setOnClickListener(this);
+        clearMessageBtn = findViewById(R.id.btn_clear_chat_history);
+        clearMessageBtn.setOnClickListener(this);
+        chatBtn = findViewById(R.id.btn_chat);
+        chatBtn.setOnClickListener(this);
+        mChatBackground = findViewById(R.id.chat_background);
+        mChatBackground.setOnClickListener(this);
+
+        audioCallBtn = findViewById(R.id.btn_voice);
+        audioCallBtn.setOnClickListener(this);
+        videoCallBtn = findViewById(R.id.btn_video);
+        videoCallBtn.setOnClickListener(this);
+
+        addFriendSendBtn = findViewById(R.id.add_friend_send_btn);
+        addFriendSendBtn.setOnClickListener(this);
+
+        acceptFriendBtn = findViewById(R.id.accept_friend_send_btn);
+        refuseFriendBtn = findViewById(R.id.refuse_friend_send_btn);
+
+        addFriendArea = findViewById(R.id.add_friend_verify_area);
+        addWordingEditText = findViewById(R.id.add_wording_edit);
+
+        friendApplicationVerifyArea = findViewById(R.id.friend_application_verify_area);
+        friendApplicationAddWording = findViewById(R.id.friend_application_add_wording);
+
+        addFriendRemarkLv = findViewById(R.id.friend_remark_lv);
+        addFriendRemarkLv.setOnClickListener(this);
+        addFriendGroupLv = findViewById(R.id.friend_group_lv);
+        addFriendGroupLv.setContent(getContext().getString(R.string.contact_my_friend));
+
+        remarkAndGroupTip = findViewById(R.id.remark_and_group_tip);
+
+        mTitleBar = findViewById(R.id.friend_titlebar);
+        mTitleBar.setTitle(getResources().getString(R.string.profile_detail), ITitleBarLayout.Position.MIDDLE);
+        mTitleBar.getRightGroup().setVisibility(View.GONE);
+        mTitleBar.setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                ((Activity) getContext()).finish();
+            }
+        });
+    }
+
+    private void setupCall() {
+        HashMap<String, Object> param = new HashMap<>();
+        param.put(TUIConstants.TUIChat.CHAT_ID, mId);
+        param.put(TUIConstants.TUIChat.CHAT_NAME, mNickname);
+        param.put(TUIConstants.TUIChat.CHAT_TYPE, ChatInfo.TYPE_C2C);
+        param.put(TUIConstants.TUIChat.CONTEXT, getContext());
+        Map<String, Object> videoCallExtension = TUICore.getExtensionInfo(TUIConstants.TUIChat.EXTENSION_INPUT_MORE_VIDEO_CALL, param);
+        if (videoCallExtension == null) {
+            videoCallBtn.setVisibility(GONE);
+        }
+
+        Map<String, Object> audioCallExtension = TUICore.getExtensionInfo(TUIConstants.TUIChat.EXTENSION_INPUT_MORE_AUDIO_CALL, param);
+        if (audioCallExtension == null) {
+            audioCallBtn.setVisibility(GONE);
+        }
+    }
+
+    private void initEvent() {
+        mChatTopView.setCheckListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(final CompoundButton buttonView, boolean isChecked) {
+                if (presenter != null) {
+                    presenter.setConversationTop(mId, isChecked);
+                }
+            }
+        });
+
+        mAddBlackView.setCheckListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                if (isChecked) {
+                    addBlack();
+                } else {
+                    deleteBlack();
+                }
+            }
+        });
+
+        refuseFriendBtn.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                refuse();
+            }
+        });
+
+        acceptFriendBtn.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                accept();
+            }
+        });
+    }
+
+    public void initData(Object data) {
+        initEvent();
+
+        if (data instanceof String) {
+            mId = (String) data;
+            loadUserProfile(mId);
+        } else if (data instanceof ContactItemBean) {
+            setViewContentFromItemBean((ContactItemBean) data);
+        } else if (data instanceof FriendApplicationBean) {
+            setViewContentFromFriendApplicationBean((FriendApplicationBean) data);
+        } else if (data instanceof ContactGroupApplyInfo) {
+            setViewContentFromContactGroupApplyInfo((ContactGroupApplyInfo) data);
+        } else if (data instanceof GroupInfo) {
+            setViewContentFromGroupInfo((GroupInfo) data);
+        }
+
+        if (!TextUtils.isEmpty(mNickname)) {
+            mNickNameView.setText(mNickname);
+        } else {
+            mNickNameView.setText(mId);
+        }
+        mIDView.setText(mId);
+
+        setupCall();
+    }
+
+    private void setViewContentFromContactGroupApplyInfo(ContactGroupApplyInfo data) {
+        final ContactGroupApplyInfo info = data;
+        mId = info.getFromUser();
+        mNickname = info.getFromUserNickName();
+        mRemarkView.setVisibility(GONE);
+        mAddBlackView.setVisibility(GONE);
+        mMessageOptionView.setVisibility(GONE);
+        mChatBackground.setVisibility(GONE);
+        deleteFriendBtn.setText(R.string.refuse);
+        deleteFriendBtn.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                refuseJoinGroupApply(info);
+            }
+        });
+        chatBtn.setText(R.string.accept);
+        chatBtn.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                acceptJoinGroupApply(info);
+            }
+        });
+    }
+
+    private void setViewContentFromGroupInfo(GroupInfo groupInfo) {
+        mTitleBar.setTitle(getResources().getString(R.string.add_group), ITitleBarLayout.Position.MIDDLE);
+        isGroup = true;
+        mId = groupInfo.getId();
+        mNickname = groupInfo.getGroupName();
+        mSignatureTagView.setText(getResources().getString(R.string.contact_group_type_tag));
+        mSignatureView.setText(groupInfo.getGroupType());
+        int radius = getResources().getDimensionPixelSize(R.dimen.contact_profile_face_radius);
+        GlideEngine.loadUserIcon(mHeadImageView, groupInfo.getFaceUrl(), TUIUtil.getDefaultGroupIconResIDByGroupType(getContext(), groupInfo.getGroupType()), radius);
+        addFriendSendBtn.setVisibility(VISIBLE);
+        addFriendArea.setVisibility(VISIBLE);
+        remarkAndGroupTip.setVisibility(GONE);
+        addFriendRemarkLv.setVisibility(GONE);
+        addFriendGroupLv.setVisibility(GONE);
+    }
+
+    private void setViewContentFromFriendApplicationBean(FriendApplicationBean data) {
+        friendApplicationBean = data;
+        mId = friendApplicationBean.getUserId();
+        mNickname = friendApplicationBean.getNickName();
+        mSignatureTagView.setVisibility(GONE);
+        mSignatureView.setVisibility(GONE);
+        mRemarkView.setVisibility(GONE);
+        mAddBlackView.setVisibility(GONE);
+        mMessageOptionView.setVisibility(GONE);
+        mChatBackground.setVisibility(GONE);
+
+        friendApplicationVerifyArea.setVisibility(VISIBLE);
+        friendApplicationAddWording.setText(friendApplicationBean.getAddWording());
+
+        refuseFriendBtn.setVisibility(VISIBLE);
+        acceptFriendBtn.setVisibility(VISIBLE);
+
+        int radius = getResources().getDimensionPixelSize(R.dimen.contact_profile_face_radius);
+        GlideEngine.loadUserIcon(mHeadImageView, friendApplicationBean.getFaceUrl(), radius);
+    }
+
+    private void setViewContentFromItemBean(ContactItemBean data) {
+        mContactInfo = data;
+        isFriend = mContactInfo.isFriend();
+        mId = mContactInfo.getId();
+        mNickname = mContactInfo.getNickName();
+        mSignatureView.setText(mContactInfo.getSignature());
+        if (TextUtils.isEmpty(mContactInfo.getSignature())) {
+            mSignatureTagView.setText(getResources().getString(R.string.contact_no_status));
+        } else {
+            mSignatureTagView.setText(getResources().getString(R.string.contact_signature_tag));
+        }
+        int radius = getResources().getDimensionPixelSize(R.dimen.contact_profile_face_radius);
+        GlideEngine.loadUserIcon(mHeadImageView, mContactInfo.getAvatarUrl(), radius);
+        mChatTopView.setChecked(presenter.isTopConversation(mId));
+        mAddBlackView.setChecked(mContactInfo.isBlackList());
+        mRemarkView.setContent(mContactInfo.getRemark());
+
+        if (TextUtils.equals(mContactInfo.getId(), TUILogin.getLoginUser())) {
+            if (isFriend) {
+                mRemarkView.setVisibility(VISIBLE);
+                chatBtn.setVisibility(VISIBLE);
+                audioCallBtn.setVisibility(VISIBLE);
+                videoCallBtn.setVisibility(VISIBLE);
+                deleteFriendBtn.setVisibility(VISIBLE);
+                mAddBlackView.setVisibility(VISIBLE);
+                mChatTopView.setVisibility(View.VISIBLE);
+                mChatBackground.setVisibility(VISIBLE);
+                updateMessageOptionView();
+            } else {
+                // DO NOTHING
+            }
+        } else {
+            if (mContactInfo.isBlackList()) {
+                deleteFriendBtn.setVisibility(VISIBLE);
+                chatBtn.setVisibility(VISIBLE);
+                audioCallBtn.setVisibility(VISIBLE);
+                videoCallBtn.setVisibility(VISIBLE);
+                mRemarkView.setVisibility(VISIBLE);
+                mAddBlackView.setVisibility(VISIBLE);
+                mMessageOptionView.setVisibility(VISIBLE);
+                mChatTopView.setVisibility(VISIBLE);
+                mChatBackground.setVisibility(VISIBLE);
+            } else {
+                if (!isFriend) {
+                    if (isGroup) {
+                        addFriendRemarkLv.setVisibility(GONE);
+                        addFriendGroupLv.setVisibility(GONE);
+                    }
+                    mTitleBar.setTitle(getResources().getString(R.string.add_friend), ITitleBarLayout.Position.MIDDLE);
+                    addFriendSendBtn.setVisibility(VISIBLE);
+                    addFriendArea.setVisibility(VISIBLE);
+                } else {
+                    mRemarkView.setVisibility(VISIBLE);
+                    chatBtn.setVisibility(VISIBLE);
+                    audioCallBtn.setVisibility(VISIBLE);
+                    videoCallBtn.setVisibility(VISIBLE);
+                    deleteFriendBtn.setVisibility(VISIBLE);
+                    mAddBlackView.setVisibility(VISIBLE);
+                    mChatTopView.setVisibility(View.VISIBLE);
+                    mChatBackground.setVisibility(VISIBLE);
+                    updateMessageOptionView();
+                }
+            }
+        }
+
+    }
+
+    private void updateMessageOptionView() {
+        mMessageOptionView.setVisibility(VISIBLE);
+        //get
+        final ArrayList<String> userIdList = new ArrayList<>();
+        userIdList.add(mId);
+
+        presenter.getC2CReceiveMessageOpt(userIdList, new IUIKitCallback<Boolean>() {
+            @Override
+            public void onSuccess(Boolean data) {
+                mMessageOptionView.setChecked(data);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                mMessageOptionView.setChecked(false);
+            }
+        });
+
+        //set
+        mMessageOptionView.setCheckListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                presenter.setC2CReceiveMessageOpt(userIdList, isChecked);
+            }
+        });
+    }
+
+    @Override
+    public void onDataSourceChanged(ContactItemBean bean) {
+        setViewContentFromItemBean(bean);
+        setupCall();
+        if (bean.isFriend()) {
+            updateMessageOptionView();
+            clearMessageBtn.setVisibility(VISIBLE);
+        }
+
+        if (!TextUtils.isEmpty(mNickname)) {
+            mNickNameView.setText(mNickname);
+        } else {
+            mNickNameView.setText(mId);
+        }
+
+        if (!TextUtils.isEmpty(bean.getAvatarUrl())) {
+            int radius = getResources().getDimensionPixelSize(R.dimen.contact_profile_face_radius);
+            GlideEngine.loadUserIcon(mHeadImageView, bean.getAvatarUrl(), radius);
+        }
+        mIDView.setText(mId);
+    }
+
+    private void loadUserProfile(String id) {
+        final ContactItemBean bean = new ContactItemBean();
+        presenter.getUsersInfo(id, bean);
+    }
+
+    private void accept() {
+        presenter.acceptFriendApplication(friendApplicationBean, FriendApplicationBean.FRIEND_ACCEPT_AGREE_AND_ADD, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                chatBtn.setText(R.string.accepted);
+                ((Activity) getContext()).finish();
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage("accept Error code = " + errCode + ", desc = " + errMsg);
+            }
+        });
+    }
+
+    private void refuse() {
+        presenter.refuseFriendApplication(friendApplicationBean, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                deleteFriendBtn.setText(R.string.refused);
+                ((Activity) getContext()).finish();
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage("refuse Error code = " + errCode + ", desc = " + errMsg);
+
+            }
+        });
+    }
+
+    public void acceptJoinGroupApply(final ContactGroupApplyInfo item) {
+        presenter.acceptJoinGroupApply(item, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                ((Activity) getContext()).finish();
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastLongMessage(errMsg);
+            }
+        });
+    }
+
+    public void refuseJoinGroupApply(final ContactGroupApplyInfo item) {
+        presenter.refuseJoinGroupApply(item, "", new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                ((Activity) getContext()).finish();
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastLongMessage(errMsg);
+            }
+        });
+    }
+
+    private void delete() {
+        List<String> identifiers = new ArrayList<>();
+        identifiers.add(mId);
+
+        presenter.deleteFriend(identifiers, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                if (mListener != null) {
+                    mListener.onDeleteFriendClick(mId);
+                }
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage("deleteFriend Error code = " + errCode + ", desc = " + errMsg);
+            }
+        });
+    }
+
+    private void chat() {
+        if (mListener != null || mContactInfo != null) {
+            mListener.onStartConversationClick(mContactInfo);
+        }
+        ((Activity) getContext()).finish();
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v  == chatBtn) {
+            chat();
+        } else if (v == deleteFriendBtn) {
+            delete();
+        }else if (v == clearMessageBtn) {
+            new TUIKitDialog(getContext())
+                    .builder()
+                    .setCancelable(true)
+                    .setCancelOutside(true)
+                    .setTitle(getContext().getString(R.string.clear_msg_tip))
+                    .setDialogWidth(0.75f)
+                    .setPositiveButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.sure), new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            Map<String, Object> hashMap = new HashMap<>();
+                            hashMap.put(TUIConstants.TUIContact.FRIEND_ID, mId);
+                            TUICore.notifyEvent(TUIConstants.TUIContact.EVENT_USER,
+                                    TUIConstants.TUIContact.EVENT_SUB_KEY_CLEAR_MESSAGE, hashMap);
+                        }
+                    })
+                    .setNegativeButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.cancel), new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+
+                        }
+                    })
+                    .show();
+        } else if (v == videoCallBtn) {
+            Map<String, Object> map = new HashMap<>();
+            map.put(TUIConstants.TUICalling.PARAM_NAME_USERIDS, new String[]{mId});
+            map.put(TUIConstants.TUICalling.PARAM_NAME_TYPE, TUIConstants.TUICalling.TYPE_VIDEO);
+            TUICore.callService(TUIConstants.TUICalling.SERVICE_NAME, TUIConstants.TUICalling.METHOD_NAME_CALL, map);
+        }  else if (v == audioCallBtn) {
+            Map<String, Object> map = new HashMap<>();
+            map.put(TUIConstants.TUICalling.PARAM_NAME_USERIDS, new String[]{mId});
+            map.put(TUIConstants.TUICalling.PARAM_NAME_TYPE, TUIConstants.TUICalling.TYPE_AUDIO);
+            TUICore.callService(TUIConstants.TUICalling.SERVICE_NAME, TUIConstants.TUICalling.METHOD_NAME_CALL, map);
+        } else if (v == addFriendSendBtn) {
+            String addWording  = addWordingEditText.getText().toString();
+            String friendGroup = "";
+            String remark = addFriendRemarkLv.getContent();
+
+            if (isGroup) {
+                presenter.joinGroup(mId, addWording, new IUIKitCallback<Void>() {
+                    @Override
+                    public void onSuccess(Void data) {
+                        ToastUtil.toastShortMessage(getContext().getString(R.string.success));
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        ToastUtil.toastShortMessage(getContext().getString(R.string.contact_add_failed) + " " + errMsg);
+                    }
+                });
+            } else {
+                presenter.addFriend(mId, addWording, friendGroup, remark, new IUIKitCallback<Pair<Integer, String>>() {
+                    @Override
+                    public void onSuccess(Pair<Integer, String> data) {
+                        ToastUtil.toastShortMessage(data.second);
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        ToastUtil.toastShortMessage(getContext().getString(R.string.contact_add_failed));
+                    }
+                });
+            }
+        } else if (v == addFriendRemarkLv) {
+            PopupInputCard popupInputCard = new PopupInputCard((Activity) getContext());
+            popupInputCard.setContent(addFriendRemarkLv.getContent());
+            popupInputCard.setTitle(getResources().getString(R.string.contact_friend_remark));
+            popupInputCard.setOnPositive((result -> {
+                addFriendRemarkLv.setContent(result);
+                if (TextUtils.isEmpty(result)) {
+                    result = "";
+                }
+                modifyRemark(result);
+            }));
+            popupInputCard.show(addFriendRemarkLv, Gravity.BOTTOM);
+        } else if (v == mRemarkView) {
+            PopupInputCard popupInputCard = new PopupInputCard((Activity) getContext());
+            popupInputCard.setContent(mRemarkView.getContent());
+            popupInputCard.setTitle(getResources().getString(R.string.profile_remark_edit));
+            String description = getResources().getString(R.string.contact_modify_remark_rule);
+            popupInputCard.setRule("^[a-zA-Z0-9_\u4e00-\u9fa5]*$");
+            popupInputCard.setDescription(description);
+            popupInputCard.setOnPositive((result -> {
+                mRemarkView.setContent(result);
+                if (TextUtils.isEmpty(result)) {
+                    result = "";
+                }
+                modifyRemark(result);
+            }));
+            popupInputCard.show(mRemarkView, Gravity.BOTTOM);
+
+        } else if (v == mChatBackground) {
+            if (mListener != null) {
+                mListener.onSetChatBackground();
+            }
+        }
+    }
+
+    private void modifyRemark(final String txt) {
+        presenter.modifyRemark(mId, txt, new IUIKitCallback<String>() {
+            @Override
+            public void onSuccess(String data) {
+                mContactInfo.setRemark(txt);
+                Map<String, Object> param = new HashMap<>();
+                param.put(TUIConstants.TUIContact.FRIEND_ID, mId);
+                param.put(TUIConstants.TUIContact.FRIEND_REMARK, txt);
+                TUICore.notifyEvent(TUIConstants.TUIContact.EVENT_FRIEND_INFO_CHANGED, TUIConstants.TUIContact.EVENT_SUB_KEY_FRIEND_REMARK_CHANGED, param);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+
+            }
+        });
+    }
+
+    private void addBlack() {
+        String[] idStringList = mId.split(",");
+        List<String> idList = new ArrayList<>(Arrays.asList(idStringList));
+        presenter.addToBlackList(idList);
+    }
+
+    private void deleteBlack() {
+        String[] idStringList = mId.split(",");
+        List<String> idList = new ArrayList<>(Arrays.asList(idStringList));
+        presenter.deleteFromBlackList(idList);
+    }
+
+    public void setOnButtonClickListener(OnButtonClickListener l) {
+        mListener = l;
+    }
+
+    public interface OnButtonClickListener {
+        void onStartConversationClick(ContactItemBean info);
+
+        void onDeleteFriendClick(String id);
+
+        default void onSetChatBackground() {};
+    }
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/widget/NewFriendListAdapter.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/widget/NewFriendListAdapter.java
new file mode 100644
index 0000000..899011d
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/classicui/widget/NewFriendListAdapter.java
@@ -0,0 +1,154 @@
+package com.tencent.qcloud.tuikit.tuicontact.classicui.widget;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.bean.FriendApplicationBean;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.NewFriendPresenter;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactConstants;
+
+import java.util.List;
+
+public class NewFriendListAdapter extends ArrayAdapter<FriendApplicationBean> {
+
+    private static final String TAG = NewFriendListAdapter.class.getSimpleName();
+
+    private int mResourceId;
+    private View mView;
+    private ViewHolder mViewHolder;
+
+    private NewFriendPresenter presenter;
+    /**
+     * Constructor
+     *
+     * @param context  The current context.
+     * @param resource The resource ID for a layout ic_chat_input_file containing a TextView to use when
+     *                 instantiating views.
+     * @param objects  The objects to represent in the ListView.
+     */
+    public NewFriendListAdapter(Context context, int resource, List<FriendApplicationBean> objects) {
+        super(context, resource, objects);
+        mResourceId = resource;
+    }
+
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        final FriendApplicationBean data = getItem(position);
+        if (convertView != null) {
+            mView = convertView;
+            mViewHolder = (ViewHolder) mView.getTag();
+        } else {
+            mView = LayoutInflater.from(getContext()).inflate(mResourceId, null);
+            mView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Bundle bundle = new Bundle();
+                    bundle.putSerializable(TUIContactConstants.ProfileType.CONTENT, data);
+                    TUICore.startActivity("FriendProfileActivity", bundle);
+                }
+            });
+            mViewHolder = new ViewHolder();
+            mViewHolder.avatar = mView.findViewById(R.id.avatar);
+            mViewHolder.name = mView.findViewById(R.id.name);
+            mViewHolder.des = mView.findViewById(R.id.description);
+            mViewHolder.agree = mView.findViewById(R.id.agree);
+            mViewHolder.reject = mView.findViewById(R.id.reject);
+            mViewHolder.result = mView.findViewById(R.id.result_tv);
+            mView.setTag(mViewHolder);
+        }
+        Resources res = getContext().getResources();
+        int radius = mView.getResources().getDimensionPixelSize(R.dimen.contact_profile_face_radius);
+        GlideEngine.loadUserIcon(mViewHolder.avatar, data.getFaceUrl(), radius);
+        mViewHolder.name.setText(TextUtils.isEmpty(data.getNickName()) ? data.getUserId() : data.getNickName());
+        mViewHolder.des.setText(data.getAddWording());
+        switch (data.getAddType()) {
+            case FriendApplicationBean.FRIEND_APPLICATION_COME_IN:
+                mViewHolder.agree.setText(res.getString(R.string.request_agree));
+                mViewHolder.agree.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        doResponse(data, true);
+                    }
+                });
+                mViewHolder.reject.setText(res.getString(R.string.refuse));
+                mViewHolder.reject.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        doResponse(data, false);
+                    }
+                });
+                if (data.isAccept()) {
+                    mViewHolder.agree.setVisibility(View.GONE);
+                    mViewHolder.reject.setVisibility(View.GONE);
+                    mViewHolder.result.setVisibility(View.VISIBLE);
+                }
+                break;
+            case FriendApplicationBean.FRIEND_APPLICATION_BOTH:
+                mViewHolder.agree.setText(res.getString(R.string.request_accepted));
+                break;
+        }
+        return mView;
+    }
+
+    private void doResponse(FriendApplicationBean bean, boolean isAccept) {
+        if (presenter != null) {
+            if (isAccept) {
+                presenter.acceptFriendApplication(bean, new IUIKitCallback<Void>() {
+                    @Override
+                    public void onSuccess(Void data) {
+                        bean.setAccept(true);
+                        refreshList();
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        ToastUtil.toastShortMessage("Error code = " + errCode + ", desc = " + errMsg);
+                    }
+                });
+            } else {
+                presenter.refuseFriendApplication(bean, new IUIKitCallback<Void>() {
+                    @Override
+                    public void onSuccess(Void data) {
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        ToastUtil.toastShortMessage("Error code = " + errCode + ", desc = " + errMsg);
+                    }
+                });
+            }
+        }
+    }
+
+    private void refreshList() {
+        notifyDataSetChanged();
+    }
+
+    public void setPresenter(NewFriendPresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    public class ViewHolder {
+        ImageView avatar;
+        TextView name;
+        TextView des;
+        TextView agree;
+        TextView reject;
+        TextView result;
+    }
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/component/indexlib/IndexBar/bean/BaseIndexBean.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/component/indexlib/IndexBar/bean/BaseIndexBean.java
new file mode 100644
index 0000000..a79d459
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/component/indexlib/IndexBar/bean/BaseIndexBean.java
@@ -0,0 +1,35 @@
+package com.tencent.qcloud.tuikit.tuicontact.component.indexlib.IndexBar.bean;
+
+import android.text.TextUtils;
+
+import com.tencent.qcloud.tuikit.tuicontact.component.indexlib.suspension.ISuspensionInterface;
+
+import java.io.Serializable;
+
+
+public abstract class BaseIndexBean implements ISuspensionInterface, Serializable {
+
+    private String baseIndexTag;//所属的分类（名字的汉语拼音首字母） // The category to which it belongs (the first letter of the Chinese pinyin of the name)
+
+    public String getBaseIndexTag() {
+        return baseIndexTag;
+    }
+
+    public BaseIndexBean setBaseIndexTag(String baseIndexTag) {
+        this.baseIndexTag = baseIndexTag;
+        return this;
+    }
+
+    @Override
+    public String getSuspensionTag() {
+        if (TextUtils.isEmpty(baseIndexTag)) {
+            return "";
+        }
+        return baseIndexTag;
+    }
+
+    @Override
+    public boolean isShowSuspension() {
+        return true;
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/component/indexlib/IndexBar/bean/BaseIndexPinyinBean.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/component/indexlib/IndexBar/bean/BaseIndexPinyinBean.java
new file mode 100644
index 0000000..669f10e
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/component/indexlib/IndexBar/bean/BaseIndexPinyinBean.java
@@ -0,0 +1,24 @@
+package com.tencent.qcloud.tuikit.tuicontact.component.indexlib.IndexBar.bean;
+
+
+public abstract class BaseIndexPinyinBean extends BaseIndexBean {
+
+    private String baseIndexPinyin;
+
+    public String getBaseIndexPinyin() {
+        return baseIndexPinyin;
+    }
+
+    public BaseIndexPinyinBean setBaseIndexPinyin(String baseIndexPinyin) {
+        this.baseIndexPinyin = baseIndexPinyin;
+        return this;
+    }
+
+    public boolean isNeedToPinyin() {
+        return true;
+    }
+
+    public abstract String getTarget();
+
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/component/indexlib/IndexBar/helper/IIndexBarDataHelper.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/component/indexlib/IndexBar/helper/IIndexBarDataHelper.java
new file mode 100644
index 0000000..a9fa303
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/component/indexlib/IndexBar/helper/IIndexBarDataHelper.java
@@ -0,0 +1,39 @@
+package com.tencent.qcloud.tuikit.tuicontact.component.indexlib.IndexBar.helper;
+
+
+import com.tencent.qcloud.tuikit.tuicontact.component.indexlib.IndexBar.bean.BaseIndexPinyinBean;
+
+import java.util.List;
+
+/**
+ * 介绍：IndexBar 的 数据相关帮助类
+ * 1 将汉语转成拼音
+ * 2 填充indexTag
+ * 3 排序源数据源
+ * 4 根据排序后的源数据源->indexBar的数据源
+ * 
+ * 
+ * Introduction: Data-related helper classes for IndexBar
+ * 1 Convert Chinese to Pinyin
+ * 2 filling indexTag
+ * 3 Sort source data
+ * 4 According to the sorted source data -> source data of indexBar
+ */
+
+public interface IIndexBarDataHelper {
+    // 汉语-》拼音
+    // Chinese to Pinyin
+    IIndexBarDataHelper convert(List<? extends BaseIndexPinyinBean> data);
+
+    // 拼音->tag
+    // Pinyin to tag
+    IIndexBarDataHelper fillInexTag(List<? extends BaseIndexPinyinBean> data);
+
+    // 对源数据进行排序（RecyclerView）
+    // Sort source data
+    IIndexBarDataHelper sortSourceDatas(List<? extends BaseIndexPinyinBean> datas);
+
+    // 对IndexBar的数据源进行排序(右侧栏),在 sortSourceDatas 方法后调用
+    // sort source data of indexBar, call after the method of sortSourceDatas
+    IIndexBarDataHelper getSortedIndexDatas(List<? extends BaseIndexPinyinBean> sourceDatas, List<String> datas);
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/component/indexlib/IndexBar/helper/IndexBarDataHelperImpl.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/component/indexlib/IndexBar/helper/IndexBarDataHelperImpl.java
new file mode 100644
index 0000000..0c61b07
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/component/indexlib/IndexBar/helper/IndexBarDataHelperImpl.java
@@ -0,0 +1,120 @@
+package com.tencent.qcloud.tuikit.tuicontact.component.indexlib.IndexBar.helper;
+
+import android.text.TextUtils;
+
+import com.github.promeg.pinyinhelper.Pinyin;
+import com.tencent.qcloud.tuikit.tuicontact.component.indexlib.IndexBar.bean.BaseIndexPinyinBean;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+
+public class IndexBarDataHelperImpl implements IIndexBarDataHelper {
+    @Override
+    public IIndexBarDataHelper convert(List<? extends BaseIndexPinyinBean> datas) {
+        if (null == datas || datas.isEmpty()) {
+            return this;
+        }
+        int size = datas.size();
+        for (int i = 0; i < size; i++) {
+            BaseIndexPinyinBean indexPinyinBean = datas.get(i);
+            StringBuilder pySb = new StringBuilder();
+            if (indexPinyinBean.isNeedToPinyin()) {
+                String target = indexPinyinBean.getTarget();
+                // 遍历target的每个char得到它的全拼音
+                // Traverse each char of target to get its full pinyin
+                if (target == null) {
+                    continue;
+                }
+                for (int i1 = 0; i1 < target.length(); i1++) {
+                    //利用TinyPinyin将char转成拼音
+                    //查看源码，方法内 如果char为汉字，则返回大写拼音
+                    //如果c不是汉字，则返回String.valueOf(c)
+                    // Convert char to Pinyin using TinyPinyin
+                    // If char is Chinese characters, return uppercase pinyin. If c is not a Chinese character, return String.valueOf(c)
+                    pySb.append(Pinyin.toPinyin(target.charAt(i1)).toUpperCase());
+                }
+                indexPinyinBean.setBaseIndexPinyin(pySb.toString());
+            } else {
+                //pySb.append(indexPinyinBean.getBaseIndexPinyin());
+            }
+        }
+        return this;
+    }
+
+    @Override
+    public IIndexBarDataHelper fillInexTag(List<? extends BaseIndexPinyinBean> datas) {
+        if (null == datas || datas.isEmpty()) {
+            return this;
+        }
+        int size = datas.size();
+        for (int i = 0; i < size; i++) {
+            BaseIndexPinyinBean indexPinyinBean = datas.get(i);
+            if (indexPinyinBean.isNeedToPinyin()) {
+                if (TextUtils.isEmpty(indexPinyinBean.getBaseIndexPinyin())) {
+                    indexPinyinBean.setBaseIndexTag("#");
+                    continue;
+                }
+                String tagString = indexPinyinBean.getBaseIndexPinyin().substring(0, 1);
+                if (tagString.matches("[A-Z]")) {
+                    indexPinyinBean.setBaseIndexTag(tagString);
+                } else {
+                    indexPinyinBean.setBaseIndexTag("#");
+                }
+            }
+        }
+        return this;
+    }
+
+    @Override
+    public IIndexBarDataHelper sortSourceDatas(List<? extends BaseIndexPinyinBean> datas) {
+        if (null == datas || datas.isEmpty()) {
+            return this;
+        }
+        convert(datas);
+        fillInexTag(datas);
+
+        Collections.sort(datas, new Comparator<BaseIndexPinyinBean>() {
+            @Override
+            public int compare(BaseIndexPinyinBean lhs, BaseIndexPinyinBean rhs) {
+                if (lhs.getBaseIndexPinyin() == null && rhs.getBaseIndexPinyin() == null) {
+                    return 0;
+                } else if (lhs.getBaseIndexPinyin() == null && rhs.getBaseIndexPinyin() != null) {
+                    return -1;
+                } else if (lhs.getBaseIndexPinyin() != null && rhs.getBaseIndexPinyin() == null) {
+                    return 1;
+                }
+                if (!lhs.isNeedToPinyin()) {
+                    return 0;
+                } else if (!rhs.isNeedToPinyin()) {
+                    return 0;
+                } else if (lhs.getBaseIndexTag().equals("#") && !rhs.getBaseIndexTag().equals("#")) {
+                    return 1;
+                } else if (!lhs.getBaseIndexTag().equals("#") && rhs.getBaseIndexTag().equals("#")) {
+                    return -1;
+                } else {
+                    return lhs.getBaseIndexPinyin().compareTo(rhs.getBaseIndexPinyin());
+                }
+            }
+        });
+        return this;
+    }
+
+    @Override
+    public IIndexBarDataHelper getSortedIndexDatas(List<? extends BaseIndexPinyinBean> sourceDatas, List<String> indexDatas) {
+        if (null == sourceDatas || sourceDatas.isEmpty()) {
+            return this;
+        }
+
+        int size = sourceDatas.size();
+        String baseIndexTag;
+        for (int i = 0; i < size; i++) {
+            baseIndexTag = sourceDatas.get(i).getBaseIndexTag();
+            if (!indexDatas.contains(baseIndexTag)) {
+                indexDatas.add(baseIndexTag);
+            }
+        }
+        return this;
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/component/indexlib/IndexBar/widget/IndexBar.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/component/indexlib/IndexBar/widget/IndexBar.java
new file mode 100644
index 0000000..cdd09dd
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/component/indexlib/IndexBar/widget/IndexBar.java
@@ -0,0 +1,378 @@
+package com.tencent.qcloud.tuikit.tuicontact.component.indexlib.IndexBar.widget;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.R;
+import com.tencent.qcloud.tuicore.component.CustomLinearLayoutManager;
+import com.tencent.qcloud.tuikit.tuicontact.component.indexlib.IndexBar.bean.BaseIndexPinyinBean;
+import com.tencent.qcloud.tuikit.tuicontact.component.indexlib.IndexBar.helper.IIndexBarDataHelper;
+import com.tencent.qcloud.tuikit.tuicontact.component.indexlib.IndexBar.helper.IndexBarDataHelperImpl;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+
+public class IndexBar extends View {
+    private static final String TAG = IndexBar.class.getSimpleName();
+
+    public static String[] INDEX_STRING = {"A", "B", "C", "D", "E", "F", "G", "H", "I",
+            "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V",
+            "W", "X", "Y", "Z", "#"};
+    // 是否需要根据实际的数据来生成索引数据源（例如 只有 A B C 三种tag，那么索引栏就 A B C 三项）
+    // Whether the index data source needs to be generated based on the actual data
+    private boolean isNeedRealIndex;
+
+    private List<String> mIndexDatas;
+
+    private int mWidth, mHeight;
+
+    private int mGapHeight;
+
+    private Paint mPaint;
+
+    // 手指按下时的背景色
+    // background color when finger is pressed
+    private int mPressedBackground;
+
+    private IIndexBarDataHelper mDataHelper;
+
+    //以下边变量是外部set进来的  // The following side variables are imported from external set
+    private TextView mPressedShowTextView;// 用于特写显示正在被触摸的index值 // Used to close-up display the index value that is being touched
+    private boolean isSourceDatasAlreadySorted;
+    private List<? extends BaseIndexPinyinBean> mSourceDatas;
+    private CustomLinearLayoutManager mLayoutManager;
+    private int mHeaderViewCount = 0;
+    private onIndexPressedListener mOnIndexPressedListener;
+
+    public IndexBar(Context context) {
+        this(context, null);
+    }
+
+    public IndexBar(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public IndexBar(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs, defStyleAttr);
+    }
+
+    public int getHeaderViewCount() {
+        return mHeaderViewCount;
+    }
+
+    public IndexBar setHeaderViewCount(int headerViewCount) {
+        mHeaderViewCount = headerViewCount;
+        return this;
+    }
+
+    public boolean isSourceDatasAlreadySorted() {
+        return isSourceDatasAlreadySorted;
+    }
+
+    public IndexBar setSourceDatasAlreadySorted(boolean sourceDatasAlreadySorted) {
+        isSourceDatasAlreadySorted = sourceDatasAlreadySorted;
+        return this;
+    }
+
+    public IIndexBarDataHelper getDataHelper() {
+        return mDataHelper;
+    }
+
+    public IndexBar setDataHelper(IIndexBarDataHelper dataHelper) {
+        mDataHelper = dataHelper;
+        return this;
+    }
+
+    private void init(Context context, AttributeSet attrs, int defStyleAttr) {
+        int textSize = (int) TypedValue.applyDimension(
+                TypedValue.COMPLEX_UNIT_SP, 12, getResources().getDisplayMetrics());
+        mPressedBackground = Color.BLACK;
+        TypedArray typedArray = context.getTheme().obtainStyledAttributes(attrs, R.styleable.IndexBar, defStyleAttr, 0);
+        int n = typedArray.getIndexCount();
+        for (int i = 0; i < n; i++) {
+            int attr = typedArray.getIndex(i);
+            if (attr == R.styleable.IndexBar_indexBarTextSize) {
+                textSize = typedArray.getDimensionPixelSize(attr, textSize);
+            } else if (attr == R.styleable.IndexBar_indexBarPressBackground) {
+                mPressedBackground = typedArray.getColor(attr, mPressedBackground);
+            }
+        }
+        typedArray.recycle();
+
+        initIndexDatas();
+
+
+        mPaint = new Paint();
+        mPaint.setAntiAlias(true);
+        mPaint.setTextSize(textSize);
+        mPaint.setColor(0xff888888);
+
+        setOnIndexPressedListener(new onIndexPressedListener() {
+            @Override
+            public void onIndexPressed(int index, String text) {
+                if (mPressedShowTextView != null) {
+                    mPressedShowTextView.setVisibility(View.VISIBLE);
+                    mPressedShowTextView.setText(text);
+                }
+
+                if (mLayoutManager != null) {
+                    int position = getPosByTag(text);
+                    if (position != -1) {
+                        mLayoutManager.scrollToPositionWithOffset(position, 0);
+                    }
+                }
+            }
+
+            @Override
+            public void onMotionEventEnd() {
+                if (mPressedShowTextView != null) {
+                    mPressedShowTextView.setVisibility(View.GONE);
+                }
+            }
+        });
+
+        mDataHelper = new IndexBarDataHelperImpl();
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int wMode = MeasureSpec.getMode(widthMeasureSpec);
+        int wSize = MeasureSpec.getSize(widthMeasureSpec);
+        int hMode = MeasureSpec.getMode(heightMeasureSpec);
+        int hSize = MeasureSpec.getSize(heightMeasureSpec);
+        int measureWidth = 0, measureHeight = 0;
+
+        Rect indexBounds = new Rect();// 存放每个绘制的index的Rect区域 // The Rect area that stores each drawn index 
+        String index;// 每个要绘制的index内容 // Each index content to be drawn
+        for (int i = 0; i < mIndexDatas.size(); i++) {
+            index = mIndexDatas.get(i);
+            mPaint.getTextBounds(index, 0, index.length(), indexBounds);
+            measureWidth = Math.max(indexBounds.width(), measureWidth);
+            measureHeight = Math.max(indexBounds.height(), measureHeight);
+        }
+        measureHeight *= mIndexDatas.size();
+        switch (wMode) {
+            case MeasureSpec.EXACTLY:
+                measureWidth = wSize;
+                break;
+            case MeasureSpec.AT_MOST:
+                measureWidth = Math.min(measureWidth, wSize);
+                break;
+            case MeasureSpec.UNSPECIFIED:
+                break;
+        }
+
+        switch (hMode) {
+            case MeasureSpec.EXACTLY:
+                measureHeight = hSize;
+                break;
+            case MeasureSpec.AT_MOST:
+                measureHeight = Math.min(measureHeight, hSize);
+                break;
+            case MeasureSpec.UNSPECIFIED:
+                break;
+        }
+
+        setMeasuredDimension(measureWidth, measureHeight);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        int t = getPaddingTop();
+        String index;
+        for (int i = 0; i < mIndexDatas.size(); i++) {
+            index = mIndexDatas.get(i);
+            // 获得画笔的FontMetrics，用来计算baseLine。因为drawText的y坐标，代表的是绘制的文字的baseLine的位置
+            // Get the FontMetrics of the brush, used to calculate the baseLine. Because the y coordinate of drawText represents the position of the baseLine of the drawn text
+            Paint.FontMetrics fontMetrics = mPaint.getFontMetrics();
+            // 计算出在每格index区域，竖直居中的baseLine值
+            // Calculate the baseLine value centered vertically in the index area of each grid
+            int baseline = (int) ((mGapHeight - fontMetrics.bottom - fontMetrics.top) / 2);
+            // 调用drawText，居中显示绘制index
+            // Call drawText to center the drawing index
+            canvas.drawText(index, mWidth / 2 - mPaint.measureText(index) / 2, t + mGapHeight * i + baseline, mPaint);
+        }
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                setBackgroundColor(mPressedBackground);
+                // 注意这里没有break，因为down时，也要计算落点 回调监听器
+                // Note that there is no break here, because when down, the drop point is also calculated. Callback listener
+            case MotionEvent.ACTION_MOVE:
+                float y = event.getY();
+                // 通过计算判断落点在哪个区域：
+                // Determine which area the landing point is in by calculating:
+                int pressI = (int) ((y - getPaddingTop()) / mGapHeight);
+                // 边界处理（在手指move时，有可能已经移出边界，防止越界）
+                // Boundary processing (when the finger moves, it may have moved out of the boundary to prevent crossing the boundary)
+                if (pressI < 0) {
+                    pressI = 0;
+                } else if (pressI >= mIndexDatas.size()) {
+                    pressI = mIndexDatas.size() - 1;
+                }
+
+                if (null != mOnIndexPressedListener && pressI > -1 && pressI < mIndexDatas.size()) {
+                    mOnIndexPressedListener.onIndexPressed(pressI, mIndexDatas.get(pressI));
+                }
+                break;
+            case MotionEvent.ACTION_UP:
+            case MotionEvent.ACTION_CANCEL:
+            default:
+                setBackgroundResource(android.R.color.transparent);
+
+                if (null != mOnIndexPressedListener) {
+                    mOnIndexPressedListener.onMotionEventEnd();
+                }
+                break;
+        }
+        return true;
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+        mWidth = w;
+        mHeight = h;
+
+        if (null == mIndexDatas || mIndexDatas.isEmpty()) {
+            return;
+        }
+        computeGapHeight();
+    }
+
+    public onIndexPressedListener getOnIndexPressedListener() {
+        return mOnIndexPressedListener;
+    }
+
+    public void setOnIndexPressedListener(onIndexPressedListener mOnIndexPressedListener) {
+        this.mOnIndexPressedListener = mOnIndexPressedListener;
+    }
+
+    /**
+     * 显示当前被按下的index的TextView
+     * 
+     * Displays the TextView of the currently pressed index
+     *
+     * @return
+     */
+    public IndexBar setPressedShowTextView(TextView mPressedShowTextView) {
+        this.mPressedShowTextView = mPressedShowTextView;
+        return this;
+    }
+
+    public IndexBar setLayoutManager(CustomLinearLayoutManager mLayoutManager) {
+        this.mLayoutManager = mLayoutManager;
+        return this;
+    }
+
+    /**
+     * 一定要在设置数据源{@link #setSourceDatas(List)}之前调用
+     * 
+     * Be sure to call before setting the data source {@link #setSourceDatas(List)}
+     *
+     * @param needRealIndex
+     * @return
+     */
+    public IndexBar setNeedRealIndex(boolean needRealIndex) {
+        isNeedRealIndex = needRealIndex;
+        initIndexDatas();
+        return this;
+    }
+
+    private void initIndexDatas() {
+        if (isNeedRealIndex) {
+            mIndexDatas = new ArrayList<>();
+        } else {
+            mIndexDatas = Arrays.asList(INDEX_STRING);
+        }
+    }
+
+    public IndexBar setSourceDatas(List<? extends BaseIndexPinyinBean> mSourceDatas) {
+        this.mSourceDatas = mSourceDatas;
+        initSourceDatas();
+        return this;
+    }
+
+    /**
+     * 初始化原始数据源，并取出索引数据源
+     * 
+     * Initialize the original data source and take out the index data source
+     *
+     * @return
+     */
+    private void initSourceDatas() {
+        if (null == mSourceDatas || mSourceDatas.isEmpty()) {
+            return;
+        }
+        if (!isSourceDatasAlreadySorted) {
+            mDataHelper.sortSourceDatas(mSourceDatas);
+        } else {
+            mDataHelper.convert(mSourceDatas);
+            mDataHelper.fillInexTag(mSourceDatas);
+        }
+        if (isNeedRealIndex) {
+            mDataHelper.getSortedIndexDatas(mSourceDatas, mIndexDatas);
+            computeGapHeight();
+        }
+        //sortData();
+    }
+
+    /**
+     * 以下情况调用：
+     * 1 在数据源改变
+     * 2 控件size改变时
+     * 计算gapHeight
+     * 
+     * 
+     * Called when:
+     * 1 change in data source
+     * 2 When the control size changes
+     * Calculate gapHeight
+     */
+    private void computeGapHeight() {
+        mGapHeight = (mHeight - getPaddingTop() - getPaddingBottom()) / mIndexDatas.size();
+    }
+
+
+    private void sortData() {
+
+    }
+
+    private int getPosByTag(String tag) {
+        if (null == mSourceDatas || mSourceDatas.isEmpty()) {
+            return -1;
+        }
+        if (TextUtils.isEmpty(tag)) {
+            return -1;
+        }
+        for (int i = 0; i < mSourceDatas.size(); i++) {
+            if (tag.equals(mSourceDatas.get(i).getBaseIndexTag())) {
+                return i + getHeaderViewCount();
+            }
+        }
+        return -1;
+    }
+
+    public interface onIndexPressedListener {
+        void onIndexPressed(int index, String text);//当某个Index被按下 // When an Index is pressed
+
+        void onMotionEventEnd();//当触摸事件结束（UP CANCEL） // When the touch event ends (UP CANCEL)
+    }
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/component/indexlib/suspension/ISuspensionInterface.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/component/indexlib/suspension/ISuspensionInterface.java
new file mode 100644
index 0000000..4c1c9ad
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/component/indexlib/suspension/ISuspensionInterface.java
@@ -0,0 +1,13 @@
+package com.tencent.qcloud.tuikit.tuicontact.component.indexlib.suspension;
+
+
+public interface ISuspensionInterface {
+    // 是否需要显示悬停title
+    // Whether to display the hover title
+    boolean isShowSuspension();
+
+    // 悬停的title
+    // hover title
+    String getSuspensionTag();
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/component/indexlib/suspension/SuspensionDecoration.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/component/indexlib/suspension/SuspensionDecoration.java
new file mode 100644
index 0000000..4e76837
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/component/indexlib/suspension/SuspensionDecoration.java
@@ -0,0 +1,205 @@
+package com.tencent.qcloud.tuikit.tuicontact.component.indexlib.suspension;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.util.TypedValue;
+import android.view.View;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.List;
+
+
+public class SuspensionDecoration extends RecyclerView.ItemDecoration {
+
+    private static final String TAG = SuspensionDecoration.class.getSimpleName();
+    private static int COLOR_TITLE_BG = Color.parseColor("#FFF2F3F5");
+    private static int COLOR_TITLE_BOTTOM_LINE = Color.parseColor("#FFCACACA");
+    private static int COLOR_TITLE_FONT = Color.parseColor("#FF888888");
+    private int mTitleFontSize;
+    private List<? extends ISuspensionInterface> mDatas;
+    private Paint mPaint;
+    private Rect mBounds;
+    private int mTitleHeight;
+    private int mHeaderViewCount = 0;
+
+
+    public SuspensionDecoration(Context context, List<? extends ISuspensionInterface> datas) {
+        super();
+        mDatas = datas;
+        mPaint = new Paint();
+        mBounds = new Rect();
+        mTitleHeight = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 33f, context.getResources().getDisplayMetrics());
+        mTitleFontSize = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, 13f, context.getResources().getDisplayMetrics());
+        mPaint.setTextSize(mTitleFontSize);
+        mPaint.setAntiAlias(true);
+    }
+
+
+    public SuspensionDecoration setTitleHeight(int mTitleHeight) {
+        this.mTitleHeight = mTitleHeight;
+        return this;
+    }
+
+
+    public SuspensionDecoration setColorTitleBg(int colorTitleBg) {
+        COLOR_TITLE_BG = colorTitleBg;
+        return this;
+    }
+
+    public SuspensionDecoration setColorTitleFont(int colorTitleFont) {
+        COLOR_TITLE_FONT = colorTitleFont;
+        return this;
+    }
+
+    public SuspensionDecoration setTitleFontSize(int mTitleFontSize) {
+        mPaint.setTextSize(mTitleFontSize);
+        return this;
+    }
+
+    public SuspensionDecoration setDatas(List<? extends ISuspensionInterface> mDatas) {
+        this.mDatas = mDatas;
+        return this;
+    }
+
+    public int getHeaderViewCount() {
+        return mHeaderViewCount;
+    }
+
+    public SuspensionDecoration setHeaderViewCount(int headerViewCount) {
+        mHeaderViewCount = headerViewCount;
+        return this;
+    }
+
+    @Override
+    public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {
+        super.onDraw(c, parent, state);
+        final int left = parent.getPaddingLeft();
+        final int right = parent.getWidth() - parent.getPaddingRight();
+        final int childCount = parent.getChildCount();
+        for (int i = 0; i < childCount; i++) {
+            final View child = parent.getChildAt(i);
+            final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child
+                    .getLayoutParams();
+            int position = params.getViewLayoutPosition();
+            position -= getHeaderViewCount();
+
+            if (mDatas == null || mDatas.isEmpty() || position > mDatas.size() - 1 || position < 0 || !mDatas.get(position).isShowSuspension()) {
+                continue;
+            }
+
+            if (position > -1) {
+                if (position == 0) {
+                    drawTitleArea(c, left, right, child, params, position);
+
+                } else {
+                    if (null != mDatas.get(position).getSuspensionTag() && !mDatas.get(position).getSuspensionTag().equals(mDatas.get(position - 1).getSuspensionTag())) {
+                        drawTitleArea(c, left, right, child, params, position);
+                    } else {
+                        //none
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 绘制Title区域背景和文字的方法
+     * 
+     * How to draw the background and text of the Title area
+     *
+     * @param c
+     * @param left
+     * @param right
+     * @param child
+     * @param params
+     * @param position
+     */
+    private void drawTitleArea(Canvas c, int left, int right, View child, RecyclerView.LayoutParams params, int position) {//最先调用，绘制在最下层 // Called first, drawn at the bottom layer
+        mPaint.setColor(COLOR_TITLE_BG);
+        c.drawRect(left, child.getTop() - params.topMargin - mTitleHeight, right, child.getTop() - params.topMargin, mPaint);
+
+        mPaint.setColor(COLOR_TITLE_BOTTOM_LINE);
+        c.drawRect(left, child.getTop() - params.topMargin - 1, right, child.getTop() - params.topMargin, mPaint);
+
+        mPaint.setColor(COLOR_TITLE_FONT);
+        mPaint.getTextBounds(mDatas.get(position).getSuspensionTag(), 0, mDatas.get(position).getSuspensionTag().length(), mBounds);
+        c.drawText(mDatas.get(position).getSuspensionTag(), child.getPaddingLeft() + 61, child.getTop() - params.topMargin - (mTitleHeight / 2 - mBounds.height() / 2), mPaint);
+    }
+
+    @Override
+    public void onDrawOver(Canvas c, final RecyclerView parent, RecyclerView.State state) {//最后调用 绘制在最上层 // Last call to draw on top
+        int pos = ((LinearLayoutManager) (parent.getLayoutManager())).findFirstVisibleItemPosition();
+        pos -= getHeaderViewCount();
+
+        if (mDatas == null || mDatas.isEmpty() || pos > mDatas.size() - 1 || pos < 0 || !mDatas.get(pos).isShowSuspension()) {
+            return;
+        }
+
+        String tag = mDatas.get(pos).getSuspensionTag();
+        //View child = parent.getChildAt(pos);
+        View child = parent.findViewHolderForLayoutPosition(pos + getHeaderViewCount()).itemView;
+
+        boolean flag = false;//定义一个flag，Canvas是否位移过的标志 // Define a flag, whether the Canvas is shifted or not
+        if ((pos + 1) < mDatas.size()) {
+            if (null != tag && !tag.equals(mDatas.get(pos + 1).getSuspensionTag())) {
+                // 当前第一个可见的Item的tag，不等于其后一个item的tag，说明悬浮的View要切换了
+                // The tag of the current first visible item is not equal to the tag of the next item, indicating that the floating View is about to be switched.
+//                TUIKitLog.d(TAG, "onDrawOver() called with: c = [" + child.getTop());
+                if (child.getHeight() + child.getTop() < mTitleHeight) {
+                    // 当第一个可见的item在屏幕中还剩的高度小于title区域的高度时，我们也该开始做悬浮Title的“交换动画”
+                    // When the remaining height of the first visible item on the screen is less than the height of the title area, we should also start to do the "swap animation" of the floating Title
+                    c.save();
+                    flag = true;
+
+                    //一种头部折叠起来的视效，个人觉得也还不错~
+                    //可与123行 c.drawRect 比较，只有bottom参数不一样，由于 child.getHeight() + child.getTop() < mTitleHeight，所以绘制区域是在不断的减小，有种折叠起来的感觉
+                    //c.clipRect(parent.getPaddingLeft(), parent.getPaddingTop(), parent.getRight() - parent.getPaddingRight(), parent.getPaddingTop() + child.getHeight() + child.getTop());
+
+                    //类似饿了么点餐时,商品列表的悬停头部切换“动画效果”
+                    //上滑时，将canvas上移 （y为负数） ,所以后面canvas 画出来的Rect和Text都上移了，有种切换的“动画”感觉
+                    // Similar to Ele.me ordering, the hover head of the product list switches the "animation effect"
+                    // When sliding up, move the canvas up (y is a negative number), so the Rect and Text drawn by the canvas are moved up, and there is a kind of "animation" feeling of switching
+                    c.translate(0, child.getHeight() + child.getTop() - mTitleHeight);
+                }
+            }
+        }
+        mPaint.setColor(COLOR_TITLE_BG);
+        c.drawRect(parent.getPaddingLeft(), parent.getPaddingTop(), parent.getRight() - parent.getPaddingRight(), parent.getPaddingTop() + mTitleHeight, mPaint);
+        mPaint.setColor(COLOR_TITLE_FONT);
+        mPaint.getTextBounds(tag, 0, tag.length(), mBounds);
+        c.drawText(tag, child.getPaddingLeft() + 40,
+                parent.getPaddingTop() + mTitleHeight - (mTitleHeight / 2 - mBounds.height() / 2),
+                mPaint);
+        if (flag)
+            c.restore();
+    }
+
+    @Override
+    public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+        super.getItemOffsets(outRect, view, parent, state);
+        int position = ((RecyclerView.LayoutParams) view.getLayoutParams()).getViewLayoutPosition();
+        position -= getHeaderViewCount();
+        if (mDatas == null || mDatas.isEmpty() || position > mDatas.size() - 1) {
+            return;
+        }
+
+        if (position > -1) {
+            ISuspensionInterface titleCategoryInterface = mDatas.get(position);
+            if (titleCategoryInterface.isShowSuspension()) {
+                if (position == 0) {
+                    outRect.set(0, mTitleHeight, 0, 0);
+                } else {
+                    if (null != titleCategoryInterface.getSuspensionTag() && !titleCategoryInterface.getSuspensionTag().equals(mDatas.get(position - 1).getSuspensionTag())) {
+                        outRect.set(0, mTitleHeight, 0, 0);
+                    }
+                }
+            }
+        }
+    }
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/config/TUIContactConfig.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/config/TUIContactConfig.java
new file mode 100644
index 0000000..8c63b69
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/config/TUIContactConfig.java
@@ -0,0 +1,29 @@
+package com.tencent.qcloud.tuikit.tuicontact.config;
+
+public class TUIContactConfig {
+    public static final String TAG = TUIContactConfig.class.getSimpleName();
+    private static TUIContactConfig instance;
+    private boolean isShowUserStatus;
+
+    public static TUIContactConfig getInstance() {
+        if (instance == null) {
+            instance = new TUIContactConfig();
+        }
+
+        return instance;
+    }
+
+    /**
+     * 获取是否显示用户在线状态
+     */
+    public boolean isShowUserStatus() {
+        return isShowUserStatus;
+    }
+
+    /**
+     * 设置是否显示用户在线状态
+     */
+    public void setShowUserStatus(boolean showUserStatus) {
+        isShowUserStatus = showUserStatus;
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/interfaces/ContactEventListener.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/interfaces/ContactEventListener.java
new file mode 100644
index 0000000..22a2700
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/interfaces/ContactEventListener.java
@@ -0,0 +1,111 @@
+package com.tencent.qcloud.tuikit.tuicontact.interfaces;
+
+import com.tencent.imsdk.v2.V2TIMUserStatus;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.bean.FriendApplicationBean;
+
+import java.util.List;
+
+public abstract class ContactEventListener {
+    /**
+     * 好友申请新增通知，两种情况会收到这个回调：
+     * 1. 自己申请加别人好友
+     * 2. 别人申请加自己好友
+     * 
+     * New friend request notification. You will receive this callback in the following cases:
+     * 1. You send a friend request to others.
+     * 2. You receive a friend request from others.
+     */
+    public void onFriendApplicationListAdded(List<FriendApplicationBean> applicationList) {
+    }
+
+    /**
+     * 好友申请删除通知，四种情况会收到这个回调
+     * 1. 调用 deleteFriendApplication 主动删除好友申请
+     * 2. 调用 refuseFriendApplication 拒绝好友申请
+     * 3. 调用 acceptFriendApplication 同意好友申请且同意类型为 V2TIM_FRIEND_ACCEPT_AGREE 时
+     * 4. 申请加别人好友被拒绝
+     * 
+     * 
+     * Friend request deletion notification. You will receive this callback in the following cases:
+     * 1. You call deleteFriendApplication to proactively delete a friend request.
+     * 2. You call refuseFriendApplication to reject a friend request.
+     * 3. You call acceptFriendApplication to accept a friend request and the acceptance type is V2TIM_FRIEND_ACCEPT_AGREE.
+     * 4. Your friend request is rejected by others.
+     */
+    public void onFriendApplicationListDeleted(List<String> userIDList) {
+    }
+
+    /**
+     * 好友申请已读通知，如果调用 setFriendApplicationRead 设置好友申请列表已读，会收到这个回调（主要用于多端同步）
+     * 
+     * Friend request read notification. When you call setFriendApplicationRead to set the friend request list as read, you will receive this callback (mainly used for multi-device synchronization).
+     */
+    public void onFriendApplicationListRead() {
+    }
+
+    /**
+     * 好友新增通知
+     * 
+     * New friend notification
+     */
+    public void onFriendListAdded(List<ContactItemBean> users) {
+    }
+
+    /**
+     * 好友删除通知，，两种情况会收到这个回调：
+     * 1. 自己删除好友（单向和双向删除都会收到回调）
+     * 2. 好友把自己删除（双向删除会收到）
+     * 
+     * Friend deletion notification. You will receive this callback in the following cases:
+     * 1. You delete a friend (received for one-way or two-way friend deletion).
+     * 2. You are deleted by a friend (received for two-way friend deletion).
+     */
+    public void onFriendListDeleted(List<String> userList) {
+    }
+
+    /**
+     * 黑名单新增通知
+     * 
+     * New blocklist notification
+     */
+    public void onBlackListAdd(List<ContactItemBean> infoList) {
+    }
+
+    /**
+     * 黑名单删除通知
+     * 
+     * Blocklist deletion notification
+     */
+    public void onBlackListDeleted(List<String> userList) {
+    }
+
+    /**
+     * 好友资料更新通知
+     * 
+     * Friend profile update notification
+     */
+    public void onFriendInfoChanged(List<ContactItemBean> infoList) {
+    }
+    /**
+     * 好友资料更新通知
+     * 
+     * Friend Remark update notification
+     */
+    public void onFriendRemarkChanged(String id, String remark) {
+    }
+
+    /**
+     * 好友在线状态变更通知
+     * 
+     * User status update notification
+     */
+    public void onUserStatusChanged(List<V2TIMUserStatus> userStatusList){
+    }
+
+    /**
+     * 刷新界面在线状态显示隐藏
+     */
+    public void refreshUserStatusFragmentUI() {
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/interfaces/IAddMoreActivity.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/interfaces/IAddMoreActivity.java
new file mode 100644
index 0000000..176fffe
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/interfaces/IAddMoreActivity.java
@@ -0,0 +1,6 @@
+package com.tencent.qcloud.tuikit.tuicontact.interfaces;
+
+public interface IAddMoreActivity {
+    String getString(int resId);
+    void finish();
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/interfaces/IContactListView.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/interfaces/IContactListView.java
new file mode 100644
index 0000000..e70ce3a
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/interfaces/IContactListView.java
@@ -0,0 +1,21 @@
+package com.tencent.qcloud.tuikit.tuicontact.interfaces;
+
+
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+
+import java.util.List;
+
+public interface IContactListView {
+
+    class DataSource {
+        public static final int UNKNOWN = -1;
+        public static final int FRIEND_LIST = 1;
+        public static final int BLACK_LIST = 2;
+        public static final int GROUP_LIST = 3;
+        public static final int CONTACT_LIST = 4;
+        public static final int GROUP_MEMBER_LIST = 5;
+    }
+
+    void onDataSourceChanged(List<ContactItemBean> contactItemBeanList);
+    void onFriendApplicationChanged();
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/interfaces/IFriendProfileLayout.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/interfaces/IFriendProfileLayout.java
new file mode 100644
index 0000000..11ae4d6
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/interfaces/IFriendProfileLayout.java
@@ -0,0 +1,8 @@
+package com.tencent.qcloud.tuikit.tuicontact.interfaces;
+
+
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+
+public interface IFriendProfileLayout {
+    void onDataSourceChanged(ContactItemBean bean);
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/interfaces/INewFriendActivity.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/interfaces/INewFriendActivity.java
new file mode 100644
index 0000000..40e7c5c
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/interfaces/INewFriendActivity.java
@@ -0,0 +1,10 @@
+package com.tencent.qcloud.tuikit.tuicontact.interfaces;
+
+
+import com.tencent.qcloud.tuikit.tuicontact.bean.FriendApplicationBean;
+
+import java.util.List;
+
+public interface INewFriendActivity {
+    void onDataSourceChanged(List<FriendApplicationBean> beanList);
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/interfaces/IContactLayout.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/interfaces/IContactLayout.java
new file mode 100644
index 0000000..2ea993f
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/interfaces/IContactLayout.java
@@ -0,0 +1,10 @@
+package com.tencent.qcloud.tuikit.tuicontact.minimalistui.interfaces;
+
+import com.tencent.qcloud.tuicore.component.interfaces.ILayout;
+import com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget.ContactListView;
+
+public interface IContactLayout extends ILayout {
+
+    ContactListView getContactListView();
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/AddMoreMinimalistActivity.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/AddMoreMinimalistActivity.java
new file mode 100644
index 0000000..8307243
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/AddMoreMinimalistActivity.java
@@ -0,0 +1,216 @@
+package com.tencent.qcloud.tuikit.tuicontact.minimalistui.pages;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.TUIUtil;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactConstants;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactService;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuicontact.interfaces.IAddMoreActivity;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.AddMorePresenter;
+
+public class AddMoreMinimalistActivity extends BaseLightActivity implements IAddMoreActivity {
+
+    private static final String TAG = AddMoreMinimalistActivity.class.getSimpleName();
+
+    private TitleBarLayout mTitleBar;
+    private EditText searchEdit;
+    private TextView idLabel;
+    private TextView notFoundTip;
+    private TextView searchBtn;
+    private View detailArea;
+
+    private ImageView faceImgView;
+    private TextView idTextView;
+    private TextView groupTypeView;
+    private TextView groupTypeTagView;
+    private TextView nickNameView;
+
+    private boolean mIsGroup;
+
+    private AddMorePresenter presenter;
+
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.contact_add_activity);
+        if (getIntent() != null) {
+            mIsGroup = getIntent().getExtras().getBoolean(TUIContactConstants.GroupType.GROUP);
+        }
+
+        presenter = new AddMorePresenter();
+        presenter.setAddMoreActivity(this);
+
+        faceImgView = findViewById(R.id.friend_icon);
+        idTextView = findViewById(R.id.friend_account);
+        groupTypeView = findViewById(R.id.group_type);
+        nickNameView = findViewById(R.id.friend_nick_name);
+        groupTypeTagView = findViewById(R.id.group_type_tag);
+
+        mTitleBar = findViewById(R.id.add_friend_titlebar);
+        mTitleBar.setTitle(mIsGroup ? getResources().getString(R.string.add_group) : getResources().getString(R.string.add_friend), ITitleBarLayout.Position.MIDDLE);
+        mTitleBar.setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        mTitleBar.getRightGroup().setVisibility(View.GONE);
+
+        searchEdit = findViewById(R.id.search_edit);
+        if (mIsGroup) {
+            searchEdit.setHint(R.string.hint_search_group_id);
+        }
+
+        idLabel = findViewById(R.id.id_label);
+        notFoundTip = findViewById(R.id.not_found_tip);
+        searchBtn = findViewById(R.id.search_button);
+        detailArea = findViewById(R.id.friend_detail_area);
+        searchBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                notFoundTip.setVisibility(View.GONE);
+                String id = searchEdit.getText().toString();
+
+                if (mIsGroup) {
+                    presenter.getGroupInfo(id, new IUIKitCallback<GroupInfo>() {
+                        @Override
+                        public void onSuccess(GroupInfo data) {
+                            setGroupDetail(data);
+                            detailArea.setOnClickListener(new View.OnClickListener() {
+                                @Override
+                                public void onClick(View v) {
+                                    Intent intent = new Intent(TUIContactService.getAppContext(), FriendProfileMinimalistActivity.class);
+                                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                    intent.putExtra(TUIContactConstants.ProfileType.CONTENT, data);
+                                    TUIContactService.getAppContext().startActivity(intent);
+                                }
+                            });
+                        }
+
+                        @Override
+                        public void onError(String module, int errCode, String errMsg) {
+                            setNotFound(true);
+                        }
+                    });
+                    return;
+                }
+
+                presenter.getUserInfo(id, new IUIKitCallback<ContactItemBean>() {
+                    @Override
+                    public void onSuccess(ContactItemBean data) {
+                        setFriendDetail(data.getAvatarUrl(), data.getId(), data.getNickName());
+                        detailArea.setOnClickListener(new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                Intent intent = new Intent(TUIContactService.getAppContext(), FriendProfileMinimalistActivity.class);
+                                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                intent.putExtra(TUIContactConstants.ProfileType.CONTENT, data);
+                                TUIContactService.getAppContext().startActivity(intent);
+                            }
+                        });
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        setNotFound(false);
+                    }
+                });
+            }
+        });
+
+        if (!mIsGroup) {
+            idLabel.setText(getString(R.string.contact_my_user_id, TUILogin.getLoginUser()));
+        }
+
+        searchEdit.setOnFocusChangeListener(new View.OnFocusChangeListener() {
+            @Override
+            public void onFocusChange(View v, boolean hasFocus) {
+                if (hasFocus) {
+                    idLabel.setVisibility(View.GONE);
+                }
+            }
+        });
+
+        searchEdit.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                if (TextUtils.isEmpty(searchEdit.getText())) {
+                    detailArea.setVisibility(View.GONE);
+                    notFoundTip.setVisibility(View.GONE);
+                }
+            }
+        });
+
+    }
+
+    private void setGroupDetail(GroupInfo groupInfo) {
+        int radius = getResources().getDimensionPixelSize(R.dimen.contact_profile_face_radius);
+        GlideEngine.loadUserIcon(faceImgView, groupInfo.getFaceUrl(),
+                TUIUtil.getDefaultGroupIconResIDByGroupType(this, groupInfo.getGroupType()), radius);
+        idTextView.setText(groupInfo.getId());
+        nickNameView.setText(groupInfo.getGroupName());
+        groupTypeTagView.setVisibility(View.VISIBLE);
+        groupTypeView.setVisibility(View.VISIBLE);
+        groupTypeView.setText(groupInfo.getGroupType());
+        detailArea.setVisibility(View.VISIBLE);
+    }
+
+    private void setFriendDetail(String faceUrl, String id, String nickName) {
+        int radius = getResources().getDimensionPixelSize(R.dimen.contact_profile_face_radius);
+        GlideEngine.loadUserIcon(faceImgView, faceUrl, radius);
+        idTextView.setText(id);
+        if (TextUtils.isEmpty(nickName)) {
+            nickNameView.setText(id);
+        } else {
+            nickNameView.setText(nickName);
+        }
+        groupTypeTagView.setVisibility(View.GONE);
+        groupTypeView.setVisibility(View.GONE);
+        detailArea.setVisibility(View.VISIBLE);
+    }
+
+    private void setNotFound(boolean isGroup) {
+        detailArea.setVisibility(View.GONE);
+        if (isGroup) {
+            notFoundTip.setText(getString(R.string.contact_no_such_group));
+        } else {
+            notFoundTip.setText(getString(R.string.contact_no_such_user));
+        }
+        notFoundTip.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    public void finish() {
+        super.finish();
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/BlackListMinimalistActivity.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/BlackListMinimalistActivity.java
new file mode 100644
index 0000000..42860f4
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/BlackListMinimalistActivity.java
@@ -0,0 +1,73 @@
+package com.tencent.qcloud.tuikit.tuicontact.minimalistui.pages;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactConstants;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget.ContactListView;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.ContactPresenter;
+
+public class BlackListMinimalistActivity extends BaseLightActivity {
+
+    private TitleBarLayout mTitleBar;
+    private ContactListView mListView;
+
+    private ContactPresenter presenter;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.minimalist_contact_blacklist_activity);
+
+        init();
+    }
+
+    private void init() {
+        mTitleBar = findViewById(R.id.black_list_titlebar);
+        mTitleBar.setTitle(getResources().getString(R.string.blacklist), ITitleBarLayout.Position.MIDDLE);
+        mTitleBar.setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        mTitleBar.getRightGroup().setVisibility(View.GONE);
+
+        mListView = findViewById(R.id.black_list);
+        mListView.setOnItemClickListener(new ContactListView.OnItemClickListener() {
+            @Override
+            public void onItemClick(int position, ContactItemBean contact) {
+                Intent intent = new Intent(BlackListMinimalistActivity.this, FriendProfileMinimalistActivity.class);
+                intent.putExtra(TUIContactConstants.ProfileType.CONTENT, contact);
+                startActivity(intent);
+            }
+        });
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        loadDataSource();
+    }
+
+    public void loadDataSource() {
+        presenter = new ContactPresenter();
+        mListView.setPresenter(presenter);
+        mListView.setNotFoundTip(getString(R.string.contact_no_block_list));
+        presenter.setContactListView(mListView);
+        presenter.setBlackListListener();
+        mListView.loadDataSource(ContactListView.DataSource.BLACK_LIST);
+    }
+
+    @Override
+    public void finish() {
+        super.finish();
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/CreateGroupMinimalistActivity.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/CreateGroupMinimalistActivity.java
new file mode 100644
index 0000000..148af9f
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/CreateGroupMinimalistActivity.java
@@ -0,0 +1,455 @@
+package com.tencent.qcloud.tuikit.tuicontact.minimalistui.pages;
+
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.TextPaint;
+import android.text.TextUtils;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
+import android.text.style.ForegroundColorSpan;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuicore.component.LineControllerView;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.activities.ImageSelectActivity;
+import com.tencent.qcloud.tuicore.component.dialog.TUIKitDialog;
+import com.tencent.qcloud.tuicore.component.gatherimage.SynthesizedImageView;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.component.popupcard.PopupInputCard;
+import com.tencent.qcloud.tuicore.util.ImageUtil;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactConstants;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuicontact.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuicontact.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuicontact.minimalistui.util.ContactStartChatUtils;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.ContactPresenter;
+import com.tencent.qcloud.tuikit.tuicontact.util.TUIContactLog;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CreateGroupMinimalistActivity extends BaseLightActivity implements View.OnClickListener {
+    private static final String TAG = CreateGroupMinimalistActivity.class.getSimpleName();
+
+    private static final int CHOOSE_AVATAR_REQUEST_CODE = 1;
+    private static final int CHOOSE_GROUP_TYPE_REQUEST_CODE = 2;
+    private TitleBarLayout titleBarLayout;
+    private SynthesizedImageView groupAvatar;
+    private LineControllerView groupNameLv;
+    private LineControllerView groupIdLv;
+    private LineControllerView groupTypeLv;
+    private View groupAvatarLayout;
+    private TextView confirmButton;
+    private TextView groupTypeContentView, groupTypeContentUrlView;
+
+    private String groupName;
+    private String groupId;
+    private String groupType = V2TIMManager.GROUP_TYPE_WORK;
+    private String groupAvatarUrl;
+    private List<Object> groupAvatarUrlList;
+    private int joinTypeIndex;
+    private String groupAvatarImageId = "";
+
+    private ArrayList<GroupMemberInfo> mGroupMembers = new ArrayList<>();
+    private boolean mCreating;
+    
+    private ContactPresenter presenter;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.create_group_layout);
+
+        titleBarLayout = findViewById(R.id.create_group_bar);
+        groupNameLv = findViewById(R.id.group_name_layout);
+        groupIdLv = findViewById(R.id.group_id_layout);
+        groupTypeLv = findViewById(R.id.group_type_layout);
+        groupAvatarLayout = findViewById(R.id.group_avatar_layout);
+        groupAvatar = findViewById(R.id.group_avatar);
+        groupAvatar.setRadius(25);
+        confirmButton = findViewById(R.id.confirm_button);
+        groupTypeContentView = findViewById(R.id.group_type_text);
+        groupTypeContentUrlView = findViewById(R.id.group_type_text_url);
+
+        initData();
+        setupViews();
+    }
+
+    private void initData() {
+        Intent intent = getIntent();
+        if (intent == null) {
+            TUIContactLog.e(TAG, "intent is null");
+            return;
+        }
+        Bundle bundle = intent.getExtras();
+        if (bundle == null) {
+            TUIContactLog.e(TAG, "bundle is null");
+            return;
+        }
+
+        mGroupMembers = (ArrayList<GroupMemberInfo>) bundle.getSerializable(TUIConstants.TUIGroup.GROUP_MEMBER_ID_LIST);
+
+        if (mGroupMembers == null || mGroupMembers.size() <= 1) {
+            TUIContactLog.e(TAG, "mGroupMemberIcons <= 1");
+        }
+
+        int num = mGroupMembers.size();
+        if (num > 9) {
+            num = 9;
+        }
+        for (int i = 0; i < num; i++) {
+            groupAvatarImageId += mGroupMembers.get(i).getAccount();
+        }
+
+        groupName = bundle.getString(TUIConstants.TUIGroup.GROUP_NAME);
+        groupNameLv.setContent(groupName);
+
+        groupTypeLv.setContent(groupType);
+
+        if (TUIConfig.isEnableGroupGridAvatar()) {
+            groupAvatarUrlList = fillGroupGridAvatar();
+            groupAvatar.setImageId(groupAvatarImageId);
+            groupAvatar.displayImage(groupAvatarUrlList).load(groupAvatarImageId);
+            groupAvatarUrl = null;
+        }
+
+        joinTypeIndex = bundle.getInt(TUIConstants.TUIGroup.JOIN_TYPE_INDEX, 2);
+    }
+
+    private void setupViews() {
+        titleBarLayout.getRightIcon().setVisibility(View.GONE);
+        titleBarLayout.setTitle(getString(R.string.create_group_chat), ITitleBarLayout.Position.MIDDLE);
+        titleBarLayout.setOnLeftClickListener(this);
+
+        groupAvatar.setOnClickListener(this);
+        groupAvatarLayout.setOnClickListener(this);
+        groupNameLv.setOnClickListener(this);
+        groupIdLv.setOnClickListener(this);
+        groupTypeLv.setOnClickListener(this);
+        groupAvatarLayout.setOnClickListener(this);
+
+        confirmButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                createGroupChat();
+            }
+        });
+
+        presenter = new ContactPresenter();
+        initGroupTypeContentView();
+    }
+
+    private void initGroupTypeContentView() {
+        switch(groupType) {
+            case V2TIMManager.GROUP_TYPE_WORK:
+                groupTypeContentView.setText(getString(R.string.group_work_content));
+                break;
+            case V2TIMManager.GROUP_TYPE_PUBLIC:
+                groupTypeContentView.setText(getString(R.string.group_public_des));
+                break;
+            case V2TIMManager.GROUP_TYPE_MEETING:
+                groupTypeContentView.setText(getString(R.string.group_meeting_des));
+                break;
+            case V2TIMManager.GROUP_TYPE_COMMUNITY:
+                groupTypeContentView.setText(getString(R.string.group_commnity_des));
+                break;
+            default:
+                groupTypeContentView.setText(getString(R.string.group_work_content));
+                break;
+        }
+
+        String groupTypeContent = getResources().getString(R.string.group_type_content_title);
+        String urlContent = getResources().getString(R.string.group_type_content_url);
+        int urlContentIndex = groupTypeContent.lastIndexOf(urlContent);
+
+        final int foregroundColor;
+        int currentTheme = TUIThemeManager.getInstance().getCurrentTheme();
+        if (currentTheme == TUIThemeManager.THEME_LIVELY) {
+            foregroundColor = getResources().getColor(com.tencent.qcloud.tuicore.R.color.core_primary_color_lively);
+        } else if (currentTheme == TUIThemeManager.THEME_SERIOUS) {
+            foregroundColor = getResources().getColor(com.tencent.qcloud.tuicore.R.color.core_primary_color_serious);
+        } else {
+            foregroundColor = getResources().getColor(com.tencent.qcloud.tuicore.R.color.core_primary_color_light);
+        }
+
+        SpannableString spannedString = new SpannableString(groupTypeContent);
+        ForegroundColorSpan colorSpan = new ForegroundColorSpan(foregroundColor);
+        spannedString.setSpan(colorSpan, urlContentIndex, urlContentIndex + urlContent.length(), Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
+
+        ClickableSpan clickableSpan = new ClickableSpan() {
+            @Override
+            public void onClick(View view) {
+                if (TextUtils.equals(TUIThemeManager.getInstance().getCurrentLanguage(), "zh")) {
+                    openWebUrl(TUIContactConstants.IM_PRODUCT_DOC_URL);
+                } else {
+                    openWebUrl(TUIContactConstants.IM_PRODUCT_DOC_URL_EN);
+                }
+            }
+
+            @Override
+            public void updateDrawState(TextPaint ds) {
+                ds.setUnderlineText(false);
+            }
+        };
+        spannedString.setSpan(clickableSpan, urlContentIndex, urlContentIndex + urlContent.length(), Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
+        groupTypeContentUrlView.setText(spannedString);
+        groupTypeContentUrlView.setMovementMethod(LinkMovementMethod.getInstance());
+    }
+    @Override
+    public void onClick(View v) {
+        if (v == groupAvatar || v == groupAvatarLayout) {
+            ArrayList<ImageSelectActivity.ImageBean> faceList = new ArrayList<>();
+            if (TUIConfig.isEnableGroupGridAvatar()) {
+                ImageSelectActivity.ImageBean imageBean = new ImageSelectActivity.ImageBean();
+                imageBean.setGroupGridAvatar(fillGroupGridAvatar());
+                imageBean.setImageId(groupAvatarImageId);
+                faceList.add(imageBean);
+            }
+
+            for (int i = 0; i < TUIConstants.TUIContact.GROUP_FACE_COUNT; i++) {
+                ImageSelectActivity.ImageBean imageBean = new ImageSelectActivity.ImageBean();
+                imageBean.setThumbnailUri(String.format(TUIConstants.TUIContact.GROUP_FACE_URL, (i + 1) + ""));
+                faceList.add(imageBean);
+            }
+
+            Intent intent = new Intent(CreateGroupMinimalistActivity.this, ImageSelectActivity.class);
+            intent.putExtra(ImageSelectActivity.TITLE, getString(R.string.group_choose_avatar));
+            intent.putExtra(ImageSelectActivity.SPAN_COUNT, 4);
+            intent.putExtra(ImageSelectActivity.PLACEHOLDER, com.tencent.qcloud.tuicore.R.drawable.core_default_user_icon_light);
+            intent.putExtra(ImageSelectActivity.ITEM_WIDTH, ScreenUtil.dip2px(77));
+            intent.putExtra(ImageSelectActivity.ITEM_HEIGHT, ScreenUtil.dip2px(77));
+            intent.putExtra(ImageSelectActivity.DATA, faceList);
+            intent.putExtra(ImageSelectActivity.SELECTED, faceList.get(0));
+            startActivityForResult(intent, CHOOSE_AVATAR_REQUEST_CODE);
+        } else if (v == groupNameLv) {
+            PopupInputCard popupInputCard = new PopupInputCard(this);
+            popupInputCard.setContent(groupNameLv.getContent().toString());
+            popupInputCard.setTitle(getResources().getString(R.string.modify_group_name));
+            popupInputCard.setMaxLimit(30);
+            popupInputCard.setOnPositive(new PopupInputCard.OnClickListener() {
+                @Override
+                public void onClick(String result) {
+                    if (!TextUtils.isEmpty(result)) {
+                        groupName = result;
+                        groupNameLv.setContent(groupName);
+
+                    } else {
+                        ToastUtil.toastLongMessage(getResources().getString(R.string.group_name_edit_null_tips));
+                    }
+                }
+            });
+            popupInputCard.setTextExceedListener(new PopupInputCard.OnTextExceedListener() {
+                @Override
+                public void onTextExceedMax() {
+                    ToastUtil.toastLongMessage(getResources().getString(R.string.group_name_edit_exceed_tips));
+                }
+            });
+            popupInputCard.show(groupNameLv, Gravity.BOTTOM);
+        } else if (v == groupIdLv) {
+            PopupInputCard popupInputCard = new PopupInputCard(this);
+            popupInputCard.setContent(groupIdLv.getContent().toString());
+            popupInputCard.setTitle(getResources().getString(R.string.modify_group_id));
+            popupInputCard.setMaxLimit(48);
+            popupInputCard.setOnPositive(new PopupInputCard.OnClickListener() {
+                @Override
+                public void onClick(String result) {
+                    if (!TextUtils.isEmpty(result) && result.startsWith("@TGS#")) {
+                        ToastUtil.toastLongMessage(getResources().getString(R.string.group_id_edit_format_tips));
+                        groupIdLv.setContent("");
+                        groupId = "";
+                        return;
+                    }
+
+                    groupIdLv.setContent(result);
+                    groupId = result;
+                }
+            });
+            popupInputCard.setTextExceedListener(new PopupInputCard.OnTextExceedListener() {
+                @Override
+                public void onTextExceedMax(){
+                    ToastUtil.toastLongMessage(getResources().getString(R.string.group_id_edit_exceed_tips));
+                }
+            });
+            popupInputCard.show(groupIdLv, Gravity.BOTTOM);
+        } else if (v == groupTypeLv) {
+            Intent intent = new Intent(this, GroupTypeSelectMinimalistActivity.class);
+            startActivityForResult(intent, CHOOSE_GROUP_TYPE_REQUEST_CODE);
+        } else if (v == titleBarLayout.getLeftGroup()) {
+            finish();
+        }
+    }
+
+    private List<Object> fillGroupGridAvatar() {
+        final List<Object> urlList = new ArrayList<>();
+        String savedIcon = ImageUtil.getGroupConversationAvatar(groupAvatarImageId);
+        if (TextUtils.isEmpty(savedIcon)) {
+            int faceSize = Math.min(mGroupMembers.size(), 9);
+            for (int i = 0; i < faceSize; i++) {
+                String iconUrl = mGroupMembers.get(i).getIconUrl();
+                urlList.add(TextUtils.isEmpty(iconUrl) ? TUIConfig.getDefaultAvatarImage() : iconUrl);
+            }
+        } else {
+            urlList.add(savedIcon);
+        }
+
+        return urlList;
+    }
+
+    private void createGroupChat() {
+        if (mCreating) {
+            return;
+        }
+
+        final GroupInfo groupInfo = new GroupInfo();
+        groupInfo.setChatName(groupName);
+        groupInfo.setGroupName(groupName);
+        groupInfo.setMemberDetails(mGroupMembers);
+        groupInfo.setGroupType(groupType);
+        groupInfo.setJoinType(joinTypeIndex);
+        groupInfo.setCommunitySupportTopic(false);
+        groupInfo.setFaceUrl(groupAvatarUrl);
+        groupInfo.setId(groupId);
+
+        mCreating = true;
+
+        presenter.createGroupChat(groupInfo, new IUIKitCallback<String>() {
+            @Override
+            public void onSuccess(String data) {
+                ContactStartChatUtils.startChatActivity(data, ChatInfo.TYPE_GROUP, groupInfo.getGroupName(), groupInfo.getGroupType());
+                finish();
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                mCreating = false;
+                //mGroupMembers.remove(selfInfo);
+                if (errCode == TUIConstants.BuyingFeature.ERR_SDK_INTERFACE_NOT_SUPPORT || errCode == 11000) {
+                    showNotSupportDialog();
+                }
+                ToastUtil.toastLongMessage("createGroupChat fail:" + errCode + "=" + errMsg);
+            }
+        });
+    }
+
+    private void showNotSupportDialog() {
+        String string = getResources().getString(R.string.contact_im_flagship_edition_update_tip, getString(R.string.contact_community));
+        String buyingGuidelines = getResources().getString(R.string.contact_buying_guidelines);
+        int buyingGuidelinesIndex = string.lastIndexOf(buyingGuidelines);
+        final int foregroundColor = getResources().getColor(TUIThemeManager.getAttrResId(this, com.tencent.qcloud.tuicore.R.attr.core_primary_color));
+        SpannableString spannedString = new SpannableString(string);
+        ForegroundColorSpan colorSpan2 = new ForegroundColorSpan(foregroundColor);
+        spannedString.setSpan(colorSpan2, buyingGuidelinesIndex, buyingGuidelinesIndex + buyingGuidelines.length(), Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
+
+        ClickableSpan clickableSpan2 = new ClickableSpan() {
+            @Override
+            public void onClick(View view) {
+                if (TextUtils.equals(TUIThemeManager.getInstance().getCurrentLanguage(), "zh")) {
+                    openWebUrl(TUIConstants.BuyingFeature.BUYING_PRICE_DESC);
+                } else {
+                    openWebUrl(TUIConstants.BuyingFeature.BUYING_PRICE_DESC_EN);
+                }
+            }
+
+            @Override
+            public void updateDrawState(TextPaint ds) {
+                ds.setUnderlineText(false);
+            }
+        };
+        spannedString.setSpan(clickableSpan2, buyingGuidelinesIndex, buyingGuidelinesIndex + buyingGuidelines.length(), Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
+
+        TUIKitDialog.TUIIMUpdateDialog.getInstance()
+                .createDialog(this)
+                .setMovementMethod(LinkMovementMethod.getInstance())
+                .setShowOnlyDebug(true)
+                .setCancelable(true)
+                .setCancelOutside(true)
+                .setTitle(spannedString)
+                .setDialogWidth(0.75f)
+                .setDialogFeatureName(TUIConstants.BuyingFeature.BUYING_FEATURE_COMMUNITY)
+                .setPositiveButton(getString(R.string.contact_no_more_reminders), new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        TUIKitDialog.TUIIMUpdateDialog.getInstance().dismiss();
+                        TUIKitDialog.TUIIMUpdateDialog.getInstance().setNeverShow(true);
+                    }
+                })
+                .setNegativeButton(getString(R.string.contact_i_know), new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        TUIKitDialog.TUIIMUpdateDialog.getInstance().dismiss();
+                    }
+                })
+                .show();
+    }
+
+    private void openWebUrl(String url) {
+        Intent intent = new Intent();
+        intent.setAction(Intent.ACTION_VIEW);
+        Uri contentUrl = Uri.parse(url);
+        intent.setData(contentUrl);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        startActivity(intent);
+    }
+    
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == CHOOSE_AVATAR_REQUEST_CODE && resultCode == ImageSelectActivity.RESULT_CODE_SUCCESS) {
+            if (data != null) {
+                ImageSelectActivity.ImageBean imageBean = (ImageSelectActivity.ImageBean) data.getSerializableExtra(ImageSelectActivity.DATA);
+                if (imageBean == null) {
+                    return;
+                }
+
+                List<Object> faceUrl = imageBean.getGroupGridAvatar();
+                if (faceUrl != null && !faceUrl.isEmpty()) {
+                    groupAvatar.setImageId(groupAvatarImageId);
+                    groupAvatar.displayImage(faceUrl).load(groupAvatarImageId);
+                    groupAvatarUrlList = faceUrl;
+                    groupAvatarUrl = null;
+                } else {
+                    groupAvatarUrl = imageBean.getThumbnailUri();
+                    GlideEngine.loadImage(groupAvatar, groupAvatarUrl);
+                }
+            }
+        } else if (requestCode == CHOOSE_GROUP_TYPE_REQUEST_CODE) {
+            if (data != null) {
+                String type = data.getStringExtra(TUIContactConstants.Selection.TYPE);
+                if (TextUtils.isEmpty(type)) {
+                    TUIContactLog.e(TAG, "onActivityResult type is null");
+                    return;
+                }
+
+                groupType = type;
+                groupTypeLv.setContent(type);
+                initGroupTypeContentView();
+                if (TextUtils.equals(groupType, V2TIMManager.GROUP_TYPE_COMMUNITY)) {
+                    groupIdLv.setOnClickListener(null);
+                    groupIdLv.setClickable(false);
+                } else {
+                    groupIdLv.setClickable(true);
+                    groupIdLv.setOnClickListener(this);
+                }
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/ForwardSelectGroupMinimalistActivity.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/ForwardSelectGroupMinimalistActivity.java
new file mode 100644
index 0000000..90bb776
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/ForwardSelectGroupMinimalistActivity.java
@@ -0,0 +1,279 @@
+package com.tencent.qcloud.tuikit.tuicontact.minimalistui.pages;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.component.CustomLinearLayoutManager;
+import com.tencent.qcloud.tuicore.component.LineControllerView;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.activities.SelectionActivity;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactConstants;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ConversationInfo;
+import com.tencent.qcloud.tuikit.tuicontact.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuicontact.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget.ContactListView;
+import com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget.ForwardContactSelectorAdapter;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.ContactPresenter;
+import com.tencent.qcloud.tuikit.tuicontact.util.ContactUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+public class ForwardSelectGroupMinimalistActivity extends BaseLightActivity {
+
+    private static final String TAG = ForwardSelectGroupMinimalistActivity.class.getSimpleName();
+
+    private TitleBarLayout mTitleBar;
+    private ContactListView mContactListView;
+    private LineControllerView mJoinType;
+    private ArrayList<GroupMemberInfo> mMembers = new ArrayList<>();
+    private int mGroupType = -1;
+    private int mJoinTypeIndex = 2;
+    private ArrayList<String> mJoinTypes = new ArrayList<>();
+    private ArrayList<String> mGroupTypeValue = new ArrayList<>();
+    private boolean mCreating;
+    private boolean isCreateNewChat = true;
+
+    private RecyclerView mForwardSelectlistView;
+    private ForwardContactSelectorAdapter mAdapter;
+    private List<String> mSelectConversationIcons = new ArrayList<>();
+    private RelativeLayout mForwardSelectlistViewLayout;
+    private TextView mSureView;
+
+    private List<ConversationInfo> mContactDataSource = new ArrayList<>();
+
+    private ContactPresenter presenter;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.minimalist_forward_select_group_contact);
+
+        init();
+    }
+
+    private String getMembersUserId(){
+        if (mMembers.size() == 0) {
+            return "";
+        }
+
+        String userIdString = "";
+        for(int i = 0; i < mMembers.size(); i++){
+            userIdString += mMembers.get(i).getAccount();
+            userIdString += " ";
+        }
+        return userIdString;
+    }
+
+    private void refreshMembers(){
+        if (mContactDataSource == null || mContactDataSource.size() ==0){
+            mMembers.clear();
+            return;
+        }
+
+        for (int i=0;i<mContactDataSource.size();i++){
+            GroupMemberInfo memberInfo = new GroupMemberInfo();
+            memberInfo.setAccount(mContactDataSource.get(i).getId());
+            memberInfo.setIconUrl((String)mContactDataSource.get(i).getIconUrlList().get(0));
+            mMembers.add(memberInfo);
+        }
+    }
+
+    private void init() {
+        Intent intent = getIntent();
+        if (intent != null){
+            isCreateNewChat = intent.getBooleanExtra(TUIContactConstants.FORWARD_CREATE_NEW_CHAT, false);
+        }
+
+        mTitleBar = findViewById(R.id.group_create_title_bar);
+        mTitleBar.getRightGroup().setVisibility(View.GONE);
+        mTitleBar.setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
+        mJoinType = findViewById(R.id.group_type_join);
+        mJoinType.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showJoinTypePickerView();
+            }
+        });
+        mJoinType.setCanNav(true);
+        mJoinType.setContent("Public");
+        mJoinType.setVisibility(View.GONE);
+
+        mContactListView = findViewById(R.id.group_create_member_list);
+
+        presenter = new ContactPresenter();
+        mContactListView.setPresenter(presenter);
+        presenter.setFriendListListener();
+        presenter.setContactListView(mContactListView);
+
+        mContactListView.loadDataSource(ContactListView.DataSource.FRIEND_LIST);
+        mContactListView.setOnSelectChangeListener(new ContactListView.OnSelectChangedListener() {
+            @Override
+            public void onSelectChanged(ContactItemBean contact, boolean selected) {
+                if (selected) {
+                    GroupMemberInfo memberInfo = new GroupMemberInfo();
+                    memberInfo.setAccount(contact.getId());
+                    memberInfo.setIconUrl(contact.getAvatarUrl());
+                    mMembers.add(memberInfo);
+                } else {
+                    for (int i = mMembers.size() - 1; i >= 0; i--) {
+                        if (mMembers.get(i).getAccount().equals(contact.getId())) {
+                            mMembers.remove(i);
+                        }
+                    }
+                }
+                refreshSelectConversations();
+            }
+        });
+
+        setGroupType(TUIContactConstants.GroupType.PUBLIC);
+
+        mForwardSelectlistViewLayout = findViewById(R.id.forward_contact_select_list_layout);
+        mForwardSelectlistViewLayout.setVisibility(View.VISIBLE);
+        mForwardSelectlistView = findViewById(R.id.forward_contact_select_list);
+        mForwardSelectlistView.setLayoutManager(new CustomLinearLayoutManager(this, CustomLinearLayoutManager.HORIZONTAL, false));
+        mAdapter = new ForwardContactSelectorAdapter(this);
+        mForwardSelectlistView.setAdapter(mAdapter);
+
+        mSureView = findViewById(R.id.btn_msg_ok);
+        mSureView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (isCreateNewChat){
+                    createGroupChat();
+                } else {
+                    Intent intent = new Intent();
+                    HashMap<String, String> conversationMap = new HashMap<>();
+                    if (mMembers != null && mMembers.size() != 0){
+                        for (int i=0;i<mMembers.size();i++){
+                            conversationMap.put(mMembers.get(i).getAccount(), mMembers.get(i).getIconUrl());
+                        }
+                    }
+
+                    intent.putExtra(TUIContactConstants.FORWARD_SELECT_CONVERSATION_KEY, conversationMap);
+                    setResult(TUIContactConstants.FORWARD_SELECT_MEMBERS_CODE, intent);
+
+                    finish();
+                }
+            }
+        });
+
+        refreshSelectConversations();
+    }
+
+    private void refreshSelectConversations(){
+        mSelectConversationIcons.clear();
+        if (mMembers != null && mMembers.size() != 0){
+            for (int i=0;i<mMembers.size();i++){
+                mSelectConversationIcons.add(mMembers.get(i).getIconUrl());
+            }
+        }
+        mAdapter.setDataSource(mSelectConversationIcons);
+
+        if (mSelectConversationIcons == null || mSelectConversationIcons.size() == 0){
+            mSureView.setText(getString(com.tencent.qcloud.tuicore.R.string.sure));
+            mSureView.setVisibility(View.GONE);
+            mForwardSelectlistViewLayout.setVisibility(View.GONE);
+        } else {
+            mForwardSelectlistViewLayout.setVisibility(View.VISIBLE);
+            mSureView.setVisibility(View.VISIBLE);
+            mSureView.setText(getString(com.tencent.qcloud.tuicore.R.string.sure) + "(" + mSelectConversationIcons.size() + ")");
+        }
+    }
+
+    public void setGroupType(int type) {
+        mGroupType = type;
+        mTitleBar.setTitle(getResources().getString(R.string.contact_title), ITitleBarLayout.Position.MIDDLE);
+        mJoinType.setVisibility(View.GONE);
+    }
+
+    private void showJoinTypePickerView() {
+        Bundle bundle = new Bundle();
+        bundle.putString(SelectionActivity.Selection.TITLE, getResources().getString(R.string.group_join_type));
+        bundle.putStringArrayList(SelectionActivity.Selection.LIST, mJoinTypes);
+        bundle.putInt(SelectionActivity.Selection.DEFAULT_SELECT_ITEM_INDEX, mJoinTypeIndex);
+        SelectionActivity.startListSelection(this, bundle, new SelectionActivity.OnResultReturnListener() {
+            @Override
+            public void onReturn(Object text) {
+                mJoinType.setContent(mJoinTypes.get((Integer) text));
+                mJoinTypeIndex = (Integer) text;
+            }
+        });
+    }
+
+    private void createGroupChat() {
+        if (mCreating || mMembers.isEmpty()) {
+            return;
+        }
+       
+        if (mMembers.size() == 1){
+            Intent intent = new Intent();
+            HashMap<String, Boolean> conversationMap = new HashMap<>();
+            conversationMap.put(mMembers.get(0).getAccount(), false);
+            intent.putExtra(TUIContactConstants.FORWARD_SELECT_CONVERSATION_KEY, conversationMap);
+            setResult(TUIContactConstants.FORWARD_CREATE_GROUP_CODE, intent);
+
+            finish();
+            return;
+        }
+        GroupMemberInfo memberInfo = new GroupMemberInfo();
+        memberInfo.setAccount(ContactUtils.getLoginUser());
+        mMembers.add(memberInfo);
+
+        final GroupInfo groupInfo = new GroupInfo();
+        String groupName = ContactUtils.getLoginUser();
+        for (int i = 1; i < mMembers.size(); i++) {
+            groupName = groupName + "、" + mMembers.get(i).getAccount();
+        }
+        if (groupName.length() > 20) {
+            groupName = groupName.substring(0, 17) + "...";
+        }
+        groupInfo.setChatName(groupName);
+        groupInfo.setGroupName(groupName);
+        groupInfo.setMemberDetails(mMembers);
+        groupInfo.setGroupType(TUIContactConstants.GroupType.TYPE_PUBLIC);
+        groupInfo.setJoinType(0);
+
+        mCreating = true;
+        
+        presenter.createGroupChat(groupInfo, new IUIKitCallback<String>() {
+            @Override
+            public void onSuccess(String data) {
+                Intent intent = new Intent();
+                HashMap<String, Boolean> conversationMap = new HashMap<>();
+                conversationMap.put(data, true);
+
+                intent.putExtra(TUIContactConstants.FORWARD_SELECT_CONVERSATION_KEY, conversationMap);
+                setResult(TUIContactConstants.FORWARD_CREATE_GROUP_CODE, intent);
+
+                finish();
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                mCreating = false;
+                ToastUtil.toastLongMessage("createGroupChat fail:" + errCode + "=" + errMsg);
+            }
+        });
+
+    }
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/FriendProfileMinimalistActivity.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/FriendProfileMinimalistActivity.java
new file mode 100644
index 0000000..6845c86
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/FriendProfileMinimalistActivity.java
@@ -0,0 +1,135 @@
+package com.tencent.qcloud.tuikit.tuicontact.minimalistui.pages;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.imsdk.v2.V2TIMGroupApplication;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.activities.ImageSelectActivity;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactConstants;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactGroupApplyInfo;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.minimalistui.util.ContactStartChatUtils;
+import com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget.FriendProfileLayout;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.FriendProfilePresenter;
+import com.tencent.qcloud.tuikit.tuicontact.util.TUIContactLog;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+public class FriendProfileMinimalistActivity extends BaseLightActivity {
+
+    private FriendProfilePresenter presenter;
+    private FriendProfileLayout layout;
+    private String mChatId;
+    private String mChatBackgroundThumbnailUrl;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.minimalist_contact_friend_profile_activity);
+        layout = findViewById(R.id.friend_profile);
+
+        presenter = new FriendProfilePresenter();
+        layout.setPresenter(presenter);
+        presenter.setFriendProfileLayout(layout);
+        Intent intent = getIntent();
+        mChatId = intent.getStringExtra(TUIConstants.TUIChat.CHAT_ID);
+        mChatBackgroundThumbnailUrl = intent.getStringExtra(TUIConstants.TUIChat.CHAT_BACKGROUND_URI);
+        String fromUser = intent.getStringExtra("fromUser");
+        String fromUserNickName = intent.getStringExtra("fromUserNickName");
+        String requestMsg = intent.getStringExtra("requestMsg");
+        V2TIMGroupApplication application = (V2TIMGroupApplication) intent.getSerializableExtra("groupApplication");
+
+        if (!TextUtils.isEmpty(mChatId)) {
+            layout.initData(mChatId);
+        } else if (!TextUtils.isEmpty(fromUser)) {
+            ContactGroupApplyInfo contactGroupApplyInfo = new ContactGroupApplyInfo();
+            contactGroupApplyInfo.setFromUser(fromUser);
+            contactGroupApplyInfo.setFromUserNickName(fromUserNickName);
+            contactGroupApplyInfo.setRequestMsg(requestMsg);
+            contactGroupApplyInfo.setTimGroupApplication(application);
+            layout.initData(contactGroupApplyInfo);
+        } else {
+            layout.initData(intent.getSerializableExtra(TUIContactConstants.ProfileType.CONTENT));
+        }
+        layout.setOnButtonClickListener(new FriendProfileLayout.OnButtonClickListener() {
+            @Override
+            public void onStartConversationClick(ContactItemBean info) {
+                String chatName = info.getId();
+                if (!TextUtils.isEmpty(info.getRemark())) {
+                    chatName = info.getRemark();
+                } else if (!TextUtils.isEmpty(info.getNickName())) {
+                    chatName = info.getNickName();
+                }
+                ContactStartChatUtils.startChatActivity(info.getId(), ContactItemBean.TYPE_C2C, chatName, "");
+            }
+
+            @Override
+            public void onDeleteFriendClick(String id) {
+                finish();
+            }
+
+            @Override
+            public void onSetChatBackground() {
+                ArrayList<ImageSelectActivity.ImageBean> faceList = new ArrayList<>();
+                ImageSelectActivity.ImageBean defaultFace = new ImageSelectActivity.ImageBean();
+                defaultFace.setDefault(true);
+                faceList.add(defaultFace);
+                for (int i = 0; i < TUIConstants.TUIChat.CHAT_CONVERSATION_BACKGROUND_COUNT; i++) {
+                    ImageSelectActivity.ImageBean imageBean = new ImageSelectActivity.ImageBean();
+                    imageBean.setImageUri(String.format(TUIConstants.TUIChat.CHAT_CONVERSATION_BACKGROUND_URL, (i + 1) + ""));
+                    imageBean.setThumbnailUri(String.format(TUIConstants.TUIChat.CHAT_CONVERSATION_BACKGROUND_THUMBNAIL_URL, (i + 1) + ""));
+                    faceList.add(imageBean);
+                }
+
+                Intent intent = new Intent(FriendProfileMinimalistActivity.this, ImageSelectActivity.class);
+                intent.putExtra(ImageSelectActivity.TITLE, getResources().getString(R.string.chat_background_title));
+                intent.putExtra(ImageSelectActivity.SPAN_COUNT, 2);
+                intent.putExtra(ImageSelectActivity.ITEM_WIDTH, ScreenUtil.dip2px(186));
+                intent.putExtra(ImageSelectActivity.ITEM_HEIGHT, ScreenUtil.dip2px(124));
+                intent.putExtra(ImageSelectActivity.DATA, faceList);
+                if (TextUtils.isEmpty(mChatBackgroundThumbnailUrl) || TextUtils.equals(TUIConstants.TUIChat.CHAT_CONVERSATION_BACKGROUND_DEFAULT_URL, mChatBackgroundThumbnailUrl)) {
+                    intent.putExtra(ImageSelectActivity.SELECTED, defaultFace);
+                } else {
+                    intent.putExtra(ImageSelectActivity.SELECTED, new ImageSelectActivity.ImageBean(mChatBackgroundThumbnailUrl, "", false));
+                }
+                intent.putExtra(ImageSelectActivity.NEED_DOWLOAD_LOCAL, true);
+                startActivityForResult(intent, TUIConstants.TUIChat.CHAT_REQUEST_BACKGROUND_CODE);
+            }
+        });
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == TUIConstants.TUIChat.CHAT_REQUEST_BACKGROUND_CODE) {
+            if (data == null) {
+                return;
+            }
+            ImageSelectActivity.ImageBean imageBean = (ImageSelectActivity.ImageBean) data.getSerializableExtra(ImageSelectActivity.DATA);
+            if (imageBean == null) {
+                TUIContactLog.e("FriendProfileMinimalistActivity", "onActivityResult imageBean is null");
+                return;
+            }
+
+            String backgroundUri = imageBean.getLocalPath();
+            String thumbnailUri = imageBean.getThumbnailUri();
+            String dataUri = thumbnailUri + "," + backgroundUri;
+            TUIContactLog.d("FriendProfileMinimalistActivity", "onActivityResult backgroundUri = " + backgroundUri);
+            mChatBackgroundThumbnailUrl = thumbnailUri;
+            HashMap<String, Object> param = new HashMap<>();
+            param.put(TUIConstants.TUIChat.CHAT_ID, mChatId);
+            param.put(TUIConstants.TUIChat.CHAT_BACKGROUND_URI, dataUri);
+            TUICore.callService(TUIConstants.TUIChat.SERVICE_NAME, TUIConstants.TUIChat.METHOD_UPDATE_DATA_STORE_CHAT_URI, param);
+        }
+    }
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/GroupListMinimalistActivity.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/GroupListMinimalistActivity.java
new file mode 100644
index 0000000..42f0c43
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/GroupListMinimalistActivity.java
@@ -0,0 +1,91 @@
+package com.tencent.qcloud.tuikit.tuicontact.minimalistui.pages;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.minimalistui.util.ContactStartChatUtils;
+import com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget.ContactListView;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.ContactPresenter;
+
+public class GroupListMinimalistActivity extends BaseLightActivity {
+
+    private static final String TAG = GroupListMinimalistActivity.class.getSimpleName();
+
+    private TitleBarLayout mTitleBar;
+    private ContactListView mListView;
+
+    private ContactPresenter presenter;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.minimalist_group_list_activity);
+
+        init();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        loadDataSource();
+    }
+
+    private void init() {
+        mTitleBar = findViewById(R.id.group_list_titlebar);
+        mTitleBar.setTitle(getResources().getString(R.string.group), ITitleBarLayout.Position.LEFT);
+        mTitleBar.setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        mTitleBar.setTitle(getResources().getString(R.string.add_group), ITitleBarLayout.Position.RIGHT);
+        mTitleBar.getRightIcon().setVisibility(View.GONE);
+        mTitleBar.setOnRightClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(GroupListMinimalistActivity.this, AddMoreMinimalistActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                intent.putExtra("isGroup", true);
+                startActivity(intent);
+            }
+        });
+
+        mListView = findViewById(R.id.group_list);
+        mListView.setOnItemClickListener(new ContactListView.OnItemClickListener() {
+            @Override
+            public void onItemClick(int position, ContactItemBean contact) {
+                String chatName = contact.getId();
+                if (!TextUtils.isEmpty(contact.getRemark())) {
+                    chatName = contact.getRemark();
+                } else if (!TextUtils.isEmpty(contact.getNickName())) {
+                    chatName = contact.getNickName();
+                }
+                ContactStartChatUtils.startChatActivity(contact.getId(), ContactItemBean.TYPE_GROUP, chatName, contact.getGroupType());
+            }
+        });
+    }
+
+    public void loadDataSource() {
+        presenter = new ContactPresenter();
+        presenter.setFriendListListener();
+        mListView.setIsGroupList(true);
+        mListView.setPresenter(presenter);
+        mListView.setNotFoundTip(getString(R.string.contact_no_group));
+        presenter.setContactListView(mListView);
+        mListView.loadDataSource(ContactListView.DataSource.GROUP_LIST);
+    }
+
+    @Override
+    public void finish() {
+        super.finish();
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/GroupTypeSelectMinimalistActivity.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/GroupTypeSelectMinimalistActivity.java
new file mode 100644
index 0000000..8170550
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/GroupTypeSelectMinimalistActivity.java
@@ -0,0 +1,167 @@
+package com.tencent.qcloud.tuikit.tuicontact.minimalistui.pages;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.util.TUIUtil;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactConstants;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class GroupTypeSelectMinimalistActivity extends BaseLightActivity implements View.OnClickListener {
+    private static final String TAG = GroupTypeSelectMinimalistActivity.class.getSimpleName();
+
+    private RecyclerView mRecyclerView;
+    private RecyclerView.LayoutManager mLayoutManager;
+    private RecyclerView.Adapter mAdapter;
+    private List<String> mDatas = new ArrayList<>();
+    private TitleBarLayout titleBarLayout;
+    private TextView groupTypeTextView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.group_type_select_layout);
+
+        initData();
+        initView();
+    }
+
+    private void initView() {
+        mLayoutManager = new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false);
+        mAdapter = new MyAdapter(mDatas);
+        mRecyclerView = (RecyclerView) findViewById(R.id.recycler);
+        mRecyclerView.setLayoutManager(mLayoutManager);
+        mRecyclerView.setAdapter(mAdapter);
+        titleBarLayout = findViewById(R.id.create_group_bar);
+        titleBarLayout.getRightIcon().setVisibility(View.GONE);
+        titleBarLayout.setTitle(getString(R.string.group_type_select_text), ITitleBarLayout.Position.MIDDLE);
+        titleBarLayout.setOnLeftClickListener(this);
+        groupTypeTextView = findViewById(R.id.group_type_text);
+        groupTypeTextView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                String url = "";
+                if (TextUtils.equals(TUIThemeManager.getInstance().getCurrentLanguage(), "zh")) {
+                    url = TUIContactConstants.IM_PRODUCT_DOC_URL;
+                } else {
+                    url = TUIContactConstants.IM_PRODUCT_DOC_URL_EN;
+                }
+                Intent intent = new Intent();
+                intent.setAction(Intent.ACTION_VIEW);
+                Uri contentUrl = Uri.parse(url);
+                intent.setData(contentUrl);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                startActivity(intent);
+            }
+        });
+    }
+
+    private void initData() {
+        String[] array = getResources().getStringArray(R.array.group_type);
+        mDatas.addAll(Arrays.asList(array));
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (view == titleBarLayout.getLeftGroup()) {
+            finish();
+        }
+    }
+
+
+    public class MyAdapter extends RecyclerView.Adapter<MyAdapter.ViewHolder>{
+        private List<String> mDatas;
+
+        public MyAdapter(List<String> datas) {
+            this.mDatas = datas;
+        }
+
+        @Override
+        public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.group_type_item, parent, false);
+            ViewHolder viewHolder = new ViewHolder(v);
+            return viewHolder;
+        }
+
+        @Override
+        public void onBindViewHolder(ViewHolder holder, int position) {
+            String type = this.mDatas.get(position);
+            holder.imageView.setImageResource(TUIUtil.getDefaultGroupIconResIDByGroupType(getApplicationContext(), type));
+            switch(type) {
+                case V2TIMManager.GROUP_TYPE_WORK:
+                    holder.textView.setText(getString(R.string.group_work_type));
+                    holder.subTextView.setText(getString(R.string.group_work_content));
+                    break;
+                case V2TIMManager.GROUP_TYPE_PUBLIC:
+                    holder.textView.setText(getString(R.string.group_public_type));
+                    holder.subTextView.setText(getString(R.string.group_public_des));
+                    break;
+                case V2TIMManager.GROUP_TYPE_MEETING:
+                    holder.textView.setText(getString(R.string.group_meeting_type));
+                    holder.subTextView.setText(getString(R.string.group_meeting_des));
+                    break;
+                case V2TIMManager.GROUP_TYPE_COMMUNITY:
+                    holder.textView.setText(getString(R.string.group_commnity_type));
+                    holder.subTextView.setText(getString(R.string.group_commnity_des));
+                    break;
+                default:
+                    holder.textView.setText(getString(R.string.group_work_type));
+                    holder.subTextView.setText(getString(R.string.group_work_content));
+                    break;
+            }
+
+            holder.rootView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    Intent intent = new Intent();
+                    intent.putExtra(TUIContactConstants.Selection.TYPE, type);
+                    setResult(0, intent);
+                    finish();
+                }
+            });
+        }
+
+        @Override
+        public int getItemCount() {
+            return this.mDatas == null ? 0 : this.mDatas.size();
+        }
+
+        public class ViewHolder extends RecyclerView.ViewHolder {
+            View rootView;
+            RelativeLayout itemLayout;
+            ImageView imageView;
+            TextView textView, subTextView;
+
+            public ViewHolder(View itemView) {
+                super(itemView);
+                rootView = itemView;
+                itemLayout = (RelativeLayout) itemView.findViewById(R.id.item_layout);
+                imageView = (ImageView) itemView.findViewById(R.id.group_type_icon);
+                textView = (TextView) itemView.findViewById(R.id.group_type_text);
+                subTextView = (TextView) itemView.findViewById(R.id.group_type_content);
+            }
+        }
+    }
+
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/NewFriendMinimalistActivity.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/NewFriendMinimalistActivity.java
new file mode 100644
index 0000000..8fea5c3
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/NewFriendMinimalistActivity.java
@@ -0,0 +1,97 @@
+package com.tencent.qcloud.tuikit.tuicontact.minimalistui.pages;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.bean.FriendApplicationBean;
+import com.tencent.qcloud.tuikit.tuicontact.interfaces.INewFriendActivity;
+import com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget.NewFriendListAdapter;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.NewFriendPresenter;
+import com.tencent.qcloud.tuikit.tuicontact.util.TUIContactLog;
+
+import java.util.List;
+
+public class NewFriendMinimalistActivity extends BaseLightActivity implements INewFriendActivity {
+
+    private static final String TAG = NewFriendMinimalistActivity.class.getSimpleName();
+
+    private TitleBarLayout mTitleBar;
+    private ListView mNewFriendLv;
+    private NewFriendListAdapter mAdapter;
+    private TextView notFoundTip;
+
+    private NewFriendPresenter presenter;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.contact_new_friend_activity);
+        init();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        initPendency();
+    }
+
+    private void init() {
+        mTitleBar = findViewById(R.id.new_friend_titlebar);
+        mTitleBar.setTitle(getResources().getString(R.string.new_friend), ITitleBarLayout.Position.MIDDLE);
+        mTitleBar.setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        mTitleBar.getRightIcon().setVisibility(View.GONE);
+        presenter = new NewFriendPresenter();
+        presenter.setFriendActivity(this);
+        presenter.setFriendApplicationListAllRead(new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+
+            }
+        });
+        mNewFriendLv = findViewById(R.id.new_friend_list);
+        notFoundTip = findViewById(R.id.not_found_tip);
+    }
+
+    private void initPendency() {
+        presenter.loadFriendApplicationList();
+    }
+
+    @Override
+    public void onDataSourceChanged(List<FriendApplicationBean> dataSource) {
+        TUIContactLog.i(TAG, "getFriendApplicationList success");
+        if (dataSource == null || dataSource.isEmpty()) {
+            notFoundTip.setVisibility(View.VISIBLE);
+        } else {
+            notFoundTip.setVisibility(View.GONE);
+        }
+        mNewFriendLv.setVisibility(View.VISIBLE);
+        mAdapter = new NewFriendListAdapter(NewFriendMinimalistActivity.this, R.layout.contact_new_friend_item, dataSource);
+        mAdapter.setPresenter(presenter);
+        mNewFriendLv.setAdapter(mAdapter);
+        mAdapter.notifyDataSetChanged();
+    }
+
+    @Override
+    public void finish() {
+        super.finish();
+    }
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/StartC2CChatMinimalistActivity.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/StartC2CChatMinimalistActivity.java
new file mode 100644
index 0000000..a1b47da
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/StartC2CChatMinimalistActivity.java
@@ -0,0 +1,98 @@
+package com.tencent.qcloud.tuikit.tuicontact.minimalistui.pages;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.minimalistui.util.ContactStartChatUtils;
+import com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget.ContactListView;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.ContactPresenter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class StartC2CChatMinimalistActivity extends BaseLightActivity {
+
+    private static final String TAG = StartC2CChatMinimalistActivity.class.getSimpleName();
+
+    private TitleBarLayout mTitleBar;
+    private ContactListView mContactListView;
+    private ContactItemBean mSelectedItem;
+    private List<ContactItemBean> mContacts = new ArrayList<>();
+
+    private ContactPresenter presenter;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.minimalist_popup_start_c2c_chat_activity);
+
+        mTitleBar = findViewById(R.id.start_c2c_chat_title);
+        mTitleBar.setTitle(getResources().getString(com.tencent.qcloud.tuicore.R.string.sure), ITitleBarLayout.Position.RIGHT);
+        mTitleBar.getRightIcon().setVisibility(View.GONE);
+        mTitleBar.setOnRightClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startConversation();
+            }
+        });
+        mTitleBar.setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
+        mContactListView = findViewById(R.id.contact_list_view);
+        mContactListView.setSingleSelectMode(true);
+
+        presenter = new ContactPresenter();
+        presenter.setFriendListListener();
+        mContactListView.setPresenter(presenter);
+        presenter.setContactListView(mContactListView);
+
+        mContactListView.loadDataSource(ContactListView.DataSource.FRIEND_LIST);
+        mContactListView.setOnSelectChangeListener(new ContactListView.OnSelectChangedListener() {
+            @Override
+            public void onSelectChanged(ContactItemBean contact, boolean selected) {
+                if (selected) {
+                    if (mSelectedItem == contact) {
+                        
+                    } else {
+                        if (mSelectedItem != null) {
+                            mSelectedItem.setSelected(false);
+                        }
+                        mSelectedItem = contact;
+                    }
+                } else {
+                    if (mSelectedItem == contact) {
+                        mSelectedItem.setSelected(false);
+                    }
+                }
+            }
+        });
+    }
+
+    public void startConversation() {
+        if (mSelectedItem == null || !mSelectedItem.isSelected()) {
+            ToastUtil.toastLongMessage(getString(R.string.select_chat));
+            return;
+        }
+        String chatName = mSelectedItem.getId();
+        if (!TextUtils.isEmpty(mSelectedItem.getRemark())) {
+            chatName = mSelectedItem.getRemark();
+        } else if (!TextUtils.isEmpty(mSelectedItem.getNickName())) {
+            chatName = mSelectedItem.getNickName();
+        }
+
+        ContactStartChatUtils.startChatActivity(mSelectedItem.getId(), ContactItemBean.TYPE_C2C, chatName, "");
+        finish();
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/StartGroupChatMinimalistActivity.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/StartGroupChatMinimalistActivity.java
new file mode 100644
index 0000000..6509f8c
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/StartGroupChatMinimalistActivity.java
@@ -0,0 +1,334 @@
+package com.tencent.qcloud.tuikit.tuicontact.minimalistui.pages;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.TextPaint;
+import android.text.TextUtils;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
+import android.text.style.ForegroundColorSpan;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuicore.component.LineControllerView;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.activities.SelectionActivity;
+import com.tencent.qcloud.tuicore.component.dialog.TUIKitDialog;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactConstants;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuicontact.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuicontact.minimalistui.util.ContactStartChatUtils;
+import com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget.ContactListView;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.ContactPresenter;
+import com.tencent.qcloud.tuikit.tuicontact.util.ContactUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class StartGroupChatMinimalistActivity extends BaseLightActivity {
+
+    private static final String TAG = StartGroupChatMinimalistActivity.class.getSimpleName();
+
+    private TitleBarLayout mTitleBar;
+    private ContactListView mContactListView;
+    private LineControllerView mJoinType;
+    private ArrayList<GroupMemberInfo> mMembers = new ArrayList<>();
+    private int mGroupType = -1;
+    private boolean communitySupportTopic = false;
+    private int mJoinTypeIndex = 2;
+    private ArrayList<String> mJoinTypes = new ArrayList<>();
+    private ArrayList<String> mGroupTypeValue = new ArrayList<>();
+    private boolean mCreating;
+    private RecyclerView selectedList;
+    private StartGroupMemberSelectMinimalistActivity.SelectedAdapter selectedListAdapter;
+    private TextView confirmButton;
+    private ContactPresenter presenter;
+    private GroupMemberInfo selfInfo;
+    private int limit;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.minimalist_popup_start_group_chat_activity);
+        selfInfo = new GroupMemberInfo();
+        selfInfo.setAccount(ContactUtils.getLoginUser());
+        selfInfo.setNickName(TUIConfig.getSelfNickName());
+        init();
+    }
+
+    private void init() {
+        limit = getIntent().getIntExtra(TUIContactConstants.Selection.LIMIT, Integer.MAX_VALUE);
+        String[] array = getResources().getStringArray(R.array.group_type);
+        mGroupTypeValue.addAll(Arrays.asList(array));
+        array = getResources().getStringArray(R.array.group_join_type);
+        mJoinTypes.addAll(Arrays.asList(array));
+
+        mTitleBar = findViewById(R.id.group_create_title_bar);
+        mTitleBar.setTitle(getResources().getString(com.tencent.qcloud.tuicore.R.string.sure), ITitleBarLayout.Position.RIGHT);
+        mTitleBar.getRightIcon().setVisibility(View.GONE);
+        mTitleBar.setOnRightClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                toCreateGroupChat();
+            }
+        });
+        mTitleBar.setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
+        mJoinType = findViewById(R.id.group_type_join);
+        mJoinType.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showJoinTypePickerView();
+            }
+        });
+        mJoinType.setCanNav(true);
+        mJoinType.setContent(mJoinTypes.get(2));
+
+        mContactListView = findViewById(R.id.group_create_member_list);
+        confirmButton = findViewById(R.id.confirm_button);
+        selectedList = findViewById(R.id.selected_list);
+        selectedListAdapter = new StartGroupMemberSelectMinimalistActivity.SelectedAdapter();
+        selectedList.setLayoutManager(new LinearLayoutManager(this, RecyclerView.HORIZONTAL, false));
+        selectedList.setAdapter(selectedListAdapter);
+        presenter = new ContactPresenter();
+        presenter.setFriendListListener();
+        mContactListView.setPresenter(presenter);
+        presenter.setContactListView(mContactListView);
+
+        ArrayList<String> alreadySelectedList = new ArrayList<>();
+        alreadySelectedList.add(TUILogin.getLoginUser());
+        mContactListView.setAlreadySelectedList(alreadySelectedList);
+        mContactListView.loadDataSource(ContactListView.DataSource.FRIEND_LIST);
+        mContactListView.setOnSelectChangeListener(new ContactListView.OnSelectChangedListener() {
+            @Override
+            public void onSelectChanged(ContactItemBean contact, boolean selected) {
+                if (selected) {
+                    GroupMemberInfo memberInfo = new GroupMemberInfo();
+                    memberInfo.setAccount(contact.getId());
+                    memberInfo.setNickName(contact.getNickName());
+                    memberInfo.setIconUrl(contact.getAvatarUrl());
+                    mMembers.add(memberInfo);
+                } else {
+                    for (int i = mMembers.size() - 1; i >= 0; i--) {
+                        if (mMembers.get(i).getAccount().equals(contact.getId())) {
+                            mMembers.remove(i);
+                        }
+                    }
+                }
+                selectedListAdapter.setMembers(mMembers);
+                selectedListAdapter.notifyDataSetChanged();
+                if (mMembers.size() > 0) {
+                    confirmButton.setAlpha(1f);
+                    confirmButton.setEnabled(true);
+                } else {
+                    confirmButton.setAlpha(0.5f);
+                    confirmButton.setEnabled(false);
+                }
+            }
+        });
+        confirmButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                toCreateGroupChat();
+            }
+        });
+        confirmButton.setAlpha(0.5f);
+        confirmButton.setEnabled(false);
+        Intent intent = getIntent();
+        communitySupportTopic = intent.getBooleanExtra(TUIConstants.TUIContact.COMMUNITY_SUPPORT_TOPIC_KEY, false);
+        setGroupType(intent.getIntExtra(TUIConstants.TUIContact.GROUP_TYPE_KEY, TUIContactConstants.GroupType.PRIVATE));
+    }
+
+    public void setGroupType(int type) {
+        mGroupType = type;
+        switch (type) {
+            case TUIContactConstants.GroupType.PUBLIC:
+                mTitleBar.setTitle(getResources().getString(R.string.create_group_chat), ITitleBarLayout.Position.MIDDLE);
+                break;
+            case TUIContactConstants.GroupType.CHAT_ROOM:
+                mTitleBar.setTitle(getResources().getString(R.string.create_chat_room), ITitleBarLayout.Position.MIDDLE);
+                break;
+            case TUIContactConstants.GroupType.COMMUNITY:
+                mTitleBar.setTitle(getResources().getString(R.string.create_community), ITitleBarLayout.Position.MIDDLE);
+                break;
+            case TUIContactConstants.GroupType.PRIVATE:
+            default:
+                mTitleBar.setTitle(getResources().getString(R.string.create_private_group), ITitleBarLayout.Position.MIDDLE);
+                break;
+        }
+    }
+
+    private void showJoinTypePickerView() {
+        Bundle bundle = new Bundle();
+        bundle.putString(SelectionActivity.Selection.TITLE, getResources().getString(R.string.group_join_type));
+        bundle.putStringArrayList(SelectionActivity.Selection.LIST, mJoinTypes);
+        bundle.putInt(SelectionActivity.Selection.DEFAULT_SELECT_ITEM_INDEX, mJoinTypeIndex);
+        SelectionActivity.startListSelection(this, bundle, new SelectionActivity.OnResultReturnListener() {
+            @Override
+            public void onReturn(Object text) {
+                mJoinType.setContent(mJoinTypes.get((Integer) text));
+                mJoinTypeIndex = (Integer) text;
+            }
+        });
+    }
+
+    private void toCreateGroupChat() {
+        mMembers.add(0, selfInfo);
+        if (mMembers.size() == 1) {
+            ToastUtil.toastLongMessage(getResources().getString(R.string.tips_empty_group_member));
+            return;
+        }
+
+        String groupName = selfInfo.getDisplayName();
+        for (int i = 1; i < mMembers.size(); i++) {
+            groupName = groupName + "、" + mMembers.get(i).getDisplayName();
+        }
+        if (groupName.length() >= 10) {
+            groupName = groupName.substring(0, 7) + "..";
+        }
+
+        Bundle bundle = new Bundle();
+        bundle.putString(TUIConstants.TUIGroup.GROUP_NAME, groupName);
+        bundle.putInt(TUIConstants.TUIGroup.JOIN_TYPE_INDEX, mJoinTypeIndex);
+        bundle.putSerializable(TUIConstants.TUIGroup.GROUP_MEMBER_ID_LIST, mMembers);
+        TUICore.startActivity("CreateGroupMinimalistActivity", bundle);
+        finish();
+    }
+
+    private void createGroupChat() {
+        if (mCreating) {
+            return;
+        }
+        mMembers.add(0, selfInfo);
+        if (mGroupType < 3 && mMembers.size() == 1) {
+            ToastUtil.toastLongMessage(getResources().getString(R.string.tips_empty_group_member));
+            return;
+        }
+        if (mGroupType > 0 && mJoinTypeIndex == -1) {
+            ToastUtil.toastLongMessage(getResources().getString(R.string.tips_empty_group_type));
+            return;
+        }
+        if (mGroupType == 0) {
+            mJoinTypeIndex = -1;
+        }
+        final GroupInfo groupInfo = new GroupInfo();
+        String groupName = selfInfo.getDisplayName();
+        for (int i = 1; i < mMembers.size(); i++) {
+            groupName = groupName + "、" + mMembers.get(i).getDisplayName();
+        }
+        if (groupName.length() >= 10) {
+            groupName = groupName.substring(0, 7) + "..";
+        }
+        groupInfo.setChatName(groupName);
+        groupInfo.setGroupName(groupName);
+        groupInfo.setMemberDetails(mMembers);
+        groupInfo.setGroupType(mGroupTypeValue.get(mGroupType));
+        groupInfo.setJoinType(mJoinTypeIndex);
+        groupInfo.setCommunitySupportTopic(communitySupportTopic);
+
+        mCreating = true;
+
+        presenter.createGroupChat(groupInfo, new IUIKitCallback<String>() {
+            @Override
+            public void onSuccess(String data) {
+                if (!communitySupportTopic) {
+                    ContactStartChatUtils.startChatActivity(data, ChatInfo.TYPE_GROUP, groupInfo.getGroupName(), groupInfo.getGroupType());
+                }
+                finish();
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                mCreating = false;
+                mMembers.remove(selfInfo);
+                if (errCode == TUIConstants.BuyingFeature.ERR_SDK_INTERFACE_NOT_SUPPORT || errCode == 11000) {
+                    showNotSupportDialog();
+                }
+                ToastUtil.toastLongMessage("createGroupChat fail:" + errCode + "=" + errMsg);
+            }
+        });
+    }
+
+    private void showNotSupportDialog() {
+        String string = getResources().getString(R.string.contact_im_flagship_edition_update_tip, getString(R.string.contact_community));
+        String buyingGuidelines = getResources().getString(R.string.contact_buying_guidelines);
+        int buyingGuidelinesIndex = string.lastIndexOf(buyingGuidelines);
+        final int foregroundColor = getResources().getColor(TUIThemeManager.getAttrResId(this, com.tencent.qcloud.tuicore.R.attr.core_primary_color));
+        SpannableString spannedString = new SpannableString(string);
+        ForegroundColorSpan colorSpan2 = new ForegroundColorSpan(foregroundColor);
+        spannedString.setSpan(colorSpan2, buyingGuidelinesIndex, buyingGuidelinesIndex + buyingGuidelines.length(), Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
+
+        ClickableSpan clickableSpan2 = new ClickableSpan() {
+            @Override
+            public void onClick(View view) {
+                if (TextUtils.equals(TUIThemeManager.getInstance().getCurrentLanguage(), "zh")) {
+                    openWebUrl(TUIConstants.BuyingFeature.BUYING_PRICE_DESC);
+                } else {
+                    openWebUrl(TUIConstants.BuyingFeature.BUYING_PRICE_DESC_EN);
+                }
+            }
+
+            @Override
+            public void updateDrawState(TextPaint ds) {
+                ds.setUnderlineText(false);
+            }
+        };
+        spannedString.setSpan(clickableSpan2, buyingGuidelinesIndex, buyingGuidelinesIndex + buyingGuidelines.length(), Spannable.SPAN_EXCLUSIVE_INCLUSIVE);
+
+        TUIKitDialog.TUIIMUpdateDialog.getInstance()
+                .createDialog(this)
+                .setMovementMethod(LinkMovementMethod.getInstance())
+                .setShowOnlyDebug(true)
+                .setCancelable(true)
+                .setCancelOutside(true)
+                .setTitle(spannedString)
+                .setDialogWidth(0.75f)
+                .setDialogFeatureName(TUIConstants.BuyingFeature.BUYING_FEATURE_COMMUNITY)
+                .setPositiveButton(getString(R.string.contact_no_more_reminders), new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        TUIKitDialog.TUIIMUpdateDialog.getInstance().dismiss();
+                        TUIKitDialog.TUIIMUpdateDialog.getInstance().setNeverShow(true);
+                    }
+                })
+                .setNegativeButton(getString(R.string.contact_i_know), new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        TUIKitDialog.TUIIMUpdateDialog.getInstance().dismiss();
+                    }
+                })
+                .show();
+    }
+
+    private void openWebUrl(String url) {
+        Intent intent = new Intent();
+        intent.setAction(Intent.ACTION_VIEW);
+        Uri contentUrl = Uri.parse(url);
+        intent.setData(contentUrl);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        startActivity(intent);
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/StartGroupMemberSelectMinimalistActivity.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/StartGroupMemberSelectMinimalistActivity.java
new file mode 100644
index 0000000..c0a81eb
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/StartGroupMemberSelectMinimalistActivity.java
@@ -0,0 +1,227 @@
+package com.tencent.qcloud.tuikit.tuicontact.minimalistui.pages;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.component.RoundCornerImageView;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactConstants;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget.ContactListView;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.ContactPresenter;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class StartGroupMemberSelectMinimalistActivity extends BaseLightActivity {
+
+    private static final String TAG = StartGroupMemberSelectMinimalistActivity.class.getSimpleName();
+
+    private TitleBarLayout mTitleBar;
+    private ContactListView mContactListView;
+    private ArrayList<GroupMemberInfo> mMembers = new ArrayList<>();
+    private ArrayList<String> alreadySelectedList;
+    private RecyclerView selectedList;
+    private SelectedAdapter selectedListAdapter;
+    private TextView confirmButton;
+    private ContactPresenter presenter;
+    private int limit;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.contact_minimalist_start_group_select_activity);
+
+        init();
+    }
+
+    private ArrayList<String> getMembersNameCard(){
+        if (mMembers.size() == 0) {
+            return new ArrayList<>();
+        }
+
+        ArrayList<String> nameCards = new ArrayList<>();
+        for(int i = 0; i < mMembers.size(); i++){
+            nameCards.add(mMembers.get(i).getNameCard());
+        }
+        return nameCards;
+    }
+
+    private ArrayList<String> getMembersUserId(){
+        if (mMembers.size() == 0) {
+            return new ArrayList<>();
+        }
+
+        ArrayList<String> userIds = new ArrayList<>();
+        for(int i = 0; i < mMembers.size(); i++){
+            userIds.add(mMembers.get(i).getAccount());
+        }
+        return userIds;
+    }
+
+    private void init() {
+        mMembers.clear();
+
+        String groupId = getIntent().getStringExtra(TUIContactConstants.Group.GROUP_ID);
+        boolean isSelectFriends = getIntent().getBooleanExtra(TUIContactConstants.Selection.SELECT_FRIENDS, false);
+        boolean isSelectForCall = getIntent().getBooleanExtra(TUIContactConstants.Selection.SELECT_FOR_CALL, false);
+        limit = getIntent().getIntExtra(TUIContactConstants.Selection.LIMIT, Integer.MAX_VALUE);
+        alreadySelectedList = getIntent().getStringArrayListExtra(TUIContactConstants.Selection.SELECTED_LIST);
+        mTitleBar = findViewById(R.id.group_create_title_bar);
+        mTitleBar.setTitle(getResources().getString(com.tencent.qcloud.tuicore.R.string.sure), ITitleBarLayout.Position.RIGHT);
+        mTitleBar.getRightIcon().setVisibility(View.GONE);
+        mTitleBar.setOnRightClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                confirmAndFinish();
+            }
+        });
+        mTitleBar.setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        confirmButton = findViewById(R.id.confirm_button);
+        selectedList = findViewById(R.id.selected_list);
+        selectedListAdapter = new SelectedAdapter();
+        selectedList.setLayoutManager(new LinearLayoutManager(this, RecyclerView.HORIZONTAL, false));
+        selectedList.setAdapter(selectedListAdapter);
+        mContactListView = findViewById(R.id.group_create_member_list);
+        mContactListView.setAlreadySelectedList(alreadySelectedList);
+        presenter = new ContactPresenter();
+        presenter.setFriendListListener();
+        presenter.setIsForCall(isSelectForCall);
+        mContactListView.setPresenter(presenter);
+        presenter.setContactListView(mContactListView);
+
+        mContactListView.setGroupId(groupId);
+        if (isSelectFriends) {
+            mTitleBar.setTitle(getString(R.string.add_group_member), TitleBarLayout.Position.MIDDLE);
+            mContactListView.loadDataSource(ContactListView.DataSource.FRIEND_LIST);
+        } else {
+            mContactListView.loadDataSource(ContactListView.DataSource.GROUP_MEMBER_LIST);
+        }
+
+        if (!isSelectForCall && !isSelectFriends) {
+            mContactListView.setOnItemClickListener(new ContactListView.OnItemClickListener() {
+                @Override
+                public void onItemClick(int position, ContactItemBean contact) {
+                    if (position == 0) {
+                        mMembers.clear();
+
+                        Intent i = new Intent();
+                        i.putStringArrayListExtra(TUIContactConstants.Selection.USER_NAMECARD_SELECT, new ArrayList<String>(Arrays.asList(getString(R.string.at_all))));
+                        i.putStringArrayListExtra(TUIContactConstants.Selection.USER_ID_SELECT, new ArrayList<String>(Arrays.asList(TUIContactConstants.Selection.SELECT_ALL)));
+                        setResult(3, i);
+
+                        finish();
+                    }
+                }
+            });
+        }
+        mContactListView.setOnSelectChangeListener(new ContactListView.OnSelectChangedListener() {
+            @Override
+            public void onSelectChanged(ContactItemBean contact, boolean selected) {
+                if (selected) {
+                    GroupMemberInfo memberInfo = new GroupMemberInfo();
+                    memberInfo.setAccount(contact.getId());
+                    memberInfo.setIconUrl(contact.getAvatarUrl());
+                    memberInfo.setNameCard(TextUtils.isEmpty(contact.getNickName()) ? contact.getId() : contact.getNickName());
+                    mMembers.add(memberInfo);
+                } else {
+                    for (int i = mMembers.size() - 1; i >= 0; i--) {
+                        if (mMembers.get(i).getAccount().equals(contact.getId())) {
+                            mMembers.remove(i);
+                        }
+                    }
+                }
+                selectedListAdapter.setMembers(mMembers);
+                selectedListAdapter.notifyDataSetChanged();
+            }
+        });
+        confirmButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                confirmAndFinish();
+            }
+        });
+
+    }
+
+    private void confirmAndFinish() {
+        if (mMembers.size() > limit) {
+            String overLimitTip = getString(R.string.contact_over_limit_tip, limit);
+            ToastUtil.toastShortMessage(overLimitTip);
+            return;
+        }
+        Intent i = new Intent();
+        List<String> friendIdList = new ArrayList<>();
+        for (GroupMemberInfo memberInfo : mMembers) {
+            friendIdList.add(memberInfo.getAccount());
+        }
+        i.putExtra(TUIContactConstants.Selection.LIST, (Serializable) friendIdList);
+        i.putStringArrayListExtra(TUIContactConstants.Selection.USER_NAMECARD_SELECT, getMembersNameCard());
+        i.putStringArrayListExtra(TUIContactConstants.Selection.USER_ID_SELECT, getMembersUserId());
+        i.putExtras(getIntent());
+        setResult(3, i);
+
+        finish();
+    }
+
+    public static class SelectedAdapter extends RecyclerView.Adapter<SelectedAdapter.SelectedViewHolder> {
+        private List<GroupMemberInfo> mMembers;
+
+        public void setMembers(List<GroupMemberInfo> mMembers) {
+            this.mMembers = mMembers;
+        }
+
+        @NonNull
+        @Override
+        public SelectedViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            return new SelectedViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.forward_contact_selector_item, parent, false));
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull SelectedViewHolder holder, int position) {
+            GlideEngine.loadImage(holder.userIconView, mMembers.get(position).getIconUrl());
+        }
+
+        @Override
+        public int getItemCount() {
+            if (mMembers == null) {
+                return 0;
+            }
+            return mMembers.size();
+        }
+
+        public class SelectedViewHolder extends RecyclerView.ViewHolder {
+            public RoundCornerImageView userIconView;
+            public SelectedViewHolder(@NonNull View itemView) {
+                super(itemView);
+                userIconView = itemView.findViewById(R.id.ivAvatar);
+                userIconView.setRadius(ScreenUtil.dip2px(20));
+            }
+        }
+    }
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/TUIContactMinimalistFragment.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/TUIContactMinimalistFragment.java
new file mode 100644
index 0000000..dd7f218
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/pages/TUIContactMinimalistFragment.java
@@ -0,0 +1,74 @@
+package com.tencent.qcloud.tuikit.tuicontact.minimalistui.pages;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.component.fragments.BaseFragment;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactConstants;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactService;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget.ContactLayout;
+import com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget.ContactListView;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.ContactPresenter;
+import com.tencent.qcloud.tuikit.tuicontact.util.TUIContactLog;
+
+public class TUIContactMinimalistFragment extends BaseFragment {
+
+    private static final String TAG = TUIContactMinimalistFragment.class.getSimpleName();
+    private ContactLayout mContactLayout;
+
+    private ContactPresenter presenter;
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        View baseView = inflater.inflate(R.layout.minimalist_contact_fragment, container, false);
+        initViews(baseView);
+
+        return baseView;
+    }
+
+    private void initViews(View view) {
+        mContactLayout = view.findViewById(R.id.contact_layout);
+
+        presenter = new ContactPresenter();
+        presenter.setFriendListListener();
+        mContactLayout.setPresenter(presenter);
+        mContactLayout.initDefault();
+
+        mContactLayout.getContactListView().setOnItemClickListener(new ContactListView.OnItemClickListener() {
+            @Override
+            public void onItemClick(int position, ContactItemBean contact) {
+                if (position == 0) {
+                    Intent intent = new Intent(TUIContactService.getAppContext(), NewFriendMinimalistActivity.class);
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    TUIContactService.getAppContext().startActivity(intent);
+                } else if (position == 1) {
+                    Intent intent = new Intent(TUIContactService.getAppContext(), GroupListMinimalistActivity.class);
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    TUIContactService.getAppContext().startActivity(intent);
+                } else if (position == 2) {
+                    Intent intent = new Intent(TUIContactService.getAppContext(), BlackListMinimalistActivity.class);
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    TUIContactService.getAppContext().startActivity(intent);
+                } else {
+                    Intent intent = new Intent(TUIContactService.getAppContext(), FriendProfileMinimalistActivity.class);
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    intent.putExtra(TUIContactConstants.ProfileType.CONTENT, contact);
+                    TUIContactService.getAppContext().startActivity(intent);
+                }
+            }
+        });
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        TUIContactLog.i(TAG, "onResume");
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/util/ContactStartChatUtils.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/util/ContactStartChatUtils.java
new file mode 100644
index 0000000..d2a064e
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/util/ContactStartChatUtils.java
@@ -0,0 +1,34 @@
+package com.tencent.qcloud.tuikit.tuicontact.minimalistui.util;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+
+public class ContactStartChatUtils {
+    public static boolean isC2CChat(int chatType) {
+        return chatType == V2TIMConversation.V2TIM_C2C;
+    }
+
+    public static boolean isGroupChat(int chatType) {
+        return chatType == V2TIMConversation.V2TIM_GROUP;
+    }
+
+    public static void startChatActivity(String chatId, int chatType, String chatName, String groupType) {
+        if (TextUtils.isEmpty(chatId)) {
+            return;
+        }
+        Bundle bundle = new Bundle();
+        bundle.putString(TUIConstants.TUIChat.CHAT_ID, chatId);
+        bundle.putString(TUIConstants.TUIChat.CHAT_NAME, chatName);
+        bundle.putInt(TUIConstants.TUIChat.CHAT_TYPE, chatType);
+        if (isGroupChat(chatType)) {
+            TUICore.startActivity("TUIGroupChatMinimalistActivity", bundle);
+        } else {
+            TUICore.startActivity("TUIC2CChatMinimalistActivity", bundle);
+        }
+    }
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/widget/ContactAdapter.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/widget/ContactAdapter.java
new file mode 100644
index 0000000..52c4614
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/widget/ContactAdapter.java
@@ -0,0 +1,240 @@
+package com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget;
+
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.imsdk.v2.V2TIMUserStatus;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuicore.component.gatherimage.ShadeImageView;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuicore.util.TUIUtil;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactService;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.config.TUIContactConfig;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.ContactPresenter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ContactAdapter extends RecyclerView.Adapter<ContactAdapter.ViewHolder> {
+
+    protected List<ContactItemBean> mData;
+    private ContactListView.OnSelectChangedListener mOnSelectChangedListener;
+    private ContactListView.OnItemClickListener mOnClickListener;
+
+    private int mPreSelectedPosition;
+    private boolean isSingleSelectMode;
+    private ContactPresenter presenter;
+    private boolean isGroupList = false;
+    private int dataSourceType = ContactListView.DataSource.UNKNOWN;
+    private ArrayList<String> alreadySelectedList;
+
+    public ContactAdapter(List<ContactItemBean> data) {
+        this.mData = data;
+    }
+
+    public void setPresenter(ContactPresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    public void setIsGroupList(boolean groupList) {
+        isGroupList = groupList;
+    }
+
+    public void setAlreadySelectedList(ArrayList<String> alreadySelectedList) {
+        this.alreadySelectedList = alreadySelectedList;
+    }
+
+    @Override
+    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        return new ViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.contact_selecable_adapter_item, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(final ViewHolder holder, final int position) {
+        final ContactItemBean contactBean = mData.get(position);
+        RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams)holder.line.getLayoutParams();
+        if (position < mData.size() - 1) {
+            String tag1 = contactBean.getSuspensionTag();
+            String tag2 = mData.get(position + 1).getSuspensionTag();
+
+            if (TextUtils.equals(tag1, tag2)) {
+                params.leftMargin = holder.tvName.getLeft();
+            } else {
+                params.leftMargin = 0;
+            }
+        } else {
+            params.leftMargin = 0;
+        }
+        holder.line.setLayoutParams(params);
+        if (!TextUtils.isEmpty(contactBean.getRemark())) {
+            holder.tvName.setText(contactBean.getRemark());
+        } else if (!TextUtils.isEmpty(contactBean.getNickName())) {
+            holder.tvName.setText(contactBean.getNickName());
+        } else {
+            holder.tvName.setText(contactBean.getId());
+        }
+        if (mOnSelectChangedListener != null) {
+            holder.ccSelect.setVisibility(View.VISIBLE);
+            holder.ccSelect.setChecked(contactBean.isSelected());
+        }
+
+        holder.content.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (!contactBean.isEnable()) {
+                    return;
+                }
+                holder.ccSelect.setChecked(!holder.ccSelect.isChecked());
+                if (mOnSelectChangedListener != null) {
+                    mOnSelectChangedListener.onSelectChanged(getItem(position), holder.ccSelect.isChecked());
+                }
+                contactBean.setSelected(holder.ccSelect.isChecked());
+                if (mOnClickListener != null) {
+                    mOnClickListener.onItemClick(position, contactBean);
+                }
+                if (isSingleSelectMode && position != mPreSelectedPosition && contactBean.isSelected()) {
+                    mData.get(mPreSelectedPosition).setSelected(false);
+                    notifyItemChanged(mPreSelectedPosition);
+                }
+                mPreSelectedPosition = position;
+            }
+        });
+        holder.unreadText.setVisibility(View.GONE);
+        holder.userStatusView.setVisibility(View.GONE);
+        if (TextUtils.equals(TUIContactService.getAppContext().getResources().getString(R.string.new_friend), contactBean.getId())) {
+            holder.avatar.setImageResource(TUIThemeManager.getAttrResId(holder.itemView.getContext(), R.attr.contact_new_friend_icon));
+
+            presenter.getFriendApplicationUnreadCount(new IUIKitCallback<Integer>() {
+                @Override
+                public void onSuccess(Integer data) {
+                    if (data == 0) {
+                        holder.unreadText.setVisibility(View.GONE);
+                    } else {
+                        holder.unreadText.setVisibility(View.VISIBLE);
+                        holder.unreadText.setText("" + data);
+                    }
+                }
+
+                @Override
+                public void onError(String module, int errCode, String errMsg) {
+                    ToastUtil.toastShortMessage("Error code = " + errCode + ", desc = " + errMsg);
+                }
+            });
+
+        } else if (TextUtils.equals(TUIContactService.getAppContext().getResources().getString(R.string.group), contactBean.getId())) {
+            holder.avatar.setImageResource(TUIThemeManager.getAttrResId(holder.itemView.getContext(), R.attr.contact_group_list_icon));
+        } else if (TextUtils.equals(TUIContactService.getAppContext().getResources().getString(R.string.blacklist), contactBean.getId())) {
+            holder.avatar.setImageResource(TUIThemeManager.getAttrResId(holder.itemView.getContext(), R.attr.contact_black_list_icon));
+        } else {
+            int radius = holder.itemView.getResources().getDimensionPixelSize(R.dimen.contact_profile_face_radius);
+            if (isGroupList) {
+                int defaultIconResId = TUIUtil.getDefaultGroupIconResIDByGroupType(holder.itemView.getContext(), contactBean.getGroupType());
+                GlideEngine.loadUserIcon(holder.avatar, contactBean.getAvatarUrl(), defaultIconResId, radius);
+            } else {
+                GlideEngine.loadUserIcon(holder.avatar, contactBean.getAvatarUrl(), radius);
+            }
+            if (dataSourceType == ContactListView.DataSource.CONTACT_LIST && TUIContactConfig.getInstance().isShowUserStatus()) {
+                holder.userStatusView.setVisibility(View.VISIBLE);
+                if (contactBean.getStatusType() == V2TIMUserStatus.V2TIM_USER_STATUS_ONLINE) {
+                    holder.userStatusView.setBackgroundResource(TUIThemeManager.getAttrResId(TUIContactService.getAppContext(), com.tencent.qcloud.tuicore.R.attr.user_status_online));
+                } else {
+                    holder.userStatusView.setBackgroundResource(TUIThemeManager.getAttrResId(TUIContactService.getAppContext(), com.tencent.qcloud.tuicore.R.attr.user_status_offline));
+                }
+            } else {
+                holder.userStatusView.setVisibility(View.GONE);
+            }
+        }
+        setAlreadySelected(holder, contactBean);
+    }
+
+    private void setAlreadySelected(ViewHolder holder, ContactItemBean contactItemBean) {
+        if (alreadySelectedList != null && alreadySelectedList.contains(contactItemBean.getId())) {
+            holder.ccSelect.setChecked(true);
+            holder.itemView.setEnabled(false);
+            holder.ccSelect.setEnabled(false);
+        } else {
+            holder.itemView.setEnabled(true);
+            holder.ccSelect.setEnabled(true);
+            holder.ccSelect.setSelected(contactItemBean.isSelected());
+        }
+    }
+
+    @Override
+    public void onViewRecycled(ViewHolder holder) {
+        if (holder != null) {
+            GlideEngine.clear(holder.avatar);
+            holder.avatar.setImageResource(0);
+
+        }
+        super.onViewRecycled(holder);
+    }
+
+    private ContactItemBean getItem(int position) {
+        if (position < mData.size()) {
+            return mData.get(position);
+        }
+        return null;
+    }
+
+    @Override
+    public int getItemCount() {
+        return mData != null ? mData.size() : 0;
+    }
+
+    public void setDataSource(List<ContactItemBean> datas) {
+        this.mData = datas;
+        notifyDataSetChanged();
+    }
+
+    public void setSingleSelectMode(boolean mode) {
+        isSingleSelectMode = mode;
+    }
+
+    public void setOnSelectChangedListener(ContactListView.OnSelectChangedListener selectListener) {
+        mOnSelectChangedListener = selectListener;
+    }
+
+    public void setOnItemClickListener(ContactListView.OnItemClickListener listener) {
+        mOnClickListener = listener;
+    }
+
+    public void setDataSourceType(int dataSourceType) {
+        this.dataSourceType = dataSourceType;
+    }
+
+    public static class ViewHolder extends RecyclerView.ViewHolder {
+        TextView tvName;
+        TextView unreadText;
+        ShadeImageView avatar;
+        CheckBox ccSelect;
+        View content;
+        View line;
+        View userStatusView;
+
+        public ViewHolder(View itemView) {
+            super(itemView);
+            tvName = itemView.findViewById(R.id.tvCity);
+            unreadText = itemView.findViewById(R.id.conversation_unread);
+            unreadText.setVisibility(View.GONE);
+            avatar = itemView.findViewById(R.id.ivAvatar);
+            ccSelect = itemView.findViewById(R.id.contact_check_box);
+            content = itemView.findViewById(R.id.selectable_contact_item);
+            line = itemView.findViewById(R.id.view_line);
+            userStatusView = itemView.findViewById(R.id.user_status);
+
+            avatar.setRadius(ScreenUtil.dip2px(20));
+        }
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/widget/ContactLayout.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/widget/ContactLayout.java
new file mode 100644
index 0000000..2c39aa1
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/widget/ContactLayout.java
@@ -0,0 +1,126 @@
+package com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.action.PopActionClickListener;
+import com.tencent.qcloud.tuicore.component.action.PopMenuAction;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactConstants;
+import com.tencent.qcloud.tuikit.tuicontact.minimalistui.interfaces.IContactLayout;
+import com.tencent.qcloud.tuikit.tuicontact.minimalistui.pages.AddMoreMinimalistActivity;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.ContactPresenter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class ContactLayout extends LinearLayout implements IContactLayout {
+
+    private static final String TAG = ContactLayout.class.getSimpleName();
+
+    private ContactListView mContactListView;
+    private View createNewButton;
+    private Menu menu;
+
+    private ContactPresenter presenter;
+
+    public ContactLayout(Context context) {
+        super(context);
+        init();
+    }
+
+    public ContactLayout(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public ContactLayout(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    public void setPresenter(ContactPresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    private void init() {
+        inflate(getContext(), R.layout.minimalist_contact_layout, this);
+        mContactListView = findViewById(R.id.contact_listview);
+        createNewButton = findViewById(R.id.create_new_button);
+        initContactMenu();
+        createNewButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (menu != null && !menu.isShowing()) {
+                    menu.show();
+                }
+            }
+        });
+    }
+
+    private void initContactMenu() {
+        menu = new Menu((Activity) getContext(), createNewButton);
+        List<PopMenuAction> menuActionList = new ArrayList<>(2);
+        PopActionClickListener popActionClickListener = new PopActionClickListener() {
+            @Override
+            public void onActionClick(int index, Object data) {
+                PopMenuAction action = (PopMenuAction) data;
+                boolean isGroup = false;
+                if (TextUtils.equals(action.getActionName(), getResources().getString(R.string.add_friend))) {
+                    isGroup = false;
+                }
+                if (TextUtils.equals(action.getActionName(), getResources().getString(R.string.add_group))) {
+                    isGroup = true;
+                }
+                Intent intent = new Intent(getContext(), AddMoreMinimalistActivity.class);
+                intent.putExtra(TUIContactConstants.GroupType.GROUP, isGroup);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                getContext().startActivity(intent);
+                menu.hide();
+            }
+        };
+        PopMenuAction action = new PopMenuAction();
+        action.setActionName(getResources().getString(R.string.add_friend));
+        action.setIconResId(R.drawable.contact_add_friend);
+        action.setActionClickListener(popActionClickListener);
+        menuActionList.add(action);
+
+        action = new PopMenuAction();
+        action.setActionName(getResources().getString(R.string.add_group));
+        action.setIconResId(R.drawable.contact_add_group);
+        action.setActionClickListener(popActionClickListener);
+        menuActionList.add(action);
+        menu.setMenuAction(menuActionList);
+    }
+
+
+    public void initDefault() {
+        mContactListView.setPresenter(presenter);
+        presenter.setContactListView(mContactListView);
+        mContactListView.loadDataSource(ContactListView.DataSource.CONTACT_LIST);
+    }
+
+    @Override
+    public ContactListView getContactListView() {
+        return mContactListView;
+    }
+
+    @Override
+    public TitleBarLayout getTitleBar() {
+        return null;
+    }
+
+    @Override
+    public void setParentLayout(Object parent) {
+
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/widget/ContactListView.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/widget/ContactListView.java
new file mode 100644
index 0000000..525a31b
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/widget/ContactListView.java
@@ -0,0 +1,187 @@
+package com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.component.CustomLinearLayoutManager;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.component.indexlib.IndexBar.widget.IndexBar;
+import com.tencent.qcloud.tuikit.tuicontact.component.indexlib.suspension.SuspensionDecoration;
+import com.tencent.qcloud.tuikit.tuicontact.interfaces.IContactListView;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.ContactPresenter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class ContactListView extends LinearLayout implements IContactListView {
+
+    private static final String TAG = ContactListView.class.getSimpleName();
+
+    private RecyclerView mRv;
+    private ContactAdapter mAdapter;
+    private CustomLinearLayoutManager mManager;
+    private List<ContactItemBean> mData = new ArrayList<>();
+    private SuspensionDecoration mDecoration;
+    private ProgressBar mContactLoadingBar;
+    private String groupId;
+    private boolean isGroupList = false;
+
+    private TextView notFoundTip;
+    /**
+     * 右侧边栏导航区域
+     */
+    private IndexBar mIndexBar;
+
+    private TextView mTvSideBarHint;
+
+    private ContactPresenter presenter;
+
+    private int dataSourceType = DataSource.UNKNOWN;
+    private ArrayList<String> alreadySelectedList;
+
+    public ContactListView(Context context) {
+        super(context);
+        init();
+    }
+
+    public ContactListView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public ContactListView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    public void setPresenter(ContactPresenter presenter) {
+        this.presenter = presenter;
+        if (mAdapter != null) {
+            mAdapter.setPresenter(presenter);
+            mAdapter.setIsGroupList(isGroupList);
+        }
+    }
+
+    public void setIsGroupList(boolean isGroupList) {
+        this.isGroupList = isGroupList;
+    }
+
+    public void setAlreadySelectedList(ArrayList<String> alreadySelectedList) {
+        this.alreadySelectedList = alreadySelectedList;
+        mAdapter.setAlreadySelectedList(alreadySelectedList);
+    }
+
+    private void init() {
+        inflate(getContext(), R.layout.minimalist_contact_list, this);
+        mRv = findViewById(R.id.contact_member_list);
+        notFoundTip = findViewById(R.id.not_found_tip);
+        mManager = new CustomLinearLayoutManager(getContext());
+        mRv.setLayoutManager(mManager);
+
+        mAdapter = new ContactAdapter(mData);
+        mRv.setAdapter(mAdapter);
+        mRv.addItemDecoration(mDecoration = new SuspensionDecoration(getContext(), mData));
+        mRv.addOnScrollListener(new RecyclerView.OnScrollListener() {
+
+            @Override
+            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+                super.onScrolled(recyclerView, dx, dy);
+                LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
+                int lastCompletelyVisibleItemPosition = layoutManager.findLastCompletelyVisibleItemPosition();
+                if(lastCompletelyVisibleItemPosition==layoutManager.getItemCount()-1) {
+                    if (presenter.getNextSeq() > 0) {
+                        presenter.loadGroupMemberList(groupId);
+                    }
+                }
+            }
+        });
+        mTvSideBarHint = findViewById(R.id.contact_tvSideBarHint);
+        mIndexBar = findViewById(R.id.contact_indexBar);
+        mIndexBar.setPressedShowTextView(mTvSideBarHint)
+                .setNeedRealIndex(false)
+                .setLayoutManager(mManager);
+        mContactLoadingBar = findViewById(R.id.contact_loading_bar);
+    }
+
+    public ContactAdapter getAdapter() {
+        return mAdapter;
+    }
+
+    public void setNotFoundTip(String text) {
+        notFoundTip.setText(text);
+    }
+
+    @Override
+    public void onDataSourceChanged(List<ContactItemBean> data) {
+        if (data == null || data.isEmpty()) {
+            if (!TextUtils.isEmpty(notFoundTip.getText())) {
+                notFoundTip.setVisibility(VISIBLE);
+            }
+        } else {
+            notFoundTip.setVisibility(GONE);
+        }
+        mContactLoadingBar.setVisibility(GONE);
+        this.mData = data;
+        mAdapter.setDataSource(mData);
+        mIndexBar.setSourceDatas(mData).invalidate();
+        mDecoration.setDatas(mData);
+    }
+
+    @Override
+    public void onFriendApplicationChanged() {
+        if (dataSourceType == DataSource.CONTACT_LIST) {
+            mAdapter.notifyItemChanged(0);
+        }
+    }
+
+    public void setSingleSelectMode(boolean mode) {
+        mAdapter.setSingleSelectMode(mode);
+    }
+
+    public void setOnSelectChangeListener(OnSelectChangedListener selectChangeListener) {
+        mAdapter.setOnSelectChangedListener(selectChangeListener);
+    }
+
+    public void setOnItemClickListener(OnItemClickListener listener) {
+        mAdapter.setOnItemClickListener(listener);
+    }
+
+    public void loadDataSource(int dataSource) {
+        this.dataSourceType = dataSource;
+        if (presenter == null) {
+            return;
+        }
+        if (mAdapter != null) {
+            mAdapter.setDataSourceType(dataSource);
+        }
+        mContactLoadingBar.setVisibility(VISIBLE);
+        if (dataSource == DataSource.GROUP_MEMBER_LIST) {
+            presenter.loadGroupMemberList(groupId);
+        } else {
+            presenter.loadDataSource(dataSource);
+        }
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
+    public interface OnSelectChangedListener {
+        void onSelectChanged(ContactItemBean contact, boolean selected);
+    }
+
+    public interface OnItemClickListener {
+        void onItemClick(int position, ContactItemBean contact);
+    }
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/widget/ForwardContactSelectorAdapter.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/widget/ForwardContactSelectorAdapter.java
new file mode 100644
index 0000000..29215f2
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/widget/ForwardContactSelectorAdapter.java
@@ -0,0 +1,74 @@
+package com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+
+import java.util.List;
+
+public class ForwardContactSelectorAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>{
+    private Context context;
+    private List<String> list;
+    private RecyclerView mRecycleView;
+
+    public ForwardContactSelectorAdapter(Context context) {
+        this.context = context;
+    }
+
+    @Override
+    public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
+        super.onAttachedToRecyclerView(recyclerView);
+        mRecycleView = (RecyclerView) recyclerView;
+        //mRecycleView.setItemViewCacheSize(5);
+    }
+
+    @Override
+    public ContactViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        return new ContactViewHolder(LayoutInflater.from(context).inflate(R.layout.forward_contact_selector_item, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+        ContactViewHolder viewHolder = (ContactViewHolder) holder;
+        if (viewHolder != null){
+            if (!TextUtils.isEmpty(list.get(position))) {
+                GlideEngine.loadImage(viewHolder.userIconView, list.get(position));
+            }
+        }
+
+    }
+
+    public void setDataSource(List<String> provider) {
+        if (provider == null) {
+            if (list != null) {
+                list.clear();
+            }
+        } else {
+            list = provider;
+        }
+
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public int getItemCount() {
+        return list == null ? 0 : list.size();
+    }
+}
+
+class ContactViewHolder extends RecyclerView.ViewHolder {
+    public ImageView userIconView;
+    public ContactViewHolder(View itemView) {
+        super(itemView);
+        userIconView = (ImageView) itemView.findViewById(R.id.ivAvatar);
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/widget/FriendProfileLayout.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/widget/FriendProfileLayout.java
new file mode 100644
index 0000000..775e18e
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/widget/FriendProfileLayout.java
@@ -0,0 +1,662 @@
+package com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget;
+
+import android.app.Activity;
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.util.Pair;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.Button;
+import android.widget.CompoundButton;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.component.LineControllerView;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.dialog.TUIKitDialog;
+import com.tencent.qcloud.tuicore.component.gatherimage.ShadeImageView;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.component.popupcard.PopupInputCard;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuicore.util.TUIUtil;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ChatInfo;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactGroupApplyInfo;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.bean.FriendApplicationBean;
+import com.tencent.qcloud.tuikit.tuicontact.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuicontact.interfaces.IFriendProfileLayout;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.FriendProfilePresenter;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class FriendProfileLayout extends LinearLayout implements View.OnClickListener, IFriendProfileLayout {
+
+    private static final String TAG = FriendProfileLayout.class.getSimpleName();
+
+    private final int CHANGE_REMARK_CODE = 200;
+
+    private TitleBarLayout mTitleBar;
+    private ShadeImageView mHeadImageView;
+    private TextView mNickNameView;
+    private TextView mIDView;
+    private TextView mSignatureView;
+    private TextView mSignatureTagView;
+    private TextView remarkAndGroupTip;
+    private LineControllerView mRemarkView;
+    private LineControllerView mAddBlackView;
+    private LineControllerView mChatTopView;
+    private LineControllerView mMessageOptionView;
+    private LineControllerView addFriendRemarkLv;
+    private LineControllerView addFriendGroupLv;
+    private LineControllerView mChatBackground;
+    private Button deleteFriendBtn;
+    private Button clearMessageBtn;
+    private Button chatBtn;
+    private Button audioCallBtn;
+    private Button videoCallBtn;
+    private Button addFriendSendBtn;
+    private Button acceptFriendBtn;
+    private Button refuseFriendBtn;
+    private View addFriendArea;
+    private EditText addWordingEditText;
+    private View friendApplicationVerifyArea;
+    private TextView friendApplicationAddWording;
+
+    private ContactItemBean mContactInfo;
+    private FriendApplicationBean friendApplicationBean;
+    private OnButtonClickListener mListener;
+    private String mId;
+    private String mNickname;
+    private String mRemark;
+    private String mAddWords;
+    private boolean isFriend;
+    private boolean isGroup = false;
+
+    private FriendProfilePresenter presenter;
+
+    public FriendProfileLayout(Context context) {
+        super(context);
+        init();
+    }
+
+    public FriendProfileLayout(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public FriendProfileLayout(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    public void setPresenter(FriendProfilePresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    private void init() {
+        inflate(getContext(), R.layout.minimalist_contact_friend_profile_layout, this);
+
+        mHeadImageView = findViewById(R.id.friend_icon);
+        mNickNameView = findViewById(R.id.friend_nick_name);
+        mIDView = findViewById(R.id.friend_account);
+        mRemarkView = findViewById(R.id.remark);
+        mRemarkView.setOnClickListener(this);
+        mSignatureTagView = findViewById(R.id.friend_signature_tag);
+        mSignatureView = findViewById(R.id.friend_signature);
+        mMessageOptionView = findViewById(R.id.msg_rev_opt);
+        mMessageOptionView.setOnClickListener(this);
+        mChatTopView = findViewById(R.id.chat_to_top);
+        mAddBlackView = findViewById(R.id.blackList);
+        deleteFriendBtn = findViewById(R.id.btn_delete);
+        deleteFriendBtn.setOnClickListener(this);
+        clearMessageBtn = findViewById(R.id.btn_clear_chat_history);
+        clearMessageBtn.setOnClickListener(this);
+        chatBtn = findViewById(R.id.btn_chat);
+        chatBtn.setOnClickListener(this);
+        mChatBackground = findViewById(R.id.chat_background);
+        mChatBackground.setOnClickListener(this);
+
+        audioCallBtn = findViewById(R.id.btn_voice);
+        audioCallBtn.setOnClickListener(this);
+        videoCallBtn = findViewById(R.id.btn_video);
+        videoCallBtn.setOnClickListener(this);
+
+        addFriendSendBtn = findViewById(R.id.add_friend_send_btn);
+        addFriendSendBtn.setOnClickListener(this);
+
+        acceptFriendBtn = findViewById(R.id.accept_friend_send_btn);
+        refuseFriendBtn = findViewById(R.id.refuse_friend_send_btn);
+
+        addFriendArea = findViewById(R.id.add_friend_verify_area);
+        addWordingEditText = findViewById(R.id.add_wording_edit);
+
+        friendApplicationVerifyArea = findViewById(R.id.friend_application_verify_area);
+        friendApplicationAddWording = findViewById(R.id.friend_application_add_wording);
+
+        addFriendRemarkLv = findViewById(R.id.friend_remark_lv);
+        addFriendRemarkLv.setOnClickListener(this);
+        addFriendGroupLv = findViewById(R.id.friend_group_lv);
+        addFriendGroupLv.setContent(getContext().getString(R.string.contact_my_friend));
+
+        remarkAndGroupTip = findViewById(R.id.remark_and_group_tip);
+
+        mTitleBar = findViewById(R.id.friend_titlebar);
+        mTitleBar.setTitle(getResources().getString(R.string.profile_detail), ITitleBarLayout.Position.MIDDLE);
+        mTitleBar.getRightGroup().setVisibility(View.GONE);
+        mTitleBar.setOnLeftClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                ((Activity) getContext()).finish();
+            }
+        });
+    }
+
+    private void setupCall() {
+        HashMap<String, Object> param = new HashMap<>();
+        param.put(TUIConstants.TUIChat.CHAT_ID, mId);
+        param.put(TUIConstants.TUIChat.CHAT_NAME, mNickname);
+        param.put(TUIConstants.TUIChat.CHAT_TYPE, ChatInfo.TYPE_C2C);
+        param.put(TUIConstants.TUIChat.CONTEXT, getContext());
+        Map<String, Object> videoCallExtension = TUICore.getExtensionInfo(TUIConstants.TUIChat.EXTENSION_INPUT_MORE_VIDEO_CALL, param);
+        if (videoCallExtension == null) {
+            videoCallBtn.setVisibility(GONE);
+        }
+
+        Map<String, Object> audioCallExtension = TUICore.getExtensionInfo(TUIConstants.TUIChat.EXTENSION_INPUT_MORE_AUDIO_CALL, param);
+        if (audioCallExtension == null) {
+            audioCallBtn.setVisibility(GONE);
+        }
+    }
+
+    private void initEvent() {
+        mChatTopView.setCheckListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(final CompoundButton buttonView, boolean isChecked) {
+                if (presenter != null) {
+                    presenter.setConversationTop(mId, isChecked);
+                }
+            }
+        });
+
+        mAddBlackView.setCheckListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                if (isChecked) {
+                    addBlack();
+                } else {
+                    deleteBlack();
+                }
+            }
+        });
+
+        refuseFriendBtn.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                refuse();
+            }
+        });
+
+        acceptFriendBtn.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                accept();
+            }
+        });
+    }
+
+    public void initData(Object data) {
+        initEvent();
+
+        if (data instanceof String) {
+            mId = (String) data;
+            loadUserProfile(mId);
+        } else if (data instanceof ContactItemBean) {
+            setViewContentFromItemBean((ContactItemBean) data);
+        } else if (data instanceof FriendApplicationBean) {
+            setViewContentFromFriendApplicationBean((FriendApplicationBean) data);
+        } else if (data instanceof ContactGroupApplyInfo) {
+            setViewContentFromContactGroupApplyInfo((ContactGroupApplyInfo) data);
+        } else if (data instanceof GroupInfo) {
+            setViewContentFromGroupInfo((GroupInfo) data);
+        }
+
+        if (!TextUtils.isEmpty(mNickname)) {
+            mNickNameView.setText(mNickname);
+        } else {
+            mNickNameView.setText(mId);
+        }
+        mIDView.setText(mId);
+
+        setupCall();
+    }
+
+    private void setViewContentFromContactGroupApplyInfo(ContactGroupApplyInfo data) {
+        final ContactGroupApplyInfo info = data;
+        mId = info.getFromUser();
+        mNickname = info.getFromUserNickName();
+        mRemarkView.setVisibility(GONE);
+        mAddBlackView.setVisibility(GONE);
+        mMessageOptionView.setVisibility(GONE);
+        mChatBackground.setVisibility(GONE);
+        deleteFriendBtn.setText(R.string.refuse);
+        deleteFriendBtn.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                refuseJoinGroupApply(info);
+            }
+        });
+        chatBtn.setText(R.string.accept);
+        chatBtn.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                acceptJoinGroupApply(info);
+            }
+        });
+    }
+
+    private void setViewContentFromGroupInfo(GroupInfo groupInfo) {
+        mTitleBar.setTitle(getResources().getString(R.string.add_group), ITitleBarLayout.Position.MIDDLE);
+        isGroup = true;
+        mId = groupInfo.getId();
+        mNickname = groupInfo.getGroupName();
+        mSignatureTagView.setText(getResources().getString(R.string.contact_group_type_tag));
+        mSignatureView.setText(groupInfo.getGroupType());
+        int radius = ScreenUtil.dip2px(24);
+        mHeadImageView.setRadius(radius);
+        GlideEngine.loadUserIcon(mHeadImageView, groupInfo.getFaceUrl(), TUIUtil.getDefaultGroupIconResIDByGroupType(getContext(), groupInfo.getGroupType()), radius);
+        addFriendSendBtn.setVisibility(VISIBLE);
+        addFriendArea.setVisibility(VISIBLE);
+        remarkAndGroupTip.setVisibility(GONE);
+        addFriendRemarkLv.setVisibility(GONE);
+        addFriendGroupLv.setVisibility(GONE);
+    }
+
+    private void setViewContentFromFriendApplicationBean(FriendApplicationBean data) {
+        friendApplicationBean = data;
+        mId = friendApplicationBean.getUserId();
+        mNickname = friendApplicationBean.getNickName();
+        mSignatureTagView.setVisibility(GONE);
+        mSignatureView.setVisibility(GONE);
+        mRemarkView.setVisibility(GONE);
+        mAddBlackView.setVisibility(GONE);
+        mMessageOptionView.setVisibility(GONE);
+        mChatBackground.setVisibility(GONE);
+
+        friendApplicationVerifyArea.setVisibility(VISIBLE);
+        friendApplicationAddWording.setText(friendApplicationBean.getAddWording());
+
+        refuseFriendBtn.setVisibility(VISIBLE);
+        acceptFriendBtn.setVisibility(VISIBLE);
+
+        int radius = getResources().getDimensionPixelSize(R.dimen.contact_profile_face_radius);
+        GlideEngine.loadUserIcon(mHeadImageView, friendApplicationBean.getFaceUrl(), radius);
+    }
+
+    private void setViewContentFromItemBean(ContactItemBean data) {
+        mContactInfo = data;
+        isFriend = mContactInfo.isFriend();
+        mId = mContactInfo.getId();
+        mNickname = mContactInfo.getNickName();
+        mSignatureView.setText(mContactInfo.getSignature());
+        if (TextUtils.isEmpty(mContactInfo.getSignature())) {
+            mSignatureTagView.setText(getResources().getString(R.string.contact_no_status));
+        } else {
+            mSignatureTagView.setText(getResources().getString(R.string.contact_signature_tag));
+        }
+        int radius = getResources().getDimensionPixelSize(R.dimen.contact_profile_face_radius);
+        GlideEngine.loadUserIcon(mHeadImageView, mContactInfo.getAvatarUrl(), radius);
+        mChatTopView.setChecked(presenter.isTopConversation(mId));
+        mAddBlackView.setChecked(mContactInfo.isBlackList());
+        mRemarkView.setContent(mContactInfo.getRemark());
+
+        if (TextUtils.equals(mContactInfo.getId(), TUILogin.getLoginUser())) {
+            if (isFriend) {
+                mRemarkView.setVisibility(VISIBLE);
+                chatBtn.setVisibility(VISIBLE);
+                audioCallBtn.setVisibility(VISIBLE);
+                videoCallBtn.setVisibility(VISIBLE);
+                deleteFriendBtn.setVisibility(VISIBLE);
+                mAddBlackView.setVisibility(VISIBLE);
+                mChatTopView.setVisibility(View.VISIBLE);
+                mChatBackground.setVisibility(VISIBLE);
+                updateMessageOptionView();
+            } else {
+                // DO NOTHING
+            }
+        } else {
+            if (mContactInfo.isBlackList()) {
+                deleteFriendBtn.setVisibility(VISIBLE);
+                chatBtn.setVisibility(VISIBLE);
+                audioCallBtn.setVisibility(VISIBLE);
+                videoCallBtn.setVisibility(VISIBLE);
+                mRemarkView.setVisibility(VISIBLE);
+                mAddBlackView.setVisibility(VISIBLE);
+                mMessageOptionView.setVisibility(VISIBLE);
+                mChatTopView.setVisibility(VISIBLE);
+                mChatBackground.setVisibility(VISIBLE);
+            } else {
+                if (!isFriend) {
+                    if (isGroup) {
+                        addFriendRemarkLv.setVisibility(GONE);
+                        addFriendGroupLv.setVisibility(GONE);
+                    }
+                    mTitleBar.setTitle(getResources().getString(R.string.add_friend), ITitleBarLayout.Position.MIDDLE);
+                    addFriendSendBtn.setVisibility(VISIBLE);
+                    addFriendArea.setVisibility(VISIBLE);
+                } else {
+                    mRemarkView.setVisibility(VISIBLE);
+                    chatBtn.setVisibility(VISIBLE);
+                    audioCallBtn.setVisibility(VISIBLE);
+                    videoCallBtn.setVisibility(VISIBLE);
+                    deleteFriendBtn.setVisibility(VISIBLE);
+                    mAddBlackView.setVisibility(VISIBLE);
+                    mChatTopView.setVisibility(View.VISIBLE);
+                    mChatBackground.setVisibility(VISIBLE);
+                    updateMessageOptionView();
+                }
+            }
+        }
+
+    }
+
+    private void updateMessageOptionView() {
+        mMessageOptionView.setVisibility(VISIBLE);
+        //get
+        final ArrayList<String> userIdList = new ArrayList<>();
+        userIdList.add(mId);
+
+        presenter.getC2CReceiveMessageOpt(userIdList, new IUIKitCallback<Boolean>() {
+            @Override
+            public void onSuccess(Boolean data) {
+                mMessageOptionView.setChecked(data);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                mMessageOptionView.setChecked(false);
+            }
+        });
+
+        //set
+        mMessageOptionView.setCheckListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                presenter.setC2CReceiveMessageOpt(userIdList, isChecked);
+            }
+        });
+    }
+
+    @Override
+    public void onDataSourceChanged(ContactItemBean bean) {
+        setViewContentFromItemBean(bean);
+        setupCall();
+        if (bean.isFriend()) {
+            updateMessageOptionView();
+            clearMessageBtn.setVisibility(VISIBLE);
+        }
+
+        if (!TextUtils.isEmpty(mNickname)) {
+            mNickNameView.setText(mNickname);
+        } else {
+            mNickNameView.setText(mId);
+        }
+
+        if (!TextUtils.isEmpty(bean.getAvatarUrl())) {
+            int radius = getResources().getDimensionPixelSize(R.dimen.contact_profile_face_radius);
+            GlideEngine.loadUserIcon(mHeadImageView, bean.getAvatarUrl(), radius);
+        }
+        mIDView.setText(mId);
+    }
+
+    private void loadUserProfile(String id) {
+        final ContactItemBean bean = new ContactItemBean();
+        presenter.getUsersInfo(id, bean);
+    }
+
+    private void accept() {
+        presenter.acceptFriendApplication(friendApplicationBean, FriendApplicationBean.FRIEND_ACCEPT_AGREE_AND_ADD, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                chatBtn.setText(R.string.accepted);
+                ((Activity) getContext()).finish();
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage("accept Error code = " + errCode + ", desc = " + errMsg);
+            }
+        });
+    }
+
+    private void refuse() {
+        presenter.refuseFriendApplication(friendApplicationBean, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                deleteFriendBtn.setText(R.string.refused);
+                ((Activity) getContext()).finish();
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage("refuse Error code = " + errCode + ", desc = " + errMsg);
+
+            }
+        });
+    }
+
+    public void acceptJoinGroupApply(final ContactGroupApplyInfo item) {
+        presenter.acceptJoinGroupApply(item, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                ((Activity) getContext()).finish();
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastLongMessage(errMsg);
+            }
+        });
+    }
+
+    public void refuseJoinGroupApply(final ContactGroupApplyInfo item) {
+        presenter.refuseJoinGroupApply(item, "", new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                ((Activity) getContext()).finish();
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastLongMessage(errMsg);
+            }
+        });
+    }
+
+    private void delete() {
+        List<String> identifiers = new ArrayList<>();
+        identifiers.add(mId);
+
+        presenter.deleteFriend(identifiers, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                if (mListener != null) {
+                    mListener.onDeleteFriendClick(mId);
+                }
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage("deleteFriend Error code = " + errCode + ", desc = " + errMsg);
+            }
+        });
+    }
+
+    private void chat() {
+        if (mListener != null || mContactInfo != null) {
+            mListener.onStartConversationClick(mContactInfo);
+        }
+        ((Activity) getContext()).finish();
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v  == chatBtn) {
+            chat();
+        } else if (v == deleteFriendBtn) {
+            delete();
+        }else if (v == clearMessageBtn) {
+            new TUIKitDialog(getContext())
+                    .builder()
+                    .setCancelable(true)
+                    .setCancelOutside(true)
+                    .setTitle(getContext().getString(R.string.clear_msg_tip))
+                    .setDialogWidth(0.75f)
+                    .setPositiveButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.sure), new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            Map<String, Object> hashMap = new HashMap<>();
+                            hashMap.put(TUIConstants.TUIContact.FRIEND_ID, mId);
+                            TUICore.notifyEvent(TUIConstants.TUIContact.EVENT_USER,
+                                    TUIConstants.TUIContact.EVENT_SUB_KEY_CLEAR_MESSAGE, hashMap);
+                        }
+                    })
+                    .setNegativeButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.cancel), new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+
+                        }
+                    })
+                    .show();
+        } else if (v == videoCallBtn) {
+            Map<String, Object> map = new HashMap<>();
+            map.put(TUIConstants.TUICalling.PARAM_NAME_USERIDS, new String[]{mId});
+            map.put(TUIConstants.TUICalling.PARAM_NAME_TYPE, TUIConstants.TUICalling.TYPE_VIDEO);
+            TUICore.callService(TUIConstants.TUICalling.SERVICE_NAME, TUIConstants.TUICalling.METHOD_NAME_CALL, map);
+        }  else if (v == audioCallBtn) {
+            Map<String, Object> map = new HashMap<>();
+            map.put(TUIConstants.TUICalling.PARAM_NAME_USERIDS, new String[]{mId});
+            map.put(TUIConstants.TUICalling.PARAM_NAME_TYPE, TUIConstants.TUICalling.TYPE_AUDIO);
+            TUICore.callService(TUIConstants.TUICalling.SERVICE_NAME, TUIConstants.TUICalling.METHOD_NAME_CALL, map);
+        } else if (v == addFriendSendBtn) {
+            String addWording  = addWordingEditText.getText().toString();
+            String friendGroup = "";
+            String remark = addFriendRemarkLv.getContent();
+
+            if (isGroup) {
+                presenter.joinGroup(mId, addWording, new IUIKitCallback<Void>() {
+                    @Override
+                    public void onSuccess(Void data) {
+                        ToastUtil.toastShortMessage(getContext().getString(R.string.success));
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        ToastUtil.toastShortMessage(getContext().getString(R.string.contact_add_failed) + " " + errMsg);
+                    }
+                });
+            } else {
+                presenter.addFriend(mId, addWording, friendGroup, remark, new IUIKitCallback<Pair<Integer, String>>() {
+                    @Override
+                    public void onSuccess(Pair<Integer, String> data) {
+                        ToastUtil.toastShortMessage(data.second);
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        ToastUtil.toastShortMessage(getContext().getString(R.string.contact_add_failed));
+                    }
+                });
+            }
+        } else if (v == addFriendRemarkLv) {
+            PopupInputCard popupInputCard = new PopupInputCard((Activity) getContext());
+            popupInputCard.setContent(addFriendRemarkLv.getContent());
+            popupInputCard.setTitle(getResources().getString(R.string.contact_friend_remark));
+            popupInputCard.setOnPositive((result -> {
+                addFriendRemarkLv.setContent(result);
+                if (TextUtils.isEmpty(result)) {
+                    result = "";
+                }
+                modifyRemark(result);
+            }));
+            popupInputCard.show(addFriendRemarkLv, Gravity.BOTTOM);
+        } else if (v == mRemarkView) {
+            PopupInputCard popupInputCard = new PopupInputCard((Activity) getContext());
+            popupInputCard.setContent(mRemarkView.getContent());
+            popupInputCard.setTitle(getResources().getString(R.string.profile_remark_edit));
+            String description = getResources().getString(R.string.contact_modify_remark_rule);
+            popupInputCard.setRule("^[a-zA-Z0-9_\u4e00-\u9fa5]*$");
+            popupInputCard.setDescription(description);
+            popupInputCard.setOnPositive((result -> {
+                mRemarkView.setContent(result);
+                if (TextUtils.isEmpty(result)) {
+                    result = "";
+                }
+                modifyRemark(result);
+            }));
+            popupInputCard.show(mRemarkView, Gravity.BOTTOM);
+
+        } else if (v == mChatBackground) {
+            if (mListener != null) {
+                mListener.onSetChatBackground();
+            }
+        }
+    }
+
+    private void modifyRemark(final String txt) {
+        presenter.modifyRemark(mId, txt, new IUIKitCallback<String>() {
+            @Override
+            public void onSuccess(String data) {
+                mContactInfo.setRemark(txt);
+                Map<String, Object> param = new HashMap<>();
+                param.put(TUIConstants.TUIContact.FRIEND_ID, mId);
+                param.put(TUIConstants.TUIContact.FRIEND_REMARK, txt);
+                TUICore.notifyEvent(TUIConstants.TUIContact.EVENT_FRIEND_INFO_CHANGED, TUIConstants.TUIContact.EVENT_SUB_KEY_FRIEND_REMARK_CHANGED, param);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+
+            }
+        });
+    }
+
+    private void addBlack() {
+        String[] idStringList = mId.split(",");
+        List<String> idList = new ArrayList<>(Arrays.asList(idStringList));
+        presenter.addToBlackList(idList);
+    }
+
+    private void deleteBlack() {
+        String[] idStringList = mId.split(",");
+        List<String> idList = new ArrayList<>(Arrays.asList(idStringList));
+        presenter.deleteFromBlackList(idList);
+    }
+
+    public void setOnButtonClickListener(OnButtonClickListener l) {
+        mListener = l;
+    }
+
+    public interface OnButtonClickListener {
+        void onStartConversationClick(ContactItemBean info);
+
+        void onDeleteFriendClick(String id);
+
+        default void onSetChatBackground() {};
+    }
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/widget/Menu.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/widget/Menu.java
new file mode 100644
index 0000000..def265a
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/widget/Menu.java
@@ -0,0 +1,173 @@
+package com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget;
+
+import android.app.Activity;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PixelFormat;
+import android.graphics.RectF;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.PopupWindow;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.R;
+import com.tencent.qcloud.tuicore.component.action.PopMenuAction;
+import com.tencent.qcloud.tuicore.component.action.PopMenuAdapter;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Menu {
+
+    private static final int SHADOW_WIDTH = 10;
+    private static final int Y_OFFSET = 4;
+
+    private ListView mMenuList;
+    private PopMenuAdapter mMenuAdapter;
+    private PopupWindow mMenuWindow;
+    private List<PopMenuAction> mActions = new ArrayList<>();
+    private Activity mActivity;
+    private View mAttachView;
+
+    public Menu(Activity activity, View attach) {
+        mActivity = activity;
+        mAttachView = attach;
+    }
+
+    public void setMenuAction(List<PopMenuAction> menuActions) {
+        mActions.clear();
+        mActions.addAll(menuActions);
+    }
+
+    public boolean isShowing() {
+        if (mMenuWindow == null) {
+            return false;
+        }
+        return mMenuWindow.isShowing();
+    }
+
+    public void hide() {
+        mMenuWindow.dismiss();
+    }
+
+    public void show() {
+        if (mActions == null || mActions.size() == 0) {
+            return;
+        }
+        mMenuWindow = new PopupWindow(mActivity);
+        mMenuWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
+        mMenuWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+        mMenuWindow.setBackgroundDrawable(new ColorDrawable());
+
+        mMenuAdapter = new PopMenuAdapter();
+        mMenuAdapter.setDataSource(mActions);
+        View menuView = LayoutInflater.from(mActivity).inflate(R.layout.core_pop_menu, null);
+
+        menuView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+        mMenuWindow.setContentView(menuView);
+        mMenuList = menuView.findViewById(R.id.menu_pop_list);
+        mMenuList.setAdapter(mMenuAdapter);
+        mMenuList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                PopMenuAction action = (PopMenuAction) mMenuAdapter.getItem(position);
+                if (action != null && action.getActionClickListener() != null) {
+                    action.getActionClickListener().onActionClick(position, mActions.get(position));
+                }
+            }
+        });
+
+        int paddingLeftRight = ScreenUtil.dip2px(15.0f);
+        int paddingTopBottom = ScreenUtil.dip2px(12.0f);
+
+        int itemWidth = mActivity.getResources().getDimensionPixelSize(R.dimen.core_pop_menu_item_width);
+        int itemHeight = mActivity.getResources().getDimensionPixelSize(R.dimen.core_pop_menu_item_height);
+        float anchorWidth = mAttachView.getWidth();
+        float anchorHeight = mAttachView.getHeight();
+
+        mMenuWindow.getContentView().measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
+
+        int[] location = new int[2];
+        mAttachView.getLocationOnScreen(location);
+        int rowCount = mActions.size();
+        int indicatorHeight = mActivity.getResources().getDimensionPixelOffset(R.dimen.core_pop_menu_indicator_height);
+
+        int popWidth = itemWidth + paddingLeftRight * 2 - SHADOW_WIDTH;
+        int popHeight = itemHeight * rowCount + paddingTopBottom * 2 - SHADOW_WIDTH;
+
+        float indicatorX = anchorWidth / 2;
+        int screenWidth = ScreenUtil.getScreenWidth(mActivity);
+        int x = location[0];
+        int y;
+        float xOffset = anchorWidth / 2;
+        // If it is on the right, the x-coordinate of the small arrow and the x-position of the pop-up window will change
+        if (location[0] * 2 + anchorWidth > screenWidth) {
+            indicatorX = popWidth - anchorWidth / 2 - xOffset;
+            x = (int) (location[0] + anchorWidth - popWidth + xOffset);
+        }
+
+        y = (int) (location[1] + anchorHeight) + Y_OFFSET;
+        popHeight = popHeight - indicatorHeight;
+
+        Drawable backgroundDrawable = getBackgroundDrawable(popWidth, popHeight, indicatorX, indicatorHeight, 16);
+        menuView.setBackground(backgroundDrawable);
+
+        mMenuWindow.setFocusable(true);
+        mMenuWindow.setTouchable(true);
+        mMenuWindow.setOutsideTouchable(true);
+        mMenuWindow.showAtLocation(mAttachView, Gravity.NO_GRAVITY, x, y);
+    }
+
+    /**
+     * Draw a popup background with small triangles
+     */
+    public Drawable getBackgroundDrawable(final float widthPixel, final float heightPixel, float indicatorX, float indicatorHeight, float radius) {
+        int borderWidth = SHADOW_WIDTH;
+
+        Path path = new Path();
+        Drawable drawable = new Drawable() {
+
+            @Override
+            public void draw(@NonNull Canvas canvas) {
+                Paint paint = new Paint();
+                paint.setColor(Color.WHITE);
+                paint.setStyle(Paint.Style.FILL);
+                paint.setShadowLayer(borderWidth, 0,0,0xFFAAAAAA);
+                path.addRoundRect(new RectF(borderWidth, indicatorHeight + borderWidth, widthPixel - borderWidth, heightPixel + indicatorHeight - borderWidth), radius, radius, Path.Direction.CW);
+                path.moveTo(indicatorX - indicatorHeight, indicatorHeight + borderWidth);
+                path.lineTo(indicatorX, borderWidth);
+                path.lineTo(indicatorX + indicatorHeight, indicatorHeight + borderWidth);
+                path.close();
+                canvas.drawPath(path, paint);
+            }
+
+            @Override
+            public void setAlpha(int alpha) {
+
+            }
+
+            @Override
+            public void setColorFilter(@Nullable ColorFilter colorFilter) {
+
+            }
+
+            @Override
+            public int getOpacity() {
+                return PixelFormat.TRANSLUCENT;
+            }
+        };
+        return drawable;
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/widget/NewFriendListAdapter.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/widget/NewFriendListAdapter.java
new file mode 100644
index 0000000..bec6dd9
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/minimalistui/widget/NewFriendListAdapter.java
@@ -0,0 +1,154 @@
+package com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactConstants;
+import com.tencent.qcloud.tuikit.tuicontact.bean.FriendApplicationBean;
+import com.tencent.qcloud.tuikit.tuicontact.presenter.NewFriendPresenter;
+
+import java.util.List;
+
+public class NewFriendListAdapter extends ArrayAdapter<FriendApplicationBean> {
+
+    private static final String TAG = NewFriendListAdapter.class.getSimpleName();
+
+    private int mResourceId;
+    private View mView;
+    private ViewHolder mViewHolder;
+
+    private NewFriendPresenter presenter;
+    /**
+     * Constructor
+     *
+     * @param context  The current context.
+     * @param resource The resource ID for a layout ic_chat_input_file containing a TextView to use when
+     *                 instantiating views.
+     * @param objects  The objects to represent in the ListView.
+     */
+    public NewFriendListAdapter(Context context, int resource, List<FriendApplicationBean> objects) {
+        super(context, resource, objects);
+        mResourceId = resource;
+    }
+
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        final FriendApplicationBean data = getItem(position);
+        if (convertView != null) {
+            mView = convertView;
+            mViewHolder = (ViewHolder) mView.getTag();
+        } else {
+            mView = LayoutInflater.from(getContext()).inflate(mResourceId, null);
+            mView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Bundle bundle = new Bundle();
+                    bundle.putSerializable(TUIContactConstants.ProfileType.CONTENT, data);
+                    TUICore.startActivity("FriendProfileMinimalistActivity", bundle);
+                }
+            });
+            mViewHolder = new ViewHolder();
+            mViewHolder.avatar = mView.findViewById(R.id.avatar);
+            mViewHolder.name = mView.findViewById(R.id.name);
+            mViewHolder.des = mView.findViewById(R.id.description);
+            mViewHolder.agree = mView.findViewById(R.id.agree);
+            mViewHolder.reject = mView.findViewById(R.id.reject);
+            mViewHolder.result = mView.findViewById(R.id.result_tv);
+            mView.setTag(mViewHolder);
+        }
+        Resources res = getContext().getResources();
+        int radius = mView.getResources().getDimensionPixelSize(R.dimen.contact_profile_face_radius);
+        GlideEngine.loadUserIcon(mViewHolder.avatar, data.getFaceUrl(), radius);
+        mViewHolder.name.setText(TextUtils.isEmpty(data.getNickName()) ? data.getUserId() : data.getNickName());
+        mViewHolder.des.setText(data.getAddWording());
+        switch (data.getAddType()) {
+            case FriendApplicationBean.FRIEND_APPLICATION_COME_IN:
+                mViewHolder.agree.setText(res.getString(R.string.request_agree));
+                mViewHolder.agree.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        doResponse(data, true);
+                    }
+                });
+                mViewHolder.reject.setText(res.getString(R.string.refuse));
+                mViewHolder.reject.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        doResponse(data, false);
+                    }
+                });
+                if (data.isAccept()) {
+                    mViewHolder.agree.setVisibility(View.GONE);
+                    mViewHolder.reject.setVisibility(View.GONE);
+                    mViewHolder.result.setVisibility(View.VISIBLE);
+                }
+                break;
+            case FriendApplicationBean.FRIEND_APPLICATION_BOTH:
+                mViewHolder.agree.setText(res.getString(R.string.request_accepted));
+                break;
+        }
+        return mView;
+    }
+
+    private void doResponse(FriendApplicationBean bean, boolean isAccept) {
+        if (presenter != null) {
+            if (isAccept) {
+                presenter.acceptFriendApplication(bean, new IUIKitCallback<Void>() {
+                    @Override
+                    public void onSuccess(Void data) {
+                        bean.setAccept(true);
+                        refreshList();
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        ToastUtil.toastShortMessage("Error code = " + errCode + ", desc = " + errMsg);
+                    }
+                });
+            } else {
+                presenter.refuseFriendApplication(bean, new IUIKitCallback<Void>() {
+                    @Override
+                    public void onSuccess(Void data) {
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        ToastUtil.toastShortMessage("Error code = " + errCode + ", desc = " + errMsg);
+                    }
+                });
+            }
+        }
+    }
+
+    private void refreshList() {
+        notifyDataSetChanged();
+    }
+
+    public void setPresenter(NewFriendPresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    public class ViewHolder {
+        ImageView avatar;
+        TextView name;
+        TextView des;
+        TextView agree;
+        TextView reject;
+        TextView result;
+    }
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/model/ContactProvider.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/model/ContactProvider.java
new file mode 100644
index 0000000..992c656
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/model/ContactProvider.java
@@ -0,0 +1,660 @@
+package com.tencent.qcloud.tuikit.tuicontact.model;
+
+import android.text.TextUtils;
+import android.util.Pair;
+
+import com.tencent.imsdk.v2.V2TIMCallback;
+import com.tencent.imsdk.v2.V2TIMCreateGroupMemberInfo;
+import com.tencent.imsdk.v2.V2TIMFriendAddApplication;
+import com.tencent.imsdk.v2.V2TIMFriendApplication;
+import com.tencent.imsdk.v2.V2TIMFriendApplicationResult;
+import com.tencent.imsdk.v2.V2TIMFriendInfo;
+import com.tencent.imsdk.v2.V2TIMFriendOperationResult;
+import com.tencent.imsdk.v2.V2TIMGroupApplication;
+import com.tencent.imsdk.v2.V2TIMGroupInfo;
+import com.tencent.imsdk.v2.V2TIMGroupInfoResult;
+import com.tencent.imsdk.v2.V2TIMGroupMemberFullInfo;
+import com.tencent.imsdk.v2.V2TIMGroupMemberInfoResult;
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.imsdk.v2.V2TIMReceiveMessageOptInfo;
+import com.tencent.imsdk.v2.V2TIMSendCallback;
+import com.tencent.imsdk.v2.V2TIMUserFullInfo;
+import com.tencent.imsdk.v2.V2TIMUserStatus;
+import com.tencent.imsdk.v2.V2TIMValueCallback;
+import com.tencent.qcloud.tuicore.BuildConfig;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ErrorMessageConverter;
+import com.tencent.qcloud.tuicore.util.ThreadHelper;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactService;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactGroupApplyInfo;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.bean.FriendApplicationBean;
+import com.tencent.qcloud.tuikit.tuicontact.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuicontact.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuicontact.config.TUIContactConfig;
+import com.tencent.qcloud.tuikit.tuicontact.util.ContactUtils;
+import com.tencent.qcloud.tuikit.tuicontact.util.TUIContactLog;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+public class ContactProvider {
+    private static final String TAG = ContactProvider.class.getSimpleName();
+    private long mNextSeq = 0;
+
+    public void loadFriendListDataAsync(IUIKitCallback<List<ContactItemBean>> callback) {
+        TUIContactLog.i(TAG, "loadFriendListDataAsync");
+        ThreadHelper.INST.execute(new Runnable() {
+            @Override
+            public void run() {
+                // 压测时数据量比较大，query耗时比较久，所以这里使用新线程来处理
+                // The amount of data during the stress test is relatively large, and the query takes a long time, so a new thread is used here to process
+                V2TIMManager.getFriendshipManager().getFriendList(new V2TIMValueCallback<List<V2TIMFriendInfo>>() {
+                    @Override
+                    public void onError(int code, String desc) {
+                        TUIContactLog.e(TAG, "loadFriendListDataAsync err code:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
+                        ContactUtils.callbackOnError(callback, TAG, code, desc);
+                    }
+
+                    @Override
+                    public void onSuccess(List<V2TIMFriendInfo> v2TIMFriendInfos) {
+                        List<ContactItemBean> contactItemBeanList = new ArrayList<>();
+                        TUIContactLog.i(TAG, "loadFriendListDataAsync->getFriendList:" + v2TIMFriendInfos.size());
+                        for (V2TIMFriendInfo timFriendInfo : v2TIMFriendInfos) {
+                            ContactItemBean info = new ContactItemBean();
+                            info.setFriend(true);
+                            info.covertTIMFriend(timFriendInfo);
+                            contactItemBeanList.add(info);
+                        }
+                        ContactUtils.callbackOnSuccess(callback, contactItemBeanList);
+                    }
+                });
+            }
+        });
+    }
+
+
+    public void loadBlackListData(IUIKitCallback<List<ContactItemBean>> callback) {
+        TUIContactLog.i(TAG, "loadBlackListData");
+
+        V2TIMManager.getFriendshipManager().getBlackList(new V2TIMValueCallback<List<V2TIMFriendInfo>>() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIContactLog.e(TAG, "getBlackList err code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+                ContactUtils.callbackOnError(callback, TAG, code, desc);
+            }
+
+            @Override
+            public void onSuccess(List<V2TIMFriendInfo> v2TIMFriendInfos) {
+                TUIContactLog.i(TAG, "getBlackList success: " + v2TIMFriendInfos.size());
+                if (v2TIMFriendInfos.size() == 0) {
+                    TUIContactLog.i(TAG, "getBlackList success but no data");
+                }
+                List<ContactItemBean> contactItemBeanList = new ArrayList<>();
+                for (V2TIMFriendInfo timFriendInfo : v2TIMFriendInfos) {
+                    ContactItemBean info = new ContactItemBean();
+                    info.covertTIMFriend(timFriendInfo).setBlackList(true);
+                    contactItemBeanList.add(info);
+                }
+                ContactUtils.callbackOnSuccess(callback, contactItemBeanList);
+            }
+        });
+
+    }
+
+    public void loadGroupListData(IUIKitCallback<List<ContactItemBean>> callback) {
+        TUIContactLog.i(TAG, "loadGroupListData");
+        V2TIMManager.getGroupManager().getJoinedGroupList(new V2TIMValueCallback<List<V2TIMGroupInfo>>() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIContactLog.e(TAG, "getGroupList err code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+                ContactUtils.callbackOnError(callback, TAG, code, desc);
+            }
+
+            @Override
+            public void onSuccess(List<V2TIMGroupInfo> v2TIMGroupInfos) {
+                TUIContactLog.i(TAG, "getGroupList success: " + v2TIMGroupInfos.size());
+                if (v2TIMGroupInfos.size() == 0) {
+                    TUIContactLog.i(TAG, "getGroupList success but no data");
+                }
+                List<ContactItemBean> contactItemBeanList = new ArrayList<>();
+
+                for (V2TIMGroupInfo info : v2TIMGroupInfos) {
+                    ContactItemBean bean = new ContactItemBean();
+                    contactItemBeanList.add(bean.covertTIMGroupBaseInfo(info));
+                }
+                ContactUtils.callbackOnSuccess(callback, contactItemBeanList);
+            }
+        });
+    }
+
+    public long getNextSeq() {
+        return mNextSeq;
+    }
+
+    public void setNextSeq(long nextSeq) {
+        this.mNextSeq = nextSeq;
+    }
+
+    public void loadGroupMembers(String groupId, IUIKitCallback<List<ContactItemBean>> callback) {
+        V2TIMManager.getGroupManager().getGroupMemberList(groupId, V2TIMGroupMemberFullInfo.V2TIM_GROUP_MEMBER_FILTER_ALL, mNextSeq, new V2TIMValueCallback<V2TIMGroupMemberInfoResult>() {
+            @Override
+            public void onError(int code, String desc) {
+                ContactUtils.callbackOnError(callback, TAG, code, desc);
+                TUIContactLog.e(TAG, "loadGroupMembers failed, code: " + code + "|desc: " + ErrorMessageConverter.convertIMError(code, desc));
+            }
+
+            @Override
+            public void onSuccess(V2TIMGroupMemberInfoResult v2TIMGroupMemberInfoResult) {
+                List<V2TIMGroupMemberFullInfo> members = new ArrayList<>();
+                for (int i = 0; i < v2TIMGroupMemberInfoResult.getMemberInfoList().size(); i++) {
+                    if (v2TIMGroupMemberInfoResult.getMemberInfoList().get(i).getUserID().equals(V2TIMManager.getInstance().getLoginUser())) {
+                        continue;
+                    }
+                    members.add(v2TIMGroupMemberInfoResult.getMemberInfoList().get(i));
+                }
+
+                mNextSeq = v2TIMGroupMemberInfoResult.getNextSeq();
+                List<ContactItemBean> contactItemBeanList = new ArrayList<>();
+                for (V2TIMGroupMemberFullInfo info : members) {
+                    ContactItemBean bean = new ContactItemBean();
+                    contactItemBeanList.add(bean.covertTIMGroupMemberFullInfo(info));
+                }
+                ContactUtils.callbackOnSuccess(callback, contactItemBeanList);
+            }
+        });
+    }
+
+    public void addFriend(String userId, String addWording, IUIKitCallback<Pair<Integer, String>> callback) {
+        addFriend(userId, addWording, null, null, callback);
+    }
+
+    public void addFriend(String userId, String addWording, String friendGroup, String remark, IUIKitCallback<Pair<Integer, String>> callback) {
+        V2TIMFriendAddApplication v2TIMFriendAddApplication = new V2TIMFriendAddApplication(userId);
+        v2TIMFriendAddApplication.setAddWording(addWording);
+        v2TIMFriendAddApplication.setAddSource("android");
+        v2TIMFriendAddApplication.setFriendGroup(friendGroup);
+        v2TIMFriendAddApplication.setFriendRemark(remark);
+        V2TIMManager.getFriendshipManager().addFriend(v2TIMFriendAddApplication, new V2TIMValueCallback<V2TIMFriendOperationResult>() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIContactLog.e(TAG, "addFriend err code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+                ContactUtils.callbackOnError(callback, TAG, code, desc);
+            }
+
+            @Override
+            public void onSuccess(V2TIMFriendOperationResult v2TIMFriendOperationResult) {
+                TUIContactLog.i(TAG, "addFriend success");
+                ContactUtils.callbackOnSuccess(callback, new Pair<>(v2TIMFriendOperationResult.getResultCode(), v2TIMFriendOperationResult.getResultInfo()));
+            }
+        });
+    }
+
+    public void joinGroup(String groupId, String addWording, IUIKitCallback<Void> callback) {
+        V2TIMManager.getInstance().joinGroup(groupId, addWording, new V2TIMCallback() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIContactLog.e(TAG, "addGroup err code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+                ContactUtils.callbackOnError(callback, TAG, code, desc);
+            }
+
+            @Override
+            public void onSuccess() {
+                TUIContactLog.i(TAG, "addGroup success");
+                ContactUtils.callbackOnSuccess(callback, null);
+            }
+        });
+    }
+
+    public void loadFriendApplicationList(IUIKitCallback<List<FriendApplicationBean>> callback) {
+        V2TIMManager.getFriendshipManager().getFriendApplicationList(new V2TIMValueCallback<V2TIMFriendApplicationResult>() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIContactLog.e(TAG, "getPendencyList err code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+                ContactUtils.callbackOnError(callback, TAG, code, desc);
+            }
+
+            @Override
+            public void onSuccess(V2TIMFriendApplicationResult v2TIMFriendApplicationResult) {
+                List<FriendApplicationBean> applicationBeanList = new ArrayList<>();
+                for (V2TIMFriendApplication application : v2TIMFriendApplicationResult.getFriendApplicationList()) {
+                    FriendApplicationBean bean = new FriendApplicationBean();
+                    bean.convertFromTimFriendApplication(application);
+                    applicationBeanList.add(bean);
+                }
+                ContactUtils.callbackOnSuccess(callback, applicationBeanList);
+            }
+        });
+    }
+
+    public void getFriendApplicationListUnreadCount(IUIKitCallback<Integer> callback) {
+        V2TIMManager.getFriendshipManager().getFriendApplicationList(new V2TIMValueCallback<V2TIMFriendApplicationResult>() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIContactLog.e(TAG, "getPendencyList err code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+                ContactUtils.callbackOnError(callback, TAG, code, desc);
+            }
+
+            @Override
+            public void onSuccess(V2TIMFriendApplicationResult v2TIMFriendApplicationResult) {
+                ContactUtils.callbackOnSuccess(callback, v2TIMFriendApplicationResult.getUnreadCount());
+            }
+        });
+    }
+
+    private void acceptFriendApplication(V2TIMFriendApplication friendApplication, int responseType, IUIKitCallback<Void> callback) {
+        V2TIMManager.getFriendshipManager().acceptFriendApplication(
+                friendApplication, responseType, new V2TIMValueCallback<V2TIMFriendOperationResult>() {
+                    @Override
+                    public void onError(int code, String desc) {
+                        TUIContactLog.e(TAG, "acceptFriend err code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+                    }
+
+                    @Override
+                    public void onSuccess(V2TIMFriendOperationResult v2TIMFriendOperationResult) {
+                        TUIContactLog.i(TAG, "acceptFriend success");
+                        ContactUtils.callbackOnSuccess(callback, null);
+                    }
+                });
+    }
+
+    public void acceptFriendApplication(FriendApplicationBean bean, int responseType, IUIKitCallback<Void> callback) {
+        V2TIMFriendApplication friendApplication = bean.getFriendApplication();
+        acceptFriendApplication(friendApplication, responseType, callback);
+
+    }
+
+    public void getC2CReceiveMessageOpt(List<String> userIdList, IUIKitCallback<Boolean> callback) {
+        V2TIMManager.getMessageManager().getC2CReceiveMessageOpt(userIdList, new V2TIMValueCallback<List<V2TIMReceiveMessageOptInfo>>() {
+            @Override
+            public void onSuccess(List<V2TIMReceiveMessageOptInfo> V2TIMReceiveMessageOptInfos) {
+                if (V2TIMReceiveMessageOptInfos == null || V2TIMReceiveMessageOptInfos.isEmpty()) {
+                    TUIContactLog.d(TAG, "getC2CReceiveMessageOpt null");
+                    ContactUtils.callbackOnError(callback, TAG, -1, "getC2CReceiveMessageOpt null");
+                    return;
+                }
+                V2TIMReceiveMessageOptInfo V2TIMReceiveMessageOptInfo = V2TIMReceiveMessageOptInfos.get(0);
+                int option = V2TIMReceiveMessageOptInfo.getC2CReceiveMessageOpt();
+
+                TUIContactLog.d(TAG, "getC2CReceiveMessageOpt option = " + option);
+                ContactUtils.callbackOnSuccess(callback, option == V2TIMMessage.V2TIM_RECEIVE_NOT_NOTIFY_MESSAGE);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIContactLog.d(TAG, "getC2CReceiveMessageOpt onError code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+                ContactUtils.callbackOnError(callback, TAG, code, desc);
+            }
+        });
+    }
+
+    public void  setC2CReceiveMessageOpt(List<String> userIdList, boolean isReceiveMessage, IUIKitCallback<Void> callback) {
+        int option;
+        if (isReceiveMessage) {
+            option = V2TIMMessage.V2TIM_RECEIVE_NOT_NOTIFY_MESSAGE;
+        } else {
+            option = V2TIMMessage.V2TIM_RECEIVE_MESSAGE;
+        }
+        V2TIMManager.getMessageManager().setC2CReceiveMessageOpt(userIdList, option, new V2TIMCallback() {
+            @Override
+            public void onSuccess() {
+                TUIContactLog.d(TAG, "setC2CReceiveMessageOpt onSuccess");
+                ContactUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIContactLog.d(TAG, "setC2CReceiveMessageOpt onError code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+                ContactUtils.callbackOnError(callback, TAG, code, desc);
+            }
+        });
+    }
+
+    public void getGroupInfo(List<String> groupIds, IUIKitCallback<List<GroupInfo>> callback) {
+        V2TIMManager.getGroupManager().getGroupsInfo(groupIds, new V2TIMValueCallback<List<V2TIMGroupInfoResult>>() {
+            @Override
+            public void onSuccess(List<V2TIMGroupInfoResult> v2TIMGroupInfoResults) {
+                List<GroupInfo> groupInfos = new ArrayList<>();
+                for (V2TIMGroupInfoResult result : v2TIMGroupInfoResults) {
+                    if (result.getResultCode() != 0) {
+                        ContactUtils.callbackOnError(callback, result.getResultCode(), result.getResultMessage());
+                        return;
+                    }
+                    GroupInfo groupInfo = new GroupInfo();
+                    groupInfo.setId(result.getGroupInfo().getGroupID());
+                    groupInfo.setFaceUrl(result.getGroupInfo().getFaceUrl());
+                    groupInfo.setGroupName(result.getGroupInfo().getGroupName());
+                    groupInfo.setMemberCount(result.getGroupInfo().getMemberCount());
+                    groupInfo.setGroupType(result.getGroupInfo().getGroupType());
+                    groupInfos.add(groupInfo);
+                }
+                ContactUtils.callbackOnSuccess(callback, groupInfos);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                ContactUtils.callbackOnError(callback, code, desc);
+            }
+        });
+    }
+
+    public void getUserInfo(List<String> userIdList, IUIKitCallback<List<ContactItemBean>> callback) {
+        V2TIMManager.getInstance().getUsersInfo(userIdList, new V2TIMValueCallback<List<V2TIMUserFullInfo>>() {
+            @Override
+            public void onError ( int code, String desc){
+                TUIContactLog.e(TAG, "loadUserProfile err code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+                ContactUtils.callbackOnError(callback, TAG, code, desc);
+            }
+
+            @Override
+            public void onSuccess (List<V2TIMUserFullInfo > v2TIMUserFullInfos) {
+                List<ContactItemBean> contactItemBeanList = new ArrayList<>();
+                for(V2TIMUserFullInfo userFullInfo : v2TIMUserFullInfos) {
+                    ContactItemBean contactItemBean = new ContactItemBean();
+                    contactItemBean.setNickName(userFullInfo.getNickName());
+                    contactItemBean.setId(userFullInfo.getUserID());
+                    contactItemBean.setAvatarUrl(userFullInfo.getFaceUrl());
+                    contactItemBean.setSignature(userFullInfo.getSelfSignature());
+                    contactItemBeanList.add(contactItemBean);
+                }
+                ContactUtils.callbackOnSuccess(callback, contactItemBeanList);
+            }
+        });
+    }
+
+    public void isInBlackList(String id, IUIKitCallback<Boolean> callback) {
+        V2TIMManager.getFriendshipManager().getBlackList(new V2TIMValueCallback<List<V2TIMFriendInfo>>() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIContactLog.e(TAG, "getBlackList err code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+                ContactUtils.callbackOnError(callback, TAG, code, desc);
+            }
+
+            @Override
+            public void onSuccess(List<V2TIMFriendInfo> v2TIMFriendInfos) {
+                if (v2TIMFriendInfos != null && v2TIMFriendInfos.size() > 0) {
+                    for (V2TIMFriendInfo friendInfo : v2TIMFriendInfos) {
+                        if (TextUtils.equals(friendInfo.getUserID(), id)) {
+                            ContactUtils.callbackOnSuccess(callback, true);
+                            return;
+                        }
+                    }
+                }
+                ContactUtils.callbackOnSuccess(callback, false);
+            }
+        });
+    }
+
+    public void isFriend(String id, ContactItemBean bean, IUIKitCallback<Boolean> callback) {
+        V2TIMManager.getFriendshipManager().getFriendList(new V2TIMValueCallback<List<V2TIMFriendInfo>>() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIContactLog.e(TAG, "getFriendList err code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+                ContactUtils.callbackOnError(callback, TAG, code, desc);
+            }
+
+            @Override
+            public void onSuccess(List<V2TIMFriendInfo> v2TIMFriendInfos) {
+                if (v2TIMFriendInfos != null && v2TIMFriendInfos.size() > 0) {
+                    for (V2TIMFriendInfo friendInfo : v2TIMFriendInfos) {
+                        if (TextUtils.equals(friendInfo.getUserID(), id)) {
+                            bean.setFriend(true);
+                            bean.setRemark(friendInfo.getFriendRemark());
+                            bean.setAvatarUrl(friendInfo.getUserProfile().getFaceUrl());
+                            ContactUtils.callbackOnSuccess(callback, true);
+                            return;
+                        }
+                    }
+                }
+                ContactUtils.callbackOnSuccess(callback, false);
+            }
+        });
+    }
+
+    public void deleteFromBlackList(List<String> idList, IUIKitCallback<Void> callback) {
+        V2TIMManager.getFriendshipManager().deleteFromBlackList(idList, new V2TIMValueCallback<List<V2TIMFriendOperationResult>>() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIContactLog.e(TAG, "deleteBlackList err code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+                ContactUtils.callbackOnError(callback, TAG, code, desc);
+            }
+
+            @Override
+            public void onSuccess(List<V2TIMFriendOperationResult> v2TIMFriendOperationResults) {
+                TUIContactLog.i(TAG, "deleteBlackList success");
+                ContactUtils.callbackOnSuccess(callback, null);
+
+            }
+        });
+    }
+
+    public void addToBlackList(List<String> idList, IUIKitCallback<Void> callback) {
+        V2TIMManager.getFriendshipManager().addToBlackList(idList, new V2TIMValueCallback<List<V2TIMFriendOperationResult>>() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIContactLog.e(TAG, "deleteBlackList err code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+                ContactUtils.callbackOnError(callback, TAG, code, desc);
+            }
+
+            @Override
+            public void onSuccess(List<V2TIMFriendOperationResult> v2TIMFriendOperationResults) {
+                TUIContactLog.i(TAG, "deleteBlackList success");
+                ContactUtils.callbackOnSuccess(callback, null);
+
+            }
+        });
+    }
+
+    public void modifyRemark(String id, String remark, IUIKitCallback<String> callback) {
+
+        V2TIMFriendInfo v2TIMFriendInfo = new V2TIMFriendInfo();
+        v2TIMFriendInfo.setUserID(id);
+        v2TIMFriendInfo.setFriendRemark(remark);
+
+        V2TIMManager.getFriendshipManager().setFriendInfo(v2TIMFriendInfo, new V2TIMCallback() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIContactLog.e(TAG, "modifyRemark err code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+                ContactUtils.callbackOnError(callback, TAG, code, desc);
+            }
+
+            @Override
+            public void onSuccess() {
+                ContactUtils.callbackOnSuccess(callback, remark);
+                TUIContactLog.i(TAG, "modifyRemark success");
+            }
+        });
+    }
+
+    public void deleteFriend(List<String> identifiers, IUIKitCallback<Void> callback) {
+        V2TIMManager.getFriendshipManager().deleteFromFriendList(identifiers, V2TIMFriendInfo.V2TIM_FRIEND_TYPE_BOTH, new V2TIMValueCallback<List<V2TIMFriendOperationResult>>() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIContactLog.e(TAG, "deleteFriends err code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+                ContactUtils.callbackOnError(callback, TAG, code, desc);
+            }
+
+            @Override
+            public void onSuccess(List<V2TIMFriendOperationResult> v2TIMFriendOperationResults) {
+                TUIContactLog.i(TAG, "deleteFriends success");
+                ContactUtils.callbackOnSuccess(callback, null);
+            }
+        });
+    }
+
+    public void refuseFriendApplication(FriendApplicationBean friendApplication, IUIKitCallback<Void> callback) {
+        V2TIMFriendApplication v2TIMFriendApplication = friendApplication.getFriendApplication();
+        if (v2TIMFriendApplication == null) {
+            ContactUtils.callbackOnError(callback, "refuseFriendApplication", -1,  "V2TIMFriendApplication is null");
+            return;
+        }
+        V2TIMManager.getFriendshipManager().refuseFriendApplication(v2TIMFriendApplication, new V2TIMValueCallback<V2TIMFriendOperationResult>() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIContactLog.e(TAG, "accept err code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+                ContactUtils.callbackOnError(callback, TAG, code, desc);
+                ToastUtil.toastShortMessage("Error code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+            }
+
+            @Override
+            public void onSuccess(V2TIMFriendOperationResult v2TIMFriendOperationResult) {
+                TUIContactLog.i(TAG, "refuse success");
+                ContactUtils.callbackOnSuccess(callback, null);
+            }
+        });
+    }
+
+    public void createGroupChat(GroupInfo groupInfo, IUIKitCallback<String> callback) {
+        V2TIMGroupInfo v2TIMGroupInfo = new V2TIMGroupInfo();
+        v2TIMGroupInfo.setGroupType(groupInfo.getGroupType());
+        v2TIMGroupInfo.setGroupName(groupInfo.getGroupName());
+        v2TIMGroupInfo.setGroupAddOpt(groupInfo.getJoinType());
+        v2TIMGroupInfo.setGroupID(groupInfo.getId());
+        v2TIMGroupInfo.setFaceUrl(groupInfo.getFaceUrl());
+        if (TextUtils.equals(v2TIMGroupInfo.getGroupType(), V2TIMManager.GROUP_TYPE_COMMUNITY)) {
+            v2TIMGroupInfo.setSupportTopic(groupInfo.isCommunitySupportTopic());
+        }
+
+        List<V2TIMCreateGroupMemberInfo> v2TIMCreateGroupMemberInfoList = new ArrayList<>();
+        for (int i = 0; i < groupInfo.getMemberDetails().size(); i++) {
+            GroupMemberInfo groupMemberInfo = groupInfo.getMemberDetails().get(i);
+            V2TIMCreateGroupMemberInfo v2TIMCreateGroupMemberInfo = new V2TIMCreateGroupMemberInfo();
+            v2TIMCreateGroupMemberInfo.setUserID(groupMemberInfo.getAccount());
+            v2TIMCreateGroupMemberInfoList.add(v2TIMCreateGroupMemberInfo);
+        }
+
+        V2TIMManager.getGroupManager().createGroup(v2TIMGroupInfo, v2TIMCreateGroupMemberInfoList, new V2TIMValueCallback<String>() {
+            @Override
+            public void onSuccess(String s) {
+                ContactUtils.callbackOnSuccess(callback, s);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                ContactUtils.callbackOnError(callback, code, desc);
+            }
+        });
+    }
+
+
+    public void sendGroupTipsMessage(String groupId, String message, IUIKitCallback<String> callback) {
+        V2TIMMessage v2TIMMessage = V2TIMManager.getMessageManager().createCustomMessage(message.getBytes());
+        V2TIMManager.getMessageManager().sendMessage(v2TIMMessage, null, groupId,
+                V2TIMMessage.V2TIM_PRIORITY_DEFAULT, false, null, new V2TIMSendCallback<V2TIMMessage>() {
+                    @Override
+                    public void onProgress(int progress) {
+
+                    }
+
+                    @Override
+                    public void onError(int code, String desc) {
+                        TUIContactLog.i(TAG, "sendTipsMessage error , code : " + code + " desc : " + ErrorMessageConverter.convertIMError(code, desc));
+                        ContactUtils.callbackOnError(callback, TAG, code, desc);
+                    }
+
+                    @Override
+                    public void onSuccess(V2TIMMessage v2TIMMessage) {
+                        TUIContactLog.i(TAG, "sendTipsMessage onSuccess");
+                        ContactUtils.callbackOnSuccess(callback, groupId);
+                    }
+                });
+
+    }
+
+    public void acceptJoinGroupApply(ContactGroupApplyInfo applyInfo, IUIKitCallback<Void> callback) {
+        V2TIMGroupApplication application = applyInfo.getTimGroupApplication();
+        String reason = applyInfo.getRequestMsg();
+        V2TIMManager.getGroupManager().acceptGroupApplication(application, reason, new V2TIMCallback() {
+            @Override
+            public void onSuccess() {
+                ContactUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                ContactUtils.callbackOnError(callback, code, desc);
+
+            }
+        });
+    }
+
+    public void refuseJoinGroupApply(ContactGroupApplyInfo info, String reason, IUIKitCallback<Void> callback) {
+        V2TIMGroupApplication application = info.getTimGroupApplication();
+        V2TIMManager.getGroupManager().refuseGroupApplication(application, reason, new V2TIMCallback() {
+            @Override
+            public void onSuccess() {
+                ContactUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                ContactUtils.callbackOnError(callback, code, desc);
+            }
+        });
+    }
+
+    public void setGroupApplicationRead(IUIKitCallback<Void> callback) {
+        V2TIMManager.getGroupManager().setGroupApplicationRead(new V2TIMCallback() {
+            @Override
+            public void onSuccess() {
+                ContactUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                ContactUtils.callbackOnError(callback, code, desc);
+            }
+        });
+    }
+
+    public void loadContactUserStatus(List<ContactItemBean> dataSource, IUIKitCallback<Void> callback) {
+        if (dataSource == null || dataSource.size() == 0) {
+            TUIContactLog.d(TAG, "loadContactUserStatus datasource is null");
+            ContactUtils.callbackOnError(callback, -1, "data list is empty");
+            return;
+        }
+
+        HashMap<String, ContactItemBean> dataSourceMap = new HashMap<>();
+        List<String> userList = new ArrayList<>();
+        for(ContactItemBean itemBean : dataSource) {
+            if (TextUtils.equals(TUIContactService.getAppContext().getResources().getString(R.string.new_friend), itemBean.getId())
+            || TextUtils.equals(TUIContactService.getAppContext().getResources().getString(R.string.blacklist), itemBean.getId())
+            || TextUtils.equals(TUIContactService.getAppContext().getResources().getString(R.string.group), itemBean.getId())) {
+                continue;
+            }
+            userList.add(itemBean.getId());
+            dataSourceMap.put(itemBean.getId(), itemBean);
+        }
+        V2TIMManager.getInstance().getUserStatus(userList, new V2TIMValueCallback<List<V2TIMUserStatus>>() {
+            @Override
+            public void onSuccess(List<V2TIMUserStatus> v2TIMUserStatuses) {
+                TUIContactLog.i(TAG, "getUserStatus success");
+
+                for (V2TIMUserStatus item : v2TIMUserStatuses) {
+                    ContactItemBean bean = dataSourceMap.get(item.getUserID());
+                    if (bean != null) {
+                        bean.setStatusType(item.getStatusType());
+                    }
+                }
+
+                ContactUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIContactLog.e(TAG, "getUserStatus error code = " + code + ",des = " + desc);
+                ContactUtils.callbackOnError(callback, code, desc);
+                if (code == TUIConstants.BuyingFeature.ERR_SDK_INTERFACE_NOT_SUPPORT &&
+                        TUIContactConfig.getInstance().isShowUserStatus() && BuildConfig.DEBUG) {
+                    ToastUtil.toastLongMessage(desc);
+                }
+            }
+        });
+    }
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/presenter/AddMorePresenter.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/presenter/AddMorePresenter.java
new file mode 100644
index 0000000..fc6a702
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/presenter/AddMorePresenter.java
@@ -0,0 +1,126 @@
+package com.tencent.qcloud.tuikit.tuicontact.presenter;
+
+import android.text.TextUtils;
+import android.util.Pair;
+
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.bean.FriendApplicationBean;
+import com.tencent.qcloud.tuikit.tuicontact.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuicontact.interfaces.IAddMoreActivity;
+import com.tencent.qcloud.tuikit.tuicontact.model.ContactProvider;
+import com.tencent.qcloud.tuikit.tuicontact.util.ContactUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AddMorePresenter {
+    private static final String TAG = AddMorePresenter.class.getSimpleName();
+
+    private ContactProvider provider;
+
+    private IAddMoreActivity addMoreActivity;
+    public AddMorePresenter() {
+        provider = new ContactProvider();
+    }
+
+    public void setAddMoreActivity(IAddMoreActivity addMoreActivity) {
+        this.addMoreActivity = addMoreActivity;
+    }
+
+    public void addFriend(String userId, String addWording) {
+
+        provider.addFriend(userId, addWording, new IUIKitCallback<Pair<Integer, String>>() {
+            @Override
+            public void onSuccess(Pair<Integer, String> data) {
+                switch (data.first) {
+                    case FriendApplicationBean.ERR_SUCC:
+                        ToastUtil.toastShortMessage(addMoreActivity.getString(R.string.success));
+                        break;
+                    case FriendApplicationBean.ERR_SVR_FRIENDSHIP_INVALID_PARAMETERS:
+                        if (TextUtils.equals(data.second, "Err_SNS_FriendAdd_Friend_Exist")) {
+                            ToastUtil.toastShortMessage(addMoreActivity.getString(R.string.have_be_friend));
+                            break;
+                        }
+                    case FriendApplicationBean.ERR_SVR_FRIENDSHIP_COUNT_LIMIT:
+                        ToastUtil.toastShortMessage(addMoreActivity.getString(R.string.friend_limit));
+                        break;
+                    case FriendApplicationBean.ERR_SVR_FRIENDSHIP_PEER_FRIEND_LIMIT:
+                        ToastUtil.toastShortMessage(addMoreActivity.getString(R.string.other_friend_limit));
+                        break;
+                    case FriendApplicationBean.ERR_SVR_FRIENDSHIP_IN_SELF_BLACKLIST:
+                        ToastUtil.toastShortMessage(addMoreActivity.getString(R.string.in_blacklist));
+                        break;
+                    case FriendApplicationBean.ERR_SVR_FRIENDSHIP_ALLOW_TYPE_DENY_ANY:
+                        ToastUtil.toastShortMessage(addMoreActivity.getString(R.string.forbid_add_friend));
+                        break;
+                    case FriendApplicationBean.ERR_SVR_FRIENDSHIP_IN_PEER_BLACKLIST:
+                        ToastUtil.toastShortMessage(addMoreActivity.getString(R.string.set_in_blacklist));
+                        break;
+                    case FriendApplicationBean.ERR_SVR_FRIENDSHIP_ALLOW_TYPE_NEED_CONFIRM:
+                        ToastUtil.toastShortMessage(addMoreActivity.getString(R.string.wait_agree_friend));
+                        break;
+                    default:
+                        ToastUtil.toastLongMessage(data.first + " " + data.second);
+                        break;
+                }
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage("Error code = " + errCode + ", desc = " + errMsg);
+            }
+        });
+    }
+
+    public void joinGroup(String groupId, String addWording) {
+        provider.joinGroup(groupId, addWording, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                ToastUtil.toastShortMessage(addMoreActivity.getString(R.string.send_request));
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage("Error code = " + errCode + ", desc = " + errMsg);
+            }
+        });
+    }
+
+
+    public void getUserInfo(String userId, IUIKitCallback<ContactItemBean> callback) {
+        List<String> userIdList = new ArrayList<>();
+        userIdList.add(userId);
+        provider.getUserInfo(userIdList, new IUIKitCallback<List<ContactItemBean>>() {
+            @Override
+            public void onSuccess(List<ContactItemBean> data) {
+                ContactUtils.callbackOnSuccess(callback, data.get(0));
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ContactUtils.callbackOnError(callback, errCode, errMsg);
+            }
+        });
+    }
+
+    public void getGroupInfo(String groupId, IUIKitCallback<GroupInfo> callback) {
+        List<String> groupIds = new ArrayList<>();
+        groupIds.add(groupId);
+        provider.getGroupInfo(groupIds, new IUIKitCallback<List<GroupInfo>>() {
+            @Override
+            public void onSuccess(List<GroupInfo> data) {
+                ContactUtils.callbackOnSuccess(callback, data.get(0));
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ContactUtils.callbackOnError(callback, errCode, errMsg);
+
+            }
+        });
+    }
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/presenter/ContactPresenter.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/presenter/ContactPresenter.java
new file mode 100644
index 0000000..5d8a3b9
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/presenter/ContactPresenter.java
@@ -0,0 +1,392 @@
+package com.tencent.qcloud.tuikit.tuicontact.presenter;
+
+import android.text.TextUtils;
+
+import com.google.gson.Gson;
+import com.tencent.imsdk.group.GroupMemberInfo;
+import com.tencent.imsdk.v2.V2TIMUserStatus;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.BackgroundTasks;
+import com.tencent.qcloud.tuicore.util.ThreadHelper;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactConstants;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactService;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.bean.FriendApplicationBean;
+import com.tencent.qcloud.tuikit.tuicontact.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuicontact.bean.MessageCustom;
+import com.tencent.qcloud.tuikit.tuicontact.config.TUIContactConfig;
+import com.tencent.qcloud.tuikit.tuicontact.interfaces.ContactEventListener;
+import com.tencent.qcloud.tuikit.tuicontact.interfaces.IContactListView;
+import com.tencent.qcloud.tuikit.tuicontact.model.ContactProvider;
+import com.tencent.qcloud.tuikit.tuicontact.util.ContactUtils;
+import com.tencent.qcloud.tuikit.tuicontact.util.TUIContactLog;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+public class ContactPresenter {
+    private static final String TAG = ContactPresenter.class.getSimpleName();
+
+    private final ContactProvider provider;
+
+    private IContactListView contactListView;
+
+    private final List<ContactItemBean> dataSource = new ArrayList<>();
+
+    // Strong references avoid GC
+    private ContactEventListener friendListListener;
+    private ContactEventListener blackListListener;
+    private IUIKitCallback<Void> getUserStatusCallback;
+
+    private boolean isSelectForCall = false;
+
+    public ContactPresenter() {
+        provider = new ContactProvider();
+        provider.setNextSeq(0);
+    }
+
+    public void setContactListView(IContactListView contactListView) {
+        this.contactListView = contactListView;
+    }
+
+    public void setFriendListListener() {
+        friendListListener = new ContactEventListener() {
+            @Override
+            public void onFriendListAdded(List<ContactItemBean> users) {
+                onDataListAdd(users);
+            }
+
+            @Override
+            public void onFriendListDeleted(List<String> userList) {
+                onDataListDeleted(userList);
+            }
+
+            @Override
+            public void onFriendInfoChanged(List<ContactItemBean> infoList) {
+                ContactPresenter.this.onFriendInfoChanged(infoList);
+            }
+
+            @Override
+            public void onFriendRemarkChanged(String id, String remark) {
+                ContactPresenter.this.onFriendRemarkChanged(id, remark);
+            }
+
+            @Override
+            public void onFriendApplicationListAdded(List<FriendApplicationBean> applicationList) {
+                if (contactListView != null) {
+                    contactListView.onFriendApplicationChanged();
+                }
+            }
+
+            @Override
+            public void onFriendApplicationListDeleted(List<String> userIDList) {
+                if (contactListView != null) {
+                    contactListView.onFriendApplicationChanged();
+                }
+            }
+
+            @Override
+            public void onUserStatusChanged(List<V2TIMUserStatus> userStatusList) {
+                ContactPresenter.this.onUserStatusChanged(userStatusList);
+            }
+
+            @Override
+            public void refreshUserStatusFragmentUI() {
+                ContactPresenter.this.notifyDataSourceChanged();
+            }
+        };
+        TUIContactService.getInstance().addContactEventListener(friendListListener);
+    }
+
+    public void setBlackListListener() {
+        blackListListener = new ContactEventListener() {
+            @Override
+            public void onBlackListAdd(List<ContactItemBean> infoList) {
+                onDataListAdd(infoList);
+            }
+
+            @Override
+            public void onBlackListDeleted(List<String> userList) {
+                onDataListDeleted(userList);
+            }
+        };
+        TUIContactService.getInstance().addContactEventListener(blackListListener);
+    }
+
+    public void setIsForCall(boolean isSelectForCall) {
+        this.isSelectForCall = isSelectForCall;
+    }
+
+    public void loadDataSource(int dataSourceType) {
+        IUIKitCallback<List<ContactItemBean>> callback = new IUIKitCallback<List<ContactItemBean>>() {
+            @Override
+            public void onSuccess(List<ContactItemBean> data) {
+                TUIContactLog.i(TAG, "load data source success , loadType = " + dataSourceType);
+                onDataLoaded(data, dataSourceType);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIContactLog.e(TAG, "load data source error , loadType = " + dataSourceType +
+                        "  " + "errCode = " + errCode + "  errMsg = " + errMsg);
+                onDataLoaded(new ArrayList<>(), dataSourceType);
+            }
+        };
+
+        dataSource.clear();
+        switch (dataSourceType) {
+            case IContactListView.DataSource.FRIEND_LIST:
+                provider.loadFriendListDataAsync(callback);
+                break;
+            case IContactListView.DataSource.BLACK_LIST:
+                provider.loadBlackListData(callback);
+                break;
+            case IContactListView.DataSource.GROUP_LIST:
+                provider.loadGroupListData(callback);
+                break;
+            case IContactListView.DataSource.CONTACT_LIST:
+                dataSource.add((ContactItemBean) new ContactItemBean(TUIContactService.getAppContext().getResources().getString(R.string.new_friend))
+                        .setTop(true).setBaseIndexTag(ContactItemBean.INDEX_STRING_TOP));
+                dataSource.add((ContactItemBean) new ContactItemBean(TUIContactService.getAppContext().getResources().getString(R.string.group)).
+                        setTop(true).setBaseIndexTag(ContactItemBean.INDEX_STRING_TOP));
+                dataSource.add((ContactItemBean) new ContactItemBean(TUIContactService.getAppContext().getResources().getString(R.string.blacklist)).
+                        setTop(true).setBaseIndexTag(ContactItemBean.INDEX_STRING_TOP));
+                provider.loadFriendListDataAsync(callback);
+                break;
+            default:
+                break;
+        }
+    }
+
+    public long getNextSeq() {
+        return provider == null ? 0 : provider.getNextSeq();
+    }
+
+    public void loadGroupMemberList(String groupId) {
+        if (!isSelectForCall && getNextSeq() == 0) {
+            dataSource.add((ContactItemBean) new ContactItemBean(TUIContactService.getAppContext().getResources().getString(R.string.at_all))
+                    .setTop(true).setBaseIndexTag(ContactItemBean.INDEX_STRING_TOP));
+        }
+        provider.loadGroupMembers(groupId, new IUIKitCallback<List<ContactItemBean>>() {
+            @Override
+            public void onSuccess(List<ContactItemBean> data) {
+                TUIContactLog.i(TAG, "load data source success , loadType = " + IContactListView.DataSource.GROUP_MEMBER_LIST);
+                onDataLoaded(data, IContactListView.DataSource.GROUP_MEMBER_LIST);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIContactLog.e(TAG, "load data source error , loadType = " + IContactListView.DataSource.GROUP_MEMBER_LIST +
+                        "  " + "errCode = " + errCode + "  errMsg = " + errMsg);
+                onDataLoaded(new ArrayList<>(), IContactListView.DataSource.GROUP_MEMBER_LIST);
+
+            }
+        });
+    }
+
+    private void onDataLoaded(List<ContactItemBean> loadedData, int dataSourceType) {
+        dataSource.addAll(onDataListDeletedAdmin(loadedData));
+        notifyDataSourceChanged();
+        if (dataSourceType != IContactListView.DataSource.GROUP_LIST) {
+            loadContactUserStatus(dataSource);
+        }
+    }
+
+    private void loadContactUserStatus(List<ContactItemBean> loadedData) {
+        getUserStatusCallback = new IUIKitCallback<Void>(){
+            @Override
+            public void onSuccess(Void result) {
+                TUIContactLog.i(TAG, "loadContactUserStatus success");
+                notifyDataSourceChanged();
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIContactLog.e(TAG, "loadContactUserStatus error code = " + errCode + ",des = " + errMsg);
+            }
+        };
+        GetUserStatusHelper.GetUserStatusTask task = new GetUserStatusHelper.GetUserStatusTask();
+        task.setLoadedData(loadedData);
+        task.setCallback(getUserStatusCallback);
+        GetUserStatusHelper.enqueue(task);
+    }
+
+    private void notifyDataSourceChanged() {
+        if (contactListView != null) {
+            contactListView.onDataSourceChanged(dataSource);
+        }
+    }
+    /**
+     * 剔除群创建者
+     * @param loadedData
+     * @return
+     */
+    private List<ContactItemBean> onDataListDeletedAdmin(List<ContactItemBean> loadedData){
+        Iterator<ContactItemBean> userIterator = loadedData.iterator();
+        while(userIterator.hasNext()) {
+            ContactItemBean contactItemBean = userIterator.next();
+            if (GroupMemberInfo.MEMBER_ROLE_OWNER == contactItemBean.getRole()) {//剔除群的创建者（创建者为后台虚拟账号，所以需要剔除）
+                userIterator.remove();
+            }
+        }
+        return loadedData;
+    }
+    private void onDataListDeleted(List<String> userList) {
+        Iterator<ContactItemBean> userIterator = dataSource.iterator();
+        while(userIterator.hasNext()) {
+            ContactItemBean contactItemBean = userIterator.next();
+            for(String id : userList) {
+                if (TextUtils.equals(id, contactItemBean.getId())) {
+                    userIterator.remove();
+                }
+            }
+        }
+        notifyDataSourceChanged();
+    }
+
+    public void onUserStatusChanged(List<V2TIMUserStatus> userStatusList) {
+        if (!TUIContactConfig.getInstance().isShowUserStatus()) {
+            return;
+        }
+        HashMap<String, ContactItemBean> dataSourceMap = new HashMap<>();
+        for(ContactItemBean itemBean : dataSource) {
+            dataSourceMap.put(itemBean.getId(), itemBean);
+        }
+
+        boolean isrefresh = false;
+        for(V2TIMUserStatus timUserStatus : userStatusList) {
+            String userid = timUserStatus.getUserID();
+            ContactItemBean bean = dataSourceMap.get(userid);
+            if (bean != null && bean.getStatusType() != timUserStatus.getStatusType()) {
+                isrefresh = true;
+                bean.setStatusType(timUserStatus.getStatusType());
+            }
+        }
+
+        if (isrefresh) {
+            notifyDataSourceChanged();
+        }
+    }
+
+    private void onDataListAdd(List<ContactItemBean> users) {
+        List<ContactItemBean> addUserList = new ArrayList<>(users);
+        Iterator<ContactItemBean> beanIterator = addUserList.iterator();
+        while(beanIterator.hasNext()) {
+            ContactItemBean contactItemBean = beanIterator.next();
+            for(ContactItemBean dataItemBean : dataSource) {
+                if (TextUtils.equals(contactItemBean.getId(), dataItemBean.getId())) {
+                    beanIterator.remove();
+                }
+            }
+        }
+        dataSource.addAll(addUserList);
+        notifyDataSourceChanged();
+
+        loadContactUserStatus(addUserList);
+    }
+
+    public void getFriendApplicationUnreadCount(IUIKitCallback<Integer> callback) {
+        provider.getFriendApplicationListUnreadCount(callback);
+    }
+
+    public void loadFriendApplicationList(IUIKitCallback<Integer> callback) {
+        provider.loadFriendApplicationList(new IUIKitCallback<List<FriendApplicationBean>>() {
+            @Override
+            public void onSuccess(List<FriendApplicationBean> data) {
+                int size = 0;
+                for (FriendApplicationBean friendApplicationBean : data) {
+                    if (friendApplicationBean.getAddType() == FriendApplicationBean.FRIEND_APPLICATION_COME_IN) {
+                        size++;
+                    }
+                }
+                ContactUtils.callbackOnSuccess(callback, size);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ContactUtils.callbackOnError(callback, module, errCode, errMsg);
+            }
+        });
+    }
+
+    public void createGroupChat(GroupInfo groupInfo, IUIKitCallback<String> callback) {
+        provider.createGroupChat(groupInfo, new IUIKitCallback<String>() {
+            @Override
+            public void onSuccess(String groupId) {
+                groupInfo.setId(groupId);
+                Gson gson = new Gson();
+                MessageCustom messageCustom = new MessageCustom();
+                messageCustom.version = TUIContactConstants.version;
+                messageCustom.businessID = MessageCustom.BUSINESS_ID_GROUP_CREATE;
+                messageCustom.opUser = TUILogin.getLoginUser();
+                messageCustom.content = TUIContactService.getAppContext().getString(R.string.create_group);
+                String data = gson.toJson(messageCustom);
+
+                ThreadHelper.INST.execute(new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            Thread.sleep(200);
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                        sendGroupTipsMessage(groupId, data, new IUIKitCallback<String>() {
+                            @Override
+                            public void onSuccess(String result) {
+                                BackgroundTasks.getInstance().runOnUiThread(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        ContactUtils.callbackOnSuccess(callback, result);
+                                    }
+                                });
+                            }
+
+                            @Override
+                            public void onError(String module, int errCode, String errMsg) {
+                                BackgroundTasks.getInstance().runOnUiThread(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        ContactUtils.callbackOnError(callback, module, errCode, errMsg);
+                                    }
+                                });
+                            }
+                        });
+                    }
+                });
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ContactUtils.callbackOnError(callback, module, errCode, errMsg);
+            }
+        });
+    }
+
+    public void onFriendInfoChanged(List<ContactItemBean> infoList) {
+        for (ContactItemBean changedItem : infoList) {
+            for (int i = 0;i < dataSource.size();i++) {
+                if (TextUtils.equals(dataSource.get(i).getId(), changedItem.getId())) {
+                    if (changedItem.getStatusType() == V2TIMUserStatus.V2TIM_USER_STATUS_UNKNOWN) {
+                        changedItem.setStatusType(dataSource.get(i).getStatusType());
+                    }
+                    dataSource.set(i, changedItem);
+                    break;
+                }
+            }
+        }
+        notifyDataSourceChanged();
+    }
+
+    public void onFriendRemarkChanged(String id, String remark) {
+        loadDataSource(IContactListView.DataSource.CONTACT_LIST);
+    }
+
+    public void sendGroupTipsMessage(String groupId, String messageData, IUIKitCallback<String> callback) {
+        provider.sendGroupTipsMessage(groupId, messageData, callback);
+    }
+
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/presenter/FriendProfilePresenter.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/presenter/FriendProfilePresenter.java
new file mode 100644
index 0000000..5b2dfbc
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/presenter/FriendProfilePresenter.java
@@ -0,0 +1,334 @@
+package com.tencent.qcloud.tuikit.tuicontact.presenter;
+
+
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Pair;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.BackgroundTasks;
+import com.tencent.qcloud.tuicore.util.ThreadHelper;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuicontact.R;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactService;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactGroupApplyInfo;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.bean.FriendApplicationBean;
+import com.tencent.qcloud.tuikit.tuicontact.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuicontact.interfaces.IFriendProfileLayout;
+import com.tencent.qcloud.tuikit.tuicontact.model.ContactProvider;
+import com.tencent.qcloud.tuikit.tuicontact.util.ContactUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+
+public class FriendProfilePresenter {
+    private static final String TAG = FriendProfilePresenter.class.getSimpleName();
+
+    private final ContactProvider provider;
+
+    private IFriendProfileLayout friendProfileLayout;
+
+    public FriendProfilePresenter() {
+        provider = new ContactProvider();
+    }
+
+    public void setFriendProfileLayout(IFriendProfileLayout friendProfileLayout) {
+        this.friendProfileLayout = friendProfileLayout;
+    }
+
+    public void getC2CReceiveMessageOpt(List<String> userIdList, IUIKitCallback<Boolean> callback) {
+        provider.getC2CReceiveMessageOpt(userIdList, new IUIKitCallback<Boolean>() {
+            @Override
+            public void onSuccess(Boolean data) {
+                ContactUtils.callbackOnSuccess(callback, data);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ContactUtils.callbackOnError(callback, TAG, errCode, errMsg);
+            }
+        });
+    }
+
+    public void setC2CReceiveMessageOpt(List<String> userIdList, boolean isReceiveMessage) {
+        provider.setC2CReceiveMessageOpt(userIdList, isReceiveMessage, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+
+            }
+        });
+    }
+
+    public void getUsersInfo(String id, ContactItemBean bean) {
+        ArrayList<String> list = new ArrayList<>();
+        list.add(id);
+        provider.getUserInfo(list, new IUIKitCallback<List<ContactItemBean>>() {
+            @Override
+            public void onSuccess(List<ContactItemBean> data) {
+                if (data == null || data.size() != 1) {
+                    return;
+                }
+                ContactItemBean user = data.get(0);
+                bean.setNickName(user.getNickName());
+                bean.setId(user.getId());
+                bean.setAvatarUrl(user.getAvatarUrl());
+                bean.setSignature(user.getSignature());
+
+                CountDownLatch latch = new CountDownLatch(2);
+                ThreadHelper.INST.execute(new Runnable() {
+                    @Override
+                    public void run() {
+                        isInBlackList(id, new IUIKitCallback<Boolean>() {
+                            @Override
+                            public void onSuccess(Boolean data) {
+                                bean.setBlackList(data);
+                                latch.countDown();
+                            }
+
+                            @Override
+                            public void onError(String module, int errCode, String errMsg) {
+                                latch.countDown();
+                            }
+                        });
+                    }
+                });
+
+                ThreadHelper.INST.execute(new Runnable() {
+                    @Override
+                    public void run() {
+                        isFriend(id, bean, new IUIKitCallback<Boolean>() {
+                            @Override
+                            public void onSuccess(Boolean data) {
+                                bean.setFriend(data);
+                                latch.countDown();
+                            }
+
+                            @Override
+                            public void onError(String module, int errCode, String errMsg) {
+                                latch.countDown();
+                            }
+                        });
+                    }
+                });
+
+                ThreadHelper.INST.execute(new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            latch.await();
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        }
+                        BackgroundTasks.getInstance().runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                if (friendProfileLayout != null) {
+                                    friendProfileLayout.onDataSourceChanged(bean);
+                                }
+                            }
+                        });
+                    }
+                });
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage("getUsersInfo error , code = " + errCode + ", desc = " + errMsg);
+            }
+        });
+    }
+
+
+    public void isInBlackList(String id, IUIKitCallback<Boolean> callback) {
+        provider.isInBlackList(id, new IUIKitCallback<Boolean>() {
+            @Override
+            public void onSuccess(Boolean data) {
+                ContactUtils.callbackOnSuccess(callback, data);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage("getBlackList error , code = " + errCode + ", desc = " + errMsg);
+                ContactUtils.callbackOnError(callback, errCode, errMsg);
+            }
+        });
+    }
+
+
+    public void isFriend(String id, ContactItemBean bean, IUIKitCallback<Boolean> callback) {
+        provider.isFriend(id, bean, callback);
+    }
+
+    public void deleteFromBlackList(List<String> idList) {
+        provider.deleteFromBlackList(idList, new IUIKitCallback<Void>() {
+
+            @Override
+            public void onSuccess(Void data) {
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage("deleteFromBlackList Error code = " + errCode + ", desc = " + errMsg);
+
+            }
+        });
+    }
+
+    public void addToBlackList(List<String> idList) {
+        provider.addToBlackList(idList, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage("addToBlackList Error code = " + errCode + ", desc = " + errMsg);
+
+            }
+        });
+    }
+
+    public void modifyRemark(String id, String remark, IUIKitCallback<String> callback) {
+        provider.modifyRemark(id, remark, callback);
+    }
+
+    public void deleteFriend(List<String> idList, IUIKitCallback<Void> callback) {
+        provider.deleteFriend(idList, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                for (String id : idList) {
+                    String conversationId = TUIConstants.TUIConversation.CONVERSATION_C2C_PREFIX + id;
+                    HashMap<String, Object> param = new HashMap<>();
+                    param.put(TUIConstants.TUIConversation.CONVERSATION_ID, conversationId);
+                    param.put(TUIConstants.TUIChat.CHAT_ID, id);
+                    param.put(TUIConstants.TUIChat.IS_GROUP_CHAT, false);
+                    TUICore.callService(TUIConstants.TUIConversation.SERVICE_NAME, TUIConstants.TUIConversation.METHOD_DELETE_CONVERSATION, param);
+                    TUICore.callService(TUIConstants.TUIChat.SERVICE_NAME, TUIConstants.TUIChat.METHOD_EXIT_CHAT, param);
+                }
+                ContactUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ContactUtils.callbackOnError(callback, module, errCode, errMsg);
+            }
+        });
+    }
+
+    public void refuseFriendApplication(FriendApplicationBean friendApplication, IUIKitCallback<Void> callback) {
+        provider.refuseFriendApplication(friendApplication, callback);
+    }
+
+    public void acceptFriendApplication(FriendApplicationBean friendApplication, int responseType, IUIKitCallback<Void> callback) {
+        provider.acceptFriendApplication(friendApplication, responseType, callback);
+    }
+
+    public boolean isTopConversation(String chatId) {
+        HashMap<String, Object> param = new HashMap<>();
+        param.put(TUIConstants.TUIConversation.CHAT_ID, chatId);
+        Object result = TUICore.callService(TUIConstants.TUIConversation.SERVICE_NAME,
+                TUIConstants.TUIConversation.METHOD_IS_TOP_CONVERSATION, param);
+        if (result instanceof Bundle) {
+            return ((Bundle) result).getBoolean(TUIConstants.TUIConversation.IS_TOP, false);
+        }
+        return false;
+    }
+
+    public void setConversationTop(String chatId, boolean isSetTop) {
+        HashMap<String, Object> param = new HashMap<>();
+        param.put(TUIConstants.TUIConversation.CHAT_ID, chatId);
+        param.put(TUIConstants.TUIConversation.IS_SET_TOP, isSetTop);
+        TUICore.callService(TUIConstants.TUIConversation.SERVICE_NAME, TUIConstants.TUIConversation.METHOD_SET_TOP_CONVERSATION, param);
+    }
+
+
+    public void acceptJoinGroupApply(ContactGroupApplyInfo info, IUIKitCallback<Void> callback) {
+        provider.acceptJoinGroupApply(info, callback);
+    }
+
+    public void refuseJoinGroupApply(ContactGroupApplyInfo info, String reason, IUIKitCallback<Void> callback) {
+        provider.refuseJoinGroupApply(info, reason, callback);
+    }
+
+    public void addFriend(String userId, String addWord, String friendGroup, String remark, IUIKitCallback<Pair<Integer, String>> callback) {
+        provider.addFriend(userId, addWord, friendGroup, remark, new IUIKitCallback<Pair<Integer, String>>() {
+            @Override
+            public void onSuccess(Pair<Integer, String> data) {
+                int code = data.first;
+                String result = "";
+                switch (code) {
+                    case FriendApplicationBean.ERR_SUCC:
+                        result = TUIContactService.getAppContext().getString(R.string.success);
+                        break;
+                    case FriendApplicationBean.ERR_SVR_FRIENDSHIP_INVALID_PARAMETERS:
+                        if (TextUtils.equals(data.second, "Err_SNS_FriendAdd_Friend_Exist")) {
+                            result = TUIContactService.getAppContext().getString(R.string.have_be_friend);
+                            break;
+                        }
+                    case FriendApplicationBean.ERR_SVR_FRIENDSHIP_COUNT_LIMIT:
+                        result = TUIContactService.getAppContext().getString(R.string.friend_limit);
+                        break;
+                    case FriendApplicationBean.ERR_SVR_FRIENDSHIP_PEER_FRIEND_LIMIT:
+                        result = TUIContactService.getAppContext().getString(R.string.other_friend_limit);
+                        break;
+                    case FriendApplicationBean.ERR_SVR_FRIENDSHIP_IN_SELF_BLACKLIST:
+                        result = TUIContactService.getAppContext().getString(R.string.in_blacklist);
+                        break;
+                    case FriendApplicationBean.ERR_SVR_FRIENDSHIP_ALLOW_TYPE_DENY_ANY:
+                        result = TUIContactService.getAppContext().getString(R.string.forbid_add_friend);
+                        break;
+                    case FriendApplicationBean.ERR_SVR_FRIENDSHIP_IN_PEER_BLACKLIST:
+                        result = TUIContactService.getAppContext().getString(R.string.set_in_blacklist);
+                        break;
+                    case FriendApplicationBean.ERR_SVR_FRIENDSHIP_ALLOW_TYPE_NEED_CONFIRM:
+                        result = TUIContactService.getAppContext().getString(R.string.wait_agree_friend);
+                        break;
+                    default:
+                        result = TUIContactService.getAppContext().getString(R.string.other_friend_limit);
+                        ToastUtil.toastLongMessage(data.first + " " + data.second);
+                        break;
+                }
+                ContactUtils.callbackOnSuccess(callback, new Pair<>(code, result));
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ContactUtils.callbackOnError(callback, errCode, errMsg);
+            }
+        });
+    }
+
+    public void joinGroup(String groupId, String addWord, IUIKitCallback<Void> callback) {
+        provider.joinGroup(groupId, addWord, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                ContactUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                String msg = errMsg;
+                if (errCode == GroupInfo.ERR_SVR_GROUP_PERMISSION_DENY) {
+                    msg = TUIContactService.getAppContext().getString(R.string.add_group_permission_deny);
+                } else if (errCode == GroupInfo.ERR_SVR_GROUP_ALLREADY_MEMBER) {
+                    msg = TUIContactService.getAppContext().getString(R.string.add_group_allready_member);
+                } else if (errCode == GroupInfo.ERR_SVR_GROUP_NOT_FOUND) {
+                    msg = TUIContactService.getAppContext().getString(R.string.add_group_not_found);
+                } else if (errCode == GroupInfo.ERR_SVR_GROUP_FULL_MEMBER_COUNT) {
+                    msg = TUIContactService.getAppContext().getString(R.string.add_group_full_member);
+                }
+                ContactUtils.callbackOnError(callback, errCode, msg);
+            }
+        });
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/presenter/GetUserStatusHelper.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/presenter/GetUserStatusHelper.java
new file mode 100644
index 0000000..771b6e1
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/presenter/GetUserStatusHelper.java
@@ -0,0 +1,123 @@
+package com.tencent.qcloud.tuikit.tuicontact.presenter;
+
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ThreadHelper;
+import com.tencent.qcloud.tuikit.tuicontact.bean.ContactItemBean;
+import com.tencent.qcloud.tuikit.tuicontact.model.ContactProvider;
+import com.tencent.qcloud.tuikit.tuicontact.util.ContactUtils;
+import com.tencent.qcloud.tuikit.tuicontact.util.TUIContactLog;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.LinkedBlockingDeque;
+
+/**
+ * A get user status task queue which has a limit frequency mechanism
+ * 具有接口调用限频机制的获取用户状态的任务队列
+ */
+public class GetUserStatusHelper {
+    private static final String TAG = "GetUserStatusHelper";
+    private static final GetUserStatusHelper instance = new GetUserStatusHelper();
+
+    private static final int MAX_USER_LIMIT = 500;
+    private static final int INTERFACE_CALL_PERIOD = 1000; // 1s
+
+    private final ContactProvider provider;
+    private final LinkedBlockingDeque<GetUserStatusTask> taskQueue;
+    private Thread getUserStatusThread;
+
+    private GetUserStatusHelper() {
+        provider = new ContactProvider();
+        taskQueue = new LinkedBlockingDeque<>();
+    }
+
+    public static void enqueue(GetUserStatusTask task) {
+        TUIContactLog.i(TAG, "GetUserStatusTask enqueue " + task);
+        instance.taskQueue.offerFirst(task);
+        instance.execute();
+    }
+
+    private synchronized void execute() {
+        if (getUserStatusThread == null) {
+            getUserStatusThread = new Thread("GetUserStatusThread") {
+                @Override
+                public void run() {
+                    while (true) {
+                        GetUserStatusTask task = taskQueue.poll();
+                        if (task == null) {
+                            getUserStatusThread = null;
+                            return;
+                        }
+                        if (!task.isNeedRequest()) {
+                            continue;
+                        }
+
+                        List<ContactItemBean> dataList;
+                        if (task.data == null || task.data.size() <= MAX_USER_LIMIT) {
+                            dataList = task.data;
+                        } else {
+                            dataList = task.data.subList(0, MAX_USER_LIMIT);
+                            task.data = task.data.subList(MAX_USER_LIMIT, task.data.size());
+                            taskQueue.offerFirst(task);
+                        }
+                        provider.loadContactUserStatus(dataList, new IUIKitCallback<Void>() {
+                            // callback run on ui thread
+                            @Override
+                            public void onSuccess(Void data) {
+                                task.callbackSuccess();
+                            }
+
+                            @Override
+                            public void onError(String module, int errCode, String errMsg) {
+                                task.callbackError(errCode, errMsg);
+                            }
+                        });
+
+                        try {
+                            Thread.sleep(INTERFACE_CALL_PERIOD);
+                        } catch (InterruptedException e) {
+                            return;
+                        }
+                    }
+                }
+            };
+            ThreadHelper.INST.execute(getUserStatusThread);
+        }
+    }
+
+    public static class GetUserStatusTask {
+        private List<ContactItemBean> data;
+        // Avoid memory leaks
+        private WeakReference<IUIKitCallback<Void>> callbackWeakReference;
+
+        // if callback exists
+        private boolean isNeedRequest() {
+            return callbackWeakReference != null && callbackWeakReference.get() != null;
+        }
+
+        // run on ui thread
+        private void callbackSuccess() {
+            if (callbackWeakReference != null) {
+                IUIKitCallback<Void> callback = callbackWeakReference.get();
+                ContactUtils.callbackOnSuccess(callback, null);
+            }
+        }
+
+        // run on ui thread
+        private void callbackError(int errCode, String errMsg) {
+            if (callbackWeakReference != null) {
+                IUIKitCallback<Void> callback = callbackWeakReference.get();
+                ContactUtils.callbackOnError(callback, errCode, errMsg);
+            }
+        }
+
+        public void setLoadedData(List<ContactItemBean> loadedData) {
+            this.data = new ArrayList<>(loadedData);
+        }
+
+        public void setCallback(IUIKitCallback<Void> callback) {
+            this.callbackWeakReference = new WeakReference<>(callback);
+        }
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/presenter/NewFriendPresenter.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/presenter/NewFriendPresenter.java
new file mode 100644
index 0000000..642a4d2
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/presenter/NewFriendPresenter.java
@@ -0,0 +1,133 @@
+package com.tencent.qcloud.tuikit.tuicontact.presenter;
+
+import android.text.TextUtils;
+
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuicontact.TUIContactService;
+import com.tencent.qcloud.tuikit.tuicontact.bean.FriendApplicationBean;
+import com.tencent.qcloud.tuikit.tuicontact.interfaces.ContactEventListener;
+import com.tencent.qcloud.tuikit.tuicontact.interfaces.INewFriendActivity;
+import com.tencent.qcloud.tuikit.tuicontact.model.ContactProvider;
+import com.tencent.qcloud.tuikit.tuicontact.util.ContactUtils;
+import com.tencent.qcloud.tuikit.tuicontact.util.TUIContactLog;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+public class NewFriendPresenter {
+    private static final String TAG = NewFriendPresenter.class.getSimpleName();
+
+    private final ContactProvider provider;
+
+    private INewFriendActivity friendActivity;
+
+    private final List<FriendApplicationBean> dataSource = new ArrayList<>();
+
+    private ContactEventListener friendApplicationListener;
+
+    public NewFriendPresenter() {
+        provider = new ContactProvider();
+
+        friendApplicationListener = new ContactEventListener() {
+            @Override
+            public void onFriendApplicationListAdded(List<FriendApplicationBean> applicationList) {
+                Iterator<FriendApplicationBean> beanIterator = applicationList.iterator();
+                while(beanIterator.hasNext()) {
+                    FriendApplicationBean friendApplicationBean = beanIterator.next();
+                    for(FriendApplicationBean dataBean : dataSource) {
+                        if (TextUtils.equals(dataBean.getUserId(), friendApplicationBean.getUserId())) {
+                            beanIterator.remove();
+                        }
+                    }
+                }
+                dataSource.addAll(applicationList);
+                notifyDataSourceChanged();
+            }
+
+            @Override
+            public void onFriendApplicationListDeleted(List<String> userIDList) {
+                Iterator<FriendApplicationBean> applicationIterator = dataSource.iterator();
+                while(applicationIterator.hasNext()) {
+                    FriendApplicationBean friendApplicationBean = applicationIterator.next();
+                    for(String id : userIDList) {
+                        if (TextUtils.equals(id, friendApplicationBean.getUserId())) {
+                            applicationIterator.remove();
+                        }
+                    }
+                }
+                notifyDataSourceChanged();
+            }
+
+            @Override
+            public void onFriendApplicationListRead() {
+                super.onFriendApplicationListRead();
+            }
+        };
+        TUIContactService.getInstance().addContactEventListener(friendApplicationListener);
+    }
+
+    public void setFriendActivity(INewFriendActivity friendActivity) {
+        this.friendActivity = friendActivity;
+    }
+
+    public void loadFriendApplicationList() {
+        dataSource.clear();
+        provider.loadFriendApplicationList(new IUIKitCallback<List<FriendApplicationBean>>() {
+            @Override
+            public void onSuccess(List<FriendApplicationBean> data) {
+                for (FriendApplicationBean friendApplicationBean : data) {
+                    if (friendApplicationBean.getAddType() == FriendApplicationBean.FRIEND_APPLICATION_COME_IN) {
+                        dataSource.add(friendApplicationBean);
+                    }
+                }
+                notifyDataSourceChanged();
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage("Error code = " + errCode + ", desc = " + errMsg);
+            }
+        });
+    }
+
+    private void notifyDataSourceChanged() {
+        if (friendActivity != null) {
+            friendActivity.onDataSourceChanged(dataSource);
+        }
+    }
+
+    public void acceptFriendApplication(FriendApplicationBean friendApplicationBean, IUIKitCallback<Void> callback) {
+        provider.acceptFriendApplication(friendApplicationBean, FriendApplicationBean.FRIEND_ACCEPT_AGREE_AND_ADD, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                ContactUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIContactLog.e(TAG, "acceptFriendApplication error " + errCode + "  " + errMsg);
+            }
+        });
+    }
+
+    public void refuseFriendApplication(FriendApplicationBean friendApplicationBean, IUIKitCallback<Void> callback) {
+        provider.refuseFriendApplication(friendApplicationBean, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                ContactUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIContactLog.e(TAG, "acceptFriendApplication error " + errCode + "  " + errMsg);
+            }
+        });
+    }
+
+
+    public void setFriendApplicationListAllRead(IUIKitCallback<Void> callback) {
+        provider.setGroupApplicationRead(callback);
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/util/ContactUtils.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/util/ContactUtils.java
new file mode 100644
index 0000000..4435905
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/util/ContactUtils.java
@@ -0,0 +1,39 @@
+package com.tencent.qcloud.tuikit.tuicontact.util;
+
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ErrorMessageConverter;
+
+public class ContactUtils {
+
+    public static <T> void callbackOnError(IUIKitCallback<T> callBack, String module, int errCode, String desc) {
+        if (callBack != null) {
+            callBack.onError(module, errCode, ErrorMessageConverter.convertIMError(errCode, desc));
+        }
+    }
+
+    public static <T> void callbackOnError(IUIKitCallback<T> callBack, int errCode, String desc) {
+        if (callBack != null) {
+            callBack.onError(null, errCode, ErrorMessageConverter.convertIMError(errCode, desc));
+        }
+    }
+
+    public static <T> void callbackOnSuccess(IUIKitCallback<T> callBack, T data) {
+        if (callBack != null) {
+            callBack.onSuccess(data);
+        }
+    }
+
+    public static boolean isC2CChat(int chatType) {
+        return chatType == V2TIMConversation.V2TIM_C2C;
+    }
+
+    public static boolean isGroupChat(int chatType) {
+        return chatType == V2TIMConversation.V2TIM_GROUP;
+    }
+
+    public static String getLoginUser() {
+        return V2TIMManager.getInstance().getLoginUser();
+    }
+}
diff --git a/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/util/TUIContactLog.java b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/util/TUIContactLog.java
new file mode 100644
index 0000000..73a318a
--- /dev/null
+++ b/system/tuicontact/src/main/java/com/tencent/qcloud/tuikit/tuicontact/util/TUIContactLog.java
@@ -0,0 +1,85 @@
+package com.tencent.qcloud.tuikit.tuicontact.util;
+
+import com.tencent.imsdk.common.IMLog;
+
+public class TUIContactLog extends IMLog {
+
+    private static final String PRE = "TUIContact-";
+
+    private static String mixTag(String tag) {
+        return PRE + tag;
+    }
+
+    /**
+     * 打印INFO级别日志
+     * 
+     * Print INFO level log
+     *
+     * @param strTag  TAG
+     * @param strInfo 消息
+     */
+    public static void v(String strTag, String strInfo) {
+        IMLog.v(mixTag(strTag), strInfo);
+    }
+
+    /**
+     * 打印DEBUG级别日志
+     * 
+     * Print DEBUG level log
+     *
+     * @param strTag  TAG
+     * @param strInfo 消息
+     */
+    public static void d(String strTag, String strInfo) {
+        IMLog.d(mixTag(strTag), strInfo);
+    }
+
+    /**
+     * 打印INFO级别日志
+     * 
+     * Print INFO level log
+     *
+     * @param strTag  TAG
+     * @param strInfo 消息
+     */
+    public static void i(String strTag, String strInfo) {
+        IMLog.i(mixTag(strTag), strInfo);
+    }
+
+    /**
+     * 打印WARN级别日志
+     * 
+     * Print WARN level log
+     *
+     * @param strTag  TAG
+     * @param strInfo 消息
+     */
+    public static void w(String strTag, String strInfo) {
+        IMLog.w(mixTag(strTag), strInfo);
+    }
+
+    /**
+     * 打印WARN级别日志
+     * 
+     * Print WARN level log
+     *
+     * @param strTag  TAG
+     * @param strInfo 消息
+     */
+    public static void w(String strTag, String strInfo, Throwable e) {
+        IMLog.w(mixTag(strTag), strInfo + e.getMessage());
+    }
+
+    /**
+     * 打印ERROR级别日志
+     * 
+     * Print ERROR level log
+     *
+     * @param strTag  TAG
+     * @param strInfo 消息
+     */
+    public static void e(String strTag, String strInfo) {
+        IMLog.e(mixTag(strTag), strInfo);
+    }
+
+}
diff --git a/system/tuicontact/src/main/res-light/drawable-xxhdpi/contact_black_list_icon_light.png b/system/tuicontact/src/main/res-light/drawable-xxhdpi/contact_black_list_icon_light.png
new file mode 100644
index 0000000..2e71ec9
Binary files /dev/null and b/system/tuicontact/src/main/res-light/drawable-xxhdpi/contact_black_list_icon_light.png differ
diff --git a/system/tuicontact/src/main/res-light/drawable-xxhdpi/contact_group_list_icon_light.png b/system/tuicontact/src/main/res-light/drawable-xxhdpi/contact_group_list_icon_light.png
new file mode 100644
index 0000000..97b28eb
Binary files /dev/null and b/system/tuicontact/src/main/res-light/drawable-xxhdpi/contact_group_list_icon_light.png differ
diff --git a/system/tuicontact/src/main/res-light/drawable-xxhdpi/contact_new_friend_icon_light.png b/system/tuicontact/src/main/res-light/drawable-xxhdpi/contact_new_friend_icon_light.png
new file mode 100644
index 0000000..4009059
Binary files /dev/null and b/system/tuicontact/src/main/res-light/drawable-xxhdpi/contact_new_friend_icon_light.png differ
diff --git a/system/tuicontact/src/main/res-light/values/light_colors.xml b/system/tuicontact/src/main/res-light/values/light_colors.xml
new file mode 100644
index 0000000..55344e5
--- /dev/null
+++ b/system/tuicontact/src/main/res-light/values/light_colors.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res-light/values/light_styles.xml b/system/tuicontact/src/main/res-light/values/light_styles.xml
new file mode 100644
index 0000000..4fbccb5
--- /dev/null
+++ b/system/tuicontact/src/main/res-light/values/light_styles.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TUIContactLightTheme" parent="TUIBaseLightTheme">
+        <item name="contact_new_friend_icon">@drawable/contact_new_friend_icon_light</item>
+        <item name="contact_group_list_icon">@drawable/contact_group_list_icon_light</item>
+        <item name="contact_black_list_icon">@drawable/contact_black_list_icon_light</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res-lively/drawable-xxhdpi/contact_black_list_icon_lively.png b/system/tuicontact/src/main/res-lively/drawable-xxhdpi/contact_black_list_icon_lively.png
new file mode 100644
index 0000000..bfcb123
Binary files /dev/null and b/system/tuicontact/src/main/res-lively/drawable-xxhdpi/contact_black_list_icon_lively.png differ
diff --git a/system/tuicontact/src/main/res-lively/drawable-xxhdpi/contact_group_list_icon_lively.png b/system/tuicontact/src/main/res-lively/drawable-xxhdpi/contact_group_list_icon_lively.png
new file mode 100644
index 0000000..30b4b36
Binary files /dev/null and b/system/tuicontact/src/main/res-lively/drawable-xxhdpi/contact_group_list_icon_lively.png differ
diff --git a/system/tuicontact/src/main/res-lively/drawable-xxhdpi/contact_new_friend_icon_lively.png b/system/tuicontact/src/main/res-lively/drawable-xxhdpi/contact_new_friend_icon_lively.png
new file mode 100644
index 0000000..9c40345
Binary files /dev/null and b/system/tuicontact/src/main/res-lively/drawable-xxhdpi/contact_new_friend_icon_lively.png differ
diff --git a/system/tuicontact/src/main/res-lively/values/lively_colors.xml b/system/tuicontact/src/main/res-lively/values/lively_colors.xml
new file mode 100644
index 0000000..55344e5
--- /dev/null
+++ b/system/tuicontact/src/main/res-lively/values/lively_colors.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res-lively/values/lively_styles.xml b/system/tuicontact/src/main/res-lively/values/lively_styles.xml
new file mode 100644
index 0000000..af79f6d
--- /dev/null
+++ b/system/tuicontact/src/main/res-lively/values/lively_styles.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TUIContactLivelyTheme" parent="TUIBaseLivelyTheme">
+        <item name="contact_new_friend_icon">@drawable/contact_new_friend_icon_lively</item>
+        <item name="contact_group_list_icon">@drawable/contact_group_list_icon_lively</item>
+        <item name="contact_black_list_icon">@drawable/contact_black_list_icon_lively</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res-minimalist/drawable/contact_add_friend.png b/system/tuicontact/src/main/res-minimalist/drawable/contact_add_friend.png
new file mode 100644
index 0000000..aaed62e
Binary files /dev/null and b/system/tuicontact/src/main/res-minimalist/drawable/contact_add_friend.png differ
diff --git a/system/tuicontact/src/main/res-minimalist/drawable/contact_add_group.png b/system/tuicontact/src/main/res-minimalist/drawable/contact_add_group.png
new file mode 100644
index 0000000..97166cc
Binary files /dev/null and b/system/tuicontact/src/main/res-minimalist/drawable/contact_add_group.png differ
diff --git a/system/tuicontact/src/main/res-minimalist/drawable/contact_minimalist_create_icon.png b/system/tuicontact/src/main/res-minimalist/drawable/contact_minimalist_create_icon.png
new file mode 100644
index 0000000..246351c
Binary files /dev/null and b/system/tuicontact/src/main/res-minimalist/drawable/contact_minimalist_create_icon.png differ
diff --git a/system/tuicontact/src/main/res-minimalist/layout/contact_minimalist_header_view_layout.xml b/system/tuicontact/src/main/res-minimalist/layout/contact_minimalist_header_view_layout.xml
new file mode 100644
index 0000000..f31f47d
--- /dev/null
+++ b/system/tuicontact/src/main/res-minimalist/layout/contact_minimalist_header_view_layout.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
+    android:background="@color/white"
+    android:paddingTop="9dp"
+    android:paddingEnd="16dp"
+    android:paddingStart="16dp"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:textSize="34sp"
+        android:lineHeight="41dp"
+        android:textStyle="bold"
+        android:textColor="@color/black_font_color"
+        android:text="@string/contact_minimalist_contacts"/>
+
+    <ImageView
+        android:id="@+id/create_new_button"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_marginLeft="25dp"
+        android:layout_marginStart="25dp"
+        android:background="@drawable/contact_minimalist_create_icon" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res-minimalist/layout/contact_minimalist_start_group_select_activity.xml b/system/tuicontact/src/main/res-minimalist/layout/contact_minimalist_start_group_select_activity.xml
new file mode 100644
index 0000000..975c197
--- /dev/null
+++ b/system/tuicontact/src/main/res-minimalist/layout/contact_minimalist_start_group_select_activity.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/group_create_title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/page_title_height" />
+
+    <com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget.ContactListView
+        android:id="@+id/group_create_member_list"
+        android:layout_weight="1"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:paddingBottom="16dp"
+        android:layout_height="wrap_content">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/selected_list"
+            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            android:id="@+id/confirm_button"
+            android:background="@drawable/contact_confirm_button_bg"
+            android:textSize="14sp"
+            android:text="@string/sure"
+            android:layout_marginLeft="12dp"
+            android:layout_gravity="center_vertical"
+            android:paddingLeft="12dp"
+            android:paddingRight="12dp"
+            android:paddingTop="4dp"
+            android:paddingBottom="4dp"
+            android:textColor="@color/white"
+            android:layout_width="wrap_content"
+            android:layout_height="30dp"/>
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/limit_tips"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center"
+        android:paddingBottom="36dp"
+        android:paddingTop="12dp"
+        android:background="#F6F6F6"
+        android:textColor="#999999"
+        android:textSize="12sp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:visibility="visible"
+        tools:text="123"
+        android:visibility="gone"/>
+
+</LinearLayout>
diff --git a/system/tuicontact/src/main/res-minimalist/layout/minimalist_contact_blacklist_activity.xml b/system/tuicontact/src/main/res-minimalist/layout/minimalist_contact_blacklist_activity.xml
new file mode 100644
index 0000000..031ab84
--- /dev/null
+++ b/system/tuicontact/src/main/res-minimalist/layout/minimalist_contact_blacklist_activity.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/black_list_titlebar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/page_title_height" />
+
+    <com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget.ContactListView
+        android:id="@+id/black_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
diff --git a/system/tuicontact/src/main/res-minimalist/layout/minimalist_contact_fragment.xml b/system/tuicontact/src/main/res-minimalist/layout/minimalist_contact_fragment.xml
new file mode 100644
index 0000000..64cc68f
--- /dev/null
+++ b/system/tuicontact/src/main/res-minimalist/layout/minimalist_contact_fragment.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget.ContactLayout
+        android:id="@+id/contact_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+
+</LinearLayout>
diff --git a/system/tuicontact/src/main/res-minimalist/layout/minimalist_contact_friend_profile_activity.xml b/system/tuicontact/src/main/res-minimalist/layout/minimalist_contact_friend_profile_activity.xml
new file mode 100644
index 0000000..9f31d86
--- /dev/null
+++ b/system/tuicontact/src/main/res-minimalist/layout/minimalist_contact_friend_profile_activity.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/status_bar_color"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget.FriendProfileLayout
+        android:id="@+id/friend_profile"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
diff --git a/system/tuicontact/src/main/res-minimalist/layout/minimalist_contact_friend_profile_layout.xml b/system/tuicontact/src/main/res-minimalist/layout/minimalist_contact_friend_profile_layout.xml
new file mode 100644
index 0000000..fbdb20f
--- /dev/null
+++ b/system/tuicontact/src/main/res-minimalist/layout/minimalist_contact_friend_profile_layout.xml
@@ -0,0 +1,353 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/core_bg_color"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/friend_titlebar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/page_title_height" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <RelativeLayout
+                android:id="@+id/friend_detail_area"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/contact_profile_self_height"
+                android:background="#FFFFFF"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:padding="@dimen/page_margin">
+
+                <com.tencent.qcloud.tuicore.component.gatherimage.ShadeImageView
+                    android:id="@+id/friend_icon"
+                    android:layout_width="@dimen/contact_profile_face_size"
+                    android:layout_height="@dimen/contact_profile_face_size"
+                    android:layout_gravity="start"
+                    app:round_radius="24dp"
+                    android:layout_marginLeft="@dimen/contact_profile_face_margin_left"
+                    android:layout_marginTop="@dimen/contact_profile_face_margin_top"
+                    android:layout_marginRight="@dimen/contact_profile_face_margin_right"
+                    android:scaleType="centerCrop" />
+
+                <TextView
+                    android:id="@+id/friend_nick_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignTop="@id/friend_icon"
+                    android:layout_toEndOf="@id/friend_icon"
+                    android:ellipsize="end"
+                    android:gravity="center_vertical"
+                    android:singleLine="true"
+                    android:textSize="@dimen/contact_profile_nick_name_text_size"
+                    tools:text="林" />
+
+                <TextView
+                    android:id="@+id/friend_account_tag"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/friend_nick_name"
+                    android:layout_alignStart="@id/friend_nick_name"
+                    android:layout_marginTop="@dimen/contact_profile_text_margin"
+                    android:gravity="center_vertical"
+                    android:text="@string/contact_account_tag"
+                    android:textSize="@dimen/contact_profile_account_text_size" />
+
+                <TextView
+                    android:id="@+id/friend_account"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/friend_nick_name"
+                    android:layout_alignTop="@+id/friend_account_tag"
+                    android:layout_toEndOf="@id/friend_account_tag"
+                    android:gravity="center_vertical"
+                    android:textSize="@dimen/contact_profile_account_text_size"
+                    tools:text="99618" />
+
+                <TextView
+                    android:id="@+id/friend_signature_tag"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/friend_account_tag"
+                    android:layout_alignStart="@id/friend_account_tag"
+                    android:layout_marginTop="@dimen/contact_profile_text_margin"
+                    android:gravity="center_vertical"
+                    android:text="@string/contact_signature_tag"
+                    android:textSize="@dimen/contact_profile_account_text_size" />
+
+
+                <TextView
+                    android:id="@+id/friend_signature"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignTop="@id/friend_signature_tag"
+                    android:layout_toEndOf="@id/friend_signature_tag"
+                    android:ellipsize="end"
+                    android:gravity="center_vertical"
+                    android:singleLine="true"
+                    android:textSize="@dimen/contact_profile_signature_text_size"
+                    tools:text="相信光" />
+
+            </RelativeLayout>
+
+            <LinearLayout
+                android:id="@+id/friend_application_verify_area"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingBottom="10dp"
+                android:background="@color/white"
+                android:orientation="horizontal"
+                android:visibility="gone"
+                tools:visibility="visible">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="15.36dp"
+                    android:text="@string/contact_add_wording" />
+
+                <TextView
+                    android:id="@+id/friend_application_add_wording"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:text="你好啊" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/add_friend_verify_area"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone"
+                tools:visibility="visible">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="15.36dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="10dp"
+                    android:text="@string/contact_set_add_wording" />
+
+                <EditText
+                    android:id="@+id/add_wording_edit"
+                    android:longClickable="false"
+                    android:layout_width="match_parent"
+                    android:layout_height="138dp"
+                    android:background="@color/white"
+                    android:gravity="top"
+                    android:maxLines="5" />
+
+                <TextView
+                    android:id="@+id/remark_and_group_tip"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="15.36dp"
+                    android:layout_marginTop="10dp"
+                    android:text="@string/contact_set_remark_and_group" />
+
+                <com.tencent.qcloud.tuicore.component.LineControllerView
+                    android:id="@+id/friend_remark_lv"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/contact_profile_item_height"
+                    android:layout_marginTop="10dp"
+                    app:canNav="true"
+                    app:name="@string/contact_friend_remark" />
+
+                <com.tencent.qcloud.tuicore.component.LineControllerView
+                    android:id="@+id/friend_group_lv"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/contact_profile_item_height"
+                    app:canNav="true"
+                    app:name="@string/contact_friend_group" />
+
+            </LinearLayout>
+
+            <com.tencent.qcloud.tuicore.component.LineControllerView
+                android:id="@+id/remark"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/contact_profile_item_height"
+                android:layout_marginTop="10dp"
+                android:visibility="gone"
+                app:canNav="true"
+                app:name="@string/profile_remark"
+                tools:visibility="visible" />
+
+            <com.tencent.qcloud.tuicore.component.LineControllerView
+                android:id="@+id/msg_rev_opt"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/contact_profile_item_height"
+                android:layout_marginTop="10dp"
+                android:visibility="gone"
+                app:isSwitch="true"
+                app:name="@string/profile_msgrev_opt" />
+
+            <com.tencent.qcloud.tuicore.component.LineControllerView
+                android:id="@+id/chat_to_top"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/contact_profile_item_height"
+                android:visibility="gone"
+                app:isSwitch="true"
+                app:isTop="true"
+                app:name="@string/chat_to_top" />
+
+            <com.tencent.qcloud.tuicore.component.LineControllerView
+                android:id="@+id/chat_background"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/contact_profile_item_height"
+                android:visibility="gone"
+                app:canNav="true"
+                app:name="@string/profile_chat_background"
+                tools:visibility="visible" />
+
+            <com.tencent.qcloud.tuicore.component.LineControllerView
+                android:id="@+id/blackList"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/contact_profile_item_height"
+                android:layout_marginTop="10dp"
+                android:visibility="gone"
+                app:isSwitch="true"
+                app:name="@string/profile_black" />
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <Button
+                    android:id="@+id/add_friend_send_btn"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/contact_profile_btn_height"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginTop="10dp"
+                    android:background="@drawable/btn_bg_color"
+                    android:text="@string/contact_add"
+                    android:textColor="?attr/core_primary_color"
+                    android:textSize="@dimen/contact_profile_btn_text_size"
+                    android:textAllCaps="false"
+                    android:visibility="gone"
+                    tools:visibility="visible" />
+
+                <Button
+                    android:id="@+id/accept_friend_send_btn"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/contact_profile_btn_height"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginTop="10dp"
+                    android:background="@drawable/btn_bg_color"
+                    android:text="@string/accept"
+                    android:textColor="?attr/core_primary_color"
+                    android:textSize="@dimen/contact_profile_btn_text_size"
+                    android:textAllCaps="false"
+                    android:visibility="gone"
+                    tools:visibility="visible" />
+
+                <Button
+                    android:id="@+id/btn_chat"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/contact_profile_btn_height"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginTop="10dp"
+                    android:background="@drawable/btn_bg_color"
+                    android:text="@string/profile_chat"
+                    android:textColor="?attr/core_primary_color"
+                    android:textSize="@dimen/contact_profile_btn_text_size"
+                    android:textAllCaps="false"
+                    android:visibility="gone"
+                    tools:visibility="visible" />
+
+                <Button
+                    android:id="@+id/btn_voice"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/contact_profile_btn_height"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginTop="0.68dp"
+                    android:background="@drawable/btn_bg_color"
+                    android:text="@string/profile_voice_chat"
+                    android:textColor="?attr/core_primary_color"
+                    android:textSize="@dimen/contact_profile_btn_text_size"
+                    android:textAllCaps="false"
+                    android:visibility="gone"
+                    tools:visibility="visible" />
+
+                <Button
+                    android:id="@+id/btn_video"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/contact_profile_btn_height"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginTop="0.68dp"
+                    android:background="@drawable/btn_bg_color"
+                    android:text="@string/profile_video_chat"
+                    android:textColor="?attr/core_primary_color"
+                    android:textSize="@dimen/contact_profile_btn_text_size"
+                    android:textAllCaps="false"
+                    android:visibility="gone"
+                    tools:visibility="visible" />
+
+                <Button
+                    android:id="@+id/btn_clear_chat_history"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/contact_profile_btn_height"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginTop="0.68dp"
+                    android:background="@drawable/btn_bg_color"
+                    android:text="@string/profile_clear_message"
+                    android:textColor="?attr/core_error_tip_color"
+                    android:textSize="@dimen/contact_profile_btn_text_size"
+                    android:visibility="gone"
+                    android:textAllCaps="false"
+                    tools:visibility="visible" />
+
+                <Button
+                    android:id="@+id/btn_delete"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/contact_profile_btn_height"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginTop="0.68dp"
+                    android:background="@drawable/btn_bg_color"
+                    android:text="@string/profile_delete_friend"
+                    android:textColor="?attr/core_error_tip_color"
+                    android:textSize="@dimen/contact_profile_btn_text_size"
+                    android:visibility="gone"
+                    android:textAllCaps="false"
+                    tools:visibility="visible" />
+
+                <Button
+                    android:id="@+id/refuse_friend_send_btn"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/contact_profile_btn_height"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginTop="0.6dp"
+                    android:background="@drawable/btn_bg_color"
+                    android:text="@string/refuse"
+                    android:textColor="?attr/core_error_tip_color"
+                    android:textAllCaps="false"
+                    android:textSize="@dimen/contact_profile_btn_text_size"
+                    android:visibility="gone"
+                    tools:visibility="visible" />
+
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+</LinearLayout>
diff --git a/system/tuicontact/src/main/res-minimalist/layout/minimalist_contact_layout.xml b/system/tuicontact/src/main/res-minimalist/layout/minimalist_contact_layout.xml
new file mode 100644
index 0000000..47acc0c
--- /dev/null
+++ b/system/tuicontact/src/main/res-minimalist/layout/minimalist_contact_layout.xml
@@ -0,0 +1,17 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/core_bg_color"
+    android:orientation="vertical">
+
+    <include layout="@layout/contact_minimalist_header_view_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget.ContactListView
+        android:id="@+id/contact_listview"
+        android:background="?attr/core_bg_color"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
diff --git a/system/tuicontact/src/main/res-minimalist/layout/minimalist_contact_list.xml b/system/tuicontact/src/main/res-minimalist/layout/minimalist_contact_list.xml
new file mode 100644
index 0000000..b58341c
--- /dev/null
+++ b/system/tuicontact/src/main/res-minimalist/layout/minimalist_contact_list.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="#F2F3F5"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/contact_member_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <TextView
+        android:id="@+id/not_found_tip"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="120dp"
+        android:gravity="center_horizontal"
+        android:textSize="13.44sp"
+        android:textColor="#444444"
+        android:visibility="gone"
+        tools:visibility="visible"
+        tools:text="暂无群聊"/>
+
+    <com.tencent.qcloud.tuikit.tuicontact.component.indexlib.IndexBar.widget.IndexBar
+        android:id="@+id/contact_indexBar"
+        android:layout_width="24dp"
+        android:layout_marginTop="54dp"
+        android:layout_marginBottom="40.8dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_vertical|right"
+        app:indexBarPressBackground="@color/partTranslucent"
+        app:indexBarTextSize="12sp" />
+
+    <TextView
+        android:id="@+id/contact_tvSideBarHint"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_gravity="center"
+        android:background="@drawable/shape_side_bar_bg"
+        android:gravity="center"
+        android:textColor="@android:color/white"
+        android:textSize="40sp"
+        android:visibility="gone"
+        tools:text="A"
+        tools:visibility="visible" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <ProgressBar
+            android:id="@+id/contact_loading_bar"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            android:layout_centerInParent="true"/>
+    </RelativeLayout>
+</FrameLayout>
diff --git a/system/tuicontact/src/main/res-minimalist/layout/minimalist_forward_select_group_contact.xml b/system/tuicontact/src/main/res-minimalist/layout/minimalist_forward_select_group_contact.xml
new file mode 100644
index 0000000..32aa731
--- /dev/null
+++ b/system/tuicontact/src/main/res-minimalist/layout/minimalist_forward_select_group_contact.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/group_create_title_bar"
+        android:layout_width="match_parent"
+        android:layout_alignParentTop="true"
+        android:layout_height="@dimen/page_title_height" />
+
+    <com.tencent.qcloud.tuicore.component.LineControllerView
+        android:id="@+id/group_type_join"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/group_create_title_bar"
+        android:layout_marginTop="1dp"
+        android:visibility="gone"
+        app:name="@string/group_join_type" />
+
+    <com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget.ContactListView
+        android:id="@+id/group_create_member_list"
+        android:layout_below="@+id/group_create_title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/btn_height"/>
+
+    <RelativeLayout
+        android:id="@+id/forward_contact_select_list_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:layout_alignParentBottom="true"
+        android:paddingLeft="14.85dp"
+        android:paddingRight="14.85dp"
+        android:orientation="horizontal">
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/forward_contact_select_list"
+            android:layout_width="match_parent"
+            android:layout_alignParentLeft="true"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="@dimen/forward_margin"/>
+
+        <TextView
+            android:id="@+id/btn_msg_ok"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="@dimen/btn_margin_right"
+            android:text="@string/sure"
+            android:textColor="@color/bg_positive_btn"
+            android:textSize="14sp"
+            android:visibility="visible" />
+
+    </RelativeLayout>
+
+</RelativeLayout>
diff --git a/system/tuicontact/src/main/res-minimalist/layout/minimalist_group_list_activity.xml b/system/tuicontact/src/main/res-minimalist/layout/minimalist_group_list_activity.xml
new file mode 100644
index 0000000..ee97d52
--- /dev/null
+++ b/system/tuicontact/src/main/res-minimalist/layout/minimalist_group_list_activity.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/group_list_titlebar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/page_title_height" />
+
+    <com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget.ContactListView
+        android:id="@+id/group_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
diff --git a/system/tuicontact/src/main/res-minimalist/layout/minimalist_popup_start_c2c_chat_activity.xml b/system/tuicontact/src/main/res-minimalist/layout/minimalist_popup_start_c2c_chat_activity.xml
new file mode 100644
index 0000000..4c67d7b
--- /dev/null
+++ b/system/tuicontact/src/main/res-minimalist/layout/minimalist_popup_start_c2c_chat_activity.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/status_bar_color"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/start_c2c_chat_title"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/page_title_height" />
+
+    <com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget.ContactListView
+        android:id="@+id/contact_list_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</LinearLayout>
diff --git a/system/tuicontact/src/main/res-minimalist/layout/minimalist_popup_start_group_chat_activity.xml b/system/tuicontact/src/main/res-minimalist/layout/minimalist_popup_start_group_chat_activity.xml
new file mode 100644
index 0000000..c36e5ec
--- /dev/null
+++ b/system/tuicontact/src/main/res-minimalist/layout/minimalist_popup_start_group_chat_activity.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/group_create_title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/page_title_height" />
+
+    <com.tencent.qcloud.tuicore.component.LineControllerView
+        android:id="@+id/group_type_join"
+        android:layout_width="match_parent"
+        android:layout_height="46.08dp"
+        android:layout_marginTop="1dp"
+        android:visibility="gone"
+        app:name="@string/group_join_type" />
+
+    <com.tencent.qcloud.tuikit.tuicontact.minimalistui.widget.ContactListView
+        android:layout_weight="1"
+        android:id="@+id/group_create_member_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:paddingBottom="8dp"
+        android:gravity="center_vertical"
+        android:layout_height="@dimen/contact_list_item_height">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/selected_list"
+            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            android:id="@+id/confirm_button"
+            android:background="@drawable/contact_confirm_button_bg"
+            android:textSize="14sp"
+            android:text="@string/core_next_step"
+            android:layout_marginLeft="12dp"
+            android:layout_gravity="center_vertical"
+            android:paddingLeft="12dp"
+            android:paddingRight="12dp"
+            android:paddingTop="4dp"
+            android:paddingBottom="4dp"
+            android:textColor="@color/white"
+            android:layout_width="wrap_content"
+            android:layout_height="30dp"/>
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/limit_tips"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center"
+        android:paddingBottom="36dp"
+        android:paddingTop="12dp"
+        android:background="#F6F6F6"
+        android:textColor="#999999"
+        android:textSize="12sp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:visibility="visible"
+        tools:text="123"
+        android:visibility="gone"/>
+</LinearLayout>
diff --git a/system/tuicontact/src/main/res-minimalist/values-zh-rCN/minimalist_strings.xml b/system/tuicontact/src/main/res-minimalist/values-zh-rCN/minimalist_strings.xml
new file mode 100644
index 0000000..00d61e8
--- /dev/null
+++ b/system/tuicontact/src/main/res-minimalist/values-zh-rCN/minimalist_strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="contact_minimalist_contacts">联系人</string>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res-minimalist/values/minimalist_strings.xml b/system/tuicontact/src/main/res-minimalist/values/minimalist_strings.xml
new file mode 100644
index 0000000..2539559
--- /dev/null
+++ b/system/tuicontact/src/main/res-minimalist/values/minimalist_strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="contact_minimalist_contacts">Contacts</string>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res-serious/drawable-xxhdpi/contact_black_list_icon_serious.png b/system/tuicontact/src/main/res-serious/drawable-xxhdpi/contact_black_list_icon_serious.png
new file mode 100644
index 0000000..500de9e
Binary files /dev/null and b/system/tuicontact/src/main/res-serious/drawable-xxhdpi/contact_black_list_icon_serious.png differ
diff --git a/system/tuicontact/src/main/res-serious/drawable-xxhdpi/contact_group_list_icon_serious.png b/system/tuicontact/src/main/res-serious/drawable-xxhdpi/contact_group_list_icon_serious.png
new file mode 100644
index 0000000..9bb3cb0
Binary files /dev/null and b/system/tuicontact/src/main/res-serious/drawable-xxhdpi/contact_group_list_icon_serious.png differ
diff --git a/system/tuicontact/src/main/res-serious/drawable-xxhdpi/contact_new_friend_icon_serious.png b/system/tuicontact/src/main/res-serious/drawable-xxhdpi/contact_new_friend_icon_serious.png
new file mode 100644
index 0000000..801e047
Binary files /dev/null and b/system/tuicontact/src/main/res-serious/drawable-xxhdpi/contact_new_friend_icon_serious.png differ
diff --git a/system/tuicontact/src/main/res-serious/values/serious_colors.xml b/system/tuicontact/src/main/res-serious/values/serious_colors.xml
new file mode 100644
index 0000000..55344e5
--- /dev/null
+++ b/system/tuicontact/src/main/res-serious/values/serious_colors.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res-serious/values/serious_styles.xml b/system/tuicontact/src/main/res-serious/values/serious_styles.xml
new file mode 100644
index 0000000..8e8f11d
--- /dev/null
+++ b/system/tuicontact/src/main/res-serious/values/serious_styles.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TUIContactSeriousTheme" parent="TUIBaseSeriousTheme">
+        <item name="contact_new_friend_icon">@drawable/contact_new_friend_icon_serious</item>
+        <item name="contact_group_list_icon">@drawable/contact_group_list_icon_serious</item>
+        <item name="contact_black_list_icon">@drawable/contact_black_list_icon_serious</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res/color/bg_negative_btn.xml b/system/tuicontact/src/main/res/color/bg_negative_btn.xml
new file mode 100644
index 0000000..65e00d4
--- /dev/null
+++ b/system/tuicontact/src/main/res/color/bg_negative_btn.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:color="#E6E9EB"/>
+    <item android:state_pressed="false" android:color="#FFFFFF"/>
+</selector>
diff --git a/system/tuicontact/src/main/res/color/bg_positive_btn.xml b/system/tuicontact/src/main/res/color/bg_positive_btn.xml
new file mode 100644
index 0000000..102c1f9
--- /dev/null
+++ b/system/tuicontact/src/main/res/color/bg_positive_btn.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:color="@color/btn_positive_hover" >
+        <shape xmlns:android="http://schemas.android.com/apk/res/android"
+            android:shape="rectangle" >
+            <corners android:radius="5dp" />
+            <solid android:color="@color/btn_positive_hover" />
+        </shape>
+    </item>
+    <item android:color="@color/btn_positive" >
+        <shape xmlns:android="http://schemas.android.com/apk/res/android"
+            android:shape="rectangle" >
+            <corners android:radius="5dp" />
+            <solid android:color="@color/btn_positive" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res/color/negative_text.xml b/system/tuicontact/src/main/res/color/negative_text.xml
new file mode 100644
index 0000000..58cd657
--- /dev/null
+++ b/system/tuicontact/src/main/res/color/negative_text.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:color="@color/text_negative_hover"/>
+    <item android:state_pressed="false" android:color="@color/text_negative"/>
+</selector>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res/color/positive_text.xml b/system/tuicontact/src/main/res/color/positive_text.xml
new file mode 100644
index 0000000..40524cf
--- /dev/null
+++ b/system/tuicontact/src/main/res/color/positive_text.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:color="@color/text_positive_hover"/>
+    <item android:state_pressed="false" android:color="@color/text_positive"/>
+</selector>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res/drawable-xxhdpi/check_box_selected.png b/system/tuicontact/src/main/res/drawable-xxhdpi/check_box_selected.png
new file mode 100644
index 0000000..273e525
Binary files /dev/null and b/system/tuicontact/src/main/res/drawable-xxhdpi/check_box_selected.png differ
diff --git a/system/tuicontact/src/main/res/drawable-xxhdpi/check_box_unselected.png b/system/tuicontact/src/main/res/drawable-xxhdpi/check_box_unselected.png
new file mode 100644
index 0000000..949bc8b
Binary files /dev/null and b/system/tuicontact/src/main/res/drawable-xxhdpi/check_box_unselected.png differ
diff --git a/system/tuicontact/src/main/res/drawable-xxhdpi/conversation_more.png b/system/tuicontact/src/main/res/drawable-xxhdpi/conversation_more.png
new file mode 100644
index 0000000..96901df
Binary files /dev/null and b/system/tuicontact/src/main/res/drawable-xxhdpi/conversation_more.png differ
diff --git a/system/tuicontact/src/main/res/drawable-xxhdpi/create_c2c.png b/system/tuicontact/src/main/res/drawable-xxhdpi/create_c2c.png
new file mode 100644
index 0000000..f3a4086
Binary files /dev/null and b/system/tuicontact/src/main/res/drawable-xxhdpi/create_c2c.png differ
diff --git a/system/tuicontact/src/main/res/drawable-xxhdpi/group_icon.png b/system/tuicontact/src/main/res/drawable-xxhdpi/group_icon.png
new file mode 100644
index 0000000..b2dc3dc
Binary files /dev/null and b/system/tuicontact/src/main/res/drawable-xxhdpi/group_icon.png differ
diff --git a/system/tuicontact/src/main/res/drawable-xxhdpi/ic_contact_join_group.png b/system/tuicontact/src/main/res/drawable-xxhdpi/ic_contact_join_group.png
new file mode 100644
index 0000000..3a4fcd0
Binary files /dev/null and b/system/tuicontact/src/main/res/drawable-xxhdpi/ic_contact_join_group.png differ
diff --git a/system/tuicontact/src/main/res/drawable/agree_btn_bg.xml b/system/tuicontact/src/main/res/drawable/agree_btn_bg.xml
new file mode 100644
index 0000000..25c0611
--- /dev/null
+++ b/system/tuicontact/src/main/res/drawable/agree_btn_bg.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid
+        android:color="?attr/core_primary_color"/>
+
+    <corners
+        android:radius="2dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res/drawable/btn_bg_color.xml b/system/tuicontact/src/main/res/drawable/btn_bg_color.xml
new file mode 100644
index 0000000..28e99b8
--- /dev/null
+++ b/system/tuicontact/src/main/res/drawable/btn_bg_color.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:drawable="@color/contact_profile_btn_pressed_color"/>
+    <item android:drawable="@color/white"/>
+
+</selector>
diff --git a/system/tuicontact/src/main/res/drawable/contact_checkbox_selector.xml b/system/tuicontact/src/main/res/drawable/contact_checkbox_selector.xml
new file mode 100644
index 0000000..8c4a3d2
--- /dev/null
+++ b/system/tuicontact/src/main/res/drawable/contact_checkbox_selector.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/check_box_selected" android:state_checked="true" android:state_enabled="true"/>
+    <item android:drawable="@drawable/contact_select_disable" android:state_checked="true" android:state_enabled="false"/>
+    <item android:drawable="@drawable/check_box_unselected" android:state_checked="false" />
+    <item android:drawable="@drawable/check_box_unselected" />
+
+</selector>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res/drawable/contact_confirm_button_bg.xml b/system/tuicontact/src/main/res/drawable/contact_confirm_button_bg.xml
new file mode 100644
index 0000000..339608e
--- /dev/null
+++ b/system/tuicontact/src/main/res/drawable/contact_confirm_button_bg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="?attr/core_primary_color"/>
+    <corners android:radius="4dp"/>
+</shape>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res/drawable/contact_select_disable.png b/system/tuicontact/src/main/res/drawable/contact_select_disable.png
new file mode 100644
index 0000000..3244854
Binary files /dev/null and b/system/tuicontact/src/main/res/drawable/contact_select_disable.png differ
diff --git a/system/tuicontact/src/main/res/drawable/contact_shape_search.xml b/system/tuicontact/src/main/res/drawable/contact_shape_search.xml
new file mode 100644
index 0000000..94b06d1
--- /dev/null
+++ b/system/tuicontact/src/main/res/drawable/contact_shape_search.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+<!-- 连框颜色值 -->
+<item>
+    <shape>
+        <solid android:color="#ece9e9" />
+        <corners android:radius="5dp"/>
+    </shape>
+</item>
+<!-- 主体背景颜色值 -->
+<item android:bottom="1dp"
+    android:start="1dp"
+    android:right="1dp"
+    android:left="1dp"> 
+    <shape>
+        <solid android:color="#fff" />
+        <corners android:radius="5dp"/>
+    </shape>
+</item>
+
+</layer-list>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res/drawable/my_cursor.xml b/system/tuicontact/src/main/res/drawable/my_cursor.xml
new file mode 100644
index 0000000..31599ac
--- /dev/null
+++ b/system/tuicontact/src/main/res/drawable/my_cursor.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/green" />
+    <size android:width="1dp" />
+</shape>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res/drawable/reject_btn_bg.xml b/system/tuicontact/src/main/res/drawable/reject_btn_bg.xml
new file mode 100644
index 0000000..5897327
--- /dev/null
+++ b/system/tuicontact/src/main/res/drawable/reject_btn_bg.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:color="@color/dialog_line_bg"
+        android:width="1dp"/>
+
+    <solid
+        android:color="@color/white"/>
+
+    <corners
+        android:radius="2dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res/drawable/shape_side_bar_bg.xml b/system/tuicontact/src/main/res/drawable/shape_side_bar_bg.xml
new file mode 100644
index 0000000..fae705f
--- /dev/null
+++ b/system/tuicontact/src/main/res/drawable/shape_side_bar_bg.xml
@@ -0,0 +1,4 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="5dp" />
+    <solid android:color="@color/slide_bar_hint_color" />
+</shape>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res/layout/contact_add_activity.xml b/system/tuicontact/src/main/res/layout/contact_add_activity.xml
new file mode 100644
index 0000000..fcd7027
--- /dev/null
+++ b/system/tuicontact/src/main/res/layout/contact_add_activity.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical">
+
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/add_friend_titlebar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/page_title_height" />
+
+    <!-- search-->
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center" >
+
+        <TextView
+            android:id="@+id/search_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="#444444"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="10dp"
+            android:text="@string/contact_search"
+            android:textSize="15.36sp" />
+
+        <LinearLayout
+            android:focusable="true"
+            android:layout_toLeftOf="@+id/search_button"
+            android:focusableInTouchMode="true"
+            android:layout_marginTop="5dp"
+            android:layout_width="match_parent"
+            android:layout_height="35dp"
+            android:layout_gravity="center"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="5dp"
+            android:background="@drawable/contact_shape_search"
+            android:orientation="horizontal">
+            <ImageView
+                android:layout_marginLeft="5dp"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:layout_gravity="center"
+                android:scaleType="fitCenter"
+                android:background="@drawable/core_search_icon" />
+            <EditText
+                android:id="@+id/search_edit"
+                android:longClickable="false"
+                android:layout_width="0dp"
+                android:layout_height="28dp"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:layout_marginLeft="10dp"
+                android:background="@null"
+                android:imeOptions="actionSearch"
+                android:hint="@string/hint_search_user_id"
+                android:lines="1"
+                android:textSize="16sp"
+                android:singleLine="true" />
+            <ImageView
+                android:layout_marginRight="3dp"
+                android:id="@+id/imgv_delete"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:layout_gravity="center"
+                android:scaleType="centerInside"
+                android:src="@drawable/core_delete_icon"
+                android:visibility="gone" />
+        </LinearLayout>
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/friend_detail_area"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/contact_profile_self_height"
+        android:background="#FFFFFF"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:padding="@dimen/page_margin"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <com.tencent.qcloud.tuicore.component.gatherimage.ShadeImageView
+            android:id="@+id/friend_icon"
+            android:layout_width="@dimen/contact_profile_face_size"
+            android:layout_height="@dimen/contact_profile_face_size"
+            android:layout_gravity="start"
+            android:scaleType="centerCrop"
+            android:layout_marginLeft="@dimen/contact_profile_face_margin_left"
+            android:layout_marginRight="@dimen/contact_profile_face_margin_right"
+            android:layout_marginTop="@dimen/contact_profile_face_margin_top" />
+
+        <TextView
+            android:id="@+id/friend_nick_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignTop="@id/friend_icon"
+            android:layout_toEndOf="@id/friend_icon"
+            android:gravity="center_vertical"
+            android:textSize="@dimen/contact_profile_nick_name_text_size"
+            tools:text="林" />
+
+        <TextView
+            android:id="@+id/friend_account_tag"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignStart="@id/friend_nick_name"
+            android:layout_below="@id/friend_nick_name"
+            android:layout_marginTop="@dimen/contact_profile_text_margin"
+            android:gravity="center_vertical"
+            android:textSize="@dimen/contact_profile_account_text_size"
+            android:text="@string/contact_account_tag" />
+
+        <TextView
+            android:id="@+id/friend_account"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignTop="@+id/friend_account_tag"
+            android:layout_toEndOf="@id/friend_account_tag"
+            android:layout_below="@id/friend_nick_name"
+            android:gravity="center_vertical"
+            android:textColor="@color/font_blue"
+            android:textSize="@dimen/contact_profile_account_text_size"
+            tools:text="99618" />
+
+        <TextView
+            android:id="@+id/group_type_tag"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignStart="@id/friend_account_tag"
+            android:layout_below="@id/friend_account_tag"
+            android:layout_marginTop="@dimen/contact_profile_text_margin"
+            android:gravity="center_vertical"
+            android:textSize="@dimen/contact_profile_account_text_size"
+            android:text="@string/contact_group_type_tag" />
+
+
+        <TextView
+            android:id="@+id/group_type"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toEndOf="@id/group_type_tag"
+            android:layout_alignTop="@id/group_type_tag"
+            android:gravity="center_vertical"
+            android:textSize="@dimen/contact_profile_signature_text_size"
+            tools:text="相信光" />
+
+    </RelativeLayout>
+
+    <TextView
+        android:id="@+id/id_label"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15.36dp"
+        android:gravity="center"
+        android:textSize="13.44sp"
+        android:textColor="#444444"
+        tools:text="我的 ID"/>
+
+
+    <TextView
+        android:id="@+id/not_found_tip"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15.36dp"
+        android:gravity="center"
+        android:textSize="13.44sp"
+        android:textColor="#444444"
+        tools:text="该用户不存在"/>
+
+</LinearLayout>
diff --git a/system/tuicontact/src/main/res/layout/contact_blacklist_activity.xml b/system/tuicontact/src/main/res/layout/contact_blacklist_activity.xml
new file mode 100644
index 0000000..b376f98
--- /dev/null
+++ b/system/tuicontact/src/main/res/layout/contact_blacklist_activity.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/black_list_titlebar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/page_title_height" />
+
+    <com.tencent.qcloud.tuikit.tuicontact.classicui.widget.ContactListView
+        android:id="@+id/black_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
diff --git a/system/tuicontact/src/main/res/layout/contact_fragment.xml b/system/tuicontact/src/main/res/layout/contact_fragment.xml
new file mode 100644
index 0000000..cd6df58
--- /dev/null
+++ b/system/tuicontact/src/main/res/layout/contact_fragment.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.tencent.qcloud.tuikit.tuicontact.classicui.widget.ContactLayout
+        android:id="@+id/contact_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+
+</LinearLayout>
diff --git a/system/tuicontact/src/main/res/layout/contact_friend_profile_activity.xml b/system/tuicontact/src/main/res/layout/contact_friend_profile_activity.xml
new file mode 100644
index 0000000..a4d2a60
--- /dev/null
+++ b/system/tuicontact/src/main/res/layout/contact_friend_profile_activity.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/status_bar_color"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuikit.tuicontact.classicui.widget.FriendProfileLayout
+        android:id="@+id/friend_profile"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
diff --git a/system/tuicontact/src/main/res/layout/contact_friend_profile_layout.xml b/system/tuicontact/src/main/res/layout/contact_friend_profile_layout.xml
new file mode 100644
index 0000000..7246b58
--- /dev/null
+++ b/system/tuicontact/src/main/res/layout/contact_friend_profile_layout.xml
@@ -0,0 +1,352 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/core_bg_color"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/friend_titlebar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/page_title_height" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <RelativeLayout
+                android:id="@+id/friend_detail_area"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/contact_profile_self_height"
+                android:background="#FFFFFF"
+                android:gravity="center_vertical"
+                android:orientation="horizontal"
+                android:padding="@dimen/page_margin">
+
+                <com.tencent.qcloud.tuicore.component.gatherimage.ShadeImageView
+                    android:id="@+id/friend_icon"
+                    android:layout_width="@dimen/contact_profile_face_size"
+                    android:layout_height="@dimen/contact_profile_face_size"
+                    android:layout_gravity="start"
+                    android:layout_marginLeft="@dimen/contact_profile_face_margin_left"
+                    android:layout_marginTop="@dimen/contact_profile_face_margin_top"
+                    android:layout_marginRight="@dimen/contact_profile_face_margin_right"
+                    android:scaleType="centerCrop" />
+
+                <TextView
+                    android:id="@+id/friend_nick_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignTop="@id/friend_icon"
+                    android:layout_toEndOf="@id/friend_icon"
+                    android:ellipsize="end"
+                    android:gravity="center_vertical"
+                    android:singleLine="true"
+                    android:textSize="@dimen/contact_profile_nick_name_text_size"
+                    tools:text="林" />
+
+                <TextView
+                    android:id="@+id/friend_account_tag"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/friend_nick_name"
+                    android:layout_alignStart="@id/friend_nick_name"
+                    android:layout_marginTop="@dimen/contact_profile_text_margin"
+                    android:gravity="center_vertical"
+                    android:text="@string/contact_account_tag"
+                    android:textSize="@dimen/contact_profile_account_text_size" />
+
+                <TextView
+                    android:id="@+id/friend_account"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/friend_nick_name"
+                    android:layout_alignTop="@+id/friend_account_tag"
+                    android:layout_toEndOf="@id/friend_account_tag"
+                    android:gravity="center_vertical"
+                    android:textSize="@dimen/contact_profile_account_text_size"
+                    tools:text="99618" />
+
+                <TextView
+                    android:id="@+id/friend_signature_tag"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/friend_account_tag"
+                    android:layout_alignStart="@id/friend_account_tag"
+                    android:layout_marginTop="@dimen/contact_profile_text_margin"
+                    android:gravity="center_vertical"
+                    android:text="@string/contact_signature_tag"
+                    android:textSize="@dimen/contact_profile_account_text_size" />
+
+
+                <TextView
+                    android:id="@+id/friend_signature"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignTop="@id/friend_signature_tag"
+                    android:layout_toEndOf="@id/friend_signature_tag"
+                    android:ellipsize="end"
+                    android:gravity="center_vertical"
+                    android:singleLine="true"
+                    android:textSize="@dimen/contact_profile_signature_text_size"
+                    tools:text="相信光" />
+
+            </RelativeLayout>
+
+            <LinearLayout
+                android:id="@+id/friend_application_verify_area"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingBottom="10dp"
+                android:background="@color/white"
+                android:orientation="horizontal"
+                android:visibility="gone"
+                tools:visibility="visible">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="15.36dp"
+                    android:text="@string/contact_add_wording" />
+
+                <TextView
+                    android:id="@+id/friend_application_add_wording"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    tools:text="你好啊" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/add_friend_verify_area"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone"
+                tools:visibility="visible">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="15.36dp"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="10dp"
+                    android:text="@string/contact_set_add_wording" />
+
+                <EditText
+                    android:id="@+id/add_wording_edit"
+                    android:longClickable="false"
+                    android:layout_width="match_parent"
+                    android:layout_height="138dp"
+                    android:background="@color/white"
+                    android:gravity="top"
+                    android:maxLines="5" />
+
+                <TextView
+                    android:id="@+id/remark_and_group_tip"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="15.36dp"
+                    android:layout_marginTop="10dp"
+                    android:text="@string/contact_set_remark_and_group" />
+
+                <com.tencent.qcloud.tuicore.component.LineControllerView
+                    android:id="@+id/friend_remark_lv"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/contact_profile_item_height"
+                    android:layout_marginTop="10dp"
+                    app:canNav="true"
+                    app:name="@string/contact_friend_remark" />
+
+                <com.tencent.qcloud.tuicore.component.LineControllerView
+                    android:id="@+id/friend_group_lv"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/contact_profile_item_height"
+                    app:canNav="true"
+                    app:name="@string/contact_friend_group" />
+
+            </LinearLayout>
+
+            <com.tencent.qcloud.tuicore.component.LineControllerView
+                android:id="@+id/remark"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/contact_profile_item_height"
+                android:layout_marginTop="10dp"
+                android:visibility="gone"
+                app:canNav="true"
+                app:name="@string/profile_remark"
+                tools:visibility="visible" />
+
+            <com.tencent.qcloud.tuicore.component.LineControllerView
+                android:id="@+id/msg_rev_opt"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/contact_profile_item_height"
+                android:layout_marginTop="10dp"
+                android:visibility="gone"
+                app:isSwitch="true"
+                app:name="@string/profile_msgrev_opt" />
+
+            <com.tencent.qcloud.tuicore.component.LineControllerView
+                android:id="@+id/chat_to_top"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/contact_profile_item_height"
+                android:visibility="gone"
+                app:isSwitch="true"
+                app:isTop="true"
+                app:name="@string/chat_to_top" />
+
+            <com.tencent.qcloud.tuicore.component.LineControllerView
+                android:id="@+id/chat_background"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/contact_profile_item_height"
+                android:visibility="gone"
+                app:canNav="true"
+                app:name="@string/profile_chat_background"
+                tools:visibility="visible" />
+
+            <com.tencent.qcloud.tuicore.component.LineControllerView
+                android:id="@+id/blackList"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/contact_profile_item_height"
+                android:layout_marginTop="10dp"
+                android:visibility="gone"
+                app:isSwitch="true"
+                app:name="@string/profile_black" />
+
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <Button
+                    android:id="@+id/add_friend_send_btn"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/contact_profile_btn_height"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginTop="10dp"
+                    android:background="@drawable/btn_bg_color"
+                    android:text="@string/contact_add"
+                    android:textColor="?attr/core_primary_color"
+                    android:textSize="@dimen/contact_profile_btn_text_size"
+                    android:textAllCaps="false"
+                    android:visibility="gone"
+                    tools:visibility="visible" />
+
+                <Button
+                    android:id="@+id/accept_friend_send_btn"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/contact_profile_btn_height"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginTop="10dp"
+                    android:background="@drawable/btn_bg_color"
+                    android:text="@string/accept"
+                    android:textColor="?attr/core_primary_color"
+                    android:textSize="@dimen/contact_profile_btn_text_size"
+                    android:textAllCaps="false"
+                    android:visibility="gone"
+                    tools:visibility="visible" />
+
+                <Button
+                    android:id="@+id/btn_chat"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/contact_profile_btn_height"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginTop="10dp"
+                    android:background="@drawable/btn_bg_color"
+                    android:text="@string/profile_chat"
+                    android:textColor="?attr/core_primary_color"
+                    android:textSize="@dimen/contact_profile_btn_text_size"
+                    android:textAllCaps="false"
+                    android:visibility="gone"
+                    tools:visibility="visible" />
+
+                <Button
+                    android:id="@+id/btn_voice"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/contact_profile_btn_height"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginTop="0.68dp"
+                    android:background="@drawable/btn_bg_color"
+                    android:text="@string/profile_voice_chat"
+                    android:textColor="?attr/core_primary_color"
+                    android:textSize="@dimen/contact_profile_btn_text_size"
+                    android:textAllCaps="false"
+                    android:visibility="gone"
+                    tools:visibility="visible" />
+
+                <Button
+                    android:id="@+id/btn_video"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/contact_profile_btn_height"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginTop="0.68dp"
+                    android:background="@drawable/btn_bg_color"
+                    android:text="@string/profile_video_chat"
+                    android:textColor="?attr/core_primary_color"
+                    android:textSize="@dimen/contact_profile_btn_text_size"
+                    android:textAllCaps="false"
+                    android:visibility="gone"
+                    tools:visibility="visible" />
+
+                <Button
+                    android:id="@+id/btn_clear_chat_history"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/contact_profile_btn_height"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginTop="0.68dp"
+                    android:background="@drawable/btn_bg_color"
+                    android:text="@string/profile_clear_message"
+                    android:textColor="?attr/core_error_tip_color"
+                    android:textSize="@dimen/contact_profile_btn_text_size"
+                    android:visibility="gone"
+                    android:textAllCaps="false"
+                    tools:visibility="visible" />
+
+                <Button
+                    android:id="@+id/btn_delete"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/contact_profile_btn_height"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginTop="0.68dp"
+                    android:background="@drawable/btn_bg_color"
+                    android:text="@string/profile_delete_friend"
+                    android:textColor="?attr/core_error_tip_color"
+                    android:textSize="@dimen/contact_profile_btn_text_size"
+                    android:visibility="gone"
+                    android:textAllCaps="false"
+                    tools:visibility="visible" />
+
+                <Button
+                    android:id="@+id/refuse_friend_send_btn"
+                    style="?android:attr/borderlessButtonStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/contact_profile_btn_height"
+                    android:layout_alignParentBottom="true"
+                    android:layout_marginTop="0.6dp"
+                    android:background="@drawable/btn_bg_color"
+                    android:text="@string/refuse"
+                    android:textColor="?attr/core_error_tip_color"
+                    android:textAllCaps="false"
+                    android:textSize="@dimen/contact_profile_btn_text_size"
+                    android:visibility="gone"
+                    tools:visibility="visible" />
+
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+</LinearLayout>
diff --git a/system/tuicontact/src/main/res/layout/contact_layout.xml b/system/tuicontact/src/main/res/layout/contact_layout.xml
new file mode 100644
index 0000000..67d8a20
--- /dev/null
+++ b/system/tuicontact/src/main/res/layout/contact_layout.xml
@@ -0,0 +1,13 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/core_bg_color"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuikit.tuicontact.classicui.widget.ContactListView
+        android:id="@+id/contact_listview"
+        android:background="?attr/core_bg_color"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
diff --git a/system/tuicontact/src/main/res/layout/contact_list.xml b/system/tuicontact/src/main/res/layout/contact_list.xml
new file mode 100644
index 0000000..b58341c
--- /dev/null
+++ b/system/tuicontact/src/main/res/layout/contact_list.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="#F2F3F5"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/contact_member_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <TextView
+        android:id="@+id/not_found_tip"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="120dp"
+        android:gravity="center_horizontal"
+        android:textSize="13.44sp"
+        android:textColor="#444444"
+        android:visibility="gone"
+        tools:visibility="visible"
+        tools:text="暂无群聊"/>
+
+    <com.tencent.qcloud.tuikit.tuicontact.component.indexlib.IndexBar.widget.IndexBar
+        android:id="@+id/contact_indexBar"
+        android:layout_width="24dp"
+        android:layout_marginTop="54dp"
+        android:layout_marginBottom="40.8dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_vertical|right"
+        app:indexBarPressBackground="@color/partTranslucent"
+        app:indexBarTextSize="12sp" />
+
+    <TextView
+        android:id="@+id/contact_tvSideBarHint"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_gravity="center"
+        android:background="@drawable/shape_side_bar_bg"
+        android:gravity="center"
+        android:textColor="@android:color/white"
+        android:textSize="40sp"
+        android:visibility="gone"
+        tools:text="A"
+        tools:visibility="visible" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <ProgressBar
+            android:id="@+id/contact_loading_bar"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            android:layout_centerInParent="true"/>
+    </RelativeLayout>
+</FrameLayout>
diff --git a/system/tuicontact/src/main/res/layout/contact_new_friend_activity.xml b/system/tuicontact/src/main/res/layout/contact_new_friend_activity.xml
new file mode 100644
index 0000000..37fdab7
--- /dev/null
+++ b/system/tuicontact/src/main/res/layout/contact_new_friend_activity.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/new_friend_titlebar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/page_title_height" />
+
+    <ListView
+        android:id="@+id/new_friend_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:id="@+id/not_found_tip"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="120dp"
+        android:gravity="center_horizontal"
+        android:textSize="13.44sp"
+        android:textColor="#444444"
+        android:visibility="gone"
+        android:text="@string/contact_no_new_friend_application"
+        tools:visibility="visible"
+        tools:text="暂无群聊"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res/layout/contact_new_friend_item.xml b/system/tuicontact/src/main/res/layout/contact_new_friend_item.xml
new file mode 100644
index 0000000..ce04c60
--- /dev/null
+++ b/system/tuicontact/src/main/res/layout/contact_new_friend_item.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@color/white"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:paddingTop="11.52dp"
+    android:focusable="true"
+    android:paddingBottom="11.52dp">
+
+    <com.tencent.qcloud.tuicore.component.gatherimage.ShadeImageView
+        android:id="@+id/avatar"
+        android:layout_width="46dp"
+        android:layout_height="46dp"
+        android:layout_marginLeft="15.36dp" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="11.52dp"
+        android:layout_weight="1"
+        android:gravity="start"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/black"
+            android:textSize="17.28sp" />
+
+        <TextView
+            android:id="@+id/description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="3dp"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:textColor="@color/text_gray1"
+            android:textSize="11.52sp" />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/agree"
+        android:layout_width="51.84dp"
+        android:layout_height="28.8dp"
+        android:background="@drawable/agree_btn_bg"
+        android:textColor="@color/white"
+        android:textSize="15.36sp"
+        android:gravity="center"
+        android:layout_marginRight="9.6dp"
+        android:layout_gravity="center"
+        tools:text="同意"/>
+
+    <TextView
+        android:id="@+id/reject"
+        android:layout_width="51.84dp"
+        android:layout_height="28.8dp"
+        android:background="@drawable/reject_btn_bg"
+        android:textColor="?attr/core_primary_color"
+        android:textSize="15.36sp"
+        android:layout_marginRight="15.36dp"
+        android:layout_gravity="center"
+        android:gravity="center"
+        tools:text="拒绝"/>
+
+    <TextView
+        android:id="@+id/result_tv"
+        android:textSize="15.36sp"
+        android:text="@string/accepted"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="15.36dp"
+        android:visibility="gone"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res/layout/contact_selecable_adapter_item.xml b/system/tuicontact/src/main/res/layout/contact_selecable_adapter_item.xml
new file mode 100644
index 0000000..ed0f0ce
--- /dev/null
+++ b/system/tuicontact/src/main/res/layout/contact_selecable_adapter_item.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/selectable_contact_item"
+    android:layout_width="match_parent"
+    android:layout_height="58.5dp"
+    android:background="#FFFFFF"
+    android:focusable="true"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:paddingLeft="15.36dp">
+
+        <CheckBox
+            android:id="@+id/contact_check_box"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
+            android:layout_marginRight="10dp"
+            android:button="@null"
+            android:background="@drawable/contact_checkbox_selector"
+            android:clickable="false"
+            android:focusable="false"
+            android:visibility="gone" />
+
+        <RelativeLayout
+            android:layout_width="45dp"
+            android:layout_height="@dimen/contact_avatar_width">
+
+        <com.tencent.qcloud.tuicore.component.gatherimage.ShadeImageView
+            android:id="@+id/ivAvatar"
+            android:layout_width="@dimen/contact_avatar_width"
+            android:layout_height="@dimen/contact_avatar_height"
+            android:clickable="false"
+            android:focusable="false" />
+
+            <View
+                android:id="@+id/user_status"
+                android:layout_width="12dp"
+                android:layout_height="12dp"
+                android:layout_alignParentBottom="true"
+                android:layout_alignParentRight="true"
+                android:layout_marginEnd="0dp"
+                android:layout_marginBottom="1dp"
+                android:background="?attr/user_status_offline"
+                android:visibility="gone"
+                android:elevation="4dp" />
+
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingLeft="11.5dp">
+
+            <TextView
+                android:id="@+id/tvCity"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_centerInParent="true"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:textSize="17.28sp"
+                android:lineHeight="23.04sp"
+                android:clickable="false"
+                android:focusable="false"
+                android:textColor="@color/black_font_color"
+                tools:text="@string/default_friend" />
+
+            <com.tencent.qcloud.tuicore.component.UnreadCountTextView
+                android:id="@+id/conversation_unread"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerInParent="true"
+                android:layout_marginRight="24dp"
+                android:gravity="center"
+                android:includeFontPadding="false"
+                android:textColor="#fff"
+                android:textSize="10sp" />
+
+        </RelativeLayout>
+    </LinearLayout>
+
+    <View
+        android:id="@+id/view_line"
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:layout_alignParentBottom="true"
+        android:layout_marginLeft="73.78dp"
+        android:background="@color/split_lint_color" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res/layout/create_group_layout.xml b/system/tuicontact/src/main/res/layout/create_group_layout.xml
new file mode 100644
index 0000000..f25dd20
--- /dev/null
+++ b/system/tuicontact/src/main/res/layout/create_group_layout.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/core_bg_color"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/create_group_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <com.tencent.qcloud.tuicore.component.LineControllerView
+                android:id="@+id/group_name_layout"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/contact_profile_item_height"
+                android:layout_marginTop="10dp"
+                app:canNav="true"
+                app:name="@string/group_name_text" />
+
+            <com.tencent.qcloud.tuicore.component.LineControllerView
+                android:id="@+id/group_id_layout"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/contact_profile_item_height"
+                app:canNav="true"
+                app:name="@string/group_id_option" />
+
+            <com.tencent.qcloud.tuicore.component.LineControllerView
+                android:id="@+id/group_type_layout"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/contact_profile_item_height"
+                android:layout_marginTop="10dp"
+                app:canNav="true"
+                app:isTop="true"
+                app:name="@string/group_type_text" />
+
+            <TextView
+                android:id="@+id/group_type_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/page_margin"
+                android:layout_marginStart="@dimen/contact_profile_face_margin_right"
+                android:layout_marginEnd="@dimen/contact_profile_face_margin_right"
+                android:gravity="center_vertical"
+                android:text="@string/group_type_select_text"
+                android:textColor="@color/contact_profile_member_name_text_color"
+                android:textSize="@dimen/contact_group_profile_group_id_size" />
+            <TextView
+                android:id="@+id/group_type_text_url"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/page_margin"
+                android:layout_marginStart="@dimen/contact_profile_face_margin_right"
+                android:layout_marginEnd="@dimen/contact_profile_face_margin_right"
+                android:gravity="center_vertical"
+                android:text="@string/group_type_content_title"
+                android:textColor="@color/contact_profile_member_name_text_color"
+                android:textSize="@dimen/contact_group_profile_group_id_size" />
+
+            <LinearLayout
+                android:id="@+id/group_avatar_layout"
+                android:layout_width="fill_parent"
+                android:layout_height="@dimen/contact_group_profile_height"
+                android:background="#FFFFFF"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/group_icon_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/contact_profile_face_margin_right"
+                    android:gravity="center_vertical"
+                    android:text="@string/group_avatar_text"
+                    android:textColor="@color/core_line_controller_title_color"
+                    android:textSize="@dimen/core_line_controller_text_size" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:gravity="end">
+
+                    <com.tencent.qcloud.tuicore.component.gatherimage.SynthesizedImageView
+                        android:id="@+id/group_avatar"
+                        android:layout_width="@dimen/contact_profile_face_size"
+                        android:layout_height="@dimen/contact_profile_face_size"
+                        android:layout_gravity="center"
+                        android:layout_marginEnd="10.56dp"
+                        android:scaleType="centerCrop" />
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginEnd="20dp"
+                        android:background="@drawable/arrow_right" />
+                </LinearLayout>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+
+    </ScrollView>
+
+    <RelativeLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:paddingBottom="16dp"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/confirm_button"
+            android:background="@drawable/contact_confirm_button_bg"
+            android:textSize="14sp"
+            android:text="@string/group_created"
+            android:layout_alignParentRight="true"
+            android:layout_marginLeft="12dp"
+            android:layout_gravity="center_vertical"
+            android:paddingLeft="12dp"
+            android:paddingRight="12dp"
+            android:paddingTop="4dp"
+            android:paddingBottom="4dp"
+            android:textColor="@color/white"
+            android:layout_width="wrap_content"
+            android:layout_height="30dp"/>
+
+    </RelativeLayout>
+</LinearLayout>
diff --git a/system/tuicontact/src/main/res/layout/forward_contact_selector_item.xml b/system/tuicontact/src/main/res/layout/forward_contact_selector_item.xml
new file mode 100644
index 0000000..fbb5e9b
--- /dev/null
+++ b/system/tuicontact/src/main/res/layout/forward_contact_selector_item.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@color/transparent"
+    android:paddingBottom="@dimen/btn_margin_bottom"
+    android:paddingRight="12dp"
+    android:paddingTop="8dp"
+    android:clickable="true">
+
+    <com.tencent.qcloud.tuicore.component.RoundCornerImageView
+        android:id="@+id/ivAvatar"
+        android:layout_width="@dimen/contact_avatar_width"
+        android:layout_height="@dimen/contact_avatar_height"
+        app:corner_radius="3.2dp"
+        android:scaleType="centerCrop"
+        android:clickable="false"
+        android:focusable="false" />
+
+</LinearLayout>
+
diff --git a/system/tuicontact/src/main/res/layout/forward_select_group_contact.xml b/system/tuicontact/src/main/res/layout/forward_select_group_contact.xml
new file mode 100644
index 0000000..3bf5691
--- /dev/null
+++ b/system/tuicontact/src/main/res/layout/forward_select_group_contact.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/group_create_title_bar"
+        android:layout_width="match_parent"
+        android:layout_alignParentTop="true"
+        android:layout_height="@dimen/page_title_height" />
+
+    <com.tencent.qcloud.tuicore.component.LineControllerView
+        android:id="@+id/group_type_join"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/group_create_title_bar"
+        android:layout_marginTop="1dp"
+        android:visibility="gone"
+        app:name="@string/group_join_type" />
+
+    <com.tencent.qcloud.tuikit.tuicontact.classicui.widget.ContactListView
+        android:id="@+id/group_create_member_list"
+        android:layout_below="@+id/group_create_title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/btn_height"/>
+
+    <RelativeLayout
+        android:id="@+id/forward_contact_select_list_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:layout_alignParentBottom="true"
+        android:paddingLeft="14.85dp"
+        android:paddingRight="14.85dp"
+        android:orientation="horizontal">
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/forward_contact_select_list"
+            android:layout_width="match_parent"
+            android:layout_alignParentLeft="true"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="@dimen/forward_margin"/>
+
+        <TextView
+            android:id="@+id/btn_msg_ok"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="@dimen/btn_margin_right"
+            android:text="@string/sure"
+            android:textColor="@color/bg_positive_btn"
+            android:textSize="14sp"
+            android:visibility="visible" />
+
+    </RelativeLayout>
+
+</RelativeLayout>
diff --git a/system/tuicontact/src/main/res/layout/group_list_activity.xml b/system/tuicontact/src/main/res/layout/group_list_activity.xml
new file mode 100644
index 0000000..51c7d9a
--- /dev/null
+++ b/system/tuicontact/src/main/res/layout/group_list_activity.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/group_list_titlebar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/page_title_height" />
+
+    <com.tencent.qcloud.tuikit.tuicontact.classicui.widget.ContactListView
+        android:id="@+id/group_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
diff --git a/system/tuicontact/src/main/res/layout/group_type_item.xml b/system/tuicontact/src/main/res/layout/group_type_item.xml
new file mode 100644
index 0000000..84802d3
--- /dev/null
+++ b/system/tuicontact/src/main/res/layout/group_type_item.xml
@@ -0,0 +1,54 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/core_bg_color"
+    android:layout_marginTop="@dimen/page_margin"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:id="@+id/item_layout"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/contact_group_profile_height"
+        android:background="#FFFFFF">
+
+        <com.tencent.qcloud.tuicore.component.gatherimage.ShadeImageView
+            android:id="@+id/group_type_icon"
+            android:layout_width="@dimen/contact_group_profile_face_size"
+            android:layout_height="@dimen/contact_group_profile_face_size"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="@dimen/contact_group_profile_face_margin_left"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="@dimen/contact_group_profile_face_margin_right"
+            android:scaleType="centerCrop" />
+
+        <TextView
+            android:id="@+id/group_type_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@+id/group_type_icon"
+            android:layout_centerVertical="true"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:textSize="@dimen/contact_group_profile_group_name_size"
+            tools:text="群聊" />
+
+    </RelativeLayout>
+
+    <TextView
+        android:id="@+id/group_type_content"
+        android:background="#FFFFFF"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/item_layout"
+        android:paddingTop="@dimen/page_margin"
+        android:paddingLeft="@dimen/contact_group_profile_face_margin_left"
+        android:paddingRight="@dimen/contact_group_profile_face_margin_right"
+        android:paddingBottom="@dimen/page_margin"
+        android:gravity="center_vertical"
+        android:textSize="@dimen/contact_group_profile_group_id_size"
+        tools:text="99618" />
+
+
+</RelativeLayout>
diff --git a/system/tuicontact/src/main/res/layout/group_type_select_layout.xml b/system/tuicontact/src/main/res/layout/group_type_select_layout.xml
new file mode 100644
index 0000000..1f2a61b
--- /dev/null
+++ b/system/tuicontact/src/main/res/layout/group_type_select_layout.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/core_bg_color">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/create_group_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler"
+        android:layout_below="@+id/create_group_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <TextView
+        android:id="@+id/group_type_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="@dimen/view_margin_bottom"
+        android:text="@string/group_type_content_button"
+        android:textColor="@color/font_blue"
+        android:textSize="@dimen/contact_group_profile_group_id_size" />
+
+</RelativeLayout>
diff --git a/system/tuicontact/src/main/res/layout/popup_start_c2c_chat_activity.xml b/system/tuicontact/src/main/res/layout/popup_start_c2c_chat_activity.xml
new file mode 100644
index 0000000..0db8f02
--- /dev/null
+++ b/system/tuicontact/src/main/res/layout/popup_start_c2c_chat_activity.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/status_bar_color"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/start_c2c_chat_title"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/page_title_height" />
+
+    <com.tencent.qcloud.tuikit.tuicontact.classicui.widget.ContactListView
+        android:id="@+id/contact_list_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</LinearLayout>
diff --git a/system/tuicontact/src/main/res/layout/popup_start_group_chat_activity.xml b/system/tuicontact/src/main/res/layout/popup_start_group_chat_activity.xml
new file mode 100644
index 0000000..7511a6f
--- /dev/null
+++ b/system/tuicontact/src/main/res/layout/popup_start_group_chat_activity.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/group_create_title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/page_title_height" />
+
+    <com.tencent.qcloud.tuicore.component.LineControllerView
+        android:id="@+id/group_type_join"
+        android:layout_width="match_parent"
+        android:layout_height="46.08dp"
+        android:layout_marginTop="1dp"
+        android:visibility="gone"
+        app:name="@string/group_join_type" />
+
+    <com.tencent.qcloud.tuikit.tuicontact.classicui.widget.ContactListView
+        android:layout_weight="1"
+        android:id="@+id/group_create_member_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:paddingBottom="8dp"
+        android:gravity="center_vertical"
+        android:layout_height="69.91dp">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/selected_list"
+            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            android:id="@+id/confirm_button"
+            android:background="@drawable/contact_confirm_button_bg"
+            android:textSize="14sp"
+            android:text="@string/core_next_step"
+            android:layout_marginLeft="12dp"
+            android:layout_gravity="center_vertical"
+            android:paddingLeft="12dp"
+            android:paddingRight="12dp"
+            android:paddingTop="4dp"
+            android:paddingBottom="4dp"
+            android:textColor="@color/white"
+            android:layout_width="wrap_content"
+            android:layout_height="30dp"/>
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/limit_tips"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center"
+        android:paddingBottom="36dp"
+        android:paddingTop="12dp"
+        android:background="#F6F6F6"
+        android:textColor="#999999"
+        android:textSize="12sp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:visibility="visible"
+        tools:text="123"
+        android:visibility="gone"/>
+</LinearLayout>
diff --git a/system/tuicontact/src/main/res/layout/popup_start_group_select_activity.xml b/system/tuicontact/src/main/res/layout/popup_start_group_select_activity.xml
new file mode 100644
index 0000000..8dbca93
--- /dev/null
+++ b/system/tuicontact/src/main/res/layout/popup_start_group_select_activity.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/group_create_title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/page_title_height" />
+
+    <com.tencent.qcloud.tuikit.tuicontact.classicui.widget.ContactListView
+        android:id="@+id/group_create_member_list"
+        android:layout_weight="1"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:paddingBottom="16dp"
+        android:layout_height="wrap_content">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/selected_list"
+            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            android:id="@+id/confirm_button"
+            android:background="@drawable/contact_confirm_button_bg"
+            android:textSize="14sp"
+            android:text="@string/sure"
+            android:layout_marginLeft="12dp"
+            android:layout_gravity="center_vertical"
+            android:paddingLeft="12dp"
+            android:paddingRight="12dp"
+            android:paddingTop="4dp"
+            android:paddingBottom="4dp"
+            android:textColor="@color/white"
+            android:layout_width="wrap_content"
+            android:layout_height="30dp"/>
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/limit_tips"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center"
+        android:paddingBottom="36dp"
+        android:paddingTop="12dp"
+        android:background="#F6F6F6"
+        android:textColor="#999999"
+        android:textSize="12sp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:visibility="visible"
+        tools:text="123"
+        android:visibility="gone"/>
+
+</LinearLayout>
diff --git a/system/tuicontact/src/main/res/values-zh-rCN/strings.xml b/system/tuicontact/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..2cab421
--- /dev/null
+++ b/system/tuicontact/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- 联系人相关 -->
+    <string name="new_friend">新的联系人</string>
+    <string name="group">我的群聊</string>
+    <string name="blacklist">黑名单</string>
+    <string name="contact_count">%d位联系人</string>
+    <string name="contact_title">通讯录</string>
+
+    <string name="no_friend_apply">暂无好友申请</string>
+    <string name="at_all">所有人</string>
+
+    <string name="success">成功</string>
+    <string name="contact_add_failed">添加失败</string>
+    <string name="contact_add_success">添加成功</string>
+    <string name="have_be_friend">对方已是您的好友</string>
+    <string name="friend_limit">您的好友数已达系统上限</string>
+    <string name="other_friend_limit">对方的好友数已达系统上限</string>
+    <string name="in_blacklist">被加好友在自己的黑名单中</string>
+    <string name="forbid_add_friend">对方已禁止加好友</string>
+    <string name="set_in_blacklist">您已被被对方设置为黑名单</string>
+    <string name="wait_agree_friend">等待好友审核同意</string>
+    <string name="send_request">加群请求已发送</string>
+    <string name="contact_search">搜索</string>
+
+    <string name="add_group_permission_deny">禁止加群</string>
+    <string name="add_group_allready_member">已经是群成员</string>
+    <string name="add_group_not_found">群组不存在</string>
+    <string name="add_group_full_member">群已满员</string>
+
+    // 新朋友
+    <string name="request_agree">同意</string>
+    <string name="request_accepted">已接受</string>
+    <string name="request_waiting">等待验证</string>
+    <string name="profile_detail">详细资料</string>
+    <string name="profile_remark_edit">修改备注</string>
+    <string name="contact_friend_remark">备注</string>
+    <string name="contact_friend_group">分组</string>
+    <string name="contact_set_add_wording">请填写验证信息</string>
+    <string name="contact_set_remark_and_group">请填写备注和分组</string>
+    <string name="contact_add_wording">验证信息：</string>
+    <string name="contact_my_friend">我的朋友</string>
+    <string name="contact_modify_remark_rule">仅限中文、字母、数字和下划线</string>
+
+    <!-- 好友资料 -->
+    <string name="profile_id">帐号</string>
+    <string name="profile_add_wording">验证消息</string>
+    <string name="profile_remark">备注名</string>
+    <string name="profile_black">加入黑名单</string>
+    <string name="profile_chat">发送消息</string>
+    <string name="profile_voice_chat">语音通话</string>
+    <string name="profile_video_chat">视频通话</string>
+    <string name="profile_clear_message">清除聊天记录</string>
+    <string name="profile_delete_friend">删除好友</string>
+    <string name="profile_chat_background">设置当前聊天背景</string>
+    <string name="chat_background_title">更换背景</string>
+
+    <string name="contact_signature_tag">个性签名：</string>
+    <string name="contact_no_status">暂无个性签名</string>
+
+    <string name="contact_account_tag">ID：</string>
+    <string name="contact_group_type_tag">群类型：</string>
+
+    <string name="select_chat">请选择聊天对象</string>
+
+    <string name="clear_msg_tip">确认清除聊天记录？</string>
+    // 群信息相关
+    <string name="tips_empty_group_member">请选择群成员</string>
+    <string name="tips_empty_group_type">请选择加群方式</string>
+
+    <string name="accept">同意</string>
+    <string name="refuse">拒绝</string>
+    <string name="accepted">已同意</string>
+    <string name="refused">已拒绝</string>
+
+    <string name="chat_to_top">置顶聊天</string>
+
+    // "+"menu相关
+    <string name="add_friend">添加好友</string>
+    <string name="add_group">添加群聊</string>
+    <string name="start_conversation">发起会话</string>
+    <string name="create_group_chat">创建群聊</string>
+    <string name="create_chat_room">创建聊天室</string>
+    <string name="create_private_group">创建讨论组</string>
+    <string name="create_community">创建社群</string>
+    <string name="hint_add_user_id">请输入ID</string>
+    <string name="hint_search_user_id">搜索用户ID</string>
+    <string name="hint_search_group_id">搜索群组ID</string>
+    <string name="hint_add_wording">请输入验证消息</string>
+    <string name="contact_add">添加</string>
+    <string name="user_id">对方ID</string>
+    <string name="add_wording">验证消息</string>
+    <string name="create_group">创建群组</string>
+
+
+    <string name="modify_group_name">修改群名称</string>
+    <string name="add_group_member">添加成员</string>
+    <string name="group_join_type">加群方式</string>
+    <string name="forbid_join">禁止加群</string>
+    <string name="manager_judge">管理员审批</string>
+    <string name="auto_judge">自动审批</string>
+    <string name="input_tip">没有输入昵称，请重新填写</string>
+    <string name="profile_msgrev_opt">消息免打扰</string>
+
+    <string name="contact_over_limit_tip">最多只能选择%d个。</string>
+
+    <string name="contact_no_such_group">该群不存在</string>
+    <string name="contact_no_such_user">该用户不存在</string>
+
+    <string name="contact_my_user_id">我的用户ID：%s</string>
+
+    <string name="contact_community">社群</string>
+    <string name="contact_i_know">我知道了</string>
+    <string name="contact_no_more_reminders">不再提醒</string>
+    <string name="contact_im_flagship">旗舰版</string>
+    <string name="contact_buying_guidelines">价格说明</string>
+    <string name="contact_im_flagship_edition_update_tip">%s功能为IM旗舰版功能，购买旗舰版套餐包后可使用，详见价格说明。</string>
+
+    <string name="contact_no_new_friend_application">暂无新的联系人请求</string>
+    <string name="contact_no_group">暂无群聊</string>
+    <string name="contact_no_block_list">暂无黑名单好友</string>
+
+    <string name="group_choose_avatar">选择头像</string>
+    <string name="group_avatar_text">群头像</string>
+    <string name="group_name_text">群名称</string>
+    <string name="modify_group_id">修改群 ID</string>
+    <string name="group_id_option">群ID (选填)</string>
+    <string name="group_type_text">群类型</string>
+    <string name="group_created">创建</string>
+    <string name="group_type_select_text">选择群类型</string>
+    <string name="group_work_type">好友工作群(Work)</string>
+    <string name="group_work_content">好友工作群(Work）：类似普通微信群，创建后仅支持已在群内的好友邀请加群，且无需被邀请方同意或群主审批。</string>
+    <string name="group_public_type">陌生人社交群(Public)</string>
+    <string name="group_public_des">陌生人社交群(Public）：类似 QQ 群，创建后群主可以指定群管理员，用户搜索群 ID 发起加群申请后，需要群主或管理员审批通过才能入群。</string>
+    <string name="group_meeting_type">临时会议群(Meeting)</string>
+    <string name="group_meeting_des">临时会议群(Meeting）：创建后可以随意进出，且支持查看入群前消息；适用于音视频会议场景、在线教育场景等与实时音视频产品结合的场景。</string>
+    <string name="group_commnity_type">社群(Community)</string>
+    <string name="group_commnity_des">社群(Community)：创建后可以随意进出，最多支持100000人，支持历史消息存储，用户搜索群 ID 发起加群申请后，无需管理员审批即可进群。</string>
+    <string name="group_name_edit_null_tips">群组名称不能为空!</string>
+    <string name="group_name_edit_exceed_tips">群组名称最长 30 字节!</string>
+    <string name="group_id_edit_format_tips">群组 ID 前缀不能为 @TGS# !</string>
+    <string name="group_id_edit_exceed_tips">群组 ID 最长 48 字节!</string>
+    <string name="group_type_content_title">详见产品文档</string>
+    <string name="group_type_content_url">产品文档</string>
+    <string name="group_type_content_button">查看产品文档</string>
+</resources>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res/values/arrays.xml b/system/tuicontact/src/main/res/values/arrays.xml
new file mode 100644
index 0000000..5f918f4
--- /dev/null
+++ b/system/tuicontact/src/main/res/values/arrays.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="group_type">
+        <item>Work</item>
+        <item>Public</item>
+        <item>Meeting</item>
+        <item>Community</item>
+    </string-array>
+
+    <string-array name="group_join_type">
+        <item>@string/forbid_join</item>
+        <item>@string/manager_judge</item>
+        <item>@string/auto_judge</item>
+    </string-array>
+</resources>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res/values/colors.xml b/system/tuicontact/src/main/res/values/colors.xml
new file mode 100644
index 0000000..4340261
--- /dev/null
+++ b/system/tuicontact/src/main/res/values/colors.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="partTranslucent">#39000000</color>
+    <color name="slide_bar_hint_color">#CCCCCC</color>
+    <color name="title_bar_font_color">#016fff</color>
+
+    <color name="line">#DDDDDD</color>
+    <color name="navigation_bar_color">#F7F7F7</color>
+    <color name="transparent">#00000000</color>
+    <color name="list_bottom_text_bg">#999999</color>
+
+    <color name="font_blue">#066fff</color>
+    <color name="green">#70C160</color>
+    <color name="white">#FFFFFF</color>
+    <color name="text_color_gray">#696969</color>
+    <color name="black_font_color">#181818</color>
+    <color name="text_tips_color">#A5A5A5</color>
+
+    <color name="text_gray1">#777777</color>
+    <color name="split_lint_color">#D9D9D9</color>
+
+    <color name="black">#000000</color>
+    <color name="dialog_line_bg">#c6c6c6</color>
+
+    <!-- 积极按钮文本色值 -->
+    <color name="text_positive">#ffffff</color>
+    <color name="text_positive_hover">#ffffff</color>
+
+    <!-- 积极钮色值 -->
+    <color name="btn_positive">#00a4ff</color>
+    <color name="btn_positive_hover">#006eff</color>
+
+    <!-- 消极按钮背景色值 -->
+    <color name="btn_negative">#ffffff</color>
+    <color name="btn_negative_hover">#cc3428</color>
+
+    <!-- 消极按钮文本色值 -->
+    <color name="text_negative">#fb6155</color>
+    <color name="text_negative_hover">#FFFFFF</color>
+
+    <color name="read_dot_bg">#f74c31</color>
+
+    <color name="contact_profile_btn_positive_color">#147AFF</color>
+    <color name="contact_profile_btn_negative_color">#FF584C</color>
+
+    <color name="contact_profile_btn_pressed_color">#E6E9EB</color>
+    <color name="contact_profile_member_name_text_color">#888888</color>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res/values/dimens.xml b/system/tuicontact/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..9d3b896
--- /dev/null
+++ b/system/tuicontact/src/main/res/values/dimens.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="contact_avatar_width">38.4dp</dimen>
+    <dimen name="contact_avatar_height">38.4dp</dimen>
+    <dimen name="btn_text_size">14dp</dimen>
+
+    <dimen name="btn_margin_top">36dp</dimen>
+    <dimen name="btn_margin_left">12dp</dimen>
+    <dimen name="btn_margin_right">12dp</dimen>
+    <dimen name="btn_margin_bottom">8dp</dimen>
+    <dimen name="btn_margin_middle">10dp</dimen>
+    <dimen name="btn_padding_left">16dp</dimen>
+    <dimen name="btn_padding_right">16dp</dimen>
+
+    <dimen name="page_title_height">45dp</dimen>
+    <dimen name="page_margin">10dp</dimen>
+
+    <dimen name="btn_height">40dp</dimen>
+    <dimen name="forward_margin">55dp</dimen>
+
+    <dimen name="switch_thumb_padding">2dp</dimen>
+    <dimen name="switch_thumb_width">23dp</dimen>
+    <dimen name="switch_thumb_height">23dp</dimen>
+    <dimen name="switch_thumb_radius">20dp</dimen>
+
+    <dimen name="contact_profile_item_height">46.08dp</dimen>
+    <dimen name="contact_profile_btn_height">53.76dp</dimen>
+    <dimen name="contact_profile_signature_text_size">12.48sp</dimen>
+    <dimen name="contact_profile_account_text_size">12.48sp</dimen>
+    <dimen name="contact_profile_face_radius">4.61dp</dimen>
+    <dimen name="contact_profile_face_margin_left">5.36dp</dimen>
+    <dimen name="contact_profile_face_margin_right">15.36dp</dimen>
+    <dimen name="contact_profile_face_margin_top">-12dp</dimen>
+    <dimen name="contact_profile_face_size">46.08dp</dimen>
+    <dimen name="contact_profile_self_height">90.24dp</dimen>
+    <dimen name="contact_profile_nick_name_text_size">17.28sp</dimen>
+    <dimen name="contact_profile_text_margin">3.84dp</dimen>
+    <dimen name="contact_profile_btn_text_size">16.32sp</dimen>
+
+    <dimen name="search_bar_width">329.28dp</dimen>
+    <dimen name="search_bar_height">38.4dp</dimen>
+    <dimen name="search_bar_margin">15.36dp</dimen>
+    <dimen name="contact_add_item_height">90.24dp</dimen>
+    <dimen name="view_margin_bottom">20dp</dimen>
+    <dimen name="contact_list_item_height">69.91dp</dimen>
+
+    <dimen name="contact_group_profile_height">69.12dp</dimen>
+    <dimen name="contact_group_profile_item_height">46.08dp</dimen>
+    <dimen name="contact_group_profile_face_size">46.08dp</dimen>
+    <dimen name="contact_group_profile_group_name_size">17.28sp</dimen>
+    <dimen name="contact_group_profile_group_id_size">12.48dp</dimen>
+    <dimen name="contact_group_profile_face_margin_left">15.36dp</dimen>
+    <dimen name="contact_group_profile_face_margin_right">15.36dp</dimen>
+    <dimen name="contact_group_profile_face_margin_top">11.5dp</dimen>
+    <dimen name="contact_group_profile_member_grid_padding_left_right">19.2dp</dimen>
+    <dimen name="contact_group_profile_member_grid_padding_top">11.52dp</dimen>
+    <dimen name="contact_group_profile_member_item_width">48dp</dimen>
+    <dimen name="contact_group_profile_member_item_name_size">9.6sp</dimen>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res/values/strings.xml b/system/tuicontact/src/main/res/values/strings.xml
new file mode 100644
index 0000000..a29a617
--- /dev/null
+++ b/system/tuicontact/src/main/res/values/strings.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- 联系人相关 -->
+    <string name="new_friend">New Contacts</string>
+    <string name="group">Group Chats</string>
+    <string name="blacklist">Blocked List</string>
+    <string name="contact_count">%d contact(s)</string>
+    <string name="contact_title">Contacts</string>
+
+    <string name="no_friend_apply">No friend request</string>
+    <string name="at_all">All</string>
+
+    <string name="success">Successful</string>
+    <string name="contact_add_failed">Failed</string>
+    <string name="contact_add_success">Successful</string>
+    <string name="have_be_friend">You\'re already friends.</string>
+    <string name="friend_limit">The number of your friends exceeds the limit.</string>
+    <string name="other_friend_limit">The number of the other user\'s friends exceeds the limit.</string>
+    <string name="in_blacklist">You have blocked this user.</string>
+    <string name="forbid_add_friend">This user has disabled friend request.</string>
+    <string name="set_in_blacklist">You have been blocked.</string>
+    <string name="wait_agree_friend">Request sent</string>
+    <string name="send_request">Request sent</string>
+
+    <string name="add_group_permission_deny">Prohibited from Joining</string>
+    <string name="add_group_allready_member">The user is a group member</string>
+    <string name="add_group_not_found">The group does not exist</string>
+    <string name="add_group_full_member">The number of group members has reached the limit</string>
+    <string name="contact_search">Search</string>
+
+    // 新朋友
+    <string name="request_agree">Accept</string>
+    <string name="request_accepted">Accepted</string>
+    <string name="request_waiting">Pending</string>
+    <string name="profile_detail">Details</string>
+    <string name="profile_remark_edit">Edit Alias</string>
+    <string name="contact_friend_remark">Set Alias</string>
+    <string name="contact_friend_group">Group</string>
+    <string name="contact_set_add_wording">Verification Message</string>
+    <string name="contact_add_wording">Verification Message：</string>
+    <string name="contact_set_remark_and_group">Remark And Group</string>
+
+
+    <!-- 好友资料 -->
+    <string name="profile_id">Account</string>
+    <string name="profile_add_wording">Verification Message</string>
+    <string name="profile_remark">Alias</string>
+    <string name="profile_black">Block</string>
+    <string name="profile_chat">Send Message</string>
+    <string name="profile_delete_friend">Delete Friend</string>
+    <string name="profile_voice_chat">Voice Call</string>
+    <string name="profile_video_chat">Video Call</string>
+    <string name="profile_clear_message">Clear Chat History</string>
+    <string name="profile_chat_background">Background</string>
+    <string name="chat_background_title">Background</string>
+    <string name="contact_signature_tag">Status : </string>
+    <string name="contact_no_status">No status</string>
+    <string name="contact_account_tag">ID : </string>
+    <string name="contact_group_type_tag">Group Type : </string>
+    <string name="contact_my_friend">My Friend</string>
+
+    <string name="select_chat">Select Chat User</string>
+
+    <string name="chat_to_top">Pin</string>
+
+    <string name="clear_msg_tip">Are you sure you want to clear the chat history?</string>
+    // 群信息相关
+    <string name="tips_empty_group_member">Select members</string>
+    <string name="tips_empty_group_type">Select a method to join the group</string>
+
+    <string name="accept">Agree</string>
+    <string name="refuse">Decline</string>
+    <string name="accepted">Agreed</string>
+    <string name="refused">Declined</string>
+
+    <string name="add_friend">Add Contact</string>
+    <string name="add_group">Add Group</string>
+    <string name="start_conversation">New Chat</string>
+    <string name="create_group_chat">Create Group Chat</string>
+    <string name="create_chat_room">Create Chat Room</string>
+    <string name="create_community">Create Community</string>
+    <string name="create_private_group">Create Discussion Group</string>
+    <string name="hint_add_user_id">Enter ID</string>
+    <string name="hint_search_user_id">Search by user ID</string>
+    <string name="hint_search_group_id">Search by group ID</string>
+    <string name="hint_add_wording">Enter verification message</string>
+    <string name="contact_add">Add</string>
+    <string name="contact_refuse">Refuse</string>
+    <string name="user_id">ID</string>
+    <string name="add_wording">Verification Message</string>
+    <string name="create_group">Create Group</string>
+
+    <string name="modify_group_name">Edit Group Name</string>
+    <string name="add_group_member">Add Member</string>
+    <string name="group_join_type">Group Joining Method</string>
+    <string name="forbid_join">Prohibited from Joining</string>
+    <string name="manager_judge">Admin Approval</string>
+    <string name="auto_judge">Auto Approval</string>
+    <string name="input_tip">No nickname. Enter again.</string>
+    <string name="profile_msgrev_opt">Mute Notifications</string>
+    <string name="contact_modify_remark_rule">Only letters, digits, underscores, and Chinese characters.</string>
+
+    <string name="contact_over_limit_tip">At most %d can be selected.</string>
+
+    <string name="contact_no_such_group">This group chat does not exist.</string>
+    <string name="contact_no_such_user">This user does not exist.</string>
+
+    <string name="contact_my_user_id">My User ID : %s</string>
+
+    <string name="contact_community">Community</string>
+    <string name="contact_i_know">I got it</string>
+    <string name="contact_no_more_reminders">No more reminders</string>
+    <string name="contact_im_flagship">Ultimate Edition</string>
+    <string name="contact_buying_guidelines">price description</string>
+    <string name="contact_im_flagship_edition_update_tip">%s function is the IM Ultimate Edition function, which can be used after purchasing the Ultimate Edition package. Please refer to the price description for details.</string>
+
+    <string name="contact_no_new_friend_application">Friend request is empty</string>
+    <string name="contact_no_group">Group chats is empty</string>
+    <string name="contact_no_block_list">Block list is emply</string>
+
+    <string name="group_choose_avatar">Choose Avatar</string>
+    <string name="group_avatar_text">Group Avatar</string>
+    <string name="group_name_text">Group Name</string>
+    <string name="modify_group_id">Edit Group ID</string>
+    <string name="group_id_option">Group ID (optional)</string>
+    <string name="group_type_text">Group Type</string>
+    <string name="group_created">Create</string>
+    <string name="group_type_select_text">Select group type</string>
+    <string name="group_work_type">Friends Working group(Work)</string>
+    <string name="group_work_content">Friends work group (Work): Similar to ordinary WeChat groups, after creation, only friends who are already in the group can be invited to join the group, and there is no need for the approval of the invitee or the approval of the group owner.</string>
+    <string name="group_public_type">Stranger Social group(Public）</string>
+    <string name="group_public_des">Stranger social group (Public): Similar to QQ group, the group owner can designate the group administrator after creation. After the user searches for the group ID and initiates a group application, the group owner or administrator must approve it before joining the group.</string>
+    <string name="group_meeting_type">Temporary Meeting group(Meeting）</string>
+    <string name="group_meeting_des">Temporary meeting group (Meeting): After creation, you can enter and leave at will, and support viewing of messages before joining the group; it is suitable for audio and video conference scenarios, online education scenarios, and other scenarios that are combined with real-time audio and video products.</string>
+    <string name="group_commnity_type">Community(Community)</string>
+    <string name="group_commnity_des">Community(Community)：After creation, you can enter and leave at will, support up to 100,000 people, support historical message storage, and after users search for group ID and initiate a group application, they can join the group without administrator approval.</string>
+    <string name="group_name_edit_null_tips">Group name cannot be empty!</string>
+    <string name="group_name_edit_exceed_tips">Group name up to 30 bytes!</string>
+    <string name="group_id_edit_format_tips">Group ID prefix cannot be @TGS# !</string>
+    <string name="group_id_edit_exceed_tips">Group ID up to 48 bytes!</string>
+    <string name="group_type_content_title">See details product documentation</string>
+    <string name="group_type_content_url">product documentation</string>
+    <string name="group_type_content_button">View product documentation</string>
+</resources>
\ No newline at end of file
diff --git a/system/tuicontact/src/main/res/values/tui_theme_attrs.xml b/system/tuicontact/src/main/res/values/tui_theme_attrs.xml
new file mode 100644
index 0000000..4f54cc1
--- /dev/null
+++ b/system/tuicontact/src/main/res/values/tui_theme_attrs.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- 参与换肤的属性 -->
+    <attr name="contact_new_friend_icon" format="reference"/>
+    <attr name="contact_group_list_icon" format="reference"/>
+    <attr name="contact_black_list_icon" format="reference"/>
+</resources>
\ No newline at end of file
diff --git a/system/tuiconversation/.gitignore b/system/tuiconversation/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/system/tuiconversation/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/system/tuiconversation/build.gradle b/system/tuiconversation/build.gradle
new file mode 100644
index 0000000..fce69d2
--- /dev/null
+++ b/system/tuiconversation/build.gradle
@@ -0,0 +1,44 @@
+plugins {
+    id 'com.android.library'
+}
+
+android {
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+
+    defaultConfig {
+        minSdkVersion 16
+        targetSdkVersion 30
+        versionCode 1
+        versionName "1.0"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    sourceSets {
+        main {
+            res.srcDirs += "src/main/res-minimalistui"
+        }
+    }
+}
+
+afterEvaluate{
+    generateReleaseBuildConfig.enabled =false
+    generateDebugBuildConfig.enabled =false
+}
+
+dependencies {
+
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'com.google.code.gson:gson:2.8.7'
+    api project(':system:tuicore')
+}
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/AndroidManifest.xml b/system/tuiconversation/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..bec6ff6
--- /dev/null
+++ b/system/tuiconversation/src/main/AndroidManifest.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.tencent.qcloud.tuikit.tuiconversation">
+
+    <application>
+        <provider
+            android:name=".TUIConversationService"
+            android:authorities="${applicationId}.TUIConversation.Init"
+            android:enabled="true"
+            android:exported="false"/>
+
+
+        <!-- **************** Classic UI Activity Start **************** -->
+        <activity
+            android:name=".classicui.page.TUIForwardSelectActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".classicui.page.TUIFoldedConversationActivity"
+            android:screenOrientation="portrait" />
+        <!-- **************** Classic UI Activity End **************** -->
+
+
+
+
+
+        <!-- **************** Minimalist UI Activity Start **************** -->
+        <activity
+            android:name=".minimalistui.page.TUIForwardSelectMinimalistActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".minimalistui.page.TUIFoldedConversationMinimalistActivity"
+            android:screenOrientation="portrait" />
+        <!-- **************** Minimalist UI Activity End **************** -->
+
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/ITUIConversationService.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/ITUIConversationService.java
new file mode 100644
index 0000000..f7d69c6
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/ITUIConversationService.java
@@ -0,0 +1,81 @@
+package com.tencent.qcloud.tuikit.tuiconversation;
+
+import com.tencent.qcloud.tuicore.interfaces.ITUINotification;
+import com.tencent.qcloud.tuicore.interfaces.ITUIService;
+
+import java.util.Map;
+
+public interface ITUIConversationService extends ITUIService, ITUINotification {
+
+    /**
+     * 1、获取会话是否置顶；
+     * @param method TUIConstants.TUIConversation.METHOD_IS_TOP_CONVERSATION
+     * @param param {TUIConstants.TUIConversation.CHAT_ID : String}
+     * @return {TUIConstants.TUIConversation.IS_TOP : Boolean}
+     * 2、设置会话置顶；
+     * @param method TUIConstants.TUIConversation.METHOD_SET_TOP_CONVERSATION
+     * @param param {TUIConstants.TUIConversation.CHAT_ID : String, TUIConstants.TUIConversation.IS_SET_TOP : Boolean}
+     * 3、获取未读总数；
+     * @param method TUIConstants.TUIConversation.METHOD_GET_TOTAL_UNREAD_COUNT
+     * @return 未读总数
+     * 4、更新未读总数；
+     * @param method TUIConstants.TUIConversation.METHOD_UPDATE_TOTAL_UNREAD_COUNT
+     * 5、删除会话。
+     * @param method TUIConstants.TUIConversation.METHOD_DELETE_CONVERSATION
+     * @param param {TUIConstants.TUIConversation.CONVERSATION_ID : String}
+     * 
+     * 
+     * 1、Get whether the conversation is sticky
+     * @param method TUIConstants.TUIConversation.METHOD_IS_TOP_CONVERSATION
+     * @param param {TUIConstants.TUIConversation.CHAT_ID : String}
+     * @return {TUIConstants.TUIConversation.IS_TOP : Boolean}
+     * 2、Set session sticky
+     * @param method TUIConstants.TUIConversation.METHOD_SET_TOP_CONVERSATION
+     * @param param {TUIConstants.TUIConversation.CHAT_ID : String, TUIConstants.TUIConversation.IS_SET_TOP : Boolean}
+     * 3、Get the total number of unreads
+     * @param method TUIConstants.TUIConversation.METHOD_GET_TOTAL_UNREAD_COUNT
+     * @return the total number of unreads
+     * 4、Update the total number of unreads
+     * @param method TUIConstants.TUIConversation.METHOD_UPDATE_TOTAL_UNREAD_COUNT
+     * 5、Delete conversation
+     * @param method TUIConstants.TUIConversation.METHOD_DELETE_CONVERSATION
+     * @param param {TUIConstants.TUIConversation.CONVERSATION_ID : String}
+     */
+    @Override
+    Object onCall(String method, Map<String, Object> param);
+
+    /**
+     * 1、接收退群通知；
+     * @param key TUIConstants.TUIGroup.EVENT_GROUP
+     * @param subKey TUIConstants.TUIGroup.EVENT_SUB_KEY_EXIT_GROUP,
+     *               TUIConstants.TUIGroup.EVENT_SUB_KEY_GROUP_DISMISS,
+     *               TUIConstants.TUIGroup.EVENT_SUB_KEY_GROUP_RECYCLE
+     * @param param {TUIConstants.TUIGroup.GROUP_ID : String}
+     * 2、接收群成员退出群通知：
+     * @param key TUIConstants.TUIGroup.EVENT_GROUP
+     * @param subKey TUIConstants.TUIGroup.EVENT_SUB_KEY_MEMBER_KICKED_GROUP
+     * @param param {TUIConstants.TUIGroup.GROUP_ID : String, TUIConstants.TUIGroup.GROUP_MEMBER_ID_LIST : ArrayList<String>}
+     * 3、接收好友备注修改通知。
+     * @param key TUIConstants.TUIContact.EVENT_FRIEND_INFO_CHANGED
+     * @param subKey TUIConstants.TUIContact.EVENT_SUB_KEY_FRIEND_REMARK_CHANGED
+     * @param param {TUIConstants.TUIContact.FRIEND_ID : String, TUIConstants.TUIContact.FRIEND_REMARK : String}
+     * 
+     * 
+     * 1、Receive notifications of exit group
+     * @param key TUIConstants.TUIGroup.EVENT_GROUP
+     * @param subKey TUIConstants.TUIGroup.EVENT_SUB_KEY_EXIT_GROUP,
+     *               TUIConstants.TUIGroup.EVENT_SUB_KEY_GROUP_DISMISS,
+     *               TUIConstants.TUIGroup.EVENT_SUB_KEY_GROUP_RECYCLE
+     * @param param {TUIConstants.TUIGroup.GROUP_ID : String}
+     * 2、Receive group members leaving the group notification
+     * @param key TUIConstants.TUIGroup.EVENT_GROUP
+     * @param subKey TUIConstants.TUIGroup.EVENT_SUB_KEY_MEMBER_KICKED_GROUP
+     * @param param {TUIConstants.TUIGroup.GROUP_ID : String, TUIConstants.TUIGroup.GROUP_MEMBER_ID_LIST : ArrayList<String>}
+     * 3、Receive notification of friend's note modification
+     * @param key TUIConstants.TUIContact.EVENT_FRIEND_INFO_CHANGED
+     * @param subKey TUIConstants.TUIContact.EVENT_SUB_KEY_FRIEND_REMARK_CHANGED
+     * @param param {TUIConstants.TUIContact.FRIEND_ID : String, TUIConstants.TUIContact.FRIEND_REMARK : String}
+     */
+    @Override
+    void onNotifyEvent(String key, String subKey, Map<String, Object> param);
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/TUIConversationConstants.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/TUIConversationConstants.java
new file mode 100644
index 0000000..487c1d4
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/TUIConversationConstants.java
@@ -0,0 +1,43 @@
+package com.tencent.qcloud.tuikit.tuiconversation;
+
+public class TUIConversationConstants {
+    public static final String FORWARD_SELECT_CONVERSATION_KEY = "forward_select_conversation_key";
+    public static final int FORWARD_SELECT_ACTIVTY_CODE = 101;
+    public static final int FORWARD_SELECT_MEMBERS_CODE = 102;
+    public static final int FORWARD_CREATE_GROUP_CODE = 103;
+    public static final String FORWARD_CREATE_NEW_CHAT = "forward_create_new_chat";
+
+    public static String covert2HTMLString(String original) {
+        return "\"<font color=\"#5B6B92\">" + original + "</font>\"";
+    }
+
+    /**
+     * 1: 仅仅是一个带链接的文本消息
+     * 2: iOS支持的视频通话版本，后续已经不兼容
+     * 3: 未发布版本
+     * 4: Android/iOS/Web互通的视频通话版本
+     * 
+     * 1: Just a text message with a link
+     * 2: The video calling version supported by iOS is no longer compatible
+     * 3: unreleased version
+     * 4: Android/iOS/Web interoperable version for video call
+     */
+    public static final int JSON_VERSION_UNKNOWN = 0;
+    public static final int JSON_VERSION_1       = 1;
+    public static final int JSON_VERSION_4       = 4;
+    public static int version = JSON_VERSION_4;
+
+    public static class GroupType {
+        public static final String TYPE = "type";
+        public static final String GROUP = "isGroup";
+        public static final int PRIVATE = 0;
+        public static final int PUBLIC = 1;
+        public static final int CHAT_ROOM = 2;
+        public static final int COMMUNITY = 3;
+    }
+
+    public static final String CONVERSATION_SETTINGS_SP_NAME = "conversation_settings_sp";
+    public static final String HIDE_FOLD_ITEM_SP_KEY_PREFIX = "hide_fold_item_";
+    public static final String FOLD_ITEM_IS_UNREAD_SP_KEY_PREFIX = "fold_item_is_unread_";
+
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/TUIConversationService.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/TUIConversationService.java
new file mode 100644
index 0000000..14660a0
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/TUIConversationService.java
@@ -0,0 +1,370 @@
+package com.tencent.qcloud.tuikit.tuiconversation;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.text.TextUtils;
+
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.imsdk.v2.V2TIMConversationListener;
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMSDKListener;
+import com.tencent.imsdk.v2.V2TIMUserStatus;
+import com.tencent.qcloud.tuicore.ServiceInitializer;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+import com.tencent.qcloud.tuikit.tuiconversation.commonutil.ConversationUtils;
+import com.tencent.qcloud.tuikit.tuiconversation.commonutil.TUIConversationLog;
+import com.tencent.qcloud.tuikit.tuiconversation.interfaces.ConversationEventListener;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+public class TUIConversationService extends ServiceInitializer implements ITUIConversationService {
+    public static final String TAG = TUIConversationService.class.getSimpleName();
+    private static TUIConversationService instance;
+
+    public static TUIConversationService getInstance() {
+        return instance;
+    }
+    private boolean syncFinished = false;
+
+    private WeakReference<ConversationEventListener> conversationEventListener;
+    private final List<WeakReference<ConversationEventListener>> conversationEventListenerList = new ArrayList<>();
+
+    @Override
+    public void init(Context context) {
+        instance = this;
+        initService();
+        initEvent();
+        initIMListener();
+    }
+
+    private void initService() {
+        TUICore.registerService(TUIConstants.TUIConversation.SERVICE_NAME, this);
+    }
+
+    private void initEvent() {
+        TUICore.registerEvent(TUIConstants.TUIGroup.EVENT_GROUP, TUIConstants.TUIGroup.EVENT_SUB_KEY_EXIT_GROUP, this);
+        TUICore.registerEvent(TUIConstants.TUIGroup.EVENT_GROUP, TUIConstants.TUIGroup.EVENT_SUB_KEY_MEMBER_KICKED_GROUP, this);
+        TUICore.registerEvent(TUIConstants.TUIGroup.EVENT_GROUP, TUIConstants.TUIGroup.EVENT_SUB_KEY_GROUP_DISMISS, this);
+        TUICore.registerEvent(TUIConstants.TUIGroup.EVENT_GROUP, TUIConstants.TUIGroup.EVENT_SUB_KEY_GROUP_RECYCLE, this);
+        TUICore.registerEvent(TUIConstants.TUIContact.EVENT_FRIEND_INFO_CHANGED, TUIConstants.TUIContact.EVENT_SUB_KEY_FRIEND_REMARK_CHANGED, this);
+        TUICore.registerEvent(TUIConstants.TUIGroup.EVENT_GROUP, TUIConstants.TUIGroup.EVENT_SUB_KEY_CLEAR_MESSAGE, this);
+        TUICore.registerEvent(TUIConstants.TUIContact.EVENT_USER, TUIConstants.TUIContact.EVENT_SUB_KEY_CLEAR_MESSAGE, this);
+        TUICore.registerEvent(TUIConstants.TUIChat.EVENT_KEY_RECEIVE_MESSAGE, TUIConstants.TUIChat.EVENT_SUB_KEY_CONVERSATION_ID, this);
+        TUICore.registerEvent(TUIConstants.TUIConversation.EVENT_KEY_MESSAGE_SEND_FOR_CONVERSATION, TUIConstants.TUIConversation.EVENT_SUB_KEY_MESSAGE_SEND_FOR_CONVERSATION, this);
+    }
+
+    @Override
+    public Object onCall(String method, Map<String, Object> param) {
+        Bundle result = new Bundle();
+
+        ConversationEventListener conversationEventListener = getInstance().getConversationEventListener();
+        if (conversationEventListener == null) {
+            TUIConversationLog.e(TAG, "execute " + method + " failed , conversationEvent listener is null");
+            return result;
+        }
+        if (TextUtils.equals(TUIConstants.TUIConversation.METHOD_IS_TOP_CONVERSATION, method)) {
+            String chatId = (String) param.get(TUIConstants.TUIConversation.CHAT_ID);
+            if (!TextUtils.isEmpty(chatId)) {
+                boolean isTop = conversationEventListener.isTopConversation(chatId);
+                result.putBoolean(TUIConstants.TUIConversation.IS_TOP, isTop);
+            }
+        } else if (TextUtils.equals(TUIConstants.TUIConversation.METHOD_SET_TOP_CONVERSATION, method)) {
+            String chatId = (String) param.get(TUIConstants.TUIConversation.CHAT_ID);
+            boolean isTop = (boolean) param.get(TUIConstants.TUIConversation.IS_SET_TOP);
+            if (!TextUtils.isEmpty(chatId)) {
+                conversationEventListener.setConversationTop(chatId, isTop, new IUIKitCallback<Void>() {
+                    @Override
+                    public void onSuccess(Void data) {
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                    }
+                });
+            }
+        } else if (TextUtils.equals(TUIConstants.TUIConversation.METHOD_GET_TOTAL_UNREAD_COUNT, method)) {
+            return conversationEventListener.getUnreadTotal();
+        } else if (TextUtils.equals(TUIConstants.TUIConversation.METHOD_UPDATE_TOTAL_UNREAD_COUNT, method)) {
+            HashMap<String, Object> unreadMap = new HashMap<>();
+            long totalUnread = conversationEventListener.getUnreadTotal();
+            unreadMap.put(TUIConstants.TUIConversation.TOTAL_UNREAD_COUNT, totalUnread);
+            TUICore.notifyEvent(TUIConstants.TUIConversation.EVENT_UNREAD, TUIConstants.TUIConversation.EVENT_SUB_KEY_UNREAD_CHANGED, unreadMap);
+        } else if (TextUtils.equals(TUIConstants.TUIConversation.METHOD_DELETE_CONVERSATION, method)) {
+            String conversationId = (String) param.get(TUIConstants.TUIConversation.CONVERSATION_ID);
+            conversationEventListener.clearFoldMarkAndDeleteConversation(conversationId);
+
+            List<ConversationEventListener> conversationEventObserverList = getConversationEventListenerList();
+            for(ConversationEventListener conversationEventObserver : conversationEventObserverList) {
+                conversationEventObserver.clearFoldMarkAndDeleteConversation(conversationId);
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public void onNotifyEvent(String key, String subKey, Map<String, Object> param) {
+        if (TextUtils.equals(key, TUIConstants.TUIGroup.EVENT_GROUP)) {
+            if (TextUtils.equals(subKey, TUIConstants.TUIGroup.EVENT_SUB_KEY_EXIT_GROUP)
+                    || TextUtils.equals(subKey, TUIConstants.TUIGroup.EVENT_SUB_KEY_GROUP_DISMISS)
+                    || TextUtils.equals(subKey, TUIConstants.TUIGroup.EVENT_SUB_KEY_GROUP_RECYCLE)) {
+                ConversationEventListener eventListener = getConversationEventListener();
+                String groupId = null;
+                if (param != null) {
+                    groupId = (String) getOrDefault(param.get(TUIConstants.TUIGroup.GROUP_ID), "");
+                }
+                if (eventListener != null) {
+                    eventListener.deleteConversation(groupId, true);
+                }
+                List<ConversationEventListener> conversationEventObserverList = getConversationEventListenerList();
+                for(ConversationEventListener conversationEventObserver : conversationEventObserverList) {
+                    conversationEventObserver.deleteConversation(groupId, true);
+                }
+            } else if (TextUtils.equals(subKey, TUIConstants.TUIGroup.EVENT_SUB_KEY_MEMBER_KICKED_GROUP)) {
+                if (param == null) {
+                    return;
+                }
+                String groupId = (String) getOrDefault(param.get(TUIConstants.TUIGroup.GROUP_ID), "");
+                ArrayList<String> memberList = (ArrayList<String>) param.get(TUIConstants.TUIGroup.GROUP_MEMBER_ID_LIST);
+                if (TextUtils.isEmpty(groupId) || memberList == null || memberList.isEmpty()) {
+                    return;
+                }
+                for (String id : memberList) {
+                    if (TextUtils.equals(id, TUILogin.getLoginUser())) {
+                        ConversationEventListener eventListener = getConversationEventListener();
+                        if (eventListener != null) {
+                            eventListener.deleteConversation(groupId, true);
+                        }
+                        List<ConversationEventListener> conversationEventObserverList = getConversationEventListenerList();
+                        for(ConversationEventListener conversationEventObserver : conversationEventObserverList) {
+                            conversationEventObserver.deleteConversation(groupId, true);
+                        }
+                        break;
+                    }
+                }
+            } else if (TextUtils.equals(subKey, TUIConstants.TUIGroup.EVENT_SUB_KEY_CLEAR_MESSAGE)) {
+                String groupId = (String) getOrDefault(param.get(TUIConstants.TUIGroup.GROUP_ID), "");
+                ConversationEventListener eventListener = getConversationEventListener();
+                if (eventListener != null) {
+                    eventListener.clearConversationMessage(groupId, true);
+                }
+                List<ConversationEventListener> conversationEventObserverList = getConversationEventListenerList();
+                for(ConversationEventListener conversationEventObserver : conversationEventObserverList) {
+                    conversationEventObserver.clearConversationMessage(groupId, true);
+                }
+            }
+        } else if (key.equals(TUIConstants.TUIContact.EVENT_USER)) {
+            if (subKey.equals(TUIConstants.TUIContact.EVENT_SUB_KEY_CLEAR_MESSAGE)) {
+                if (param == null || param.isEmpty()) {
+                    return;
+                }
+                String userID = (String) getOrDefault(param.get(TUIConstants.TUIContact.FRIEND_ID), "");
+                ConversationEventListener eventListener = getConversationEventListener();
+                if (eventListener != null) {
+                    eventListener.clearConversationMessage(userID, false);
+                }
+                List<ConversationEventListener> conversationEventObserverList = getConversationEventListenerList();
+                for(ConversationEventListener conversationEventObserver : conversationEventObserverList) {
+                    conversationEventObserver.clearConversationMessage(userID, false);
+                }
+            }
+        } else if (key.equals(TUIConstants.TUIContact.EVENT_FRIEND_INFO_CHANGED)) {
+            if (subKey.equals(TUIConstants.TUIContact.EVENT_SUB_KEY_FRIEND_REMARK_CHANGED)) {
+                if (param == null || param.isEmpty()) {
+                    return;
+                }
+                ConversationEventListener conversationEventListener = getInstance().getConversationEventListener();
+                if (conversationEventListener == null) {
+                    return;
+                }
+                String id = (String) param.get(TUIConstants.TUIContact.FRIEND_ID);
+                String remark = (String) param.get(TUIConstants.TUIContact.FRIEND_REMARK);
+                conversationEventListener.onFriendRemarkChanged(id ,remark);
+
+                List<ConversationEventListener> conversationEventObserverList = getConversationEventListenerList();
+                for(ConversationEventListener conversationEventObserver : conversationEventObserverList) {
+                    conversationEventObserver.onFriendRemarkChanged(id, remark);
+                }
+            }
+        } else if (key.equals(TUIConstants.TUIChat.EVENT_KEY_RECEIVE_MESSAGE)) {
+            if (subKey.equals(TUIConstants.TUIChat.EVENT_SUB_KEY_CONVERSATION_ID)) {
+                if (param == null || param.isEmpty()) {
+                    return;
+                }
+                String conversationID = (String) param.get(TUIConstants.TUIChat.CONVERSATION_ID);
+                boolean isTypingMessage = false;
+                if (param.containsKey(TUIConstants.TUIChat.IS_TYPING_MESSAGE)) {
+                    isTypingMessage = (Boolean) param.get(TUIConstants.TUIChat.IS_TYPING_MESSAGE);
+                }
+                ConversationEventListener conversationEventListener = getInstance().getConversationEventListener();
+                if (conversationEventListener != null) {
+                    conversationEventListener.onReceiveMessage(conversationID, isTypingMessage);
+                }
+                List<ConversationEventListener> conversationEventObserverList = getConversationEventListenerList();
+                for(ConversationEventListener conversationEventObserver : conversationEventObserverList) {
+                    conversationEventObserver.onReceiveMessage(conversationID, isTypingMessage);
+                }
+            }
+
+        } else if (TextUtils.equals(key, TUIConstants.TUIConversation.EVENT_KEY_MESSAGE_SEND_FOR_CONVERSATION)) {
+            if (TextUtils.equals(subKey, TUIConstants.TUIConversation.EVENT_SUB_KEY_MESSAGE_SEND_FOR_CONVERSATION)) {
+                if (param == null || param.isEmpty()) {
+                    return;
+                }
+                String conversationID = (String) param.get(TUIConstants.TUIConversation.CONVERSATION_ID);
+                ConversationEventListener eventListener = getConversationEventListener();
+                if (eventListener != null) {
+                    eventListener.onMessageSendForHideConversation(conversationID);
+                }
+            }
+        }
+    }
+
+    private Object getOrDefault(Object value, Object defaultValue) {
+        if (value != null) {
+            return value;
+        }
+        return defaultValue;
+    }
+
+    private void initIMListener() {
+        V2TIMManager.getConversationManager().addConversationListener(new V2TIMConversationListener() {
+            @Override
+            public void onSyncServerStart() {
+                syncFinished = false;
+            }
+
+            @Override
+            public void onSyncServerFinish() {
+                ConversationEventListener conversationEventListener = getInstance().getConversationEventListener();
+                if (conversationEventListener != null) {
+                    conversationEventListener.onSyncServerFinish();
+                }
+
+                List<ConversationEventListener> conversationEventObserverList = getConversationEventListenerList();
+                for(ConversationEventListener conversationEventObserver : conversationEventObserverList) {
+                    conversationEventObserver.onSyncServerFinish();
+                }
+
+                syncFinished = true;
+            }
+
+            @Override
+            public void onSyncServerFailed() {
+                syncFinished = false;
+            }
+
+            @Override
+            public void onNewConversation(List<V2TIMConversation> conversationList) {
+                ConversationEventListener conversationEventListener = getInstance().getConversationEventListener();
+                List<ConversationInfo> conversationInfoList = ConversationUtils.convertV2TIMConversationList(conversationList);
+                if (conversationEventListener != null) {
+                    conversationEventListener.onNewConversation(conversationInfoList);
+                }
+
+                List<ConversationEventListener> conversationEventObserverList = getConversationEventListenerList();
+                for(ConversationEventListener conversationEventObserver : conversationEventObserverList) {
+                    conversationEventObserver.onNewConversation(conversationInfoList);
+                }
+            }
+
+            @Override
+            public void onConversationChanged(List<V2TIMConversation> conversationList) {
+                ConversationEventListener conversationEventListener = getInstance().getConversationEventListener();
+                List<ConversationInfo> conversationInfoList = ConversationUtils.convertV2TIMConversationList(conversationList);
+                if (conversationEventListener != null) {
+                    conversationEventListener.onConversationChanged(conversationInfoList);
+                }
+
+                List<ConversationEventListener> conversationEventObserverList = getConversationEventListenerList();
+                for(ConversationEventListener conversationEventObserver : conversationEventObserverList) {
+                    conversationEventObserver.onConversationChanged(conversationInfoList);
+                }
+            }
+
+            @Override
+            public void onTotalUnreadMessageCountChanged(long totalUnreadCount) {
+                ConversationEventListener conversationEventListener = getInstance().getConversationEventListener();
+                if (conversationEventListener != null) {
+                    conversationEventListener.updateTotalUnreadMessageCount(totalUnreadCount);
+                }
+                List<ConversationEventListener> conversationEventObserverList = getConversationEventListenerList();
+                for(ConversationEventListener conversationEventObserver : conversationEventObserverList) {
+                    conversationEventObserver.updateTotalUnreadMessageCount(totalUnreadCount);
+                }
+
+                HashMap<String, Object> param = new HashMap<>();
+                param.put(TUIConstants.TUIConversation.TOTAL_UNREAD_COUNT, totalUnreadCount);
+                TUICore.notifyEvent(TUIConstants.TUIConversation.EVENT_UNREAD, TUIConstants.TUIConversation.EVENT_SUB_KEY_UNREAD_CHANGED, param);
+            }
+        });
+
+        V2TIMSDKListener v2TIMSDKListener = new V2TIMSDKListener() {
+            @Override
+            public void onUserStatusChanged(List<V2TIMUserStatus> userStatusList) {
+                ConversationEventListener conversationEventListener = getInstance().getConversationEventListener();
+                if (conversationEventListener != null) {
+                    conversationEventListener.onUserStatusChanged(userStatusList);
+                }
+                List<ConversationEventListener> conversationEventObserverList = getConversationEventListenerList();
+                for(ConversationEventListener conversationEventObserver : conversationEventObserverList) {
+                    conversationEventObserver.onUserStatusChanged(userStatusList);
+                }
+            }
+        };
+        V2TIMManager.getInstance().addIMSDKListener(v2TIMSDKListener);
+    }
+
+    public void addConversationEventListener(ConversationEventListener conversationEventListener) {
+        if (conversationEventListener == null) {
+            return;
+        }
+        for (WeakReference<ConversationEventListener> listenerWeakReference : conversationEventListenerList) {
+            if (listenerWeakReference.get() == conversationEventListener) {
+                return;
+            }
+        }
+        conversationEventListenerList.add(new WeakReference<>(conversationEventListener));
+    }
+
+    public List<ConversationEventListener> getConversationEventListenerList() {
+        List<ConversationEventListener> listeners = new ArrayList<>();
+        Iterator<WeakReference<ConversationEventListener>> iterator = conversationEventListenerList.listIterator();
+        while(iterator.hasNext()) {
+            WeakReference<ConversationEventListener> listenerWeakReference = iterator.next();
+            ConversationEventListener listener = listenerWeakReference.get();
+            if (listener == null) {
+                iterator.remove();
+            } else {
+                listeners.add(listener);
+            }
+        }
+        return listeners;
+    }
+
+    public void setConversationEventListener(ConversationEventListener conversationManagerKit) {
+        this.conversationEventListener = new WeakReference<>(conversationManagerKit);
+        if (syncFinished) {
+            conversationManagerKit.onSyncServerFinish();
+        }
+    }
+
+    public ConversationEventListener getConversationEventListener() {
+        if (conversationEventListener != null) {
+            return conversationEventListener.get();
+        }
+        return null;
+    }
+
+    public void addMessageListener() {
+
+    }
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/bean/ConversationInfo.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/bean/ConversationInfo.java
new file mode 100644
index 0000000..d41baf4
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/bean/ConversationInfo.java
@@ -0,0 +1,347 @@
+package com.tencent.qcloud.tuikit.tuiconversation.bean;
+
+import androidx.annotation.NonNull;
+
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.imsdk.v2.V2TIMGroupAtInfo;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.imsdk.v2.V2TIMUserStatus;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ConversationInfo implements Serializable, Comparable<ConversationInfo> {
+
+    public static final int TYPE_COMMON = 1;
+    public static final int TYPE_CUSTOM = 2;
+
+    public static final int TYPE_FORWAR_SELECT = 3;
+    public static final int TYPE_RECENT_LABEL = 4;
+    /**
+     * 会话类型，自定义会话or普通会话
+     * 
+     * conversation type
+     */
+    private int type;
+
+    /**
+     * 消息未读数
+     * 
+     * unread message number
+     */
+    private int unRead;
+    /**
+     * 会话ID
+     * 
+     * conversation ID
+     */
+    private String conversationId;
+    /**
+     * 会话标识，C2C为对方用户ID，群聊为群组ID
+     * 
+     * ID, C2C is UserID, Group is group ID
+     */
+    private String id;
+
+    private int statusType = V2TIMUserStatus.V2TIM_USER_STATUS_UNKNOWN;
+
+    private V2TIMConversation conversation;
+
+    private List<Object> iconUrlList = new ArrayList<>();
+
+    public List<Object> getIconUrlList() {
+        return iconUrlList;
+    }
+
+    public void setIconUrlList(List<Object> iconUrlList) {
+        this.iconUrlList = iconUrlList;
+    }
+
+    public V2TIMConversation getConversation() {
+        return conversation;
+    }
+
+    public void setConversation(V2TIMConversation conversation) {
+        this.conversation = conversation;
+    }
+
+    public String getShowName() {
+        if (conversation != null) {
+            return conversation.getShowName();
+        }
+        return null;
+    }
+    
+    private String title;
+    private String iconPath;
+    private boolean isGroup;
+    private boolean top;
+    /**
+     * 是否为折叠会话 Is folded conversation or not
+     */
+    private boolean isMarkFold;
+    /**
+     * 是否标记会话未读 Is marked conversation unread or not
+     */
+    private boolean isMarkUnread;
+    /**
+     * 是否标记会话隐藏 Is marked conversation hidden or not
+     */
+    private boolean isMarkHidden;
+    /**
+     * 本地记录未读状态 Is marked conversation local-unread or not
+     */
+    private boolean isMarkLocalUnread;
+    /**
+     * 最后一条消息时间
+     */
+    private long lastMessageTime;
+    private V2TIMMessage lastMessage;
+
+    /**
+     * 会话界面显示的@提示消息
+     * 
+     * "@" message in group
+     */
+    private String atInfoText;
+
+    /**
+     * 会话界面显示消息免打扰图标
+     * 
+     * the conversation item displays the icon of Do Not Disturb
+     */
+    private boolean showDisturbIcon;
+
+    private DraftInfo draft;
+    private String groupType;
+
+    /**
+     * 会话排序键值
+     * 
+     * conversation sort key
+     */
+    private long orderKey;
+
+    public ConversationInfo() {
+
+    }
+
+    public String getConversationId() {
+        return conversationId;
+    }
+
+    public void setConversationId(String conversationId) {
+        this.conversationId = conversationId;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public int getUnRead() {
+        return unRead;
+    }
+
+    public void setUnRead(int unRead) {
+        this.unRead = unRead;
+    }
+
+    public boolean isGroup() {
+        return isGroup;
+    }
+
+    public void setGroup(boolean group) {
+        isGroup = group;
+    }
+
+    public boolean isTop() {
+        return top;
+    }
+
+    public void setTop(boolean top) {
+        this.top = top;
+    }
+
+    public boolean isMarkFold() {
+        return isMarkFold;
+    }
+
+    public void setMarkFold(boolean markFold) {
+        isMarkFold = markFold;
+    }
+
+    public boolean isMarkUnread() {
+        return isMarkUnread;
+    }
+
+    public void setMarkUnread(boolean markUnread) {
+        isMarkUnread = markUnread;
+    }
+
+    public boolean isMarkHidden() {
+        return isMarkHidden;
+    }
+
+    public void setMarkHidden(boolean markHidden) {
+        isMarkHidden = markHidden;
+    }
+
+    public boolean isMarkLocalUnread() {
+        return isMarkLocalUnread;
+    }
+
+    public void setMarkLocalUnread(boolean markLocalUnread) {
+        isMarkLocalUnread = markLocalUnread;
+    }
+
+    /**
+     * 获得最后一条消息的时间，单位是秒
+     * 
+     * Get the time of the last message, in seconds
+     */
+    public long getLastMessageTime() {
+        return lastMessageTime;
+    }
+
+    /**
+     * 设置最后一条消息的时间，单位是秒
+     * 
+     * Set the time of the last message, in seconds
+     * @param lastMessageTime
+     */
+    public void setLastMessageTime(long lastMessageTime) {
+        this.lastMessageTime = lastMessageTime;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public V2TIMMessage getLastMessage() {
+        return lastMessage;
+    }
+
+    public void setLastMessage(V2TIMMessage lastMessage) {
+        this.lastMessage = lastMessage;
+    }
+
+    public void setAtInfoText(String atInfoText) {
+        this.atInfoText = atInfoText;
+    }
+
+    public String getAtInfoText() {
+        return atInfoText;
+    }
+
+    public boolean isShowDisturbIcon() {
+        return showDisturbIcon;
+    }
+
+    public void setShowDisturbIcon(boolean showDisturbIcon) {
+        this.showDisturbIcon = showDisturbIcon;
+    }
+
+    public void setDraft(DraftInfo draft) {
+        this.draft = draft;
+    }
+
+    public DraftInfo getDraft() {
+        return this.draft;
+    }
+
+    public String getGroupType() {
+        return groupType;
+    }
+
+    public void setGroupType(String groupType) {
+        this.groupType = groupType;
+    }
+
+    public String getIconPath() {
+        return iconPath;
+    }
+
+    public void setIconPath(String iconPath) {
+        this.iconPath = iconPath;
+    }
+
+    public void setOrderKey(long orderKey) {
+        this.orderKey = orderKey;
+    }
+
+    public long getOrderKey() {
+        return orderKey;
+    }
+
+    public List<V2TIMGroupAtInfo> getGroupAtInfoList() {
+        if (conversation != null) {
+            return conversation.getGroupAtInfoList();
+        }
+
+        return null;
+    }
+
+    public int getStatusType() {
+        return statusType;
+    }
+
+    public void setStatusType(int statusType) {
+        this.statusType = statusType;
+    }
+
+    @Override
+    public int compareTo(@NonNull ConversationInfo other) {
+        if (this.isTop() && !other.isTop()) {
+            return -1;
+        } else if (!this.isTop() && other.isTop()) {
+            return 1;
+        } else {
+            long thisOrderKey = this.orderKey;
+            long otherOrderKey = other.orderKey;
+            if (thisOrderKey > otherOrderKey) {
+                return -1;
+            } else if (thisOrderKey == otherOrderKey) {
+                return 0;
+            } else {
+                return 1;
+            }
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "ConversationInfo{" +
+                "type=" + type +
+                ", unRead=" + unRead +
+                ", conversationId='" + conversationId + '\'' +
+                ", id='" + id + '\'' +
+                ", iconUrl='" + iconUrlList.size() + '\'' +
+                ", title='" + title + '\'' +
+                ", iconPath=" + iconPath +
+                ", isGroup=" + isGroup +
+                ", top=" + top +
+                ", lastMessageTime=" + lastMessageTime +
+                ", lastMessage=" + lastMessage +
+                ", draftText=" + draft +
+                ", groupType=" + groupType +
+                ", statusType=" + statusType +
+                '}';
+    }
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/bean/DraftInfo.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/bean/DraftInfo.java
new file mode 100644
index 0000000..063a9c9
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/bean/DraftInfo.java
@@ -0,0 +1,32 @@
+package com.tencent.qcloud.tuikit.tuiconversation.bean;
+
+import java.io.Serializable;
+
+public class DraftInfo implements Serializable {
+    private String draftText;
+    private long draftTime;
+
+    public String getDraftText() {
+        return draftText;
+    }
+
+    public void setDraftText(String draftText) {
+        this.draftText = draftText;
+    }
+
+    public long getDraftTime() {
+        return draftTime;
+    }
+
+    public void setDraftTime(long draftTime) {
+        this.draftTime = draftTime;
+    }
+
+    @Override
+    public String toString() {
+        return "DraftInfo{" +
+                "draftText='" + draftText + '\'' +
+                ", draftTime=" + draftTime +
+                '}';
+    }
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/interfaces/IConversationLayout.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/interfaces/IConversationLayout.java
new file mode 100644
index 0000000..a9ec8f0
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/interfaces/IConversationLayout.java
@@ -0,0 +1,38 @@
+package com.tencent.qcloud.tuikit.tuiconversation.classicui.interfaces;
+
+import android.view.View;
+
+import com.tencent.qcloud.tuicore.component.interfaces.ILayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+
+public interface IConversationLayout extends ILayout {
+    View getConversationList();
+    void setConversationTop(ConversationInfo conversation, IUIKitCallback callBack);
+    void deleteConversation(ConversationInfo conversation);
+    void clearConversationMessage(ConversationInfo conversation);
+
+    /**
+     * 隐藏普通会话
+     * Hide normal conversation
+     */
+    void markConversationHidden(ConversationInfo conversation);
+
+    /**
+     * 标记会话已读/未读
+     * Mark conversation read or unread
+     */
+    void markConversationUnread(ConversationInfo conversationInfo, boolean markUnread);
+
+    /**
+     * 隐藏整个折叠的会话 item
+     * Hide folded conversation item
+     */
+    void hideFoldedItem(boolean needHide);
+
+    /**
+     * 清除折叠 item 本地未读状态
+     * Clear unread status of fold item
+     */
+    void clearUnreadStatusOfFoldItem();
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/interfaces/IConversationListLayout.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/interfaces/IConversationListLayout.java
new file mode 100644
index 0000000..b8b87c6
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/interfaces/IConversationListLayout.java
@@ -0,0 +1,62 @@
+package com.tencent.qcloud.tuikit.tuiconversation.classicui.interfaces;
+
+import android.view.View;
+
+import com.tencent.qcloud.tuikit.tuiconversation.classicui.widget.ConversationListAdapter;
+import com.tencent.qcloud.tuikit.tuiconversation.interfaces.IConversationListAdapter;
+
+public interface IConversationListLayout {
+    void setBackground(int resId);
+    void setOnConversationAdapterListener(OnConversationAdapterListener listener);
+
+    /**
+     * 不显示小红点未读消息条数开关
+     * 
+     * Do not display the switch for the number of unread messages with the small red dot
+     *
+     * @param flag 默认false，表示显示
+     */
+    void disableItemUnreadDot(boolean flag);
+
+    /**
+     * 设置会话Item头像圆角
+     * 
+     * Set session item avatar rounded corners
+     *
+     * @param radius
+     */
+    void setItemAvatarRadius(int radius);
+
+    /**
+     * 设置会话Item顶部字体大小
+     * 
+     * Set the font size at the top of the session item
+     *
+     * @param size
+     */
+    void setItemTopTextSize(int size);
+
+    /**
+     * 设置会话Item底部字体大小
+     * 
+     * Set the font size at the bottom of the session item
+     *
+     * @param size
+     */
+    void setItemBottomTextSize(int size);
+
+    /**
+     * 设置会话Item日期字体大小
+     * 
+     * Set the session item date font size
+     *
+     * @param size
+     */
+    void setItemDateTextSize(int size);
+
+
+    View getListLayout();
+    ConversationListAdapter getAdapter();
+    void setAdapter(IConversationListAdapter adapter);
+
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/interfaces/IConversationProvider.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/interfaces/IConversationProvider.java
new file mode 100644
index 0000000..4d97c97
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/interfaces/IConversationProvider.java
@@ -0,0 +1,62 @@
+package com.tencent.qcloud.tuikit.tuiconversation.classicui.interfaces;
+
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+import com.tencent.qcloud.tuikit.tuiconversation.interfaces.IConversationListAdapter;
+
+import java.util.List;
+
+
+public interface IConversationProvider {
+
+    /**
+     * 获取具体的会话数据集合，ConversationContainer依据该数据集合展示会话列表
+     * 
+     * Get a specific session data set, and ConversationContainer displays the session list based on the data set
+     *
+     * @return
+     */
+    List<ConversationInfo> getDataSource();
+
+    /**
+     * 批量添加会话条目
+     * 
+     * Bulk add session entries
+     *
+     * @param conversations 会话数据集合
+     * @return
+     */
+    boolean addConversations(List<ConversationInfo> conversations);
+
+    /**
+     * 删除会话条目
+     * 
+     * Delete session entries
+     *
+     * @param conversations 会话数据集合
+     * @return
+     */
+    boolean deleteConversations(List<ConversationInfo> conversations);
+
+    /**
+     * 更新会话条目
+     * 
+     * Update session entries
+     *
+     * @param conversations 会话数据集合
+     * @return
+     */
+    boolean updateConversations(List<ConversationInfo> conversations);
+
+
+    /**
+     * 绑定会话适配器时触发的调用，在调用{@link com.tencent.qcloud.tuikit.tuiconversation.interfaces.IConversationListAdapter#setDataProvider}时自动调用
+     * 
+     * Called when a session adapter is bound, automatically called when {@link com.tencent.qcloud.tuikit.tuiconversation.interfaces.IConversationListAdapter#setDataProvider} is called
+     *
+     * @param adapter 会话UI显示适配器
+     * @return
+     */
+
+    void attachAdapter(IConversationListAdapter adapter);
+
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/interfaces/OnConversationAdapterListener.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/interfaces/OnConversationAdapterListener.java
new file mode 100644
index 0000000..542fdce
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/interfaces/OnConversationAdapterListener.java
@@ -0,0 +1,13 @@
+package com.tencent.qcloud.tuikit.tuiconversation.classicui.interfaces;
+
+import android.view.View;
+
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+
+import java.util.List;
+
+public interface OnConversationAdapterListener {
+    void onItemClick(View view, int viewType, ConversationInfo conversationInfo);
+    void OnItemLongClick(View view, ConversationInfo conversationInfo);
+    void onConversationChanged(List<ConversationInfo> dataSource);
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/page/TUIConversationFragment.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/page/TUIConversationFragment.java
new file mode 100644
index 0000000..53dfdf0
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/page/TUIConversationFragment.java
@@ -0,0 +1,238 @@
+package com.tencent.qcloud.tuikit.tuiconversation.classicui.page;
+
+import android.content.Intent;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.PopupWindow;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+import com.tencent.qcloud.tuicore.component.fragments.BaseFragment;
+import com.tencent.qcloud.tuicore.component.action.PopActionClickListener;
+import com.tencent.qcloud.tuicore.component.action.PopDialogAdapter;
+import com.tencent.qcloud.tuicore.component.action.PopMenuAction;
+import com.tencent.qcloud.tuikit.tuiconversation.classicui.interfaces.OnConversationAdapterListener;
+import com.tencent.qcloud.tuikit.tuiconversation.classicui.util.TUIConversationUtils;
+import com.tencent.qcloud.tuikit.tuiconversation.classicui.widget.ConversationLayout;
+import com.tencent.qcloud.tuikit.tuiconversation.presenter.ConversationPresenter;
+import com.tencent.qcloud.tuikit.tuiconversation.commonutil.ConversationUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TUIConversationFragment extends BaseFragment {
+    private View mBaseView;
+    private ConversationLayout mConversationLayout;
+    private ListView mConversationPopList;
+    private PopDialogAdapter mConversationPopAdapter;
+    private PopupWindow mConversationPopWindow;
+    private String popWindowConversationId;
+    private List<PopMenuAction> mConversationPopActions = new ArrayList<>();
+
+    private ConversationPresenter presenter;
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        mBaseView = inflater.inflate(R.layout.conversation_fragment, container, false);
+        initView();
+        return mBaseView;
+    }
+
+    private void initView() {
+        // 从布局文件中获取会话列表面板
+        mConversationLayout = mBaseView.findViewById(R.id.conversation_layout);
+
+        presenter = new ConversationPresenter();
+        presenter.setConversationListener();
+        presenter.setShowType(ConversationPresenter.SHOW_TYPE_CONVERSATION_LIST_WITH_FOLD);
+        mConversationLayout.setPresenter(presenter);
+
+        // 会话列表面板的默认UI和交互初始化
+        mConversationLayout.initDefault();
+        // 通过API设置ConversataonLayout各种属性的样例，开发者可以打开注释，体验效果
+//        ConversationLayoutSetting.customizeConversation(mConversationLayout);
+
+        mConversationLayout.getConversationList().setOnConversationAdapterListener(new OnConversationAdapterListener() {
+
+            @Override
+            public void onItemClick(View view, int viewType, ConversationInfo conversationInfo) {
+                //此处为demo的实现逻辑，更根据会话类型跳转到相关界面，开发者可根据自己的应用场景灵活实现
+                if (conversationInfo.isMarkFold()) {
+                    mConversationLayout.clearUnreadStatusOfFoldItem();
+                    startFoldedConversationActivity();
+                } else {
+                    TUIConversationUtils.startChatActivity(conversationInfo);
+                }
+            }
+
+            @Override
+            public void OnItemLongClick(View view, ConversationInfo conversationInfo) {
+                showItemPopMenu(view, conversationInfo);
+            }
+
+            @Override
+            public void onConversationChanged(List<ConversationInfo> dataSource) {
+                if (dataSource == null)return;
+                ConversationInfo conversationInfo = dataSource.get(0);
+                if (conversationInfo == null)return;
+
+                if (!TextUtils.isEmpty(popWindowConversationId) && popWindowConversationId.equals(conversationInfo.getConversationId())) {
+                    if (mConversationPopWindow != null) {
+                        mConversationPopWindow.dismiss();
+                    }
+                }
+            }
+        });
+
+        restoreConversationItemBackground();
+    }
+
+    public void restoreConversationItemBackground() {
+        if (mConversationLayout.getConversationList().getAdapter() !=  null &&
+                mConversationLayout.getConversationList().getAdapter().isClick()) {
+            mConversationLayout.getConversationList().getAdapter().setClick(false);
+            mConversationLayout.getConversationList().getAdapter().notifyItemChanged(mConversationLayout.getConversationList().getAdapter().getCurrentPosition());
+        }
+    }
+
+    private void initPopMenuAction() {
+        // 设置长按conversation显示PopAction
+        List<PopMenuAction> conversationPopActions = new ArrayList<PopMenuAction>();
+        PopMenuAction action = new PopMenuAction();
+        action.setActionName(getResources().getString(R.string.not_display));
+        action.setActionClickListener(new PopActionClickListener() {
+            @Override
+            public void onActionClick(int index, Object data) {
+                ConversationInfo conversationInfo = (ConversationInfo) data;
+                if (conversationInfo.isMarkFold()) {
+                    mConversationLayout.hideFoldedItem(true);
+                } else {
+                    mConversationLayout.markConversationHidden(conversationInfo);
+                }
+            }
+        });
+        conversationPopActions.add(action);
+
+        mConversationPopActions.clear();
+        mConversationPopActions.addAll(conversationPopActions);
+    }
+
+    private void addMarkUnreadPopMenuAction(boolean markUnread) {
+        PopMenuAction action = new PopMenuAction();
+        action.setActionClickListener(new PopActionClickListener() {
+            @Override
+            public void onActionClick(int index, Object data) {
+                mConversationLayout.markConversationUnread((ConversationInfo) data, markUnread);
+            }
+        });
+        if (markUnread) {
+            action.setActionName(getResources().getString(R.string.mark_unread));
+        } else {
+            action.setActionName(getResources().getString(R.string.mark_read));
+        }
+        mConversationPopActions.add(0, action);
+    }
+
+    private void addDeletePopMenuAction() {
+        PopMenuAction action = new PopMenuAction();
+        action.setActionClickListener(new PopActionClickListener() {
+            @Override
+            public void onActionClick(int index, Object data) {
+                mConversationLayout.deleteConversation((ConversationInfo) data);
+            }
+        });
+        action.setActionName(getResources().getString(R.string.chat_delete));
+        mConversationPopActions.add(action);
+    }
+
+    /**
+     * 长按会话item弹框
+     * @param view 长按 view
+     * @param conversationInfo 会话数据对象
+     */
+    private void showItemPopMenu(View view, final ConversationInfo conversationInfo) {
+        initPopMenuAction();
+
+        if (!conversationInfo.isMarkFold()) {
+            if (conversationInfo.getUnRead() > 0) {
+                addMarkUnreadPopMenuAction(false);
+            } else {
+                if (conversationInfo.isMarkUnread()) {
+                    addMarkUnreadPopMenuAction(false);
+                } else {
+                    addMarkUnreadPopMenuAction(true);
+                }
+            }
+
+            addDeletePopMenuAction();
+        }
+
+        View itemPop = LayoutInflater.from(getActivity()).inflate(R.layout.conversation_pop_menu_layout, null);
+        mConversationPopList = itemPop.findViewById(R.id.pop_menu_list);
+        mConversationPopList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                PopMenuAction action = mConversationPopActions.get(position);
+                if (action.getActionClickListener() != null) {
+                    action.getActionClickListener().onActionClick(position, conversationInfo);
+                }
+                mConversationPopWindow.dismiss();
+                restoreConversationItemBackground();
+            }
+        });
+
+        for (int i = 0; i < mConversationPopActions.size(); i++) {
+            PopMenuAction action = mConversationPopActions.get(i);
+            if (conversationInfo.isTop()) {
+                if (action.getActionName().equals(getResources().getString(R.string.chat_top))) {
+                    action.setActionName(getResources().getString(R.string.quit_chat_top));
+                }
+            } else {
+                if (action.getActionName().equals(getResources().getString(R.string.quit_chat_top))) {
+                    action.setActionName(getResources().getString(R.string.chat_top));
+                }
+
+            }
+        }
+        mConversationPopAdapter = new PopDialogAdapter();
+        mConversationPopList.setAdapter(mConversationPopAdapter);
+        mConversationPopAdapter.setDataSource(mConversationPopActions);
+        mConversationPopWindow = new PopupWindow(itemPop, WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT);
+        mConversationPopWindow.setBackgroundDrawable(new ColorDrawable());
+        mConversationPopWindow.setOutsideTouchable(true);
+        int width = ConversationUtils.getListUnspecifiedWidth(mConversationPopAdapter, mConversationPopList);
+        mConversationPopWindow.setWidth(width);
+        popWindowConversationId = conversationInfo.getConversationId();
+        mConversationPopWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                restoreConversationItemBackground();
+                popWindowConversationId = "";
+            }
+        });
+        int x = view.getWidth() / 2;
+        int y = - view.getHeight() / 3;
+        int popHeight = ScreenUtil.dip2px(45) * 3;
+        if (y + popHeight + view.getY() + view.getHeight() > mConversationLayout.getBottom()) {
+            y = y - popHeight;
+        }
+        mConversationPopWindow.showAsDropDown(view, x, y, Gravity.TOP | Gravity.START);
+    }
+
+    private void startFoldedConversationActivity() {
+        Intent intent = new Intent(getActivity(), TUIFoldedConversationActivity.class);
+        startActivity(intent);
+    }
+
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/page/TUIFoldedConversationActivity.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/page/TUIFoldedConversationActivity.java
new file mode 100644
index 0000000..0900cce
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/page/TUIFoldedConversationActivity.java
@@ -0,0 +1,22 @@
+package com.tencent.qcloud.tuikit.tuiconversation.classicui.page;
+
+import android.os.Bundle;
+import androidx.annotation.Nullable;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+
+public class TUIFoldedConversationActivity extends BaseLightActivity {
+    private TUIFoldedConversationFragment mTUIFoldedConversationFragment;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.folded_activity);
+
+        init();
+    }
+
+    private void init() {
+        mTUIFoldedConversationFragment = new TUIFoldedConversationFragment();
+        getSupportFragmentManager().beginTransaction().replace(R.id.empty_view, mTUIFoldedConversationFragment).commitAllowingStateLoss();
+    }
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/page/TUIFoldedConversationFragment.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/page/TUIFoldedConversationFragment.java
new file mode 100644
index 0000000..df76d2e
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/page/TUIFoldedConversationFragment.java
@@ -0,0 +1,217 @@
+package com.tencent.qcloud.tuikit.tuiconversation.classicui.page;
+
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.PopupWindow;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.action.PopActionClickListener;
+import com.tencent.qcloud.tuicore.component.action.PopDialogAdapter;
+import com.tencent.qcloud.tuicore.component.action.PopMenuAction;
+import com.tencent.qcloud.tuicore.component.fragments.BaseFragment;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+import com.tencent.qcloud.tuikit.tuiconversation.classicui.interfaces.OnConversationAdapterListener;
+import com.tencent.qcloud.tuikit.tuiconversation.classicui.util.TUIConversationUtils;
+import com.tencent.qcloud.tuikit.tuiconversation.classicui.widget.FoldedConversationLayout;
+import com.tencent.qcloud.tuikit.tuiconversation.presenter.ConversationFoldPresenter;
+import com.tencent.qcloud.tuikit.tuiconversation.commonutil.ConversationUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TUIFoldedConversationFragment extends BaseFragment {
+    private View mBaseView;
+    private TitleBarLayout mTitleBarLayout;
+    private FoldedConversationLayout mFoldedLayout;
+    private PopDialogAdapter mConversationPopAdapter;
+    private ListView mConversationPopList;
+    private PopupWindow mConversationPopWindow;
+    private String popWindowConversationId;
+    private List<PopMenuAction> mConversationPopActions = new ArrayList<>();
+
+    private ConversationFoldPresenter presenter;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        mBaseView = inflater.inflate(R.layout.folded_fragment, container, false);
+        initView();
+        return mBaseView;
+    }
+
+    private void initView() {
+        mFoldedLayout = mBaseView.findViewById(R.id.folded_conversation_layout);
+        mTitleBarLayout = mFoldedLayout.getTitleBar();
+        mTitleBarLayout.setTitle(getResources().getString(R.string.folded_group_chat), ITitleBarLayout.Position.MIDDLE);
+        mTitleBarLayout.setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getActivity().finish();
+            }
+        });
+
+        presenter = new ConversationFoldPresenter();
+        presenter.initListener();
+
+        mFoldedLayout.setPresenter(presenter);
+        mFoldedLayout.initDefault();
+
+        mFoldedLayout.getConversationList().setOnConversationAdapterListener(new OnConversationAdapterListener() {
+            @Override
+            public void onItemClick(View view, int viewType, ConversationInfo conversationInfo) {
+                TUIConversationUtils.startChatActivity(conversationInfo);
+            }
+
+            @Override
+            public void OnItemLongClick(View view, ConversationInfo conversationInfo) {
+                showItemPopMenu(view, conversationInfo);
+            }
+
+            @Override
+            public void onConversationChanged(List<ConversationInfo> dataSource) {
+                if (dataSource == null)return;
+                ConversationInfo conversationInfo = dataSource.get(0);
+                if (conversationInfo == null)return;
+
+                if (!TextUtils.isEmpty(popWindowConversationId) && popWindowConversationId.equals(conversationInfo.getConversationId())) {
+                    if (mConversationPopWindow != null) {
+                        mConversationPopWindow.dismiss();
+                    }
+                }
+            }
+        });
+
+        restoreConversationItemBackground();
+    }
+
+    private void initPopMenuAction() {
+        // 设置长按conversation显示PopAction
+        List<PopMenuAction> conversationPopActions = new ArrayList<PopMenuAction>();
+        PopMenuAction action = new PopMenuAction();
+        action.setActionName(getResources().getString(R.string.not_display));
+        action.setActionClickListener(new PopActionClickListener() {
+            @Override
+            public void onActionClick(int index, Object data) {
+                ConversationInfo conversationInfo = (ConversationInfo) data;
+                mFoldedLayout.markConversationHidden((ConversationInfo) data);
+            }
+        });
+        conversationPopActions.add(action);
+
+        action = new PopMenuAction();
+        action.setActionClickListener(new PopActionClickListener() {
+            @Override
+            public void onActionClick(int index, Object data) {
+                mFoldedLayout.deleteConversation((ConversationInfo) data);
+            }
+        });
+        action.setActionName(getResources().getString(R.string.chat_delete));
+        conversationPopActions.add(action);
+
+        mConversationPopActions.clear();
+        mConversationPopActions.addAll(conversationPopActions);
+    }
+
+    private void restoreConversationItemBackground() {
+        if (mFoldedLayout.getConversationList().getAdapter() !=  null &&
+                mFoldedLayout.getConversationList().getAdapter().isClick()) {
+            mFoldedLayout.getConversationList().getAdapter().setClick(false);
+            mFoldedLayout.getConversationList().getAdapter().notifyItemChanged(mFoldedLayout.getConversationList().getAdapter().getCurrentPosition());
+        }
+    }
+
+    private void addMarkUnreadPopMenuAction(boolean markUnread) {
+        PopMenuAction action = new PopMenuAction();
+        action.setActionClickListener(new PopActionClickListener() {
+            @Override
+            public void onActionClick(int index, Object data) {
+                mFoldedLayout.markConversationUnread((ConversationInfo) data, markUnread);
+            }
+        });
+        if (markUnread) {
+            action.setActionName(getResources().getString(R.string.mark_unread));
+        } else {
+            action.setActionName(getResources().getString(R.string.mark_read));
+        }
+        mConversationPopActions.add(0, action);
+    }
+
+    private void showItemPopMenu(View view, final ConversationInfo conversationInfo) {
+        initPopMenuAction();
+
+        if (conversationInfo.getUnRead() > 0) {
+            addMarkUnreadPopMenuAction(false);
+        } else {
+            if (conversationInfo.isMarkUnread()) {
+                addMarkUnreadPopMenuAction(false);
+            } else {
+                addMarkUnreadPopMenuAction(true);
+            }
+        }
+
+        View itemPop = LayoutInflater.from(getActivity()).inflate(R.layout.conversation_pop_menu_layout, null);
+        mConversationPopList = itemPop.findViewById(R.id.pop_menu_list);
+        mConversationPopList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                PopMenuAction action = mConversationPopActions.get(position);
+                if (action.getActionClickListener() != null) {
+                    action.getActionClickListener().onActionClick(position, conversationInfo);
+                }
+                mConversationPopWindow.dismiss();
+                restoreConversationItemBackground();
+            }
+        });
+
+        for (int i = 0; i < mConversationPopActions.size(); i++) {
+            PopMenuAction action = mConversationPopActions.get(i);
+            if (conversationInfo.isTop()) {
+                if (action.getActionName().equals(getResources().getString(R.string.chat_top))) {
+                    action.setActionName(getResources().getString(R.string.quit_chat_top));
+                }
+            } else {
+                if (action.getActionName().equals(getResources().getString(R.string.quit_chat_top))) {
+                    action.setActionName(getResources().getString(R.string.chat_top));
+                }
+
+            }
+        }
+        mConversationPopAdapter = new PopDialogAdapter();
+        mConversationPopList.setAdapter(mConversationPopAdapter);
+        mConversationPopAdapter.setDataSource(mConversationPopActions);
+        mConversationPopWindow = new PopupWindow(itemPop, WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT);
+        mConversationPopWindow.setBackgroundDrawable(new ColorDrawable());
+        mConversationPopWindow.setOutsideTouchable(true);
+        popWindowConversationId = conversationInfo.getConversationId();
+        int width = ConversationUtils.getListUnspecifiedWidth(mConversationPopAdapter, mConversationPopList);
+        mConversationPopWindow.setWidth(width);
+        mConversationPopWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                restoreConversationItemBackground();
+                popWindowConversationId = "";
+            }
+        });
+        int x = view.getWidth() / 2;
+        int y = - view.getHeight() / 3;
+        int popHeight = ScreenUtil.dip2px(45) * 3;
+        if (y + popHeight + view.getY() + view.getHeight() > mFoldedLayout.getBottom()) {
+            y = y - popHeight;
+        }
+        mConversationPopWindow.showAsDropDown(view, x, y, Gravity.TOP | Gravity.START);
+    }
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/page/TUIForwardSelectActivity.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/page/TUIForwardSelectActivity.java
new file mode 100644
index 0000000..d4eb87e
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/page/TUIForwardSelectActivity.java
@@ -0,0 +1,42 @@
+package com.tencent.qcloud.tuikit.tuiconversation.classicui.page;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuikit.tuiconversation.commonutil.TUIConversationLog;
+
+public class TUIForwardSelectActivity extends BaseLightActivity {
+    private static final String TAG = TUIForwardSelectActivity.class.getSimpleName();
+
+    private TUIForwardSelectFragment mTUIForwardSelectFragment;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.forward_activity);
+
+        init();
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        TUIConversationLog.i(TAG, "onNewIntent");
+        super.onNewIntent(intent);;
+    }
+
+    @Override
+    protected void onResume() {
+        TUIConversationLog.i(TAG, "onResume");
+        super.onResume();
+    }
+
+    private void init() {
+        mTUIForwardSelectFragment = new TUIForwardSelectFragment();
+        getSupportFragmentManager().beginTransaction().replace(R.id.empty_view, mTUIForwardSelectFragment).commitAllowingStateLoss();
+
+    }
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/page/TUIForwardSelectFragment.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/page/TUIForwardSelectFragment.java
new file mode 100644
index 0000000..fc023ef
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/page/TUIForwardSelectFragment.java
@@ -0,0 +1,332 @@
+package com.tencent.qcloud.tuikit.tuiconversation.classicui.page;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.component.CustomLinearLayoutManager;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.fragments.BaseFragment;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+import com.tencent.qcloud.tuikit.tuiconversation.TUIConversationConstants;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+import com.tencent.qcloud.tuikit.tuiconversation.classicui.interfaces.OnConversationAdapterListener;
+import com.tencent.qcloud.tuikit.tuiconversation.classicui.widget.ConversationListLayout;
+import com.tencent.qcloud.tuikit.tuiconversation.classicui.widget.ForwardConversationSelectorAdapter;
+import com.tencent.qcloud.tuikit.tuiconversation.classicui.widget.ForwardSelectLayout;
+import com.tencent.qcloud.tuikit.tuiconversation.commonutil.TUIConversationLog;
+import com.tencent.qcloud.tuikit.tuiconversation.presenter.ConversationPresenter;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+public class TUIForwardSelectFragment extends BaseFragment {
+
+    private View mBaseView;
+    private TitleBarLayout mTitleBarLayout;
+    private ForwardSelectLayout mForwardLayout;
+
+    private RecyclerView mForwardSelectlistView;
+    private ForwardConversationSelectorAdapter mAdapter;
+    private List<ConversationInfo> mDataSource = new ArrayList<>();
+    private List<ConversationInfo> mContactDataSource = new ArrayList<>();
+    private List<ConversationInfo> mAllSelectedConversations = new ArrayList<>();
+    private RelativeLayout mForwardSelectlistViewLayout;
+    private TextView mSureView;
+
+    private ConversationPresenter presenter;
+
+    private static final String TAG = TUIForwardSelectFragment.class.getSimpleName();
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        mBaseView = inflater.inflate(R.layout.forward_fragment, container, false);
+        return mBaseView;
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        mForwardLayout = view.findViewById(R.id.forward_conversation_layout);
+
+        presenter = new ConversationPresenter();
+        mForwardLayout.setPresenter(presenter);
+
+        mForwardLayout.initDefault();
+
+        customizeConversation();
+        mForwardLayout.getConversationList().setOnConversationAdapterListener(new OnConversationAdapterListener() {
+            @Override
+            public void onItemClick(View view, int viewType, ConversationInfo conversationInfo) {
+                if (viewType == ConversationInfo.TYPE_RECENT_LABEL){
+                    return;
+                } else if (viewType == ConversationInfo.TYPE_FORWAR_SELECT){
+                    if(mTitleBarLayout.getLeftTitle().getText().equals(getString(R.string.titlebar_cancle))){
+                        Bundle param = new Bundle();
+                        param.putInt(TUIConversationConstants.GroupType.TYPE, TUIConversationConstants.GroupType.PUBLIC);
+                        param.putBoolean(TUIConversationConstants.FORWARD_CREATE_NEW_CHAT, false);
+                        TUICore.startActivity(TUIForwardSelectFragment.this, "ForwardSelectGroupActivity", param, TUIConversationConstants.FORWARD_SELECT_MEMBERS_CODE);
+                    }else if(mTitleBarLayout.getLeftTitle().getText().equals(getString(R.string.titlebar_close))){
+                        Bundle param = new Bundle();
+                        param.putInt(TUIConversationConstants.GroupType.TYPE, TUIConversationConstants.GroupType.PUBLIC);
+                        param.putBoolean(TUIConversationConstants.FORWARD_CREATE_NEW_CHAT, true);
+                        TUICore.startActivity(TUIForwardSelectFragment.this, "ForwardSelectGroupActivity", param, TUIConversationConstants.FORWARD_CREATE_GROUP_CODE);
+                    }else{
+                        TUIConversationLog.d(TAG,"Titlebar exception");
+                    }
+                } else {
+                    if(mTitleBarLayout.getLeftTitle().getText().equals(getString(R.string.titlebar_cancle))) {
+                        mDataSource = mForwardLayout.getConversationList().getAdapter().getSelectedItem();
+                        checkRepeat();
+                        refreshSelectConversations();
+                    } else if(mTitleBarLayout.getLeftTitle().getText().equals(getString(R.string.titlebar_close))){
+                        forwardMessages(conversationInfo);
+                    } else {
+                        forwardMessages(conversationInfo);
+                    }
+                }
+            }
+
+            @Override
+            public void OnItemLongClick(View view, ConversationInfo conversationInfo) {
+
+            }
+
+            @Override
+            public void onConversationChanged(List<ConversationInfo> dataSource) {
+
+            }
+        });
+
+        mForwardSelectlistViewLayout = view.findViewById(R.id.forward_select_list_layout);
+        mForwardSelectlistViewLayout.setVisibility(View.VISIBLE);
+        mForwardSelectlistView = view.findViewById(R.id.forward_select_list);
+        mForwardSelectlistView.setLayoutManager(new CustomLinearLayoutManager(getContext(), CustomLinearLayoutManager.HORIZONTAL, false));
+        mAdapter = new ForwardConversationSelectorAdapter(this.getContext());
+        mForwardSelectlistView.setAdapter(mAdapter);
+
+        mAdapter.setOnItemClickListener(new ForwardConversationSelectorAdapter.OnItemClickListener() {
+            @Override
+            public void onClick(View view, int position) {
+                boolean needFresh = false;
+                if (mDataSource != null && mDataSource.size() != 0){
+                    if(position < mDataSource.size()) {
+                        mDataSource.remove(position);
+                        mForwardLayout.getConversationList().getAdapter().setSelectConversations(mDataSource);
+                        needFresh = true;
+                    }
+                }
+
+                if(!needFresh) {
+                    if (mContactDataSource != null && mContactDataSource.size() != 0) {
+                        int dataSourcePosition = mDataSource == null ? 0 : mDataSource.size();
+                        if (position - dataSourcePosition < mContactDataSource.size()) {
+                            mContactDataSource.remove(position - dataSourcePosition);
+                            needFresh = true;
+                        }
+                    }
+                }
+
+                if (needFresh) {
+                    refreshSelectConversations();
+                }
+            }
+        });
+        mSureView = view.findViewById(R.id.btn_msg_ok);
+        mSureView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (getActivity() != null) {
+                    HashMap<String, Boolean> conversationMap = new HashMap<>();
+                    if (mDataSource != null && mDataSource.size() != 0){
+                        for (int i=0;i<mDataSource.size();i++){
+                            conversationMap.put(mDataSource.get(i).getId(), mDataSource.get(i).isGroup());
+                        }
+                    }
+
+                    if (mContactDataSource != null && mContactDataSource.size() != 0){
+                        for (int i=0;i<mContactDataSource.size();i++){
+                            conversationMap.put(mContactDataSource.get(i).getId(), mContactDataSource.get(i).isGroup());
+                        }
+                    }
+
+                    Intent intent = new Intent();
+                    intent.putExtra(TUIConversationConstants.FORWARD_SELECT_CONVERSATION_KEY, conversationMap);
+                    getActivity().setResult(TUIConversationConstants.FORWARD_SELECT_ACTIVTY_CODE, intent);
+
+                    getActivity().finish();
+                }
+            }
+        });
+
+        refreshSelectConversations();
+        initTitleAction();
+    }
+
+    private void refreshSelectConversations(){
+        mAllSelectedConversations.clear();
+
+        mDataSource = mForwardLayout.getConversationList().getAdapter().getSelectedItem();
+
+        if (mDataSource != null && mDataSource.size() != 0){
+            mAllSelectedConversations.addAll(mDataSource);
+        }
+        if (mContactDataSource != null && mContactDataSource.size() != 0){
+            mAllSelectedConversations.addAll(mContactDataSource);
+        }
+
+        mAdapter.setDataSource(mAllSelectedConversations);
+
+        if (mAllSelectedConversations == null || mAllSelectedConversations.size() == 0){
+            mSureView.setText(getString(com.tencent.qcloud.tuicore.R.string.sure));
+            mSureView.setVisibility(View.GONE);
+            mForwardSelectlistViewLayout.setVisibility(View.GONE);
+        } else {
+            mForwardSelectlistViewLayout.setVisibility(View.VISIBLE);
+            mSureView.setVisibility(View.VISIBLE);
+            mSureView.setText(getString(com.tencent.qcloud.tuicore.R.string.sure) + "(" + mAllSelectedConversations.size() + ")");
+        }
+    }
+
+    private void forwardMessages(final ConversationInfo conversationInfo){
+        AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+        builder.setTitle("");
+        builder.setMessage(getString(R.string.forward_alert_title));
+        builder.setCancelable(true);
+        builder.setPositiveButton(getString(com.tencent.qcloud.tuicore.R.string.sure), new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                if (getActivity() != null) {
+                    HashMap<String, Boolean> chatInfo = new HashMap<>();
+                    chatInfo.put(conversationInfo.getId(), conversationInfo.isGroup());
+
+                    Intent intent = new Intent();
+                    intent.putExtra(TUIConversationConstants.FORWARD_SELECT_CONVERSATION_KEY, chatInfo);
+                    getActivity().setResult(TUIConversationConstants.FORWARD_SELECT_ACTIVTY_CODE, intent);
+
+                    getActivity().finish();
+                }
+                dialog.dismiss();
+            }
+        });
+        builder.setNegativeButton(getString(com.tencent.qcloud.tuicore.R.string.cancel), new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                dialog.dismiss();
+            }
+        });
+        AlertDialog dialog = builder.create();
+        dialog.show();
+    }
+
+    private void customizeConversation(){
+        mTitleBarLayout = mForwardLayout.getTitleBar();
+        mTitleBarLayout.setTitle("", TitleBarLayout.Position.MIDDLE);
+        mTitleBarLayout.getLeftGroup().setVisibility(View.VISIBLE);
+        mTitleBarLayout.getRightGroup().setVisibility(View.VISIBLE);
+        mTitleBarLayout.setTitle(getString(R.string.titlebar_close), ITitleBarLayout.Position.LEFT);
+        mTitleBarLayout.setTitle(getString(R.string.titlebar_mutiselect), TitleBarLayout.Position.RIGHT);
+        mTitleBarLayout.getLeftIcon().setVisibility(View.GONE);
+        mTitleBarLayout.getRightIcon().setVisibility(View.GONE);
+
+    }
+
+    private void initTitleAction() {
+        mForwardLayout.getTitleBar().setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if(mTitleBarLayout.getLeftTitle().getText().equals(getString(R.string.titlebar_cancle))){
+                    mTitleBarLayout.getRightGroup().setVisibility(View.VISIBLE);
+                    mTitleBarLayout.setTitle(getString(R.string.titlebar_close), TitleBarLayout.Position.LEFT);
+                    mTitleBarLayout.setTitle(getString(R.string.titlebar_mutiselect), TitleBarLayout.Position.RIGHT);
+
+                    ConversationListLayout listLayout = mForwardLayout.getConversationList();
+                    listLayout.getAdapter().setShowMultiSelectCheckBox(false);
+                    listLayout.getAdapter().notifyDataSetChanged();
+
+                    mForwardSelectlistViewLayout.setVisibility(View.GONE);
+                    mAdapter.setDataSource(null);
+                    mAllSelectedConversations.clear();
+                }else if(mTitleBarLayout.getLeftTitle().getText().equals(getString(R.string.titlebar_close))){
+                    getActivity().finish();
+                }else{
+                    TUIConversationLog.d(TAG,"Titlebar exception");
+                }
+            }
+        });
+
+        mForwardLayout.getTitleBar().setOnRightClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mTitleBarLayout.getRightGroup().setVisibility(View.GONE);
+                mTitleBarLayout.setTitle(getString(R.string.titlebar_cancle), TitleBarLayout.Position.LEFT);
+
+                ConversationListLayout listLayout = mForwardLayout.getConversationList();
+                listLayout.getAdapter().setShowMultiSelectCheckBox(true);
+                listLayout.getAdapter().notifyDataSetChanged();
+            }
+        });
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == TUIConversationConstants.FORWARD_CREATE_GROUP_CODE && resultCode == TUIConversationConstants.FORWARD_CREATE_GROUP_CODE) {
+            if (getActivity() != null) {
+                getActivity().setResult(TUIConversationConstants.FORWARD_SELECT_ACTIVTY_CODE, data);
+                getActivity().finish();
+            }
+        } else if (requestCode == TUIConversationConstants.FORWARD_SELECT_MEMBERS_CODE && resultCode == TUIConversationConstants.FORWARD_SELECT_MEMBERS_CODE){
+            HashMap<String, String> conversationMap = (HashMap<String, String>) data.getSerializableExtra(TUIConversationConstants.FORWARD_SELECT_CONVERSATION_KEY);
+            if (conversationMap == null || conversationMap.isEmpty()){
+                mContactDataSource.clear();
+                refreshSelectConversations();
+                return;
+            }
+
+            mContactDataSource.clear();
+            for (Map.Entry<String, String> entry: conversationMap.entrySet()){
+                ConversationInfo conversationInfo = new ConversationInfo();
+                List<Object> iconList = new ArrayList<>();
+                iconList.add(entry.getValue());
+                conversationInfo.setIconUrlList(iconList);
+                conversationInfo.setId(entry.getKey());
+                conversationInfo.setGroup(false);
+                mContactDataSource.add(conversationInfo);
+            }
+            checkRepeat();
+
+            refreshSelectConversations();
+        }
+    }
+
+    private void checkRepeat() {
+        Iterator<ConversationInfo> iterator = mContactDataSource.iterator();
+        while (iterator.hasNext()) {
+            ConversationInfo conversationInfo = iterator.next();
+            if (mDataSource != null && mDataSource.size() != 0) {
+                for (int i = 0; i < mDataSource.size(); i++) {
+                    if (conversationInfo.getId().equals(mDataSource.get(i).getId())) {
+                        iterator.remove();
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/setting/ConversationLayoutSetting.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/setting/ConversationLayoutSetting.java
new file mode 100644
index 0000000..2185d91
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/setting/ConversationLayoutSetting.java
@@ -0,0 +1,42 @@
+package com.tencent.qcloud.tuikit.tuiconversation.classicui.setting;
+
+import com.tencent.qcloud.tuikit.tuiconversation.classicui.widget.ConversationLayout;
+import com.tencent.qcloud.tuikit.tuiconversation.classicui.widget.ConversationListLayout;
+
+public class ConversationLayoutSetting {
+
+    public static void customizeConversation(final ConversationLayout layout) {
+
+        ConversationListLayout listLayout = (ConversationListLayout) layout.getConversationList();
+
+        listLayout.setItemTopTextSize(16);
+        listLayout.setItemBottomTextSize(12);
+        listLayout.setItemDateTextSize(10);
+        listLayout.setItemAvatarRadius(5);
+        listLayout.disableItemUnreadDot(false);
+
+        // 动态插入，删除Item，包括自定义会话
+//        final ConversationInfo customInfo = new ConversationInfo();
+//        customInfo.setType(ConversationInfo.TYPE_CUSTOM);
+//        customInfo.setId("自定义会话");
+//        customInfo.setGroup(false);
+//        customInfo.setTitle("乔丹风行8代跑鞋 风随我动！");
+//        customInfo.setIconUrl("https://img1.gtimg.com/ninja/2/2019/03/ninja155375585738456.jpg");
+//
+//
+//        new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
+//            @Override
+//            public void run() {
+//                layout.addConversationInfo(0, customInfo);
+//            }
+//        }, 3000);
+
+//        new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
+//            @Override
+//            public void run() {
+//                layout.removeConversationInfo(0);
+//            }
+//        }, 5000);
+    }
+
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/util/TUIConversationUtils.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/util/TUIConversationUtils.java
new file mode 100644
index 0000000..466f062
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/util/TUIConversationUtils.java
@@ -0,0 +1,34 @@
+package com.tencent.qcloud.tuikit.tuiconversation.classicui.util;
+
+import android.os.Bundle;
+
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+
+import java.io.Serializable;
+
+public class TUIConversationUtils {
+    public static void startChatActivity(ConversationInfo conversationInfo) {
+        Bundle param = new Bundle();
+        param.putInt(TUIConstants.TUIChat.CHAT_TYPE, conversationInfo.isGroup() ? V2TIMConversation.V2TIM_GROUP : V2TIMConversation.V2TIM_C2C);
+        param.putString(TUIConstants.TUIChat.CHAT_ID, conversationInfo.getId());
+        param.putString(TUIConstants.TUIChat.CHAT_NAME, conversationInfo.getTitle());
+        if (conversationInfo.getDraft() != null) {
+            param.putString(TUIConstants.TUIChat.DRAFT_TEXT, conversationInfo.getDraft().getDraftText());
+            param.putLong(TUIConstants.TUIChat.DRAFT_TIME, conversationInfo.getDraft().getDraftTime());
+        }
+        param.putBoolean(TUIConstants.TUIChat.IS_TOP_CHAT, conversationInfo.isTop());
+        param.putString(TUIConstants.TUIChat.FACE_URL, conversationInfo.getIconPath());
+        if (conversationInfo.isGroup()) {
+            param.putString(TUIConstants.TUIChat.GROUP_TYPE, conversationInfo.getGroupType());
+            param.putSerializable(TUIConstants.TUIChat.AT_INFO_LIST, (Serializable) conversationInfo.getGroupAtInfoList());
+        }
+        if (conversationInfo.isGroup()) {
+            TUICore.startActivity(TUIConstants.TUIChat.GROUP_CHAT_ACTIVITY_NAME, param);
+        } else {
+            TUICore.startActivity(TUIConstants.TUIChat.C2C_CHAT_ACTIVITY_NAME, param);
+        }
+    }
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ConversationBaseHolder.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ConversationBaseHolder.java
new file mode 100644
index 0000000..f2044a9
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ConversationBaseHolder.java
@@ -0,0 +1,25 @@
+package com.tencent.qcloud.tuikit.tuiconversation.classicui.widget;
+
+import android.view.View;
+
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+public abstract class ConversationBaseHolder extends RecyclerView.ViewHolder {
+
+    protected View rootView;
+    protected ConversationListAdapter mAdapter;
+
+    public ConversationBaseHolder(View itemView) {
+        super(itemView);
+        rootView = itemView;
+    }
+
+    public void setAdapter(RecyclerView.Adapter adapter) {
+        mAdapter = (ConversationListAdapter) adapter;
+    }
+
+    public abstract void layoutViews(ConversationInfo conversationInfo, int position);
+
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ConversationCommonHolder.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ConversationCommonHolder.java
new file mode 100644
index 0000000..4ab12c0
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ConversationCommonHolder.java
@@ -0,0 +1,251 @@
+package com.tencent.qcloud.tuikit.tuiconversation.classicui.widget;
+
+import android.graphics.Color;
+import android.text.Html;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.imsdk.v2.V2TIMUserStatus;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuicore.component.UnreadCountTextView;
+import com.tencent.qcloud.tuicore.util.DateTimeUtil;
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.DraftInfo;
+import com.tencent.qcloud.tuikit.tuiconversation.config.TUIConversationConfig;
+import com.tencent.qcloud.tuikit.tuiconversation.commonutil.TUIConversationLog;
+
+import java.util.Date;
+import java.util.HashMap;
+
+public class ConversationCommonHolder extends ConversationBaseHolder {
+
+    public ConversationIconView conversationIconView;
+    protected LinearLayout leftItemLayout;
+    protected TextView titleText;
+    protected TextView messageText;
+    protected TextView timelineText;
+    protected UnreadCountTextView unreadText;
+    protected TextView atInfoText;
+    protected ImageView disturbView;
+    protected CheckBox multiSelectCheckBox;
+    protected RelativeLayout messageStatusLayout;
+    public ImageView messageSending;
+    public ImageView messageFailed;
+    private boolean isForwardMode = false;
+    protected View userStatusView;
+    private boolean showFoldedStyle = true;
+
+    public ConversationCommonHolder(View itemView) {
+        super(itemView);
+        leftItemLayout = rootView.findViewById(R.id.item_left);
+        conversationIconView = rootView.findViewById(R.id.conversation_icon);
+        titleText = rootView.findViewById(R.id.conversation_title);
+        messageText = rootView.findViewById(R.id.conversation_last_msg);
+        timelineText = rootView.findViewById(R.id.conversation_time);
+        unreadText = rootView.findViewById(R.id.conversation_unread);
+        atInfoText = rootView.findViewById(R.id.conversation_at_msg);
+        disturbView = rootView.findViewById(R.id.not_disturb);
+        multiSelectCheckBox = rootView.findViewById(R.id.select_checkbox);
+        messageStatusLayout = rootView.findViewById(R.id.message_status_layout);
+        messageFailed = itemView.findViewById(R.id.message_status_failed);
+        messageSending = itemView.findViewById(R.id.message_status_sending);
+        userStatusView = itemView.findViewById(R.id.user_status);
+    }
+
+    public void setForwardMode(boolean forwardMode) {
+        isForwardMode = forwardMode;
+    }
+
+    public void setShowFoldedStyle(boolean showFoldedStyle) {
+        this.showFoldedStyle = showFoldedStyle;
+    }
+
+    public void layoutViews(ConversationInfo conversation, int position) {
+        if (conversation.isTop() && !isForwardMode) {
+            leftItemLayout.setBackgroundColor(rootView.getResources().getColor(R.color.conversation_item_top_color));
+        } else {
+            leftItemLayout.setBackgroundColor(Color.WHITE);
+        }
+
+        if (showFoldedStyle && conversation.isMarkFold()) {
+            titleText.setText(R.string.folded_group_chat);
+            timelineText.setVisibility(View.GONE);
+        } else {
+            titleText.setText(conversation.getTitle());
+        }
+        messageText.setText("");
+        timelineText.setText("");
+        DraftInfo draftInfo = conversation.getDraft();
+        String draftText = "";
+        if (draftInfo != null) {
+            Gson gson = new Gson();
+            HashMap draftJsonMap;
+            draftText = draftInfo.getDraftText();
+            try {
+                draftJsonMap = gson.fromJson(draftInfo.getDraftText(), HashMap.class);
+                if (draftJsonMap != null) {
+                    draftText = (String) draftJsonMap.get("content");
+                }
+            } catch (JsonSyntaxException e) {
+                TUIConversationLog.e("ConversationCommonHolder", " getDraftJsonMap error ");
+            }
+        }
+        if (draftInfo != null) {
+            messageText.setText(draftText);
+            timelineText.setText(DateTimeUtil.getTimeFormatText(new Date(draftInfo.getDraftTime() * 1000)));
+        } else {
+            HashMap<String, Object> param = new HashMap<>();
+            param.put(TUIConstants.TUIChat.V2TIMMESSAGE, conversation.getLastMessage());
+            String lastMsgDisplayString = (String) TUICore.callService(TUIConstants.TUIChat.SERVICE_NAME, TUIConstants.TUIChat.METHOD_GET_DISPLAY_STRING, param);
+            // 获取要显示的字符
+            // Get the characters to display
+            if (lastMsgDisplayString != null) {
+                messageText.setText(Html.fromHtml(lastMsgDisplayString));
+                messageText.setTextColor(rootView.getResources().getColor(R.color.list_bottom_text_bg));
+            }
+            if (conversation.getLastMessage() != null) {
+                timelineText.setText(DateTimeUtil.getTimeFormatText(new Date(conversation.getLastMessageTime() * 1000)));
+            }
+        }
+
+        if (conversation.isShowDisturbIcon()) {
+            if ((showFoldedStyle && conversation.isMarkFold())) {
+                if (conversation.isMarkLocalUnread()) {
+                    unreadText.setVisibility(View.VISIBLE);
+                    unreadText.setText("");
+                } else {
+                    unreadText.setVisibility(View.GONE);
+                }
+            } else {
+                if (conversation.getUnRead() == 0) {
+                    if (conversation.isMarkUnread()) {
+                        unreadText.setVisibility(View.VISIBLE);
+                        unreadText.setText("");
+                    } else {
+                        unreadText.setVisibility(View.GONE);
+                    }
+                } else {
+                    unreadText.setVisibility(View.VISIBLE);
+                    unreadText.setText("");
+
+                    if (messageText.getText() != null) {
+                        String text = messageText.getText().toString();
+                        messageText.setText("[" + conversation.getUnRead() + rootView.getContext().getString(R.string.message_num) + "] " + text);
+                    }
+                }
+            }
+        } else if (conversation.getUnRead() > 0) {
+            unreadText.setVisibility(View.VISIBLE);
+            if (conversation.getUnRead() > 99) {
+                unreadText.setText("99+");
+            } else {
+                unreadText.setText("" + conversation.getUnRead());
+            }
+        } else {
+            if (conversation.isMarkUnread()) {
+                unreadText.setVisibility(View.VISIBLE);
+                unreadText.setText("1");
+            } else {
+                unreadText.setVisibility(View.GONE);
+            }
+        }
+
+        if (draftInfo != null) {
+            atInfoText.setVisibility(View.VISIBLE);
+            atInfoText.setText(R.string.drafts);
+            atInfoText.setTextColor(Color.RED);
+
+            messageStatusLayout.setVisibility(View.GONE);
+            messageFailed.setVisibility(View.GONE);
+            messageSending.setVisibility(View.GONE);
+        } else {
+            if (conversation.getAtInfoText().isEmpty()) {
+                atInfoText.setVisibility(View.GONE);
+            } else {
+                atInfoText.setVisibility(View.VISIBLE);
+                atInfoText.setText(conversation.getAtInfoText());
+                atInfoText.setTextColor(Color.RED);
+            }
+
+            V2TIMMessage lastMessage = conversation.getLastMessage();
+            if (lastMessage != null) {
+                int status = lastMessage.getStatus();
+                if (status == V2TIMMessage.V2TIM_MSG_STATUS_SEND_FAIL) {
+                    messageStatusLayout.setVisibility(View.VISIBLE);
+                    messageFailed.setVisibility(View.VISIBLE);
+                    messageSending.setVisibility(View.GONE);
+                } else if (status == V2TIMMessage.V2TIM_MSG_STATUS_SENDING) {
+                    messageStatusLayout.setVisibility(View.VISIBLE);
+                    messageFailed.setVisibility(View.GONE);
+                    messageSending.setVisibility(View.VISIBLE);
+                } else {
+                    messageStatusLayout.setVisibility(View.GONE);
+                    messageFailed.setVisibility(View.GONE);
+                    messageSending.setVisibility(View.GONE);
+                }
+            } else {
+                messageStatusLayout.setVisibility(View.GONE);
+                messageFailed.setVisibility(View.GONE);
+                messageSending.setVisibility(View.GONE);
+            }
+        }
+
+        conversationIconView.setRadius(mAdapter.getItemAvatarRadius());
+        if (mAdapter.getItemDateTextSize() != 0) {
+            timelineText.setTextSize(mAdapter.getItemDateTextSize());
+        }
+        if (mAdapter.getItemBottomTextSize() != 0) {
+            messageText.setTextSize(mAdapter.getItemBottomTextSize());
+        }
+        if (mAdapter.getItemTopTextSize() != 0) {
+            titleText.setTextSize(mAdapter.getItemTopTextSize());
+        }
+        if (!mAdapter.hasItemUnreadDot()) {
+            unreadText.setVisibility(View.GONE);
+        }
+
+        conversationIconView.setShowFoldedStyle(showFoldedStyle);
+        conversationIconView.setConversation(conversation);
+
+        if (conversation.isShowDisturbIcon() && !isForwardMode) {
+            if (showFoldedStyle && conversation.isMarkFold()) {
+                disturbView.setVisibility(View.GONE);
+            } else {
+                disturbView.setVisibility(View.VISIBLE);
+            }
+        } else {
+            disturbView.setVisibility(View.GONE);
+        }
+
+        if (isForwardMode) {
+            messageText.setVisibility(View.GONE);
+            timelineText.setVisibility(View.GONE);
+            unreadText.setVisibility(View.GONE);
+            atInfoText.setVisibility(View.GONE);
+            messageStatusLayout.setVisibility(View.GONE);
+            messageFailed.setVisibility(View.GONE);
+            messageSending.setVisibility(View.GONE);
+        }
+
+        if (!conversation.isGroup() && TUIConversationConfig.getInstance().isShowUserStatus()) {
+            userStatusView.setVisibility(View.VISIBLE);
+            if (conversation.getStatusType() == V2TIMUserStatus.V2TIM_USER_STATUS_ONLINE) {
+                userStatusView.setBackgroundResource(TUIThemeManager.getAttrResId(rootView.getContext(), com.tencent.qcloud.tuicore.R.attr.user_status_online));
+            } else {
+                userStatusView.setBackgroundResource(TUIThemeManager.getAttrResId(rootView.getContext(), com.tencent.qcloud.tuicore.R.attr.user_status_offline));
+            }
+        } else {
+            userStatusView.setVisibility(View.GONE);
+        }
+    }
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ConversationCustomHolder.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ConversationCustomHolder.java
new file mode 100644
index 0000000..b8d64c3
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ConversationCustomHolder.java
@@ -0,0 +1,68 @@
+package com.tencent.qcloud.tuikit.tuiconversation.classicui.widget;
+
+import android.graphics.Color;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+
+
+public class ConversationCustomHolder extends ConversationBaseHolder {
+
+    protected LinearLayout leftItemLayout;
+    protected TextView titleText;
+    protected TextView messageText;
+    protected TextView timelineText;
+    protected TextView unreadText;
+    protected ConversationIconView conversationIconView;
+
+
+    public ConversationCustomHolder(View itemView) {
+        super(itemView);
+        leftItemLayout = rootView.findViewById(R.id.item_left);
+        conversationIconView = rootView.findViewById(R.id.conversation_icon);
+        titleText = rootView.findViewById(R.id.conversation_title);
+        messageText = rootView.findViewById(R.id.conversation_last_msg);
+        timelineText = rootView.findViewById(R.id.conversation_time);
+        unreadText = rootView.findViewById(R.id.conversation_unread);
+    }
+
+    @Override
+    public void layoutViews(ConversationInfo conversation, int position) {
+        if (conversation.isTop()) {
+            leftItemLayout.setBackgroundColor(rootView.getResources().getColor(R.color.conversation_item_top_color));
+        } else {
+            leftItemLayout.setBackgroundColor(Color.WHITE);
+        }
+        conversationIconView.setConversation(conversation);
+
+        titleText.setText(conversation.getTitle());
+        messageText.setText("");
+        timelineText.setText("");
+
+        if (conversation.getUnRead() > 0) {
+            unreadText.setVisibility(View.VISIBLE);
+            if (conversation.getUnRead() > 99) {
+                unreadText.setText("99+");
+            } else {
+                unreadText.setText("" + conversation.getUnRead());
+            }
+        } else {
+            unreadText.setVisibility(View.GONE);
+        }
+
+        if (mAdapter.getItemDateTextSize() != 0) {
+            timelineText.setTextSize(mAdapter.getItemDateTextSize());
+        }
+        if (mAdapter.getItemBottomTextSize() != 0) {
+            messageText.setTextSize(mAdapter.getItemBottomTextSize());
+        }
+        if (mAdapter.getItemTopTextSize() != 0) {
+            titleText.setTextSize(mAdapter.getItemTopTextSize());
+        }
+
+    }
+
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ConversationIconView.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ConversationIconView.java
new file mode 100644
index 0000000..48f1f52
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ConversationIconView.java
@@ -0,0 +1,171 @@
+package com.tencent.qcloud.tuikit.tuiconversation.classicui.widget;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.component.gatherimage.SynthesizedImageView;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.BackgroundTasks;
+import com.tencent.qcloud.tuicore.util.ImageUtil;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuicore.util.ThreadHelper;
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+import com.tencent.qcloud.tuikit.tuiconversation.presenter.ConversationIconPresenter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 会话列表头像View
+ */
+public class ConversationIconView extends RelativeLayout {
+
+    private static final int icon_size = ScreenUtil.getPxByDp(50);
+    private ImageView mIconView;
+    private boolean showFoldedStyle = false;
+
+    private ConversationIconPresenter presenter;
+
+    public ConversationIconView(Context context) {
+        super(context);
+        init();
+    }
+
+    public ConversationIconView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public ConversationIconView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private void init() {
+        inflate(getContext(), com.tencent.qcloud.tuicore.R.layout.profile_icon_view, this);
+        mIconView = findViewById(com.tencent.qcloud.tuicore.R.id.profile_icon);
+        ((SynthesizedImageView) mIconView).defaultImage(TUIConfig.getDefaultAvatarImage());
+        presenter = new ConversationIconPresenter();
+    }
+
+    public void setShowFoldedStyle(boolean showFoldedStyle) {
+        this.showFoldedStyle = showFoldedStyle;
+    }
+
+    /**
+     * 设置会话头像的url
+     *
+     * @param iconUrls 头像url,最多只取前9个
+     */
+    public void setIconUrls(final List<Object> iconUrls, final String conversationId) {
+        // 需要在主线程中执行，以免写缓存出现问题
+        BackgroundTasks.getInstance().runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                if (mIconView instanceof SynthesizedImageView) {
+                    ((SynthesizedImageView) (mIconView)).displayImage(iconUrls).load(conversationId);
+                }
+            }
+        });
+    }
+
+    public void setConversation(ConversationInfo conversationInfo) {
+        if (showFoldedStyle && conversationInfo.isMarkFold()) {
+            mIconView.setImageResource(R.drawable.ic_fold);
+        } else if (mIconView instanceof SynthesizedImageView) {
+            ((SynthesizedImageView) (mIconView)).setImageId(conversationInfo.getConversationId());
+            if (conversationInfo.isGroup()) {
+                fillConversationUrlForGroup(conversationInfo);
+            } else {
+                setIconUrls(conversationInfo.getIconUrlList(), conversationInfo.getConversationId());
+            }
+        }
+    }
+
+    private void fillConversationUrlForGroup(final ConversationInfo info) {
+        List<Object> iconUrlList = info.getIconUrlList();
+        if (iconUrlList == null || iconUrlList.size() == 0) {
+            if (!TUIConfig.isEnableGroupGridAvatar()) {
+                List<Object> faceList = new ArrayList<>();
+                faceList.add(TUIConfig.getDefaultGroupAvatarImage());
+                setIconUrls(faceList, info.getConversationId());
+                return;
+            }
+            // 读取文件，在线程池中进行，避免主线程卡顿
+            ThreadHelper.INST.execute(new Runnable() {
+                @Override
+                public void run() {
+                    final String savedIcon = ImageUtil.getGroupConversationAvatar(info.getConversationId());
+                    if (TextUtils.isEmpty(savedIcon)) {
+                        fillFaceUrlList(info.getId(), info);
+                    } else {
+                        List<Object> list = new ArrayList<>();
+                        list.add(savedIcon);
+                        info.setIconUrlList(list);
+                        setIconUrls(list, info.getConversationId());
+                    }
+                }
+            });
+        } else {
+            if (!TUIConfig.isEnableGroupGridAvatar() && iconUrlList.size() > 1) {
+                List<Object> faceList = new ArrayList<>();
+                faceList.add(TUIConfig.getDefaultGroupAvatarImage());
+                setIconUrls(faceList, info.getConversationId());
+            } else {
+                setIconUrls(iconUrlList, info.getConversationId());
+            }
+        }
+    }
+
+    private void fillFaceUrlList(final String groupID, final ConversationInfo info) {
+        BackgroundTasks.getInstance().runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                clearImage();
+                presenter.getGroupMemberIconList(groupID, new IUIKitCallback<List<Object>>() {
+                    @Override
+                    public void onSuccess(List<Object> data) {
+                        info.setIconUrlList(data);
+                        setIconUrls(data, info.getConversationId());
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+
+                    }
+                });
+            }
+        });
+    }
+
+    public void setRadius(int radius) {
+        if (mIconView instanceof SynthesizedImageView) {
+            ((SynthesizedImageView) (mIconView)).setRadius(radius);
+        }
+    }
+
+    public void setDefaultImageResId(int resId) {
+        BitmapDrawable bd = (BitmapDrawable) getContext().getResources().getDrawable(resId);
+        mIconView.setImageBitmap(bd.getBitmap());
+    }
+
+    public void setBitmapResId(int resId) {
+        BitmapDrawable bd = (BitmapDrawable) getContext().getResources().getDrawable(resId);
+        Bitmap bitmap = ImageUtil.toRoundBitmap(bd.getBitmap());
+        mIconView.setImageBitmap(bitmap);
+    }
+
+    public void clearImage() {
+        if (mIconView instanceof SynthesizedImageView) {
+            ((SynthesizedImageView) mIconView).clear();
+        }
+    }
+}
+
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ConversationLayout.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ConversationLayout.java
new file mode 100644
index 0000000..2daccfd
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ConversationLayout.java
@@ -0,0 +1,143 @@
+package com.tencent.qcloud.tuikit.tuiconversation.classicui.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.RelativeLayout;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+import com.tencent.qcloud.tuikit.tuiconversation.classicui.interfaces.IConversationLayout;
+import com.tencent.qcloud.tuikit.tuiconversation.interfaces.IConversationListAdapter;
+import com.tencent.qcloud.tuikit.tuiconversation.presenter.ConversationPresenter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ConversationLayout extends RelativeLayout implements IConversationLayout {
+
+    private ConversationListLayout mConversationList;
+    private ConversationPresenter presenter;
+    public ConversationLayout(Context context) {
+        super(context);
+        init();
+    }
+
+    public ConversationLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public ConversationLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    public void setPresenter(ConversationPresenter presenter) {
+        this.presenter = presenter;
+        if (mConversationList != null) {
+            mConversationList.setPresenter(presenter);
+        }
+    }
+
+    /**
+     * 初始化相关UI元素
+     */
+    private void init() {
+        inflate(getContext(), R.layout.conversation_layout, this);
+        mConversationList = findViewById(R.id.conversation_list);
+    }
+
+    public void initDefault() {
+        final ConversationListAdapter adapter = new ConversationListAdapter();
+        if (presenter != null) {
+            initSearchView(adapter);
+            adapter.setShowFoldedStyle(true);
+        }
+        mConversationList.setAdapter((IConversationListAdapter) adapter);
+        if (presenter != null) {
+            presenter.setAdapter(adapter);
+        }
+        mConversationList.loadConversation(0);
+    }
+
+    public void initSearchView(ConversationListAdapter adapter) {
+        Map<String, Object> param = new HashMap<>();
+        param.put(TUIConstants.TUIConversation.CONTEXT, getContext());
+        Map<String, Object> searchExtension = TUICore.getExtensionInfo(TUIConstants.TUIConversation.EXTENSION_CLASSIC_SEARCH, param);
+        if (searchExtension != null) {
+            View searchView = (View) searchExtension.get(TUIConstants.TUIConversation.SEARCH_VIEW);
+            if (searchView != null) {
+                adapter.setSearchView(searchView);
+            }
+        }
+    }
+
+    @Override
+    public void setParentLayout(Object parent) {
+
+    }
+
+    @Override
+    public ConversationListLayout getConversationList() {
+        return mConversationList;
+    }
+
+    @Override
+    public void setConversationTop(ConversationInfo conversation, IUIKitCallback callBack) {
+        if (presenter != null) {
+            presenter.setConversationTop(conversation, callBack);
+        }
+    }
+
+    @Override
+    public void deleteConversation(ConversationInfo conversation) {
+        if (presenter != null) {
+            presenter.deleteConversation(conversation);
+        }
+    }
+
+    @Override
+    public void clearConversationMessage(ConversationInfo conversation) {
+        if (presenter != null) {
+            presenter.clearConversationMessage(conversation);
+        }
+    }
+
+    @Override
+    public void markConversationHidden(ConversationInfo conversation) {
+        if (presenter != null) {
+            presenter.markConversationHidden(conversation, true);
+        }
+    }
+
+    @Override
+    public void markConversationUnread(ConversationInfo conversationInfo, boolean markUnread) {
+        if (presenter != null) {
+            presenter.markConversationUnread(conversationInfo, markUnread);
+        }
+    }
+
+    @Override
+    public void hideFoldedItem(boolean needHide) {
+        if (presenter != null) {
+            presenter.hideFoldItem(needHide);
+        }
+    }
+
+    @Override
+    public void clearUnreadStatusOfFoldItem() {
+        if (presenter != null) {
+            presenter.setUnreadStatusOfFoldItem(false);
+        }
+    }
+
+    @Override
+    public TitleBarLayout getTitleBar() {
+        return null;
+    }
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ConversationListAdapter.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ConversationListAdapter.java
new file mode 100644
index 0000000..f7f00e1
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ConversationListAdapter.java
@@ -0,0 +1,540 @@
+package com.tencent.qcloud.tuikit.tuiconversation.classicui.widget;
+
+import android.graphics.Color;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+import com.tencent.qcloud.tuikit.tuiconversation.TUIConversationService;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+import com.tencent.qcloud.tuikit.tuiconversation.classicui.interfaces.OnConversationAdapterListener;
+import com.tencent.qcloud.tuikit.tuiconversation.interfaces.IConversationListAdapter;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+public class ConversationListAdapter extends RecyclerView.Adapter implements IConversationListAdapter {
+
+    public static final int ITEM_TYPE_HEADER_SEARCH = 101;
+    public static final int ITEM_TYPE_FOOTER_LOADING = -99;
+    public static final int HEADER_COUNT = 1;
+    public static final int FOOTER_COUNT = 1;
+    public static final int SELECT_COUNT = 1;
+    public static final int SELECT_LABEL_COUNT = 1;
+
+    private boolean mHasShowUnreadDot = true;
+    private int mItemAvatarRadius = ScreenUtil.getPxByDp(5);
+    private int mTopTextSize;
+    private int mBottomTextSize;
+    private int mDateTextSize;
+    protected List<ConversationInfo> mDataSource = new ArrayList<>();
+    private OnConversationAdapterListener mOnConversationAdapterListener;
+
+    //消息转发
+    private final HashMap<String, Boolean> mSelectedPositions = new HashMap<>();
+    private boolean isShowMultiSelectCheckBox = false;
+    private boolean isForwardFragment = false;
+
+    private boolean mIsLoading = false;
+
+    // 长按高亮显示
+    private boolean isClick = false;
+    private int currentPosition = -1;
+
+    private View searchView;
+    // 展示折叠样式
+    private boolean showFoldedStyle = true;
+    public ConversationListAdapter() {
+
+    }
+
+    public int getCurrentPosition() {
+        return currentPosition;
+    }
+
+    public boolean isClick() {
+        return isClick;
+    }
+
+    public void setClick(boolean click) {
+        isClick = click;
+    }
+
+    public void setCurrentPosition(int currentPosition , boolean isClick) {
+        this.currentPosition = currentPosition;
+        this.isClick = isClick;
+    }
+
+    public void setShowMultiSelectCheckBox(boolean show) {
+        isShowMultiSelectCheckBox = show;
+
+        if (!isShowMultiSelectCheckBox) {
+            mSelectedPositions.clear();
+        }
+    }
+
+    public void setForwardFragment(boolean forwardFragment) {
+        isForwardFragment = forwardFragment;
+    }
+
+    public void setSearchView(View searchView) {
+        this.searchView = searchView;
+    }
+
+    public void setShowFoldedStyle(boolean showFoldedStyle) {
+        this.showFoldedStyle = showFoldedStyle;
+    }
+
+    //设置给定位置条目的选择状态
+    public void setItemChecked(String conversationId, boolean isChecked) {
+        mSelectedPositions.put(conversationId, isChecked);
+    }
+
+    //根据位置判断条目是否选中
+    private boolean isItemChecked(String id) {
+        if (mSelectedPositions.size() <= 0) {
+            return false;
+        }
+
+        if (mSelectedPositions.containsKey(id)) {
+            return mSelectedPositions.get(id);
+        } else {
+            return false;
+        }
+    }
+
+    // 获得选中条目的结果
+    public List<ConversationInfo> getSelectedItem() {
+        if (mSelectedPositions.size() == 0) {
+            return null;
+        }
+        List<ConversationInfo> selectList = new ArrayList<>();
+        for (int i = 0; i < getItemCount() - 1; i++) {
+            ConversationInfo conversationInfo = getItem(i);
+            if (conversationInfo == null) {
+                continue;
+            }
+            if (isItemChecked(conversationInfo.getConversationId())) {
+                selectList.add(conversationInfo);
+            }
+        }
+        return selectList;
+    }
+
+    public void setSelectConversations(List<ConversationInfo> dataSource){
+        if(dataSource == null || dataSource.size() == 0){
+            mSelectedPositions.clear();
+            notifyDataSetChanged();
+            return;
+        }
+
+        mSelectedPositions.clear();
+        for (int i = 0; i < dataSource.size(); i++) {
+            for (int j =0; j<mDataSource.size(); j++){
+                if (TextUtils.equals(dataSource.get(i).getConversationId(), mDataSource.get(j).getConversationId())){
+                    setItemChecked(mDataSource.get(j).getConversationId(), true);
+                    notifyDataSetChanged();
+                    break;
+                }
+            }
+        }
+    }
+
+    public void setOnConversationAdapterListener(OnConversationAdapterListener listener) {
+        this.mOnConversationAdapterListener = listener;
+    }
+
+    @Override
+    public void onDataSourceChanged(List<ConversationInfo> dataSource) {
+        this.mDataSource = dataSource;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        LayoutInflater inflater = LayoutInflater.from(parent.getContext());
+        ConversationBaseHolder holder = null;
+        // 创建不同的 ViewHolder
+        View view;
+        // 根据ViewType来创建条目
+        if (viewType == ITEM_TYPE_HEADER_SEARCH) {
+            // 如果 searchView 不显示，添加一个隐藏的 view，防止 recyclerview 自动滑到最底部
+            if (searchView == null) {
+                searchView = new View(parent.getContext());
+            }
+            return new HeaderViewHolder(searchView);
+        } else if (viewType == ConversationInfo.TYPE_CUSTOM) {
+            view = inflater.inflate(R.layout.conversation_custom_adapter, parent, false);
+            holder = new ConversationCustomHolder(view);
+        } else if (viewType == ITEM_TYPE_FOOTER_LOADING) {
+            view = inflater.inflate(R.layout.loading_progress_bar, parent, false);
+            return new FooterViewHolder(view);
+        } else if (viewType == ConversationInfo.TYPE_FORWAR_SELECT) {
+            view = inflater.inflate(R.layout.conversation_forward_select_adapter, parent, false);
+            return new ForwardSelectHolder(view);
+        }  else if (viewType == ConversationInfo.TYPE_RECENT_LABEL) {
+            view = inflater.inflate(R.layout.conversation_forward_label_adapter, parent, false);
+            return new ForwardLabelHolder(view);
+        } else {
+            view = inflater.inflate(R.layout.conversation_list_item_layout, parent, false);
+            holder = new ConversationCommonHolder(view);
+            ((ConversationCommonHolder) holder).setForwardMode(isForwardFragment);
+            ((ConversationCommonHolder) holder).setShowFoldedStyle(showFoldedStyle);
+        }
+        holder.setAdapter(this);
+        return holder;
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, final int position) {
+        final ConversationInfo conversationInfo = getItem(position);
+        ConversationBaseHolder baseHolder = null;
+        if (conversationInfo != null) {
+            baseHolder = (ConversationBaseHolder) holder;
+        }
+
+        switch (getItemViewType(position)) {
+            case ConversationInfo.TYPE_CUSTOM:
+            case ConversationInfo.TYPE_RECENT_LABEL:
+                break;
+            case ITEM_TYPE_FOOTER_LOADING: {
+                if (holder instanceof FooterViewHolder) {
+                    ((ConversationBaseHolder) holder).layoutViews(null, position);
+                }
+                break;
+            }
+            case ConversationInfo.TYPE_FORWAR_SELECT : {
+                ForwardSelectHolder selectHolder = (ForwardSelectHolder) holder;
+                selectHolder.refreshTitle(!isShowMultiSelectCheckBox);
+                setOnClickListener(holder, getItemViewType(position), conversationInfo);
+                break;
+            }
+            default:
+                setOnClickListener(holder, getItemViewType(position), conversationInfo);
+        }
+        if (baseHolder != null) {
+            baseHolder.layoutViews(conversationInfo, position);
+            setCheckBoxStatus(conversationInfo, position, baseHolder);
+        }
+
+        if (getCurrentPosition() == position && isClick()){
+            baseHolder.itemView.setBackgroundResource(R.color.conversation_item_clicked_color);
+        } else {
+            if (conversationInfo == null) {
+                return;
+            }
+            if (conversationInfo.isTop() && !isForwardFragment) {
+                baseHolder.itemView.setBackgroundColor(baseHolder.rootView.getResources().getColor(R.color.conversation_item_top_color));
+            } else {
+                baseHolder.itemView.setBackgroundColor(Color.WHITE);
+            }
+        }
+
+    }
+
+    private void setOnClickListener(RecyclerView.ViewHolder holder, int viewType, ConversationInfo conversationInfo) {
+        if (holder instanceof HeaderViewHolder) {
+            return;
+        }
+        //设置点击和长按事件
+        if (mOnConversationAdapterListener != null) {
+            holder.itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    mOnConversationAdapterListener.onItemClick(view, viewType, conversationInfo);
+                }
+            });
+
+            holder.itemView.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View view) {
+                    mOnConversationAdapterListener.OnItemLongClick(view, conversationInfo);
+                    int position = getIndexInAdapter(conversationInfo);
+                    if (position != -1) {
+                        setCurrentPosition(position, true);
+                        notifyItemChanged(position);
+                    }
+                    return true;
+                }
+            });
+        }
+    }
+
+    // 设置多选框的选中状态和点击事件
+    private void setCheckBoxStatus(final ConversationInfo conversationInfo, int position, ConversationBaseHolder baseHolder) {
+        if (!(baseHolder instanceof ConversationCommonHolder) || ((ConversationCommonHolder) baseHolder).multiSelectCheckBox == null) {
+            return;
+        }
+        int viewType = getItemViewType(position);
+        String conversationId = conversationInfo.getConversationId();
+        ConversationCommonHolder commonHolder = (ConversationCommonHolder) baseHolder;
+        if (!isShowMultiSelectCheckBox) {
+            commonHolder.multiSelectCheckBox.setVisibility(View.GONE);
+        } else {
+            commonHolder.multiSelectCheckBox.setVisibility(View.VISIBLE);
+
+            //设置条目状态
+            commonHolder.multiSelectCheckBox.setChecked(isItemChecked(conversationId));
+            //checkBox的监听
+            commonHolder.multiSelectCheckBox.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    setItemChecked(conversationId, !isItemChecked(conversationId));
+                    if (mOnConversationAdapterListener != null) {
+                        mOnConversationAdapterListener.onItemClick(v, viewType, conversationInfo);
+                    }
+                }
+            });
+
+            //条目view的监听
+            baseHolder.itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    setItemChecked(conversationId, !isItemChecked(conversationId));
+                    int currentPosition = getIndexInAdapter(conversationInfo);
+                    if (currentPosition != -1) {
+                        notifyItemChanged(currentPosition);
+                    }
+                    if (mOnConversationAdapterListener != null) {
+                        mOnConversationAdapterListener.onItemClick(v, viewType, conversationInfo);
+                    }
+                }
+            });
+        }
+    }
+
+    public int getIndexInAdapter(ConversationInfo conversationInfo) {
+        int position = -1;
+        if (mDataSource != null) {
+            int indexInData = mDataSource.indexOf(conversationInfo);
+            if (indexInData != -1) {
+                position = getItemIndexInAdapter(indexInData);
+            }
+        }
+        return position;
+    }
+
+    @Override
+    public void onViewRecycled(@NonNull RecyclerView.ViewHolder holder) {
+        // ViewHolder 被回收时要清空头像 view 并且停止异步加载头像
+        if (holder instanceof ConversationCommonHolder) {
+            ((ConversationCommonHolder) holder).conversationIconView.clearImage();
+        }
+    }
+
+    public ConversationInfo getItem(int position) {
+        if (mDataSource.isEmpty() || position == getItemCount() - 1) {
+            return null;
+        }
+
+        int dataPosition;
+        if (isForwardFragment) {
+            dataPosition = position - SELECT_COUNT - SELECT_LABEL_COUNT;
+        } else {
+            dataPosition = position - HEADER_COUNT;
+        }
+        if (dataPosition < mDataSource.size() && dataPosition >= 0) {
+            return mDataSource.get(dataPosition);
+        }
+
+        return null;
+    }
+
+    @Override
+    public int getItemCount() {
+        int listSize = mDataSource.size();
+        if (isForwardFragment) {
+            return listSize + SELECT_COUNT + SELECT_LABEL_COUNT + FOOTER_COUNT;
+        }
+        return listSize + HEADER_COUNT + FOOTER_COUNT;
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        if (isForwardFragment) {
+            if (position == 0) {
+                return ConversationInfo.TYPE_FORWAR_SELECT;
+            } else if (position == 1) {
+                return ConversationInfo.TYPE_RECENT_LABEL;
+            }
+        } else {
+            if (position == 0) {
+                return ITEM_TYPE_HEADER_SEARCH;
+            }
+        }
+        if (position == getItemCount() - 1) {
+            return ITEM_TYPE_FOOTER_LOADING;
+        } else if (mDataSource != null) {
+            ConversationInfo conversationInfo = getItem(position);
+            if (conversationInfo != null) {
+                return conversationInfo.getType();
+            }
+        }
+        return ConversationInfo.TYPE_COMMON;
+    }
+
+    private int getItemIndexInAdapter(int index) {
+        int itemIndex;
+        if (isForwardFragment) {
+            itemIndex = index + SELECT_LABEL_COUNT + SELECT_COUNT;
+        } else {
+            itemIndex = index + HEADER_COUNT;
+        }
+        return itemIndex;
+    }
+
+    @Override
+    public void onItemRemoved(int position) {
+        int itemIndex = getItemIndexInAdapter(position);
+        notifyItemRemoved(itemIndex);
+    }
+
+    @Override
+    public void onItemInserted(int position) {
+        int itemIndex = getItemIndexInAdapter(position);
+        notifyItemInserted(itemIndex);
+    }
+
+    @Override
+    public void onItemChanged(int position) {
+        int itemIndex = getItemIndexInAdapter(position);
+        notifyItemChanged(itemIndex);
+    }
+
+    @Override
+    public void onItemRangeChanged(int startPosition, int count) {
+        int itemStartIndex = getItemIndexInAdapter(startPosition);
+        notifyItemRangeChanged(itemStartIndex, count);
+    }
+
+    @Override
+    public void onConversationChanged(List<ConversationInfo> conversationInfoList) {
+        if (mOnConversationAdapterListener != null) {
+            mOnConversationAdapterListener.onConversationChanged(conversationInfoList);
+        }
+    }
+
+    public void setItemTopTextSize(int size) {
+        mTopTextSize = size;
+    }
+
+    public int getItemTopTextSize() {
+        return mTopTextSize;
+    }
+
+    public void setItemBottomTextSize(int size) {
+        mBottomTextSize = size;
+    }
+
+    public int getItemBottomTextSize() {
+        return mBottomTextSize;
+    }
+
+    public void setItemDateTextSize(int size) {
+        mDateTextSize = size;
+    }
+
+    public int getItemDateTextSize() {
+        return mDateTextSize;
+    }
+
+    public void setItemAvatarRadius(int radius) {
+        mItemAvatarRadius = radius;
+    }
+
+    public int getItemAvatarRadius() {
+        return mItemAvatarRadius;
+    }
+
+    public void disableItemUnreadDot(boolean flag) {
+        mHasShowUnreadDot = !flag;
+    }
+
+    public boolean hasItemUnreadDot() {
+        return mHasShowUnreadDot;
+    }
+
+    @Override
+    public void onLoadingStateChanged(boolean isLoading) {
+        this.mIsLoading = isLoading;
+        notifyItemChanged(getItemCount() - 1);
+    }
+
+    @Override
+    public void onViewNeedRefresh() {
+        notifyDataSetChanged();
+    }
+
+    //header
+    static class HeaderViewHolder extends RecyclerView.ViewHolder {
+        public HeaderViewHolder(@NonNull View itemView) {
+            super(itemView);
+        }
+    }
+
+    //footer
+    class FooterViewHolder extends ConversationBaseHolder {
+        public FooterViewHolder(@NonNull View itemView) {
+            super(itemView);
+        }
+
+        @Override
+        public void layoutViews(ConversationInfo conversationInfo, int position) {
+            RecyclerView.LayoutParams param = (RecyclerView.LayoutParams) rootView.getLayoutParams();
+            if (mIsLoading) {
+                param.height = LinearLayout.LayoutParams.WRAP_CONTENT;
+                param.width = LinearLayout.LayoutParams.MATCH_PARENT;
+                rootView.setVisibility(View.VISIBLE);
+            } else {
+                param.height = 0;
+                param.width = 0;
+                rootView.setVisibility(View.GONE);
+            }
+            rootView.setLayoutParams(param);
+        }
+    }
+
+    static class ForwardLabelHolder extends ConversationBaseHolder {
+        public ForwardLabelHolder(View itemView) {
+            super(itemView);
+        }
+
+        @Override
+        public void layoutViews(ConversationInfo conversationInfo, int position) {
+
+        }
+    }
+
+    static class ForwardSelectHolder extends ConversationBaseHolder {
+        private final TextView titleView;
+        public ForwardSelectHolder(View itemView) {
+            super(itemView);
+            titleView = itemView.findViewById(R.id.forward_title);
+        }
+
+        @Override
+        public void layoutViews(ConversationInfo conversationInfo, int position) {
+
+        }
+
+        public void refreshTitle(boolean isCreateGroup){
+            if (titleView == null)return;
+
+            if (isCreateGroup){
+                titleView.setText(TUIConversationService.getAppContext().getString(R.string.forward_select_new_chat));
+            } else {
+                titleView.setText(TUIConversationService.getAppContext().getString(R.string.forward_select_from_contact));
+            }
+        }
+    }
+
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ConversationListLayout.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ConversationListLayout.java
new file mode 100644
index 0000000..7dfe013
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ConversationListLayout.java
@@ -0,0 +1,142 @@
+package com.tencent.qcloud.tuikit.tuiconversation.classicui.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.SimpleItemAnimator;
+
+import com.tencent.qcloud.tuicore.component.CustomLinearLayoutManager;
+import com.tencent.qcloud.tuikit.tuiconversation.classicui.interfaces.IConversationListLayout;
+import com.tencent.qcloud.tuikit.tuiconversation.classicui.interfaces.OnConversationAdapterListener;
+import com.tencent.qcloud.tuikit.tuiconversation.interfaces.IConversationListAdapter;
+import com.tencent.qcloud.tuikit.tuiconversation.presenter.ConversationPresenter;
+
+public class ConversationListLayout extends RecyclerView implements IConversationListLayout {
+
+    private ConversationListAdapter mAdapter;
+    private ConversationPresenter presenter;
+    private boolean isFolded = false;
+
+    public ConversationListLayout(Context context) {
+        super(context);
+        init();
+    }
+
+    public ConversationListLayout(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public ConversationListLayout(Context context, @Nullable AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init();
+    }
+
+    public void setPresenter(ConversationPresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    public void init() {
+        setLayoutFrozen(false);
+        setItemViewCacheSize(0);
+        setHasFixedSize(true);
+        setFocusableInTouchMode(false);
+        CustomLinearLayoutManager linearLayoutManager = new CustomLinearLayoutManager(getContext());
+        linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
+        setLayoutManager(linearLayoutManager);
+        SimpleItemAnimator animator = (SimpleItemAnimator) getItemAnimator();
+        if (animator != null) {
+            animator.setSupportsChangeAnimations(false);
+        }
+    }
+
+    @Override
+    public void setBackground(int resId) {
+        setBackgroundColor(resId);
+    }
+
+    @Override
+    public void disableItemUnreadDot(boolean flag) {
+        mAdapter.disableItemUnreadDot(flag);
+    }
+
+    @Override
+    public void setItemAvatarRadius(int radius) {
+        mAdapter.setItemAvatarRadius(radius);
+    }
+
+    @Override
+    public void setItemTopTextSize(int size) {
+        mAdapter.setItemTopTextSize(size);
+    }
+
+    @Override
+    public void setItemBottomTextSize(int size) {
+        mAdapter.setItemBottomTextSize(size);
+    }
+
+    @Override
+    public void setItemDateTextSize(int size) {
+        mAdapter.setItemDateTextSize(size);
+    }
+
+    @Override
+    public ConversationListLayout getListLayout() {
+        return this;
+    }
+
+    @Override
+    public ConversationListAdapter getAdapter() {
+        return mAdapter;
+    }
+
+    @Override
+    public void setAdapter(IConversationListAdapter adapter) {
+        if (adapter instanceof ConversationListAdapter) {
+            super.setAdapter((ConversationListAdapter) adapter);
+            mAdapter = (ConversationListAdapter) adapter;
+        }
+    }
+
+    @Override
+    public void setOnConversationAdapterListener(OnConversationAdapterListener listener){
+        mAdapter.setOnConversationAdapterListener(listener);
+    }
+
+    @Override
+    public void onScrollStateChanged(int state) {
+        super.onScrollStateChanged(state);
+        if (state == RecyclerView.SCROLL_STATE_IDLE) {
+            LinearLayoutManager layoutManager = (LinearLayoutManager) getLayoutManager();
+            if (layoutManager == null) {
+                return;
+            }
+            int lastPosition = layoutManager.findLastCompletelyVisibleItemPosition();
+
+            if (mAdapter != null) {
+                if (lastPosition == mAdapter.getItemCount() - 1 && !isLoadCompleted()) {
+                    mAdapter.onLoadingStateChanged(true);
+                    if (presenter != null) {
+                        presenter.loadMoreConversation();
+                    }
+                }
+            }
+        }
+    }
+
+    public void loadConversation(long nextSeq) {
+        if (presenter != null) {
+            presenter.loadConversation(nextSeq);
+        }
+    }
+
+    boolean isLoadCompleted(){
+        if (presenter != null) {
+            return presenter.isLoadFinished();
+        }
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/FoldedConversationLayout.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/FoldedConversationLayout.java
new file mode 100644
index 0000000..bc5a320
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/FoldedConversationLayout.java
@@ -0,0 +1,112 @@
+package com.tencent.qcloud.tuikit.tuiconversation.classicui.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.RelativeLayout;
+
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+import com.tencent.qcloud.tuikit.tuiconversation.classicui.interfaces.IConversationLayout;
+import com.tencent.qcloud.tuikit.tuiconversation.interfaces.IConversationListAdapter;
+import com.tencent.qcloud.tuikit.tuiconversation.presenter.ConversationFoldPresenter;
+
+public class FoldedConversationLayout extends RelativeLayout implements IConversationLayout {
+    private TitleBarLayout titleBarLayout;
+    private FoldedConversationListLayout conversationListLayout;
+    private ConversationFoldPresenter presenter;
+
+    public FoldedConversationLayout(Context context) {
+        super(context);
+        init();
+    }
+
+    public FoldedConversationLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public FoldedConversationLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    public void setPresenter(ConversationFoldPresenter presenter) {
+        this.presenter = presenter;
+        if (conversationListLayout != null) {
+            conversationListLayout.setPresenter(presenter);
+        }
+    }
+
+    private void init() {
+        inflate(getContext(), R.layout.folded_layout, this);
+        titleBarLayout = findViewById(R.id.conversation_title);
+        conversationListLayout = findViewById(R.id.folded_conversation_list);
+    }
+
+    public void initDefault() {
+        final ConversationListAdapter adapter = new ConversationListAdapter();
+        conversationListLayout.setAdapter((IConversationListAdapter) adapter);
+        adapter.setShowFoldedStyle(false);
+        if (presenter != null) {
+            presenter.setAdapter(adapter);
+        }
+        conversationListLayout.loadConversation();
+    }
+
+    @Override
+    public FoldedConversationListLayout getConversationList() {
+        return conversationListLayout;
+    }
+
+    @Override
+    public void setConversationTop(ConversationInfo conversation, IUIKitCallback callBack) {
+    }
+
+    @Override
+    public void deleteConversation(ConversationInfo conversation) {
+        if (presenter != null) {
+            presenter.deleteConversation(conversation);
+        }
+    }
+
+    @Override
+    public void clearConversationMessage(ConversationInfo conversation) {
+
+    }
+
+    @Override
+    public void markConversationHidden(ConversationInfo conversation) {
+        if (presenter != null) {
+            presenter.markConversationHidden(conversation, true);
+        }
+    }
+
+    @Override
+    public void markConversationUnread(ConversationInfo conversationInfo, boolean markUnread) {
+        if (presenter != null) {
+            presenter.markConversationUnread(conversationInfo, markUnread);
+        }
+    }
+
+    @Override
+    public void hideFoldedItem(boolean needHide) {
+        
+    }
+
+    @Override
+    public void clearUnreadStatusOfFoldItem() {
+
+    }
+
+    @Override
+    public TitleBarLayout getTitleBar() {
+        return titleBarLayout;
+    }
+
+    @Override
+    public void setParentLayout(Object parent) {
+
+    }
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/FoldedConversationListLayout.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/FoldedConversationListLayout.java
new file mode 100644
index 0000000..6e247da
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/FoldedConversationListLayout.java
@@ -0,0 +1,114 @@
+package com.tencent.qcloud.tuikit.tuiconversation.classicui.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.SimpleItemAnimator;
+
+import com.tencent.qcloud.tuicore.component.CustomLinearLayoutManager;
+import com.tencent.qcloud.tuikit.tuiconversation.classicui.interfaces.IConversationListLayout;
+import com.tencent.qcloud.tuikit.tuiconversation.classicui.interfaces.OnConversationAdapterListener;
+import com.tencent.qcloud.tuikit.tuiconversation.interfaces.IConversationListAdapter;
+import com.tencent.qcloud.tuikit.tuiconversation.presenter.ConversationFoldPresenter;
+
+public class FoldedConversationListLayout extends RecyclerView implements IConversationListLayout {
+
+    private ConversationListAdapter mAdapter;
+    private ConversationFoldPresenter presenter;
+    private boolean isFolded = false;
+
+    public FoldedConversationListLayout(Context context) {
+        super(context);
+        init();
+    }
+
+    public FoldedConversationListLayout(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public FoldedConversationListLayout(Context context, @Nullable AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init();
+    }
+
+    public void setPresenter(ConversationFoldPresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    public void init() {
+        setLayoutFrozen(false);
+        setItemViewCacheSize(0);
+        setHasFixedSize(true);
+        setFocusableInTouchMode(false);
+        CustomLinearLayoutManager linearLayoutManager = new CustomLinearLayoutManager(getContext());
+        linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
+        setLayoutManager(linearLayoutManager);
+        SimpleItemAnimator animator = (SimpleItemAnimator) getItemAnimator();
+        if (animator != null) {
+            animator.setSupportsChangeAnimations(false);
+        }
+    }
+
+    @Override
+    public void setBackground(int resId) {
+        setBackgroundColor(resId);
+    }
+
+    @Override
+    public void disableItemUnreadDot(boolean flag) {
+        mAdapter.disableItemUnreadDot(flag);
+    }
+
+    @Override
+    public void setItemAvatarRadius(int radius) {
+        mAdapter.setItemAvatarRadius(radius);
+    }
+
+    @Override
+    public void setItemTopTextSize(int size) {
+        mAdapter.setItemTopTextSize(size);
+    }
+
+    @Override
+    public void setItemBottomTextSize(int size) {
+        mAdapter.setItemBottomTextSize(size);
+    }
+
+    @Override
+    public void setItemDateTextSize(int size) {
+        mAdapter.setItemDateTextSize(size);
+    }
+
+    @Override
+    public FoldedConversationListLayout getListLayout() {
+        return this;
+    }
+
+    @Override
+    public ConversationListAdapter getAdapter() {
+        return mAdapter;
+    }
+
+    @Override
+    public void setAdapter(IConversationListAdapter adapter) {
+        if (adapter instanceof ConversationListAdapter) {
+            super.setAdapter((ConversationListAdapter) adapter);
+            mAdapter = (ConversationListAdapter) adapter;
+        }
+    }
+
+    @Override
+    public void setOnConversationAdapterListener(OnConversationAdapterListener listener) {
+        mAdapter.setOnConversationAdapterListener(listener);
+    }
+
+    public void loadConversation() {
+        if (presenter != null) {
+            presenter.loadConversation();
+        }
+    }
+}
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ForwardConversationSelectorAdapter.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ForwardConversationSelectorAdapter.java
new file mode 100644
index 0000000..58ba446
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ForwardConversationSelectorAdapter.java
@@ -0,0 +1,85 @@
+package com.tencent.qcloud.tuikit.tuiconversation.classicui.widget;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+
+import java.util.List;
+
+public class ForwardConversationSelectorAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>{
+    private Context context;
+    private List<ConversationInfo> list;
+    private OnItemClickListener mOnItemClickListener;
+
+    public ForwardConversationSelectorAdapter(Context context) {
+        this.context = context;
+    }
+
+    @Override
+    public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
+        super.onAttachedToRecyclerView(recyclerView);
+    }
+
+    @NonNull
+    @Override
+    public ConversationViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        return new ConversationViewHolder(LayoutInflater.from(context).inflate(R.layout.forward_conversation_selector_item, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, final int position) {
+        ConversationViewHolder viewHolder = (ConversationViewHolder) holder;
+        viewHolder.conversationUserIconView.setVisibility(View.VISIBLE);
+        viewHolder.conversationUserIconView.setConversation(list.get(position));
+
+        viewHolder.conversationUserIconView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mOnItemClickListener.onClick(v, position);
+            }
+        });
+
+    }
+
+    public void setDataSource(List<ConversationInfo> dataSource) {
+        if (dataSource == null) {
+            if (list != null) {
+                list.clear();
+            }
+        } else {
+            list = dataSource;
+        }
+
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public int getItemCount() {
+        return list == null ? 0 : list.size();
+    }
+
+    public void setOnItemClickListener(OnItemClickListener listener) {
+        this.mOnItemClickListener = listener;
+    }
+
+    public interface OnItemClickListener {
+        void onClick(View view, int position);
+    }
+
+    static class ConversationViewHolder extends RecyclerView.ViewHolder {
+        public ConversationIconView conversationUserIconView;
+        public ConversationViewHolder(View itemView) {
+            super(itemView);
+            conversationUserIconView = itemView.findViewById(R.id.conversation_user_icon_view);
+        }
+    }
+}
+
+
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ForwardSelectLayout.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ForwardSelectLayout.java
new file mode 100644
index 0000000..f46643e
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/classicui/widget/ForwardSelectLayout.java
@@ -0,0 +1,106 @@
+package com.tencent.qcloud.tuikit.tuiconversation.classicui.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.RelativeLayout;
+
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+import com.tencent.qcloud.tuikit.tuiconversation.classicui.interfaces.IConversationLayout;
+import com.tencent.qcloud.tuikit.tuiconversation.interfaces.IConversationListAdapter;
+import com.tencent.qcloud.tuikit.tuiconversation.presenter.ConversationPresenter;
+
+public class ForwardSelectLayout extends RelativeLayout implements IConversationLayout {
+
+    private TitleBarLayout titleBarLayout;
+    private ConversationListLayout conversationList;
+    private ConversationPresenter presenter;
+
+    public ForwardSelectLayout(Context context) {
+        super(context);
+        init();
+    }
+
+    public ForwardSelectLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public ForwardSelectLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    public void setPresenter(ConversationPresenter presenter) {
+        this.presenter = presenter;
+        if (conversationList != null) {
+            conversationList.setPresenter(presenter);
+        }
+    }
+
+    /**
+     * 初始化相关UI元素
+     */
+    private void init() {
+        inflate(getContext(), R.layout.forward_layout, this);
+        titleBarLayout = findViewById(R.id.conversation_title);
+        conversationList = findViewById(R.id.conversation_list);
+    }
+
+    public void initDefault() {
+        final ConversationListAdapter adapter = new ConversationListAdapter();
+        adapter.setForwardFragment(true);
+        conversationList.setAdapter((IConversationListAdapter) adapter);
+        presenter.setAdapter(adapter);
+        presenter.loadConversation(0);
+    }
+
+    public TitleBarLayout getTitleBar() {
+        return titleBarLayout;
+    }
+
+    @Override
+    public void setParentLayout(Object parent) {
+
+    }
+
+    @Override
+    public ConversationListLayout getConversationList() {
+        return conversationList;
+    }
+
+    @Override
+    public void setConversationTop(ConversationInfo conversation, IUIKitCallback callBack) {
+    }
+
+    @Override
+    public void deleteConversation(ConversationInfo conversation) {
+    }
+
+    @Override
+    public void clearConversationMessage(ConversationInfo conversation) {
+
+    }
+
+    @Override
+    public void markConversationHidden(ConversationInfo conversation) {
+
+    }
+
+    @Override
+    public void hideFoldedItem(boolean needHide) {
+
+    }
+
+    @Override
+    public void clearUnreadStatusOfFoldItem() {
+
+    }
+
+    @Override
+    public void markConversationUnread(ConversationInfo conversationInfo, boolean markRead) {
+
+    }
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/commonutil/ConversationUtils.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/commonutil/ConversationUtils.java
new file mode 100644
index 0000000..d5e6dbd
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/commonutil/ConversationUtils.java
@@ -0,0 +1,207 @@
+package com.tencent.qcloud.tuikit.tuiconversation.commonutil;
+
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.ListView;
+
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.imsdk.v2.V2TIMGroupAtInfo;
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.component.action.PopDialogAdapter;
+import com.tencent.qcloud.tuicore.util.DateTimeUtil;
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+import com.tencent.qcloud.tuikit.tuiconversation.TUIConversationService;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.DraftInfo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ConversationUtils {
+    private static final String TAG = ConversationUtils.class.getSimpleName();
+
+    public static List<ConversationInfo> convertV2TIMConversationList(List<V2TIMConversation> conversationList) {
+        List<ConversationInfo> conversationInfoList = new ArrayList<>();
+        if (conversationList != null) {
+            for(V2TIMConversation conversation : conversationList) {
+                conversationInfoList.add(convertV2TIMConversation(conversation));
+            }
+        }
+        return conversationInfoList;
+    }
+
+    public static ConversationInfo convertV2TIMConversation(final V2TIMConversation conversation) {
+        if (conversation == null) {
+            return null;
+        }
+        TUIConversationLog.i(TAG, "TIMConversation2ConversationInfo id:" + conversation.getConversationID()
+                + "|name:" + conversation.getShowName()
+                + "|unreadNum:" + conversation.getUnreadCount());
+        final ConversationInfo info = new ConversationInfo();
+        info.setConversation(conversation);
+        int type = conversation.getType();
+        if (type != V2TIMConversation.V2TIM_C2C && type != V2TIMConversation.V2TIM_GROUP) {
+            return null;
+        }
+
+        boolean isGroup = type == V2TIMConversation.V2TIM_GROUP;
+
+        String draftText = conversation.getDraftText();
+        if (!TextUtils.isEmpty(draftText)) {
+            DraftInfo draftInfo = new DraftInfo();
+            draftInfo.setDraftText(draftText);
+            draftInfo.setDraftTime(conversation.getDraftTimestamp());
+            info.setDraft(draftInfo);
+        }
+        V2TIMMessage message = conversation.getLastMessage();
+        if (message == null) {
+            long time = DateTimeUtil.getStringToDate("0001-01-01 00:00:00", "yyyy-MM-dd HH:mm:ss");
+            info.setLastMessageTime(time);
+        } else {
+            info.setLastMessageTime(message.getTimestamp());
+            info.setLastMessage(message);
+        }
+
+        int atInfoType = getAtInfoType(conversation);
+        switch (atInfoType){
+            case V2TIMGroupAtInfo.TIM_AT_ME:
+                info.setAtInfoText(TUIConversationService.getAppContext().getString(R.string.ui_at_me));
+                break;
+            case V2TIMGroupAtInfo.TIM_AT_ALL:
+                info.setAtInfoText(TUIConversationService.getAppContext().getString(R.string.ui_at_all));
+                break;
+            case V2TIMGroupAtInfo.TIM_AT_ALL_AT_ME:
+                info.setAtInfoText(TUIConversationService.getAppContext().getString(R.string.ui_at_all_me));
+                break;
+            default:
+                info.setAtInfoText("");
+                break;
+
+        }
+
+        info.setTitle(conversation.getShowName());
+        List<Object> faceList = new ArrayList<>();
+        if (isGroup) {
+            if (!TextUtils.isEmpty(conversation.getFaceUrl())) {
+                faceList.add(conversation.getFaceUrl());
+            }
+        } else {
+            if (TextUtils.isEmpty(conversation.getFaceUrl())) {
+                faceList.add(TUIConfig.getDefaultAvatarImage());
+            } else {
+                faceList.add(conversation.getFaceUrl());
+            }
+        }
+        info.setIconPath(conversation.getFaceUrl());
+        info.setIconUrlList(faceList);
+
+        if (isGroup) {
+            info.setId(conversation.getGroupID());
+            info.setGroupType(conversation.getGroupType());
+        } else {
+            info.setId(conversation.getUserID());
+        }
+
+        if (V2TIMManager.GROUP_TYPE_MEETING.equals(conversation.getGroupType())) {
+            info.setShowDisturbIcon(false);
+        } else {
+            info.setShowDisturbIcon(conversation.getRecvOpt() == V2TIMMessage.V2TIM_RECEIVE_NOT_NOTIFY_MESSAGE);
+        }
+        info.setConversationId(conversation.getConversationID());
+        info.setGroup(isGroup);
+        
+        if (!V2TIMManager.GROUP_TYPE_AVCHATROOM.equals(conversation.getGroupType())) {
+            info.setUnRead(conversation.getUnreadCount());
+        }
+        info.setTop(conversation.isPinned());
+        info.setOrderKey(conversation.getOrderKey());
+        if (conversation.getMarkList() != null) {
+            if (conversation.getMarkList().contains(V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_FOLD)) {
+                info.setMarkFold(true);
+            } else {
+                info.setMarkFold(false);
+            }
+            if (conversation.getMarkList().contains(V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_UNREAD)) {
+                info.setMarkUnread(true);
+            } else {
+                info.setMarkUnread(false);
+            }
+            if (conversation.getMarkList().contains(V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_HIDE)) {
+                info.setMarkHidden(true);
+            } else {
+                info.setMarkHidden(false);
+            }
+        }
+        return info;
+    }
+
+    private static int getAtInfoType(V2TIMConversation conversation){
+        int atInfoType = 0;
+        boolean atMe = false;
+        boolean atAll = false;
+
+        List<V2TIMGroupAtInfo> atInfoList = conversation.getGroupAtInfoList();
+
+        if (atInfoList == null || atInfoList.isEmpty()){
+            return V2TIMGroupAtInfo.TIM_AT_UNKNOWN;
+        }
+
+        for(V2TIMGroupAtInfo atInfo : atInfoList){
+            if (atInfo.getAtType() == V2TIMGroupAtInfo.TIM_AT_ME){
+                atMe = true;
+                continue;
+            }
+            if (atInfo.getAtType() == V2TIMGroupAtInfo.TIM_AT_ALL){
+                atAll = true;
+                continue;
+            }
+            if (atInfo.getAtType() == V2TIMGroupAtInfo.TIM_AT_ALL_AT_ME){
+                atMe = true;
+                atAll = true;
+                continue;
+            }
+        }
+
+        if (atAll && atMe){
+            atInfoType = V2TIMGroupAtInfo.TIM_AT_ALL_AT_ME;
+        } else if (atAll){
+            atInfoType = V2TIMGroupAtInfo.TIM_AT_ALL;
+        } else if (atMe){
+            atInfoType = V2TIMGroupAtInfo.TIM_AT_ME;
+        } else {
+            atInfoType = V2TIMGroupAtInfo.TIM_AT_UNKNOWN;
+        }
+
+        return atInfoType;
+    }
+
+    public static boolean isIgnored(ConversationInfo conversationInfo) {
+        if (V2TIMManager.GROUP_TYPE_AVCHATROOM.equals(conversationInfo.getGroupType())) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public static int getListUnspecifiedWidth(PopDialogAdapter adapter, ListView listView) {
+        if (adapter == null || listView == null) {
+            return 0;
+        }
+        int maxWidth = 0;
+        View convertView = null;
+        int childCount = adapter.getCount();
+        if (childCount <= 0) {
+            return 0;
+        }
+        for (int i = 0; i < childCount; i++) {
+            View child = adapter.getView(i, convertView, listView);
+            child.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
+            maxWidth = Math.max(maxWidth, child.getMeasuredWidth() + child.getPaddingLeft() + child.getPaddingRight());
+            convertView = child;
+        }
+        return maxWidth;
+    }
+
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/commonutil/TUIConversationLog.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/commonutil/TUIConversationLog.java
new file mode 100644
index 0000000..6744ed0
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/commonutil/TUIConversationLog.java
@@ -0,0 +1,37 @@
+package com.tencent.qcloud.tuikit.tuiconversation.commonutil;
+
+import com.tencent.imsdk.common.IMLog;
+
+public class TUIConversationLog extends IMLog {
+
+    private static final String PRE = "TUIKit-";
+
+    private static String mixTag(String tag) {
+        return PRE + tag;
+    }
+
+    public static void v(String strTag, String strInfo) {
+        IMLog.v(mixTag(strTag), strInfo);
+    }
+
+    public static void d(String strTag, String strInfo) {
+        IMLog.d(mixTag(strTag), strInfo);
+    }
+
+    public static void i(String strTag, String strInfo) {
+        IMLog.i(mixTag(strTag), strInfo);
+    }
+
+    public static void w(String strTag, String strInfo) {
+        IMLog.w(mixTag(strTag), strInfo);
+    }
+
+    public static void w(String strTag, String strInfo, Throwable e) {
+        IMLog.w(mixTag(strTag), strInfo + e.getMessage());
+    }
+
+    public static void e(String strTag, String strInfo) {
+        IMLog.e(mixTag(strTag), strInfo);
+    }
+
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/commonutil/TUIConversationUtils.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/commonutil/TUIConversationUtils.java
new file mode 100644
index 0000000..703b37d
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/commonutil/TUIConversationUtils.java
@@ -0,0 +1,25 @@
+package com.tencent.qcloud.tuikit.tuiconversation.commonutil;
+
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ErrorMessageConverter;
+
+public class TUIConversationUtils {
+
+    public static <T> void callbackOnError(IUIKitCallback<T> callBack, String module, int errCode, String desc) {
+        if (callBack != null) {
+            callBack.onError(module, errCode, ErrorMessageConverter.convertIMError(errCode, desc));
+        }
+    }
+
+    public static <T> void callbackOnError(IUIKitCallback<T> callBack, int errCode, String desc) {
+        if (callBack != null) {
+            callBack.onError(null, errCode, ErrorMessageConverter.convertIMError(errCode, desc));
+        }
+    }
+
+    public static <T> void callbackOnSuccess(IUIKitCallback<T> callBack, T data) {
+        if (callBack != null) {
+            callBack.onSuccess(data);
+        }
+    }
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/config/TUIConversationConfig.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/config/TUIConversationConfig.java
new file mode 100644
index 0000000..2f9d827
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/config/TUIConversationConfig.java
@@ -0,0 +1,23 @@
+package com.tencent.qcloud.tuikit.tuiconversation.config;
+
+public class TUIConversationConfig {
+    public static final String TAG = TUIConversationConfig.class.getSimpleName();
+    private static TUIConversationConfig instance;
+    private boolean isShowUserStatus;
+
+    public static TUIConversationConfig getInstance() {
+        if (instance == null) {
+            instance = new TUIConversationConfig();
+        }
+
+        return instance;
+    }
+
+    public boolean isShowUserStatus() {
+        return isShowUserStatus;
+    }
+
+    public void setShowUserStatus(boolean showUserStatus) {
+        isShowUserStatus = showUserStatus;
+    }
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/interfaces/ConversationEventListener.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/interfaces/ConversationEventListener.java
new file mode 100644
index 0000000..a6db5f6
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/interfaces/ConversationEventListener.java
@@ -0,0 +1,25 @@
+package com.tencent.qcloud.tuikit.tuiconversation.interfaces;
+
+import com.tencent.imsdk.v2.V2TIMUserStatus;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+
+import java.util.List;
+
+public interface ConversationEventListener {
+    void deleteConversation(String chatId, boolean isGroup);
+    void clearConversationMessage(String chatId, boolean isGroup);
+    void clearFoldMarkAndDeleteConversation(String conversationId);
+    void setConversationTop(String chatId, boolean isChecked, IUIKitCallback<Void> iuiKitCallBack);
+    boolean isTopConversation(String chatId);
+    long getUnreadTotal();
+    void onSyncServerFinish();
+    void updateTotalUnreadMessageCount(long count);
+    void onNewConversation(List<ConversationInfo> conversationList);
+    void onConversationChanged(List<ConversationInfo> conversationList);
+    void onFriendRemarkChanged(String id, String remark);
+    void onUserStatusChanged(List<V2TIMUserStatus> userStatusList);
+    void refreshUserStatusFragmentUI();
+    void onReceiveMessage(String conversationID, boolean isTypingMessage);
+    void onMessageSendForHideConversation(String conversationID);
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/interfaces/IConversationListAdapter.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/interfaces/IConversationListAdapter.java
new file mode 100644
index 0000000..c8819f8
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/interfaces/IConversationListAdapter.java
@@ -0,0 +1,33 @@
+package com.tencent.qcloud.tuikit.tuiconversation.interfaces;
+
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+
+import java.util.List;
+
+public interface IConversationListAdapter {
+    /**
+     * 获取适配器的条目数据，返回的是ConversationInfo对象或其子对象
+     * 
+     * Get the entry data of the adapter, which returns the ConversationInfo object or its sub-objects
+     *
+     * @param position
+     * @return ConversationInfo
+     */
+    ConversationInfo getItem(int position);
+
+    void onLoadingStateChanged(boolean isLoading);
+
+    void onDataSourceChanged(List<ConversationInfo> conversationInfoList);
+
+    void onViewNeedRefresh();
+
+    void onItemRemoved(int position);
+
+    void onItemInserted(int position);
+
+    void onItemChanged(int position);
+    
+    void onItemRangeChanged(int startPosition, int count);
+
+    void onConversationChanged(List<ConversationInfo> conversationInfoList);
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/interfaces/IConversationLayout.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/interfaces/IConversationLayout.java
new file mode 100644
index 0000000..f1b8358
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/interfaces/IConversationLayout.java
@@ -0,0 +1,38 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.interfaces;
+
+import android.view.View;
+
+import com.tencent.qcloud.tuicore.component.interfaces.ILayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+
+public interface IConversationLayout extends ILayout {
+    View getConversationList();
+    void setConversationTop(ConversationInfo conversation, IUIKitCallback callBack);
+    void deleteConversation(ConversationInfo conversation);
+    void clearConversationMessage(ConversationInfo conversation);
+
+    /**
+     * 隐藏普通会话
+     * Hide normal conversation
+     */
+    void markConversationHidden(ConversationInfo conversation);
+
+    /**
+     * 标记会话已读/未读
+     * Mark conversation read or unread
+     */
+    void markConversationUnread(ConversationInfo conversationInfo, boolean markUnread);
+
+    /**
+     * 隐藏整个折叠的会话 item
+     * Hide folded conversation item
+     */
+    void hideFoldedItem(boolean needHide);
+
+    /**
+     * 清除折叠 item 本地未读状态
+     * Clear unread status of fold item
+     */
+    void clearUnreadStatusOfFoldItem();
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/interfaces/IConversationListLayout.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/interfaces/IConversationListLayout.java
new file mode 100644
index 0000000..96f08e4
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/interfaces/IConversationListLayout.java
@@ -0,0 +1,63 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.interfaces;
+
+import android.view.View;
+
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.interfaces.OnConversationAdapterListener;
+import com.tencent.qcloud.tuikit.tuiconversation.interfaces.IConversationListAdapter;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.ConversationListAdapter;
+
+public interface IConversationListLayout {
+    void setBackground(int resId);
+    void setOnConversationAdapterListener(OnConversationAdapterListener listener);
+
+    /**
+     * 不显示小红点未读消息条数开关
+     * 
+     * Do not display the switch for the number of unread messages with the small red dot
+     *
+     * @param flag 默认false，表示显示
+     */
+    void disableItemUnreadDot(boolean flag);
+
+    /**
+     * 设置会话Item头像圆角
+     * 
+     * Set session item avatar rounded corners
+     *
+     * @param radius
+     */
+    void setItemAvatarRadius(int radius);
+
+    /**
+     * 设置会话Item顶部字体大小
+     * 
+     * Set the font size at the top of the session item
+     *
+     * @param size
+     */
+    void setItemTopTextSize(int size);
+
+    /**
+     * 设置会话Item底部字体大小
+     * 
+     * Set the font size at the bottom of the session item
+     *
+     * @param size
+     */
+    void setItemBottomTextSize(int size);
+
+    /**
+     * 设置会话Item日期字体大小
+     * 
+     * Set the session item date font size
+     *
+     * @param size
+     */
+    void setItemDateTextSize(int size);
+
+
+    View getListLayout();
+    ConversationListAdapter getAdapter();
+    void setAdapter(IConversationListAdapter adapter);
+
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/interfaces/IConversationProvider.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/interfaces/IConversationProvider.java
new file mode 100644
index 0000000..198fa37
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/interfaces/IConversationProvider.java
@@ -0,0 +1,62 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.interfaces;
+
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+import com.tencent.qcloud.tuikit.tuiconversation.interfaces.IConversationListAdapter;
+
+import java.util.List;
+
+
+public interface IConversationProvider {
+
+    /**
+     * 获取具体的会话数据集合，ConversationContainer依据该数据集合展示会话列表
+     * 
+     * Get a specific session data set, and ConversationContainer displays the session list based on the data set
+     *
+     * @return
+     */
+    List<ConversationInfo> getDataSource();
+
+    /**
+     * 批量添加会话条目
+     * 
+     * Bulk add session entries
+     *
+     * @param conversations 会话数据集合
+     * @return
+     */
+    boolean addConversations(List<ConversationInfo> conversations);
+
+    /**
+     * 删除会话条目
+     * 
+     * Delete session entries
+     *
+     * @param conversations 会话数据集合
+     * @return
+     */
+    boolean deleteConversations(List<ConversationInfo> conversations);
+
+    /**
+     * 更新会话条目
+     * 
+     * Update session entries
+     *
+     * @param conversations 会话数据集合
+     * @return
+     */
+    boolean updateConversations(List<ConversationInfo> conversations);
+
+
+    /**
+     * 绑定会话适配器时触发的调用，在调用{@link com.tencent.qcloud.tuikit.tuiconversation.interfaces.IConversationListAdapter#setDataProvider}时自动调用
+     * 
+     * Called when a session adapter is bound, automatically called when {@link com.tencent.qcloud.tuikit.tuiconversation.interfaces.IConversationListAdapter#setDataProvider} is called
+     *
+     * @param adapter 会话UI显示适配器
+     * @return
+     */
+
+    void attachAdapter(IConversationListAdapter adapter);
+
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/interfaces/OnConversationAdapterListener.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/interfaces/OnConversationAdapterListener.java
new file mode 100644
index 0000000..b2647d2
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/interfaces/OnConversationAdapterListener.java
@@ -0,0 +1,17 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.interfaces;
+
+import android.view.View;
+
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+
+import java.util.List;
+
+public interface OnConversationAdapterListener {
+    void onItemClick(View view, int viewType, ConversationInfo conversationInfo);
+    void OnItemLongClick(View view, ConversationInfo conversationInfo);
+    void onConversationChanged(List<ConversationInfo> dataSource);
+    void onMarkConversationUnread(View view, ConversationInfo conversationInfo, boolean markUnread);
+    void onMarkConversationHidden(View view, ConversationInfo conversationInfo);
+    void onClickMoreView(View view, ConversationInfo conversationInfo);
+    void onSwipeConversationChanged(ConversationInfo conversationInfo);
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/page/ConversationMinimalistFragment.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/page/ConversationMinimalistFragment.java
new file mode 100644
index 0000000..b75a207
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/page/ConversationMinimalistFragment.java
@@ -0,0 +1,642 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.page;
+
+import android.app.AlertDialog;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.PopupWindow;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.component.action.PopActionClickListener;
+import com.tencent.qcloud.tuicore.component.action.PopDialogAdapter;
+import com.tencent.qcloud.tuicore.component.action.PopMenuAction;
+import com.tencent.qcloud.tuicore.component.fragments.BaseFragment;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+import com.tencent.qcloud.tuikit.tuiconversation.TUIConversationConstants;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.interfaces.OnConversationAdapterListener;
+import com.tencent.qcloud.tuikit.tuiconversation.commonutil.ConversationUtils;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.util.TUIConversationUtils;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.ConversationLayout;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.ConversationListAdapter;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.Menu;
+import com.tencent.qcloud.tuikit.tuiconversation.presenter.ConversationPresenter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ConversationMinimalistFragment extends BaseFragment {
+    private View mBaseView;
+    private ConversationLayout mConversationLayout;
+    private ListView mConversationPopList;
+    private PopDialogAdapter mConversationPopAdapter;
+    private PopupWindow mConversationPopWindow;
+    private String popWindowConversationId;
+    private List<PopMenuAction> mConversationPopActions = new ArrayList<>();
+    private AlertDialog mBottomDialog;
+    private boolean isShowReadButton, isShowReadAllButton;
+    private BroadcastReceiver unreadCountReceiver;
+    private Menu menu;
+
+    private ConversationPresenter presenter;
+    private ConversationListAdapter mAdapter;
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        mBaseView = inflater.inflate(R.layout.minimalistui_conversation_fragment, container, false);
+        initView();
+        return mBaseView;
+    }
+
+    private void initView() {
+        // 从布局文件中获取会话列表面板
+        mConversationLayout = mBaseView.findViewById(R.id.conversation_layout);
+
+        presenter = new ConversationPresenter();
+        presenter.setConversationListener();
+        presenter.setShowType(ConversationPresenter.SHOW_TYPE_CONVERSATION_LIST_WITH_FOLD);
+        mConversationLayout.setPresenter(presenter);
+
+        // 会话列表面板的默认UI和交互初始化
+        mConversationLayout.initDefault();
+        // 通过API设置ConversataonLayout各种属性的样例，开发者可以打开注释，体验效果
+//        ConversationLayoutSetting.customizeConversation(mConversationLayout);
+        isShowReadButton = false;
+        isShowReadAllButton = false;
+        mAdapter = mConversationLayout.getConversationList().getAdapter();
+        mConversationLayout.getConversationList().setOnConversationAdapterListener(new OnConversationAdapterListener() {
+            @Override
+            public void onItemClick(View view, int viewType, ConversationInfo conversationInfo) {
+                if (mConversationLayout.isMultiSelected()) {
+                    if (mAdapter == null) {
+                        refreshEditConversationDialog(0);
+                        return;
+                    }
+                    List<ConversationInfo> mSelectConversations = mAdapter.getSelectedItem();
+                    if (mSelectConversations == null) {
+                        refreshEditConversationDialog(0);
+                        return;
+                    }
+                    isShowReadButton = false;
+                    for(ConversationInfo conversation : mSelectConversations) {
+                        if (conversation.isMarkUnread() || conversation.getUnRead() > 0) {
+                            isShowReadButton = true;
+                            break;
+                        }
+                    }
+
+                    refreshEditConversationDialog(mSelectConversations.size());
+                } else if (conversationInfo.isMarkFold()) {
+                    mConversationLayout.clearUnreadStatusOfFoldItem();
+                    startFoldedConversationActivity();
+                } else {
+                    TUIConversationUtils.startChatActivity(conversationInfo);
+                }
+            }
+
+            @Override
+            public void OnItemLongClick(View view, ConversationInfo conversationInfo) {
+                showItemPopMenu(view, conversationInfo);
+            }
+
+            @Override
+            public void onConversationChanged(List<ConversationInfo> dataSource) {
+                if (dataSource == null)return;
+                ConversationInfo conversationInfo = dataSource.get(0);
+                if (conversationInfo == null)return;
+
+                if (!TextUtils.isEmpty(popWindowConversationId) && popWindowConversationId.equals(conversationInfo.getConversationId())) {
+                    if (mConversationPopWindow != null) {
+                        mConversationPopWindow.dismiss();
+                    }
+                    if (mAdapter != null) {
+                        mAdapter.closeAllSwipeItems();
+                    }
+                }
+            }
+
+            @Override
+            public void onMarkConversationUnread(View view, ConversationInfo conversationInfo, boolean markUnread) {
+                mConversationLayout.markConversationUnread(conversationInfo, markUnread);
+            }
+
+            @Override
+            public void onMarkConversationHidden(View view, ConversationInfo conversationInfo) {
+                mConversationLayout.markConversationHidden(conversationInfo);
+            }
+
+            @Override
+            public void onClickMoreView(View view, ConversationInfo conversationInfo) {
+                showConversationMoreActionDialog(conversationInfo);
+            }
+
+            @Override
+            public void onSwipeConversationChanged(ConversationInfo conversationInfo) {
+                if (conversationInfo == null) {
+                    popWindowConversationId = "";
+                    return;
+                }
+                popWindowConversationId = conversationInfo.getConversationId();
+            }
+        });
+
+        mConversationLayout.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onEditConversationStartClick() {
+                showEditConversationDialog();
+            }
+
+            @Override
+            public void onEditConversationEndClick() {
+                closeEditConversationDialog();
+            }
+
+            @Override
+            public void onStartChatClick() {
+                if (menu == null) {
+                    return;
+                }
+                if (menu.isShowing()) {
+                    menu.hide();
+                } else {
+                    menu.show();
+                }
+            }
+        });
+
+        initUnreadCountReceiver();
+        restoreConversationItemBackground();
+        setConversationMenu();
+    }
+
+    public void restoreConversationItemBackground() {
+        if (mConversationLayout.getConversationList().getAdapter() !=  null &&
+                mConversationLayout.getConversationList().getAdapter().isClick()) {
+            mConversationLayout.getConversationList().getAdapter().setClick(false);
+            mConversationLayout.getConversationList().getAdapter().notifyItemChanged(mConversationLayout.getConversationList().getAdapter().getCurrentPosition());
+        }
+    }
+
+    private void initUnreadCountReceiver() {
+        unreadCountReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                long unreadCount = intent.getLongExtra(TUIConstants.UNREAD_COUNT_EXTRA, 0);
+                if (unreadCount > 0) {
+                    isShowReadAllButton = true;
+                } else {
+                    isShowReadAllButton = false;
+                }
+            }
+        };
+        IntentFilter unreadCountFilter = new IntentFilter();
+        unreadCountFilter.addAction(TUIConstants.CONVERSATION_UNREAD_COUNT_ACTION);
+        LocalBroadcastManager.getInstance(getContext()).registerReceiver(unreadCountReceiver, unreadCountFilter);
+    }
+
+    private void initPopMenuAction() {
+        // 设置长按conversation显示PopAction
+        List<PopMenuAction> conversationPopActions = new ArrayList<PopMenuAction>();
+        PopMenuAction action = new PopMenuAction();
+        action.setActionName(getResources().getString(R.string.not_display));
+        action.setActionClickListener(new PopActionClickListener() {
+            @Override
+            public void onActionClick(int index, Object data) {
+                ConversationInfo conversationInfo = (ConversationInfo) data;
+                if (conversationInfo.isMarkFold()) {
+                    mConversationLayout.hideFoldedItem(true);
+                } else {
+                    mConversationLayout.markConversationHidden(conversationInfo);
+                }
+            }
+        });
+        conversationPopActions.add(action);
+
+        mConversationPopActions.clear();
+        mConversationPopActions.addAll(conversationPopActions);
+    }
+
+    private void addMarkUnreadPopMenuAction(boolean markUnread) {
+        PopMenuAction action = new PopMenuAction();
+        action.setActionClickListener(new PopActionClickListener() {
+            @Override
+            public void onActionClick(int index, Object data) {
+                mConversationLayout.markConversationUnread((ConversationInfo) data, markUnread);
+            }
+        });
+        if (markUnread) {
+            action.setActionName(getResources().getString(R.string.mark_unread));
+        } else {
+            action.setActionName(getResources().getString(R.string.mark_read));
+        }
+        mConversationPopActions.add(0, action);
+    }
+
+    private void addDeletePopMenuAction() {
+        PopMenuAction action = new PopMenuAction();
+        action.setActionClickListener(new PopActionClickListener() {
+            @Override
+            public void onActionClick(int index, Object data) {
+                mConversationLayout.deleteConversation((ConversationInfo) data);
+            }
+        });
+        action.setActionName(getResources().getString(R.string.chat_delete));
+        mConversationPopActions.add(action);
+    }
+
+    /**
+     * 长按会话item弹框
+     * @param view 长按 view
+     * @param conversationInfo 会话数据对象
+     */
+    private void showItemPopMenu(View view, final ConversationInfo conversationInfo) {
+        initPopMenuAction();
+
+        if (!conversationInfo.isMarkFold()) {
+            if (conversationInfo.getUnRead() > 0) {
+                addMarkUnreadPopMenuAction(false);
+            } else {
+                if (conversationInfo.isMarkUnread()) {
+                    addMarkUnreadPopMenuAction(false);
+                } else {
+                    addMarkUnreadPopMenuAction(true);
+                }
+            }
+
+            addDeletePopMenuAction();
+        }
+
+        View itemPop = LayoutInflater.from(getActivity()).inflate(R.layout.conversation_pop_menu_layout, null);
+        mConversationPopList = itemPop.findViewById(R.id.pop_menu_list);
+        mConversationPopList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                PopMenuAction action = mConversationPopActions.get(position);
+                if (action.getActionClickListener() != null) {
+                    action.getActionClickListener().onActionClick(position, conversationInfo);
+                }
+                mConversationPopWindow.dismiss();
+                restoreConversationItemBackground();
+            }
+        });
+
+        for (int i = 0; i < mConversationPopActions.size(); i++) {
+            PopMenuAction action = mConversationPopActions.get(i);
+            if (conversationInfo.isTop()) {
+                if (action.getActionName().equals(getResources().getString(R.string.chat_top))) {
+                    action.setActionName(getResources().getString(R.string.quit_chat_top));
+                }
+            } else {
+                if (action.getActionName().equals(getResources().getString(R.string.quit_chat_top))) {
+                    action.setActionName(getResources().getString(R.string.chat_top));
+                }
+
+            }
+        }
+        mConversationPopAdapter = new PopDialogAdapter();
+        mConversationPopList.setAdapter(mConversationPopAdapter);
+        mConversationPopAdapter.setDataSource(mConversationPopActions);
+        mConversationPopWindow = new PopupWindow(itemPop, WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT);
+        mConversationPopWindow.setBackgroundDrawable(new ColorDrawable());
+        mConversationPopWindow.setOutsideTouchable(true);
+        popWindowConversationId = conversationInfo.getConversationId();
+        int width = ConversationUtils.getListUnspecifiedWidth(mConversationPopAdapter, mConversationPopList);
+        mConversationPopWindow.setWidth(width);
+        mConversationPopWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                restoreConversationItemBackground();
+                popWindowConversationId = "";
+            }
+        });
+        int x = view.getWidth() / 2;
+        int y = - view.getHeight() / 3;
+        int popHeight = ScreenUtil.dip2px(45) * 3;
+        if (y + popHeight + view.getY() + view.getHeight() > mConversationLayout.getBottom()) {
+            y = y - popHeight;
+        }
+        mConversationPopWindow.showAsDropDown(view, x, y, Gravity.TOP | Gravity.START);
+    }
+
+    private void startFoldedConversationActivity() {
+        Intent intent = new Intent(getActivity(), TUIFoldedConversationMinimalistActivity.class);
+        startActivity(intent);
+    }
+
+    public interface OnClickListener {
+        void onEditConversationStartClick();
+        void onEditConversationEndClick();
+        void onStartChatClick();
+    }
+
+    private void showEditConversationDialog(){
+        if (mBottomDialog != null && mBottomDialog.isShowing()) {
+            return;
+        }
+        View view = LayoutInflater.from(getContext()).inflate(R.layout.minimalist_bottom_bar,null,false);
+        mBottomDialog = new AlertDialog.Builder(getContext()).setView(view).create();
+
+        TextView markReadView = view.findViewById(R.id.mark_read);
+        TextView notDisplayView = view.findViewById(R.id.not_display);
+        TextView deleteChatView = view.findViewById(R.id.delete_chat);
+
+        if (isShowReadAllButton) {
+            markReadView.setAlpha(1f);
+            markReadView.setEnabled(true);
+            markReadView.setText(getString(R.string.has_all_read));
+        } else {
+            markReadView.setAlpha(0.5f);
+            markReadView.setEnabled(false);
+            markReadView.setText(getString(R.string.mark_read));
+        }
+        notDisplayView.setAlpha(0.5f);
+        notDisplayView.setEnabled(false);
+        deleteChatView.setAlpha(0.5f);
+        deleteChatView.setEnabled(false);
+
+        markReadView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (markReadView.getText().equals(getString(R.string.has_all_read))) {
+                    presenter.clearAllUnreadMessage();
+                } else {
+                    if (mAdapter == null) {
+                        resetEditConversationStatus();
+                        return;
+                    }
+                    List<ConversationInfo> mSelectConversations = mAdapter.getSelectedItem();
+                    for (ConversationInfo conversationInfo : mSelectConversations) {
+                        mConversationLayout.markConversationUnread(conversationInfo, false);
+                    }
+                }
+                resetEditConversationStatus();
+            }
+        });
+
+        notDisplayView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mAdapter == null) {
+                    resetEditConversationStatus();
+                    return;
+                }
+                List<ConversationInfo> mSelectConversations = mAdapter.getSelectedItem();
+                for(ConversationInfo conversationInfo : mSelectConversations) {
+                    mConversationLayout.markConversationHidden(conversationInfo);
+                }
+                resetEditConversationStatus();
+            }
+        });
+
+        deleteChatView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mAdapter == null) {
+                    resetEditConversationStatus();
+                    return;
+                }
+                List<ConversationInfo> mSelectConversations = mAdapter.getSelectedItem();
+                for(ConversationInfo conversationInfo : mSelectConversations) {
+                    mConversationLayout.deleteConversation(conversationInfo);
+                }
+                resetEditConversationStatus();
+            }
+        });
+
+        mBottomDialog.setCanceledOnTouchOutside(false);
+        mBottomDialog.show();
+        Window win = mBottomDialog.getWindow();
+        win.setGravity(Gravity.BOTTOM);   // 这里控制弹出的位置
+        win.getDecorView().setPadding(0, 0, 0, 0);
+        WindowManager.LayoutParams lp = win.getAttributes();
+        lp.width = WindowManager.LayoutParams.MATCH_PARENT;
+        lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
+        mBottomDialog.getWindow().setBackgroundDrawableResource(R.color.conversation_bottom_bg);
+        win.setAttributes(lp);
+
+        win.setDimAmount(0f);
+        win.setFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL, WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL);
+        win.setFlags(WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH, WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH);
+
+        mBottomDialog.setOnKeyListener(new DialogInterface.OnKeyListener() {
+            @Override
+            public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
+                if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN) {
+                    resetEditConversationStatus();
+                }
+                return false;
+            }
+        });
+    }
+
+    private void refreshEditConversationDialog(int selectSize) {
+        if (mBottomDialog == null) {
+            return;
+        }
+
+        TextView markReadView = mBottomDialog.findViewById(R.id.mark_read);
+        TextView notDisplayView = mBottomDialog.findViewById(R.id.not_display);
+        TextView deleteChatView = mBottomDialog.findViewById(R.id.delete_chat);
+
+        if (selectSize <= 0) {
+            deleteChatView.setAlpha(0.5f);
+            deleteChatView.setEnabled(false);
+
+            notDisplayView.setAlpha(0.5f);
+            notDisplayView.setEnabled(false);
+
+            markReadView.setAlpha(1f);
+            markReadView.setEnabled(true);
+            markReadView.setText(getString(R.string.has_all_read));
+        } else {
+            deleteChatView.setAlpha(1f);
+            deleteChatView.setEnabled(true);
+
+            notDisplayView.setAlpha(1f);
+            notDisplayView.setEnabled(true);
+
+            markReadView.setText(getString(R.string.mark_read));
+            if (isShowReadButton) {
+                markReadView.setAlpha(1f);
+                markReadView.setEnabled(true);
+            } else {
+                markReadView.setAlpha(0.5f);
+                markReadView.setEnabled(false);
+            }
+        }
+    }
+
+    private void resetEditConversationStatus() {
+        isShowReadAllButton = false;
+        isShowReadButton = false;
+        if (mBottomDialog != null) {
+            mBottomDialog.dismiss();
+        }
+        mConversationLayout.resetTitileBar();
+    }
+
+    private void closeEditConversationDialog() {
+        if (mBottomDialog != null) {
+            mBottomDialog.dismiss();
+        }
+    }
+
+    private void setConversationMenu() {
+        menu = new Menu(getActivity(), mConversationLayout.getCreateChatView());
+        PopActionClickListener popActionClickListener = new PopActionClickListener() {
+            @Override
+            public void onActionClick(int position, Object data) {
+                PopMenuAction action = (PopMenuAction) data;
+                if (TextUtils.equals(action.getActionName(), getResources().getString(R.string.start_conversation))) {
+                    TUICore.startActivity("StartC2CChatMinimalistActivity", null);
+                }
+
+                if (TextUtils.equals(action.getActionName(), getResources().getString(R.string.create_group_chat))) {
+                    Bundle bundle = new Bundle();
+                    bundle.putInt(TUIConversationConstants.GroupType.TYPE, TUIConversationConstants.GroupType.PUBLIC);
+                    TUICore.startActivity("StartGroupChatMinimalistActivity", bundle);
+                }
+
+                menu.hide();
+            }
+        };
+
+        List<PopMenuAction> menuActions = new ArrayList<>();
+
+        PopMenuAction action = new PopMenuAction();
+
+        action.setActionName(getResources().getString(R.string.start_conversation));
+        action.setActionClickListener(popActionClickListener);
+        action.setIconResId(R.drawable.create_c2c);
+        menuActions.add(action);
+
+        action = new PopMenuAction();
+        action.setActionName(getResources().getString(R.string.create_group_chat));
+        action.setIconResId(R.drawable.group_icon);
+        action.setActionClickListener(popActionClickListener);
+        menuActions.add(action);
+
+        menu.setMenuAction(menuActions);
+    }
+
+    private void showConversationMoreActionDialog(ConversationInfo conversationInfo){
+        View view = LayoutInflater.from(getContext()).inflate(R.layout.minimalist_more_dialog,null,false);
+        AlertDialog moreDialog = new AlertDialog.Builder(getContext()).setView(view).create();
+
+        TextView setTopView = view.findViewById(R.id.top_set);
+        TextView notDisplayView = view.findViewById(R.id.not_display);
+        TextView clearChatView = view.findViewById(R.id.clear_chat);
+        TextView deleteChatView = view.findViewById(R.id.delete_chat);
+        TextView cancelView = view.findViewById(R.id.cancel_button);
+
+
+        if (conversationInfo.isTop()) {
+            setTopView.setText(getString(R.string.quit_chat_top));
+        } else {
+            setTopView.setText(getString(R.string.chat_top));
+        }
+        setTopView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mConversationLayout.setConversationTop(conversationInfo, new IUIKitCallback() {
+                    @Override
+                    public void onSuccess(Object data) {
+                        super.onSuccess(data);
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        super.onError(module, errCode, errMsg);
+                    }
+                });
+                moreDialog.dismiss();
+            }
+        });
+
+        notDisplayView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mConversationLayout.markConversationHidden(conversationInfo);
+                moreDialog.dismiss();
+            }
+        });
+
+        clearChatView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mConversationLayout.clearConversationMessage(conversationInfo);
+                if (conversationInfo.isMarkUnread()) {
+                    mConversationLayout.markConversationUnread(conversationInfo, false);
+                }
+                moreDialog.dismiss();
+            }
+        });
+
+        deleteChatView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mConversationLayout.deleteConversation(conversationInfo);
+                moreDialog.dismiss();
+            }
+        });
+
+        cancelView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                moreDialog.dismiss();
+            }
+        });
+
+        moreDialog.setCanceledOnTouchOutside(false);
+        Window win = moreDialog.getWindow();
+        WindowManager.LayoutParams lp = win.getAttributes();
+        lp.width = lp.width - ScreenUtil.getPxByDp(16f);
+        lp.y = ScreenUtil.getPxByDp(34f);
+        moreDialog.getWindow().setBackgroundDrawableResource(com.tencent.qcloud.tuicore.R.color.status_bar_color);
+        win.setGravity(Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM);
+        win.setAttributes(lp);
+        moreDialog.show();
+
+        moreDialog.setOnKeyListener(new DialogInterface.OnKeyListener() {
+            @Override
+            public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
+                if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN) {
+                    moreDialog.dismiss();
+                }
+                return false;
+            }
+        });
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        if (unreadCountReceiver != null) {
+            LocalBroadcastManager.getInstance(getContext()).unregisterReceiver(unreadCountReceiver);
+            unreadCountReceiver = null;
+        }
+    }
+
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/page/TUIFoldedConversationMinimalistActivity.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/page/TUIFoldedConversationMinimalistActivity.java
new file mode 100644
index 0000000..c128553
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/page/TUIFoldedConversationMinimalistActivity.java
@@ -0,0 +1,24 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.page;
+
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+
+public class TUIFoldedConversationMinimalistActivity extends BaseLightActivity {
+    private TUIFoldedConversationMinimalistFragment mTUIFoldedConversationMinimalistFragment;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.folded_activity);
+
+        init();
+    }
+
+    private void init() {
+        mTUIFoldedConversationMinimalistFragment = new TUIFoldedConversationMinimalistFragment();
+        getSupportFragmentManager().beginTransaction().replace(R.id.empty_view, mTUIFoldedConversationMinimalistFragment).commitAllowingStateLoss();
+    }
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/page/TUIFoldedConversationMinimalistFragment.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/page/TUIFoldedConversationMinimalistFragment.java
new file mode 100644
index 0000000..cf6856e
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/page/TUIFoldedConversationMinimalistFragment.java
@@ -0,0 +1,241 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.page;
+
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.PopupWindow;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.action.PopActionClickListener;
+import com.tencent.qcloud.tuicore.component.action.PopDialogAdapter;
+import com.tencent.qcloud.tuicore.component.action.PopMenuAction;
+import com.tencent.qcloud.tuicore.component.fragments.BaseFragment;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+import com.tencent.qcloud.tuikit.tuiconversation.commonutil.ConversationUtils;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.interfaces.OnConversationAdapterListener;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.util.TUIConversationUtils;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.FoldedConversationLayout;
+import com.tencent.qcloud.tuikit.tuiconversation.presenter.ConversationFoldPresenter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TUIFoldedConversationMinimalistFragment extends BaseFragment {
+    private View mBaseView;
+    private TitleBarLayout mTitleBarLayout;
+    private FoldedConversationLayout mFoldedLayout;
+    private PopDialogAdapter mConversationPopAdapter;
+    private ListView mConversationPopList;
+    private PopupWindow mConversationPopWindow;
+    private String popWindowConversationId;
+    private List<PopMenuAction> mConversationPopActions = new ArrayList<>();
+
+    private ConversationFoldPresenter presenter;
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        mBaseView = inflater.inflate(R.layout.minimalist_folded_fragment, container, false);
+        initView();
+        return mBaseView;
+    }
+
+    private void initView() {
+        mFoldedLayout = mBaseView.findViewById(R.id.folded_conversation_layout);
+        mTitleBarLayout = mFoldedLayout.getTitleBar();
+        mTitleBarLayout.setTitle(getResources().getString(R.string.folded_group_chat), ITitleBarLayout.Position.MIDDLE);
+        mTitleBarLayout.setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getActivity().finish();
+            }
+        });
+
+        presenter = new ConversationFoldPresenter();
+        presenter.initListener();
+
+        mFoldedLayout.setPresenter(presenter);
+        mFoldedLayout.initDefault();
+
+        mFoldedLayout.getConversationList().setOnConversationAdapterListener(new OnConversationAdapterListener() {
+            @Override
+            public void onItemClick(View view, int viewType, ConversationInfo conversationInfo) {
+                TUIConversationUtils.startChatActivity(conversationInfo);
+            }
+
+            @Override
+            public void OnItemLongClick(View view, ConversationInfo conversationInfo) {
+                showItemPopMenu(view, conversationInfo);
+            }
+
+            @Override
+            public void onConversationChanged(List<ConversationInfo> dataSource) {
+                if (dataSource == null)return;
+                ConversationInfo conversationInfo = dataSource.get(0);
+                if (conversationInfo == null)return;
+
+                if (!TextUtils.isEmpty(popWindowConversationId) && popWindowConversationId.equals(conversationInfo.getConversationId())) {
+                    if (mConversationPopWindow != null) {
+                        mConversationPopWindow.dismiss();
+                    }
+                }
+            }
+
+            @Override
+            public void onMarkConversationUnread(View view, ConversationInfo conversationInfo, boolean markUnread) {
+
+            }
+
+            @Override
+            public void onMarkConversationHidden(View view, ConversationInfo conversationInfo) {
+
+            }
+
+            @Override
+            public void onClickMoreView(View view, ConversationInfo conversationInfo) {
+
+            }
+
+            @Override
+            public void onSwipeConversationChanged(ConversationInfo conversationInfo) {
+                if (conversationInfo == null) {
+                    popWindowConversationId = "";
+                    return;
+                }
+                popWindowConversationId = conversationInfo.getConversationId();
+            }
+        });
+
+        restoreConversationItemBackground();
+    }
+
+    private void initPopMenuAction() {
+        // 设置长按conversation显示PopAction
+        List<PopMenuAction> conversationPopActions = new ArrayList<PopMenuAction>();
+        PopMenuAction action = new PopMenuAction();
+        action.setActionName(getResources().getString(R.string.not_display));
+        action.setActionClickListener(new PopActionClickListener() {
+            @Override
+            public void onActionClick(int index, Object data) {
+                ConversationInfo conversationInfo = (ConversationInfo) data;
+                mFoldedLayout.markConversationHidden((ConversationInfo) data);
+            }
+        });
+        conversationPopActions.add(action);
+
+        action = new PopMenuAction();
+        action.setActionClickListener(new PopActionClickListener() {
+            @Override
+            public void onActionClick(int index, Object data) {
+                mFoldedLayout.deleteConversation((ConversationInfo) data);
+            }
+        });
+        action.setActionName(getResources().getString(R.string.chat_delete));
+        conversationPopActions.add(action);
+
+        mConversationPopActions.clear();
+        mConversationPopActions.addAll(conversationPopActions);
+    }
+
+    private void restoreConversationItemBackground() {
+        if (mFoldedLayout.getConversationList().getAdapter() !=  null &&
+                mFoldedLayout.getConversationList().getAdapter().isClick()) {
+            mFoldedLayout.getConversationList().getAdapter().setClick(false);
+            mFoldedLayout.getConversationList().getAdapter().notifyItemChanged(mFoldedLayout.getConversationList().getAdapter().getCurrentPosition());
+        }
+    }
+
+    private void addMarkUnreadPopMenuAction(boolean markUnread) {
+        PopMenuAction action = new PopMenuAction();
+        action.setActionClickListener(new PopActionClickListener() {
+            @Override
+            public void onActionClick(int index, Object data) {
+                mFoldedLayout.markConversationUnread((ConversationInfo) data, markUnread);
+            }
+        });
+        if (markUnread) {
+            action.setActionName(getResources().getString(R.string.mark_unread));
+        } else {
+            action.setActionName(getResources().getString(R.string.mark_read));
+        }
+        mConversationPopActions.add(0, action);
+    }
+
+    private void showItemPopMenu(View view, final ConversationInfo conversationInfo) {
+        initPopMenuAction();
+
+        if (conversationInfo.getUnRead() > 0) {
+            addMarkUnreadPopMenuAction(false);
+        } else {
+            if (conversationInfo.isMarkUnread()) {
+                addMarkUnreadPopMenuAction(false);
+            } else {
+                addMarkUnreadPopMenuAction(true);
+            }
+        }
+
+        View itemPop = LayoutInflater.from(getActivity()).inflate(R.layout.conversation_pop_menu_layout, null);
+        mConversationPopList = itemPop.findViewById(R.id.pop_menu_list);
+        mConversationPopList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                PopMenuAction action = mConversationPopActions.get(position);
+                if (action.getActionClickListener() != null) {
+                    action.getActionClickListener().onActionClick(position, conversationInfo);
+                }
+                mConversationPopWindow.dismiss();
+                restoreConversationItemBackground();
+            }
+        });
+
+        for (int i = 0; i < mConversationPopActions.size(); i++) {
+            PopMenuAction action = mConversationPopActions.get(i);
+            if (conversationInfo.isTop()) {
+                if (action.getActionName().equals(getResources().getString(R.string.chat_top))) {
+                    action.setActionName(getResources().getString(R.string.quit_chat_top));
+                }
+            } else {
+                if (action.getActionName().equals(getResources().getString(R.string.quit_chat_top))) {
+                    action.setActionName(getResources().getString(R.string.chat_top));
+                }
+
+            }
+        }
+        mConversationPopAdapter = new PopDialogAdapter();
+        mConversationPopList.setAdapter(mConversationPopAdapter);
+        mConversationPopAdapter.setDataSource(mConversationPopActions);
+        mConversationPopWindow = new PopupWindow(itemPop, WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT);
+        mConversationPopWindow.setBackgroundDrawable(new ColorDrawable());
+        mConversationPopWindow.setOutsideTouchable(true);
+        popWindowConversationId = conversationInfo.getConversationId();
+        int width = ConversationUtils.getListUnspecifiedWidth(mConversationPopAdapter, mConversationPopList);
+        mConversationPopWindow.setWidth(width);
+        mConversationPopWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                restoreConversationItemBackground();
+                popWindowConversationId = "";
+            }
+        });
+        int x = view.getWidth() / 2;
+        int y = - view.getHeight() / 3;
+        int popHeight = ScreenUtil.dip2px(45) * 3;
+        if (y + popHeight + view.getY() + view.getHeight() > mFoldedLayout.getBottom()) {
+            y = y - popHeight;
+        }
+        mConversationPopWindow.showAsDropDown(view, x, y, Gravity.TOP | Gravity.START);
+    }
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/page/TUIForwardSelectMinimalistActivity.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/page/TUIForwardSelectMinimalistActivity.java
new file mode 100644
index 0000000..a3c72c1
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/page/TUIForwardSelectMinimalistActivity.java
@@ -0,0 +1,42 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.page;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+import com.tencent.qcloud.tuikit.tuiconversation.commonutil.TUIConversationLog;
+
+public class TUIForwardSelectMinimalistActivity extends BaseLightActivity {
+    private static final String TAG = TUIForwardSelectMinimalistActivity.class.getSimpleName();
+
+    private TUIForwardSelectMinimalistFragment mTUIForwardSelectMinimalistFragment;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.forward_activity);
+
+        init();
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        TUIConversationLog.i(TAG, "onNewIntent");
+        super.onNewIntent(intent);;
+    }
+
+    @Override
+    protected void onResume() {
+        TUIConversationLog.i(TAG, "onResume");
+        super.onResume();
+    }
+
+    private void init() {
+        mTUIForwardSelectMinimalistFragment = new TUIForwardSelectMinimalistFragment();
+        getSupportFragmentManager().beginTransaction().replace(R.id.empty_view, mTUIForwardSelectMinimalistFragment).commitAllowingStateLoss();
+
+    }
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/page/TUIForwardSelectMinimalistFragment.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/page/TUIForwardSelectMinimalistFragment.java
new file mode 100644
index 0000000..2eca669
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/page/TUIForwardSelectMinimalistFragment.java
@@ -0,0 +1,352 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.page;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.component.CustomLinearLayoutManager;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.fragments.BaseFragment;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+import com.tencent.qcloud.tuikit.tuiconversation.TUIConversationConstants;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+import com.tencent.qcloud.tuikit.tuiconversation.commonutil.TUIConversationLog;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.interfaces.OnConversationAdapterListener;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.ConversationListLayout;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.ForwardConversationSelectorAdapter;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.ForwardSelectLayout;
+import com.tencent.qcloud.tuikit.tuiconversation.presenter.ConversationPresenter;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+public class TUIForwardSelectMinimalistFragment extends BaseFragment {
+
+    private View mBaseView;
+    private TitleBarLayout mTitleBarLayout;
+    private ForwardSelectLayout mForwardLayout;
+
+    private RecyclerView mForwardSelectlistView;
+    private ForwardConversationSelectorAdapter mAdapter;
+    private List<ConversationInfo> mDataSource = new ArrayList<>();
+    private List<ConversationInfo> mContactDataSource = new ArrayList<>();
+    private List<ConversationInfo> mAllSelectedConversations = new ArrayList<>();
+    private RelativeLayout mForwardSelectlistViewLayout;
+    private TextView mSureView;
+
+    private ConversationPresenter presenter;
+
+    private static final String TAG = TUIForwardSelectMinimalistFragment.class.getSimpleName();
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        mBaseView = inflater.inflate(R.layout.minimalist_forward_fragment, container, false);
+        return mBaseView;
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        mForwardLayout = view.findViewById(R.id.forward_conversation_layout);
+
+        presenter = new ConversationPresenter();
+        mForwardLayout.setPresenter(presenter);
+
+        mForwardLayout.initDefault();
+
+        customizeConversation();
+        mForwardLayout.getConversationList().setOnConversationAdapterListener(new OnConversationAdapterListener() {
+            @Override
+            public void onItemClick(View view, int viewType, ConversationInfo conversationInfo) {
+                if (viewType == ConversationInfo.TYPE_RECENT_LABEL){
+                    return;
+                } else if (viewType == ConversationInfo.TYPE_FORWAR_SELECT){
+                    if(mTitleBarLayout.getLeftTitle().getText().equals(getString(R.string.titlebar_cancle))){
+                        Bundle param = new Bundle();
+                        param.putInt(TUIConversationConstants.GroupType.TYPE, TUIConversationConstants.GroupType.PUBLIC);
+                        param.putBoolean(TUIConversationConstants.FORWARD_CREATE_NEW_CHAT, false);
+                        TUICore.startActivity(TUIForwardSelectMinimalistFragment.this, "ForwardSelectGroupMinimalistActivity", param, TUIConversationConstants.FORWARD_SELECT_MEMBERS_CODE);
+                    }else if(mTitleBarLayout.getLeftTitle().getText().equals(getString(R.string.titlebar_close))){
+                        Bundle param = new Bundle();
+                        param.putInt(TUIConversationConstants.GroupType.TYPE, TUIConversationConstants.GroupType.PUBLIC);
+                        param.putBoolean(TUIConversationConstants.FORWARD_CREATE_NEW_CHAT, true);
+                        TUICore.startActivity(TUIForwardSelectMinimalistFragment.this, "ForwardSelectGroupMinimalistActivity", param, TUIConversationConstants.FORWARD_CREATE_GROUP_CODE);
+                    }else{
+                        TUIConversationLog.d(TAG,"Titlebar exception");
+                    }
+                } else {
+                    if(mTitleBarLayout.getLeftTitle().getText().equals(getString(R.string.titlebar_cancle))) {
+                        mDataSource = mForwardLayout.getConversationList().getAdapter().getSelectedItem();
+                        checkRepeat();
+                        refreshSelectConversations();
+                    } else if(mTitleBarLayout.getLeftTitle().getText().equals(getString(R.string.titlebar_close))){
+                        forwardMessages(conversationInfo);
+                    } else {
+                        forwardMessages(conversationInfo);
+                    }
+                }
+            }
+
+            @Override
+            public void OnItemLongClick(View view, ConversationInfo conversationInfo) {
+
+            }
+
+            @Override
+            public void onConversationChanged(List<ConversationInfo> dataSource) {
+
+            }
+
+            @Override
+            public void onMarkConversationUnread(View view, ConversationInfo conversationInfo, boolean markUnread) {
+
+            }
+
+            @Override
+            public void onMarkConversationHidden(View view, ConversationInfo conversationInfo) {
+
+            }
+
+            @Override
+            public void onClickMoreView(View view, ConversationInfo conversationInfo) {
+
+            }
+
+            @Override
+            public void onSwipeConversationChanged(ConversationInfo conversationInfo) {
+
+            }
+        });
+
+        mForwardSelectlistViewLayout = view.findViewById(R.id.forward_select_list_layout);
+        mForwardSelectlistViewLayout.setVisibility(View.VISIBLE);
+        mForwardSelectlistView = view.findViewById(R.id.forward_select_list);
+        mForwardSelectlistView.setLayoutManager(new CustomLinearLayoutManager(getContext(), CustomLinearLayoutManager.HORIZONTAL, false));
+        mAdapter = new ForwardConversationSelectorAdapter(this.getContext());
+        mForwardSelectlistView.setAdapter(mAdapter);
+
+        mAdapter.setOnItemClickListener(new ForwardConversationSelectorAdapter.OnItemClickListener() {
+            @Override
+            public void onClick(View view, int position) {
+                boolean needFresh = false;
+                if (mDataSource != null && mDataSource.size() != 0){
+                    if(position < mDataSource.size()) {
+                        mDataSource.remove(position);
+                        mForwardLayout.getConversationList().getAdapter().setSelectConversations(mDataSource);
+                        needFresh = true;
+                    }
+                }
+
+                if(!needFresh) {
+                    if (mContactDataSource != null && mContactDataSource.size() != 0) {
+                        int dataSourcePosition = mDataSource == null ? 0 : mDataSource.size();
+                        if (position - dataSourcePosition < mContactDataSource.size()) {
+                            mContactDataSource.remove(position - dataSourcePosition);
+                            needFresh = true;
+                        }
+                    }
+                }
+
+                if (needFresh) {
+                    refreshSelectConversations();
+                }
+            }
+        });
+        mSureView = view.findViewById(R.id.btn_msg_ok);
+        mSureView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (getActivity() != null) {
+                    HashMap<String, Boolean> conversationMap = new HashMap<>();
+                    if (mDataSource != null && mDataSource.size() != 0){
+                        for (int i=0;i<mDataSource.size();i++){
+                            conversationMap.put(mDataSource.get(i).getId(), mDataSource.get(i).isGroup());
+                        }
+                    }
+
+                    if (mContactDataSource != null && mContactDataSource.size() != 0){
+                        for (int i=0;i<mContactDataSource.size();i++){
+                            conversationMap.put(mContactDataSource.get(i).getId(), mContactDataSource.get(i).isGroup());
+                        }
+                    }
+
+                    Intent intent = new Intent();
+                    intent.putExtra(TUIConversationConstants.FORWARD_SELECT_CONVERSATION_KEY, conversationMap);
+                    getActivity().setResult(TUIConversationConstants.FORWARD_SELECT_ACTIVTY_CODE, intent);
+
+                    getActivity().finish();
+                }
+            }
+        });
+
+        refreshSelectConversations();
+        initTitleAction();
+    }
+
+    private void refreshSelectConversations(){
+        mAllSelectedConversations.clear();
+
+        mDataSource = mForwardLayout.getConversationList().getAdapter().getSelectedItem();
+
+        if (mDataSource != null && mDataSource.size() != 0){
+            mAllSelectedConversations.addAll(mDataSource);
+        }
+        if (mContactDataSource != null && mContactDataSource.size() != 0){
+            mAllSelectedConversations.addAll(mContactDataSource);
+        }
+
+        mAdapter.setDataSource(mAllSelectedConversations);
+
+        if (mAllSelectedConversations == null || mAllSelectedConversations.size() == 0){
+            mSureView.setText(getString(com.tencent.qcloud.tuicore.R.string.sure));
+            mSureView.setVisibility(View.GONE);
+            mForwardSelectlistViewLayout.setVisibility(View.GONE);
+        } else {
+            mForwardSelectlistViewLayout.setVisibility(View.VISIBLE);
+            mSureView.setVisibility(View.VISIBLE);
+            mSureView.setText(getString(com.tencent.qcloud.tuicore.R.string.sure) + "(" + mAllSelectedConversations.size() + ")");
+        }
+    }
+
+    private void forwardMessages(final ConversationInfo conversationInfo){
+        AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+        builder.setTitle("");
+        builder.setMessage(getString(R.string.forward_alert_title));
+        builder.setCancelable(true);
+        builder.setPositiveButton(getString(com.tencent.qcloud.tuicore.R.string.sure), new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                if (getActivity() != null) {
+                    HashMap<String, Boolean> chatInfo = new HashMap<>();
+                    chatInfo.put(conversationInfo.getId(), conversationInfo.isGroup());
+
+                    Intent intent = new Intent();
+                    intent.putExtra(TUIConversationConstants.FORWARD_SELECT_CONVERSATION_KEY, chatInfo);
+                    getActivity().setResult(TUIConversationConstants.FORWARD_SELECT_ACTIVTY_CODE, intent);
+
+                    getActivity().finish();
+                }
+                dialog.dismiss();
+            }
+        });
+        builder.setNegativeButton(getString(com.tencent.qcloud.tuicore.R.string.cancel), new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                dialog.dismiss();
+            }
+        });
+        AlertDialog dialog = builder.create();
+        dialog.show();
+    }
+
+    private void customizeConversation(){
+        mTitleBarLayout = mForwardLayout.getTitleBar();
+        mTitleBarLayout.setTitle("", TitleBarLayout.Position.MIDDLE);
+        mTitleBarLayout.getLeftGroup().setVisibility(View.VISIBLE);
+        mTitleBarLayout.getRightGroup().setVisibility(View.VISIBLE);
+        mTitleBarLayout.setTitle(getString(R.string.titlebar_close), ITitleBarLayout.Position.LEFT);
+        mTitleBarLayout.setTitle(getString(R.string.titlebar_mutiselect), TitleBarLayout.Position.RIGHT);
+        mTitleBarLayout.getLeftIcon().setVisibility(View.GONE);
+        mTitleBarLayout.getRightIcon().setVisibility(View.GONE);
+
+    }
+
+    private void initTitleAction() {
+        mForwardLayout.getTitleBar().setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if(mTitleBarLayout.getLeftTitle().getText().equals(getString(R.string.titlebar_cancle))){
+                    mTitleBarLayout.getRightGroup().setVisibility(View.VISIBLE);
+                    mTitleBarLayout.setTitle(getString(R.string.titlebar_close), TitleBarLayout.Position.LEFT);
+                    mTitleBarLayout.setTitle(getString(R.string.titlebar_mutiselect), TitleBarLayout.Position.RIGHT);
+
+                    ConversationListLayout listLayout = mForwardLayout.getConversationList();
+                    listLayout.getAdapter().setShowMultiSelectCheckBox(false);
+                    listLayout.getAdapter().notifyDataSetChanged();
+
+                    mForwardSelectlistViewLayout.setVisibility(View.GONE);
+                    mAdapter.setDataSource(null);
+                    mAllSelectedConversations.clear();
+                }else if(mTitleBarLayout.getLeftTitle().getText().equals(getString(R.string.titlebar_close))){
+                    getActivity().finish();
+                }else{
+                    TUIConversationLog.d(TAG,"Titlebar exception");
+                }
+            }
+        });
+
+        mForwardLayout.getTitleBar().setOnRightClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mTitleBarLayout.getRightGroup().setVisibility(View.GONE);
+                mTitleBarLayout.setTitle(getString(R.string.titlebar_cancle), TitleBarLayout.Position.LEFT);
+
+                ConversationListLayout listLayout = mForwardLayout.getConversationList();
+                listLayout.getAdapter().setShowMultiSelectCheckBox(true);
+                listLayout.getAdapter().notifyDataSetChanged();
+            }
+        });
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == TUIConversationConstants.FORWARD_CREATE_GROUP_CODE && resultCode == TUIConversationConstants.FORWARD_CREATE_GROUP_CODE) {
+            if (getActivity() != null) {
+                getActivity().setResult(TUIConversationConstants.FORWARD_SELECT_ACTIVTY_CODE, data);
+                getActivity().finish();
+            }
+        } else if (requestCode == TUIConversationConstants.FORWARD_SELECT_MEMBERS_CODE && resultCode == TUIConversationConstants.FORWARD_SELECT_MEMBERS_CODE){
+            HashMap<String, String> conversationMap = (HashMap<String, String>) data.getSerializableExtra(TUIConversationConstants.FORWARD_SELECT_CONVERSATION_KEY);
+            if (conversationMap == null || conversationMap.isEmpty()){
+                mContactDataSource.clear();
+                refreshSelectConversations();
+                return;
+            }
+
+            mContactDataSource.clear();
+            for (Map.Entry<String, String> entry: conversationMap.entrySet()){
+                ConversationInfo conversationInfo = new ConversationInfo();
+                List<Object> iconList = new ArrayList<>();
+                iconList.add(entry.getValue());
+                conversationInfo.setIconUrlList(iconList);
+                conversationInfo.setId(entry.getKey());
+                conversationInfo.setGroup(false);
+                mContactDataSource.add(conversationInfo);
+            }
+            checkRepeat();
+
+            refreshSelectConversations();
+        }
+    }
+
+    private void checkRepeat() {
+        Iterator<ConversationInfo> iterator = mContactDataSource.iterator();
+        while (iterator.hasNext()) {
+            ConversationInfo conversationInfo = iterator.next();
+            if (mDataSource != null && mDataSource.size() != 0) {
+                for (int i = 0; i < mDataSource.size(); i++) {
+                    if (conversationInfo.getId().equals(mDataSource.get(i).getId())) {
+                        iterator.remove();
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/setting/ConversationLayoutSetting.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/setting/ConversationLayoutSetting.java
new file mode 100644
index 0000000..5b218e7
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/setting/ConversationLayoutSetting.java
@@ -0,0 +1,39 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.setting;
+
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.ConversationLayout;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.ConversationListLayout;
+
+public class ConversationLayoutSetting {
+
+    public static void customizeConversation(final ConversationLayout layout) {
+
+        ConversationListLayout listLayout = (ConversationListLayout) layout.getConversationList();
+
+        listLayout.setItemAvatarRadius((int) ScreenUtil.dp2px(49f, listLayout.getResources().getDisplayMetrics()));
+
+        // 动态插入，删除Item，包括自定义会话
+//        final ConversationInfo customInfo = new ConversationInfo();
+//        customInfo.setType(ConversationInfo.TYPE_CUSTOM);
+//        customInfo.setId("自定义会话");
+//        customInfo.setGroup(false);
+//        customInfo.setTitle("乔丹风行8代跑鞋 风随我动！");
+//        customInfo.setIconUrl("https://img1.gtimg.com/ninja/2/2019/03/ninja155375585738456.jpg");
+//
+//
+//        new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
+//            @Override
+//            public void run() {
+//                layout.addConversationInfo(0, customInfo);
+//            }
+//        }, 3000);
+
+//        new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
+//            @Override
+//            public void run() {
+//                layout.removeConversationInfo(0);
+//            }
+//        }, 5000);
+    }
+
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/util/TUIConversationUtils.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/util/TUIConversationUtils.java
new file mode 100644
index 0000000..16052cd
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/util/TUIConversationUtils.java
@@ -0,0 +1,36 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.util;
+
+import android.os.Bundle;
+
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+
+public class TUIConversationUtils {
+    public static void startChatActivity(ConversationInfo conversationInfo) {
+        Bundle param = new Bundle();
+        param.putInt(TUIConstants.TUIChat.CHAT_TYPE, conversationInfo.isGroup() ? V2TIMConversation.V2TIM_GROUP : V2TIMConversation.V2TIM_C2C);
+        param.putString(TUIConstants.TUIChat.CHAT_ID, conversationInfo.getId());
+        param.putString(TUIConstants.TUIChat.CHAT_NAME, conversationInfo.getTitle());
+        if (conversationInfo.getDraft() != null) {
+            param.putString(TUIConstants.TUIChat.DRAFT_TEXT, conversationInfo.getDraft().getDraftText());
+            param.putLong(TUIConstants.TUIChat.DRAFT_TIME, conversationInfo.getDraft().getDraftTime());
+        }
+        param.putBoolean(TUIConstants.TUIChat.IS_TOP_CHAT, conversationInfo.isTop());
+        param.putString(TUIConstants.TUIChat.FACE_URL, conversationInfo.getIconPath());
+        if (conversationInfo.isGroup()) {
+            param.putString(TUIConstants.TUIChat.GROUP_TYPE, conversationInfo.getGroupType());
+            param.putSerializable(TUIConstants.TUIChat.FACE_URL_LIST, (Serializable) conversationInfo.getIconUrlList());
+            param.putSerializable(TUIConstants.TUIChat.AT_INFO_LIST, (Serializable) conversationInfo.getGroupAtInfoList());
+        }
+        if (conversationInfo.isGroup()) {
+            TUICore.startActivity("TUIGroupChatMinimalistActivity", param);
+        } else {
+            TUICore.startActivity("TUIC2CChatMinimalistActivity", param);
+        }
+    }
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ConversationBaseHolder.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ConversationBaseHolder.java
new file mode 100644
index 0000000..5bd0411
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ConversationBaseHolder.java
@@ -0,0 +1,25 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget;
+
+import android.view.View;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+
+public abstract class ConversationBaseHolder extends RecyclerView.ViewHolder {
+
+    protected View rootView;
+    protected ConversationListAdapter mAdapter;
+
+    public ConversationBaseHolder(View itemView) {
+        super(itemView);
+        rootView = itemView;
+    }
+
+    public void setAdapter(RecyclerView.Adapter adapter) {
+        mAdapter = (ConversationListAdapter) adapter;
+    }
+
+    public abstract void layoutViews(ConversationInfo conversationInfo, int position);
+
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ConversationCommonHolder.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ConversationCommonHolder.java
new file mode 100644
index 0000000..7aa5a1e
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ConversationCommonHolder.java
@@ -0,0 +1,261 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget;
+
+import android.graphics.Color;
+import android.text.Html;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.imsdk.v2.V2TIMUserStatus;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuicore.component.UnreadCountTextView;
+import com.tencent.qcloud.tuicore.util.DateTimeUtil;
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.DraftInfo;
+import com.tencent.qcloud.tuikit.tuiconversation.config.TUIConversationConfig;
+import com.tencent.qcloud.tuikit.tuiconversation.commonutil.TUIConversationLog;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.swipe.SwipeLayout;
+
+import java.util.Date;
+import java.util.HashMap;
+
+public class ConversationCommonHolder extends ConversationBaseHolder {
+
+    public ConversationIconView conversationIconView;
+    protected LinearLayout leftItemLayout;
+    protected TextView titleText;
+    protected TextView messageText;
+    protected TextView timelineText;
+    protected UnreadCountTextView unreadText;
+    protected TextView atInfoText;
+    protected ImageView disturbView;
+    protected CheckBox multiSelectCheckBox;
+    protected RelativeLayout messageStatusLayout;
+    public ImageView messageSending;
+    public ImageView messageFailed;
+    private boolean isForwardMode = false;
+    protected View userStatusView;
+    private boolean showFoldedStyle = true;
+    protected SwipeLayout swipeLayout;
+    protected RelativeLayout markReadView, moreView;
+    protected TextView markReadTextView, notDisplayView;
+    protected ImageView markReadIconView;
+
+    public ConversationCommonHolder(View itemView) {
+        super(itemView);
+        leftItemLayout = rootView.findViewById(R.id.item_left);
+        conversationIconView = rootView.findViewById(R.id.conversation_icon);
+        titleText = rootView.findViewById(R.id.conversation_title);
+        messageText = rootView.findViewById(R.id.conversation_last_msg);
+        timelineText = rootView.findViewById(R.id.conversation_time);
+        unreadText = rootView.findViewById(R.id.conversation_unread);
+        atInfoText = rootView.findViewById(R.id.conversation_at_msg);
+        disturbView = rootView.findViewById(R.id.not_disturb);
+        multiSelectCheckBox = rootView.findViewById(R.id.select_checkbox);
+        messageStatusLayout = rootView.findViewById(R.id.message_status_layout);
+        messageFailed = itemView.findViewById(R.id.message_status_failed);
+        messageSending = itemView.findViewById(R.id.message_status_sending);
+        userStatusView = itemView.findViewById(R.id.user_status);
+        swipeLayout = itemView.findViewById(R.id.swipe);
+        markReadView = itemView.findViewById(R.id.mark_read);
+        moreView = itemView.findViewById(R.id.more_view);
+        markReadTextView = itemView.findViewById(R.id.mark_read_text);
+        notDisplayView = itemView.findViewById(R.id.not_display);
+        markReadIconView = itemView.findViewById(R.id.mark_read_image);
+    }
+
+    public void setForwardMode(boolean forwardMode) {
+        isForwardMode = forwardMode;
+    }
+
+    public void setShowFoldedStyle(boolean showFoldedStyle) {
+        this.showFoldedStyle = showFoldedStyle;
+    }
+
+    public void layoutViews(ConversationInfo conversation, int position) {
+        if (conversation.isTop() && !isForwardMode) {
+            leftItemLayout.setBackgroundColor(rootView.getResources().getColor(R.color.conversation_item_top_color));
+        } else {
+            leftItemLayout.setBackgroundColor(Color.WHITE);
+        }
+
+        if (showFoldedStyle && conversation.isMarkFold()) {
+            titleText.setText(R.string.folded_group_chat);
+            timelineText.setVisibility(View.GONE);
+        } else {
+            titleText.setText(conversation.getTitle());
+        }
+        messageText.setText("");
+        timelineText.setText("");
+        DraftInfo draftInfo = conversation.getDraft();
+        String draftText = "";
+        if (draftInfo != null) {
+            Gson gson = new Gson();
+            HashMap draftJsonMap;
+            draftText = draftInfo.getDraftText();
+            try {
+                draftJsonMap = gson.fromJson(draftInfo.getDraftText(), HashMap.class);
+                if (draftJsonMap != null) {
+                    draftText = (String) draftJsonMap.get("content");
+                }
+            } catch (JsonSyntaxException e) {
+                TUIConversationLog.e("ConversationCommonHolder", " getDraftJsonMap error ");
+            }
+        }
+        if (draftInfo != null) {
+            messageText.setText(draftText);
+            timelineText.setText(DateTimeUtil.getTimeFormatText(new Date(draftInfo.getDraftTime() * 1000)));
+        } else {
+            HashMap<String, Object> param = new HashMap<>();
+            param.put(TUIConstants.TUIChat.V2TIMMESSAGE, conversation.getLastMessage());
+            String lastMsgDisplayString = (String) TUICore.callService(TUIConstants.TUIChat.SERVICE_NAME, TUIConstants.TUIChat.METHOD_GET_DISPLAY_STRING, param);
+            // 获取要显示的字符
+            // Get the characters to display
+            if (lastMsgDisplayString != null) {
+                messageText.setText(Html.fromHtml(lastMsgDisplayString));
+                messageText.setTextColor(rootView.getResources().getColor(R.color.list_bottom_text_bg));
+            }
+            if (conversation.getLastMessage() != null) {
+                timelineText.setText(DateTimeUtil.getTimeFormatText(new Date(conversation.getLastMessageTime() * 1000)));
+            }
+        }
+
+        if (conversation.isShowDisturbIcon()) {
+            if ((showFoldedStyle && conversation.isMarkFold())) {
+                if (conversation.isMarkLocalUnread()) {
+                    unreadText.setVisibility(View.VISIBLE);
+                    unreadText.setText("");
+                } else {
+                    unreadText.setVisibility(View.GONE);
+                }
+            } else {
+                if (conversation.getUnRead() == 0) {
+                    if (conversation.isMarkUnread()) {
+                        unreadText.setVisibility(View.VISIBLE);
+                        unreadText.setText("");
+                    } else {
+                        unreadText.setVisibility(View.GONE);
+                    }
+                } else {
+                    unreadText.setVisibility(View.VISIBLE);
+                    unreadText.setText("");
+
+                    if (messageText.getText() != null) {
+                        String text = messageText.getText().toString();
+                        messageText.setText("[" + conversation.getUnRead() + rootView.getContext().getString(R.string.message_num) + "] " + text);
+                    }
+                }
+            }
+        } else if (conversation.getUnRead() > 0) {
+            unreadText.setVisibility(View.VISIBLE);
+            if (conversation.getUnRead() > 99) {
+                unreadText.setText("99+");
+            } else {
+                unreadText.setText("" + conversation.getUnRead());
+            }
+        } else {
+            if (conversation.isMarkUnread()) {
+                unreadText.setVisibility(View.VISIBLE);
+                unreadText.setText("1");
+            } else {
+                unreadText.setVisibility(View.GONE);
+            }
+        }
+
+        if (draftInfo != null) {
+            atInfoText.setVisibility(View.VISIBLE);
+            atInfoText.setText(R.string.drafts);
+            atInfoText.setTextColor(Color.RED);
+
+            messageStatusLayout.setVisibility(View.GONE);
+            messageFailed.setVisibility(View.GONE);
+            messageSending.setVisibility(View.GONE);
+        } else {
+            if (conversation.getAtInfoText().isEmpty()) {
+                atInfoText.setVisibility(View.GONE);
+            } else {
+                atInfoText.setVisibility(View.VISIBLE);
+                atInfoText.setText(conversation.getAtInfoText());
+                atInfoText.setTextColor(Color.RED);
+            }
+
+            V2TIMMessage lastMessage = conversation.getLastMessage();
+            if (lastMessage != null) {
+                int status = lastMessage.getStatus();
+                if (status == V2TIMMessage.V2TIM_MSG_STATUS_SEND_FAIL) {
+                    messageStatusLayout.setVisibility(View.VISIBLE);
+                    messageFailed.setVisibility(View.VISIBLE);
+                    messageSending.setVisibility(View.GONE);
+                } else if (status == V2TIMMessage.V2TIM_MSG_STATUS_SENDING) {
+                    messageStatusLayout.setVisibility(View.VISIBLE);
+                    messageFailed.setVisibility(View.GONE);
+                    messageSending.setVisibility(View.VISIBLE);
+                } else {
+                    messageStatusLayout.setVisibility(View.GONE);
+                    messageFailed.setVisibility(View.GONE);
+                    messageSending.setVisibility(View.GONE);
+                }
+            } else {
+                messageStatusLayout.setVisibility(View.GONE);
+                messageFailed.setVisibility(View.GONE);
+                messageSending.setVisibility(View.GONE);
+            }
+        }
+
+        conversationIconView.setRadius(mAdapter.getItemAvatarRadius());
+        if (mAdapter.getItemDateTextSize() != 0) {
+            timelineText.setTextSize(mAdapter.getItemDateTextSize());
+        }
+        if (mAdapter.getItemBottomTextSize() != 0) {
+            messageText.setTextSize(mAdapter.getItemBottomTextSize());
+        }
+        if (mAdapter.getItemTopTextSize() != 0) {
+            titleText.setTextSize(mAdapter.getItemTopTextSize());
+        }
+        if (!mAdapter.hasItemUnreadDot()) {
+            unreadText.setVisibility(View.GONE);
+        }
+
+        conversationIconView.setShowFoldedStyle(showFoldedStyle);
+        conversationIconView.setConversation(conversation);
+
+        if (conversation.isShowDisturbIcon() && !isForwardMode) {
+            if (showFoldedStyle && conversation.isMarkFold()) {
+                disturbView.setVisibility(View.GONE);
+            } else {
+                disturbView.setVisibility(View.VISIBLE);
+            }
+        } else {
+            disturbView.setVisibility(View.GONE);
+        }
+
+        if (isForwardMode) {
+            messageText.setVisibility(View.GONE);
+            timelineText.setVisibility(View.GONE);
+            unreadText.setVisibility(View.GONE);
+            atInfoText.setVisibility(View.GONE);
+            messageStatusLayout.setVisibility(View.GONE);
+            messageFailed.setVisibility(View.GONE);
+            messageSending.setVisibility(View.GONE);
+        }
+
+        if (!conversation.isGroup() && TUIConversationConfig.getInstance().isShowUserStatus()) {
+            if (conversation.getStatusType() == V2TIMUserStatus.V2TIM_USER_STATUS_ONLINE) {
+                userStatusView.setVisibility(View.VISIBLE);
+            } else {
+                userStatusView.setVisibility(View.GONE);
+            }
+        } else {
+            userStatusView.setVisibility(View.GONE);
+        }
+    }
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ConversationCustomHolder.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ConversationCustomHolder.java
new file mode 100644
index 0000000..ed663f4
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ConversationCustomHolder.java
@@ -0,0 +1,68 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget;
+
+import android.graphics.Color;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+
+
+public class ConversationCustomHolder extends ConversationBaseHolder {
+
+    protected LinearLayout leftItemLayout;
+    protected TextView titleText;
+    protected TextView messageText;
+    protected TextView timelineText;
+    protected TextView unreadText;
+    protected ConversationIconView conversationIconView;
+
+
+    public ConversationCustomHolder(View itemView) {
+        super(itemView);
+        leftItemLayout = rootView.findViewById(R.id.item_left);
+        conversationIconView = rootView.findViewById(R.id.conversation_icon);
+        titleText = rootView.findViewById(R.id.conversation_title);
+        messageText = rootView.findViewById(R.id.conversation_last_msg);
+        timelineText = rootView.findViewById(R.id.conversation_time);
+        unreadText = rootView.findViewById(R.id.conversation_unread);
+    }
+
+    @Override
+    public void layoutViews(ConversationInfo conversation, int position) {
+        if (conversation.isTop()) {
+            leftItemLayout.setBackgroundColor(rootView.getResources().getColor(R.color.conversation_item_top_color));
+        } else {
+            leftItemLayout.setBackgroundColor(Color.WHITE);
+        }
+        conversationIconView.setConversation(conversation);
+
+        titleText.setText(conversation.getTitle());
+        messageText.setText("");
+        timelineText.setText("");
+
+        if (conversation.getUnRead() > 0) {
+            unreadText.setVisibility(View.VISIBLE);
+            if (conversation.getUnRead() > 99) {
+                unreadText.setText("99+");
+            } else {
+                unreadText.setText("" + conversation.getUnRead());
+            }
+        } else {
+            unreadText.setVisibility(View.GONE);
+        }
+
+        if (mAdapter.getItemDateTextSize() != 0) {
+            timelineText.setTextSize(mAdapter.getItemDateTextSize());
+        }
+        if (mAdapter.getItemBottomTextSize() != 0) {
+            messageText.setTextSize(mAdapter.getItemBottomTextSize());
+        }
+        if (mAdapter.getItemTopTextSize() != 0) {
+            titleText.setTextSize(mAdapter.getItemTopTextSize());
+        }
+
+    }
+
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ConversationIconView.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ConversationIconView.java
new file mode 100644
index 0000000..a066980
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ConversationIconView.java
@@ -0,0 +1,169 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.component.gatherimage.SynthesizedImageView;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.BackgroundTasks;
+import com.tencent.qcloud.tuicore.util.ImageUtil;
+import com.tencent.qcloud.tuicore.util.ThreadHelper;
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+import com.tencent.qcloud.tuikit.tuiconversation.presenter.ConversationIconPresenter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 会话列表头像View
+ */
+public class ConversationIconView extends RelativeLayout {
+
+    private ImageView mIconView;
+    private boolean showFoldedStyle = false;
+
+    private ConversationIconPresenter presenter;
+
+    public ConversationIconView(Context context) {
+        super(context);
+        init();
+    }
+
+    public ConversationIconView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public ConversationIconView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private void init() {
+        inflate(getContext(), com.tencent.qcloud.tuicore.R.layout.profile_icon_view, this);
+        mIconView = findViewById(com.tencent.qcloud.tuicore.R.id.profile_icon);
+        ((SynthesizedImageView) mIconView).defaultImage(TUIConfig.getDefaultAvatarImage());
+        presenter = new ConversationIconPresenter();
+    }
+
+    public void setShowFoldedStyle(boolean showFoldedStyle) {
+        this.showFoldedStyle = showFoldedStyle;
+    }
+
+    /**
+     * 设置会话头像的url
+     *
+     * @param iconUrls 头像url,最多只取前9个
+     */
+    public void setIconUrls(final List<Object> iconUrls, final String conversationId) {
+        // 需要在主线程中执行，以免写缓存出现问题
+        BackgroundTasks.getInstance().runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                if (mIconView instanceof SynthesizedImageView) {
+                    ((SynthesizedImageView) (mIconView)).displayImage(iconUrls).load(conversationId);
+                }
+            }
+        });
+    }
+
+    public void setConversation(ConversationInfo conversationInfo) {
+        if (showFoldedStyle && conversationInfo.isMarkFold()) {
+            mIconView.setImageResource(R.drawable.ic_fold);
+        } else if (mIconView instanceof SynthesizedImageView) {
+            ((SynthesizedImageView) (mIconView)).setImageId(conversationInfo.getConversationId());
+            if (conversationInfo.isGroup()) {
+                fillConversationUrlForGroup(conversationInfo);
+            } else {
+                setIconUrls(conversationInfo.getIconUrlList(), conversationInfo.getConversationId());
+            }
+        }
+    }
+
+    private void fillConversationUrlForGroup(final ConversationInfo info) {
+        List<Object> iconUrlList = info.getIconUrlList();
+        if (iconUrlList == null || iconUrlList.size() == 0) {
+            if (!TUIConfig.isEnableGroupGridAvatar()) {
+                List<Object> faceList = new ArrayList<>();
+                faceList.add(TUIConfig.getDefaultGroupAvatarImage());
+                setIconUrls(faceList, info.getConversationId());
+                return;
+            }
+            // 读取文件，在线程池中进行，避免主线程卡顿
+            ThreadHelper.INST.execute(new Runnable() {
+                @Override
+                public void run() {
+                    final String savedIcon = ImageUtil.getGroupConversationAvatar(info.getConversationId());
+                    if (TextUtils.isEmpty(savedIcon)) {
+                        fillFaceUrlList(info.getId(), info);
+                    } else {
+                        List<Object> list = new ArrayList<>();
+                        list.add(savedIcon);
+                        info.setIconUrlList(list);
+                        setIconUrls(list, info.getConversationId());
+                    }
+                }
+            });
+        } else {
+            if (!TUIConfig.isEnableGroupGridAvatar() && iconUrlList.size() > 1) {
+                List<Object> faceList = new ArrayList<>();
+                faceList.add(TUIConfig.getDefaultGroupAvatarImage());
+                setIconUrls(faceList, info.getConversationId());
+            } else {
+                setIconUrls(iconUrlList, info.getConversationId());
+            }
+        }
+    }
+
+    private void fillFaceUrlList(final String groupID, final ConversationInfo info) {
+        BackgroundTasks.getInstance().runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                clearImage();
+                presenter.getGroupMemberIconList(groupID, new IUIKitCallback<List<Object>>() {
+                    @Override
+                    public void onSuccess(List<Object> data) {
+                        info.setIconUrlList(data);
+                        setIconUrls(data, info.getConversationId());
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+
+                    }
+                });
+            }
+        });
+    }
+
+    public void setRadius(int radius) {
+        if (mIconView instanceof SynthesizedImageView) {
+            ((SynthesizedImageView) (mIconView)).setRadius(radius);
+        }
+    }
+
+    public void setDefaultImageResId(int resId) {
+        BitmapDrawable bd = (BitmapDrawable) getContext().getResources().getDrawable(resId);
+        mIconView.setImageBitmap(bd.getBitmap());
+    }
+
+    public void setBitmapResId(int resId) {
+        BitmapDrawable bd = (BitmapDrawable) getContext().getResources().getDrawable(resId);
+        Bitmap bitmap = ImageUtil.toRoundBitmap(bd.getBitmap());
+        mIconView.setImageBitmap(bitmap);
+    }
+
+    public void clearImage() {
+        if (mIconView instanceof SynthesizedImageView) {
+            ((SynthesizedImageView) mIconView).clear();
+        }
+    }
+}
+
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ConversationLayout.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ConversationLayout.java
new file mode 100644
index 0000000..ee34cab
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ConversationLayout.java
@@ -0,0 +1,249 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+import com.tencent.qcloud.tuikit.tuiconversation.interfaces.IConversationListAdapter;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.interfaces.IConversationLayout;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.page.ConversationMinimalistFragment;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.setting.ConversationLayoutSetting;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.swipe.Attributes;
+import com.tencent.qcloud.tuikit.tuiconversation.presenter.ConversationPresenter;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ConversationLayout extends RelativeLayout implements IConversationLayout {
+
+    private ConversationListLayout mConversationList;
+    private ViewGroup searchLayout;
+    private ConversationPresenter presenter;
+    private ImageView conversationEditView, createChatView;
+    private TextView conversationEditDoneView;
+    private ConversationMinimalistFragment.OnClickListener mClickListener = null;
+    private boolean isMultiSelected = false;
+    private List<ConversationInfo> mSelectConversations = new ArrayList<>();
+
+    public ConversationLayout(Context context) {
+        super(context);
+        init();
+    }
+
+    public ConversationLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public ConversationLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    public void setPresenter(ConversationPresenter presenter) {
+        this.presenter = presenter;
+        if (mConversationList != null) {
+            mConversationList.setPresenter(presenter);
+        }
+    }
+
+    /**
+     * 初始化相关UI元素
+     */
+    private void init() {
+        inflate(getContext(), R.layout.minimalistui_conversation_layout, this);
+        mConversationList = findViewById(R.id.conversation_list);
+        searchLayout = findViewById(R.id.search_layout);
+        conversationEditView = findViewById(R.id.edit_button);
+        createChatView = findViewById(R.id.create_new_button);
+        conversationEditDoneView = findViewById(R.id.edit_done);
+        mSelectConversations.clear();
+        conversationEditView.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (mClickListener != null) {
+                    mClickListener.onEditConversationStartClick();
+                }
+                conversationEditView.setVisibility(GONE);
+                conversationEditDoneView.setVisibility(VISIBLE);
+                createChatView.setVisibility(GONE);
+
+                conversationMutiSelectStart();
+            }
+        });
+        createChatView.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (mClickListener != null) {
+                    mClickListener.onStartChatClick();
+                }
+            }
+        });
+        conversationEditDoneView.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (mClickListener != null) {
+                    mClickListener.onEditConversationEndClick();
+                }
+                conversationEditView.setVisibility(VISIBLE);
+                conversationEditDoneView.setVisibility(GONE);
+                createChatView.setVisibility(VISIBLE);
+
+                conversationMutiSelectEnd();
+            }
+        });
+    }
+
+    public ImageView getCreateChatView() {
+        return createChatView;
+    }
+
+    public void resetTitileBar() {
+        conversationEditView.setVisibility(VISIBLE);
+        conversationEditDoneView.setVisibility(GONE);
+        createChatView.setVisibility(VISIBLE);
+        conversationMutiSelectEnd();
+    }
+
+    public void setOnClickListener(ConversationMinimalistFragment.OnClickListener listener) {
+        mClickListener = listener;
+    }
+    public boolean isMultiSelected() {
+        return isMultiSelected;
+    }
+
+    private void conversationMutiSelectStart() {
+        ConversationListAdapter adapter = mConversationList.getAdapter();
+        if (adapter != null) {
+            adapter.setShowMultiSelectCheckBox(true);
+            adapter.notifyDataSetChanged();
+            adapter.closeAllSwipeItems();
+            adapter.switchAllSwipeEnable(false);
+        }
+        isMultiSelected = true;
+        mSelectConversations.clear();
+    }
+
+    private void conversationMutiSelectEnd() {
+        ConversationListAdapter adapter = mConversationList.getAdapter();
+        if (adapter != null) {
+            adapter.setShowMultiSelectCheckBox(false);
+            adapter.notifyDataSetChanged();
+            adapter.closeAllSwipeItems();
+            adapter.switchAllSwipeEnable(true);
+        }
+        isMultiSelected = false;
+        mSelectConversations.clear();
+    }
+
+    public void initDefault() {
+        final ConversationListAdapter adapter = new ConversationListAdapter();
+        if (presenter != null) {
+            initSearchView(adapter);
+            adapter.setShowFoldedStyle(true);
+        }
+
+        mConversationList.setLayoutManager(new LinearLayoutManager(getContext()));
+        adapter.setMode(Attributes.Mode.Single);
+        mConversationList.setAdapter((IConversationListAdapter) adapter);
+        if (presenter != null) {
+            presenter.setAdapter(adapter);
+        }
+        ConversationLayoutSetting.customizeConversation(this);
+        mConversationList.loadConversation(0);
+    }
+
+    public void initSearchView(ConversationListAdapter adapter) {
+        Map<String, Object> param = new HashMap<>();
+        param.put(TUIConstants.TUIConversation.CONTEXT, getContext());
+        Map<String, Object> searchExtension = TUICore.getExtensionInfo(TUIConstants.TUIConversation.EXTENSION_MINIMALIST_SEARCH, param);
+        if (searchExtension != null) {
+            searchLayout.setVisibility(VISIBLE);
+            if (searchLayout.getChildCount() == 0) {
+                View searchView = (View) searchExtension.get(TUIConstants.TUIConversation.SEARCH_VIEW);
+                searchLayout.addView(searchView);
+            }
+        } else {
+            searchLayout.removeAllViews();
+            searchLayout.setVisibility(GONE);
+        }
+    }
+
+    @Override
+    public void setParentLayout(Object parent) {
+
+    }
+
+    @Override
+    public ConversationListLayout getConversationList() {
+        return mConversationList;
+    }
+
+    @Override
+    public void setConversationTop(ConversationInfo conversation, IUIKitCallback callBack) {
+        if (presenter != null) {
+            presenter.setConversationTop(conversation, callBack);
+        }
+    }
+
+    @Override
+    public void deleteConversation(ConversationInfo conversation) {
+        if (presenter != null) {
+            presenter.deleteConversation(conversation);
+        }
+    }
+
+    @Override
+    public void clearConversationMessage(ConversationInfo conversation) {
+        if (presenter != null) {
+            presenter.clearConversationMessage(conversation);
+        }
+    }
+
+    @Override
+    public void markConversationHidden(ConversationInfo conversation) {
+        if (presenter != null) {
+            presenter.markConversationHidden(conversation, true);
+        }
+    }
+
+    @Override
+    public void markConversationUnread(ConversationInfo conversationInfo, boolean markUnread) {
+        if (presenter != null) {
+            presenter.markConversationUnread(conversationInfo, markUnread);
+        }
+    }
+
+    @Override
+    public void hideFoldedItem(boolean needHide) {
+        if (presenter != null) {
+            presenter.hideFoldItem(needHide);
+        }
+    }
+
+    @Override
+    public void clearUnreadStatusOfFoldItem() {
+        if (presenter != null) {
+            presenter.setUnreadStatusOfFoldItem(false);
+        }
+    }
+
+    @Override
+    public TitleBarLayout getTitleBar() {
+        return null;
+    }
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ConversationListAdapter.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ConversationListAdapter.java
new file mode 100644
index 0000000..6871567
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ConversationListAdapter.java
@@ -0,0 +1,654 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget;
+
+import android.graphics.Color;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+import com.tencent.qcloud.tuikit.tuiconversation.TUIConversationService;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.interfaces.OnConversationAdapterListener;
+import com.tencent.qcloud.tuikit.tuiconversation.interfaces.IConversationListAdapter;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.swipe.RecyclerSwipeAdapter;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.swipe.SimpleSwipeListener;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.swipe.SwipeLayout;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+public class ConversationListAdapter extends RecyclerSwipeAdapter<RecyclerView.ViewHolder> implements IConversationListAdapter {
+
+    public static final int ITEM_TYPE_HEADER_HIDE = 101;
+    public static final int ITEM_TYPE_FOOTER_LOADING = -99;
+    public static final int HEADER_COUNT = 1;
+    public static final int FOOTER_COUNT = 1;
+    public static final int SELECT_COUNT = 1;
+    public static final int SELECT_LABEL_COUNT = 1;
+
+    private boolean mHasShowUnreadDot = true;
+    private int mItemAvatarRadius = ScreenUtil.getPxByDp(5);
+    private int mTopTextSize;
+    private int mBottomTextSize;
+    private int mDateTextSize;
+    protected List<ConversationInfo> mDataSource = new ArrayList<>();
+    private OnConversationAdapterListener mOnConversationAdapterListener;
+
+    //消息转发
+    private final HashMap<String, Boolean> mSelectedPositions = new HashMap<>();
+    private boolean isShowMultiSelectCheckBox = false;
+    private boolean isForwardFragment = false;
+
+    private boolean mIsLoading = false;
+
+    // 长按高亮显示
+    private boolean isClick = false;
+    private int currentPosition = -1;
+
+    private View hideView;
+    // 展示折叠样式
+    private boolean showFoldedStyle = true;
+    public ConversationListAdapter() {
+
+    }
+
+    public int getCurrentPosition() {
+        return currentPosition;
+    }
+
+    public boolean isClick() {
+        return isClick;
+    }
+
+    public void setClick(boolean click) {
+        isClick = click;
+    }
+
+    public void setCurrentPosition(int currentPosition , boolean isClick) {
+        this.currentPosition = currentPosition;
+        this.isClick = isClick;
+    }
+
+    public void setShowMultiSelectCheckBox(boolean show) {
+        isShowMultiSelectCheckBox = show;
+
+        if (!isShowMultiSelectCheckBox) {
+            mSelectedPositions.clear();
+        }
+    }
+
+    public void setForwardFragment(boolean forwardFragment) {
+        isForwardFragment = forwardFragment;
+    }
+
+    public void setShowFoldedStyle(boolean showFoldedStyle) {
+        this.showFoldedStyle = showFoldedStyle;
+    }
+
+    //设置给定位置条目的选择状态
+    public void setItemChecked(String conversationId, boolean isChecked) {
+        mSelectedPositions.put(conversationId, isChecked);
+    }
+
+    //根据位置判断条目是否选中
+    private boolean isItemChecked(String id) {
+        if (mSelectedPositions.size() <= 0) {
+            return false;
+        }
+
+        if (mSelectedPositions.containsKey(id)) {
+            return mSelectedPositions.get(id);
+        } else {
+            return false;
+        }
+    }
+
+    // 获得选中条目的结果
+    public List<ConversationInfo> getSelectedItem() {
+        if (mSelectedPositions.size() == 0) {
+            return null;
+        }
+        List<ConversationInfo> selectList = new ArrayList<>();
+        for (int i = 0; i < getItemCount() - 1; i++) {
+            ConversationInfo conversationInfo = getItem(i);
+            if (conversationInfo == null) {
+                continue;
+            }
+            if (isItemChecked(conversationInfo.getConversationId())) {
+                selectList.add(conversationInfo);
+            }
+        }
+        return selectList;
+    }
+
+    public void setSelectConversations(List<ConversationInfo> dataSource){
+        if(dataSource == null || dataSource.size() == 0){
+            mSelectedPositions.clear();
+            notifyDataSetChanged();
+            return;
+        }
+
+        mSelectedPositions.clear();
+        for (int i = 0; i < dataSource.size(); i++) {
+            for (int j =0; j<mDataSource.size(); j++){
+                if (TextUtils.equals(dataSource.get(i).getConversationId(), mDataSource.get(j).getConversationId())){
+                    setItemChecked(mDataSource.get(j).getConversationId(), true);
+                    notifyDataSetChanged();
+                    break;
+                }
+            }
+        }
+    }
+
+    public void setOnConversationAdapterListener(OnConversationAdapterListener listener) {
+        this.mOnConversationAdapterListener = listener;
+    }
+
+    @Override
+    public void onDataSourceChanged(List<ConversationInfo> dataSource) {
+        this.mDataSource = dataSource;
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        LayoutInflater inflater = LayoutInflater.from(parent.getContext());
+        ConversationBaseHolder holder = null;
+        // 创建不同的 ViewHolder
+        View view;
+        // 根据ViewType来创建条目
+        if (viewType == ITEM_TYPE_HEADER_HIDE) {
+            // 如果 searchView 不显示，添加一个隐藏的 view，防止 recyclerview 自动滑到最底部
+            return new HeaderViewHolder(new View(parent.getContext()));
+        } else if (viewType == ConversationInfo.TYPE_CUSTOM) {
+            view = inflater.inflate(R.layout.conversation_custom_adapter, parent, false);
+            holder = new ConversationCustomHolder(view);
+        } else if (viewType == ITEM_TYPE_FOOTER_LOADING) {
+            view = inflater.inflate(R.layout.loading_progress_bar, parent, false);
+            return new FooterViewHolder(view);
+        } else if (viewType == ConversationInfo.TYPE_FORWAR_SELECT) {
+            view = inflater.inflate(R.layout.conversation_forward_select_adapter, parent, false);
+            return new ForwardSelectHolder(view);
+        }  else if (viewType == ConversationInfo.TYPE_RECENT_LABEL) {
+            view = inflater.inflate(R.layout.conversation_forward_label_adapter, parent, false);
+            return new ForwardLabelHolder(view);
+        } else {
+            view = inflater.inflate(R.layout.minimalistui_conversation_list_item_layout, parent, false);
+            holder = new ConversationCommonHolder(view);
+            ((ConversationCommonHolder) holder).setForwardMode(isForwardFragment);
+            ((ConversationCommonHolder) holder).setShowFoldedStyle(showFoldedStyle);
+        }
+        holder.setAdapter(this);
+        return holder;
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, final int position) {
+        final ConversationInfo conversationInfo = getItem(position);
+        ConversationBaseHolder baseHolder = null;
+        if (conversationInfo != null) {
+            baseHolder = (ConversationBaseHolder) holder;
+        }
+
+        switch (getItemViewType(position)) {
+            case ConversationInfo.TYPE_CUSTOM:
+            case ConversationInfo.TYPE_RECENT_LABEL:
+                break;
+            case ITEM_TYPE_FOOTER_LOADING: {
+                if (holder instanceof FooterViewHolder) {
+                    ((ConversationBaseHolder) holder).layoutViews(null, position);
+                }
+                break;
+            }
+            case ConversationInfo.TYPE_FORWAR_SELECT : {
+                ForwardSelectHolder selectHolder = (ForwardSelectHolder) holder;
+                selectHolder.refreshTitle(!isShowMultiSelectCheckBox);
+                setOnClickListener(holder, getItemViewType(position), conversationInfo);
+                break;
+            }
+            default: {
+                if (baseHolder instanceof ConversationCommonHolder) {
+                    ConversationCommonHolder viewHolder = (ConversationCommonHolder) baseHolder;
+                    viewHolder.swipeLayout.setShowMode(SwipeLayout.ShowMode.LayDown);
+                    if (conversationInfo.isMarkFold()) {
+                        viewHolder.swipeLayout.setOnDoubleClickListener(new SwipeLayout.DoubleClickListener() {
+                            @Override
+                            public void onDoubleClick(SwipeLayout layout, boolean surface) {
+
+                            }
+
+                            @Override
+                            public void onClick() {
+                                if (mOnConversationAdapterListener != null) {
+                                    mOnConversationAdapterListener.onItemClick(viewHolder.itemView, getItemViewType(position), conversationInfo);
+                                }
+                            }
+                        });
+
+                        viewHolder.markReadView.setVisibility(View.GONE);
+                        viewHolder.moreView.setVisibility(View.GONE);
+                        viewHolder.notDisplayView.setVisibility(View.VISIBLE);
+                        viewHolder.notDisplayView.setOnClickListener(new View.OnClickListener() {
+                            @Override
+                            public void onClick(View view) {
+                                if (mOnConversationAdapterListener != null) {
+                                    mItemManger.removeShownLayouts(viewHolder.swipeLayout);
+                                    mOnConversationAdapterListener.onMarkConversationHidden(view, conversationInfo);
+                                }
+                                mItemManger.closeAllSwipeItems();
+                            }
+                        });
+                        mItemManger.bind(viewHolder.itemView, position);
+                    } else {
+                        viewHolder.notDisplayView.setVisibility(View.GONE);
+                        viewHolder.markReadView.setVisibility(View.VISIBLE);
+                        viewHolder.moreView.setVisibility(View.VISIBLE);
+                        viewHolder.swipeLayout.addSwipeListener(new SimpleSwipeListener() {
+                            @Override
+                            public void onOpen(SwipeLayout layout) {
+                                if (mOnConversationAdapterListener != null) {
+                                    mOnConversationAdapterListener.onSwipeConversationChanged(conversationInfo);
+                                }
+                            }
+
+                            @Override
+                            public void onClose(SwipeLayout layout) {
+                                if (mOnConversationAdapterListener != null) {
+                                    mOnConversationAdapterListener.onSwipeConversationChanged(null);
+                                }
+                            }
+
+                            @Override
+                            public void onStartOpen(SwipeLayout layout) {
+                                int unReadNum = conversationInfo.getUnRead();
+                                boolean isMarkUnread = conversationInfo.isMarkUnread();
+                                if (unReadNum > 0) {
+                                    viewHolder.markReadTextView.setText(R.string.mark_read);
+                                    viewHolder.markReadView.setBackgroundColor(viewHolder.itemView.getResources().getColor(R.color.conversation_mark_swipe_bg));
+                                    viewHolder.markReadIconView.setBackgroundResource(R.drawable.conversation_minimalist_message_status_send_all_read);
+                                } else {
+                                    if (isMarkUnread) {
+                                        viewHolder.markReadTextView.setText(R.string.mark_read);
+                                        viewHolder.markReadView.setBackgroundColor(viewHolder.itemView.getResources().getColor(R.color.conversation_mark_swipe_bg));
+                                        viewHolder.markReadIconView.setBackgroundResource(R.drawable.conversation_minimalist_message_status_send_all_read);
+                                    } else {
+                                        viewHolder.markReadTextView.setText(R.string.mark_unread);
+                                        viewHolder.markReadView.setBackgroundColor(viewHolder.itemView.getResources().getColor(R.color.conversation_mark_swipe_dark_bg));
+                                        viewHolder.markReadIconView.setBackgroundResource(R.drawable.conversation_minimalist_message_status_send_no_read);
+                                    }
+                                }
+                            }
+                        });
+                        viewHolder.swipeLayout.setOnDoubleClickListener(new SwipeLayout.DoubleClickListener() {
+                            @Override
+                            public void onDoubleClick(SwipeLayout layout, boolean surface) {
+
+                            }
+
+                            @Override
+                            public void onClick() {
+                                if (mOnConversationAdapterListener != null) {
+                                    mOnConversationAdapterListener.onItemClick(viewHolder.itemView, getItemViewType(position), conversationInfo);
+                                }
+                            }
+                        });
+
+                        viewHolder.markReadView.setOnClickListener(new View.OnClickListener() {
+                            @Override
+                            public void onClick(View view) {
+                                if (mOnConversationAdapterListener != null) {
+                                    boolean markRead = TUIConversationService.getAppContext().getString(R.string.mark_read).equals(viewHolder.markReadTextView.getText());
+                                    mOnConversationAdapterListener.onMarkConversationUnread(view, conversationInfo, !markRead);
+                                }
+                                mItemManger.closeAllSwipeItems();
+                            }
+                        });
+
+                        viewHolder.moreView.setOnClickListener(new View.OnClickListener() {
+                            @Override
+                            public void onClick(View view) {
+                                if (mOnConversationAdapterListener != null) {
+                                    mOnConversationAdapterListener.onClickMoreView(view, conversationInfo);
+                                }
+                                mItemManger.closeAllSwipeItems();
+                            }
+                        });
+
+                        mItemManger.bind(viewHolder.itemView, position);
+                    }
+                } else {
+                    setOnClickListener(holder, getItemViewType(position), conversationInfo);
+                }
+            }
+        }
+        if (baseHolder != null) {
+            baseHolder.layoutViews(conversationInfo, position);
+            setCheckBoxStatus(conversationInfo, position, baseHolder);
+        }
+
+        if (getCurrentPosition() == position && isClick()){
+            baseHolder.itemView.setBackgroundResource(R.color.conversation_item_clicked_color);
+        } else {
+            if (conversationInfo == null) {
+                return;
+            }
+            if (conversationInfo.isTop() && !isForwardFragment) {
+                baseHolder.itemView.setBackgroundColor(baseHolder.rootView.getResources().getColor(R.color.conversation_item_top_color));
+            } else {
+                baseHolder.itemView.setBackgroundColor(Color.WHITE);
+            }
+        }
+
+    }
+
+    private void setOnClickListener(RecyclerView.ViewHolder holder, int viewType, ConversationInfo conversationInfo) {
+        if (holder instanceof HeaderViewHolder) {
+            return;
+        }
+        //设置点击和长按事件
+        if (mOnConversationAdapterListener != null) {
+            holder.itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    mOnConversationAdapterListener.onItemClick(view, viewType, conversationInfo);
+                }
+            });
+
+            holder.itemView.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View view) {
+                    mOnConversationAdapterListener.OnItemLongClick(view, conversationInfo);
+                    int position = getIndexInAdapter(conversationInfo);
+                    if (position != -1) {
+                        setCurrentPosition(position, true);
+                        notifyItemChanged(position);
+                    }
+                    return true;
+                }
+            });
+        }
+    }
+
+    // 设置多选框的选中状态和点击事件
+    private void setCheckBoxStatus(final ConversationInfo conversationInfo, int position, ConversationBaseHolder baseHolder) {
+        if (!(baseHolder instanceof ConversationCommonHolder) || ((ConversationCommonHolder) baseHolder).multiSelectCheckBox == null) {
+            return;
+        }
+        int viewType = getItemViewType(position);
+        String conversationId = conversationInfo.getConversationId();
+        ConversationCommonHolder commonHolder = (ConversationCommonHolder) baseHolder;
+        if (!isShowMultiSelectCheckBox || conversationInfo.isMarkFold()) {
+            commonHolder.multiSelectCheckBox.setVisibility(View.GONE);
+            baseHolder.itemView.setOnClickListener(null);
+        } else {
+            commonHolder.multiSelectCheckBox.setVisibility(View.VISIBLE);
+
+            //设置条目状态
+            commonHolder.multiSelectCheckBox.setChecked(isItemChecked(conversationId));
+            //checkBox的监听
+            commonHolder.multiSelectCheckBox.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    setItemChecked(conversationId, !isItemChecked(conversationId));
+                    if (mOnConversationAdapterListener != null) {
+                        mOnConversationAdapterListener.onItemClick(v, viewType, conversationInfo);
+                    }
+                }
+            });
+
+            //条目view的监听
+            baseHolder.itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    setItemChecked(conversationId, !isItemChecked(conversationId));
+                    int currentPosition = getIndexInAdapter(conversationInfo);
+                    if (currentPosition != -1) {
+                        notifyItemChanged(currentPosition);
+                    }
+                    if (mOnConversationAdapterListener != null) {
+                        mOnConversationAdapterListener.onItemClick(v, viewType, conversationInfo);
+                    }
+                }
+            });
+        }
+    }
+
+    public int getIndexInAdapter(ConversationInfo conversationInfo) {
+        int position = -1;
+        if (mDataSource != null) {
+            int indexInData = mDataSource.indexOf(conversationInfo);
+            if (indexInData != -1) {
+                position = getItemIndexInAdapter(indexInData);
+            }
+        }
+        return position;
+    }
+
+    @Override
+    public void onViewRecycled(@NonNull RecyclerView.ViewHolder holder) {
+        // ViewHolder 被回收时要清空头像 view 并且停止异步加载头像
+        if (holder instanceof ConversationCommonHolder) {
+            ((ConversationCommonHolder) holder).conversationIconView.clearImage();
+        }
+    }
+
+    public ConversationInfo getItem(int position) {
+        if (mDataSource.isEmpty() || position == getItemCount() - 1) {
+            return null;
+        }
+
+        int dataPosition;
+        if (isForwardFragment) {
+            dataPosition = position - SELECT_COUNT - SELECT_LABEL_COUNT;
+        } else {
+            dataPosition = position - HEADER_COUNT;
+        }
+        if (dataPosition < mDataSource.size() && dataPosition >= 0) {
+            return mDataSource.get(dataPosition);
+        }
+
+        return null;
+    }
+
+    @Override
+    public int getItemCount() {
+        int listSize = mDataSource.size();
+        if (isForwardFragment) {
+            return listSize + SELECT_COUNT + SELECT_LABEL_COUNT + FOOTER_COUNT;
+        }
+        return listSize + HEADER_COUNT + FOOTER_COUNT;
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        if (isForwardFragment) {
+            if (position == 0) {
+                return ConversationInfo.TYPE_FORWAR_SELECT;
+            } else if (position == 1) {
+                return ConversationInfo.TYPE_RECENT_LABEL;
+            }
+        } else {
+            if (position == 0) {
+                return ITEM_TYPE_HEADER_HIDE;
+            }
+        }
+        if (position == getItemCount() - 1) {
+            return ITEM_TYPE_FOOTER_LOADING;
+        } else if (mDataSource != null) {
+            ConversationInfo conversationInfo = getItem(position);
+            if (conversationInfo != null) {
+                return conversationInfo.getType();
+            }
+        }
+        return ConversationInfo.TYPE_COMMON;
+    }
+
+    private int getItemIndexInAdapter(int index) {
+        int itemIndex;
+        if (isForwardFragment) {
+            itemIndex = index + SELECT_LABEL_COUNT + SELECT_COUNT;
+        } else {
+            itemIndex = index + HEADER_COUNT;
+        }
+        return itemIndex;
+    }
+
+    @Override
+    public void onItemRemoved(int position) {
+        int itemIndex = getItemIndexInAdapter(position);
+        notifyItemRemoved(itemIndex);
+    }
+
+    @Override
+    public void onItemInserted(int position) {
+        int itemIndex = getItemIndexInAdapter(position);
+        notifyItemInserted(itemIndex);
+    }
+
+    @Override
+    public void onItemChanged(int position) {
+        int itemIndex = getItemIndexInAdapter(position);
+        notifyItemChanged(itemIndex);
+    }
+
+    @Override
+    public void onItemRangeChanged(int startPosition, int count) {
+        int itemStartIndex = getItemIndexInAdapter(startPosition);
+        notifyItemRangeChanged(itemStartIndex, count);
+    }
+
+    @Override
+    public void onConversationChanged(List<ConversationInfo> conversationInfoList) {
+        if (mOnConversationAdapterListener != null) {
+            mOnConversationAdapterListener.onConversationChanged(conversationInfoList);
+        }
+    }
+
+    public void setItemTopTextSize(int size) {
+        mTopTextSize = size;
+    }
+
+    public int getItemTopTextSize() {
+        return mTopTextSize;
+    }
+
+    public void setItemBottomTextSize(int size) {
+        mBottomTextSize = size;
+    }
+
+    public int getItemBottomTextSize() {
+        return mBottomTextSize;
+    }
+
+    public void setItemDateTextSize(int size) {
+        mDateTextSize = size;
+    }
+
+    public int getItemDateTextSize() {
+        return mDateTextSize;
+    }
+
+    public void setItemAvatarRadius(int radius) {
+        mItemAvatarRadius = radius;
+    }
+
+    public int getItemAvatarRadius() {
+        return mItemAvatarRadius;
+    }
+
+    public void disableItemUnreadDot(boolean flag) {
+        mHasShowUnreadDot = !flag;
+    }
+
+    public boolean hasItemUnreadDot() {
+        return mHasShowUnreadDot;
+    }
+
+    @Override
+    public void onLoadingStateChanged(boolean isLoading) {
+        this.mIsLoading = isLoading;
+        notifyItemChanged(getItemCount() - 1);
+    }
+
+    @Override
+    public void onViewNeedRefresh() {
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public int getSwipeLayoutResourceId(int position) {
+        return R.id.swipe;
+    }
+
+    //header
+    static class HeaderViewHolder extends RecyclerView.ViewHolder {
+        public HeaderViewHolder(@NonNull View itemView) {
+            super(itemView);
+        }
+    }
+
+    //footer
+    class FooterViewHolder extends ConversationBaseHolder {
+        public FooterViewHolder(@NonNull View itemView) {
+            super(itemView);
+        }
+
+        @Override
+        public void layoutViews(ConversationInfo conversationInfo, int position) {
+            RecyclerView.LayoutParams param = (RecyclerView.LayoutParams) rootView.getLayoutParams();
+            if (mIsLoading) {
+                param.height = LinearLayout.LayoutParams.WRAP_CONTENT;
+                param.width = LinearLayout.LayoutParams.MATCH_PARENT;
+                rootView.setVisibility(View.VISIBLE);
+            } else {
+                param.height = 0;
+                param.width = 0;
+                rootView.setVisibility(View.GONE);
+            }
+            rootView.setLayoutParams(param);
+        }
+    }
+
+    static class ForwardLabelHolder extends ConversationBaseHolder {
+        public ForwardLabelHolder(View itemView) {
+            super(itemView);
+        }
+
+        @Override
+        public void layoutViews(ConversationInfo conversationInfo, int position) {
+
+        }
+    }
+
+    static class ForwardSelectHolder extends ConversationBaseHolder {
+        private final TextView titleView;
+        public ForwardSelectHolder(View itemView) {
+            super(itemView);
+            titleView = itemView.findViewById(R.id.forward_title);
+        }
+
+        @Override
+        public void layoutViews(ConversationInfo conversationInfo, int position) {
+
+        }
+
+        public void refreshTitle(boolean isCreateGroup){
+            if (titleView == null)return;
+
+            if (isCreateGroup){
+                titleView.setText(TUIConversationService.getAppContext().getString(R.string.forward_select_new_chat));
+            } else {
+                titleView.setText(TUIConversationService.getAppContext().getString(R.string.forward_select_from_contact));
+            }
+        }
+    }
+
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ConversationListLayout.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ConversationListLayout.java
new file mode 100644
index 0000000..1daee91
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ConversationListLayout.java
@@ -0,0 +1,142 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.SimpleItemAnimator;
+
+import com.tencent.qcloud.tuicore.component.CustomLinearLayoutManager;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.interfaces.OnConversationAdapterListener;
+import com.tencent.qcloud.tuikit.tuiconversation.interfaces.IConversationListAdapter;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.interfaces.IConversationListLayout;
+import com.tencent.qcloud.tuikit.tuiconversation.presenter.ConversationPresenter;
+
+public class ConversationListLayout extends RecyclerView implements IConversationListLayout {
+
+    private ConversationListAdapter mAdapter;
+    private ConversationPresenter presenter;
+    private boolean isFolded = false;
+
+    public ConversationListLayout(Context context) {
+        super(context);
+        init();
+    }
+
+    public ConversationListLayout(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public ConversationListLayout(Context context, @Nullable AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init();
+    }
+
+    public void setPresenter(ConversationPresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    public void init() {
+        setLayoutFrozen(false);
+        setItemViewCacheSize(0);
+        setHasFixedSize(true);
+        setFocusableInTouchMode(false);
+        CustomLinearLayoutManager linearLayoutManager = new CustomLinearLayoutManager(getContext());
+        linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
+        setLayoutManager(linearLayoutManager);
+        SimpleItemAnimator animator = (SimpleItemAnimator) getItemAnimator();
+        if (animator != null) {
+            animator.setSupportsChangeAnimations(false);
+        }
+    }
+
+    @Override
+    public void setBackground(int resId) {
+        setBackgroundColor(resId);
+    }
+
+    @Override
+    public void disableItemUnreadDot(boolean flag) {
+        mAdapter.disableItemUnreadDot(flag);
+    }
+
+    @Override
+    public void setItemAvatarRadius(int radius) {
+        mAdapter.setItemAvatarRadius(radius);
+    }
+
+    @Override
+    public void setItemTopTextSize(int size) {
+        mAdapter.setItemTopTextSize(size);
+    }
+
+    @Override
+    public void setItemBottomTextSize(int size) {
+        mAdapter.setItemBottomTextSize(size);
+    }
+
+    @Override
+    public void setItemDateTextSize(int size) {
+        mAdapter.setItemDateTextSize(size);
+    }
+
+    @Override
+    public ConversationListLayout getListLayout() {
+        return this;
+    }
+
+    @Override
+    public ConversationListAdapter getAdapter() {
+        return mAdapter;
+    }
+
+    @Override
+    public void setAdapter(IConversationListAdapter adapter) {
+        if (adapter instanceof ConversationListAdapter) {
+            super.setAdapter((ConversationListAdapter) adapter);
+            mAdapter = (ConversationListAdapter) adapter;
+        }
+    }
+
+    @Override
+    public void setOnConversationAdapterListener(OnConversationAdapterListener listener){
+        mAdapter.setOnConversationAdapterListener(listener);
+    }
+
+    @Override
+    public void onScrollStateChanged(int state) {
+        super.onScrollStateChanged(state);
+        if (state == RecyclerView.SCROLL_STATE_IDLE) {
+            LinearLayoutManager layoutManager = (LinearLayoutManager) getLayoutManager();
+            if (layoutManager == null) {
+                return;
+            }
+            int lastPosition = layoutManager.findLastCompletelyVisibleItemPosition();
+
+            if (mAdapter != null) {
+                if (lastPosition == mAdapter.getItemCount() - 1 && !isLoadCompleted()) {
+                    mAdapter.onLoadingStateChanged(true);
+                    if (presenter != null) {
+                        presenter.loadMoreConversation();
+                    }
+                }
+            }
+        }
+    }
+
+    public void loadConversation(long nextSeq) {
+        if (presenter != null) {
+            presenter.loadConversation(nextSeq);
+        }
+    }
+
+    boolean isLoadCompleted(){
+        if (presenter != null) {
+            return presenter.isLoadFinished();
+        }
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/FoldedConversationLayout.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/FoldedConversationLayout.java
new file mode 100644
index 0000000..170c6e3
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/FoldedConversationLayout.java
@@ -0,0 +1,112 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.RelativeLayout;
+
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+import com.tencent.qcloud.tuikit.tuiconversation.interfaces.IConversationListAdapter;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.interfaces.IConversationLayout;
+import com.tencent.qcloud.tuikit.tuiconversation.presenter.ConversationFoldPresenter;
+
+public class FoldedConversationLayout extends RelativeLayout implements IConversationLayout {
+    private TitleBarLayout titleBarLayout;
+    private FoldedConversationListLayout conversationListLayout;
+    private ConversationFoldPresenter presenter;
+
+    public FoldedConversationLayout(Context context) {
+        super(context);
+        init();
+    }
+
+    public FoldedConversationLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public FoldedConversationLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    public void setPresenter(ConversationFoldPresenter presenter) {
+        this.presenter = presenter;
+        if (conversationListLayout != null) {
+            conversationListLayout.setPresenter(presenter);
+        }
+    }
+
+    private void init() {
+        inflate(getContext(), R.layout.minimalist_folded_layout, this);
+        titleBarLayout = findViewById(R.id.conversation_title);
+        conversationListLayout = findViewById(R.id.folded_conversation_list);
+    }
+
+    public void initDefault() {
+        final ConversationListAdapter adapter = new ConversationListAdapter();
+        conversationListLayout.setAdapter((IConversationListAdapter) adapter);
+        adapter.setShowFoldedStyle(false);
+        if (presenter != null) {
+            presenter.setAdapter(adapter);
+        }
+        conversationListLayout.loadConversation();
+    }
+
+    @Override
+    public FoldedConversationListLayout getConversationList() {
+        return conversationListLayout;
+    }
+
+    @Override
+    public void setConversationTop(ConversationInfo conversation, IUIKitCallback callBack) {
+    }
+
+    @Override
+    public void deleteConversation(ConversationInfo conversation) {
+        if (presenter != null) {
+            presenter.deleteConversation(conversation);
+        }
+    }
+
+    @Override
+    public void clearConversationMessage(ConversationInfo conversation) {
+
+    }
+
+    @Override
+    public void markConversationHidden(ConversationInfo conversation) {
+        if (presenter != null) {
+            presenter.markConversationHidden(conversation, true);
+        }
+    }
+
+    @Override
+    public void markConversationUnread(ConversationInfo conversationInfo, boolean markUnread) {
+        if (presenter != null) {
+            presenter.markConversationUnread(conversationInfo, markUnread);
+        }
+    }
+
+    @Override
+    public void hideFoldedItem(boolean needHide) {
+        
+    }
+
+    @Override
+    public void clearUnreadStatusOfFoldItem() {
+
+    }
+
+    @Override
+    public TitleBarLayout getTitleBar() {
+        return titleBarLayout;
+    }
+
+    @Override
+    public void setParentLayout(Object parent) {
+
+    }
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/FoldedConversationListLayout.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/FoldedConversationListLayout.java
new file mode 100644
index 0000000..0a36ee3
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/FoldedConversationListLayout.java
@@ -0,0 +1,114 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.SimpleItemAnimator;
+
+import com.tencent.qcloud.tuicore.component.CustomLinearLayoutManager;
+import com.tencent.qcloud.tuikit.tuiconversation.interfaces.IConversationListAdapter;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.interfaces.IConversationListLayout;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.interfaces.OnConversationAdapterListener;
+import com.tencent.qcloud.tuikit.tuiconversation.presenter.ConversationFoldPresenter;
+
+public class FoldedConversationListLayout extends RecyclerView implements IConversationListLayout {
+
+    private ConversationListAdapter mAdapter;
+    private ConversationFoldPresenter presenter;
+    private boolean isFolded = false;
+
+    public FoldedConversationListLayout(Context context) {
+        super(context);
+        init();
+    }
+
+    public FoldedConversationListLayout(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public FoldedConversationListLayout(Context context, @Nullable AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init();
+    }
+
+    public void setPresenter(ConversationFoldPresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    public void init() {
+        setLayoutFrozen(false);
+        setItemViewCacheSize(0);
+        setHasFixedSize(true);
+        setFocusableInTouchMode(false);
+        CustomLinearLayoutManager linearLayoutManager = new CustomLinearLayoutManager(getContext());
+        linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
+        setLayoutManager(linearLayoutManager);
+        SimpleItemAnimator animator = (SimpleItemAnimator) getItemAnimator();
+        if (animator != null) {
+            animator.setSupportsChangeAnimations(false);
+        }
+    }
+
+    @Override
+    public void setBackground(int resId) {
+        setBackgroundColor(resId);
+    }
+
+    @Override
+    public void disableItemUnreadDot(boolean flag) {
+        mAdapter.disableItemUnreadDot(flag);
+    }
+
+    @Override
+    public void setItemAvatarRadius(int radius) {
+        mAdapter.setItemAvatarRadius(radius);
+    }
+
+    @Override
+    public void setItemTopTextSize(int size) {
+        mAdapter.setItemTopTextSize(size);
+    }
+
+    @Override
+    public void setItemBottomTextSize(int size) {
+        mAdapter.setItemBottomTextSize(size);
+    }
+
+    @Override
+    public void setItemDateTextSize(int size) {
+        mAdapter.setItemDateTextSize(size);
+    }
+
+    @Override
+    public FoldedConversationListLayout getListLayout() {
+        return this;
+    }
+
+    @Override
+    public ConversationListAdapter getAdapter() {
+        return mAdapter;
+    }
+
+    @Override
+    public void setAdapter(IConversationListAdapter adapter) {
+        if (adapter instanceof ConversationListAdapter) {
+            super.setAdapter((ConversationListAdapter) adapter);
+            mAdapter = (ConversationListAdapter) adapter;
+        }
+    }
+
+    @Override
+    public void setOnConversationAdapterListener(OnConversationAdapterListener listener) {
+        mAdapter.setOnConversationAdapterListener(listener);
+    }
+
+    public void loadConversation() {
+        if (presenter != null) {
+            presenter.loadConversation();
+        }
+    }
+}
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ForwardConversationSelectorAdapter.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ForwardConversationSelectorAdapter.java
new file mode 100644
index 0000000..f4b4703
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ForwardConversationSelectorAdapter.java
@@ -0,0 +1,85 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+
+import java.util.List;
+
+public class ForwardConversationSelectorAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>{
+    private Context context;
+    private List<ConversationInfo> list;
+    private OnItemClickListener mOnItemClickListener;
+
+    public ForwardConversationSelectorAdapter(Context context) {
+        this.context = context;
+    }
+
+    @Override
+    public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
+        super.onAttachedToRecyclerView(recyclerView);
+    }
+
+    @NonNull
+    @Override
+    public ConversationViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        return new ConversationViewHolder(LayoutInflater.from(context).inflate(R.layout.minimalist_forward_conversation_selector_item, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, final int position) {
+        ConversationViewHolder viewHolder = (ConversationViewHolder) holder;
+        viewHolder.conversationUserIconView.setVisibility(View.VISIBLE);
+        viewHolder.conversationUserIconView.setConversation(list.get(position));
+
+        viewHolder.conversationUserIconView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mOnItemClickListener.onClick(v, position);
+            }
+        });
+
+    }
+
+    public void setDataSource(List<ConversationInfo> dataSource) {
+        if (dataSource == null) {
+            if (list != null) {
+                list.clear();
+            }
+        } else {
+            list = dataSource;
+        }
+
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public int getItemCount() {
+        return list == null ? 0 : list.size();
+    }
+
+    public void setOnItemClickListener(OnItemClickListener listener) {
+        this.mOnItemClickListener = listener;
+    }
+
+    public interface OnItemClickListener {
+        void onClick(View view, int position);
+    }
+
+    static class ConversationViewHolder extends RecyclerView.ViewHolder {
+        public ConversationIconView conversationUserIconView;
+        public ConversationViewHolder(View itemView) {
+            super(itemView);
+            conversationUserIconView = itemView.findViewById(R.id.conversation_user_icon_view);
+        }
+    }
+}
+
+
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ForwardSelectLayout.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ForwardSelectLayout.java
new file mode 100644
index 0000000..b080d3c
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/ForwardSelectLayout.java
@@ -0,0 +1,106 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.RelativeLayout;
+
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+import com.tencent.qcloud.tuikit.tuiconversation.interfaces.IConversationListAdapter;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.interfaces.IConversationLayout;
+import com.tencent.qcloud.tuikit.tuiconversation.presenter.ConversationPresenter;
+
+public class ForwardSelectLayout extends RelativeLayout implements IConversationLayout {
+
+    private TitleBarLayout titleBarLayout;
+    private ConversationListLayout conversationList;
+    private ConversationPresenter presenter;
+
+    public ForwardSelectLayout(Context context) {
+        super(context);
+        init();
+    }
+
+    public ForwardSelectLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public ForwardSelectLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    public void setPresenter(ConversationPresenter presenter) {
+        this.presenter = presenter;
+        if (conversationList != null) {
+            conversationList.setPresenter(presenter);
+        }
+    }
+
+    /**
+     * 初始化相关UI元素
+     */
+    private void init() {
+        inflate(getContext(), R.layout.minimalist_forward_layout, this);
+        titleBarLayout = findViewById(R.id.conversation_title);
+        conversationList = findViewById(R.id.conversation_list);
+    }
+
+    public void initDefault() {
+        final ConversationListAdapter adapter = new ConversationListAdapter();
+        adapter.setForwardFragment(true);
+        conversationList.setAdapter((IConversationListAdapter) adapter);
+        presenter.setAdapter(adapter);
+        presenter.loadConversation(0);
+    }
+
+    public TitleBarLayout getTitleBar() {
+        return titleBarLayout;
+    }
+
+    @Override
+    public void setParentLayout(Object parent) {
+
+    }
+
+    @Override
+    public ConversationListLayout getConversationList() {
+        return conversationList;
+    }
+
+    @Override
+    public void setConversationTop(ConversationInfo conversation, IUIKitCallback callBack) {
+    }
+
+    @Override
+    public void deleteConversation(ConversationInfo conversation) {
+    }
+
+    @Override
+    public void clearConversationMessage(ConversationInfo conversation) {
+
+    }
+
+    @Override
+    public void markConversationHidden(ConversationInfo conversation) {
+
+    }
+
+    @Override
+    public void hideFoldedItem(boolean needHide) {
+
+    }
+
+    @Override
+    public void clearUnreadStatusOfFoldItem() {
+
+    }
+
+    @Override
+    public void markConversationUnread(ConversationInfo conversationInfo, boolean markRead) {
+
+    }
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/Menu.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/Menu.java
new file mode 100644
index 0000000..51995a9
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/Menu.java
@@ -0,0 +1,172 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget;
+
+import android.app.Activity;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PixelFormat;
+import android.graphics.RectF;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ListView;
+import android.widget.PopupWindow;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.R;
+import com.tencent.qcloud.tuicore.component.action.PopMenuAction;
+import com.tencent.qcloud.tuicore.component.action.PopMenuAdapter;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Menu {
+
+    private static final int SHADOW_WIDTH = 10;
+    private static final int Y_OFFSET = 4;
+
+    private ListView mMenuList;
+    private PopMenuAdapter mMenuAdapter;
+    private PopupWindow mMenuWindow;
+    private List<PopMenuAction> mActions = new ArrayList<>();
+    private Activity mActivity;
+    private View mAttachView;
+
+    public Menu(Activity activity, View attach) {
+        mActivity = activity;
+        mAttachView = attach;
+    }
+
+    public void setMenuAction(List<PopMenuAction> menuActions) {
+        mActions.clear();
+        mActions.addAll(menuActions);
+    }
+
+    public boolean isShowing() {
+        if (mMenuWindow == null) {
+            return false;
+        }
+        return mMenuWindow.isShowing();
+    }
+
+    public void hide() {
+        mMenuWindow.dismiss();
+    }
+
+    public void show() {
+        if (mActions == null || mActions.size() == 0) {
+            return;
+        }
+        mMenuWindow = new PopupWindow(mActivity);
+        mMenuWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
+        mMenuWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+        mMenuWindow.setBackgroundDrawable(new ColorDrawable());
+
+        mMenuAdapter = new PopMenuAdapter();
+        mMenuAdapter.setDataSource(mActions);
+        View menuView = LayoutInflater.from(mActivity).inflate(R.layout.core_pop_menu, null);
+        menuView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
+        mMenuWindow.setContentView(menuView);
+        mMenuList = menuView.findViewById(R.id.menu_pop_list);
+        mMenuList.setAdapter(mMenuAdapter);
+        mMenuList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                PopMenuAction action = (PopMenuAction) mMenuAdapter.getItem(position);
+                if (action != null && action.getActionClickListener() != null) {
+                    action.getActionClickListener().onActionClick(position, mActions.get(position));
+                }
+            }
+        });
+
+        int paddingLeftRight = ScreenUtil.dip2px(15.0f);
+        int paddingTopBottom = ScreenUtil.dip2px(12.0f);
+
+        int itemWidth = mActivity.getResources().getDimensionPixelSize(R.dimen.core_pop_menu_item_width);
+        int itemHeight = mActivity.getResources().getDimensionPixelSize(R.dimen.core_pop_menu_item_height);
+        float anchorWidth = mAttachView.getWidth();
+        float anchorHeight = mAttachView.getHeight();
+
+        mMenuWindow.getContentView().measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
+
+        int[] location = new int[2];
+        mAttachView.getLocationOnScreen(location);
+        int rowCount = mActions.size();
+        int indicatorHeight = mActivity.getResources().getDimensionPixelOffset(R.dimen.core_pop_menu_indicator_height);
+
+        int popWidth = itemWidth + paddingLeftRight * 2 - SHADOW_WIDTH;
+        int popHeight = itemHeight * rowCount + paddingTopBottom * 2 - SHADOW_WIDTH;
+
+        float indicatorX = anchorWidth / 2;
+        int screenWidth = ScreenUtil.getScreenWidth(mActivity);
+        int x = location[0];
+        int y;
+        float xOffset = anchorWidth / 2;
+        // If it is on the right, the x-coordinate of the small arrow and the x-position of the pop-up window will change
+        if (location[0] * 2 + anchorWidth > screenWidth) {
+            indicatorX = popWidth - anchorWidth / 2 - xOffset;
+            x = (int) (location[0] + anchorWidth - popWidth + xOffset);
+        }
+
+        y = (int) (location[1] + anchorHeight) + Y_OFFSET;
+        popHeight = popHeight - indicatorHeight;
+
+        Drawable backgroundDrawable = getBackgroundDrawable(popWidth, popHeight, indicatorX, indicatorHeight, 16);
+        menuView.setBackground(backgroundDrawable);
+
+        mMenuWindow.setFocusable(true);
+        mMenuWindow.setTouchable(true);
+        mMenuWindow.setOutsideTouchable(true);
+        mMenuWindow.showAtLocation(mAttachView, Gravity.NO_GRAVITY, x, y);
+    }
+
+    /**
+     * Draw a popup background with small triangles
+     */
+    public Drawable getBackgroundDrawable(final float widthPixel, final float heightPixel, float indicatorX, float indicatorHeight, float radius) {
+        int borderWidth = SHADOW_WIDTH;
+
+        Path path = new Path();
+        Drawable drawable = new Drawable() {
+
+            @Override
+            public void draw(@NonNull Canvas canvas) {
+                Paint paint = new Paint();
+                paint.setColor(Color.WHITE);
+                paint.setStyle(Paint.Style.FILL);
+                paint.setShadowLayer(borderWidth, 0,0,0xFFAAAAAA);
+                path.addRoundRect(new RectF(borderWidth, indicatorHeight + borderWidth, widthPixel - borderWidth, heightPixel + indicatorHeight - borderWidth), radius, radius, Path.Direction.CW);
+                path.moveTo(indicatorX - indicatorHeight, indicatorHeight + borderWidth);
+                path.lineTo(indicatorX, borderWidth);
+                path.lineTo(indicatorX + indicatorHeight, indicatorHeight + borderWidth);
+                path.close();
+                canvas.drawPath(path, paint);
+            }
+
+            @Override
+            public void setAlpha(int alpha) {
+
+            }
+
+            @Override
+            public void setColorFilter(@Nullable ColorFilter colorFilter) {
+
+            }
+
+            @Override
+            public int getOpacity() {
+                return PixelFormat.TRANSLUCENT;
+            }
+        };
+        return drawable;
+    }
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/swipe/Attributes.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/swipe/Attributes.java
new file mode 100644
index 0000000..3a39937
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/swipe/Attributes.java
@@ -0,0 +1,9 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.swipe;
+
+
+public class Attributes {
+
+    public enum Mode {
+        Single, Multiple
+    }
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/swipe/RecyclerSwipeAdapter.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/swipe/RecyclerSwipeAdapter.java
new file mode 100644
index 0000000..f999fd4
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/swipe/RecyclerSwipeAdapter.java
@@ -0,0 +1,84 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.swipe;
+
+import android.view.ViewGroup;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.swipe.Attributes;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.swipe.SwipeAdapterInterface;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.swipe.SwipeItemMangerImpl;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.swipe.SwipeItemMangerInterface;
+import com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.swipe.SwipeLayout;
+
+import java.util.List;
+
+public abstract class RecyclerSwipeAdapter<VH extends RecyclerView.ViewHolder> extends RecyclerView.Adapter<VH> implements SwipeItemMangerInterface, SwipeAdapterInterface {
+
+    public SwipeItemMangerImpl mItemManger = new SwipeItemMangerImpl(this);
+
+    @Override
+    public abstract VH onCreateViewHolder(ViewGroup parent, int viewType);
+
+    @Override
+    public abstract void onBindViewHolder(VH viewHolder, final int position);
+
+    @Override
+    public void notifyDatasetChanged() {
+        super.notifyDataSetChanged();
+    }
+
+    @Override
+    public void openItem(int position) {
+        mItemManger.openItem(position);
+    }
+
+    @Override
+    public void closeItem(int position) {
+        mItemManger.closeItem(position);
+    }
+
+    @Override
+    public void closeAllExcept(SwipeLayout layout) {
+        mItemManger.closeAllExcept(layout);
+    }
+
+    @Override
+    public void closeAllSwipeItems() {
+        mItemManger.closeAllSwipeItems();
+    }
+
+    @Override
+    public List<Integer> getOpenItems() {
+        return mItemManger.getOpenItems();
+    }
+
+    @Override
+    public List<SwipeLayout> getOpenLayouts() {
+        return mItemManger.getOpenLayouts();
+    }
+
+    @Override
+    public void removeShownLayouts(SwipeLayout layout) {
+        mItemManger.removeShownLayouts(layout);
+    }
+
+    @Override
+    public boolean isOpen(int position) {
+        return mItemManger.isOpen(position);
+    }
+
+    @Override
+    public Attributes.Mode getMode() {
+        return mItemManger.getMode();
+    }
+
+    @Override
+    public void setMode(Attributes.Mode mode) {
+        mItemManger.setMode(mode);
+    }
+
+    @Override
+    public void switchAllSwipeEnable(boolean enable) {
+        mItemManger.switchAllSwipeEnable(enable);
+    }
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/swipe/SimpleSwipeListener.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/swipe/SimpleSwipeListener.java
new file mode 100644
index 0000000..d0ad3e1
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/swipe/SimpleSwipeListener.java
@@ -0,0 +1,28 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.swipe;
+
+public class SimpleSwipeListener implements SwipeLayout.SwipeListener {
+
+    @Override
+    public void onStartOpen(SwipeLayout layout) {
+    }
+
+    @Override
+    public void onOpen(SwipeLayout layout) {
+    }
+
+    @Override
+    public void onStartClose(SwipeLayout layout) {
+    }
+
+    @Override
+    public void onClose(SwipeLayout layout) {
+    }
+
+    @Override
+    public void onUpdate(SwipeLayout layout, int leftOffset, int topOffset) {
+    }
+
+    @Override
+    public void onHandRelease(SwipeLayout layout, float xvel, float yvel) {
+    }
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/swipe/SwipeAdapterInterface.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/swipe/SwipeAdapterInterface.java
new file mode 100644
index 0000000..04fba86
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/swipe/SwipeAdapterInterface.java
@@ -0,0 +1,9 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.swipe;
+
+public interface SwipeAdapterInterface {
+
+    int getSwipeLayoutResourceId(int position);
+
+    void notifyDatasetChanged();
+
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/swipe/SwipeItemMangerImpl.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/swipe/SwipeItemMangerImpl.java
new file mode 100644
index 0000000..2e1fb42
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/swipe/SwipeItemMangerImpl.java
@@ -0,0 +1,213 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.swipe;
+
+import android.view.View;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+public class SwipeItemMangerImpl implements SwipeItemMangerInterface {
+
+    private Attributes.Mode mode = Attributes.Mode.Single;
+    public final int INVALID_POSITION = -1;
+
+    protected int mOpenPosition = INVALID_POSITION;
+
+    protected Set<Integer> mOpenPositions = new HashSet<Integer>();
+    protected Set<SwipeLayout> mShownLayouts = new HashSet<SwipeLayout>();
+
+    protected SwipeAdapterInterface swipeAdapterInterface;
+
+    public SwipeItemMangerImpl(SwipeAdapterInterface swipeAdapterInterface) {
+        if (swipeAdapterInterface == null)
+            throw new IllegalArgumentException("SwipeAdapterInterface can not be null");
+
+        this.swipeAdapterInterface = swipeAdapterInterface;
+    }
+
+    public Attributes.Mode getMode() {
+        return mode;
+    }
+
+    public void setMode(Attributes.Mode mode) {
+        this.mode = mode;
+        mOpenPositions.clear();
+        mShownLayouts.clear();
+        mOpenPosition = INVALID_POSITION;
+    }
+
+    public void bind(View view, int position) {
+        int resId = swipeAdapterInterface.getSwipeLayoutResourceId(position);
+        SwipeLayout swipeLayout = (SwipeLayout) view.findViewById(resId);
+        if (swipeLayout == null)
+            throw new IllegalStateException("can not find SwipeLayout in target view");
+
+        if (swipeLayout.getTag(resId) == null) {
+            OnLayoutListener onLayoutListener = new OnLayoutListener(position);
+            SwipeMemory swipeMemory = new SwipeMemory(position);
+            swipeLayout.addSwipeListener(swipeMemory);
+            swipeLayout.addOnLayoutListener(onLayoutListener);
+            swipeLayout.setTag(resId, new ValueBox(position, swipeMemory, onLayoutListener));
+            mShownLayouts.add(swipeLayout);
+        } else {
+            ValueBox valueBox = (ValueBox) swipeLayout.getTag(resId);
+            valueBox.swipeMemory.setPosition(position);
+            valueBox.onLayoutListener.setPosition(position);
+            valueBox.position = position;
+        }
+    }
+
+    @Override
+    public void openItem(int position) {
+        if (mode == Attributes.Mode.Multiple) {
+            if (!mOpenPositions.contains(position))
+                mOpenPositions.add(position);
+        } else {
+            mOpenPosition = position;
+        }
+        swipeAdapterInterface.notifyDatasetChanged();
+    }
+
+    @Override
+    public void closeItem(int position) {
+        if (mode == Attributes.Mode.Multiple) {
+            mOpenPositions.remove(position);
+        } else {
+            if (mOpenPosition == position)
+                mOpenPosition = INVALID_POSITION;
+        }
+        swipeAdapterInterface.notifyDatasetChanged();
+    }
+
+    @Override
+    public void closeAllExcept(SwipeLayout layout) {
+        for (SwipeLayout s : mShownLayouts) {
+            if (s != layout)
+                s.close();
+        }
+    }
+
+    @Override
+    public void closeAllSwipeItems() {
+        if (mode == Attributes.Mode.Multiple) {
+            mOpenPositions.clear();
+        } else {
+            mOpenPosition = INVALID_POSITION;
+        }
+        for (SwipeLayout s : mShownLayouts) {
+            s.close();
+        }
+    }
+
+    @Override
+    public void switchAllSwipeEnable(boolean enable) {
+        for (SwipeLayout s : mShownLayouts) {
+            s.setSwipeEnabled(enable);
+        }
+    }
+
+    @Override
+    public void removeShownLayouts(SwipeLayout layout) {
+        mShownLayouts.remove(layout);
+    }
+
+    @Override
+    public List<Integer> getOpenItems() {
+        if (mode == Attributes.Mode.Multiple) {
+            return new ArrayList<Integer>(mOpenPositions);
+        } else {
+            return Collections.singletonList(mOpenPosition);
+        }
+    }
+
+    @Override
+    public List<SwipeLayout> getOpenLayouts() {
+        return new ArrayList<SwipeLayout>(mShownLayouts);
+    }
+
+    @Override
+    public boolean isOpen(int position) {
+        if (mode == Attributes.Mode.Multiple) {
+            return mOpenPositions.contains(position);
+        } else {
+            return mOpenPosition == position;
+        }
+    }
+
+    class ValueBox {
+        OnLayoutListener onLayoutListener;
+        SwipeMemory swipeMemory;
+        int position;
+
+        ValueBox(int position, SwipeMemory swipeMemory, OnLayoutListener onLayoutListener) {
+            this.swipeMemory = swipeMemory;
+            this.onLayoutListener = onLayoutListener;
+            this.position = position;
+        }
+    }
+
+    class OnLayoutListener implements SwipeLayout.OnLayout {
+
+        private int position;
+
+        OnLayoutListener(int position) {
+            this.position = position;
+        }
+
+        public void setPosition(int position) {
+            this.position = position;
+        }
+
+        @Override
+        public void onLayout(SwipeLayout v) {
+            if (isOpen(position)) {
+                v.open(false, false);
+            } else {
+                v.close(false, false);
+            }
+        }
+
+    }
+
+    class SwipeMemory extends SimpleSwipeListener {
+
+        private int position;
+
+        SwipeMemory(int position) {
+            this.position = position;
+        }
+
+        @Override
+        public void onClose(SwipeLayout layout) {
+            if (mode == Attributes.Mode.Multiple) {
+                mOpenPositions.remove(position);
+            } else {
+                mOpenPosition = INVALID_POSITION;
+            }
+        }
+
+        @Override
+        public void onStartOpen(SwipeLayout layout) {
+            if (mode == Attributes.Mode.Single) {
+                closeAllExcept(layout);
+            }
+        }
+
+        @Override
+        public void onOpen(SwipeLayout layout) {
+            if (mode == Attributes.Mode.Multiple)
+                mOpenPositions.add(position);
+            else {
+                closeAllExcept(layout);
+                mOpenPosition = position;
+            }
+        }
+
+        public void setPosition(int position) {
+            this.position = position;
+        }
+    }
+
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/swipe/SwipeItemMangerInterface.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/swipe/SwipeItemMangerInterface.java
new file mode 100644
index 0000000..993bcb9
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/swipe/SwipeItemMangerInterface.java
@@ -0,0 +1,28 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.swipe;
+
+import java.util.List;
+
+public interface SwipeItemMangerInterface {
+
+    void openItem(int position);
+
+    void closeItem(int position);
+
+    void closeAllExcept(SwipeLayout layout);
+    
+    void closeAllSwipeItems();
+
+    List<Integer> getOpenItems();
+
+    List<SwipeLayout> getOpenLayouts();
+
+    void removeShownLayouts(SwipeLayout layout);
+
+    boolean isOpen(int position);
+
+    Attributes.Mode getMode();
+
+    void setMode(Attributes.Mode mode);
+
+    void switchAllSwipeEnable(boolean enable);
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/swipe/SwipeLayout.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/swipe/SwipeLayout.java
new file mode 100644
index 0000000..771b2b9
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/minimalistui/widget/swipe/SwipeLayout.java
@@ -0,0 +1,1662 @@
+package com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.swipe;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Rect;
+import android.util.AttributeSet;
+import android.view.GestureDetector;
+import android.view.Gravity;
+import android.view.HapticFeedbackConstants;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+import android.widget.AbsListView;
+import android.widget.AdapterView;
+import android.widget.FrameLayout;
+
+import androidx.core.view.GravityCompat;
+import androidx.core.view.ViewCompat;
+import androidx.customview.widget.ViewDragHelper;
+
+import com.tencent.qcloud.tuikit.tuiconversation.R;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+public class SwipeLayout extends FrameLayout {
+    @Deprecated
+    public static final int EMPTY_LAYOUT = -1;
+    private static final int DRAG_LEFT = 1;
+    private static final int DRAG_RIGHT = 2;
+    private static final int DRAG_TOP = 4;
+    private static final int DRAG_BOTTOM = 8;
+    private static final DragEdge DefaultDragEdge = DragEdge.Right;
+
+    private int mTouchSlop;
+
+    private DragEdge mCurrentDragEdge = DefaultDragEdge;
+    private ViewDragHelper mDragHelper;
+
+    private int mDragDistance = 0;
+    private LinkedHashMap<DragEdge, View> mDragEdges = new LinkedHashMap<>();
+    private ShowMode mShowMode;
+
+    private float[] mEdgeSwipesOffset = new float[4];
+
+    private List<SwipeListener> mSwipeListeners = new ArrayList<>();
+    private List<SwipeDenier> mSwipeDeniers = new ArrayList<>();
+    private Map<View, ArrayList<OnRevealListener>> mRevealListeners = new HashMap<>();
+    private Map<View, Boolean> mShowEntirely = new HashMap<>();
+    private Map<View, Rect> mViewBoundCache = new HashMap<>();//save all children's bound, restore in onLayout
+
+    private DoubleClickListener mDoubleClickListener;
+
+    private boolean mSwipeEnabled = true;
+    private boolean[] mSwipesEnabled = new boolean[]{true, true, true, true};
+    private boolean mClickToClose = false;
+    private float mWillOpenPercentAfterOpen = 0.75f;
+    private float mWillOpenPercentAfterClose = 0.25f;
+
+    public enum DragEdge {
+        Left,
+        Top,
+        Right,
+        Bottom
+    }
+
+    public enum ShowMode {
+        LayDown,
+        PullOut
+    }
+
+    public SwipeLayout(Context context) {
+        this(context, null);
+    }
+
+    public SwipeLayout(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public SwipeLayout(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        mDragHelper = ViewDragHelper.create(this, mDragHelperCallback);
+        mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
+
+        TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SwipeLayout);
+        int dragEdgeChoices = a.getInt(R.styleable.SwipeLayout_drag_edge, DRAG_RIGHT);
+        mEdgeSwipesOffset[DragEdge.Left.ordinal()] = a.getDimension(R.styleable.SwipeLayout_leftEdgeSwipeOffset, 0);
+        mEdgeSwipesOffset[DragEdge.Right.ordinal()] = a.getDimension(R.styleable.SwipeLayout_rightEdgeSwipeOffset, 0);
+        mEdgeSwipesOffset[DragEdge.Top.ordinal()] = a.getDimension(R.styleable.SwipeLayout_topEdgeSwipeOffset, 0);
+        mEdgeSwipesOffset[DragEdge.Bottom.ordinal()] = a.getDimension(R.styleable.SwipeLayout_bottomEdgeSwipeOffset, 0);
+        setClickToClose(a.getBoolean(R.styleable.SwipeLayout_clickToClose, mClickToClose));
+
+        if ((dragEdgeChoices & DRAG_LEFT) == DRAG_LEFT) {
+            mDragEdges.put(DragEdge.Left, null);
+        }
+        if ((dragEdgeChoices & DRAG_TOP) == DRAG_TOP) {
+            mDragEdges.put(DragEdge.Top, null);
+        }
+        if ((dragEdgeChoices & DRAG_RIGHT) == DRAG_RIGHT) {
+            mDragEdges.put(DragEdge.Right, null);
+        }
+        if ((dragEdgeChoices & DRAG_BOTTOM) == DRAG_BOTTOM) {
+            mDragEdges.put(DragEdge.Bottom, null);
+        }
+        int ordinal = a.getInt(R.styleable.SwipeLayout_show_mode, ShowMode.PullOut.ordinal());
+        mShowMode = ShowMode.values()[ordinal];
+        a.recycle();
+
+    }
+
+    public interface SwipeListener {
+        void onStartOpen(SwipeLayout layout);
+
+        void onOpen(SwipeLayout layout);
+
+        void onStartClose(SwipeLayout layout);
+
+        void onClose(SwipeLayout layout);
+
+        void onUpdate(SwipeLayout layout, int leftOffset, int topOffset);
+
+        void onHandRelease(SwipeLayout layout, float xvel, float yvel);
+    }
+
+    public void addSwipeListener(SwipeListener l) {
+        mSwipeListeners.add(l);
+    }
+
+    public void removeSwipeListener(SwipeListener l) {
+        mSwipeListeners.remove(l);
+    }
+
+    public void removeAllSwipeListener() {
+        mSwipeListeners.clear();
+    }
+
+    public interface SwipeDenier {
+        boolean shouldDenySwipe(MotionEvent ev);
+    }
+
+    public void addSwipeDenier(SwipeDenier denier) {
+        mSwipeDeniers.add(denier);
+    }
+
+    public void removeSwipeDenier(SwipeDenier denier) {
+        mSwipeDeniers.remove(denier);
+    }
+
+    public void removeAllSwipeDeniers() {
+        mSwipeDeniers.clear();
+    }
+
+    public interface OnRevealListener {
+        void onReveal(View child, DragEdge edge, float fraction, int distance);
+    }
+
+    /**
+     * bind a view with a specific
+     * {@link OnRevealListener}
+     *
+     * @param childId the view id.
+     * @param l       the target
+     *                {@link OnRevealListener}
+     */
+    public void addRevealListener(int childId, OnRevealListener l) {
+        View child = findViewById(childId);
+        if (child == null) {
+            throw new IllegalArgumentException("Child does not belong to SwipeListener.");
+        }
+
+        if (!mShowEntirely.containsKey(child)) {
+            mShowEntirely.put(child, false);
+        }
+        if (mRevealListeners.get(child) == null)
+            mRevealListeners.put(child, new ArrayList<OnRevealListener>());
+
+        mRevealListeners.get(child).add(l);
+    }
+
+    /**
+     * bind multiple views with an
+     * {@link OnRevealListener}.
+     *
+     * @param childIds the view id.
+     * @param l        the {@link OnRevealListener}
+     */
+    public void addRevealListener(int[] childIds, OnRevealListener l) {
+        for (int i : childIds)
+            addRevealListener(i, l);
+    }
+
+    public void removeRevealListener(int childId, OnRevealListener l) {
+        View child = findViewById(childId);
+
+        if (child == null) return;
+
+        mShowEntirely.remove(child);
+        if (mRevealListeners.containsKey(child)) mRevealListeners.get(child).remove(l);
+    }
+
+    public void removeAllRevealListeners(int childId) {
+        View child = findViewById(childId);
+        if (child != null) {
+            mRevealListeners.remove(child);
+            mShowEntirely.remove(child);
+        }
+    }
+
+    private ViewDragHelper.Callback mDragHelperCallback = new ViewDragHelper.Callback() {
+
+        @Override
+        public int clampViewPositionHorizontal(View child, int left, int dx) {
+            if (child == getSurfaceView()) {
+                switch (mCurrentDragEdge) {
+                    case Top:
+                    case Bottom:
+                        return getPaddingLeft();
+                    case Left:
+                        if (left < getPaddingLeft()) return getPaddingLeft();
+                        if (left > getPaddingLeft() + mDragDistance)
+                            return getPaddingLeft() + mDragDistance;
+                        break;
+                    case Right:
+                        if (left > getPaddingLeft()) return getPaddingLeft();
+                        if (left < getPaddingLeft() - mDragDistance)
+                            return getPaddingLeft() - mDragDistance;
+                        break;
+                }
+            } else if (getCurrentBottomView() == child) {
+
+                switch (mCurrentDragEdge) {
+                    case Top:
+                    case Bottom:
+                        return getPaddingLeft();
+                    case Left:
+                        if (mShowMode == ShowMode.PullOut) {
+                            if (left > getPaddingLeft()) return getPaddingLeft();
+                        }
+                        break;
+                    case Right:
+                        if (mShowMode == ShowMode.PullOut) {
+                            if (left < getMeasuredWidth() - mDragDistance) {
+                                return getMeasuredWidth() - mDragDistance;
+                            }
+                        }
+                        break;
+                }
+            }
+            return left;
+        }
+
+        @Override
+        public int clampViewPositionVertical(View child, int top, int dy) {
+            if (child == getSurfaceView()) {
+                switch (mCurrentDragEdge) {
+                    case Left:
+                    case Right:
+                        return getPaddingTop();
+                    case Top:
+                        if (top < getPaddingTop()) return getPaddingTop();
+                        if (top > getPaddingTop() + mDragDistance)
+                            return getPaddingTop() + mDragDistance;
+                        break;
+                    case Bottom:
+                        if (top < getPaddingTop() - mDragDistance) {
+                            return getPaddingTop() - mDragDistance;
+                        }
+                        if (top > getPaddingTop()) {
+                            return getPaddingTop();
+                        }
+                }
+            } else {
+                View surfaceView = getSurfaceView();
+                int surfaceViewTop = surfaceView == null ? 0 : surfaceView.getTop();
+                switch (mCurrentDragEdge) {
+                    case Left:
+                    case Right:
+                        return getPaddingTop();
+                    case Top:
+                        if (mShowMode == ShowMode.PullOut) {
+                            if (top > getPaddingTop()) return getPaddingTop();
+                        } else {
+                            if (surfaceViewTop + dy < getPaddingTop())
+                                return getPaddingTop();
+                            if (surfaceViewTop + dy > getPaddingTop() + mDragDistance)
+                                return getPaddingTop() + mDragDistance;
+                        }
+                        break;
+                    case Bottom:
+                        if (mShowMode == ShowMode.PullOut) {
+                            if (top < getMeasuredHeight() - mDragDistance)
+                                return getMeasuredHeight() - mDragDistance;
+                        } else {
+                            if (surfaceViewTop + dy >= getPaddingTop())
+                                return getPaddingTop();
+                            if (surfaceViewTop + dy <= getPaddingTop() - mDragDistance)
+                                return getPaddingTop() - mDragDistance;
+                        }
+                }
+            }
+            return top;
+        }
+
+        @Override
+        public boolean tryCaptureView(View child, int pointerId) {
+            boolean result = child == getSurfaceView() || getBottomViews().contains(child);
+            if (result) {
+                isCloseBeforeDrag = getOpenStatus() == Status.Close;
+            }
+            return result;
+        }
+
+        @Override
+        public int getViewHorizontalDragRange(View child) {
+            return mDragDistance;
+        }
+
+        @Override
+        public int getViewVerticalDragRange(View child) {
+            return mDragDistance;
+        }
+
+        boolean isCloseBeforeDrag = true;
+
+        @Override
+        public void onViewReleased(View releasedChild, float xvel, float yvel) {
+            super.onViewReleased(releasedChild, xvel, yvel);
+            processHandRelease(xvel, yvel, isCloseBeforeDrag);
+            for (SwipeListener l : mSwipeListeners) {
+                l.onHandRelease(SwipeLayout.this, xvel, yvel);
+            }
+
+            invalidate();
+        }
+
+        @Override
+        public void onViewPositionChanged(View changedView, int left, int top, int dx, int dy) {
+            View surfaceView = getSurfaceView();
+            if (surfaceView == null) return;
+            View currentBottomView = getCurrentBottomView();
+            int evLeft = surfaceView.getLeft(),
+                    evRight = surfaceView.getRight(),
+                    evTop = surfaceView.getTop(),
+                    evBottom = surfaceView.getBottom();
+            if (changedView == surfaceView) {
+
+                if (mShowMode == ShowMode.PullOut && currentBottomView != null) {
+                    if (mCurrentDragEdge == DragEdge.Left || mCurrentDragEdge == DragEdge.Right) {
+                        currentBottomView.offsetLeftAndRight(dx);
+                    } else {
+                        currentBottomView.offsetTopAndBottom(dy);
+                    }
+                }
+
+            } else if (getBottomViews().contains(changedView)) {
+
+                if (mShowMode == ShowMode.PullOut) {
+                    surfaceView.offsetLeftAndRight(dx);
+                    surfaceView.offsetTopAndBottom(dy);
+                } else {
+                    Rect rect = computeBottomLayDown(mCurrentDragEdge);
+                    if (currentBottomView != null) {
+                        currentBottomView.layout(rect.left, rect.top, rect.right, rect.bottom);
+                    }
+
+                    int newLeft = surfaceView.getLeft() + dx, newTop = surfaceView.getTop() + dy;
+
+                    if (mCurrentDragEdge == DragEdge.Left && newLeft < getPaddingLeft())
+                        newLeft = getPaddingLeft();
+                    else if (mCurrentDragEdge == DragEdge.Right && newLeft > getPaddingLeft())
+                        newLeft = getPaddingLeft();
+                    else if (mCurrentDragEdge == DragEdge.Top && newTop < getPaddingTop())
+                        newTop = getPaddingTop();
+                    else if (mCurrentDragEdge == DragEdge.Bottom && newTop > getPaddingTop())
+                        newTop = getPaddingTop();
+
+                    surfaceView.layout(newLeft, newTop, newLeft + getMeasuredWidth(), newTop + getMeasuredHeight());
+                }
+            }
+
+            dispatchRevealEvent(evLeft, evTop, evRight, evBottom);
+
+            dispatchSwipeEvent(evLeft, evTop, dx, dy);
+
+            invalidate();
+
+            captureChildrenBound();
+        }
+    };
+
+    private void captureChildrenBound() {
+        View currentBottomView = getCurrentBottomView();
+        if (getOpenStatus() == Status.Close) {
+            mViewBoundCache.remove(currentBottomView);
+            return;
+        }
+
+        View[] views = new View[]{getSurfaceView(), currentBottomView};
+        for (View child : views) {
+            Rect rect = mViewBoundCache.get(child);
+            if (rect == null) {
+                rect = new Rect();
+                mViewBoundCache.put(child, rect);
+            }
+            rect.left = child.getLeft();
+            rect.top = child.getTop();
+            rect.right = child.getRight();
+            rect.bottom = child.getBottom();
+        }
+    }
+
+    /**
+     * the dispatchRevealEvent method may not always get accurate position, it
+     * makes the view may not always get the event when the view is totally
+     * show( fraction = 1), so , we need to calculate every time.
+     */
+    protected boolean isViewTotallyFirstShowed(View child, Rect relativePosition, DragEdge edge, int surfaceLeft,
+                                               int surfaceTop, int surfaceRight, int surfaceBottom) {
+        if (mShowEntirely.get(child)) return false;
+        int childLeft = relativePosition.left;
+        int childRight = relativePosition.right;
+        int childTop = relativePosition.top;
+        int childBottom = relativePosition.bottom;
+        boolean r = false;
+        if (getShowMode() == ShowMode.LayDown) {
+            if ((edge == DragEdge.Right && surfaceRight <= childLeft)
+                    || (edge == DragEdge.Left && surfaceLeft >= childRight)
+                    || (edge == DragEdge.Top && surfaceTop >= childBottom)
+                    || (edge == DragEdge.Bottom && surfaceBottom <= childTop)) r = true;
+        } else if (getShowMode() == ShowMode.PullOut) {
+            if ((edge == DragEdge.Right && childRight <= getWidth())
+                    || (edge == DragEdge.Left && childLeft >= getPaddingLeft())
+                    || (edge == DragEdge.Top && childTop >= getPaddingTop())
+                    || (edge == DragEdge.Bottom && childBottom <= getHeight())) r = true;
+        }
+        return r;
+    }
+
+    protected boolean isViewShowing(View child, Rect relativePosition, DragEdge availableEdge, int surfaceLeft,
+                                    int surfaceTop, int surfaceRight, int surfaceBottom) {
+        int childLeft = relativePosition.left;
+        int childRight = relativePosition.right;
+        int childTop = relativePosition.top;
+        int childBottom = relativePosition.bottom;
+        if (getShowMode() == ShowMode.LayDown) {
+            switch (availableEdge) {
+                case Right:
+                    if (surfaceRight > childLeft && surfaceRight <= childRight) {
+                        return true;
+                    }
+                    break;
+                case Left:
+                    if (surfaceLeft < childRight && surfaceLeft >= childLeft) {
+                        return true;
+                    }
+                    break;
+                case Top:
+                    if (surfaceTop >= childTop && surfaceTop < childBottom) {
+                        return true;
+                    }
+                    break;
+                case Bottom:
+                    if (surfaceBottom > childTop && surfaceBottom <= childBottom) {
+                        return true;
+                    }
+                    break;
+            }
+        } else if (getShowMode() == ShowMode.PullOut) {
+            switch (availableEdge) {
+                case Right:
+                    if (childLeft <= getWidth() && childRight > getWidth()) return true;
+                    break;
+                case Left:
+                    if (childRight >= getPaddingLeft() && childLeft < getPaddingLeft()) return true;
+                    break;
+                case Top:
+                    if (childTop < getPaddingTop() && childBottom >= getPaddingTop()) return true;
+                    break;
+                case Bottom:
+                    if (childTop < getHeight() && childTop >= getPaddingTop()) return true;
+                    break;
+            }
+        }
+        return false;
+    }
+
+    protected Rect getRelativePosition(View child) {
+        View t = child;
+        Rect r = new Rect(t.getLeft(), t.getTop(), 0, 0);
+        while (t.getParent() != null && t != getRootView()) {
+            t = (View) t.getParent();
+            if (t == this) break;
+            r.left += t.getLeft();
+            r.top += t.getTop();
+        }
+        r.right = r.left + child.getMeasuredWidth();
+        r.bottom = r.top + child.getMeasuredHeight();
+        return r;
+    }
+
+    private int mEventCounter = 0;
+
+    protected void dispatchSwipeEvent(int surfaceLeft, int surfaceTop, int dx, int dy) {
+        DragEdge edge = getDragEdge();
+        boolean open = true;
+        if (edge == DragEdge.Left) {
+            if (dx < 0) open = false;
+        } else if (edge == DragEdge.Right) {
+            if (dx > 0) open = false;
+        } else if (edge == DragEdge.Top) {
+            if (dy < 0) open = false;
+        } else if (edge == DragEdge.Bottom) {
+            if (dy > 0) open = false;
+        }
+
+        dispatchSwipeEvent(surfaceLeft, surfaceTop, open);
+    }
+
+    protected void dispatchSwipeEvent(int surfaceLeft, int surfaceTop, boolean open) {
+        safeBottomView();
+        Status status = getOpenStatus();
+
+        if (!mSwipeListeners.isEmpty()) {
+            mEventCounter++;
+            for (SwipeListener l : mSwipeListeners) {
+                if (mEventCounter == 1) {
+                    if (open) {
+                        l.onStartOpen(this);
+                    } else {
+                        l.onStartClose(this);
+                    }
+                }
+                l.onUpdate(SwipeLayout.this, surfaceLeft - getPaddingLeft(), surfaceTop - getPaddingTop());
+            }
+
+            if (status == Status.Close) {
+                for (SwipeListener l : mSwipeListeners) {
+                    l.onClose(SwipeLayout.this);
+                }
+                mEventCounter = 0;
+                mClickToClose = false;
+            }
+
+            if (status == Status.Open) {
+                View currentBottomView = getCurrentBottomView();
+                if (currentBottomView != null) {
+                    currentBottomView.setEnabled(true);
+                }
+                for (SwipeListener l : mSwipeListeners) {
+                    l.onOpen(SwipeLayout.this);
+                }
+                mEventCounter = 0;
+                mClickToClose = true;
+            }
+        }
+    }
+
+    /**
+     * prevent bottom view get any touch event. Especially in LayDown mode.
+     */
+    private void safeBottomView() {
+        Status status = getOpenStatus();
+        List<View> bottoms = getBottomViews();
+
+        if (status == Status.Close) {
+            for (View bottom : bottoms) {
+                if (bottom != null && bottom.getVisibility() != INVISIBLE) {
+                    bottom.setVisibility(INVISIBLE);
+                }
+            }
+        } else {
+            View currentBottomView = getCurrentBottomView();
+            if (currentBottomView != null && currentBottomView.getVisibility() != VISIBLE) {
+                currentBottomView.setVisibility(VISIBLE);
+            }
+        }
+    }
+
+    protected void dispatchRevealEvent(final int surfaceLeft, final int surfaceTop, final int surfaceRight,
+                                       final int surfaceBottom) {
+        if (mRevealListeners.isEmpty()) return;
+        for (Map.Entry<View, ArrayList<OnRevealListener>> entry : mRevealListeners.entrySet()) {
+            View child = entry.getKey();
+            Rect rect = getRelativePosition(child);
+            if (isViewShowing(child, rect, mCurrentDragEdge, surfaceLeft, surfaceTop,
+                    surfaceRight, surfaceBottom)) {
+                mShowEntirely.put(child, false);
+                int distance = 0;
+                float fraction = 0f;
+                if (getShowMode() == ShowMode.LayDown) {
+                    switch (mCurrentDragEdge) {
+                        case Left:
+                            distance = rect.left - surfaceLeft;
+                            fraction = distance / (float) child.getWidth();
+                            break;
+                        case Right:
+                            distance = rect.right - surfaceRight;
+                            fraction = distance / (float) child.getWidth();
+                            break;
+                        case Top:
+                            distance = rect.top - surfaceTop;
+                            fraction = distance / (float) child.getHeight();
+                            break;
+                        case Bottom:
+                            distance = rect.bottom - surfaceBottom;
+                            fraction = distance / (float) child.getHeight();
+                            break;
+                    }
+                } else if (getShowMode() == ShowMode.PullOut) {
+                    switch (mCurrentDragEdge) {
+                        case Left:
+                            distance = rect.right - getPaddingLeft();
+                            fraction = distance / (float) child.getWidth();
+                            break;
+                        case Right:
+                            distance = rect.left - getWidth();
+                            fraction = distance / (float) child.getWidth();
+                            break;
+                        case Top:
+                            distance = rect.bottom - getPaddingTop();
+                            fraction = distance / (float) child.getHeight();
+                            break;
+                        case Bottom:
+                            distance = rect.top - getHeight();
+                            fraction = distance / (float) child.getHeight();
+                            break;
+                    }
+                }
+
+                for (OnRevealListener l : entry.getValue()) {
+                    l.onReveal(child, mCurrentDragEdge, Math.abs(fraction), distance);
+                    if (Math.abs(fraction) == 1) {
+                        mShowEntirely.put(child, true);
+                    }
+                }
+            }
+
+            if (isViewTotallyFirstShowed(child, rect, mCurrentDragEdge, surfaceLeft, surfaceTop,
+                    surfaceRight, surfaceBottom)) {
+                mShowEntirely.put(child, true);
+                for (OnRevealListener l : entry.getValue()) {
+                    if (mCurrentDragEdge == DragEdge.Left
+                            || mCurrentDragEdge == DragEdge.Right)
+                        l.onReveal(child, mCurrentDragEdge, 1, child.getWidth());
+                    else
+                        l.onReveal(child, mCurrentDragEdge, 1, child.getHeight());
+                }
+            }
+
+        }
+    }
+
+    @Override
+    public void computeScroll() {
+        super.computeScroll();
+        if (mDragHelper.continueSettling(true)) {
+            ViewCompat.postInvalidateOnAnimation(this);
+        }
+    }
+
+    /**
+     * {@link OnLayoutChangeListener} added in API 11. I need
+     * to support it from API 8.
+     */
+    public interface OnLayout {
+        void onLayout(SwipeLayout v);
+    }
+
+    private List<OnLayout> mOnLayoutListeners;
+
+    public void addOnLayoutListener(OnLayout l) {
+        if (mOnLayoutListeners == null) mOnLayoutListeners = new ArrayList<OnLayout>();
+        mOnLayoutListeners.add(l);
+    }
+
+    public void removeOnLayoutListener(OnLayout l) {
+        if (mOnLayoutListeners != null) mOnLayoutListeners.remove(l);
+    }
+
+    public void clearDragEdge() {
+        mDragEdges.clear();
+    }
+
+    public void setDrag(DragEdge dragEdge, int childId) {
+        clearDragEdge();
+        addDrag(dragEdge, childId);
+    }
+
+    public void setDrag(DragEdge dragEdge, View child) {
+        clearDragEdge();
+        addDrag(dragEdge, child);
+    }
+
+    public void addDrag(DragEdge dragEdge, int childId) {
+        addDrag(dragEdge, findViewById(childId), null);
+    }
+
+    public void addDrag(DragEdge dragEdge, View child) {
+        addDrag(dragEdge, child, null);
+    }
+
+    public void addDrag(DragEdge dragEdge, View child, ViewGroup.LayoutParams params) {
+        if (child == null) return;
+
+        if (params == null) {
+            params = generateDefaultLayoutParams();
+        }
+        if (!checkLayoutParams(params)) {
+            params = generateLayoutParams(params);
+        }
+        int gravity = -1;
+        switch (dragEdge) {
+            case Left:
+                gravity = Gravity.LEFT;
+                break;
+            case Right:
+                gravity = Gravity.RIGHT;
+                break;
+            case Top:
+                gravity = Gravity.TOP;
+                break;
+            case Bottom:
+                gravity = Gravity.BOTTOM;
+                break;
+        }
+        if (params instanceof LayoutParams) {
+            ((LayoutParams) params).gravity = gravity;
+        }
+        addView(child, 0, params);
+    }
+
+    @Override
+    public void addView(View child, int index, ViewGroup.LayoutParams params) {
+        if (child == null) return;
+        int gravity = Gravity.NO_GRAVITY;
+        try {
+            gravity = (Integer) params.getClass().getField("gravity").get(params);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        if (gravity > 0) {
+            gravity = GravityCompat.getAbsoluteGravity(gravity, ViewCompat.getLayoutDirection(this));
+
+            if ((gravity & Gravity.LEFT) == Gravity.LEFT) {
+                mDragEdges.put(DragEdge.Left, child);
+            }
+            if ((gravity & Gravity.RIGHT) == Gravity.RIGHT) {
+                mDragEdges.put(DragEdge.Right, child);
+            }
+            if ((gravity & Gravity.TOP) == Gravity.TOP) {
+                mDragEdges.put(DragEdge.Top, child);
+            }
+            if ((gravity & Gravity.BOTTOM) == Gravity.BOTTOM) {
+                mDragEdges.put(DragEdge.Bottom, child);
+            }
+        } else {
+            for (Map.Entry<DragEdge, View> entry : mDragEdges.entrySet()) {
+                if (entry.getValue() == null) {
+                    //means used the drag_edge attr, the no gravity child should be use set
+                    mDragEdges.put(entry.getKey(), child);
+                    break;
+                }
+            }
+        }
+        if (child.getParent() == this) {
+            return;
+        }
+        super.addView(child, index, params);
+    }
+
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        updateBottomViews();
+
+        if (mOnLayoutListeners != null) for (int i = 0; i < mOnLayoutListeners.size(); i++) {
+            mOnLayoutListeners.get(i).onLayout(this);
+        }
+    }
+
+    void layoutPullOut() {
+        View surfaceView = getSurfaceView();
+        Rect surfaceRect = mViewBoundCache.get(surfaceView);
+        if (surfaceRect == null) surfaceRect = computeSurfaceLayoutArea(false);
+        if (surfaceView != null) {
+            surfaceView.layout(surfaceRect.left, surfaceRect.top, surfaceRect.right, surfaceRect.bottom);
+            bringChildToFront(surfaceView);
+        }
+        View currentBottomView = getCurrentBottomView();
+        Rect bottomViewRect = mViewBoundCache.get(currentBottomView);
+        if (bottomViewRect == null)
+            bottomViewRect = computeBottomLayoutAreaViaSurface(ShowMode.PullOut, surfaceRect);
+        if (currentBottomView != null) {
+            currentBottomView.layout(bottomViewRect.left, bottomViewRect.top, bottomViewRect.right, bottomViewRect.bottom);
+        }
+    }
+
+    void layoutLayDown() {
+        View surfaceView = getSurfaceView();
+        Rect surfaceRect = mViewBoundCache.get(surfaceView);
+        if (surfaceRect == null) surfaceRect = computeSurfaceLayoutArea(false);
+        if (surfaceView != null) {
+            surfaceView.layout(surfaceRect.left, surfaceRect.top, surfaceRect.right, surfaceRect.bottom);
+            bringChildToFront(surfaceView);
+        }
+        View currentBottomView = getCurrentBottomView();
+        Rect bottomViewRect = mViewBoundCache.get(currentBottomView);
+        if (bottomViewRect == null)
+            bottomViewRect = computeBottomLayoutAreaViaSurface(ShowMode.LayDown, surfaceRect);
+        if (currentBottomView != null) {
+            currentBottomView.layout(bottomViewRect.left, bottomViewRect.top, bottomViewRect.right, bottomViewRect.bottom);
+        }
+    }
+
+    private boolean mIsBeingDragged;
+
+    private void checkCanDrag(MotionEvent ev) {
+        if (mIsBeingDragged) return;
+        if (getOpenStatus() == Status.Middle) {
+            mIsBeingDragged = true;
+            return;
+        }
+        Status status = getOpenStatus();
+        float distanceX = ev.getRawX() - sX;
+        float distanceY = ev.getRawY() - sY;
+        float angle = Math.abs(distanceY / distanceX);
+        angle = (float) Math.toDegrees(Math.atan(angle));
+        if (getOpenStatus() == Status.Close) {
+            DragEdge dragEdge;
+            if (angle < 45) {
+                if (distanceX > 0 && isLeftSwipeEnabled()) {
+                    dragEdge = DragEdge.Left;
+                } else if (distanceX < 0 && isRightSwipeEnabled()) {
+                    dragEdge = DragEdge.Right;
+                } else return;
+
+            } else {
+                if (distanceY > 0 && isTopSwipeEnabled()) {
+                    dragEdge = DragEdge.Top;
+                } else if (distanceY < 0 && isBottomSwipeEnabled()) {
+                    dragEdge = DragEdge.Bottom;
+                } else return;
+            }
+            setCurrentDragEdge(dragEdge);
+        }
+
+        boolean doNothing = false;
+        if (mCurrentDragEdge == DragEdge.Right) {
+            boolean suitable = (status == Status.Open && distanceX > mTouchSlop)
+                    || (status == Status.Close && distanceX < -mTouchSlop);
+            suitable = suitable || (status == Status.Middle);
+
+            if (angle > 30 || !suitable) {
+                doNothing = true;
+            }
+        }
+
+        if (mCurrentDragEdge == DragEdge.Left) {
+            boolean suitable = (status == Status.Open && distanceX < -mTouchSlop)
+                    || (status == Status.Close && distanceX > mTouchSlop);
+            suitable = suitable || status == Status.Middle;
+
+            if (angle > 30 || !suitable) {
+                doNothing = true;
+            }
+        }
+
+        if (mCurrentDragEdge == DragEdge.Top) {
+            boolean suitable = (status == Status.Open && distanceY < -mTouchSlop)
+                    || (status == Status.Close && distanceY > mTouchSlop);
+            suitable = suitable || status == Status.Middle;
+
+            if (angle < 60 || !suitable) {
+                doNothing = true;
+            }
+        }
+
+        if (mCurrentDragEdge == DragEdge.Bottom) {
+            boolean suitable = (status == Status.Open && distanceY > mTouchSlop)
+                    || (status == Status.Close && distanceY < -mTouchSlop);
+            suitable = suitable || status == Status.Middle;
+
+            if (angle < 60 || !suitable) {
+                doNothing = true;
+            }
+        }
+        mIsBeingDragged = !doNothing;
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        if (!isSwipeEnabled()) {
+            return false;
+        }
+        if (mClickToClose && getOpenStatus() == Status.Open && isTouchOnSurface(ev)) {
+            return true;
+        }
+        for (SwipeDenier denier : mSwipeDeniers) {
+            if (denier != null && denier.shouldDenySwipe(ev)) {
+                return false;
+            }
+        }
+
+        switch (ev.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                mDragHelper.processTouchEvent(ev);
+                mIsBeingDragged = false;
+                sX = ev.getRawX();
+                sY = ev.getRawY();
+                //if the swipe is in middle state(scrolling), should intercept the touch
+                if (getOpenStatus() == Status.Middle) {
+                    mIsBeingDragged = true;
+                }
+                break;
+            case MotionEvent.ACTION_MOVE:
+                boolean beforeCheck = mIsBeingDragged;
+                checkCanDrag(ev);
+                if (mIsBeingDragged) {
+                    ViewParent parent = getParent();
+                    if (parent != null) {
+                        parent.requestDisallowInterceptTouchEvent(true);
+                    }
+                }
+                if (!beforeCheck && mIsBeingDragged) {
+                    //let children has one chance to catch the touch, and request the swipe not intercept
+                    //useful when swipeLayout wrap a swipeLayout or other gestural layout
+                    return false;
+                }
+                break;
+
+            case MotionEvent.ACTION_CANCEL:
+            case MotionEvent.ACTION_UP:
+                mIsBeingDragged = false;
+                mDragHelper.processTouchEvent(ev);
+                break;
+            default://handle other action, such as ACTION_POINTER_DOWN/UP
+                mDragHelper.processTouchEvent(ev);
+        }
+        return mIsBeingDragged;
+    }
+
+    private float sX = -1, sY = -1;
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (!isSwipeEnabled()) return super.onTouchEvent(event);
+
+        int action = event.getActionMasked();
+        gestureDetector.onTouchEvent(event);
+
+        switch (action) {
+            case MotionEvent.ACTION_DOWN:
+                mDragHelper.processTouchEvent(event);
+                sX = event.getRawX();
+                sY = event.getRawY();
+
+
+            case MotionEvent.ACTION_MOVE: {
+                //the drag state and the direction are already judged at onInterceptTouchEvent
+                checkCanDrag(event);
+                if (mIsBeingDragged) {
+                    getParent().requestDisallowInterceptTouchEvent(true);
+                    mDragHelper.processTouchEvent(event);
+                }
+                break;
+            }
+            case MotionEvent.ACTION_UP:
+            case MotionEvent.ACTION_CANCEL:
+                mIsBeingDragged = false;
+                mDragHelper.processTouchEvent(event);
+                break;
+
+            default://handle other action, such as ACTION_POINTER_DOWN/UP
+                mDragHelper.processTouchEvent(event);
+        }
+
+        return super.onTouchEvent(event) || mIsBeingDragged || action == MotionEvent.ACTION_DOWN;
+    }
+
+    public boolean isClickToClose() {
+        return mClickToClose;
+    }
+
+    public void setClickToClose(boolean mClickToClose) {
+        this.mClickToClose = mClickToClose;
+    }
+
+    public void setSwipeEnabled(boolean enabled) {
+        mSwipeEnabled = enabled;
+    }
+
+    public boolean isSwipeEnabled() {
+        return mSwipeEnabled;
+    }
+
+    public boolean isLeftSwipeEnabled() {
+        View bottomView = mDragEdges.get(DragEdge.Left);
+        return bottomView != null && bottomView.getParent() == this
+                && bottomView != getSurfaceView() && mSwipesEnabled[DragEdge.Left.ordinal()];
+    }
+
+    public void setLeftSwipeEnabled(boolean leftSwipeEnabled) {
+        this.mSwipesEnabled[DragEdge.Left.ordinal()] = leftSwipeEnabled;
+    }
+
+    public boolean isRightSwipeEnabled() {
+        View bottomView = mDragEdges.get(DragEdge.Right);
+        return bottomView != null && bottomView.getParent() == this
+                && bottomView != getSurfaceView() && mSwipesEnabled[DragEdge.Right.ordinal()];
+    }
+
+    public void setRightSwipeEnabled(boolean rightSwipeEnabled) {
+        this.mSwipesEnabled[DragEdge.Right.ordinal()] = rightSwipeEnabled;
+    }
+
+    public boolean isTopSwipeEnabled() {
+        View bottomView = mDragEdges.get(DragEdge.Top);
+        return bottomView != null && bottomView.getParent() == this
+                && bottomView != getSurfaceView() && mSwipesEnabled[DragEdge.Top.ordinal()];
+    }
+
+    public void setTopSwipeEnabled(boolean topSwipeEnabled) {
+        this.mSwipesEnabled[DragEdge.Top.ordinal()] = topSwipeEnabled;
+    }
+
+    public boolean isBottomSwipeEnabled() {
+        View bottomView = mDragEdges.get(DragEdge.Bottom);
+        return bottomView != null && bottomView.getParent() == this
+                && bottomView != getSurfaceView() && mSwipesEnabled[DragEdge.Bottom.ordinal()];
+    }
+
+    public void setBottomSwipeEnabled(boolean bottomSwipeEnabled) {
+        this.mSwipesEnabled[DragEdge.Bottom.ordinal()] = bottomSwipeEnabled;
+    }
+
+    /***
+     * Returns the percentage of revealing at which the view below should the view finish opening
+     * if it was already open before dragging
+     *
+     * @returns The percentage of view revealed to trigger, default value is 0.25
+     */
+    public float getWillOpenPercentAfterOpen() {
+        return mWillOpenPercentAfterOpen;
+    }
+
+    /***
+     * Allows to stablish at what percentage of revealing the view below should the view finish opening
+     * if it was already open before dragging
+     *
+     * @param willOpenPercentAfterOpen The percentage of view revealed to trigger, default value is 0.25
+     */
+    public void setWillOpenPercentAfterOpen(float willOpenPercentAfterOpen) {
+        this.mWillOpenPercentAfterOpen = willOpenPercentAfterOpen;
+    }
+
+    /***
+     * Returns the percentage of revealing at which the view below should the view finish opening
+     * if it was already closed before dragging
+     *
+     * @returns The percentage of view revealed to trigger, default value is 0.25
+     */
+    public float getWillOpenPercentAfterClose() {
+        return mWillOpenPercentAfterClose;
+    }
+
+    /***
+     * Allows to stablish at what percentage of revealing the view below should the view finish opening
+     * if it was already closed before dragging
+     *
+     * @param willOpenPercentAfterClose The percentage of view revealed to trigger, default value is 0.75
+     */
+    public void setWillOpenPercentAfterClose(float willOpenPercentAfterClose) {
+        this.mWillOpenPercentAfterClose = willOpenPercentAfterClose;
+    }
+
+    private boolean insideAdapterView() {
+        return getAdapterView() != null;
+    }
+
+    private AdapterView getAdapterView() {
+        ViewParent t = getParent();
+        if (t instanceof AdapterView) {
+            return (AdapterView) t;
+        }
+        return null;
+    }
+
+    public void performAdapterViewItemClick() {
+        if (getOpenStatus() != Status.Close) return;
+        ViewParent t = getParent();
+        if (t instanceof AdapterView) {
+            AdapterView view = (AdapterView) t;
+            int p = view.getPositionForView(SwipeLayout.this);
+            if (p != AdapterView.INVALID_POSITION) {
+                view.performItemClick(view.getChildAt(p - view.getFirstVisiblePosition()), p, view
+                        .getAdapter().getItemId(p));
+            }
+        }
+    }
+
+    private boolean performAdapterViewItemLongClick() {
+        if (getOpenStatus() != Status.Close) return false;
+        ViewParent t = getParent();
+        if (t instanceof AdapterView) {
+            AdapterView view = (AdapterView) t;
+            int p = view.getPositionForView(SwipeLayout.this);
+            if (p == AdapterView.INVALID_POSITION) return false;
+            long vId = view.getItemIdAtPosition(p);
+            boolean handled = false;
+            try {
+                Method m = AbsListView.class.getDeclaredMethod("performLongPress", View.class, int.class, long.class);
+                m.setAccessible(true);
+                handled = (boolean) m.invoke(view, SwipeLayout.this, p, vId);
+
+            } catch (Exception e) {
+                e.printStackTrace();
+
+                if (view.getOnItemLongClickListener() != null) {
+                    handled = view.getOnItemLongClickListener().onItemLongClick(view, SwipeLayout.this, p, vId);
+                }
+                if (handled) {
+                    view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+                }
+            }
+            return handled;
+        }
+        return false;
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        if (insideAdapterView()) {
+            if (clickListener == null) {
+                setOnClickListener(new OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        performAdapterViewItemClick();
+                    }
+                });
+            }
+            if (longClickListener == null) {
+                setOnLongClickListener(new OnLongClickListener() {
+                    @Override
+                    public boolean onLongClick(View v) {
+                        performAdapterViewItemLongClick();
+                        return true;
+                    }
+                });
+            }
+        }
+    }
+
+    OnClickListener clickListener;
+
+    @Override
+    public void setOnClickListener(OnClickListener l) {
+        super.setOnClickListener(l);
+        clickListener = l;
+    }
+
+    OnLongClickListener longClickListener;
+
+    @Override
+    public void setOnLongClickListener(OnLongClickListener l) {
+        super.setOnLongClickListener(l);
+        longClickListener = l;
+    }
+
+    private Rect hitSurfaceRect;
+
+    private boolean isTouchOnSurface(MotionEvent ev) {
+        View surfaceView = getSurfaceView();
+        if (surfaceView == null) {
+            return false;
+        }
+        if (hitSurfaceRect == null) {
+            hitSurfaceRect = new Rect();
+        }
+        surfaceView.getHitRect(hitSurfaceRect);
+        return hitSurfaceRect.contains((int) ev.getX(), (int) ev.getY());
+    }
+
+    private GestureDetector gestureDetector = new GestureDetector(getContext(), new SwipeDetector());
+
+    class SwipeDetector extends GestureDetector.SimpleOnGestureListener {
+        @Override
+        public boolean onSingleTapUp(MotionEvent e) {
+            if (isTouchOnSurface(e)) {
+                if (mClickToClose) {
+                    close();
+                } else {
+                    if (mDoubleClickListener != null) {
+                        mDoubleClickListener.onClick();
+                    }
+                }
+            }
+            return super.onSingleTapUp(e);
+        }
+
+        @Override
+        public boolean onDoubleTap(MotionEvent e) {
+            if (mDoubleClickListener != null) {
+                View target;
+                View bottom = getCurrentBottomView();
+                View surface = getSurfaceView();
+                if (bottom != null && e.getX() > bottom.getLeft() && e.getX() < bottom.getRight()
+                        && e.getY() > bottom.getTop() && e.getY() < bottom.getBottom()) {
+                    target = bottom;
+                } else {
+                    target = surface;
+                }
+                mDoubleClickListener.onDoubleClick(SwipeLayout.this, target == surface);
+            }
+            return true;
+        }
+    }
+
+    /**
+     * set the drag distance, it will force set the bottom view's width or
+     * height via this value.
+     *
+     * @param max max distance in dp unit
+     */
+    public void setDragDistance(int max) {
+        if (max < 0) max = 0;
+        mDragDistance = dp2px(max);
+        requestLayout();
+    }
+
+    /**
+     * There are 2 diffirent show mode.
+     * {@link ShowMode}.PullOut and
+     * {@link ShowMode}.LayDown.
+     *
+     * @param mode
+     */
+    public void setShowMode(ShowMode mode) {
+        mShowMode = mode;
+        requestLayout();
+    }
+
+    public DragEdge getDragEdge() {
+        return mCurrentDragEdge;
+    }
+
+    public int getDragDistance() {
+        return mDragDistance;
+    }
+
+    public ShowMode getShowMode() {
+        return mShowMode;
+    }
+
+    /**
+     * return null if there is no surface view(no children)
+     */
+    public View getSurfaceView() {
+        if (getChildCount() == 0) return null;
+        return getChildAt(getChildCount() - 1);
+    }
+
+    /**
+     * return null if there is no bottom view
+     */
+    public View getCurrentBottomView() {
+        List<View> bottoms = getBottomViews();
+        if (mCurrentDragEdge.ordinal() < bottoms.size()) {
+            return bottoms.get(mCurrentDragEdge.ordinal());
+        }
+        return null;
+    }
+
+    /**
+     * @return all bottomViews: left, top, right, bottom (may null if the edge is not set)
+     */
+    public List<View> getBottomViews() {
+        ArrayList<View> bottoms = new ArrayList<View>();
+        for (DragEdge dragEdge : DragEdge.values()) {
+            bottoms.add(mDragEdges.get(dragEdge));
+        }
+        return bottoms;
+    }
+
+    public enum Status {
+        Middle,
+        Open,
+        Close
+    }
+
+    /**
+     * get the open status.
+     *
+     * @return {@link Status} Open , Close or
+     * Middle.
+     */
+    public Status getOpenStatus() {
+        View surfaceView = getSurfaceView();
+        if (surfaceView == null) {
+            return Status.Close;
+        }
+        int surfaceLeft = surfaceView.getLeft();
+        int surfaceTop = surfaceView.getTop();
+        if (surfaceLeft == getPaddingLeft() && surfaceTop == getPaddingTop()) return Status.Close;
+
+        if (surfaceLeft == (getPaddingLeft() - mDragDistance) || surfaceLeft == (getPaddingLeft() + mDragDistance)
+                || surfaceTop == (getPaddingTop() - mDragDistance) || surfaceTop == (getPaddingTop() + mDragDistance))
+            return Status.Open;
+
+        return Status.Middle;
+    }
+
+
+    /**
+     * Process the surface release event.
+     *
+     * @param xvel                 xVelocity
+     * @param yvel                 yVelocity
+     * @param isCloseBeforeDragged the open state before drag
+     */
+    protected void processHandRelease(float xvel, float yvel, boolean isCloseBeforeDragged) {
+        float minVelocity = mDragHelper.getMinVelocity();
+        View surfaceView = getSurfaceView();
+        DragEdge currentDragEdge = mCurrentDragEdge;
+        if (currentDragEdge == null || surfaceView == null) {
+            return;
+        }
+        float willOpenPercent = (isCloseBeforeDragged ? mWillOpenPercentAfterClose : mWillOpenPercentAfterOpen);
+        if (currentDragEdge == DragEdge.Left) {
+            if (xvel > minVelocity) open();
+            else if (xvel < -minVelocity) close();
+            else {
+                float openPercent = 1f * getSurfaceView().getLeft() / mDragDistance;
+                if (openPercent > willOpenPercent) open();
+                else close();
+            }
+        } else if (currentDragEdge == DragEdge.Right) {
+            if (xvel > minVelocity) close();
+            else if (xvel < -minVelocity) open();
+            else {
+                float openPercent = 1f * (-getSurfaceView().getLeft()) / mDragDistance;
+                if (openPercent > willOpenPercent) open();
+                else close();
+            }
+        } else if (currentDragEdge == DragEdge.Top) {
+            if (yvel > minVelocity) open();
+            else if (yvel < -minVelocity) close();
+            else {
+                float openPercent = 1f * getSurfaceView().getTop() / mDragDistance;
+                if (openPercent > willOpenPercent) open();
+                else close();
+            }
+        } else if (currentDragEdge == DragEdge.Bottom) {
+            if (yvel > minVelocity) close();
+            else if (yvel < -minVelocity) open();
+            else {
+                float openPercent = 1f * (-getSurfaceView().getTop()) / mDragDistance;
+                if (openPercent > willOpenPercent) open();
+                else close();
+            }
+        }
+    }
+
+    /**
+     * smoothly open surface.
+     */
+    public void open() {
+        open(true, true);
+    }
+
+    public void open(boolean smooth) {
+        open(smooth, true);
+    }
+
+    public void open(boolean smooth, boolean notify) {
+        View surface = getSurfaceView(), bottom = getCurrentBottomView();
+        if (surface == null) {
+            return;
+        }
+        int dx, dy;
+        Rect rect = computeSurfaceLayoutArea(true);
+        if (smooth) {
+            mDragHelper.smoothSlideViewTo(surface, rect.left, rect.top);
+        } else {
+            dx = rect.left - surface.getLeft();
+            dy = rect.top - surface.getTop();
+            surface.layout(rect.left, rect.top, rect.right, rect.bottom);
+            if (getShowMode() == ShowMode.PullOut) {
+                Rect bRect = computeBottomLayoutAreaViaSurface(ShowMode.PullOut, rect);
+                if (bottom != null) {
+                    bottom.layout(bRect.left, bRect.top, bRect.right, bRect.bottom);
+                }
+            }
+            if (notify) {
+                dispatchRevealEvent(rect.left, rect.top, rect.right, rect.bottom);
+                dispatchSwipeEvent(rect.left, rect.top, dx, dy);
+            } else {
+                safeBottomView();
+            }
+        }
+        invalidate();
+    }
+
+    public void open(DragEdge edge) {
+        setCurrentDragEdge(edge);
+        open(true, true);
+    }
+
+    public void open(boolean smooth, DragEdge edge) {
+        setCurrentDragEdge(edge);
+        open(smooth, true);
+    }
+
+    public void open(boolean smooth, boolean notify, DragEdge edge) {
+        setCurrentDragEdge(edge);
+        open(smooth, notify);
+    }
+
+    /**
+     * smoothly close surface.
+     */
+    public void close() {
+        close(true, true);
+    }
+
+    public void close(boolean smooth) {
+        close(smooth, true);
+    }
+
+    /**
+     * close surface
+     *
+     * @param smooth smoothly or not.
+     * @param notify if notify all the listeners.
+     */
+    public void close(boolean smooth, boolean notify) {
+        View surface = getSurfaceView();
+        if (surface == null) {
+            return;
+        }
+        int dx, dy;
+        if (smooth)
+            mDragHelper.smoothSlideViewTo(getSurfaceView(), getPaddingLeft(), getPaddingTop());
+        else {
+            Rect rect = computeSurfaceLayoutArea(false);
+            dx = rect.left - surface.getLeft();
+            dy = rect.top - surface.getTop();
+            surface.layout(rect.left, rect.top, rect.right, rect.bottom);
+            if (notify) {
+                dispatchRevealEvent(rect.left, rect.top, rect.right, rect.bottom);
+                dispatchSwipeEvent(rect.left, rect.top, dx, dy);
+            } else {
+                safeBottomView();
+            }
+        }
+        invalidate();
+    }
+
+    public void toggle() {
+        toggle(true);
+    }
+
+    public void toggle(boolean smooth) {
+        if (getOpenStatus() == Status.Open)
+            close(smooth);
+        else if (getOpenStatus() == Status.Close) open(smooth);
+    }
+
+
+    /**
+     * a helper function to compute the Rect area that surface will hold in.
+     *
+     * @param open open status or close status.
+     */
+    private Rect computeSurfaceLayoutArea(boolean open) {
+        int l = getPaddingLeft(), t = getPaddingTop();
+        if (open) {
+            if (mCurrentDragEdge == DragEdge.Left)
+                l = getPaddingLeft() + mDragDistance;
+            else if (mCurrentDragEdge == DragEdge.Right)
+                l = getPaddingLeft() - mDragDistance;
+            else if (mCurrentDragEdge == DragEdge.Top)
+                t = getPaddingTop() + mDragDistance;
+            else t = getPaddingTop() - mDragDistance;
+        }
+        return new Rect(l, t, l + getMeasuredWidth(), t + getMeasuredHeight());
+    }
+
+    private Rect computeBottomLayoutAreaViaSurface(ShowMode mode, Rect surfaceArea) {
+        Rect rect = surfaceArea;
+        View bottomView = getCurrentBottomView();
+
+        int bl = rect.left, bt = rect.top, br = rect.right, bb = rect.bottom;
+        if (mode == ShowMode.PullOut) {
+            if (mCurrentDragEdge == DragEdge.Left)
+                bl = rect.left - mDragDistance;
+            else if (mCurrentDragEdge == DragEdge.Right)
+                bl = rect.right;
+            else if (mCurrentDragEdge == DragEdge.Top)
+                bt = rect.top - mDragDistance;
+            else bt = rect.bottom;
+
+            if (mCurrentDragEdge == DragEdge.Left || mCurrentDragEdge == DragEdge.Right) {
+                bb = rect.bottom;
+                br = bl + (bottomView == null ? 0 : bottomView.getMeasuredWidth());
+            } else {
+                bb = bt + (bottomView == null ? 0 : bottomView.getMeasuredHeight());
+                br = rect.right;
+            }
+        } else if (mode == ShowMode.LayDown) {
+            if (mCurrentDragEdge == DragEdge.Left)
+                br = bl + mDragDistance;
+            else if (mCurrentDragEdge == DragEdge.Right)
+                bl = br - mDragDistance;
+            else if (mCurrentDragEdge == DragEdge.Top)
+                bb = bt + mDragDistance;
+            else bt = bb - mDragDistance;
+
+        }
+        return new Rect(bl, bt, br, bb);
+
+    }
+
+    private Rect computeBottomLayDown(DragEdge dragEdge) {
+        int bl = getPaddingLeft(), bt = getPaddingTop();
+        int br, bb;
+        if (dragEdge == DragEdge.Right) {
+            bl = getMeasuredWidth() - mDragDistance;
+        } else if (dragEdge == DragEdge.Bottom) {
+            bt = getMeasuredHeight() - mDragDistance;
+        }
+        if (dragEdge == DragEdge.Left || dragEdge == DragEdge.Right) {
+            br = bl + mDragDistance;
+            bb = bt + getMeasuredHeight();
+        } else {
+            br = bl + getMeasuredWidth();
+            bb = bt + mDragDistance;
+        }
+        return new Rect(bl, bt, br, bb);
+    }
+
+    public void setOnDoubleClickListener(DoubleClickListener doubleClickListener) {
+        mDoubleClickListener = doubleClickListener;
+    }
+
+    public interface DoubleClickListener {
+        void onDoubleClick(SwipeLayout layout, boolean surface);
+        void onClick();
+    }
+
+    private int dp2px(float dp) {
+        return (int) (dp * getContext().getResources().getDisplayMetrics().density + 0.5f);
+    }
+
+
+    /**
+     * Deprecated, use {@link #setDrag(DragEdge, View)}
+     */
+    @Deprecated
+    public void setDragEdge(DragEdge dragEdge) {
+        clearDragEdge();
+        if (getChildCount() >= 2) {
+            mDragEdges.put(dragEdge, getChildAt(getChildCount() - 2));
+        }
+        setCurrentDragEdge(dragEdge);
+    }
+
+    public void onViewRemoved(View child) {
+        for (Map.Entry<DragEdge, View> entry : new HashMap<DragEdge, View>(mDragEdges).entrySet()) {
+            if (entry.getValue() == child) {
+                mDragEdges.remove(entry.getKey());
+            }
+        }
+    }
+
+    public Map<DragEdge, View> getDragEdgeMap() {
+        return mDragEdges;
+    }
+
+    /**
+     * Deprecated, use {@link #getDragEdgeMap()}
+     */
+    @Deprecated
+    public List<DragEdge> getDragEdges() {
+        return new ArrayList<DragEdge>(mDragEdges.keySet());
+    }
+
+    /**
+     * Deprecated, use {@link #setDrag(DragEdge, View)}
+     */
+    @Deprecated
+    public void setDragEdges(List<DragEdge> dragEdges) {
+        clearDragEdge();
+        for (int i = 0, size = Math.min(dragEdges.size(), getChildCount() - 1); i < size; i++) {
+            DragEdge dragEdge = dragEdges.get(i);
+            mDragEdges.put(dragEdge, getChildAt(i));
+        }
+        if (dragEdges.size() == 0 || dragEdges.contains(DefaultDragEdge)) {
+            setCurrentDragEdge(DefaultDragEdge);
+        } else {
+            setCurrentDragEdge(dragEdges.get(0));
+        }
+    }
+
+    /**
+     * Deprecated, use {@link #addDrag(DragEdge, View)}
+     */
+    @Deprecated
+    public void setDragEdges(DragEdge... mDragEdges) {
+        clearDragEdge();
+        setDragEdges(Arrays.asList(mDragEdges));
+    }
+
+    /**
+     * Deprecated, use {@link #addDrag(DragEdge, View)}
+     * When using multiple drag edges it's a good idea to pass the ids of the views that
+     * you're using for the left, right, top bottom views (-1 if you're not using a particular view)
+     */
+    @Deprecated
+    public void setBottomViewIds(int leftId, int rightId, int topId, int bottomId) {
+        addDrag(DragEdge.Left, findViewById(leftId));
+        addDrag(DragEdge.Right, findViewById(rightId));
+        addDrag(DragEdge.Top, findViewById(topId));
+        addDrag(DragEdge.Bottom, findViewById(bottomId));
+    }
+
+    private float getCurrentOffset() {
+        if (mCurrentDragEdge == null) return 0;
+        return mEdgeSwipesOffset[mCurrentDragEdge.ordinal()];
+    }
+
+    private void setCurrentDragEdge(DragEdge dragEdge) {
+        mCurrentDragEdge = dragEdge;
+        updateBottomViews();
+    }
+
+    private void updateBottomViews() {
+        View currentBottomView = getCurrentBottomView();
+        if (currentBottomView != null) {
+            if (mCurrentDragEdge == DragEdge.Left || mCurrentDragEdge == DragEdge.Right) {
+                mDragDistance = currentBottomView.getMeasuredWidth() - dp2px(getCurrentOffset());
+            } else {
+                mDragDistance = currentBottomView.getMeasuredHeight() - dp2px(getCurrentOffset());
+            }
+        }
+
+        if (mShowMode == ShowMode.PullOut) {
+            layoutPullOut();
+        } else if (mShowMode == ShowMode.LayDown) {
+            layoutLayDown();
+        }
+
+        safeBottomView();
+    }
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/model/ConversationProvider.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/model/ConversationProvider.java
new file mode 100644
index 0000000..b3bf69b
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/model/ConversationProvider.java
@@ -0,0 +1,487 @@
+package com.tencent.qcloud.tuikit.tuiconversation.model;
+
+import android.text.TextUtils;
+import android.view.View;
+
+import com.tencent.imsdk.BaseConstants;
+import com.tencent.imsdk.v2.V2TIMCallback;
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.imsdk.v2.V2TIMConversationListFilter;
+import com.tencent.imsdk.v2.V2TIMConversationOperationResult;
+import com.tencent.imsdk.v2.V2TIMConversationResult;
+import com.tencent.imsdk.v2.V2TIMGroupMemberFullInfo;
+import com.tencent.imsdk.v2.V2TIMGroupMemberInfoResult;
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMUserStatus;
+import com.tencent.imsdk.v2.V2TIMValueCallback;
+import com.tencent.qcloud.tuicore.BuildConfig;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ErrorMessageConverter;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuiconversation.TUIConversationService;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+import com.tencent.qcloud.tuikit.tuiconversation.config.TUIConversationConfig;
+import com.tencent.qcloud.tuikit.tuiconversation.commonutil.ConversationUtils;
+import com.tencent.qcloud.tuikit.tuiconversation.commonutil.TUIConversationLog;
+import com.tencent.qcloud.tuikit.tuiconversation.commonutil.TUIConversationUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+public class ConversationProvider {
+    private static final String TAG = ConversationProvider.class.getSimpleName();
+
+    private boolean isFinished = false;
+    private long nextLoadSeq = 0L;
+
+    private List<ConversationInfo> markConversationInfoList = new ArrayList<>();
+    private HashMap<String, V2TIMConversation> markUnreadMap = new HashMap<>();
+
+    public void loadConversation(long startSeq, int loadCount, final IUIKitCallback<List<ConversationInfo>> callBack) {
+        isFinished = false;
+        nextLoadSeq = 0;
+        V2TIMManager.getConversationManager().getConversationList(startSeq, loadCount, new V2TIMValueCallback<V2TIMConversationResult>() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIConversationLog.v(TAG, "loadConversation getConversationList error, code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+                TUIConversationUtils.callbackOnError(callBack, TAG, code, desc);
+            }
+
+            @Override
+            public void onSuccess(V2TIMConversationResult v2TIMConversationResult) {
+                List<V2TIMConversation> v2TIMConversationList = v2TIMConversationResult.getConversationList();
+                List<ConversationInfo> conversationInfoList = ConversationUtils.convertV2TIMConversationList(v2TIMConversationList);
+                isFinished = v2TIMConversationResult.isFinished();
+                nextLoadSeq = v2TIMConversationResult.getNextSeq();
+                TUIConversationUtils.callbackOnSuccess(callBack, conversationInfoList);
+            }
+        });
+    }
+
+    public void loadMoreConversation(int loadCount, IUIKitCallback<List<ConversationInfo>> callBack) {
+        if (isFinished) {
+            return;
+        }
+        loadConversation(nextLoadSeq, loadCount, callBack);
+    }
+
+    public boolean isLoadFinished() {
+        return isFinished;
+    }
+
+    public void getConversation(String conversationID, IUIKitCallback<ConversationInfo> callback) {
+        V2TIMManager.getConversationManager().getConversation(conversationID, new V2TIMValueCallback<V2TIMConversation>() {
+            @Override
+            public void onSuccess(V2TIMConversation v2TIMConversation) {
+                ConversationInfo conversationInfo = ConversationUtils.convertV2TIMConversation(v2TIMConversation);
+                TUIConversationUtils.callbackOnSuccess(callback, conversationInfo);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIConversationLog.v(TAG, "getConversation error, code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+                TUIConversationUtils.callbackOnError(callback, TAG, code, desc);
+            }
+        });
+    }
+
+    public void getTotalUnreadMessageCount(IUIKitCallback<Long> callBack) {
+        // 更新消息未读总数
+        V2TIMManager.getConversationManager().getTotalUnreadMessageCount(new V2TIMValueCallback<Long>() {
+            @Override
+            public void onSuccess(Long count) {
+                TUIConversationUtils.callbackOnSuccess(callBack, count);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+
+            }
+        });
+    }
+
+    public void setConversationTop(String conversationId, boolean isTop, IUIKitCallback<Void> callBack) {
+        V2TIMManager.getConversationManager().pinConversation(conversationId, isTop, new V2TIMCallback() {
+            @Override
+            public void onSuccess() {
+                TUIConversationUtils.callbackOnSuccess(callBack, null);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIConversationUtils.callbackOnError(callBack, TAG, code, desc);
+            }
+        });
+    }
+
+    public void markConversationFold(String conversationID, boolean isFold, IUIKitCallback<Void> callback) {
+        List<String> conversationIDList = new ArrayList<>();
+        conversationIDList.add(conversationID);
+        V2TIMManager.getConversationManager().markConversation(conversationIDList,
+                V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_FOLD, isFold,
+                new V2TIMValueCallback<List<V2TIMConversationOperationResult>>() {
+                    @Override
+                    public void onSuccess(List<V2TIMConversationOperationResult> v2TIMConversationOperationResults) {
+                        if (v2TIMConversationOperationResults.size() == 0) {
+                            return;
+                        }
+                        V2TIMConversationOperationResult result = v2TIMConversationOperationResults.get(0);
+                        if (result.getResultCode() == BaseConstants.ERR_SUCC) {
+                            TUIConversationUtils.callbackOnSuccess(callback, null);
+                        } else {
+                            TUIConversationUtils.callbackOnError(callback, TAG, result.getResultCode(), result.getResultInfo());
+                        }
+                    }
+
+                    @Override
+                    public void onError(int code, String desc) {
+                        TUIConversationLog.e(TAG, "markConversationFold error:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
+                        TUIConversationUtils.callbackOnError(callback, TAG, code, desc);
+                    }
+                });
+    }
+
+    public void markConversationHidden(String conversationID, boolean isHidden, IUIKitCallback<Void> callback) {
+        List<String> conversationIDList = new ArrayList<>();
+        if (!TextUtils.isEmpty(conversationID)) {
+            conversationIDList.add(conversationID);
+        }
+        V2TIMManager.getConversationManager().markConversation(conversationIDList,
+                V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_HIDE, isHidden, new V2TIMValueCallback<List<V2TIMConversationOperationResult>>() {
+            @Override
+            public void onSuccess(List<V2TIMConversationOperationResult> v2TIMConversationOperationResults) {
+                if (v2TIMConversationOperationResults.size() == 0) {
+                    return;
+                }
+                V2TIMConversationOperationResult result = v2TIMConversationOperationResults.get(0);
+                if (result.getResultCode() == BaseConstants.ERR_SUCC) {
+                    TUIConversationUtils.callbackOnSuccess(callback, null);
+                } else {
+                    TUIConversationUtils.callbackOnError(callback, TAG, result.getResultCode(), result.getResultInfo());
+                }
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIConversationLog.e(TAG, "markConversationHidden error:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
+                TUIConversationUtils.callbackOnError(callback, TAG, code, desc);
+            }
+        });
+    }
+
+    public void markConversationUnread(ConversationInfo conversationInfo, boolean markUnread, IUIKitCallback<Void> callback) {
+        List<String> conversationIDList = new ArrayList<>();
+        if (!TextUtils.isEmpty(conversationInfo.getConversationId())) {
+            conversationIDList.add(conversationInfo.getConversationId());
+        }
+        if (!markUnread && conversationInfo.getUnRead() > 0) {
+            if (conversationInfo.isGroup()) {
+                V2TIMManager.getMessageManager().markGroupMessageAsRead(conversationInfo.getId(), new V2TIMCallback() {
+                    @Override
+                    public void onSuccess() {
+                        TUIConversationLog.i(TAG, "markConversationUnread->markGroupMessageAsRead success");
+                    }
+
+                @Override
+                public void onError(int code, String desc) {
+                    TUIConversationLog.e(TAG, "markConversationUnread error:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
+                }
+            });
+        } else {
+            V2TIMManager.getMessageManager().markC2CMessageAsRead(conversationInfo.getId(), new V2TIMCallback() {
+                @Override
+                public void onSuccess() {
+                    TUIConversationLog.i(TAG, "markConversationUnread->markC2CMessageAsRead success");
+                }
+
+                    @Override
+                    public void onError(int code, String desc) {
+                        TUIConversationLog.e(TAG, "markConversationUnread error:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
+                    }
+                });
+            }
+        }
+
+        if (markUnread != conversationInfo.isMarkUnread()) {
+            V2TIMManager.getConversationManager().markConversation(conversationIDList, V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_UNREAD, markUnread, new V2TIMValueCallback<List<V2TIMConversationOperationResult>>() {
+                @Override
+                public void onSuccess(List<V2TIMConversationOperationResult> v2TIMConversationOperationResults) {
+                    if (v2TIMConversationOperationResults.size() == 0) {
+                        return;
+                    }
+                    V2TIMConversationOperationResult result = v2TIMConversationOperationResults.get(0);
+                    if (result.getResultCode() == BaseConstants.ERR_SUCC) {
+                        TUIConversationUtils.callbackOnSuccess(callback, null);
+                    } else {
+                        TUIConversationUtils.callbackOnError(callback, TAG, result.getResultCode(), result.getResultInfo());
+                    }
+                }
+
+                @Override
+                public void onError(int code, String desc) {
+                    TUIConversationLog.e(TAG, "markConversationUnread error:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
+                    TUIConversationUtils.callbackOnError(callback, TAG, code, desc);
+                }
+            });
+        }
+    }
+
+    public void deleteConversation(String conversationId, IUIKitCallback<Void> callBack) {
+        V2TIMManager.getConversationManager().deleteConversation(conversationId, new V2TIMCallback() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIConversationLog.e(TAG, "deleteConversation error:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
+                TUIConversationUtils.callbackOnError(callBack, TAG, code, desc);
+            }
+
+            @Override
+            public void onSuccess() {
+                TUIConversationLog.i(TAG, "deleteConversation success");
+                TUIConversationUtils.callbackOnSuccess(callBack, null);
+            }
+        });
+    }
+
+    public void clearHistoryMessage(String userId, boolean isGroup, IUIKitCallback<Void> callBack) {
+        if (isGroup) {
+            V2TIMManager.getMessageManager().clearGroupHistoryMessage(userId, new V2TIMCallback() {
+                @Override
+                public void onError(int code, String desc) {
+                    TUIConversationLog.e(TAG, "clearConversationMessage error:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
+                    TUIConversationUtils.callbackOnError(callBack, TAG, code, desc);
+                }
+
+                @Override
+                public void onSuccess() {
+                    TUIConversationLog.i(TAG, "clearConversationMessage success");
+                    TUIConversationUtils.callbackOnSuccess(callBack, null);
+                }
+            });
+        } else {
+            V2TIMManager.getMessageManager().clearC2CHistoryMessage(userId, new V2TIMCallback() {
+                @Override
+                public void onError(int code, String desc) {
+                    TUIConversationLog.e(TAG, "clearConversationMessage error:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
+                    TUIConversationUtils.callbackOnError(callBack, TAG, code, desc);
+
+                }
+
+                @Override
+                public void onSuccess() {
+                    TUIConversationLog.i(TAG, "clearConversationMessage success");
+                    TUIConversationUtils.callbackOnSuccess(callBack, null);
+
+                }
+            });
+        }
+    }
+
+    public void getGroupMemberIconList(String groupId, int iconCount, IUIKitCallback<List<Object>> callback) {
+        V2TIMManager.getGroupManager().getGroupMemberList(groupId, V2TIMGroupMemberFullInfo.V2TIM_GROUP_MEMBER_FILTER_ALL, 0, new V2TIMValueCallback<V2TIMGroupMemberInfoResult>() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIConversationUtils.callbackOnError(callback, code, desc);
+                TUIConversationLog.e("ConversationIconView", "getGroupMemberList failed! groupID:" + groupId + "|code:" + code + "|desc: " + ErrorMessageConverter.convertIMError(code, desc));
+            }
+
+            @Override
+            public void onSuccess(V2TIMGroupMemberInfoResult v2TIMGroupMemberInfoResult) {
+                List<V2TIMGroupMemberFullInfo> v2TIMGroupMemberFullInfoList = v2TIMGroupMemberInfoResult.getMemberInfoList();
+                int faceSize = Math.min(v2TIMGroupMemberFullInfoList.size(), iconCount);
+                final List<Object> urlList = new ArrayList<>();
+                for (int i = 0; i < faceSize; i++) {
+                    V2TIMGroupMemberFullInfo v2TIMGroupMemberFullInfo = v2TIMGroupMemberFullInfoList.get(i);
+                    urlList.add(v2TIMGroupMemberFullInfo.getFaceUrl());
+                }
+                TUIConversationUtils.callbackOnSuccess(callback, urlList);
+            }
+        });
+    }
+
+    public void loadConversationUserStatus(List<ConversationInfo> dataSource, IUIKitCallback<Void> callback) {
+        if (dataSource == null || dataSource.size() == 0) {
+            TUIConversationLog.d(TAG, "loadConversationUserStatus datasource is null");
+            return;
+        }
+
+        HashMap<String, ConversationInfo> dataSourceMap = new HashMap<>();
+        List<String> userList = new ArrayList<>();
+        for(ConversationInfo itemBean : dataSource) {
+            if (itemBean.isGroup()) {
+                continue;
+            }
+            userList.add(itemBean.getId());
+            dataSourceMap.put(itemBean.getId(), itemBean);
+        }
+        if (userList.isEmpty()) {
+            TUIConversationLog.d(TAG, "loadConversationUserStatus userList is empty");
+            return;
+        }
+        V2TIMManager.getInstance().getUserStatus(userList, new V2TIMValueCallback<List<V2TIMUserStatus>>() {
+            @Override
+            public void onSuccess(List<V2TIMUserStatus> v2TIMUserStatuses) {
+                TUIConversationLog.i(TAG, "getUserStatus success");
+                for (V2TIMUserStatus item : v2TIMUserStatuses) {
+                    ConversationInfo bean = dataSourceMap.get(item.getUserID());
+                    if (bean != null) {
+                        bean.setStatusType(item.getStatusType());
+                    }
+                }
+
+                TUIConversationUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIConversationLog.e(TAG, "getUserStatus error code = " + code + ",des = " + desc);
+                TUIConversationUtils.callbackOnError(callback, code, desc);
+                if (code == TUIConstants.BuyingFeature.ERR_SDK_INTERFACE_NOT_SUPPORT &&
+                        TUIConversationConfig.getInstance().isShowUserStatus() && BuildConfig.DEBUG) {
+                    ToastUtil.toastLongMessage(desc);
+                }
+            }
+        });
+    }
+
+    public void subscribeConversationUserStatus(List<String> userIdList, IUIKitCallback<Void> callback) {
+        if (userIdList == null || userIdList.size() == 0) {
+            TUIConversationLog.e(TAG, "subscribeConversationUserStatus userId is null");
+            TUIConversationUtils.callbackOnError(callback, BaseConstants.ERR_INVALID_PARAMETERS, "userid list is null");
+            return;
+        }
+
+        V2TIMManager.getInstance().subscribeUserStatus(userIdList, new V2TIMCallback() {
+            @Override
+            public void onSuccess() {
+                TUIConversationUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIConversationLog.e(TAG, "subscribeConversationUserStatus error code = " + code + ",des = " + desc);
+                TUIConversationUtils.callbackOnError(callback, code, desc);
+            }
+        });
+    }
+
+    public void getMarkConversationList(final V2TIMConversationListFilter filter, long nextSeq, int count, boolean fromStart, IUIKitCallback<List<ConversationInfo>> callback) {
+        if (fromStart) {
+            markConversationInfoList.clear();
+        }
+        V2TIMManager.getConversationManager().getConversationListByFilter(filter, nextSeq, count, new V2TIMValueCallback<V2TIMConversationResult>() {
+            @Override
+            public void onSuccess(V2TIMConversationResult v2TIMConversationResult) {
+                List<V2TIMConversation> conversationList = v2TIMConversationResult.getConversationList();
+                List<ConversationInfo> conversationInfoList = ConversationUtils.convertV2TIMConversationList(conversationList);
+                markConversationInfoList.addAll(conversationInfoList);
+
+                if (!v2TIMConversationResult.isFinished()) {
+                    getMarkConversationList(filter, v2TIMConversationResult.getNextSeq(), count, false, callback);
+                } else {
+                    if (callback != null) {
+                        callback.onSuccess(markConversationInfoList);
+                    }
+                }
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIConversationLog.e(TAG, "getMarkConversationList error:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
+            }
+        });
+    }
+
+    public void clearAllUnreadMessage(IUIKitCallback<Void> callback) {
+        V2TIMManager.getMessageManager().markAllMessageAsRead(new V2TIMCallback() {
+            @Override
+            public void onSuccess() {
+                TUIConversationLog.i(TAG, "markAllMessageAsRead success");
+                TUIConversationUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIConversationLog.i(TAG, "markAllMessageAsRead error:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
+                TUIConversationUtils.callbackOnError(callback, code, desc);
+            }
+        });
+
+        V2TIMConversationListFilter filter = new V2TIMConversationListFilter();
+        filter.setMarkType(V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_UNREAD);
+        getMarkUnreadConversationList(filter, 0, 100,  true, new V2TIMValueCallback<HashMap<String, V2TIMConversation>>() {
+            @Override
+            public void onSuccess(HashMap<String, V2TIMConversation> stringV2TIMConversationHashMap) {
+                if (stringV2TIMConversationHashMap.size() == 0) {
+                    return;
+                }
+                List<String> unreadConversationIDList = new ArrayList<>();
+                Iterator<Map.Entry<String, V2TIMConversation>> iterator = markUnreadMap.entrySet().iterator();
+                while (iterator.hasNext()) {
+                    Map.Entry<String, V2TIMConversation> entry = iterator.next();
+                    unreadConversationIDList.add(entry.getKey());
+                }
+
+                V2TIMManager.getConversationManager().markConversation(unreadConversationIDList,
+                        V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_UNREAD,
+                        false,
+                        new V2TIMValueCallback<List<V2TIMConversationOperationResult>>() {
+                            @Override
+                            public void onSuccess(List<V2TIMConversationOperationResult> v2TIMConversationOperationResults) {
+                                for (V2TIMConversationOperationResult result : v2TIMConversationOperationResults) {
+                                    if (result.getResultCode() == BaseConstants.ERR_SUCC) {
+                                        V2TIMConversation v2TIMConversation = markUnreadMap.get(result.getConversationID());
+                                        if (!v2TIMConversation.getMarkList().contains(V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_HIDE)) {
+                                            markUnreadMap.remove(result.getConversationID());
+                                        }
+                                    }
+                                }
+                                TUIConversationUtils.callbackOnSuccess(callback, null);
+                            }
+
+                            @Override
+                            public void onError(int code, String desc) {
+                                TUIConversationLog.e(TAG, "triggerClearAllUnreadMessage->markConversation error:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
+                                TUIConversationUtils.callbackOnError(callback, code, desc);
+                            }
+                        });
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIConversationLog.e(TAG, "triggerClearAllUnreadMessage->getMarkUnreadConversationList error:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
+            }
+        });
+    }
+
+    private void getMarkUnreadConversationList(V2TIMConversationListFilter filter, long nextSeq, int count, boolean fromStart, V2TIMValueCallback<HashMap<String, V2TIMConversation>> callback) {
+        if (fromStart) {
+            markUnreadMap.clear();
+        }
+        V2TIMManager.getConversationManager().getConversationListByFilter(filter, nextSeq, count, new V2TIMValueCallback<V2TIMConversationResult>() {
+            @Override
+            public void onSuccess(V2TIMConversationResult v2TIMConversationResult) {
+                List<V2TIMConversation> conversationList = v2TIMConversationResult.getConversationList();
+                for (V2TIMConversation conversation : conversationList) {
+                    markUnreadMap.put(conversation.getConversationID(), conversation);
+                }
+
+                if (!v2TIMConversationResult.isFinished()) {
+                    getMarkUnreadConversationList(filter, v2TIMConversationResult.getNextSeq(), count, false, callback);
+                } else {
+                    if (callback != null) {
+                        callback.onSuccess(markUnreadMap);
+                    }
+                }
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIConversationLog.e(TAG, "getMarkUnreadConversationList error:" + code + ", desc:" + ErrorMessageConverter.convertIMError(code, desc));
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/presenter/ConversationFoldPresenter.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/presenter/ConversationFoldPresenter.java
new file mode 100644
index 0000000..b17c100
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/presenter/ConversationFoldPresenter.java
@@ -0,0 +1,462 @@
+package com.tencent.qcloud.tuikit.tuiconversation.presenter;
+
+import android.text.TextUtils;
+
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.imsdk.v2.V2TIMConversationListFilter;
+import com.tencent.imsdk.v2.V2TIMUserStatus;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuiconversation.TUIConversationService;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+import com.tencent.qcloud.tuikit.tuiconversation.commonutil.ConversationUtils;
+import com.tencent.qcloud.tuikit.tuiconversation.commonutil.TUIConversationLog;
+import com.tencent.qcloud.tuikit.tuiconversation.interfaces.ConversationEventListener;
+import com.tencent.qcloud.tuikit.tuiconversation.interfaces.IConversationListAdapter;
+import com.tencent.qcloud.tuikit.tuiconversation.model.ConversationProvider;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+public class ConversationFoldPresenter {
+    private static final String TAG = ConversationFoldPresenter.class.getSimpleName();
+
+    private final static int GET_CONVERSATION_COUNT = 100;
+
+    ConversationEventListener conversationEventForMarkObserver;
+
+    private final ConversationProvider provider;
+
+    private IConversationListAdapter adapter;
+
+    private final List<ConversationInfo> loadedConversationInfoList = new ArrayList<>();
+
+    public ConversationFoldPresenter() {
+        provider = new ConversationProvider();
+    }
+
+    public void setAdapter(IConversationListAdapter adapter) {
+        this.adapter = adapter;
+    }
+
+    public void initListener() {
+        conversationEventForMarkObserver = new ConversationEventListener() {
+            @Override
+            public void deleteConversation(String chatId, boolean isGroup) {
+                ConversationFoldPresenter.this.deleteConversationFromUI(chatId, isGroup);
+            }
+
+            @Override
+            public void clearConversationMessage(String chatId, boolean isGroup) {
+
+            }
+
+            @Override
+            public void clearFoldMarkAndDeleteConversation(String conversationId) {
+                ConversationFoldPresenter.this.deleteConversationFromUI(conversationId);
+            }
+
+            @Override
+            public void setConversationTop(String chatId, boolean isChecked, IUIKitCallback<Void> iuiKitCallBack) {
+
+            }
+
+            @Override
+            public boolean isTopConversation(String chatId) {
+                return false;
+            }
+
+            @Override
+            public long getUnreadTotal() {
+                return 0;
+            }
+
+            @Override
+            public void onSyncServerFinish() {
+
+            }
+
+            @Override
+            public void updateTotalUnreadMessageCount(long count) {
+
+            }
+
+            @Override
+            public void onNewConversation(List<ConversationInfo> conversationList) {
+                ConversationFoldPresenter.this.onNewConversation(conversationList);
+            }
+
+            @Override
+            public void onConversationChanged(List<ConversationInfo> conversationList) {
+                ConversationFoldPresenter.this.onConversationChanged(conversationList);
+            }
+
+            @Override
+            public void onFriendRemarkChanged(String id, String remark) {
+
+            }
+
+            @Override
+            public void onUserStatusChanged(List<V2TIMUserStatus> userStatusList) {
+
+            }
+
+            @Override
+            public void refreshUserStatusFragmentUI() {
+
+            }
+
+            @Override
+            public void onReceiveMessage(String conversationID, boolean isTypingMessage) {
+                processNewMessage(conversationID, isTypingMessage);
+            }
+
+            @Override
+            public void onMessageSendForHideConversation(String conversationID) {
+
+            }
+        };
+        TUIConversationService.getInstance().addConversationEventListener(conversationEventForMarkObserver);
+    }
+
+    public void loadConversation() {
+        TUIConversationLog.i(TAG, "loadConversation");
+        V2TIMConversationListFilter filter = new V2TIMConversationListFilter();
+        long markType = V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_FOLD;
+        filter.setMarkType(markType);
+        provider.getMarkConversationList(filter, 0, GET_CONVERSATION_COUNT, true, new IUIKitCallback<List<ConversationInfo>>() {
+            @Override
+            public void onSuccess(List<ConversationInfo> conversationInfoList) {
+                if (conversationInfoList.size() == 0) {
+                    return;
+                }
+
+                Collections.sort(conversationInfoList);
+                List<ConversationInfo> loadList = new ArrayList<>();
+                for (ConversationInfo conversationInfo : conversationInfoList) {
+                    if (!conversationInfo.isMarkHidden()) {
+                        loadList.add(conversationInfo);
+                    }
+                }
+                onLoadConversationCompleted(loadList);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIConversationLog.e(TAG, "loadConversation error:" + errCode + ", " + errMsg);
+                if (adapter != null) {
+                    adapter.onLoadingStateChanged(false);
+                }
+            }
+        });
+    }
+
+    private void onLoadConversationCompleted(List<ConversationInfo> conversationInfoList) {
+        onNewConversation(conversationInfoList);
+        if (adapter != null) {
+            adapter.onLoadingStateChanged(false);
+        }
+    }
+
+    /**
+     * 有新的会话
+     * @param conversationInfoList 新的会话列表
+     */
+    public void onNewConversation(List<ConversationInfo> conversationInfoList) {
+        TUIConversationLog.i(TAG, "onNewConversation conversations:" + conversationInfoList);
+
+        if (conversationInfoList.size() == 0) {
+            return;
+        }
+
+        ArrayList<ConversationInfo> processedInfoList = processFoldedAndHiddenConversation(conversationInfoList);
+
+        List<ConversationInfo> exists = new ArrayList<>();
+        Iterator<ConversationInfo> iterator = processedInfoList.iterator();
+        while (iterator.hasNext()) {
+            ConversationInfo update = iterator.next();
+            for (int i = 0; i < loadedConversationInfoList.size(); i++) {
+                ConversationInfo cacheInfo = loadedConversationInfoList.get(i);
+                // 去重
+                if (cacheInfo.getConversationId().equals(update.getConversationId())) {
+                    loadedConversationInfoList.set(i, update);
+                    iterator.remove();
+                    exists.add(update);
+                    break;
+                }
+            }
+
+        }
+
+        // 对新增会话排序，避免插入 recyclerview 时错乱
+        Collections.sort(processedInfoList);
+        loadedConversationInfoList.addAll(processedInfoList);
+        if (adapter != null) {
+            Collections.sort(loadedConversationInfoList);
+            adapter.onDataSourceChanged(loadedConversationInfoList);
+            for (ConversationInfo info : processedInfoList) {
+                int index = loadedConversationInfoList.indexOf(info);
+                if (index != -1) {
+                    adapter.onItemInserted(index);
+                }
+            }
+
+            for (ConversationInfo info : exists) {
+                int index = loadedConversationInfoList.indexOf(info);
+                if (index != -1) {
+                    adapter.onItemChanged(index);
+                }
+            }
+        }
+    }
+
+    public void onConversationChanged(List<ConversationInfo> conversationInfoList) {
+        TUIConversationLog.i(TAG, "onConversationChanged conversations:" + conversationInfoList);
+
+        ArrayList<ConversationInfo> addInfoList = new ArrayList<>();
+        ArrayList<ConversationInfo> infoList = processFoldedAndHiddenConversation(conversationInfoList);
+
+        ArrayList<ConversationInfo> changedInfoList = new ArrayList<>();
+        for (ConversationInfo conversationInfo : infoList) {
+            if (!ConversationUtils.isIgnored(conversationInfo)) {
+                boolean exists = false;
+                for (ConversationInfo loadedInfo : loadedConversationInfoList) {
+                    if (TextUtils.equals(conversationInfo.getConversationId(), loadedInfo.getConversationId())) {
+                        exists = true;
+                        break;
+                    }
+                }
+                if (exists) {
+                    TUIConversationLog.i(TAG, "onConversationChanged conversationInfo " + conversationInfo);
+                    changedInfoList.add(conversationInfo);
+                } else {
+                    addInfoList.add(conversationInfo);
+                }
+            }
+        }
+        if (!addInfoList.isEmpty()) {
+            onNewConversation(addInfoList);
+        }
+
+        if (changedInfoList.size() == 0) {
+            return;
+        }
+
+        refreshChangedInfo(loadedConversationInfoList, changedInfoList);
+    }
+
+    private void refreshChangedInfo(List<ConversationInfo> uiSourceInfoList,
+                                    ArrayList<ConversationInfo> changedInfoList) {
+        Collections.sort(changedInfoList);
+
+        HashMap<ConversationInfo, Integer> indexMap = new HashMap<>();
+        for (int j = 0; j < changedInfoList.size(); j++) {
+            ConversationInfo update = changedInfoList.get(j);
+            for (int i = 0; i < uiSourceInfoList.size(); i++) {
+                ConversationInfo cacheInfo = uiSourceInfoList.get(i);
+                //单个会话刷新时找到老的会话数据，替换
+                if (cacheInfo.getConversationId().equals(update.getConversationId())) {
+                    if (update.getStatusType() == V2TIMUserStatus.V2TIM_USER_STATUS_UNKNOWN) {
+                        update.setStatusType(cacheInfo.getStatusType());
+                    }
+                    uiSourceInfoList.set(i, update);
+                    indexMap.put(update, i);
+                    break;
+                }
+            }
+        }
+        if (adapter != null) {
+            Collections.sort(uiSourceInfoList);
+            adapter.onDataSourceChanged(uiSourceInfoList);
+            int minRefreshIndex = Integer.MAX_VALUE;
+            int maxRefreshIndex = Integer.MIN_VALUE;
+            for (ConversationInfo info : changedInfoList) {
+                Integer oldIndexObj = indexMap.get(info);
+                if (oldIndexObj == null) {
+                    continue;
+                }
+                int oldIndex = oldIndexObj;
+                int newIndex = uiSourceInfoList.indexOf(info);
+                if (newIndex != -1) {
+                    minRefreshIndex = Math.min(minRefreshIndex, Math.min(oldIndex, newIndex));
+                    maxRefreshIndex = Math.max(maxRefreshIndex, Math.max(oldIndex, newIndex));
+                }
+            }
+            int count;
+            if (minRefreshIndex == maxRefreshIndex) {
+                count = 1;
+            } else {
+                count = maxRefreshIndex - minRefreshIndex + 1;
+            }
+            if (count > 0 && maxRefreshIndex >= minRefreshIndex) {
+                adapter.onItemRangeChanged(minRefreshIndex, count);
+            }
+        }
+    }
+
+    private ArrayList<ConversationInfo> processFoldedAndHiddenConversation(List<ConversationInfo> infoList) {
+        ArrayList<ConversationInfo> changedInfoList = new ArrayList<>();
+        for (ConversationInfo conversationInfo : infoList) {
+            int uiIndex = -1;
+            for (int i = 0; i < loadedConversationInfoList.size(); i++) {
+                ConversationInfo loadedInfo = loadedConversationInfoList.get(i);
+                if (TextUtils.equals(conversationInfo.getConversationId(), loadedInfo.getConversationId())) {
+                    uiIndex = i;
+                    break;
+                }
+            }
+            if (uiIndex >= 0) {
+                if (!conversationInfo.isMarkFold() || conversationInfo.isMarkHidden()) {
+                    loadedConversationInfoList.remove(uiIndex);
+                    if (adapter != null) {
+                        adapter.onItemRemoved(uiIndex);
+                    }
+                } else if (conversationInfo.isMarkFold()) {
+                    changedInfoList.add(conversationInfo);
+                }
+            } else {
+                if (conversationInfo.isMarkFold() && !conversationInfo.isMarkHidden()) {
+                    changedInfoList.add(conversationInfo);
+                }
+            }
+        }
+
+        return changedInfoList;
+    }
+
+    private void processNewMessage(String conversationID, boolean isTypingMessage) {
+        if (TextUtils.isEmpty(conversationID)) {
+           return;
+        }
+        if (isTypingMessage) {
+            return;
+        }
+
+        ConversationInfo cacheInfo = null;
+        for (ConversationInfo conversationInfo : loadedConversationInfoList) {
+            if (TextUtils.equals(conversationID, conversationInfo.getConversationId())) {
+                cacheInfo = conversationInfo;
+                break;
+            }
+        }
+
+        if (cacheInfo != null) {
+            if (cacheInfo.isMarkUnread()) {
+                markConversationUnread(cacheInfo, false);
+            }
+        } else {
+            provider.getConversation(conversationID, new IUIKitCallback<ConversationInfo>() {
+                @Override
+                public void onSuccess(ConversationInfo conversationInfo) {
+                    if (conversationInfo.isMarkHidden()) {
+                        markConversationHidden(conversationInfo, false);
+                    }
+                    if (conversationInfo.isMarkUnread()) {
+                        markConversationUnread(conversationInfo, false);
+                    }
+                }
+
+                @Override
+                public void onError(String module, int errCode, String errMsg) {
+
+                }
+            });
+        }
+    }
+
+    /**
+     * 删除会话，会将本地会话数据从imsdk中删除
+     *
+     * @param conversation 会话信息
+     */
+    public void deleteConversation(ConversationInfo conversation) {
+        HashMap<String, Object> param = new HashMap<>();
+        param.put(TUIConstants.TUIConversation.CONVERSATION_ID, conversation.getConversationId());
+        TUICore.callService(TUIConstants.TUIConversation.SERVICE_NAME, TUIConstants.TUIConversation.METHOD_DELETE_CONVERSATION, param);
+    }
+
+    /**
+     * 隐藏会话
+     * hide conversation
+     * @param conversationInfo 会话信息 conversation info
+     */
+    public void markConversationHidden(ConversationInfo conversationInfo, boolean isHidden) {
+        if (conversationInfo == null || TextUtils.isEmpty(conversationInfo.getConversationId())) {
+            TUIConversationLog.e(TAG, "markConversationHidden error: invalid conversationInfo");
+            return;
+        }
+
+        provider.markConversationHidden(conversationInfo.getConversationId(), isHidden, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                conversationInfo.setMarkHidden(isHidden);
+                TUIConversationLog.i(TAG, "markConversationHidden success, conversationID:" +
+                        conversationInfo.getConversationId() + ", isHidden:" + isHidden);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIConversationLog.e(TAG, "markConversationHidden error, conversationID:" +
+                        conversationInfo.getConversationId() + ", code:" + errCode + "|msg:" + errMsg);
+            }
+        });
+    }
+
+    public void markConversationUnread(ConversationInfo conversationInfo, boolean markUnread) {
+        if (conversationInfo == null || TextUtils.isEmpty(conversationInfo.getConversationId())) {
+            TUIConversationLog.e(TAG, "markConversationUnread error: invalid conversationInfo");
+            return;
+        }
+
+        provider.markConversationUnread(conversationInfo, markUnread, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                conversationInfo.setMarkUnread(markUnread);
+                TUIConversationLog.i(TAG, "markConversationRead success, conversationID:" +
+                        conversationInfo.getConversationId());
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIConversationLog.e(TAG, "markConversationRead error, conversationID:" +
+                        conversationInfo.getConversationId() + ", code:" + errCode + "|msg:" + errMsg);
+            }
+        });
+    }
+
+    public void deleteConversationFromUI(String id, boolean isGroup) {
+        if (!isGroup) {
+            return;
+        }
+        for (int i = 0; i < loadedConversationInfoList.size(); i++) {
+            ConversationInfo info = loadedConversationInfoList.get(i);
+            if (TextUtils.equals(info.getId(), id)) {
+                boolean isRemove = loadedConversationInfoList.remove(info);
+                if (adapter != null && isRemove) {
+                    adapter.onItemRemoved(i);
+                }
+                break;
+            }
+        }
+    }
+
+    public void deleteConversationFromUI(String conversationId) {
+        if (TextUtils.isEmpty(conversationId)) {
+            return;
+        }
+        for (int i = 0; i < loadedConversationInfoList.size(); i++) {
+            ConversationInfo info = loadedConversationInfoList.get(i);
+            if (TextUtils.equals(info.getConversationId(), conversationId)) {
+                boolean isRemove = loadedConversationInfoList.remove(info);
+                if (adapter != null && isRemove) {
+                    adapter.onItemRemoved(i);
+                }
+                break;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/presenter/ConversationIconPresenter.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/presenter/ConversationIconPresenter.java
new file mode 100644
index 0000000..04eb7de
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/presenter/ConversationIconPresenter.java
@@ -0,0 +1,19 @@
+package com.tencent.qcloud.tuikit.tuiconversation.presenter;
+
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuiconversation.model.ConversationProvider;
+
+import java.util.List;
+
+public class ConversationIconPresenter {
+    private final ConversationProvider provider;
+
+    public ConversationIconPresenter() {
+        provider = new ConversationProvider();
+    }
+
+    public void getGroupMemberIconList(String groupId, IUIKitCallback<List<Object>> callback) {
+        provider.getGroupMemberIconList(groupId, 9, callback);
+    }
+
+}
diff --git a/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/presenter/ConversationPresenter.java b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/presenter/ConversationPresenter.java
new file mode 100644
index 0000000..555c0ea
--- /dev/null
+++ b/system/tuiconversation/src/main/java/com/tencent/qcloud/tuikit/tuiconversation/presenter/ConversationPresenter.java
@@ -0,0 +1,1197 @@
+package com.tencent.qcloud.tuikit.tuiconversation.presenter;
+
+import android.content.Intent;
+import android.text.TextUtils;
+import android.util.Pair;
+
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.imsdk.v2.V2TIMConversationListFilter;
+import com.tencent.imsdk.v2.V2TIMUserStatus;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.SPUtils;
+import com.tencent.qcloud.tuikit.tuiconversation.TUIConversationConstants;
+import com.tencent.qcloud.tuikit.tuiconversation.TUIConversationService;
+import com.tencent.qcloud.tuikit.tuiconversation.bean.ConversationInfo;
+import com.tencent.qcloud.tuikit.tuiconversation.commonutil.ConversationUtils;
+import com.tencent.qcloud.tuikit.tuiconversation.commonutil.TUIConversationLog;
+import com.tencent.qcloud.tuikit.tuiconversation.commonutil.TUIConversationUtils;
+import com.tencent.qcloud.tuikit.tuiconversation.config.TUIConversationConfig;
+import com.tencent.qcloud.tuikit.tuiconversation.interfaces.ConversationEventListener;
+import com.tencent.qcloud.tuikit.tuiconversation.interfaces.IConversationListAdapter;
+import com.tencent.qcloud.tuikit.tuiconversation.model.ConversationProvider;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+public class ConversationPresenter {
+    private static final String TAG = ConversationPresenter.class.getSimpleName();
+
+    public final static int SHOW_TYPE_CONVERSATION_LIST = 0;
+    public final static int SHOW_TYPE_CONVERSATION_LIST_WITH_FOLD = 1;
+
+    private int showType = SHOW_TYPE_CONVERSATION_LIST_WITH_FOLD;
+
+    private final static int GET_CONVERSATION_COUNT = 100;
+
+    ConversationEventListener conversationEventListener;
+
+    private final ConversationProvider provider;
+
+    private IConversationListAdapter adapter;
+
+    private final List<ConversationInfo> loadedConversationInfoList = new ArrayList<>();
+    private List<ConversationInfo> foldConversationInfoList = new ArrayList<>();
+
+    private ConversationInfo mUIFoldConversation;
+
+    private HashMap<String, ConversationInfo> markUnreadAndHiddenMap = new HashMap<>();
+
+    private long totalUnreadCount;
+
+    private boolean hideFoldItem;
+    private boolean isUnreadStatusOfFoldItem;
+
+    public ConversationPresenter() {
+        provider = new ConversationProvider();
+        String loginUserID = TUILogin.getLoginUser();
+        hideFoldItem = SPUtils.getInstance(TUIConversationConstants.CONVERSATION_SETTINGS_SP_NAME).
+                getBoolean(TUIConversationConstants.HIDE_FOLD_ITEM_SP_KEY_PREFIX + loginUserID, false);
+        isUnreadStatusOfFoldItem = SPUtils.getInstance(TUIConversationConstants.CONVERSATION_SETTINGS_SP_NAME).
+                getBoolean(TUIConversationConstants.FOLD_ITEM_IS_UNREAD_SP_KEY_PREFIX + loginUserID, false);
+    }
+
+    public void setConversationListener() {
+        conversationEventListener = new ConversationEventListener() {
+            @Override
+            public void deleteConversation(String chatId, boolean isGroup) {
+                ConversationPresenter.this.deleteConversation(chatId, isGroup);
+            }
+
+            @Override
+            public void clearConversationMessage(String chatId, boolean isGroup) {
+                ConversationPresenter.this.clearConversationMessage(chatId, isGroup);
+            }
+
+            @Override
+            public void clearFoldMarkAndDeleteConversation(String conversationId) {
+                ConversationPresenter.this.clearFoldMarkAndDeleteConversation(conversationId);
+            }
+
+            @Override
+            public void setConversationTop(String chatId, boolean isChecked, IUIKitCallback<Void> iuiKitCallBack) {
+                ConversationPresenter.this.setConversationTop(chatId, isChecked, iuiKitCallBack);
+            }
+
+            @Override
+            public boolean isTopConversation(String chatId) {
+                return ConversationPresenter.this.isTopConversation(chatId);
+            }
+
+            @Override
+            public long getUnreadTotal() {
+                return totalUnreadCount;
+            }
+
+            @Override
+            public void onSyncServerFinish() {
+                TUIConversationLog.i(TAG, "onSyncServerFinish");
+                loadConversation(0);
+                ConversationPresenter.this.loadMarkedConversation();
+            }
+
+            @Override
+            public void updateTotalUnreadMessageCount(long count) {
+                ConversationPresenter.this.updateTotalUnreadMessageCount(count);
+            }
+
+            @Override
+            public void onNewConversation(List<ConversationInfo> conversationList) {
+                ConversationPresenter.this.onNewConversation(conversationList, false);
+                if (updateMarkedUnreadAndHiddenList(conversationList)) {
+                    refreshUnreadCount();
+                }
+            }
+
+            @Override
+            public void onConversationChanged(List<ConversationInfo> conversationList) {
+                ConversationPresenter.this.onConversationChanged(conversationList);
+                if (updateMarkedUnreadAndHiddenList(conversationList)) {
+                    refreshUnreadCount();
+                }
+            }
+
+            @Override
+            public void onFriendRemarkChanged(String id, String remark) {
+                ConversationPresenter.this.onFriendRemarkChanged(id, remark);
+            }
+
+            @Override
+            public void onUserStatusChanged(List<V2TIMUserStatus> userStatusList) {
+                ConversationPresenter.this.onUserStatusChanged(userStatusList);
+            }
+
+            @Override
+            public void refreshUserStatusFragmentUI() {
+                ConversationPresenter.this.updateAdapter();
+            }
+
+            @Override
+            public void onReceiveMessage(String conversationID, boolean isTypingMessage) {
+                processNewMessage(conversationID, isTypingMessage);
+            }
+
+            @Override
+            public void onMessageSendForHideConversation(String conversationID) {
+                ConversationPresenter.this.onMessageSendForHideConversation(conversationID);
+            }
+        };
+        TUIConversationService.getInstance().setConversationEventListener(conversationEventListener);
+    }
+
+    public void setAdapter(IConversationListAdapter adapter) {
+        this.adapter = adapter;
+    }
+
+    public void setShowType(int showType) {
+        this.showType = showType;
+    }
+
+    /**
+     * 加载会话信息
+     *
+     * @param nextSeq 分页拉取的游标，第一次默认取传 0，后续分页拉传上一次分页拉取成功回调里的 nextSeq
+     */
+    public void loadConversation(long nextSeq) {
+        TUIConversationLog.i(TAG, "loadConversation");
+        provider.loadConversation(nextSeq, GET_CONVERSATION_COUNT, new IUIKitCallback<List<ConversationInfo>>() {
+            @Override
+            public void onSuccess(List<ConversationInfo> conversationInfoList) {
+                onLoadConversationCompleted(conversationInfoList);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                if (adapter != null) {
+                    adapter.onLoadingStateChanged(false);
+                }
+            }
+        });
+    }
+
+    public void loadMoreConversation() {
+        provider.loadMoreConversation(GET_CONVERSATION_COUNT, new IUIKitCallback<List<ConversationInfo>>() {
+            @Override
+            public void onSuccess(List<ConversationInfo> data) {
+                onLoadConversationCompleted(data);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                if (adapter != null) {
+                    adapter.onLoadingStateChanged(false);
+                }
+
+            }
+        });
+    }
+
+    private void onLoadConversationCompleted(List<ConversationInfo> conversationInfoList) {
+        onNewConversation(conversationInfoList, false);
+        if (adapter != null) {
+            adapter.onLoadingStateChanged(false);
+        }
+    }
+
+    private void refreshUnreadCount() {
+        provider.getTotalUnreadMessageCount(new IUIKitCallback<Long>() {
+            @Override
+            public void onSuccess(Long data) {
+                int sdkUnreadCount = data.intValue();
+                updateTotalUnreadMessageCount(sdkUnreadCount);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+
+            }
+        });
+    }
+
+    private void loadMarkedConversation() {
+        TUIConversationLog.i(TAG, "loadMarkedConversation");
+        V2TIMConversationListFilter filter = new V2TIMConversationListFilter();
+        long markType = V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_FOLD |
+                V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_UNREAD |
+                V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_HIDE;
+        filter.setMarkType(markType);
+        provider.getMarkConversationList(filter, 0, GET_CONVERSATION_COUNT, true, new IUIKitCallback<List<ConversationInfo>>() {
+            @Override
+            public void onSuccess(List<ConversationInfo> conversationInfoList) {
+                if (conversationInfoList.size() == 0) {
+                    refreshUnreadCount();
+                    return;
+                }
+
+                Collections.sort(conversationInfoList);
+                for (ConversationInfo conversationInfo : conversationInfoList) {
+                    if (conversationInfo.isMarkFold()) {
+                        boolean existInFoldList = false;
+                        for (int i = 0; i < foldConversationInfoList.size(); i++) {
+                            ConversationInfo foldInfo = foldConversationInfoList.get(i);
+                            if (TextUtils.equals(conversationInfo.getConversationId(), foldInfo.getConversationId())) {
+                                existInFoldList = true;
+                                break;
+                            }
+                        }
+                        if (!existInFoldList) {
+                            foldConversationInfoList.add(conversationInfo);
+                        }
+                    }
+                    if (conversationInfo.isMarkHidden()) {
+                        markUnreadAndHiddenMap.put(conversationInfo.getConversationId(), conversationInfo);
+                    }
+                    if (conversationInfo.isMarkUnread()) {
+                        markUnreadAndHiddenMap.put(conversationInfo.getConversationId(), conversationInfo);
+                    }
+                }
+
+                ConversationInfo firstChangedFoldInfo = getFirstFoldInfo();
+                if (firstChangedFoldInfo != null) {
+                    List<ConversationInfo> changedInfoList = new ArrayList<>();
+                    changedInfoList.add(firstChangedFoldInfo);
+                    onConversationChanged(changedInfoList);
+                }
+
+                refreshUnreadCount();
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                refreshUnreadCount();
+                TUIConversationLog.e(TAG, "loadMarkedConversation error:" + errCode + ", " + errMsg);
+            }
+        });
+    }
+
+    private boolean updateMarkedUnreadAndHiddenList(List<ConversationInfo> conversationList) {
+        boolean isChanged = false;
+        for (ConversationInfo conversationInfo : conversationList) {
+            if (conversationInfo.isMarkUnread() || conversationInfo.isMarkHidden()) {
+                markUnreadAndHiddenMap.put(conversationInfo.getConversationId(), conversationInfo);
+                isChanged = true;
+            } else {
+                ConversationInfo cacheConversation = markUnreadAndHiddenMap.get(conversationInfo.getConversationId());
+                if (cacheConversation != null) {
+                    markUnreadAndHiddenMap.remove(conversationInfo.getConversationId());
+                    isChanged = true;
+                }
+            }
+        }
+
+        return isChanged;
+    }
+
+    private void loadAndSubscribeConversationUserStatus(List<ConversationInfo> conversationInfoList) {
+        provider.loadConversationUserStatus(conversationInfoList, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                onConversationChanged(conversationInfoList);
+            }
+
+            @Override
+            public void onError(String module, int code, String desc) {
+                TUIConversationLog.e(TAG, "loadConversationUserStatus code:" + code + "|desc:" + desc);
+            }
+        });
+
+        List<String> userIdList = new ArrayList<>();
+        for(ConversationInfo conversationInfo : conversationInfoList) {
+            if (conversationInfo.isGroup()) {
+                continue;
+            }
+            userIdList.add(conversationInfo.getId());
+        }
+        provider.subscribeConversationUserStatus(userIdList, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                TUIConversationLog.d(TAG, "subscribeConversationUserStatus success");
+            }
+
+            @Override
+            public void onError(String module, int code, String desc) {
+                TUIConversationLog.e(TAG, "subscribeConversationUserStatus code:" + code + "|desc:" + desc);
+            }
+        });
+    }
+
+    public boolean isLoadFinished() {
+        return provider.isLoadFinished();
+    }
+
+    /**
+     * 有新的会话
+     * @param conversationInfoList 新的会话列表
+     */
+    public void onNewConversation(List<ConversationInfo> conversationInfoList, boolean showFoldItem) {
+        TUIConversationLog.i(TAG, "onNewConversation conversations:" + conversationInfoList);
+
+        ArrayList<ConversationInfo> infos = new ArrayList<>();
+        for (ConversationInfo conversationInfo : conversationInfoList) {
+            if (!ConversationUtils.isIgnored(conversationInfo) && !conversationInfo.isMarkHidden()) {
+                if (showType == SHOW_TYPE_CONVERSATION_LIST_WITH_FOLD) {
+                    if (!conversationInfo.isMarkFold() || showFoldItem) {
+                        TUIConversationLog.i(TAG, "onNewConversation conversationInfo " + conversationInfo.toString());
+                        infos.add(conversationInfo);
+                    }
+                } else {
+                    TUIConversationLog.i(TAG, "onNewConversation conversationInfo " + conversationInfo.toString());
+                    infos.add(conversationInfo);
+                }
+            }
+        }
+        if (infos.size() == 0) {
+            return;
+        }
+
+        List<ConversationInfo> uiSourceInfoList;
+        if (showType == SHOW_TYPE_CONVERSATION_LIST) {
+            uiSourceInfoList = loadedConversationInfoList;
+        } else if (showType == SHOW_TYPE_CONVERSATION_LIST_WITH_FOLD) {
+            uiSourceInfoList = loadedConversationInfoList;
+        } else {
+            uiSourceInfoList = foldConversationInfoList;
+        }
+
+        List<ConversationInfo> exists = new ArrayList<>();
+        Iterator<ConversationInfo> iterator = infos.iterator();
+        while (iterator.hasNext()) {
+            ConversationInfo update = iterator.next();
+            for (int i = 0; i < uiSourceInfoList.size(); i++) {
+                ConversationInfo cacheInfo = uiSourceInfoList.get(i);
+                // 去重
+                if (cacheInfo.getConversationId().equals(update.getConversationId())) {
+                    if (update.getStatusType() == V2TIMUserStatus.V2TIM_USER_STATUS_UNKNOWN) {
+                        update.setStatusType(cacheInfo.getStatusType());
+                    }
+                    uiSourceInfoList.set(i, update);
+                    iterator.remove();
+                    exists.add(update);
+                    break;
+                }
+            }
+        }
+
+        // 对新增会话排序，避免插入 recyclerview 时错乱
+        Collections.sort(infos);
+        uiSourceInfoList.addAll(infos);
+        if (adapter != null) {
+            Collections.sort(uiSourceInfoList);
+            adapter.onDataSourceChanged(uiSourceInfoList);
+            for (ConversationInfo info : infos) {
+                int index = uiSourceInfoList.indexOf(info);
+                if (index != -1) {
+                    adapter.onItemInserted(index);
+                }
+            }
+
+            for (ConversationInfo info : exists) {
+                int index = uiSourceInfoList.indexOf(info);
+                if (index != -1) {
+                    adapter.onItemChanged(index);
+                }
+            }
+        }
+
+        loadAndSubscribeConversationUserStatus(conversationInfoList);
+    }
+
+    /**
+     * 部分会话刷新（包括多终端已读上报同步）
+     *
+     * @param conversationInfoList 需要刷新的会话列表
+     */
+    public void onConversationChanged(List<ConversationInfo> conversationInfoList) {
+        TUIConversationLog.i(TAG, "onConversationChanged conversations:" + conversationInfoList);
+
+        List<ConversationInfo> uiSourceInfoList;
+        ArrayList<ConversationInfo> infoList;
+        infoList = processHiddenConversation(conversationInfoList);
+
+        ArrayList<ConversationInfo> changedInfoList;
+        if (showType == SHOW_TYPE_CONVERSATION_LIST) {
+            uiSourceInfoList = loadedConversationInfoList;
+            changedInfoList = processConversationList(infoList);
+        } else {
+            uiSourceInfoList = loadedConversationInfoList;
+            changedInfoList = processConversationListWithFold(infoList);
+        }
+
+        if (changedInfoList.size() == 0) {
+            return;
+        }
+
+        adapter.onConversationChanged(changedInfoList);
+        refreshChangedInfo(uiSourceInfoList, changedInfoList);
+    }
+
+    private void refreshChangedInfo(List<ConversationInfo> uiSourceInfoList,
+                                    ArrayList<ConversationInfo> changedInfoList) {
+        Collections.sort(changedInfoList);
+
+        HashMap<ConversationInfo, Integer> indexMap = new HashMap<>();
+        for (int j = 0; j < changedInfoList.size(); j++) {
+            ConversationInfo update = changedInfoList.get(j);
+            for (int i = 0; i < uiSourceInfoList.size(); i++) {
+                ConversationInfo cacheInfo = uiSourceInfoList.get(i);
+                //单个会话刷新时找到老的会话数据，替换
+                if (cacheInfo.getConversationId().equals(update.getConversationId())) {
+                    if (update.getStatusType() == V2TIMUserStatus.V2TIM_USER_STATUS_UNKNOWN) {
+                        update.setStatusType(cacheInfo.getStatusType());
+                    }
+                    uiSourceInfoList.set(i, update);
+                    indexMap.put(update, i);
+                    break;
+                }
+            }
+        }
+        if (adapter != null) {
+            Collections.sort(uiSourceInfoList);
+            adapter.onDataSourceChanged(uiSourceInfoList);
+            int minRefreshIndex = Integer.MAX_VALUE;
+            int maxRefreshIndex = Integer.MIN_VALUE;
+            for (ConversationInfo info : changedInfoList) {
+                Integer oldIndexObj = indexMap.get(info);
+                if (oldIndexObj == null) {
+                    continue;
+                }
+                int oldIndex = oldIndexObj;
+                int newIndex = uiSourceInfoList.indexOf(info);
+                if (newIndex != -1) {
+                    minRefreshIndex = Math.min(minRefreshIndex, Math.min(oldIndex, newIndex));
+                    maxRefreshIndex = Math.max(maxRefreshIndex, Math.max(oldIndex, newIndex));
+                }
+            }
+            int count;
+            if (minRefreshIndex == maxRefreshIndex) {
+                count = 1;
+            } else {
+                count = maxRefreshIndex - minRefreshIndex + 1;
+            }
+            if (count > 0 && maxRefreshIndex >= minRefreshIndex) {
+                adapter.onItemRangeChanged(minRefreshIndex, count);
+            }
+        }
+    }
+
+    private ArrayList<ConversationInfo> processHiddenConversation(List<ConversationInfo> infoList) {
+        ArrayList<ConversationInfo> changedInfoList = new ArrayList<>();
+        //  1.1 UI 已加载  ui had loaded data
+        //   1.1.1 隐藏状态，则从 UI 删除  hidden status, to delete it from ui data
+        //   1.1.2 非隐藏，则收集到更新列表  not hidden status, to collect it in changed list
+        //  1.2 UI 未加载，则收集到更新列表  ui not loaded, to collect it in changed list
+        for (ConversationInfo conversationInfo : infoList) {
+            int uiIndex = -1;
+            for (int i = 0; i < loadedConversationInfoList.size(); i++) {
+                ConversationInfo loadedInfo = loadedConversationInfoList.get(i);
+                if (TextUtils.equals(conversationInfo.getConversationId(), loadedInfo.getConversationId())) {
+                    uiIndex = i;
+                    break;
+                }
+            }
+            if (uiIndex >= 0 && conversationInfo.isMarkHidden()) {
+                loadedConversationInfoList.remove(uiIndex);
+                if (adapter != null) {
+                    adapter.onItemRemoved(uiIndex);
+                }
+                if (mUIFoldConversation != null) {
+                    if (TextUtils.equals(conversationInfo.getConversationId(), mUIFoldConversation.getConversationId())) {
+                        mUIFoldConversation = null;
+                        changedInfoList.add(conversationInfo);
+                    }
+                }
+            } else {
+                changedInfoList.add(conversationInfo);
+            }
+        }
+
+        return changedInfoList;
+    }
+
+    private ArrayList<ConversationInfo> processConversationList(List<ConversationInfo> conversationInfoList) {
+        ArrayList<ConversationInfo> addInfoList = new ArrayList<>();
+        ArrayList<ConversationInfo> changedInfoList = new ArrayList<>();
+        for (ConversationInfo conversationInfo : conversationInfoList) {
+            if (!ConversationUtils.isIgnored(conversationInfo)) {
+                boolean exists = false;
+                for (ConversationInfo loadedInfo : loadedConversationInfoList) {
+                    if (TextUtils.equals(conversationInfo.getConversationId(), loadedInfo.getConversationId())) {
+                        exists = true;
+                        break;
+                    }
+                }
+                if (exists) {
+                    TUIConversationLog.i(TAG, "onConversationChanged conversationInfo " + conversationInfo);
+                    changedInfoList.add(conversationInfo);
+                } else {
+                    addInfoList.add(conversationInfo);
+                }
+            }
+        }
+        if (!addInfoList.isEmpty()) {
+            onNewConversation(addInfoList, true);
+        }
+
+        return changedInfoList;
+    }
+
+    private ArrayList<ConversationInfo> processConversationListWithFold(List<ConversationInfo> conversationInfoList) {
+        ArrayList<ConversationInfo> changedInfoList = new ArrayList<>();
+        ArrayList<ConversationInfo> addInfoList = new ArrayList<>();
+        // 会话列表处理：折叠列表新增/折叠列表更新替换/折叠列表删除/UI加载列表新增/UI加载列表更新替换  process conversation list: add to fold list/update fold list/delete from fold list/add to ui list/update in ui list
+        // 1、存在于折叠列表  exist in fold list
+        //  1.1 是折叠的，替换折叠列表中的对应会话  is folded status, replace it from fold list
+        //  1.2 非折叠的，从折叠列表删除该会话，并收集到新增列表中 is not folded status, delete it from fold list, and collect it in added list
+        // 2、不存在于折叠列表  not exist in fold list
+        //  2.1 是折叠的，插入到折叠列表，并从 UI 上找到并删除  is folded status, insert to fold list, and delete it from ui list
+        //  2.2 非折叠的，UI 上已展示的则更新，否则插入  is not folded status, if in ui list then update it, if not, insert it to ui list
+        for (ConversationInfo conversationInfo : conversationInfoList) {
+            if (ConversationUtils.isIgnored(conversationInfo)) {
+                continue;
+            }
+            int foldIndex = -1;
+            for (int i = 0; i < foldConversationInfoList.size(); i++) {
+                ConversationInfo foldInfo = foldConversationInfoList.get(i);
+                if (TextUtils.equals(foldInfo.getConversationId(), conversationInfo.getConversationId())) {
+                    foldIndex = i;
+                    break;
+                }
+            }
+            if (foldIndex >= 0) {
+                // 1 之前存在于折叠列表  exist in fold list
+                if (conversationInfo.isMarkFold()) {
+                    // 1.1 仍然是折叠的，替换  if is folded, then replace
+                    foldConversationInfoList.set(foldIndex, conversationInfo);
+                } else {
+                    // 1.2 更新为非折叠，从折叠列表删除，并插入新增列表  if if not folded, delete it from folded list, and insert to added list
+                    foldConversationInfoList.remove(foldIndex);
+                    addInfoList.add(conversationInfo);
+                }
+            } else {
+                // 2 之前不存在于折叠列表  not exist in fold list
+                // UI 上判断是否展示过  if ui list exist or not
+                int uiIndex = -1;
+                for (int i = 0; i < loadedConversationInfoList.size(); i++) {
+                    ConversationInfo loadedInfo = loadedConversationInfoList.get(i);
+                    if (TextUtils.equals(conversationInfo.getConversationId(), loadedInfo.getConversationId())) {
+                        uiIndex = i;
+                        break;
+                    }
+                }
+                if (conversationInfo.isMarkFold()) {
+                    // 2.1 折叠会话，则添加到折叠列表  is folded status, insert to fold list
+                    foldConversationInfoList.add(conversationInfo);
+                    // UI 上找到该会话，并移除不去展示  if find it in ui list, delete it
+                    if (uiIndex >= 0) {
+                        loadedConversationInfoList.remove(uiIndex);
+                        if (adapter != null) {
+                            adapter.onItemRemoved(uiIndex);
+                        }
+                    }
+                } else {
+                    // 2.2 非折叠会话，UI 上已展示则更新，未展示则插入  is not folded status, if exist in ui list then update it, if not, insert it
+                    if (uiIndex >= 0) {
+                        TUIConversationLog.i(TAG, "onConversationChanged conversationInfo " + conversationInfo);
+                        changedInfoList.add(conversationInfo);
+                    } else {
+                        addInfoList.add(conversationInfo);
+                    }
+                }
+            }
+        }
+        // 主界面显示的折叠会话信息与折叠会话列表的处理  process fold info item and fold list in main ui
+        // 1、折叠列表有会话  fold list size > 0
+        //  1.1 排序后取出第一个非隐藏会话，并与 UI 折叠会话比较  sort list, then compare the first which not mark hidden and fold this item in ui
+        //   1.1.1 与 UI 折叠会话是同一个会话，添加到待更新列表中，并更新 UI 折叠会话  is the same conversation, insert to changed list, and replace cache info
+        //   1.1.2 与 UI 折叠会话不是一个会话，从 UI 先删除折叠的会话，添加新的折叠会话到新增列表中，并更新 UI 折叠会话  is not the same conversation, delete the fold item from ui first, then insert it to added list and update cache info
+        //   1.1.3 UI 的不存在，则插入到新增会话列表，并赋值给 UI 折叠会话  cache info not exist, insert it to added list, and update cache info
+        // 2、折叠列表无会话，且 UI 会话存在，则从 UI 先删除折叠的会话，然后清空 UI 会话  fold list is empty, delete fold item from ui and clear cache info
+        if (!hideFoldItem) {
+            ConversationInfo firstChangedFoldInfo = getFirstFoldInfo();
+            if (foldConversationInfoList.size() > 0 && firstChangedFoldInfo != null) {
+                // 1
+                if (mUIFoldConversation != null) {
+                    if (mUIFoldConversation != firstChangedFoldInfo) {
+                        if (TextUtils.equals(mUIFoldConversation.getConversationId(), firstChangedFoldInfo.getConversationId())) {
+                            // 1.1.1
+                            changedInfoList.add(firstChangedFoldInfo);
+                            mUIFoldConversation = firstChangedFoldInfo;
+                            mUIFoldConversation.setMarkLocalUnread(isUnreadStatusOfFoldItem);
+                        } else {
+                            // 1.1.2
+                            int uiIndex = loadedConversationInfoList.indexOf(mUIFoldConversation);
+                            if (uiIndex != -1) {
+                                loadedConversationInfoList.remove(uiIndex);
+                                if (adapter != null) {
+                                    adapter.onItemRemoved(uiIndex);
+                                }
+                            }
+                            addInfoList.add(firstChangedFoldInfo);
+                            mUIFoldConversation = firstChangedFoldInfo;
+                            mUIFoldConversation.setMarkLocalUnread(isUnreadStatusOfFoldItem);
+                        }
+                    }
+                } else {
+                    // 1.1.3
+                    addInfoList.add(firstChangedFoldInfo);
+                    mUIFoldConversation = firstChangedFoldInfo;
+                    mUIFoldConversation.setMarkLocalUnread(isUnreadStatusOfFoldItem);
+                }
+            } else {
+                // 2
+                hideFoldItemFromUI();
+            }
+        } else {
+            hideFoldItemFromUI();
+        }
+
+        if (!addInfoList.isEmpty()) {
+            onNewConversation(addInfoList,true);
+        }
+
+        return changedInfoList;
+    }
+
+    private void processNewMessage(String conversationID, boolean isTypingMessage) {
+        if (TextUtils.isEmpty(conversationID)) {
+           return;
+        }
+        if (isTypingMessage) {
+            return;
+        }
+
+        ConversationInfo cacheInfo = null;
+        for (ConversationInfo conversationInfo : loadedConversationInfoList) {
+            if (TextUtils.equals(conversationID, conversationInfo.getConversationId())) {
+                cacheInfo = conversationInfo;
+                break;
+            }
+        }
+
+        boolean existInFoldList = false;
+        for (ConversationInfo conversationInfo : foldConversationInfoList) {
+            if (TextUtils.equals(conversationID, conversationInfo.getConversationId())) {
+                existInFoldList = true;
+                break;
+            }
+        }
+
+        if (existInFoldList) {
+            if (!isUnreadStatusOfFoldItem) {
+                setUnreadStatusOfFoldItem(true);
+            }
+        }
+
+        if (cacheInfo != null) {
+            if (cacheInfo.isMarkUnread()) {
+                markConversationUnread(cacheInfo, false);
+            }
+        } else {
+            provider.getConversation(conversationID, new IUIKitCallback<ConversationInfo>() {
+                @Override
+                public void onSuccess(ConversationInfo conversationInfo) {
+                    if (conversationInfo.isMarkHidden()) {
+                        markConversationHidden(conversationInfo, false);
+                    }
+                    if (conversationInfo.isMarkUnread()) {
+                        markConversationUnread(conversationInfo, false);
+                    }
+                }
+
+                @Override
+                public void onError(String module, int errCode, String errMsg) {
+
+                }
+            });
+
+            // if new message is belong to one of the foldedConversationInfoList, then show fold item
+            if (existInFoldList) {
+                hideFoldItem(false);
+            }
+        }
+    }
+
+    public void hideFoldItem(boolean needHide) {
+        String loginUserID = TUILogin.getLoginUser();
+        SPUtils.getInstance(TUIConversationConstants.CONVERSATION_SETTINGS_SP_NAME).
+                put(TUIConversationConstants.HIDE_FOLD_ITEM_SP_KEY_PREFIX + loginUserID, needHide);
+        hideFoldItem = needHide;
+        if (needHide) {
+            hideFoldItemFromUI();
+        }
+    }
+
+    private void hideFoldItemFromUI() {
+        if (mUIFoldConversation != null) {
+            int uiIndex = loadedConversationInfoList.indexOf(mUIFoldConversation);
+            if (uiIndex != -1) {
+                loadedConversationInfoList.remove(uiIndex);
+                if (adapter != null) {
+                    adapter.onItemRemoved(uiIndex);
+                }
+                mUIFoldConversation = null;
+            }
+        }
+    }
+
+    public void setUnreadStatusOfFoldItem(boolean isUnread) {
+        String loginUserID = TUILogin.getLoginUser();
+        SPUtils.getInstance(TUIConversationConstants.CONVERSATION_SETTINGS_SP_NAME).
+                put(TUIConversationConstants.FOLD_ITEM_IS_UNREAD_SP_KEY_PREFIX + loginUserID, isUnread);
+        isUnreadStatusOfFoldItem = isUnread;
+        if (mUIFoldConversation == null) {
+            return;
+        }
+        mUIFoldConversation.setMarkLocalUnread(isUnread);
+
+        ArrayList<ConversationInfo> changedInfoList = new ArrayList<>();
+        changedInfoList.add(mUIFoldConversation);
+        List<ConversationInfo> uiSourceInfoList = loadedConversationInfoList;
+        refreshChangedInfo(uiSourceInfoList, changedInfoList);
+    }
+
+    private ConversationInfo getFirstFoldInfo() {
+        Collections.sort(foldConversationInfoList);
+        ConversationInfo firstChangedFoldInfo = null;
+        for (ConversationInfo conversationInfo : foldConversationInfoList) {
+            if (!conversationInfo.isMarkHidden()) {
+                firstChangedFoldInfo = conversationInfo;
+                break;
+            }
+        }
+        return firstChangedFoldInfo;
+    }
+
+    private void updateTotalUnreadMessageCount(long sdkUnreadCount) {
+        int markUnreadCount = 0;
+        int markHiddenCount = 0;
+        Iterator<Map.Entry<String, ConversationInfo>> iterator = markUnreadAndHiddenMap.entrySet().iterator();
+        while (iterator.hasNext()) {
+            Map.Entry<String, ConversationInfo> entry = iterator.next();
+            ConversationInfo conversationInfo = entry.getValue();
+            if (conversationInfo.isShowDisturbIcon()) {
+                continue;
+            }
+
+            if (conversationInfo.isMarkHidden()) {
+                markHiddenCount += conversationInfo.getUnRead();
+            } else if (conversationInfo.isMarkUnread()) {
+                markUnreadCount++;
+            }
+        }
+
+        TUIConversationLog.i(TAG, "updateTotalUnreadMessageCount sdkUnreadCount:" + sdkUnreadCount + ", markUnreadCount:" + markUnreadCount + ", markHiddenCount:" + markHiddenCount);
+
+        totalUnreadCount = sdkUnreadCount + markUnreadCount - markHiddenCount;
+        if (totalUnreadCount < 0) {
+            totalUnreadCount = 0;
+        }
+        updateUnreadTotal(totalUnreadCount);
+    }
+
+    /**
+     * 更新会话未读计数
+     *
+     * @param unreadTotal
+     */
+    public void updateUnreadTotal(long unreadTotal) {
+        TUIConversationLog.i(TAG, "updateUnreadTotal:" + unreadTotal);
+        totalUnreadCount = unreadTotal;
+        HashMap<String, Object> param = new HashMap<>();
+        param.put(TUIConstants.TUIConversation.TOTAL_UNREAD_COUNT, totalUnreadCount);
+        TUICore.notifyEvent(TUIConstants.TUIConversation.EVENT_UNREAD, TUIConstants.TUIConversation.EVENT_SUB_KEY_UNREAD_CHANGED, param);
+
+        Intent intent = new Intent();
+        intent.setAction(TUIConstants.CONVERSATION_UNREAD_COUNT_ACTION);
+        intent.putExtra(TUIConstants.UNREAD_COUNT_EXTRA, totalUnreadCount);
+        LocalBroadcastManager.getInstance(TUIConversationService.getAppContext()).sendBroadcast(intent);
+    }
+
+    /**
+     * 将某个会话置顶
+     *
+     * @param conversation
+     */
+    public void setConversationTop(final ConversationInfo conversation, final IUIKitCallback<Void> callBack) {
+        TUIConversationLog.i(TAG, "setConversationTop" + "|conversation:" + conversation);
+        final boolean setTop = !conversation.isTop();
+
+        provider.setConversationTop(conversation.getConversationId(), setTop, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                conversation.setTop(setTop);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIConversationLog.e(TAG, "setConversationTop code:" + errCode + "|desc:" + errMsg);
+                if (callBack != null) {
+                    callBack.onError("setConversationTop", errCode, errMsg);
+                }
+            }
+        });
+
+    }
+
+    /**
+     * 会话置顶操作
+     *
+     * @param id    会话ID
+     * @param isTop 是否置顶
+     */
+    public void setConversationTop(String id, final boolean isTop, final IUIKitCallback<Void> callBack) {
+        TUIConversationLog.i(TAG, "setConversationTop id:" + id + "|isTop:" + isTop);
+        ConversationInfo conversation = null;
+        for (int i = 0; i < loadedConversationInfoList.size(); i++) {
+            ConversationInfo info = loadedConversationInfoList.get(i);
+            if (info.getId().equals(id)) {
+                conversation = info;
+                break;
+            }
+        }
+        if (conversation == null) {
+            return;
+        }
+        final ConversationInfo conversationInfo = conversation;
+        final String conversationId = conversation.getConversationId();
+        provider.setConversationTop(conversationId, isTop, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                conversationInfo.setTop(isTop);
+                TUIConversationUtils.callbackOnSuccess(callBack, null);
+            }
+
+            @Override
+            public void onError(String module, int code, String desc) {
+                TUIConversationLog.e(TAG, "setConversationTop code:" + code + "|desc:" + desc);
+                if (callBack != null) {
+                    callBack.onError("setConversationTop", code, desc);
+                }
+            }
+        });
+    }
+
+    public boolean isTopConversation(String conversationID) {
+        for (int i = 0; i < loadedConversationInfoList.size(); i++) {
+            ConversationInfo info = loadedConversationInfoList.get(i);
+            if (info.getId().equals(conversationID)) {
+                return info.isTop();
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 删除会话，会将本地会话数据从imsdk中删除
+     *
+     * @param conversation 会话信息
+     */
+    public void deleteConversation(ConversationInfo conversation) {
+        TUIConversationLog.i(TAG, "deleteConversation conversation:" + conversation);
+        if (conversation == null) {
+            return;
+        }
+        provider.deleteConversation(conversation.getConversationId(), new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                int index = loadedConversationInfoList.indexOf(conversation);
+                boolean isRemove = loadedConversationInfoList.remove(conversation);
+                if (adapter != null && isRemove && index != -1) {
+                    adapter.onItemRemoved(index);
+                }
+
+                if (mUIFoldConversation == null || !conversation.isGroup()) {
+                    return;
+                }
+
+                if (!TextUtils.equals(conversation.getConversationId(), mUIFoldConversation.getConversationId())) {
+                    return;
+                }
+
+                mUIFoldConversation = null;
+                Iterator<ConversationInfo> iterator = foldConversationInfoList.iterator();
+                while (iterator.hasNext()) {
+                    ConversationInfo cacheConversationInfo = iterator.next();
+                    if (TextUtils.equals(conversation.getConversationId(), cacheConversationInfo.getConversationId())) {
+                        iterator.remove();
+                        break;
+                    }
+                }
+
+                for (ConversationInfo conversationInfo : foldConversationInfoList) {
+                    if (!conversationInfo.isMarkHidden()) {
+                        mUIFoldConversation = conversationInfo;
+                        ArrayList<ConversationInfo> addInfoList = new ArrayList<>();
+                        addInfoList.add(mUIFoldConversation);
+                        onNewConversation(addInfoList,true);
+                        break;
+                    }
+                }
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+
+            }
+        });
+
+    }
+
+    /**
+     * 清空会话
+     *
+     * @param conversation 会话信息
+     */
+    public void clearConversationMessage(ConversationInfo conversation) {
+        if (conversation == null || TextUtils.isEmpty(conversation.getConversationId())) {
+            TUIConversationLog.e(TAG, "clearConversationMessage error: invalid conversation");
+            return;
+        }
+
+        provider.clearHistoryMessage(conversation.getId(), conversation.isGroup(), new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+
+            }
+        });
+    }
+
+    /**
+     * 隐藏会话
+     * hide conversation
+     * @param conversationInfo 会话信息 conversation info
+     */
+    public void markConversationHidden(ConversationInfo conversationInfo, boolean isHidden) {
+        if (conversationInfo == null || TextUtils.isEmpty(conversationInfo.getConversationId())) {
+            TUIConversationLog.e(TAG, "markConversationHidden error: invalid conversationInfo");
+            return;
+        }
+
+        provider.markConversationHidden(conversationInfo.getConversationId(), isHidden, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                conversationInfo.setMarkHidden(isHidden);
+                TUIConversationLog.i(TAG, "markConversationHidden success, conversationID:" +
+                        conversationInfo.getConversationId() + ", isHidden:" + isHidden);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIConversationLog.e(TAG, "markConversationHidden error, conversationID:" +
+                        conversationInfo.getConversationId() + ", code:" + errCode + "|msg:" + errMsg);
+            }
+        });
+    }
+
+    public void markConversationUnread(ConversationInfo conversationInfo, boolean markUnread) {
+        if (conversationInfo == null || TextUtils.isEmpty(conversationInfo.getConversationId())) {
+            TUIConversationLog.e(TAG, "markConversationUnread error: invalid conversationInfo");
+            return;
+        }
+
+        provider.markConversationUnread(conversationInfo, markUnread, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                conversationInfo.setMarkUnread(markUnread);
+                TUIConversationLog.i(TAG, "markConversationRead success, conversationID:" +
+                        conversationInfo.getConversationId());
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIConversationLog.e(TAG, "markConversationRead error, conversationID:" +
+                        conversationInfo.getConversationId() + ", code:" + errCode + "|msg:" + errMsg);
+            }
+        });
+    }
+
+    public void clearConversationMessage(String chatId, boolean isGroup) {
+        provider.clearHistoryMessage(chatId, isGroup, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+
+            }
+        });
+    }
+
+    /**
+     * 删除会话，只删除数据源中的会话信息
+     *
+     * @param id C2C：对方的 userID；Group：群 ID
+     */
+    public void deleteConversation(String id, boolean isGroup) {
+        ConversationInfo conversationInfo = null;
+        for (int i = 0; i < loadedConversationInfoList.size(); i++) {
+            ConversationInfo info = loadedConversationInfoList.get(i);
+            if (isGroup == info.isGroup() && info.getId().equals(id)) {
+                conversationInfo = info;
+                break;
+            }
+        }
+        deleteConversation(conversationInfo);
+    }
+
+    public void clearFoldMarkAndDeleteConversation(String conversationId) {
+        if (TextUtils.isEmpty(conversationId)) {
+            return;
+        }
+        ConversationInfo conversationInfo = null;
+        for (int i = 0; i < loadedConversationInfoList.size(); i++) {
+            ConversationInfo info = loadedConversationInfoList.get(i);
+            if (info.getConversationId().equals(conversationId)) {
+                conversationInfo = info;
+                break;
+            }
+        }
+
+        if (conversationInfo == null) {
+            return;
+        }
+
+        if (conversationInfo.isMarkFold()) {
+            ConversationInfo finalConversationInfo = conversationInfo;
+            provider.markConversationFold(conversationId, false, new IUIKitCallback<Void>() {
+                @Override
+                public void onSuccess(Void data) {
+                    deleteConversation(finalConversationInfo);
+                }
+
+                @Override
+                public void onError(String module, int errCode, String errMsg) {
+                    TUIConversationLog.e(TAG, "markConversationFold error, conversationID:" +
+                            conversationId + ", code:" + errCode + "|msg:" + errMsg);
+                }
+            });
+        } else {
+            deleteConversation(conversationInfo);
+        }
+    }
+
+    public void onFriendRemarkChanged(String id, String remark) {
+        for (int i = 0; i < loadedConversationInfoList.size(); i++) {
+            ConversationInfo info = loadedConversationInfoList.get(i);
+            if (info.getId().equals(id) && !info.isGroup()) {
+                String title = info.getShowName();
+                if (!TextUtils.isEmpty(remark)) {
+                    title = remark;
+                }
+                info.setTitle(title);
+                adapter.onDataSourceChanged(loadedConversationInfoList);
+                if (adapter != null) {
+                    adapter.onItemChanged(i);
+                }
+                break;
+            }
+        }
+    }
+
+    public void onMessageSendForHideConversation(String id) {
+        if (TextUtils.isEmpty(id)) {
+            return;
+        }
+
+        boolean isHide = false;
+        ConversationInfo conversationInfo = markUnreadAndHiddenMap.get(id);
+        if (conversationInfo!= null && conversationInfo.isMarkHidden()) {
+            isHide = true;
+        }
+
+        if (!isHide) {
+            return;
+        }
+
+        provider.markConversationHidden(id, false, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                TUIConversationLog.i(TAG, "onMessageSendForHideConversation markConversationHidden success, conversationID:" +
+                        id + ", isHidden:false");
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIConversationLog.e(TAG, "onMessageSendForHideConversation markConversationHidden error, conversationID:" +
+                        id + ", code:" + errCode + "|msg:" + errMsg);
+            }
+        });
+    }
+
+    public void onUserStatusChanged(List<V2TIMUserStatus> userStatusList) {
+        if (!TUIConversationConfig.getInstance().isShowUserStatus()) {
+            return;
+        }
+        HashMap<String, Pair<Integer, ConversationInfo>> dataSourceMap = new HashMap<>();
+        int index = 0;
+        for(ConversationInfo itemBean : loadedConversationInfoList) {
+            dataSourceMap.put(itemBean.getId(), Pair.create(index++, itemBean));
+        }
+
+        for(V2TIMUserStatus timUserStatus : userStatusList) {
+            String userid = timUserStatus.getUserID();
+            Pair<Integer, ConversationInfo> beanPair = dataSourceMap.get(userid);
+            if (beanPair == null) {
+                continue;
+            }
+            ConversationInfo bean = dataSourceMap.get(userid).second;
+            int position = dataSourceMap.get(userid).first;
+            if (bean != null && bean.getStatusType() != timUserStatus.getStatusType()) {
+                bean.setStatusType(timUserStatus.getStatusType());
+                adapter.onDataSourceChanged(loadedConversationInfoList);
+                if (adapter != null) {
+                    adapter.onItemChanged(position);
+                }
+            }
+        }
+    }
+
+    public void clearAllUnreadMessage() {
+        provider.clearAllUnreadMessage(new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+
+            }
+        });
+    }
+
+    /**
+     * 会话会话列界面，在数据源更新的地方调用
+     */
+    public void updateAdapter() {
+        if (adapter != null) {
+            adapter.onViewNeedRefresh();
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_create_icon.png b/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_create_icon.png
new file mode 100644
index 0000000..246351c
Binary files /dev/null and b/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_create_icon.png differ
diff --git a/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_edit_icon.png b/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_edit_icon.png
new file mode 100644
index 0000000..d8be61a
Binary files /dev/null and b/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_edit_icon.png differ
diff --git a/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_message_status_send_all_read.png b/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_message_status_send_all_read.png
new file mode 100644
index 0000000..2046ce5
Binary files /dev/null and b/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_message_status_send_all_read.png differ
diff --git a/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_message_status_send_no_read.png b/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_message_status_send_no_read.png
new file mode 100644
index 0000000..c6a209a
Binary files /dev/null and b/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_message_status_send_no_read.png differ
diff --git a/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_more_icon.png b/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_more_icon.png
new file mode 100644
index 0000000..dbbf60d
Binary files /dev/null and b/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_more_icon.png differ
diff --git a/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_not_disturb_icon.png b/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_not_disturb_icon.png
new file mode 100644
index 0000000..8e497ee
Binary files /dev/null and b/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_not_disturb_icon.png differ
diff --git a/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_online_icon.png b/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_online_icon.png
new file mode 100644
index 0000000..6e5c850
Binary files /dev/null and b/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_online_icon.png differ
diff --git a/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_search_border.xml b/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_search_border.xml
new file mode 100644
index 0000000..6ccaebb
--- /dev/null
+++ b/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_search_border.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#1F767680"/>
+    <corners android:radius="10dp"/>
+</shape>
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_search_icon.png b/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_search_icon.png
new file mode 100644
index 0000000..3e6a260
Binary files /dev/null and b/system/tuiconversation/src/main/res-minimalistui/drawable/conversation_minimalist_search_icon.png differ
diff --git a/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_bottom_bar.xml b/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_bottom_bar.xml
new file mode 100644
index 0000000..1a691b6
--- /dev/null
+++ b/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_bottom_bar.xml
@@ -0,0 +1,64 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/bottom_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/conversation_bottom_bg"
+    android:orientation="vertical"
+    android:visibility="visible"
+    tools:visibility="visible">
+
+    <TextView
+        android:id="@+id/divide_line"
+        android:layout_width="match_parent"
+        android:layout_marginTop="1dp"
+        android:layout_height="1dp"
+        android:background="@color/dialog_line_bg" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/conversation_bottom_bg"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:paddingLeft="38.4dp"
+        android:paddingRight="38.4dp"
+        android:layout_marginTop="1.36dp"
+        android:layout_marginBottom="46.08dp"
+        android:orientation="horizontal" >
+    <TextView
+        android:id="@+id/not_display"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:layout_marginTop="5.76dp"
+        android:text="@string/not_display"
+        android:textColor="#147AFF"
+        android:textSize="14sp" />
+
+    <TextView
+        android:id="@+id/mark_read"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:layout_marginTop="5.76dp"
+        android:layout_weight="1"
+        android:text="@string/mark_read"
+        android:textColor="#147AFF"
+        android:textSize="14sp" />
+
+    <TextView
+        android:id="@+id/delete_chat"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:layout_weight="1"
+        android:layout_marginTop="5.76dp"
+        android:text="@string/chat_delete"
+        android:textColor="#147AFF"
+        android:textSize="14sp" />
+
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_conversation_list_item_sub_layout.xml b/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_conversation_list_item_sub_layout.xml
new file mode 100644
index 0000000..f4612fe
--- /dev/null
+++ b/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_conversation_list_item_sub_layout.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:gravity="center_vertical"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:orientation="horizontal">
+
+    <RelativeLayout
+        android:gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.ConversationIconView
+            android:id="@+id/conversation_icon"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            tools:background="@android:drawable/ic_menu_gallery"/>
+
+        <View
+            android:id="@+id/user_status"
+            android:layout_width="10dp"
+            android:layout_height="10dp"
+            android:layout_alignBottom="@id/conversation_icon"
+            android:layout_alignEnd="@id/conversation_icon"
+            android:layout_alignRight="@id/conversation_icon"
+            android:visibility="visible"
+            android:background="@drawable/conversation_minimalist_online_icon" />
+
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:gravity="center_vertical"
+        android:layout_marginStart="8dp"
+        android:layout_marginLeft="8dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/conversation_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxWidth="180dp"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentTop="true"
+            android:ellipsize="end"
+            android:gravity="top|start"
+            android:singleLine="true"
+            android:textColor="@color/black_font_color"
+            android:textStyle="bold"
+            android:textSize="14sp"
+            tools:text="Daniel"/>
+
+        <TextView
+            android:id="@+id/conversation_at_msg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/conversation_title"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textColor="#FF666666"
+            android:textSize="12sp"
+            android:visibility="gone"
+            android:layout_marginEnd="4dp"
+            android:layout_marginRight="4dp"
+            tools:visibility="visible"
+            tools:text="\@You" />
+
+        <TextView
+            android:id="@+id/conversation_last_msg"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="start"
+            android:layout_gravity="start"
+            android:layout_below="@id/conversation_title"
+            android:layout_toEndOf="@id/conversation_at_msg"
+            android:layout_toStartOf="@id/message_status_layout"
+            android:layout_marginEnd="29dp"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textColor="#FF666666"
+            android:textSize="12sp"
+            tools:text="Hello"
+            android:layout_toRightOf="@id/conversation_at_msg"
+            android:layout_toLeftOf="@id/message_status_layout"
+            android:layout_marginRight="29dp" />
+
+        <RelativeLayout
+            android:id="@+id/message_status_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_above="@+id/view_line"
+            android:layout_toStartOf="@id/conversation_time"
+            android:layout_alignBottom="@id/conversation_time"
+            android:layout_gravity="center_vertical"
+            android:gravity="center_vertical"
+            android:visibility="gone"
+            android:layout_marginRight="2dp"
+            tools:visibility="visible"
+            android:layout_toLeftOf="@id/conversation_time">
+
+            <ImageView
+                android:id="@+id/message_status_sending"
+                android:layout_width="14dp"
+                android:layout_height="14dp"
+                android:layout_gravity="center_vertical"
+                android:background="@drawable/ic_sending_status"
+                android:visibility="gone"
+                tools:visibility="visible"/>
+
+            <ImageView
+                android:id="@+id/message_status_failed"
+                android:layout_width="14dp"
+                android:layout_height="14dp"
+                android:layout_gravity="center_vertical"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_send_failed"
+                android:visibility="gone"/>
+        </RelativeLayout>
+
+
+        <TextView
+            android:id="@+id/conversation_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/conversation_title"
+            android:layout_alignParentRight="true"
+            android:textColor="#FF666666"
+            android:textSize="12sp"
+            android:lineHeight="14.32sp"
+            android:layout_alignParentEnd="true"
+            tools:text="12:00"/>
+
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:gravity="center_vertical"
+            android:layout_alignParentRight="true"
+            android:layout_marginBottom="3dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:id="@+id/not_disturb"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
+                android:includeFontPadding="false"
+                android:background="@drawable/conversation_minimalist_not_disturb_icon"
+                android:visibility="gone"
+                tools:visibility="visible"/>
+
+            <com.tencent.qcloud.tuicore.component.UnreadCountTextView
+                android:id="@+id/conversation_unread"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_above="@id/conversation_time"
+                android:layout_marginStart="8dp"
+                android:layout_marginLeft="8dp"
+                android:gravity="center"
+                android:includeFontPadding="false"
+                android:textColor="#FFFFFF"
+                android:textSize="11sp"
+                app:paint_color="#FF584C"
+                android:layout_alignParentEnd="true"
+                tools:text="2"
+                tools:visibility="visible"/>
+        </LinearLayout>
+
+
+    </RelativeLayout>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_folded_fragment.xml b/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_folded_fragment.xml
new file mode 100644
index 0000000..893a53c
--- /dev/null
+++ b/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_folded_fragment.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/conversation_page_bg">
+
+    <com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.FoldedConversationLayout
+        android:id="@+id/folded_conversation_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
diff --git a/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_folded_layout.xml b/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_folded_layout.xml
new file mode 100644
index 0000000..b77f1f1
--- /dev/null
+++ b/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_folded_layout.xml
@@ -0,0 +1,16 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/conversation_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.FoldedConversationListLayout
+        android:id="@+id/folded_conversation_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</LinearLayout>
diff --git a/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_forward_conversation_selector_item.xml b/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_forward_conversation_selector_item.xml
new file mode 100644
index 0000000..27d40b2
--- /dev/null
+++ b/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_forward_conversation_selector_item.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="@dimen/btn_margin_bottom"
+    android:clickable="true">
+
+    <com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.ConversationIconView
+        android:id="@+id/conversation_user_icon_view"
+        android:layout_width="41dp"
+        android:layout_height="41dp"
+        app:default_image="?attr/core_default_user_icon"
+        android:visibility="gone"/>
+
+</LinearLayout>
+
diff --git a/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_forward_fragment.xml b/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_forward_fragment.xml
new file mode 100644
index 0000000..5b90da6
--- /dev/null
+++ b/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_forward_fragment.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.ForwardSelectLayout
+        android:id="@+id/forward_conversation_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="@dimen/btn_height"/>
+
+    <RelativeLayout
+        android:id="@+id/forward_select_list_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:paddingLeft="14.85dp"
+        android:paddingRight="14.85dp"
+        android:orientation="horizontal">
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/forward_select_list"
+            android:layout_width="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="@dimen/forward_margin"/>
+
+        <TextView
+            android:id="@+id/btn_msg_ok"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="@dimen/btn_margin_right"
+            android:text="@string/sure"
+            android:textColor="@color/bg_positive_btn"
+            android:textSize="14sp"
+            android:visibility="visible" />
+
+    </RelativeLayout>
+</RelativeLayout>
diff --git a/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_forward_layout.xml b/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_forward_layout.xml
new file mode 100644
index 0000000..65036ef
--- /dev/null
+++ b/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_forward_layout.xml
@@ -0,0 +1,16 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/conversation_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.ConversationListLayout
+        android:id="@+id/conversation_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</LinearLayout>
diff --git a/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_header_view_layout.xml b/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_header_view_layout.xml
new file mode 100644
index 0000000..d73c740
--- /dev/null
+++ b/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_header_view_layout.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:gravity="center_vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:textSize="34sp"
+        android:lineHeight="41dp"
+        android:textStyle="bold"
+        android:textColor="@color/black_font_color"
+        android:text="@string/conversation_minimalist_chat"/>
+
+    <ImageView
+        android:id="@+id/edit_button"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:background="@drawable/conversation_minimalist_edit_icon"/>
+
+    <ImageView
+        android:id="@+id/create_new_button"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_marginLeft="25dp"
+        android:layout_marginStart="25dp"
+        android:background="@drawable/conversation_minimalist_create_icon" />
+
+    <TextView
+        android:id="@+id/edit_done"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="16sp"
+        android:textColor="@color/font_blue"
+        android:text="@string/conversation_minimalist_done"
+        android:visibility="gone"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_more_dialog.xml b/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_more_dialog.xml
new file mode 100644
index 0000000..d96f1f3
--- /dev/null
+++ b/system/tuiconversation/src/main/res-minimalistui/layout/minimalist_more_dialog.xml
@@ -0,0 +1,88 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/more_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/transparent"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:layout_marginLeft="16dp"
+    android:layout_marginRight="16dp"
+    android:layout_marginBottom="34dp"
+    android:visibility="visible"
+    tools:visibility="visible">
+
+    <LinearLayout
+        android:id="@+id/layout_actions"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:background="@drawable/alert_bg"
+        android:alpha="0.95">
+
+    <TextView
+        android:id="@+id/not_display"
+        android:text="@string/not_display"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:gravity="center"
+        android:textColor="#147AFF"
+        android:textSize="17sp" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/white" />
+
+    <TextView
+        android:id="@+id/top_set"
+        android:text="@string/chat_top"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:gravity="center"
+        android:textColor="#147AFF"
+        android:textSize="17sp" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/white" />
+
+    <TextView
+        android:id="@+id/clear_chat"
+        android:text="@string/clear_message"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:gravity="center"
+        android:textColor="#147AFF"
+        android:textSize="17sp" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/white" />
+
+    <TextView
+        android:id="@+id/delete_chat"
+        android:text="@string/chat_delete"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:gravity="center"
+        android:textColor="#FF584C"
+        android:textSize="17sp" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/cancel_button"
+        android:layout_below="@+id/layout_actions"
+        android:background="@drawable/alert_bg"
+        android:layout_marginTop="12dp"
+        android:text="@string/cancel"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:gravity="center"
+        android:textColor="#147AFF"
+        android:textSize="17sp" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/res-minimalistui/layout/minimalistui_conversation_fragment.xml b/system/tuiconversation/src/main/res-minimalistui/layout/minimalistui_conversation_fragment.xml
new file mode 100644
index 0000000..42a87a8
--- /dev/null
+++ b/system/tuiconversation/src/main/res-minimalistui/layout/minimalistui_conversation_fragment.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/conversation_page_bg">
+
+    <com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.ConversationLayout
+        android:id="@+id/conversation_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <include layout="@layout/minimalist_bottom_bar"
+        android:layout_marginBottom="@dimen/page_margin"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent" />
+
+</LinearLayout>
diff --git a/system/tuiconversation/src/main/res-minimalistui/layout/minimalistui_conversation_layout.xml b/system/tuiconversation/src/main/res-minimalistui/layout/minimalistui_conversation_layout.xml
new file mode 100644
index 0000000..1e0c273
--- /dev/null
+++ b/system/tuiconversation/src/main/res-minimalistui/layout/minimalistui_conversation_layout.xml
@@ -0,0 +1,46 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <include
+        layout="@layout/minimalist_header_view_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="9dp"
+        android:layout_marginEnd="16dp" />
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:background="@color/transparent"
+            app:elevation="0dp"
+            app:layout_insetEdge="none"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <FrameLayout
+                android:id="@+id/search_layout"
+                android:layout_width="match_parent"
+                android:layout_height="32dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginTop="9dp"
+                android:layout_marginRight="16dp"
+                android:layout_marginBottom="15dp"
+                android:visibility="gone"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed" />
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.ConversationListLayout
+            android:id="@+id/conversation_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+</LinearLayout>
diff --git a/system/tuiconversation/src/main/res-minimalistui/layout/minimalistui_conversation_list_item_layout.xml b/system/tuiconversation/src/main/res-minimalistui/layout/minimalistui_conversation_list_item_layout.xml
new file mode 100644
index 0000000..2f40961
--- /dev/null
+++ b/system/tuiconversation/src/main/res-minimalistui/layout/minimalistui_conversation_list_item_layout.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.swipe.SwipeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/swipe"
+    android:layout_width="match_parent"
+    android:layout_height="64dp"
+    android:background="#FFFFFF"
+    app:clickToClose="false">
+
+    <LinearLayout
+        android:id="@+id/bottom_wrapper_2"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:tag="Bottom4">
+
+        <RelativeLayout
+            android:id="@+id/more_view"
+            android:layout_width="70dp"
+            android:layout_height="match_parent"
+            android:background="@color/black"
+            android:gravity="center">
+
+            <ImageView
+                android:id="@+id/more_image"
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
+                android:src="@drawable/conversation_minimalist_more_icon" />
+
+            <TextView
+                android:id="@+id/more_text"
+                android:layout_width="70dp"
+                android:layout_height="match_parent"
+                android:layout_below="@+id/more_image"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true"
+                android:gravity="center"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
+                android:text="@string/more_text"
+                android:textColor="@color/white"
+                android:textSize="12sp" />
+
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/mark_read"
+            android:layout_width="70dp"
+            android:layout_height="match_parent"
+            android:background="@color/conversation_mark_swipe_bg"
+            android:gravity="center">
+
+            <ImageView
+                android:id="@+id/mark_read_image"
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:layout_centerHorizontal="true"
+                android:layout_centerVertical="true" />
+
+            <TextView
+                android:id="@+id/mark_read_text"
+                android:layout_width="70dp"
+                android:layout_height="match_parent"
+                android:layout_below="@+id/mark_read_image"
+                android:layout_centerInParent="true"
+                android:background="@color/transparent"
+                android:gravity="center"
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp"
+                android:text="@string/mark_read"
+                android:textColor="@color/white"
+                android:textSize="12sp" />
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/not_display"
+            android:layout_width="70dp"
+            android:layout_height="match_parent"
+            android:background="@color/conversation_mark_swipe_bg"
+            android:gravity="center"
+            android:paddingLeft="5dp"
+            android:paddingRight="5dp"
+            android:text="@string/not_display"
+            android:textColor="@color/white"
+            android:textSize="12sp"
+            android:visibility="gone" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/item_left"
+        android:layout_width="match_parent"
+        android:layout_height="64dp"
+        android:background="#FFFFFF"
+        android:clipChildren="false"
+        android:clipToPadding="false"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp">
+
+        <CheckBox
+            android:id="@+id/select_checkbox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_gravity="center_vertical"
+            android:layout_marginRight="6.23dp"
+            android:button="@drawable/checkbox_selector"
+            android:visibility="gone" />
+
+        <include
+            layout="@layout/minimalist_conversation_list_item_sub_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:padding="10dp"
+            android:tag="Hover" />
+
+    </LinearLayout>
+</com.tencent.qcloud.tuikit.tuiconversation.minimalistui.widget.swipe.SwipeLayout>
diff --git a/system/tuiconversation/src/main/res-minimalistui/values-zh-rCN/minimalist_strings.xml b/system/tuiconversation/src/main/res-minimalistui/values-zh-rCN/minimalist_strings.xml
new file mode 100644
index 0000000..73b00ff
--- /dev/null
+++ b/system/tuiconversation/src/main/res-minimalistui/values-zh-rCN/minimalist_strings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="conversation_minimalist_chat">聊天</string>
+    <string name="conversation_minimalist_search">搜索</string>
+    <string name="conversation_minimalist_done">完成</string>
+    <string name="has_all_read">全部已读</string>
+    <string name="start_conversation">发起会话</string>
+    <string name="create_group_chat">创建群聊</string>
+    <string name="more_text">更多</string>
+    <string name="clear_message">清除聊天记录</string>
+</resources>
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/res-minimalistui/values/minimalist_attrs.xml b/system/tuiconversation/src/main/res-minimalistui/values/minimalist_attrs.xml
new file mode 100644
index 0000000..3c4e3b1
--- /dev/null
+++ b/system/tuiconversation/src/main/res-minimalistui/values/minimalist_attrs.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="MinimalistHeaderView">
+        <attr name="header_title" format="string" />
+    </declare-styleable>
+
+    <declare-styleable name="SwipeLayout">
+        <attr name="drag_edge">
+            <flag name="left" value="1" />
+            <flag name="right" value="2" />
+            <flag name="top" value="4" />
+            <flag name="bottom" value="8" />
+        </attr>
+        <attr name="leftEdgeSwipeOffset" format="dimension" />
+        <attr name="rightEdgeSwipeOffset" format="dimension" />
+        <attr name="topEdgeSwipeOffset" format="dimension" />
+        <attr name="bottomEdgeSwipeOffset" format="dimension" />
+        <attr name="show_mode" format="enum">
+            <enum name="lay_down" value="0" />
+            <enum name="pull_out" value="1" />
+        </attr>
+        <attr name="clickToClose" format="boolean" />
+    </declare-styleable>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/res-minimalistui/values/minimalist_colors.xml b/system/tuiconversation/src/main/res-minimalistui/values/minimalist_colors.xml
new file mode 100644
index 0000000..d2ddf80
--- /dev/null
+++ b/system/tuiconversation/src/main/res-minimalistui/values/minimalist_colors.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="conversation_delete_swipe_bg">#F24D4C</color>
+    <color name="conversation_mark_swipe_bg">#147AFF</color>
+    <color name="conversation_mark_swipe_dark_bg">#666666</color>
+    <color name="conversation_hide_swipe_bg">#F29340</color>
+    <color name="conversation_bottom_bg">#F9F9F9</color>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/res-minimalistui/values/minimalist_strings.xml b/system/tuiconversation/src/main/res-minimalistui/values/minimalist_strings.xml
new file mode 100644
index 0000000..c473fdb
--- /dev/null
+++ b/system/tuiconversation/src/main/res-minimalistui/values/minimalist_strings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="conversation_minimalist_chat">Chat</string>
+    <string name="conversation_minimalist_search">Search</string>
+    <string name="conversation_minimalist_done">Done</string>
+    <string name="has_all_read">Read All</string>
+    <string name="start_conversation">New Chat</string>
+    <string name="create_group_chat">Create Group Chat</string>
+    <string name="more_text">More</string>
+    <string name="clear_message">Clear Chat History</string>
+</resources>
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/res/color/bg_positive_btn.xml b/system/tuiconversation/src/main/res/color/bg_positive_btn.xml
new file mode 100644
index 0000000..102c1f9
--- /dev/null
+++ b/system/tuiconversation/src/main/res/color/bg_positive_btn.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:color="@color/btn_positive_hover" >
+        <shape xmlns:android="http://schemas.android.com/apk/res/android"
+            android:shape="rectangle" >
+            <corners android:radius="5dp" />
+            <solid android:color="@color/btn_positive_hover" />
+        </shape>
+    </item>
+    <item android:color="@color/btn_positive" >
+        <shape xmlns:android="http://schemas.android.com/apk/res/android"
+            android:shape="rectangle" >
+            <corners android:radius="5dp" />
+            <solid android:color="@color/btn_positive" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/res/drawable-xxhdpi/check_box_selected.png b/system/tuiconversation/src/main/res/drawable-xxhdpi/check_box_selected.png
new file mode 100644
index 0000000..273e525
Binary files /dev/null and b/system/tuiconversation/src/main/res/drawable-xxhdpi/check_box_selected.png differ
diff --git a/system/tuiconversation/src/main/res/drawable-xxhdpi/check_box_unselected.png b/system/tuiconversation/src/main/res/drawable-xxhdpi/check_box_unselected.png
new file mode 100644
index 0000000..949bc8b
Binary files /dev/null and b/system/tuiconversation/src/main/res/drawable-xxhdpi/check_box_unselected.png differ
diff --git a/system/tuiconversation/src/main/res/drawable-xxhdpi/conversation_more.png b/system/tuiconversation/src/main/res/drawable-xxhdpi/conversation_more.png
new file mode 100644
index 0000000..96901df
Binary files /dev/null and b/system/tuiconversation/src/main/res/drawable-xxhdpi/conversation_more.png differ
diff --git a/system/tuiconversation/src/main/res/drawable-xxhdpi/create_c2c.png b/system/tuiconversation/src/main/res/drawable-xxhdpi/create_c2c.png
new file mode 100644
index 0000000..f3a4086
Binary files /dev/null and b/system/tuiconversation/src/main/res/drawable-xxhdpi/create_c2c.png differ
diff --git a/system/tuiconversation/src/main/res/drawable-xxhdpi/group_icon.png b/system/tuiconversation/src/main/res/drawable-xxhdpi/group_icon.png
new file mode 100644
index 0000000..b2dc3dc
Binary files /dev/null and b/system/tuiconversation/src/main/res/drawable-xxhdpi/group_icon.png differ
diff --git a/system/tuiconversation/src/main/res/drawable-xxhdpi/ic_contact_join_group.png b/system/tuiconversation/src/main/res/drawable-xxhdpi/ic_contact_join_group.png
new file mode 100644
index 0000000..3a4fcd0
Binary files /dev/null and b/system/tuiconversation/src/main/res/drawable-xxhdpi/ic_contact_join_group.png differ
diff --git a/system/tuiconversation/src/main/res/drawable-xxhdpi/ic_fold.png b/system/tuiconversation/src/main/res/drawable-xxhdpi/ic_fold.png
new file mode 100644
index 0000000..a851803
Binary files /dev/null and b/system/tuiconversation/src/main/res/drawable-xxhdpi/ic_fold.png differ
diff --git a/system/tuiconversation/src/main/res/drawable-xxhdpi/ic_personal_member.png b/system/tuiconversation/src/main/res/drawable-xxhdpi/ic_personal_member.png
new file mode 100644
index 0000000..e6cb21c
Binary files /dev/null and b/system/tuiconversation/src/main/res/drawable-xxhdpi/ic_personal_member.png differ
diff --git a/system/tuiconversation/src/main/res/drawable/checkbox_selector.xml b/system/tuiconversation/src/main/res/drawable/checkbox_selector.xml
new file mode 100644
index 0000000..0004216
--- /dev/null
+++ b/system/tuiconversation/src/main/res/drawable/checkbox_selector.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/check_box_selected" android:state_checked="true" />
+    <item android:drawable="@drawable/check_box_unselected" android:state_checked="false" />
+    <item android:drawable="@drawable/check_box_unselected" />
+
+</selector>
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/res/drawable/ic_disturb.xml b/system/tuiconversation/src/main/res/drawable/ic_disturb.xml
new file mode 100644
index 0000000..b4815c8
--- /dev/null
+++ b/system/tuiconversation/src/main/res/drawable/ic_disturb.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M10.8,14C10.4,15.2 9.3,16 8,16C6.7,16 5.6,15.2 5.2,14L10.8,14ZM9,1L9,2.1C11.3,2.6 13,4.6 13,7L13,10.086L15.0208,12.1066L13.6066,13.5208L3,2.9142L4.4142,1.5L5.5613,2.647C6.0028,2.3981 6.4864,2.2116 7,2.1L7,1L9,1ZM3.5061,4.814L11.691,13L1,13L1,12L3,11L3,7C3,6.2158 3.1815,5.4744 3.5061,4.814Z"
+      android:strokeWidth="1"
+      android:fillColor="#BBBBBB"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000"/>
+</vector>
diff --git a/system/tuiconversation/src/main/res/drawable/ic_send_failed.xml b/system/tuiconversation/src/main/res/drawable/ic_send_failed.xml
new file mode 100644
index 0000000..5d3cfca
--- /dev/null
+++ b/system/tuiconversation/src/main/res/drawable/ic_send_failed.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M16,2A14,14 0,1 0,16 30A14,14 0,1 0,16 2Z"
+      android:fillColor="#FF584C"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M17,21L17,23L15,23L15,21L17,21ZM17,9L17,19L15,19L15,9L17,9Z"
+      android:fillColor="#FFF"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/system/tuiconversation/src/main/res/drawable/ic_sending_status.xml b/system/tuiconversation/src/main/res/drawable/ic_sending_status.xml
new file mode 100644
index 0000000..7c7a17f
--- /dev/null
+++ b/system/tuiconversation/src/main/res/drawable/ic_sending_status.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M14,5L14,12L20,12L20,20L14,20L14,27L2,15.9716L14,5ZM26,12L26,20L22,20L22,12L26,12ZM30,12L30,20L28,20L28,12L30,12Z"
+      android:fillColor="#CCC"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/system/tuiconversation/src/main/res/drawable/my_cursor.xml b/system/tuiconversation/src/main/res/drawable/my_cursor.xml
new file mode 100644
index 0000000..31599ac
--- /dev/null
+++ b/system/tuiconversation/src/main/res/drawable/my_cursor.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/green" />
+    <size android:width="1dp" />
+</shape>
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/res/drawable/popu_dialog_bg.xml b/system/tuiconversation/src/main/res/drawable/popu_dialog_bg.xml
new file mode 100644
index 0000000..dcf8d1a
--- /dev/null
+++ b/system/tuiconversation/src/main/res/drawable/popu_dialog_bg.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <stroke
+                android:width="1dp"
+                android:color="#cccccc" />
+            <solid android:color="#ffffff" />
+        </shape>
+
+    </item>
+
+</layer-list>
diff --git a/system/tuiconversation/src/main/res/drawable/shape_search.xml b/system/tuiconversation/src/main/res/drawable/shape_search.xml
new file mode 100644
index 0000000..94b06d1
--- /dev/null
+++ b/system/tuiconversation/src/main/res/drawable/shape_search.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+<!-- 连框颜色值 -->
+<item>
+    <shape>
+        <solid android:color="#ece9e9" />
+        <corners android:radius="5dp"/>
+    </shape>
+</item>
+<!-- 主体背景颜色值 -->
+<item android:bottom="1dp"
+    android:start="1dp"
+    android:right="1dp"
+    android:left="1dp"> 
+    <shape>
+        <solid android:color="#fff" />
+        <corners android:radius="5dp"/>
+    </shape>
+</item>
+
+</layer-list>
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/res/layout/conversation_custom_adapter.xml b/system/tuiconversation/src/main/res/layout/conversation_custom_adapter.xml
new file mode 100644
index 0000000..222aa23
--- /dev/null
+++ b/system/tuiconversation/src/main/res/layout/conversation_custom_adapter.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/item_left"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#FFFFFF"
+        android:paddingBottom="10dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+        android:paddingTop="10dp">
+
+        <ImageView
+            android:id="@+id/conversation_icon"
+            android:layout_width="match_parent"
+            android:layout_height="200dp" />
+
+
+        <TextView
+            android:id="@+id/conversation_title"
+            android:layout_width="match_parent"
+            android:layout_height="30dp"
+            android:layout_centerInParent="true"
+            android:layout_alignBottom="@+id/conversation_icon"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:background="@color/custom_transparent"
+            android:textColor="@color/white"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/conversation_last_msg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@+id/conversation_icon"
+            android:layout_alignRight="@+id/conversation_title"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textSize="12sp"
+            android:textColor="@color/list_bottom_text_bg" />
+
+        <TextView
+            android:id="@+id/conversation_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignTop="@+id/conversation_title"
+            android:textSize="10sp"
+            android:textColor="@color/list_bottom_text_bg" />
+
+
+        <com.tencent.qcloud.tuicore.component.UnreadCountTextView
+            android:id="@+id/conversation_unread"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:textColor="#fff"
+            android:textSize="10sp" />
+    </RelativeLayout>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/res/layout/conversation_forward_label_adapter.xml b/system/tuiconversation/src/main/res/layout/conversation_forward_label_adapter.xml
new file mode 100644
index 0000000..8308a4e
--- /dev/null
+++ b/system/tuiconversation/src/main/res/layout/conversation_forward_label_adapter.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/item_left"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/navigation_bar_color"
+    android:paddingTop="4dp"
+    android:paddingLeft="14.85dp">
+
+    <TextView
+        android:id="@+id/forward_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:gravity="center_vertical"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:textColor="@color/black_font_color"
+        android:text="@string/forward_list_label"
+        android:textSize="16.3sp" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/res/layout/conversation_forward_select_adapter.xml b/system/tuiconversation/src/main/res/layout/conversation_forward_select_adapter.xml
new file mode 100644
index 0000000..4ae4800
--- /dev/null
+++ b/system/tuiconversation/src/main/res/layout/conversation_forward_select_adapter.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/forward_select_layout"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/item_height"
+    android:background="#FFFFFF"
+    android:paddingTop="12dp"
+    android:paddingLeft="14.85dp"
+    android:paddingRight="14.85dp"
+    android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/forward_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:gravity="center|left"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textColor="@color/black_font_color"
+            android:text="create new chat"
+            android:textSize="16.3sp" />
+
+        <ImageView
+            android:id="@+id/forward_arrow"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:src="@drawable/arrow_right"
+            android:textSize="11.14sp"
+            android:gravity="center|right"
+            android:layout_alignParentRight="true" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/res/layout/conversation_fragment.xml b/system/tuiconversation/src/main/res/layout/conversation_fragment.xml
new file mode 100644
index 0000000..fbd3555
--- /dev/null
+++ b/system/tuiconversation/src/main/res/layout/conversation_fragment.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/conversation_page_bg">
+
+    <com.tencent.qcloud.tuikit.tuiconversation.classicui.widget.ConversationLayout
+        android:id="@+id/conversation_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
diff --git a/system/tuiconversation/src/main/res/layout/conversation_layout.xml b/system/tuiconversation/src/main/res/layout/conversation_layout.xml
new file mode 100644
index 0000000..5cb3943
--- /dev/null
+++ b/system/tuiconversation/src/main/res/layout/conversation_layout.xml
@@ -0,0 +1,11 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuikit.tuiconversation.classicui.widget.ConversationListLayout
+        android:id="@+id/conversation_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</LinearLayout>
diff --git a/system/tuiconversation/src/main/res/layout/conversation_list_item_layout.xml b/system/tuiconversation/src/main/res/layout/conversation_list_item_layout.xml
new file mode 100644
index 0000000..f1deefd
--- /dev/null
+++ b/system/tuiconversation/src/main/res/layout/conversation_list_item_layout.xml
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/item_left"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/conversation_list_item_height"
+    android:background="#FFFFFF"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:orientation="horizontal"
+    android:paddingLeft="14.85dp"
+    android:paddingTop="12dp">
+
+    <CheckBox
+        android:id="@+id/select_checkbox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_gravity="center_vertical"
+        android:layout_marginRight="6.23dp"
+        android:button="@drawable/checkbox_selector"
+        android:visibility="gone" />
+
+    <RelativeLayout
+        android:layout_width="60.78dp"
+        android:layout_height="match_parent">
+
+        <com.tencent.qcloud.tuikit.tuiconversation.classicui.widget.ConversationIconView
+            android:id="@+id/conversation_icon"
+            android:layout_width="@dimen/conversation_list_avatar_width"
+            android:layout_height="@dimen/conversation_list_avatar_height" />
+
+        <com.tencent.qcloud.tuicore.component.UnreadCountTextView
+            android:id="@+id/conversation_unread"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentRight="true"
+            android:layout_marginStart="-10dp"
+            android:layout_marginTop="-8dp"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:textColor="#FFFFFF"
+            android:textSize="11.52sp" />
+
+        <View
+            android:id="@+id/user_status"
+            android:layout_width="12dp"
+            android:layout_height="12dp"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:layout_marginEnd="10dp"
+            android:layout_marginBottom="10dp"
+            android:visibility="gone"
+            android:background="?attr/user_status_offline"
+            android:elevation="4dp" />
+
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="0dp"
+        android:layout_marginTop="1.37dp">
+
+        <TextView
+            android:id="@+id/conversation_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxWidth="180dp"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentTop="true"
+            android:ellipsize="end"
+            android:gravity="top|left"
+            android:singleLine="true"
+            android:textColor="@color/black_font_color"
+            android:lineHeight="23.04sp"
+            android:textSize="17.28sp" />
+
+        <TextView
+            android:id="@+id/conversation_time"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="@dimen/conversation_list_time_margin_right"
+            android:textColor="@color/conversation_item_time_color"
+            android:textSize="11.52sp"
+            android:lineHeight="15.84sp"/>
+
+
+        <TextView
+            android:id="@+id/conversation_at_msg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_above="@+id/view_line"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginBottom="@dimen/conversation_list_text_margin_bottom"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textColor="@color/list_bottom_text_bg"
+            android:textSize="13.44sp"
+            android:visibility="gone" />
+
+        <RelativeLayout
+            android:id="@+id/message_status_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_above="@+id/view_line"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentBottom="true"
+            android:layout_gravity="center_vertical"
+            android:gravity="center_vertical"
+            android:layout_marginLeft="0dp"
+            android:layout_marginTop="1.37dp"
+            android:visibility="gone"
+            android:layout_marginBottom="@dimen/conversation_list_text_margin_bottom"
+            android:layout_marginRight="2dp"
+            android:layout_toRightOf="@+id/conversation_at_msg">
+
+            <ImageView
+                android:id="@+id/message_status_sending"
+                android:layout_width="14dp"
+                android:layout_height="14dp"
+                android:layout_gravity="center_vertical"
+                android:background="@drawable/ic_sending_status"
+                android:visibility="gone" />
+
+            <ImageView
+                android:id="@+id/message_status_failed"
+                android:layout_width="14dp"
+                android:layout_height="14dp"
+                android:layout_gravity="center_vertical"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_send_failed"
+                android:visibility="gone" />
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/conversation_last_msg"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_above="@+id/view_line"
+            android:layout_alignParentBottom="true"
+            android:layout_marginRight="48dp"
+            android:layout_marginBottom="@dimen/conversation_list_text_margin_bottom"
+            android:layout_toRightOf="@+id/message_status_layout"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textColor="@color/list_bottom_text_bg"
+            android:textSize="13.44sp" />
+
+
+        <ImageView
+            android:id="@+id/not_disturb"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_above="@+id/view_line"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true"
+            android:layout_marginRight="@dimen/conversation_list_time_margin_right"
+            android:layout_marginBottom="@dimen/conversation_list_text_margin_bottom"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:src="@drawable/ic_disturb"
+            android:visibility="gone" />
+
+        <View
+            android:id="@+id/view_line"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/conversation_list_divide_line_height"
+            android:layout_alignParentBottom="true"
+            android:layout_marginTop="12dp"
+            android:background="@color/conversation_divide_line_color" />
+    </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/res/layout/conversation_pop_menu_layout.xml b/system/tuiconversation/src/main/res/layout/conversation_pop_menu_layout.xml
new file mode 100644
index 0000000..b3b63be
--- /dev/null
+++ b/system/tuiconversation/src/main/res/layout/conversation_pop_menu_layout.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:cardBackgroundColor="@color/white"
+    app:cardUseCompatPadding="true"
+    app:cardElevation="10dp">
+
+    <ListView
+        android:id="@+id/pop_menu_list"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:background="@color/white"
+        android:divider="#00000000"
+        android:dividerHeight="0dip" />
+
+
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/res/layout/folded_activity.xml b/system/tuiconversation/src/main/res/layout/folded_activity.xml
new file mode 100644
index 0000000..97c78a4
--- /dev/null
+++ b/system/tuiconversation/src/main/res/layout/folded_activity.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:id="@+id/empty_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
diff --git a/system/tuiconversation/src/main/res/layout/folded_fragment.xml b/system/tuiconversation/src/main/res/layout/folded_fragment.xml
new file mode 100644
index 0000000..588e8bd
--- /dev/null
+++ b/system/tuiconversation/src/main/res/layout/folded_fragment.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/conversation_page_bg">
+
+    <com.tencent.qcloud.tuikit.tuiconversation.classicui.widget.FoldedConversationLayout
+        android:id="@+id/folded_conversation_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
diff --git a/system/tuiconversation/src/main/res/layout/folded_layout.xml b/system/tuiconversation/src/main/res/layout/folded_layout.xml
new file mode 100644
index 0000000..fec8c26
--- /dev/null
+++ b/system/tuiconversation/src/main/res/layout/folded_layout.xml
@@ -0,0 +1,16 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/conversation_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <com.tencent.qcloud.tuikit.tuiconversation.classicui.widget.FoldedConversationListLayout
+        android:id="@+id/folded_conversation_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</LinearLayout>
diff --git a/system/tuiconversation/src/main/res/layout/forward_activity.xml b/system/tuiconversation/src/main/res/layout/forward_activity.xml
new file mode 100644
index 0000000..8eb03bd
--- /dev/null
+++ b/system/tuiconversation/src/main/res/layout/forward_activity.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:id="@+id/empty_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+
+</LinearLayout>
diff --git a/system/tuiconversation/src/main/res/layout/forward_conversation_selector_item.xml b/system/tuiconversation/src/main/res/layout/forward_conversation_selector_item.xml
new file mode 100644
index 0000000..f740f7d
--- /dev/null
+++ b/system/tuiconversation/src/main/res/layout/forward_conversation_selector_item.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="@dimen/btn_margin_bottom"
+    android:clickable="true">
+
+    <com.tencent.qcloud.tuikit.tuiconversation.classicui.widget.ConversationIconView
+        android:id="@+id/conversation_user_icon_view"
+        android:layout_width="41dp"
+        android:layout_height="41dp"
+        app:default_image="?attr/core_default_user_icon"
+        android:visibility="gone"/>
+
+</LinearLayout>
+
diff --git a/system/tuiconversation/src/main/res/layout/forward_fragment.xml b/system/tuiconversation/src/main/res/layout/forward_fragment.xml
new file mode 100644
index 0000000..bd58f06
--- /dev/null
+++ b/system/tuiconversation/src/main/res/layout/forward_fragment.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuikit.tuiconversation.classicui.widget.ForwardSelectLayout
+        android:id="@+id/forward_conversation_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginBottom="@dimen/btn_height"/>
+
+    <RelativeLayout
+        android:id="@+id/forward_select_list_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:paddingLeft="14.85dp"
+        android:paddingRight="14.85dp"
+        android:orientation="horizontal">
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/forward_select_list"
+            android:layout_width="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="@dimen/forward_margin"/>
+
+        <TextView
+            android:id="@+id/btn_msg_ok"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="@dimen/btn_margin_right"
+            android:text="@string/sure"
+            android:textColor="@color/bg_positive_btn"
+            android:textSize="14sp"
+            android:visibility="visible" />
+
+    </RelativeLayout>
+</RelativeLayout>
diff --git a/system/tuiconversation/src/main/res/layout/forward_layout.xml b/system/tuiconversation/src/main/res/layout/forward_layout.xml
new file mode 100644
index 0000000..87909d2
--- /dev/null
+++ b/system/tuiconversation/src/main/res/layout/forward_layout.xml
@@ -0,0 +1,16 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/conversation_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <com.tencent.qcloud.tuikit.tuiconversation.classicui.widget.ConversationListLayout
+        android:id="@+id/conversation_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</LinearLayout>
diff --git a/system/tuiconversation/src/main/res/layout/loading_progress_bar.xml b/system/tuiconversation/src/main/res/layout/loading_progress_bar.xml
new file mode 100644
index 0000000..f659806
--- /dev/null
+++ b/system/tuiconversation/src/main/res/layout/loading_progress_bar.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="60dp"
+    android:orientation="vertical">
+
+    <ProgressBar
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_centerInParent="true" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/res/values-zh-rCN/strings.xml b/system/tuiconversation/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..4cabaaf
--- /dev/null
+++ b/system/tuiconversation/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="chat_top">置顶聊天</string>
+    <string name="chat_delete">删除聊天</string>
+    <string name="quit_chat_top">取消置顶</string>
+    <string name="mark_unread">标为未读</string>
+    <string name="mark_read">标为已读</string>
+    <string name="not_display">不显示</string>
+
+    <string name="forward_select_new_chat">创建新聊天</string>
+    <string name="forward_select_from_contact">从通讯录选择</string>
+    <string name="titlebar_cancle">取消</string>
+    <string name="titlebar_close">关闭</string>
+    <string name="forward_alert_title">您确定进行转发吗?</string>
+    <string name="forward_list_label">最近聊天</string>
+    <string name="ui_at_all">[@所有人]</string>
+    <string name="ui_at_me">[有人@我]</string>
+    <string name="ui_at_all_me">[@所有人][有人@我]</string>
+    <string name="drafts">[草稿]</string>
+    <string name="titlebar_mutiselect">多选</string>
+    <string name="message_num">条</string>
+
+    <string name="folded_group_chat">折叠的群聊</string>
+</resources>
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/res/values/attrs.xml b/system/tuiconversation/src/main/res/values/attrs.xml
new file mode 100644
index 0000000..e7f96a2
--- /dev/null
+++ b/system/tuiconversation/src/main/res/values/attrs.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <declare-styleable name="UserIconView">
+        <!--默认头像-->
+        <attr name="default_image" format="reference" />
+        <attr name="image_radius" format="dimension" />
+    </declare-styleable>
+
+    <declare-styleable name="SynthesizedImageView">
+        <!--合成图片的背景-->
+        <attr name="synthesized_image_bg" format="color" />
+        <!--合成图片的默认图片-->
+        <attr name="synthesized_default_image" format="reference" />
+        <!--合成图片的尺寸-->
+        <attr name="synthesized_image_size" format="dimension" />
+        <!--多图片之间的空隙间隔-->
+        <attr name="synthesized_image_gap" format="dimension" />
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/res/values/colors.xml b/system/tuiconversation/src/main/res/values/colors.xml
new file mode 100644
index 0000000..868840c
--- /dev/null
+++ b/system/tuiconversation/src/main/res/values/colors.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="conversation_page_bg">#FFFFFF</color>
+    <color name="conversation_item_top_color">#F4F4F4</color>
+    <color name="conversation_item_time_color">#b0b0b0</color>
+    <color name="conversation_divide_line_color">#D9D9D9</color>
+    <color name="conversation_item_clicked_color">#D9D9D9</color>
+
+    <color name="custom_transparent">#B3000000</color>
+
+    <color name="line">#DDDDDD</color>
+    <color name="navigation_bar_color">#F7F7F7</color>
+    <color name="transparent">#00000000</color>
+    <color name="list_bottom_text_bg">#999999</color>
+
+    <color name="font_blue">#066fff</color>
+    <color name="green">#70C160</color>
+    <color name="white">#FFFFFF</color>
+    <color name="text_color_gray">#696969</color>
+    <color name="black_font_color">#181818</color>
+    <color name="text_tips_color">#A5A5A5</color>
+
+    <color name="text_gray1">#777777</color>
+
+    <color name="black">#000000</color>
+    <color name="dialog_line_bg">#c6c6c6</color>
+
+    <!-- 积极钮色值 -->
+    <color name="btn_positive">#00a4ff</color>
+    <color name="btn_positive_hover">#006eff</color>
+
+    <color name="read_dot_bg">#f74c31</color>
+    <color name="light_blue_400">#FF29B6F6</color>
+    <color name="light_blue_600">#FF039BE5</color>
+    <color name="gray_400">#FFBDBDBD</color>
+    <color name="gray_600">#FF757575</color>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/res/values/dimens.xml b/system/tuiconversation/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..d47df01
--- /dev/null
+++ b/system/tuiconversation/src/main/res/values/dimens.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <dimen name="page_title_height">45dp</dimen>
+    <dimen name="page_margin">10dp</dimen>
+    <!-- 列表头像 -->
+    <dimen name="item_height">49.35dp</dimen>
+    <dimen name="item_width">49.35dp</dimen>
+
+    <dimen name="btn_margin_top">36dp</dimen>
+    <dimen name="btn_margin_left">12dp</dimen>
+    <dimen name="btn_margin_right">12dp</dimen>
+    <dimen name="btn_margin_bottom">8dp</dimen>
+    <dimen name="btn_margin_middle">10dp</dimen>
+    <dimen name="btn_padding_left">16dp</dimen>
+    <dimen name="btn_padding_right">16dp</dimen>
+
+    <dimen name="btn_height">40dp</dimen>
+    <dimen name="forward_margin">55dp</dimen>
+
+    <dimen name="conversation_list_item_height">69.91dp</dimen>
+    <dimen name="conversation_list_avatar_width">46.08dp</dimen>
+    <dimen name="conversation_list_avatar_height">46.08dp</dimen>
+    <dimen name="conversation_list_text_margin_bottom">12.96dp</dimen>
+    <dimen name="conversation_list_divide_line_height">0.55dp</dimen>
+    <dimen name="conversation_list_time_margin_right">15.35dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/res/values/strings.xml b/system/tuiconversation/src/main/res/values/strings.xml
new file mode 100644
index 0000000..90782ea
--- /dev/null
+++ b/system/tuiconversation/src/main/res/values/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    // 云通信
+    <string name="chat_top">Pin</string>
+    <string name="chat_delete">Delete</string>
+    <string name="quit_chat_top">Unpin</string>
+    <string name="mark_unread">Unread</string>
+    <string name="mark_read">Read</string>
+    <string name="not_display">Hide</string>
+
+    <string name="forward_select_new_chat">Create new chat</string>
+    <string name="forward_select_from_contact">Select from contact</string>
+    <string name="titlebar_cancle">Cancel</string>
+    <string name="titlebar_close">Close</string>
+    <string name="forward_alert_title">Are you sure you want to forward?</string>
+    <string name="forward_list_label">Recent Conversations</string>
+    <string name="ui_at_all">[@All]</string>
+    <string name="ui_at_me">[Someone @ me]</string>
+    <string name="ui_at_all_me">[@All][Someone @ me]</string>
+    <string name="drafts">[Drafts]</string>
+    <string name="titlebar_mutiselect">Select</string>
+    <string name="message_num">messages</string>
+
+    <string name="folded_group_chat">folded group chat</string>
+</resources>
\ No newline at end of file
diff --git a/system/tuiconversation/src/main/res/xml/file_paths_public.xml b/system/tuiconversation/src/main/res/xml/file_paths_public.xml
new file mode 100644
index 0000000..e0e49c2
--- /dev/null
+++ b/system/tuiconversation/src/main/res/xml/file_paths_public.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <!--内置SD卡 Environment.getExternalStorageDirectory() .表示共享所有的目录，也可以指定共享的目录-->
+    <external-path
+        name="external-path"
+        path="."/>
+    <!--内置SD卡 Context.getExternalCacheDir() .表示共享所有的目录，也可以指定共享的目录-->
+    <external-cache-path
+        name="external-cache-path"
+        path="."/>
+    <!--内置SD卡 Context.getExternalFilesDir(null) .表示共享所有的目录，也可以指定共享的目录-->
+    <external-files-path
+        name="external-files-path"
+        path="."/>
+    <!--data目录下 Context.getFilesDir() .表示共享所有的目录，也可以指定共享的目录-->
+    <files-path
+        name="files_path"
+        path="."/>
+    <!--data缓存目录 Context.getCacheDir() .表示共享所有的目录，也可以指定共享的目录-->
+    <cache-path
+        name="cache-path"
+        path="."/>
+    <!--这个标签Android官方文档中是没有提及，Android设备的根目录，该目录下包含着手机内部存储器，外置SD卡等所有文件的目录-->
+    <root-path
+        name="name"
+        path="."/>
+</paths>
\ No newline at end of file
diff --git a/system/tuicore-7.3.4358/build.gradle b/system/tuicore-7.3.4358/build.gradle
new file mode 100644
index 0000000..b3d77f5
--- /dev/null
+++ b/system/tuicore-7.3.4358/build.gradle
@@ -0,0 +1,51 @@
+plugins {
+    id 'com.android.library'
+}
+
+android {
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+
+    defaultConfig {
+        minSdkVersion 16
+        targetSdkVersion 30
+        versionCode 1
+        versionName "1.0"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    // 主题资源文件夹
+    sourceSets {
+        main {
+            res.srcDirs += "src/main/res-light"
+            res.srcDirs += "src/main/res-lively"
+            res.srcDirs += "src/main/res-serious"
+        }
+    }
+}
+
+dependencies {
+    api fileTree(include: ['*.jar', '*.aar'], dir: '../../../../tuikit/android/libs')
+
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'com.github.bumptech.glide:glide:4.12.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+
+    def projects = this.rootProject.getAllprojects().stream().map { project -> project.name }.collect()
+    println "all projects : {$projects}"
+    if (projects.contains("imsdk-plus")) {
+        api project(':imsdk-plus')
+    } else {
+        api rootProject.getProperties().containsKey("imSdk") ? rootProject.ext.imSdk : "com.tencent.imsdk:imsdk-plus:7.3.4358"
+    }
+
+}
\ No newline at end of file
diff --git a/system/tuicore-7.3.4358/src/main/AndroidManifest.xml b/system/tuicore-7.3.4358/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..297b213
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/AndroidManifest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.tencent.qcloud.tuicore">
+
+    <application>
+        <activity
+            android:name=".permission.PermissionActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:launchMode="singleTask"
+            android:theme="@style/CoreActivityTranslucent"
+            android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
+
+        <activity
+            android:name=".util.PermissionRequester$PermissionActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:multiprocess="true"
+            android:launchMode="singleTask"
+            android:theme="@style/CoreActivityTranslucent"
+            android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
+
+        <provider
+            android:name=".ServiceInitializer"
+            android:authorities="${applicationId}.TUICore.Init"
+            android:enabled="true"
+            android:exported="false"/>
+
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/EventManager.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/EventManager.java
new file mode 100644
index 0000000..76cfa47
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/EventManager.java
@@ -0,0 +1,91 @@
+package com.tencent.qcloud.tuicore;
+
+import android.text.TextUtils;
+import android.util.Log;
+import android.util.Pair;
+import com.tencent.qcloud.tuicore.interfaces.ITUINotification;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+/**
+ * Notification registration, removal and triggering
+ */
+class EventManager {
+    private static final String TAG = EventManager.class.getSimpleName();
+
+    private static class EventManagerHolder {
+        private static final EventManager eventManager = new EventManager();
+    }
+
+    public static EventManager getInstance() {
+        return EventManagerHolder.eventManager;
+    }
+
+    private final Map<Pair<String, String>, List<ITUINotification>> eventMap = new ConcurrentHashMap<>();
+
+    private EventManager() {}
+
+    public void registerEvent(String key, String subKey, ITUINotification notification) {
+        Log.i(TAG, "registerEvent : key : " + key + ", subKey : " + subKey + ", notification : " + notification);
+        if (TextUtils.isEmpty(key) || TextUtils.isEmpty(subKey) || notification == null) {
+            return;
+        }
+        Pair<String, String> keyPair = new Pair<>(key, subKey);
+        List<ITUINotification> list = eventMap.get(keyPair);
+        if (list == null) {
+            list = new CopyOnWriteArrayList<>();
+            eventMap.put(keyPair, list);
+        }
+        if (!list.contains(notification)) {
+            list.add(notification);
+        }
+    }
+
+    public void unRegisterEvent(String key, String subKey, ITUINotification notification) {
+        Log.i(TAG, "removeEvent : key : " + key + ", subKey : " + subKey + " notification : " + notification);
+        if (TextUtils.isEmpty(key) || TextUtils.isEmpty(subKey) || notification == null) {
+            return;
+        }
+        Pair<String, String> keyPair = new Pair<>(key, subKey);
+        List<ITUINotification> list = eventMap.get(keyPair);
+        if (list == null) {
+            return;
+        }
+        list.remove(notification);
+    }
+
+    public void unRegisterEvent(ITUINotification notification) {
+        Log.i(TAG, "removeEvent : notification : " + notification);
+        if (notification == null) {
+            return;
+        }
+        for (Pair<String, String> key : eventMap.keySet()) {
+            List<ITUINotification> value = eventMap.get(key);
+            if (value == null) {
+                continue;
+            }
+            for (ITUINotification item : value) {
+                if (item == notification) {
+                    value.remove(item);
+                    break;
+                }
+            }
+        }
+    }
+
+    public void notifyEvent(String key, String subKey, Map<String, Object> param) {
+        Log.i(TAG, "notifyEvent : key : " + key + ", subKey : " + subKey);
+        if (TextUtils.isEmpty(key) || TextUtils.isEmpty(subKey)) {
+            return;
+        }
+        Pair<String, String> keyPair = new Pair<>(key, subKey);
+        List<ITUINotification> notificationList = eventMap.get(keyPair);
+        if (notificationList != null) {
+            for (ITUINotification notification : notificationList) {
+                notification.onNotifyEvent(key, subKey, param);
+            }
+        }
+    }
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/ExtensionManager.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/ExtensionManager.java
new file mode 100644
index 0000000..fee8520
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/ExtensionManager.java
@@ -0,0 +1,108 @@
+package com.tencent.qcloud.tuicore;
+
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import com.tencent.qcloud.tuicore.interfaces.ITUIExtension;
+import com.tencent.qcloud.tuicore.interfaces.TUIExtensionInfo;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+/**
+ * UI extension registration and acquisition
+ */
+class ExtensionManager {
+    private static final String TAG = ExtensionManager.class.getSimpleName();
+
+    private static class ExtensionManagerHolder {
+        private static final ExtensionManager extensionManager = new ExtensionManager();
+    }
+
+    public static ExtensionManager getInstance() {
+        return ExtensionManagerHolder.extensionManager;
+    }
+
+    private final Map<String, List<ITUIExtension>> extensionHashMap = new ConcurrentHashMap<>();
+
+    private ExtensionManager() {}
+
+    public void registerExtension(String extensionID, ITUIExtension extension) {
+        Log.i(TAG, "registerExtension extensionID : " + extensionID + ", extension : " + extension);
+        if (TextUtils.isEmpty(extensionID) || extension == null) {
+            return;
+        }
+        List<ITUIExtension> list = extensionHashMap.get(extensionID);
+        if (list == null) {
+            list = new CopyOnWriteArrayList<>();
+            extensionHashMap.put(extensionID, list);
+        }
+        if (!list.contains(extension)) {
+            list.add(extension);
+        }
+    }
+
+    public void unRegisterExtension(String extensionID, ITUIExtension extension) {
+        Log.i(TAG, "removeExtension extensionID : " + extensionID + ", extension : " + extension);
+        if (TextUtils.isEmpty(extensionID) || extension == null) {
+            return;
+        }
+        List<ITUIExtension> list = extensionHashMap.get(extensionID);
+        if (list == null) {
+            return;
+        }
+        list.remove(extension);
+    }
+
+    @Deprecated
+    public Map<String, Object> getExtensionInfo(String key, Map<String, Object> param) {
+        Log.i(TAG, "getExtensionInfo key : " + key);
+        if (TextUtils.isEmpty(key)) {
+            return null;
+        }
+        List<ITUIExtension> list = extensionHashMap.get(key);
+        if (list == null) {
+            return null;
+        }
+        for (ITUIExtension extension : list) {
+            return extension.onGetExtensionInfo(key, param);
+        }
+        return null;
+    }
+
+    public List<TUIExtensionInfo> getExtensionList(String extensionID, Map<String, Object> param) {
+        Log.i(TAG, "getExtensionInfoList extensionID : " + extensionID);
+        List<TUIExtensionInfo> extensionInfoList = new ArrayList<>();
+        if (TextUtils.isEmpty(extensionID)) {
+            return extensionInfoList;
+        }
+        List<ITUIExtension> ituiExtensionList = extensionHashMap.get(extensionID);
+        if (ituiExtensionList == null || ituiExtensionList.isEmpty()) {
+            return extensionInfoList;
+        }
+        for (ITUIExtension ituiExtension : ituiExtensionList) {
+            List<TUIExtensionInfo> extensionInfo = ituiExtension.onGetExtension(extensionID, param);
+            if (extensionInfo != null) {
+                extensionInfoList.addAll(extensionInfo);
+            }
+        }
+        return extensionInfoList;
+    }
+
+    public void raiseExtension(String extensionID, View parentView, Map<String, Object> param) {
+        Log.i(TAG, "raiseExtension extensionID : " + extensionID);
+        if (TextUtils.isEmpty(extensionID)) {
+            return;
+        }
+        List<ITUIExtension> list = extensionHashMap.get(extensionID);
+        if (list == null) {
+            return;
+        }
+        for (ITUIExtension extension : list) {
+            extension.onRaiseExtension(extensionID, parentView, param);
+            return;
+        }
+    }
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/ObjectManager.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/ObjectManager.java
new file mode 100644
index 0000000..667f0b6
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/ObjectManager.java
@@ -0,0 +1,56 @@
+package com.tencent.qcloud.tuicore;
+
+import android.text.TextUtils;
+import android.util.Log;
+import com.tencent.qcloud.tuicore.interfaces.ITUIObjectFactory;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Object register and create
+ */
+class ObjectManager {
+    private static final String TAG = ObjectManager.class.getSimpleName();
+
+    private static class ObjectManagerHolder {
+        private static final ObjectManager serviceManager = new ObjectManager();
+    }
+
+    public static ObjectManager getInstance() {
+        return ObjectManagerHolder.serviceManager;
+    }
+
+    private final Map<String, ITUIObjectFactory> objectFactoryMap = new ConcurrentHashMap<>();
+
+    private ObjectManager() {}
+
+    public void registerObjectFactory(String factoryName, ITUIObjectFactory objectFactory) {
+        Log.i(TAG, "registerObjectFactory : " + factoryName + "  " + objectFactory);
+        if (TextUtils.isEmpty(factoryName) || objectFactory == null) {
+            return;
+        }
+        objectFactoryMap.put(factoryName, objectFactory);
+    }
+
+    public void unregisterObjectFactory(String factoryName) {
+        Log.i(TAG, "unregisterObjectFactory : " + factoryName);
+        if (TextUtils.isEmpty(factoryName)) {
+            return;
+        }
+        objectFactoryMap.remove(factoryName);
+    }
+
+    public Object createObject(String factoryName, String objectName, Map<String, Object> param) {
+        Log.i(TAG, "createObject : " + factoryName + " objectName : " + objectName);
+        if (TextUtils.isEmpty(factoryName)) {
+            return null;
+        }
+        ITUIObjectFactory objectFactory = objectFactoryMap.get(factoryName);
+        if (objectFactory != null) {
+            return objectFactory.onCreateObject(objectName, param);
+        } else {
+            Log.w(TAG, "can't find objectFactory : " + factoryName);
+            return null;
+        }
+    }
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/ServiceInitializer.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/ServiceInitializer.java
new file mode 100644
index 0000000..03ac8d5
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/ServiceInitializer.java
@@ -0,0 +1,96 @@
+package com.tencent.qcloud.tuicore;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+/**
+ * If each module needs to be initialized, it needs to implement the init method of this class
+ * and register it in the form of ContentProvider in the Manifest file.
+ */
+public class ServiceInitializer extends ContentProvider {
+    /**
+     * @param context applicationContext
+     */
+    public void init(Context context) {}
+
+    /**
+     * LightTheme id
+     */
+    public int getLightThemeResId() {
+        return R.style.TUIBaseLightTheme;
+    }
+
+    /**
+     * LivelyTheme id
+     */
+    public int getLivelyThemeResId() {
+        return R.style.TUIBaseLivelyTheme;
+    }
+
+    /**
+     * SeriousTheme id
+     */
+    public int getSeriousThemeResId() {
+        return R.style.TUIBaseSeriousTheme;
+    }
+
+    /////////////////////////////////////////////////////////////////////////////////
+    //             The following methods do not need to be overridden              //
+    /////////////////////////////////////////////////////////////////////////////////
+
+    private static Context appContext;
+
+    public static Context getAppContext() {
+        return appContext;
+    }
+
+    @Override
+    public boolean onCreate() {
+        if (appContext == null) {
+            appContext = getContext().getApplicationContext();
+        }
+
+        TUIRouter.init(appContext);
+        TUIConfig.init(appContext);
+        TUIThemeManager.addLightTheme(getLightThemeResId());
+        TUIThemeManager.addLivelyTheme(getLivelyThemeResId());
+        TUIThemeManager.addSeriousTheme(getSeriousThemeResId());
+        TUIThemeManager.setTheme(appContext);
+        init(appContext);
+        return false;
+    }
+
+    @Nullable
+    @Override
+    public Cursor query(
+        @NonNull Uri uri, @Nullable String[] projection, @Nullable String selection, @Nullable String[] selectionArgs, @Nullable String sortOrder) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public String getType(@NonNull Uri uri) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public Uri insert(@NonNull Uri uri, @Nullable ContentValues values) {
+        return null;
+    }
+
+    @Override
+    public int delete(@NonNull Uri uri, @Nullable String selection, @Nullable String[] selectionArgs) {
+        return 0;
+    }
+
+    @Override
+    public int update(@NonNull Uri uri, @Nullable ContentValues values, @Nullable String selection, @Nullable String[] selectionArgs) {
+        return 0;
+    }
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/ServiceManager.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/ServiceManager.java
new file mode 100644
index 0000000..bddce8e
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/ServiceManager.java
@@ -0,0 +1,75 @@
+package com.tencent.qcloud.tuicore;
+
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.tencent.qcloud.tuicore.interfaces.ITUIService;
+import com.tencent.qcloud.tuicore.interfaces.TUIServiceCallback;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Service register and call
+ */
+class ServiceManager {
+    private static final String TAG = ServiceManager.class.getSimpleName();
+
+    private static class ServiceManagerHolder {
+        private static final ServiceManager serviceManager = new ServiceManager();
+    }
+
+    public static ServiceManager getInstance() {
+        return ServiceManagerHolder.serviceManager;
+    }
+
+    private final Map<String, ITUIService> serviceMap = new ConcurrentHashMap<>();
+
+    private ServiceManager() {}
+
+    public void registerService(String serviceName, ITUIService service) {
+        Log.i(TAG, "registerService : " + serviceName + "  " + service);
+        if (TextUtils.isEmpty(serviceName) || service == null) {
+            return;
+        }
+        serviceMap.put(serviceName, service);
+    }
+
+    public void unregisterService(String serviceName) {
+        Log.i(TAG, "unregisterService : " + serviceName);
+        if (TextUtils.isEmpty(serviceName)) {
+            return;
+        }
+        serviceMap.remove(serviceName);
+    }
+
+    public ITUIService getService(String serviceName) {
+        Log.i(TAG, "getService : " + serviceName);
+        if (TextUtils.isEmpty(serviceName)) {
+            return null;
+        }
+        return serviceMap.get(serviceName);
+    }
+
+    public Object callService(String serviceName, String method, Map<String, Object> param) {
+        Log.i(TAG, "callService : " + serviceName + " method : " + method);
+        ITUIService service = serviceMap.get(serviceName);
+        if (service != null) {
+            return service.onCall(method, param);
+        } else {
+            Log.w(TAG, "can't find service : " + serviceName);
+            return null;
+        }
+    }
+
+    public Object callService(String serviceName, String method, Map<String, Object> param, TUIServiceCallback callback) {
+        Log.i(TAG, "callService : " + serviceName + " method : " + method);
+        ITUIService service = serviceMap.get(serviceName);
+        if (service != null) {
+            return service.onCall(method, param, callback);
+        } else {
+            Log.w(TAG, "can't find service : " + serviceName);
+            return null;
+        }
+    }
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/TUIConfig.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/TUIConfig.java
new file mode 100644
index 0000000..a1a7a62
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/TUIConfig.java
@@ -0,0 +1,373 @@
+package com.tencent.qcloud.tuicore;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.tencent.imsdk.v2.V2TIMUserFullInfo;
+
+import org.json.JSONObject;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+/**
+ * TUI configuration, such as file path configuration, user information
+ */
+public class TUIConfig {
+    private static Context appContext;
+
+    private static String appDir = "";
+    private static String selfFaceUrl = "";
+    private static String selfNickName = "";
+    private static int selfAllowType = 0;
+    private static long selfBirthDay = 0L;
+    private static String selfSignature = "";
+    private static int gender;
+
+    public static final String TUICORE_SETTINGS_SP_NAME = "TUICoreSettings";
+
+    private static final String RECORD_DIR_SUFFIX = "/record/";
+    private static final String RECORD_DOWNLOAD_DIR_SUFFIX = "/record/download/";
+    public static final String VIDEO_BASE_DIR_SUFFIX = "/video/";
+    private static final String VIDEO_DOWNLOAD_DIR_SUFFIX = "/video/download/";
+    public static final String IMAGE_BASE_DIR_SUFFIX = "/image/";
+    private static final String IMAGE_DOWNLOAD_DIR_SUFFIX = "/image/download/";
+    private static final String MEDIA_DIR_SUFFIX = "/media/";
+    private static final String FILE_DOWNLOAD_DIR_SUFFIX = "/file/download/";
+    private static final String CRASH_LOG_DIR_SUFFIX = "/crash/";
+
+    private static boolean initialized = false;
+    private static boolean enableGroupGridAvatar = true;
+    private static int defaultAvatarImage;
+    private static int defaultGroupAvatarImage;
+
+    public static final int TUI_HOST_TYPE_IMAPP = 0;
+    public static final int TUI_HOST_TYPE_RTCUBE = 1;
+    // 0,im app; 1,rtcube app
+    private static int tuiHostType = TUI_HOST_TYPE_IMAPP;
+
+    public static void init(Context context) {
+        if (initialized) {
+            return;
+        }
+        TUIConfig.appContext = context;
+        initPath();
+        initialized = true;
+    }
+
+    public static String getDefaultAppDir() {
+        if (TextUtils.isEmpty(appDir)) {
+            Context context = null;
+            if (appContext != null) {
+                context = appContext;
+            } else if (TUIRouter.getContext() != null) {
+                context = TUIRouter.getContext();
+            } else if (TUILogin.getAppContext() != null) {
+                context = TUILogin.getAppContext();
+            }
+            if (context != null) {
+                appDir = context.getFilesDir().getAbsolutePath();
+            }
+        }
+        return appDir;
+    }
+
+    public static void setDefaultAppDir(String appDir) {
+        TUIConfig.appDir = appDir;
+    }
+
+    public static String getRecordDir() {
+        return getDefaultAppDir() + RECORD_DIR_SUFFIX;
+    }
+
+    public static String getRecordDownloadDir() {
+        return getDefaultAppDir() + RECORD_DOWNLOAD_DIR_SUFFIX;
+    }
+
+    public static String getVideoBaseDir() {
+        return getDefaultAppDir() + VIDEO_BASE_DIR_SUFFIX;
+    }
+
+    public static String getVideoDownloadDir() {
+        return getDefaultAppDir() + VIDEO_DOWNLOAD_DIR_SUFFIX;
+    }
+
+    public static String getImageBaseDir() {
+        return getDefaultAppDir() + IMAGE_BASE_DIR_SUFFIX;
+    }
+
+    public static String getImageDownloadDir() {
+        return getDefaultAppDir() + IMAGE_DOWNLOAD_DIR_SUFFIX;
+    }
+
+    public static String getMediaDir() {
+        return getDefaultAppDir() + MEDIA_DIR_SUFFIX;
+    }
+
+    public static String getFileDownloadDir() {
+        return getDefaultAppDir() + FILE_DOWNLOAD_DIR_SUFFIX;
+    }
+
+    public static String getCrashLogDir() {
+        return getDefaultAppDir() + CRASH_LOG_DIR_SUFFIX;
+    }
+
+    public static String getSelfFaceUrl() {
+        return selfFaceUrl;
+    }
+
+    public static void setSelfFaceUrl(String selfFaceUrl) {
+        TUIConfig.selfFaceUrl = selfFaceUrl;
+    }
+
+    public static String getSelfNickName() {
+        return selfNickName;
+    }
+
+    public static void setSelfNickName(String selfNickName) {
+        TUIConfig.selfNickName = selfNickName;
+    }
+
+    public static int getSelfAllowType() {
+        return selfAllowType;
+    }
+
+    public static void setSelfAllowType(int selfAllowType) {
+        TUIConfig.selfAllowType = selfAllowType;
+    }
+
+    public static long getSelfBirthDay() {
+        return selfBirthDay;
+    }
+
+    public static void setSelfBirthDay(long selfBirthDay) {
+        TUIConfig.selfBirthDay = selfBirthDay;
+    }
+
+    public static String getSelfSignature() {
+        return selfSignature;
+    }
+
+    public static void setSelfSignature(String selfSignature) {
+        TUIConfig.selfSignature = selfSignature;
+    }
+
+    public static void setGender(int gender) {
+        TUIConfig.gender = gender;
+    }
+
+    public static int getGender() {
+        return gender;
+    }
+
+    public static void setTUIHostType(int type) {
+        TUIConfig.tuiHostType = type;
+    }
+
+    public static int getTUIHostType() {
+        return tuiHostType;
+    }
+
+    /**
+     * 获取群组会话否展示九宫格样式的头像，默认为 true
+     * Gets whether to display the avatar in the nine-square grid style in the group conversation, the default is true
+     */
+    public static boolean isEnableGroupGridAvatar() {
+        return enableGroupGridAvatar;
+    }
+
+    /**
+     * 设置群组会话是否展示九宫格样式的头像
+     * Set whether to display the avatar in the nine-square grid style in group conversations
+     */
+    public static void setEnableGroupGridAvatar(boolean enableGroupGridAvatar) {
+        TUIConfig.enableGroupGridAvatar = enableGroupGridAvatar;
+    }
+
+    /**
+     * 获取 c2c 会话的默认头像
+     *
+     * Get the default avatar for c2c conversation
+     *
+     * @return
+     */
+    public static int getDefaultAvatarImage() {
+        return defaultAvatarImage;
+    }
+
+    /**
+     * 设置 c2c 会话的默认头像
+     *
+     *Set the default avatar for c2c conversation
+     *
+     * @return
+     */
+    public static void setDefaultAvatarImage(int defaultAvatarImage) {
+        TUIConfig.defaultAvatarImage = defaultAvatarImage;
+    }
+
+    /**
+     * 获取 group 会话的默认头像
+     *
+     * Get the default avatar for group conversation
+     *
+     * @return
+     */
+    public static int getDefaultGroupAvatarImage() {
+        return defaultGroupAvatarImage;
+    }
+
+    /**
+     * 设置 group 会话的默认头像
+     *
+     *Set the default avatar for group conversation
+     *
+     * @return
+     */
+    public static void setDefaultGroupAvatarImage(int defaultGroupAvatarImage) {
+        TUIConfig.defaultGroupAvatarImage = defaultGroupAvatarImage;
+    }
+
+    /**
+     * Set login user information
+     */
+    public static void setSelfInfo(V2TIMUserFullInfo userFullInfo) {
+        TUIConfig.selfFaceUrl = userFullInfo.getFaceUrl();
+        TUIConfig.selfNickName = userFullInfo.getNickName();
+        TUIConfig.selfAllowType = userFullInfo.getAllowType();
+        TUIConfig.selfBirthDay = userFullInfo.getBirthday();
+        TUIConfig.selfSignature = userFullInfo.getSelfSignature();
+        TUIConfig.gender = userFullInfo.getGender();
+    }
+
+    /**
+     * Clear login user information
+     */
+    public static void clearSelfInfo() {
+        TUIConfig.selfFaceUrl = "";
+        TUIConfig.selfNickName = "";
+        TUIConfig.selfAllowType = 0;
+        TUIConfig.selfBirthDay = 0L;
+        TUIConfig.selfSignature = "";
+    }
+
+    /**
+     * init file path
+     */
+    public static void initPath() {
+        File f = new File(getMediaDir());
+        if (!f.exists()) {
+            f.mkdirs();
+        }
+
+        f = new File(getRecordDir());
+        if (!f.exists()) {
+            f.mkdirs();
+        }
+
+        f = new File(getRecordDownloadDir());
+        if (!f.exists()) {
+            f.mkdirs();
+        }
+
+        f = new File(getVideoDownloadDir());
+        if (!f.exists()) {
+            f.mkdirs();
+        }
+
+        f = new File(getImageDownloadDir());
+        if (!f.exists()) {
+            f.mkdirs();
+        }
+
+        f = new File(getImageBaseDir());
+        if (!f.exists()) {
+            f.mkdirs();
+        }
+
+        f = new File(getVideoBaseDir());
+        if (!f.exists()) {
+            f.mkdirs();
+        }
+
+        f = new File(getFileDownloadDir());
+        if (!f.exists()) {
+            f.mkdirs();
+        }
+
+        f = new File(getCrashLogDir());
+        if (!f.exists()) {
+            f.mkdirs();
+        }
+    }
+
+    public static Context getAppContext() {
+        return appContext;
+    }
+
+    public static void setSceneOptimizParams(final String scene) {
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    String packageName = "";
+                    if (getAppContext() != null) {
+                        packageName = getAppContext().getPackageName();
+                    }
+
+                    URL url = new URL("https://demos.trtc.tencent-cloud.com/prod/base/v1/events/stat");
+                    HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+                    conn.setConnectTimeout(5000);
+                    conn.setReadTimeout(5000);
+                    conn.setDoOutput(true);
+                    conn.setDoInput(true);
+                    conn.setUseCaches(false);
+                    conn.setRequestMethod("POST");
+                    conn.setRequestProperty("Content-Type", "application/json");
+
+                    String sdkAPPId = TUILogin.getSdkAppId() + "";
+                    JSONObject msgObject = new JSONObject();
+                    msgObject.put("sdkappid", sdkAPPId);
+                    msgObject.put("bundleId", "");
+                    msgObject.put("component", scene);
+                    msgObject.put("package", packageName);
+
+                    String userId = TUILogin.getUserId();
+                    JSONObject bodyObject = new JSONObject();
+                    bodyObject.put("userId", userId);
+                    bodyObject.put("event", "useScenario");
+                    bodyObject.put("msg", msgObject);
+                    String paramStr = String.valueOf(bodyObject);
+
+                    OutputStream out = conn.getOutputStream();
+                    out.write(paramStr.getBytes());
+                    out.flush();
+                    out.close();
+                    if (conn.getResponseCode() == HttpURLConnection.HTTP_OK) {
+                        InputStream is = conn.getInputStream();
+                        ByteArrayOutputStream message = new ByteArrayOutputStream();
+                        int len = 0;
+                        byte[] buffer = new byte[1024];
+                        while ((len = is.read(buffer)) != -1) {
+                            message.write(buffer, 0, len);
+                        }
+                        String msg = new String(message.toByteArray());
+                        Log.d("setSceneOptimizParams", "msg:" + msg);
+                        is.close();
+                        message.close();
+                        conn.disconnect();
+                    } else {
+                        Log.d("setSceneOptimizParams", "ResponseCode:" + conn.getResponseCode());
+                    }
+                } catch (Exception e) {
+                    Log.d("TUICore", "setSceneOptimizParams exception");
+                }
+            }
+        }).start();
+    }
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/TUIConstants.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/TUIConstants.java
new file mode 100644
index 0000000..d9edea3
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/TUIConstants.java
@@ -0,0 +1,732 @@
+package com.tencent.qcloud.tuicore;
+
+import com.tencent.imsdk.BaseConstants;
+
+/**
+ * TUI constants
+ */
+public final class TUIConstants {
+    public static final class GroupType {
+        public static final String TYPE = "type";
+        public static final String IS_GROUP = "isGroup";
+
+        public static final String TYPE_PRIVATE = "Private";
+        public static final String TYPE_WORK = "Work";
+        public static final String TYPE_PUBLIC = "Public";
+
+        public static final String TYPE_CHAT_ROOM = "ChatRoom";
+        public static final String TYPE_MEETING = "Meeting";
+        public static final String TYPE_COMMUNITY = "Community";
+    }
+
+    public static final class Service {
+        public static final String TUI_CHAT = "TUIChatService";
+        public static final String TUI_CONVERSATION = "TUIConversationService";
+        public static final String TUI_CONTACT = "TUIContactService";
+        public static final String TUI_SEARCH = "TUISearchService";
+        public static final String TUI_GROUP = "TUIGroupService";
+        public static final String TUI_CALLING = "TUICallingService";
+        public static final String TUI_AUDIO_RECORD = "TUIAudioMessageRecordService";
+        public static final String TUI_LIVE = "TUILiveService";
+        public static final String TUI_BEAUTY = "TUIBeauty";
+        public static final String TUI_OFFLINEPUSH = "TUIOfflinePushService";
+        public static final String TUI_COMMUNITY = "TUICommunityService";
+        public static final String TUI_DEMO = "TIMAppService";
+        public static final String TUI_POLL = "TUIPollService";
+        public static final String TUI_GROUP_NOTE = "TUIGroupNoteService";
+        public static final String TUI_CONVERSATION_GROUP = "TUIConversationGroupService";
+        public static final String TUI_CONVERSATION_MARK = "TUIConversationMarkService";
+    }
+
+    public static final class ObjectFactory {
+        public static final String FACTORY_CONVERSATION_GROUP = "objectConversationGroup";
+        public static final String FACTORY_CONVERSATION_MARK = "objectConversationMark";
+    }
+
+    public static final class TUICore {
+        public static final String LANGUAGE_EVENT = "TUIThemeManager";
+        public static final String LANGUAGE_EVENT_SUB_KEY = "onInitLanguage";
+    }
+
+    public static final class TUILogin {
+        // User login status change broadcast
+        public static final String EVENT_LOGIN_STATE_CHANGED = "eventLoginStateChanged";
+        // User kicked offline
+        public static final String EVENT_SUB_KEY_USER_KICKED_OFFLINE = "eventSubKeyUserKickedOffline";
+        // User ticket expired
+        public static final String EVENT_SUB_KEY_USER_SIG_EXPIRED = "eventSubKeyUserSigExpired";
+        // Changes in user personal information
+        public static final String EVENT_SUB_KEY_USER_INFO_UPDATED = "eventSubKeyUserInfoUpdated";
+
+        // Imsdk initialize state change
+        public static final String EVENT_IMSDK_INIT_STATE_CHANGED = "eventIMSDKInitStateChanged";
+        // Init
+        public static final String EVENT_SUB_KEY_START_INIT = "eventSubKeyStartInit";
+        // Uint
+        public static final String EVENT_SUB_KEY_START_UNINIT = "eventSubKeyStartUnInit";
+        // Login success
+        public static final String EVENT_SUB_KEY_USER_LOGIN_SUCCESS = "eventSubKeyUserLoginSuccess";
+        // Logout success
+        public static final String EVENT_SUB_KEY_USER_LOGOUT_SUCCESS = "eventSubKeyUserLogoutSuccess";
+
+        public static final String SELF_ID = "selfId";
+        public static final String SELF_SIGNATURE = "selfSignature";
+        public static final String SELF_FACE_URL = "selfFaceUrl";
+        public static final String SELF_NICK_NAME = "selfNickName";
+        public static final String SELF_LEVEL = "selfLevel";
+        public static final String SELF_GENDER = "selfGender";
+        public static final String SELF_ROLE = "selfRole";
+        public static final String SELF_BIRTHDAY = "selfBirthday";
+        public static final String SELF_ALLOW_TYPE = "selfAllowType";
+    }
+
+    public static final class TUIChat {
+        public static final String SERVICE_NAME = TUIConstants.Service.TUI_CHAT;
+
+        // Send message
+        public static final String METHOD_SEND_MESSAGE = "sendMessage";
+        // Exit chat
+        public static final String METHOD_EXIT_CHAT = "exitChat";
+        // Get a message digest to display in the conversation list
+        public static final String METHOD_GET_DISPLAY_STRING = "getDisplayString";
+        // add message to chat list
+        public static final String METHOD_ADD_MESSAGE_TO_CHAT = "addMessageToChat";
+        // Set chat extension
+        public static final String METHOD_SET_CHAT_EXTENSION = "setChatExtension";
+
+        // More actions
+        public static final String EXTENSION_INPUT_MORE_VIDEO_CALL = "inputMoreVideoCall";
+        public static final String EXTENSION_INPUT_MORE_AUDIO_CALL = "inputMoreAudioCall";
+        public static final String EXTENSION_INPUT_MORE_GROUP_NOTE = "inputMoreGroupNote";
+        public static final String EXTENSION_INPUT_MORE_POLL = "inputMoreGroupPoll";
+
+        // Message actions
+        public static final String EVENT_KEY_RECEIVE_MESSAGE = "eventReceiveMessage";
+        public static final String EVENT_SUB_KEY_CONVERSATION_ID = "eventConversationID";
+
+        public static final String EVENT_KEY_INPUT_MORE = "eventKeyInputMore";
+        public static final String EVENT_SUB_KEY_ON_CLICK = "eventSubKeyOnClick";
+
+        public static final String EVENT_KEY_MESSAGE_EVENT = "eventKeyMessageEvent";
+        public static final String EVENT_SUB_KEY_SEND_MESSAGE_SUCCESS = "eventSubKeySendMessageSuccess";
+        public static final String EVENT_SUB_KEY_SEND_MESSAGE_FAILED = "eventSubKeySendMessageFailed";
+        public static final String EVENT_SUB_KEY_REPLY_MESSAGE_SUCCESS = "eventSubKeyReplyMessageSuccess";
+
+        public static final String C2C_CHAT_ACTIVITY_NAME = "TUIC2CChatActivity";
+        public static final String GROUP_CHAT_ACTIVITY_NAME = "TUIGroupChatActivity";
+        public static final String CHAT_ID = "chatId";
+        public static final String CHAT_NAME = "chatName";
+        public static final String CHAT_TYPE = "chatType";
+        public static final String GROUP_NAME = "groupName";
+        public static final String GROUP_TYPE = "groupType";
+        public static final String DRAFT_TEXT = "draftText";
+        public static final String DRAFT_TIME = "draftTime";
+        public static final String IS_TOP_CHAT = "isTopChat";
+        public static final String LOCATE_MESSAGE = "locateMessage";
+        public static final String AT_INFO_LIST = "atInfoList";
+        public static final String FACE_URL = "faceUrl";
+        public static final String FACE_URL_LIST = "faceUrlList";
+        public static final String JOIN_TYPE = "joinType";
+        public static final String MEMBER_COUNT = "memberCount";
+        public static final String RECEIVE_OPTION = "receiveOption";
+        public static final String NOTICE = "notice";
+        public static final String OWNER = "owner";
+        public static final String MEMBER_DETAILS = "memberDetails";
+        public static final String IS_GROUP_CHAT = "isGroupChat";
+        public static final String V2TIMMESSAGE = "v2TIMMessage";
+        public static final String MESSAGE_BEAN = "messageBean";
+        public static final String GROUP_APPLY_NUM = "groupApplicaitonNumber";
+        public static final String CONVERSATION_ID = "conversationID";
+        public static final String IS_TYPING_MESSAGE = "isTypingMessage";
+        public static final String CALL_BACK = "callback";
+        public static final String PLUGIN_ITEM_VIEW = "pluginItemView";
+        public static final String PLUGIN_BEAN_OBJECT = "pluginBeanObject";
+
+        // Send custom message fields
+        public static final String MESSAGE_CONTENT = "messageContent";
+        public static final String MESSAGE_DESCRIPTION = "messageDescription";
+        public static final String MESSAGE_EXTENSION = "messageExtension";
+
+        // More input button extension field
+        public static final String CONTEXT = "context";
+        public static final String INPUT_MORE_ICON = "icon";
+        public static final String INPUT_MORE_TITLE = "title";
+        public static final String INPUT_MORE_ACTION_ID = "actionId";
+        public static final String INPUT_MORE_VIEW = "inputMoreView";
+
+        // Background
+        public static final String CHAT_CONVERSATION_BACKGROUND_URL =
+            "https://im.sdk.qcloud.com/download/tuikit-resource/conversation-backgroundImage/backgroundImage_%s_full.png";
+        public static final String CHAT_CONVERSATION_BACKGROUND_THUMBNAIL_URL =
+            "https://im.sdk.qcloud.com/download/tuikit-resource/conversation-backgroundImage/backgroundImage_%s.png";
+        public static final int CHAT_CONVERSATION_BACKGROUND_COUNT = 7;
+        public static final String CHAT_CONVERSATION_BACKGROUND_DEFAULT_URL = "chat/conversation/background/default/url";
+        public static final int CHAT_REQUEST_BACKGROUND_CODE = 1001;
+        public static final String METHOD_UPDATE_DATA_STORE_CHAT_URI = "updateDatastoreChatUri";
+        public static final String CHAT_BACKGROUND_URI = "chatBackgroundUri";
+
+        // Chat plugin
+        public static final String ENABLE_VIDEO_CALL = "enableVideoCall";
+        public static final String ENABLE_AUDIO_CALL = "enableAudioCall";
+        public static final String ENABLE_LINK = "enableLink";
+
+        // Translation
+        public static final String CHAT_RECYCLER_VIEW = "chatRecyclerView";
+        public static final String THEME_STYLE_CLASSIC = "classicTheme";
+        public static final String THEME_STYLE_MINIMALIST = "minimalistTheme";
+        public static final String FRAGMENT = "fragment";
+        public static final String ACTIVITY = "activity";
+
+        public static class Extension {
+            // UI extension for the input area at the bottom of the chat page
+            public static class InputMore {
+                public static final String CLASSIC_EXTENSION_ID = "ChatInputMoreExtensionClassicID";
+                public static final String MINIMALIST_EXTENSION_ID = "ChatInputMoreExtensionMinimalistID";
+                public static final String FILTER_VOICE_CALL = "ChatInputMoreExtensionFilterAudioCall";
+                public static final String FILTER_VIDEO_CALL = "ChatInputMoreExtensionFilterVideoCall";
+                public static final String CONTEXT = "ChatContext";
+                public static final String USER_ID = "ChatInputMoreUserID";
+                public static final String GROUP_ID = "ChatInputMoreGroupID";
+                public static final String INPUT_MORE_LISTENER = "ChatInputMoreListener";
+            }
+
+            // Message long press pop-up window extension
+            public static class MessagePopMenu {
+                public static final String CLASSIC_EXTENSION_ID = "ChatMessagePopMenuExtensionClassicID";
+                public static final String MINIMALIST_EXTENSION_ID = "ChatMessagePopMenuExtensionMinimalistID";
+                public static final String MESSAGE_BEAN = "ChatMessageBean";
+                public static final String ON_POP_CLICK_LISTENER = "ChatOnPopClickListener";
+            }
+
+            // UI extension on the right side of navigation bar in chat page
+            public static class ChatNavigationMoreItem {
+                public static final String CLASSIC_EXTENSION_ID = "ChatNavigationMoreItemExtensionClassicID";
+                public static final String MINIMALIST_EXTENSION_ID = "ChatNavigationMoreItemExtensionMinimalistID";
+
+                public static final String FILTER_VOICE_CALL = "ChatNavigationMoreItemFilterAudioCall";
+                public static final String FILTER_VIDEO_CALL = "ChatNavigationMoreItemFilterVideoCall";
+
+                public static final String CHAT_BACKGROUND_URI = "ChatBackgroundUri";
+                public static final String USER_ID = "ChatUserID";
+                public static final String GROUP_ID = "ChatGroupID";
+                public static final String TOPIC_ID = "ChatTopicID";
+                public static final String CONTEXT = "ChatContext";
+            }
+        }
+
+        public static class Method {
+            // Register a message type with Chat
+            public static class RegisterCustomMessage {
+                public static final String CLASSIC_SERVICE_NAME = TUIChat.Service.CLASSIC_SERVICE_NAME;
+                public static final String MINIMALIST_SERVICE_NAME = TUIChat.Service.MINIMALIST_SERVICE_NAME;
+                public static final String METHOD_NAME = "ChatRegisterCustomMessageName";
+                public static final String MESSAGE_BUSINESS_ID = "ChatMessageBusinessID";
+                public static final String MESSAGE_BEAN_CLASS = "ChatMessageBeanClass";
+                public static final String MESSAGE_VIEW_HOLDER_CLASS = "ChatMessageViewHolderClass";
+                public static final String MESSAGE_REPLY_BEAN_CLASS = "ChatMessageReplyBeanClass";
+                public static final String MESSAGE_REPLY_VIEW_CLASS = "ChatMessageReplyViewClass";
+                public static final String IS_NEED_EMPTY_VIEW_GROUP = "ChatMessageIsNeedEmptyViewGroup";
+            }
+        }
+
+        public static class Service {
+            public static final String CHAT_SERVICE_NAME = TUIConstants.Service.TUI_CHAT;
+            public static final String CLASSIC_SERVICE_NAME = "ChatClassicService";
+            public static final String MINIMALIST_SERVICE_NAME = "ChatMinimalistService";
+        }
+    }
+
+    public static final class TUIConversation {
+        public static final String SERVICE_NAME = Service.TUI_CONVERSATION;
+
+        public static final String METHOD_IS_TOP_CONVERSATION = "isTopConversation";
+        public static final String METHOD_SET_TOP_CONVERSATION = "setTopConversation";
+        public static final String METHOD_GET_TOTAL_UNREAD_COUNT = "getTotalUnreadCount";
+        public static final String METHOD_UPDATE_TOTAL_UNREAD_COUNT = "updateTotalUnreadCount";
+        public static final String METHOD_DELETE_CONVERSATION = "deleteConversation";
+        public static final String METHOD_CLEAR_CONVERSATION_MESSAGE = "clearConversationMessage";
+
+        public static final String EVENT_UNREAD = "eventTotalUnreadCount";
+        public static final String EVENT_SUB_KEY_UNREAD_CHANGED = "unreadCountChanged";
+
+        public static final String EXTENSION_CLASSIC_SEARCH = "extensionClassicSearch";
+        public static final String EXTENSION_MINIMALIST_SEARCH = "extensionMinimalistSearch";
+
+        public static final String CHAT_ID = "chatId";
+        public static final String CONVERSATION_ID = "conversationId";
+        public static final String IS_SET_TOP = "isSetTop";
+        public static final String IS_TOP = "isTop";
+        public static final String IS_GROUP = "isGroup";
+        public static final String TOTAL_UNREAD_COUNT = "totalUnreadCount";
+        public static final String CONTEXT = "context";
+        public static final String SEARCH_VIEW = "searchView";
+        public static final String KEY_CONVERSATION_INFO = "keyConversationInfo";
+
+        public static final String CONVERSATION_C2C_PREFIX = "c2c_";
+        public static final String CONVERSATION_GROUP_PREFIX = "group_";
+
+        public static final String EVENT_KEY_MESSAGE_SEND_FOR_CONVERSATION = "eventKeyMessageSendForConversation";
+        public static final String EVENT_SUB_KEY_MESSAGE_SEND_FOR_CONVERSATION = "eventSubKeyMessageSendForConversation";
+
+        public static class Extension {
+            // Conversation List Header Extension
+            public static class ConversationListHeader {
+                public static final String CLASSIC_EXTENSION_ID = "TUIConversationListHeaderClassicID";
+                public static final String MINIMALIST_EXTENSION_ID = "TUIConversationListHeaderMinimalistID";
+                public static final String HEADER_CONTAINER = "TUIConversationListHeaderContainer";
+            }
+
+            // Conversation popmenu Extension
+            public static class ConversationPopMenu {
+                public static final String CLASSIC_EXTENSION_ID = "ConversationPopMenuExtensionClassicID";
+                public static final String MINIMALIST_EXTENSION_ID = "ConversationPopMenuExtensionMinimalistID";
+            }
+
+            // Conversation group Extension
+            public static class ConversationGroupBean {
+                public static final String CLASSIC_EXTENSION_ID = "ConversationGroupPopMenuExtensionClassicID";
+                public static final String MINIMALIST_EXTENSION_ID = "ConversationGroupPopMenuExtensionMinimalistID";
+                public static final String KEY_DATA = "conversationGroupBeanData";
+            }
+        }
+    }
+
+    public static final class TUIContact {
+        public static final String SERVICE_NAME = Service.TUI_CONTACT;
+
+        public static final String EVENT_FRIEND_STATE_CHANGED = "eventFriendStateChanged";
+        public static final String EVENT_FRIEND_INFO_CHANGED = "eventFriendInfoChanged";
+        public static final String EVENT_USER = "eventUser";
+        public static final String EVENT_SUB_KEY_FRIEND_REMARK_CHANGED = "eventFriendRemarkChanged";
+        public static final String EVENT_SUB_KEY_FRIEND_DELETE = "eventSubKeyFriendDelete";
+        public static final String EVENT_SUB_KEY_CLEAR_MESSAGE = "eventSubKeyC2CClearMessage";
+
+        public static final String FRIEND_ID_LIST = "friendIdList";
+        public static final String FRIEND_ID = "friendId";
+        public static final String FRIEND_REMARK = "friendRemark";
+
+        public static final String GROUP_TYPE_KEY = "type";
+        public static final String COMMUNITY_SUPPORT_TOPIC_KEY = "communitySupportTopic";
+
+        public static final int GROUP_TYPE_PRIVATE = 0;
+        public static final int GROUP_TYPE_PUBLIC = 1;
+        public static final int GROUP_TYPE_CHAT_ROOM = 2;
+        public static final int GROUP_TYPE_COMMUNITY = 3;
+
+        public static final String GROUP_FACE_URL = "https://im.sdk.qcloud.com/download/tuikit-resource/group-avatar/group_avatar_%s.png";
+        public static final int GROUP_FACE_COUNT = 24;
+
+        public static class Extension {
+            public static class FriendProfileItem {
+                public static final String CLASSIC_EXTENSION_ID = "ContactFriendProfileItemClassicID";
+                public static final String MINIMALIST_EXTENSION_ID = "ContactFriendProfileItemMinimalistID";
+                public static final String USER_ID = "ContactFriendProfileUserID";
+            }
+        }
+
+        public static class StartActivity {
+            // Group members selector
+            public static class GroupMemberSelect {
+                public static final String CLASSIC_ACTIVITY_NAME = "StartGroupMemberSelectActivity";
+                public static final String MINIMALIST_ACTIVITY_NAME = "StartGroupMemberSelectMinimalistActivity";
+                public static final String GROUP_ID = "ContactGroupMemberSelectGroupID";
+                public static final String MEMBER_LIMIT = "ContactGroupMemberSelectMemberLimit";
+                public static final String SELECT_FOR_CALL = "ContactGroupMemberSelectForCall";
+                public static final String SELECTED_LIST = "ContactGroupMemberSelectedList";
+                public static final String SELECT_FRIENDS = "ContactGroupMemberSelectFriends";
+                public static final String DATA_LIST = "ContactGroupMemberSelectDataList";
+                public static final String PAGE_TITLE = "ContactGroupMemberSelectTitle";
+                public static final String USER_NAME_CARD_SELECT = "ContactGroupMemberSelectNameCardSelected";
+                public static final String USER_ID_SELECT = "ContactGroupMemberSelectUserIDSelected";
+            }
+        }
+    }
+
+    public static final class TUICalling {
+        public static final String SERVICE_NAME = Service.TUI_CALLING;
+
+        public static final String METHOD_NAME_CALL = "call";
+        public static final String METHOD_NAME_RECEIVEAPNSCALLED = "receiveAPNSCalled";
+        public static final String METHOD_NAME_ENABLE_FLOAT_WINDOW = "methodEnableFloatWindow";
+        public static final String METHOD_NAME_ENABLE_MULTI_DEVICE = "methodEnableMultiDeviceAbility";
+
+        public static final String PARAM_NAME_TYPE = "type";
+        public static final String PARAM_NAME_USERIDS = "userIDs";
+        public static final String PARAM_NAME_GROUPID = "groupId";
+        public static final String PARAM_NAME_CALLMODEL = "call_model_data";
+        public static final String PARAM_NAME_ENABLE_FLOAT_WINDOW = "enableFloatWindow";
+        public static final String PARAM_NAME_ENABLE_MULTI_DEVICE = "enableMultiDeviceAbility";
+
+        public static final String METHOD_START_CALL = "startCall";
+
+        public static final String CUSTOM_MESSAGE_BUSINESS_ID = "av_call";
+        public static final Double CALL_TIMEOUT_BUSINESS_ID = 1.0;
+
+        public static final String CALL_ID = "callId";
+        public static final String SENDER = "sender";
+        public static final String GROUP_ID = "groupId";
+        public static final String INVITED_LIST = "invitedList";
+        public static final String DATA = "data";
+
+        public static final String TYPE_AUDIO = "audio";
+        public static final String TYPE_VIDEO = "video";
+
+        public static final int ACTION_ID_AUDIO_CALL = 1;
+        public static final int ACTION_ID_VIDEO_CALL = 2;
+
+        public static final String EVENT_KEY_CALLING = "calling";
+        public static final String EVENT_KEY_NAME = "event_name";
+        public static final String EVENT_ACTIVE_HANGUP = "active_hangup";
+
+        public static final String SERVICE_NAME_AUDIO_RECORD = Service.TUI_AUDIO_RECORD;
+        public static final String METHOD_NAME_START_RECORD_AUDIO_MESSAGE = "methodStartRecordAudioMessage";
+        public static final String METHOD_NAME_STOP_RECORD_AUDIO_MESSAGE = "methodStopRecordAudioMessage";
+
+        public static final String EVENT_KEY_RECORD_AUDIO_MESSAGE = "eventRecordAudioMessage";
+        public static final String EVENT_SUB_KEY_RECORD_START = "eventSubKeyStartRecordAudioMessage";
+        public static final String EVENT_SUB_KEY_RECORD_STOP = "eventSubKeyStopRecordAudioMessage";
+
+        public static final String PARAM_NAME_SDK_APP_ID = "sdkappid";
+        public static final String PARAM_NAME_AUDIO_SIGNATURE = "signature";
+        public static final String PARAM_NAME_AUDIO_PATH = "path";
+
+        // Error Code
+        public static final int ERROR_NONE = 0; // init success or record success
+        public static final int ERROR_INVALID_PARAM = -1001; // param is invalid
+        public static final int ERROR_STATUS_IN_CALL = -1002; // recording rejected, currently in call
+        public static final int ERROR_STATUS_IS_AUDIO_RECORDING = -1003; // recording rejected, the current recording is not finished
+        public static final int ERROR_MIC_PERMISSION_REFUSED = -1004; // recording rejected, failed to obtain microphone permission
+        public static final int ERROR_REQUEST_AUDIO_FOCUS_FAILED = -1005; // recording rejected, failed to obtain audio focus
+        public static final int ERROR_RECORD_INIT_FAILED = -2001; // -1, init failed(onLocalRecordBegin)
+        public static final int ERROR_PATH_FORMAT_NOT_SUPPORT = -2002; // -2, file format is invalid(onLocalRecordBegin)
+        public static final int ERROR_RECORD_FAILED = -2003; // -1, record failed(onLocalRecordComplete)
+        public static final int ERROR_NO_MESSAGE_TO_RECORD = -2004; // -3, The audio data has not arrived(onLocalRecordComplete)
+        public static final int ERROR_SIGNATURE_ERROR = -3001; // -4, signature error(onLocalRecordBegin)
+        public static final int ERROR_SIGNATURE_EXPIRED = -3002; // -5, signature expired(onLocalRecordBegin)
+        // TRTC-SDK MIC Error Code
+        public static final int ERR_MIC_START_FAIL = -1302; // start microphone failed
+        public static final int ERR_MIC_NOT_AUTHORIZED = -1317; // microphone authorize failed
+        public static final int ERR_MIC_SET_PARAM_FAIL = -1318; // microphone param is invalid
+        public static final int ERR_MIC_OCCUPY = -1319; // microphone is occupied
+
+        public static class ObjectFactory {
+            public static final String FACTORY_NAME = "TUICallingObjectFactory";
+
+            public static class RecentCalls {
+                public static final String OBJECT_NAME = "TUICallingRecentCallsFragment";
+                public static final String UI_STYLE = "TUICallingRecentCallsFragmentUIStyle";
+                public static final String UI_STYLE_CLASSIC = "ClassicStyle";
+                public static final String UI_STYLE_MINIMALIST = "MinimalistStyle";
+            }
+        }
+    }
+
+    public static final class TUILive {
+        public static final String SERVICE_NAME = Service.TUI_LIVE;
+
+        public static final String METHOD_LOGIN = "methodLogin";
+        public static final String METHOD_LOGOUT = "methodLogout";
+        public static final String METHOD_START_ANCHOR = "methodStartAnchor";
+        public static final String METHOD_START_AUDIENCE = "methodStartAudience";
+
+        public static final String CUSTOM_MESSAGE_BUSINESS_ID = "group_live";
+        public static final String SDK_APP_ID = "sdkAppId";
+        public static final String USER_ID = "userId";
+        public static final String USER_SIG = "userSig";
+
+        public static final String GROUP_ID = "groupId";
+        public static final String ROOM_ID = "roomId";
+        public static final String ROOM_NAME = "roomName";
+        public static final String ROOM_STATUS = "roomStatus";
+        public static final String ROOM_COVER = "roomCover";
+        public static final String USE_CDN_PLAY = "use_cdn_play";
+        public static final String ANCHOR_ID = "anchorId";
+        public static final String ANCHOR_NAME = "anchorName";
+        public static final String PUSHER_NAME = "pusherName";
+        public static final String COVER_PIC = "coverPic";
+        public static final String PUSHER_AVATAR = "pusherAvatar";
+
+        public static final int ACTION_ID_LIVE = 0;
+    }
+
+    public static final class TUIGroup {
+        public static final String SERVICE_NAME = Service.TUI_GROUP;
+
+        public static final String EVENT_GROUP = "eventGroup";
+        public static final String EVENT_SUB_KEY_EXIT_GROUP = "eventExitGroup";
+        public static final String EVENT_SUB_KEY_MEMBER_KICKED_GROUP = "eventMemberKickedGroup";
+        public static final String EVENT_SUB_KEY_GROUP_RECYCLE = "eventMemberGroupRecycle";
+        public static final String EVENT_SUB_KEY_GROUP_DISMISS = "eventMemberGroupDismiss";
+        public static final String EVENT_SUB_KEY_JOIN_GROUP = "eventSubKeyJoinGroup";
+        public static final String EVENT_SUB_KEY_INVITED_GROUP = "eventSubKeyInvitedGroup";
+        public static final String EVENT_SUB_KEY_GROUP_INFO_CHANGED = "eventSubKeyGroupInfoChanged";
+        public static final String EVENT_SUB_KEY_CLEAR_MESSAGE = "eventSubKeyGroupClearMessage";
+        public static final String EVENT_SUB_KEY_GROUP_MEMBER_SELECTED = "eventSubKeyGroupMemberSelected";
+
+        public static final String GROUP_ID = "groupId";
+        public static final String GROUP_NAME = "groupName";
+        public static final String GROUP_FACE_URL = "groupFaceUrl";
+        public static final String GROUP_OWNER = "groupOwner";
+        public static final String GROUP_INTRODUCTION = "groupIntroduction";
+        public static final String GROUP_NOTIFICATION = "groupNotification";
+        public static final String GROUP_MEMBER_ID_LIST = "groupMemberIdList";
+
+        public static final String SELECT_FRIENDS = "select_friends";
+        public static final String SELECT_FOR_CALL = "isSelectForCall";
+        public static final String USER_DATA = "userData";
+        public static final String IS_SELECT_MODE = "isSelectMode";
+        public static final String EXCLUDE_LIST = "excludeList";
+        public static final String SELECTED_LIST = "selectedList";
+        public static final String CONTENT = "content";
+        public static final String TYPE = "type";
+        public static final String TITLE = "title";
+        public static final String LIST = "list";
+        public static final String LIMIT = "limit";
+        public static final String FILTER = "filter";
+        public static final String JOIN_TYPE_INDEX = "joinTypeIndex";
+
+        public static class Extension {
+            public static class GroupProfileItem {
+                public static final String CLASSIC_EXTENSION_ID = "GroupProfileItemClassicID";
+                public static final String MINIMALIST_EXTENSION_ID = "GroupProfileItemMinimalistID";
+                public static final String GROUP_ID = "GroupProfileGroupID";
+                public static final String CONTEXT = "GroupProfileContext";
+            }
+        }
+
+        public static class Event {
+            public static class GroupApplication {
+                public static final String KEY_GROUP_APPLICATION = "groupApplication";
+                public static final String SUB_KEY_GROUP_APPLICATION_NUM_CHANGED = "groupApplicationNumChanged";
+            }
+        }
+    }
+
+    public static final class TUIBeauty {
+        public static final String SERVICE_NAME = Service.TUI_BEAUTY;
+
+        public static final String PARAM_NAME_CONTEXT = "context";
+        public static final String PARAM_NAME_LICENSE_KEY = "licenseKey";
+        public static final String PARAM_NAME_LICENSE_URL = "licenseUrl";
+        public static final String PARAM_NAME_FRAME_WIDTH = "frameWidth";
+        public static final String PARAM_NAME_FRAME_HEIGHT = "frameHeight";
+        public static final String PARAM_NAME_SRC_TEXTURE_ID = "srcTextureId";
+
+        public static final String METHOD_PROCESS_VIDEO_FRAME = "processVideoFrame";
+        public static final String METHOD_INIT_XMAGIC = "setLicense";
+        public static final String METHOD_DESTROY_XMAGIC = "destroy";
+    }
+
+    public static final class TUIOfflinePush {
+        public static final String SERVICE_NAME = Service.TUI_OFFLINEPUSH;
+        public static final String METHOD_UNREGISTER_PUSH = "unRegiterPush";
+
+        public static final String EVENT_NOTIFY = "offlinePushNotifyEvent";
+        public static final String EVENT_NOTIFY_NOTIFICATION = "notifyNotificationEvent";
+        public static final String NOTIFICATION_INTENT_KEY = "notificationIntentKey";
+        public static final String NOTIFICATION_EXT_KEY = "ext";
+
+        public static final String NOTIFICATION_BROADCAST_ACTION = "com.tencent.tuiofflinepush.BROADCAST_PUSH_RECEIVER";
+    }
+
+    public static final class TUICommunity {
+        public static final String SERVICE_NAME = Service.TUI_COMMUNITY;
+
+        public static final String TOPIC_ID = "topic_id";
+
+        public static final String EVENT_KEY_COMMUNITY_EXPERIENCE = "eventKeyCommunityExperience";
+        public static final String EVENT_SUB_KEY_ADD_COMMUNITY = "eventSubKeyAddCommunity";
+        public static final String EVENT_SUB_KEY_CREATE_COMMUNITY = "eventSubKeyCreateCommunity";
+        public static final String EVENT_SUB_KEY_DISBAND_COMMUNITY = "eventSubKeyDisbandCommunity";
+        public static final String EVENT_SUB_KEY_CREATE_TOPIC = "eventSubKeyCreateTopic";
+        public static final String EVENT_SUB_KEY_DELETE_TOPIC = "eventSubKeyDeleteTopic";
+    }
+
+    public static final class TUIPlugin {
+        public static final String PLUGIN_BUSINESS_ID = "businessID";
+        public static final String PLUGIN_TITLE = "title";
+        public static final String PLUGIN_DESCRIPTION = "description";
+        public static final String PLUGIN_CONTENT = "content";
+        public static final String PLUGIN_EXTENSION_CONFIG = "config";
+        public static final String PLUGIN_ORIGINAL_MESSAGE_ID = "original_msg_id";
+        public static final String PLUGIN_ORIGINAL_MESSAGE_SEQUENCE = "original_msg_seq";
+
+        public static final String BUSINESS_ID_PLUGIN_GROUP_NOTE = "group_note";
+        public static final String BUSINESS_ID_PLUGIN_GROUP_NOTE_TIPS = "group_note_tips";
+        public static final String BUSINESS_ID_PLUGIN_POLL = "group_poll";
+
+        public static final String KEY_EXTENSIONS = "key_extensions";
+    }
+
+    public static final class TUIPollPlugin {
+        public static final String SERVICE_NAME = Service.TUI_POLL;
+        public static final int ACTION_ID_POLL = 3;
+
+        public static final String POLL_CREATOR_ACTIVITY_NAME = "TUIPollCreatorActivity";
+        public static final String PLUGIN_POLL_OPTION_LIST = "option_list";
+        public static final String PLUGIN_POLL_OPTION_INDEX = "index";
+        public static final String PLUGIN_POLL_OPTION_CONTENT = "option";
+        public static final String PLUGIN_POLL_ENABLE_PUBLIC = "public";
+        public static final String PLUGIN_POLL_ENABLE_MULTI_VOTE = "allow_multi_vote";
+        public static final String PLUGIN_POLL_ANONYMOUS = "anonymous";
+        public static final String METHOD_GET_POLL_MESSAGE_LAYOUT = "getPollMessageLayout";
+        public static final String EVENT_KEY_POLL_MESSAGE_LAYOUT = "eventKeyPollMessageLayout";
+        public static final String EVENT_SUB_KEY_REFRESH_POLL_MESSAGE_LAYOUT = "eventKeyRefreshPollMessageLayout";
+
+        public static final String EVENT_KEY_POLL_EVENT = "eventKeyPollEvent";
+        public static final String EVENT_SUB_KEY_POLL_VOTE_CHANGED = "eventSubKeyVoteChanged";
+    }
+
+    public static final class TUIGroupNotePlugin {
+        public static final String SERVICE_NAME = Service.TUI_GROUP_NOTE;
+
+        public static final int ACTION_ID_GROUP_NOTE = 4;
+
+        public static final String GROUP_NOTE_CREATOR_ACTIVITY_NAME = "TUIGroupNoteCreatorActivity";
+
+        public static final String PLUGIN_GROUP_NOTE_CREATOR = "creator";
+        public static final String PLUGIN_GROUP_NOTE_SHOW_LINE_NUM = "show_line_num";
+        public static final String PLUGIN_GROUP_NOTE_FORMAT = "format";
+        public static final String PLUGIN_GROUP_NOTE_ENABLE_MULTIPLE_SUBMISSION = "multi_submit";
+        public static final String PLUGIN_GROUP_NOTE_DEADLINE = "deadline";
+        public static final String PLUGIN_GROUP_NOTE_ENABLE_NOTIFICATION = "notify";
+
+        public static final String METHOD_GET_GROUP_NOTE_MESSAGE_LAYOUT = "getGroupNoteMessageLayout";
+        public static final String METHOD_GET_GROUP_NOTE_TIPS_MESSAGE_LAYOUT = "getGroupNoteTipsMessageLayout";
+
+        public static final String EVENT_KEY_GROUP_NOTE_EVENT = "eventKeyGroupNoteEvent";
+        public static final String EVENT_SUB_KEY_GROUP_NOTE_CHANGED = "eventSubKeyGroupNoteChanged";
+    }
+
+    public static final class TIMAppKit {
+        public static final String SERVICE_NAME = Service.TUI_DEMO;
+
+        public static final String METHOD_INIT_IM_BEFORE_LOGIN = "initIMBeforeLogin";
+        public static final String METHOD_ENTER_IM_FROM_RTCUBE = "enterIMFromRTCube";
+        public static final String SDK_APP_ID = "sdkAppId";
+        public static final String IM_DEMO_ITEM_TYPE_KEY = "imDemoItemTypeKey";
+        public static final String IM_DEMO_ITEM_TYPE_CHAT = "imDemoItemTypeChat";
+        public static final String IM_DEMO_ITEM_TYPE_COMMUNITY = "imDemoItemTypeCommunity";
+        public static final String IM_DEMO_ITEM_TYPE_CONTACT = "imDemoItemTypeContact";
+        public static final String IM_DEMO_ITEM_TYPE_RECENT_CALLS = "imDemoItemTypeRecentCalls";
+        public static final String IM_DEMO_ITEM_TYPE_PROFILE = "imDemoItemTypeProfile";
+        public static final String BACK_TO_RTCUBE_DEMO_TYPE_KEY = "backToRTCubeDemoTypeKey";
+        public static final String BACK_TO_RTCUBE_DEMO_TYPE_IM = "backToRTCubeDemoTypeIM";
+        public static final String NOTIFY_RTCUBE_EVENT_KEY = "notifyRTCubeEventKey";
+        public static final String NOTIFY_RTCUBE_LOGIN_SUB_KEY = "notifyRTCubeLoginSubKey";
+        public static final String NOFITY_IMLOGIN_SUCCESS_SUB_KEY = "nofityIMLoginSuccessSubKey";
+        public static final String OFFLINE_PUSH_INTENT_DATA = "offlinePushIntentData";
+
+        public static final int BACK_RTCUBE_HOME_ICON_WIDTH = 40;
+        public static final int BACK_RTCUBE_HOME_ICON_HEIGHT = 32;
+
+        public static class Extension {
+            public static class ProfileSettings {
+                public static final String CLASSIC_EXTENSION_ID = "ProfileSettingsViewClassicID";
+                public static final String MINIMALIST_EXTENSION_ID = "ProfileSettingsMinimalistID";
+                public static final String KEY_VIEW = "view";
+            }
+        }
+    }
+
+    public static final class TUITranslationPlugin {
+        public static class Extension {
+            // TranslationView Extension
+            public static class TranslationView {
+                public static final String CLASSIC_EXTENSION_ID = "TUITranslationViewClassicID";
+                public static final String MINIMALIST_EXTENSION_ID = "TUITranslationViewMinimalistID";
+            }
+        }
+
+        // show translation view
+        public static final String EVENT_KEY_TRANSLATION_EVENT = "eventKeyTranslationEvent";
+        public static final String EVENT_SUB_KEY_TRANSLATION_CHANGED = "eventSubKeyTranslationChanged";
+        // select target language
+        public static final String METHOD_SELECT_TRANSLATION_LANGUAGE = "selectTranslationLanguage";
+        public static final String LANGUAGE_NAME = "languageName";
+    }
+
+    public static final class TUIConversationGroupPlugin {
+        public static final String SERVICE_NAME = Service.TUI_CONVERSATION_GROUP;
+        public static final String OBJECT_FACTORY_NAME = ObjectFactory.FACTORY_CONVERSATION_GROUP;
+        public static final String CONTEXT = "context";
+        public static final String EXTENSION_GROUP_SETTING_MENU = "extensionGroupSettingMenu";
+        public static final String OBJECT_CONVERSATION_GROUP_FRAGMENT = "objectConversationGroupFragment";
+
+        public static class Extension {
+            // ConversationGroup popmenu Extension
+            public static class ConversationPopMenu {
+                public static final String CLASSIC_EXTENSION_ID = "ConversationGroupPopMenuExtensionClassicID";
+                public static final String MINIMALIST_EXTENSION_ID = "ConversationGroupPopMenuExtensionMinimalistID";
+            }
+        }
+    }
+
+    public static final class TUIConversationMarkPlugin {
+        public static final String SERVICE_NAME = Service.TUI_CONVERSATION_MARK;
+        public static final String OBJECT_FACTORY_NAME = ObjectFactory.FACTORY_CONVERSATION_MARK;
+        public static final String CONTEXT = "context";
+        public static final String OBJECT_CONVERSATION_MARK_BEANS = "objectConversationMarkBeans";
+        public static final String OBJECT_CONVERSATION_MARK_FRAGMENT = "objectConversationMarkFragment";
+
+        public static class Extension {
+            // ConversationMark popmenu Extension
+            public static class ConversationPopMenu {
+                public static final String CLASSIC_EXTENSION_ID = "ConversationMarkPopMenuExtensionClassicID";
+                public static final String MINIMALIST_EXTENSION_ID = "ConversationMarkPopMenuExtensionMinimalistID";
+            }
+
+            public static class ConversationGroupBean {
+                public static final String CLASSIC_EXTENSION_ID = "ConversationGroupPopMenuExtensionClassicID";
+                public static final String MINIMALIST_EXTENSION_ID = "ConversationGroupPopMenuExtensionMinimalistID";
+            }
+        }
+    }
+
+    public static final class Message {
+        public static final String CUSTOM_BUSINESS_ID_KEY = "businessID";
+        public static final String CALLING_TYPE_KEY = "call_type";
+    }
+
+    public static final class NetworkConnection {
+        public static final String EVENT_CONNECTION_STATE_CHANGED = "eventConnectionStateChanged";
+        public static final String EVENT_SUB_KEY_CONNECTING = "eventSubKeyConnecting";
+        public static final String EVENT_SUB_KEY_CONNECT_SUCCESS = "eventSubKeyConnectSuccess";
+        public static final String EVENT_SUB_KEY_CONNECT_FAILED = "eventSubKeyConnectFailed";
+    }
+
+    public static final class BuyingFeature {
+        public static final int ERR_SDK_INTERFACE_NOT_SUPPORT = BaseConstants.ERR_SDK_INTERFACE_NOT_SUPPORT;
+        public static final String BUYING_GUIDELINES_EN = "https://intl.cloud.tencent.com/document/product/1047/36021?lang=en&pg=#changing-configuration";
+        public static final String BUYING_GUIDELINES = "https://cloud.tencent.com/document/product/269/32458";
+
+        public static final String BUYING_PRICE_DESC_EN = "https://www.tencentcloud.com/document/product/1047/34349#basic-services";
+        public static final String BUYING_PRICE_DESC =
+            "https://cloud.tencent.com/document/product/269/11673?from=17219#.E5.9F.BA.E7.A1.80.E6.9C.8D.E5.8A.A1.E8.AF.A6.E6.83.85";
+
+        public static final String BUYING_FEATURE_MESSAGE_RECEIPT = "buying_chat_message_read_receipt";
+        public static final String BUYING_FEATURE_COMMUNITY = "buying_community";
+        public static final String BUYING_FEATURE_SEARCH = "buying_search";
+        public static final String BUYING_FEATURE_ONLINE_STATUS = "buying_online_status";
+    }
+
+    public static final class TUIVideoSeat {
+        public static final String SERVICE_VIDEO_SEAT = "com.tencent.cloud.tuikit.videoseat.core.TUIVideoSeatExtension";
+        public static final String METHOD_SWITCH_VIDEO_LAYOUT = "switchVideoLayout";
+    }
+
+    public static final class Privacy {
+        public static class PermissionsFactory {
+            public static final String FACTORY_NAME = "PrivacyPermissionsFactory";
+
+            public static class PermissionsName {
+                public static final String CAMERA_PERMISSIONS = "CameraPermissions";
+                public static final String MICROPHONE_PERMISSIONS = "MicrophonePermissions";
+            }
+        }
+    }
+
+    // localBroadcast
+    public static final String CONVERSATION_UNREAD_COUNT_ACTION = "conversation_unread_count_action";
+    public static final String UNREAD_COUNT_EXTRA = "unread_count_extra";
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/TUICore.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/TUICore.java
new file mode 100644
index 0000000..bc64739
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/TUICore.java
@@ -0,0 +1,232 @@
+package com.tencent.qcloud.tuicore;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import androidx.activity.result.ActivityResult;
+import androidx.activity.result.ActivityResultCallback;
+import androidx.activity.result.ActivityResultCaller;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import com.tencent.qcloud.tuicore.interfaces.ITUIExtension;
+import com.tencent.qcloud.tuicore.interfaces.ITUINotification;
+import com.tencent.qcloud.tuicore.interfaces.ITUIObjectFactory;
+import com.tencent.qcloud.tuicore.interfaces.ITUIService;
+import com.tencent.qcloud.tuicore.interfaces.TUIExtensionInfo;
+import com.tencent.qcloud.tuicore.interfaces.TUIServiceCallback;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TUI Plugin core class, mainly responsible for data transfer between TUI plugins, notification broadcast, function extension, etc.
+ */
+public class TUICore {
+    private static final String TAG = TUICore.class.getSimpleName();
+
+    /**
+     * Register Service
+     * @param serviceName    service name
+     * @param service        service object
+     */
+    public static void registerService(String serviceName, ITUIService service) {
+        ServiceManager.getInstance().registerService(serviceName, service);
+    }
+
+    /**
+     * unregister Service
+     *
+     * @param serviceName service name
+     */
+    public static void unregisterService(String serviceName) {
+        ServiceManager.getInstance().unregisterService(serviceName);
+    }
+
+    /**
+     * get Service
+     *
+     * @param serviceName service name
+     * @return service
+     */
+    public static ITUIService getService(String serviceName) {
+        return ServiceManager.getInstance().getService(serviceName);
+    }
+
+    /**
+     * Call Service
+     *
+     *  @param serviceName     service name
+     *  @param method          method name
+     *  @param param           pass parameters
+     *  @return                object
+     */
+    public static Object callService(String serviceName, String method, Map<String, Object> param) {
+        return ServiceManager.getInstance().callService(serviceName, method, param);
+    }
+
+    /**
+     * Call service asynchronously
+     *
+     *  @param serviceName     service name
+     *  @param method          method name
+     *  @param param           pass parameters
+     *  @return                object
+     */
+    public static Object callService(String serviceName, String method, Map<String, Object> param, TUIServiceCallback callback) {
+        return ServiceManager.getInstance().callService(serviceName, method, param, callback);
+    }
+
+    /**
+     * start Activity
+     * @param activityName     activity name，such as "TUIGroupChatActivity"
+     * @param param            pass parameters
+     */
+    public static void startActivity(String activityName, Bundle param) {
+        startActivity(null, activityName, param, -1);
+    }
+
+    /**
+     * start Activity
+     * @param starter         Initiator, either {@link Context} or {@link Fragment}
+     * @param activityName    activity name，such as "TUIGroupChatActivity"
+     * @param param           pass parameters
+     */
+    public static void startActivity(@Nullable Object starter, String activityName, Bundle param) {
+        startActivity(starter, activityName, param, -1);
+    }
+
+    /**
+     * start Activity
+     * @param starter         Initiator, either {@link Context} or {@link Fragment}
+     * @param activityName    activity name，such as "TUIGroupChatActivity"
+     * @param param           pass parameters
+     * @param requestCode     The request value passed to the Activity, used to return the result in the initiator's
+     *                        onActivityResult method when the Activity ends, greater than or equal to 0 is valid.
+     * @note The method has been deprecated：use {@link #startActivityForResult}
+     */
+    @Deprecated
+    public static void startActivity(@Nullable Object starter, String activityName, Bundle param, int requestCode) {
+        TUIRouter.startActivity(starter, activityName, param, requestCode);
+    }
+
+    /**
+     * Start the activity and get the result asynchronously
+     * @param caller          {@link androidx.activity.result.ActivityResultCaller}
+     * @param activityName    activity name，such as "TUIGroupChatActivity"
+     * @param param           pass parameters
+     * @param resultCallback  the result callback
+     */
+    public static void startActivityForResult(
+        @Nullable ActivityResultCaller caller, String activityName, Bundle param, ActivityResultCallback<ActivityResult> resultCallback) {
+        TUIRouter.startActivityForResult(caller, activityName, param, resultCallback);
+    }
+
+    /**
+     * Start the activity and get the result asynchronously
+     * @param caller          {@link androidx.activity.result.ActivityResultCaller}
+     * @param activityClazz   activity's Class Object
+     * @param param           pass parameters
+     * @param resultCallback  the result callback
+     */
+    public static void startActivityForResult(
+        @Nullable ActivityResultCaller caller, Class<? extends Activity> activityClazz, Bundle param, ActivityResultCallback<ActivityResult> resultCallback) {
+        TUIRouter.startActivityForResult(caller, activityClazz, param, resultCallback);
+    }
+
+    /**
+     * Start the activity and get the result asynchronously
+     * @param caller          {@link androidx.activity.result.ActivityResultCaller}
+     * @param intent          the intent
+     * @param resultCallback  the result callback
+     */
+    public static void startActivityForResult(@Nullable ActivityResultCaller caller, Intent intent, ActivityResultCallback<ActivityResult> resultCallback) {
+        TUIRouter.startActivityForResult(caller, intent, resultCallback);
+    }
+
+    /**
+     *  Register event
+     */
+    public static void registerEvent(String key, String subKey, ITUINotification notification) {
+        EventManager.getInstance().registerEvent(key, subKey, notification);
+    }
+
+    /**
+     *  Unregister event
+     */
+    public static void unRegisterEvent(String key, String subKey, ITUINotification notification) {
+        EventManager.getInstance().unRegisterEvent(key, subKey, notification);
+    }
+
+    /**
+     *  Removes all notifications for the specified notification object
+     */
+    public static void unRegisterEvent(ITUINotification notification) {
+        EventManager.getInstance().unRegisterEvent(notification);
+    }
+
+    /**
+     *  Notify event
+     */
+    public static void notifyEvent(String key, String subKey, Map<String, Object> param) {
+        EventManager.getInstance().notifyEvent(key, subKey, param);
+    }
+
+    /**
+     *  Register extension
+     */
+    public static void registerExtension(String extensionID, ITUIExtension extension) {
+        ExtensionManager.getInstance().registerExtension(extensionID, extension);
+    }
+
+    /**
+     *  Unregister extension
+     */
+    public static void unRegisterExtension(String key, ITUIExtension extension) {
+        ExtensionManager.getInstance().unRegisterExtension(key, extension);
+    }
+
+    /**
+     *  Get Extension
+     *  @note The method has been deprecated：use {@link #getExtensionList}
+     */
+    @Deprecated
+    public static Map<String, Object> getExtensionInfo(String key, Map<String, Object> param) {
+        return ExtensionManager.getInstance().getExtensionInfo(key, param);
+    }
+
+    /**
+     *  Get Extension list
+     */
+    public static List<TUIExtensionInfo> getExtensionList(String extensionID, Map<String, Object> param) {
+        return ExtensionManager.getInstance().getExtensionList(extensionID, param);
+    }
+
+    /**
+     *  invoke Extension
+     */
+    public static void raiseExtension(String key, View parentView, Map<String, Object> param) {
+        ExtensionManager.getInstance().raiseExtension(key, parentView, param);
+    }
+
+    /**
+     *  Register object factory
+     */
+    public static void registerObjectFactory(String factoryName, ITUIObjectFactory objectFactory) {
+        ObjectManager.getInstance().registerObjectFactory(factoryName, objectFactory);
+    }
+
+    /**
+     *  Unregister object factory
+     */
+    public static void unregisterObjectFactory(String factoryName) {
+        ObjectManager.getInstance().unregisterObjectFactory(factoryName);
+    }
+
+    /**
+     *  Create object and get
+     */
+    public static Object createObject(String objectFactory, String objectName, Map<String, Object> param) {
+        return ObjectManager.getInstance().createObject(objectFactory, objectName, param);
+    }
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/TUILogin.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/TUILogin.java
new file mode 100644
index 0000000..e90b361
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/TUILogin.java
@@ -0,0 +1,485 @@
+package com.tencent.qcloud.tuicore;
+
+import static com.tencent.imsdk.v2.V2TIMManager.V2TIM_STATUS_LOGINED;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.tencent.imsdk.v2.V2TIMCallback;
+import com.tencent.imsdk.v2.V2TIMLogListener;
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMSDKConfig;
+import com.tencent.imsdk.v2.V2TIMSDKListener;
+import com.tencent.imsdk.v2.V2TIMUserFullInfo;
+import com.tencent.imsdk.v2.V2TIMValueCallback;
+import com.tencent.qcloud.tuicore.interfaces.TUICallback;
+import com.tencent.qcloud.tuicore.interfaces.TUILogListener;
+import com.tencent.qcloud.tuicore.interfaces.TUILoginConfig;
+import com.tencent.qcloud.tuicore.interfaces.TUILoginListener;
+import com.tencent.qcloud.tuicore.util.ErrorMessageConverter;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+/**
+ * Login logic for IM and TRTC
+ */
+public class TUILogin {
+    private static final String TAG = TUILogin.class.getSimpleName();
+
+    private static class TUILoginHolder {
+        private static final TUILogin loginInstance = new TUILogin();
+    }
+
+    public static TUILogin getInstance() {
+        return TUILoginHolder.loginInstance;
+    }
+
+    private Context appContext;
+    private int sdkAppId = 0;
+    private String userId;
+    private String userSig;
+    private boolean hasLoginSuccess = false;
+    private int currentBusinessScene = TUIBusinessScene.NONE;
+
+    private final List<TUILoginListener> listenerList = new CopyOnWriteArrayList<>();
+
+    private TUILogin() {}
+
+    private final V2TIMSDKListener imSdkListener = new V2TIMSDKListener() {
+        @Override
+        public void onConnecting() {
+            for (TUILoginListener listener : listenerList) {
+                listener.onConnecting();
+            }
+            TUICore.notifyEvent(TUIConstants.NetworkConnection.EVENT_CONNECTION_STATE_CHANGED, TUIConstants.NetworkConnection.EVENT_SUB_KEY_CONNECTING, null);
+        }
+
+        @Override
+        public void onConnectSuccess() {
+            for (TUILoginListener listener : listenerList) {
+                listener.onConnectSuccess();
+            }
+            TUICore.notifyEvent(
+                TUIConstants.NetworkConnection.EVENT_CONNECTION_STATE_CHANGED, TUIConstants.NetworkConnection.EVENT_SUB_KEY_CONNECT_SUCCESS, null);
+        }
+
+        @Override
+        public void onConnectFailed(int code, String error) {
+            for (TUILoginListener listener : listenerList) {
+                listener.onConnectFailed(code, error);
+            }
+            TUICore.notifyEvent(
+                TUIConstants.NetworkConnection.EVENT_CONNECTION_STATE_CHANGED, TUIConstants.NetworkConnection.EVENT_SUB_KEY_CONNECT_FAILED, null);
+        }
+
+        @Override
+        public void onKickedOffline() {
+            for (TUILoginListener listener : listenerList) {
+                listener.onKickedOffline();
+            }
+            TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED, TUIConstants.TUILogin.EVENT_SUB_KEY_USER_KICKED_OFFLINE, null);
+        }
+
+        @Override
+        public void onUserSigExpired() {
+            for (TUILoginListener listener : listenerList) {
+                listener.onUserSigExpired();
+            }
+            TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED, TUIConstants.TUILogin.EVENT_SUB_KEY_USER_SIG_EXPIRED, null);
+        }
+
+        @Override
+        public void onSelfInfoUpdated(V2TIMUserFullInfo info) {
+            TUIConfig.setSelfInfo(info);
+            notifyUserInfoChanged(info);
+        }
+    };
+
+    /**
+     * IMSDK login
+     *
+     * @param context   The context of the application, generally is ApplicationContext
+     * @param sdkAppId  Assigned when you register your app with Tencent Cloud
+     * @param userId    User ID
+     * @param userSig   Obtained from the business server
+     * @param callback  login callback
+     */
+    public static void login(@NonNull Context context, int sdkAppId, String userId, String userSig, TUICallback callback) {
+        getInstance().internalLogin(context, sdkAppId, userId, userSig, null, callback);
+    }
+
+    /**
+     * IMSDK login
+     *
+     * @param context   The context of the application, generally is ApplicationContext
+     * @param sdkAppId  Assigned when you register your app with Tencent Cloud
+     * @param userId    User ID
+     * @param userSig   Obtained from the business server
+     * @param config    log related configs
+     * @param callback  login callback
+     */
+    public static void login(@NonNull Context context, int sdkAppId, String userId, String userSig, TUILoginConfig config, TUICallback callback) {
+        getInstance().internalLogin(context, sdkAppId, userId, userSig, config, callback);
+    }
+
+
+    /**
+     * User Login
+     *
+     * @param userId   User ID
+     * @param userSig  Obtained from the business server
+     * @param callback  login callback
+     */
+    @Deprecated
+    public static void login(@NonNull String userId, @NonNull String userSig, @Nullable V2TIMCallback callback) {
+        getInstance().userId = userId;
+        getInstance().userSig = userSig;
+        if (TextUtils.equals(userId, V2TIMManager.getInstance().getLoginUser()) && !TextUtils.isEmpty(userId)) {
+            if (callback != null) {
+                callback.onSuccess();
+            }
+            getUserInfo(userId);
+            return;
+        }
+
+        V2TIMManager.getInstance().login(userId, userSig, new V2TIMCallback() {
+            @Override
+            public void onSuccess() {
+                getInstance().hasLoginSuccess = true;
+                if (callback != null) {
+                    callback.onSuccess();
+                }
+                getUserInfo(userId);
+                TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED, TUIConstants.TUILogin.EVENT_SUB_KEY_USER_LOGIN_SUCCESS, null);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                if (callback != null) {
+                    callback.onError(code, ErrorMessageConverter.convertIMError(code, desc));
+                }
+            }
+        });
+    }
+
+
+    /**
+     * IMSDK logout
+     * @param callback  logout callback
+     */
+    public static void logout(TUICallback callback) {
+        getInstance().internalLogout(callback);
+    }
+
+    /**
+     * User Logout
+     *
+     * @param callback  Logout callback
+     */
+    @Deprecated
+    public static void logout(@Nullable V2TIMCallback callback) {
+        V2TIMManager.getInstance().logout(new V2TIMCallback() {
+            @Override
+            public void onSuccess() {
+                getInstance().userId = null;
+                getInstance().userSig = null;
+                if (callback != null) {
+                    callback.onSuccess();
+                }
+                TUIConfig.clearSelfInfo();
+
+                TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED, TUIConstants.TUILogin.EVENT_SUB_KEY_USER_LOGOUT_SUCCESS, null);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                if (callback != null) {
+                    callback.onError(code, ErrorMessageConverter.convertIMError(code, desc));
+                }
+            }
+        });
+    }
+
+    public static void addLoginListener(TUILoginListener listener) {
+        getInstance().internalAddLoginListener(listener);
+    }
+
+    public static void removeLoginListener(TUILoginListener listener) {
+        getInstance().internalRemoveLoginListener(listener);
+    }
+
+    private void internalLogin(Context context, final int sdkAppId, final String userId, final String userSig, TUILoginConfig config, TUICallback callback) {
+        if (this.sdkAppId != 0 && sdkAppId != this.sdkAppId) {
+            logout((TUICallback) null);
+        }
+        this.appContext = context.getApplicationContext();
+        this.sdkAppId = sdkAppId;
+        currentBusinessScene = TUIBusinessScene.NONE;
+        V2TIMManager.getInstance().addIMSDKListener(imSdkListener);
+        // Notify init event
+        TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_IMSDK_INIT_STATE_CHANGED, TUIConstants.TUILogin.EVENT_SUB_KEY_START_INIT, null);
+        // User operation initialization, the privacy agreement has been read by default
+
+        V2TIMSDKConfig v2TIMSDKConfig = null;
+        if (config != null) {
+            v2TIMSDKConfig = new V2TIMSDKConfig();
+            v2TIMSDKConfig.setLogLevel(config.getLogLevel());
+            TUILogListener logListener = config.getLogListener();
+            if (logListener != null) {
+                v2TIMSDKConfig.setLogListener(new V2TIMLogListener() {
+                    @Override
+                    public void onLog(int logLevel, String logContent) {
+                        logListener.onLog(logLevel, logContent);
+                    }
+                });
+            }
+        }
+
+        boolean initSuccess = V2TIMManager.getInstance().initSDK(context, sdkAppId, v2TIMSDKConfig);
+        if (initSuccess) {
+            this.userId = userId;
+            this.userSig = userSig;
+            if (TextUtils.equals(userId, V2TIMManager.getInstance().getLoginUser()) && !TextUtils.isEmpty(userId)) {
+                hasLoginSuccess = true;
+                getUserInfo(userId);
+                TUICallback.onSuccess(callback);
+                TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED, TUIConstants.TUILogin.EVENT_SUB_KEY_USER_LOGIN_SUCCESS, null);
+                return;
+            }
+
+            V2TIMManager.getInstance().login(userId, userSig, new V2TIMCallback() {
+                @Override
+                public void onSuccess() {
+                    hasLoginSuccess = true;
+                    getUserInfo(userId);
+                    TUICallback.onSuccess(callback);
+                    TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED, TUIConstants.TUILogin.EVENT_SUB_KEY_USER_LOGIN_SUCCESS, null);
+                }
+
+                @Override
+                public void onError(int code, String desc) {
+                    TUICallback.onError(callback, code, ErrorMessageConverter.convertIMError(code, desc));
+                }
+            });
+        } else {
+            TUICallback.onError(callback, -1, "init failed");
+        }
+    }
+
+    private void internalLogout(TUICallback callback) {
+        // Notify unit event
+        currentBusinessScene = TUIBusinessScene.NONE;
+        TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_IMSDK_INIT_STATE_CHANGED, TUIConstants.TUILogin.EVENT_SUB_KEY_START_UNINIT, null);
+        V2TIMManager.getInstance().logout(new V2TIMCallback() {
+            @Override
+            public void onSuccess() {
+                sdkAppId = 0;
+                userId = null;
+                userSig = null;
+                V2TIMManager.getInstance().unInitSDK();
+                TUIConfig.clearSelfInfo();
+                TUICallback.onSuccess(callback);
+                TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED, TUIConstants.TUILogin.EVENT_SUB_KEY_USER_LOGOUT_SUCCESS, null);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUICallback.onError(callback, code, desc);
+            }
+        });
+    }
+
+    private void internalAddLoginListener(TUILoginListener listener) {
+        Log.i(TAG, "addLoginListener listener : " + listener);
+        if (listener == null) {
+            return;
+        }
+        if (!listenerList.contains(listener)) {
+            listenerList.add(listener);
+        }
+    }
+
+    private void internalRemoveLoginListener(TUILoginListener listener) {
+        Log.i(TAG, "removeLoginListener listener : " + listener);
+        if (listener == null) {
+            return;
+        }
+        listenerList.remove(listener);
+    }
+
+    /**
+     * IMSDK init
+     *
+     * @param context      The context of the application, generally is ApplicationContext
+     * @param sdkAppId     Assigned when you register your app with Tencent Cloud
+     * @param config       The related configuration items of IMSDK, generally use the default,
+     *                     and need special configuration, please refer to the API documentation
+     * @param listener     Listener of IMSDK init
+     * @return true：init success；false：init failed
+     */
+    @Deprecated
+    public static boolean init(@NonNull Context context, int sdkAppId, @Nullable V2TIMSDKConfig config, @Nullable V2TIMSDKListener listener) {
+        if (getInstance().sdkAppId != 0 && sdkAppId != getInstance().sdkAppId) {
+            logout((V2TIMCallback) null);
+            unInit();
+        }
+        getInstance().appContext = context.getApplicationContext();
+        getInstance().sdkAppId = sdkAppId;
+        V2TIMManager.getInstance().addIMSDKListener(new V2TIMSDKListener() {
+            @Override
+            public void onConnecting() {
+                if (listener != null) {
+                    listener.onConnecting();
+                }
+            }
+
+            @Override
+            public void onConnectSuccess() {
+                if (listener != null) {
+                    listener.onConnectSuccess();
+                }
+            }
+
+            @Override
+            public void onConnectFailed(int code, String error) {
+                if (listener != null) {
+                    listener.onConnectFailed(code, ErrorMessageConverter.convertIMError(code, error));
+                }
+            }
+
+            @Override
+            public void onKickedOffline() {
+                if (listener != null) {
+                    listener.onKickedOffline();
+                }
+                setCurrentBusinessScene(TUIBusinessScene.NONE);
+                TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED, TUIConstants.TUILogin.EVENT_SUB_KEY_USER_KICKED_OFFLINE, null);
+            }
+
+            @Override
+            public void onUserSigExpired() {
+                if (listener != null) {
+                    listener.onUserSigExpired();
+                }
+                setCurrentBusinessScene(TUIBusinessScene.NONE);
+                TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED, TUIConstants.TUILogin.EVENT_SUB_KEY_USER_SIG_EXPIRED, null);
+            }
+
+            @Override
+            public void onSelfInfoUpdated(V2TIMUserFullInfo info) {
+                if (listener != null) {
+                    listener.onSelfInfoUpdated(info);
+                }
+
+                TUIConfig.setSelfInfo(info);
+                notifyUserInfoChanged(info);
+            }
+        });
+        TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_IMSDK_INIT_STATE_CHANGED, TUIConstants.TUILogin.EVENT_SUB_KEY_START_INIT, null);
+        return V2TIMManager.getInstance().initSDK(context, sdkAppId, config);
+    }
+
+    @Deprecated
+    public static void unInit() {
+        getInstance().sdkAppId = 0;
+        TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_IMSDK_INIT_STATE_CHANGED, TUIConstants.TUILogin.EVENT_SUB_KEY_START_UNINIT, null);
+
+        V2TIMManager.getInstance().unInitSDK();
+        TUIConfig.clearSelfInfo();
+    }
+
+    private static void getUserInfo(String userId) {
+        List<String> userIdList = new ArrayList<>();
+        userIdList.add(userId);
+        V2TIMManager.getInstance().getUsersInfo(userIdList, new V2TIMValueCallback<List<V2TIMUserFullInfo>>() {
+            @Override
+            public void onSuccess(List<V2TIMUserFullInfo> v2TIMUserFullInfos) {
+                if (v2TIMUserFullInfos.isEmpty()) {
+                    Log.e(TAG, "get logined userInfo failed. list is empty");
+                    return;
+                }
+                V2TIMUserFullInfo userFullInfo = v2TIMUserFullInfos.get(0);
+                TUIConfig.setSelfInfo(userFullInfo);
+                notifyUserInfoChanged(userFullInfo);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                Log.e(TAG, "get logined userInfo failed. code : " + code + " desc : " + ErrorMessageConverter.convertIMError(code, desc));
+            }
+        });
+    }
+
+    private static void notifyUserInfoChanged(V2TIMUserFullInfo userFullInfo) {
+        HashMap<String, Object> param = new HashMap<>();
+        param.put(TUIConstants.TUILogin.SELF_ID, userFullInfo.getUserID());
+        param.put(TUIConstants.TUILogin.SELF_SIGNATURE, userFullInfo.getSelfSignature());
+        param.put(TUIConstants.TUILogin.SELF_NICK_NAME, userFullInfo.getNickName());
+        param.put(TUIConstants.TUILogin.SELF_FACE_URL, userFullInfo.getFaceUrl());
+        param.put(TUIConstants.TUILogin.SELF_BIRTHDAY, userFullInfo.getBirthday());
+        param.put(TUIConstants.TUILogin.SELF_ROLE, userFullInfo.getRole());
+        param.put(TUIConstants.TUILogin.SELF_GENDER, userFullInfo.getGender());
+        param.put(TUIConstants.TUILogin.SELF_LEVEL, userFullInfo.getLevel());
+        param.put(TUIConstants.TUILogin.SELF_ALLOW_TYPE, userFullInfo.getAllowType());
+        TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED, TUIConstants.TUILogin.EVENT_SUB_KEY_USER_INFO_UPDATED, param);
+    }
+
+    public static int getSdkAppId() {
+        return getInstance().sdkAppId;
+    }
+
+    public static String getUserId() {
+        return getInstance().userId;
+    }
+
+    public static String getUserSig() {
+        return getInstance().userSig;
+    }
+
+    public static String getNickName() {
+        return TUIConfig.getSelfNickName();
+    }
+
+    public static String getFaceUrl() {
+        return TUIConfig.getSelfFaceUrl();
+    }
+
+    public static Context getAppContext() {
+        return getInstance().appContext;
+    }
+
+    public static boolean isUserLogined() {
+        return getInstance().hasLoginSuccess && V2TIMManager.getInstance().getLoginStatus() == V2TIM_STATUS_LOGINED;
+    }
+
+    public static String getLoginUser() {
+        return V2TIMManager.getInstance().getLoginUser();
+    }
+
+    public static class TUIBusinessScene {
+        public static final int NONE = 0;
+        public static final int IN_RECORDING = 1;
+        public static final int IN_CALLING_ROOM = 2;
+        public static final int IN_MEETING_ROOM = 3;
+        public static final int IN_LIVING_ROOM = 4;
+    }
+
+    /**
+     * No-thread-safe
+     * @param scene
+     */
+    public static void setCurrentBusinessScene(int scene) {
+        getInstance().currentBusinessScene = scene;
+    }
+
+    public static int getCurrentBusinessScene() {
+        return getInstance().currentBusinessScene;
+    }
+}
\ No newline at end of file
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/TUIRouter.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/TUIRouter.java
new file mode 100644
index 0000000..f77518d
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/TUIRouter.java
@@ -0,0 +1,523 @@
+package com.tencent.qcloud.tuicore;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.app.Application;
+import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.util.Log;
+import android.util.Pair;
+import androidx.activity.result.ActivityResult;
+import androidx.activity.result.ActivityResultCallback;
+import androidx.activity.result.ActivityResultCaller;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContract;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.WeakHashMap;
+
+/**
+ * For Activity routing jump, only used inside TUICore, not exposed to the outside
+ */
+class TUIRouter {
+    private static final String TAG = TUIRouter.class.getSimpleName();
+
+    private static final TUIRouter router = new TUIRouter();
+
+    public static TUIRouter getInstance() {
+        return router;
+    }
+
+    private static final Map<String, String> routerMap = new HashMap<>();
+
+    private static final Map<ActivityResultCaller, ActivityResultLauncher<Pair<Intent, ActivityResultCallback<ActivityResult>>>> activityResultLauncherMap =
+        new WeakHashMap<>();
+
+    @SuppressLint("StaticFieldLeak") private static Context context;
+
+    private static boolean initialized = false;
+
+    private TUIRouter() {}
+
+    public static synchronized void init(Context context) {
+        if (initialized) {
+            return;
+        }
+        TUIRouter.context = context;
+        if (context == null) {
+            Log.e(TAG, "init failed, context is null.");
+            return;
+        }
+        initRouter(context);
+        initActivityResultLauncher(context);
+        initialized = true;
+    }
+
+    static class RouterActivityResultContract
+        extends ActivityResultContract<Pair<Intent, ActivityResultCallback<ActivityResult>>, Pair<ActivityResult, ActivityResultCallback<ActivityResult>>> {
+        private ActivityResultCallback<ActivityResult> callback;
+
+        @NonNull
+        @Override
+        public Intent createIntent(@NonNull Context context, Pair<Intent, ActivityResultCallback<ActivityResult>> input) {
+            callback = input.second;
+            return input.first;
+        }
+
+        @Override
+        public Pair<ActivityResult, ActivityResultCallback<ActivityResult>> parseResult(int resultCode, @Nullable Intent intent) {
+            Pair<ActivityResult, ActivityResultCallback<ActivityResult>> pair = Pair.create(new ActivityResult(resultCode, intent), callback);
+            callback = null;
+            return pair;
+        }
+    }
+
+    static class RouterActivityResultCallback implements ActivityResultCallback<Pair<ActivityResult, ActivityResultCallback<ActivityResult>>> {
+        @Override
+        public void onActivityResult(Pair<ActivityResult, ActivityResultCallback<ActivityResult>> resultCallbackPair) {
+            if (resultCallbackPair.second != null) {
+                resultCallbackPair.second.onActivityResult(resultCallbackPair.first);
+            }
+        }
+    }
+
+    private static void initActivityResultLauncher(Context context) {
+        if (context instanceof Application) {
+            ((Application) context).registerActivityLifecycleCallbacks(new Application.ActivityLifecycleCallbacks() {
+                @Override
+                public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle savedInstanceState) {
+                    if (activity instanceof ActivityResultCaller) {
+                        registerForActivityResult((ActivityResultCaller) activity);
+                        if (activity instanceof FragmentActivity) {
+                            ((FragmentActivity) activity)
+                                .getSupportFragmentManager()
+                                .registerFragmentLifecycleCallbacks(new FragmentManager.FragmentLifecycleCallbacks() {
+                                    @Override
+                                    public void onFragmentCreated(
+                                        @NonNull FragmentManager fragmentManager, @NonNull Fragment fragment, @Nullable Bundle savedInstanceState) {
+                                        registerForActivityResult(fragment);
+                                    }
+
+                                    @Override
+                                    public void onFragmentDestroyed(@NonNull FragmentManager fm, @NonNull Fragment fragment) {
+                                        clearLauncher(fragment);
+                                    }
+                                }, true);
+                        }
+                    }
+                }
+
+                private void registerForActivityResult(ActivityResultCaller resultCaller) {
+                    ActivityResultLauncher<Pair<Intent, ActivityResultCallback<ActivityResult>>> activityFragmentResultLauncher =
+                        resultCaller.registerForActivityResult(new RouterActivityResultContract(), new RouterActivityResultCallback());
+                    activityResultLauncherMap.put(resultCaller, activityFragmentResultLauncher);
+                }
+
+                private void clearLauncher(ActivityResultCaller resultCaller) {
+                    activityResultLauncherMap.remove(resultCaller);
+                }
+
+                @Override
+                public void onActivityStarted(@NonNull Activity activity) {}
+
+                @Override
+                public void onActivityResumed(@NonNull Activity activity) {}
+
+                @Override
+                public void onActivityPaused(@NonNull Activity activity) {}
+
+                @Override
+                public void onActivityStopped(@NonNull Activity activity) {}
+
+                @Override
+                public void onActivitySaveInstanceState(@NonNull Activity activity, @NonNull Bundle outState) {}
+
+                @Override
+                public void onActivityDestroyed(@NonNull Activity activity) {
+                    if (activity instanceof ActivityResultCaller) {
+                        clearLauncher((ActivityResultCaller) activity);
+                    }
+                }
+            });
+        }
+    }
+
+    public Navigation setDestination(String path) {
+        Navigation navigation = new Navigation();
+        navigation.setDestination(path);
+        return navigation;
+    }
+
+    public Navigation setDestination(Class<? extends Activity> activityClazz) {
+        Navigation navigation = new Navigation();
+        navigation.setDestination(activityClazz);
+        return navigation;
+    }
+
+    static class Navigation {
+        String destination;
+        Bundle options;
+        Intent intent = new Intent();
+
+        public Navigation setOptions(Bundle options) {
+            this.options = options;
+            return this;
+        }
+
+        public Navigation putExtra(String key, boolean value) {
+            intent.putExtra(key, value);
+            return this;
+        }
+
+        public Navigation putExtra(String key, byte value) {
+            intent.putExtra(key, value);
+            return this;
+        }
+
+        public Navigation putExtra(String key, char value) {
+            intent.putExtra(key, value);
+            return this;
+        }
+
+        public Navigation putExtra(String key, short value) {
+            intent.putExtra(key, value);
+            return this;
+        }
+
+        public Navigation putExtra(String key, int value) {
+            intent.putExtra(key, value);
+            return this;
+        }
+
+        public Navigation putExtra(String key, long value) {
+            intent.putExtra(key, value);
+            return this;
+        }
+
+        public Navigation putExtra(String key, float value) {
+            intent.putExtra(key, value);
+            return this;
+        }
+
+        public Navigation putExtra(String key, double value) {
+            intent.putExtra(key, value);
+            return this;
+        }
+
+        public Navigation putExtra(String key, String value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, CharSequence value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, Parcelable value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, Parcelable[] value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, Serializable value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, boolean[] value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, byte[] value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, short[] value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, char[] value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, int[] value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, long[] value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, float[] value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, double[] value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, String[] value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, CharSequence[] value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, Bundle value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtras(Bundle bundle) {
+            if (bundle != null) {
+                intent.putExtras(bundle);
+            }
+            return this;
+        }
+
+        public Navigation putExtras(Intent src) {
+            if (src != null) {
+                intent.putExtras(src);
+            }
+            return this;
+        }
+
+        public Navigation setDestination(String path) {
+            destination = routerMap.get(path);
+            if (destination == null) {
+                Log.e(TAG, "destination is null.");
+                return this;
+            }
+            intent.setComponent(new ComponentName(TUIRouter.context, destination));
+            return this;
+        }
+
+        public Navigation setDestination(Class<? extends Activity> activityClazz) {
+            intent.setComponent(new ComponentName(TUIRouter.context, activityClazz));
+            return this;
+        }
+
+        public Navigation setIntent(Intent intent) {
+            this.intent = intent;
+            return this;
+        }
+
+        public Intent getIntent() {
+            return this.intent;
+        }
+
+        public void navigate() {
+            navigate((Context) null);
+        }
+
+        public void navigate(Context context) {
+            navigate(context, -1);
+        }
+
+        public void navigate(Fragment fragment) {
+            navigate(fragment, -1);
+        }
+
+        @Deprecated
+        public void navigate(Fragment fragment, int requestCode) {
+            if (!initialized) {
+                Log.e(TAG, "have not initialized.");
+                return;
+            }
+            if (intent == null) {
+                Log.e(TAG, "intent is null.");
+                return;
+            }
+            try {
+                if (fragment != null) {
+                    if (requestCode >= 0) {
+                        fragment.startActivityForResult(intent, requestCode);
+                    } else {
+                        fragment.startActivity(intent, options);
+                    }
+                } else {
+                    startActivity(null, requestCode);
+                }
+            } catch (ActivityNotFoundException e) {
+                e.printStackTrace();
+            }
+        }
+
+        public void navigate(ActivityResultCaller caller, ActivityResultCallback<ActivityResult> callback) {
+            if (!initialized) {
+                Log.e(TAG, "have not initialized.");
+                return;
+            }
+            if (intent == null) {
+                Log.e(TAG, "intent is null.");
+                return;
+            }
+            try {
+                ActivityResultLauncher<Pair<Intent, ActivityResultCallback<ActivityResult>>> launcher = activityResultLauncherMap.get(caller);
+                if (launcher != null) {
+                    launcher.launch(Pair.create(intent, callback));
+                }
+            } catch (Exception e) {
+                Log.e(TAG, "start activity failed, " + e.getLocalizedMessage());
+            }
+        }
+
+        @Deprecated
+        public void navigate(Context context, int requestCode) {
+            if (!initialized) {
+                Log.e(TAG, "have not initialized.");
+                return;
+            }
+            if (intent == null) {
+                Log.e(TAG, "intent is null.");
+                return;
+            }
+            Context startContext = context;
+            if (context == null) {
+                startContext = TUIRouter.context;
+            }
+            startActivity(startContext, requestCode);
+        }
+
+        private void startActivity(Context context, int requestCode) {
+            if (context == null) {
+                Log.e(TAG, "StartActivity failed, context is null.Please init");
+                return;
+            }
+            try {
+                if (context instanceof Activity && requestCode >= 0) {
+                    ActivityCompat.startActivityForResult((Activity) context, intent, requestCode, options);
+                } else {
+                    if (!(context instanceof Activity)) {
+                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    }
+                    ActivityCompat.startActivity(context, intent, options);
+                }
+            } catch (ActivityNotFoundException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public static void startActivityForResult(
+        @Nullable ActivityResultCaller caller, String activityName, Bundle param, ActivityResultCallback<ActivityResult> resultCallback) {
+        Navigation navigation = TUIRouter.getInstance().setDestination(activityName).putExtras(param);
+        navigation.navigate(caller, resultCallback);
+    }
+
+    public static void startActivityForResult(
+        @Nullable ActivityResultCaller caller, Class<? extends Activity> activityClazz, Bundle param, ActivityResultCallback<ActivityResult> resultCallback) {
+        Navigation navigation = TUIRouter.getInstance().setDestination(activityClazz).putExtras(param);
+        navigation.navigate(caller, resultCallback);
+    }
+
+    public static void startActivityForResult(@Nullable ActivityResultCaller caller, Intent intent, ActivityResultCallback<ActivityResult> resultCallback) {
+        Navigation navigation = new Navigation();
+        navigation.setIntent(intent);
+        navigation.navigate(caller, resultCallback);
+    }
+
+    /**
+     * use {@link #startActivityForResult}
+     */
+    @Deprecated
+    public static void startActivity(@Nullable Object starter, String activityName, Bundle param, int requestCode) {
+        TUIRouter.Navigation navigation = TUIRouter.getInstance().setDestination(activityName).putExtras(param);
+        if (starter instanceof Fragment) {
+            navigation.navigate((Fragment) starter, requestCode);
+        } else if (starter instanceof Context) {
+            navigation.navigate((Context) starter, requestCode);
+        } else {
+            navigation.navigate((Context) null, requestCode);
+        }
+    }
+
+    public static void initRouter(Context context) {
+        ActivityInfo[] activityInfos = null;
+        List<String> activityNames = new ArrayList<>();
+        PackageManager packageManager = context.getPackageManager();
+        try {
+            PackageInfo packageInfo = packageManager.getPackageInfo(context.getPackageName(), PackageManager.GET_ACTIVITIES);
+            activityInfos = packageInfo.activities;
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        if (activityInfos != null) {
+            for (ActivityInfo activityInfo : activityInfos) {
+                activityNames.add(activityInfo.name);
+            }
+        }
+        for (String activityName : activityNames) {
+            String[] splitStr = activityName.split("\\.");
+            routerMap.put(splitStr[splitStr.length - 1], activityName);
+        }
+    }
+
+    public static Context getContext() {
+        return context;
+    }
+}
\ No newline at end of file
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/TUIThemeManager.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/TUIThemeManager.java
new file mode 100644
index 0000000..f9402d5
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/TUIThemeManager.java
@@ -0,0 +1,326 @@
+package com.tencent.qcloud.tuicore;
+
+import android.app.Activity;
+import android.app.Application;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+import android.util.TypedValue;
+import android.webkit.WebView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.tencent.qcloud.tuicore.util.SPUtils;
+import com.tencent.qcloud.tuicore.util.TUIBuild;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * Static skinning, language
+ */
+public class TUIThemeManager {
+    private static final String TAG = TUIThemeManager.class.getSimpleName();
+
+    private static final String SP_THEME_AND_LANGUAGE_NAME = "TUIThemeAndLanguage";
+    private static final String SP_KEY_LANGUAGE = "language";
+    private static final String SP_KEY_THEME = "theme";
+
+    public static final int THEME_LIGHT = 0; // default
+    public static final int THEME_LIVELY = 1;
+    public static final int THEME_SERIOUS = 2;
+
+    public static final String LANGUAGE_ZH_CN = "zh";
+    public static final String LANGUAGE_EN = "en";
+
+    private static final class ThemeManagerHolder {
+        private static final TUIThemeManager instance = new TUIThemeManager();
+    }
+
+    public static TUIThemeManager getInstance() {
+        return ThemeManagerHolder.instance;
+    }
+
+    private boolean isInit = false;
+
+    private final Map<Integer, List<Integer>> themeResIDMap = new HashMap<>();
+    private final Map<String, Locale> languageMap = new HashMap<>();
+
+    private int currentThemeID = THEME_LIGHT;
+    private String currentLanguage = "";
+    private Locale defaultLocale = null;
+
+    private TUIThemeManager() {
+        languageMap.put(LANGUAGE_ZH_CN, Locale.SIMPLIFIED_CHINESE);
+        languageMap.put(LANGUAGE_EN, Locale.ENGLISH);
+    }
+
+    public static void setTheme(Context context) {
+        getInstance().setThemeInternal(context);
+    }
+
+    private void setThemeInternal(Context context) {
+        if (context == null) {
+            return;
+        }
+
+        Context appContext = context.getApplicationContext();
+        if (!isInit) {
+            isInit = true;
+            if (appContext instanceof Application) {
+                ((Application) appContext).registerActivityLifecycleCallbacks(new ThemeAndLanguageCallback());
+            }
+
+            notifySetLanguageEvent();
+            Locale defaultLocale = getLocale(appContext);
+            SPUtils spUtils = SPUtils.getInstance(SP_THEME_AND_LANGUAGE_NAME);
+            currentLanguage = spUtils.getString(SP_KEY_LANGUAGE, defaultLocale.getLanguage());
+            currentThemeID = spUtils.getInt(SP_KEY_THEME, THEME_LIGHT);
+
+            // The language only needs to be initialized once
+            applyLanguage(appContext);
+        }
+        // The theme needs to be updated multiple times
+        applyTheme(appContext);
+    }
+
+    private static String currentProcessName = "";
+
+    public static String getProcessName() {
+        if (!TextUtils.isEmpty(currentProcessName)) {
+            return currentProcessName;
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            currentProcessName = Application.getProcessName();
+            return currentProcessName;
+        }
+
+        try {
+            final Method declaredMethod = Class.forName("android.app.ActivityThread", false, Application.class.getClassLoader())
+                                              .getDeclaredMethod("currentProcessName", (Class<?>[]) new Class[0]);
+            declaredMethod.setAccessible(true);
+            final Object invoke = declaredMethod.invoke(null, new Object[0]);
+            if (invoke instanceof String) {
+                currentProcessName = (String) invoke;
+            }
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+
+        return currentProcessName;
+    }
+
+    private void notifySetLanguageEvent() {
+        TUICore.notifyEvent(TUIConstants.TUICore.LANGUAGE_EVENT, TUIConstants.TUICore.LANGUAGE_EVENT_SUB_KEY, null);
+    }
+
+    /**
+     * Solve the problem that WebView on Android 7 and above causes failure to switch languages.
+     * Solve the problem of using WebView Crash for multiple processes above Android 9.
+     */
+    public static void setWebViewLanguage(Context appContext) {
+        try {
+            Log.i(TAG, "setWebViewLanguage");
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                WebView.setDataDirectorySuffix(getProcessName());
+            }
+            new WebView(appContext).destroy();
+        } catch (Throwable throwable) {
+            Log.e("TUIThemeManager", "init language settings failed, " + throwable.getMessage());
+        }
+    }
+
+    public void setDefaultLocale(Locale defaultLocale) {
+        this.defaultLocale = defaultLocale;
+    }
+
+    public static void addTheme(int themeID, int resID) {
+        if (resID == 0) {
+            Log.e(TAG, "addTheme failed, theme resID is zero");
+            return;
+        }
+        Log.i(TAG, "addTheme themeID=" + themeID + " resID=" + resID);
+        List<Integer> themeResIDList = getInstance().themeResIDMap.get(themeID);
+        if (themeResIDList == null) {
+            themeResIDList = new ArrayList<>();
+            getInstance().themeResIDMap.put(themeID, themeResIDList);
+        }
+        if (themeResIDList.contains(resID)) {
+            return;
+        }
+        themeResIDList.add(resID);
+        TUIThemeManager.getInstance().applyTheme(ServiceInitializer.getAppContext());
+    }
+
+    public static void addLightTheme(int resId) {
+        addTheme(THEME_LIGHT, resId);
+    }
+
+    public static void addLivelyTheme(int resId) {
+        addTheme(THEME_LIVELY, resId);
+    }
+
+    public static void addSeriousTheme(int resId) {
+        addTheme(THEME_SERIOUS, resId);
+    }
+
+    public int getCurrentTheme() {
+        return currentThemeID;
+    }
+
+    private void mergeTheme(Resources.Theme theme) {
+        if (theme == null) {
+            return;
+        }
+
+        List<Integer> currentThemeResIDList = themeResIDMap.get(currentThemeID);
+        if (currentThemeResIDList == null) {
+            return;
+        }
+        for (Integer resId : currentThemeResIDList) {
+            theme.applyStyle(resId, true);
+        }
+    }
+
+    public static void addLanguage(String language, Locale locale) {
+        Log.i(TAG, "addLanguage language=" + language + " locale=" + locale);
+        getInstance().languageMap.put(language, locale);
+    }
+
+    public void changeLanguage(Context context, String language) {
+        if (context == null) {
+            return;
+        }
+
+        if (TextUtils.equals(language, currentLanguage)) {
+            return;
+        }
+        currentLanguage = language;
+        SPUtils spUtils = SPUtils.getInstance(SP_THEME_AND_LANGUAGE_NAME);
+        spUtils.put(SP_KEY_LANGUAGE, language, true);
+
+        applyLanguage(context.getApplicationContext());
+        applyLanguage(context);
+    }
+
+    public void applyLanguage(Context context) {
+        if (context == null) {
+            return;
+        }
+        Locale locale = languageMap.get(currentLanguage);
+        if (locale == null) {
+            if (defaultLocale != null) {
+                locale = defaultLocale;
+            } else {
+                locale = getLocale(context);
+            }
+        }
+
+        Resources resources = context.getResources();
+        Configuration configuration = resources.getConfiguration();
+        configuration.locale = locale;
+        if (TUIBuild.getVersionInt() >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            configuration.setLocale(locale);
+        }
+        resources.updateConfiguration(configuration, null);
+
+        if (Build.VERSION.SDK_INT >= 25) {
+            context = context.createConfigurationContext(configuration);
+            context.getResources().updateConfiguration(configuration, resources.getDisplayMetrics());
+        }
+    }
+
+    public String getCurrentLanguage() {
+        return currentLanguage;
+    }
+
+    public Locale getLocale(Context context) {
+        Locale locale;
+
+        if (TUIBuild.getVersionInt() < Build.VERSION_CODES.N) {
+            locale = context.getResources().getConfiguration().locale;
+        } else {
+            locale = context.getResources().getConfiguration().getLocales().get(0);
+        }
+        return locale;
+    }
+
+    public void changeTheme(Context context, int themeId) {
+        if (context == null) {
+            return;
+        }
+
+        if (themeId == currentThemeID) {
+            return;
+        }
+        currentThemeID = themeId;
+
+        SPUtils spUtils = SPUtils.getInstance(SP_THEME_AND_LANGUAGE_NAME);
+        spUtils.put(SP_KEY_THEME, themeId, true);
+
+        applyTheme(context.getApplicationContext());
+        applyTheme(context);
+    }
+
+    private void applyTheme(Context context) {
+        if (context == null) {
+            return;
+        }
+        Resources.Theme theme = context.getTheme();
+        if (theme == null) {
+            context.setTheme(R.style.TUIBaseTheme);
+            theme = context.getTheme();
+        }
+        mergeTheme(theme);
+    }
+
+    /**
+     * Get resources for skinning
+     *
+     * @param context   context
+     * @param attrId    custom attribute
+     * @return resources for skinning
+     */
+    public static int getAttrResId(Context context, int attrId) {
+        if (context == null || attrId == 0) {
+            return 0;
+        }
+        TypedValue typedValue = new TypedValue();
+        context.getTheme().resolveAttribute(attrId, typedValue, true);
+        return typedValue.resourceId;
+    }
+
+    static class ThemeAndLanguageCallback implements Application.ActivityLifecycleCallbacks {
+        @Override
+        public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle savedInstanceState) {
+            TUIThemeManager.getInstance().applyTheme(activity);
+            TUIThemeManager.getInstance().applyLanguage(activity);
+            TUIThemeManager.getInstance().applyLanguage(activity.getApplicationContext());
+        }
+
+        @Override
+        public void onActivityStarted(@NonNull Activity activity) {}
+
+        @Override
+        public void onActivityResumed(@NonNull Activity activity) {}
+
+        @Override
+        public void onActivityPaused(@NonNull Activity activity) {}
+
+        @Override
+        public void onActivityStopped(@NonNull Activity activity) {}
+
+        @Override
+        public void onActivitySaveInstanceState(@NonNull Activity activity, @NonNull Bundle outState) {}
+
+        @Override
+        public void onActivityDestroyed(@NonNull Activity activity) {}
+    }
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/ITUIExtension.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/ITUIExtension.java
new file mode 100644
index 0000000..853d8d1
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/ITUIExtension.java
@@ -0,0 +1,21 @@
+package com.tencent.qcloud.tuicore.interfaces;
+
+import android.view.View;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public interface ITUIExtension {
+    @Deprecated
+    default Map<String, Object> onGetExtensionInfo(String key, Map<String, Object> param) {
+        return new HashMap<>();
+    }
+
+    default void onRaiseExtension(String extensionID, View parentView, Map<String, Object> param) {}
+    
+    default List<TUIExtensionInfo> onGetExtension(String extensionID, Map<String, Object> param) {
+        return new ArrayList<>();
+    }
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/ITUINotification.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/ITUINotification.java
new file mode 100644
index 0000000..42deae9
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/ITUINotification.java
@@ -0,0 +1,7 @@
+package com.tencent.qcloud.tuicore.interfaces;
+
+import java.util.Map;
+
+public interface ITUINotification {
+    void onNotifyEvent(String key, String subKey, Map<String, Object> param);
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/ITUIObjectFactory.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/ITUIObjectFactory.java
new file mode 100644
index 0000000..f647992
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/ITUIObjectFactory.java
@@ -0,0 +1,7 @@
+package com.tencent.qcloud.tuicore.interfaces;
+
+import java.util.Map;
+
+public interface ITUIObjectFactory {
+    Object onCreateObject(String objectName, Map<String, Object> param);
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/ITUIService.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/ITUIService.java
new file mode 100644
index 0000000..558c7f8
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/ITUIService.java
@@ -0,0 +1,13 @@
+package com.tencent.qcloud.tuicore.interfaces;
+
+import java.util.Map;
+
+public interface ITUIService {
+    default Object onCall(String method, Map<String, Object> param) {
+        return null;
+    }
+
+    default Object onCall(String method, Map<String, Object> param, TUIServiceCallback callback) {
+        return null;
+    }
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUICallback.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUICallback.java
new file mode 100644
index 0000000..87302a4
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUICallback.java
@@ -0,0 +1,19 @@
+package com.tencent.qcloud.tuicore.interfaces;
+
+public abstract class TUICallback {
+    public abstract void onSuccess();
+
+    public static void onSuccess(TUICallback callback) {
+        if (callback != null) {
+            callback.onSuccess();
+        }
+    }
+
+    public abstract void onError(int errorCode, String errorMessage);
+
+    public static void onError(TUICallback callback, int errorCode, String errorMessage) {
+        if (callback != null) {
+            callback.onError(errorCode, errorMessage);
+        }
+    }
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUIExtensionEventListener.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUIExtensionEventListener.java
new file mode 100644
index 0000000..0feb4b1
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUIExtensionEventListener.java
@@ -0,0 +1,13 @@
+package com.tencent.qcloud.tuicore.interfaces;
+
+import java.util.Map;
+
+public abstract class TUIExtensionEventListener {
+    public void onClicked(Map<String, Object> param) {}
+
+    public void onLongPressed(Map<String, Object> param) {}
+
+    public void onTouched(Map<String, Object> param) {}
+
+    public void onSwiped(int direction, Map<String, Object> param) {}
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUIExtensionInfo.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUIExtensionInfo.java
new file mode 100644
index 0000000..442be5f
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUIExtensionInfo.java
@@ -0,0 +1,58 @@
+package com.tencent.qcloud.tuicore.interfaces;
+
+import java.util.Map;
+
+public class TUIExtensionInfo implements Comparable<TUIExtensionInfo> {
+    private int weight;
+    private String text;
+    private Object icon;
+
+    private Map<String, Object> data;
+
+    private TUIExtensionEventListener extensionListener;
+
+    public int getWeight() {
+        return weight;
+    }
+
+    public void setWeight(int weight) {
+        this.weight = weight;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public Object getIcon() {
+        return icon;
+    }
+
+    public void setIcon(Object icon) {
+        this.icon = icon;
+    }
+
+    public Map<String, Object> getData() {
+        return data;
+    }
+
+    public void setData(Map<String, Object> data) {
+        this.data = data;
+    }
+
+    public void setExtensionListener(TUIExtensionEventListener extensionListener) {
+        this.extensionListener = extensionListener;
+    }
+
+    public TUIExtensionEventListener getExtensionListener() {
+        return extensionListener;
+    }
+
+    @Override
+    public int compareTo(TUIExtensionInfo o) {
+        return o.getWeight() - this.weight;
+    }
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUILogListener.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUILogListener.java
new file mode 100644
index 0000000..51ec6a7
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUILogListener.java
@@ -0,0 +1,5 @@
+package com.tencent.qcloud.tuicore.interfaces;
+
+public abstract class TUILogListener {
+    public void onLog(int logLevel, String logContent) {}
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUILoginConfig.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUILoginConfig.java
new file mode 100644
index 0000000..82f11c7
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUILoginConfig.java
@@ -0,0 +1,64 @@
+package com.tencent.qcloud.tuicore.interfaces;
+
+public class TUILoginConfig {
+    /**
+     * ## Do not output any SDK logs
+     */
+    public static final int TUI_LOG_NONE = 0;
+    /**
+     * ## Output logs at the DEBUG, INFO, WARNING, and ERROR levels
+     */
+    public static final int TUI_LOG_DEBUG = 3;
+    /**
+     * ## Output logs at the INFO, WARNING, and ERROR levels
+     */
+    public static final int TUI_LOG_INFO = 4;
+    /**
+     * ## Output logs at the WARNING and ERROR levels
+     */
+    public static final int TUI_LOG_WARN = 5;
+    /**
+     * ## Output logs at the ERROR level
+     */
+    public static final int TUI_LOG_ERROR = 6;
+
+    // Log level
+    private int logLevel = TUI_LOG_INFO;
+
+    // Log callback
+    private TUILogListener tuiLogListener;
+
+    /**
+     * Configuration class constructor
+     */
+    public TUILoginConfig() {}
+
+    /**
+     * Set the write log level. This operation must be performed before IM SDK initialization. Otherwise, the setting does not take effect.
+     *
+     * @param logLevel   Log level
+     */
+    public void setLogLevel(int logLevel) {
+        this.logLevel = logLevel;
+    }
+
+    public int getLogLevel() {
+        return this.logLevel;
+    }
+
+    /**
+     * Get the current log callback listener
+     */
+    public TUILogListener getLogListener() {
+        return tuiLogListener;
+    }
+
+    /**
+     * Set the current log callback listener. This operation must be performed before IM SDK initialization.
+     * @note The callback is in the main thread. Log callbacks can be quite frequent, so be careful not to synchronize too many time-consuming tasks in the
+     * callback, which may block the main thread.
+     */
+    public void setLogListener(TUILogListener logListener) {
+        this.tuiLogListener = logListener;
+    }
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUILoginListener.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUILoginListener.java
new file mode 100644
index 0000000..990b3ba
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUILoginListener.java
@@ -0,0 +1,40 @@
+package com.tencent.qcloud.tuicore.interfaces;
+
+public abstract class TUILoginListener {
+    /**
+     * SDK 正在连接到腾讯云服务器
+     *
+     * The SDK is connecting to the CVM instance
+     */
+    public void onConnecting() {}
+
+    /**
+     * SDK 已经成功连接到腾讯云服务器
+     *
+     * The SDK is successfully connected to the CVM instance
+     */
+    public void onConnectSuccess() {}
+
+    /**
+     * SDK 连接腾讯云服务器失败
+     *
+     * The SDK failed to connect to the CVM instance
+     */
+    public void onConnectFailed(int code, String error) {}
+
+    /**
+     * 当前用户被踢下线，此时可以 UI 提示用户，并再次调用 TUILogin 的 login() 函数重新登录。
+     *
+     * The current user is kicked offline: the SDK notifies the user on the UI, and the user can choose to call the login() function of V2TIMManager to log in
+     * again.
+     */
+    public void onKickedOffline() {}
+
+    /**
+     * 在线时票据过期：此时您需要生成新的 userSig 并再次调用 TUILogin 的 login() 函数重新登录。
+     *
+     * The ticket expires when the user is online: the user needs to generate a new userSig and call the login() function of V2TIMManager to log in again.
+     */
+    public void onUserSigExpired() {
+    }
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUIServiceCallback.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUIServiceCallback.java
new file mode 100644
index 0000000..4b023c8
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUIServiceCallback.java
@@ -0,0 +1,7 @@
+package com.tencent.qcloud.tuicore.interfaces;
+
+import android.os.Bundle;
+
+public abstract class TUIServiceCallback {
+    public abstract void onServiceCallback(int errorCode, String errorMessage, Bundle bundle);
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUIValueCallback.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUIValueCallback.java
new file mode 100644
index 0000000..39a86d5
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUIValueCallback.java
@@ -0,0 +1,19 @@
+package com.tencent.qcloud.tuicore.interfaces;
+
+public abstract class TUIValueCallback<T> {
+    public abstract void onSuccess(T object);
+
+    public static <T> void onSuccess(TUIValueCallback<T> callback, T result) {
+        if (callback != null) {
+            callback.onSuccess(result);
+        }
+    }
+
+    public abstract void onError(int errorCode, String errorMessage);
+
+    public static <T> void onError(TUIValueCallback<T> callback, int errorCode, String errorMessage) {
+        if (callback != null) {
+            callback.onError(errorCode, errorMessage);
+        }
+    }
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/permission/PermissionActivity.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/permission/PermissionActivity.java
new file mode 100644
index 0000000..4b9188c
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/permission/PermissionActivity.java
@@ -0,0 +1,232 @@
+package com.tencent.qcloud.tuicore.permission;
+
+import static com.tencent.qcloud.tuicore.permission.PermissionRequester.PERMISSION_NOTIFY_EVENT_KEY;
+import static com.tencent.qcloud.tuicore.permission.PermissionRequester.PERMISSION_NOTIFY_EVENT_SUB_KEY;
+import static com.tencent.qcloud.tuicore.permission.PermissionRequester.PERMISSION_RESULT;
+
+import android.annotation.SuppressLint;
+import android.app.ActionBar;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
+import com.tencent.qcloud.tuicore.R;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.util.TUIBuild;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@RequiresApi(api = Build.VERSION_CODES.M)
+public class PermissionActivity extends Activity {
+    private static final String TAG = "PermissionActivity";
+    private static final int PERMISSION_REQUEST_CODE = 100;
+
+    private TextView mRationaleTitleTv;
+    private TextView mRationaleDescriptionTv;
+    private ImageView mPermissionIconIv;
+    private PermissionRequester.RequestData mRequestData;
+
+    private PermissionRequester.Result mResult = PermissionRequester.Result.Denied;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mRequestData = getPermissionRequest();
+        if (mRequestData == null || mRequestData.isPermissionsExistEmpty()) {
+            Log.e(TAG, "onCreate mRequestData exist empty permission");
+            finishWithResult(PermissionRequester.Result.Denied);
+            return;
+        }
+        Log.i(TAG, "onCreate : " + mRequestData.toString());
+        if (TUIBuild.getVersionInt() < Build.VERSION_CODES.M) {
+            finishWithResult(PermissionRequester.Result.Granted);
+            return;
+        }
+
+        makeBackGroundTransparent();
+        initView();
+        showPermissionRationale();
+
+        requestPermissions(mRequestData.getPermissions(), PERMISSION_REQUEST_CODE);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+        hidePermissionRationale();
+        if (isAllPermissionsGranted(grantResults)) {
+            finishWithResult(PermissionRequester.Result.Granted);
+            return;
+        }
+        showSettingsTip();
+    }
+
+    private void showSettingsTip() {
+        if (mRequestData == null) {
+            return;
+        }
+
+        View tipLayout = LayoutInflater.from(this).inflate(R.layout.permission_tip_layout, null);
+        TextView tipsTv = tipLayout.findViewById(R.id.tips);
+        TextView positiveBtn = tipLayout.findViewById(R.id.positive_btn);
+        TextView negativeBtn = tipLayout.findViewById(R.id.negative_btn);
+        tipsTv.setText(mRequestData.getSettingsTip());
+
+        Dialog permissionTipDialog = new AlertDialog.Builder(this).setView(tipLayout).setCancelable(false).create();
+
+        positiveBtn.setOnClickListener(v -> {
+            permissionTipDialog.dismiss();
+            launchAppDetailsSettings();
+            finishWithResult(PermissionRequester.Result.Requesting);
+        });
+
+        negativeBtn.setOnClickListener(v -> {
+            permissionTipDialog.dismiss();
+            finishWithResult(PermissionRequester.Result.Denied);
+        });
+        permissionTipDialog.setOnKeyListener((dialog, keyCode, event) -> {
+            if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_UP) {
+                permissionTipDialog.dismiss();
+            }
+            return true;
+        });
+
+        Window dialogWindow = permissionTipDialog.getWindow();
+        dialogWindow.setBackgroundDrawable(new ColorDrawable());
+        WindowManager.LayoutParams layoutParams = dialogWindow.getAttributes();
+        layoutParams.width = WindowManager.LayoutParams.WRAP_CONTENT;
+        layoutParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
+        dialogWindow.setAttributes(layoutParams);
+        permissionTipDialog.show();
+    }
+
+    /**
+     * 启动应用程序的详细信息设置。
+     *
+     * Launch the application's details settings.
+     */
+    private void launchAppDetailsSettings() {
+        Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+        intent.setData(Uri.parse("package:" + getPackageName()));
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        if (getPackageManager().queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY).size() <= 0) {
+            Log.e(TAG, "launchAppDetailsSettings can not find system settings");
+            return;
+        }
+        startActivity(intent);
+    }
+
+    private void finishWithResult(PermissionRequester.Result result) {
+        Log.i(TAG, "finishWithResult : " + result);
+        mResult = result;
+        Map<String, Object> map = new HashMap<>(1);
+        map.put(PERMISSION_RESULT, result);
+        TUICore.notifyEvent(PERMISSION_NOTIFY_EVENT_KEY, PERMISSION_NOTIFY_EVENT_SUB_KEY, map);
+        finish();
+    }
+
+    /*
+     * APP 从异常中恢复时，有些 Activity 在 onCreate 时就会申请权限；同时对于异常恢复，所有 Activity 可能被干掉，从新走流程；
+     * 所以可能导致本次权限申请过早结束，此时须在 onDestroy 中返回结果。
+     */
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        Map<String, Object> result = new HashMap<>(1);
+        result.put(PERMISSION_RESULT, mResult);
+        TUICore.notifyEvent(PERMISSION_NOTIFY_EVENT_KEY, PERMISSION_NOTIFY_EVENT_SUB_KEY, result);
+    }
+
+    private PermissionRequester.RequestData getPermissionRequest() {
+        Intent intent = getIntent();
+        if (intent == null) {
+            return null;
+        }
+        return intent.getParcelableExtra(PermissionRequester.PERMISSION_REQUEST_KEY);
+    }
+
+    @SuppressLint("NewApi")
+    private void makeBackGroundTransparent() {
+        if (TUIBuild.getVersionInt() >= Build.VERSION_CODES.LOLLIPOP) {
+            View decorView = getWindow().getDecorView();
+            decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+            getWindow().setStatusBarColor(Color.TRANSPARENT);
+            getWindow().setNavigationBarColor(Color.TRANSPARENT);
+        }
+
+        ActionBar actionBar = getActionBar();
+        if (actionBar != null) {
+            actionBar.hide();
+        }
+    }
+
+    private void initView() {
+        setContentView(R.layout.permission_activity_layout);
+        mRationaleTitleTv = findViewById(R.id.permission_reason_title);
+        mRationaleDescriptionTv = findViewById(R.id.permission_reason);
+        mPermissionIconIv = findViewById(R.id.permission_icon);
+    }
+
+    /**
+     * 安全合规要求，申请权限时，必须显示申请权限的理由。
+     *
+     * Security compliance requires that when applying for permission, the reason for applying for permission must be
+     * displayed.
+     */
+    private void showPermissionRationale() {
+        if (mRequestData == null) {
+            return;
+        }
+        mRationaleTitleTv.setText(mRequestData.getTitle());
+        mRationaleDescriptionTv.setText(mRequestData.getDescription());
+        mPermissionIconIv.setBackgroundResource(mRequestData.getPermissionIconId());
+
+        mRationaleTitleTv.setVisibility(View.VISIBLE);
+        mRationaleDescriptionTv.setVisibility(View.VISIBLE);
+        mPermissionIconIv.setVisibility(View.VISIBLE);
+    }
+
+    private void hidePermissionRationale() {
+        mRationaleTitleTv.setVisibility(View.INVISIBLE);
+        mRationaleDescriptionTv.setVisibility(View.INVISIBLE);
+        mPermissionIconIv.setVisibility(View.INVISIBLE);
+    }
+
+    private boolean isAllPermissionsGranted(@NonNull int[] grantResults) {
+        for (int result : grantResults) {
+            if (result != PackageManager.PERMISSION_GRANTED) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/permission/PermissionCallback.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/permission/PermissionCallback.java
new file mode 100644
index 0000000..cc9c080
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/permission/PermissionCallback.java
@@ -0,0 +1,9 @@
+package com.tencent.qcloud.tuicore.permission;
+
+public abstract class PermissionCallback {
+    public abstract void onGranted();
+
+    public void onRequesting() {}
+
+    public void onDenied() {}
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/permission/PermissionRequester.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/permission/PermissionRequester.java
new file mode 100644
index 0000000..cf5b654
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/permission/PermissionRequester.java
@@ -0,0 +1,322 @@
+package com.tencent.qcloud.tuicore.permission;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.text.TextUtils;
+import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.Size;
+import androidx.core.content.ContextCompat;
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.interfaces.ITUINotification;
+import com.tencent.qcloud.tuicore.util.TUIBuild;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class PermissionRequester {
+    private static final String TAG = "PermissionRequester";
+
+    public static final String PERMISSION_NOTIFY_EVENT_KEY = "PERMISSION_NOTIFY_EVENT_KEY";
+    public static final String PERMISSION_NOTIFY_EVENT_SUB_KEY = "PERMISSION_NOTIFY_EVENT_SUB_KEY";
+    public static final String PERMISSION_RESULT = "PERMISSION_RESULT";
+    public static final String PERMISSION_REQUEST_KEY = "PERMISSION_REQUEST_KEY";
+    private static final Object sLock = new Object();
+
+    private static AtomicBoolean sIsRequesting = new AtomicBoolean(false);
+
+    private PermissionCallback mPermissionCallback;
+    private String[] mPermissions;
+    private String mTitle;
+    private String mDescription;
+    private String mSettingsTip;
+    private ITUINotification mPermissionNotification;
+
+    public enum Result { Granted, Denied, Requesting }
+
+    private PermissionRequester(String... permissions) {
+        mPermissions = permissions;
+        mPermissionNotification = (key, subKey, param) -> {
+            if (param == null) {
+                return;
+            }
+            Object result = param.get(PERMISSION_RESULT);
+            if (result == null) {
+                return;
+            }
+            notifyPermissionRequestResult((Result) result);
+        };
+    }
+
+    /**
+     * 生成 PermissionRequester 的实例，其中参数为具体需要申请的权限，可以传入一个或多个权限。
+     *
+     * @param permissions 需要申请的权限名称。
+     * @return PermissionRequester 的实例。
+     *
+     * Generate an instance of PermissionRequester, where the parameters are the specific permissions that need to be
+     * applied for, and one or more permissions can be passed in.
+     *
+     * @param permissions The name of the permission that needs to be applied for.
+     * @return An instance of PermissionRequester.
+     */
+    public static PermissionRequester newInstance(@NonNull @Size(min = 1) String... permissions) {
+        return new PermissionRequester(permissions);
+    }
+
+    /**
+     * 理由的标题：安全合规要求，请求权限时，须向用户解释为什么需要申请该权限；
+     *
+     * @param title 理由的标题；
+     * @return PermissionRequester 的实例。
+     *
+     * The title of the reason: security compliance requirements, when requesting permission, you
+     * must explain to the user why you need to apply for the permission;
+     *
+     * @param title The title of the reason;
+     * @return An instance of PermissionRequester.
+     */
+    public PermissionRequester title(@NonNull String title) {
+        mTitle = title;
+        return this;
+    }
+
+    /**
+     * 理由的正文：安全合规要求，请求权限时，须向用户解释为什么需要申请该权限；
+     *
+     * @param description 理由的正文；
+     * @return PermissionRequester 的实例。
+     *
+     * The text of the reason: security compliance requirements, when requesting permission,
+     * explain to the user why the permission is required;
+     *
+     * @param description The text of the reason;
+     * @return An instance of PermissionRequester.
+     */
+    public PermissionRequester description(@NonNull String description) {
+        mDescription = description;
+        return this;
+    }
+
+    /**
+     * 向用户说明到 Settings 后需要打开什么权限，以保证功能的正常运行；
+     *
+     * @param settingsTip 提示用户到设置中做什么；
+     * @return PermissionRequester 的实例。
+     *
+     * Explain to the user what permissions need to be opened after entering the Settings to
+     * ensure the normal operation of the function;
+     *
+     * @param settingsTip Prompt user what to do in settings;
+     * @return An instance of PermissionRequester.
+     */
+    public PermissionRequester settingsTip(@NonNull String settingsTip) {
+        mSettingsTip = settingsTip;
+        return this;
+    }
+
+    /**
+     * 设置用于获取权限申请结果的回调。
+     *
+     * @param callback 权限申请的回调；
+     * @return PermissionRequester 的实例。
+     *
+     * Set the callback used to get the permission application result.
+     *
+     * @param callback callback for permission application;
+     * @return An instance of PermissionRequester.
+     */
+    public PermissionRequester callback(@NonNull PermissionCallback callback) {
+        mPermissionCallback = callback;
+        return this;
+    }
+
+    /**
+     * 开始请求权限。
+     *
+     * Start requesting permission.
+     */
+    @SuppressLint("NewApi")
+    public void request() {
+        synchronized (sLock) {
+            if (sIsRequesting.get()) {
+                Log.e(TAG, "can not request during requesting");
+                mPermissionCallback.onDenied();
+                return;
+            }
+            sIsRequesting.set(true);
+        }
+
+        TUICore.registerEvent(PERMISSION_NOTIFY_EVENT_KEY, PERMISSION_NOTIFY_EVENT_SUB_KEY, mPermissionNotification);
+        if (TUIBuild.getVersionInt() < Build.VERSION_CODES.M) {
+            Log.i(TAG, "current version is lower than 23");
+            notifyPermissionRequestResult(Result.Granted);
+            return;
+        }
+        String[] unauthorizedPermissions = findUnauthorizedPermissions(mPermissions);
+        if (unauthorizedPermissions.length <= 0) {
+            notifyPermissionRequestResult(Result.Granted);
+            return;
+        }
+        RequestData realRequest = new RequestData(mTitle, mDescription, mSettingsTip, unauthorizedPermissions);
+        startPermissionActivity(realRequest);
+    }
+
+    public boolean has() {
+        for (String permission : mPermissions) {
+            if (!has(permission)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private boolean has(final String permission) {
+        return TUIBuild.getVersionInt() < Build.VERSION_CODES.M
+            || PackageManager.PERMISSION_GRANTED == ContextCompat.checkSelfPermission(TUIConfig.getAppContext(), permission);
+    }
+
+    private void notifyPermissionRequestResult(Result result) {
+        TUICore.unRegisterEvent(PERMISSION_NOTIFY_EVENT_KEY, PERMISSION_NOTIFY_EVENT_SUB_KEY, mPermissionNotification);
+        sIsRequesting.set(false);
+        if (mPermissionCallback == null) {
+            return;
+        }
+        if (Result.Granted.equals(result)) {
+            mPermissionCallback.onGranted();
+        } else if (Result.Requesting.equals(result)) {
+            mPermissionCallback.onRequesting();
+        } else {
+            mPermissionCallback.onDenied();
+        }
+        mPermissionCallback = null;
+    }
+
+    private String[] findUnauthorizedPermissions(String[] permissions) {
+        Context appContext = TUIConfig.getAppContext();
+        if (appContext == null) {
+            Log.e(TAG, "findUnauthorizedPermissions appContext is null");
+            return permissions;
+        }
+        List<String> unauthorizedList = new LinkedList<>();
+        for (String permission : permissions) {
+            if (PackageManager.PERMISSION_GRANTED != ContextCompat.checkSelfPermission(appContext, permission)) {
+                unauthorizedList.add(permission);
+            }
+        }
+        return unauthorizedList.toArray(new String[0]);
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    private void startPermissionActivity(RequestData request) {
+        Context context = TUIConfig.getAppContext();
+        if (context == null) {
+            return;
+        }
+        Intent intent = new Intent(context, PermissionActivity.class);
+        intent.putExtra(PERMISSION_REQUEST_KEY, request);
+        // 在Activity之外startActivity需要添加FLAG_ACTIVITY_NEW_TASK，否则会crash
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(intent);
+    }
+
+    static class RequestData implements Parcelable {
+        private final String[] mPermissions;
+        private final String mTitle;
+        private final String mDescription;
+        private final String mSettingsTip;
+        private int mPermissionIconId;
+
+        public RequestData(@NonNull String title, @NonNull String description, @NonNull String settingsTip, @NonNull String... perms) {
+            mTitle = title;
+            mDescription = description;
+            mSettingsTip = settingsTip;
+            mPermissions = perms.clone();
+        }
+
+        protected RequestData(Parcel in) {
+            mPermissions = in.createStringArray();
+            mTitle = in.readString();
+            mDescription = in.readString();
+            mSettingsTip = in.readString();
+            mPermissionIconId = in.readInt();
+        }
+
+        public static final Creator<RequestData> CREATOR = new Creator<RequestData>() {
+            @Override
+            public RequestData createFromParcel(Parcel in) {
+                return new RequestData(in);
+            }
+
+            @Override
+            public RequestData[] newArray(int size) {
+                return new RequestData[size];
+            }
+        };
+
+        public boolean isPermissionsExistEmpty() {
+            if (mPermissions == null || mPermissions.length <= 0) {
+                return true;
+            }
+            for (String permission : mPermissions) {
+                if (TextUtils.isEmpty(permission)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public String[] getPermissions() {
+            return mPermissions.clone();
+        }
+
+        public String getTitle() {
+            return mTitle;
+        }
+
+        public String getDescription() {
+            return mDescription;
+        }
+
+        public String getSettingsTip() {
+            return mSettingsTip;
+        }
+
+        public int getPermissionIconId() {
+            return mPermissionIconId;
+        }
+
+        public void setPermissionIconId(int permissionIconId) {
+            mPermissionIconId = permissionIconId;
+        }
+
+        @Override
+        public String toString() {
+            return "PermissionRequest{"
+                + "mPermissions=" + Arrays.toString(mPermissions) + ", mTitle=" + mTitle + ", mDescription='" + mDescription + ", mSettingsTip='" + mSettingsTip
+                + '}';
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeStringArray(mPermissions);
+            dest.writeString(mTitle);
+            dest.writeString(mDescription);
+            dest.writeString(mSettingsTip);
+            dest.writeInt(mPermissionIconId);
+        }
+    }
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/util/BackgroundTasks.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/util/BackgroundTasks.java
new file mode 100644
index 0000000..cd6b976
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/util/BackgroundTasks.java
@@ -0,0 +1,23 @@
+package com.tencent.qcloud.tuicore.util;
+
+import android.os.Handler;
+import android.os.Looper;
+
+public class BackgroundTasks {
+    private static final BackgroundTasks instance = new BackgroundTasks();
+    private final Handler handler = new Handler(Looper.getMainLooper());
+
+    public static BackgroundTasks getInstance() {
+        return instance;
+    }
+
+    private BackgroundTasks() {}
+
+    public void runOnUiThread(Runnable runnable) {
+        handler.post(runnable);
+    }
+
+    public boolean postDelayed(Runnable r, long delayMillis) {
+        return handler.postDelayed(r, delayMillis);
+    }
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/util/DateTimeUtil.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/util/DateTimeUtil.java
new file mode 100644
index 0000000..aeeadff
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/util/DateTimeUtil.java
@@ -0,0 +1,154 @@
+package com.tencent.qcloud.tuicore.util;
+
+import android.content.Context;
+import com.tencent.qcloud.tuicore.R;
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+public class DateTimeUtil {
+    private static final long minute = 60 * 1000;
+    private static final long hour = 60 * minute;
+    private static final long day = 24 * hour;
+    private static final long week = 7 * day;
+    private static final long month = 31 * day;
+    private static final long year = 12 * month;
+
+    /**
+     * return format text for time
+     * you can see https://docs.oracle.com/javase/8/docs/api/java/util/Formatter.html
+     * today：HH:MM
+     * this week：Sunday, Friday ..
+     * this year：MM/DD
+     * before this year：YYYY/MM/DD
+     * @param date current time
+     * @return format text
+     */
+    public static String getTimeFormatText(Date date) {
+        if (date == null) {
+            return "";
+        }
+        Context context = TUIConfig.getAppContext();
+        Locale locale;
+        if (context == null) {
+            locale = Locale.getDefault();
+        } else {
+            locale = TUIThemeManager.getInstance().getLocale(context);
+        }
+        String timeText;
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        calendar = Calendar.getInstance();
+        calendar.set(Calendar.DAY_OF_WEEK, 1);
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        calendar = Calendar.getInstance();
+        calendar.set(Calendar.DAY_OF_YEAR, 1);
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        long yearStartTimeInMillis = calendar.getTimeInMillis();
+        long outTimeMillis = date.getTime();
+        long weekStartTimeInMillis = calendar.getTimeInMillis();
+        long dayStartTimeInMillis = calendar.getTimeInMillis();
+        if (outTimeMillis < yearStartTimeInMillis) {
+            timeText = String.format(locale, "%tD", date);
+        } else if (outTimeMillis < weekStartTimeInMillis) {
+            timeText = String.format(locale, "%1$tm/%1$td", date);
+        } else if (outTimeMillis < dayStartTimeInMillis) {
+            timeText = String.format(locale, "%tA", date);
+        } else {
+            timeText = String.format(locale, "%tR", date);
+        }
+        return timeText;
+    }
+
+    /**
+     * HH:MM
+     * @param date current time
+     * @return format text e.g. "12:12"
+     */
+    public static String getHMTimeString(Date date) {
+        if (date == null) {
+            return "";
+        }
+        Context context = TUIConfig.getAppContext();
+        Locale locale;
+        if (context == null) {
+            locale = Locale.getDefault();
+        } else {
+            locale = TUIThemeManager.getInstance().getLocale(context);
+        }
+        return String.format(locale, "%tR", date);
+    }
+
+    public static String formatSeconds(long seconds) {
+        Context context = TUIConfig.getAppContext();
+        String timeStr = seconds + context.getString(R.string.date_second_short);
+        if (seconds > 60) {
+            long second = seconds % 60;
+            long min = seconds / 60;
+            timeStr = min + context.getString(R.string.date_minute_short) + second + context.getString(R.string.date_second_short);
+            if (min > 60) {
+                min = (seconds / 60) % 60;
+                long hour = (seconds / 60) / 60;
+                timeStr = hour + context.getString(R.string.date_hour_short) + min + context.getString(R.string.date_minute_short) + second
+                    + context.getString(R.string.date_second_short);
+                if (hour % 24 == 0) {
+                    long day = (((seconds / 60) / 60) / 24);
+                    timeStr = day + context.getString(R.string.date_day_short);
+                } else if (hour > 24) {
+                    hour = ((seconds / 60) / 60) % 24;
+                    long day = (((seconds / 60) / 60) / 24);
+                    timeStr = day + context.getString(R.string.date_day_short) + hour + context.getString(R.string.date_hour_short) + min
+                        + context.getString(R.string.date_minute_short) + second + context.getString(R.string.date_second_short);
+                }
+            }
+        }
+        return timeStr;
+    }
+
+    public static String formatSecondsTo00(int timeSeconds) {
+        int second = timeSeconds % 60;
+        int minuteTemp = timeSeconds / 60;
+        if (minuteTemp > 0) {
+            int minute = minuteTemp % 60;
+            int hour = minuteTemp / 60;
+            if (hour > 0) {
+                return (hour >= 10 ? (hour + "") : ("0" + hour)) + ":" + (minute >= 10 ? (minute + "") : ("0" + minute)) + ":"
+                    + (second >= 10 ? (second + "") : ("0" + second));
+            } else {
+                return (minute >= 10 ? (minute + "") : ("0" + minute)) + ":" + (second >= 10 ? (second + "") : ("0" + second));
+            }
+        } else {
+            return "00:" + (second >= 10 ? (second + "") : ("0" + second));
+        }
+    }
+
+    public static long getStringToDate(String dateString, String pattern) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat(pattern);
+        Date date = new Date();
+        try {
+            date = dateFormat.parse(dateString);
+        } catch (ParseException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return date.getTime();
+    }
+
+    public static String getTimeStringFromDate(Date date, String pattern) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(pattern);
+        return simpleDateFormat.format(date);
+    }
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/util/ErrorMessageConverter.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/util/ErrorMessageConverter.java
new file mode 100644
index 0000000..b07ec25
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/util/ErrorMessageConverter.java
@@ -0,0 +1,428 @@
+package com.tencent.qcloud.tuicore.util;
+
+import com.tencent.imsdk.BaseConstants;
+import com.tencent.qcloud.tuicore.R;
+import com.tencent.qcloud.tuicore.TUIConfig;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ErrorMessageConverter {
+    public static final Map<Integer, Integer> ERROR_CODE_MAP = new HashMap<>();
+
+    static {
+        /////////////////////////////////////////////////////////////////////////////////
+        //
+        //                      （一）IM SDK 的错误码
+        //                           IM SDK error codes
+        //
+        /////////////////////////////////////////////////////////////////////////////////
+        // 通用错误码
+        // Common error codes
+        ERROR_CODE_MAP.put(BaseConstants.ERR_IN_PROGESS, R.string.TUIKitErrorInProcess);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_INVALID_PARAMETERS, R.string.TUIKitErrorInvalidParameters);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_IO_OPERATION_FAILED, R.string.TUIKitErrorIOOperateFaild);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_INVALID_JSON, R.string.TUIKitErrorInvalidJson);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_OUT_OF_MEMORY, R.string.TUIKitErrorOutOfMemory);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_PARSE_RESPONSE_FAILED, R.string.TUIKitErrorParseResponseFaild);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SERIALIZE_REQ_FAILED, R.string.TUIKitErrorSerializeReqFaild);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_NOT_INITIALIZED, R.string.TUIKitErrorSDKNotInit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_LOADMSG_FAILED, R.string.TUIKitErrorLoadMsgFailed);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_DATABASE_OPERATE_FAILED, R.string.TUIKitErrorDatabaseOperateFailed);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_COMM_CROSS_THREAD, R.string.TUIKitErrorCrossThread);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_COMM_TINYID_EMPTY, R.string.TUIKitErrorTinyIdEmpty);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_COMM_INVALID_IDENTIFIER, R.string.TUIKitErrorInvalidIdentifier);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_COMM_FILE_NOT_FOUND, R.string.TUIKitErrorFileNotFound);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_COMM_FILE_TOO_LARGE, R.string.TUIKitErrorFileTooLarge);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_COMM_FILE_SIZE_EMPTY, R.string.TUIKitErrorEmptyFile);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_COMM_FILE_OPEN_FAILED, R.string.TUIKitErrorFileOpenFailed);
+
+        // 帐号错误码
+        // Account error codes
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_NOT_LOGGED_IN, R.string.TUIKitErrorNotLogin);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_NO_PREVIOUS_LOGIN, R.string.TUIKitErrorNoPreviousLogin);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_USER_SIG_EXPIRED, R.string.TUIKitErrorUserSigExpired);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_LOGIN_KICKED_OFF_BY_OTHER, R.string.TUIKitErrorLoginKickedOffByOther);
+        //        errorCodeMap.put(BaseConstants.ERR_LOGIN_IN_PROCESS:
+        //            return @"登录正在执行中";
+        //        errorCodeMap.put(BaseConstants.ERR_LOGOUT_IN_PROCESS:
+        //            return @"登出正在执行中";
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_ACCOUNT_TLS_INIT_FAILED, R.string.TUIKitErrorTLSSDKInit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_ACCOUNT_TLS_NOT_INITIALIZED, R.string.TUIKitErrorTLSSDKUninit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_ACCOUNT_TLS_TRANSPKG_ERROR, R.string.TUIKitErrorTLSSDKTRANSPackageFormat);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_ACCOUNT_TLS_DECRYPT_FAILED, R.string.TUIKitErrorTLSDecrypt);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_ACCOUNT_TLS_REQUEST_FAILED, R.string.TUIKitErrorTLSSDKRequest);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_ACCOUNT_TLS_REQUEST_TIMEOUT, R.string.TUIKitErrorTLSSDKRequestTimeout);
+
+        // 消息错误码
+        // Message error codes
+        ERROR_CODE_MAP.put(BaseConstants.ERR_INVALID_CONVERSATION, R.string.TUIKitErrorInvalidConveration);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_FILE_TRANS_AUTH_FAILED, R.string.TUIKitErrorFileTransAuthFailed);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_FILE_TRANS_NO_SERVER, R.string.TUIKitErrorFileTransNoServer);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_FILE_TRANS_UPLOAD_FAILED, R.string.TUIKitErrorFileTransUploadFailed);
+        //            errorCodeMap.put(BaseConstants.ERR_IMAGE_UPLOAD_FAILED_NOTIMAGE:
+        //                return TUIKitLocalizableString(R.string.TUIKitErrorFileTransUploadFailedNotImage);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_FILE_TRANS_DOWNLOAD_FAILED, R.string.TUIKitErrorFileTransDownloadFailed);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_HTTP_REQ_FAILED, R.string.TUIKitErrorHTTPRequestFailed);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_INVALID_MSG_ELEM, R.string.TUIKitErrorInvalidMsgElem);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_INVALID_SDK_OBJECT, R.string.TUIKitErrorInvalidSDKObject);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_MSG_BODY_SIZE_LIMIT, R.string.TUIKitSDKMsgBodySizeLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_MSG_KEY_REQ_DIFFER_RSP, R.string.TUIKitErrorSDKMsgKeyReqDifferRsp);
+
+        // 群组错误码
+        // Group error codes
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_GROUP_INVALID_ID, R.string.TUIKitErrorSDKGroupInvalidID);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_GROUP_INVALID_NAME, R.string.TUIKitErrorSDKGroupInvalidName);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_GROUP_INVALID_INTRODUCTION, R.string.TUIKitErrorSDKGroupInvalidIntroduction);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_GROUP_INVALID_NOTIFICATION, R.string.TUIKitErrorSDKGroupInvalidNotification);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_GROUP_INVALID_FACE_URL, R.string.TUIKitErrorSDKGroupInvalidFaceURL);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_GROUP_INVALID_NAME_CARD, R.string.TUIKitErrorSDKGroupInvalidNameCard);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_GROUP_MEMBER_COUNT_LIMIT, R.string.TUIKitErrorSDKGroupMemberCountLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_GROUP_JOIN_PRIVATE_GROUP_DENY, R.string.TUIKitErrorSDKGroupJoinPrivateGroupDeny);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_GROUP_INVITE_SUPER_DENY, R.string.TUIKitErrorSDKGroupInviteSuperDeny);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_GROUP_INVITE_NO_MEMBER, R.string.TUIKitErrorSDKGroupInviteNoMember);
+
+        // 关系链错误码
+        // Relationship chain error codes
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_FRIENDSHIP_INVALID_PROFILE_KEY, R.string.TUIKitErrorSDKFriendShipInvalidProfileKey);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_FRIENDSHIP_INVALID_ADD_REMARK, R.string.TUIKitErrorSDKFriendshipInvalidAddRemark);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_FRIENDSHIP_INVALID_ADD_WORDING, R.string.TUIKitErrorSDKFriendshipInvalidAddWording);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_FRIENDSHIP_INVALID_ADD_SOURCE, R.string.TUIKitErrorSDKFriendshipInvalidAddSource);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_FRIENDSHIP_FRIEND_GROUP_EMPTY, R.string.TUIKitErrorSDKFriendshipFriendGroupEmpty);
+
+        // 网络错误码
+        // Network error codes
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_NET_ENCODE_FAILED, R.string.TUIKitErrorSDKNetEncodeFailed);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_NET_DECODE_FAILED, R.string.TUIKitErrorSDKNetDecodeFailed);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_NET_AUTH_INVALID, R.string.TUIKitErrorSDKNetAuthInvalid);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_NET_COMPRESS_FAILED, R.string.TUIKitErrorSDKNetCompressFailed);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_NET_UNCOMPRESS_FAILED, R.string.TUIKitErrorSDKNetUncompressFaile);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_NET_FREQ_LIMIT, R.string.TUIKitErrorSDKNetFreqLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_NET_REQ_COUNT_LIMIT, R.string.TUIKitErrorSDKnetReqCountLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_NET_DISCONNECT, R.string.TUIKitErrorSDKNetDisconnect);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_NET_ALLREADY_CONN, R.string.TUIKitErrorSDKNetAllreadyConn);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_NET_CONN_TIMEOUT, R.string.TUIKitErrorSDKNetConnTimeout);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_NET_CONN_REFUSE, R.string.TUIKitErrorSDKNetConnRefuse);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_NET_NET_UNREACH, R.string.TUIKitErrorSDKNetNetUnreach);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_NET_SOCKET_NO_BUFF, R.string.TUIKitErrorSDKNetSocketNoBuff);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_NET_RESET_BY_PEER, R.string.TUIKitERRORSDKNetResetByPeer);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_NET_SOCKET_INVALID, R.string.TUIKitErrorSDKNetSOcketInvalid);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_NET_HOST_GETADDRINFO_FAILED, R.string.TUIKitErrorSDKNetHostGetAddressFailed);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_NET_CONNECT_RESET, R.string.TUIKitErrorSDKNetConnectReset);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_NET_WAIT_INQUEUE_TIMEOUT, R.string.TUIKitErrorSDKNetWaitInQueueTimeout);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_NET_WAIT_SEND_TIMEOUT, R.string.TUIKitErrorSDKNetWaitSendTimeout);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_NET_WAIT_ACK_TIMEOUT, R.string.TUIKitErrorSDKNetWaitAckTimeut);
+
+        /////////////////////////////////////////////////////////////////////////////////
+        //
+        //                      （二）服务端
+        //                           Server error codes
+        //
+        /////////////////////////////////////////////////////////////////////////////////
+
+        // 网络接入层的错误码
+        // Access layer error codes for network
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_SSO_CONNECT_LIMIT, R.string.TUIKitErrorSDKSVRSSOConnectLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_SSO_VCODE, R.string.TUIKitErrorSDKSVRSSOVCode);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_SSO_D2_EXPIRED, R.string.TUIKitErrorSVRSSOD2Expired);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_SSO_A2_UP_INVALID, R.string.TUIKitErrorSVRA2UpInvalid);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_SSO_A2_DOWN_INVALID, R.string.TUIKitErrorSVRA2DownInvalid);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_SSO_EMPTY_KEY, R.string.TUIKitErrorSVRSSOEmpeyKey);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_SSO_UIN_INVALID, R.string.TUIKitErrorSVRSSOUinInvalid);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_SSO_VCODE_TIMEOUT, R.string.TUIKitErrorSVRSSOVCodeTimeout);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_SSO_NO_IMEI_AND_A2, R.string.TUIKitErrorSVRSSONoImeiAndA2);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_SSO_COOKIE_INVALID, R.string.TUIKitErrorSVRSSOCookieInvalid);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_SSO_DOWN_TIP, R.string.TUIKitErrorSVRSSODownTips);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_SSO_DISCONNECT, R.string.TUIKitErrorSVRSSODisconnect);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_SSO_IDENTIFIER_INVALID, R.string.TUIKitErrorSVRSSOIdentifierInvalid);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_SSO_CLIENT_CLOSE, R.string.TUIKitErrorSVRSSOClientClose);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_SSO_MSFSDK_QUIT, R.string.TUIKitErrorSVRSSOMSFSDKQuit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_SSO_D2KEY_WRONG, R.string.TUIKitErrorSVRSSOD2KeyWrong);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_SSO_UNSURPPORT, R.string.TUIKitErrorSVRSSOUnsupport);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_SSO_PREPAID_ARREARS, R.string.TUIKitErrorSVRSSOPrepaidArrears);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_SSO_PACKET_WRONG, R.string.TUIKitErrorSVRSSOPacketWrong);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_SSO_APPID_BLACK_LIST, R.string.TUIKitErrorSVRSSOAppidBlackList);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_SSO_CMD_BLACK_LIST, R.string.TUIKitErrorSVRSSOCmdBlackList);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_SSO_APPID_WITHOUT_USING, R.string.TUIKitErrorSVRSSOAppidWithoutUsing);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_SSO_FREQ_LIMIT, R.string.TUIKitErrorSVRSSOFreqLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_SSO_OVERLOAD, R.string.TUIKitErrorSVRSSOOverload);
+
+        // 资源文件错误码
+        // Resource file error codes
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_RES_NOT_FOUND, R.string.TUIKitErrorSVRResNotFound);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_RES_ACCESS_DENY, R.string.TUIKitErrorSVRResAccessDeny);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_RES_SIZE_LIMIT, R.string.TUIKitErrorSVRResSizeLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_RES_SEND_CANCEL, R.string.TUIKitErrorSVRResSendCancel);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_RES_READ_FAILED, R.string.TUIKitErrorSVRResReadFailed);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_RES_TRANSFER_TIMEOUT, R.string.TUIKitErrorSVRResTransferTimeout);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_RES_INVALID_PARAMETERS, R.string.TUIKitErrorSVRResInvalidParameters);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_RES_INVALID_FILE_MD5, R.string.TUIKitErrorSVRResInvalidFileMd5);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_RES_INVALID_PART_MD5, R.string.TUIKitErrorSVRResInvalidPartMd5);
+
+        // 后台公共错误码
+        // Common backend error codes
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_COMM_INVALID_HTTP_URL, R.string.TUIKitErrorSVRCommonInvalidHttpUrl);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_COMM_REQ_JSON_PARSE_FAILED, R.string.TUIKitErrorSVRCommomReqJsonParseFailed);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_COMM_INVALID_ACCOUNT, R.string.TUIKitErrorSVRCommonInvalidAccount);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_COMM_INVALID_ACCOUNT_EX, R.string.TUIKitErrorSVRCommonInvalidAccount);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_COMM_INVALID_SDKAPPID, R.string.TUIKitErrorSVRCommonInvalidSdkappid);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_COMM_REST_FREQ_LIMIT, R.string.TUIKitErrorSVRCommonRestFreqLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_COMM_REQUEST_TIMEOUT, R.string.TUIKitErrorSVRCommonRequestTimeout);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_COMM_INVALID_RES, R.string.TUIKitErrorSVRCommonInvalidRes);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_COMM_ID_NOT_ADMIN, R.string.TUIKitErrorSVRCommonIDNotAdmin);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_COMM_SDKAPPID_FREQ_LIMIT, R.string.TUIKitErrorSVRCommonSdkappidFreqLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_COMM_SDKAPPID_MISS, R.string.TUIKitErrorSVRCommonSdkappidMiss);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_COMM_RSP_JSON_PARSE_FAILED, R.string.TUIKitErrorSVRCommonRspJsonParseFailed);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_COMM_EXCHANGE_ACCOUNT_TIMEUT, R.string.TUIKitErrorSVRCommonExchangeAccountTimeout);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_COMM_INVALID_ID_FORMAT, R.string.TUIKitErrorSVRCommonInvalidIdFormat);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_COMM_SDKAPPID_FORBIDDEN, R.string.TUIKitErrorSVRCommonSDkappidForbidden);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_COMM_REQ_FORBIDDEN, R.string.TUIKitErrorSVRCommonReqForbidden);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_COMM_REQ_FREQ_LIMIT, R.string.TUIKitErrorSVRCommonReqFreqLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_COMM_REQ_FREQ_LIMIT_EX, R.string.TUIKitErrorSVRCommonReqFreqLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_COMM_INVALID_SERVICE, R.string.TUIKitErrorSVRCommonInvalidService);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_COMM_SENSITIVE_TEXT, R.string.TUIKitErrorSVRCommonSensitiveText);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_COMM_BODY_SIZE_LIMIT, R.string.TUIKitErrorSVRCommonBodySizeLimit);
+
+        // 帐号错误码
+        // Account error codes
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_ACCOUNT_USERSIG_EXPIRED, R.string.TUIKitErrorSVRAccountUserSigExpired);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_ACCOUNT_USERSIG_EMPTY, R.string.TUIKitErrorSVRAccountUserSigEmpty);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_ACCOUNT_USERSIG_CHECK_FAILED, R.string.TUIKitErrorSVRAccountUserSigCheckFailed);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_ACCOUNT_USERSIG_CHECK_FAILED_EX, R.string.TUIKitErrorSVRAccountUserSigCheckFailed);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_ACCOUNT_USERSIG_MISMATCH_PUBLICKEY, R.string.TUIKitErrorSVRAccountUserSigMismatchPublicKey);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_ACCOUNT_USERSIG_MISMATCH_ID, R.string.TUIKitErrorSVRAccountUserSigMismatchId);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_ACCOUNT_USERSIG_MISMATCH_SDKAPPID, R.string.TUIKitErrorSVRAccountUserSigMismatchSdkAppid);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_ACCOUNT_USERSIG_PUBLICKEY_NOT_FOUND, R.string.TUIKitErrorSVRAccountUserSigPublicKeyNotFound);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_ACCOUNT_SDKAPPID_NOT_FOUND, R.string.TUIKitErrorSVRAccountUserSigSdkAppidNotFount);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_ACCOUNT_INVALID_USERSIG, R.string.TUIKitErrorSVRAccountInvalidUserSig);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_ACCOUNT_NOT_FOUND, R.string.TUIKitErrorSVRAccountNotFound);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_ACCOUNT_SEC_RSTR, R.string.TUIKitErrorSVRAccountSecRstr);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_ACCOUNT_INTERNAL_TIMEOUT, R.string.TUIKitErrorSVRAccountInternalTimeout);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_ACCOUNT_INVALID_COUNT, R.string.TUIKitErrorSVRAccountInvalidCount);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_ACCOUNT_INVALID_PARAMETERS, R.string.TUIkitErrorSVRAccountINvalidParameters);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_ACCOUNT_ADMIN_REQUIRED, R.string.TUIKitErrorSVRAccountAdminRequired);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_ACCOUNT_LOW_SDK_VERSION, R.string.TUIKitErrorSVRAccountLowSDKVersion);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_ACCOUNT_FREQ_LIMIT, R.string.TUIKitErrorSVRAccountFreqLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_ACCOUNT_BLACKLIST, R.string.TUIKitErrorSVRAccountBlackList);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_ACCOUNT_COUNT_LIMIT, R.string.TUIKitErrorSVRAccountCountLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_ACCOUNT_INTERNAL_ERROR, R.string.TUIKitErrorSVRAccountInternalError);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_ACCOUNT_USER_STATUS_DISABLED, R.string.TUIKitErrorEnableUserStatusOnConsole);
+
+        // 资料错误码
+        // Profile error codes
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_PROFILE_INVALID_PARAMETERS, R.string.TUIKitErrorSVRProfileInvalidParameters);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_PROFILE_ACCOUNT_MISS, R.string.TUIKitErrorSVRProfileAccountMiss);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_PROFILE_ACCOUNT_NOT_FOUND, R.string.TUIKitErrorSVRProfileAccountNotFound);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_PROFILE_ADMIN_REQUIRED, R.string.TUIKitErrorSVRProfileAdminRequired);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_PROFILE_SENSITIVE_TEXT, R.string.TUIKitErrorSVRProfileSensitiveText);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_PROFILE_INTERNAL_ERROR, R.string.TUIKitErrorSVRProfileInternalError);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_PROFILE_READ_PERMISSION_REQUIRED, R.string.TUIKitErrorSVRProfileReadWritePermissionRequired);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_PROFILE_WRITE_PERMISSION_REQUIRED, R.string.TUIKitErrorSVRProfileReadWritePermissionRequired);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_PROFILE_TAG_NOT_FOUND, R.string.TUIKitErrorSVRProfileTagNotFound);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_PROFILE_SIZE_LIMIT, R.string.TUIKitErrorSVRProfileSizeLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_PROFILE_VALUE_ERROR, R.string.TUIKitErrorSVRProfileValueError);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_PROFILE_INVALID_VALUE_FORMAT, R.string.TUIKitErrorSVRProfileInvalidValueFormat);
+
+        // 关系链错误码
+        // Relationship chain error codes
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_FRIENDSHIP_INVALID_PARAMETERS, R.string.TUIKitErrorSVRFriendshipInvalidParameters);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_FRIENDSHIP_INVALID_SDKAPPID, R.string.TUIKitErrorSVRFriendshipInvalidSdkAppid);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_FRIENDSHIP_ACCOUNT_NOT_FOUND, R.string.TUIKitErrorSVRFriendshipAccountNotFound);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_FRIENDSHIP_ADMIN_REQUIRED, R.string.TUIKitErrorSVRFriendshipAdminRequired);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_FRIENDSHIP_SENSITIVE_TEXT, R.string.TUIKitErrorSVRFriendshipSensitiveText);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_FRIENDSHIP_INTERNAL_ERROR, R.string.TUIKitErrorSVRAccountInternalError);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_FRIENDSHIP_NET_TIMEOUT, R.string.TUIKitErrorSVRFriendshipNetTimeout);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_FRIENDSHIP_WRITE_CONFLICT, R.string.TUIKitErrorSVRFriendshipWriteConflict);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_FRIENDSHIP_ADD_FRIEND_DENY, R.string.TUIKitErrorSVRFriendshipAddFriendDeny);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_FRIENDSHIP_COUNT_LIMIT, R.string.TUIkitErrorSVRFriendshipCountLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_FRIENDSHIP_GROUP_COUNT_LIMIT, R.string.TUIKitErrorSVRFriendshipGroupCountLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_FRIENDSHIP_PENDENCY_LIMIT, R.string.TUIKitErrorSVRFriendshipPendencyLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_FRIENDSHIP_BLACKLIST_LIMIT, R.string.TUIKitErrorSVRFriendshipBlacklistLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_FRIENDSHIP_PEER_FRIEND_LIMIT, R.string.TUIKitErrorSVRFriendshipPeerFriendLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_FRIENDSHIP_IN_SELF_BLACKLIST, R.string.TUIKitErrorSVRFriendshipInSelfBlacklist);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_FRIENDSHIP_ALLOW_TYPE_DENY_ANY, R.string.TUIKitErrorSVRFriendshipAllowTypeDenyAny);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_FRIENDSHIP_IN_PEER_BLACKLIST, R.string.TUIKitErrorSVRFriendshipInPeerBlackList);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_FRIENDSHIP_ALLOW_TYPE_NEED_CONFIRM, R.string.TUIKitErrorSVRFriendshipAllowTypeNeedConfirm);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_FRIENDSHIP_ADD_FRIEND_SEC_RSTR, R.string.TUIKitErrorSVRFriendshipAddFriendSecRstr);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_FRIENDSHIP_PENDENCY_NOT_FOUND, R.string.TUIKitErrorSVRFriendshipPendencyNotFound);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_FRIENDSHIP_DEL_FRIEND_SEC_RSTR, R.string.TUIKitErrorSVRFriendshipDelFriendSecRstr);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_FRIENDSHIP_ACCOUNT_NOT_FOUND_EX, R.string.TUIKirErrorSVRFriendAccountNotFoundEx);
+
+        // 最近联系人错误码
+        // Error codes for recent contacts
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_CONV_ACCOUNT_NOT_FOUND, R.string.TUIKirErrorSVRFriendAccountNotFoundEx);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_CONV_INVALID_PARAMETERS, R.string.TUIKitErrorSVRFriendshipInvalidParameters);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_CONV_ADMIN_REQUIRED, R.string.TUIKitErrorSVRFriendshipAdminRequired);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_CONV_INTERNAL_ERROR, R.string.TUIKitErrorSVRAccountInternalError);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_CONV_NET_TIMEOUT, R.string.TUIKitErrorSVRFriendshipNetTimeout);
+
+        // 消息错误码
+        // Message error codes
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_PKG_PARSE_FAILED, R.string.TUIKitErrorSVRMsgPkgParseFailed);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_INTERNAL_AUTH_FAILED, R.string.TUIKitErrorSVRMsgInternalAuthFailed);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_INVALID_ID, R.string.TUIKitErrorSVRMsgInvalidId);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_NET_ERROR, R.string.TUIKitErrorSVRMsgNetError);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_INTERNAL_ERROR1, R.string.TUIKitErrorSVRAccountInternalError);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_PUSH_DENY, R.string.TUIKitErrorSVRMsgPushDeny);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_IN_PEER_BLACKLIST, R.string.TUIKitErrorSVRMsgInPeerBlackList);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_BOTH_NOT_FRIEND, R.string.TUIKitErrorSVRMsgBothNotFriend);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_NOT_PEER_FRIEND, R.string.TUIKitErrorSVRMsgNotPeerFriend);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_NOT_SELF_FRIEND, R.string.TUIkitErrorSVRMsgNotSelfFriend);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_SHUTUP_DENY, R.string.TUIKitErrorSVRMsgShutupDeny);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_REVOKE_TIME_LIMIT, R.string.TUIKitErrorSVRMsgRevokeTimeLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_DEL_RAMBLE_INTERNAL_ERROR, R.string.TUIKitErrorSVRMsgDelRambleInternalError);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_JSON_PARSE_FAILED, R.string.TUIKitErrorSVRMsgJsonParseFailed);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_INVALID_JSON_BODY_FORMAT, R.string.TUIKitErrorSVRMsgInvalidJsonBodyFormat);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_INVALID_TO_ACCOUNT, R.string.TUIKitErrorSVRMsgInvalidToAccount);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_INVALID_RAND, R.string.TUIKitErrorSVRMsgInvalidRand);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_INVALID_TIMESTAMP, R.string.TUIKitErrorSVRMsgInvalidTimestamp);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_BODY_NOT_ARRAY, R.string.TUIKitErrorSVRMsgBodyNotArray);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_ADMIN_REQUIRED, R.string.TUIKitErrorSVRAccountAdminRequired);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_INVALID_JSON_FORMAT, R.string.TUIKitErrorSVRMsgInvalidJsonFormat);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_TO_ACCOUNT_COUNT_LIMIT, R.string.TUIKitErrorSVRMsgToAccountCountLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_TO_ACCOUNT_NOT_FOUND, R.string.TUIKitErrorSVRMsgToAccountNotFound);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_TIME_LIMIT, R.string.TUIKitErrorSVRMsgTimeLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_INVALID_SYNCOTHERMACHINE, R.string.TUIKitErrorSVRMsgInvalidSyncOtherMachine);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_INVALID_MSGLIFETIME, R.string.TUIkitErrorSVRMsgInvalidMsgLifeTime);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_ACCOUNT_NOT_FOUND, R.string.TUIKirErrorSVRFriendAccountNotFoundEx);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_INTERNAL_ERROR2, R.string.TUIKitErrorSVRAccountInternalError);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_INTERNAL_ERROR3, R.string.TUIKitErrorSVRAccountInternalError);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_INTERNAL_ERROR4, R.string.TUIKitErrorSVRAccountInternalError);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_INTERNAL_ERROR5, R.string.TUIKitErrorSVRAccountInternalError);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_BODY_SIZE_LIMIT, R.string.TUIKitErrorSVRMsgBodySizeLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_MSG_LONGPOLLING_COUNT_LIMIT, R.string.TUIKitErrorSVRmsgLongPollingCountLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_INTERFACE_NOT_SUPPORT, R.string.TUIKitErrorUnsupporInterface);
+
+        // 群组错误码
+        // Group error codes
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_INTERNAL_ERROR, R.string.TUIKitErrorSVRAccountInternalError);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_API_NAME_ERROR, R.string.TUIKitErrorSVRGroupApiNameError);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_INVALID_PARAMETERS, R.string.TUIKitErrorSVRResInvalidParameters);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_ACOUNT_COUNT_LIMIT, R.string.TUIKitErrorSVRGroupAccountCountLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_FREQ_LIMIT, R.string.TUIkitErrorSVRGroupFreqLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_PERMISSION_DENY, R.string.TUIKitErrorSVRGroupPermissionDeny);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_INVALID_REQ, R.string.TUIKitErrorSVRGroupInvalidReq);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_SUPER_NOT_ALLOW_QUIT, R.string.TUIKitErrorSVRGroupSuperNotAllowQuit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_NOT_FOUND, R.string.TUIKitErrorSVRGroupNotFound);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_JSON_PARSE_FAILED, R.string.TUIKitErrorSVRGroupJsonParseFailed);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_INVALID_ID, R.string.TUIKitErrorSVRGroupInvalidId);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_ALLREADY_MEMBER, R.string.TUIKitErrorSVRGroupAllreadyMember);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_FULL_MEMBER_COUNT, R.string.TUIKitErrorSVRGroupFullMemberCount);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_INVALID_GROUPID, R.string.TUIKitErrorSVRGroupInvalidGroupId);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_REJECT_FROM_THIRDPARTY, R.string.TUIKitErrorSVRGroupRejectFromThirdParty);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_SHUTUP_DENY, R.string.TUIKitErrorSVRGroupShutDeny);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_RSP_SIZE_LIMIT, R.string.TUIKitErrorSVRGroupRspSizeLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_ACCOUNT_NOT_FOUND, R.string.TUIKitErrorSVRGroupAccountNotFound);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_GROUPID_IN_USED, R.string.TUIKitErrorSVRGroupGroupIdInUse);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_SEND_MSG_FREQ_LIMIT, R.string.TUIKitErrorSVRGroupSendMsgFreqLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_REQ_ALLREADY_BEEN_PROCESSED, R.string.TUIKitErrorSVRGroupReqAllreadyBeenProcessed);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_GROUPID_IN_USED_FOR_SUPER, R.string.TUIKitErrorSVRGroupGroupIdUserdForSuper);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_SDKAPPID_DENY, R.string.TUIKitErrorSVRGroupSDkAppidDeny);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_REVOKE_MSG_NOT_FOUND, R.string.TUIKitErrorSVRGroupRevokeMsgNotFound);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_REVOKE_MSG_TIME_LIMIT, R.string.TUIKitErrorSVRGroupRevokeMsgTimeLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_REVOKE_MSG_DENY, R.string.TUIKitErrorSVRGroupRevokeMsgDeny);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_NOT_ALLOW_REVOKE_MSG, R.string.TUIKitErrorSVRGroupNotAllowRevokeMsg);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_REMOVE_MSG_DENY, R.string.TUIKitErrorSVRGroupRemoveMsgDeny);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_NOT_ALLOW_REMOVE_MSG, R.string.TUIKitErrorSVRGroupNotAllowRemoveMsg);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_AVCHATROOM_COUNT_LIMIT, R.string.TUIKitErrorSVRGroupAvchatRoomCountLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_COUNT_LIMIT, R.string.TUIKitErrorSVRGroupCountLimit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SVR_GROUP_MEMBER_COUNT_LIMIT, R.string.TUIKitErrorSVRGroupMemberCountLimit);
+
+        /////////////////////////////////////////////////////////////////////////////////
+        //
+        //                      （三）V3版本错误码，待废弃
+        //                           IM SDK V3 error codes,to be abandoned
+        //
+        /////////////////////////////////////////////////////////////////////////////////
+
+        ERROR_CODE_MAP.put(BaseConstants.ERR_NO_SUCC_RESULT, R.string.TUIKitErrorSVRNoSuccessResult);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_TO_USER_INVALID, R.string.TUIKitErrorSVRToUserInvalid);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_INIT_CORE_FAIL, R.string.TUIKitErrorSVRInitCoreFail);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_EXPIRED_SESSION_NODE, R.string.TUIKitErrorExpiredSessionNode);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_LOGGED_OUT_BEFORE_LOGIN_FINISHED, R.string.TUIKitErrorLoggedOutBeforeLoginFinished);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_TLSSDK_NOT_INITIALIZED, R.string.TUIKitErrorTLSSDKNotInitialized);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_TLSSDK_USER_NOT_FOUND, R.string.TUIKitErrorTLSSDKUserNotFound);
+        //        errorCodeMap.put(BaseConstants.ERR_BIND_FAIL_UNKNOWN:
+        //            return @"QALSDK未知原因BIND失败";
+        //        errorCodeMap.put(BaseConstants.ERR_BIND_FAIL_NO_SSOTICKET:
+        //            return @"缺少SSO票据";
+        //        errorCodeMap.put(BaseConstants.ERR_BIND_FAIL_REPEATD_BIND:
+        //            return @"重复BIND";
+        //        errorCodeMap.put(BaseConstants.ERR_BIND_FAIL_TINYID_NULL:
+        //            return @"tiny为空";
+        //        errorCodeMap.put(BaseConstants.ERR_BIND_FAIL_GUID_NULL:
+        //            return @"guid为空";
+        //        errorCodeMap.put(BaseConstants.ERR_BIND_FAIL_UNPACK_REGPACK_FAILED:
+        //            return @"解注册包失败";
+        ERROR_CODE_MAP.put(BaseConstants.ERR_BIND_FAIL_REG_TIMEOUT, R.string.TUIKitErrorBindFaildRegTimeout);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_BIND_FAIL_ISBINDING, R.string.TUIKitErrorBindFaildIsBinding);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_PACKET_FAIL_UNKNOWN, R.string.TUIKitErrorPacketFailUnknown);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_PACKET_FAIL_REQ_NO_NET, R.string.TUIKitErrorPacketFailReqNoNet);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_PACKET_FAIL_RESP_NO_NET, R.string.TUIKitErrorPacketFailRespNoNet);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_PACKET_FAIL_REQ_NO_AUTH, R.string.TUIKitErrorPacketFailReqNoAuth);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_PACKET_FAIL_SSO_ERR, R.string.TUIKitErrorPacketFailSSOErr);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_PACKET_FAIL_REQ_TIMEOUT, R.string.TUIKitErrorSVRRequestTimeout);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_PACKET_FAIL_RESP_TIMEOUT, R.string.TUIKitErrorPacketFailRespTimeout);
+
+        // errorCodeMap.put(BaseConstants.ERR_PACKET_FAIL_REQ_ON_RESEND:
+        // errorCodeMap.put(BaseConstants.ERR_PACKET_FAIL_RESP_NO_RESEND:
+        // errorCodeMap.put(BaseConstants.ERR_PACKET_FAIL_FLOW_SAVE_FILTERED:
+        // errorCodeMap.put(BaseConstants.ERR_PACKET_FAIL_REQ_OVER_LOAD:
+        // errorCodeMap.put(BaseConstants.ERR_PACKET_FAIL_LOGIC_ERR:
+        ERROR_CODE_MAP.put(BaseConstants.ERR_FRIENDSHIP_PROXY_NOT_SYNCED, R.string.TUIKitErrorFriendshipProxySyncing);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_FRIENDSHIP_PROXY_SYNCING, R.string.TUIKitErrorFriendshipProxySyncing);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_FRIENDSHIP_PROXY_SYNCED_FAIL, R.string.TUIKitErrorFriendshipProxySyncedFail);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_FRIENDSHIP_PROXY_LOCAL_CHECK_ERR, R.string.TUIKitErrorFriendshipProxyLocalCheckErr);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_GROUP_INVALID_FIELD, R.string.TUIKitErrorGroupInvalidField);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_GROUP_STORAGE_DISABLED, R.string.TUIKitErrorGroupStoreageDisabled);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_LOADGRPINFO_FAILED, R.string.TUIKitErrorLoadGrpInfoFailed);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_REQ_NO_NET_ON_REQ, R.string.TUIKitErrorReqNoNetOnReq);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_REQ_NO_NET_ON_RSP, R.string.TUIKitErrorReqNoNetOnResp);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SERIVCE_NOT_READY, R.string.TUIKitErrorServiceNotReady);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_LOGIN_AUTH_FAILED, R.string.TUIKitErrorLoginAuthFailed);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_NEVER_CONNECT_AFTER_LAUNCH, R.string.TUIKitErrorNeverConnectAfterLaunch);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_REQ_FAILED, R.string.TUIKitErrorReqFailed);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_REQ_INVALID_REQ, R.string.TUIKitErrorReqInvaidReq);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_REQ_OVERLOADED, R.string.TUIKitErrorReqOnverLoaded);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_REQ_KICK_OFF, R.string.TUIKitErrorReqKickOff);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_REQ_SERVICE_SUSPEND, R.string.TUIKitErrorReqServiceSuspend);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_REQ_INVALID_SIGN, R.string.TUIKitErrorReqInvalidSign);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_REQ_INVALID_COOKIE, R.string.TUIKitErrorReqInvalidCookie);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_LOGIN_TLS_RSP_PARSE_FAILED, R.string.TUIKitErrorLoginTlsRspParseFailed);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_LOGIN_OPENMSG_TIMEOUT, R.string.TUIKitErrorLoginOpenMsgTimeout);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_LOGIN_OPENMSG_RSP_PARSE_FAILED, R.string.TUIKitErrorLoginOpenMsgRspParseFailed);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_LOGIN_TLS_DECRYPT_FAILED, R.string.TUIKitErrorLoginTslDecryptFailed);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_WIFI_NEED_AUTH, R.string.TUIKitErrorWifiNeedAuth);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_USER_CANCELED, R.string.TUIKitErrorUserCanceled);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_REVOKE_TIME_LIMIT_EXCEED, R.string.TUIkitErrorRevokeTimeLimitExceed);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_LACK_UGC_EXT, R.string.TUIKitErrorLackUGExt);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_AUTOLOGIN_NEED_USERSIG, R.string.TUIKitErrorAutoLoginNeedUserSig);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_QAL_NO_SHORT_CONN_AVAILABLE, R.string.TUIKitErrorQALNoShortConneAvailable);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_REQ_CONTENT_ATTACK, R.string.TUIKitErrorReqContentAttach);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_LOGIN_SIG_EXPIRE, R.string.TUIKitErrorLoginSigExpire);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_SDK_HAD_INITIALIZED, R.string.TUIKitErrorSDKHadInit);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_OPENBDH_BASE, R.string.TUIKitErrorOpenBDHBase);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_REQUEST_NO_NET_ONREQ, R.string.TUIKitErrorRequestNoNetOnReq);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_REQUEST_NO_NET_ONRSP, R.string.TUIKitErrorRequestNoNetOnRsp);
+        //        errorCodeMap.put(BaseConstants.ERR_REQUEST_FAILED:
+        //            return @"QAL执行失败";
+        //        errorCodeMap.put(BaseConstants.ERR_REQUEST_INVALID_REQ:
+        //            return @"请求非法，toMsgService非法";
+        ERROR_CODE_MAP.put(BaseConstants.ERR_REQUEST_OVERLOADED, R.string.TUIKitErrorRequestOnverLoaded);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_REQUEST_KICK_OFF, R.string.TUIKitErrorReqKickOff);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_REQUEST_SERVICE_SUSPEND, R.string.TUIKitErrorReqServiceSuspend);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_REQUEST_INVALID_SIGN, R.string.TUIKitErrorReqInvalidSign);
+        ERROR_CODE_MAP.put(BaseConstants.ERR_REQUEST_INVALID_COOKIE, R.string.TUIKitErrorReqInvalidCookie);
+    }
+
+    public static String convertIMError(int code, String msg) {
+        Integer errorStringId = ERROR_CODE_MAP.get(code);
+        if (errorStringId != null) {
+            return getLocalizedString(errorStringId);
+        }
+        return msg;
+    }
+
+    private static String getLocalizedString(int errStringId) {
+        return TUIConfig.getAppContext().getString(errStringId);
+    }
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/util/PermissionRequester.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/util/PermissionRequester.java
new file mode 100644
index 0000000..8c11f1c
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/util/PermissionRequester.java
@@ -0,0 +1,611 @@
+package com.tencent.qcloud.tuicore.util;
+
+import android.Manifest;
+import android.app.ActionBar;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.ImageView;
+import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.StringDef;
+import androidx.core.content.ContextCompat;
+import com.tencent.qcloud.tuicore.R;
+import com.tencent.qcloud.tuicore.TUIConfig;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public final class PermissionRequester {
+    private static final List<String> PERMISSIONS = getPermissions();
+
+    private static PermissionRequester instance;
+    private static Context applicationContext;
+    private SimpleCallback mSimpleCallback;
+    private FullCallback mFullCallback;
+    private PermissionDialogCallback mDialogCallback;
+    private Set<String> mPermissions;
+    private List<String> mPermissionsRequest;
+    private String mCurrentRequestPermission;
+    private List<String> mPermissionsGranted;
+    private List<String> mPermissionsDenied;
+
+    private static boolean isRequesting = false;
+
+    private String mReason;
+    private String mReasonTitle;
+    private String mDeniedAlert;
+    private int mIconId;
+
+    private static final Map<String, PermissionRequestContent> permissionRequestContentMap = new HashMap<>();
+
+    public static class PermissionRequestContent {
+        int iconResId;
+        String reasonTitle;
+        String reason;
+        String deniedAlert;
+
+        public void setReasonTitle(String reasonTitle) {
+            this.reasonTitle = reasonTitle;
+        }
+
+        public void setReason(String reason) {
+            this.reason = reason;
+        }
+
+        public void setIconResId(int iconResId) {
+            this.iconResId = iconResId;
+        }
+
+        public void setDeniedAlert(String deniedAlert) {
+            this.deniedAlert = deniedAlert;
+        }
+    }
+
+    public static void setPermissionRequestContent(String permission, PermissionRequestContent content) {
+        permissionRequestContentMap.put(permission, content);
+    }
+
+    /**
+     * Return the permissions used in application.
+     *
+     * @return the permissions used in application
+     */
+    public static List<String> getPermissions() {
+        return getPermissions(getApplicationContext().getPackageName());
+    }
+
+    /**
+     * Return the permissions used in application.
+     *
+     * @param packageName The name of the package.
+     * @return the permissions used in application
+     */
+    public static List<String> getPermissions(final String packageName) {
+        PackageManager pm = getApplicationContext().getPackageManager();
+        try {
+            String[] permissions = pm.getPackageInfo(packageName, PackageManager.GET_PERMISSIONS).requestedPermissions;
+            if (permissions == null) {
+                return Collections.emptyList();
+            }
+            return Arrays.asList(permissions);
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+            return Collections.emptyList();
+        }
+    }
+
+    public static boolean isGranted(final String... permissions) {
+        for (String permission : permissions) {
+            if (!isGranted(permission)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private static boolean isGranted(final String permission) {
+        return TUIBuild.getVersionInt() < Build.VERSION_CODES.M
+            || PackageManager.PERMISSION_GRANTED == ContextCompat.checkSelfPermission(getApplicationContext(), permission);
+    }
+
+    /**
+     * Launch the application's details settings.
+     */
+    public static void launchAppDetailsSettings() {
+        Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+        intent.setData(Uri.parse("package:" + getApplicationContext().getPackageName()));
+        if (!isIntentAvailable(intent)) {
+            return;
+        }
+        getApplicationContext().startActivity(intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+    }
+
+    /**
+     * Set the permissions.
+     *
+     * @param permission The permissions.
+     * @return the single {@link PermissionRequester} instance
+     */
+    public static PermissionRequester permission(@PermissionConstants.Permission final String permission) {
+        return new PermissionRequester(permission);
+    }
+
+    private static boolean isIntentAvailable(final Intent intent) {
+        return getApplicationContext().getPackageManager().queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY).size() > 0;
+    }
+
+    private PermissionRequester(final String permission) {
+        mPermissions = new LinkedHashSet<>();
+        mCurrentRequestPermission = permission;
+        for (String aPermission : PermissionConstants.getPermissions(permission)) {
+            if (PERMISSIONS.contains(aPermission)) {
+                mPermissions.add(aPermission);
+            }
+        }
+    }
+
+    /**
+     * Set the simple call back.
+     *
+     * @param callback the simple call back
+     * @return the single {@link PermissionRequester} instance
+     */
+    public PermissionRequester callback(final SimpleCallback callback) {
+        mSimpleCallback = callback;
+        return this;
+    }
+
+    /**
+     * Set the full call back.
+     *
+     * @param callback the full call back
+     * @return the single {@link PermissionRequester} instance
+     */
+    public PermissionRequester callback(final FullCallback callback) {
+        mFullCallback = callback;
+        return this;
+    }
+
+    public PermissionRequester reason(String reason) {
+        mReason = reason;
+        return this;
+    }
+
+    public PermissionRequester reasonTitle(String reasonTitle) {
+        mReasonTitle = reasonTitle;
+        return this;
+    }
+
+    public PermissionRequester deniedAlert(String deniedAlert) {
+        mDeniedAlert = deniedAlert;
+        return this;
+    }
+
+    public PermissionRequester reasonIcon(int iconId) {
+        mIconId = iconId;
+        return this;
+    }
+
+    public PermissionRequester permissionDialogCallback(PermissionDialogCallback callback) {
+        mDialogCallback = callback;
+        return this;
+    }
+
+    public void request() {
+        if (isRequesting) {
+            return;
+        }
+        isRequesting = true;
+        instance = this;
+        mPermissionsGranted = new ArrayList<>();
+        mPermissionsRequest = new ArrayList<>();
+        if (TUIBuild.getVersionInt() < Build.VERSION_CODES.M) {
+            mPermissionsGranted.addAll(mPermissions);
+            isRequesting = false;
+            requestCallback();
+            mDialogCallback = null;
+        } else {
+            for (String permission : mPermissions) {
+                if (isGranted(permission)) {
+                    mPermissionsGranted.add(permission);
+                } else {
+                    mPermissionsRequest.add(permission);
+                }
+            }
+            if (mPermissionsRequest.isEmpty()) {
+                isRequesting = false;
+                requestCallback();
+                mDialogCallback = null;
+            } else {
+                startPermissionActivity();
+            }
+        }
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    private void startPermissionActivity() {
+        mPermissionsDenied = new ArrayList<>();
+        Context context = getApplicationContext();
+        if (context == null) {
+            return;
+        }
+        Intent intent = new Intent(context, PermissionActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(intent);
+    }
+
+    private void getPermissionsStatus() {
+        for (String permission : mPermissionsRequest) {
+            if (isGranted(permission)) {
+                mPermissionsGranted.add(permission);
+            } else {
+                mPermissionsDenied.add(permission);
+            }
+        }
+    }
+
+    private void requestCallback() {
+        if (mSimpleCallback != null) {
+            if (mPermissionsRequest.size() == 0 || mPermissions.size() == mPermissionsGranted.size()) {
+                mSimpleCallback.onGranted();
+            } else {
+                if (!mPermissionsDenied.isEmpty()) {
+                    mSimpleCallback.onDenied();
+                }
+            }
+            mSimpleCallback = null;
+        }
+        if (mFullCallback != null) {
+            if (mPermissionsRequest.size() == 0 || mPermissions.size() == mPermissionsGranted.size()) {
+                mFullCallback.onGranted(mPermissionsGranted);
+            } else {
+                if (!mPermissionsDenied.isEmpty()) {
+                    mFullCallback.onDenied(mPermissionsDenied);
+                }
+            }
+            mFullCallback = null;
+        }
+    }
+
+    private void onRequestPermissionsResult(final Activity activity) {
+        getPermissionsStatus();
+        if (!mPermissionsDenied.isEmpty()) {
+            showPermissionDialog(activity, new PermissionDialogCallback() {
+                @Override
+                public void onApproved() {
+                    if (mDialogCallback != null) {
+                        mDialogCallback.onApproved();
+                    }
+                    mDialogCallback = null;
+                    launchAppDetailsSettings();
+                }
+
+                @Override
+                public void onRefused() {
+                    if (mDialogCallback != null) {
+                        mDialogCallback.onRefused();
+                    }
+                    mDialogCallback = null;
+                }
+            });
+        } else {
+            isRequesting = false;
+            mDialogCallback = null;
+            activity.finish();
+        }
+
+        requestCallback();
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    public static class PermissionActivity extends Activity {
+        private View mContentView;
+
+        @Override
+        protected void onCreate(@Nullable Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            if (TUIBuild.getVersionInt() >= Build.VERSION_CODES.LOLLIPOP) {
+                View decorView = getWindow().getDecorView();
+                decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+                getWindow().setStatusBarColor(Color.TRANSPARENT);
+                getWindow().setNavigationBarColor(Color.TRANSPARENT);
+            }
+            ActionBar actionBar = getActionBar();
+            if (actionBar != null) {
+                actionBar.hide();
+            }
+
+            requestPermission();
+        }
+
+        private void requestPermission() {
+            if (instance.mPermissionsRequest != null) {
+                int size = instance.mPermissionsRequest.size();
+                if (size <= 0) {
+                    instance.onRequestPermissionsResult(this);
+                } else {
+                    fillContentView();
+                    requestPermissions(instance.mPermissionsRequest.toArray(new String[size]), 1);
+                }
+            }
+        }
+
+        private void fillContentView() {
+            PermissionRequestContent info = permissionRequestContentMap.get(instance.mCurrentRequestPermission);
+            int iconResId = instance.mIconId;
+            String reasonTitle = instance.mReasonTitle;
+            String reason = instance.mReason;
+            if (info != null) {
+                if (info.iconResId != 0) {
+                    iconResId = info.iconResId;
+                }
+                if (!TextUtils.isEmpty(info.reasonTitle)) {
+                    reasonTitle = info.reasonTitle;
+                }
+                if (!TextUtils.isEmpty(info.reason)) {
+                    reason = info.reason;
+                }
+            }
+            if (TextUtils.isEmpty(reason)) {
+                return;
+            }
+            setContentView(R.layout.permission_activity_layout);
+            mContentView = findViewById(R.id.tuicore_permission_layout);
+            TextView permissionReasonTitle = findViewById(R.id.permission_reason_title);
+            TextView permissionReason = findViewById(R.id.permission_reason);
+            ImageView permissionIcon = findViewById(R.id.permission_icon);
+            permissionReasonTitle.setText(reasonTitle);
+            permissionReason.setText(reason);
+            if (iconResId != 0) {
+                permissionIcon.setBackgroundResource(iconResId);
+            }
+        }
+
+        private void hideContentView() {
+            if (mContentView != null) {
+                mContentView.setVisibility(View.INVISIBLE);
+            }
+        }
+
+        @Override
+        public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+            if (instance.mPermissionsRequest != null) {
+                hideContentView();
+                instance.onRequestPermissionsResult(this);
+            }
+        }
+
+        @Override
+        public boolean dispatchTouchEvent(MotionEvent ev) {
+            return super.dispatchTouchEvent(ev);
+        }
+
+        @Override
+        public boolean onTouchEvent(MotionEvent event) {
+            return true;
+        }
+
+        @Override
+        protected void onDestroy() {
+            super.onDestroy();
+            isRequesting = false;
+        }
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // interface
+    ///////////////////////////////////////////////////////////////////////////
+
+    public interface SimpleCallback {
+        void onGranted();
+
+        void onDenied();
+    }
+
+    public interface FullCallback {
+        void onGranted(List<String> permissionsGranted);
+
+        void onDenied(List<String> permissionsDenied);
+    }
+
+    public static final class PermissionConstants {
+        public static final String CALENDAR = Manifest.permission_group.CALENDAR;
+        public static final String CAMERA = Manifest.permission_group.CAMERA;
+        public static final String CONTACTS = Manifest.permission_group.CONTACTS;
+        public static final String LOCATION = Manifest.permission_group.LOCATION;
+        public static final String MICROPHONE = Manifest.permission_group.MICROPHONE;
+        public static final String PHONE = Manifest.permission_group.PHONE;
+        public static final String SENSORS = Manifest.permission_group.SENSORS;
+        public static final String SMS = Manifest.permission_group.SMS;
+        public static final String STORAGE = Manifest.permission_group.STORAGE;
+
+        private static final String[] GROUP_CALENDAR = {Manifest.permission.READ_CALENDAR, Manifest.permission.WRITE_CALENDAR};
+        private static final String[] GROUP_CAMERA = {Manifest.permission.CAMERA};
+        private static final String[] GROUP_CONTACTS = {
+            Manifest.permission.READ_CONTACTS, Manifest.permission.WRITE_CONTACTS, Manifest.permission.GET_ACCOUNTS};
+        private static final String[] GROUP_LOCATION = {Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION};
+        private static final String[] GROUP_MICROPHONE = {Manifest.permission.RECORD_AUDIO};
+        private static final String[] GROUP_PHONE = {Manifest.permission.READ_PHONE_STATE, Manifest.permission.READ_PHONE_NUMBERS,
+            Manifest.permission.CALL_PHONE, Manifest.permission.READ_CALL_LOG, Manifest.permission.WRITE_CALL_LOG, Manifest.permission.ADD_VOICEMAIL,
+            Manifest.permission.USE_SIP, Manifest.permission.PROCESS_OUTGOING_CALLS, Manifest.permission.ANSWER_PHONE_CALLS};
+        private static final String[] GROUP_PHONE_BELOW_O = {Manifest.permission.READ_PHONE_STATE, Manifest.permission.READ_PHONE_NUMBERS,
+            Manifest.permission.CALL_PHONE, Manifest.permission.READ_CALL_LOG, Manifest.permission.WRITE_CALL_LOG, Manifest.permission.ADD_VOICEMAIL,
+            Manifest.permission.USE_SIP, Manifest.permission.PROCESS_OUTGOING_CALLS};
+        private static final String[] GROUP_SENSORS = {Manifest.permission.BODY_SENSORS};
+        private static final String[] GROUP_SMS = {
+            Manifest.permission.SEND_SMS,
+            Manifest.permission.RECEIVE_SMS,
+            Manifest.permission.READ_SMS,
+            Manifest.permission.RECEIVE_WAP_PUSH,
+            Manifest.permission.RECEIVE_MMS,
+        };
+        private static final String[] GROUP_STORAGE = {
+            Manifest.permission.READ_EXTERNAL_STORAGE,
+            Manifest.permission.WRITE_EXTERNAL_STORAGE,
+        };
+
+        @StringDef({
+            CALENDAR,
+            CAMERA,
+            CONTACTS,
+            LOCATION,
+            MICROPHONE,
+            PHONE,
+            SENSORS,
+            SMS,
+            STORAGE,
+        })
+        @Retention(RetentionPolicy.SOURCE)
+        public @interface Permission {}
+
+        public static String[] getPermissions(@Permission final String permission) {
+            switch (permission) {
+                case CALENDAR:
+                    return GROUP_CALENDAR;
+                case CAMERA:
+                    return GROUP_CAMERA;
+                case CONTACTS:
+                    return GROUP_CONTACTS;
+                case LOCATION:
+                    return GROUP_LOCATION;
+                case MICROPHONE:
+                    return GROUP_MICROPHONE;
+                case PHONE:
+                    if (TUIBuild.getVersionInt() < Build.VERSION_CODES.O) {
+                        return GROUP_PHONE_BELOW_O;
+                    } else {
+                        return GROUP_PHONE;
+                    }
+                case SENSORS:
+                    return GROUP_SENSORS;
+                case SMS:
+                    return GROUP_SMS;
+                case STORAGE:
+                    return GROUP_STORAGE;
+                default:
+                    break;
+            }
+            return new String[] {permission};
+        }
+    }
+
+    private static Context getApplicationContext() {
+        if (applicationContext == null) {
+            applicationContext = TUIConfig.getAppContext();
+        }
+        return applicationContext;
+    }
+
+    public void showPermissionDialog(Activity activity, PermissionDialogCallback callback) {
+        PermissionRequestContent info = permissionRequestContentMap.get(instance.mCurrentRequestPermission);
+        String deniedAlert = mDeniedAlert;
+        if (info != null) {
+            if (!TextUtils.isEmpty(info.deniedAlert)) {
+                deniedAlert = info.deniedAlert;
+            }
+        }
+
+        if (TextUtils.isEmpty(deniedAlert)) {
+            deniedAlert = mReason;
+        }
+
+        if (TextUtils.isEmpty(deniedAlert)) {
+            isRequesting = false;
+            activity.finish();
+            callback.onRefused();
+            return;
+        }
+
+        activity.setContentView(R.layout.permission_activity_layout);
+
+        View itemPop = LayoutInflater.from(activity).inflate(R.layout.permission_tip_layout, null);
+        TextView tipsTv = itemPop.findViewById(R.id.tips);
+        TextView positiveBtn = itemPop.findViewById(R.id.positive_btn);
+        TextView negativeBtn = itemPop.findViewById(R.id.negative_btn);
+        tipsTv.setText(deniedAlert);
+
+        Dialog permissionTipDialog = new AlertDialog.Builder(activity)
+                                         .setView(itemPop)
+                                         .setCancelable(false)
+                                         .setOnDismissListener(new DialogInterface.OnDismissListener() {
+                                             @Override
+                                             public void onDismiss(DialogInterface dialog) {
+                                                 isRequesting = false;
+                                             }
+                                         })
+                                         .create();
+
+        positiveBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                isRequesting = false;
+                permissionTipDialog.cancel();
+                activity.finish();
+                callback.onApproved();
+            }
+        });
+
+        negativeBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                isRequesting = false;
+                permissionTipDialog.cancel();
+                activity.finish();
+                callback.onRefused();
+            }
+        });
+        permissionTipDialog.setOnKeyListener(new DialogInterface.OnKeyListener() {
+            @Override
+            public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
+                if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN) {
+                    isRequesting = false;
+                    permissionTipDialog.cancel();
+                    activity.finish();
+                    callback.onRefused();
+                }
+                return false;
+            }
+        });
+
+        permissionTipDialog.show();
+        Window dialogWindow = permissionTipDialog.getWindow();
+        dialogWindow.setBackgroundDrawable(new ColorDrawable());
+        WindowManager.LayoutParams layoutParams = dialogWindow.getAttributes();
+        layoutParams.width = WindowManager.LayoutParams.WRAP_CONTENT;
+        layoutParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
+        dialogWindow.setAttributes(layoutParams);
+    }
+
+    public interface PermissionDialogCallback {
+        void onApproved();
+
+        void onRefused();
+    }
+}
\ No newline at end of file
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/util/SPUtils.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/util/SPUtils.java
new file mode 100644
index 0000000..489d934
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/util/SPUtils.java
@@ -0,0 +1,197 @@
+package com.tencent.qcloud.tuicore.util;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import androidx.annotation.NonNull;
+import com.tencent.qcloud.tuicore.ServiceInitializer;
+import java.util.HashMap;
+import java.util.Map;
+
+public class SPUtils {
+    public static final String DEFAULT_DATABASE = "tuikit";
+    private static final Map<String, SPUtils> SP_UTILS_MAP = new HashMap<>();
+
+    private final SharedPreferences mSharedPreferences;
+
+    public static SPUtils getInstance() {
+        return getInstance(DEFAULT_DATABASE, Context.MODE_PRIVATE);
+    }
+
+    public static SPUtils getInstance(final int mode) {
+        return getInstance(DEFAULT_DATABASE, mode);
+    }
+
+    public static SPUtils getInstance(String spName) {
+        return getInstance(spName, Context.MODE_PRIVATE);
+    }
+
+    public static SPUtils getInstance(String spName, final int mode) {
+        if (isSpace(spName)) {
+            spName = DEFAULT_DATABASE;
+        }
+        SPUtils spUtils = SP_UTILS_MAP.get(spName);
+        if (spUtils == null) {
+            synchronized (SPUtils.class) {
+                spUtils = SP_UTILS_MAP.get(spName);
+                if (spUtils == null) {
+                    spUtils = new SPUtils(spName, mode);
+                    SP_UTILS_MAP.put(spName, spUtils);
+                }
+            }
+        }
+        return spUtils;
+    }
+
+    private SPUtils(final String spName, final int mode) {
+        mSharedPreferences = getApplicationContext().getSharedPreferences(spName, mode);
+    }
+
+    private Context getApplicationContext() {
+        return ServiceInitializer.getAppContext();
+    }
+
+    public String getString(@NonNull final String key) {
+        return getString(key, "");
+    }
+
+    public String getString(@NonNull final String key, final String defaultValue) {
+        return mSharedPreferences.getString(key, defaultValue);
+    }
+
+    // String
+    public void put(@NonNull final String key, final String value) {
+        put(key, value, false);
+    }
+
+    public void put(@NonNull final String key, final String value, final boolean isCommit) {
+        if (isCommit) {
+            mSharedPreferences.edit().putString(key, value).commit();
+        } else {
+            mSharedPreferences.edit().putString(key, value).apply();
+        }
+    }
+
+    // boolean
+    public void put(@NonNull final String key, final boolean value) {
+        put(key, value, false);
+    }
+
+    public void put(@NonNull final String key, final boolean value, final boolean isCommit) {
+        if (isCommit) {
+            mSharedPreferences.edit().putBoolean(key, value).commit();
+        } else {
+            mSharedPreferences.edit().putBoolean(key, value).apply();
+        }
+    }
+
+    // int
+    public void put(@NonNull final String key, final int value) {
+        put(key, value, false);
+    }
+
+    public void put(@NonNull final String key, final int value, final boolean isCommit) {
+        if (isCommit) {
+            mSharedPreferences.edit().putInt(key, value).commit();
+        } else {
+            mSharedPreferences.edit().putInt(key, value).apply();
+        }
+    }
+
+    // float
+    public void put(@NonNull final String key, final float value) {
+        put(key, value, false);
+    }
+
+    public void put(@NonNull final String key, final float value, final boolean isCommit) {
+        if (isCommit) {
+            mSharedPreferences.edit().putFloat(key, value).commit();
+        } else {
+            mSharedPreferences.edit().putFloat(key, value).apply();
+        }
+    }
+
+    // long
+    public void put(@NonNull final String key, final long value) {
+        put(key, value, false);
+    }
+
+    public void put(@NonNull final String key, final long value, final boolean isCommit) {
+        if (isCommit) {
+            mSharedPreferences.edit().putLong(key, value).commit();
+        } else {
+            mSharedPreferences.edit().putLong(key, value).apply();
+        }
+    }
+
+    public boolean getBoolean(@NonNull final String key) {
+        return getBoolean(key, false);
+    }
+
+    public boolean getBoolean(@NonNull final String key, final boolean defaultValue) {
+        return mSharedPreferences.getBoolean(key, defaultValue);
+    }
+
+    public int getInt(@NonNull final String key) {
+        return getInt(key, -1);
+    }
+
+    public int getInt(@NonNull final String key, final int defaultValue) {
+        return mSharedPreferences.getInt(key, defaultValue);
+    }
+
+    public float getFloat(@NonNull final String key) {
+        return getFloat(key, -1f);
+    }
+
+    public float getFloat(@NonNull final String key, final float defaultValue) {
+        return mSharedPreferences.getFloat(key, defaultValue);
+    }
+
+    public long getLong(@NonNull final String key) {
+        return getLong(key, -1L);
+    }
+
+    public long getLong(@NonNull final String key, final long defaultValue) {
+        return mSharedPreferences.getLong(key, defaultValue);
+    }
+
+    public boolean contains(@NonNull final String key) {
+        return mSharedPreferences.contains(key);
+    }
+
+    public void remove(@NonNull final String key) {
+        remove(key, false);
+    }
+
+    public void remove(@NonNull final String key, final boolean isCommit) {
+        if (isCommit) {
+            mSharedPreferences.edit().remove(key).commit();
+        } else {
+            mSharedPreferences.edit().remove(key).apply();
+        }
+    }
+
+    public void clear() {
+        clear(false);
+    }
+
+    public void clear(final boolean isCommit) {
+        if (isCommit) {
+            mSharedPreferences.edit().clear().commit();
+        } else {
+            mSharedPreferences.edit().clear().apply();
+        }
+    }
+
+    private static boolean isSpace(final String s) {
+        if (s == null) {
+            return true;
+        }
+        for (int i = 0, len = s.length(); i < len; ++i) {
+            if (!Character.isWhitespace(s.charAt(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/util/ScreenUtil.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/util/ScreenUtil.java
new file mode 100644
index 0000000..be22a47
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/util/ScreenUtil.java
@@ -0,0 +1,83 @@
+package com.tencent.qcloud.tuicore.util;
+
+import android.content.Context;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.Display;
+import android.view.WindowManager;
+import com.tencent.qcloud.tuicore.TUIConfig;
+
+public class ScreenUtil {
+    private static final String TAG = ScreenUtil.class.getSimpleName();
+
+    public static int getScreenHeight(Context context) {
+        DisplayMetrics metric = new DisplayMetrics();
+        WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+        wm.getDefaultDisplay().getMetrics(metric);
+        return metric.heightPixels;
+    }
+
+    public static int getScreenWidth(Context context) {
+        DisplayMetrics metric = new DisplayMetrics();
+        WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+        wm.getDefaultDisplay().getMetrics(metric);
+        return metric.widthPixels;
+    }
+
+    public static int getPxByDp(float dp) {
+        float scale = TUIConfig.getAppContext().getResources().getDisplayMetrics().density;
+        return (int) (dp * scale + 0.5f);
+    }
+
+    public static int getRealScreenHeight(Context context) {
+        WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+        Display display = wm.getDefaultDisplay();
+        DisplayMetrics dm = new DisplayMetrics();
+        display.getRealMetrics(dm);
+        return dm.heightPixels;
+    }
+
+    public static int getRealScreenWidth(Context context) {
+        WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+        Display display = wm.getDefaultDisplay();
+        DisplayMetrics dm = new DisplayMetrics();
+        display.getRealMetrics(dm);
+        return dm.widthPixels;
+    }
+
+    public static int getNavigationBarHeight(Context context) {
+        int resourceId = context.getResources().getIdentifier("navigation_bar_height", "dimen", "android");
+        if (resourceId > 0) {
+            return context.getResources().getDimensionPixelSize(resourceId);
+        }
+        return 0;
+    }
+
+    public static int[] scaledSize(int containerWidth, int containerHeight, int realWidth, int realHeight) {
+        Log.i(TAG,
+            "scaledSize  containerWidth: " + containerWidth + " containerHeight: " + containerHeight + " realWidth: " + realWidth
+                + " realHeight: " + realHeight);
+        float deviceRate = (float) containerWidth / (float) containerHeight;
+        float rate = (float) realWidth / (float) realHeight;
+        int width = 0;
+        int height = 0;
+        if (rate < deviceRate) {
+            height = containerHeight;
+            width = (int) (containerHeight * rate);
+        } else {
+            width = containerWidth;
+            height = (int) (containerWidth / rate);
+        }
+        return new int[] {width, height};
+    }
+
+    public static int dip2px(float dpValue) {
+        final float scale = TUIConfig.getAppContext().getResources().getDisplayMetrics().density;
+        return (int) (dpValue * scale + 0.5f);
+    }
+
+    public static float dp2px(float dpValue, DisplayMetrics displayMetrics) {
+        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dpValue, displayMetrics);
+    }
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/util/TUIBuild.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/util/TUIBuild.java
new file mode 100644
index 0000000..86d36c7
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/util/TUIBuild.java
@@ -0,0 +1,187 @@
+package com.tencent.qcloud.tuicore.util;
+
+import android.os.Build;
+import android.util.Log;
+
+public final class TUIBuild {
+    private static final String TAG = "TUIBuild";
+
+    private static String MODEL = ""; // Build.MODEL;
+    private static String BRAND = ""; // Build.BRAND;
+    private static String DEVICE = ""; // Build.DEVICE;
+    private static String MANUFACTURER = ""; // Build.MANUFACTURER;
+    private static String HARDWARE = ""; // Build.HARDWARE;
+    private static String VERSION = ""; // Build.VERSION.RELEASE;
+    private static String BOARD = ""; // Build.BOARD;
+    private static String VERSION_INCREMENTAL = ""; // Build.VERSION.INCREMENTAL
+    private static int VERSION_INT = 0; // Build.VERSION.SDK_INT;
+
+    public static void setModel(final String model) {
+        synchronized (TUIBuild.class) {
+            MODEL = model;
+        }
+    }
+
+    public static String getModel() {
+        if (MODEL == null || MODEL.isEmpty()) {
+            synchronized (TUIBuild.class) {
+                if (MODEL == null || MODEL.isEmpty()) {
+                    MODEL = Build.MODEL;
+                    Log.i(TAG, "get MODEL by Build.MODEL :" + MODEL);
+                }
+            }
+        }
+        return MODEL;
+    }
+
+    public static void setBrand(final String brand) {
+        synchronized (TUIBuild.class) {
+            BRAND = brand;
+        }
+    }
+
+    public static String getBrand() {
+        if (BRAND == null || BRAND.isEmpty()) {
+            synchronized (TUIBuild.class) {
+                if (BRAND == null || BRAND.isEmpty()) {
+                    BRAND = Build.BRAND;
+                    Log.i(TAG, "get BRAND by Build.BRAND :" + BRAND);
+                }
+            }
+        }
+
+        return BRAND;
+    }
+
+    public static void setDevice(final String device) {
+        synchronized (TUIBuild.class) {
+            DEVICE = device;
+        }
+    }
+
+    public static String getDevice() {
+        if (DEVICE == null || DEVICE.isEmpty()) {
+            synchronized (TUIBuild.class) {
+                if (DEVICE == null || DEVICE.isEmpty()) {
+                    DEVICE = Build.DEVICE;
+                    Log.i(TAG, "get DEVICE by Build.DEVICE :" + DEVICE);
+                }
+            }
+        }
+
+        return DEVICE;
+    }
+
+    public static void setManufacturer(final String manufacturer) {
+        synchronized (TUIBuild.class) {
+            MANUFACTURER = manufacturer;
+        }
+    }
+
+    public static String getManufacturer() {
+        if (MANUFACTURER == null || MANUFACTURER.isEmpty()) {
+            synchronized (TUIBuild.class) {
+                if (MANUFACTURER == null || MANUFACTURER.isEmpty()) {
+                    MANUFACTURER = Build.MANUFACTURER;
+                    Log.i(TAG, "get MANUFACTURER by Build.MANUFACTURER :" + MANUFACTURER);
+                }
+            }
+        }
+
+        return MANUFACTURER;
+    }
+
+    public static void setHardware(final String hardware) {
+        synchronized (TUIBuild.class) {
+            HARDWARE = hardware;
+        }
+    }
+
+    public static String getHardware() {
+        if (HARDWARE == null || HARDWARE.isEmpty()) {
+            synchronized (TUIBuild.class) {
+                if (HARDWARE == null || HARDWARE.isEmpty()) {
+                    HARDWARE = Build.HARDWARE;
+                    Log.i(TAG, "get HARDWARE by Build.HARDWARE :" + HARDWARE);
+                }
+            }
+        }
+
+        return HARDWARE;
+    }
+
+    public static void setVersion(final String version) {
+        synchronized (TUIBuild.class) {
+            VERSION = version;
+        }
+    }
+
+    public static String getVersion() {
+        if (VERSION == null || VERSION.isEmpty()) {
+            synchronized (TUIBuild.class) {
+                if (VERSION == null || VERSION.isEmpty()) {
+                    VERSION = Build.VERSION.RELEASE;
+                    Log.i(TAG, "get VERSION by Build.VERSION.RELEASE :" + VERSION);
+                }
+            }
+        }
+
+        return VERSION;
+    }
+
+    public static void setVersionInt(final int versionInt) {
+        synchronized (TUIBuild.class) {
+            VERSION_INT = versionInt;
+        }
+    }
+
+    public static int getVersionInt() {
+        if (VERSION_INT == 0) {
+            synchronized (TUIBuild.class) {
+                if (VERSION_INT == 0) {
+                    VERSION_INT = Build.VERSION.SDK_INT;
+                    Log.i(TAG, "get VERSION_INT by Build.VERSION.SDK_INT :" + VERSION_INT);
+                }
+            }
+        }
+
+        return VERSION_INT;
+    }
+
+    public static void setVersionIncremental(final String versionIncremental) {
+        synchronized (TUIBuild.class) {
+            VERSION_INCREMENTAL = versionIncremental;
+        }
+    }
+
+    public static String getVersionIncremental() {
+        if (VERSION_INCREMENTAL == null || VERSION_INCREMENTAL.isEmpty()) {
+            synchronized (TUIBuild.class) {
+                if (VERSION_INCREMENTAL == null || VERSION_INCREMENTAL.isEmpty()) {
+                    VERSION_INCREMENTAL = Build.VERSION.INCREMENTAL;
+                    Log.i(TAG, "get VERSION_INCREMENTAL by Build.VERSION.INCREMENTAL :" + VERSION_INCREMENTAL);
+                }
+            }
+        }
+        return VERSION_INCREMENTAL;
+    }
+
+    public static void setBoard(final String board) {
+        synchronized (TUIBuild.class) {
+            BOARD = board;
+        }
+    }
+
+    public static String getBoard() {
+        if (BOARD == null || BOARD.isEmpty()) {
+            synchronized (TUIBuild.class) {
+                if (BOARD == null || BOARD.isEmpty()) {
+                    BOARD = Build.BOARD;
+                    Log.i(TAG, "get BOARD by Build.BOARD :" + BOARD);
+                }
+            }
+        }
+
+        return BOARD;
+    }
+}
diff --git a/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/util/ToastUtil.java b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/util/ToastUtil.java
new file mode 100644
index 0000000..78c8f9e
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/java/com/tencent/qcloud/tuicore/util/ToastUtil.java
@@ -0,0 +1,48 @@
+package com.tencent.qcloud.tuicore.util;
+
+import android.os.Handler;
+import android.os.Looper;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
+import com.tencent.qcloud.tuicore.ServiceInitializer;
+
+public class ToastUtil {
+    private static final Handler handler = new Handler(Looper.getMainLooper());
+    private static Toast toast;
+
+    public static void toastLongMessage(final String message) {
+        toastMessage(message, true, Gravity.BOTTOM);
+    }
+
+    public static void toastShortMessage(final String message) {
+        toastMessage(message, false, Gravity.BOTTOM);
+    }
+
+    public static void show(final String message, boolean isLong, int gravity) {
+        toastMessage(message, isLong, gravity);
+    }
+
+    private static void toastMessage(final String message, boolean isLong, int gravity) {
+        handler.post(new Runnable() {
+            @Override
+            public void run() {
+                if (toast != null) {
+                    toast.cancel();
+                    toast = null;
+                }
+                toast = Toast.makeText(ServiceInitializer.getAppContext(), message, isLong ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT);
+                toast.setGravity(gravity, 0, 0);
+                View view = toast.getView();
+                if (view != null) {
+                    TextView textView = view.findViewById(android.R.id.message);
+                    if (textView != null) {
+                        textView.setGravity(Gravity.CENTER);
+                    }
+                }
+                toast.show();
+            }
+        });
+    }
+}
diff --git a/system/tuicore-7.3.4358/src/main/res-light/values/light_colors.xml b/system/tuicore-7.3.4358/src/main/res-light/values/light_colors.xml
new file mode 100644
index 0000000..fa6a814
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/res-light/values/light_colors.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- 颜色规范 start -->
+    <color name="core_light_bg_title_text_color_light">#FF000000</color>
+    <color name="core_light_bg_primary_text_color_light">#FF444444</color>
+    <color name="core_light_bg_secondary_text_color_light">#FF888888</color>
+    <color name="core_light_bg_secondary2_text_color_light">#FF999999</color>
+    <color name="core_light_bg_disable_text_color_light">#FFBBBBBB</color>
+    <color name="core_dark_bg_primary_text_color_light">#FFFFFFFF</color>
+
+    <color name="core_primary_bg_color_light">#FFFFFFFF</color>
+    <color name="core_bg_color_light">#FFF2F3F5</color>
+    <color name="core_primary_color_light">#FF147AFF</color>
+    <color name="core_error_tip_color_light">#FFFF584C</color>
+    <color name="core_success_tip_color_light">#FF26CB3E</color>
+    <color name="core_bubble_bg_color_light">#FFDCEAFD</color>
+    <color name="core_divide_color_light">#FFE5E5E5</color>
+    <color name="core_border_color_light">#FFDDDDDD</color>
+    <color name="core_header_start_color_light">#FFEBF0F6</color>
+    <color name="core_header_end_color_light">#FFEBF0F6</color>
+    <color name="core_header_text_color_light">#FF000000</color>
+
+    <color name="core_btn_normal_color_light">#FF147AFF</color>
+    <color name="core_btn_pressed_color_light">#FF0064E7</color>
+    <color name="core_btn_disable_color_light">#4D147AFF</color>
+    <!-- 颜色规范 end -->
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicore-7.3.4358/src/main/res-light/values/light_styles.xml b/system/tuicore-7.3.4358/src/main/res-light/values/light_styles.xml
new file mode 100644
index 0000000..4407685
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/res-light/values/light_styles.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TUIBaseLightTheme" parent="@style/TUIBaseTheme">
+        <!-- 颜色规范 start -->
+        <item name="core_light_bg_title_text_color">@color/core_light_bg_title_text_color_light</item>
+        <item name="core_light_bg_primary_text_color">@color/core_light_bg_primary_text_color_light</item>
+        <item name="core_light_bg_secondary_text_color">@color/core_light_bg_secondary_text_color_light</item>
+        <item name="core_light_bg_secondary2_text_color">@color/core_light_bg_secondary2_text_color_light</item>
+        <item name="core_light_bg_disable_text_color">@color/core_light_bg_disable_text_color_light</item>
+        <item name="core_dark_bg_primary_text_color">@color/core_dark_bg_primary_text_color_light</item>
+        <item name="core_primary_bg_color">@color/core_primary_bg_color_light</item>
+        <item name="core_bg_color">@color/core_bg_color_light</item>
+        <item name="core_primary_color">@color/core_primary_color_light</item>
+        <item name="core_error_tip_color">@color/core_error_tip_color_light</item>
+        <item name="core_success_tip_color">@color/core_success_tip_color_light</item>
+        <item name="core_bubble_bg_color">@color/core_bubble_bg_color_light</item>
+        <item name="core_divide_color">@color/core_divide_color_light</item>
+        <item name="core_border_color">@color/core_border_color_light</item>
+        <item name="core_header_start_color">@color/core_header_start_color_light</item>
+        <item name="core_header_end_color">@color/core_header_end_color_light</item>
+        <item name="core_header_text_color">@color/core_header_text_color_light</item>
+        <item name="core_btn_normal_color">@color/core_btn_normal_color_light</item>
+        <item name="core_btn_pressed_color">@color/core_btn_pressed_color_light</item>
+        <item name="core_btn_disable_color">@color/core_btn_disable_color_light</item>
+        <!-- 颜色规范 end -->
+
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicore-7.3.4358/src/main/res-lively/values/lively_colors.xml b/system/tuicore-7.3.4358/src/main/res-lively/values/lively_colors.xml
new file mode 100644
index 0000000..3dc2ed8
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/res-lively/values/lively_colors.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- 颜色规范 start -->
+    <color name="core_light_bg_title_text_color_lively">#FF000000</color>
+    <color name="core_light_bg_primary_text_color_lively">#FF444444</color>
+    <color name="core_light_bg_secondary_text_color_lively">#FF888888</color>
+    <color name="core_light_bg_secondary2_text_color_lively">#FF999999</color>
+    <color name="core_light_bg_disable_text_color_lively">#FFBBBBBB</color>
+    <color name="core_dark_bg_primary_text_color_lively">#FFFFFFFF</color>
+
+    <color name="core_primary_bg_color_lively">#FFFFFFFF</color>
+    <color name="core_bg_color_lively">#FFF2F3F5</color>
+    <color name="core_primary_color_lively">#FFFF8E82</color>
+    <color name="core_error_tip_color_lively">#FFFF584C</color>
+    <color name="core_success_tip_color_lively">#FF26CB3E</color>
+    <color name="core_bubble_bg_color_lively">#FF9D85</color>
+    <color name="core_divide_color_lively">#FFE5E5E5</color>
+    <color name="core_border_color_lively">#FFDDDDDD</color>
+    <color name="core_header_start_color_lively">#FFFF7B7B</color>
+    <color name="core_header_end_color_lively">#FFFFA88B</color>
+    <color name="core_header_text_color_lively">#FFFFFFFF</color>
+
+    <color name="core_btn_normal_color_lively">#FFFF8E82</color>
+    <color name="core_btn_pressed_color_lively">#FFF86657</color>
+    <color name="core_btn_disable_color_lively">#4DFF8E82</color>
+    <!-- 颜色规范 end -->
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicore-7.3.4358/src/main/res-lively/values/lively_styles.xml b/system/tuicore-7.3.4358/src/main/res-lively/values/lively_styles.xml
new file mode 100644
index 0000000..24ba4c9
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/res-lively/values/lively_styles.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TUIBaseLivelyTheme" parent="@style/TUIBaseTheme">
+        <!-- 颜色规范 start -->
+        <item name="core_light_bg_title_text_color">@color/core_light_bg_title_text_color_lively</item>
+        <item name="core_light_bg_primary_text_color">@color/core_light_bg_primary_text_color_lively</item>
+        <item name="core_light_bg_secondary_text_color">@color/core_light_bg_secondary_text_color_lively</item>
+        <item name="core_light_bg_secondary2_text_color">@color/core_light_bg_secondary2_text_color_lively</item>
+        <item name="core_light_bg_disable_text_color">@color/core_light_bg_disable_text_color_lively</item>
+        <item name="core_dark_bg_primary_text_color">@color/core_dark_bg_primary_text_color_lively</item>
+        <item name="core_primary_bg_color">@color/core_primary_bg_color_lively</item>
+        <item name="core_bg_color">@color/core_bg_color_lively</item>
+        <item name="core_primary_color">@color/core_primary_color_lively</item>
+        <item name="core_error_tip_color">@color/core_error_tip_color_lively</item>
+        <item name="core_success_tip_color">@color/core_success_tip_color_lively</item>
+        <item name="core_bubble_bg_color">@color/core_bubble_bg_color_lively</item>
+        <item name="core_divide_color">@color/core_divide_color_lively</item>
+        <item name="core_border_color">@color/core_border_color_lively</item>
+        <item name="core_header_start_color">@color/core_header_start_color_lively</item>
+        <item name="core_header_end_color">@color/core_header_end_color_lively</item>
+        <item name="core_header_text_color">@color/core_header_text_color_lively</item>
+        <item name="core_btn_normal_color">@color/core_btn_normal_color_lively</item>
+        <item name="core_btn_pressed_color">@color/core_btn_pressed_color_lively</item>
+        <item name="core_btn_disable_color">@color/core_btn_disable_color_lively</item>
+        <!-- 颜色规范 end -->
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicore-7.3.4358/src/main/res-serious/values/serious_colors.xml b/system/tuicore-7.3.4358/src/main/res-serious/values/serious_colors.xml
new file mode 100644
index 0000000..ff8576c
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/res-serious/values/serious_colors.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- 颜色规范 start -->
+    <color name="core_light_bg_title_text_color_serious">#FF000000</color>
+    <color name="core_light_bg_primary_text_color_serious">#FF444444</color>
+    <color name="core_light_bg_secondary_text_color_serious">#FF888888</color>
+    <color name="core_light_bg_secondary2_text_color_serious">#FF999999</color>
+    <color name="core_light_bg_disable_text_color_serious">#FFBBBBBB</color>
+    <color name="core_dark_bg_primary_text_color_serious">#FFFFFFFF</color>
+
+    <color name="core_primary_bg_color_serious">#FFFFFFFF</color>
+    <color name="core_bg_color_serious">#FFF2F3F5</color>
+    <color name="core_primary_color_serious">#FF0052FF</color>
+    <color name="core_error_tip_color_serious">#FFFF584C</color>
+    <color name="core_success_tip_color_serious">#FF26CB3E</color>
+    <color name="core_bubble_bg_color_serious">#FF4F87FF</color>
+    <color name="core_divide_color_serious">#FFE5E5E5</color>
+    <color name="core_border_color_serious">#FFDDDDDD</color>
+    <color name="core_header_start_color_serious">#FF6395FF</color>
+    <color name="core_header_end_color_serious">#FF0052FF</color>
+    <color name="core_header_text_color_serious">#FFFFFFFF</color>
+
+    <color name="core_btn_normal_color_serious">#FF0052FF</color>
+    <color name="core_btn_pressed_color_serious">#FF0049E4</color>
+    <color name="core_btn_disable_color_serious">#4D0052FF</color>
+    <!-- 颜色规范 end -->
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicore-7.3.4358/src/main/res-serious/values/serious_styles.xml b/system/tuicore-7.3.4358/src/main/res-serious/values/serious_styles.xml
new file mode 100644
index 0000000..275451c
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/res-serious/values/serious_styles.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TUIBaseSeriousTheme" parent="@style/TUIBaseTheme">
+
+        <!-- 颜色规范 start -->
+        <item name="core_light_bg_title_text_color">@color/core_light_bg_title_text_color_serious</item>
+        <item name="core_light_bg_primary_text_color">@color/core_light_bg_primary_text_color_serious</item>
+        <item name="core_light_bg_secondary_text_color">@color/core_light_bg_secondary_text_color_serious</item>
+        <item name="core_light_bg_secondary2_text_color">@color/core_light_bg_secondary2_text_color_serious</item>
+        <item name="core_light_bg_disable_text_color">@color/core_light_bg_disable_text_color_serious</item>
+        <item name="core_dark_bg_primary_text_color">@color/core_dark_bg_primary_text_color_serious</item>
+        <item name="core_primary_bg_color">@color/core_primary_bg_color_serious</item>
+        <item name="core_bg_color">@color/core_bg_color_serious</item>
+        <item name="core_primary_color">@color/core_primary_color_serious</item>
+        <item name="core_error_tip_color">@color/core_error_tip_color_serious</item>
+        <item name="core_success_tip_color">@color/core_success_tip_color_serious</item>
+        <item name="core_bubble_bg_color">@color/core_bubble_bg_color_serious</item>
+        <item name="core_divide_color">@color/core_divide_color_serious</item>
+        <item name="core_border_color">@color/core_border_color_serious</item>
+        <item name="core_header_start_color">@color/core_header_start_color_serious</item>
+        <item name="core_header_end_color">@color/core_header_end_color_serious</item>
+        <item name="core_header_text_color">@color/core_header_text_color_serious</item>
+        <item name="core_btn_normal_color">@color/core_btn_normal_color_serious</item>
+        <item name="core_btn_pressed_color">@color/core_btn_pressed_color_serious</item>
+        <item name="core_btn_disable_color">@color/core_btn_disable_color_serious</item>
+        <!-- 颜色规范 end -->
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicore-7.3.4358/src/main/res/drawable/core_list_divider.xml b/system/tuicore-7.3.4358/src/main/res/drawable/core_list_divider.xml
new file mode 100644
index 0000000..59cf049
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/res/drawable/core_list_divider.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid
+        android:color="#E5E5E5"/>
+
+    <size
+        android:height="0.5dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuicore-7.3.4358/src/main/res/drawable/core_permission_dialog_bg.xml b/system/tuicore-7.3.4358/src/main/res/drawable/core_permission_dialog_bg.xml
new file mode 100644
index 0000000..6328472
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/res/drawable/core_permission_dialog_bg.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white"/>
+    <corners android:radius="7.68dp"/>
+</shape>
\ No newline at end of file
diff --git a/system/tuicore-7.3.4358/src/main/res/layout/permission_activity_layout.xml b/system/tuicore-7.3.4358/src/main/res/layout/permission_activity_layout.xml
new file mode 100644
index 0000000..0ebe1c1
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/res/layout/permission_activity_layout.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/tuicore_permission_layout"
+    android:orientation="vertical"
+    android:background="#BF000000"
+    android:gravity="center_horizontal"
+    android:paddingTop="60dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/permission_icon"
+        android:scaleType="fitCenter"
+        android:layout_gravity="center"
+        android:layout_width="32dp"
+        android:layout_height="32dp"/>
+
+    <TextView
+        android:id="@+id/permission_reason_title"
+        android:textSize="17.28sp"
+        android:textColor="@color/white"
+        android:textStyle="bold"
+        android:layout_marginTop="8dp"
+        android:gravity="center"
+        android:layout_width="240dp"
+        android:layout_height="wrap_content"/>
+
+    <TextView
+        android:id="@+id/permission_reason"
+        android:layout_marginTop="8dp"
+        android:textSize="17sp"
+        android:gravity="center"
+        android:textColor="#BFFFFFFF"
+        android:layout_width="240dp"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuicore-7.3.4358/src/main/res/layout/permission_tip_layout.xml b/system/tuicore-7.3.4358/src/main/res/layout/permission_tip_layout.xml
new file mode 100644
index 0000000..0af5342
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/res/layout/permission_tip_layout.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/core_permission_dialog_bg"
+    android:clickable="true"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/tips_title"
+        android:textSize="15sp"
+        android:textStyle="bold"
+        android:gravity="center"
+        android:textColor="@color/black"
+        android:text="@string/core_permission_dialog_title"
+        android:layout_marginStart="30dp"
+        android:layout_marginEnd="30dp"
+        android:layout_marginTop="20dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <TextView
+        android:id="@+id/tips"
+        android:layout_marginTop="12dp"
+        android:layout_marginStart="30dp"
+        android:layout_marginEnd="30dp"
+        android:layout_marginBottom="20dp"
+        android:textSize="15sp"
+        android:gravity="center"
+        android:textColor="#888888"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <View
+        android:background="#EEEEEE"
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/negative_btn"
+            android:layout_marginTop="15dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:layout_marginBottom="15dp"
+            android:gravity="center"
+            android:textColor="@color/black"
+            android:textStyle="bold"
+            android:textSize="15.55sp"
+            android:text="@string/cancel"
+            android:layout_weight="0.5"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <View
+            android:background="#EEEEEE"
+            android:layout_width="0.5dp"
+            android:layout_height="match_parent"/>
+
+        <TextView
+            android:id="@+id/positive_btn"
+            android:layout_marginTop="15dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:layout_marginBottom="15dp"
+            android:text="@string/core_permission_dialog_positive_setting_text"
+            android:textSize="15.55sp"
+            android:textStyle="bold"
+            android:layout_weight="0.5"
+            android:textColor="?attr/core_primary_color"
+            android:gravity="center"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuicore-7.3.4358/src/main/res/values-zh-rCN/im_error_msg.xml b/system/tuicore-7.3.4358/src/main/res/values-zh-rCN/im_error_msg.xml
new file mode 100644
index 0000000..99593fa
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/res/values-zh-rCN/im_error_msg.xml
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="TUIKitErrorInProcess">执行中</string>
+    <string name="TUIKitErrorInvalidParameters">参数无效</string>
+    <string name="TUIKitErrorIOOperateFaild">操作本地 IO 错误</string>
+    <string name="TUIKitErrorInvalidJson">错误的 JSON 格式</string>
+    <string name="TUIKitErrorOutOfMemory">内存不足</string>
+    <string name="TUIKitErrorParseResponseFaild">PB 解析失败</string>
+    <string name="TUIKitErrorSerializeReqFaild">PB 序列化失败</string>
+    <string name="TUIKitErrorSDKNotInit">IM SDK 未初始化</string>
+    <string name="TUIKitErrorLoadMsgFailed">加载本地数据库操作失败</string>
+    <string name="TUIKitErrorDatabaseOperateFailed">本地数据库操作失败</string>
+    <string name="TUIKitErrorCrossThread">跨线程错误</string>
+    <string name="TUIKitErrorTinyIdEmpty">用户信息为空</string>
+    <string name="TUIKitErrorInvalidIdentifier">Identifier 非法</string>
+    <string name="TUIKitErrorFileNotFound">文件不存在</string>
+    <string name="TUIKitErrorFileTooLarge">文件大小超出了限制</string>
+    <string name="TUIKitErrorEmptyFile">空文件</string>
+    <string name="TUIKitErrorFileOpenFailed">文件打开失败</string>
+    <string name="TUIKitErrorNotLogin">IM SDK 未登陆</string>
+    <string name="TUIKitErrorNoPreviousLogin">并没有登录过该用户</string>
+    <string name="TUIKitErrorUserSigExpired">UserSig 过期</string>
+    <string name="TUIKitErrorLoginKickedOffByOther">其他终端登录同一账号</string>
+    <string name="TUIKitErrorTLSSDKInit">TLS SDK 初始化失败</string>
+    <string name="TUIKitErrorTLSSDKUninit">TLS SDK 未初始化</string>
+    <string name="TUIKitErrorTLSSDKTRANSPackageFormat">TLS SDK TRANS 包格式错误</string>
+    <string name="TUIKitErrorTLSDecrypt">TLS SDK 解密失败</string>
+    <string name="TUIKitErrorTLSSDKRequest">TLS SDK 请求失败</string>
+    <string name="TUIKitErrorTLSSDKRequestTimeout">TLS SDK 请求超时</string>
+    <string name="TUIKitErrorInvalidConveration">会话无效</string>
+    <string name="TUIKitErrorFileTransAuthFailed">文件传输鉴权失败</string>
+    <string name="TUIKitErrorFileTransNoServer">文件传输获取 Server 列表失败</string>
+    <string name="TUIKitErrorFileTransUploadFailed">文件传输上传失败，请检查网络是否连接</string>
+    <string name="TUIKitErrorFileTransUploadFailedNotImage">文件传输上传失败，请检查上传的图片是否能够正常打开</string>
+    <string name="TUIKitErrorFileTransDownloadFailed">文件传输下载失败，请检查网络，或者文件、语音是否已经过期</string>
+    <string name="TUIKitErrorHTTPRequestFailed">HTTP 请求失败</string>
+    <string name="TUIKitErrorInvalidMsgElem">IM SDK 无效消息 elem</string>
+    <string name="TUIKitErrorInvalidSDKObject">无效的对象</string>
+    <string name="TUIKitSDKMsgBodySizeLimit">消息长度超出限制</string>
+    <string name="TUIKitErrorSDKMsgKeyReqDifferRsp">消息 KEY 错误</string>
+    <string name="TUIKitErrorSDKGroupInvalidID">群组 ID 非法，自定义群组 ID 必须为可打印 ASCII 字符（0x20-0x7e），最长48个字节，且前缀不能为 @TGS#</string>
+    <string name="TUIKitErrorSDKGroupInvalidName">群名称非法，群名称最长30字节</string>
+    <string name="TUIKitErrorSDKGroupInvalidIntroduction">群简介非法，群简介最长240字节</string>
+    <string name="TUIKitErrorSDKGroupInvalidNotification">群公告非法，群公告最长300字节</string>
+    <string name="TUIKitErrorSDKGroupInvalidFaceURL">群头像 URL 非法，群头像 URL 最长100字节</string>
+    <string name="TUIKitErrorSDKGroupInvalidNameCard">群名片非法，群名片最长50字节</string>
+    <string name="TUIKitErrorSDKGroupMemberCountLimit">超过群组成员数的限制</string>
+    <string name="TUIKitErrorSDKGroupJoinPrivateGroupDeny">不允许申请加入 Private 群组</string>
+    <string name="TUIKitErrorSDKGroupInviteSuperDeny">不允许邀请角色为群主的成员</string>
+    <string name="TUIKitErrorSDKGroupInviteNoMember">不允许邀请0个成员</string>
+    <string name="TUIKitErrorSDKFriendShipInvalidProfileKey">资料字段非法</string>
+    <string name="TUIKitErrorSDKFriendshipInvalidAddRemark">备注字段非法，最大96字节</string>
+    <string name="TUIKitErrorSDKFriendshipInvalidAddWording">请求添加好友的请求说明字段非法，最大120字节</string>
+    <string name="TUIKitErrorSDKFriendshipInvalidAddSource">请求添加好友的添加来源字段非法，来源需要添加“AddSource_Type_”前缀。</string>
+    <string name="TUIKitErrorSDKFriendshipFriendGroupEmpty">好友分组字段非法，必须不为空，每个分组的名称最长30字节</string>
+    <string name="TUIKitErrorSDKNetEncodeFailed">网络链接加密失败</string>
+    <string name="TUIKitErrorSDKNetDecodeFailed">网络链接解密失败</string>
+    <string name="TUIKitErrorSDKNetAuthInvalid">网络链接未完成鉴权</string>
+    <string name="TUIKitErrorSDKNetCompressFailed">数据包压缩失败</string>
+    <string name="TUIKitErrorSDKNetUncompressFaile">数据包解压失败</string>
+    <string name="TUIKitErrorSDKNetFreqLimit">调用频率限制，最大每秒发起 5 次请求</string>
+    <string name="TUIKitErrorSDKnetReqCountLimit">请求队列満，超过同时请求的数量限制，最大同时发起1000个请求。</string>
+    <string name="TUIKitErrorSDKNetDisconnect">网络已断开，未建立连接，或者建立 socket 连接时，检测到无网络。</string>
+    <string name="TUIKitErrorSDKNetAllreadyConn">网络连接已建立，重复创建连接</string>
+    <string name="TUIKitErrorSDKNetConnTimeout">建立网络连接超时，请等网络恢复后重试。</string>
+    <string name="TUIKitErrorSDKNetConnRefuse">网络连接已被拒绝，请求过于频繁，服务端拒绝服务。</string>
+    <string name="TUIKitErrorSDKNetNetUnreach">没有到达网络的可用路由，请等网络恢复后重试。</string>
+    <string name="TUIKitErrorSDKNetSocketNoBuff">系统中没有足够的缓冲区空间资源可用来完成调用，系统过于繁忙，内部错误。</string>
+    <string name="TUIKitERRORSDKNetResetByPeer">对端重置了连接</string>
+    <string name="TUIKitErrorSDKNetSOcketInvalid">socket 套接字无效</string>
+    <string name="TUIKitErrorSDKNetHostGetAddressFailed">IP 地址解析失败</string>
+    <string name="TUIKitErrorSDKNetConnectReset">网络连接到中间节点或服务端重置</string>
+    <string name="TUIKitErrorSDKNetWaitInQueueTimeout">请求包等待进入待发送队列超时</string>
+    <string name="TUIKitErrorSDKNetWaitSendTimeout">请求包已进入待发送队列，等待进入系统的网络 buffer 超时</string>
+    <string name="TUIKitErrorSDKNetWaitAckTimeut">请求包已进入系统的网络 buffer ，等待服务端回包超时</string>
+    <string name="TUIKitErrorSDKSVRSSOConnectLimit">Server 的连接数量超出限制，服务端拒绝服务。</string>
+    <string name="TUIKitErrorSDKSVRSSOVCode">验证码下发超时。</string>
+    <string name="TUIKitErrorSVRSSOD2Expired">Key 过期。Key 是根据 UserSig 生成的内部票据，Key 的有效期小于或等于 UserSig 的有效期。请重新调用 TIMManager.getInstance().login 登录接口生成新的 Key。</string>
+    <string name="TUIKitErrorSVRA2UpInvalid">Ticket 过期。Ticket 是根据 UserSig 生成的内部票据，Ticket 的有效期小于或等于 UserSig 的有效期。请重新调用 TIMManager.getInstance().login 登录接口生成新的 Ticket。</string>
+    <string name="TUIKitErrorSVRA2DownInvalid">票据验证没通过或者被安全打击。请重新调用 TIMManager.getInstance().login 登录接口生成新的票据。</string>
+    <string name="TUIKitErrorSVRSSOEmpeyKey">不允许空 Key。</string>
+    <string name="TUIKitErrorSVRSSOUinInvalid">Key 中的帐号和请求包头的帐号不匹配。</string>
+    <string name="TUIKitErrorSVRSSOVCodeTimeout">验证码下发超时。</string>
+    <string name="TUIKitErrorSVRSSONoImeiAndA2">需要带上 Key 和 Ticket。</string>
+    <string name="TUIKitErrorSVRSSOCookieInvalid">Cookie 检查不匹配。</string>
+    <string name="TUIKitErrorSVRSSODownTips">下发提示语，Key 过期。</string>
+    <string name="TUIKitErrorSVRSSODisconnect">断链锁屏。</string>
+    <string name="TUIKitErrorSVRSSOIdentifierInvalid">失效身份。</string>
+    <string name="TUIKitErrorSVRSSOClientClose">终端自动退出。</string>
+    <string name="TUIKitErrorSVRSSOMSFSDKQuit">MSFSDK 自动退出。</string>
+    <string name="TUIKitErrorSVRSSOD2KeyWrong">解密失败次数超过阈值，通知终端需要重置，请重新调用 TIMManager.getInstance().login 登录接口生成新的 Key。</string>
+    <string name="TUIKitErrorSVRSSOUnsupport">不支持聚合，给终端返回统一的错误码。终端在该 TCP 长连接上停止聚合。</string>
+    <string name="TUIKitErrorSVRSSOPrepaidArrears">预付费欠费。</string>
+    <string name="TUIKitErrorSVRSSOPacketWrong">请求包格式错误。</string>
+    <string name="TUIKitErrorSVRSSOAppidBlackList">SDKAppID 黑名单。</string>
+    <string name="TUIKitErrorSVRSSOCmdBlackList">SDKAppID 设置 service cmd 黑名单。</string>
+    <string name="TUIKitErrorSVRSSOAppidWithoutUsing">SDKAppID 停用。</string>
+    <string name="TUIKitErrorSVRSSOFreqLimit">频率限制(用户)，频率限制是设置针对某一个协议的每秒请求数的限制。</string>
+    <string name="TUIKitErrorSVRSSOOverload">过载丢包(系统)，连接的服务端处理过多请求，处理不过来，拒绝服务。</string>
+    <string name="TUIKitErrorSVRResNotFound">要发送的资源文件不存在。</string>
+    <string name="TUIKitErrorSVRResAccessDeny">要发送的资源文件不允许访问。</string>
+    <string name="TUIKitErrorSVRResSizeLimit">文件大小超过限制。</string>
+    <string name="TUIKitErrorSVRResSendCancel">用户取消发送，如发送过程中登出等原因。</string>
+    <string name="TUIKitErrorSVRResReadFailed">读取文件内容失败。</string>
+    <string name="TUIKitErrorSVRResTransferTimeout">资源文件传输超时</string>
+    <string name="TUIKitErrorSVRResInvalidParameters">参数非法。</string>
+    <string name="TUIKitErrorSVRResInvalidFileMd5">文件 MD5 校验失败。</string>
+    <string name="TUIKitErrorSVRResInvalidPartMd5">分片 MD5 校验失败。</string>
+    <string name="TUIKitErrorSVRCommonInvalidHttpUrl">HTTP 解析错误 ，请检查 HTTP 请求 URL 格式。</string>
+    <string name="TUIKitErrorSVRCommomReqJsonParseFailed">HTTP 请求 JSON 解析错误，请检查 JSON 格式。</string>
+    <string name="TUIKitErrorSVRCommonInvalidAccount">请求 URI 或 JSON 包体中 Identifier 或 UserSig 错误。</string>
+    <string name="TUIKitErrorSVRCommonInvalidSdkappid">SDKAppID 失效，请核对 SDKAppID 有效性。</string>
+    <string name="TUIKitErrorSVRCommonRestFreqLimit">REST 接口调用频率超过限制，请降低请求频率。</string>
+    <string name="TUIKitErrorSVRCommonRequestTimeout">服务请求超时或 HTTP 请求格式错误，请检查并重试。</string>
+    <string name="TUIKitErrorSVRCommonInvalidRes">请求资源错误，请检查请求 URL。</string>
+    <string name="TUIKitErrorSVRCommonIDNotAdmin">REST API 请求的 Identifier 字段请填写 App 管理员帐号。</string>
+    <string name="TUIKitErrorSVRCommonSdkappidFreqLimit">SDKAppID 请求频率超限，请降低请求频率。</string>
+    <string name="TUIKitErrorSVRCommonSdkappidMiss">REST 接口需要带 SDKAppID，请检查请求 URL 中的 SDKAppID。</string>
+    <string name="TUIKitErrorSVRCommonRspJsonParseFailed">HTTP 响应包 JSON 解析错误。</string>
+    <string name="TUIKitErrorSVRCommonExchangeAccountTimeout">置换帐号超时。</string>
+    <string name="TUIKitErrorSVRCommonInvalidIdFormat">请求包体 Identifier 类型错误，请确认 Identifier 为字符串格式。</string>
+    <string name="TUIKitErrorSVRCommonSDkappidForbidden">SDKAppID 被禁用</string>
+    <string name="TUIKitErrorSVRCommonReqForbidden">请求被禁用</string>
+    <string name="TUIKitErrorSVRCommonReqFreqLimit">请求过于频繁，请稍后重试。</string>
+    <string name="TUIKitErrorSVRCommonInvalidService">未购买套餐包，或套餐包已过期，或购买的套餐包正在配置中暂未生效。请登录 即时通信 IM 购买页面 重新购买套餐包。购买后，将在5分钟后生效。</string>
+    <string name="TUIKitErrorSVRCommonSensitiveText">文本安全打击，文本中可能包含敏感词汇。</string>
+    <string name="TUIKitErrorSVRCommonBodySizeLimit">发消息包体过长，目前支持最大12k消息包体长度，请减少包体大小重试。</string>
+    <string name="TUIKitErrorSVRAccountUserSigExpired">UserSig 已过期，请重新生成 UserSig</string>
+    <string name="TUIKitErrorSVRAccountUserSigEmpty">UserSig 长度为0</string>
+    <string name="TUIKitErrorSVRAccountUserSigCheckFailed">UserSig 校验失败</string>
+    <string name="TUIKitErrorSVRAccountUserSigMismatchPublicKey">用公钥验证 UserSig 失败</string>
+    <string name="TUIKitErrorSVRAccountUserSigMismatchId">请求的 Identifier 与生成 UserSig 的 Identifier 不匹配。</string>
+    <string name="TUIKitErrorSVRAccountUserSigMismatchSdkAppid">请求的 SDKAppID 与生成 UserSig 的 SDKAppID 不匹配。</string>
+    <string name="TUIKitErrorSVRAccountUserSigPublicKeyNotFound">验证 UserSig 时公钥不存在</string>
+    <string name="TUIKitErrorSVRAccountUserSigSdkAppidNotFount">SDKAppID 未找到，请在云通信 IM 控制台确认应用信息。</string>
+    <string name="TUIKitErrorSVRAccountInvalidUserSig">UserSig 已经失效，请重新生成，再次尝试。</string>
+    <string name="TUIKitErrorSVRAccountNotFound">请求的用户帐号不存在。</string>
+    <string name="TUIKitErrorSVRAccountSecRstr">安全原因被限制。</string>
+    <string name="TUIKitErrorSVRAccountInternalTimeout">服务端内部超时，请重试。</string>
+    <string name="TUIKitErrorSVRAccountInvalidCount">请求中批量数量不合法。</string>
+    <string name="TUIkitErrorSVRAccountINvalidParameters">参数非法，请检查必填字段是否填充，或者字段的填充是否满足协议要求。</string>
+    <string name="TUIKitErrorSVRAccountAdminRequired">请求需要 App 管理员权限。</string>
+    <string name="TUIKitErrorSVRAccountLowSDKVersion">您的SDK版本过低，请升级到最新版本。</string>
+    <string name="TUIKitErrorSVRAccountFreqLimit">因失败且重试次数过多导致被限制，请检查 UserSig 是否正确，一分钟之后再试。</string>
+    <string name="TUIKitErrorSVRAccountBlackList">帐号被拉入黑名单。</string>
+    <string name="TUIKitErrorSVRAccountCountLimit">创建帐号数量超过免费体验版数量限制，请升级为专业版。</string>
+    <string name="TUIKitErrorSVRAccountInternalError">服务端内部错误，请重试。</string>
+    <string name="TUIKitErrorSVRProfileInvalidParameters">请求参数错误，请根据错误描述检查请求是否正确。</string>
+    <string name="TUIKitErrorSVRProfileAccountMiss">请求参数错误，没有指定需要拉取资料的用户帐号。</string>
+    <string name="TUIKitErrorSVRProfileAccountNotFound">请求的用户帐号不存在。</string>
+    <string name="TUIKitErrorSVRProfileAdminRequired">请求需要 App 管理员权限。</string>
+    <string name="TUIKitErrorSVRProfileSensitiveText">资料字段中包含敏感词。</string>
+    <string name="TUIKitErrorSVRProfileInternalError">服务端内部错误，请稍后重试。</string>
+    <string name="TUIKitErrorSVRProfileReadWritePermissionRequired">没有资料字段的读权限，详情可参见 资料字段。</string>
+    <string name="TUIKitErrorSVRProfileTagNotFound">资料字段的 Tag 不存在。</string>
+    <string name="TUIKitErrorSVRProfileSizeLimit">资料字段的 Value 长度超过500字节。</string>
+    <string name="TUIKitErrorSVRProfileValueError">标配资料字段的 Value 错误，详情可参见 标配资料字段。</string>
+    <string name="TUIKitErrorSVRProfileInvalidValueFormat">资料字段的 Value 类型不匹配，详情可参见 标配资料字段。</string>
+    <string name="TUIKitErrorSVRFriendshipInvalidParameters">请求参数错误，请根据错误描述检查请求是否正确。</string>
+    <string name="TUIKitErrorSVRFriendshipInvalidSdkAppid">SDKAppID 不匹配。</string>
+    <string name="TUIKitErrorSVRFriendshipAccountNotFound">请求的用户帐号不存在。</string>
+    <string name="TUIKitErrorSVRFriendshipAdminRequired">请求需要 App 管理员权限。</string>
+    <string name="TUIKitErrorSVRFriendshipSensitiveText">关系链字段中包含敏感词。</string>
+    <string name="TUIKitErrorSVRFriendshipNetTimeout">网络超时，请稍后重试。</string>
+    <string name="TUIKitErrorSVRFriendshipWriteConflict">并发写导致写冲突，建议使用批量方式。</string>
+    <string name="TUIKitErrorSVRFriendshipAddFriendDeny">后台禁止该用户发起加好友请求。</string>
+    <string name="TUIkitErrorSVRFriendshipCountLimit">自己的好友数已达系统上限。</string>
+    <string name="TUIKitErrorSVRFriendshipGroupCountLimit">分组已达系统上限。</string>
+    <string name="TUIKitErrorSVRFriendshipPendencyLimit">未决数已达系统上限。</string>
+    <string name="TUIKitErrorSVRFriendshipBlacklistLimit">黑名单数已达系统上限。</string>
+    <string name="TUIKitErrorSVRFriendshipPeerFriendLimit">对方的好友数已达系统上限。</string>
+    <string name="TUIKitErrorSVRFriendshipInSelfBlacklist">对方在自己的黑名单中，不允许加好友。</string>
+    <string name="TUIKitErrorSVRFriendshipAllowTypeDenyAny">对方的加好友验证方式是不允许任何人添加自己为好友。</string>
+    <string name="TUIKitErrorSVRFriendshipInPeerBlackList">自己在对方的黑名单中，不允许加好友。</string>
+    <string name="TUIKitErrorSVRFriendshipAllowTypeNeedConfirm">请求已发送，等待对方同意</string>
+    <string name="TUIKitErrorSVRFriendshipAddFriendSecRstr">添加好友请求被安全策略打击，请勿频繁发起添加好友请求。</string>
+    <string name="TUIKitErrorSVRFriendshipPendencyNotFound">请求的未决不存在。</string>
+    <string name="TUIKitErrorSVRFriendshipDelFriendSecRstr">删除好友请求被安全策略打击，请勿频繁发起删除好友请求。</string>
+    <string name="TUIKirErrorSVRFriendAccountNotFoundEx">请求的用户帐号不存在。</string>
+    <string name="TUIKitErrorSVRMsgPkgParseFailed">解析请求包失败。</string>
+    <string name="TUIKitErrorSVRMsgInternalAuthFailed">内部鉴权失败。</string>
+    <string name="TUIKitErrorSVRMsgInvalidId">Identifier 无效</string>
+    <string name="TUIKitErrorSVRMsgNetError">网络异常，请重试。</string>
+    <string name="TUIKitErrorSVRMsgPushDeny">触发发送单聊消息之前回调，App 后台返回禁止下发该消息。</string>
+    <string name="TUIKitErrorSVRMsgInPeerBlackList">发送单聊消息，被对方拉黑，禁止发送。</string>
+    <string name="TUIKitErrorSVRMsgBothNotFriend">消息发送双方互相不是好友，禁止发送。</string>
+    <string name="TUIKitErrorSVRMsgNotPeerFriend">发送单聊消息，自己不是对方的好友（单向关系），禁止发送。</string>
+    <string name="TUIkitErrorSVRMsgNotSelfFriend">发送单聊消息，对方不是自己的好友（单向关系），禁止发送。</string>
+    <string name="TUIKitErrorSVRMsgShutupDeny">因禁言，禁止发送消息。</string>
+    <string name="TUIKitErrorSVRMsgRevokeTimeLimit">消息撤回超过了时间限制（默认2分钟）。</string>
+    <string name="TUIKitErrorSVRMsgDelRambleInternalError">删除漫游内部错误。</string>
+    <string name="TUIKitErrorSVRMsgJsonParseFailed">JSON 格式解析失败，请检查请求包是否符合 JSON 规范。</string>
+    <string name="TUIKitErrorSVRMsgInvalidJsonBodyFormat">JSON 格式请求包中 MsgBody 不符合消息格式描述</string>
+    <string name="TUIKitErrorSVRMsgInvalidToAccount">JSON 格式请求包体中缺少 To_Account 字段或者 To_Account 字段不是 Integer 类型</string>
+    <string name="TUIKitErrorSVRMsgInvalidRand">JSON 格式请求包体中缺少 MsgRandom 字段或者 MsgRandom 字段不是 Integer 类型</string>
+    <string name="TUIKitErrorSVRMsgInvalidTimestamp">JSON 格式请求包体中缺少 MsgTimeStamp 字段或者 MsgTimeStamp 字段不是 Integer 类型</string>
+    <string name="TUIKitErrorSVRMsgBodyNotArray">JSON 格式请求包体中 MsgBody 类型不是 Array 类型</string>
+    <string name="TUIKitErrorSVRMsgInvalidJsonFormat">JSON 格式请求包不符合消息格式描述</string>
+    <string name="TUIKitErrorSVRMsgToAccountCountLimit">批量发消息目标帐号超过500</string>
+    <string name="TUIKitErrorSVRMsgToAccountNotFound">To_Account 没有注册或不存在</string>
+    <string name="TUIKitErrorSVRMsgTimeLimit">消息离线存储时间错误（最多不能超过7天）。</string>
+    <string name="TUIKitErrorSVRMsgInvalidSyncOtherMachine">JSON 格式请求包体中 SyncOtherMachine 字段不是 Integer 类型</string>
+    <string name="TUIkitErrorSVRMsgInvalidMsgLifeTime">JSON 格式请求包体中 MsgLifeTime 字段不是 Integer 类型</string>
+    <string name="TUIKitErrorSVRMsgBodySizeLimit">JSON 数据包超长，消息包体请不要超过12k。</string>
+    <string name="TUIKitErrorSVRmsgLongPollingCountLimit">Web 端长轮询被踢（Web 端同时在线实例个数超出限制）。</string>
+    <string name="TUIKitErrorUnsupporInterface">该功能仅限旗舰版使用，请升级至旗舰版。</string>
+    <string name="TUIKitErrorUnsupporInterfaceSuffix">功能仅限旗舰版使用，请升级至旗舰版。</string>
+
+    <string name="TUIKitErrorSVRGroupApiNameError">请求中的接口名称错误</string>
+    <string name="TUIKitErrorSVRGroupAccountCountLimit">请求包体中携带的帐号数量过多。</string>
+    <string name="TUIkitErrorSVRGroupFreqLimit">操作频率限制，请尝试降低调用的频率。</string>
+    <string name="TUIKitErrorSVRGroupPermissionDeny">操作权限不足</string>
+    <string name="TUIKitErrorSVRGroupInvalidReq">请求非法</string>
+    <string name="TUIKitErrorSVRGroupSuperNotAllowQuit">该群不允许群主主动退出。</string>
+    <string name="TUIKitErrorSVRGroupNotFound">群组不存在</string>
+    <string name="TUIKitErrorSVRGroupJsonParseFailed">解析 JSON 包体失败，请检查包体的格式是否符合 JSON 格式。</string>
+    <string name="TUIKitErrorSVRGroupInvalidId">发起操作的 Identifier 非法，请检查发起操作的用户 Identifier 是否填写正确。</string>
+    <string name="TUIKitErrorSVRGroupAllreadyMember">被邀请加入的用户已经是群成员。</string>
+    <string name="TUIKitErrorSVRGroupFullMemberCount">群已满员，无法将请求中的用户加入群组</string>
+    <string name="TUIKitErrorSVRGroupInvalidGroupId">群组 ID 非法，请检查群组 ID 是否填写正确。</string>
+    <string name="TUIKitErrorSVRGroupRejectFromThirdParty">App 后台通过第三方回调拒绝本次操作。</string>
+    <string name="TUIKitErrorSVRGroupShutDeny">因被禁言而不能发送消息，请检查发送者是否被设置禁言。</string>
+    <string name="TUIKitErrorSVRGroupRspSizeLimit">应答包长度超过最大包长</string>
+    <string name="TUIKitErrorSVRGroupAccountNotFound">请求的用户帐号不存在。</string>
+    <string name="TUIKitErrorSVRGroupGroupIdInUse">群组 ID 已被使用，请选择其他的群组 ID。</string>
+    <string name="TUIKitErrorSVRGroupSendMsgFreqLimit">发消息的频率超限，请延长两次发消息时间的间隔。</string>
+    <string name="TUIKitErrorSVRGroupReqAllreadyBeenProcessed">此邀请或者申请请求已经被处理。</string>
+    <string name="TUIKitErrorSVRGroupGroupIdUserdForSuper">群组 ID 已被使用，并且操作者为群主，可以直接使用。</string>
+    <string name="TUIKitErrorSVRGroupSDkAppidDeny">该 SDKAppID 请求的命令字已被禁用</string>
+    <string name="TUIKitErrorSVRGroupRevokeMsgNotFound">请求撤回的消息不存在。</string>
+    <string name="TUIKitErrorSVRGroupRevokeMsgTimeLimit">消息撤回超过了时间限制（默认2分钟）。</string>
+    <string name="TUIKitErrorSVRGroupRevokeMsgDeny">请求撤回的消息不支持撤回操作。</string>
+    <string name="TUIKitErrorSVRGroupNotAllowRevokeMsg">群组类型不支持消息撤回操作。</string>
+    <string name="TUIKitErrorSVRGroupRemoveMsgDeny">该消息类型不支持删除操作。</string>
+    <string name="TUIKitErrorSVRGroupNotAllowRemoveMsg">音视频聊天室和在线成员广播大群不支持删除消息。</string>
+    <string name="TUIKitErrorSVRGroupAvchatRoomCountLimit">音视频聊天室创建数量超过了限制</string>
+    <string name="TUIKitErrorSVRGroupCountLimit">单个用户可创建和加入的群组数量超过了限制”。</string>
+    <string name="TUIKitErrorSVRGroupMemberCountLimit">群成员数量超过限制</string>
+    <string name="TUIKitErrorSVRNoSuccessResult">批量操作无成功结果</string>
+    <string name="TUIKitErrorSVRToUserInvalid">IM: 无效接收方</string>
+    <string name="TUIKitErrorSVRRequestTimeout">请求超时</string>
+    <string name="TUIKitErrorSVRInitCoreFail">INIT CORE模块失败</string>
+    <string name="TUIKitErrorExpiredSessionNode">SessionNode为null</string>
+    <string name="TUIKitErrorLoggedOutBeforeLoginFinished">在登录完成前进行了登出（在登录时返回）</string>
+    <string name="TUIKitErrorTLSSDKNotInitialized">tlssdk未初始化</string>
+    <string name="TUIKitErrorTLSSDKUserNotFound">TLSSDK没有找到相应的用户信息</string>
+    <string name="TUIKitErrorBindFaildRegTimeout">注册超时</string>
+    <string name="TUIKitErrorBindFaildIsBinding">正在bind操作中</string>
+    <string name="TUIKitErrorPacketFailUnknown">发包未知错误</string>
+    <string name="TUIKitErrorPacketFailReqNoNet">发送请求包时没有网络,处理时转换成case ERR_REQ_NO_NET_ON_REQ:</string>
+    <string name="TUIKitErrorPacketFailRespNoNet">发送回复包时没有网络,处理时转换成case ERR_REQ_NO_NET_ON_RSP:</string>
+    <string name="TUIKitErrorPacketFailReqNoAuth">发送请求包时没有权限</string>
+    <string name="TUIKitErrorPacketFailSSOErr">SSO错误</string>
+    <string name="TUIKitErrorPacketFailRespTimeout">回复超时</string>
+    <string name="TUIKitErrorFriendshipProxySyncing">proxy_manager没有完成svr数据同步</string>
+    <string name="TUIKitErrorFriendshipProxySyncedFail">proxy_manager同步失败</string>
+    <string name="TUIKitErrorFriendshipProxyLocalCheckErr">proxy_manager请求参数，在本地检查不合法</string>
+    <string name="TUIKitErrorGroupInvalidField">group assistant请求字段中包含非预设字段</string>
+    <string name="TUIKitErrorGroupStoreageDisabled">group assistant群资料本地存储没有开启</string>
+    <string name="TUIKitErrorLoadGrpInfoFailed">无法从存储中加载groupinfo</string>
+    <string name="TUIKitErrorReqNoNetOnReq">请求的时候没有网络</string>
+    <string name="TUIKitErrorReqNoNetOnResp">响应的时候没有网络</string>
+    <string name="TUIKitErrorServiceNotReady">QALSDK服务未就绪</string>
+    <string name="TUIKitErrorLoginAuthFailed">账号认证失败（用户信息获取失败）</string>
+    <string name="TUIKitErrorNeverConnectAfterLaunch">在应用启动后没有尝试联网</string>
+    <string name="TUIKitErrorReqFailed">QAL执行失败</string>
+    <string name="TUIKitErrorReqInvaidReq">请求非法，toMsgService非法</string>
+    <string name="TUIKitErrorReqOnverLoaded">请求队列满</string>
+    <string name="TUIKitErrorReqKickOff">已经被其他终端踢了</string>
+    <string name="TUIKitErrorReqServiceSuspend">服务被暂停</string>
+    <string name="TUIKitErrorReqInvalidSign">SSO签名错误</string>
+    <string name="TUIKitErrorReqInvalidCookie">SSO cookie无效</string>
+    <string name="TUIKitErrorLoginTlsRspParseFailed">登录时TLS回包校验，包体长度错误</string>
+    <string name="TUIKitErrorLoginOpenMsgTimeout">登录时OPENSTATSVC向OPENMSG上报状态超时</string>
+    <string name="TUIKitErrorLoginOpenMsgRspParseFailed">登录时OPENSTATSVC向OPENMSG上报状态时解析回包失败</string>
+    <string name="TUIKitErrorLoginTslDecryptFailed">登录时TLS解密失败</string>
+    <string name="TUIKitErrorWifiNeedAuth">wifi需要认证</string>
+    <string name="TUIKitErrorUserCanceled">用户已取消</string>
+    <string name="TUIkitErrorRevokeTimeLimitExceed">消息撤回超过了时间限制（默认2分钟）</string>
+    <string name="TUIKitErrorLackUGExt">缺少UGC扩展包</string>
+    <string name="TUIKitErrorAutoLoginNeedUserSig">自动登录，本地票据过期，需要userSig手动登录</string>
+    <string name="TUIKitErrorQALNoShortConneAvailable">没有可用的短连接sso</string>
+    <string name="TUIKitErrorReqContentAttach">消息内容安全打击</string>
+    <string name="TUIKitErrorLoginSigExpire">登录返回，票据过期</string>
+    <string name="TUIKitErrorSDKHadInit">SDK 已经初始化无需重复初始化</string>
+    <string name="TUIKitErrorOpenBDHBase">openbdh 错误码</string>
+    <string name="TUIKitErrorRequestNoNetOnReq">请求时没有网络，请等网络恢复后重试</string>
+    <string name="TUIKitErrorRequestNoNetOnRsp">响应时没有网络，请等网络恢复后重试</string>
+    <string name="TUIKitErrorRequestOnverLoaded">请求队列満</string>
+    <string name="TUIKitErrorEnableUserStatusOnConsole">您未开启用户状态功能，请先登录控制台开启</string>
+</resources>
\ No newline at end of file
diff --git a/system/tuicore-7.3.4358/src/main/res/values-zh-rCN/strings.xml b/system/tuicore-7.3.4358/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..4bc405e
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="open_file_tips">选择要打开此文件的应用</string>
+
+    <string name="sure">确定</string>
+    <string name="cancel">取消</string>
+    <string name="core_permission_dialog_title">权限申请</string>
+    <string name="core_permission_dialog_positive_setting_text">去设置</string>
+    <string name="date_year_short">年</string>
+    <string name="date_month_short">月</string>
+    <string name="date_day_short">天</string>
+    <string name="date_hour_short">时</string>
+    <string name="date_minute_short">分</string>
+    <string name="date_second_short">秒</string>
+    <string name="date_yesterday">昨天</string>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicore-7.3.4358/src/main/res/values/attrs.xml b/system/tuicore-7.3.4358/src/main/res/values/attrs.xml
new file mode 100644
index 0000000..ae6abdb
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/res/values/attrs.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="UserIconView">
+        <!--默认头像-->
+        <attr name="default_image" format="reference" />
+        <attr name="image_radius" format="dimension" />
+    </declare-styleable>
+
+    <declare-styleable name="SynthesizedImageView">
+        <!--合成图片的背景-->
+        <attr name="synthesized_image_bg" format="color" />
+        <!--合成图片的默认图片-->
+        <attr name="synthesized_default_image" format="reference" />
+        <!--合成图片的尺寸-->
+        <attr name="synthesized_image_size" format="dimension" />
+        <!--多图片之间的空隙间隔-->
+        <attr name="synthesized_image_gap" format="dimension" />
+    </declare-styleable>
+
+    <declare-styleable name="LineControllerView">
+        <!-- 名称 -->
+        <attr name="name" format="string"/>
+        <!-- 内容或当前状态 -->
+        <attr name="subject" format="string"/>
+        <!-- 是否是列表中最后一个 -->
+        <attr name="isBottom" format="boolean"/>
+        <!-- 是否是列表中第一个 -->
+        <attr name="isTop" format="boolean"/>
+        <!-- 是否可以跳转 -->
+        <attr name="canNav" format="boolean"/>
+        <!-- 是否是开关 -->
+        <attr name="isSwitch" format="boolean"/>
+    </declare-styleable>
+
+    <declare-styleable name="IndexBar">
+        <attr name="indexBarTextSize" format="dimension"/>
+        <attr name="indexBarPressBackground" format="color" />
+    </declare-styleable>
+
+    <declare-styleable name="core_round_rect_image_style">
+        <attr name="round_radius" format="dimension" />
+    </declare-styleable>
+
+    <declare-styleable name="TitleBarLayout">
+        <attr name="title_bar_middle_title" format="string" />
+        <attr name="title_bar_can_return" format="boolean" />
+    </declare-styleable>
+
+    <declare-styleable name="RoundFrameLayout">
+        <attr name="corner_radius" format="dimension" />
+        <attr name="left_top_corner_radius" format="dimension" />
+        <attr name="right_top_corner_radius" format="dimension" />
+        <attr name="right_bottom_corner_radius" format="dimension" />
+        <attr name="left_bottom_corner_radius" format="dimension" />
+    </declare-styleable>
+
+    <declare-styleable name="RoundCornerImageView" parent="RoundFrameLayout">
+        <attr name="corner_radius"/>
+        <attr name="left_top_corner_radius"/>
+        <attr name="right_top_corner_radius" />
+        <attr name="right_bottom_corner_radius"  />
+        <attr name="left_bottom_corner_radius"  />
+    </declare-styleable>
+
+    <declare-styleable name="UnreadCountTextView">
+        <attr name="paint_color" format="color|reference"/>
+    </declare-styleable>
+
+    <declare-styleable name="CustomWidthSwitch">
+        <attr name="custom_width" format="dimension|reference"/>
+    </declare-styleable>
+
+    <declare-styleable name="SwipeLayout">
+        <attr name="drag_edge">
+            <flag name="left" value="1" />
+            <flag name="right" value="2" />
+            <flag name="top" value="4" />
+            <flag name="bottom" value="8" />
+        </attr>
+        <attr name="leftEdgeSwipeOffset" format="dimension" />
+        <attr name="rightEdgeSwipeOffset" format="dimension" />
+        <attr name="topEdgeSwipeOffset" format="dimension" />
+        <attr name="bottomEdgeSwipeOffset" format="dimension" />
+        <attr name="show_mode" format="enum">
+            <enum name="lay_down" value="0" />
+            <enum name="pull_out" value="1" />
+        </attr>
+        <attr name="clickToClose" format="boolean" />
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/system/tuicore-7.3.4358/src/main/res/values/colors.xml b/system/tuicore-7.3.4358/src/main/res/values/colors.xml
new file mode 100644
index 0000000..bb28cf7
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/res/values/colors.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="black">#000000</color>
+    <color name="white">#FFFFFF</color>
+    <color name="read_dot_bg">#f74c31</color>
+    <color name="font_blue">#066fff</color>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicore-7.3.4358/src/main/res/values/im_error_msg.xml b/system/tuicore-7.3.4358/src/main/res/values/im_error_msg.xml
new file mode 100644
index 0000000..b3ccb6b
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/res/values/im_error_msg.xml
@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="TUIKitErrorInProcess">Executing</string>
+    <string name="TUIKitErrorInvalidParameters">Invalid parameter</string>
+    <string name="TUIKitErrorIOOperateFaild">Local IO operation error</string>
+    <string name="TUIKitErrorInvalidJson">Invalid JSON format</string>
+    <string name="TUIKitErrorOutOfMemory">Out of storage</string>
+    <string name="TUIKitErrorParseResponseFaild">PB parsing failed</string>
+    <string name="TUIKitErrorSerializeReqFaild">PB serialization failed</string>
+    <string name="TUIKitErrorSDKNotInit">IM SDK is not initialized.</string>
+    <string name="TUIKitErrorLoadMsgFailed">Failed to load local database</string>
+    <string name="TUIKitErrorDatabaseOperateFailed">Local database operation failed</string>
+    <string name="TUIKitErrorCrossThread">Cross-thread error</string>
+    <string name="TUIKitErrorTinyIdEmpty">User info is empty.</string>
+    <string name="TUIKitErrorInvalidIdentifier">Invalid identifier</string>
+    <string name="TUIKitErrorFileNotFound">File not found</string>
+    <string name="TUIKitErrorFileTooLarge">File size exceeds the limit.</string>
+    <string name="TUIKitErrorEmptyFile">Empty file</string>
+    <string name="TUIKitErrorFileOpenFailed">Failed to open file</string>
+    <string name="TUIKitErrorNotLogin">Not logged in to IM SDK</string>
+    <string name="TUIKitErrorNoPreviousLogin">Not logged in to the user\'s account.</string>
+    <string name="TUIKitErrorUserSigExpired">UserSig expired</string>
+    <string name="TUIKitErrorLoginKickedOffByOther">Log in to the same account on other devices</string>
+    <string name="TUIKitErrorTLSSDKInit">TLS SDK initialization failed</string>
+    <string name="TUIKitErrorTLSSDKUninit">TLS SDK is not initialized.</string>
+    <string name="TUIKitErrorTLSSDKTRANSPackageFormat">Invalid TLS SDK TRANS packet format</string>
+    <string name="TUIKitErrorTLSDecrypt">TLS SDK decryption failed</string>
+    <string name="TUIKitErrorTLSSDKRequest">TLS SDK request failed</string>
+    <string name="TUIKitErrorTLSSDKRequestTimeout">TLS SDK request timed out</string>
+    <string name="TUIKitErrorInvalidConveration">Invalid session</string>
+    <string name="TUIKitErrorFileTransAuthFailed">Authentication failed during file transfer.</string>
+    <string name="TUIKitErrorFileTransNoServer">Failed to get the server list via FTP.</string>
+    <string name="TUIKitErrorFileTransUploadFailed">Failed to upload the file via FTP. Check your network connection.</string>
+    <string name="TUIKitErrorFileTransUploadFailedNotImage">Failed to upload the file via FTP. Check if the uploaded image can be opened normally.</string>
+    <string name="TUIKitErrorFileTransDownloadFailed">Failed to download the file via FTP. Check whether your network is connected or the file or audio has expired.</string>
+    <string name="TUIKitErrorHTTPRequestFailed">HTTP request failed</string>
+    <string name="TUIKitErrorInvalidMsgElem">Invalid IM SDK message elem</string>
+    <string name="TUIKitErrorInvalidSDKObject">Invalid object</string>
+    <string name="TUIKitSDKMsgBodySizeLimit">Message length exceeds the limit.</string>
+    <string name="TUIKitErrorSDKMsgKeyReqDifferRsp">Message key error</string>
+    <string name="TUIKitErrorSDKGroupInvalidID">Invalid group ID. Custom group ID must be printable ASCII characters (0x20-0x7e), with maximum length of 48 bytes, and cannot be prefixed with @TGS#.</string>
+    <string name="TUIKitErrorSDKGroupInvalidName">Group name is invalid, which cannot exceed 30 bytes.</string>
+    <string name="TUIKitErrorSDKGroupInvalidIntroduction">Group description is invalid, which cannot exceed 240 bytes.</string>
+    <string name="TUIKitErrorSDKGroupInvalidNotification">Group notice is invalid, which cannot exceed 300 bytes.</string>
+    <string name="TUIKitErrorSDKGroupInvalidFaceURL">Group profile photo URL is invalid, which should not exceed 100 bytes.</string>
+    <string name="TUIKitErrorSDKGroupInvalidNameCard">Group card is invalid, which cannot exceed 50 bytes.</string>
+    <string name="TUIKitErrorSDKGroupMemberCountLimit">The maximum number of group members is exceeded.</string>
+    <string name="TUIKitErrorSDKGroupJoinPrivateGroupDeny">Request to join private groups is not allowed.</string>
+    <string name="TUIKitErrorSDKGroupInviteSuperDeny">Group owners cannot be invited.</string>
+    <string name="TUIKitErrorSDKGroupInviteNoMember">The number of members to be invited cannot be 0.</string>
+    <string name="TUIKitErrorSDKFriendShipInvalidProfileKey">Invalid data field</string>
+    <string name="TUIKitErrorSDKFriendshipInvalidAddRemark">The remark field exceeds the limit of 96 bytes.</string>
+    <string name="TUIKitErrorSDKFriendshipInvalidAddWording">The description field in the friend request is invalid, which should not exceed 120 bytes.</string>
+    <string name="TUIKitErrorSDKFriendshipInvalidAddSource">The source field in the friend request is invalid, which should be prefixed with \"AddSource_Type_\".</string>
+    <string name="TUIKitErrorSDKFriendshipFriendGroupEmpty">The friend list field is invalid. It is required with each list name of 30 bytes at most.</string>
+    <string name="TUIKitErrorSDKNetEncodeFailed">Network link encryption failed</string>
+    <string name="TUIKitErrorSDKNetDecodeFailed">Network link decryption failed</string>
+    <string name="TUIKitErrorSDKNetAuthInvalid">Network link authentication not completed</string>
+    <string name="TUIKitErrorSDKNetCompressFailed">Unable to compress data packet</string>
+    <string name="TUIKitErrorSDKNetUncompressFaile">Packet decompression failed</string>
+    <string name="TUIKitErrorSDKNetFreqLimit">Call frequency is limited, with up to 5 requests per second.</string>
+    <string name="TUIKitErrorSDKnetReqCountLimit">Request queue is full. The number of concurrent requests exceeds the limit of 1000.</string>
+    <string name="TUIKitErrorSDKNetDisconnect">Network disconnected. No connection is established, or no network is detected when a socket connection is established.</string>
+    <string name="TUIKitErrorSDKNetAllreadyConn">Network connection has been established.</string>
+    <string name="TUIKitErrorSDKNetConnTimeout">Network connection timed out. Try again once network connection is restored.</string>
+    <string name="TUIKitErrorSDKNetConnRefuse">Network connection denied. Too many attempts. Service denied by the server.</string>
+    <string name="TUIKitErrorSDKNetNetUnreach">No available route to the network. Try again once network connection is restored.</string>
+    <string name="TUIKitErrorSDKNetSocketNoBuff">Call failed to due to insufficient buffer resources in the system. System busy. Internal error.</string>
+    <string name="TUIKitERRORSDKNetResetByPeer">The peer resets the connection.</string>
+    <string name="TUIKitErrorSDKNetSOcketInvalid">Invalid socket</string>
+    <string name="TUIKitErrorSDKNetHostGetAddressFailed">IP address resolution failed</string>
+    <string name="TUIKitErrorSDKNetConnectReset">Network is connected to an intermediate node or connection to the server is reset.</string>
+    <string name="TUIKitErrorSDKNetWaitInQueueTimeout">Timed out waiting for request packet to enter the to-be-sent queue.</string>
+    <string name="TUIKitErrorSDKNetWaitSendTimeout">Request packet has entered the to-be-sent queue. Timed out waiting to enter the network buffer of the system.</string>
+    <string name="TUIKitErrorSDKNetWaitAckTimeut">Request packet has entered the network buffer of the system. Timed out waiting for response from server.</string>
+    <string name="TUIKitErrorSDKSVRSSOConnectLimit">The number of Server connections exceeds the limit. Service denied by the server.</string>
+    <string name="TUIKitErrorSDKSVRSSOVCode">Sending verification code timeout.</string>
+    <string name="TUIKitErrorSVRSSOD2Expired">Key expired. Key is an internal bill generated according to usersig. The validity period of the key is less than or equal to the validity period of usersig. Please call timmanager again getInstance(). The login interface generates a new key.</string>
+    <string name="TUIKitErrorSVRA2UpInvalid">Ticket expired. Ticket is an internal bill generated according to usersig. The validity period of ticket is less than or equal to that of usersig. Please call timmanager again getInstance(). The login interface generates a new ticket.</string>
+    <string name="TUIKitErrorSVRA2DownInvalid">The bill failed verification or was hit by security. Please call timmanager again getInstance(). The login interface generates a new ticket.</string>
+    <string name="TUIKitErrorSVRSSOEmpeyKey">Empty key is not allowed.</string>
+    <string name="TUIKitErrorSVRSSOUinInvalid">The account in the key does not match the account in the request header.</string>
+    <string name="TUIKitErrorSVRSSOVCodeTimeout">Timed out sending verification code.</string>
+    <string name="TUIKitErrorSVRSSONoImeiAndA2">You need to bring your key and ticket.</string>
+    <string name="TUIKitErrorSVRSSOCookieInvalid">Cookie check mismatch.</string>
+    <string name="TUIKitErrorSVRSSODownTips">Send a prompt: Key expired.</string>
+    <string name="TUIKitErrorSVRSSODisconnect">Link disconnected and screen locked.</string>
+    <string name="TUIKitErrorSVRSSOIdentifierInvalid">Invalid identity.</string>
+    <string name="TUIKitErrorSVRSSOClientClose">The device automatically logs out.</string>
+    <string name="TUIKitErrorSVRSSOMSFSDKQuit">MSFSDK automatically logs out.</string>
+    <string name="TUIKitErrorSVRSSOD2KeyWrong">the number of decryption failures exceeds the threshold, notify the terminal that it needs to be reset, please call timmanager again getInstance(). The login interface generates a new key.</string>
+    <string name="TUIKitErrorSVRSSOUnsupport">Aggregation is not supported. A unified error code is returned to devices. The device stops aggregation on the persistent TCP connection.</string>
+    <string name="TUIKitErrorSVRSSOPrepaidArrears">Prepaid service is in arrears.</string>
+    <string name="TUIKitErrorSVRSSOPacketWrong">Invalid request packet format.</string>
+    <string name="TUIKitErrorSVRSSOAppidBlackList">SDKAppID blocked list.</string>
+    <string name="TUIKitErrorSVRSSOCmdBlackList">SDKAppID sets the service cmd blocked list.</string>
+    <string name="TUIKitErrorSVRSSOAppidWithoutUsing">SDKAppID is disabled.</string>
+    <string name="TUIKitErrorSVRSSOFreqLimit">Frequency limit (user), which is to limit the number of requests per second of a protocol.</string>
+    <string name="TUIKitErrorSVRSSOOverload">Packet loss due to overload (system). Service denied by the connected server that failed to process too many requests.</string>
+    <string name="TUIKitErrorSVRResNotFound">The resource file to be sent does not exist.</string>
+    <string name="TUIKitErrorSVRResAccessDeny">Unable to access the resource file to be sent.</string>
+    <string name="TUIKitErrorSVRResSizeLimit">File size exceeds the limit.</string>
+    <string name="TUIKitErrorSVRResSendCancel">Sending is canceled by the user due to reasons like logging out when sending a message.</string>
+    <string name="TUIKitErrorSVRResReadFailed">Failed to access the file content.</string>
+    <string name="TUIKitErrorSVRResTransferTimeout">Timed out transferring the resource file.</string>
+    <string name="TUIKitErrorSVRResInvalidParameters">Invalid parameter.</string>
+    <string name="TUIKitErrorSVRResInvalidFileMd5">File MD5 verification failed.</string>
+    <string name="TUIKitErrorSVRResInvalidPartMd5">Sharding MD5 verification failed.</string>
+    <string name="TUIKitErrorSVRCommonInvalidHttpUrl">HTTP parsing error. Check the HTTP request URL format.</string>
+    <string name="TUIKitErrorSVRCommomReqJsonParseFailed">JSON parsing error in the HTTP request. Check the JSON format.</string>
+    <string name="TUIKitErrorSVRCommonInvalidAccount">The Identifier or UserSig in the request URI or JSON packet is incorrect.</string>
+    <string name="TUIKitErrorSVRCommonInvalidSdkappid">Invalid SDKAppID. Check the SDKAppID validity.</string>
+    <string name="TUIKitErrorSVRCommonRestFreqLimit">The REST API call frequency exceeds the limit. Reduce the request rate.</string>
+    <string name="TUIKitErrorSVRCommonRequestTimeout">The service request timed out or the HTTP request format is incorrect. Check the error and try again.</string>
+    <string name="TUIKitErrorSVRCommonInvalidRes">Requested resource error. Check the request URL.</string>
+    <string name="TUIKitErrorSVRCommonIDNotAdmin">Fill in the Identifier field of the REST API request with the app admin\'s account.</string>
+    <string name="TUIKitErrorSVRCommonSdkappidFreqLimit">SDKAppID request rate exceeds the limit. Reduce the request rate.</string>
+    <string name="TUIKitErrorSVRCommonSdkappidMiss">SDKAppID is required for the REST API. Check the SDKAppID in the request URL.</string>
+    <string name="TUIKitErrorSVRCommonRspJsonParseFailed">JSON parsing error in the HTTP response packet.</string>
+    <string name="TUIKitErrorSVRCommonExchangeAccountTimeout">Account switching timed out.</string>
+    <string name="TUIKitErrorSVRCommonInvalidIdFormat">The Identifier type of the request packet body is incorrect. Confirm that the Identifier is a string.</string>
+    <string name="TUIKitErrorSVRCommonSDkappidForbidden">SDKAppID is disabled.</string>
+    <string name="TUIKitErrorSVRCommonReqForbidden">Request is disabled.</string>
+    <string name="TUIKitErrorSVRCommonReqFreqLimit">Too many requests. Try again later.</string>
+    <string name="TUIKitErrorSVRCommonInvalidService">The package has not been purchased, or the package has expired, or the purchased package is being configured and has not yet taken effect. Please log in to the im purchase page to re purchase the package. After purchase, it will take effect in 5 minutes.</string>
+    <string name="TUIKitErrorSVRCommonSensitiveText">Text is filtered due to security reasons, which may contain sensitive words.</string>
+    <string name="TUIKitErrorSVRCommonBodySizeLimit">The sending message package is too long. Currently, the maximum 12K message package length is supported. Please reduce the package size and try again.</string>
+    <string name="TUIKitErrorSVRAccountUserSigExpired">UserSig has expired. Generate a new one.</string>
+    <string name="TUIKitErrorSVRAccountUserSigEmpty">UserSig length is 0.</string>
+    <string name="TUIKitErrorSVRAccountUserSigCheckFailed">UserSig verification failed.</string>
+    <string name="TUIKitErrorSVRAccountUserSigMismatchPublicKey">Failed to verify UserSig with public key</string>
+    <string name="TUIKitErrorSVRAccountUserSigMismatchId">The requested Identifier does not match the Identifier that is used to generate the UserSig.</string>
+    <string name="TUIKitErrorSVRAccountUserSigMismatchSdkAppid">The requested SDKAppID does not match the SDKAppID of the generated UserSig.</string>
+    <string name="TUIKitErrorSVRAccountUserSigPublicKeyNotFound">Public key does not exist when verifying UserSig.</string>
+    <string name="TUIKitErrorSVRAccountUserSigSdkAppidNotFount">SDKAppID not found. Check the app information in the IM console.</string>
+    <string name="TUIKitErrorSVRAccountInvalidUserSig">UserSig has expired. Generate a new one and try again.</string>
+    <string name="TUIKitErrorSVRAccountNotFound">Requested user account not found.</string>
+    <string name="TUIKitErrorSVRAccountSecRstr">Restricted for security reasons.</string>
+    <string name="TUIKitErrorSVRAccountInternalTimeout">Internal server timeout. Try again.</string>
+    <string name="TUIKitErrorSVRAccountInvalidCount">Invalid batch quantity in the request.</string>
+    <string name="TUIkitErrorSVRAccountINvalidParameters">Invalid parameter. Check whether the fields are entered as required in the protocol.</string>
+    <string name="TUIKitErrorSVRAccountAdminRequired">The request requires app admin permissions.</string>
+    <string name="TUIKitErrorSVRAccountLowSDKVersion">Your sdk version is too low, Please upgrade to the latest version.</string>
+    <string name="TUIKitErrorSVRAccountFreqLimit">Restricted due to too many failures and retries. Check if the UserSig is correct and try again after one minute.</string>
+    <string name="TUIKitErrorSVRAccountBlackList">The account is added to the blocked list.</string>
+    <string name="TUIKitErrorSVRAccountCountLimit">The number of accounts created exceeds that allowed in the free trial version. Upgrade to the professional version.</string>
+    <string name="TUIKitErrorSVRAccountInternalError">Internal server error. Try again.</string>
+    <string name="TUIKitErrorSVRProfileInvalidParameters">Request parameter error. Check if the request is correct according to the error message.</string>
+    <string name="TUIKitErrorSVRProfileAccountMiss">Request parameter error. No user account specified to pull data.</string>
+    <string name="TUIKitErrorSVRProfileAccountNotFound">Requested user account not found.</string>
+    <string name="TUIKitErrorSVRProfileAdminRequired">The request requires app admin permissions.</string>
+    <string name="TUIKitErrorSVRProfileSensitiveText">The data field contains sensitive words.</string>
+    <string name="TUIKitErrorSVRProfileInternalError">Server internal error. Try again later.</string>
+    <string name="TUIKitErrorSVRProfileReadWritePermissionRequired">You have no permission to read the data field. See the data field for details.</string>
+    <string name="TUIKitErrorSVRProfileTagNotFound">The tag of the data field does not exist.</string>
+    <string name="TUIKitErrorSVRProfileSizeLimit">The value of the data field exceeds 500 bytes.</string>
+    <string name="TUIKitErrorSVRProfileValueError">The value of the standard data field is incorrect. See the standard data field for details.</string>
+    <string name="TUIKitErrorSVRProfileInvalidValueFormat">The value type of the data field does not match. See the standard data field for details.</string>
+    <string name="TUIKitErrorSVRFriendshipInvalidParameters">Request parameter error. Check if the request is correct according to the error message.</string>
+    <string name="TUIKitErrorSVRFriendshipInvalidSdkAppid">SDKAppID does not match.</string>
+    <string name="TUIKitErrorSVRFriendshipAccountNotFound">Requested user account not found.</string>
+    <string name="TUIKitErrorSVRFriendshipAdminRequired">The request requires app admin permissions.</string>
+    <string name="TUIKitErrorSVRFriendshipSensitiveText">The relation chain field contains sensitive words.</string>
+    <string name="TUIKitErrorSVRFriendshipNetTimeout">Network timed out. Try again later.</string>
+    <string name="TUIKitErrorSVRFriendshipWriteConflict">A write conflict occurred due to concurrent writes. The batch mode is recommended.</string>
+    <string name="TUIKitErrorSVRFriendshipAddFriendDeny">The backend blocks the user from initiating friend requests.</string>
+    <string name="TUIkitErrorSVRFriendshipCountLimit">The number of your friends exceeds the limit.</string>
+    <string name="TUIKitErrorSVRFriendshipGroupCountLimit">The number of lists exceeds the limit.</string>
+    <string name="TUIKitErrorSVRFriendshipPendencyLimit">You have reached the limit of pending friend requests.</string>
+    <string name="TUIKitErrorSVRFriendshipBlacklistLimit">The number of accounts in the blocked list exceeds the limit.</string>
+    <string name="TUIKitErrorSVRFriendshipPeerFriendLimit">The number of the other user\'s friends exceeds the limit.</string>
+    <string name="TUIKitErrorSVRFriendshipInSelfBlacklist">You have blocked the other user. Unable to send friend request.</string>
+    <string name="TUIKitErrorSVRFriendshipAllowTypeDenyAny">The other user\'s friend request verification mode is \"Decline friend request from any user\".</string>
+    <string name="TUIKitErrorSVRFriendshipInPeerBlackList">You are blocked by the other user. Unable to send friend request.</string>
+    <string name="TUIKitErrorSVRFriendshipAllowTypeNeedConfirm">Request sent. Wait for acceptance.</string>
+    <string name="TUIKitErrorSVRFriendshipAddFriendSecRstr">The friend request was filtered by the security policy. Do not initiate friend requests too frequently.</string>
+    <string name="TUIKitErrorSVRFriendshipPendencyNotFound">The pending friend request does not exist.</string>
+    <string name="TUIKitErrorSVRFriendshipDelFriendSecRstr">The friend deletion request was filtered by the security policy. Do not initiate friend deletion requests too frequently.</string>
+    <string name="TUIKirErrorSVRFriendAccountNotFoundEx">Requested user account not found.</string>
+    <string name="TUIKitErrorSVRMsgPkgParseFailed">Failed to parse the request packet.</string>
+    <string name="TUIKitErrorSVRMsgInternalAuthFailed">Internal authentication failed.</string>
+    <string name="TUIKitErrorSVRMsgInvalidId">Invalid identifier</string>
+    <string name="TUIKitErrorSVRMsgNetError">Network error. Try again.</string>
+    <string name="TUIKitErrorSVRMsgPushDeny">A callback is triggered before sending a message in the private chat, and the App backend returns \"The message is prohibited from sending\".</string>
+    <string name="TUIKitErrorSVRMsgInPeerBlackList">Unable to send messages in the private chat as you are blocked by the other user.</string>
+    <string name="TUIKitErrorSVRMsgBothNotFriend">You are not a friend of this user. Unable to send messages.</string>
+    <string name="TUIKitErrorSVRMsgNotPeerFriend">Unable to send messages in the private chat as you are not the other user\'s friend (one-way friend).</string>
+    <string name="TUIkitErrorSVRMsgNotSelfFriend">Unable to send messages in the private chat as the other user is not your friend (one-way friend).</string>
+    <string name="TUIKitErrorSVRMsgShutupDeny">Blocked from posting. Unable to send messages.</string>
+    <string name="TUIKitErrorSVRMsgRevokeTimeLimit">Timed out recalling the message (default is 2 min).</string>
+    <string name="TUIKitErrorSVRMsgDelRambleInternalError">An internal error occurred while deleting roaming messages.</string>
+    <string name="TUIKitErrorSVRMsgJsonParseFailed">Failed to parse the JSON packet. Check whether the request packet meets the JSON specifications.</string>
+    <string name="TUIKitErrorSVRMsgInvalidJsonBodyFormat">MsgBody in the JSON request packet does not conform to the message format description.</string>
+    <string name="TUIKitErrorSVRMsgInvalidToAccount">The To_Account field is missing from the JSON request packet body or the type of the To_Account field is not Integer.</string>
+    <string name="TUIKitErrorSVRMsgInvalidRand">The MsgRandom field is missing from the JSON request packet body or the type of the MsgRandom field is not Integer.</string>
+    <string name="TUIKitErrorSVRMsgInvalidTimestamp">The MsgTimeStamp field is missing from the JSON request packet body or the type of the MsgTimeStamp field is not Integer.</string>
+    <string name="TUIKitErrorSVRMsgBodyNotArray">The MsgBody type in the JSON request packet body is not Array.</string>
+    <string name="TUIKitErrorSVRMsgInvalidJsonFormat">The JSON request packet does not conform to the message format description.</string>
+    <string name="TUIKitErrorSVRMsgToAccountCountLimit">The number of accounts to which messages are sent in batch exceeds 500.</string>
+    <string name="TUIKitErrorSVRMsgToAccountNotFound">To_Account is not registered or does not exist.</string>
+    <string name="TUIKitErrorSVRMsgTimeLimit">Invalid offline message storage time (up to 7 days).</string>
+    <string name="TUIKitErrorSVRMsgInvalidSyncOtherMachine">The type of the SyncOtherMachine field in the JSON request packet body is not Integer.</string>
+    <string name="TUIkitErrorSVRMsgInvalidMsgLifeTime">The type of the MsgLifeTime field in the JSON request packet body is not Integer.</string>
+    <string name="TUIKitErrorSVRMsgBodySizeLimit">The length of JSON data packet exceeds the limit. The message packet body shall not exceed 12 KB.</string>
+    <string name="TUIKitErrorSVRmsgLongPollingCountLimit">Forced logout on the Web page during long polling (the number of online instances on the Web page exceeds the limit).</string>
+    <string name="TUIKitErrorUnsupporInterface">This feature is available only to the Ultimate edition. Please upgrade.</string>
+    <string name="TUIKitErrorUnsupporInterfaceSuffix"> feature is available only to the Ultimate edition. Please upgrade.</string>
+
+    <string name="TUIKitErrorSVRGroupApiNameError">The API name in the request is incorrect.</string>
+    <string name="TUIKitErrorSVRGroupAccountCountLimit">The number of accounts in the request packet body exceeds the limit.</string>
+    <string name="TUIkitErrorSVRGroupFreqLimit">Call frequency is limited. Reduce the call frequency.</string>
+    <string name="TUIKitErrorSVRGroupPermissionDeny">Insufficient operation permissions</string>
+    <string name="TUIKitErrorSVRGroupInvalidReq">Invalid request</string>
+    <string name="TUIKitErrorSVRGroupSuperNotAllowQuit">Group owner is not allowed to leave this group.</string>
+    <string name="TUIKitErrorSVRGroupNotFound">The group does not exist.</string>
+    <string name="TUIKitErrorSVRGroupJsonParseFailed">Failed to parse the JSON packet. Check whether the packet body conforms to the JSON format.</string>
+    <string name="TUIKitErrorSVRGroupInvalidId">The identifier that is used to initiated the operation is invalid. Check whether the identifier of the user who initiated the operation is correct.</string>
+    <string name="TUIKitErrorSVRGroupAllreadyMember">The invited user is a group member.</string>
+    <string name="TUIKitErrorSVRGroupFullMemberCount">The number of group members has reached the limit. Unable to add the user in the request to the group.</string>
+    <string name="TUIKitErrorSVRGroupInvalidGroupId">Invalid group ID. Check whether the group ID is correct.</string>
+    <string name="TUIKitErrorSVRGroupRejectFromThirdParty">The app backend rejected this operation via a third-party callback.</string>
+    <string name="TUIKitErrorSVRGroupShutDeny">This user is blocked from posting and thus cannot send messages. Check whether the sender is blocked from posting.</string>
+    <string name="TUIKitErrorSVRGroupRspSizeLimit">The response packet length exceeds the limit.</string>
+    <string name="TUIKitErrorSVRGroupAccountNotFound">Requested user account not found.</string>
+    <string name="TUIKitErrorSVRGroupGroupIdInUse">The group ID has been used. Select another one.</string>
+    <string name="TUIKitErrorSVRGroupSendMsgFreqLimit">The frequency of sending messages exceeds the limit. Extend the interval between sending messages.</string>
+    <string name="TUIKitErrorSVRGroupReqAllreadyBeenProcessed">This invitation or request has been processed.</string>
+    <string name="TUIKitErrorSVRGroupGroupIdUserdForSuper">The group ID has been used by the group owner. It can be used directly.</string>
+    <string name="TUIKitErrorSVRGroupSDkAppidDeny">The command word used in the SDKAppID request has been disabled.</string>
+    <string name="TUIKitErrorSVRGroupRevokeMsgNotFound">This message does not exist.</string>
+    <string name="TUIKitErrorSVRGroupRevokeMsgTimeLimit">Timed out recalling the message (default is 2 min).</string>
+    <string name="TUIKitErrorSVRGroupRevokeMsgDeny">Unable to recall this message.</string>
+    <string name="TUIKitErrorSVRGroupNotAllowRevokeMsg">Unable to recall messages in groups of this type.</string>
+    <string name="TUIKitErrorSVRGroupRemoveMsgDeny">Unable to delete messages of this type.</string>
+    <string name="TUIKitErrorSVRGroupNotAllowRemoveMsg">Unable to delete messages in the voice/video chat room and the broadcast group of online members.</string>
+    <string name="TUIKitErrorSVRGroupAvchatRoomCountLimit">The number of created voice/video chat rooms exceeds the limit.</string>
+    <string name="TUIKitErrorSVRGroupCountLimit">The number of groups that a single user can create and join exceeds the limit.</string>
+    <string name="TUIKitErrorSVRGroupMemberCountLimit">The number of group members exceeds the limit.</string>
+    <string name="TUIKitErrorSVRNoSuccessResult">No success result returned for the batch operation.</string>
+    <string name="TUIKitErrorSVRToUserInvalid">IM: Invalid recipient</string>
+    <string name="TUIKitErrorSVRRequestTimeout">Request timeout</string>
+    <string name="TUIKitErrorSVRInitCoreFail">INIT CORE module failed</string>
+    <string name="TUIKitErrorExpiredSessionNode">SessionNode is null.</string>
+    <string name="TUIKitErrorLoggedOutBeforeLoginFinished">Logged out before login (returned at login time)</string>
+    <string name="TUIKitErrorTLSSDKNotInitialized">tlssdk is not initialized.</string>
+    <string name="TUIKitErrorTLSSDKUserNotFound">The user information for TLSSDK was not found.</string>
+    <string name="TUIKitErrorBindFaildRegTimeout">Registration timed out</string>
+    <string name="TUIKitErrorBindFaildIsBinding">The bind operation in progress.</string>
+    <string name="TUIKitErrorPacketFailUnknown">Unknown error occurred while sending packet</string>
+    <string name="TUIKitErrorPacketFailReqNoNet">No network connection when sending request packet, which is converted to case ERR_REQ_NO_NET_ON_REQ:</string>
+    <string name="TUIKitErrorPacketFailRespNoNet">No network connection when sending response packet, which is converted to case ERR_REQ_NO_NET_ON_RSP:</string>
+    <string name="TUIKitErrorPacketFailReqNoAuth">No permission when sending request packet</string>
+    <string name="TUIKitErrorPacketFailSSOErr">SSO error</string>
+    <string name="TUIKitErrorPacketFailRespTimeout">Response timed out</string>
+    <string name="TUIKitErrorFriendshipProxySyncing">proxy_manager failed to sync SVR data</string>
+    <string name="TUIKitErrorFriendshipProxySyncedFail">proxy_manager sync failed</string>
+    <string name="TUIKitErrorFriendshipProxyLocalCheckErr">proxy_manager request parameter is invalid in local check.</string>
+    <string name="TUIKitErrorGroupInvalidField">group assistant request field contains non-preset fields.</string>
+    <string name="TUIKitErrorGroupStoreageDisabled">Local storage of group assistant group data is disabled.</string>
+    <string name="TUIKitErrorLoadGrpInfoFailed">Failed to load groupinfo from storage</string>
+    <string name="TUIKitErrorReqNoNetOnReq">No network connection when sending request</string>
+    <string name="TUIKitErrorReqNoNetOnResp">No network connection when sending response</string>
+    <string name="TUIKitErrorServiceNotReady">QALSDK service is not ready.</string>
+    <string name="TUIKitErrorLoginAuthFailed">Account verification failed (user info get failed)</string>
+    <string name="TUIKitErrorNeverConnectAfterLaunch">Failed to connect network when the app is lunched.</string>
+    <string name="TUIKitErrorReqFailed">QAL execution failed</string>
+    <string name="TUIKitErrorReqInvaidReq">Invalid request. Invalid toMsgService.</string>
+    <string name="TUIKitErrorReqOnverLoaded">Request queue is full.</string>
+    <string name="TUIKitErrorReqKickOff">Forced logout on another device</string>
+    <string name="TUIKitErrorReqServiceSuspend">Service suspended</string>
+    <string name="TUIKitErrorReqInvalidSign">SSO signature error</string>
+    <string name="TUIKitErrorReqInvalidCookie">Invalid SSO cookie</string>
+    <string name="TUIKitErrorLoginTlsRspParseFailed">TSL response packet is verified at login time. Packet length error.</string>
+    <string name="TUIKitErrorLoginOpenMsgTimeout">Timeout occurred when OPENSTATSVC attempted to report status to OPENMSG during login.</string>
+    <string name="TUIKitErrorLoginOpenMsgRspParseFailed">Response parsing failed when OPENSTATSVC reports status to OPENMSG during login.</string>
+    <string name="TUIKitErrorLoginTslDecryptFailed">TLS decryption failed at login time.</string>
+    <string name="TUIKitErrorWifiNeedAuth">Verification is required for Wi-Fi connection.</string>
+    <string name="TUIKitErrorUserCanceled">Canceled by user</string>
+    <string name="TUIkitErrorRevokeTimeLimitExceed">Timed out recalling the message (default is 2 min).</string>
+    <string name="TUIKitErrorLackUGExt">Missing UGC extension pack</string>
+    <string name="TUIKitErrorAutoLoginNeedUserSig">Local ticket for auto login expired. userSig is required for manual login.</string>
+    <string name="TUIKitErrorQALNoShortConneAvailable">No available SSO for short connections.</string>
+    <string name="TUIKitErrorReqContentAttach">Message content is filtered due to security reasons.</string>
+    <string name="TUIKitErrorLoginSigExpire">Returned at login time. Ticket expired.</string>
+    <string name="TUIKitErrorSDKHadInit">SDK has been initialized. Do not initialize again.</string>
+    <string name="TUIKitErrorOpenBDHBase">Openbdh error</string>
+    <string name="TUIKitErrorRequestNoNetOnReq">No network connection when sending request. Try again once network connection is restored.</string>
+    <string name="TUIKitErrorRequestNoNetOnRsp">No network connection when sending response. Try again once network connection is restored.</string>
+    <string name="TUIKitErrorRequestOnverLoaded">Request queue is full.</string>
+    <string name="TUIKitErrorEnableUserStatusOnConsole">The user status not supported. Please enable the ability in the console first.</string>
+</resources>
\ No newline at end of file
diff --git a/system/tuicore-7.3.4358/src/main/res/values/strings.xml b/system/tuicore-7.3.4358/src/main/res/values/strings.xml
new file mode 100644
index 0000000..d9c6772
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/res/values/strings.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="open_file_tips">Select an app to open the file</string>
+
+    <string name="cancel">Cancel</string>
+    <string name="sure">Confirm</string>
+    <string name="core_permission_dialog_title">Authorization Request</string>
+    <string name="core_permission_dialog_positive_setting_text">Settings</string>
+    <string name="date_yesterday">Yesterday</string>
+    <string name="date_year_short">YYYY</string>
+    <string name="date_month_short">MM</string>
+    <string name="date_day_short">DD</string>
+    <string name="date_hour_short">HH</string>
+    <string name="date_minute_short">MM</string>
+    <string name="date_second_short">SS</string>
+</resources>
\ No newline at end of file
diff --git a/system/tuicore-7.3.4358/src/main/res/values/styles.xml b/system/tuicore-7.3.4358/src/main/res/values/styles.xml
new file mode 100644
index 0000000..1b7ebb5
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/res/values/styles.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="CoreActivityTranslucent">
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:backgroundDimEnabled">false</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowAnimationStyle">@null</item>
+        <item name="android:windowDisablePreview">true</item>
+    </style>
+
+    <style name="TUIBaseTheme">
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicore-7.3.4358/src/main/res/values/tui_theme_attrs.xml b/system/tuicore-7.3.4358/src/main/res/values/tui_theme_attrs.xml
new file mode 100644
index 0000000..34afa00
--- /dev/null
+++ b/system/tuicore-7.3.4358/src/main/res/values/tui_theme_attrs.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- 颜色规范 start -->
+    <attr name="core_light_bg_title_text_color" format="reference|color"/>
+    <attr name="core_light_bg_primary_text_color" format="reference|color"/>
+    <attr name="core_light_bg_secondary_text_color" format="reference|color"/>
+    <attr name="core_light_bg_secondary2_text_color" format="reference|color"/>
+    <attr name="core_light_bg_disable_text_color" format="reference|color"/>
+    <attr name="core_dark_bg_primary_text_color" format="reference|color"/>
+    <attr name="core_primary_bg_color" format="reference|color"/>
+    <attr name="core_bg_color" format="reference|color"/>
+    <attr name="core_primary_color" format="reference|color"/>
+    <attr name="core_error_tip_color" format="reference|color"/>
+    <attr name="core_success_tip_color" format="reference|color"/>
+    <attr name="core_bubble_bg_color" format="reference|color"/>
+    <attr name="core_divide_color" format="reference|color"/>
+    <attr name="core_border_color" format="reference|color"/>
+    <attr name="core_header_start_color" format="reference|color"/>
+    <attr name="core_header_end_color" format="reference|color"/>
+    <attr name="core_header_text_color" format="reference|color"/>
+
+    <attr name="core_btn_normal_color" format="reference|color"/>
+    <attr name="core_btn_pressed_color" format="reference|color"/>
+    <attr name="core_btn_disable_color" format="reference|color"/>
+    <!-- 颜色规范 end -->
+</resources>
\ No newline at end of file
diff --git a/system/tuicore/.gitignore b/system/tuicore/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/system/tuicore/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/system/tuicore/build.gradle b/system/tuicore/build.gradle
new file mode 100644
index 0000000..f177544
--- /dev/null
+++ b/system/tuicore/build.gradle
@@ -0,0 +1,53 @@
+plugins {
+    id 'com.android.library'
+}
+
+android {
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+
+    defaultConfig {
+        minSdkVersion 16
+        targetSdkVersion 30
+        versionCode 1
+        versionName "1.0"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    // 主题资源文件夹
+    sourceSets {
+        main {
+            res.srcDirs += "src/main/res-light"
+            res.srcDirs += "src/main/res-lively"
+            res.srcDirs += "src/main/res-serious"
+        }
+    }
+}
+
+dependencies {
+    api fileTree(include: ['*.jar','*.aar'], dir: '../../../../tuikit/android/libs')
+
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'com.github.bumptech.glide:glide:4.12.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    /*EventBus*/
+    api 'org.greenrobot:eventbus:3.1.1'
+
+    def projects = this.rootProject.getAllprojects().stream().map{project->project.name}.collect()
+    println "all projects : {$projects}"
+    if (projects.contains("imsdk-plus")) {
+        api project(':imsdk-plus')
+    } else {
+        api rootProject.getProperties().containsKey("imSdk") ? rootProject.ext.imSdk : "com.tencent.imsdk:imsdk-plus:7.3.4358"
+    }
+
+}
\ No newline at end of file
diff --git a/system/tuicore/src/main/AndroidManifest.xml b/system/tuicore/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..d250cd6
--- /dev/null
+++ b/system/tuicore/src/main/AndroidManifest.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.tencent.qcloud.tuicore">
+
+    <application>
+        <activity
+            android:name=".permission.PermissionActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:launchMode="singleTask"
+            android:theme="@style/CoreActivityTranslucent"
+            android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
+        <activity
+            android:name=".component.activities.SelectionActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".component.activities.ImageSelectActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".util.PermissionRequester$PermissionActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:multiprocess="true"
+            android:launchMode="singleTask"
+            android:theme="@style/CoreActivityTranslucent"
+            android:windowSoftInputMode="stateHidden|stateAlwaysHidden" />
+
+        <provider
+            android:name=".ServiceInitializer"
+            android:authorities="${applicationId}.TUICore.Init"
+            android:enabled="true"
+            android:exported="false"/>
+
+        <provider
+            android:name=".util.TUIFileProvider"
+            android:authorities="${applicationId}.tuicore.fileprovider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths_public"/>
+        </provider>
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/EventManager.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/EventManager.java
new file mode 100644
index 0000000..6c5d983
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/EventManager.java
@@ -0,0 +1,95 @@
+package com.tencent.qcloud.tuicore;
+
+
+import android.text.TextUtils;
+import android.util.Log;
+import android.util.Pair;
+
+import com.tencent.qcloud.tuicore.interfaces.ITUINotification;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+/**
+ * Notification registration, removal and triggering
+ */
+class EventManager {
+    private static final String TAG = EventManager.class.getSimpleName();
+
+    private static class EventManagerHolder {
+        private static final EventManager eventManager = new EventManager();
+    }
+
+    public static EventManager getInstance() {
+        return EventManagerHolder.eventManager;
+    }
+
+    private final Map<Pair<String, String>, List<ITUINotification>> eventMap = new ConcurrentHashMap<>();
+
+    private EventManager() {}
+
+    public void registerEvent(String key, String subKey, ITUINotification notification) {
+        Log.i(TAG, "registerEvent : key : " + key + ", subKey : " + subKey + ", notification : " + notification);
+        if (TextUtils.isEmpty(key) || TextUtils.isEmpty(subKey) || notification == null) {
+            return;
+        }
+        Pair<String, String> keyPair = new Pair<>(key, subKey);
+        List<ITUINotification> list = eventMap.get(keyPair);
+        if (list == null) {
+            list = new CopyOnWriteArrayList<>();
+            eventMap.put(keyPair, list);
+        }
+        if (!list.contains(notification)) {
+            list.add(notification);
+        }
+    }
+
+    public void unRegisterEvent(String key, String subKey, ITUINotification notification) {
+        Log.i(TAG, "removeEvent : key : " + key + ", subKey : " + subKey + " notification : " + notification);
+        if (TextUtils.isEmpty(key) || TextUtils.isEmpty(subKey) || notification == null) {
+            return;
+        }
+        Pair<String, String> keyPair = new Pair<>(key, subKey);
+        List<ITUINotification> list = eventMap.get(keyPair);
+        if (list == null) {
+            return;
+        }
+        list.remove(notification);
+    }
+
+    public void unRegisterEvent(ITUINotification notification) {
+        Log.i(TAG, "removeEvent : notification : " + notification);
+        if (notification == null) {
+            return;
+        }
+        for (Pair<String, String> key : eventMap.keySet()) {
+            List<ITUINotification> value = eventMap.get(key);
+            if (value == null) {
+                continue;
+            }
+            for (ITUINotification item : value) {
+                if (item == notification) {
+                    value.remove(item);
+                    break;
+                }
+            }
+        }
+    }
+
+    public void notifyEvent(String key, String subKey, Map<String, Object> param) {
+        Log.i(TAG, "notifyEvent : key : " + key + ", subKey : " + subKey);
+        if (TextUtils.isEmpty(key) || TextUtils.isEmpty(subKey)) {
+            return;
+        }
+        Pair<String, String> keyPair = new Pair<>(key, subKey);
+        List<ITUINotification> notificationList = eventMap.get(keyPair);
+        if (notificationList != null) {
+            for(ITUINotification notification : notificationList) {
+                notification.onNotifyEvent(key, subKey, param);
+            }
+        }
+    }
+
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/ExtensionManager.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/ExtensionManager.java
new file mode 100644
index 0000000..80886de
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/ExtensionManager.java
@@ -0,0 +1,74 @@
+package com.tencent.qcloud.tuicore;
+
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.tencent.qcloud.tuicore.interfaces.ITUIExtension;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+/**
+ * UI extension registration and acquisition
+ */
+class ExtensionManager {
+    private static final String TAG = ExtensionManager.class.getSimpleName();
+
+    private static class ExtensionManagerHolder {
+        private static final ExtensionManager extensionManager = new ExtensionManager();
+    }
+
+    public static ExtensionManager getInstance() {
+        return ExtensionManagerHolder.extensionManager;
+    }
+
+    private final Map<String, List<ITUIExtension>>  extensionHashMap = new ConcurrentHashMap<>();
+
+    private ExtensionManager() {}
+
+    public void registerExtension(String key, ITUIExtension extension) {
+        Log.i(TAG, "registerExtension key : " + key + ", extension : " + extension);
+        if (TextUtils.isEmpty(key) || extension == null) {
+            return;
+        }
+        List<ITUIExtension> list = extensionHashMap.get(key);
+        if (list == null) {
+            list = new CopyOnWriteArrayList<>();
+            extensionHashMap.put(key, list);
+        }
+        if (!list.contains(extension)) {
+            list.add(extension);
+        }
+    }
+
+    public void unRegisterExtension(String key, ITUIExtension extension) {
+        Log.i(TAG, "removeExtension key : " + key + ", extension : " + extension);
+        if (TextUtils.isEmpty(key) || extension == null) {
+            return;
+        }
+        List<ITUIExtension> list = extensionHashMap.get(key);
+        if (list == null) {
+            return;
+        }
+        list.remove(extension);
+    }
+
+    public Map<String, Object> getExtensionInfo(String key, Map<String, Object> param) {
+        Log.i(TAG, "getExtensionInfo key : " + key );
+        if (TextUtils.isEmpty(key)) {
+            return null;
+        }
+        List<ITUIExtension> list = extensionHashMap.get(key);
+        if (list == null) {
+            return null;
+        }
+        for(ITUIExtension extension : list) {
+            return extension.onGetExtensionInfo(key, param);
+        }
+        return null;
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/ServiceInitializer.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/ServiceInitializer.java
new file mode 100644
index 0000000..69978fb
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/ServiceInitializer.java
@@ -0,0 +1,97 @@
+package com.tencent.qcloud.tuicore;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+/**
+ * If each module needs to be initialized, it needs to implement the init method of this class 
+ * and register it in the form of ContentProvider in the Manifest file.
+ */
+public class ServiceInitializer extends ContentProvider {
+
+    /**
+     * @param context applicationContext
+     */
+    public void init(Context context) {}
+
+    /**
+     * LightTheme id
+     */
+    public int getLightThemeResId() {
+        return R.style.TUIBaseLightTheme;
+    }
+
+    /**
+     * LivelyTheme id
+     */
+    public int getLivelyThemeResId() {
+        return R.style.TUIBaseLivelyTheme;
+    }
+
+    /**
+     * SeriousTheme id
+     */
+    public int getSeriousThemeResId() {
+        return R.style.TUIBaseSeriousTheme;
+    }
+
+/////////////////////////////////////////////////////////////////////////////////
+//             The following methods do not need to be overridden                      //
+/////////////////////////////////////////////////////////////////////////////////
+
+    private static Context appContext;
+
+    public static Context getAppContext() {
+        return appContext;
+    }
+
+    @Override
+    public boolean onCreate() {
+        if (appContext == null) {
+            appContext = getContext().getApplicationContext();
+        }
+        
+        TUIRouter.init(appContext);
+        TUIConfig.init(appContext);
+        TUIThemeManager.addLightTheme(getLightThemeResId());
+        TUIThemeManager.addLivelyTheme(getLivelyThemeResId());
+        TUIThemeManager.addSeriousTheme(getSeriousThemeResId());
+        TUIThemeManager.setTheme(appContext);
+        init(appContext);
+        return false;
+    }
+
+    @Nullable
+    @Override
+    public Cursor query(@NonNull Uri uri, @Nullable String[] projection, @Nullable String selection, @Nullable String[] selectionArgs, @Nullable String sortOrder) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public String getType(@NonNull Uri uri) {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public Uri insert(@NonNull Uri uri, @Nullable ContentValues values) {
+        return null;
+    }
+
+    @Override
+    public int delete(@NonNull Uri uri, @Nullable String selection, @Nullable String[] selectionArgs) {
+        return 0;
+    }
+
+    @Override
+    public int update(@NonNull Uri uri, @Nullable ContentValues values, @Nullable String selection, @Nullable String[] selectionArgs) {
+        return 0;
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/ServiceManager.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/ServiceManager.java
new file mode 100644
index 0000000..73e690d
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/ServiceManager.java
@@ -0,0 +1,63 @@
+package com.tencent.qcloud.tuicore;
+
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.tencent.qcloud.tuicore.interfaces.ITUIService;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Service register and call
+ */
+class ServiceManager {
+    private static final String TAG = ServiceManager.class.getSimpleName();
+
+    private static class ServiceManagerHolder {
+        private static final ServiceManager serviceManager = new ServiceManager();
+    }
+
+    public static ServiceManager getInstance() {
+        return ServiceManagerHolder.serviceManager;
+    }
+
+    private final Map<String, ITUIService> serviceMap = new ConcurrentHashMap<>();
+
+    private ServiceManager() {}
+
+    public void registerService(String serviceName, ITUIService service) {
+        Log.i(TAG, "registerService : " + serviceName + "  " + service);
+        if (TextUtils.isEmpty(serviceName) || service == null) {
+            return;
+        }
+        serviceMap.put(serviceName, service);
+    }
+
+    public void unregisterService(String serviceName) {
+        Log.i(TAG, "unregisterService : " + serviceName);
+        if (TextUtils.isEmpty(serviceName)) {
+            return;
+        }
+        serviceMap.remove(serviceName);
+    }
+
+    public ITUIService getService(String serviceName) {
+        Log.i(TAG, "getService : " + serviceName);
+        if (TextUtils.isEmpty(serviceName)) {
+            return null;
+        }
+        return serviceMap.get(serviceName);
+    }
+
+    public Object callService(String serviceName, String method, Map<String, Object> param) {
+        Log.i(TAG, "callService : " + serviceName + " method : " + method);
+        ITUIService service = serviceMap.get(serviceName);
+        if (service != null) {
+            return service.onCall(method, param);
+        } else {
+            Log.w(TAG, "can't find service : " + serviceName);
+            return null;
+        }
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/TUIConfig.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/TUIConfig.java
new file mode 100644
index 0000000..784d24b
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/TUIConfig.java
@@ -0,0 +1,346 @@
+package com.tencent.qcloud.tuicore;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.tencent.imsdk.v2.V2TIMUserFullInfo;
+
+import org.json.JSONObject;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+/**
+ * TUI configuration, such as file path configuration, user information
+ */
+public class TUIConfig {
+
+    private static Context appContext;
+
+    private static String appDir = "";
+    private static String selfFaceUrl = "";
+    private static String selfNickName = "";
+    private static int selfAllowType = 0;
+    private static long selfBirthDay = 0L;
+    private static String selfSignature = "";
+    private static int gender;
+
+    public static final String TUICORE_SETTINGS_SP_NAME = "TUICoreSettings";
+
+    private static final String RECORD_DIR_SUFFIX = "/record/";
+    private static final String RECORD_DOWNLOAD_DIR_SUFFIX = "/record/download/";
+    private static final String VIDEO_DOWNLOAD_DIR_SUFFIX = "/video/download/";
+    private static final String IMAGE_BASE_DIR_SUFFIX = "/image/";
+    private static final String IMAGE_DOWNLOAD_DIR_SUFFIX = "/image/download/";
+    private static final String MEDIA_DIR_SUFFIX = "/media/";
+    private static final String FILE_DOWNLOAD_DIR_SUFFIX = "/file/download/";
+    private static final String CRASH_LOG_DIR_SUFFIX = "/crash/";
+
+    private static boolean initialized = false;
+    private static boolean enableGroupGridAvatar = true;
+    private static int defaultAvatarImage;
+    private static int defaultGroupAvatarImage;
+
+    public static void init(Context context) {
+        if (initialized) {
+            return;
+        }
+        TUIConfig.appContext = context;
+        initPath();
+        initialized = true;
+    }
+
+    public static String getDefaultAppDir() {
+        if (TextUtils.isEmpty(appDir)) {
+            Context context = null;
+            if (appContext != null) {
+                context = appContext;
+            } else if (TUIRouter.getContext() != null) {
+                context = TUIRouter.getContext();
+            } else if (TUILogin.getAppContext() != null) {
+                context = TUILogin.getAppContext();
+            }
+            if (context != null) {
+                appDir = context.getFilesDir().getAbsolutePath();
+            }
+        }
+        return appDir;
+    }
+
+    public static void setDefaultAppDir(String appDir) {
+        TUIConfig.appDir = appDir;
+    }
+
+    public static String getRecordDir() {
+        return getDefaultAppDir() + RECORD_DIR_SUFFIX;
+    }
+
+    public static String getRecordDownloadDir() {
+        return getDefaultAppDir() + RECORD_DOWNLOAD_DIR_SUFFIX;
+    }
+
+    public static String getVideoDownloadDir() {
+        return getDefaultAppDir() + VIDEO_DOWNLOAD_DIR_SUFFIX;
+    }
+
+    public static String getImageBaseDir() {
+        return getDefaultAppDir() + IMAGE_BASE_DIR_SUFFIX;
+    }
+
+    public static String getImageDownloadDir() {
+        return getDefaultAppDir() + IMAGE_DOWNLOAD_DIR_SUFFIX;
+    }
+
+    public static String getMediaDir() {
+        return getDefaultAppDir() + MEDIA_DIR_SUFFIX;
+    }
+
+    public static String getFileDownloadDir() {
+        return getDefaultAppDir() + FILE_DOWNLOAD_DIR_SUFFIX;
+    }
+
+    public static String getCrashLogDir() {
+        return getDefaultAppDir() + CRASH_LOG_DIR_SUFFIX;
+    }
+
+    public static String getSelfFaceUrl() {
+        return selfFaceUrl;
+    }
+
+    public static void setSelfFaceUrl(String selfFaceUrl) {
+        TUIConfig.selfFaceUrl = selfFaceUrl;
+    }
+
+    public static String getSelfNickName() {
+        return selfNickName;
+    }
+
+    public static void setSelfNickName(String selfNickName) {
+        TUIConfig.selfNickName = selfNickName;
+    }
+
+    public static int getSelfAllowType() {
+        return selfAllowType;
+    }
+
+    public static void setSelfAllowType(int selfAllowType) {
+        TUIConfig.selfAllowType = selfAllowType;
+    }
+
+    public static long getSelfBirthDay() {
+        return selfBirthDay;
+    }
+
+    public static void setSelfBirthDay(long selfBirthDay) {
+        TUIConfig.selfBirthDay = selfBirthDay;
+    }
+
+    public static String getSelfSignature() {
+        return selfSignature;
+    }
+
+    public static void setSelfSignature(String selfSignature) {
+        TUIConfig.selfSignature = selfSignature;
+    }
+
+    public static void setGender(int gender) {
+        TUIConfig.gender = gender;
+    }
+
+    public static int getGender() {
+        return gender;
+    }
+
+    /**
+     * 获取群组会话否展示九宫格样式的头像，默认为 true
+     * Gets whether to display the avatar in the nine-square grid style in the group conversation, the default is true
+     */
+    public static boolean isEnableGroupGridAvatar() {
+        return enableGroupGridAvatar;
+    }
+
+    /**
+     * 设置群组会话是否展示九宫格样式的头像
+     * Set whether to display the avatar in the nine-square grid style in group conversations
+     */
+    public static void setEnableGroupGridAvatar(boolean enableGroupGridAvatar) {
+        TUIConfig.enableGroupGridAvatar = enableGroupGridAvatar;
+    }
+
+    /**
+     * 获取 c2c 会话的默认头像
+     *
+     * Get the default avatar for c2c conversation
+     *
+     * @return
+     */
+    public static int getDefaultAvatarImage() {
+        return defaultAvatarImage;
+    }
+
+    /**
+     * 设置 c2c 会话的默认头像
+     *
+     *Set the default avatar for c2c conversation
+     *
+     * @return
+     */
+    public static void setDefaultAvatarImage(int defaultAvatarImage) {
+        TUIConfig.defaultAvatarImage = defaultAvatarImage;
+    }
+
+    /**
+     * 获取 group 会话的默认头像
+     *
+     * Get the default avatar for group conversation
+     *
+     * @return
+     */
+    public static int getDefaultGroupAvatarImage() {
+        return defaultGroupAvatarImage;
+    }
+
+    /**
+     * 设置 group 会话的默认头像
+     *
+     *Set the default avatar for group conversation
+     *
+     * @return
+     */
+    public static void setDefaultGroupAvatarImage(int defaultGroupAvatarImage) {
+        TUIConfig.defaultGroupAvatarImage = defaultGroupAvatarImage;
+    }
+
+    /**
+     * Set login user information
+     */
+    public static void setSelfInfo(V2TIMUserFullInfo userFullInfo) {
+        TUIConfig.selfFaceUrl = userFullInfo.getFaceUrl();
+        TUIConfig.selfNickName = userFullInfo.getNickName();
+        TUIConfig.selfAllowType = userFullInfo.getAllowType();
+        TUIConfig.selfBirthDay = userFullInfo.getBirthday();
+        TUIConfig.selfSignature = userFullInfo.getSelfSignature();
+        TUIConfig.gender = userFullInfo.getGender();
+    }
+
+    /**
+     * Clear login user information
+     */
+    public static void clearSelfInfo() {
+        TUIConfig.selfFaceUrl = "";
+        TUIConfig.selfNickName = "";
+        TUIConfig.selfAllowType = 0;
+        TUIConfig.selfBirthDay = 0L;
+        TUIConfig.selfSignature = "";
+    }
+
+    /**
+     * init file path
+     */
+    public static void initPath() {
+        File f = new File(getMediaDir());
+        if (!f.exists()) {
+            f.mkdirs();
+        }
+
+        f = new File(getRecordDir());
+        if (!f.exists()) {
+            f.mkdirs();
+        }
+
+        f = new File(getRecordDownloadDir());
+        if (!f.exists()) {
+            f.mkdirs();
+        }
+
+        f = new File(getVideoDownloadDir());
+        if (!f.exists()) {
+            f.mkdirs();
+        }
+
+        f = new File(getImageDownloadDir());
+        if (!f.exists()) {
+            f.mkdirs();
+        }
+
+        f = new File(getFileDownloadDir());
+        if (!f.exists()) {
+            f.mkdirs();
+        }
+
+        f = new File(getCrashLogDir());
+        if (!f.exists()) {
+            f.mkdirs();
+        }
+    }
+
+    public static Context getAppContext() {
+        return appContext;
+    }
+
+    public static void setSceneOptimizParams(final String scene){
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    String packageName = "";
+                    String sdkAPPId = TUILogin.getSdkAppId() + "";
+                    String userId = TUILogin.getUserId();
+                    if(getAppContext() != null){
+                        packageName = getAppContext().getPackageName();
+                    }
+
+                    URL url = new URL("https://demos.trtc.tencent-cloud.com/prod/base/v1/events/stat");
+                    HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+                    conn.setConnectTimeout(5000);
+                    conn.setReadTimeout(5000);
+                    conn.setDoOutput(true);
+                    conn.setDoInput(true);
+                    conn.setUseCaches(false);
+                    conn.setRequestMethod("POST");
+                    conn.setRequestProperty("Content-Type", "application/json");
+
+                    JSONObject msgObject = new JSONObject();
+                    msgObject.put("sdkappid", sdkAPPId);
+                    msgObject.put("bundleId", "");
+                    msgObject.put("component", scene);
+                    msgObject.put("package", packageName);
+
+                    JSONObject bodyObject = new JSONObject();
+                    bodyObject.put("userId", userId);
+                    bodyObject.put("event", "useScenario");
+                    bodyObject.put("msg", msgObject);
+                    String paramStr = String.valueOf(bodyObject);
+
+                    OutputStream out = conn.getOutputStream();
+                    out.write(paramStr.getBytes());
+                    out.flush();
+                    out.close();
+                    if (conn.getResponseCode() == HttpURLConnection.HTTP_OK) {
+                        InputStream is = conn.getInputStream();
+                        ByteArrayOutputStream message = new ByteArrayOutputStream();
+                        int len = 0;
+                        byte buffer[] = new byte[1024];
+                        while ((len = is.read(buffer)) != -1) {
+                            message.write(buffer, 0, len);
+                        }
+                        String msg = new String(message.toByteArray());
+                        Log.d("setSceneOptimizParams", "msg:" + msg);
+                        is.close();
+                        message.close();
+                        conn.disconnect();
+                    } else {
+                        Log.d("setSceneOptimizParams", "ResponseCode:" + conn.getResponseCode());
+                    }
+                } catch (Exception e) {
+                    Log.d("TUICore", "setSceneOptimizParams exception");
+                }
+            }
+        }).start();
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/TUIConstants.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/TUIConstants.java
new file mode 100644
index 0000000..4038559
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/TUIConstants.java
@@ -0,0 +1,429 @@
+package com.tencent.qcloud.tuicore;
+
+import com.tencent.imsdk.BaseConstants;
+
+/**
+ * TUI constants
+ */
+public final class TUIConstants {
+
+    public static final class GroupType {
+        public static final String TYPE = "type";
+        public static final String IS_GROUP = "isGroup";
+
+        public static final String TYPE_PRIVATE = "Private";
+        public static final String TYPE_WORK = "Work";
+        public static final String TYPE_PUBLIC = "Public";
+
+        public static final String TYPE_CHAT_ROOM = "ChatRoom";
+        public static final String TYPE_MEETING = "Meeting";
+        public static final String TYPE_COMMUNITY = "Community";
+    }
+
+    public static final class Service {
+        public static final String TUI_CHAT = "TUIChatService";
+        public static final String TUI_CONVERSATION = "TUIConversationService";
+        public static final String TUI_CONTACT = "TUIContactService";
+        public static final String TUI_SEARCH = "TUISearchService";
+        public static final String TUI_GROUP = "TUIGroupService";
+        public static final String TUI_CALLING = "TUICallingService";
+        public static final String TUI_AUDIO_RECORD = "TUIAudioMessageRecordService";
+        public static final String TUI_LIVE = "TUILiveService";
+        public static final String TUI_BEAUTY = "TUIBeauty";
+        public static final String TUI_OFFLINEPUSH = "TUIOfflinePushService";
+        public static final String TUI_COMMUNITY = "TUICommunityService";
+    }
+
+    public static final class TUILogin {
+
+        // User login status change broadcast
+        public static final String EVENT_LOGIN_STATE_CHANGED = "eventLoginStateChanged";
+        // User kicked offline
+        public static final String EVENT_SUB_KEY_USER_KICKED_OFFLINE = "eventSubKeyUserKickedOffline";
+        // User ticket expired
+        public static final String EVENT_SUB_KEY_USER_SIG_EXPIRED = "eventSubKeyUserSigExpired";
+        // Changes in user personal information
+        public static final String EVENT_SUB_KEY_USER_INFO_UPDATED = "eventSubKeyUserInfoUpdated";
+
+        // Imsdk initialize state change
+        public static final String EVENT_IMSDK_INIT_STATE_CHANGED = "eventIMSDKInitStateChanged";
+        // Init
+        public static final String EVENT_SUB_KEY_START_INIT = "eventSubKeyStartInit";
+        // Uint
+        public static final String EVENT_SUB_KEY_START_UNINIT = "eventSubKeyStartUnInit";
+        // Login success
+        public static final String EVENT_SUB_KEY_USER_LOGIN_SUCCESS = "eventSubKeyUserLoginSuccess";
+        // Logout success
+        public static final String EVENT_SUB_KEY_USER_LOGOUT_SUCCESS = "eventSubKeyUserLogoutSuccess";
+
+        public static final String SELF_ID = "selfId";
+        public static final String SELF_SIGNATURE = "selfSignature";
+        public static final String SELF_FACE_URL = "selfFaceUrl";
+        public static final String SELF_NICK_NAME = "selfNickName";
+        public static final String SELF_LEVEL = "selfLevel";
+        public static final String SELF_GENDER = "selfGender";
+        public static final String SELF_ROLE = "selfRole";
+        public static final String SELF_BIRTHDAY = "selfBirthday";
+        public static final String SELF_ALLOW_TYPE = "selfAllowType";
+    }
+
+    public static final class TUIChat {
+        public static final String SERVICE_NAME = Service.TUI_CHAT;
+
+        // Send message
+        public static final String METHOD_SEND_MESSAGE = "sendMessage";
+        // Exit chat
+        public static final String METHOD_EXIT_CHAT = "exitChat";
+        // Get a message digest to display in the conversation list
+        public static final String METHOD_GET_DISPLAY_STRING = "getDisplayString";
+        // add message to chat list
+        public static final String METHOD_ADD_MESSAGE_TO_CHAT = "addMessageToChat";
+        // 处理完群申请 // Process the group application
+        public static final String METHOD_GROUP_APPLICAITON_PROCESSED = "groupApplicationProcessed";
+
+        // More actions
+        public static final String EXTENSION_INPUT_MORE_CUSTOM_MESSAGE = "inputMoreCustomMessage";
+        public static final String EXTENSION_INPUT_MORE_LIVE = "inputMoreLive";
+        public static final String EXTENSION_INPUT_MORE_VIDEO_CALL = "inputMoreVideoCall";
+        public static final String EXTENSION_INPUT_MORE_AUDIO_CALL = "inputMoreAudioCall";
+
+        public static final String EVENT_KEY_RECEIVE_MESSAGE = "eventReceiveMessage";
+        public static final String EVENT_SUB_KEY_CONVERSATION_ID = "eventConversationID";
+
+        public static final String EVENT_KEY_INPUT_MORE = "eventKeyInputMore";
+        public static final String EVENT_SUB_KEY_ON_CLICK = "eventSubKeyOnClick";
+
+        public static final String EVENT_KEY_MESSAGE_EVENT = "eventKeyMessageEvent";
+        public static final String EVENT_SUB_KEY_SEND_MESSAGE_SUCCESS = "eventSubKeySendMessageSuccess";
+        public static final String EVENT_SUB_KEY_REPLY_MESSAGE_SUCCESS = "eventSubKeyReplyMessageSuccess";
+
+        public static final String C2C_CHAT_ACTIVITY_NAME = "TUIC2CChatActivity";
+        public static final String GROUP_CHAT_ACTIVITY_NAME = "TUIGroupChatActivity";
+        public static final String CHAT_ID = "chatId";
+        public static final String CHAT_NAME = "chatName";
+        public static final String CHAT_TYPE = "chatType";
+        public static final String GROUP_NAME = "groupName";
+        public static final String GROUP_TYPE = "groupType";
+        public static final String DRAFT_TEXT = "draftText";
+        public static final String DRAFT_TIME = "draftTime";
+        public static final String IS_TOP_CHAT = "isTopChat";
+        public static final String LOCATE_MESSAGE = "locateMessage";
+        public static final String AT_INFO_LIST = "atInfoList";
+        public static final String FACE_URL = "faceUrl";
+        public static final String FACE_URL_LIST = "faceUrlList";
+        /*当下公司业务传输数据使用*/
+        public static final String WORK_BEAN = "workBean";
+        public static final String JOIN_TYPE = "joinType";
+        public static final String MEMBER_COUNT = "memberCount";
+        public static final String RECEIVE_OPTION = "receiveOption";
+        public static final String NOTICE = "notice";
+        public static final String OWNER = "owner";
+        public static final String MEMBER_DETAILS = "memberDetails";
+        public static final String IS_GROUP_CHAT = "isGroupChat";
+        public static final String V2TIMMESSAGE = "v2TIMMessage";
+        public static final String MESSAGE_BEAN = "messageBean";
+        public static final String GROUP_APPLY_NUM = "groupApplicaitonNumber";
+        public static final String CONVERSATION_ID = "conversationID";
+        public static final String IS_TYPING_MESSAGE = "isTypingMessage";
+
+        // Send custom message fields
+        public static final String MESSAGE_CONTENT = "messageContent";
+        public static final String MESSAGE_DESCRIPTION = "messageDescription";
+        public static final String MESSAGE_EXTENSION = "messageExtension";
+
+        // More input button extension field
+        public static final String CONTEXT = "context";
+        public static final String INPUT_MORE_ICON = "icon";
+        public static final String INPUT_MORE_TITLE = "title";
+        public static final String INPUT_MORE_ACTION_ID = "actionId";
+        public static final String INPUT_MORE_VIEW = "inputMoreView";
+
+        // Background
+        public static final String CHAT_CONVERSATION_BACKGROUND_URL = "https://sdk-im-1252463788.file.myqcloud.com/download/tuikit-resource/conversation-backgroundImage/backgroundImage_%s_full.png";
+        public static final String CHAT_CONVERSATION_BACKGROUND_THUMBNAIL_URL = "https://sdk-im-1252463788.file.myqcloud.com/download/tuikit-resource/conversation-backgroundImage/backgroundImage_%s.png";
+        public static final int CHAT_CONVERSATION_BACKGROUND_COUNT = 7;
+        public static final String CHAT_CONVERSATION_BACKGROUND_DEFAULT_URL = "chat/conversation/background/default/url";
+        public static final int CHAT_REQUEST_BACKGROUND_CODE = 1001;
+        public static final String METHOD_UPDATE_DATA_STORE_CHAT_URI = "updateDatastoreChatUri";
+        public static final String CHAT_BACKGROUND_URI = "chatBackgroundUri";
+    }
+
+    public static final class TUIConversation {
+        public static final String SERVICE_NAME = Service.TUI_CONVERSATION;
+
+
+        public static final String METHOD_IS_TOP_CONVERSATION = "isTopConversation";
+        public static final String METHOD_SET_TOP_CONVERSATION = "setTopConversation";
+        public static final String METHOD_GET_TOTAL_UNREAD_COUNT = "getTotalUnreadCount";
+        public static final String METHOD_UPDATE_TOTAL_UNREAD_COUNT = "updateTotalUnreadCount";
+        public static final String METHOD_DELETE_CONVERSATION = "deleteConversation";
+        public static final String METHOD_CLEAR_CONVERSATION_MESSAGE = "clearConversationMessage";
+
+        public static final String EVENT_UNREAD = "eventTotalUnreadCount";
+        public static final String EVENT_SUB_KEY_UNREAD_CHANGED = "unreadCountChanged";
+
+        public static final String EXTENSION_CLASSIC_SEARCH = "extensionClassicSearch";
+        public static final String EXTENSION_MINIMALIST_SEARCH = "extensionMinimalistSearch";
+
+        public static final String CHAT_ID = "chatId";
+        public static final String CONVERSATION_ID = "conversationId";
+        public static final String IS_SET_TOP = "isSetTop";
+        public static final String IS_TOP = "isTop";
+        public static final String IS_GROUP = "isGroup";
+        public static final String TOTAL_UNREAD_COUNT = "totalUnreadCount";
+        public static final String CONTEXT = "context";
+        public static final String SEARCH_VIEW = "searchView";
+
+        public static final String CONVERSATION_C2C_PREFIX = "c2c_";
+        public static final String CONVERSATION_GROUP_PREFIX = "group_";
+
+        public static final String EVENT_KEY_MESSAGE_SEND_FOR_CONVERSATION = "eventKeyMessageSendForConversation";
+        public static final String EVENT_SUB_KEY_MESSAGE_SEND_FOR_CONVERSATION = "eventSubKeyMessageSendForConversation";
+    }
+
+    public static final class TUIContact {
+        public static final String SERVICE_NAME = Service.TUI_CONTACT;
+
+        public static final String EVENT_FRIEND_STATE_CHANGED = "eventFriendStateChanged";
+        public static final String EVENT_FRIEND_INFO_CHANGED = "eventFriendInfoChanged";
+        public static final String EVENT_USER = "eventUser";
+        public static final String EVENT_SUB_KEY_FRIEND_REMARK_CHANGED = "eventFriendRemarkChanged";
+        public static final String EVENT_SUB_KEY_FRIEND_DELETE = "eventSubKeyFriendDelete";
+        public static final String EVENT_SUB_KEY_CLEAR_MESSAGE = "eventSubKeyC2CClearMessage";
+
+        public static final String FRIEND_ID_LIST = "friendIdList";
+        public static final String FRIEND_ID = "friendId";
+        public static final String FRIEND_REMARK = "friendRemark";
+
+        public static final String GROUP_TYPE_KEY = "type";
+        public static final String COMMUNITY_SUPPORT_TOPIC_KEY = "communitySupportTopic";
+
+        public static final int GROUP_TYPE_PRIVATE = 0;
+        public static final int GROUP_TYPE_PUBLIC = 1;
+        public static final int GROUP_TYPE_CHAT_ROOM = 2;
+        public static final int GROUP_TYPE_COMMUNITY = 3;
+
+        public static final String GROUP_FACE_URL = "https://im.sdk.cloud.tencent.cn/download/tuikit-resource/group-avatar/group_avatar_%s.png";
+        public static final int GROUP_FACE_COUNT = 24;
+    }
+
+    public static final class TUICalling {
+        public static final String SERVICE_NAME = Service.TUI_CALLING;
+
+        public static final String METHOD_NAME_CALL = "call";
+        public static final String METHOD_NAME_RECEIVEAPNSCALLED = "receiveAPNSCalled";
+        public static final String METHOD_NAME_ENABLE_FLOAT_WINDOW = "methodEnableFloatWindow";
+        public static final String METHOD_NAME_ENABLE_MULTI_DEVICE = "methodEnableMultiDeviceAbility";
+
+        public static final String PARAM_NAME_TYPE = "type";
+        public static final String PARAM_NAME_USERIDS = "userIDs";
+        public static final String PARAM_NAME_GROUPID = "groupId";
+        public static final String PARAM_NAME_CALLMODEL = "call_model_data";
+        public static final String PARAM_NAME_ENABLE_FLOAT_WINDOW = "enableFloatWindow";
+        public static final String PARAM_NAME_ENABLE_MULTI_DEVICE = "enableMultiDeviceAbility";
+
+        public static final String METHOD_START_CALL = "startCall";
+
+        public static final String CUSTOM_MESSAGE_BUSINESS_ID = "av_call";
+        public static final Double CALL_TIMEOUT_BUSINESS_ID = 1.0;
+
+        public static final String CALL_ID = "callId";
+        public static final String SENDER = "sender";
+        public static final String GROUP_ID = "groupId";
+        public static final String INVITED_LIST = "invitedList";
+        public static final String DATA = "data";
+
+        public static final String TYPE_AUDIO = "audio";
+        public static final String TYPE_VIDEO = "video";
+
+        public static final int ACTION_ID_AUDIO_CALL = 1;
+        public static final int ACTION_ID_VIDEO_CALL = 2;
+
+        public static final String EVENT_KEY_CALLING = "calling";
+        public static final String EVENT_KEY_NAME = "event_name";
+        public static final String EVENT_ACTIVE_HANGUP = "active_hangup";
+
+        public static final String SERVICE_NAME_AUDIO_RECORD              = Service.TUI_AUDIO_RECORD;
+        public static final String METHOD_NAME_START_RECORD_AUDIO_MESSAGE = "methodStartRecordAudioMessage";
+        public static final String METHOD_NAME_STOP_RECORD_AUDIO_MESSAGE  = "methodStopRecordAudioMessage";
+
+        public static final String EVENT_KEY_RECORD_AUDIO_MESSAGE = "eventRecordAudioMessage";
+        public static final String EVENT_SUB_KEY_RECORD_START     = "eventSubKeyStartRecordAudioMessage";
+        public static final String EVENT_SUB_KEY_RECORD_STOP      = "eventSubKeyStopRecordAudioMessage";
+
+        public static final String PARAM_NAME_SDK_APP_ID      = "sdkappid";
+        public static final String PARAM_NAME_AUDIO_SIGNATURE = "signature";
+        public static final String PARAM_NAME_AUDIO_PATH      = "path";
+
+        //Error Code
+        public static final int ERROR_NONE                       = 0;     // init success or record success
+        public static final int ERROR_INVALID_PARAM              = -1001; // param is invalid
+        public static final int ERROR_STATUS_IN_CALL             = -1002; // recording rejected, currently in call
+        public static final int ERROR_STATUS_IS_AUDIO_RECORDING  = -1003; // recording rejected, the current recording is not finished
+        public static final int ERROR_MIC_PERMISSION_REFUSED     = -1004; // recording rejected, failed to obtain microphone permission
+        public static final int ERROR_REQUEST_AUDIO_FOCUS_FAILED = -1005; // recording rejected, failed to obtain audio focus
+        public static final int ERROR_RECORD_INIT_FAILED         = -2001; // -1, init failed(onLocalRecordBegin)
+        public static final int ERROR_PATH_FORMAT_NOT_SUPPORT    = -2002; // -2, file format is invalid(onLocalRecordBegin)
+        public static final int ERROR_RECORD_FAILED              = -2003; // -1, record failed(onLocalRecordComplete)
+        public static final int ERROR_NO_MESSAGE_TO_RECORD       = -2004; // -3, The audio data has not arrived(onLocalRecordComplete)
+        public static final int ERROR_SIGNATURE_ERROR            = -3001; // -4, signature error(onLocalRecordBegin)
+        public static final int ERROR_SIGNATURE_EXPIRED          = -3002; // -5, signature expired(onLocalRecordBegin)
+        //TRTC-SDK MIC Error Code
+        public static final int ERR_MIC_START_FAIL               = -1302; // start microphone failed
+        public static final int ERR_MIC_NOT_AUTHORIZED           = -1317; // microphone authorize failed
+        public static final int ERR_MIC_SET_PARAM_FAIL           = -1318; // microphone param is invalid
+        public static final int ERR_MIC_OCCUPY                   = -1319; // microphone is occupied
+        public static class ObjectFactory {
+            public static final String FACTORY_NAME = "TUICallingObjectFactory";
+
+            public static class RecentCalls {
+                public static final String OBJECT_NAME = "TUICallingRecentCallsFragment";
+                public static final String UI_STYLE = "TUICallingRecentCallsFragmentUIStyle";
+                public static final String UI_STYLE_CLASSIC = "ClassicStyle";
+                public static final String UI_STYLE_MINIMALIST = "MinimalistStyle";
+            }
+        }
+    }
+
+    public static final class TUILive {
+        public static final String SERVICE_NAME = Service.TUI_LIVE;
+
+
+        public static final String METHOD_LOGIN = "methodLogin";
+        public static final String METHOD_LOGOUT = "methodLogout";
+        public static final String METHOD_START_ANCHOR = "methodStartAnchor";
+        public static final String METHOD_START_AUDIENCE = "methodStartAudience";
+
+        public static final String CUSTOM_MESSAGE_BUSINESS_ID = "group_live";
+        public static final String SDK_APP_ID = "sdkAppId";
+        public static final String USER_ID = "userId";
+        public static final String USER_SIG = "userSig";
+
+        public static final String GROUP_ID = "groupId";
+        public static final String ROOM_ID = "roomId";
+        public static final String ROOM_NAME    = "roomName";
+        public static final String ROOM_STATUS = "roomStatus";
+        public static final String ROOM_COVER     = "roomCover";
+        public static final String USE_CDN_PLAY  = "use_cdn_play";
+        public static final String ANCHOR_ID     = "anchorId";
+        public static final String ANCHOR_NAME     = "anchorName";
+        public static final String PUSHER_NAME   = "pusherName";
+        public static final String COVER_PIC     = "coverPic";
+        public static final String PUSHER_AVATAR = "pusherAvatar";
+
+        public static final int ACTION_ID_LIVE = 0;
+
+    }
+
+    public static final class TUIGroup {
+        public static final String SERVICE_NAME = Service.TUI_GROUP;
+
+
+        public static final String EVENT_GROUP = "eventGroup";
+        public static final String EVENT_SUB_KEY_EXIT_GROUP = "eventExitGroup";
+        public static final String EVENT_SUB_KEY_MEMBER_KICKED_GROUP = "eventMemberKickedGroup";
+        public static final String EVENT_SUB_KEY_GROUP_RECYCLE = "eventMemberGroupRecycle";
+        public static final String EVENT_SUB_KEY_GROUP_DISMISS = "eventMemberGroupDismiss";
+        public static final String EVENT_SUB_KEY_JOIN_GROUP = "eventSubKeyJoinGroup";
+        public static final String EVENT_SUB_KEY_INVITED_GROUP = "eventSubKeyInvitedGroup";
+        public static final String EVENT_SUB_KEY_GROUP_INFO_CHANGED = "eventSubKeyGroupInfoChanged";
+        public static final String EVENT_SUB_KEY_CLEAR_MESSAGE = "eventSubKeyGroupClearMessage";
+        public static final String EVENT_SUB_KEY_GROUP_MEMBER_SELECTED = "eventSubKeyGroupMemberSelected";
+
+        public static final String GROUP_ID = "groupId";
+        public static final String GROUP_NAME = "groupName";
+        public static final String GROUP_FACE_URL = "groupFaceUrl";
+        public static final String GROUP_OWNER = "groupOwner";
+        public static final String GROUP_INTRODUCTION = "groupIntroduction";
+        public static final String GROUP_NOTIFICATION= "groupNotification";
+        public static final String GROUP_MEMBER_ID_LIST= "groupMemberIdList";
+
+        public static final String SELECT_FRIENDS = "select_friends";
+        public static final String SELECT_FOR_CALL = "isSelectForCall";
+        public static final String USER_DATA = "userData";
+        public static final String IS_SELECT_MODE = "isSelectMode";
+        public static final String EXCLUDE_LIST = "excludeList";
+        public static final String SELECTED_LIST = "selectedList";
+        public static final String CONTENT = "content";
+        public static final String TYPE = "type";
+        public static final String TITLE = "title";
+        public static final String LIST = "list";
+        public static final String LIMIT = "limit";
+        public static final String FILTER = "filter";
+        public static final String JOIN_TYPE_INDEX = "joinTypeIndex";
+
+    }
+
+
+    public static final class TUIBeauty {
+        public static final String SERVICE_NAME = Service.TUI_BEAUTY;
+
+        public static final String PARAM_NAME_CONTEXT        = "context";
+        public static final String PARAM_NAME_LICENSE_KEY    = "licenseKey";
+        public static final String PARAM_NAME_LICENSE_URL    = "licenseUrl";
+        public static final String PARAM_NAME_FRAME_WIDTH    = "frameWidth";
+        public static final String PARAM_NAME_FRAME_HEIGHT   = "frameHeight";
+        public static final String PARAM_NAME_SRC_TEXTURE_ID = "srcTextureId";
+
+        public static final String METHOD_PROCESS_VIDEO_FRAME = "processVideoFrame";
+        public static final String METHOD_INIT_XMAGIC         = "setLicense";
+        public static final String METHOD_DESTROY_XMAGIC      = "destroy";
+    }
+    
+    public static final class TUIOfflinePush {
+        public static final String SERVICE_NAME = Service.TUI_OFFLINEPUSH;
+        public static final String METHOD_UNREGISTER_PUSH = "unRegiterPush";
+
+        public static final String EVENT_NOTIFY = "offlinePushNotifyEvent";
+        public static final String EVENT_NOTIFY_NOTIFICATION = "notifyNotificationEvent";
+        public static final String NOTIFICATION_INTENT_KEY = "notificationIntentKey";
+        public static final String NOTIFICATION_EXT_KEY = "ext";
+
+        public static final String NOTIFICATION_BROADCAST_ACTION = "com.tencent.tuiofflinepush.BROADCAST_PUSH_RECEIVER";
+    }
+
+    public static final class TUICommunity {
+        public static final String SERVICE_NAME = Service.TUI_COMMUNITY;
+
+        public static final String TOPIC_ID = "topic_id";
+
+        public static final String EVENT_KEY_COMMUNITY_EXPERIENCE= "eventKeyCommunityExperience";
+        public static final String EVENT_SUB_KEY_ADD_COMMUNITY = "eventSubKeyAddCommunity";
+        public static final String EVENT_SUB_KEY_CREATE_COMMUNITY = "eventSubKeyCreateCommunity";
+        public static final String EVENT_SUB_KEY_DISBAND_COMMUNITY = "eventSubKeyDisbandCommunity";
+        public static final String EVENT_SUB_KEY_CREATE_TOPIC = "eventSubKeyCreateTopic";
+        public static final String EVENT_SUB_KEY_DELETE_TOPIC = "eventSubKeyDeleteTopic";
+    }
+
+    public static final class Message {
+        public static final String CUSTOM_BUSINESS_ID_KEY = "businessID";
+        public static final String CALLING_TYPE_KEY = "call_type";
+    }
+
+    public static final class NetworkConnection {
+        public static final String EVENT_CONNECTION_STATE_CHANGED = "eventConnectionStateChanged";
+        public static final String EVENT_SUB_KEY_CONNECTING       = "eventSubKeyConnecting";
+        public static final String EVENT_SUB_KEY_CONNECT_SUCCESS  = "eventSubKeyConnectSuccess";
+        public static final String EVENT_SUB_KEY_CONNECT_FAILED   = "eventSubKeyConnectFailed";
+    }
+
+
+    public static final class BuyingFeature {
+        public static final int ERR_SDK_INTERFACE_NOT_SUPPORT = BaseConstants.ERR_SDK_INTERFACE_NOT_SUPPORT;
+        public static final String BUYING_GUIDELINES_EN = "https://intl.cloud.tencent.com/document/product/1047/36021?lang=en&pg=#changing-configuration";
+        public static final String BUYING_GUIDELINES = "https://cloud.tencent.com/document/product/269/32458";
+
+        public static final String BUYING_PRICE_DESC_EN = "https://www.tencentcloud.com/document/product/1047/34349#basic-services";
+        public static final String BUYING_PRICE_DESC = "https://cloud.tencent.com/document/product/269/11673?from=17219#.E5.9F.BA.E7.A1.80.E6.9C.8D.E5.8A.A1.E8.AF.A6.E6.83.85";
+
+
+        public static final String BUYING_FEATURE_MESSAGE_RECEIPT = "buying_chat_message_read_receipt";
+        public static final String BUYING_FEATURE_COMMUNITY = "buying_community";
+        public static final String BUYING_FEATURE_SEARCH = "buying_search";
+        public static final String BUYING_FEATURE_ONLINE_STATUS = "buying_online_status";
+    }
+
+    // localBroadcast
+    public static final String CONVERSATION_UNREAD_COUNT_ACTION = "conversation_unread_count_action";
+    public static final String UNREAD_COUNT_EXTRA = "unread_count_extra";
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/TUICore.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/TUICore.java
new file mode 100644
index 0000000..7fa3123
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/TUICore.java
@@ -0,0 +1,148 @@
+package com.tencent.qcloud.tuicore;
+
+import android.content.Context;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import com.tencent.qcloud.tuicore.interfaces.ITUIExtension;
+import com.tencent.qcloud.tuicore.interfaces.ITUINotification;
+import com.tencent.qcloud.tuicore.interfaces.ITUIService;
+
+import java.util.Map;
+
+/**
+ * TUI Plugin core class, mainly responsible for data transfer between TUI plugins, notification broadcast, function extension, etc.
+ */
+public class TUICore {
+    private static final String TAG = TUICore.class.getSimpleName();
+
+    /**
+     * Register Service
+     * @param serviceName    service name
+     * @param service        service object
+     */
+    public static void registerService(String serviceName, ITUIService service) {
+        ServiceManager.getInstance().registerService(serviceName, service);
+    }
+
+    /**
+     * unregister Service
+     *
+     * @param serviceName service name
+     */
+    public static void unregisterService(String serviceName) {
+        ServiceManager.getInstance().unregisterService(serviceName);
+    }
+
+    /**
+     * get Service
+     *
+     * @param serviceName service name
+     * @return service
+     */
+    public static ITUIService getService(String serviceName) {
+        return ServiceManager.getInstance().getService(serviceName);
+    }
+
+    /**
+     * Call Service
+     *
+     *  @param serviceName     service name
+     *  @param method          method name
+     *  @param param           pass parameters
+     *  @return                object
+     */
+    public static Object callService(String serviceName, String method, Map<String, Object> param) {
+        return ServiceManager.getInstance().callService(serviceName, method, param);
+    }
+
+    /**
+     * start Activity
+     * @param activityName     activity name，such as "TUIGroupChatActivity"
+     * @param param            pass parameters
+     */
+    public static void startActivity(String activityName, Bundle param) {
+        startActivity(null, activityName, param, -1);
+    }
+
+    /**
+     * start Activity
+     * @param starter         Initiator, either {@link Context} or {@link Fragment}
+     * @param activityName    activity name，such as "TUIGroupChatActivity"
+     * @param param           pass parameters
+     */
+    public static void startActivity(@Nullable Object starter, String activityName, Bundle param) {
+        startActivity(starter, activityName, param, -1);
+    }
+
+    /**
+     * start Activity
+     * @param starter         Initiator, either {@link Context} or {@link Fragment}
+     * @param activityName    activity name，such as "TUIGroupChatActivity"
+     * @param param           pass parameters
+     * @param requestCode     The request value passed to the Activity, used to return the result in the initiator's 
+     *                        onActivityResult method when the Activity ends, greater than or equal to 0 is valid.
+     */
+    public static void startActivity(@Nullable Object starter, String activityName, Bundle param, int requestCode) {
+        TUIRouter.Navigation navigation = TUIRouter.getInstance().setDestination(activityName).putExtras(param);
+        if (starter instanceof Fragment) {
+            navigation.navigate((Fragment) starter, requestCode);
+        } else if (starter instanceof Context) {
+            navigation.navigate((Context) starter, requestCode);
+        } else {
+            navigation.navigate((Context) null, requestCode);
+        }
+    }
+
+    /**
+     *  Register event
+     */
+    public static void registerEvent(String key, String subKey, ITUINotification notification) {
+        EventManager.getInstance().registerEvent(key, subKey, notification);
+    }
+
+    /**
+     *  Unregister event
+     */
+    public static void unRegisterEvent(String key, String subKey, ITUINotification notification) {
+        EventManager.getInstance().unRegisterEvent(key, subKey, notification);
+    }
+
+    /**
+     *  Removes all notifications for the specified notification object
+     */
+    public static void unRegisterEvent(ITUINotification notification) {
+        EventManager.getInstance().unRegisterEvent(notification);
+    }
+
+    /**
+     *  Notify event
+     */
+    public static void notifyEvent(String key, String subKey, Map<String, Object> param) {
+        EventManager.getInstance().notifyEvent(key, subKey, param);
+    }
+
+    /**
+     *  Register extension
+     */
+    public static void registerExtension(String key, ITUIExtension extension) {
+        ExtensionManager.getInstance().registerExtension(key, extension);
+    }
+
+    /**
+     *  Unregister extension
+     */
+    public static void unRegisterExtension(String key, ITUIExtension extension) {
+        ExtensionManager.getInstance().unRegisterExtension(key, extension);
+    }
+
+    /**
+     *  Get Extension
+     */
+    public static Map<String, Object> getExtensionInfo(String key, Map<String, Object> param) {
+        return ExtensionManager.getInstance().getExtensionInfo(key, param);
+    }
+
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/TUILogin.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/TUILogin.java
new file mode 100644
index 0000000..e707b91
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/TUILogin.java
@@ -0,0 +1,464 @@
+package com.tencent.qcloud.tuicore;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.tencent.imsdk.v2.V2TIMCallback;
+import com.tencent.imsdk.v2.V2TIMLogListener;
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMSDKConfig;
+import com.tencent.imsdk.v2.V2TIMSDKListener;
+import com.tencent.imsdk.v2.V2TIMUserFullInfo;
+import com.tencent.imsdk.v2.V2TIMValueCallback;
+import com.tencent.qcloud.tuicore.interfaces.TUICallback;
+import com.tencent.qcloud.tuicore.interfaces.TUILogListener;
+import com.tencent.qcloud.tuicore.interfaces.TUILoginConfig;
+import com.tencent.qcloud.tuicore.interfaces.TUILoginListener;
+import com.tencent.qcloud.tuicore.util.ErrorMessageConverter;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import static com.tencent.imsdk.v2.V2TIMManager.V2TIM_STATUS_LOGINED;
+
+
+/**
+ * Login logic for IM and TRTC
+ */
+public class TUILogin {
+    private static final String TAG = TUILogin.class.getSimpleName();
+
+    private static class TUILoginHolder {
+        private static final TUILogin loginInstance = new TUILogin();
+    }
+
+    public static TUILogin getInstance() {
+        return TUILoginHolder.loginInstance;
+    }
+
+    private Context appContext;
+    private int sdkAppId = 0;
+    private String userId;
+    private String userSig;
+    private boolean hasLoginSuccess = false;
+
+    private final List<TUILoginListener> listenerList = new CopyOnWriteArrayList<>();
+
+    private TUILogin() {}
+
+    private final V2TIMSDKListener imSdkListener = new V2TIMSDKListener() {
+        @Override
+        public void onConnecting() {
+            for (TUILoginListener listener : listenerList) {
+                listener.onConnecting();
+            }
+            TUICore.notifyEvent(TUIConstants.NetworkConnection.EVENT_CONNECTION_STATE_CHANGED,
+                    TUIConstants.NetworkConnection.EVENT_SUB_KEY_CONNECTING, null);
+        }
+
+        @Override
+        public void onConnectSuccess() {
+            for (TUILoginListener listener : listenerList) {
+                listener.onConnectSuccess();
+            }
+            TUICore.notifyEvent(TUIConstants.NetworkConnection.EVENT_CONNECTION_STATE_CHANGED,
+                    TUIConstants.NetworkConnection.EVENT_SUB_KEY_CONNECT_SUCCESS, null);
+        }
+
+        @Override
+        public void onConnectFailed(int code, String error) {
+            for (TUILoginListener listener : listenerList) {
+                listener.onConnectFailed(code, error);
+            }
+            TUICore.notifyEvent(TUIConstants.NetworkConnection.EVENT_CONNECTION_STATE_CHANGED,
+                    TUIConstants.NetworkConnection.EVENT_SUB_KEY_CONNECT_FAILED, null);
+        }
+
+        @Override
+        public void onKickedOffline() {
+            for (TUILoginListener listener : listenerList) {
+                listener.onKickedOffline();
+            }
+            TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED,
+                    TUIConstants.TUILogin.EVENT_SUB_KEY_USER_KICKED_OFFLINE, null);
+        }
+
+        @Override
+        public void onUserSigExpired() {
+            for (TUILoginListener listener : listenerList) {
+                listener.onUserSigExpired();
+            }
+            TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED,
+                    TUIConstants.TUILogin.EVENT_SUB_KEY_USER_SIG_EXPIRED, null);
+        }
+
+        @Override
+        public void onSelfInfoUpdated(V2TIMUserFullInfo info) {
+            TUIConfig.setSelfInfo(info);
+            notifyUserInfoChanged(info);
+        }
+    };
+
+    /**
+     * IMSDK login
+     *
+     * @param context   The context of the application, generally is ApplicationContext
+     * @param sdkAppId  Assigned when you register your app with Tencent Cloud
+     * @param userId    User ID
+     * @param userSig   Obtained from the business server
+     * @param callback  login callback
+     */
+    public static void login(@NonNull Context context, int sdkAppId, String  userId, String userSig, TUICallback callback) {
+        getInstance().internalLogin(context, sdkAppId, userId, userSig, null, callback);
+    }
+
+    /**
+     * IMSDK login
+     *
+     * @param context   The context of the application, generally is ApplicationContext
+     * @param sdkAppId  Assigned when you register your app with Tencent Cloud
+     * @param userId    User ID
+     * @param userSig   Obtained from the business server
+     * @param config    log related configs
+     * @param callback  login callback
+     */
+    public static void login(@NonNull Context context, int sdkAppId, String  userId, String userSig, TUILoginConfig config, TUICallback callback) {
+        getInstance().internalLogin(context, sdkAppId, userId, userSig, config, callback);
+    }
+
+    /**
+     * IMSDK logout
+     * @param callback  logout callback
+     */
+    public static void logout(TUICallback callback) {
+        getInstance().internalLogout(callback);
+    }
+
+    public static void addLoginListener(TUILoginListener listener) {
+        getInstance().internalAddLoginListener(listener);
+    }
+
+    public static void removeLoginListener(TUILoginListener listener) {
+        getInstance().internalRemoveLoginListener(listener);
+    }
+
+    private void internalLogin(Context context, final int sdkAppId, final String  userId, final String userSig, TUILoginConfig config, TUICallback callback) {
+        if (this.sdkAppId != 0 && sdkAppId != this.sdkAppId) {
+            logout((TUICallback) null);
+        }
+        this.appContext = context.getApplicationContext();
+        this.sdkAppId = sdkAppId;
+        V2TIMManager.getInstance().addIMSDKListener(imSdkListener);
+        // Notify init event
+        TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_IMSDK_INIT_STATE_CHANGED, TUIConstants.TUILogin.EVENT_SUB_KEY_START_INIT, null);
+        // User operation initialization, the privacy agreement has been read by default
+
+        V2TIMSDKConfig v2TIMSDKConfig = null;
+        if (config != null) {
+            v2TIMSDKConfig = new V2TIMSDKConfig();
+            v2TIMSDKConfig.setLogLevel(config.getLogLevel());
+            TUILogListener logListener = config.getLogListener();
+            if (logListener != null) {
+                v2TIMSDKConfig.setLogListener(new V2TIMLogListener() {
+                    @Override
+                    public void onLog(int logLevel, String logContent) {
+                        logListener.onLog(logLevel, logContent);
+                    }
+                });
+            }
+        }
+
+        boolean initSuccess = V2TIMManager.getInstance().initSDK(context, sdkAppId, v2TIMSDKConfig);
+        if (initSuccess) {
+            this.userId = userId;
+            this.userSig = userSig;
+            if (TextUtils.equals(userId, V2TIMManager.getInstance().getLoginUser()) && !TextUtils.isEmpty(userId)) {
+                TUICallback.onSuccess(callback);
+                TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED, TUIConstants.TUILogin.EVENT_SUB_KEY_USER_LOGIN_SUCCESS, null);
+                getUserInfo(userId);
+                return;
+            }
+
+            V2TIMManager.getInstance().login(userId, userSig, new V2TIMCallback() {
+                @Override
+                public void onSuccess() {
+                    hasLoginSuccess = true;
+                    getUserInfo(userId);
+                    TUICallback.onSuccess(callback);
+                    TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED, TUIConstants.TUILogin.EVENT_SUB_KEY_USER_LOGIN_SUCCESS, null);
+                }
+
+                @Override
+                public void onError(int code, String desc) {
+                    TUICallback.onError(callback, code, ErrorMessageConverter.convertIMError(code, desc));
+                }
+            });
+        } else {
+            TUICallback.onError(callback, -1, "init failed");
+        }
+    }
+
+    private void internalLogout(TUICallback callback) {
+        // Notify unit event
+        TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_IMSDK_INIT_STATE_CHANGED, TUIConstants.TUILogin.EVENT_SUB_KEY_START_UNINIT, null);
+        V2TIMManager.getInstance().logout(new V2TIMCallback() {
+            @Override
+            public void onSuccess() {
+                sdkAppId = 0;
+                userId = null;
+                userSig = null;
+                V2TIMManager.getInstance().unInitSDK();
+                TUIConfig.clearSelfInfo();
+                TUICallback.onSuccess(callback);
+                TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED, TUIConstants.TUILogin.EVENT_SUB_KEY_USER_LOGOUT_SUCCESS, null);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUICallback.onError(callback, code, desc);
+            }
+        });
+    }
+
+    private void internalAddLoginListener(TUILoginListener listener) {
+        Log.i(TAG, "addLoginListener listener : " + listener);
+        if (listener == null) {
+            return;
+        }
+        if (!listenerList.contains(listener)) {
+            listenerList.add(listener);
+        }
+    }
+
+    private void internalRemoveLoginListener(TUILoginListener listener) {
+        Log.i(TAG, "removeLoginListener listener : " + listener);
+        if (listener == null) {
+            return;
+        }
+        listenerList.remove(listener);
+    }
+
+    /**
+     * IMSDK init
+     *
+     * @param context      The context of the application, generally is ApplicationContext
+     * @param sdkAppId     Assigned when you register your app with Tencent Cloud
+     * @param config       The related configuration items of IMSDK, generally use the default, 
+     *                     and need special configuration, please refer to the API documentation
+     * @param listener     Listener of IMSDK init
+     * @return true：init success；false：init failed
+     */
+    @Deprecated
+    public static boolean init(@NonNull Context context, int sdkAppId, @Nullable V2TIMSDKConfig config, @Nullable V2TIMSDKListener listener) {
+        if (getInstance().sdkAppId != 0 && sdkAppId != getInstance().sdkAppId) {
+            logout((V2TIMCallback) null);
+            unInit();
+        }
+        getInstance().appContext = context.getApplicationContext();
+        getInstance().sdkAppId = sdkAppId;
+        V2TIMManager.getInstance().addIMSDKListener(new V2TIMSDKListener() {
+            @Override
+            public void onConnecting() {
+                if (listener != null) {
+                    listener.onConnecting();
+                }
+            }
+
+            @Override
+            public void onConnectSuccess() {
+                if (listener != null) {
+                    listener.onConnectSuccess();
+                }
+            }
+
+            @Override
+            public void onConnectFailed(int code, String error) {
+                if (listener != null) {
+                    listener.onConnectFailed(code, ErrorMessageConverter.convertIMError(code, error));
+                }
+            }
+
+            @Override
+            public void onKickedOffline() {
+                if (listener != null) {
+                    listener.onKickedOffline();
+                }
+                TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED,
+                        TUIConstants.TUILogin.EVENT_SUB_KEY_USER_KICKED_OFFLINE, null);
+            }
+
+            @Override
+            public void onUserSigExpired() {
+                if (listener != null) {
+                    listener.onUserSigExpired();
+                }
+                TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED,
+                        TUIConstants.TUILogin.EVENT_SUB_KEY_USER_SIG_EXPIRED, null);
+            }
+
+            @Override
+            public void onSelfInfoUpdated(V2TIMUserFullInfo info) {
+                if (listener != null) {
+                    listener.onSelfInfoUpdated(info);
+                }
+
+                TUIConfig.setSelfInfo(info);
+                notifyUserInfoChanged(info);
+            }
+        });
+        TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_IMSDK_INIT_STATE_CHANGED, TUIConstants.TUILogin.EVENT_SUB_KEY_START_INIT, null);
+        return V2TIMManager.getInstance().initSDK(context, sdkAppId, config);
+    }
+
+    @Deprecated
+    public static void unInit() {
+        getInstance().sdkAppId = 0;
+        TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_IMSDK_INIT_STATE_CHANGED, TUIConstants.TUILogin.EVENT_SUB_KEY_START_UNINIT, null);
+
+        V2TIMManager.getInstance().unInitSDK();
+        TUIConfig.clearSelfInfo();
+    }
+
+    /**
+     * User Login
+     *
+     * @param userId   User ID
+     * @param userSig  Obtained from the business server
+     * @param callback  login callback
+     */
+    @Deprecated
+    public static void login(@NonNull String userId, @NonNull String userSig, @Nullable V2TIMCallback callback) {
+        getInstance().userId = userId;
+        getInstance().userSig = userSig;
+        if (TextUtils.equals(userId, V2TIMManager.getInstance().getLoginUser()) && !TextUtils.isEmpty(userId)) {
+            if (callback != null) {
+                callback.onSuccess();
+            }
+            getUserInfo(userId);
+            return;
+        }
+
+        V2TIMManager.getInstance().login(userId, userSig, new V2TIMCallback() {
+            @Override
+            public void onSuccess() {
+                getInstance().hasLoginSuccess = true;
+                if (callback != null) {
+                    callback.onSuccess();
+                }
+                getUserInfo(userId);
+                TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED, TUIConstants.TUILogin.EVENT_SUB_KEY_USER_LOGIN_SUCCESS, null);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                if (callback != null) {
+                    callback.onError(code, ErrorMessageConverter.convertIMError(code, desc));
+                }
+            }
+        });
+    }
+
+    /**
+     * User Logout
+     *
+     * @param callback  Logout callback
+     */
+    @Deprecated
+    public static void logout(@Nullable V2TIMCallback callback) {
+        V2TIMManager.getInstance().logout(new V2TIMCallback() {
+            @Override
+            public void onSuccess() {
+                getInstance().userId = null;
+                getInstance().userSig = null;
+                if (callback != null) {
+                    callback.onSuccess();
+                }
+                TUIConfig.clearSelfInfo();
+
+                TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED, TUIConstants.TUILogin.EVENT_SUB_KEY_USER_LOGOUT_SUCCESS, null);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                if (callback != null) {
+                    callback.onError(code, ErrorMessageConverter.convertIMError(code, desc));
+                }
+            }
+        });
+    }
+
+    private static void getUserInfo(String userId) {
+        List<String> userIdList = new ArrayList<>();
+        userIdList.add(userId);
+        V2TIMManager.getInstance().getUsersInfo(userIdList, new V2TIMValueCallback<List<V2TIMUserFullInfo>>() {
+            @Override
+            public void onSuccess(List<V2TIMUserFullInfo> v2TIMUserFullInfos) {
+                if (v2TIMUserFullInfos.isEmpty()) {
+                    Log.e(TAG, "get logined userInfo failed. list is empty");
+                    return;
+                }
+                V2TIMUserFullInfo userFullInfo = v2TIMUserFullInfos.get(0);
+                TUIConfig.setSelfInfo(userFullInfo);
+                notifyUserInfoChanged(userFullInfo);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                Log.e(TAG, "get logined userInfo failed. code : " + code + " desc : " + ErrorMessageConverter.convertIMError(code, desc));
+            }
+        });
+    }
+
+    private static void notifyUserInfoChanged(V2TIMUserFullInfo userFullInfo) {
+        HashMap<String, Object> param = new HashMap<>();
+        param.put(TUIConstants.TUILogin.SELF_ID, userFullInfo.getUserID());
+        param.put(TUIConstants.TUILogin.SELF_SIGNATURE, userFullInfo.getSelfSignature());
+        param.put(TUIConstants.TUILogin.SELF_NICK_NAME, userFullInfo.getNickName());
+        param.put(TUIConstants.TUILogin.SELF_FACE_URL, userFullInfo.getFaceUrl());
+        param.put(TUIConstants.TUILogin.SELF_BIRTHDAY, userFullInfo.getBirthday());
+        param.put(TUIConstants.TUILogin.SELF_ROLE, userFullInfo.getRole());
+        param.put(TUIConstants.TUILogin.SELF_GENDER, userFullInfo.getGender());
+        param.put(TUIConstants.TUILogin.SELF_LEVEL, userFullInfo.getLevel());
+        param.put(TUIConstants.TUILogin.SELF_ALLOW_TYPE, userFullInfo.getAllowType());
+        TUICore.notifyEvent(TUIConstants.TUILogin.EVENT_LOGIN_STATE_CHANGED,
+                TUIConstants.TUILogin.EVENT_SUB_KEY_USER_INFO_UPDATED, param);
+    }
+
+    public static int getSdkAppId() {
+        return getInstance().sdkAppId;
+    }
+
+    public static String getUserId() {
+        return getInstance().userId;
+    }
+
+    public static String getUserSig() {
+        return getInstance().userSig;
+    }
+
+    public static String getNickName() {
+        return TUIConfig.getSelfNickName();
+    }
+
+    public static String getFaceUrl() {
+        return TUIConfig.getSelfFaceUrl();
+    }
+
+    public static Context getAppContext() {
+        return getInstance().appContext;
+    }
+
+    public static boolean isUserLogined() {
+        return getInstance().hasLoginSuccess && V2TIMManager.getInstance().getLoginStatus() == V2TIM_STATUS_LOGINED;
+    }
+
+    public static String getLoginUser() {
+        return V2TIMManager.getInstance().getLoginUser();
+    }
+}
\ No newline at end of file
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/TUIRouter.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/TUIRouter.java
new file mode 100644
index 0000000..cbaa40a
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/TUIRouter.java
@@ -0,0 +1,356 @@
+package com.tencent.qcloud.tuicore;
+
+import android.app.Activity;
+import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.util.Log;
+
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.Fragment;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * For Activity routing jump, only used inside TUICore, not exposed to the outside
+ */
+class TUIRouter {
+    private static final String TAG = TUIRouter.class.getSimpleName();
+
+    private static final TUIRouter router = new TUIRouter();
+
+    public static TUIRouter getInstance() {
+        return router;
+    }
+
+    private static final Map<String, String> routerMap = new HashMap<>();
+
+    private static Context context;
+
+    private static boolean initialized = false;
+
+    private TUIRouter() {
+    }
+
+    public synchronized static void init(Context context) {
+        if (initialized) {
+            return;
+        }
+        TUIRouter.context = context;
+        if (context == null) {
+            Log.e(TAG, "init failed, context is null.");
+            return;
+        }
+        initRouter(context);
+        initialized = true;
+    }
+
+    public Navigation setDestination(String path) {
+        Navigation navigation = new Navigation();
+        navigation.setDestination(path);
+        return navigation;
+    }
+
+    static class Navigation {
+        String destination;
+        Bundle options;
+        Intent intent = new Intent();
+
+        public Navigation setOptions(Bundle options) {
+            this.options = options;
+            return this;
+        }
+
+        public Navigation putExtra(String key, boolean value) {
+            intent.putExtra(key, value);
+            return this;
+        }
+
+        public Navigation putExtra(String key, byte value) {
+            intent.putExtra(key, value);
+            return this;
+        }
+
+        public Navigation putExtra(String key, char value) {
+            intent.putExtra(key, value);
+            return this;
+        }
+
+        public Navigation putExtra(String key, short value) {
+            intent.putExtra(key, value);
+            return this;
+        }
+
+        public Navigation putExtra(String key, int value) {
+            intent.putExtra(key, value);
+            return this;
+        }
+
+        public Navigation putExtra(String key, long value) {
+            intent.putExtra(key, value);
+            return this;
+        }
+
+        public Navigation putExtra(String key, float value) {
+            intent.putExtra(key, value);
+            return this;
+        }
+
+        public Navigation putExtra(String key, double value) {
+            intent.putExtra(key, value);
+            return this;
+        }
+
+        public Navigation putExtra(String key, String value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, CharSequence value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, Parcelable value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, Parcelable[] value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, Serializable value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, boolean[] value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, byte[] value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, short[] value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, char[] value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, int[] value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, long[] value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, float[] value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, double[] value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, String[] value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, CharSequence[] value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtra(String key, Bundle value) {
+            if (value != null) {
+                intent.putExtra(key, value);
+            }
+            return this;
+        }
+
+        public Navigation putExtras(Bundle bundle) {
+            if (bundle != null) {
+                intent.putExtras(bundle);
+            }
+            return this;
+        }
+
+        public Navigation putExtras(Intent src) {
+            if (src != null) {
+                intent.putExtras(src);
+            }
+            return this;
+        }
+
+        public Navigation setDestination(String path) {
+            destination = routerMap.get(path);
+            if (destination == null) {
+                Log.e(TAG, "destination is null.");
+                return this;
+            }
+            intent.setComponent(new ComponentName(TUIRouter.context, destination));
+            return this;
+        }
+
+        public Navigation setIntent(Intent intent) {
+            this.intent = intent;
+            return this;
+        }
+
+        public Intent getIntent() {
+            return this.intent;
+        }
+
+        public void navigate() {
+            navigate((Context) null);
+        }
+
+        public void navigate(Context context) {
+            navigate(context, -1);
+        }
+
+        public void navigate(Fragment fragment) {
+            navigate(fragment, -1);
+        }
+        
+        public void navigate(Fragment fragment, int requestCode) {
+            if (!initialized) {
+                Log.e(TAG, "have not initialized.");
+                return;
+            }
+            if (intent == null) {
+                Log.e(TAG, "intent is null.");
+                return;
+            }
+            try {
+                if (fragment != null) {
+                    if (requestCode >= 0) {
+                        fragment.startActivityForResult(intent, requestCode);
+                    } else {
+                        fragment.startActivity(intent, options);
+                    }
+                } else {
+                    startActivity(null, requestCode);
+                }
+            } catch (ActivityNotFoundException e) {
+                e.printStackTrace();
+            }
+        }
+
+        public void navigate(Context context, int requestCode) {
+            if (!initialized) {
+                Log.e(TAG, "have not initialized.");
+                return;
+            }
+            if (intent == null) {
+                Log.e(TAG, "intent is null.");
+                return;
+            }
+            Context startContext = context;
+            if (context == null) {
+                startContext = TUIRouter.context;
+            }
+            startActivity(startContext, requestCode);
+        }
+
+        private void startActivity(Context context, int requestCode) {
+            if (context == null) {
+                Log.e(TAG, "StartActivity failed, context is null.Please init");
+                return;
+            }
+            try {
+                if (context instanceof Activity && requestCode >= 0) {
+                    ActivityCompat.startActivityForResult((Activity) context, intent, requestCode, options);
+                } else {
+                    if (!(context instanceof Activity)) {
+                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    }
+                    ActivityCompat.startActivity(context, intent, options);
+                }
+            } catch (ActivityNotFoundException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+
+    public static void initRouter(Context context) {
+        ActivityInfo[] activityInfos = null;
+        List<String> activityNames = new ArrayList<>();
+        PackageManager packageManager = context.getPackageManager();
+        try {
+            PackageInfo packageInfo = packageManager.getPackageInfo(context.getPackageName(), PackageManager.GET_ACTIVITIES);
+            activityInfos = packageInfo.activities;
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        if (activityInfos != null) {
+            for (ActivityInfo activityInfo : activityInfos) {
+                activityNames.add(activityInfo.name);
+            }
+        }
+        for (String activityName : activityNames) {
+            String[] splitStr = activityName.split("\\.");
+            routerMap.put(splitStr[splitStr.length - 1], activityName);
+        }
+    }
+
+    public static Context getContext() {
+        return context;
+    }
+}
\ No newline at end of file
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/TUIThemeManager.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/TUIThemeManager.java
new file mode 100644
index 0000000..4503add
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/TUIThemeManager.java
@@ -0,0 +1,310 @@
+package com.tencent.qcloud.tuicore;
+
+import android.app.Activity;
+import android.app.Application;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+import android.util.TypedValue;
+import android.webkit.WebView;
+
+import androidx.annotation.IntDef;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.util.SPUtils;
+import com.tencent.qcloud.tuicore.util.TUIBuild;
+import com.tencent.qcloud.tuicore.util.TUIUtil;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * Static skinning, language
+ */
+public class TUIThemeManager {
+    private static final String TAG = TUIThemeManager.class.getSimpleName();
+
+    private static final String SP_THEME_AND_LANGUAGE_NAME = "TUIThemeAndLanguage";
+    private static final String SP_KEY_LANGUAGE = "language";
+    private static final String SP_KEY_THEME = "theme";
+
+    public static final int THEME_LIGHT = 0; // default
+    public static final int THEME_LIVELY = 1;
+    public static final int THEME_SERIOUS = 2;
+
+    public static final String LANGUAGE_ZH_CN = "zh";
+    public static final String LANGUAGE_EN = "en";
+
+    private static final class ThemeManagerHolder {
+        private static final TUIThemeManager instance = new TUIThemeManager();
+    }
+
+    public static TUIThemeManager getInstance() {
+        return ThemeManagerHolder.instance;
+    }
+
+    private boolean isInit = false;
+
+    private final Map<Integer, List<Integer>> themeResIDMap = new HashMap<>();
+    private final Map<String, Locale> languageMap = new HashMap<>();
+
+    private int currentThemeID = THEME_LIGHT;
+    private String currentLanguage = "";
+    private Locale defaultLocale = null;
+
+    private TUIThemeManager() {
+        languageMap.put(LANGUAGE_ZH_CN, Locale.SIMPLIFIED_CHINESE);
+        languageMap.put(LANGUAGE_EN, Locale.ENGLISH);
+    }
+
+    public static void setTheme(Context context) {
+        getInstance().setThemeInternal(context);
+    }
+
+    private void setThemeInternal(Context context) {
+        if (context == null) {
+            return;
+        }
+
+        Context appContext = context.getApplicationContext();
+        if (!isInit) {
+            isInit = true;
+            if (appContext instanceof Application) {
+                ((Application) appContext).registerActivityLifecycleCallbacks(new ThemeAndLanguageCallback());
+            }
+
+            Locale defaultLocale = getLocale(appContext);
+            SPUtils spUtils = SPUtils.getInstance(SP_THEME_AND_LANGUAGE_NAME);
+            currentLanguage = spUtils.getString(SP_KEY_LANGUAGE, defaultLocale.getLanguage());
+            currentThemeID = spUtils.getInt(SP_KEY_THEME, THEME_LIGHT);
+
+            // The language only needs to be initialized once
+            applyLanguage(appContext);
+        }
+        // The theme needs to be updated multiple times
+        applyTheme(appContext);
+    }
+
+    /**
+     * Solve the problem that WebView on Android 7 and above causes failure to switch languages.
+     * Solve the problem of using WebView Crash for multiple processes above Android 9.
+     */
+    public static void setWebViewLanguage(Context appContext) {
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                WebView.setDataDirectorySuffix(TUIUtil.getProcessName());
+            }
+            new WebView(appContext).destroy();
+        } catch (Throwable throwable) {
+            Log.e("TUIThemeManager", "init language settings failed, " + throwable.getMessage());
+        }
+    }
+
+    public void setDefaultLocale(Locale defaultLocale) {
+        this.defaultLocale = defaultLocale;
+    }
+
+    public static void addTheme(int themeID, int resID) {
+        if (resID == 0) {
+            Log.e(TAG, "addTheme failed, theme resID is zero");
+            return;
+        }
+        Log.i(TAG, "addTheme themeID=" + themeID + " resID=" + resID);
+        List<Integer> themeResIDList = getInstance().themeResIDMap.get(themeID);
+        if (themeResIDList == null) {
+            themeResIDList = new ArrayList<>();
+            getInstance().themeResIDMap.put(themeID, themeResIDList);
+        }
+        if (themeResIDList.contains(resID)) {
+            return;
+        }
+        themeResIDList.add(resID);
+        TUIThemeManager.getInstance().applyTheme(ServiceInitializer.getAppContext());
+    }
+
+    public static void addLightTheme(int resId) {
+        addTheme(THEME_LIGHT, resId);
+    }
+
+    public static void addLivelyTheme(int resId) {
+        addTheme(THEME_LIVELY, resId);
+    }
+    public static void addSeriousTheme(int resId) {
+        addTheme(THEME_SERIOUS, resId);
+    }
+
+    public int getCurrentTheme() {
+        return currentThemeID;
+    }
+
+    private void mergeTheme(Resources.Theme theme) {
+        if (theme == null) {
+            return;
+        }
+
+        List<Integer> currentThemeResIDList = themeResIDMap.get(currentThemeID);
+        if (currentThemeResIDList == null) {
+            return;
+        }
+        for (Integer resId : currentThemeResIDList) {
+            theme.applyStyle(resId, true);
+        }
+    }
+
+    public static void addLanguage(String language, Locale locale) {
+        Log.i(TAG, "addLanguage language=" + language + " locale=" + locale);
+        getInstance().languageMap.put(language, locale);
+    }
+
+    public void changeLanguage(Context context, String language) {
+        if (context == null) {
+            return;
+        }
+
+        if (TextUtils.equals(language, currentLanguage)) {
+            return;
+        }
+        currentLanguage = language;
+        SPUtils spUtils = SPUtils.getInstance(SP_THEME_AND_LANGUAGE_NAME);
+        spUtils.put(SP_KEY_LANGUAGE, language, true);
+
+        applyLanguage(context.getApplicationContext());
+        applyLanguage(context);
+    }
+
+    public void applyLanguage(Context context) {
+        if (context == null) {
+            return;
+        }
+        Locale locale = languageMap.get(currentLanguage);
+        if (locale == null) {
+            if (defaultLocale != null) {
+                locale = defaultLocale;
+            } else {
+                locale = getLocale(context);
+            }
+        }
+
+        Resources resources = context.getResources();
+        Configuration configuration = resources.getConfiguration();
+        configuration.locale = locale;
+        if (TUIBuild.getVersionInt() >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            configuration.setLocale(locale);
+        }
+        resources.updateConfiguration(configuration, null);
+
+        if (Build.VERSION.SDK_INT >= 25) {
+            context = context.createConfigurationContext(configuration);
+            context.getResources().updateConfiguration(configuration,
+                resources.getDisplayMetrics());
+        }
+    }
+
+    public String getCurrentLanguage() {
+        return currentLanguage;
+    }
+
+    public Locale getLocale(Context context) {
+        Locale locale;
+
+        if (TUIBuild.getVersionInt() < Build.VERSION_CODES.N) {
+            locale = context.getResources().getConfiguration().locale;
+        } else {
+            locale = context.getResources().getConfiguration().getLocales().get(0);
+        }
+        return locale;
+    }
+
+    public void changeTheme(Context context, int themeId) {
+        if (context == null) {
+            return;
+        }
+
+        if (themeId == currentThemeID) {
+            return;
+        }
+        currentThemeID = themeId;
+
+        SPUtils spUtils = SPUtils.getInstance(SP_THEME_AND_LANGUAGE_NAME);
+        spUtils.put(SP_KEY_THEME, themeId, true);
+
+        applyTheme(context.getApplicationContext());
+        applyTheme(context);
+    }
+
+    private void applyTheme(Context context) {
+        if (context == null) {
+            return;
+        }
+        Resources.Theme theme = context.getTheme();
+        if (theme == null) {
+            context.setTheme(R.style.TUIBaseTheme);
+            theme = context.getTheme();
+        }
+        mergeTheme(theme);
+    }
+
+    /**
+     * Get resources for skinning
+     * 
+     * @param context   context
+     * @param attrId    custom attribute
+     * @return resources for skinning
+     */
+    public static int getAttrResId(Context context, int attrId) {
+        if (context == null || attrId == 0) {
+            return 0;
+        }
+        TypedValue typedValue = new TypedValue();
+        context.getTheme().resolveAttribute(attrId, typedValue, true);
+        return typedValue.resourceId;
+    }
+
+    static class ThemeAndLanguageCallback implements Application.ActivityLifecycleCallbacks {
+
+        @Override
+        public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle savedInstanceState) {
+            TUIThemeManager.getInstance().applyTheme(activity);
+            TUIThemeManager.getInstance().applyLanguage(activity);
+        }
+
+        @Override
+        public void onActivityStarted(@NonNull Activity activity) {
+
+        }
+
+        @Override
+        public void onActivityResumed(@NonNull Activity activity) {
+
+        }
+
+        @Override
+        public void onActivityPaused(@NonNull Activity activity) {
+
+        }
+
+        @Override
+        public void onActivityStopped(@NonNull Activity activity) {
+
+        }
+
+        @Override
+        public void onActivitySaveInstanceState(@NonNull Activity activity, @NonNull Bundle outState) {
+
+        }
+
+        @Override
+        public void onActivityDestroyed(@NonNull Activity activity) {
+
+        }
+    }
+
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/CustomLinearLayoutManager.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/CustomLinearLayoutManager.java
new file mode 100644
index 0000000..a274399
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/CustomLinearLayoutManager.java
@@ -0,0 +1,36 @@
+package com.tencent.qcloud.tuicore.component;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.util.Log;
+
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+/**
+ * https://stackoverflow.com/questions/30458640/recyclerview-java-lang-indexoutofboundsexception-inconsistency-detected-inval
+ */
+public class CustomLinearLayoutManager extends LinearLayoutManager {
+
+    public CustomLinearLayoutManager(Context context) {
+        super(context);
+    }
+
+    public CustomLinearLayoutManager(Context context, int orientation, boolean reverseLayout) {
+        super(context, orientation, reverseLayout);
+    }
+
+    public CustomLinearLayoutManager(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    @Override
+    public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {
+        try {
+            super.onLayoutChildren(recycler, state);
+        } catch (IndexOutOfBoundsException e) {
+            Log.w("CustomLinearLayoutManager", e.getLocalizedMessage());
+        }
+
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/LineControllerView.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/LineControllerView.java
new file mode 100644
index 0000000..35b7f25
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/LineControllerView.java
@@ -0,0 +1,130 @@
+package com.tencent.qcloud.tuicore.component;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CompoundButton;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.Switch;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.R;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+
+/**
+ * Custom LineControllerView
+ */
+public class LineControllerView extends LinearLayout {
+
+    private String mName;
+    private boolean mIsBottom;
+    private boolean mIsTop;
+    private String mContent;
+    private boolean mIsJump;
+    private boolean mIsSwitch;
+
+    private TextView mNameText;
+    private TextView mContentText;
+    private ImageView mNavArrowView;
+    private Switch mSwitchView;
+    private View mMask;
+
+    public LineControllerView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        LayoutInflater.from(context).inflate(R.layout.line_controller_view, this);
+        TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.LineControllerView, 0, 0);
+        try {
+            mName = ta.getString(R.styleable.LineControllerView_name);
+            mContent = ta.getString(R.styleable.LineControllerView_subject);
+            mIsBottom = ta.getBoolean(R.styleable.LineControllerView_isBottom, false);
+            mIsTop = ta.getBoolean(R.styleable.LineControllerView_isTop, false);
+            mIsJump = ta.getBoolean(R.styleable.LineControllerView_canNav, false);
+            mIsSwitch = ta.getBoolean(R.styleable.LineControllerView_isSwitch, false);
+            setUpView();
+        } finally {
+            ta.recycle();
+        }
+    }
+
+    private void setUpView() {
+        mNameText = findViewById(R.id.name);
+        mNameText.setText(mName);
+        mContentText = findViewById(R.id.content);
+        mContentText.setText(mContent);
+        View bottomLine = findViewById(R.id.bottom_line);
+        View topLine = findViewById(R.id.top_line);
+        bottomLine.setVisibility(mIsBottom ? VISIBLE : GONE);
+        topLine.setVisibility(mIsTop ? VISIBLE : GONE);
+        mNavArrowView = findViewById(R.id.rightArrow);
+        mNavArrowView.setVisibility(mIsJump ? VISIBLE : GONE);
+        RelativeLayout contentLayout = findViewById(R.id.contentText);
+        contentLayout.setVisibility(mIsSwitch ? GONE : VISIBLE);
+        mSwitchView = findViewById(R.id.btnSwitch);
+        mSwitchView.setVisibility(mIsSwitch ? VISIBLE : GONE);
+        mMask = findViewById(R.id.disable_mask);
+    }
+
+    public String getContent() {
+        return mContentText.getText().toString();
+    }
+
+    public void setContent(String content) {
+        this.mContent = content;
+        mContentText.setText(content);
+    }
+
+    public void setSingleLine(boolean singleLine) {
+        mContentText.setSingleLine(singleLine);
+    }
+
+    /**
+     * Set whether to jump
+     *
+     * @param canNav
+     */
+    public void setCanNav(boolean canNav) {
+        this.mIsJump = canNav;
+        mNavArrowView.setVisibility(canNav ? VISIBLE : GONE);
+        if (canNav) {
+            ViewGroup.LayoutParams params = mContentText.getLayoutParams();
+            params.width = ScreenUtil.getPxByDp(120);
+            params.height = ViewGroup.LayoutParams.WRAP_CONTENT;
+            mContentText.setLayoutParams(params);
+            mContentText.setTextIsSelectable(false);
+        } else {
+            ViewGroup.LayoutParams params = mContentText.getLayoutParams();
+            params.width = ViewGroup.LayoutParams.WRAP_CONTENT;
+            params.height = ViewGroup.LayoutParams.WRAP_CONTENT;
+            mContentText.setLayoutParams(params);
+            mContentText.setTextIsSelectable(true);
+        }
+    }
+
+    public boolean isChecked() {
+        return mSwitchView.isChecked();
+    }
+
+    public void setChecked(boolean on) {
+        mSwitchView.setChecked(on);
+    }
+
+    public void setCheckListener(CompoundButton.OnCheckedChangeListener listener) {
+        mSwitchView.setOnCheckedChangeListener(listener);
+    }
+
+    public void setMask(boolean enableMask) {
+        if (enableMask) {
+            mMask.setVisibility(View.VISIBLE);
+            mSwitchView.setEnabled(false);
+        } else {
+            mMask.setVisibility(View.GONE);
+            mSwitchView.setEnabled(true);
+        }
+    }
+
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/RoundCornerImageView.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/RoundCornerImageView.java
new file mode 100644
index 0000000..1d5a9a8
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/RoundCornerImageView.java
@@ -0,0 +1,126 @@
+package com.tencent.qcloud.tuicore.component;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.PaintFlagsDrawFilter;
+import android.graphics.Path;
+import android.graphics.RectF;
+import android.util.AttributeSet;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatImageView;
+
+import com.tencent.qcloud.tuicore.R;
+
+public class RoundCornerImageView extends AppCompatImageView {
+    private final Path path = new Path();
+    private final RectF rectF = new RectF();
+    private final PaintFlagsDrawFilter aliasFilter = new PaintFlagsDrawFilter(0, Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);
+    private int radius;
+    private int leftTopRadius;
+    private int rightTopRadius;
+    private int rightBottomRadius;
+    private int leftBottomRadius;
+
+    public RoundCornerImageView(@NonNull Context context) {
+        super(context);
+        init(context, null);
+    }
+
+    public RoundCornerImageView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public RoundCornerImageView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    private void init(Context context, AttributeSet attrs) {
+        setLayerType(View.LAYER_TYPE_HARDWARE, null);
+        int defaultRadius = 0;
+        if (attrs != null) {
+            TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.RoundCornerImageView);
+            radius = array.getDimensionPixelOffset(R.styleable.RoundCornerImageView_corner_radius, defaultRadius);
+            leftTopRadius = array.getDimensionPixelOffset(R.styleable.RoundCornerImageView_left_top_corner_radius, defaultRadius);
+            rightTopRadius = array.getDimensionPixelOffset(R.styleable.RoundCornerImageView_right_top_corner_radius, defaultRadius);
+            rightBottomRadius = array.getDimensionPixelOffset(R.styleable.RoundCornerImageView_right_bottom_corner_radius, defaultRadius);
+            leftBottomRadius = array.getDimensionPixelOffset(R.styleable.RoundCornerImageView_left_bottom_corner_radius, defaultRadius);
+            array.recycle();
+        }
+
+        if (defaultRadius == leftTopRadius) {
+            leftTopRadius = radius;
+        }
+        if (defaultRadius == rightTopRadius) {
+            rightTopRadius = radius;
+        }
+        if (defaultRadius == rightBottomRadius) {
+            rightBottomRadius = radius;
+        }
+        if (defaultRadius == leftBottomRadius) {
+            leftBottomRadius = radius;
+        }
+    }
+
+    public void setLeftBottomRadius(int leftBottomRadius) {
+        this.leftBottomRadius = leftBottomRadius;
+    }
+
+    public void setLeftTopRadius(int leftTopRadius) {
+        this.leftTopRadius = leftTopRadius;
+    }
+
+    public void setRadius(int radius) {
+        this.radius = radius;
+        leftBottomRadius = radius;
+        rightBottomRadius = radius;
+        rightTopRadius = radius;
+        leftTopRadius = radius;
+    }
+
+    public void setRightBottomRadius(int rightBottomRadius) {
+        this.rightBottomRadius = rightBottomRadius;
+    }
+
+    public void setRightTopRadius(int rightTopRadius) {
+        this.rightTopRadius = rightTopRadius;
+    }
+
+    public int getLeftBottomRadius() {
+        return leftBottomRadius;
+    }
+
+    public int getLeftTopRadius() {
+        return leftTopRadius;
+    }
+
+    public int getRadius() {
+        return radius;
+    }
+
+    public int getRightBottomRadius() {
+        return rightBottomRadius;
+    }
+
+    public int getRightTopRadius() {
+        return rightTopRadius;
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        path.reset();
+        canvas.setDrawFilter(aliasFilter);
+        rectF.set(0, 0, getMeasuredWidth(), getMeasuredHeight());
+        // left-top -> right-top -> right-bottom -> left-bottom
+        float[] radius = {leftTopRadius, leftTopRadius, rightTopRadius, rightTopRadius,
+                rightBottomRadius, rightBottomRadius, leftBottomRadius, leftBottomRadius};
+        path.addRoundRect(rectF, radius, Path.Direction.CW);
+        canvas.clipPath(path);
+        super.onDraw(canvas);
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/RoundFrameLayout.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/RoundFrameLayout.java
new file mode 100644
index 0000000..2816b0c
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/RoundFrameLayout.java
@@ -0,0 +1,83 @@
+package com.tencent.qcloud.tuicore.component;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.PaintFlagsDrawFilter;
+import android.graphics.Path;
+import android.graphics.RectF;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.FrameLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.R;
+
+public class RoundFrameLayout extends FrameLayout {
+
+    private final Path path = new Path();
+    private final RectF rectF = new RectF();
+    private final PaintFlagsDrawFilter aliasFilter = new PaintFlagsDrawFilter(0, Paint.ANTI_ALIAS_FLAG | Paint.FILTER_BITMAP_FLAG);
+    private int radius;
+    private int leftTopRadius;
+    private int rightTopRadius;
+    private int rightBottomRadius;
+    private int leftBottomRadius;
+
+    public RoundFrameLayout(@NonNull Context context) {
+        super(context);
+        init(context, null);
+    }
+
+    public RoundFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public RoundFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    private void init(Context context, AttributeSet attrs) {
+        setLayerType(View.LAYER_TYPE_HARDWARE, null);
+        int defaultRadius = 0;
+        if (attrs != null) {
+            TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.RoundFrameLayout);
+            radius = array.getDimensionPixelOffset(R.styleable.RoundFrameLayout_corner_radius, defaultRadius);
+            leftTopRadius = array.getDimensionPixelOffset(R.styleable.RoundFrameLayout_left_top_corner_radius, defaultRadius);
+            rightTopRadius = array.getDimensionPixelOffset(R.styleable.RoundFrameLayout_right_top_corner_radius, defaultRadius);
+            rightBottomRadius = array.getDimensionPixelOffset(R.styleable.RoundFrameLayout_right_bottom_corner_radius, defaultRadius);
+            leftBottomRadius = array.getDimensionPixelOffset(R.styleable.RoundFrameLayout_left_bottom_corner_radius, defaultRadius);
+            array.recycle();
+        }
+
+        if (defaultRadius == leftTopRadius) {
+            leftTopRadius = radius;
+        }
+        if (defaultRadius == rightTopRadius) {
+            rightTopRadius = radius;
+        }
+        if (defaultRadius == rightBottomRadius) {
+            rightBottomRadius = radius;
+        }
+        if (defaultRadius == leftBottomRadius) {
+            leftBottomRadius = radius;
+        }
+    }
+
+    @Override
+    protected void dispatchDraw(Canvas canvas) {
+        path.reset();
+        canvas.setDrawFilter(aliasFilter);
+        rectF.set(0, 0, getMeasuredWidth(), getMeasuredHeight());
+        // left-top -> right-top -> right-bottom -> left-bottom
+        float[] radius = {leftTopRadius, leftTopRadius, rightTopRadius, rightTopRadius,
+                rightBottomRadius, rightBottomRadius, leftBottomRadius, leftBottomRadius};
+        path.addRoundRect(rectF, radius, Path.Direction.CW);
+        canvas.clipPath(path);
+        super.dispatchDraw(canvas);
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/TitleBarLayout.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/TitleBarLayout.java
new file mode 100644
index 0000000..67f5e38
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/TitleBarLayout.java
@@ -0,0 +1,175 @@
+package com.tencent.qcloud.tuicore.component;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.R;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+public class TitleBarLayout extends LinearLayout implements ITitleBarLayout {
+
+    private LinearLayout mLeftGroup;
+    private LinearLayout mRightGroup;
+    private TextView mLeftTitle;
+    private TextView mCenterTitle;
+    private TextView mRightTitle;
+    private ImageView mLeftIcon;
+    private ImageView mRightIcon;
+    private RelativeLayout mTitleLayout;
+    private UnreadCountTextView unreadCountTextView;
+
+    public TitleBarLayout(Context context) {
+        super(context);
+        init(context, null);
+    }
+
+    public TitleBarLayout(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public TitleBarLayout(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs);
+    }
+
+    private void init(Context context, @Nullable AttributeSet attrs) {
+        String middleTitle = null;
+        boolean canReturn = false;
+        if (attrs != null) {
+            TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.TitleBarLayout);
+            middleTitle = array.getString(R.styleable.TitleBarLayout_title_bar_middle_title);
+            canReturn = array.getBoolean(R.styleable.TitleBarLayout_title_bar_can_return, false);
+            array.recycle();
+        }
+        inflate(context, R.layout.title_bar_layout, this);
+        mTitleLayout = findViewById(R.id.page_title_layout);
+        mLeftGroup = findViewById(R.id.page_title_left_group);
+        mRightGroup = findViewById(R.id.page_title_right_group);
+        mLeftTitle = findViewById(R.id.page_title_left_text);
+        mRightTitle = findViewById(R.id.page_title_right_text);
+        mCenterTitle = findViewById(R.id.page_title);
+        mLeftIcon = findViewById(R.id.page_title_left_icon);
+        mRightIcon = findViewById(R.id.page_title_right_icon);
+        unreadCountTextView = findViewById(R.id.new_message_total_unread);
+
+        LayoutParams params = (LayoutParams) mTitleLayout.getLayoutParams();
+        params.height = ScreenUtil.getPxByDp(50);
+        mTitleLayout.setLayoutParams(params);
+        setBackgroundResource(TUIThemeManager.getAttrResId(getContext(), R.attr.core_title_bar_bg));
+
+        int iconSize = ScreenUtil.dip2px(20);
+        ViewGroup.LayoutParams iconParams = mLeftIcon.getLayoutParams();
+        iconParams.width = iconSize;
+        iconParams.height = iconSize;
+        mLeftIcon.setLayoutParams(iconParams);
+        iconParams = mRightIcon.getLayoutParams();
+        iconParams.width = iconSize;
+        iconParams.height = iconSize;
+
+        mRightIcon.setLayoutParams(iconParams);
+
+        if (canReturn) {
+            mLeftGroup.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (context instanceof Activity) {
+                        InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+                        imm.hideSoftInputFromWindow(TitleBarLayout.this.getWindowToken(), 0);
+                        ((Activity) context).finish();
+                    }
+                }
+            });
+        }
+        if (!TextUtils.isEmpty(middleTitle)) {
+            mCenterTitle.setText(middleTitle);
+        }
+    }
+
+    @Override
+    public void setOnLeftClickListener(OnClickListener listener) {
+        mLeftGroup.setOnClickListener(listener);
+    }
+
+    @Override
+    public void setOnRightClickListener(OnClickListener listener) {
+        mRightGroup.setOnClickListener(listener);
+    }
+
+    @Override
+    public void setTitle(String title, Position position) {
+        switch (position) {
+            case LEFT:
+                mLeftTitle.setText(title);
+                break;
+            case RIGHT:
+                mRightTitle.setText(title);
+                break;
+            case MIDDLE:
+                mCenterTitle.setText(title);
+                break;
+        }
+    }
+
+    @Override
+    public LinearLayout getLeftGroup() {
+        return mLeftGroup;
+    }
+
+    @Override
+    public LinearLayout getRightGroup() {
+        return mRightGroup;
+    }
+
+    @Override
+    public ImageView getLeftIcon() {
+        return mLeftIcon;
+    }
+
+    @Override
+    public void setLeftIcon(int resId) {
+        mLeftIcon.setBackgroundResource(resId);
+    }
+
+    @Override
+    public ImageView getRightIcon() {
+        return mRightIcon;
+    }
+
+    @Override
+    public void setRightIcon(int resId) {
+        mRightIcon.setBackgroundResource(resId);
+    }
+
+    @Override
+    public TextView getLeftTitle() {
+        return mLeftTitle;
+    }
+
+    @Override
+    public TextView getMiddleTitle() {
+        return mCenterTitle;
+    }
+
+    @Override
+    public TextView getRightTitle() {
+        return mRightTitle;
+    }
+
+    public UnreadCountTextView getUnreadCountTextView() {
+        return unreadCountTextView;
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/UnreadCountTextView.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/UnreadCountTextView.java
new file mode 100644
index 0000000..570b46c
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/UnreadCountTextView.java
@@ -0,0 +1,85 @@
+package com.tencent.qcloud.tuicore.component;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.util.TypedValue;
+
+import androidx.appcompat.widget.AppCompatTextView;
+
+import com.tencent.qcloud.tuicore.R;
+
+
+public class UnreadCountTextView extends AppCompatTextView {
+
+    private int mNormalSize;
+    private Paint mPaint;
+
+    public UnreadCountTextView(Context context) {
+        super(context);
+        init(context, null);
+    }
+
+    public UnreadCountTextView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public UnreadCountTextView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs);
+    }
+
+    private void init(Context context, AttributeSet attrs) {
+        mNormalSize = dp2px(18.4f);
+        TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.UnreadCountTextView);
+        int paintColor = typedArray.getColor(R.styleable.UnreadCountTextView_paint_color, getResources().getColor(R.color.read_dot_bg));
+        typedArray.recycle();
+
+        mPaint = new Paint();
+        mPaint.setColor(paintColor);
+        mPaint.setAntiAlias(true);
+    }
+
+    public void setPaintColor(int color) {
+        if (mPaint != null) {
+            mPaint.setColor(color);
+        }
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        if (getText().length() == 0) {
+            int l = (getMeasuredWidth() - dp2px(6)) / 2;
+            int t = l;
+            int r = getMeasuredWidth() - l;
+            int b = r;
+            canvas.drawOval(new RectF(l, t, r, b), mPaint);
+        } else if (getText().length() == 1) {
+            canvas.drawOval(new RectF(0, 0, mNormalSize, mNormalSize), mPaint);
+        } else if (getText().length() > 1) {
+            canvas.drawRoundRect(new RectF(0, 0, getMeasuredWidth(), getMeasuredHeight()), getMeasuredHeight() / 2, getMeasuredHeight() / 2, mPaint);
+        }
+        super.onDraw(canvas);
+
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int width = mNormalSize;
+        int height = mNormalSize;
+        if (getText().length() > 1) {
+            width = mNormalSize + dp2px((getText().length() - 1) * 10);
+        }
+        setMeasuredDimension(width, height);
+    }
+
+    private int dp2px(float dp) {
+        DisplayMetrics displayMetrics = getResources().getDisplayMetrics();
+        return  (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, displayMetrics);
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/action/PopActionClickListener.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/action/PopActionClickListener.java
new file mode 100644
index 0000000..4e73cfd
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/action/PopActionClickListener.java
@@ -0,0 +1,6 @@
+package com.tencent.qcloud.tuicore.component.action;
+
+
+public interface PopActionClickListener {
+    void onActionClick(int index, Object data);
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/action/PopDialogAdapter.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/action/PopDialogAdapter.java
new file mode 100644
index 0000000..a67c87a
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/action/PopDialogAdapter.java
@@ -0,0 +1,65 @@
+package com.tencent.qcloud.tuicore.component.action;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.R;
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.util.BackgroundTasks;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PopDialogAdapter extends BaseAdapter {
+
+    private List<PopMenuAction> dataSource = new ArrayList<>();
+
+    public void setDataSource(final List datas) {
+        dataSource = datas;
+        BackgroundTasks.getInstance().runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                notifyDataSetChanged();
+            }
+        });
+    }
+
+    @Override
+    public int getCount() {
+        return dataSource.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return dataSource.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(final int position, View convertView, ViewGroup parent) {
+
+        ViewHolder holder;
+        if (convertView == null) {
+            convertView = LayoutInflater.from(TUIConfig.getAppContext()).inflate(R.layout.pop_dialog_adapter, parent, false);
+            holder = new ViewHolder();
+            holder.text = convertView.findViewById(R.id.pop_dialog_text);
+            convertView.setTag(holder);
+        } else {
+            holder = (ViewHolder) convertView.getTag();
+        }
+        PopMenuAction action = (PopMenuAction) getItem(position);
+        holder.text.setText(action.getActionName());
+        return convertView;
+    }
+
+    static class ViewHolder {
+        TextView text;
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/action/PopMenuAction.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/action/PopMenuAction.java
new file mode 100644
index 0000000..8c15c66
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/action/PopMenuAction.java
@@ -0,0 +1,44 @@
+package com.tencent.qcloud.tuicore.component.action;
+
+import android.graphics.Bitmap;
+
+public class PopMenuAction {
+
+    private String actionName;
+    private Bitmap icon;
+    private int iconResId;
+    private PopActionClickListener actionClickListener;
+
+    public String getActionName() {
+        return actionName;
+    }
+
+    public void setActionName(String actionName) {
+        this.actionName = actionName;
+    }
+
+    public Bitmap getIcon() {
+        return icon;
+    }
+
+    public void setIcon(Bitmap mIcon) {
+        this.icon = mIcon;
+    }
+
+
+    public int getIconResId() {
+        return iconResId;
+    }
+
+    public void setIconResId(int iconResId) {
+        this.iconResId = iconResId;
+    }
+
+    public PopActionClickListener getActionClickListener() {
+        return actionClickListener;
+    }
+
+    public void setActionClickListener(PopActionClickListener actionClickListener) {
+        this.actionClickListener = actionClickListener;
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/action/PopMenuAdapter.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/action/PopMenuAdapter.java
new file mode 100644
index 0000000..ce3d48f
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/action/PopMenuAdapter.java
@@ -0,0 +1,88 @@
+package com.tencent.qcloud.tuicore.component.action;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.R;
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.util.BackgroundTasks;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PopMenuAdapter extends BaseAdapter {
+
+    private List<PopMenuAction> dataSource = new ArrayList<>();
+
+    public PopMenuAdapter() {
+
+    }
+
+    public void setDataSource(final List datas) {
+        dataSource = datas;
+        BackgroundTasks.getInstance().runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                notifyDataSetChanged();
+            }
+        });
+    }
+
+    @Override
+    public int getCount() {
+        return dataSource.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return dataSource.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(final int position, View convertView, ViewGroup parent) {
+
+        ViewHolder holder;
+        if (convertView == null) {
+            convertView = LayoutInflater.from(TUIConfig.getAppContext()).inflate(R.layout.pop_menu_adapter, parent, false);
+            holder = new ViewHolder();
+            holder.menu_icon = convertView.findViewById(R.id.pop_menu_icon);
+
+            int iconSize = convertView.getResources().getDimensionPixelSize(R.dimen.core_pop_menu_icon_size);
+            ViewGroup.LayoutParams params = holder.menu_icon.getLayoutParams();
+            params.width = iconSize;
+            params.height = iconSize;
+            holder.menu_icon.setLayoutParams(params);
+
+            holder.menu_lable = convertView.findViewById(R.id.pop_menu_label);
+            convertView.setTag(holder);
+        } else {
+            holder = (ViewHolder) convertView.getTag();
+        }
+        PopMenuAction action = (PopMenuAction) getItem(position);
+        holder.menu_icon.setVisibility(View.VISIBLE);
+        if (action.getIcon() != null) {
+            holder.menu_icon.setImageBitmap(action.getIcon());
+        } else if (action.getIconResId() > 0) {
+            holder.menu_icon.setImageResource(action.getIconResId());
+        } else {
+            holder.menu_icon.setVisibility(View.GONE);
+        }
+        holder.menu_lable.setText(action.getActionName());
+        return convertView;
+    }
+
+    static class ViewHolder {
+        TextView menu_lable;
+        ImageView menu_icon;
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/activities/BaseLightActivity.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/activities/BaseLightActivity.java
new file mode 100644
index 0000000..fdccf4c
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/activities/BaseLightActivity.java
@@ -0,0 +1,48 @@
+package com.tencent.qcloud.tuicore.component.activities;
+
+import android.content.Context;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.tencent.qcloud.tuicore.R;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+
+
+public class BaseLightActivity extends AppCompatActivity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+            getWindow().setStatusBarColor(getResources().getColor(TUIThemeManager.getAttrResId(this, R.attr.core_header_start_color)));
+            getWindow().setNavigationBarColor(getResources().getColor(R.color.navigation_bar_color));
+            int vis = getWindow().getDecorView().getSystemUiVisibility();
+            vis |= View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
+            vis |= View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
+            getWindow().getDecorView().setSystemUiVisibility(vis);
+        }
+    }
+
+    @Override
+    public void finish() {
+        hideSoftInput();
+        super.finish();
+    }
+
+    public void hideSoftInput() {
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        Window window = getWindow();
+        if (window != null) {
+            imm.hideSoftInputFromWindow(window.getDecorView().getWindowToken(), 0);
+        }
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/activities/BaseMinimalistLightActivity.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/activities/BaseMinimalistLightActivity.java
new file mode 100644
index 0000000..3b7e528
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/activities/BaseMinimalistLightActivity.java
@@ -0,0 +1,48 @@
+package com.tencent.qcloud.tuicore.component.activities;
+
+import android.content.Context;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.tencent.qcloud.tuicore.R;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+
+
+public class BaseMinimalistLightActivity extends AppCompatActivity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+            getWindow().setStatusBarColor(0xFFFFFFFF);
+            getWindow().setNavigationBarColor(0xFFFFFFFF);
+            int vis = getWindow().getDecorView().getSystemUiVisibility();
+            vis |= View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
+            vis |= View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
+            getWindow().getDecorView().setSystemUiVisibility(vis);
+        }
+    }
+
+    @Override
+    public void finish() {
+        hideSoftInput();
+        super.finish();
+    }
+
+    public void hideSoftInput() {
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        Window window = getWindow();
+        if (window != null) {
+            imm.hideSoftInputFromWindow(window.getDecorView().getWindowToken(), 0);
+        }
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/activities/ImageSelectActivity.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/activities/ImageSelectActivity.java
new file mode 100644
index 0000000..3cd43fa
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/activities/ImageSelectActivity.java
@@ -0,0 +1,444 @@
+package com.tencent.qcloud.tuicore.component.activities;
+
+
+import android.app.ProgressDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.request.RequestListener;
+import com.bumptech.glide.request.RequestOptions;
+import com.bumptech.glide.request.target.Target;
+import com.tencent.qcloud.tuicore.R;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.gatherimage.SynthesizedImageView;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+
+import java.io.File;
+import java.io.Serializable;
+import java.util.List;
+
+
+public class ImageSelectActivity extends BaseLightActivity {
+    private static final String TAG = ImageSelectActivity.class.getSimpleName();
+
+    public static final int RESULT_CODE_ERROR = -1;
+    public static final int RESULT_CODE_SUCCESS = 0;
+    public static final String TITLE = "title";
+    public static final String SPAN_COUNT = "spanCount";
+    public static final String DATA = "data";
+    public static final String ITEM_HEIGHT = "itemHeight";
+    public static final String ITEM_WIDTH = "itemWidth";
+    public static final String SELECTED = "selected";
+    public static final String PLACEHOLDER = "placeholder";
+    public static final String NEED_DOWLOAD_LOCAL = "needdowmload";
+
+    private int defaultSpacing;
+
+    private List<ImageBean> data;
+    private ImageBean selected;
+    private int placeHolder;
+    private int columnNum;
+    private RecyclerView imageGrid;
+    private GridLayoutManager gridLayoutManager;
+    private ImageGridAdapter gridAdapter;
+    private TitleBarLayout titleBarLayout;
+    private int itemHeight;
+    private int itemWidth;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        defaultSpacing = ScreenUtil.dip2px(12);
+        setContentView(R.layout.core_activity_image_select_layout);
+        Intent intent = getIntent();
+        String title = intent.getStringExtra(TITLE);
+        boolean needDownload = intent.getBooleanExtra(NEED_DOWLOAD_LOCAL, false);
+        titleBarLayout = findViewById(R.id.image_select_title);
+        titleBarLayout.setTitle(title, ITitleBarLayout.Position.MIDDLE);
+        titleBarLayout.setTitle(getString(R.string.sure), ITitleBarLayout.Position.RIGHT);
+        titleBarLayout.getRightIcon().setVisibility(View.GONE);
+        titleBarLayout.getRightTitle().setTextColor(0xFF006EFF);
+        titleBarLayout.setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                setResult(RESULT_CODE_ERROR);
+                finish();
+            }
+        });
+        titleBarLayout.setOnRightClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (selected == null) {
+                    return;
+                }
+                if (needDownload) {
+                    DownloadUrl();
+                } else {
+                    Intent resultIntent = new Intent();
+                    resultIntent.putExtra(DATA, (Serializable) selected);
+                    setResult(RESULT_CODE_SUCCESS, resultIntent);
+                    finish();
+                }
+            }
+        });
+
+        data = (List<ImageBean>) intent.getSerializableExtra(DATA);
+        selected = (ImageBean) intent.getSerializableExtra(SELECTED);
+        placeHolder = intent.getIntExtra(PLACEHOLDER, 0);
+        itemHeight = intent.getIntExtra(ITEM_HEIGHT, 0);
+        itemWidth = intent.getIntExtra(ITEM_WIDTH, 0);
+        columnNum = intent.getIntExtra(SPAN_COUNT, 2);
+        gridLayoutManager = new GridLayoutManager(this, columnNum);
+        imageGrid = findViewById(R.id.image_select_grid);
+        imageGrid.addItemDecoration(new GridDecoration(columnNum, defaultSpacing, defaultSpacing));
+        imageGrid.setLayoutManager(gridLayoutManager);
+        imageGrid.setItemAnimator(null);
+        gridAdapter = new ImageGridAdapter();
+        gridAdapter.setPlaceHolder(placeHolder);
+        gridAdapter.setSelected(selected);
+        gridAdapter.setOnItemClickListener(new OnItemClickListener() {
+            @Override
+            public void onClick(ImageBean obj) {
+                selected = obj;
+                setSelectedStatus();
+            }
+        });
+        gridAdapter.setItemWidth(itemWidth);
+        gridAdapter.setItemHeight(itemHeight);
+        imageGrid.setAdapter(gridAdapter);
+        gridAdapter.setData(data);
+        setSelectedStatus();
+        gridAdapter.notifyDataSetChanged();
+    }
+
+    private void DownloadUrl() {
+        if (selected == null) {
+            return;
+        }
+
+        if (selected.isDefault()) {
+            selected.setLocalPath(TUIConstants.TUIChat.CHAT_CONVERSATION_BACKGROUND_DEFAULT_URL);
+            setResult(selected);
+            ToastUtil.toastShortMessage(getResources().getString(R.string.setting_success));
+            finish();
+            return;
+        }
+
+        String url = selected.getImageUri();
+        if (TextUtils.isEmpty(url)) {
+            Log.d(TAG, "DownloadUrl is null");
+            return;
+        }
+
+        final ProgressDialog dialog = new ProgressDialog(this);
+        dialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
+        dialog.setCancelable(false);
+        dialog.setCanceledOnTouchOutside(false);
+        dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+
+            @Override
+            public void onDismiss(DialogInterface dialog) {
+                // TODO Auto-generated method stub
+                finish();
+            }
+        });
+        dialog.setMessage(getResources().getString(R.string.setting));
+        dialog.show();
+
+        ImageBean finalBean = selected;
+        Glide.with(this)
+                .downloadOnly()
+                .load(url)
+                .listener(new RequestListener<File>() {
+                    @Override
+                    public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<File> target, boolean isFirstResource) {
+                        dialog.cancel();
+                        Log.e(TAG, "DownloadUrl onLoadFailed e = " + e);
+                        ToastUtil.toastShortMessage(getResources().getString(R.string.setting_fail));
+                        return false;
+                    }
+
+                    @Override
+                    public boolean onResourceReady(File resource, Object model, Target<File> target, DataSource dataSource, boolean isFirstResource) {
+                        dialog.cancel();
+                        String path = resource.getAbsolutePath();
+                        Log.e(TAG, "DownloadUrl resource path = " + path);
+                        finalBean.setLocalPath(path);
+                        setResult(finalBean);
+                        ToastUtil.toastShortMessage(getResources().getString(R.string.setting_success));
+                        return false;
+                    }
+                })
+                .preload();
+    }
+
+    private void setResult(ImageBean bean) {
+        Intent resultIntent = new Intent();
+        resultIntent.putExtra(DATA, (Serializable) bean);
+        setResult(RESULT_CODE_SUCCESS, resultIntent);
+        finish();
+    }
+
+    private void setSelectedStatus() {
+        if (selected != null && data != null && data.contains(selected)) {
+            titleBarLayout.getRightTitle().setEnabled(true);
+            titleBarLayout.getRightTitle().setTextColor(getResources().getColor(TUIThemeManager.getAttrResId(this, R.attr.core_primary_color)));
+        } else {
+            titleBarLayout.getRightTitle().setEnabled(false);
+            titleBarLayout.getRightTitle().setTextColor(0xFF666666);
+        }
+        gridAdapter.setSelected(selected);
+    }
+
+    public static class ImageGridAdapter extends RecyclerView.Adapter<ImageGridAdapter.ImageViewHolder> {
+        private int itemWidth;
+        private int itemHeight;
+
+        private List<ImageBean> data;
+        private ImageBean selected;
+        private int placeHolder;
+        private OnItemClickListener onItemClickListener;
+
+        public void setData(List<ImageBean> data) {
+            this.data = data;
+        }
+
+        public void setSelected(ImageBean selected) {
+            if (data == null || data.isEmpty()) {
+                this.selected = selected;
+            } else {
+                this.selected = selected;
+                notifyDataSetChanged();
+            }
+        }
+
+        public void setPlaceHolder(int placeHolder) {
+            this.placeHolder = placeHolder;
+        }
+
+        public void setItemHeight(int itemHeight) {
+            this.itemHeight = itemHeight;
+        }
+
+        public void setItemWidth(int itemWidth) {
+            this.itemWidth = itemWidth;
+        }
+
+        public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
+            this.onItemClickListener = onItemClickListener;
+        }
+
+        @NonNull
+        @Override
+        public ImageViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.core_select_image_item_layout, parent, false);
+            return new ImageViewHolder(view);
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull ImageViewHolder holder, int position) {
+            ImageView imageView = holder.imageView;
+            setItemLayoutParams(holder);
+            ImageBean imageBean = data.get(position);
+            if (selected != null && imageBean != null && TextUtils.equals(selected.getThumbnailUri(), imageBean.getThumbnailUri())) {
+                holder.selectBorderLayout.setVisibility(View.VISIBLE);
+            } else {
+                holder.selectBorderLayout.setVisibility(View.GONE);
+            }
+
+            if (imageBean.getGroupGridAvatar() != null) {
+                holder.defaultLayout.setVisibility(View.GONE);
+                if (imageView instanceof SynthesizedImageView) {
+                    SynthesizedImageView synthesizedImageView = ((SynthesizedImageView) (imageView));
+                    String imageId = imageBean.getImageId();
+                    synthesizedImageView.setImageId(imageId);
+                    synthesizedImageView.displayImage(imageBean.getGroupGridAvatar()).load(imageId);
+                }
+            } else if (imageBean.isDefault()) {
+                holder.defaultLayout.setVisibility(View.VISIBLE);
+                imageView.setImageResource(android.R.color.transparent);
+            } else {
+                holder.defaultLayout.setVisibility(View.GONE);
+                Glide.with(holder.itemView.getContext()).asBitmap()
+                        .load(imageBean.getThumbnailUri())
+                        .placeholder(placeHolder)
+                        .apply(new RequestOptions().error(placeHolder))
+                        .into(imageView);
+            }
+
+            holder.itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (onItemClickListener != null) {
+                        onItemClickListener.onClick(imageBean);
+                    }
+                }
+            });
+        }
+
+        private void setItemLayoutParams(ImageViewHolder holder) {
+            if (itemHeight > 0 && itemWidth > 0) {
+                ViewGroup.LayoutParams params = holder.imageView.getLayoutParams();
+                params.width = itemWidth;
+                params.height = itemHeight;
+                holder.imageView.setLayoutParams(params);
+
+                ViewGroup.LayoutParams borderLayoutParams = holder.selectBorderLayout.getLayoutParams();
+                borderLayoutParams.width = itemWidth;
+                borderLayoutParams.height = itemHeight;
+                holder.selectBorderLayout.setLayoutParams(borderLayoutParams);
+
+                ViewGroup.LayoutParams borderParams = holder.selectedBorder.getLayoutParams();
+                borderParams.width = itemWidth;
+                borderParams.height = itemHeight;
+                holder.selectedBorder.setLayoutParams(borderParams);
+            }
+        }
+
+        @Override
+        public int getItemCount() {
+            if (data == null || data.isEmpty()) {
+                return 0;
+            }
+            return data.size();
+        }
+
+        public static class ImageViewHolder extends RecyclerView.ViewHolder {
+            private final ImageView imageView;
+            private final ImageView selectedBorder;
+            private final RelativeLayout selectBorderLayout;
+            private final Button defaultLayout;
+
+            public ImageViewHolder(@NonNull View itemView) {
+                super(itemView);
+                imageView = itemView.findViewById(R.id.content_image);
+                selectedBorder = itemView.findViewById(R.id.select_border);
+                selectBorderLayout = itemView.findViewById(R.id.selected_border_area);
+                defaultLayout = itemView.findViewById(R.id.default_image_layout);
+            }
+        }
+    }
+
+    /**
+     * add spacing
+     */
+    public static class GridDecoration extends RecyclerView.ItemDecoration {
+
+        private final int columnNum; // span count
+        private final int leftRightSpace; // vertical spacing
+        private final int topBottomSpace; // horizontal spacing
+
+        public GridDecoration(int columnNum, int leftRightSpace, int topBottomSpace) {
+            this.columnNum = columnNum;
+            this.leftRightSpace = leftRightSpace;
+            this.topBottomSpace = topBottomSpace;
+        }
+
+        @Override
+        public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+            int position = parent.getChildAdapterPosition(view);
+            int column = position % columnNum;
+
+            outRect.left = column * leftRightSpace / columnNum;
+            outRect.right = leftRightSpace * (columnNum - 1 - column) / columnNum;
+
+            // add top spacing
+            if (position >= columnNum) {
+                outRect.top = topBottomSpace;
+            }
+        }
+    }
+
+    public interface OnItemClickListener {
+        void onClick(ImageBean obj);
+    }
+
+    public static class ImageBean implements Serializable{
+        String thumbnailUri; // for display
+        String imageUri; // for download
+        String localPath; // for local path
+        boolean isDefault = false; // for default display
+        List<Object> groupGridAvatar = null; // for group grid avatar
+        String imageId;
+
+        public ImageBean() {
+
+        }
+
+        public ImageBean(String thumbnailUri, String imageUri, boolean isDefault) {
+            this.thumbnailUri = thumbnailUri;
+            this.imageUri = imageUri;
+            this.isDefault = isDefault;
+        }
+
+        public String getImageUri() {
+            return imageUri;
+        }
+
+        public String getThumbnailUri() {
+            return thumbnailUri;
+        }
+
+        public void setImageUri(String imageUri) {
+            this.imageUri = imageUri;
+        }
+
+        public void setThumbnailUri(String thumbnailUri) {
+            this.thumbnailUri = thumbnailUri;
+        }
+
+        public String getLocalPath() {
+            return localPath;
+        }
+
+        public void setLocalPath(String localPath) {
+            this.localPath = localPath;
+        }
+
+        public boolean isDefault() {
+            return isDefault;
+        }
+
+        public void setDefault(boolean aDefault) {
+            isDefault = aDefault;
+        }
+
+        public List<Object> getGroupGridAvatar() {
+            return groupGridAvatar;
+        }
+
+        public void setGroupGridAvatar(List<Object> groupGridAvatar) {
+            this.groupGridAvatar = groupGridAvatar;
+        }
+
+        public String getImageId() {
+            return imageId;
+        }
+
+        public void setImageId(String imageId) {
+            this.imageId = imageId;
+        }
+    }
+}
\ No newline at end of file
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/activities/SelectionActivity.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/activities/SelectionActivity.java
new file mode 100644
index 0000000..2611664
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/activities/SelectionActivity.java
@@ -0,0 +1,243 @@
+package com.tencent.qcloud.tuicore.component.activities;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.InputFilter;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.R;
+import com.tencent.qcloud.tuicore.component.CustomLinearLayoutManager;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+
+import java.util.ArrayList;
+
+public class SelectionActivity extends BaseLightActivity {
+
+    private static OnResultReturnListener sOnResultReturnListener;
+
+    private RecyclerView selectListView;
+    private SelectAdapter selectListAdapter;
+    private EditText input;
+    private int mSelectionType;
+    private ArrayList<String> selectList = new ArrayList<>();
+    private int selectedItem = -1;
+    private OnItemClickListener onItemClickListener;
+    private boolean needConfirm = true;
+    private boolean returnNow = true;
+
+    public static void startTextSelection(Context context, Bundle bundle, OnResultReturnListener listener) {
+        bundle.putInt(Selection.TYPE, Selection.TYPE_TEXT);
+        startSelection(context, bundle, listener);
+    }
+
+    public static void startListSelection(Context context, Bundle bundle, OnResultReturnListener listener) {
+        bundle.putInt(Selection.TYPE, Selection.TYPE_LIST);
+        startSelection(context, bundle, listener);
+    }
+
+    private static void startSelection(Context context, Bundle bundle, OnResultReturnListener listener) {
+        Intent intent = new Intent(context, SelectionActivity.class);
+        intent.putExtra(Selection.CONTENT, bundle);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(intent);
+        sOnResultReturnListener = listener;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.tuicore_selection_activity);
+        final TitleBarLayout titleBar = findViewById(R.id.edit_title_bar);
+        selectListView = findViewById(R.id.select_list);
+        selectListAdapter = new SelectAdapter();
+        selectListView.setAdapter(selectListAdapter);
+        selectListView.setLayoutManager(new CustomLinearLayoutManager(this));
+        DividerItemDecoration dividerItemDecoration = new DividerItemDecoration(this, DividerItemDecoration.VERTICAL);
+        dividerItemDecoration.setDrawable(getResources().getDrawable(R.drawable.core_list_divider));
+        selectListView.addItemDecoration(dividerItemDecoration);
+        onItemClickListener = new OnItemClickListener() {
+            @Override
+            public void onClick(int position) {
+                selectedItem = position;
+                selectListAdapter.setSelectedItem(position);
+                selectListAdapter.notifyDataSetChanged();
+                if (!needConfirm) {
+                    echoClick();
+                }
+            }
+        };
+        input = findViewById(R.id.edit_content_et);
+
+        Bundle bundle = getIntent().getBundleExtra(Selection.CONTENT);
+        switch (bundle.getInt(Selection.TYPE)) {
+            case Selection.TYPE_TEXT:
+                selectListView.setVisibility(View.GONE);
+                String defaultString = bundle.getString(Selection.INIT_CONTENT);
+                int limit = bundle.getInt(Selection.LIMIT);
+                if (!TextUtils.isEmpty(defaultString)) {
+                    input.setText(defaultString);
+                    input.setSelection(defaultString.length());
+                }
+                if (limit > 0) {
+                    input.setFilters(new InputFilter[]{new InputFilter.LengthFilter(limit)});
+                }
+                break;
+            case Selection.TYPE_LIST:
+                input.setVisibility(View.GONE);
+                ArrayList<String> list = bundle.getStringArrayList(Selection.LIST);
+                selectedItem = bundle.getInt(Selection.DEFAULT_SELECT_ITEM_INDEX);
+                if (list == null || list.size() == 0) {
+                    return;
+                }
+                selectList.clear();
+                selectList.addAll(list);
+                selectListAdapter.setSelectedItem(selectedItem);
+                selectListAdapter.setData(selectList);
+                selectListAdapter.notifyDataSetChanged();
+
+                break;
+            default:
+                finish();
+                return;
+        }
+        mSelectionType = bundle.getInt(Selection.TYPE);
+
+        final String title = bundle.getString(Selection.TITLE);
+
+        needConfirm = bundle.getBoolean(Selection.NEED_CONFIRM, true);
+        returnNow = bundle.getBoolean(Selection.RETURN_NOW, true);
+
+        titleBar.setTitle(title, ITitleBarLayout.Position.MIDDLE);
+        titleBar.setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        titleBar.getRightIcon().setVisibility(View.GONE);
+        if (needConfirm) {
+            titleBar.getRightTitle().setText(getResources().getString(R.string.sure));
+            titleBar.setOnRightClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    echoClick();
+                }
+            });
+        } else {
+            titleBar.getRightGroup().setVisibility(View.GONE);
+        }
+    }
+
+    private void echoClick() {
+        switch (mSelectionType) {
+            case Selection.TYPE_TEXT:
+                if (sOnResultReturnListener != null) {
+                    sOnResultReturnListener.onReturn(input.getText().toString());
+                }
+                break;
+            case Selection.TYPE_LIST:
+                if (sOnResultReturnListener != null) {
+                    sOnResultReturnListener.onReturn(selectedItem);
+                }
+                break;
+        }
+        if (returnNow) {
+            finish();
+        }
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        sOnResultReturnListener = null;
+    }
+
+    class SelectAdapter extends RecyclerView.Adapter<SelectAdapter.SelectViewHolder> {
+        int selectedItem = -1;
+        ArrayList<String> data = new ArrayList<>();
+
+        public void setData(ArrayList<String> data) {
+            this.data.clear();
+            this.data.addAll(data);
+        }
+
+        public void setSelectedItem(int selectedItem) {
+            this.selectedItem = selectedItem;
+        }
+
+        @NonNull
+        @Override
+        public SelectViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            View view = LayoutInflater.from(SelectionActivity.this).inflate(R.layout.core_select_item_layout,parent, false);
+            return new SelectViewHolder(view);
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull SelectViewHolder holder, int position) {
+            String nameStr = data.get(position);
+            holder.name.setText(nameStr);
+            if (selectedItem == position) {
+                holder.selectedIcon.setVisibility(View.VISIBLE);
+            } else {
+                holder.selectedIcon.setVisibility(View.GONE);
+            }
+            holder.itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    onItemClickListener.onClick(position);
+                }
+            });
+        }
+
+        @Override
+        public int getItemCount() {
+            return data.size();
+        }
+
+        class SelectViewHolder extends RecyclerView.ViewHolder{
+            TextView name;
+            ImageView selectedIcon;
+            public SelectViewHolder(@NonNull View itemView) {
+                super(itemView);
+                name = itemView.findViewById(R.id.name);
+                selectedIcon = itemView.findViewById(R.id.selected_icon);
+            }
+        }
+    }
+
+    public interface OnResultReturnListener {
+        void onReturn(Object res);
+    }
+
+    public interface OnItemClickListener {
+        void onClick(int position);
+    }
+
+    public static class Selection {
+        public static final String SELECT_ALL = "select_all";
+        public static final String CONTENT = "content";
+        public static final String TYPE = "type";
+        public static final String TITLE = "title";
+        public static final String INIT_CONTENT = "init_content";
+        public static final String DEFAULT_SELECT_ITEM_INDEX = "default_select_item_index";
+        public static final String LIST = "list";
+        public static final String LIMIT = "limit";
+        public static final String NEED_CONFIRM = "needConfirm";
+        public static final String RETURN_NOW = "returnNow";
+        public static final int TYPE_TEXT = 1;
+        public static final int TYPE_LIST = 2;
+
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/dialog/TUIKitDialog.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/dialog/TUIKitDialog.java
new file mode 100644
index 0000000..33c85f8
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/dialog/TUIKitDialog.java
@@ -0,0 +1,337 @@
+package com.tencent.qcloud.tuicore.component.dialog;
+
+import static com.tencent.qcloud.tuicore.TUIConfig.TUICORE_SETTINGS_SP_NAME;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.text.method.MovementMethod;
+import android.view.Display;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.WindowManager;
+import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.LinearLayout.LayoutParams;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+
+import com.tencent.qcloud.tuicore.BuildConfig;
+import com.tencent.qcloud.tuicore.R;
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.util.SPUtils;
+
+import java.lang.ref.WeakReference;
+
+public class TUIKitDialog {
+
+    private Context mContext;
+    protected Dialog dialog;
+    private LinearLayout mBackgroundLayout;
+    private LinearLayout mMainLayout;
+    protected TextView mTitleTv;
+    private Button mCancelButton;
+    private Button mSureButton;
+    private ImageView mLineImg;
+    private Display mDisplay;
+
+    private boolean showTitle = false;
+    private boolean showPosBtn = false;
+    private boolean showNegBtn = false;
+    
+    private float dialogWidth = 0.7f;
+
+
+    public TUIKitDialog(Context context) {
+        this.mContext = context;
+        WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+        mDisplay = windowManager.getDefaultDisplay();
+    }
+
+    public TUIKitDialog builder() {
+        View view = LayoutInflater.from(mContext).inflate(R.layout.view_dialog, null);
+        mBackgroundLayout = (LinearLayout) view.findViewById(R.id.ll_background);
+        mMainLayout = (LinearLayout) view.findViewById(R.id.ll_alert);
+        mMainLayout.setVerticalGravity(View.GONE);
+        mTitleTv = (TextView) view.findViewById(R.id.tv_title);
+        mTitleTv.setVisibility(View.GONE);
+        mCancelButton = (Button) view.findViewById(R.id.btn_neg);
+        mCancelButton.setVisibility(View.GONE);
+        mSureButton = (Button) view.findViewById(R.id.btn_pos);
+        mSureButton.setVisibility(View.GONE);
+        mLineImg = (ImageView) view.findViewById(R.id.img_line);
+        mLineImg.setVisibility(View.GONE);
+
+        dialog = new Dialog(mContext, R.style.TUIKit_AlertDialogStyle);
+        dialog.setContentView(view);
+
+        mBackgroundLayout.setLayoutParams(new FrameLayout.LayoutParams((int) (mDisplay.getWidth() * dialogWidth), LayoutParams.WRAP_CONTENT));
+        return this;
+    }
+
+
+    public TUIKitDialog setTitle(@NonNull CharSequence title) {
+        showTitle = true;
+        mTitleTv.setText(title);
+        return this;
+    }
+
+    /***
+     * Whether to click back to cancel
+     * @param cancel
+     * @return
+     */
+    public TUIKitDialog setCancelable(boolean cancel) {
+        dialog.setCancelable(cancel);
+        return this;
+    }
+
+    /**
+     * Whether the setting can be canceled
+     *
+     * @param isCancelOutside
+     * @return
+     */
+    public TUIKitDialog setCancelOutside(boolean isCancelOutside) {
+        dialog.setCanceledOnTouchOutside(isCancelOutside);
+        return this;
+    }
+
+    public TUIKitDialog setPositiveButton(CharSequence text,
+                                          final OnClickListener listener) {
+        showPosBtn = true;
+        mSureButton.setText(text);
+        mSureButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                listener.onClick(v);
+                dialog.dismiss();
+            }
+        });
+        return this;
+    }
+
+    public void setTitleGravity(int gravity) {
+        mTitleTv.setGravity(gravity);
+    }
+
+    public TUIKitDialog setPositiveButton(final OnClickListener listener) {
+        setPositiveButton(TUIConfig.getAppContext().getString(R.string.sure), listener);
+        return this;
+    }
+
+    public TUIKitDialog setNegativeButton(CharSequence text,
+                                          final OnClickListener listener) {
+        showNegBtn = true;
+        mCancelButton.setText(text);
+        mCancelButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                listener.onClick(v);
+                dialog.dismiss();
+            }
+        });
+        return this;
+    }
+
+    public TUIKitDialog setNegativeButton(final OnClickListener listener) {
+        setNegativeButton(TUIConfig.getAppContext().getString(R.string.cancel), listener);
+        return this;
+    }
+
+
+    private void setLayout() {
+        if (!showTitle) {
+            mTitleTv.setVisibility(View.GONE);
+        }
+
+        if (showTitle) {
+            mTitleTv.setVisibility(View.VISIBLE);
+        }
+
+        if (!showPosBtn && !showNegBtn) {
+            mSureButton.setVisibility(View.GONE);
+            mSureButton.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    dialog.dismiss();
+                }
+            });
+        }
+
+        if (showPosBtn && showNegBtn) {
+            mSureButton.setVisibility(View.VISIBLE);
+            mCancelButton.setVisibility(View.VISIBLE);
+            mLineImg.setVisibility(View.VISIBLE);
+        }
+
+        if (showPosBtn && !showNegBtn) {
+            mSureButton.setVisibility(View.VISIBLE);
+        }
+
+        if (!showPosBtn && showNegBtn) {
+            mCancelButton.setVisibility(View.VISIBLE);
+        }
+    }
+
+    public void show() {
+        setLayout();
+        dialog.show();
+    }
+
+    public void dismiss() {
+        if (dialog != null && dialog.isShowing()) {
+            dialog.dismiss();
+        }
+    }
+
+    public boolean isShowing() {
+        return dialog != null && dialog.isShowing();
+    }
+
+    /**
+     * 设置dialog  宽度
+     *
+     * @param dialogWidth
+     * @return
+     */
+    public TUIKitDialog setDialogWidth(float dialogWidth) {
+        if (mBackgroundLayout != null) {
+            mBackgroundLayout.setLayoutParams(new FrameLayout.LayoutParams((int) (mDisplay.getWidth() * dialogWidth), LayoutParams.WRAP_CONTENT));
+        }
+        this.dialogWidth = dialogWidth;
+        return this;
+    }
+
+    public static class TUIIMUpdateDialog {
+
+        private static final class TUIIMUpdateDialogHolder {
+            private static final TUIIMUpdateDialog instance = new TUIIMUpdateDialog();
+        }
+
+        public static final String KEY_NEVER_SHOW = "neverShow";
+
+        private boolean isNeverShow;
+        private boolean isShowOnlyDebug = false;
+        private String dialogFeatureName;
+
+        private WeakReference<TUIKitDialog> tuiKitDialog;
+
+        public static TUIIMUpdateDialog getInstance() {
+           return TUIIMUpdateDialogHolder.instance;
+        }
+
+        private TUIIMUpdateDialog() {
+            isNeverShow = SPUtils.getInstance(TUICORE_SETTINGS_SP_NAME).getBoolean(getDialogFeatureName(), false);
+        }
+
+        public TUIIMUpdateDialog createDialog(Context context) {
+            tuiKitDialog = new WeakReference<>(new TUIKitDialog(context));
+            tuiKitDialog.get().builder();
+            return this;
+        }
+
+        public void setNeverShow(boolean neverShowAlert) {
+            this.isNeverShow = neverShowAlert;
+            SPUtils.getInstance(TUICORE_SETTINGS_SP_NAME).put(getDialogFeatureName(), neverShowAlert);
+        }
+
+        public TUIIMUpdateDialog setShowOnlyDebug(boolean isShowOnlyDebug) {
+            this.isShowOnlyDebug = isShowOnlyDebug;
+            return this;
+        }
+
+        public TUIIMUpdateDialog setMovementMethod(MovementMethod movementMethod) {
+            if (tuiKitDialog != null && tuiKitDialog.get() != null) {
+                tuiKitDialog.get().mTitleTv.setMovementMethod(movementMethod);
+            }
+            return this;
+        }
+
+        public TUIIMUpdateDialog setHighlightColor(int color) {
+            if (tuiKitDialog != null && tuiKitDialog.get() != null) {
+                tuiKitDialog.get().mTitleTv.setHighlightColor(color);
+            }
+            return this;
+        }
+
+        public TUIIMUpdateDialog setCancelable(boolean cancelable) {
+            if (tuiKitDialog != null && tuiKitDialog.get() != null) {
+                tuiKitDialog.get().setCancelable(cancelable);
+            }
+            return this;
+        }
+
+        public TUIIMUpdateDialog setCancelOutside(boolean cancelOutside) {
+            if (tuiKitDialog != null && tuiKitDialog.get() != null) {
+                tuiKitDialog.get().setCancelOutside(cancelOutside);
+            }
+            return this;
+        }
+
+        public TUIIMUpdateDialog setTitle(CharSequence charSequence) {
+            if (tuiKitDialog != null && tuiKitDialog.get() != null) {
+                tuiKitDialog.get().setTitle(charSequence);
+            }
+            return this;
+        }
+
+        public TUIIMUpdateDialog setDialogWidth(float dialogWidth) {
+            if (tuiKitDialog != null && tuiKitDialog.get() != null) {
+                tuiKitDialog.get().setDialogWidth(dialogWidth);
+            }
+            return this;
+        }
+
+        public TUIIMUpdateDialog setPositiveButton(CharSequence text, OnClickListener clickListener) {
+            if (tuiKitDialog != null && tuiKitDialog.get() != null) {
+                tuiKitDialog.get().setPositiveButton(text, clickListener);
+            }
+            return this;
+        }
+
+        public TUIIMUpdateDialog setNegativeButton(CharSequence text, OnClickListener clickListener) {
+            if (tuiKitDialog != null && tuiKitDialog.get() != null) {
+                tuiKitDialog.get().setNegativeButton(text, clickListener);
+            }
+            return this;
+        }
+
+        public TUIIMUpdateDialog setDialogFeatureName(String featureName) {
+            this.dialogFeatureName = featureName;
+            return this;
+        }
+
+        private String getDialogFeatureName() {
+            return dialogFeatureName;
+        }
+
+        public void show() {
+            if (tuiKitDialog == null || tuiKitDialog.get() == null) {
+                return;
+            }
+            isNeverShow = SPUtils.getInstance(TUICORE_SETTINGS_SP_NAME).getBoolean(getDialogFeatureName(), false);
+            Dialog dialog = tuiKitDialog.get().dialog;
+            if (dialog == null || dialog.isShowing()) {
+                return;
+            }
+            if (isNeverShow) {
+                return;
+            }
+            if (isShowOnlyDebug && !BuildConfig.DEBUG) {
+                return;
+            }
+            tuiKitDialog.get().show();
+        }
+
+        public void dismiss() {
+            if (tuiKitDialog == null || tuiKitDialog.get() == null) {
+                return;
+            }
+            tuiKitDialog.get().dismiss();
+        }
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/fragments/BaseFragment.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/fragments/BaseFragment.java
new file mode 100644
index 0000000..9342f0a
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/fragments/BaseFragment.java
@@ -0,0 +1,34 @@
+package com.tencent.qcloud.tuicore.component.fragments;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+
+public class BaseFragment extends Fragment {
+
+    public void forward(Fragment fragment, boolean hide) {
+        forward(getId(), fragment, null, hide);
+    }
+
+    public void forward(int viewId, Fragment fragment, String name, boolean hide) {
+        if (getFragmentManager() == null){
+            return;
+        }
+        FragmentTransaction trans = getFragmentManager().beginTransaction();
+        if (hide) {
+            trans.hide(this);
+            trans.add(viewId, fragment);
+        } else {
+            trans.replace(viewId, fragment);
+        }
+
+        trans.addToBackStack(name);
+        trans.commitAllowingStateLoss();
+    }
+
+    public void backward() {
+        if (getFragmentManager() == null){
+            return;
+        }
+        getFragmentManager().popBackStack();
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/gatherimage/MultiImageData.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/gatherimage/MultiImageData.java
new file mode 100644
index 0000000..4883090
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/gatherimage/MultiImageData.java
@@ -0,0 +1,100 @@
+package com.tencent.qcloud.tuicore.component.gatherimage;
+
+import android.graphics.Bitmap;
+import android.graphics.Color;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Multiple image data
+ */
+
+public class MultiImageData implements Cloneable{
+    final static int maxSize = 9;
+    List<Object> imageUrls;
+    int defaultImageResId;
+    Map<Integer, Bitmap> bitmapMap;
+    int bgColor = Color.parseColor("#cfd3d8");
+
+
+    int targetImageSize;
+    int maxWidth, maxHeight;
+    int rowCount;
+    int columnCount;
+    int gap = 6;
+
+    public MultiImageData() {
+    }
+
+    public MultiImageData(int defaultImageResId) {
+        this.defaultImageResId = defaultImageResId;
+    }
+
+    public MultiImageData(List<Object> imageUrls, int defaultImageResId) {
+        this.imageUrls = imageUrls;
+        this.defaultImageResId = defaultImageResId;
+    }
+
+    public int getDefaultImageResId() {
+        return defaultImageResId;
+    }
+
+    public void setDefaultImageResId(int defaultImageResId) {
+        this.defaultImageResId = defaultImageResId;
+    }
+
+    public List<Object> getImageUrls() {
+        return imageUrls;
+    }
+
+    public void setImageUrls(List<Object> imageUrls) {
+        this.imageUrls = imageUrls;
+    }
+
+    public void putBitmap(Bitmap bitmap, int position) {
+        if (null != bitmapMap) {
+            synchronized (bitmapMap) {
+                bitmapMap.put(position, bitmap);
+            }
+        } else {
+            bitmapMap = new HashMap<>();
+            synchronized (bitmapMap) {
+                bitmapMap.put(position, bitmap);
+            }
+        }
+    }
+
+    public Bitmap getBitmap(int position) {
+        if (null != bitmapMap) {
+            synchronized (bitmapMap) {
+                return bitmapMap.get(position);
+            }
+        }
+        return null;
+    }
+
+    public int size() {
+        if (null != imageUrls) {
+            return imageUrls.size() > maxSize ? maxSize : imageUrls.size();
+        } else {
+            return 0;
+        }
+    }
+
+    @Override
+    protected MultiImageData clone() throws CloneNotSupportedException {
+        MultiImageData multiImageData = (MultiImageData) super.clone();
+        if (imageUrls != null) {
+            multiImageData.imageUrls = new ArrayList<>(imageUrls.size());
+            multiImageData.imageUrls.addAll(imageUrls);
+        }
+        if (bitmapMap != null) {
+            multiImageData.bitmapMap = new HashMap<>();
+            multiImageData.bitmapMap.putAll(bitmapMap);
+        }
+        return multiImageData;
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/gatherimage/ShadeImageView.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/gatherimage/ShadeImageView.java
new file mode 100644
index 0000000..f44adc5
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/gatherimage/ShadeImageView.java
@@ -0,0 +1,95 @@
+package com.tencent.qcloud.tuicore.component.gatherimage;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.util.AttributeSet;
+import android.util.SparseArray;
+import android.widget.ImageView;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.R;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+
+@SuppressLint("AppCompatCustomView")
+public class ShadeImageView extends ImageView {
+
+    private static SparseArray<Bitmap> sRoundBitmapArray = new SparseArray();
+    private Paint mShadePaint = new Paint();
+    private Bitmap mRoundBitmap;
+    private int radius;
+
+    public ShadeImageView(Context context) {
+        super(context);
+    }
+
+    public ShadeImageView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public ShadeImageView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs);
+    }
+
+    private void init(Context context, AttributeSet attrs) {
+        radius = (int) ScreenUtil.dp2px(4.0f, getResources().getDisplayMetrics());
+        TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.core_round_rect_image_style);
+        radius = array.getDimensionPixelSize(R.styleable.core_round_rect_image_style_round_radius, radius);
+        array.recycle();
+        setLayerType(LAYER_TYPE_HARDWARE, null);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        mShadePaint.setColor(Color.RED);
+        mShadePaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.DST_IN));
+        mRoundBitmap = sRoundBitmapArray.get(getMeasuredWidth() + radius);
+        if (mRoundBitmap == null) {
+            mRoundBitmap = getRoundBitmap();
+            sRoundBitmapArray.put(getMeasuredWidth() + radius, mRoundBitmap);
+        }
+        canvas.drawBitmap(mRoundBitmap, 0, 0, mShadePaint);
+    }
+
+    /**
+     * Get rounded rectangle
+     *
+     * @return Bitmap
+     */
+    private Bitmap getRoundBitmap() {
+        Bitmap output = Bitmap.createBitmap(getWidth(), getHeight(), Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(output);
+        final int color = Color.parseColor("#cfd3d8");
+        final Rect rect = new Rect(0, 0, getMeasuredWidth(), getMeasuredHeight());
+        final RectF rectF = new RectF(rect);
+        Paint paint = new Paint();
+        paint.setAntiAlias(true);
+        canvas.drawARGB(0, 0, 0, 0);
+        paint.setColor(color);
+        canvas.drawRoundRect(rectF, radius, radius, paint);
+        return output;
+    }
+
+
+    public int getRadius() {
+        return radius;
+    }
+
+    public void setRadius(int radius) {
+        this.radius = radius;
+    }
+
+
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/gatherimage/SynthesizedImageView.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/gatherimage/SynthesizedImageView.java
new file mode 100644
index 0000000..f7eba56
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/gatherimage/SynthesizedImageView.java
@@ -0,0 +1,90 @@
+package com.tencent.qcloud.tuicore.component.gatherimage;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Color;
+import android.util.AttributeSet;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.R;
+
+import java.util.List;
+
+
+public class SynthesizedImageView extends ShadeImageView {
+    /**
+     * 群聊头像合成器
+     * 
+     * Group Chat Avatar Synthesizer
+     */
+    TeamHeadSynthesizer teamHeadSynthesizer;
+    int imageSize = 100;
+    int synthesizedBg = Color.parseColor("#cfd3d8");
+    int defaultImageResId = 0;
+    int imageGap = 6;
+
+    public SynthesizedImageView(Context context) {
+        super(context);
+        init(context);
+    }
+
+    public SynthesizedImageView(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        initAttrs(attrs);
+        init(context);
+    }
+
+    public SynthesizedImageView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initAttrs(attrs);
+        init(context);
+    }
+
+    private void initAttrs(AttributeSet attributeSet) {
+        TypedArray ta = getContext().obtainStyledAttributes(attributeSet, R.styleable.SynthesizedImageView);
+        if (null != ta) {
+            synthesizedBg = ta.getColor(R.styleable.SynthesizedImageView_synthesized_image_bg, synthesizedBg);
+            defaultImageResId = ta.getResourceId(R.styleable.SynthesizedImageView_synthesized_default_image, defaultImageResId);
+            imageSize = ta.getDimensionPixelSize(R.styleable.SynthesizedImageView_synthesized_image_size, imageSize);
+            imageGap = ta.getDimensionPixelSize(R.styleable.SynthesizedImageView_synthesized_image_gap, imageGap);
+            ta.recycle();
+        }
+    }
+
+    private void init(Context context) {
+        teamHeadSynthesizer = new TeamHeadSynthesizer(context, this);
+        teamHeadSynthesizer.setMaxWidthHeight(imageSize, imageSize);
+        teamHeadSynthesizer.setDefaultImage(defaultImageResId);
+        teamHeadSynthesizer.setBgColor(synthesizedBg);
+        teamHeadSynthesizer.setGap(imageGap);
+    }
+
+    public SynthesizedImageView displayImage(List<Object> imageUrls) {
+        teamHeadSynthesizer.getMultiImageData().setImageUrls(imageUrls);
+        return this;
+    }
+
+    public SynthesizedImageView defaultImage(int defaultImage) {
+        teamHeadSynthesizer.setDefaultImage(defaultImage);
+        return this;
+    }
+
+    public SynthesizedImageView synthesizedWidthHeight(int maxWidth, int maxHeight) {
+        teamHeadSynthesizer.setMaxWidthHeight(maxWidth, maxHeight);
+        return this;
+    }
+
+    public void setImageId(String id) {
+        teamHeadSynthesizer.setImageId(id);
+    }
+
+    public void load(String imageId) {
+        teamHeadSynthesizer.load(imageId);
+    }
+
+    public void clear() {
+        teamHeadSynthesizer.clearImage();
+    }
+
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/gatherimage/Synthesizer.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/gatherimage/Synthesizer.java
new file mode 100644
index 0000000..f2ec6a8
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/gatherimage/Synthesizer.java
@@ -0,0 +1,14 @@
+package com.tencent.qcloud.tuicore.component.gatherimage;
+
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+
+
+public interface Synthesizer {
+
+    Bitmap synthesizeImageList(MultiImageData imageData);
+
+    boolean asyncLoadImageList(MultiImageData imageData);
+
+    void drawDrawable(Canvas canvas, MultiImageData imageData);
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/gatherimage/TeamHeadSynthesizer.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/gatherimage/TeamHeadSynthesizer.java
new file mode 100644
index 0000000..50faa62
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/gatherimage/TeamHeadSynthesizer.java
@@ -0,0 +1,330 @@
+package com.tencent.qcloud.tuicore.component.gatherimage;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.text.TextUtils;
+import android.widget.ImageView;
+
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.util.BackgroundTasks;
+import com.tencent.qcloud.tuicore.util.ImageUtil;
+import com.tencent.qcloud.tuicore.util.ThreadHelper;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+
+
+public class TeamHeadSynthesizer implements Synthesizer {
+
+    MultiImageData multiImageData;
+    Context mContext;
+
+    ImageView imageView;
+
+    // It is safe to set and get only in the main thread
+    private String currentImageId = "";
+    Callback callback = new Callback() {
+        @Override
+        public void onCall(Bitmap bitmap, String targetID) {
+            if (!TextUtils.equals(getImageId(), targetID)) {
+                return;
+            }
+            GlideEngine.loadUserIcon(imageView, bitmap);
+        }
+    };
+
+
+    public TeamHeadSynthesizer(Context mContext, ImageView imageView) {
+        this.mContext = mContext;
+        this.imageView = imageView;
+        init();
+    }
+
+    private void init() {
+        multiImageData = new MultiImageData();
+    }
+
+    public void setMaxWidthHeight(int maxWidth, int maxHeight) {
+        multiImageData.maxWidth = maxWidth;
+        multiImageData.maxHeight = maxHeight;
+    }
+
+    public MultiImageData getMultiImageData() {
+        return multiImageData;
+    }
+
+    public int getDefaultImage() {
+        return multiImageData.getDefaultImageResId();
+    }
+
+    public void setDefaultImage(int defaultImageResId) {
+        multiImageData.setDefaultImageResId(defaultImageResId);
+    }
+
+    public void setBgColor(int bgColor) {
+        multiImageData.bgColor = bgColor;
+    }
+
+    public void setGap(int gap) {
+        multiImageData.gap = gap;
+    }
+
+    /**
+     * Set Grid params
+     *
+     * @param imagesSize   Number of pictures
+     * @return gridParam[0] Rows gridParam[1] columns
+     */
+    protected int[] calculateGridParam(int imagesSize) {
+        int[] gridParam = new int[2];
+        if (imagesSize < 3) {
+            gridParam[0] = 1;
+            gridParam[1] = imagesSize;
+        } else if (imagesSize <= 4) {
+            gridParam[0] = 2;
+            gridParam[1] = 2;
+        } else {
+            gridParam[0] = imagesSize / 3 + (imagesSize % 3 == 0 ? 0 : 1);
+            gridParam[1] = 3;
+        }
+        return gridParam;
+    }
+
+    @Override
+    public Bitmap synthesizeImageList(MultiImageData imageData) {
+        Bitmap mergeBitmap = Bitmap.createBitmap(imageData.maxWidth, imageData.maxHeight, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(mergeBitmap);
+        drawDrawable(canvas, imageData);
+        canvas.save();
+        canvas.restore();
+        return mergeBitmap;
+    }
+
+    @Override
+    public boolean asyncLoadImageList(MultiImageData imageData) {
+        boolean loadSuccess = true;
+        List<Object> imageUrls = imageData.getImageUrls();
+        for (int i = 0; i < imageUrls.size(); i++) {
+            Bitmap defaultIcon = BitmapFactory.decodeResource(mContext.getResources(), TUIConfig.getDefaultAvatarImage());
+            try {
+                Bitmap bitmap = asyncLoadImage(imageUrls.get(i), imageData.targetImageSize);
+                imageData.putBitmap(bitmap, i);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+                imageData.putBitmap(defaultIcon, i);
+            } catch (ExecutionException e) {
+                e.printStackTrace();
+                imageData.putBitmap(defaultIcon, i);
+            }
+        }
+        return loadSuccess;
+    }
+
+    @Override
+    public void drawDrawable(Canvas canvas, MultiImageData imageData) {
+        canvas.drawColor(imageData.bgColor);
+        int size = imageData.size();
+        int t_center = (imageData.maxHeight + imageData.gap) / 2;
+        int b_center = (imageData.maxHeight - imageData.gap) / 2;
+        int l_center = (imageData.maxWidth + imageData.gap) / 2;
+        int r_center = (imageData.maxWidth - imageData.gap) / 2;
+        int center = (imageData.maxHeight - imageData.targetImageSize) / 2;
+        for (int i = 0; i < size; i++) {
+            int rowNum = i / imageData.columnCount;
+            int columnNum = i % imageData.columnCount;
+
+            int left = ((int) (imageData.targetImageSize * (imageData.columnCount == 1 ? columnNum + 0.5 : columnNum) + imageData.gap * (columnNum + 1)));
+            int top = ((int) (imageData.targetImageSize * (imageData.columnCount == 1 ? rowNum + 0.5 : rowNum) + imageData.gap * (rowNum + 1)));
+            int right = left + imageData.targetImageSize;
+            int bottom = top + imageData.targetImageSize;
+
+            Bitmap bitmap = imageData.getBitmap(i);
+            if (size == 1) {
+                drawBitmapAtPosition(canvas, left, top, right, bottom, bitmap);
+            } else if (size == 2) {
+                drawBitmapAtPosition(canvas, left, center, right, center + imageData.targetImageSize, bitmap);
+            } else if (size == 3) {
+                if (i == 0) {
+                    drawBitmapAtPosition(canvas, center, top, center + imageData.targetImageSize, bottom, bitmap);
+                } else {
+                    drawBitmapAtPosition(canvas, imageData.gap * i + imageData.targetImageSize * (i - 1), t_center, imageData.gap * i + imageData.targetImageSize * i, t_center + imageData.targetImageSize, bitmap);
+                }
+            } else if (size == 4) {
+                drawBitmapAtPosition(canvas, left, top, right, bottom, bitmap);
+            } else if (size == 5) {
+                if (i == 0) {
+                    drawBitmapAtPosition(canvas, r_center - imageData.targetImageSize, r_center - imageData.targetImageSize, r_center, r_center, bitmap);
+                } else if (i == 1) {
+                    drawBitmapAtPosition(canvas, l_center, r_center - imageData.targetImageSize, l_center + imageData.targetImageSize, r_center, bitmap);
+                } else {
+                    drawBitmapAtPosition(canvas, imageData.gap * (i - 1) + imageData.targetImageSize * (i - 2), t_center, imageData.gap * (i - 1) + imageData.targetImageSize * (i - 1), t_center +
+                            imageData.targetImageSize, bitmap);
+                }
+            } else if (size == 6) {
+                if (i < 3) {
+                    drawBitmapAtPosition(canvas, imageData.gap * (i + 1) + imageData.targetImageSize * i, b_center - imageData.targetImageSize, imageData.gap * (i + 1) + imageData.targetImageSize * (i + 1), b_center, bitmap);
+                } else {
+                    drawBitmapAtPosition(canvas, imageData.gap * (i - 2) + imageData.targetImageSize * (i - 3), t_center, imageData.gap * (i - 2) + imageData.targetImageSize * (i - 2), t_center +
+                            imageData.targetImageSize, bitmap);
+                }
+            } else if (size == 7) {
+                if (i == 0) {
+                    drawBitmapAtPosition(canvas, center, imageData.gap, center + imageData.targetImageSize, imageData.gap + imageData.targetImageSize, bitmap);
+                } else if (i > 0 && i < 4) {
+                    drawBitmapAtPosition(canvas, imageData.gap * i + imageData.targetImageSize * (i - 1), center, imageData.gap * i + imageData.targetImageSize * i, center + imageData.targetImageSize, bitmap);
+                } else {
+                    drawBitmapAtPosition(canvas, imageData.gap * (i - 3) + imageData.targetImageSize * (i - 4), t_center + imageData.targetImageSize / 2, imageData.gap * (i - 3) + imageData.targetImageSize * (i - 3), t_center + imageData.targetImageSize / 2 + imageData.targetImageSize, bitmap);
+                }
+            } else if (size == 8) {
+                if (i == 0) {
+                    drawBitmapAtPosition(canvas, r_center - imageData.targetImageSize, imageData.gap, r_center, imageData.gap + imageData.targetImageSize, bitmap);
+                } else if (i == 1) {
+                    drawBitmapAtPosition(canvas, l_center, imageData.gap, l_center + imageData.targetImageSize, imageData.gap + imageData.targetImageSize, bitmap);
+                } else if (i > 1 && i < 5) {
+                    drawBitmapAtPosition(canvas, imageData.gap * (i - 1) + imageData.targetImageSize * (i - 2), center, imageData.gap * (i - 1) + imageData.targetImageSize * (i - 1), center + imageData.targetImageSize, bitmap);
+                } else {
+                    drawBitmapAtPosition(canvas, imageData.gap * (i - 4) + imageData.targetImageSize * (i - 5), t_center + imageData.targetImageSize / 2, imageData.gap * (i - 4) + imageData.targetImageSize * (i - 4), t_center + imageData.targetImageSize / 2 + imageData.targetImageSize, bitmap);
+                }
+            } else if (size == 9) {
+                drawBitmapAtPosition(canvas, left, top, right, bottom, bitmap);
+            }
+        }
+    }
+
+    /**
+     * DrawBitmap
+     *
+     * @param canvas
+     * @param left
+     * @param top
+     * @param right
+     * @param bottom
+     * @param bitmap
+     */
+    public void drawBitmapAtPosition(Canvas canvas, int left, int top, int right, int bottom, Bitmap bitmap) {
+        if (null == bitmap) {
+            if (multiImageData.getDefaultImageResId() > 0) {
+                bitmap = BitmapFactory.decodeResource(mContext.getResources(), multiImageData.getDefaultImageResId());
+            }
+        }
+        if (null != bitmap) {
+            Rect rect = new Rect(left, top, right, bottom);
+            canvas.drawBitmap(bitmap, null, rect, null);
+        }
+    }
+
+    private Bitmap asyncLoadImage(Object imageUrl, int targetImageSize) throws ExecutionException, InterruptedException {
+        return GlideEngine.loadBitmap(imageUrl, targetImageSize);
+    }
+
+    public void setImageId(String id) {
+        currentImageId = id;
+    }
+
+    public String getImageId() {
+        return currentImageId;
+    }
+
+    public void load(String imageId) {
+        if (multiImageData.size() == 0) {
+            // 发起请求时的图片 id 和当前图片 id 不一致，说明发生了复用，此时不应该再设置图像
+            // The image id when the request is initiated is inconsistent with the current image id, 
+            // indicating that multiplexing has occurred, and the image should not be set at this time.
+            if (imageId != null && !TextUtils.equals(imageId, currentImageId)) {
+                return;
+            }
+            GlideEngine.loadUserIcon(imageView, getDefaultImage());
+            return;
+        }
+
+        if (multiImageData.size() == 1) {
+            // 发起请求时的图片 id 和当前图片 id 不一致，说明发生了复用，此时不应该再设置图像
+            // The image id when the request is initiated is inconsistent with the current image id, 
+            // indicating that multiplexing has occurred, and the image should not be set at this time.
+            if (imageId != null && !TextUtils.equals(imageId, currentImageId)) {
+                return;
+            }
+            GlideEngine.loadUserIcon(imageView, multiImageData.getImageUrls().get(0), getDefaultImage(), 0);
+            return;
+        }
+
+        // 异步加载图像前先清空内容，避免闪烁
+        // Clear the content before loading images asynchronously to avoid flickering
+        clearImage();
+
+        // 初始化图片信息，由于是异步加载和合成头像，这里需要传给合成线程一个局部对象，只在异步加载线程中使用
+        // 这样在图片被复用时外部线程再次设置 url 就不会覆盖此局部对象
+        // Initialize the image information. Since it is asynchronous loading and synthesizing the avatar, 
+        // a local object needs to be passed to the synthesis thread, which is only used in the asynchronous 
+        // loading thread, so that when the image is reused, the external thread will not overwrite the local 
+        // object by setting the url again.
+        MultiImageData copyMultiImageData;
+        try {
+            copyMultiImageData = multiImageData.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+            List urlList = new ArrayList();
+            if (multiImageData.imageUrls != null) {
+                urlList.addAll(multiImageData.imageUrls);
+            }
+            copyMultiImageData = new MultiImageData(urlList, multiImageData.defaultImageResId);
+        }
+        int[] gridParam = calculateGridParam(multiImageData.size());
+        copyMultiImageData.rowCount = gridParam[0];
+        copyMultiImageData.columnCount = gridParam[1];
+        copyMultiImageData.targetImageSize = (copyMultiImageData.maxWidth - (copyMultiImageData.columnCount + 1)
+                * copyMultiImageData.gap) / (copyMultiImageData.columnCount == 1 ? 2 : copyMultiImageData.columnCount);
+        final String finalImageId = imageId;
+        final MultiImageData finalCopyMultiImageData = copyMultiImageData;
+        ThreadHelper.INST.execute(new Runnable() {
+            @Override
+            public void run() {
+                final File file = new File(TUIConfig.getImageBaseDir() + finalImageId);
+                boolean cacheBitmapExists = false;
+                Bitmap existsBitmap = null;
+                if (file.exists() && file.isFile()) {
+                    BitmapFactory.Options options = new BitmapFactory.Options();
+                    existsBitmap = BitmapFactory.decodeFile(file.getPath(), options);
+                    if (options.outWidth > 0 && options.outHeight > 0) {
+                        cacheBitmapExists = true;
+                    }
+                }
+                if (!cacheBitmapExists) {
+                    asyncLoadImageList(finalCopyMultiImageData);
+                    final Bitmap bitmap = synthesizeImageList(finalCopyMultiImageData);
+                    ImageUtil.storeBitmap(file, bitmap);
+                    ImageUtil.setGroupConversationAvatar(finalImageId, file.getAbsolutePath());
+                    BackgroundTasks.getInstance().runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            callback.onCall(bitmap, finalImageId);
+                        }
+                    });
+                } else {
+                    final Bitmap finalExistsBitmap = existsBitmap;
+                    BackgroundTasks.getInstance().runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            callback.onCall(finalExistsBitmap, finalImageId);
+                        }
+                    });
+                }
+            }
+        });
+    }
+
+    public void clearImage() {
+        GlideEngine.clear(imageView);
+    }
+
+    interface Callback {
+        void onCall(Bitmap bitmap, String targetID);
+    }
+
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/gatherimage/UserIconView.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/gatherimage/UserIconView.java
new file mode 100644
index 0000000..58679db
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/gatherimage/UserIconView.java
@@ -0,0 +1,67 @@
+package com.tencent.qcloud.tuicore.component.gatherimage;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.widget.RelativeLayout;
+
+import com.tencent.qcloud.tuicore.R;
+
+import java.util.List;
+
+public class UserIconView extends RelativeLayout {
+
+    private SynthesizedImageView mIconView;
+    private int mDefaultImageResId;
+    private int mIconRadius;
+
+    public UserIconView(Context context) {
+        super(context);
+        init(null);
+    }
+
+    public UserIconView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(attrs);
+    }
+
+    public UserIconView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(attrs);
+    }
+
+    private void init(AttributeSet attributeSet) {
+        inflate(getContext(), R.layout.profile_icon_view, this);
+        if (attributeSet != null) {
+            TypedArray ta = getContext().obtainStyledAttributes(attributeSet, R.styleable.UserIconView);
+            if (null != ta) {
+                mDefaultImageResId = ta.getResourceId(R.styleable.UserIconView_default_image, mDefaultImageResId);
+                mIconRadius = ta.getDimensionPixelSize(R.styleable.UserIconView_image_radius, mIconRadius);
+                ta.recycle();
+            }
+        }
+
+        mIconView = findViewById(R.id.profile_icon);
+        if (mDefaultImageResId > 0) {
+            mIconView.defaultImage(mDefaultImageResId);
+        }
+        if (mIconRadius > 0) {
+            mIconView.setRadius(mIconRadius);
+        }
+    }
+
+    public void setDefaultImageResId(int resId) {
+        mDefaultImageResId = resId;
+        mIconView.defaultImage(resId);
+    }
+
+    public void setRadius(int radius) {
+        mIconRadius = radius;
+        mIconView.setRadius(mIconRadius);
+    }
+
+    public void setIconUrls(List<Object> iconUrls) {
+        mIconView.displayImage(iconUrls).load(null);
+    }
+
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/imageEngine/impl/CornerTransform.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/imageEngine/impl/CornerTransform.java
new file mode 100644
index 0000000..f2daf7e
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/imageEngine/impl/CornerTransform.java
@@ -0,0 +1,135 @@
+package com.tencent.qcloud.tuicore.component.imageEngine.impl;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapShader;
+import android.graphics.Canvas;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.graphics.Shader;
+
+import androidx.annotation.NonNull;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.Transformation;
+import com.bumptech.glide.load.engine.Resource;
+import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
+import com.bumptech.glide.load.resource.bitmap.BitmapResource;
+
+import java.security.MessageDigest;
+
+public class CornerTransform implements Transformation<Bitmap> {
+
+    private BitmapPool mBitmapPool;
+    private float radius;
+    private boolean exceptLeftTop, exceptRightTop, exceptLeftBottom, exceptRightBottom;
+
+    public CornerTransform(Context context, float radius) {
+        this.mBitmapPool = Glide.get(context).getBitmapPool();
+        this.radius = radius;
+    }
+
+    public void setExceptCorner(boolean leftTop, boolean rightTop, boolean leftBottom, boolean rightBottom) {
+        this.exceptLeftTop = leftTop;
+        this.exceptRightTop = rightTop;
+        this.exceptLeftBottom = leftBottom;
+        this.exceptRightBottom = rightBottom;
+    }
+
+    @NonNull
+    @Override
+    public Resource<Bitmap> transform(@NonNull Context context, @NonNull Resource<Bitmap> resource, int outWidth, int outHeight) {
+        Bitmap source = resource.get();
+        int finalWidth, finalHeight;
+        // 输出目标的宽高或高宽比例
+        // The width-height or height-width ratio of the output target
+        float ratio;
+        if (outWidth > outHeight) {
+            // 输出宽度>输出高度,求高宽比
+            // output width > output height, find the aspect ratio
+            ratio = (float) outHeight / (float) outWidth;
+            finalWidth = source.getWidth();
+            // 固定原图宽度,求最终高度
+            // Fix the width of the original image and find the final height
+            finalHeight = (int) ((float) source.getWidth() * ratio); 
+            if (finalHeight > source.getHeight()) {
+                // 求出的最终高度>原图高度,求宽高比
+                // Find the final height > the original image height, find the aspect ratio
+                ratio = (float) outWidth / (float) outHeight;
+                finalHeight = source.getHeight();
+                // 固定原图高度,求最终宽度
+                // Fix the width of the original image and find the final width
+                finalWidth = (int) ((float) source.getHeight() * ratio);
+            }
+        } else if (outWidth < outHeight) { 
+            // 输出宽度 < 输出高度,求宽高比
+            // output width < output height, find the aspect ratio
+            ratio = (float) outWidth / (float) outHeight;
+            finalHeight = source.getHeight();
+            // 固定原图高度,求最终宽度
+            // Fix the width of the original image and find the final width
+            finalWidth = (int) ((float) source.getHeight() * ratio);
+            if (finalWidth > source.getWidth()) { 
+                // 求出的最终宽度 > 原图宽度,求高宽比
+                // Find the final width > the original image width, find the aspect ratio
+                ratio = (float) outHeight / (float) outWidth;
+                finalWidth = source.getWidth();
+                finalHeight = (int) ((float) source.getWidth() * ratio);
+            }
+        } else { 
+            // 输出宽度=输出高度
+            // output width = output height
+            finalHeight = source.getHeight();
+            finalWidth = finalHeight;
+        }
+
+        // 修正圆角
+        // Correct rounded corners
+        this.radius *= (float) finalHeight / (float) outHeight;
+        Bitmap outBitmap = this.mBitmapPool.get(finalWidth, finalHeight, Bitmap.Config.ARGB_8888);
+        if (outBitmap == null) {
+            outBitmap = Bitmap.createBitmap(finalWidth, finalHeight, Bitmap.Config.ARGB_8888);
+        }
+
+        Canvas canvas = new Canvas(outBitmap);
+        Paint paint = new Paint();
+        BitmapShader shader = new BitmapShader(source, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP);
+        // 计算中心位置,进行偏移
+        // Calculate the center position and offset it
+        int width = (source.getWidth() - finalWidth) / 2;
+        int height = (source.getHeight() - finalHeight) / 2;
+        if (width != 0 || height != 0) {
+            Matrix matrix = new Matrix();
+            matrix.setTranslate((float) (-width), (float) (-height));
+            shader.setLocalMatrix(matrix);
+        }
+
+        paint.setShader(shader);
+        paint.setAntiAlias(true);
+        RectF rectF = new RectF(0.0F, 0.0F, (float) canvas.getWidth(), (float) canvas.getHeight());
+        canvas.drawRoundRect(rectF, this.radius, this.radius, paint);
+
+        if (exceptLeftTop) {
+            canvas.drawRect(0, 0, radius, radius, paint);
+        }
+        if (exceptRightTop) {
+            canvas.drawRect(canvas.getWidth() - radius, 0, radius, radius, paint);
+        }
+
+        if (exceptLeftBottom) {
+            canvas.drawRect(0, canvas.getHeight() - radius, radius, canvas.getHeight(), paint);
+        }
+
+        if (exceptRightBottom) {
+            canvas.drawRect(canvas.getWidth() - radius, canvas.getHeight() - radius, canvas.getWidth(), canvas.getHeight(), paint);
+        }
+
+        return BitmapResource.obtain(outBitmap, this.mBitmapPool);
+    }
+
+    @Override
+    public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
+
+    }
+}
\ No newline at end of file
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/imageEngine/impl/GlideEngine.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/imageEngine/impl/GlideEngine.java
new file mode 100644
index 0000000..91dc9e5
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/imageEngine/impl/GlideEngine.java
@@ -0,0 +1,167 @@
+package com.tencent.qcloud.tuicore.component.imageEngine.impl;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.widget.ImageView;
+
+import androidx.annotation.DrawableRes;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.Priority;
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
+import com.bumptech.glide.request.RequestListener;
+import com.bumptech.glide.request.RequestOptions;
+import com.tencent.qcloud.tuicore.R;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+
+import java.io.File;
+import java.util.concurrent.ExecutionException;
+
+public class GlideEngine {
+
+    public static void loadCornerImageWithoutPlaceHolder(ImageView imageView, String filePath, RequestListener listener, float radius) {
+        RoundedCorners transform = null;
+        if ((int) radius > 0) {
+            transform = new RoundedCorners((int) radius);
+        }
+
+        RequestOptions options = new RequestOptions()
+                .centerCrop();
+        if (transform != null) {
+            options = options.transform(transform);
+        }
+        Glide.with(TUILogin.getAppContext())
+                .load(filePath)
+                .apply(options)
+                .listener(listener)
+                .into(imageView);
+    }
+
+    public static void loadImage(ImageView imageView, String filePath, RequestListener listener) {
+        Glide.with(TUILogin.getAppContext())
+                .load(filePath)
+                .listener(listener)
+                .apply(new RequestOptions().error(TUIThemeManager.getAttrResId(TUILogin.getAppContext(), R.attr.core_default_user_icon)))
+                .into(imageView);
+    }
+
+    public static void loadImage(ImageView imageView, String filePath) {
+        Glide.with(TUILogin.getAppContext())
+                .load(filePath)
+                .apply(new RequestOptions().error(TUIThemeManager.getAttrResId(TUILogin.getAppContext(), R.attr.core_default_user_icon)))
+                .into(imageView);
+    }
+
+    public static void clear(ImageView imageView) {
+        Glide.with(TUILogin.getAppContext()).clear(imageView);
+    }
+
+    public static void loadImage(ImageView imageView, Uri uri) {
+        if (uri == null) {
+            return;
+        }
+        Glide.with(TUILogin.getAppContext())
+                .load(uri)
+                .apply(new RequestOptions().error(TUIThemeManager.getAttrResId(TUILogin.getAppContext(), R.attr.core_default_user_icon)))
+                .into(imageView);
+    }
+
+    public static void loadImage(String filePath, String url) {
+        try {
+            File file = Glide.with(TUILogin.getAppContext()).asFile().load(url).submit().get();
+            File destFile = new File(filePath);
+            file.renameTo(destFile);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        } catch (ExecutionException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void loadImage(ImageView imageView, Object uri) {
+        if (uri == null) {
+            return;
+        }
+        Glide.with(TUILogin.getAppContext())
+                .load(uri)
+                .apply(new RequestOptions().error(TUIThemeManager.getAttrResId(TUILogin.getAppContext(), R.attr.core_default_user_icon)))
+                .into(imageView);
+    }
+
+    public static void loadUserIcon(ImageView imageView, Object uri) {
+        loadUserIcon(imageView, uri, 0);
+    }
+
+    public static void loadUserIcon(ImageView imageView, Object uri, int radius) {
+        Glide.with(TUILogin.getAppContext())
+                .load(uri)
+                .placeholder(TUIThemeManager.getAttrResId(TUILogin.getAppContext(), R.attr.core_default_user_icon))
+                .apply(new RequestOptions().centerCrop().error(TUIThemeManager.getAttrResId(TUILogin.getAppContext(), R.attr.core_default_user_icon)))
+                .into(imageView);
+    }
+
+    public static void loadUserIcon(ImageView imageView, Object uri, int defaultResId, int radius) {
+        Glide.with(TUILogin.getAppContext())
+                .load(uri)
+                .placeholder(defaultResId)
+                .apply(new RequestOptions().centerCrop().error(defaultResId))
+                .into(imageView);
+    }
+    public static void loadUserCircleIcon(ImageView imageView, Object uri) {
+        Glide.with(TUILogin.getAppContext())
+                .load(uri)
+                .placeholder(TUIThemeManager.getAttrResId(TUILogin.getAppContext(), R.attr.core_default_user_icon))
+                .apply(new RequestOptions().centerCrop().circleCrop().error(TUIThemeManager.getAttrResId(TUILogin.getAppContext(), R.attr.core_default_user_icon)))
+                .into(imageView);
+    }
+    public static void loadUserCircleIcon(ImageView imageView, Object uri, @DrawableRes int resourceId) {
+        Glide.with(TUILogin.getAppContext())
+                .load(uri)
+                .placeholder(resourceId)
+                .apply(new RequestOptions().centerCrop().circleCrop().error(resourceId))
+                .into(imageView);
+    }
+    public static Bitmap loadBitmap(Object imageUrl, int targetImageSize) throws InterruptedException, ExecutionException {
+        if (imageUrl == null) {
+            return null;
+        }
+        return Glide.with(TUILogin.getAppContext()).asBitmap()
+                .load(imageUrl)
+                .apply(new RequestOptions().error(TUIThemeManager.getAttrResId(TUILogin.getAppContext(), R.attr.core_default_user_icon)))
+                .into(targetImageSize, targetImageSize)
+                .get();
+    }
+
+    public static Bitmap loadBitmap(Object imageUrl, int width, int height) throws InterruptedException, ExecutionException {
+        if (imageUrl == null) {
+            return null;
+        }
+        return Glide.with(TUILogin.getAppContext()).asBitmap()
+                .load(imageUrl)
+                .apply(new RequestOptions().error(TUIThemeManager.getAttrResId(TUILogin.getAppContext(), R.attr.core_default_user_icon)))
+                .into(width, height)
+                .get();
+    }
+
+
+    public void loadImage(Context context, int resizeX, int resizeY, ImageView imageView, Uri uri) {
+        Glide.with(context)
+                .load(uri)
+                .apply(new RequestOptions()
+                        .override(resizeX, resizeY)
+                        .priority(Priority.HIGH)
+                        .fitCenter())
+                .into(imageView);
+    }
+
+    public static void loadImageSetDefault(ImageView imageView, Object uri, int defaultResId) {
+        Glide.with(TUILogin.getAppContext())
+                .load(uri)
+                .placeholder(defaultResId)
+                .apply(new RequestOptions().centerCrop().error(defaultResId))
+                .into(imageView);
+    }
+
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/interfaces/ILayout.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/interfaces/ILayout.java
new file mode 100644
index 0000000..25b3a48
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/interfaces/ILayout.java
@@ -0,0 +1,20 @@
+package com.tencent.qcloud.tuicore.component.interfaces;
+
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+
+public interface ILayout {
+
+    /**
+     * get title bar
+     *
+     * @return
+     */
+    TitleBarLayout getTitleBar();
+
+    /**
+     * Set the parent container of this Layout
+     *
+     * @param parent
+     */
+    void setParentLayout(Object parent);
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/interfaces/ITitleBarLayout.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/interfaces/ITitleBarLayout.java
new file mode 100644
index 0000000..f6ffee1
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/interfaces/ITitleBarLayout.java
@@ -0,0 +1,153 @@
+package com.tencent.qcloud.tuicore.component.interfaces;
+
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+/**
+ * 会话列表窗口 {@link ConversationLayout}、聊天窗口 {@link ChatLayout} 等都自带标题栏，<br>
+ * 标题栏设计为左中右三部分标题，左边可为图片+文字，中间为文字，右边也可为图片+文字，这些区域返回的都是标准的<br>
+ * Android View，可以根据业务需要对这些 View 进行交互响应处理。
+ * 
+ * Conversation list window {@link ConversationLayout}、chat window {@link ChatLayout} have title bar，
+ * The title bar is designed as a three-part title on the left, middle and right. The left can be 
+ * picture + text, the middle is text, and the right can also be picture + text. These areas return the 
+ * standard Android View，These Views can be interactively processed according to business needs。
+ */
+public interface ITitleBarLayout {
+
+    /**
+     * 设置左边标题的点击事件
+     * 
+     * Set the click event of the left header
+     *
+     * @param listener
+     */
+    void setOnLeftClickListener(View.OnClickListener listener);
+
+    /**
+     * 设置右边标题的点击事件
+     * 
+     * Set the click event of the right title
+     *
+     * @param listener
+     */
+    void setOnRightClickListener(View.OnClickListener listener);
+
+    /**
+     * 设置标题
+     * 
+     * set Title
+     *
+     */
+    void setTitle(String title, Position position);
+
+    /**
+     * 返回左边标题区域
+     * 
+     * Return to the left header area
+     *
+     * @return
+     */
+    LinearLayout getLeftGroup();
+
+    /**
+     * 返回右边标题区域
+     * 
+     * Return to the right header area
+     *
+     * @return
+     */
+    LinearLayout getRightGroup();
+
+    /**
+     * 返回左边标题的图片
+     * 
+     * Returns the image for the left header
+     *
+     * @return
+     */
+    ImageView getLeftIcon();
+
+    /**
+     * 设置左边标题的图片
+     * 
+     * Set the image for the left header
+     *
+     * @param resId
+     */
+    void setLeftIcon(int resId);
+
+    /**
+     * 返回右边标题的图片
+     * 
+     * Returns the image with the right header
+     *
+     * @return
+     */
+    ImageView getRightIcon();
+
+    /**
+     * 设置右边标题的图片
+     * 
+     * Set the image for the title on the right
+     *
+     * @param resId
+     */
+    void setRightIcon(int resId);
+
+    /**
+     * 返回左边标题的文字
+     * 
+     * Returns the text of the left header
+     *
+     * @return
+     */
+    TextView getLeftTitle();
+
+    /**
+     * 返回中间标题的文字
+     * 
+     * Returns the text of the middle title
+     *
+     * @return
+     */
+    TextView getMiddleTitle();
+
+    /**
+     * 返回右边标题的文字
+     * 
+     * Returns the text of the title on the right
+     *
+     * @return
+     */
+    TextView getRightTitle();
+
+    /**
+     * 标题区域的枚举值
+     * 
+     * enumeration value of the header area
+     */
+    enum Position {
+        /**
+         * 左边标题
+         * 
+         * left title
+         */
+        LEFT,
+        /**
+         * 中间标题
+         * 
+         * middle title
+         */
+        MIDDLE,
+        /**
+         * 右边标题
+         * 
+         * right title
+         */
+        RIGHT
+    }
+
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/interfaces/IUIKitCallback.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/interfaces/IUIKitCallback.java
new file mode 100644
index 0000000..8044508
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/interfaces/IUIKitCallback.java
@@ -0,0 +1,13 @@
+package com.tencent.qcloud.tuicore.component.interfaces;
+
+public abstract class IUIKitCallback<T> {
+
+    public void onSuccess(T data) {};
+
+    public void onError(String module, int errCode, String errMsg) {}
+
+    public void onError(int errCode, String errMsg, T data) {}
+
+    public void onProgress(Object data) {}
+
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/popupcard/PopupInputCard.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/popupcard/PopupInputCard.java
new file mode 100644
index 0000000..9201196
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/component/popupcard/PopupInputCard.java
@@ -0,0 +1,284 @@
+package com.tencent.qcloud.tuicore.component.popupcard;
+
+import android.animation.ValueAnimator;
+import android.app.Activity;
+import android.graphics.drawable.ColorDrawable;
+import android.text.Editable;
+import android.text.InputFilter;
+import android.text.Spanned;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.view.animation.LinearInterpolator;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.PopupWindow;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.R;
+import com.tencent.qcloud.tuicore.util.SoftKeyBoardUtil;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+
+import java.util.regex.Pattern;
+
+public class PopupInputCard {
+    private PopupWindow popupWindow;
+
+    private TextView titleTv;
+    private EditText editText;
+    private TextView descriptionTv;
+    private Button positiveBtn;
+    private View closeBtn;
+    private OnClickListener positiveOnClickListener;
+    private OnTextExceedListener textExceedListener;
+
+    private int minLimit = 0;
+    private int maxLimit = Integer.MAX_VALUE;
+    private String rule;
+    private String notMachRuleTip;
+    private ByteLengthFilter lengthFilter = new ByteLengthFilter();
+    public PopupInputCard(Activity activity) {
+        View popupView = LayoutInflater.from(activity).inflate(R.layout.layout_popup_card, null);
+        titleTv = popupView.findViewById(R.id.popup_card_title);
+        editText = popupView.findViewById(R.id.popup_card_edit);
+        descriptionTv = popupView.findViewById(R.id.popup_card_description);
+        positiveBtn = popupView.findViewById(R.id.popup_card_positive_btn);
+        closeBtn = popupView.findViewById(R.id.close_btn);
+
+        popupWindow = new PopupWindow(popupView, WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT, true) {
+            @Override
+            public void showAtLocation(View anchor, int gravity, int x, int y) {
+                if (activity != null && !activity.isFinishing()) {
+                    Window dialogWindow = activity.getWindow();
+                    startAnimation(dialogWindow, true);
+                }
+                editText.requestFocus();
+                if (activity.getWindow() != null) {
+                    SoftKeyBoardUtil.showKeyBoard(activity.getWindow());
+                }
+                super.showAtLocation(anchor, gravity, x, y);
+            }
+
+            @Override
+            public void dismiss() {
+                if (activity != null && !activity.isFinishing()) {
+                    Window dialogWindow = activity.getWindow();
+                    startAnimation(dialogWindow, false);
+                }
+
+                super.dismiss();
+            }
+        };
+        popupWindow.setBackgroundDrawable(new ColorDrawable());
+        popupWindow.setTouchable(true);
+        popupWindow.setOutsideTouchable(false);
+        popupWindow.setAnimationStyle(R.style.PopupInputCardAnim);
+
+        popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+            @Override
+            public void onDismiss() {
+                if (activity.getWindow() != null) {
+                    SoftKeyBoardUtil.hideKeyBoard(activity.getWindow());
+                }
+            }
+        });
+
+        positiveBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String result = editText.getText().toString();
+
+                if (result.length() < minLimit || result.length() > maxLimit) {
+                    ToastUtil.toastShortMessage(notMachRuleTip);
+                    return;
+                }
+
+                if (!TextUtils.isEmpty(rule) && !Pattern.matches(rule, result)) {
+                    ToastUtil.toastShortMessage(notMachRuleTip);
+                    return;
+                }
+
+                if (positiveOnClickListener != null) {
+                    positiveOnClickListener.onClick(editText.getText().toString());
+                }
+                popupWindow.dismiss();
+            }
+        });
+
+        closeBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                popupWindow.dismiss();
+            }
+        });
+        editText.setFilters(new InputFilter[] {lengthFilter});
+        editText.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                if (!TextUtils.isEmpty(rule)) {
+                    if (!Pattern.matches(rule, s.toString())) {
+                        positiveBtn.setEnabled(false);
+                    } else {
+                        positiveBtn.setEnabled(true);
+                    }
+                }
+            }
+        });
+
+    }
+    private void startAnimation(Window window, boolean isShow) {
+        LinearInterpolator interpolator = new LinearInterpolator();
+        ValueAnimator animator;
+        if (isShow) {
+            animator = ValueAnimator.ofFloat(1.0f, 0.5f);
+        } else {
+            animator = ValueAnimator.ofFloat(0.5f, 1.0f);
+        }
+        animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            @Override
+            public void onAnimationUpdate(ValueAnimator animation) {
+                WindowManager.LayoutParams lp = window.getAttributes();
+                lp.alpha = (float) animation.getAnimatedValue();
+                window.setAttributes(lp);
+            }
+        });
+
+        animator.setDuration(200);
+        animator.setInterpolator(interpolator);
+        animator.start();
+    }
+
+    public void show(View rootView, int gravity) {
+        if (popupWindow != null) {
+            popupWindow.showAtLocation(rootView, gravity, 0, 0);
+        }
+    }
+
+    public void setTitle(String title) {
+        titleTv.setText(title);
+    }
+
+    public void setDescription(String description) {
+        if (!TextUtils.isEmpty(description)) {
+            descriptionTv.setVisibility(View.VISIBLE);
+            descriptionTv.setText(description);
+        }
+    }
+
+    public void setContent(String content) {
+        editText.setText(content);
+    }
+
+    public void setOnPositive(OnClickListener clickListener) {
+        positiveOnClickListener = clickListener;
+    }
+
+    public void setTextExceedListener(OnTextExceedListener textExceedListener) {
+        this.textExceedListener = textExceedListener;
+    }
+
+    public void setSingleLine(boolean isSingleLine) {
+        editText.setSingleLine(isSingleLine);
+    }
+
+    public void setMaxLimit(int maxLimit) {
+        this.maxLimit = maxLimit;
+        lengthFilter.setLength(maxLimit);
+    }
+
+    public void setMinLimit(int minLimit) {
+        this.minLimit = minLimit;
+    }
+
+    public void setRule(String rule) {
+        if (TextUtils.isEmpty(rule)) {
+            this.rule = "";
+        } else {
+            this.rule = rule;
+        }
+    }
+
+    public void setNotMachRuleTip(String notMachRuleTip) {
+        this.notMachRuleTip = notMachRuleTip;
+    }
+
+    class ByteLengthFilter implements InputFilter {
+        private int length = Integer.MAX_VALUE;
+        public ByteLengthFilter() {
+        }
+
+        public void setLength(int length) {
+            this.length = length;
+        }
+
+        @Override
+        public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
+            int destLength = 0;
+            int destReplaceLength = 0;
+            int sourceLength = 0;
+            if (!TextUtils.isEmpty(dest)) {
+                destLength = dest.toString().getBytes().length;
+                destReplaceLength= dest.subSequence(dstart, dend).toString().getBytes().length;
+            }
+            if (!TextUtils.isEmpty(source)) {
+                sourceLength = source.subSequence(start, end).toString().getBytes().length;
+            }
+            int keepBytesLength = length - (destLength - destReplaceLength);
+            if (keepBytesLength <= 0) {
+                if (textExceedListener != null) {
+                    textExceedListener.onTextExceedMax();
+                }
+                return "";
+            } else if (keepBytesLength >= sourceLength) {
+                return null;
+            } else {
+                if (textExceedListener != null) {
+                    textExceedListener.onTextExceedMax();
+                }
+                return getSource(source, start, keepBytesLength);
+            }
+        }
+
+        private CharSequence getSource(CharSequence sequence, int start, int keepLength) {
+            int sequenceLength = sequence.length();
+            int end = 0;
+            for (int i = 1; i <= sequenceLength; i++) {
+                if (sequence.subSequence(0, i).toString().getBytes().length <= keepLength) {
+                    end = i;
+                } else {
+                    break;
+                }
+            }
+            if (end > 0 && Character.isHighSurrogate(sequence.charAt(end - 1))) {
+                --end;
+                if (end == start) {
+                    return "";
+                }
+            }
+            return sequence.subSequence(start, end);
+        }
+
+    }
+
+    @FunctionalInterface
+    public interface OnClickListener {
+        void onClick(String result);
+    }
+
+    public interface OnTextExceedListener {
+        void onTextExceedMax();
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/interfaces/ITUIExtension.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/interfaces/ITUIExtension.java
new file mode 100644
index 0000000..a622d46
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/interfaces/ITUIExtension.java
@@ -0,0 +1,7 @@
+package com.tencent.qcloud.tuicore.interfaces;
+
+import java.util.Map;
+
+public interface ITUIExtension {
+    Map<String, Object> onGetExtensionInfo(String key, Map<String, Object> param);
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/interfaces/ITUINotification.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/interfaces/ITUINotification.java
new file mode 100644
index 0000000..42deae9
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/interfaces/ITUINotification.java
@@ -0,0 +1,7 @@
+package com.tencent.qcloud.tuicore.interfaces;
+
+import java.util.Map;
+
+public interface ITUINotification {
+    void onNotifyEvent(String key, String subKey, Map<String, Object> param);
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/interfaces/ITUIService.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/interfaces/ITUIService.java
new file mode 100644
index 0000000..9959edc
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/interfaces/ITUIService.java
@@ -0,0 +1,7 @@
+package com.tencent.qcloud.tuicore.interfaces;
+
+import java.util.Map;
+
+public interface ITUIService {
+    Object onCall(String method, Map<String, Object> param);
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUICallback.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUICallback.java
new file mode 100644
index 0000000..6d50a87
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUICallback.java
@@ -0,0 +1,19 @@
+package com.tencent.qcloud.tuicore.interfaces;
+
+public abstract class TUICallback {
+    public abstract void onSuccess();
+
+    public abstract void onError(int errorCode, String errorMessage);
+
+    public static void onSuccess(TUICallback callback) {
+        if (callback != null) {
+            callback.onSuccess();
+        }
+    }
+
+    public static void onError(TUICallback callback, int errorCode, String errorMessage) {
+        if (callback != null) {
+            callback.onError(errorCode, errorMessage);
+        }
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUILogListener.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUILogListener.java
new file mode 100644
index 0000000..51ec6a7
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUILogListener.java
@@ -0,0 +1,5 @@
+package com.tencent.qcloud.tuicore.interfaces;
+
+public abstract class TUILogListener {
+    public void onLog(int logLevel, String logContent) {}
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUILoginConfig.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUILoginConfig.java
new file mode 100644
index 0000000..b366433
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUILoginConfig.java
@@ -0,0 +1,64 @@
+package com.tencent.qcloud.tuicore.interfaces;
+
+public class TUILoginConfig {
+    /**
+     * ## Do not output any SDK logs
+     */
+    public static final int TUI_LOG_NONE = 0;
+    /**
+     * ## Output logs at the DEBUG, INFO, WARNING, and ERROR levels
+     */
+    public static final int TUI_LOG_DEBUG = 3;
+    /**
+     * ## Output logs at the INFO, WARNING, and ERROR levels
+     */
+    public static final int TUI_LOG_INFO = 4;
+    /**
+     * ## Output logs at the WARNING and ERROR levels
+     */
+    public static final int TUI_LOG_WARN = 5;
+    /**
+     * ## Output logs at the ERROR level
+     */
+    public static final int TUI_LOG_ERROR = 6;
+
+    // Log level
+    private int logLevel = TUI_LOG_INFO;
+
+    // Log callback
+    private TUILogListener tuiLogListener;
+
+    /**
+     * Configuration class constructor
+     */
+    public TUILoginConfig() {
+    }
+
+    /**
+     * Set the write log level. This operation must be performed before IM SDK initialization. Otherwise, the setting does not take effect.
+     *
+     * @param logLevel   Log level
+     */
+    public void setLogLevel(int logLevel) {
+        this.logLevel = logLevel;
+    }
+
+    public int getLogLevel() {
+        return this.logLevel;
+    }
+
+    /**
+     * Get the current log callback listener
+     */
+    public TUILogListener getLogListener() {
+        return tuiLogListener;
+    }
+
+    /**
+     * Set the current log callback listener. This operation must be performed before IM SDK initialization.
+     * @note The callback is in the main thread. Log callbacks can be quite frequent, so be careful not to synchronize too many time-consuming tasks in the callback, which may block the main thread.
+     */
+    public void setLogListener(TUILogListener logListener) {
+        this.tuiLogListener = logListener;
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUILoginListener.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUILoginListener.java
new file mode 100644
index 0000000..420db1a
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/interfaces/TUILoginListener.java
@@ -0,0 +1,44 @@
+package com.tencent.qcloud.tuicore.interfaces;
+
+public abstract class TUILoginListener {
+    /**
+     * SDK 正在连接到腾讯云服务器
+     * 
+     * The SDK is connecting to the CVM instance
+     */
+    public void onConnecting() {
+    }
+
+    /**
+     * SDK 已经成功连接到腾讯云服务器
+     * 
+     * The SDK is successfully connected to the CVM instance
+     */
+    public void onConnectSuccess() {
+    }
+
+    /**
+     * SDK 连接腾讯云服务器失败
+     * 
+     * The SDK failed to connect to the CVM instance
+     */
+    public void onConnectFailed(int code, String error) {
+    }
+
+    /**
+     * 当前用户被踢下线，此时可以 UI 提示用户，并再次调用 TUILogin 的 login() 函数重新登录。
+     * 
+     * The current user is kicked offline: the SDK notifies the user on the UI, and the user can choose to call the login() function of V2TIMManager to log in again.
+     */
+    public void onKickedOffline() {
+    }
+
+    /**
+     * 在线时票据过期：此时您需要生成新的 userSig 并再次调用 TUILogin 的 login() 函数重新登录。
+     * 
+     * The ticket expires when the user is online: the user needs to generate a new userSig and call the login() function of V2TIMManager to log in again.
+     */
+    public void onUserSigExpired() {
+    }
+
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/permission/PermissionActivity.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/permission/PermissionActivity.java
new file mode 100644
index 0000000..eb8e32a
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/permission/PermissionActivity.java
@@ -0,0 +1,232 @@
+package com.tencent.qcloud.tuicore.permission;
+
+import static com.tencent.qcloud.tuicore.permission.PermissionRequester.PERMISSION_NOTIFY_EVENT_KEY;
+import static com.tencent.qcloud.tuicore.permission.PermissionRequester.PERMISSION_NOTIFY_EVENT_SUB_KEY;
+import static com.tencent.qcloud.tuicore.permission.PermissionRequester.PERMISSION_RESULT;
+
+import android.annotation.SuppressLint;
+import android.app.ActionBar;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.util.EventLog;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+
+import com.tencent.qcloud.tuicore.R;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.util.TUIBuild;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@RequiresApi(api = Build.VERSION_CODES.M)
+public class PermissionActivity extends Activity {
+    private static final String TAG = "PermissionActivity";
+    private static final int PERMISSION_REQUEST_CODE = 100;
+
+    private TextView mRationaleTitleTv;
+    private TextView mRationaleDescriptionTv;
+    private ImageView mPermissionIconIv;
+    private PermissionRequester.RequestData mRequestData;
+
+    private boolean mIsGranted = false;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mRequestData = getPermissionRequest();
+        if (mRequestData == null || mRequestData.isPermissionsExistEmpty()) {
+            Log.e(TAG, "onCreate mRequestData exist empty permission");
+            finishWithResult(false);
+            return;
+        }
+        Log.i(TAG, "onCreate : " + mRequestData.toString());
+        if (TUIBuild.getVersionInt() < Build.VERSION_CODES.M) {
+            finishWithResult(true);
+            return;
+        }
+
+        makeBackGroundTransparent();
+        initView();
+        showPermissionRationale();
+
+        requestPermissions(mRequestData.getPermissions(), PERMISSION_REQUEST_CODE);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode,
+                                           @NonNull String[] permissions,
+                                           @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+        hidePermissionRationale();
+        if (isAllPermissionsGranted(grantResults)) {
+            finishWithResult(true);
+            return;
+        }
+        showSettingsTip();
+    }
+
+    private void showSettingsTip() {
+        if (mRequestData == null) {
+            return;
+        }
+
+        View tipLayout = LayoutInflater.from(this).inflate(R.layout.permission_tip_layout, null);
+        TextView tipsTv = tipLayout.findViewById(R.id.tips);
+        TextView positiveBtn = tipLayout.findViewById(R.id.positive_btn);
+        TextView negativeBtn = tipLayout.findViewById(R.id.negative_btn);
+        tipsTv.setText(mRequestData.getSettingsTip());
+
+        Dialog permissionTipDialog = new AlertDialog.Builder(this)
+                .setView(tipLayout)
+                .setCancelable(false)
+                .setOnDismissListener(dialog -> finishWithResult(false))
+                .create();
+
+        positiveBtn.setOnClickListener(v -> {
+            permissionTipDialog.dismiss();
+            launchAppDetailsSettings();
+        });
+
+        negativeBtn.setOnClickListener(v -> permissionTipDialog.dismiss());
+        permissionTipDialog.setOnKeyListener((dialog, keyCode, event) -> {
+            if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_UP) {
+                permissionTipDialog.dismiss();
+            }
+            return true;
+        });
+
+        Window dialogWindow = permissionTipDialog.getWindow();
+        dialogWindow.setBackgroundDrawable(new ColorDrawable());
+        WindowManager.LayoutParams layoutParams = dialogWindow.getAttributes();
+        layoutParams.width = WindowManager.LayoutParams.WRAP_CONTENT;
+        layoutParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
+        dialogWindow.setAttributes(layoutParams);
+        permissionTipDialog.show();
+    }
+
+    /**
+     * 启动应用程序的详细信息设置。
+     *
+     * Launch the application's details settings.
+     */
+    private void launchAppDetailsSettings() {
+        Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+        intent.setData(Uri.parse("package:" + getPackageName()));
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        if (getPackageManager().queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY).size() <= 0) {
+            Log.e(TAG, "launchAppDetailsSettings can not find system settings");
+            return;
+        }
+        startActivity(intent);
+    }
+
+    private void finishWithResult(boolean isGranted) {
+        Log.i(TAG, "finishWithResult : " + isGranted);
+        mIsGranted = isGranted;
+        finish();
+    }
+
+    /*
+     * APP 从异常中恢复时，有些 Activity 在 onCreate 时就会申请权限；同时对于异常恢复，所有 Activity 可能被干掉，从新走流程；
+     * 所以可能导致本次权限申请过早结束，此时须在 onDestroy 中返回结果。
+     */
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        Map<String, Object> result = new HashMap<>(1);
+        result.put(PERMISSION_RESULT, mIsGranted);
+        TUICore.notifyEvent(PERMISSION_NOTIFY_EVENT_KEY, PERMISSION_NOTIFY_EVENT_SUB_KEY, result);
+    }
+
+    private PermissionRequester.RequestData getPermissionRequest() {
+        Intent intent = getIntent();
+        if (intent == null) {
+            return null;
+        }
+        return intent.getParcelableExtra(PermissionRequester.PERMISSION_REQUEST_KEY);
+    }
+
+    @SuppressLint("NewApi")
+    private void makeBackGroundTransparent() {
+        if (TUIBuild.getVersionInt() >= Build.VERSION_CODES.LOLLIPOP) {
+            View decorView = getWindow().getDecorView();
+            decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+            getWindow().setStatusBarColor(Color.TRANSPARENT);
+            getWindow().setNavigationBarColor(Color.TRANSPARENT);
+        }
+
+        ActionBar actionBar = getActionBar();
+        if (actionBar != null) {
+            actionBar.hide();
+        }
+    }
+
+    private void initView() {
+        setContentView(R.layout.permission_activity_layout);
+        mRationaleTitleTv = findViewById(R.id.permission_reason_title);
+        mRationaleDescriptionTv = findViewById(R.id.permission_reason);
+        mPermissionIconIv = findViewById(R.id.permission_icon);
+    }
+
+    /**
+     * 安全合规要求，申请权限时，必须显示申请权限的理由。
+     *
+     * Security compliance requires that when applying for permission, the reason for applying for permission must be
+     * displayed.
+     */
+    private void showPermissionRationale() {
+        if (mRequestData == null) {
+            return;
+        }
+        mRationaleTitleTv.setText(mRequestData.getTitle());
+        mRationaleDescriptionTv.setText(mRequestData.getDescription());
+        mPermissionIconIv.setBackgroundResource(mRequestData.getPermissionIconId());
+
+        mRationaleTitleTv.setVisibility(View.VISIBLE);
+        mRationaleDescriptionTv.setVisibility(View.VISIBLE);
+        mPermissionIconIv.setVisibility(View.VISIBLE);
+    }
+
+    private void hidePermissionRationale() {
+        mRationaleTitleTv.setVisibility(View.INVISIBLE);
+        mRationaleDescriptionTv.setVisibility(View.INVISIBLE);
+        mPermissionIconIv.setVisibility(View.INVISIBLE);
+    }
+
+    private boolean isAllPermissionsGranted(@NonNull int[] grantResults) {
+        for (int result : grantResults) {
+            if (result != PackageManager.PERMISSION_GRANTED) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/permission/PermissionCallback.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/permission/PermissionCallback.java
new file mode 100644
index 0000000..2e044e6
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/permission/PermissionCallback.java
@@ -0,0 +1,6 @@
+package com.tencent.qcloud.tuicore.permission;
+
+public abstract class PermissionCallback {
+    public abstract void onGranted();
+    public void onDenied() {}
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/permission/PermissionRequester.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/permission/PermissionRequester.java
new file mode 100644
index 0000000..361abe5
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/permission/PermissionRequester.java
@@ -0,0 +1,320 @@
+package com.tencent.qcloud.tuicore.permission;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.Size;
+import androidx.core.content.ContextCompat;
+
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.interfaces.ITUINotification;
+import com.tencent.qcloud.tuicore.util.TUIBuild;
+
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class PermissionRequester {
+    private static final String TAG = "PermissionRequester";
+
+    public static final String PERMISSION_NOTIFY_EVENT_KEY = "PERMISSION_NOTIFY_EVENT_KEY";
+    public static final String PERMISSION_NOTIFY_EVENT_SUB_KEY = "PERMISSION_NOTIFY_EVENT_SUB_KEY";
+    public static final String PERMISSION_RESULT = "PERMISSION_RESULT";
+    public static final String PERMISSION_REQUEST_KEY = "PERMISSION_REQUEST_KEY";
+    private static final Object sLock = new Object();
+
+    private static AtomicBoolean sIsRequesting = new AtomicBoolean(false);
+
+    private PermissionCallback mPermissionCallback;
+    private String[] mPermissions;
+    private String mTitle;
+    private String mDescription;
+    private String mSettingsTip;
+    private ITUINotification mPermissionNotification;
+
+    private PermissionRequester(String... permissions) {
+        mPermissions = permissions;
+        mPermissionNotification = (key, subKey, param) -> {
+            if (param == null) {
+                return;
+            }
+            final Object result = param.get(PERMISSION_RESULT);
+            if (result == null || !(result instanceof Boolean)) {
+                return;
+            }
+            if ((boolean) result) {
+                afterPermissionGranted();
+            } else {
+                afterPermissionDenied();
+            }
+        };
+    }
+
+    /**
+     * 生成 PermissionRequester 的实例，其中参数为具体需要申请的权限，可以传入一个或多个权限。
+     *
+     * @param permissions 需要申请的权限名称。
+     * @return PermissionRequester 的实例。
+     *
+     * Generate an instance of PermissionRequester, where the parameters are the specific permissions that need to be
+     * applied for, and one or more permissions can be passed in.
+     *
+     * @param permissions The name of the permission that needs to be applied for.
+     * @return An instance of PermissionRequester.
+     */
+    public static PermissionRequester newInstance(@NonNull @Size(min = 1) String... permissions) {
+        return new PermissionRequester(permissions);
+    }
+
+    /**
+     * 理由的标题：安全合规要求，请求权限时，须向用户解释为什么需要申请该权限；
+     *
+     * @param title 理由的标题；
+     * @return PermissionRequester 的实例。
+     *
+     * The title of the reason: security compliance requirements, when requesting permission, you
+     * must explain to the user why you need to apply for the permission;
+     *
+     * @param title The title of the reason;
+     * @return An instance of PermissionRequester.
+     */
+    public PermissionRequester title(@NonNull String title) {
+        mTitle = title;
+        return this;
+    }
+
+    /**
+     * 理由的正文：安全合规要求，请求权限时，须向用户解释为什么需要申请该权限；
+     *
+     * @param description 理由的正文；
+     * @return PermissionRequester 的实例。
+     *
+     * The text of the reason: security compliance requirements, when requesting permission,
+     * explain to the user why the permission is required;
+     *
+     * @param description The text of the reason;
+     * @return An instance of PermissionRequester.
+     */
+    public PermissionRequester description(@NonNull String description) {
+        mDescription = description;
+        return this;
+    }
+
+    /**
+     * 向用户说明到 Settings 后需要打开什么权限，以保证功能的正常运行；
+     *
+     * @param settingsTip 提示用户到设置中做什么；
+     * @return PermissionRequester 的实例。
+     *
+     * Explain to the user what permissions need to be opened after entering the Settings to
+     * ensure the normal operation of the function;
+     *
+     * @param settingsTip Prompt user what to do in settings;
+     * @return An instance of PermissionRequester.
+     */
+    public PermissionRequester settingsTip(@NonNull String settingsTip) {
+        mSettingsTip = settingsTip;
+        return this;
+    }
+
+    /**
+     * 设置用于获取权限申请结果的回调。
+     *
+     * @param callback 权限申请的回调；
+     * @return PermissionRequester 的实例。
+     *
+     * Set the callback used to get the permission application result.
+     *
+     * @param callback callback for permission application;
+     * @return An instance of PermissionRequester.
+     */
+    public PermissionRequester callback(@NonNull PermissionCallback callback) {
+        mPermissionCallback = callback;
+        return this;
+    }
+
+    /**
+     * 开始请求权限。
+     *
+     * Start requesting permission.
+     */
+    @SuppressLint("NewApi")
+    public void request() {
+        synchronized (sLock) {
+            if (sIsRequesting.get()) {
+                Log.e(TAG, "can not request during requesting");
+                mPermissionCallback.onDenied();
+                return;
+            }
+            sIsRequesting.set(true);
+        }
+
+        TUICore.registerEvent(PERMISSION_NOTIFY_EVENT_KEY, PERMISSION_NOTIFY_EVENT_SUB_KEY, mPermissionNotification);
+        if (TUIBuild.getVersionInt() < Build.VERSION_CODES.M) {
+            Log.i(TAG, "current version is lower than 23");
+            afterPermissionGranted();
+            return;
+        }
+        String[] unauthorizedPermissions = findUnauthorizedPermissions(mPermissions);
+        if (unauthorizedPermissions.length <= 0) {
+            afterPermissionGranted();
+            return;
+        }
+        RequestData realRequest =
+                new RequestData(mTitle, mDescription, mSettingsTip, unauthorizedPermissions);
+        startPermissionActivity(realRequest);
+    }
+
+    private void afterPermissionGranted() {
+        Log.i(TAG, "afterPermissionGranted");
+        if (mPermissionCallback != null) {
+            mPermissionCallback.onGranted();
+            mPermissionCallback = null;
+        }
+        TUICore.unRegisterEvent(PERMISSION_NOTIFY_EVENT_KEY, PERMISSION_NOTIFY_EVENT_SUB_KEY, mPermissionNotification);
+        sIsRequesting.set(false);
+    }
+
+    private void afterPermissionDenied() {
+        Log.i(TAG, "afterPermissionDenied");
+        if (mPermissionCallback != null) {
+            mPermissionCallback.onDenied();
+            mPermissionCallback = null;
+        }
+        TUICore.unRegisterEvent(PERMISSION_NOTIFY_EVENT_KEY, PERMISSION_NOTIFY_EVENT_SUB_KEY, mPermissionNotification);
+        sIsRequesting.set(false);
+    }
+
+    private String[] findUnauthorizedPermissions(String[] permissions) {
+        Context appContext = TUIConfig.getAppContext();
+        if (appContext == null) {
+            Log.e(TAG, "findUnauthorizedPermissions appContext is null");
+            return permissions;
+        }
+        List<String> unauthorizedList = new LinkedList<>();
+        for (String permission : permissions) {
+            if (PackageManager.PERMISSION_GRANTED != ContextCompat.checkSelfPermission(appContext, permission)) {
+                unauthorizedList.add(permission);
+            }
+        }
+        return unauthorizedList.toArray(new String[0]);
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    private void startPermissionActivity(RequestData request) {
+        Context context = TUIConfig.getAppContext();
+        if (context == null) {
+            return;
+        }
+        Intent intent = new Intent(context, PermissionActivity.class);
+        intent.putExtra(PERMISSION_REQUEST_KEY, request);
+        context.startActivity(intent);
+    }
+
+    static class RequestData implements Parcelable {
+        private final String[] mPermissions;
+        private final String mTitle;
+        private final String mDescription;
+        private final String mSettingsTip;
+        private int mPermissionIconId;
+
+        public RequestData(@NonNull String title, @NonNull String description,
+                           @NonNull String settingsTip, @NonNull String... perms) {
+            mTitle = title;
+            mDescription = description;
+            mSettingsTip = settingsTip;
+            mPermissions = perms.clone();
+        }
+
+        protected RequestData(Parcel in) {
+            mPermissions = in.createStringArray();
+            mTitle = in.readString();
+            mDescription = in.readString();
+            mSettingsTip = in.readString();
+            mPermissionIconId = in.readInt();
+        }
+
+        public static final Creator<RequestData> CREATOR = new Creator<RequestData>() {
+            @Override
+            public RequestData createFromParcel(Parcel in) {
+                return new RequestData(in);
+            }
+
+            @Override
+            public RequestData[] newArray(int size) {
+                return new RequestData[size];
+            }
+        };
+
+        public boolean isPermissionsExistEmpty() {
+            if (mPermissions == null || mPermissions.length <= 0) {
+                return true;
+            }
+            for (String permission : mPermissions) {
+                if (TextUtils.isEmpty(permission)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public String[] getPermissions() {
+            return mPermissions.clone();
+        }
+
+        public String getTitle() {
+            return mTitle;
+        }
+
+        public String getDescription() {
+            return mDescription;
+        }
+
+        public String getSettingsTip() {
+            return mSettingsTip;
+        }
+
+        public int getPermissionIconId() {
+            return mPermissionIconId;
+        }
+
+        public void setPermissionIconId(int permissionIconId) {
+            mPermissionIconId = permissionIconId;
+        }
+
+        @Override
+        public String toString() {
+            return "PermissionRequest{" +
+                    "mPermissions=" + Arrays.toString(mPermissions) +
+                    ", mTitle=" + mTitle +
+                    ", mDescription='" + mDescription +
+                    ", mSettingsTip='" + mSettingsTip +
+                    '}';
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeStringArray(mPermissions);
+            dest.writeString(mTitle);
+            dest.writeString(mDescription);
+            dest.writeString(mSettingsTip);
+            dest.writeInt(mPermissionIconId);
+        }
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/BackgroundTasks.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/BackgroundTasks.java
new file mode 100644
index 0000000..f06fb79
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/BackgroundTasks.java
@@ -0,0 +1,25 @@
+package com.tencent.qcloud.tuicore.util;
+
+import android.os.Handler;
+import android.os.Looper;
+
+
+public class BackgroundTasks {
+
+    private static final BackgroundTasks instance = new BackgroundTasks();
+    private final Handler handler = new Handler(Looper.getMainLooper());
+
+    public static BackgroundTasks getInstance() {
+        return instance;
+    }
+
+    private BackgroundTasks() {}
+
+    public void runOnUiThread(Runnable runnable) {
+        handler.post(runnable);
+    }
+
+    public boolean postDelayed(Runnable r, long delayMillis) {
+        return handler.postDelayed(r, delayMillis);
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/DateTimeUtil.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/DateTimeUtil.java
new file mode 100644
index 0000000..36f452e
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/DateTimeUtil.java
@@ -0,0 +1,152 @@
+package com.tencent.qcloud.tuicore.util;
+
+import android.content.Context;
+
+import com.tencent.qcloud.tuicore.R;
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
+
+
+public class DateTimeUtil {
+
+    private final static long minute = 60 * 1000;
+    private final static long hour = 60 * minute;
+    private final static long day = 24 * hour;
+    private final static long week = 7 * day;
+    private final static long month = 31 * day;
+    private final static long year = 12 * month;
+
+    /**
+     * return format text for time
+     * you can see https://docs.oracle.com/javase/8/docs/api/java/util/Formatter.html
+     * today：HH:MM
+     * this week：Sunday, Friday ..
+     * this year：MM/DD
+     * before this year：YYYY/MM/DD
+     * @param date current time
+     * @return format text
+     */
+    public static String getTimeFormatText(Date date) {
+        if (date == null) {
+            return "";
+        }
+        Context context = TUIConfig.getAppContext();
+        Locale locale;
+        if (context == null) {
+            locale = Locale.getDefault();
+        } else {
+            locale = TUIThemeManager.getInstance().getLocale(context);
+        }
+        String timeText;
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        long dayStartTimeInMillis = calendar.getTimeInMillis();
+        calendar = Calendar.getInstance();
+        calendar.set(Calendar.DAY_OF_WEEK, 1);
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        long weekStartTimeInMillis = calendar.getTimeInMillis();
+        calendar = Calendar.getInstance();
+        calendar.set(Calendar.DAY_OF_YEAR, 1);
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        long yearStartTimeInMillis = calendar.getTimeInMillis();
+        long outTimeMillis = date.getTime();
+        if (outTimeMillis < yearStartTimeInMillis) {
+            timeText = String.format(locale, "%tD", date);
+        } else if (outTimeMillis < weekStartTimeInMillis) {
+            timeText = String.format(locale, "%1$tm/%1$td", date);
+        } else if (outTimeMillis < dayStartTimeInMillis) {
+            timeText = String.format(locale, "%tA", date);
+        } else {
+            timeText = String.format(locale, "%tR", date);
+        }
+        return timeText;
+    }
+
+    /**
+     * HH:MM
+     * @param date current time
+     * @return format text e.g. "12:12"
+     */
+    public static String getHMTimeString(Date date) {
+        if (date == null) {
+            return "";
+        }
+        Context context = TUIConfig.getAppContext();
+        Locale locale;
+        if (context == null) {
+            locale = Locale.getDefault();
+        } else {
+            locale = TUIThemeManager.getInstance().getLocale(context);
+        }
+        return String.format(locale, "%tR", date);
+    }
+
+    public static String formatSeconds(long seconds) {
+        Context context = TUIConfig.getAppContext();
+        String timeStr = seconds + context.getString(R.string.date_second_short);
+        if (seconds > 60) {
+            long second = seconds % 60;
+            long min = seconds / 60;
+            timeStr = min + context.getString(R.string.date_minute_short) + second + context.getString(R.string.date_second_short);
+            if (min > 60) {
+                min = (seconds / 60) % 60;
+                long hour = (seconds / 60) / 60;
+                timeStr = hour + context.getString(R.string.date_hour_short) + min + context.getString(R.string.date_minute_short) + second + context.getString(R.string.date_second_short);
+                if (hour % 24 == 0) {
+                    long day = (((seconds / 60) / 60) / 24);
+                    timeStr = day + context.getString(R.string.date_day_short);
+                } else if (hour > 24) {
+                    hour = ((seconds / 60) / 60) % 24;
+                    long day = (((seconds / 60) / 60) / 24);
+                    timeStr = day + context.getString(R.string.date_day_short) + hour + context.getString(R.string.date_hour_short) + min + context.getString(R.string.date_minute_short) + second + context.getString(R.string.date_second_short);
+                }
+            }
+        }
+        return timeStr;
+    }
+
+    public static String formatSecondsTo00(int timeSeconds) {
+        int second = timeSeconds % 60;
+        int minuteTemp = timeSeconds / 60;
+        if (minuteTemp > 0) {
+            int minute = minuteTemp % 60;
+            int hour = minuteTemp / 60;
+            if (hour > 0) {
+                return (hour >= 10 ? (hour + "") : ("0" + hour)) + ":" + (minute >= 10 ? (minute + "") : ("0" + minute))
+                        + ":" + (second >= 10 ? (second + "") : ("0" + second));
+            } else {
+                return (minute >= 10 ? (minute + "") : ("0" + minute)) + ":"
+                        + (second >= 10 ? (second + "") : ("0" + second));
+            }
+        } else {
+            return "00:" + (second >= 10 ? (second + "") : ("0" + second));
+        }
+    }
+
+    public static long getStringToDate(String dateString, String pattern) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat(pattern);
+        Date date = new Date();
+        try{
+            date = dateFormat.parse(dateString);
+        } catch(ParseException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return date.getTime();
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/ErrorMessageConverter.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/ErrorMessageConverter.java
new file mode 100644
index 0000000..a8155ad
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/ErrorMessageConverter.java
@@ -0,0 +1,733 @@
+package com.tencent.qcloud.tuicore.util;
+
+import com.tencent.imsdk.BaseConstants;
+import com.tencent.qcloud.tuicore.R;
+import com.tencent.qcloud.tuicore.TUIConfig;
+
+public class ErrorMessageConverter {
+
+    public static String convertIMError(int code, String msg) {
+        /////////////////////////////////////////////////////////////////////////////////
+        //
+        //                      （一）IM SDK 的错误码
+        //                           IM SDK error codes
+        //
+        /////////////////////////////////////////////////////////////////////////////////
+        switch (code) {
+            // 通用错误码
+            // Common error codes
+            case BaseConstants.ERR_IN_PROGESS:
+                return getLocalizedString(R.string.TUIKitErrorInProcess);
+            case BaseConstants.ERR_INVALID_PARAMETERS:
+                return getLocalizedString(R.string.TUIKitErrorInvalidParameters);
+            case BaseConstants.ERR_IO_OPERATION_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorIOOperateFaild);
+            case BaseConstants.ERR_INVALID_JSON:
+                return getLocalizedString(R.string.TUIKitErrorInvalidJson);
+            case BaseConstants.ERR_OUT_OF_MEMORY:
+                return getLocalizedString(R.string.TUIKitErrorOutOfMemory);
+            case BaseConstants.ERR_PARSE_RESPONSE_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorParseResponseFaild);
+            case BaseConstants.ERR_SERIALIZE_REQ_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorSerializeReqFaild);
+            case BaseConstants.ERR_SDK_NOT_INITIALIZED:
+                return getLocalizedString(R.string.TUIKitErrorSDKNotInit);
+            case BaseConstants.ERR_LOADMSG_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorLoadMsgFailed);
+            case BaseConstants.ERR_DATABASE_OPERATE_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorDatabaseOperateFailed);
+            case BaseConstants.ERR_SDK_COMM_CROSS_THREAD:
+                return getLocalizedString(R.string.TUIKitErrorCrossThread);
+            case BaseConstants.ERR_SDK_COMM_TINYID_EMPTY:
+                return getLocalizedString(R.string.TUIKitErrorTinyIdEmpty);
+            case BaseConstants.ERR_SDK_COMM_INVALID_IDENTIFIER:
+                return getLocalizedString(R.string.TUIKitErrorInvalidIdentifier);
+            case BaseConstants.ERR_SDK_COMM_FILE_NOT_FOUND:
+                return getLocalizedString(R.string.TUIKitErrorFileNotFound);
+            case BaseConstants.ERR_SDK_COMM_FILE_TOO_LARGE:
+                return getLocalizedString(R.string.TUIKitErrorFileTooLarge);
+            case BaseConstants.ERR_SDK_COMM_FILE_SIZE_EMPTY:
+                return getLocalizedString(R.string.TUIKitErrorEmptyFile);
+            case BaseConstants.ERR_SDK_COMM_FILE_OPEN_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorFileOpenFailed);
+
+            // 帐号错误码
+            // Account error codes
+            case BaseConstants.ERR_SDK_NOT_LOGGED_IN:
+                return getLocalizedString(R.string.TUIKitErrorNotLogin);
+            case BaseConstants.ERR_NO_PREVIOUS_LOGIN:
+                return getLocalizedString(R.string.TUIKitErrorNoPreviousLogin);
+            case BaseConstants.ERR_USER_SIG_EXPIRED:
+                return getLocalizedString(R.string.TUIKitErrorUserSigExpired);
+            case BaseConstants.ERR_LOGIN_KICKED_OFF_BY_OTHER:
+                return getLocalizedString(R.string.TUIKitErrorLoginKickedOffByOther);
+//        case BaseConstants.ERR_LOGIN_IN_PROCESS:
+//            return @"登录正在执行中";
+//        case BaseConstants.ERR_LOGOUT_IN_PROCESS:
+//            return @"登出正在执行中";
+            case BaseConstants.ERR_SDK_ACCOUNT_TLS_INIT_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorTLSSDKInit);
+            case BaseConstants.ERR_SDK_ACCOUNT_TLS_NOT_INITIALIZED:
+                return getLocalizedString(R.string.TUIKitErrorTLSSDKUninit);
+            case BaseConstants.ERR_SDK_ACCOUNT_TLS_TRANSPKG_ERROR:
+                return getLocalizedString(R.string.TUIKitErrorTLSSDKTRANSPackageFormat);
+            case BaseConstants.ERR_SDK_ACCOUNT_TLS_DECRYPT_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorTLSDecrypt);
+            case BaseConstants.ERR_SDK_ACCOUNT_TLS_REQUEST_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorTLSSDKRequest);
+            case BaseConstants.ERR_SDK_ACCOUNT_TLS_REQUEST_TIMEOUT:
+                return getLocalizedString(R.string.TUIKitErrorTLSSDKRequestTimeout);
+
+            // 消息错误码
+            // Message error codes
+            case BaseConstants.ERR_INVALID_CONVERSATION:
+                return getLocalizedString(R.string.TUIKitErrorInvalidConveration);
+            case BaseConstants.ERR_FILE_TRANS_AUTH_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorFileTransAuthFailed);
+            case BaseConstants.ERR_FILE_TRANS_NO_SERVER:
+                return getLocalizedString(R.string.TUIKitErrorFileTransNoServer);
+            case BaseConstants.ERR_FILE_TRANS_UPLOAD_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorFileTransUploadFailed);
+//            case BaseConstants.ERR_IMAGE_UPLOAD_FAILED_NOTIMAGE:
+//                return TUIKitLocalizableString(R.string.TUIKitErrorFileTransUploadFailedNotImage);
+            case BaseConstants.ERR_FILE_TRANS_DOWNLOAD_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorFileTransDownloadFailed);
+            case BaseConstants.ERR_HTTP_REQ_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorHTTPRequestFailed);
+            case BaseConstants.ERR_INVALID_MSG_ELEM:
+                return getLocalizedString(R.string.TUIKitErrorInvalidMsgElem);
+            case BaseConstants.ERR_INVALID_SDK_OBJECT:
+                return getLocalizedString(R.string.TUIKitErrorInvalidSDKObject);
+            case BaseConstants.ERR_SDK_MSG_BODY_SIZE_LIMIT:
+                return getLocalizedString(R.string.TUIKitSDKMsgBodySizeLimit);
+            case BaseConstants.ERR_SDK_MSG_KEY_REQ_DIFFER_RSP:
+                return getLocalizedString(R.string.TUIKitErrorSDKMsgKeyReqDifferRsp);
+
+
+            // 群组错误码
+            // Group error codes
+            case BaseConstants.ERR_SDK_GROUP_INVALID_ID:
+                return getLocalizedString(R.string.TUIKitErrorSDKGroupInvalidID);
+            case BaseConstants.ERR_SDK_GROUP_INVALID_NAME:
+                return getLocalizedString(R.string.TUIKitErrorSDKGroupInvalidName);
+            case BaseConstants.ERR_SDK_GROUP_INVALID_INTRODUCTION:
+                return getLocalizedString(R.string.TUIKitErrorSDKGroupInvalidIntroduction);
+            case BaseConstants.ERR_SDK_GROUP_INVALID_NOTIFICATION:
+                return getLocalizedString(R.string.TUIKitErrorSDKGroupInvalidNotification);
+            case BaseConstants.ERR_SDK_GROUP_INVALID_FACE_URL:
+                return getLocalizedString(R.string.TUIKitErrorSDKGroupInvalidFaceURL);
+            case BaseConstants.ERR_SDK_GROUP_INVALID_NAME_CARD:
+                return getLocalizedString(R.string.TUIKitErrorSDKGroupInvalidNameCard);
+            case BaseConstants.ERR_SDK_GROUP_MEMBER_COUNT_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSDKGroupMemberCountLimit);
+            case BaseConstants.ERR_SDK_GROUP_JOIN_PRIVATE_GROUP_DENY:
+                return getLocalizedString(R.string.TUIKitErrorSDKGroupJoinPrivateGroupDeny);
+            case BaseConstants.ERR_SDK_GROUP_INVITE_SUPER_DENY:
+                return getLocalizedString(R.string.TUIKitErrorSDKGroupInviteSuperDeny);
+            case BaseConstants.ERR_SDK_GROUP_INVITE_NO_MEMBER:
+                return getLocalizedString(R.string.TUIKitErrorSDKGroupInviteNoMember);
+
+
+            // 关系链错误码
+            // Relationship chain error codes
+            case BaseConstants.ERR_SDK_FRIENDSHIP_INVALID_PROFILE_KEY:
+                return getLocalizedString(R.string.TUIKitErrorSDKFriendShipInvalidProfileKey);
+            case BaseConstants.ERR_SDK_FRIENDSHIP_INVALID_ADD_REMARK:
+                return getLocalizedString(R.string.TUIKitErrorSDKFriendshipInvalidAddRemark);
+            case BaseConstants.ERR_SDK_FRIENDSHIP_INVALID_ADD_WORDING:
+                return getLocalizedString(R.string.TUIKitErrorSDKFriendshipInvalidAddWording);
+            case BaseConstants.ERR_SDK_FRIENDSHIP_INVALID_ADD_SOURCE:
+                return getLocalizedString(R.string.TUIKitErrorSDKFriendshipInvalidAddSource);
+            case BaseConstants.ERR_SDK_FRIENDSHIP_FRIEND_GROUP_EMPTY:
+                return getLocalizedString(R.string.TUIKitErrorSDKFriendshipFriendGroupEmpty);
+
+
+            // 网络错误码
+            // Network error codes
+            case BaseConstants.ERR_SDK_NET_ENCODE_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorSDKNetEncodeFailed);
+            case BaseConstants.ERR_SDK_NET_DECODE_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorSDKNetDecodeFailed);
+            case BaseConstants.ERR_SDK_NET_AUTH_INVALID:
+                return getLocalizedString(R.string.TUIKitErrorSDKNetAuthInvalid);
+            case BaseConstants.ERR_SDK_NET_COMPRESS_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorSDKNetCompressFailed);
+            case BaseConstants.ERR_SDK_NET_UNCOMPRESS_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorSDKNetUncompressFaile);
+            case BaseConstants.ERR_SDK_NET_FREQ_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSDKNetFreqLimit);
+            case BaseConstants.ERR_SDK_NET_REQ_COUNT_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSDKnetReqCountLimit);
+            case BaseConstants.ERR_SDK_NET_DISCONNECT:
+                return getLocalizedString(R.string.TUIKitErrorSDKNetDisconnect);
+            case BaseConstants.ERR_SDK_NET_ALLREADY_CONN:
+                return getLocalizedString(R.string.TUIKitErrorSDKNetAllreadyConn);
+            case BaseConstants.ERR_SDK_NET_CONN_TIMEOUT:
+                return getLocalizedString(R.string.TUIKitErrorSDKNetConnTimeout);
+            case BaseConstants.ERR_SDK_NET_CONN_REFUSE:
+                return getLocalizedString(R.string.TUIKitErrorSDKNetConnRefuse);
+            case BaseConstants.ERR_SDK_NET_NET_UNREACH:
+                return getLocalizedString(R.string.TUIKitErrorSDKNetNetUnreach);
+            case BaseConstants.ERR_SDK_NET_SOCKET_NO_BUFF:
+                return getLocalizedString(R.string.TUIKitErrorSDKNetSocketNoBuff);
+            case BaseConstants.ERR_SDK_NET_RESET_BY_PEER:
+                return getLocalizedString(R.string.TUIKitERRORSDKNetResetByPeer);
+            case BaseConstants.ERR_SDK_NET_SOCKET_INVALID:
+                return getLocalizedString(R.string.TUIKitErrorSDKNetSOcketInvalid);
+            case BaseConstants.ERR_SDK_NET_HOST_GETADDRINFO_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorSDKNetHostGetAddressFailed);
+            case BaseConstants.ERR_SDK_NET_CONNECT_RESET:
+                return getLocalizedString(R.string.TUIKitErrorSDKNetConnectReset);
+            case BaseConstants.ERR_SDK_NET_WAIT_INQUEUE_TIMEOUT:
+                return getLocalizedString(R.string.TUIKitErrorSDKNetWaitInQueueTimeout);
+            case BaseConstants.ERR_SDK_NET_WAIT_SEND_TIMEOUT:
+                return getLocalizedString(R.string.TUIKitErrorSDKNetWaitSendTimeout);
+            case BaseConstants.ERR_SDK_NET_WAIT_ACK_TIMEOUT:
+                return getLocalizedString(R.string.TUIKitErrorSDKNetWaitAckTimeut);
+
+            /////////////////////////////////////////////////////////////////////////////////
+            //
+            //                      （二）服务端
+            //                           Server error codes
+            //
+            /////////////////////////////////////////////////////////////////////////////////
+
+            // 网络接入层的错误码
+            // Access layer error codes for network
+            case BaseConstants.ERR_SVR_SSO_CONNECT_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSDKSVRSSOConnectLimit);
+            case BaseConstants.ERR_SVR_SSO_VCODE:
+                return getLocalizedString(R.string.TUIKitErrorSDKSVRSSOVCode);
+            case BaseConstants.ERR_SVR_SSO_D2_EXPIRED:
+                return getLocalizedString(R.string.TUIKitErrorSVRSSOD2Expired);
+            case BaseConstants.ERR_SVR_SSO_A2_UP_INVALID:
+                return getLocalizedString(R.string.TUIKitErrorSVRA2UpInvalid);
+            case BaseConstants.ERR_SVR_SSO_A2_DOWN_INVALID:
+                return getLocalizedString(R.string.TUIKitErrorSVRA2DownInvalid);
+            case BaseConstants.ERR_SVR_SSO_EMPTY_KEY:
+                return getLocalizedString(R.string.TUIKitErrorSVRSSOEmpeyKey);
+            case BaseConstants.ERR_SVR_SSO_UIN_INVALID:
+                return getLocalizedString(R.string.TUIKitErrorSVRSSOUinInvalid);
+            case BaseConstants.ERR_SVR_SSO_VCODE_TIMEOUT:
+                return getLocalizedString(R.string.TUIKitErrorSVRSSOVCodeTimeout);
+            case BaseConstants.ERR_SVR_SSO_NO_IMEI_AND_A2:
+                return getLocalizedString(R.string.TUIKitErrorSVRSSONoImeiAndA2);
+            case BaseConstants.ERR_SVR_SSO_COOKIE_INVALID:
+                return getLocalizedString(R.string.TUIKitErrorSVRSSOCookieInvalid);
+            case BaseConstants.ERR_SVR_SSO_DOWN_TIP:
+                return getLocalizedString(R.string.TUIKitErrorSVRSSODownTips);
+            case BaseConstants.ERR_SVR_SSO_DISCONNECT:
+                return getLocalizedString(R.string.TUIKitErrorSVRSSODisconnect);
+            case BaseConstants.ERR_SVR_SSO_IDENTIFIER_INVALID:
+                return getLocalizedString(R.string.TUIKitErrorSVRSSOIdentifierInvalid);
+            case BaseConstants.ERR_SVR_SSO_CLIENT_CLOSE:
+                return getLocalizedString(R.string.TUIKitErrorSVRSSOClientClose);
+            case BaseConstants.ERR_SVR_SSO_MSFSDK_QUIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRSSOMSFSDKQuit);
+            case BaseConstants.ERR_SVR_SSO_D2KEY_WRONG:
+                return getLocalizedString(R.string.TUIKitErrorSVRSSOD2KeyWrong);
+            case BaseConstants.ERR_SVR_SSO_UNSURPPORT:
+                return getLocalizedString(R.string.TUIKitErrorSVRSSOUnsupport);
+            case BaseConstants.ERR_SVR_SSO_PREPAID_ARREARS:
+                return getLocalizedString(R.string.TUIKitErrorSVRSSOPrepaidArrears);
+            case BaseConstants.ERR_SVR_SSO_PACKET_WRONG:
+                return getLocalizedString(R.string.TUIKitErrorSVRSSOPacketWrong);
+            case BaseConstants.ERR_SVR_SSO_APPID_BLACK_LIST:
+                return getLocalizedString(R.string.TUIKitErrorSVRSSOAppidBlackList);
+            case BaseConstants.ERR_SVR_SSO_CMD_BLACK_LIST:
+                return getLocalizedString(R.string.TUIKitErrorSVRSSOCmdBlackList);
+            case BaseConstants.ERR_SVR_SSO_APPID_WITHOUT_USING:
+                return getLocalizedString(R.string.TUIKitErrorSVRSSOAppidWithoutUsing);
+            case BaseConstants.ERR_SVR_SSO_FREQ_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRSSOFreqLimit);
+            case BaseConstants.ERR_SVR_SSO_OVERLOAD:
+                return getLocalizedString(R.string.TUIKitErrorSVRSSOOverload);
+
+            // 资源文件错误码
+            // Resource file error codes
+            case BaseConstants.ERR_SVR_RES_NOT_FOUND:
+                return getLocalizedString(R.string.TUIKitErrorSVRResNotFound);
+            case BaseConstants.ERR_SVR_RES_ACCESS_DENY:
+                return getLocalizedString(R.string.TUIKitErrorSVRResAccessDeny);
+            case BaseConstants.ERR_SVR_RES_SIZE_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRResSizeLimit);
+            case BaseConstants.ERR_SVR_RES_SEND_CANCEL:
+                return getLocalizedString(R.string.TUIKitErrorSVRResSendCancel);
+            case BaseConstants.ERR_SVR_RES_READ_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorSVRResReadFailed);
+            case BaseConstants.ERR_SVR_RES_TRANSFER_TIMEOUT:
+                return getLocalizedString(R.string.TUIKitErrorSVRResTransferTimeout);
+            case BaseConstants.ERR_SVR_RES_INVALID_PARAMETERS:
+                return getLocalizedString(R.string.TUIKitErrorSVRResInvalidParameters);
+            case BaseConstants.ERR_SVR_RES_INVALID_FILE_MD5:
+                return getLocalizedString(R.string.TUIKitErrorSVRResInvalidFileMd5);
+            case BaseConstants.ERR_SVR_RES_INVALID_PART_MD5:
+                return getLocalizedString(R.string.TUIKitErrorSVRResInvalidPartMd5);
+
+            // 后台公共错误码
+            // Common backend error codes
+            case BaseConstants.ERR_SVR_COMM_INVALID_HTTP_URL:
+                return getLocalizedString(R.string.TUIKitErrorSVRCommonInvalidHttpUrl);
+            case BaseConstants.ERR_SVR_COMM_REQ_JSON_PARSE_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorSVRCommomReqJsonParseFailed);
+            case BaseConstants.ERR_SVR_COMM_INVALID_ACCOUNT:
+                return getLocalizedString(R.string.TUIKitErrorSVRCommonInvalidAccount);
+            case BaseConstants.ERR_SVR_COMM_INVALID_ACCOUNT_EX:
+                return getLocalizedString(R.string.TUIKitErrorSVRCommonInvalidAccount);
+            case BaseConstants.ERR_SVR_COMM_INVALID_SDKAPPID:
+                return getLocalizedString(R.string.TUIKitErrorSVRCommonInvalidSdkappid);
+            case BaseConstants.ERR_SVR_COMM_REST_FREQ_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRCommonRestFreqLimit);
+            case BaseConstants.ERR_SVR_COMM_REQUEST_TIMEOUT:
+                return getLocalizedString(R.string.TUIKitErrorSVRCommonRequestTimeout);
+            case BaseConstants.ERR_SVR_COMM_INVALID_RES:
+                return getLocalizedString(R.string.TUIKitErrorSVRCommonInvalidRes);
+            case BaseConstants.ERR_SVR_COMM_ID_NOT_ADMIN:
+                return getLocalizedString(R.string.TUIKitErrorSVRCommonIDNotAdmin);
+            case BaseConstants.ERR_SVR_COMM_SDKAPPID_FREQ_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRCommonSdkappidFreqLimit);
+            case BaseConstants.ERR_SVR_COMM_SDKAPPID_MISS:
+                return getLocalizedString(R.string.TUIKitErrorSVRCommonSdkappidMiss);
+            case BaseConstants.ERR_SVR_COMM_RSP_JSON_PARSE_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorSVRCommonRspJsonParseFailed);
+            case BaseConstants.ERR_SVR_COMM_EXCHANGE_ACCOUNT_TIMEUT:
+                return getLocalizedString(R.string.TUIKitErrorSVRCommonExchangeAccountTimeout);
+            case BaseConstants.ERR_SVR_COMM_INVALID_ID_FORMAT:
+                return getLocalizedString(R.string.TUIKitErrorSVRCommonInvalidIdFormat);
+            case BaseConstants.ERR_SVR_COMM_SDKAPPID_FORBIDDEN:
+                return getLocalizedString(R.string.TUIKitErrorSVRCommonSDkappidForbidden);
+            case BaseConstants.ERR_SVR_COMM_REQ_FORBIDDEN:
+                return getLocalizedString(R.string.TUIKitErrorSVRCommonReqForbidden);
+            case BaseConstants.ERR_SVR_COMM_REQ_FREQ_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRCommonReqFreqLimit);
+            case BaseConstants.ERR_SVR_COMM_REQ_FREQ_LIMIT_EX:
+                return getLocalizedString(R.string.TUIKitErrorSVRCommonReqFreqLimit);
+            case BaseConstants.ERR_SVR_COMM_INVALID_SERVICE:
+                return getLocalizedString(R.string.TUIKitErrorSVRCommonInvalidService);
+            case BaseConstants.ERR_SVR_COMM_SENSITIVE_TEXT:
+                return getLocalizedString(R.string.TUIKitErrorSVRCommonSensitiveText);
+            case BaseConstants.ERR_SVR_COMM_BODY_SIZE_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRCommonBodySizeLimit);
+
+            // 帐号错误码
+            // Account error codes
+            case BaseConstants.ERR_SVR_ACCOUNT_USERSIG_EXPIRED:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountUserSigExpired);
+            case BaseConstants.ERR_SVR_ACCOUNT_USERSIG_EMPTY:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountUserSigEmpty);
+            case BaseConstants.ERR_SVR_ACCOUNT_USERSIG_CHECK_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountUserSigCheckFailed);
+            case BaseConstants.ERR_SVR_ACCOUNT_USERSIG_CHECK_FAILED_EX:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountUserSigCheckFailed);
+            case BaseConstants.ERR_SVR_ACCOUNT_USERSIG_MISMATCH_PUBLICKEY:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountUserSigMismatchPublicKey);
+            case BaseConstants.ERR_SVR_ACCOUNT_USERSIG_MISMATCH_ID:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountUserSigMismatchId);
+            case BaseConstants.ERR_SVR_ACCOUNT_USERSIG_MISMATCH_SDKAPPID:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountUserSigMismatchSdkAppid);
+            case BaseConstants.ERR_SVR_ACCOUNT_USERSIG_PUBLICKEY_NOT_FOUND:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountUserSigPublicKeyNotFound);
+            case BaseConstants.ERR_SVR_ACCOUNT_SDKAPPID_NOT_FOUND:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountUserSigSdkAppidNotFount);
+            case BaseConstants.ERR_SVR_ACCOUNT_INVALID_USERSIG:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountInvalidUserSig);
+            case BaseConstants.ERR_SVR_ACCOUNT_NOT_FOUND:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountNotFound);
+            case BaseConstants.ERR_SVR_ACCOUNT_SEC_RSTR:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountSecRstr);
+            case BaseConstants.ERR_SVR_ACCOUNT_INTERNAL_TIMEOUT:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountInternalTimeout);
+            case BaseConstants.ERR_SVR_ACCOUNT_INVALID_COUNT:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountInvalidCount);
+            case BaseConstants.ERR_SVR_ACCOUNT_INVALID_PARAMETERS:
+                return getLocalizedString(R.string.TUIkitErrorSVRAccountINvalidParameters);
+            case BaseConstants.ERR_SVR_ACCOUNT_ADMIN_REQUIRED:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountAdminRequired);
+            case BaseConstants.ERR_SVR_ACCOUNT_FREQ_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountFreqLimit);
+            case BaseConstants.ERR_SVR_ACCOUNT_BLACKLIST:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountBlackList);
+            case BaseConstants.ERR_SVR_ACCOUNT_COUNT_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountCountLimit);
+            case BaseConstants.ERR_SVR_ACCOUNT_INTERNAL_ERROR:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountInternalError);
+            case BaseConstants.ERR_SVR_ACCOUNT_USER_STATUS_DISABLED:
+                return getLocalizedString(R.string.TUIKitErrorEnableUserStatusOnConsole);
+
+            // 资料错误码
+            // Profile error codes
+            case BaseConstants.ERR_SVR_PROFILE_INVALID_PARAMETERS:
+                return getLocalizedString(R.string.TUIKitErrorSVRProfileInvalidParameters);
+            case BaseConstants.ERR_SVR_PROFILE_ACCOUNT_MISS:
+                return getLocalizedString(R.string.TUIKitErrorSVRProfileAccountMiss);
+            case BaseConstants.ERR_SVR_PROFILE_ACCOUNT_NOT_FOUND:
+                return getLocalizedString(R.string.TUIKitErrorSVRProfileAccountNotFound);
+            case BaseConstants.ERR_SVR_PROFILE_ADMIN_REQUIRED:
+                return getLocalizedString(R.string.TUIKitErrorSVRProfileAdminRequired);
+            case BaseConstants.ERR_SVR_PROFILE_SENSITIVE_TEXT:
+                return getLocalizedString(R.string.TUIKitErrorSVRProfileSensitiveText);
+            case BaseConstants.ERR_SVR_PROFILE_INTERNAL_ERROR:
+                return getLocalizedString(R.string.TUIKitErrorSVRProfileInternalError);
+            case BaseConstants.ERR_SVR_PROFILE_READ_PERMISSION_REQUIRED:
+                return getLocalizedString(R.string.TUIKitErrorSVRProfileReadWritePermissionRequired);
+            case BaseConstants.ERR_SVR_PROFILE_WRITE_PERMISSION_REQUIRED:
+                return getLocalizedString(R.string.TUIKitErrorSVRProfileReadWritePermissionRequired);
+            case BaseConstants.ERR_SVR_PROFILE_TAG_NOT_FOUND:
+                return getLocalizedString(R.string.TUIKitErrorSVRProfileTagNotFound);
+            case BaseConstants.ERR_SVR_PROFILE_SIZE_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRProfileSizeLimit);
+            case BaseConstants.ERR_SVR_PROFILE_VALUE_ERROR:
+                return getLocalizedString(R.string.TUIKitErrorSVRProfileValueError);
+            case BaseConstants.ERR_SVR_PROFILE_INVALID_VALUE_FORMAT:
+                return getLocalizedString(R.string.TUIKitErrorSVRProfileInvalidValueFormat);
+
+            // 关系链错误码
+            // Relationship chain error codes
+            case BaseConstants.ERR_SVR_FRIENDSHIP_INVALID_PARAMETERS:
+                return getLocalizedString(R.string.TUIKitErrorSVRFriendshipInvalidParameters);
+            case BaseConstants.ERR_SVR_FRIENDSHIP_INVALID_SDKAPPID:
+                return getLocalizedString(R.string.TUIKitErrorSVRFriendshipInvalidSdkAppid);
+            case BaseConstants.ERR_SVR_FRIENDSHIP_ACCOUNT_NOT_FOUND:
+                return getLocalizedString(R.string.TUIKitErrorSVRFriendshipAccountNotFound);
+            case BaseConstants.ERR_SVR_FRIENDSHIP_ADMIN_REQUIRED:
+                return getLocalizedString(R.string.TUIKitErrorSVRFriendshipAdminRequired);
+            case BaseConstants.ERR_SVR_FRIENDSHIP_SENSITIVE_TEXT:
+                return getLocalizedString(R.string.TUIKitErrorSVRFriendshipSensitiveText);
+            case BaseConstants.ERR_SVR_FRIENDSHIP_INTERNAL_ERROR:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountInternalError);
+            case BaseConstants.ERR_SVR_FRIENDSHIP_NET_TIMEOUT:
+                return getLocalizedString(R.string.TUIKitErrorSVRFriendshipNetTimeout);
+            case BaseConstants.ERR_SVR_FRIENDSHIP_WRITE_CONFLICT:
+                return getLocalizedString(R.string.TUIKitErrorSVRFriendshipWriteConflict);
+            case BaseConstants.ERR_SVR_FRIENDSHIP_ADD_FRIEND_DENY:
+                return getLocalizedString(R.string.TUIKitErrorSVRFriendshipAddFriendDeny);
+            case BaseConstants.ERR_SVR_FRIENDSHIP_COUNT_LIMIT:
+                return getLocalizedString(R.string.TUIkitErrorSVRFriendshipCountLimit);
+            case BaseConstants.ERR_SVR_FRIENDSHIP_GROUP_COUNT_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRFriendshipGroupCountLimit);
+            case BaseConstants.ERR_SVR_FRIENDSHIP_PENDENCY_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRFriendshipPendencyLimit);
+            case BaseConstants.ERR_SVR_FRIENDSHIP_BLACKLIST_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRFriendshipBlacklistLimit);
+            case BaseConstants.ERR_SVR_FRIENDSHIP_PEER_FRIEND_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRFriendshipPeerFriendLimit);
+            case BaseConstants.ERR_SVR_FRIENDSHIP_IN_SELF_BLACKLIST:
+                return getLocalizedString(R.string.TUIKitErrorSVRFriendshipInSelfBlacklist);
+            case BaseConstants.ERR_SVR_FRIENDSHIP_ALLOW_TYPE_DENY_ANY:
+                return getLocalizedString(R.string.TUIKitErrorSVRFriendshipAllowTypeDenyAny);
+            case BaseConstants.ERR_SVR_FRIENDSHIP_IN_PEER_BLACKLIST:
+                return getLocalizedString(R.string.TUIKitErrorSVRFriendshipInPeerBlackList);
+            case BaseConstants.ERR_SVR_FRIENDSHIP_ALLOW_TYPE_NEED_CONFIRM:
+                return getLocalizedString(R.string.TUIKitErrorSVRFriendshipAllowTypeNeedConfirm);
+            case BaseConstants.ERR_SVR_FRIENDSHIP_ADD_FRIEND_SEC_RSTR:
+                return getLocalizedString(R.string.TUIKitErrorSVRFriendshipAddFriendSecRstr);
+            case BaseConstants.ERR_SVR_FRIENDSHIP_PENDENCY_NOT_FOUND:
+                return getLocalizedString(R.string.TUIKitErrorSVRFriendshipPendencyNotFound);
+            case BaseConstants.ERR_SVR_FRIENDSHIP_DEL_FRIEND_SEC_RSTR:
+                return getLocalizedString(R.string.TUIKitErrorSVRFriendshipDelFriendSecRstr);
+            case BaseConstants.ERR_SVR_FRIENDSHIP_ACCOUNT_NOT_FOUND_EX:
+                return getLocalizedString(R.string.TUIKirErrorSVRFriendAccountNotFoundEx);
+
+            // 最近联系人错误码
+            // Error codes for recent contacts
+            case BaseConstants.ERR_SVR_CONV_ACCOUNT_NOT_FOUND:
+                return getLocalizedString(R.string.TUIKirErrorSVRFriendAccountNotFoundEx);
+            case BaseConstants.ERR_SVR_CONV_INVALID_PARAMETERS:
+                return getLocalizedString(R.string.TUIKitErrorSVRFriendshipInvalidParameters);
+            case BaseConstants.ERR_SVR_CONV_ADMIN_REQUIRED:
+                return getLocalizedString(R.string.TUIKitErrorSVRFriendshipAdminRequired);
+            case BaseConstants.ERR_SVR_CONV_INTERNAL_ERROR:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountInternalError);
+            case BaseConstants.ERR_SVR_CONV_NET_TIMEOUT:
+                return getLocalizedString(R.string.TUIKitErrorSVRFriendshipNetTimeout);
+
+            // 消息错误码
+            // Message error codes
+            case BaseConstants.ERR_SVR_MSG_PKG_PARSE_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorSVRMsgPkgParseFailed);
+            case BaseConstants.ERR_SVR_MSG_INTERNAL_AUTH_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorSVRMsgInternalAuthFailed);
+            case BaseConstants.ERR_SVR_MSG_INVALID_ID:
+                return getLocalizedString(R.string.TUIKitErrorSVRMsgInvalidId);
+            case BaseConstants.ERR_SVR_MSG_NET_ERROR:
+                return getLocalizedString(R.string.TUIKitErrorSVRMsgNetError);
+            case BaseConstants.ERR_SVR_MSG_INTERNAL_ERROR1:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountInternalError);
+            case BaseConstants.ERR_SVR_MSG_PUSH_DENY:
+                return getLocalizedString(R.string.TUIKitErrorSVRMsgPushDeny);
+            case BaseConstants.ERR_SVR_MSG_IN_PEER_BLACKLIST:
+                return getLocalizedString(R.string.TUIKitErrorSVRMsgInPeerBlackList);
+            case BaseConstants.ERR_SVR_MSG_BOTH_NOT_FRIEND:
+                return getLocalizedString(R.string.TUIKitErrorSVRMsgBothNotFriend);
+            case BaseConstants.ERR_SVR_MSG_NOT_PEER_FRIEND:
+                return getLocalizedString(R.string.TUIKitErrorSVRMsgNotPeerFriend);
+            case BaseConstants.ERR_SVR_MSG_NOT_SELF_FRIEND:
+                return getLocalizedString(R.string.TUIkitErrorSVRMsgNotSelfFriend);
+            case BaseConstants.ERR_SVR_MSG_SHUTUP_DENY:
+                return getLocalizedString(R.string.TUIKitErrorSVRMsgShutupDeny);
+            case BaseConstants.ERR_SVR_MSG_REVOKE_TIME_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRMsgRevokeTimeLimit);
+            case BaseConstants.ERR_SVR_MSG_DEL_RAMBLE_INTERNAL_ERROR:
+                return getLocalizedString(R.string.TUIKitErrorSVRMsgDelRambleInternalError);
+            case BaseConstants.ERR_SVR_MSG_JSON_PARSE_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorSVRMsgJsonParseFailed);
+            case BaseConstants.ERR_SVR_MSG_INVALID_JSON_BODY_FORMAT:
+                return getLocalizedString(R.string.TUIKitErrorSVRMsgInvalidJsonBodyFormat);
+            case BaseConstants.ERR_SVR_MSG_INVALID_TO_ACCOUNT:
+                return getLocalizedString(R.string.TUIKitErrorSVRMsgInvalidToAccount);
+            case BaseConstants.ERR_SVR_MSG_INVALID_RAND:
+                return getLocalizedString(R.string.TUIKitErrorSVRMsgInvalidRand);
+            case BaseConstants.ERR_SVR_MSG_INVALID_TIMESTAMP:
+                return getLocalizedString(R.string.TUIKitErrorSVRMsgInvalidTimestamp);
+            case BaseConstants.ERR_SVR_MSG_BODY_NOT_ARRAY:
+                return getLocalizedString(R.string.TUIKitErrorSVRMsgBodyNotArray);
+            case BaseConstants.ERR_SVR_MSG_ADMIN_REQUIRED:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountAdminRequired);
+            case BaseConstants.ERR_SVR_MSG_INVALID_JSON_FORMAT:
+                return getLocalizedString(R.string.TUIKitErrorSVRMsgInvalidJsonFormat);
+            case BaseConstants.ERR_SVR_MSG_TO_ACCOUNT_COUNT_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRMsgToAccountCountLimit);
+            case BaseConstants.ERR_SVR_MSG_TO_ACCOUNT_NOT_FOUND:
+                return getLocalizedString(R.string.TUIKitErrorSVRMsgToAccountNotFound);
+            case BaseConstants.ERR_SVR_MSG_TIME_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRMsgTimeLimit);
+            case BaseConstants.ERR_SVR_MSG_INVALID_SYNCOTHERMACHINE:
+                return getLocalizedString(R.string.TUIKitErrorSVRMsgInvalidSyncOtherMachine);
+            case BaseConstants.ERR_SVR_MSG_INVALID_MSGLIFETIME:
+                return getLocalizedString(R.string.TUIkitErrorSVRMsgInvalidMsgLifeTime);
+            case BaseConstants.ERR_SVR_MSG_ACCOUNT_NOT_FOUND:
+                return getLocalizedString(R.string.TUIKirErrorSVRFriendAccountNotFoundEx);
+            case BaseConstants.ERR_SVR_MSG_INTERNAL_ERROR2:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountInternalError);
+            case BaseConstants.ERR_SVR_MSG_INTERNAL_ERROR3:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountInternalError);
+            case BaseConstants.ERR_SVR_MSG_INTERNAL_ERROR4:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountInternalError);
+            case BaseConstants.ERR_SVR_MSG_INTERNAL_ERROR5:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountInternalError);
+            case BaseConstants.ERR_SVR_MSG_BODY_SIZE_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRMsgBodySizeLimit);
+            case BaseConstants.ERR_SVR_MSG_LONGPOLLING_COUNT_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRmsgLongPollingCountLimit);
+            case BaseConstants.ERR_SDK_INTERFACE_NOT_SUPPORT:
+                return getLocalizedString(R.string.TUIKitErrorUnsupporInterface);
+
+            // 群组错误码
+            // Group error codes
+            case BaseConstants.ERR_SVR_GROUP_INTERNAL_ERROR:
+                return getLocalizedString(R.string.TUIKitErrorSVRAccountInternalError);
+            case BaseConstants.ERR_SVR_GROUP_API_NAME_ERROR:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupApiNameError);
+            case BaseConstants.ERR_SVR_GROUP_INVALID_PARAMETERS:
+                return getLocalizedString(R.string.TUIKitErrorSVRResInvalidParameters);
+            case BaseConstants.ERR_SVR_GROUP_ACOUNT_COUNT_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupAccountCountLimit);
+            case BaseConstants.ERR_SVR_GROUP_FREQ_LIMIT:
+                return getLocalizedString(R.string.TUIkitErrorSVRGroupFreqLimit);
+            case BaseConstants.ERR_SVR_GROUP_PERMISSION_DENY:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupPermissionDeny);
+            case BaseConstants.ERR_SVR_GROUP_INVALID_REQ:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupInvalidReq);
+            case BaseConstants.ERR_SVR_GROUP_SUPER_NOT_ALLOW_QUIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupSuperNotAllowQuit);
+            case BaseConstants.ERR_SVR_GROUP_NOT_FOUND:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupNotFound);
+            case BaseConstants.ERR_SVR_GROUP_JSON_PARSE_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupJsonParseFailed);
+            case BaseConstants.ERR_SVR_GROUP_INVALID_ID:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupInvalidId);
+            case BaseConstants.ERR_SVR_GROUP_ALLREADY_MEMBER:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupAllreadyMember);
+            case BaseConstants.ERR_SVR_GROUP_FULL_MEMBER_COUNT:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupFullMemberCount);
+            case BaseConstants.ERR_SVR_GROUP_INVALID_GROUPID:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupInvalidGroupId);
+            case BaseConstants.ERR_SVR_GROUP_REJECT_FROM_THIRDPARTY:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupRejectFromThirdParty);
+            case BaseConstants.ERR_SVR_GROUP_SHUTUP_DENY:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupShutDeny);
+            case BaseConstants.ERR_SVR_GROUP_RSP_SIZE_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupRspSizeLimit);
+            case BaseConstants.ERR_SVR_GROUP_ACCOUNT_NOT_FOUND:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupAccountNotFound);
+            case BaseConstants.ERR_SVR_GROUP_GROUPID_IN_USED:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupGroupIdInUse);
+            case BaseConstants.ERR_SVR_GROUP_SEND_MSG_FREQ_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupSendMsgFreqLimit);
+            case BaseConstants.ERR_SVR_GROUP_REQ_ALLREADY_BEEN_PROCESSED:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupReqAllreadyBeenProcessed);
+            case BaseConstants.ERR_SVR_GROUP_GROUPID_IN_USED_FOR_SUPER:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupGroupIdUserdForSuper);
+            case BaseConstants.ERR_SVR_GROUP_SDKAPPID_DENY:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupSDkAppidDeny);
+            case BaseConstants.ERR_SVR_GROUP_REVOKE_MSG_NOT_FOUND:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupRevokeMsgNotFound);
+            case BaseConstants.ERR_SVR_GROUP_REVOKE_MSG_TIME_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupRevokeMsgTimeLimit);
+            case BaseConstants.ERR_SVR_GROUP_REVOKE_MSG_DENY:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupRevokeMsgDeny);
+            case BaseConstants.ERR_SVR_GROUP_NOT_ALLOW_REVOKE_MSG:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupNotAllowRevokeMsg);
+            case BaseConstants.ERR_SVR_GROUP_REMOVE_MSG_DENY:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupRemoveMsgDeny);
+            case BaseConstants.ERR_SVR_GROUP_NOT_ALLOW_REMOVE_MSG:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupNotAllowRemoveMsg);
+            case BaseConstants.ERR_SVR_GROUP_AVCHATROOM_COUNT_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupAvchatRoomCountLimit);
+            case BaseConstants.ERR_SVR_GROUP_COUNT_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupCountLimit);
+            case BaseConstants.ERR_SVR_GROUP_MEMBER_COUNT_LIMIT:
+                return getLocalizedString(R.string.TUIKitErrorSVRGroupMemberCountLimit);
+
+            /////////////////////////////////////////////////////////////////////////////////
+            //
+            //                      （三）V3版本错误码，待废弃
+            //                           IM SDK V3 error codes,to be abandoned
+            //
+            /////////////////////////////////////////////////////////////////////////////////
+
+            case BaseConstants.ERR_NO_SUCC_RESULT:
+                return getLocalizedString(R.string.TUIKitErrorSVRNoSuccessResult);
+            case BaseConstants.ERR_TO_USER_INVALID:
+                return getLocalizedString(R.string.TUIKitErrorSVRToUserInvalid);
+            case BaseConstants.ERR_INIT_CORE_FAIL:
+                return getLocalizedString(R.string.TUIKitErrorSVRInitCoreFail);
+            case BaseConstants.ERR_EXPIRED_SESSION_NODE:
+                return getLocalizedString(R.string.TUIKitErrorExpiredSessionNode);
+            case BaseConstants.ERR_LOGGED_OUT_BEFORE_LOGIN_FINISHED:
+                return getLocalizedString(R.string.TUIKitErrorLoggedOutBeforeLoginFinished);
+            case BaseConstants.ERR_TLSSDK_NOT_INITIALIZED:
+                return getLocalizedString(R.string.TUIKitErrorTLSSDKNotInitialized);
+            case BaseConstants.ERR_TLSSDK_USER_NOT_FOUND:
+                return getLocalizedString(R.string.TUIKitErrorTLSSDKUserNotFound);
+//        case BaseConstants.ERR_BIND_FAIL_UNKNOWN:
+//            return @"QALSDK未知原因BIND失败";
+//        case BaseConstants.ERR_BIND_FAIL_NO_SSOTICKET:
+//            return @"缺少SSO票据";
+//        case BaseConstants.ERR_BIND_FAIL_REPEATD_BIND:
+//            return @"重复BIND";
+//        case BaseConstants.ERR_BIND_FAIL_TINYID_NULL:
+//            return @"tiny为空";
+//        case BaseConstants.ERR_BIND_FAIL_GUID_NULL:
+//            return @"guid为空";
+//        case BaseConstants.ERR_BIND_FAIL_UNPACK_REGPACK_FAILED:
+//            return @"解注册包失败";
+            case BaseConstants.ERR_BIND_FAIL_REG_TIMEOUT:
+                return getLocalizedString(R.string.TUIKitErrorBindFaildRegTimeout);
+            case BaseConstants.ERR_BIND_FAIL_ISBINDING:
+                return getLocalizedString(R.string.TUIKitErrorBindFaildIsBinding);
+            case BaseConstants.ERR_PACKET_FAIL_UNKNOWN:
+                return getLocalizedString(R.string.TUIKitErrorPacketFailUnknown);
+            case BaseConstants.ERR_PACKET_FAIL_REQ_NO_NET:
+                return getLocalizedString(R.string.TUIKitErrorPacketFailReqNoNet);
+            case BaseConstants.ERR_PACKET_FAIL_RESP_NO_NET:
+                return getLocalizedString(R.string.TUIKitErrorPacketFailRespNoNet);
+            case BaseConstants.ERR_PACKET_FAIL_REQ_NO_AUTH:
+                return getLocalizedString(R.string.TUIKitErrorPacketFailReqNoAuth);
+            case BaseConstants.ERR_PACKET_FAIL_SSO_ERR:
+                return getLocalizedString(R.string.TUIKitErrorPacketFailSSOErr);
+            case BaseConstants.ERR_PACKET_FAIL_REQ_TIMEOUT:
+                return getLocalizedString(R.string.TUIKitErrorSVRRequestTimeout);
+            case BaseConstants.ERR_PACKET_FAIL_RESP_TIMEOUT:
+                return getLocalizedString(R.string.TUIKitErrorPacketFailRespTimeout);
+
+            // case BaseConstants.ERR_PACKET_FAIL_REQ_ON_RESEND:
+            // case BaseConstants.ERR_PACKET_FAIL_RESP_NO_RESEND:
+            // case BaseConstants.ERR_PACKET_FAIL_FLOW_SAVE_FILTERED:
+            // case BaseConstants.ERR_PACKET_FAIL_REQ_OVER_LOAD:
+            // case BaseConstants.ERR_PACKET_FAIL_LOGIC_ERR:
+            case BaseConstants.ERR_FRIENDSHIP_PROXY_NOT_SYNCED:
+                return getLocalizedString(R.string.TUIKitErrorFriendshipProxySyncing);
+            case BaseConstants.ERR_FRIENDSHIP_PROXY_SYNCING:
+                return getLocalizedString(R.string.TUIKitErrorFriendshipProxySyncing);
+            case BaseConstants.ERR_FRIENDSHIP_PROXY_SYNCED_FAIL:
+                return getLocalizedString(R.string.TUIKitErrorFriendshipProxySyncedFail);
+            case BaseConstants.ERR_FRIENDSHIP_PROXY_LOCAL_CHECK_ERR:
+                return getLocalizedString(R.string.TUIKitErrorFriendshipProxyLocalCheckErr);
+            case BaseConstants.ERR_GROUP_INVALID_FIELD:
+                return getLocalizedString(R.string.TUIKitErrorGroupInvalidField);
+            case BaseConstants.ERR_GROUP_STORAGE_DISABLED:
+                return getLocalizedString(R.string.TUIKitErrorGroupStoreageDisabled);
+            case BaseConstants.ERR_LOADGRPINFO_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorLoadGrpInfoFailed);
+            case BaseConstants.ERR_REQ_NO_NET_ON_REQ:
+                return getLocalizedString(R.string.TUIKitErrorReqNoNetOnReq);
+            case BaseConstants.ERR_REQ_NO_NET_ON_RSP:
+                return getLocalizedString(R.string.TUIKitErrorReqNoNetOnResp);
+            case BaseConstants.ERR_SERIVCE_NOT_READY:
+                return getLocalizedString(R.string.TUIKitErrorServiceNotReady);
+            case BaseConstants.ERR_LOGIN_AUTH_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorLoginAuthFailed);
+            case BaseConstants.ERR_NEVER_CONNECT_AFTER_LAUNCH:
+                return getLocalizedString(R.string.TUIKitErrorNeverConnectAfterLaunch);
+            case BaseConstants.ERR_REQ_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorReqFailed);
+            case BaseConstants.ERR_REQ_INVALID_REQ:
+                return getLocalizedString(R.string.TUIKitErrorReqInvaidReq);
+            case BaseConstants.ERR_REQ_OVERLOADED:
+                return getLocalizedString(R.string.TUIKitErrorReqOnverLoaded);
+            case BaseConstants.ERR_REQ_KICK_OFF:
+                return getLocalizedString(R.string.TUIKitErrorReqKickOff);
+            case BaseConstants.ERR_REQ_SERVICE_SUSPEND:
+                return getLocalizedString(R.string.TUIKitErrorReqServiceSuspend);
+            case BaseConstants.ERR_REQ_INVALID_SIGN:
+                return getLocalizedString(R.string.TUIKitErrorReqInvalidSign);
+            case BaseConstants.ERR_REQ_INVALID_COOKIE:
+                return getLocalizedString(R.string.TUIKitErrorReqInvalidCookie);
+            case BaseConstants.ERR_LOGIN_TLS_RSP_PARSE_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorLoginTlsRspParseFailed);
+            case BaseConstants.ERR_LOGIN_OPENMSG_TIMEOUT:
+                return getLocalizedString(R.string.TUIKitErrorLoginOpenMsgTimeout);
+            case BaseConstants.ERR_LOGIN_OPENMSG_RSP_PARSE_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorLoginOpenMsgRspParseFailed);
+            case BaseConstants.ERR_LOGIN_TLS_DECRYPT_FAILED:
+                return getLocalizedString(R.string.TUIKitErrorLoginTslDecryptFailed);
+            case BaseConstants.ERR_WIFI_NEED_AUTH:
+                return getLocalizedString(R.string.TUIKitErrorWifiNeedAuth);
+            case BaseConstants.ERR_USER_CANCELED:
+                return getLocalizedString(R.string.TUIKitErrorUserCanceled);
+            case BaseConstants.ERR_REVOKE_TIME_LIMIT_EXCEED:
+                return getLocalizedString(R.string.TUIkitErrorRevokeTimeLimitExceed);
+            case BaseConstants.ERR_LACK_UGC_EXT:
+                return getLocalizedString(R.string.TUIKitErrorLackUGExt);
+            case BaseConstants.ERR_AUTOLOGIN_NEED_USERSIG:
+                return getLocalizedString(R.string.TUIKitErrorAutoLoginNeedUserSig);
+            case BaseConstants.ERR_QAL_NO_SHORT_CONN_AVAILABLE:
+                return getLocalizedString(R.string.TUIKitErrorQALNoShortConneAvailable);
+            case BaseConstants.ERR_REQ_CONTENT_ATTACK:
+                return getLocalizedString(R.string.TUIKitErrorReqContentAttach);
+            case BaseConstants.ERR_LOGIN_SIG_EXPIRE:
+                return getLocalizedString(R.string.TUIKitErrorLoginSigExpire);
+            case BaseConstants.ERR_SDK_HAD_INITIALIZED:
+                return getLocalizedString(R.string.TUIKitErrorSDKHadInit);
+            case BaseConstants.ERR_OPENBDH_BASE:
+                return getLocalizedString(R.string.TUIKitErrorOpenBDHBase);
+            case BaseConstants.ERR_REQUEST_NO_NET_ONREQ:
+                return getLocalizedString(R.string.TUIKitErrorRequestNoNetOnReq);
+            case BaseConstants.ERR_REQUEST_NO_NET_ONRSP:
+                return getLocalizedString(R.string.TUIKitErrorRequestNoNetOnRsp);
+//        case BaseConstants.ERR_REQUEST_FAILED:
+//            return @"QAL执行失败";
+//        case BaseConstants.ERR_REQUEST_INVALID_REQ:
+//            return @"请求非法，toMsgService非法";
+            case BaseConstants.ERR_REQUEST_OVERLOADED:
+                return getLocalizedString(R.string.TUIKitErrorRequestOnverLoaded);
+            case BaseConstants.ERR_REQUEST_KICK_OFF:
+                return getLocalizedString(R.string.TUIKitErrorReqKickOff);
+            case BaseConstants.ERR_REQUEST_SERVICE_SUSPEND:
+                return getLocalizedString(R.string.TUIKitErrorReqServiceSuspend);
+            case BaseConstants.ERR_REQUEST_INVALID_SIGN:
+                return getLocalizedString(R.string.TUIKitErrorReqInvalidSign);
+            case BaseConstants.ERR_REQUEST_INVALID_COOKIE:
+                return getLocalizedString(R.string.TUIKitErrorReqInvalidCookie);
+
+            default:
+                break;
+        }
+        return msg;
+    }
+
+    private static String getLocalizedString(int errStringId) {
+        return TUIConfig.getAppContext().getString(errStringId);
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/FileUtil.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/FileUtil.java
new file mode 100644
index 0000000..b1948da
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/FileUtil.java
@@ -0,0 +1,497 @@
+package com.tencent.qcloud.tuicore.util;
+
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Environment;
+import android.provider.DocumentsContract;
+import android.provider.MediaStore;
+import android.provider.OpenableColumns;
+import android.text.TextUtils;
+import android.util.Log;
+import android.webkit.MimeTypeMap;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.R;
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.TUILogin;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+public class FileUtil {
+
+    public static final String DOCUMENTS_DIR = "documents";
+
+    public static final int SIZETYPE_B = 1;
+    public static final int SIZETYPE_KB = 2;
+    public static final int SIZETYPE_MB = 3;
+    public static final int SIZETYPE_GB = 4;
+
+    public static String saveBitmap(String dir, Bitmap b) {
+        String jpegName = TUIConfig.getMediaDir() + "picture_" + new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(new Date()) + ".jpg";
+        try {
+            FileOutputStream fout = new FileOutputStream(jpegName);
+            BufferedOutputStream bos = new BufferedOutputStream(fout);
+            b.compress(Bitmap.CompressFormat.JPEG, 100, bos);
+            bos.flush();
+            bos.close();
+            return jpegName;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return "";
+        }
+    }
+
+    public static boolean deleteFile(String url) {
+        boolean result = false;
+        File file = new File(url);
+        if (file.exists()) {
+            result = file.delete();
+        }
+        return result;
+    }
+
+    public static String getPathFromUri(Uri uri) {
+        String path = "";
+        try {
+            int sdkVersion = Build.VERSION.SDK_INT;
+            if (sdkVersion >= 19) {
+                path = getPathByCopyFile(TUILogin.getAppContext(), uri);
+            } else {
+                path = getRealFilePath(uri);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        if (path == null) {
+            path = "";
+        }
+        return path;
+    }
+
+    public static String getRealFilePath(Uri uri) {
+        if (null == uri) {
+            return null;
+        }
+        final String scheme = uri.getScheme();
+        String data = null;
+        if (scheme == null) {
+            data = uri.getPath();
+        } else if (ContentResolver.SCHEME_FILE.equals(scheme)) {
+            data = uri.getPath();
+        } else if (ContentResolver.SCHEME_CONTENT.equals(scheme)) {
+            Cursor cursor = TUILogin.getAppContext().getContentResolver().query(uri, new String[]{MediaStore.Images.ImageColumns.DATA}, null, null, null);
+            if (null != cursor) {
+                if (cursor.moveToFirst()) {
+                    int index = cursor.getColumnIndex(MediaStore.Images.ImageColumns.DATA);
+                    if (index > -1) {
+                        data = cursor.getString(index);
+                    }
+                }
+                cursor.close();
+            }
+        }
+        return data;
+    }
+
+    public static Uri getUriFromPath(String path) {
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                return TUIFileProvider.getUriForFile(TUIConfig.getAppContext(), TUIConfig.getAppContext().getApplicationInfo().packageName + ".tuicore.fileprovider", new File(path));
+            } else {
+                return Uri.fromFile(new File(path));
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 专为Android4.4以上设计的从Uri获取文件路径
+     * 
+     * Get file path from Uri specially designed for Android4.4 and above
+     */
+    public static String getPath(final Context context, final Uri uri) {
+
+        final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
+
+        // DocumentProvider
+        if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) {
+            // ExternalStorageProvider
+            if (isExternalStorageDocument(uri)) {
+
+                final String docId = DocumentsContract.getDocumentId(uri);
+                final String[] split = docId.split(":");
+                final String type = split[0];
+
+                if ("primary".equalsIgnoreCase(type)) {
+                    return Environment.getExternalStorageDirectory() + "/" + split[1];
+                } else {
+                    return getPathByCopyFile(context, uri);
+                }
+            }
+            // DownloadsProvider
+            else if (isDownloadsDocument(uri)) {
+
+                final String id = DocumentsContract.getDocumentId(uri);
+                if (id.startsWith("raw:")) {
+                    final String path = id.replaceFirst("raw:", "");
+                    return path;
+                }
+                String[] contentUriPrefixesToTry = new String[]{
+                        "content://downloads/public_downloads",
+                        "content://downloads/my_downloads",
+                        "content://downloads/all_downloads"
+                };
+
+                for (String contentUriPrefix : contentUriPrefixesToTry) {
+                    Uri contentUri = ContentUris.withAppendedId(Uri.parse(contentUriPrefix), Long.parseLong(id));
+                    try {
+                        String path = getDataColumn(context, contentUri, null, null);
+                        if (path != null && Build.VERSION.SDK_INT < 29) {
+                            return path;
+                        }
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+
+                // 在某些android8+的手机上，无法获取路径，所以用拷贝的方式，获取新文件名，然后把文件发出去
+                // On some android8+ mobile phones, the path cannot be obtained, so the new file name is obtained by copying, and then the file is sent out
+                return getPathByCopyFile(context, uri);
+            }
+            // MediaProvider
+            else if (isMediaDocument(uri)) {
+
+                final String docId = DocumentsContract.getDocumentId(uri);
+                final String[] split = docId.split(":");
+                final String type = split[0];
+
+                Uri contentUri = null;
+                if ("image".equals(type)) {
+                    contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+                } else if ("video".equals(type)) {
+                    contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
+                } else if ("audio".equals(type)) {
+                    contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
+                }
+
+                final String selection = "_id=?";
+                final String[] selectionArgs = new String[]{split[1]};
+
+                String path = getDataColumn(context, contentUri, selection, selectionArgs);
+                if (TextUtils.isEmpty(path) || Build.VERSION.SDK_INT >= 29) {
+                    path = getPathByCopyFile(context, uri);
+                }
+                return path;
+            }
+        }
+        // MediaStore (and general)
+        else if ("content".equalsIgnoreCase(uri.getScheme())) {
+            String path = getDataColumn(context, uri, null, null);
+            if (TextUtils.isEmpty(path) || Build.VERSION.SDK_INT >= 29) {
+                // 在某些华为android9+的手机上，无法获取路径，所以用拷贝的方式，获取新文件名，然后把文件发出去
+                path = getPathByCopyFile(context, uri);
+            }
+            return path;
+        }
+        // File
+        else if ("file".equalsIgnoreCase(uri.getScheme())) {
+            return uri.getPath();
+        }
+
+        return null;
+    }
+
+    private static String getPathByCopyFile(Context context, Uri uri) {
+        String fileName = getFileName(context, uri);
+        File cacheDir = getDocumentCacheDir(context);
+        File file = generateFileName(fileName, cacheDir);
+        String destinationPath = null;
+        if (file != null) {
+            destinationPath = file.getAbsolutePath();
+            boolean saveSuccess = saveFileFromUri(context, uri, destinationPath);
+            if (!saveSuccess) {
+                file.delete();
+                return null;
+            }
+        }
+
+        return destinationPath;
+    }
+
+    @Nullable
+    public static File generateFileName(@Nullable String name, File directory) {
+        if (name == null) {
+            return null;
+        }
+
+        File file = new File(directory, name);
+
+        if (file.exists()) {
+            String fileName = name;
+            String extension = "";
+            int dotIndex = name.lastIndexOf('.');
+            if (dotIndex > 0) {
+                fileName = name.substring(0, dotIndex);
+                extension = name.substring(dotIndex);
+            }
+
+            int index = 0;
+
+            while (file.exists()) {
+                index++;
+                name = fileName + '(' + index + ')' + extension;
+                file = new File(directory, name);
+            }
+        }
+
+        try {
+            if (!file.createNewFile()) {
+                return null;
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+
+
+        return file;
+    }
+
+    public static String getFileName(@NonNull Context context, Uri uri) {
+        String mimeType = context.getContentResolver().getType(uri);
+        String filename = null;
+
+        if (mimeType == null && context != null) {
+            filename = getName(uri.toString());
+        } else {
+            Cursor returnCursor = context.getContentResolver().query(uri, null,
+                    null, null, null);
+            if (returnCursor != null) {
+                int nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
+                returnCursor.moveToFirst();
+                filename = returnCursor.getString(nameIndex);
+                returnCursor.close();
+            }
+        }
+
+        return filename;
+    }
+
+    private static String getName(String filename) {
+        if (filename == null) {
+            return null;
+        }
+        int index = filename.lastIndexOf('/');
+        return filename.substring(index + 1);
+    }
+
+    public static File getDocumentCacheDir(@NonNull Context context) {
+        File dir = new File(context.getCacheDir(), DOCUMENTS_DIR);
+        if (!dir.exists()) {
+            dir.mkdirs();
+        }
+
+        return dir;
+    }
+
+    private static boolean saveFileFromUri(Context context, Uri uri, String destinationPath) {
+        InputStream is = null;
+        BufferedOutputStream bos = null;
+        try {
+            is = context.getContentResolver().openInputStream(uri);
+            bos = new BufferedOutputStream(new FileOutputStream(destinationPath, false));
+            byte[] buf = new byte[1024];
+
+            int actualBytes;
+            while ((actualBytes = is.read(buf)) != -1) {
+                bos.write(buf, 0, actualBytes);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            return false;
+        } finally {
+            try {
+                if (is != null) is.close();
+                if (bos != null) bos.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Get the value of the data column for this Uri. This is useful for
+     * MediaStore Uris, and other file-based ContentProviders.
+     *
+     * @param context       The context.
+     * @param uri           The Uri to query.
+     * @param selection     (Optional) Filter used in the query.
+     * @param selectionArgs (Optional) Selection arguments used in the query.
+     * @return The value of the _data column, which is typically a file path.
+     */
+    public static String getDataColumn(Context context, Uri uri, String selection,
+                                       String[] selectionArgs) {
+
+        Cursor cursor = null;
+        final String column = "_data";
+        final String[] projection = {column};
+
+        try {
+            cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs,
+                    null);
+            if (cursor != null && cursor.moveToFirst()) {
+                final int column_index = cursor.getColumnIndexOrThrow(column);
+                return cursor.getString(column_index);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @param uri The Uri to check.
+     * @return Whether the Uri authority is ExternalStorageProvider.
+     */
+    public static boolean isExternalStorageDocument(Uri uri) {
+        return "com.android.externalstorage.documents".equals(uri.getAuthority());
+    }
+
+    /**
+     * @param uri The Uri to check.
+     * @return Whether the Uri authority is DownloadsProvider.
+     */
+    public static boolean isDownloadsDocument(Uri uri) {
+        return "com.android.providers.downloads.documents".equals(uri.getAuthority());
+    }
+
+    /**
+     * @param uri The Uri to check.
+     * @return Whether the Uri authority is MediaProvider.
+     */
+    public static boolean isMediaDocument(Uri uri) {
+        return "com.android.providers.media.documents".equals(uri.getAuthority());
+    }
+
+
+    /**
+     * 转换文件大小
+     * 
+     * Convert file size to string
+     *
+     * @param fileS
+     * @return
+     */
+    public static String formatFileSize(long fileS) {
+        DecimalFormat df = new DecimalFormat("#.00");
+        String fileSizeString = "";
+        String wrongSize = "0B";
+        if (fileS == 0) {
+            return wrongSize;
+        }
+        if (fileS < 1024) {
+            fileSizeString = df.format((double) fileS) + "B";
+        } else if (fileS < 1048576) {
+            fileSizeString = df.format((double) fileS / 1024) + "KB";
+        } else if (fileS < 1073741824) {
+            fileSizeString = df.format((double) fileS / 1048576) + "MB";
+        } else {
+            fileSizeString = df.format((double) fileS / 1073741824) + "GB";
+        }
+        return fileSizeString;
+    }
+
+
+    // 修复 android.webkit.MimeTypeMap 的 getFileExtensionFromUrl 方法不支持中文的问题
+    // fix the problem that getFileExtensionFromUrl does not support Chinese
+    public static String getFileExtensionFromUrl(String url) {
+        if (!TextUtils.isEmpty(url)) {
+            int fragment = url.lastIndexOf('#');
+            if (fragment > 0) {
+                url = url.substring(0, fragment);
+            }
+
+            int query = url.lastIndexOf('?');
+            if (query > 0) {
+                url = url.substring(0, query);
+            }
+
+            int filenamePos = url.lastIndexOf('/');
+            String filename =
+                    0 <= filenamePos ? url.substring(filenamePos + 1) : url;
+
+            // if the filename contains special characters, we don't
+            // consider it valid for our matching purposes:
+            // 去掉正则表达式判断以添加中文支持
+//          if (!filename.isEmpty() && Pattern.matches("[a-zA-Z_0-9\\.\\-\\(\\)\\%]+", filename))
+            if (!filename.isEmpty()) {
+                int dotPos = filename.lastIndexOf('.');
+                if (0 <= dotPos) {
+                    return filename.substring(dotPos + 1).toLowerCase();
+                }
+            }
+        }
+
+        return "";
+    }
+
+    public static void openFile(String path, String fileName) {
+        Uri uri = TUIFileProvider.getUriForFile(TUIConfig.getAppContext(),
+                TUIConfig.getAppContext().getApplicationInfo().packageName + ".tuicore.fileprovider",
+                new File(path));
+        if (uri == null) {
+            Log.e("FileUtil", "openFile failed , uri is null");
+            return;
+        }
+        String fileExtension;
+        if (TextUtils.isEmpty(fileName)) {
+            fileExtension = FileUtil.getFileExtensionFromUrl(path);
+        } else {
+            fileExtension = FileUtil.getFileExtensionFromUrl(fileName);
+        }
+        String mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileExtension);
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        intent.setDataAndType(uri, mimeType);
+        try {
+            Intent chooserIntent = Intent.createChooser(intent, TUIConfig.getAppContext().getString(R.string.open_file_tips));
+            chooserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            TUIConfig.getAppContext().startActivity(chooserIntent);
+        } catch (Exception e) {
+            Log.e("FileUtil", "openFile failed , " + e.getMessage());
+        }
+    }
+
+    public static long getFileSize(String path) {
+        File file = new File(path);
+        if (file.exists()) {
+            return file.length();
+        }
+        return 0;
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/ImageUtil.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/ImageUtil.java
new file mode 100644
index 0000000..32976f9
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/ImageUtil.java
@@ -0,0 +1,477 @@
+package com.tencent.qcloud.tuicore.util;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.media.ExifInterface;
+import android.net.Uri;
+import android.text.TextUtils;
+
+import com.tencent.imsdk.v2.V2TIMImageElem;
+import com.tencent.qcloud.tuicore.TUIConfig;
+import com.tencent.qcloud.tuicore.TUILogin;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+
+public class ImageUtil {
+    public final static String SP_IMAGE = "_conversation_group_face";
+
+    /**
+     * @param outFile
+     * @param bitmap
+     * @return
+     */
+    public static File storeBitmap(File outFile, Bitmap bitmap) {
+        if (!outFile.exists() || outFile.isDirectory()) {
+            outFile.getParentFile().mkdirs();
+        }
+        FileOutputStream fOut = null;
+        try {
+            outFile.deleteOnExit();
+            outFile.createNewFile();
+            fOut = new FileOutputStream(outFile);
+            bitmap.compress(Bitmap.CompressFormat.JPEG, 100, fOut);
+            fOut.flush();
+        } catch (IOException e1) {
+            outFile.deleteOnExit();
+        } finally {
+            if (null != fOut) {
+                try {
+                    fOut.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    outFile.deleteOnExit();
+                }
+            }
+        }
+        return outFile;
+    }
+
+    public static Bitmap getBitmapFormPath(Uri uri) {
+        Bitmap bitmap = null;
+        try {
+            InputStream input = TUIConfig.getAppContext().getContentResolver().openInputStream(uri);
+            BitmapFactory.Options onlyBoundsOptions = new BitmapFactory.Options();
+            onlyBoundsOptions.inJustDecodeBounds = true;
+            onlyBoundsOptions.inDither = true;//optional
+            onlyBoundsOptions.inPreferredConfig = Bitmap.Config.ARGB_8888;//optional
+            BitmapFactory.decodeStream(input, null, onlyBoundsOptions);
+            input.close();
+            int originalWidth = onlyBoundsOptions.outWidth;
+            int originalHeight = onlyBoundsOptions.outHeight;
+            if ((originalWidth == -1) || (originalHeight == -1))
+                return null;
+            float hh = 800f;
+            float ww = 480f;
+            int degree = getBitmapDegree(uri);
+            if (degree == 90 || degree == 270) {
+                hh = 480;
+                ww = 800;
+            }
+            // 缩放比。由于是固定比例缩放，只用高或者宽其中一个数据进行计算即可
+            // zoom ratio. Since it is a fixed scale scaling, only one data of height or width can be used for calculation.
+            int be = 1;
+            if (originalWidth > originalHeight && originalWidth > ww) {
+                be = (int) (originalWidth / ww);
+            } else if (originalWidth < originalHeight && originalHeight > hh) {
+                be = (int) (originalHeight / hh);
+            }
+            if (be <= 0)
+                be = 1;
+            BitmapFactory.Options bitmapOptions = new BitmapFactory.Options();
+            bitmapOptions.inSampleSize = be;
+            bitmapOptions.inDither = true;
+            bitmapOptions.inPreferredConfig = Bitmap.Config.ARGB_8888;
+            input = TUIConfig.getAppContext().getContentResolver().openInputStream(uri);
+            bitmap = BitmapFactory.decodeStream(input, null, bitmapOptions);
+
+            input.close();
+            compressImage(bitmap);
+            bitmap = rotateBitmapByDegree(bitmap, degree);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return bitmap;
+    }
+
+    public static Bitmap getBitmapFormPath(String path) {
+        if (TextUtils.isEmpty(path)) {
+            return null;
+        }
+        return getBitmapFormPath(Uri.fromFile(new File(path)));
+    }
+
+    public static Bitmap compressImage(Bitmap image) {
+
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        image.compress(Bitmap.CompressFormat.JPEG, 100, baos);
+        int options = 100;
+        while (baos.toByteArray().length / 1024 > 100) {
+            baos.reset();
+            image.compress(Bitmap.CompressFormat.JPEG, options, baos);
+            options -= 10;
+        }
+        ByteArrayInputStream isBm = new ByteArrayInputStream(baos.toByteArray());
+        Bitmap bitmap = BitmapFactory.decodeStream(isBm, null, null);
+        return bitmap;
+    }
+
+    /**
+     * 读取图片的旋转的角度
+     * 
+     * Read the rotation angle of the image
+     */
+    public static int getBitmapDegree(Uri uri) {
+        int degree = 0;
+        try {
+            ExifInterface exifInterface = new ExifInterface(FileUtil.getPathFromUri(uri));
+            int orientation = exifInterface.getAttributeInt(ExifInterface.TAG_ORIENTATION,
+                    ExifInterface.ORIENTATION_NORMAL);
+            switch (orientation) {
+                case ExifInterface.ORIENTATION_ROTATE_90:
+                    degree = 90;
+                    break;
+                case ExifInterface.ORIENTATION_ROTATE_180:
+                    degree = 180;
+                    break;
+                case ExifInterface.ORIENTATION_ROTATE_270:
+                    degree = 270;
+                    break;
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return degree;
+    }
+
+    /**
+     * 读取图片的旋转的角度
+     * 
+     * Read the rotation angle of the image
+     */
+    public static int getBitmapDegree(String fileName) {
+        int degree = 0;
+        try {
+            ExifInterface exifInterface = new ExifInterface(fileName);
+            int orientation = exifInterface.getAttributeInt(ExifInterface.TAG_ORIENTATION,
+                    ExifInterface.ORIENTATION_NORMAL);
+            switch (orientation) {
+                case ExifInterface.ORIENTATION_ROTATE_90:
+                    degree = 90;
+                    break;
+                case ExifInterface.ORIENTATION_ROTATE_180:
+                    degree = 180;
+                    break;
+                case ExifInterface.ORIENTATION_ROTATE_270:
+                    degree = 270;
+                    break;
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return degree;
+    }
+
+    /**
+     * 将图片按照某个角度进行旋转
+     *
+     * @param bm     需要旋转的图片
+     * @param degree 旋转角度
+     * @return 旋转后的图片
+     * 
+     * 
+     * Rotate the image by an angle
+     * 
+     * @param bm     image to be rotated
+     * @param degree Rotation angle
+     * @return rotated image
+     */
+    public static Bitmap rotateBitmapByDegree(Bitmap bm, int degree) {
+        Bitmap returnBm = null;
+
+        Matrix matrix = new Matrix();
+        matrix.postRotate(degree);
+        try {
+            returnBm = Bitmap.createBitmap(bm, 0, 0, bm.getWidth(), bm.getHeight(), matrix, true);
+        } catch (OutOfMemoryError e) {
+        }
+        if (returnBm == null) {
+            returnBm = bm;
+        }
+        if (bm != returnBm) {
+            bm.recycle();
+        }
+        return returnBm;
+    }
+
+    public static int[] getImageSize(String path) {
+        int size[] = new int[2];
+        try {
+            BitmapFactory.Options onlyBoundsOptions = new BitmapFactory.Options();
+            onlyBoundsOptions.inJustDecodeBounds = true;
+            BitmapFactory.decodeFile(path, onlyBoundsOptions);
+            int originalWidth = onlyBoundsOptions.outWidth;
+            int originalHeight = onlyBoundsOptions.outHeight;
+            //size[0] = originalWidth;
+            //size[1] = originalHeight;
+
+            int degree = getBitmapDegree(path);
+            if (degree == 0) {
+                size[0] = originalWidth;
+                size[1] = originalHeight;
+            } else {
+                float hh = 800f;
+                float ww = 480f;
+                if (degree == 90 || degree == 270) {
+                    hh = 480;
+                    ww = 800;
+                }
+                int be = 1;
+                if (originalWidth > originalHeight && originalWidth > ww) {
+                    be = (int) (originalWidth / ww);
+                } else if (originalWidth < originalHeight && originalHeight > hh) {
+                    be = (int) (originalHeight / hh);
+                }
+                if (be <= 0)
+                    be = 1;
+                BitmapFactory.Options bitmapOptions = new BitmapFactory.Options();
+                bitmapOptions.inSampleSize = be;
+                bitmapOptions.inDither = true;
+                bitmapOptions.inPreferredConfig = Bitmap.Config.ARGB_8888;
+                Bitmap bitmap = BitmapFactory.decodeFile(path, bitmapOptions);
+                bitmap = rotateBitmapByDegree(bitmap, degree);
+                size[0] = bitmap.getWidth();
+                size[1] = bitmap.getHeight();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return size;
+
+    }
+
+
+    // 图片文件先在本地做旋转，返回旋转之后的图片文件路径
+    // The image file is rotated locally, and the path of the image file after rotation is returned.
+    public static String getImagePathAfterRotate(final Uri uri) {
+        try {
+            InputStream is = TUIConfig.getAppContext().getContentResolver()
+                    .openInputStream(uri);
+            Bitmap originBitmap = BitmapFactory.decodeStream(is, null, null);
+            int degree = ImageUtil.getBitmapDegree(uri);
+            if (degree == 0) {
+                return FileUtil.getPathFromUri(uri);
+            } else {
+                Bitmap newBitmap = ImageUtil.rotateBitmapByDegree(originBitmap, degree);
+                String oldName = FileUtil.getFileName(TUIConfig.getAppContext(), uri);
+                File newImageFile = FileUtil.generateFileName(oldName, FileUtil.getDocumentCacheDir(TUIConfig.getAppContext()));
+                if (newImageFile == null) {
+                    return FileUtil.getPathFromUri(uri);
+                }
+                ImageUtil.storeBitmap(newImageFile, newBitmap);
+                newBitmap.recycle();
+                return newImageFile.getAbsolutePath();
+            }
+        }catch (FileNotFoundException e) {
+            return FileUtil.getPathFromUri(uri);
+        }
+    }
+
+    /**
+     * 转换图片成圆形
+     *
+     * @param bitmap 传入Bitmap对象
+     * @return
+     * 
+     * 
+     * Convert image to circle
+     *
+     * @param bitmap   Pass in a Bitmap object
+     * @return
+     */
+    public static Bitmap toRoundBitmap(Bitmap bitmap) {
+        int width = bitmap.getWidth();
+        int height = bitmap.getHeight();
+        float roundPx;
+        float left, top, right, bottom, dst_left, dst_top, dst_right, dst_bottom;
+        if (width <= height) {
+            roundPx = width / 2;
+            left = 0;
+            top = 0;
+            right = width;
+            bottom = width;
+            height = width;
+            dst_left = 0;
+            dst_top = 0;
+            dst_right = width;
+            dst_bottom = width;
+        } else {
+            roundPx = height / 2;
+            float clip = (width - height) / 2;
+            left = clip;
+            right = width - clip;
+            top = 0;
+            bottom = height;
+            width = height;
+            dst_left = 0;
+            dst_top = 0;
+            dst_right = height;
+            dst_bottom = height;
+        }
+
+        Bitmap output = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(output);
+
+        final int color = 0xff424242;
+        final Paint paint = new Paint();
+        final Rect src = new Rect((int) left, (int) top, (int) right, (int) bottom);
+        final Rect dst = new Rect((int) dst_left, (int) dst_top, (int) dst_right, (int) dst_bottom);
+        final RectF rectF = new RectF(dst);
+
+        paint.setAntiAlias(true);
+
+        canvas.drawARGB(0, 0, 0, 0);
+        paint.setColor(color);
+
+        // canvas.drawRoundRect(rectF, roundPx, roundPx, paint);
+        canvas.drawCircle(roundPx, roundPx, roundPx, paint);
+
+        paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
+        canvas.drawBitmap(bitmap, src, dst, paint);
+
+        return output;
+    }
+
+    public static boolean isImageDownloaded(String imagePath) {
+        try {
+            BitmapFactory.Options options = new BitmapFactory.Options();
+            options.inJustDecodeBounds = true;
+            BitmapFactory.decodeFile(imagePath, options);
+//            ImageDecoder.Source src = ImageDecoder.createSource(mContext.getContentResolver(),
+//                    uri, res);
+//            return ImageDecoder.decodeDrawable(src, (decoder, info, s) -> {
+//                decoder.setAllocator(ImageDecoder.ALLOCATOR_SOFTWARE);
+//            });
+
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    /**
+     *  加载高分辨率图片需要做下适配
+     *
+     * @param imagePath 图片路径
+     * @return Bitmap 调整后的位图
+     * 
+     * 
+     * Loading high-resolution images requires adaptation
+     * 
+     * @param imagePath
+     * @return Bitmap
+     */
+    public static Bitmap adaptBitmapFormPath(String imagePath, int reqWidth, int reqHeight){
+        try {
+            BitmapFactory.Options options = new BitmapFactory.Options();
+            options.inJustDecodeBounds = true;
+            BitmapFactory.decodeFile(imagePath, options);
+
+            options.inSampleSize = calculateInSampleSize(options, reqWidth, reqHeight);
+
+            options.inJustDecodeBounds = false;
+            return BitmapFactory.decodeFile(imagePath, options);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    private static int calculateInSampleSize(
+            BitmapFactory.Options options, int reqWidth, int reqHeight) {
+        // Raw height and width of image
+        final int height = options.outHeight;
+        final int width = options.outWidth;
+        int inSampleSize = 1;
+
+        if (height > reqHeight || width > reqWidth) {
+
+            final int halfHeight = height / 2;
+            final int halfWidth = width / 2;
+
+            // Calculate the largest inSampleSize value that is a power of 2 and keeps both
+            // height and width larger than the requested height and width.
+            while ((halfHeight / inSampleSize) >= reqHeight
+                    && (halfWidth / inSampleSize) >= reqWidth) {
+                inSampleSize *= 2;
+            }
+        }
+
+        return inSampleSize;
+    }
+
+
+    /**
+     * 根据图片 UUID 和 类型得到图片文件路径
+     * @param uuid 图片 UUID
+     * @param imageType 图片类型 V2TIMImageElem.V2TIM_IMAGE_TYPE_THUMB , V2TIMImageElem.V2TIM_IMAGE_TYPE_ORIGIN ,
+     *                  V2TIMImageElem.V2TIM_IMAGE_TYPE_LARGE
+     * @return 图片文件路径
+     * 
+     * 
+     * 
+     * 
+     * Get the image file path based on the image UUID and type
+     * @param uuid 
+     * @param imageType V2TIMImageElem.V2TIM_IMAGE_TYPE_THUMB , V2TIMImageElem.V2TIM_IMAGE_TYPE_ORIGIN ,
+     *                  V2TIMImageElem.V2TIM_IMAGE_TYPE_LARGE
+     * @return path
+     */
+//    public static String generateImagePath(String uuid, int imageType) {
+//        return TUIConfig.getImageDownloadDir() + uuid + "_" + imageType;
+//    }
+    public static String generateImagePath(String uuid, int imageType) {
+        String imageTypePreStr;
+        if (imageType == V2TIMImageElem.V2TIM_IMAGE_TYPE_THUMB) {
+            imageTypePreStr = "thumb_";
+        } else if (imageType == V2TIMImageElem.V2TIM_IMAGE_TYPE_ORIGIN) {
+            imageTypePreStr = "origin_";
+        } else if (imageType == V2TIMImageElem.V2TIM_IMAGE_TYPE_LARGE) {
+            imageTypePreStr = "large_";
+        } else {
+            imageTypePreStr = "other_";
+        }
+        return TUIConfig.getImageDownloadDir() + imageTypePreStr + uuid;
+    }
+
+    public static String getGroupConversationAvatar(String groupId) {
+        SPUtils spUtils = SPUtils.getInstance(TUILogin.getSdkAppId() + SP_IMAGE);
+        final String savedIcon = spUtils.getString(groupId, "");
+        if (!TextUtils.isEmpty(savedIcon) && new File(savedIcon).isFile() && new File(savedIcon).exists()) {
+            return savedIcon;
+        }
+        return "";
+    }
+
+    public static void setGroupConversationAvatar(String conversationId, String url) {
+        SPUtils spUtils = SPUtils.getInstance(TUILogin.getSdkAppId() + SP_IMAGE);
+        spUtils.put(conversationId, url);
+    }
+
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/PermissionRequester.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/PermissionRequester.java
new file mode 100644
index 0000000..0935f73
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/PermissionRequester.java
@@ -0,0 +1,623 @@
+package com.tencent.qcloud.tuicore.util;
+
+
+import android.Manifest;
+import android.app.ActionBar;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.StringDef;
+import androidx.core.content.ContextCompat;
+
+import com.tencent.qcloud.tuicore.R;
+import com.tencent.qcloud.tuicore.TUIConfig;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public final class PermissionRequester {
+
+    private static final List<String> PERMISSIONS = getPermissions();
+
+    private static PermissionRequester instance;
+    private static Context applicationContext;
+    private SimpleCallback mSimpleCallback;
+    private FullCallback mFullCallback;
+    private PermissionDialogCallback mDialogCallback;
+    private Set<String> mPermissions;
+    private List<String> mPermissionsRequest;
+    private String mCurrentRequestPermission;
+    private List<String> mPermissionsGranted;
+    private List<String> mPermissionsDenied;
+
+    private static boolean isRequesting = false;
+
+    private String mReason;
+    private String mReasonTitle;
+    private String mDeniedAlert;
+    private int mIconId;
+
+    private static final Map<String, PermissionRequestContent> permissionRequestContentMap = new HashMap<>();
+
+    public static class PermissionRequestContent {
+        int iconResId;
+        String reasonTitle;
+        String reason;
+        String deniedAlert;
+
+        public void setReasonTitle(String reasonTitle) {
+            this.reasonTitle = reasonTitle;
+        }
+
+        public void setReason(String reason) {
+            this.reason = reason;
+        }
+
+        public void setIconResId(int iconResId) {
+            this.iconResId = iconResId;
+        }
+
+        public void setDeniedAlert(String deniedAlert) {
+            this.deniedAlert = deniedAlert;
+        }
+    }
+
+    public static void setPermissionRequestContent(String permission, PermissionRequestContent content) {
+        permissionRequestContentMap.put(permission, content);
+    }
+
+    /**
+     * Return the permissions used in application.
+     *
+     * @return the permissions used in application
+     */
+    public static List<String> getPermissions() {
+        return getPermissions(getApplicationContext().getPackageName());
+    }
+
+    /**
+     * Return the permissions used in application.
+     *
+     * @param packageName The name of the package.
+     * @return the permissions used in application
+     */
+    public static List<String> getPermissions(final String packageName) {
+        PackageManager pm = getApplicationContext().getPackageManager();
+        try {
+            String[] permissions = pm.getPackageInfo(packageName, PackageManager.GET_PERMISSIONS).requestedPermissions;
+            if (permissions == null) return Collections.emptyList();
+            return Arrays.asList(permissions);
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+            return Collections.emptyList();
+        }
+    }
+
+    public static boolean isGranted(final String... permissions) {
+        for (String permission : permissions) {
+            if (!isGranted(permission)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private static boolean isGranted(final String permission) {
+        return TUIBuild.getVersionInt() < Build.VERSION_CODES.M
+                || PackageManager.PERMISSION_GRANTED
+                == ContextCompat.checkSelfPermission(getApplicationContext(), permission);
+    }
+
+    /**
+     * Launch the application's details settings.
+     */
+    public static void launchAppDetailsSettings() {
+        Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+        intent.setData(Uri.parse("package:" + getApplicationContext().getPackageName()));
+        if (!isIntentAvailable(intent)) return;
+        getApplicationContext().startActivity(intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+    }
+
+    /**
+     * Set the permissions.
+     *
+     * @param permission The permissions.
+     * @return the single {@link PermissionRequester} instance
+     */
+    public static PermissionRequester permission(@PermissionConstants.Permission final String permission) {
+        return new PermissionRequester(permission);
+    }
+
+    private static boolean isIntentAvailable(final Intent intent) {
+        return getApplicationContext()
+                .getPackageManager()
+                .queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY)
+                .size() > 0;
+    }
+
+    private PermissionRequester(final String permission) {
+        mPermissions = new LinkedHashSet<>();
+        mCurrentRequestPermission = permission;
+        for (String aPermission : PermissionConstants.getPermissions(permission)) {
+            if (PERMISSIONS.contains(aPermission)) {
+                mPermissions.add(aPermission);
+            }
+        }
+    }
+
+    /**
+     * Set the simple call back.
+     *
+     * @param callback the simple call back
+     * @return the single {@link PermissionRequester} instance
+     */
+    public PermissionRequester callback(final SimpleCallback callback) {
+        mSimpleCallback = callback;
+        return this;
+    }
+
+    /**
+     * Set the full call back.
+     *
+     * @param callback the full call back
+     * @return the single {@link PermissionRequester} instance
+     */
+    public PermissionRequester callback(final FullCallback callback) {
+        mFullCallback = callback;
+        return this;
+    }
+
+    public PermissionRequester reason(String reason) {
+        mReason = reason;
+        return this;
+    }
+
+    public PermissionRequester reasonTitle(String reasonTitle) {
+        mReasonTitle = reasonTitle;
+        return this;
+    }
+
+    public PermissionRequester deniedAlert(String deniedAlert) {
+        mDeniedAlert = deniedAlert;
+        return this;
+    }
+
+    public PermissionRequester reasonIcon(int iconId) {
+        mIconId = iconId;
+        return this;
+    }
+
+    public PermissionRequester permissionDialogCallback(PermissionDialogCallback callback) {
+        mDialogCallback = callback;
+        return this;
+    }
+
+    public void request() {
+        if (isRequesting) {
+            return;
+        }
+        isRequesting = true;
+        instance = this;
+        mPermissionsGranted = new ArrayList<>();
+        mPermissionsRequest = new ArrayList<>();
+        if (TUIBuild.getVersionInt() < Build.VERSION_CODES.M) {
+            mPermissionsGranted.addAll(mPermissions);
+            isRequesting = false;
+            requestCallback();
+        } else {
+            for (String permission : mPermissions) {
+                if (isGranted(permission)) {
+                    mPermissionsGranted.add(permission);
+                } else {
+                    mPermissionsRequest.add(permission);
+                }
+            }
+            if (mPermissionsRequest.isEmpty()) {
+                isRequesting = false;
+                requestCallback();
+            } else {
+                startPermissionActivity();
+            }
+        }
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    private void startPermissionActivity() {
+        mPermissionsDenied = new ArrayList<>();
+        Context context = getApplicationContext();
+        if (context == null) {
+            return;
+        }
+        Intent intent = new Intent(context, PermissionActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(intent);
+    }
+
+    private void getPermissionsStatus() {
+        for (String permission : mPermissionsRequest) {
+            if (isGranted(permission)) {
+                mPermissionsGranted.add(permission);
+            } else {
+                mPermissionsDenied.add(permission);
+            }
+        }
+    }
+
+    private void requestCallback() {
+        if (mSimpleCallback != null) {
+            if (mPermissionsRequest.size() == 0
+                    || mPermissions.size() == mPermissionsGranted.size()) {
+                mSimpleCallback.onGranted();
+            } else {
+                if (!mPermissionsDenied.isEmpty()) {
+                    mSimpleCallback.onDenied();
+                }
+            }
+            mSimpleCallback = null;
+        }
+        if (mFullCallback != null) {
+            if (mPermissionsRequest.size() == 0
+                    || mPermissions.size() == mPermissionsGranted.size()) {
+                mFullCallback.onGranted(mPermissionsGranted);
+            } else {
+                if (!mPermissionsDenied.isEmpty()) {
+                    mFullCallback.onDenied(mPermissionsDenied);
+                }
+            }
+            mFullCallback = null;
+        }
+        mDialogCallback = null;
+    }
+
+    private void onRequestPermissionsResult(final Activity activity) {
+
+        getPermissionsStatus();
+        if (!mPermissionsDenied.isEmpty()) {
+            showPermissionDialog(activity, new PermissionDialogCallback() {
+                @Override
+                public void onApproved() {
+                    if (mDialogCallback != null) {
+                        mDialogCallback.onApproved();
+                    }
+                    mDialogCallback = null;
+                    launchAppDetailsSettings();
+                }
+
+                @Override
+                public void onRefused() {
+                    if (mDialogCallback != null) {
+                        mDialogCallback.onRefused();
+                    }
+                    mDialogCallback = null;
+                }
+            });
+        } else {
+            isRequesting = false;
+            mDialogCallback = null;
+            activity.finish();
+        }
+
+        requestCallback();
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.M)
+    public static class PermissionActivity extends Activity {
+        private View mContentView;
+
+        @Override
+        protected void onCreate(@Nullable Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            if (TUIBuild.getVersionInt() >= Build.VERSION_CODES.LOLLIPOP) {
+                View decorView = getWindow().getDecorView();
+                decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                        | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+                getWindow().setStatusBarColor(Color.TRANSPARENT);
+                getWindow().setNavigationBarColor(Color.TRANSPARENT);
+            }
+            ActionBar actionBar = getActionBar();
+            if (actionBar != null) {
+                actionBar.hide();
+            }
+
+            requestPermission();
+        }
+
+        private void requestPermission() {
+            if (instance.mPermissionsRequest != null) {
+                int size = instance.mPermissionsRequest.size();
+                if (size <= 0) {
+                    instance.onRequestPermissionsResult(this);
+                } else {
+                    fillContentView();
+                    requestPermissions(instance.mPermissionsRequest.toArray(new String[size]), 1);
+                }
+            }
+        }
+
+        private void fillContentView() {
+            PermissionRequestContent info = permissionRequestContentMap.get(instance.mCurrentRequestPermission);
+            int iconResId = instance.mIconId;
+            String reasonTitle = instance.mReasonTitle;
+            String reason = instance.mReason;
+            if (info != null) {
+                if (info.iconResId != 0) {
+                    iconResId = info.iconResId;
+                }
+                if (!TextUtils.isEmpty(info.reasonTitle)) {
+                    reasonTitle = info.reasonTitle;
+                }
+                if (!TextUtils.isEmpty(info.reason)) {
+                    reason = info.reason;
+                }
+            }
+            if (TextUtils.isEmpty(reason)) {
+                return;
+            }
+            setContentView(R.layout.permission_activity_layout);
+            mContentView = findViewById(R.id.tuicore_permission_layout);
+            TextView permissionReasonTitle = findViewById(R.id.permission_reason_title);
+            TextView permissionReason = findViewById(R.id.permission_reason);
+            ImageView permissionIcon = findViewById(R.id.permission_icon);
+            permissionReasonTitle.setText(reasonTitle);
+            permissionReason.setText(reason);
+            if (iconResId != 0) {
+                permissionIcon.setBackgroundResource(iconResId);
+            }
+        }
+
+        private void hideContentView() {
+            if (mContentView != null) {
+                mContentView.setVisibility(View.INVISIBLE);
+            }
+        }
+
+        @Override
+        public void onRequestPermissionsResult(int requestCode,
+                                               @NonNull String[] permissions,
+                                               @NonNull int[] grantResults) {
+
+            if (instance.mPermissionsRequest != null) {
+                hideContentView();
+                instance.onRequestPermissionsResult(this);
+            }
+        }
+
+        @Override
+        public boolean dispatchTouchEvent(MotionEvent ev) {
+            return super.dispatchTouchEvent(ev);
+        }
+
+        @Override
+        public boolean onTouchEvent(MotionEvent event) {
+            return true;
+        }
+
+        @Override
+        protected void onDestroy() {
+            super.onDestroy();
+            isRequesting = false;
+        }
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // interface
+    ///////////////////////////////////////////////////////////////////////////
+
+
+    public interface SimpleCallback {
+        void onGranted();
+        void onDenied();
+    }
+
+    public interface FullCallback {
+        void onGranted(List<String> permissionsGranted);
+        void onDenied(List<String> permissionsDenied);
+    }
+
+    public static final class PermissionConstants {
+
+        public static final String CALENDAR   = Manifest.permission_group.CALENDAR;
+        public static final String CAMERA     = Manifest.permission_group.CAMERA;
+        public static final String CONTACTS   = Manifest.permission_group.CONTACTS;
+        public static final String LOCATION   = Manifest.permission_group.LOCATION;
+        public static final String MICROPHONE = Manifest.permission_group.MICROPHONE;
+        public static final String PHONE      = Manifest.permission_group.PHONE;
+        public static final String SENSORS    = Manifest.permission_group.SENSORS;
+        public static final String SMS        = Manifest.permission_group.SMS;
+        public static final String STORAGE    = Manifest.permission_group.STORAGE;
+
+        private static final String[] GROUP_CALENDAR      = {
+                Manifest.permission.READ_CALENDAR, Manifest.permission.WRITE_CALENDAR
+        };
+        private static final String[] GROUP_CAMERA        = {
+                Manifest.permission.CAMERA
+        };
+        private static final String[] GROUP_CONTACTS      = {
+                Manifest.permission.READ_CONTACTS, Manifest.permission.WRITE_CONTACTS, Manifest.permission.GET_ACCOUNTS
+        };
+        private static final String[] GROUP_LOCATION      = {
+                Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION
+        };
+        private static final String[] GROUP_MICROPHONE    = {
+                Manifest.permission.RECORD_AUDIO
+        };
+        private static final String[] GROUP_PHONE         = {
+                Manifest.permission.READ_PHONE_STATE, Manifest.permission.READ_PHONE_NUMBERS, Manifest.permission.CALL_PHONE,
+                Manifest.permission.READ_CALL_LOG, Manifest.permission.WRITE_CALL_LOG, Manifest.permission.ADD_VOICEMAIL,
+                Manifest.permission.USE_SIP, Manifest.permission.PROCESS_OUTGOING_CALLS, Manifest.permission.ANSWER_PHONE_CALLS
+        };
+        private static final String[] GROUP_PHONE_BELOW_O = {
+                Manifest.permission.READ_PHONE_STATE, Manifest.permission.READ_PHONE_NUMBERS, Manifest.permission.CALL_PHONE,
+                Manifest.permission.READ_CALL_LOG, Manifest.permission.WRITE_CALL_LOG, Manifest.permission.ADD_VOICEMAIL,
+                Manifest.permission.USE_SIP, Manifest.permission.PROCESS_OUTGOING_CALLS
+        };
+        private static final String[] GROUP_SENSORS       = {
+                Manifest.permission.BODY_SENSORS
+        };
+        private static final String[] GROUP_SMS           = {
+                Manifest.permission.SEND_SMS, Manifest.permission.RECEIVE_SMS, Manifest.permission.READ_SMS,
+                Manifest.permission.RECEIVE_WAP_PUSH, Manifest.permission.RECEIVE_MMS,
+        };
+        private static final String[] GROUP_STORAGE       = {
+                Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE,
+        };
+
+        @StringDef({CALENDAR, CAMERA, CONTACTS, LOCATION, MICROPHONE, PHONE, SENSORS, SMS, STORAGE,})
+        @Retention(RetentionPolicy.SOURCE)
+        public @interface Permission {
+        }
+
+        public static String[] getPermissions(@Permission final String permission) {
+            switch (permission) {
+                case CALENDAR:
+                    return GROUP_CALENDAR;
+                case CAMERA:
+                    return GROUP_CAMERA;
+                case CONTACTS:
+                    return GROUP_CONTACTS;
+                case LOCATION:
+                    return GROUP_LOCATION;
+                case MICROPHONE:
+                    return GROUP_MICROPHONE;
+                case PHONE:
+                    if (TUIBuild.getVersionInt() < Build.VERSION_CODES.O) {
+                        return GROUP_PHONE_BELOW_O;
+                    } else {
+                        return GROUP_PHONE;
+                    }
+                case SENSORS:
+                    return GROUP_SENSORS;
+                case SMS:
+                    return GROUP_SMS;
+                case STORAGE:
+                    return GROUP_STORAGE;
+            }
+            return new String[]{permission};
+        }
+    }
+
+    private static Context getApplicationContext() {
+        if (applicationContext == null) {
+            applicationContext = TUIConfig.getAppContext();
+        }
+        return applicationContext;
+    }
+
+    public void showPermissionDialog(Activity activity, PermissionDialogCallback callback) {
+
+        PermissionRequestContent info = permissionRequestContentMap.get(instance.mCurrentRequestPermission);
+        String deniedAlert = mDeniedAlert;
+        if (info != null) {
+            if (!TextUtils.isEmpty(info.deniedAlert)) {
+                deniedAlert = info.deniedAlert;
+            }
+        }
+
+        if (TextUtils.isEmpty(deniedAlert)) {
+            deniedAlert = mReason;
+        }
+
+        if (TextUtils.isEmpty(deniedAlert)) {
+            isRequesting = false;
+            activity.finish();
+            callback.onRefused();
+            return;
+        }
+
+        activity.setContentView(R.layout.permission_activity_layout);
+
+        View itemPop = LayoutInflater.from(activity).inflate(R.layout.permission_tip_layout, null);
+        TextView tipsTv = itemPop.findViewById(R.id.tips);
+        TextView positiveBtn = itemPop.findViewById(R.id.positive_btn);
+        TextView negativeBtn = itemPop.findViewById(R.id.negative_btn);
+        tipsTv.setText(deniedAlert);
+
+        Dialog permissionTipDialog = new AlertDialog.Builder(activity)
+                .setView(itemPop)
+                .setCancelable(false)
+                .setOnDismissListener(new DialogInterface.OnDismissListener() {
+                    @Override
+                    public void onDismiss(DialogInterface dialog) {
+                        isRequesting = false;
+                    }
+                })
+                .create();
+
+        positiveBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                isRequesting = false;
+                permissionTipDialog.cancel();
+                activity.finish();
+                callback.onApproved();
+            }
+        });
+
+        negativeBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                isRequesting = false;
+                permissionTipDialog.cancel();
+                activity.finish();
+                callback.onRefused();
+            }
+        });
+        permissionTipDialog.setOnKeyListener(new DialogInterface.OnKeyListener() {
+            @Override
+            public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
+                if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN) {
+                    isRequesting = false;
+                    permissionTipDialog.cancel();
+                    activity.finish();
+                    callback.onRefused();
+                }
+                return false;
+            }
+        });
+
+        permissionTipDialog.show();
+        Window dialogWindow = permissionTipDialog.getWindow();
+        dialogWindow.setBackgroundDrawable(new ColorDrawable());
+        WindowManager.LayoutParams layoutParams = dialogWindow.getAttributes();
+        layoutParams.width = WindowManager.LayoutParams.WRAP_CONTENT;
+        layoutParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
+        dialogWindow.setAttributes(layoutParams);
+    }
+
+    public interface PermissionDialogCallback{
+        void onApproved();
+        void onRefused();
+    }
+
+}
\ No newline at end of file
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/PopWindowUtil.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/PopWindowUtil.java
new file mode 100644
index 0000000..f1d913c
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/PopWindowUtil.java
@@ -0,0 +1,45 @@
+package com.tencent.qcloud.tuicore.util;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Build;
+import android.view.Gravity;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
+
+import com.tencent.qcloud.tuicore.R;
+
+public class PopWindowUtil {
+
+    public static AlertDialog buildFullScreenDialog(Activity activity) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            if (activity.isDestroyed())
+                return null;
+        }
+        AlertDialog.Builder builder = new AlertDialog.Builder(activity, R.style.TUIKit_AlertDialogStyle);
+        builder.setTitle("");
+        builder.setCancelable(true);
+        AlertDialog dialog = builder.create();
+        dialog.getWindow().setDimAmount(0);
+        dialog.setCanceledOnTouchOutside(true);
+        dialog.show();
+        dialog.getWindow().setLayout(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
+        dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+        return dialog;
+    }
+
+    public static PopupWindow popupWindow(View windowView, View parent, int x, int y) {
+        PopupWindow popup = new PopupWindow(windowView, WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT);
+//        int[] position = calculatePopWindowPos(windowView, parent, x, y);
+        popup.setOutsideTouchable(true);
+        popup.setFocusable(true);
+        popup.setBackgroundDrawable(new ColorDrawable(0xAEEEEE00));
+        popup.showAtLocation(windowView, Gravity.CENTER | Gravity.TOP, x, y);
+        return popup;
+    }
+
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/SPUtils.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/SPUtils.java
new file mode 100644
index 0000000..19f51b5
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/SPUtils.java
@@ -0,0 +1,203 @@
+package com.tencent.qcloud.tuicore.util;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import androidx.annotation.NonNull;
+
+import com.tencent.qcloud.tuicore.ServiceInitializer;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class SPUtils {
+
+    public static final String DEFAULT_DATABASE = "tuikit";
+    private static final Map<String, SPUtils> SP_UTILS_MAP = new HashMap<>();
+
+    private final SharedPreferences mSharedPreferences;
+
+    public static SPUtils getInstance() {
+        return getInstance(DEFAULT_DATABASE, Context.MODE_PRIVATE);
+    }
+
+    public static SPUtils getInstance(final int mode) {
+        return getInstance(DEFAULT_DATABASE, mode);
+    }
+
+    public static SPUtils getInstance(String spName) {
+        return getInstance(spName, Context.MODE_PRIVATE);
+    }
+
+    public static SPUtils getInstance(String spName, final int mode) {
+        if (isSpace(spName)) {
+            spName = DEFAULT_DATABASE;
+        }
+        SPUtils spUtils = SP_UTILS_MAP.get(spName);
+        if (spUtils == null) {
+            synchronized (SPUtils.class) {
+                spUtils = SP_UTILS_MAP.get(spName);
+                if (spUtils == null) {
+                    spUtils = new SPUtils(spName, mode);
+                    SP_UTILS_MAP.put(spName, spUtils);
+                }
+            }
+        }
+        return spUtils;
+    }
+
+    private SPUtils(final String spName, final int mode) {
+        mSharedPreferences = getApplicationContext().getSharedPreferences(spName, mode);
+    }
+
+    private Context getApplicationContext() {
+        return ServiceInitializer.getAppContext();
+    }
+
+
+    // String
+    public void put(@NonNull final String key, final String value) {
+        put(key, value, false);
+    }
+
+    public void put(@NonNull final String key, final String value, final boolean isCommit) {
+        if (isCommit) {
+            mSharedPreferences.edit().putString(key, value).commit();
+        } else {
+            mSharedPreferences.edit().putString(key, value).apply();
+        }
+    }
+
+    public String getString(@NonNull final String key) {
+        return getString(key, "");
+    }
+
+    public String getString(@NonNull final String key, final String defaultValue) {
+        return mSharedPreferences.getString(key, defaultValue);
+    }
+
+    // boolean
+    public void put(@NonNull final String key, final boolean value) {
+        put(key, value, false);
+    }
+
+    public void put(@NonNull final String key, final boolean value, final boolean isCommit) {
+        if (isCommit) {
+            mSharedPreferences.edit().putBoolean(key, value).commit();
+        } else {
+            mSharedPreferences.edit().putBoolean(key, value).apply();
+        }
+    }
+
+    public boolean getBoolean(@NonNull final String key) {
+        return getBoolean(key, false);
+    }
+
+    public boolean getBoolean(@NonNull final String key, final boolean defaultValue) {
+        return mSharedPreferences.getBoolean(key, defaultValue);
+    }
+
+    // int
+    public void put(@NonNull final String key, final int value) {
+        put(key, value, false);
+    }
+
+    public void put(@NonNull final String key, final int value, final boolean isCommit) {
+        if (isCommit) {
+            mSharedPreferences.edit().putInt(key, value).commit();
+        } else {
+            mSharedPreferences.edit().putInt(key, value).apply();
+        }
+    }
+
+    public int getInt(@NonNull final String key) {
+        return getInt(key, -1);
+    }
+
+    public int getInt(@NonNull final String key, final int defaultValue) {
+        return mSharedPreferences.getInt(key, defaultValue);
+    }
+
+    // float
+    public void put(@NonNull final String key, final float value) {
+        put(key, value, false);
+    }
+
+    public void put(@NonNull final String key, final float value, final boolean isCommit) {
+        if (isCommit) {
+            mSharedPreferences.edit().putFloat(key, value).commit();
+        } else {
+            mSharedPreferences.edit().putFloat(key, value).apply();
+        }
+    }
+
+    public float getFloat(@NonNull final String key) {
+        return getFloat(key, -1f);
+    }
+
+    public float getFloat(@NonNull final String key, final float defaultValue) {
+        return mSharedPreferences.getFloat(key, defaultValue);
+    }
+
+    // long
+    public void put(@NonNull final String key, final long value) {
+        put(key, value, false);
+    }
+
+    public void put(@NonNull final String key, final long value, final boolean isCommit) {
+        if (isCommit) {
+            mSharedPreferences.edit().putLong(key, value).commit();
+        } else {
+            mSharedPreferences.edit().putLong(key, value).apply();
+        }
+    }
+
+    public long getLong(@NonNull final String key) {
+        return getLong(key, -1L);
+    }
+
+    public long getLong(@NonNull final String key, final long defaultValue) {
+        return mSharedPreferences.getLong(key, defaultValue);
+    }
+
+
+    public boolean contains(@NonNull final String key) {
+        return mSharedPreferences.contains(key);
+    }
+
+    public void remove(@NonNull final String key) {
+        remove(key, false);
+    }
+
+    public void remove(@NonNull final String key, final boolean isCommit) {
+        if (isCommit) {
+            mSharedPreferences.edit().remove(key).commit();
+        } else {
+            mSharedPreferences.edit().remove(key).apply();
+        }
+    }
+
+    public void clear() {
+        clear(false);
+    }
+
+    public void clear(final boolean isCommit) {
+        if (isCommit) {
+            mSharedPreferences.edit().clear().commit();
+        } else {
+            mSharedPreferences.edit().clear().apply();
+        }
+    }
+
+    private static boolean isSpace(final String s) {
+        if (s == null) {
+            return true;
+        }
+        for (int i = 0, len = s.length(); i < len; ++i) {
+            if (!Character.isWhitespace(s.charAt(i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/ScreenUtil.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/ScreenUtil.java
new file mode 100644
index 0000000..ed22685
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/ScreenUtil.java
@@ -0,0 +1,85 @@
+package com.tencent.qcloud.tuicore.util;
+
+import android.content.Context;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.Display;
+import android.view.WindowManager;
+
+import com.tencent.qcloud.tuicore.TUIConfig;
+
+public class ScreenUtil {
+
+    private static final String TAG = ScreenUtil.class.getSimpleName();
+
+    public static int getScreenHeight(Context context) {
+        DisplayMetrics metric = new DisplayMetrics();
+        WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+        wm.getDefaultDisplay().getMetrics(metric);
+        return metric.heightPixels;
+    }
+
+    public static int getScreenWidth(Context context) {
+        DisplayMetrics metric = new DisplayMetrics();
+        WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+        wm.getDefaultDisplay().getMetrics(metric);
+        return metric.widthPixels;
+    }
+
+    public static int getPxByDp(float dp) {
+        float scale = TUIConfig.getAppContext().getResources().getDisplayMetrics().density;
+        return (int) (dp * scale + 0.5f);
+    }
+
+    public static int getRealScreenHeight(Context context) {
+        WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+        Display display = wm.getDefaultDisplay();
+        DisplayMetrics dm = new DisplayMetrics();
+        display.getRealMetrics(dm);
+        return dm.heightPixels;
+    }
+
+    public static int getRealScreenWidth(Context context) {
+        WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+        Display display = wm.getDefaultDisplay();
+        DisplayMetrics dm = new DisplayMetrics();
+        display.getRealMetrics(dm);
+        return dm.widthPixels;
+    }
+
+    public static int getNavigationBarHeight(Context context){
+        int resourceId = context.getResources().getIdentifier("navigation_bar_height", "dimen", "android");
+        if (resourceId > 0) {
+            return context.getResources().getDimensionPixelSize(resourceId);
+        }
+        return 0;
+    }
+
+    public static int[] scaledSize(int containerWidth, int containerHeight, int realWidth, int realHeight) {
+        Log.i(TAG, "scaledSize  containerWidth: " + containerWidth + " containerHeight: " + containerHeight
+                + " realWidth: " + realWidth + " realHeight: " + realHeight);
+        float deviceRate = (float) containerWidth / (float) containerHeight;
+        float rate = (float) realWidth / (float) realHeight;
+        int width = 0;
+        int height = 0;
+        if (rate < deviceRate) {
+            height = containerHeight;
+            width = (int) (containerHeight * rate);
+        } else {
+            width = containerWidth;
+            height = (int) (containerWidth / rate);
+        }
+        return new int[]{width, height};
+    }
+
+    public static int dip2px(float dpValue) {
+        final float scale = TUIConfig.getAppContext().getResources().getDisplayMetrics().density;
+        return (int) (dpValue * scale + 0.5f);
+    }
+
+    public static float dp2px(float dpValue, DisplayMetrics displayMetrics) {
+        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dpValue, displayMetrics);
+    }
+
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/SoftKeyBoardUtil.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/SoftKeyBoardUtil.java
new file mode 100644
index 0000000..d82e077
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/SoftKeyBoardUtil.java
@@ -0,0 +1,63 @@
+package com.tencent.qcloud.tuicore.util;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.os.IBinder;
+import android.util.DisplayMetrics;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
+
+import com.tencent.qcloud.tuicore.TUIConfig;
+
+public class SoftKeyBoardUtil {
+
+    public static void hideKeyBoard(IBinder token) {
+        InputMethodManager imm = (InputMethodManager) TUIConfig.getAppContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+        if (imm != null) {
+            imm.hideSoftInputFromWindow(token, 0);
+        }
+    }
+
+    public static void showKeyBoard(Window window) {
+        InputMethodManager imm = (InputMethodManager) TUIConfig.getAppContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+        if (imm != null) {
+            if (!isSoftInputShown(window)) {
+                imm.toggleSoftInput(0, 0);
+            }
+        }
+    }
+
+    public static void hideKeyBoard(Window window) {
+        InputMethodManager imm = (InputMethodManager) TUIConfig.getAppContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+        if (imm != null) {
+            if (isSoftInputShown(window)) {
+                imm.toggleSoftInput(0, 0);
+            }
+        }
+    }
+
+    private static boolean isSoftInputShown(Window window) {
+        View decorView = window.getDecorView();
+        int screenHeight = decorView.getHeight();
+        Rect rect = new Rect();
+        decorView.getWindowVisibleDisplayFrame(rect);
+        return screenHeight - rect.bottom - getNavigateBarHeight(window.getWindowManager()) >= 0;
+    }
+
+    private static int getNavigateBarHeight(WindowManager windowManager) {
+        DisplayMetrics metrics = new DisplayMetrics();
+        windowManager.getDefaultDisplay().getMetrics(metrics);
+        int usableHeight = metrics.heightPixels;
+        windowManager.getDefaultDisplay().getRealMetrics(metrics);
+        int realHeight = metrics.heightPixels;
+        if (realHeight > usableHeight) {
+            return realHeight - usableHeight;
+        } else {
+            return 0;
+        }
+    }
+
+}
+
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/TUIBuild.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/TUIBuild.java
new file mode 100644
index 0000000..e97d8b8
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/TUIBuild.java
@@ -0,0 +1,188 @@
+package com.tencent.qcloud.tuicore.util;
+
+import android.os.Build;
+import android.util.Log;
+
+public final class TUIBuild {
+
+    private static final String TAG = "TUIBuild";
+
+    private static String MODEL = ""; //Build.MODEL;
+    private static String BRAND = ""; //Build.BRAND;
+    private static String DEVICE = ""; //Build.DEVICE;
+    private static String MANUFACTURER = ""; //Build.MANUFACTURER;
+    private static String HARDWARE = ""; //Build.HARDWARE;
+    private static String VERSION = ""; //Build.VERSION.RELEASE;
+    private static String BOARD  = ""; //Build.BOARD;
+    private static String VERSION_INCREMENTAL = ""; //Build.VERSION.INCREMENTAL
+    private static int VERSION_INT = 0;  //Build.VERSION.SDK_INT;
+
+    public static void setModel(final String model) {
+        synchronized (TUIBuild.class) {
+            MODEL = model;
+        }
+    }
+
+    public static String getModel() {
+        if (MODEL == null || MODEL.isEmpty()) {
+            synchronized (TUIBuild.class) {
+                if (MODEL == null || MODEL.isEmpty()) {
+                    MODEL = Build.MODEL;
+                    Log.i(TAG, "get MODEL by Build.MODEL :" + MODEL);
+                }
+            }
+        }
+        return MODEL;
+    }
+
+    public static void setBrand(final String brand) {
+        synchronized (TUIBuild.class) {
+            BRAND = brand;
+        }
+    }
+
+    public static String getBrand() {
+        if (BRAND == null || BRAND.isEmpty()) {
+            synchronized (TUIBuild.class) {
+                if (BRAND == null || BRAND.isEmpty()) {
+                    BRAND = Build.BRAND;
+                    Log.i(TAG, "get BRAND by Build.BRAND :" + BRAND);
+                }
+            }
+        }
+
+        return BRAND;
+    }
+
+    public static void setDevice(final String device) {
+        synchronized (TUIBuild.class) {
+            DEVICE = device;
+        }
+    }
+
+    public static String getDevice() {
+        if (DEVICE == null || DEVICE.isEmpty()) {
+            synchronized (TUIBuild.class) {
+                if (DEVICE == null || DEVICE.isEmpty()) {
+                    DEVICE = Build.DEVICE;
+                    Log.i(TAG, "get DEVICE by Build.DEVICE :" + DEVICE);
+                }
+            }
+        }
+
+        return DEVICE;
+    }
+
+    public static void setManufacturer(final String manufacturer) {
+        synchronized (TUIBuild.class) {
+            MANUFACTURER = manufacturer;
+        }
+    }
+
+    public static String getManufacturer() {
+        if (MANUFACTURER == null || MANUFACTURER.isEmpty()) {
+            synchronized (TUIBuild.class) {
+                if (MANUFACTURER == null || MANUFACTURER.isEmpty()) {
+                    MANUFACTURER = Build.MANUFACTURER;
+                    Log.i(TAG, "get MANUFACTURER by Build.MANUFACTURER :" + MANUFACTURER);
+                }
+            }
+        }
+
+        return MANUFACTURER;
+    }
+
+    public static void setHardware(final String hardware) {
+        synchronized (TUIBuild.class) {
+            HARDWARE = hardware;
+        }
+    }
+
+    public static String getHardware() {
+        if (HARDWARE == null || HARDWARE.isEmpty()) {
+            synchronized (TUIBuild.class) {
+                if (HARDWARE == null || HARDWARE.isEmpty()) {
+                    HARDWARE = Build.HARDWARE;
+                    Log.i(TAG, "get HARDWARE by Build.HARDWARE :" + HARDWARE);
+                }
+            }
+        }
+
+        return HARDWARE;
+    }
+
+    public static void setVersion(final String version) {
+        synchronized (TUIBuild.class) {
+            VERSION = version;
+        }
+    }
+
+    public static String getVersion() {
+        if (VERSION == null || VERSION.isEmpty()) {
+            synchronized (TUIBuild.class) {
+                if (VERSION == null || VERSION.isEmpty()) {
+                    VERSION = Build.VERSION.RELEASE;
+                    Log.i(TAG, "get VERSION by Build.VERSION.RELEASE :" + VERSION);
+                }
+            }
+        }
+
+        return VERSION;
+    }
+
+    public static void setVersionInt(final int versionInt) {
+        synchronized (TUIBuild.class) {
+            VERSION_INT = versionInt;
+        }
+    }
+
+    public static int getVersionInt() {
+        if (VERSION_INT == 0) {
+            synchronized (TUIBuild.class) {
+                if (VERSION_INT == 0) {
+                    VERSION_INT = Build.VERSION.SDK_INT;
+                    Log.i(TAG, "get VERSION_INT by Build.VERSION.SDK_INT :" + VERSION_INT);
+                }
+            }
+        }
+
+        return VERSION_INT;
+    }
+
+    public static void setVersionIncremental(final String version_incremental) {
+        synchronized (TUIBuild.class) {
+            VERSION_INCREMENTAL = version_incremental;
+        }
+    }
+
+    public static String getVersionIncremental() {
+        if (VERSION_INCREMENTAL == null || VERSION_INCREMENTAL.isEmpty()) {
+            synchronized (TUIBuild.class) {
+                if (VERSION_INCREMENTAL == null || VERSION_INCREMENTAL.isEmpty()) {
+                    VERSION_INCREMENTAL = Build.VERSION.INCREMENTAL;
+                    Log.i(TAG, "get VERSION_INCREMENTAL by Build.VERSION.INCREMENTAL :" + VERSION_INCREMENTAL);
+                }
+            }
+        }
+        return VERSION_INCREMENTAL;
+    }
+
+    public static void setBoard(final String board) {
+        synchronized (TUIBuild.class) {
+            BOARD = board;
+        }
+    }
+
+    public static String getBoard() {
+        if (BOARD == null || BOARD.isEmpty()) {
+            synchronized (TUIBuild.class) {
+                if (BOARD == null || BOARD.isEmpty()) {
+                    BOARD = Build.BOARD;
+                    Log.i(TAG, "get BOARD by Build.BOARD :" + BOARD);
+                }
+            }
+        }
+
+        return BOARD;
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/TUIFileProvider.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/TUIFileProvider.java
new file mode 100644
index 0000000..71fae94
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/TUIFileProvider.java
@@ -0,0 +1,6 @@
+package com.tencent.qcloud.tuicore.util;
+
+import androidx.core.content.FileProvider;
+
+public class TUIFileProvider extends FileProvider {
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/TUIUtil.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/TUIUtil.java
new file mode 100644
index 0000000..ee00cd3
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/TUIUtil.java
@@ -0,0 +1,57 @@
+package com.tencent.qcloud.tuicore.util;
+
+import android.app.Application;
+import android.content.Context;
+import android.os.Build;
+import android.text.TextUtils;
+
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.qcloud.tuicore.R;
+import com.tencent.qcloud.tuicore.TUIThemeManager;
+
+import java.lang.reflect.Method;
+
+public class TUIUtil {
+    private static String currentProcessName = "";
+
+    public static String getProcessName() {
+        if (!TextUtils.isEmpty(currentProcessName)) {
+            return currentProcessName;
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            currentProcessName = Application.getProcessName();
+            return currentProcessName;
+        }
+
+        try {
+            final Method declaredMethod = Class.forName("android.app.ActivityThread", false, Application.class.getClassLoader())
+                    .getDeclaredMethod("currentProcessName", (Class<?>[]) new Class[0]);
+            declaredMethod.setAccessible(true);
+            final Object invoke = declaredMethod.invoke(null, new Object[0]);
+            if (invoke instanceof String) {
+                currentProcessName = (String) invoke;
+            }
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+
+        return currentProcessName;
+    }
+
+    public static int getDefaultGroupIconResIDByGroupType(Context context, String groupType) {
+        if (context == null || TextUtils.isEmpty(groupType)) {
+            return R.drawable.core_default_group_icon_community;
+        }
+        if (TextUtils.equals(groupType, V2TIMManager.GROUP_TYPE_WORK)) {
+            return TUIThemeManager.getAttrResId(context, R.attr.core_default_group_icon_work);
+        } else if (TextUtils.equals(groupType, V2TIMManager.GROUP_TYPE_MEETING)) {
+            return TUIThemeManager.getAttrResId(context, R.attr.core_default_group_icon_meeting);
+        } else if (TextUtils.equals(groupType, V2TIMManager.GROUP_TYPE_PUBLIC)) {
+            return TUIThemeManager.getAttrResId(context, R.attr.core_default_group_icon_public);
+        } else if (TextUtils.equals(groupType, V2TIMManager.GROUP_TYPE_COMMUNITY)) {
+            return TUIThemeManager.getAttrResId(context, R.attr.core_default_group_icon_community);
+        }
+        return R.drawable.core_default_group_icon_community;
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/ThreadHelper.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/ThreadHelper.java
new file mode 100644
index 0000000..43bcb86
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/ThreadHelper.java
@@ -0,0 +1,47 @@
+package com.tencent.qcloud.tuicore.util;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * 线程工具，用于执行线程等
+ * 
+ * Threading tools
+ */
+public final class ThreadHelper {
+    public static final ThreadHelper INST = new ThreadHelper();
+
+    private ExecutorService executors;
+
+    private ThreadHelper(){
+    }
+
+    /**
+     * 在线程中执行
+     * @param runnable 要执行的runnable
+     * 
+     * execute in thread
+     */
+    public void execute(Runnable runnable) {
+        ExecutorService executorService = getExecutorService();
+        if (executorService != null) {
+            executorService.execute(runnable);
+        } else {
+            new Thread(runnable).start();
+        }
+    }
+
+    /**
+     * 获取缓存线程池
+     * @return 缓存线程池服务
+     * 
+     * Get the cache thread pool
+     */
+    private ExecutorService getExecutorService(){
+        if (executors == null) {
+            executors = Executors.newCachedThreadPool();
+        }
+
+        return executors;
+    }
+}
diff --git a/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/ToastUtil.java b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/ToastUtil.java
new file mode 100644
index 0000000..02cb0a1
--- /dev/null
+++ b/system/tuicore/src/main/java/com/tencent/qcloud/tuicore/util/ToastUtil.java
@@ -0,0 +1,44 @@
+package com.tencent.qcloud.tuicore.util;
+
+import android.view.Gravity;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.tencent.qcloud.tuicore.ServiceInitializer;
+
+public class ToastUtil {
+
+    private static Toast toast;
+
+    public static void toastLongMessage(final String message) {
+        toastMessage(message, true);
+    }
+
+    public static void toastShortMessage(final String message) {
+        toastMessage(message, false);
+    }
+
+    private static void toastMessage(final String message, boolean isLong) {
+        BackgroundTasks.getInstance().runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                if (toast != null) {
+                    toast.cancel();
+                    toast = null;
+                }
+                toast = Toast.makeText(ServiceInitializer.getAppContext(), message,
+                        isLong ? Toast.LENGTH_LONG : Toast.LENGTH_SHORT);
+                View view = toast.getView();
+                if (view != null) {
+                    TextView textView = view.findViewById(android.R.id.message);
+                    if (textView != null) {
+                        textView.setGravity(Gravity.CENTER);
+                    }
+                }
+                toast.show();
+            }
+        });
+    }
+
+}
diff --git a/system/tuicore/src/main/res-light/drawable-xxhdpi/core_default_group_icon_community_light.png b/system/tuicore/src/main/res-light/drawable-xxhdpi/core_default_group_icon_community_light.png
new file mode 100644
index 0000000..67d36c2
Binary files /dev/null and b/system/tuicore/src/main/res-light/drawable-xxhdpi/core_default_group_icon_community_light.png differ
diff --git a/system/tuicore/src/main/res-light/drawable-xxhdpi/core_default_group_icon_meeting_light.png b/system/tuicore/src/main/res-light/drawable-xxhdpi/core_default_group_icon_meeting_light.png
new file mode 100644
index 0000000..f32ec47
Binary files /dev/null and b/system/tuicore/src/main/res-light/drawable-xxhdpi/core_default_group_icon_meeting_light.png differ
diff --git a/system/tuicore/src/main/res-light/drawable-xxhdpi/core_default_group_icon_public_light.png b/system/tuicore/src/main/res-light/drawable-xxhdpi/core_default_group_icon_public_light.png
new file mode 100644
index 0000000..03f988e
Binary files /dev/null and b/system/tuicore/src/main/res-light/drawable-xxhdpi/core_default_group_icon_public_light.png differ
diff --git a/system/tuicore/src/main/res-light/drawable-xxhdpi/core_default_group_icon_work_light.png b/system/tuicore/src/main/res-light/drawable-xxhdpi/core_default_group_icon_work_light.png
new file mode 100644
index 0000000..9002d45
Binary files /dev/null and b/system/tuicore/src/main/res-light/drawable-xxhdpi/core_default_group_icon_work_light.png differ
diff --git a/system/tuicore/src/main/res-light/drawable-xxhdpi/core_default_user_icon_light.png b/system/tuicore/src/main/res-light/drawable-xxhdpi/core_default_user_icon_light.png
new file mode 100644
index 0000000..b384546
Binary files /dev/null and b/system/tuicore/src/main/res-light/drawable-xxhdpi/core_default_user_icon_light.png differ
diff --git a/system/tuicore/src/main/res-light/drawable-xxhdpi/core_online_status_light.png b/system/tuicore/src/main/res-light/drawable-xxhdpi/core_online_status_light.png
new file mode 100644
index 0000000..cf07e72
Binary files /dev/null and b/system/tuicore/src/main/res-light/drawable-xxhdpi/core_online_status_light.png differ
diff --git a/system/tuicore/src/main/res-light/drawable-xxhdpi/core_selected_icon_light.png b/system/tuicore/src/main/res-light/drawable-xxhdpi/core_selected_icon_light.png
new file mode 100644
index 0000000..ae46e89
Binary files /dev/null and b/system/tuicore/src/main/res-light/drawable-xxhdpi/core_selected_icon_light.png differ
diff --git a/system/tuicore/src/main/res-light/drawable-xxhdpi/core_title_bar_back_light.png b/system/tuicore/src/main/res-light/drawable-xxhdpi/core_title_bar_back_light.png
new file mode 100644
index 0000000..83d658d
Binary files /dev/null and b/system/tuicore/src/main/res-light/drawable-xxhdpi/core_title_bar_back_light.png differ
diff --git a/system/tuicore/src/main/res-light/drawable/core_title_bar_bg_light.xml b/system/tuicore/src/main/res-light/drawable/core_title_bar_bg_light.xml
new file mode 100644
index 0000000..7a5193b
--- /dev/null
+++ b/system/tuicore/src/main/res-light/drawable/core_title_bar_bg_light.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <gradient android:startColor="?attr/core_header_end_color"
+        android:endColor="?attr/core_header_end_color"/>
+
+
+</shape>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res-light/values/light_colors.xml b/system/tuicore/src/main/res-light/values/light_colors.xml
new file mode 100644
index 0000000..34e7fd9
--- /dev/null
+++ b/system/tuicore/src/main/res-light/values/light_colors.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- 颜色规范 start -->
+    <color name="core_light_bg_title_text_color_light">#FF000000</color>
+    <color name="core_light_bg_primary_text_color_light">#FF444444</color>
+    <color name="core_light_bg_secondary_text_color_light">#FF888888</color>
+    <color name="core_light_bg_secondary2_text_color_light">#FF999999</color>
+    <color name="core_light_bg_disable_text_color_light">#FFBBBBBB</color>
+    <color name="core_dark_bg_primary_text_color_light">#FFFFFFFF</color>
+
+    <color name="core_primary_bg_color_light">#FFFFFFFF</color>
+    <color name="core_bg_color_light">#FFF2F3F5</color>
+    <color name="core_primary_color_light">#FF147AFF</color>
+    <color name="core_error_tip_color_light">#FFFF584C</color>
+    <color name="core_success_tip_color_light">#FF26CB3E</color>
+    <color name="core_bubble_bg_color_light">#FFDCEAFD</color>
+    <color name="core_divide_color_light">#FFE5E5E5</color>
+    <color name="core_border_color_light">#FFDDDDDD</color>
+    <color name="core_header_start_color_light">#FFEBF0F6</color>
+    <color name="core_header_end_color_light">#FFEBF0F6</color>
+
+    <color name="core_btn_normal_color_light">#FF147AFF</color>
+    <color name="core_btn_pressed_color_light">#FF0064E7</color>
+    <color name="core_btn_disable_color_light">#4D147AFF</color>
+    <!-- 颜色规范 end -->
+
+    <color name="core_title_bar_text_bg_light">#FF000000</color>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res-light/values/light_styles.xml b/system/tuicore/src/main/res-light/values/light_styles.xml
new file mode 100644
index 0000000..c74b206
--- /dev/null
+++ b/system/tuicore/src/main/res-light/values/light_styles.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TUIBaseLightTheme" parent="@style/TUIBaseTheme">
+        <!-- 颜色规范 start -->
+        <item name="core_light_bg_title_text_color">@color/core_light_bg_title_text_color_light</item>
+        <item name="core_light_bg_primary_text_color">@color/core_light_bg_primary_text_color_light</item>
+        <item name="core_light_bg_secondary_text_color">@color/core_light_bg_secondary_text_color_light</item>
+        <item name="core_light_bg_secondary2_text_color">@color/core_light_bg_secondary2_text_color_light</item>
+        <item name="core_light_bg_disable_text_color">@color/core_light_bg_disable_text_color_light</item>
+        <item name="core_dark_bg_primary_text_color">@color/core_dark_bg_primary_text_color_light</item>
+        <item name="core_primary_bg_color">@color/core_primary_bg_color_light</item>
+        <item name="core_bg_color">@color/core_bg_color_light</item>
+        <item name="core_primary_color">@color/core_primary_color_light</item>
+        <item name="core_error_tip_color">@color/core_error_tip_color_light</item>
+        <item name="core_success_tip_color">@color/core_success_tip_color_light</item>
+        <item name="core_bubble_bg_color">@color/core_bubble_bg_color_light</item>
+        <item name="core_divide_color">@color/core_divide_color_light</item>
+        <item name="core_border_color">@color/core_border_color_light</item>
+        <item name="core_header_start_color">@color/core_header_start_color_light</item>
+        <item name="core_header_end_color">@color/core_header_end_color_light</item>
+        <item name="core_btn_normal_color">@color/core_btn_normal_color_light</item>
+        <item name="core_btn_pressed_color">@color/core_btn_pressed_color_light</item>
+        <item name="core_btn_disable_color">@color/core_btn_disable_color_light</item>
+        <!-- 颜色规范 end -->
+
+        <item name="core_line_controller_view_switch_btn_selected_bg">@color/core_primary_color_light</item>
+        <item name="core_selected_icon">@drawable/core_selected_icon_light</item>
+        <item name="core_title_bar_bg">@drawable/core_title_bar_bg_light</item>
+        <item name="core_title_bar_text_bg">@color/core_title_bar_text_bg_light</item>
+        <item name="core_title_bar_back_icon">@drawable/core_title_bar_back_light</item>
+        <item name="core_default_group_icon_public">@drawable/core_default_group_icon_public_light</item>
+        <item name="core_default_group_icon_work">@drawable/core_default_group_icon_work_light</item>
+        <item name="core_default_group_icon_meeting">@drawable/core_default_group_icon_meeting_light</item>
+        <item name="core_default_group_icon_community">@drawable/core_default_group_icon_community_light</item>
+        <item name="core_default_user_icon">@drawable/core_default_user_icon_light</item>
+        <item name="user_status_online">@drawable/core_online_status_light</item>
+
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res-lively/drawable-xxhdpi/core_default_group_icon_community_lively.png b/system/tuicore/src/main/res-lively/drawable-xxhdpi/core_default_group_icon_community_lively.png
new file mode 100644
index 0000000..028d844
Binary files /dev/null and b/system/tuicore/src/main/res-lively/drawable-xxhdpi/core_default_group_icon_community_lively.png differ
diff --git a/system/tuicore/src/main/res-lively/drawable-xxhdpi/core_default_group_icon_meeting_lively.png b/system/tuicore/src/main/res-lively/drawable-xxhdpi/core_default_group_icon_meeting_lively.png
new file mode 100644
index 0000000..5480bcb
Binary files /dev/null and b/system/tuicore/src/main/res-lively/drawable-xxhdpi/core_default_group_icon_meeting_lively.png differ
diff --git a/system/tuicore/src/main/res-lively/drawable-xxhdpi/core_default_group_icon_public_lively.png b/system/tuicore/src/main/res-lively/drawable-xxhdpi/core_default_group_icon_public_lively.png
new file mode 100644
index 0000000..18dd84c
Binary files /dev/null and b/system/tuicore/src/main/res-lively/drawable-xxhdpi/core_default_group_icon_public_lively.png differ
diff --git a/system/tuicore/src/main/res-lively/drawable-xxhdpi/core_default_group_icon_work_lively.png b/system/tuicore/src/main/res-lively/drawable-xxhdpi/core_default_group_icon_work_lively.png
new file mode 100644
index 0000000..32e2fbf
Binary files /dev/null and b/system/tuicore/src/main/res-lively/drawable-xxhdpi/core_default_group_icon_work_lively.png differ
diff --git a/system/tuicore/src/main/res-lively/drawable-xxhdpi/core_default_user_icon_lively.png b/system/tuicore/src/main/res-lively/drawable-xxhdpi/core_default_user_icon_lively.png
new file mode 100644
index 0000000..b384546
Binary files /dev/null and b/system/tuicore/src/main/res-lively/drawable-xxhdpi/core_default_user_icon_lively.png differ
diff --git a/system/tuicore/src/main/res-lively/drawable-xxhdpi/core_online_status_lively.png b/system/tuicore/src/main/res-lively/drawable-xxhdpi/core_online_status_lively.png
new file mode 100644
index 0000000..69b05d8
Binary files /dev/null and b/system/tuicore/src/main/res-lively/drawable-xxhdpi/core_online_status_lively.png differ
diff --git a/system/tuicore/src/main/res-lively/drawable-xxhdpi/core_selected_icon_lively.png b/system/tuicore/src/main/res-lively/drawable-xxhdpi/core_selected_icon_lively.png
new file mode 100644
index 0000000..c86e1ac
Binary files /dev/null and b/system/tuicore/src/main/res-lively/drawable-xxhdpi/core_selected_icon_lively.png differ
diff --git a/system/tuicore/src/main/res-lively/drawable-xxhdpi/core_title_bar_back_lively.png b/system/tuicore/src/main/res-lively/drawable-xxhdpi/core_title_bar_back_lively.png
new file mode 100644
index 0000000..2072634
Binary files /dev/null and b/system/tuicore/src/main/res-lively/drawable-xxhdpi/core_title_bar_back_lively.png differ
diff --git a/system/tuicore/src/main/res-lively/drawable/core_title_bar_bg_lively.xml b/system/tuicore/src/main/res-lively/drawable/core_title_bar_bg_lively.xml
new file mode 100644
index 0000000..3d6ec23
--- /dev/null
+++ b/system/tuicore/src/main/res-lively/drawable/core_title_bar_bg_lively.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <gradient android:startColor="?attr/core_header_start_color"
+        android:endColor="?attr/core_header_start_color"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res-lively/values/lively_colors.xml b/system/tuicore/src/main/res-lively/values/lively_colors.xml
new file mode 100644
index 0000000..229f152
--- /dev/null
+++ b/system/tuicore/src/main/res-lively/values/lively_colors.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- 颜色规范 start -->
+    <color name="core_light_bg_title_text_color_lively">#FF000000</color>
+    <color name="core_light_bg_primary_text_color_lively">#FF444444</color>
+    <color name="core_light_bg_secondary_text_color_lively">#FF888888</color>
+    <color name="core_light_bg_secondary2_text_color_lively">#FF999999</color>
+    <color name="core_light_bg_disable_text_color_lively">#FFBBBBBB</color>
+    <color name="core_dark_bg_primary_text_color_lively">#FFFFFFFF</color>
+
+    <color name="core_primary_bg_color_lively">#FFFFFFFF</color>
+    <color name="core_bg_color_lively">#FFF2F3F5</color>
+    <color name="core_primary_color_lively">#FFFF8E82</color>
+    <color name="core_error_tip_color_lively">#FFFF584C</color>
+    <color name="core_success_tip_color_lively">#FF26CB3E</color>
+    <color name="core_bubble_bg_color_lively">#FF9D85</color>
+    <color name="core_divide_color_lively">#FFE5E5E5</color>
+    <color name="core_border_color_lively">#FFDDDDDD</color>
+    <color name="core_header_start_color_lively">#FFFF7B7B</color>
+    <color name="core_header_end_color_lively">#FFFFA88B</color>
+
+    <color name="core_btn_normal_color_lively">#FFFF8E82</color>
+    <color name="core_btn_pressed_color_lively">#FFF86657</color>
+    <color name="core_btn_disable_color_lively">#4DFF8E82</color>
+    <!-- 颜色规范 end -->
+
+    <color name="core_title_bar_text_bg_lively">#FFFFFFFF</color>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res-lively/values/lively_styles.xml b/system/tuicore/src/main/res-lively/values/lively_styles.xml
new file mode 100644
index 0000000..d751280
--- /dev/null
+++ b/system/tuicore/src/main/res-lively/values/lively_styles.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TUIBaseLivelyTheme" parent="@style/TUIBaseTheme">
+        <!-- 颜色规范 start -->
+        <item name="core_light_bg_title_text_color">@color/core_light_bg_title_text_color_lively</item>
+        <item name="core_light_bg_primary_text_color">@color/core_light_bg_primary_text_color_lively</item>
+        <item name="core_light_bg_secondary_text_color">@color/core_light_bg_secondary_text_color_lively</item>
+        <item name="core_light_bg_secondary2_text_color">@color/core_light_bg_secondary2_text_color_lively</item>
+        <item name="core_light_bg_disable_text_color">@color/core_light_bg_disable_text_color_lively</item>
+        <item name="core_dark_bg_primary_text_color">@color/core_dark_bg_primary_text_color_lively</item>
+        <item name="core_primary_bg_color">@color/core_primary_bg_color_lively</item>
+        <item name="core_bg_color">@color/core_bg_color_lively</item>
+        <item name="core_primary_color">@color/core_primary_color_lively</item>
+        <item name="core_error_tip_color">@color/core_error_tip_color_lively</item>
+        <item name="core_success_tip_color">@color/core_success_tip_color_lively</item>
+        <item name="core_bubble_bg_color">@color/core_bubble_bg_color_lively</item>
+        <item name="core_divide_color">@color/core_divide_color_lively</item>
+        <item name="core_border_color">@color/core_border_color_lively</item>
+        <item name="core_header_start_color">@color/core_header_start_color_lively</item>
+        <item name="core_header_end_color">@color/core_header_end_color_lively</item>
+        <item name="core_btn_normal_color">@color/core_btn_normal_color_lively</item>
+        <item name="core_btn_pressed_color">@color/core_btn_pressed_color_lively</item>
+        <item name="core_btn_disable_color">@color/core_btn_disable_color_lively</item>
+        <!-- 颜色规范 end -->
+
+        <item name="core_line_controller_view_switch_btn_selected_bg">@color/core_primary_color_lively</item>
+        <item name="core_selected_icon">@drawable/core_selected_icon_lively</item>
+        <item name="core_title_bar_bg">@drawable/core_title_bar_bg_lively</item>
+        <item name="core_title_bar_text_bg">@color/core_title_bar_text_bg_lively</item>
+        <item name="core_title_bar_back_icon">@drawable/core_title_bar_back_lively</item>
+        <item name="core_default_group_icon_public">@drawable/core_default_group_icon_public_lively</item>
+        <item name="core_default_group_icon_work">@drawable/core_default_group_icon_work_lively</item>
+        <item name="core_default_group_icon_meeting">@drawable/core_default_group_icon_meeting_lively</item>
+        <item name="core_default_group_icon_community">@drawable/core_default_group_icon_community_lively</item>
+        <item name="core_default_user_icon">@drawable/core_default_user_icon_lively</item>
+        <item name="user_status_online">@drawable/core_online_status_lively</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res-serious/drawable-xxhdpi/core_default_group_icon_community_serious.png b/system/tuicore/src/main/res-serious/drawable-xxhdpi/core_default_group_icon_community_serious.png
new file mode 100644
index 0000000..1a2e268
Binary files /dev/null and b/system/tuicore/src/main/res-serious/drawable-xxhdpi/core_default_group_icon_community_serious.png differ
diff --git a/system/tuicore/src/main/res-serious/drawable-xxhdpi/core_default_group_icon_meeting_serious.png b/system/tuicore/src/main/res-serious/drawable-xxhdpi/core_default_group_icon_meeting_serious.png
new file mode 100644
index 0000000..76b9e15
Binary files /dev/null and b/system/tuicore/src/main/res-serious/drawable-xxhdpi/core_default_group_icon_meeting_serious.png differ
diff --git a/system/tuicore/src/main/res-serious/drawable-xxhdpi/core_default_group_icon_public_serious.png b/system/tuicore/src/main/res-serious/drawable-xxhdpi/core_default_group_icon_public_serious.png
new file mode 100644
index 0000000..a4f3e7b
Binary files /dev/null and b/system/tuicore/src/main/res-serious/drawable-xxhdpi/core_default_group_icon_public_serious.png differ
diff --git a/system/tuicore/src/main/res-serious/drawable-xxhdpi/core_default_group_icon_work_serious.png b/system/tuicore/src/main/res-serious/drawable-xxhdpi/core_default_group_icon_work_serious.png
new file mode 100644
index 0000000..7081399
Binary files /dev/null and b/system/tuicore/src/main/res-serious/drawable-xxhdpi/core_default_group_icon_work_serious.png differ
diff --git a/system/tuicore/src/main/res-serious/drawable-xxhdpi/core_default_user_icon_serious.png b/system/tuicore/src/main/res-serious/drawable-xxhdpi/core_default_user_icon_serious.png
new file mode 100644
index 0000000..68bb06f
Binary files /dev/null and b/system/tuicore/src/main/res-serious/drawable-xxhdpi/core_default_user_icon_serious.png differ
diff --git a/system/tuicore/src/main/res-serious/drawable-xxhdpi/core_online_status_serious.png b/system/tuicore/src/main/res-serious/drawable-xxhdpi/core_online_status_serious.png
new file mode 100644
index 0000000..ec31c4a
Binary files /dev/null and b/system/tuicore/src/main/res-serious/drawable-xxhdpi/core_online_status_serious.png differ
diff --git a/system/tuicore/src/main/res-serious/drawable-xxhdpi/core_selected_icon_serious.png b/system/tuicore/src/main/res-serious/drawable-xxhdpi/core_selected_icon_serious.png
new file mode 100644
index 0000000..3486026
Binary files /dev/null and b/system/tuicore/src/main/res-serious/drawable-xxhdpi/core_selected_icon_serious.png differ
diff --git a/system/tuicore/src/main/res-serious/drawable-xxhdpi/core_title_bar_back_serious.png b/system/tuicore/src/main/res-serious/drawable-xxhdpi/core_title_bar_back_serious.png
new file mode 100644
index 0000000..2072634
Binary files /dev/null and b/system/tuicore/src/main/res-serious/drawable-xxhdpi/core_title_bar_back_serious.png differ
diff --git a/system/tuicore/src/main/res-serious/drawable/core_title_bar_bg_serious.xml b/system/tuicore/src/main/res-serious/drawable/core_title_bar_bg_serious.xml
new file mode 100644
index 0000000..9471fbc
--- /dev/null
+++ b/system/tuicore/src/main/res-serious/drawable/core_title_bar_bg_serious.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <gradient android:startColor="?attr/core_header_start_color"
+        android:endColor="?attr/core_header_start_color"
+        android:angle="270"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res-serious/values/serious_colors.xml b/system/tuicore/src/main/res-serious/values/serious_colors.xml
new file mode 100644
index 0000000..451e6bc
--- /dev/null
+++ b/system/tuicore/src/main/res-serious/values/serious_colors.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- 颜色规范 start -->
+    <color name="core_light_bg_title_text_color_serious">#FF000000</color>
+    <color name="core_light_bg_primary_text_color_serious">#FF444444</color>
+    <color name="core_light_bg_secondary_text_color_serious">#FF888888</color>
+    <color name="core_light_bg_secondary2_text_color_serious">#FF999999</color>
+    <color name="core_light_bg_disable_text_color_serious">#FFBBBBBB</color>
+    <color name="core_dark_bg_primary_text_color_serious">#FFFFFFFF</color>
+
+    <color name="core_primary_bg_color_serious">#FFFFFFFF</color>
+    <color name="core_bg_color_serious">#FFF2F3F5</color>
+    <color name="core_primary_color_serious">#FF21BEBD</color>
+    <color name="core_error_tip_color_serious">#FFFF584C</color>
+    <color name="core_success_tip_color_serious">#FF26CB3E</color>
+    <color name="core_bubble_bg_color_serious">#FFFFFFFF</color>
+    <color name="core_divide_color_serious">#FFE5E5E5</color>
+    <color name="core_border_color_serious">#FFDDDDDD</color>
+    <color name="core_header_start_color_serious">#FF21BEBD</color>
+    <color name="core_header_end_color_serious">#FF21BEBD</color>
+
+    <color name="core_btn_normal_color_serious">#FF0052FF</color>
+    <color name="core_btn_pressed_color_serious">#FF0049E4</color>
+    <color name="core_btn_disable_color_serious">#4D0052FF</color>
+    <!-- 颜色规范 end -->
+
+    <color name="core_title_bar_text_bg_serious">#FFFFFFFF</color>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res-serious/values/serious_styles.xml b/system/tuicore/src/main/res-serious/values/serious_styles.xml
new file mode 100644
index 0000000..26d862b
--- /dev/null
+++ b/system/tuicore/src/main/res-serious/values/serious_styles.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TUIBaseSeriousTheme" parent="@style/TUIBaseTheme">
+
+        <!-- 颜色规范 start -->
+        <item name="core_light_bg_title_text_color">@color/core_light_bg_title_text_color_serious</item>
+        <item name="core_light_bg_primary_text_color">@color/core_light_bg_primary_text_color_serious</item>
+        <item name="core_light_bg_secondary_text_color">@color/core_light_bg_secondary_text_color_serious</item>
+        <item name="core_light_bg_secondary2_text_color">@color/core_light_bg_secondary2_text_color_serious</item>
+        <item name="core_light_bg_disable_text_color">@color/core_light_bg_disable_text_color_serious</item>
+        <item name="core_dark_bg_primary_text_color">@color/core_dark_bg_primary_text_color_serious</item>
+        <item name="core_primary_bg_color">@color/core_primary_bg_color_serious</item>
+        <item name="core_bg_color">@color/core_bg_color_serious</item>
+        <item name="core_primary_color">@color/core_primary_color_serious</item>
+        <item name="core_error_tip_color">@color/core_error_tip_color_serious</item>
+        <item name="core_success_tip_color">@color/core_success_tip_color_serious</item>
+        <item name="core_bubble_bg_color">@color/core_bubble_bg_color_serious</item>
+        <item name="core_divide_color">@color/core_divide_color_serious</item>
+        <item name="core_border_color">@color/core_border_color_serious</item>
+        <item name="core_header_start_color">@color/core_header_start_color_serious</item>
+        <item name="core_header_end_color">@color/core_header_end_color_serious</item>
+        <item name="core_btn_normal_color">@color/core_btn_normal_color_serious</item>
+        <item name="core_btn_pressed_color">@color/core_btn_pressed_color_serious</item>
+        <item name="core_btn_disable_color">@color/core_btn_disable_color_serious</item>
+        <!-- 颜色规范 end -->
+
+        <item name="core_line_controller_view_switch_btn_selected_bg">@color/core_primary_color_serious</item>
+        <item name="core_selected_icon">@drawable/core_selected_icon_serious</item>
+        <item name="core_title_bar_bg">@drawable/core_title_bar_bg_serious</item>
+        <item name="core_title_bar_text_bg">@color/core_title_bar_text_bg_serious</item>
+        <item name="core_title_bar_back_icon">@drawable/core_title_bar_back_serious</item>
+        <item name="core_default_group_icon_public">@drawable/core_default_group_icon_public_serious</item>
+        <item name="core_default_group_icon_work">@drawable/core_default_group_icon_work_serious</item>
+        <item name="core_default_group_icon_meeting">@drawable/core_default_group_icon_meeting_serious</item>
+        <item name="core_default_group_icon_community">@drawable/core_default_group_icon_community_serious</item>
+        <item name="core_default_user_icon">@drawable/core_default_user_icon_serious</item>
+        <item name="user_status_online">@drawable/core_online_status_serious</item>
+
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/anim/core_popup_in_anim.xml b/system/tuicore/src/main/res/anim/core_popup_in_anim.xml
new file mode 100644
index 0000000..74069b9
--- /dev/null
+++ b/system/tuicore/src/main/res/anim/core_popup_in_anim.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="150"
+        android:fromYDelta="100%"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:toYDelta="0"/>
+</set>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/anim/core_popup_out_anim.xml b/system/tuicore/src/main/res/anim/core_popup_out_anim.xml
new file mode 100644
index 0000000..7dd9512
--- /dev/null
+++ b/system/tuicore/src/main/res/anim/core_popup_out_anim.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="150"
+        android:fromYDelta="0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:toYDelta="100%"/>
+</set>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/drawable-xxhdpi/arrow_right.png b/system/tuicore/src/main/res/drawable-xxhdpi/arrow_right.png
new file mode 100644
index 0000000..b4fd76e
Binary files /dev/null and b/system/tuicore/src/main/res/drawable-xxhdpi/arrow_right.png differ
diff --git a/system/tuicore/src/main/res/drawable-xxhdpi/core_close_icon.png b/system/tuicore/src/main/res/drawable-xxhdpi/core_close_icon.png
new file mode 100644
index 0000000..56a93e7
Binary files /dev/null and b/system/tuicore/src/main/res/drawable-xxhdpi/core_close_icon.png differ
diff --git a/system/tuicore/src/main/res/drawable-xxhdpi/core_default_group_icon_community.png b/system/tuicore/src/main/res/drawable-xxhdpi/core_default_group_icon_community.png
new file mode 100644
index 0000000..32344cb
Binary files /dev/null and b/system/tuicore/src/main/res/drawable-xxhdpi/core_default_group_icon_community.png differ
diff --git a/system/tuicore/src/main/res/drawable-xxhdpi/core_delete_icon.png b/system/tuicore/src/main/res/drawable-xxhdpi/core_delete_icon.png
new file mode 100644
index 0000000..29b021b
Binary files /dev/null and b/system/tuicore/src/main/res/drawable-xxhdpi/core_delete_icon.png differ
diff --git a/system/tuicore/src/main/res/drawable-xxhdpi/core_icon_offline_status.png b/system/tuicore/src/main/res/drawable-xxhdpi/core_icon_offline_status.png
new file mode 100644
index 0000000..93f4010
Binary files /dev/null and b/system/tuicore/src/main/res/drawable-xxhdpi/core_icon_offline_status.png differ
diff --git a/system/tuicore/src/main/res/drawable-xxhdpi/core_search_icon.png b/system/tuicore/src/main/res/drawable-xxhdpi/core_search_icon.png
new file mode 100644
index 0000000..e95fc8b
Binary files /dev/null and b/system/tuicore/src/main/res/drawable-xxhdpi/core_search_icon.png differ
diff --git a/system/tuicore/src/main/res/drawable/alert_bg.9.png b/system/tuicore/src/main/res/drawable/alert_bg.9.png
new file mode 100644
index 0000000..84a042e
Binary files /dev/null and b/system/tuicore/src/main/res/drawable/alert_bg.9.png differ
diff --git a/system/tuicore/src/main/res/drawable/core_edit_cursor.xml b/system/tuicore/src/main/res/drawable/core_edit_cursor.xml
new file mode 100644
index 0000000..03016a8
--- /dev/null
+++ b/system/tuicore/src/main/res/drawable/core_edit_cursor.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#70C160" />
+    <size android:width="1dp" />
+
+</shape>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/drawable/core_edit_text_bg.xml b/system/tuicore/src/main/res/drawable/core_edit_text_bg.xml
new file mode 100644
index 0000000..68c4f6a
--- /dev/null
+++ b/system/tuicore/src/main/res/drawable/core_edit_text_bg.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#F5F5F5" />
+    <corners android:radius="4.8dp" />
+</shape>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/drawable/core_list_divider.xml b/system/tuicore/src/main/res/drawable/core_list_divider.xml
new file mode 100644
index 0000000..59cf049
--- /dev/null
+++ b/system/tuicore/src/main/res/drawable/core_list_divider.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid
+        android:color="#E5E5E5"/>
+
+    <size
+        android:height="0.5dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/drawable/core_permission_dialog_bg.xml b/system/tuicore/src/main/res/drawable/core_permission_dialog_bg.xml
new file mode 100644
index 0000000..6328472
--- /dev/null
+++ b/system/tuicore/src/main/res/drawable/core_permission_dialog_bg.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white"/>
+    <corners android:radius="7.68dp"/>
+</shape>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/drawable/core_positive_btn_bg.xml b/system/tuicore/src/main/res/drawable/core_positive_btn_bg.xml
new file mode 100644
index 0000000..9063d53
--- /dev/null
+++ b/system/tuicore/src/main/res/drawable/core_positive_btn_bg.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/core_positive_btn_normal_bg" android:state_enabled="true" android:state_pressed="false" />
+    <item android:drawable="@drawable/core_positive_btn_disable_bg" android:state_enabled="false" />
+    <item android:drawable="@drawable/core_positive_btn_pressed_bg" android:state_pressed="true" />
+
+</selector>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/drawable/core_positive_btn_disable_bg.xml b/system/tuicore/src/main/res/drawable/core_positive_btn_disable_bg.xml
new file mode 100644
index 0000000..a8b242b
--- /dev/null
+++ b/system/tuicore/src/main/res/drawable/core_positive_btn_disable_bg.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid
+        android:color="?attr/core_btn_disable_color"/>
+
+    <corners
+        android:radius="7.68dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/drawable/core_positive_btn_normal_bg.xml b/system/tuicore/src/main/res/drawable/core_positive_btn_normal_bg.xml
new file mode 100644
index 0000000..745901d
--- /dev/null
+++ b/system/tuicore/src/main/res/drawable/core_positive_btn_normal_bg.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid
+        android:color="?attr/core_btn_normal_color"/>
+
+    <corners
+        android:radius="7.68dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/drawable/core_positive_btn_pressed_bg.xml b/system/tuicore/src/main/res/drawable/core_positive_btn_pressed_bg.xml
new file mode 100644
index 0000000..f53a321
--- /dev/null
+++ b/system/tuicore/src/main/res/drawable/core_positive_btn_pressed_bg.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid
+        android:color="?attr/core_btn_pressed_color"/>
+
+    <corners
+        android:radius="7.68dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/drawable/popup_card_bg.xml b/system/tuicore/src/main/res/drawable/popup_card_bg.xml
new file mode 100644
index 0000000..325f6cd
--- /dev/null
+++ b/system/tuicore/src/main/res/drawable/popup_card_bg.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid
+        android:color="#FFFFFF"/>
+
+    <corners
+        android:radius="9.89dp"
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="0dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/drawable/selected_border.xml b/system/tuicore/src/main/res/drawable/selected_border.xml
new file mode 100644
index 0000000..dd04892
--- /dev/null
+++ b/system/tuicore/src/main/res/drawable/selected_border.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="8dp"/>
+
+    <stroke android:width="1.5dp" android:color="?attr/core_primary_color"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/drawable/switch_thumb.xml b/system/tuicore/src/main/res/drawable/switch_thumb.xml
new file mode 100644
index 0000000..a76dc22
--- /dev/null
+++ b/system/tuicore/src/main/res/drawable/switch_thumb.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/switch_thumb_blue" android:state_checked="true" />
+    <item android:drawable="@drawable/switch_thumb_gray" />
+</selector>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/drawable/switch_thumb_blue.xml b/system/tuicore/src/main/res/drawable/switch_thumb_blue.xml
new file mode 100644
index 0000000..2fba5a6
--- /dev/null
+++ b/system/tuicore/src/main/res/drawable/switch_thumb_blue.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <layer-list>
+            <item android:bottom="@dimen/switch_thumb_padding" android:left="@dimen/switch_thumb_padding" android:right="@dimen/switch_thumb_padding" android:top="@dimen/switch_thumb_padding">
+                <shape android:shape="rectangle">
+                    <size android:width="@dimen/switch_thumb_width" android:height="@dimen/switch_thumb_height" />
+                    <corners android:radius="@dimen/switch_thumb_radius" />
+                    <gradient android:endColor="#ffffff" android:startColor="#ffffff" />
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/drawable/switch_thumb_gray.xml b/system/tuicore/src/main/res/drawable/switch_thumb_gray.xml
new file mode 100644
index 0000000..280eaff
--- /dev/null
+++ b/system/tuicore/src/main/res/drawable/switch_thumb_gray.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <layer-list>
+            <item android:bottom="@dimen/switch_thumb_padding" android:left="@dimen/switch_thumb_padding" android:right="@dimen/switch_thumb_padding" android:top="@dimen/switch_thumb_padding">
+                <shape android:shape="oval">
+                    <size android:width="@dimen/switch_thumb_width" android:height="@dimen/switch_thumb_height" />
+                    <gradient android:endColor="#ffffff" android:startColor="#ffffff" />
+                    <stroke
+                        android:width="0.7dp"
+                        android:color="#d2d2d2"/>
+                </shape>
+            </item>
+        </layer-list>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/drawable/switch_track.xml b/system/tuicore/src/main/res/drawable/switch_track.xml
new file mode 100644
index 0000000..986f41b
--- /dev/null
+++ b/system/tuicore/src/main/res/drawable/switch_track.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/switch_track_blue" android:state_checked="true" />
+    <item android:drawable="@drawable/switch_track_gray" />
+</selector>
diff --git a/system/tuicore/src/main/res/drawable/switch_track_blue.xml b/system/tuicore/src/main/res/drawable/switch_track_blue.xml
new file mode 100644
index 0000000..51e0eb2
--- /dev/null
+++ b/system/tuicore/src/main/res/drawable/switch_track_blue.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <size
+        android:width="46.08dp"
+        android:height="26.88dp"/>
+
+    <corners android:radius="15dp" />
+
+    <solid
+        android:color="?attr/core_primary_color" />
+</shape>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/drawable/switch_track_gray.xml b/system/tuicore/src/main/res/drawable/switch_track_gray.xml
new file mode 100644
index 0000000..ee7467c
--- /dev/null
+++ b/system/tuicore/src/main/res/drawable/switch_track_gray.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="15dp" />
+    <solid
+        android:color="#FFFFFF"/>
+
+   <size
+       android:width="46.08dp"
+       android:height="26.88dp"/>
+
+    <stroke
+        android:width="1dp"
+        android:color="#d2d2d2"/>
+</shape>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/drawable/trans_bg.png b/system/tuicore/src/main/res/drawable/trans_bg.png
new file mode 100644
index 0000000..0a4c3cd
Binary files /dev/null and b/system/tuicore/src/main/res/drawable/trans_bg.png differ
diff --git a/system/tuicore/src/main/res/layout/core_activity_image_select_layout.xml b/system/tuicore/src/main/res/layout/core_activity_image_select_layout.xml
new file mode 100644
index 0000000..166b323
--- /dev/null
+++ b/system/tuicore/src/main/res/layout/core_activity_image_select_layout.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context="com.tencent.qcloud.tuicore.component.activities.ImageSelectActivity">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/image_select_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/image_select_grid"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:paddingTop="14dp"
+        android:paddingBottom="14dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/layout/core_pop_menu.xml b/system/tuicore/src/main/res/layout/core_pop_menu.xml
new file mode 100644
index 0000000..1232a7e
--- /dev/null
+++ b/system/tuicore/src/main/res/layout/core_pop_menu.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingTop="@dimen/core_pop_menu_padding_top"
+    android:paddingBottom="@dimen/core_pop_menu_padding_bottom"
+    android:paddingLeft="20dp"
+    android:paddingRight="10dp">
+
+    <ListView
+        android:id="@+id/menu_pop_list"
+        android:divider="@null"
+        android:layout_width="@dimen/core_pop_menu_item_width"
+        android:layout_height="wrap_content" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/layout/core_select_image_item_layout.xml b/system/tuicore/src/main/res/layout/core_select_image_item_layout.xml
new file mode 100644
index 0000000..0e0cbb2
--- /dev/null
+++ b/system/tuicore/src/main/res/layout/core_select_image_item_layout.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/item_content"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <com.tencent.qcloud.tuicore.component.RoundFrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/trans_bg"
+        app:corner_radius="8dp">
+
+        <com.tencent.qcloud.tuicore.component.gatherimage.SynthesizedImageView
+            android:id="@+id/content_image"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop" />
+
+        <Button
+            android:id="@+id/default_image_layout"
+            android:layout_width="match_parent"
+            android:layout_height="28dp"
+            android:layout_gravity="bottom"
+            android:background="#000000"
+            android:text="@string/default_text"
+            android:textColor="@color/white"
+            android:visibility="gone" />
+
+    </com.tencent.qcloud.tuicore.component.RoundFrameLayout>
+
+    <RelativeLayout
+        android:id="@+id/selected_border_area"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true">
+
+        <com.tencent.qcloud.tuicore.component.RoundCornerImageView
+            android:id="@+id/select_border"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@drawable/selected_border"
+            android:scaleType="centerCrop"
+            app:corner_radius="8dp" />
+
+        <ImageView
+            android:layout_width="21dp"
+            android:layout_height="21dp"
+            android:layout_alignTop="@id/select_border"
+            android:layout_alignEnd="@id/select_border"
+            android:layout_alignRight="@id/select_border"
+            android:layout_margin="4dp"
+            android:background="?attr/core_selected_icon"
+            android:visibility="visible" />
+    </RelativeLayout>
+</RelativeLayout>
+
diff --git a/system/tuicore/src/main/res/layout/core_select_item_layout.xml b/system/tuicore/src/main/res/layout/core_select_item_layout.xml
new file mode 100644
index 0000000..210024a
--- /dev/null
+++ b/system/tuicore/src/main/res/layout/core_select_item_layout.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal"
+    android:layout_gravity="center"
+    android:layout_width="match_parent"
+    android:background="@color/white"
+    android:paddingLeft="15.36dp"
+    android:paddingRight="15.36dp"
+    android:layout_height="46.08dp">
+
+    <TextView
+        android:id="@+id/name"
+        android:layout_weight="1"
+        android:layout_gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="15.36sp"
+        android:textColor="#444444"
+        tools:text="选项1"/>
+
+    <ImageView
+        android:id="@+id/selected_icon"
+        android:background="?attr/core_selected_icon"
+        android:layout_gravity="center"
+        android:visibility="gone"
+        android:layout_width="21dp"
+        android:layout_height="21dp"
+        tools:visibility="visible"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/layout/layout_popup_card.xml b/system/tuicore/src/main/res/layout/layout_popup_card.xml
new file mode 100644
index 0000000..8f09189
--- /dev/null
+++ b/system/tuicore/src/main/res/layout/layout_popup_card.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tool="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:gravity="bottom"
+    android:background="@drawable/popup_card_bg"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <FrameLayout
+        android:layout_marginTop="@dimen/core_popup_card_padding"
+        android:orientation="horizontal"
+        android:gravity="center"
+        android:layout_marginStart="@dimen/core_popup_card_padding"
+        android:layout_marginEnd="@dimen/core_popup_card_padding"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:gravity="center"
+            android:id="@+id/popup_card_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/core_popup_card_title_size"
+            android:textColor="#000000"
+            tool:text="弹窗标题"/>
+
+        <ImageView
+            android:id="@+id/close_btn"
+            android:layout_gravity="end"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:src="@drawable/core_close_icon" />
+
+    </FrameLayout>
+
+    <View
+        android:layout_width="wrap_content"
+        android:layout_marginBottom="@dimen/core_popup_card_line_margin"
+        android:layout_marginTop="@dimen/core_popup_card_line_margin"
+        android:layout_marginLeft="@dimen/core_popup_card_line_margin_left_right"
+        android:layout_marginRight="@dimen/core_popup_card_line_margin_left_right"
+        android:layout_height="@dimen/core_popup_card_line_height"
+        android:background="@color/core_popup_card_line_bg" />
+
+    <EditText
+        android:id="@+id/popup_card_edit"
+        android:longClickable="false"
+        android:background="@drawable/core_edit_text_bg"
+        android:textSize="@dimen/core_popup_card_edit_text_size"
+        android:paddingLeft="@dimen/core_popup_card_edit_padding_left_right"
+        android:paddingRight="@dimen/core_popup_card_edit_padding_left_right"
+        android:layout_marginStart="@dimen/core_popup_card_padding"
+        android:layout_marginEnd="@dimen/core_popup_card_padding"
+        android:textCursorDrawable="@drawable/core_edit_cursor"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/core_popup_card_edit_height"/>
+
+    <TextView
+        android:id="@+id/popup_card_description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/core_popup_card_desc_margin_top"
+        android:layout_marginStart="@dimen/core_popup_card_padding"
+        android:layout_marginEnd="@dimen/core_popup_card_padding"
+        tool:text="仅限中文、字母、数字和下划线，2-20个字"
+        android:visibility="gone"/>
+
+    <Button
+        android:id="@+id/popup_card_positive_btn"
+        android:text="@string/sure"
+        android:textSize="@dimen/core_popup_card_btn_text_size"
+        android:textAllCaps="false"
+        android:textColor="@color/white"
+        android:background="@drawable/core_positive_btn_bg"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/core_popup_card_btn_height"
+        android:layout_marginStart="@dimen/core_popup_card_btn_margin_left_right"
+        android:layout_marginEnd="@dimen/core_popup_card_btn_margin_left_right"
+        android:layout_marginTop="@dimen/core_popup_card_btn_margin_top"
+        android:layout_marginBottom="@dimen/core_popup_card_btn_margin_bottom" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/layout/line_controller_view.xml b/system/tuicore/src/main/res/layout/line_controller_view.xml
new file mode 100644
index 0000000..38e6f3d
--- /dev/null
+++ b/system/tuicore/src/main/res/layout/line_controller_view.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <View
+        android:id="@+id/top_line"
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/line" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white">
+
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_marginLeft="@dimen/core_line_controller_margin_left"
+            android:layout_centerVertical="true"
+            android:textColor="@color/core_line_controller_title_color"
+            android:textSize="@dimen/core_line_controller_text_size" />
+
+        <RelativeLayout
+            android:id="@+id/contentText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dp"
+            android:layout_centerVertical="true"
+            android:layout_toLeftOf="@id/btnSwitch"
+            android:layout_toRightOf="@+id/name">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_centerVertical="true"
+                android:layout_alignParentRight="true"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/content"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:singleLine="true"
+                    android:gravity="right"
+                    android:textIsSelectable="true"
+                    android:textColor="@color/core_line_controller_content_color"
+                    android:textSize="@dimen/core_line_controller_text_size" />
+
+                <ImageView
+                    android:id="@+id/rightArrow"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="10.56dp"
+                    android:src="@drawable/arrow_right" />
+            </LinearLayout>
+        </RelativeLayout>
+
+        <Switch
+            android:id="@+id/btnSwitch"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:thumb="@drawable/switch_thumb"
+            android:track="@drawable/switch_track"
+            android:switchMinWidth="@dimen/switch_mini_width"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:textOff=""
+            android:textOn=""
+            android:layout_marginRight="15dp" />
+
+        <View
+            android:id="@+id/disable_mask"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:visibility="gone"
+            android:background="@color/core_line_controller_white_translucent_color"/>
+    </RelativeLayout>
+
+    <View
+        android:id="@+id/bottom_line"
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/line" />
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/layout/permission_activity_layout.xml b/system/tuicore/src/main/res/layout/permission_activity_layout.xml
new file mode 100644
index 0000000..0ebe1c1
--- /dev/null
+++ b/system/tuicore/src/main/res/layout/permission_activity_layout.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/tuicore_permission_layout"
+    android:orientation="vertical"
+    android:background="#BF000000"
+    android:gravity="center_horizontal"
+    android:paddingTop="60dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/permission_icon"
+        android:scaleType="fitCenter"
+        android:layout_gravity="center"
+        android:layout_width="32dp"
+        android:layout_height="32dp"/>
+
+    <TextView
+        android:id="@+id/permission_reason_title"
+        android:textSize="17.28sp"
+        android:textColor="@color/white"
+        android:textStyle="bold"
+        android:layout_marginTop="8dp"
+        android:gravity="center"
+        android:layout_width="240dp"
+        android:layout_height="wrap_content"/>
+
+    <TextView
+        android:id="@+id/permission_reason"
+        android:layout_marginTop="8dp"
+        android:textSize="17sp"
+        android:gravity="center"
+        android:textColor="#BFFFFFFF"
+        android:layout_width="240dp"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/layout/permission_tip_layout.xml b/system/tuicore/src/main/res/layout/permission_tip_layout.xml
new file mode 100644
index 0000000..0af5342
--- /dev/null
+++ b/system/tuicore/src/main/res/layout/permission_tip_layout.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/core_permission_dialog_bg"
+    android:clickable="true"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/tips_title"
+        android:textSize="15sp"
+        android:textStyle="bold"
+        android:gravity="center"
+        android:textColor="@color/black"
+        android:text="@string/core_permission_dialog_title"
+        android:layout_marginStart="30dp"
+        android:layout_marginEnd="30dp"
+        android:layout_marginTop="20dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <TextView
+        android:id="@+id/tips"
+        android:layout_marginTop="12dp"
+        android:layout_marginStart="30dp"
+        android:layout_marginEnd="30dp"
+        android:layout_marginBottom="20dp"
+        android:textSize="15sp"
+        android:gravity="center"
+        android:textColor="#888888"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <View
+        android:background="#EEEEEE"
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/negative_btn"
+            android:layout_marginTop="15dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:layout_marginBottom="15dp"
+            android:gravity="center"
+            android:textColor="@color/black"
+            android:textStyle="bold"
+            android:textSize="15.55sp"
+            android:text="@string/cancel"
+            android:layout_weight="0.5"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <View
+            android:background="#EEEEEE"
+            android:layout_width="0.5dp"
+            android:layout_height="match_parent"/>
+
+        <TextView
+            android:id="@+id/positive_btn"
+            android:layout_marginTop="15dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:layout_marginBottom="15dp"
+            android:text="@string/core_permission_dialog_positive_setting_text"
+            android:textSize="15.55sp"
+            android:textStyle="bold"
+            android:layout_weight="0.5"
+            android:textColor="?attr/core_primary_color"
+            android:gravity="center"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/layout/pop_dialog_adapter.xml b/system/tuicore/src/main/res/layout/pop_dialog_adapter.xml
new file mode 100644
index 0000000..9f5eac0
--- /dev/null
+++ b/system/tuicore/src/main/res/layout/pop_dialog_adapter.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="11.52dp">
+
+    <TextView
+        android:id="@+id/pop_dialog_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="start"
+        android:lines="1"
+        android:maxLines="1"
+        android:textColor="@color/text_color_gray"
+        android:textSize="13.44sp" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/layout/pop_menu_adapter.xml b/system/tuicore/src/main/res/layout/pop_menu_adapter.xml
new file mode 100644
index 0000000..35fb1fd
--- /dev/null
+++ b/system/tuicore/src/main/res/layout/pop_menu_adapter.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/core_pop_menu_item_height"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/pop_menu_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="11.5dp" />
+
+    <TextView
+        android:id="@+id/pop_menu_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="#444444"
+        android:textSize="15.36sp" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/layout/profile_icon_view.xml b/system/tuicore/src/main/res/layout/profile_icon_view.xml
new file mode 100644
index 0000000..85970f2
--- /dev/null
+++ b/system/tuicore/src/main/res/layout/profile_icon_view.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/profile_icon_group"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="#00000000">
+
+    <com.tencent.qcloud.tuicore.component.gatherimage.SynthesizedImageView
+        android:id="@+id/profile_icon"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="fitCenter" />
+
+</RelativeLayout>
diff --git a/system/tuicore/src/main/res/layout/title_bar_layout.xml b/system/tuicore/src/main/res/layout/title_bar_layout.xml
new file mode 100644
index 0000000..83882d7
--- /dev/null
+++ b/system/tuicore/src/main/res/layout/title_bar_layout.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/core_page_title_height"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/page_title_layout">
+
+    <LinearLayout
+        android:id="@+id/page_title_left_group"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_alignParentStart="true"
+        android:gravity="center_vertical"
+        android:minWidth="80dp"
+        android:orientation="horizontal"
+        android:paddingLeft="16dp">
+
+        <ImageView
+            android:id="@+id/page_title_left_icon"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:clickable="false"
+            android:background="?attr/core_title_bar_back_icon" />
+
+        <com.tencent.qcloud.tuicore.component.UnreadCountTextView
+            android:id="@+id/new_message_total_unread"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:layout_marginEnd="5dp"
+            android:minWidth="18.4dp"
+            android:minHeight="18.4dp"
+            android:textColor="#ffffff"
+            android:textSize="13.4sp"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/page_title_left_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?attr/core_title_bar_text_bg"
+            android:gravity="center"
+            android:textSize="16.3sp"
+            android:textStyle="bold"/>
+
+    </LinearLayout>
+
+
+    <TextView
+        android:id="@+id/page_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:maxWidth="200dp"
+        android:singleLine="true"
+        android:textAlignment="gravity"
+        android:textColor="?attr/core_title_bar_text_bg"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        tools:text="Title" />
+
+    <LinearLayout
+        android:id="@+id/page_title_right_group"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_alignParentRight="true"
+        android:gravity="center_vertical|right"
+        android:minWidth="80dp"
+        android:orientation="horizontal"
+        android:paddingRight="16dp">
+
+        <TextView
+            android:id="@+id/page_title_right_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="right"
+            android:textColor="?attr/core_title_bar_text_bg"
+            android:textSize="16.3sp"
+            android:textStyle="bold"/>
+
+        <ImageView
+            android:id="@+id/page_title_right_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:clickable="false" />
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/layout/tuicore_selection_activity.xml b/system/tuicore/src/main/res/layout/tuicore_selection_activity.xml
new file mode 100644
index 0000000..f8ae715
--- /dev/null
+++ b/system/tuicore/src/main/res/layout/tuicore_selection_activity.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/edit_title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/core_page_title_height" />
+
+    <EditText
+        android:id="@+id/edit_content_et"
+        android:longClickable="false"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginRight="10dp"
+        android:singleLine="true"
+        android:textCursorDrawable="@drawable/core_edit_cursor" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/select_list"
+        android:background="@color/white"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+</LinearLayout>
diff --git a/system/tuicore/src/main/res/layout/view_dialog.xml b/system/tuicore/src/main/res/layout/view_dialog.xml
new file mode 100644
index 0000000..4c1b864
--- /dev/null
+++ b/system/tuicore/src/main/res/layout/view_dialog.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/ll_background"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/alert_bg"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/tv_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp"
+        android:layout_marginTop="15dp"
+        android:gravity="center"
+        android:clickable="true"
+        android:focusableInTouchMode="true"
+        android:textColor="@color/black"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        android:focusable="true" />
+
+
+    <LinearLayout
+        android:id="@+id/ll_alert"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" />
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:layout_marginTop="10dp"
+        android:background="@color/dialog_line_bg" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/btn_neg"
+            android:layout_width="wrap_content"
+            android:layout_height="50dp"
+            android:layout_weight="1"
+            android:background="@drawable/trans_bg"
+            android:gravity="center"
+            android:textAllCaps="false"
+            android:textColor="?attr/core_primary_color"
+            android:textSize="16sp" />
+
+        <ImageView
+            android:id="@+id/img_line"
+            android:layout_width="0.5dp"
+            android:layout_height="50dp"
+            android:background="@color/dialog_line_bg" />
+
+        <Button
+            android:id="@+id/btn_pos"
+            android:layout_width="wrap_content"
+            android:layout_height="50dp"
+            android:layout_weight="1"
+            android:background="@drawable/trans_bg"
+            android:gravity="center"
+            android:textAllCaps="false"
+            android:textColor="?attr/core_primary_color"
+            android:textSize="16sp" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/values-zh-rCN/im_error_msg.xml b/system/tuicore/src/main/res/values-zh-rCN/im_error_msg.xml
new file mode 100644
index 0000000..1f96497
--- /dev/null
+++ b/system/tuicore/src/main/res/values-zh-rCN/im_error_msg.xml
@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="TUIKitErrorInProcess">执行中</string>
+    <string name="TUIKitErrorInvalidParameters">参数无效</string>
+    <string name="TUIKitErrorIOOperateFaild">操作本地 IO 错误</string>
+    <string name="TUIKitErrorInvalidJson">错误的 JSON 格式</string>
+    <string name="TUIKitErrorOutOfMemory">内存不足</string>
+    <string name="TUIKitErrorParseResponseFaild">PB 解析失败</string>
+    <string name="TUIKitErrorSerializeReqFaild">PB 序列化失败</string>
+    <string name="TUIKitErrorSDKNotInit">IM SDK 未初始化</string>
+    <string name="TUIKitErrorLoadMsgFailed">加载本地数据库操作失败</string>
+    <string name="TUIKitErrorDatabaseOperateFailed">本地数据库操作失败</string>
+    <string name="TUIKitErrorCrossThread">跨线程错误</string>
+    <string name="TUIKitErrorTinyIdEmpty">用户信息为空</string>
+    <string name="TUIKitErrorInvalidIdentifier">Identifier 非法</string>
+    <string name="TUIKitErrorFileNotFound">文件不存在</string>
+    <string name="TUIKitErrorFileTooLarge">文件大小超出了限制</string>
+    <string name="TUIKitErrorEmptyFile">空文件</string>
+    <string name="TUIKitErrorFileOpenFailed">文件打开失败</string>
+    <string name="TUIKitErrorNotLogin">IM SDK 未登陆</string>
+    <string name="TUIKitErrorNoPreviousLogin">并没有登录过该用户</string>
+    <string name="TUIKitErrorUserSigExpired">UserSig 过期</string>
+    <string name="TUIKitErrorLoginKickedOffByOther">其他终端登录同一账号</string>
+    <string name="TUIKitErrorTLSSDKInit">TLS SDK 初始化失败</string>
+    <string name="TUIKitErrorTLSSDKUninit">TLS SDK 未初始化</string>
+    <string name="TUIKitErrorTLSSDKTRANSPackageFormat">TLS SDK TRANS 包格式错误</string>
+    <string name="TUIKitErrorTLSDecrypt">TLS SDK 解密失败</string>
+    <string name="TUIKitErrorTLSSDKRequest">TLS SDK 请求失败</string>
+    <string name="TUIKitErrorTLSSDKRequestTimeout">TLS SDK 请求超时</string>
+    <string name="TUIKitErrorInvalidConveration">会话无效</string>
+    <string name="TUIKitErrorFileTransAuthFailed">文件传输鉴权失败</string>
+    <string name="TUIKitErrorFileTransNoServer">文件传输获取 Server 列表失败</string>
+    <string name="TUIKitErrorFileTransUploadFailed">文件传输上传失败，请检查网络是否连接</string>
+    <string name="TUIKitErrorFileTransUploadFailedNotImage">文件传输上传失败，请检查上传的图片是否能够正常打开</string>
+    <string name="TUIKitErrorFileTransDownloadFailed">文件传输下载失败，请检查网络，或者文件、语音是否已经过期</string>
+    <string name="TUIKitErrorHTTPRequestFailed">HTTP 请求失败</string>
+    <string name="TUIKitErrorInvalidMsgElem">IM SDK 无效消息 elem</string>
+    <string name="TUIKitErrorInvalidSDKObject">无效的对象</string>
+    <string name="TUIKitSDKMsgBodySizeLimit">消息长度超出限制</string>
+    <string name="TUIKitErrorSDKMsgKeyReqDifferRsp">消息 KEY 错误</string>
+    <string name="TUIKitErrorSDKGroupInvalidID">群组 ID 非法，自定义群组 ID 必须为可打印 ASCII 字符（0x20-0x7e），最长48个字节，且前缀不能为 @TGS#</string>
+    <string name="TUIKitErrorSDKGroupInvalidName">群名称非法，群名称最长30字节</string>
+    <string name="TUIKitErrorSDKGroupInvalidIntroduction">群简介非法，群简介最长240字节</string>
+    <string name="TUIKitErrorSDKGroupInvalidNotification">群公告非法，群公告最长300字节</string>
+    <string name="TUIKitErrorSDKGroupInvalidFaceURL">群头像 URL 非法，群头像 URL 最长100字节</string>
+    <string name="TUIKitErrorSDKGroupInvalidNameCard">群名片非法，群名片最长50字节</string>
+    <string name="TUIKitErrorSDKGroupMemberCountLimit">超过群组成员数的限制</string>
+    <string name="TUIKitErrorSDKGroupJoinPrivateGroupDeny">不允许申请加入 Private 群组</string>
+    <string name="TUIKitErrorSDKGroupInviteSuperDeny">不允许邀请角色为群主的成员</string>
+    <string name="TUIKitErrorSDKGroupInviteNoMember">不允许邀请0个成员</string>
+    <string name="TUIKitErrorSDKFriendShipInvalidProfileKey">资料字段非法</string>
+    <string name="TUIKitErrorSDKFriendshipInvalidAddRemark">备注字段非法，最大96字节</string>
+    <string name="TUIKitErrorSDKFriendshipInvalidAddWording">请求添加好友的请求说明字段非法，最大120字节</string>
+    <string name="TUIKitErrorSDKFriendshipInvalidAddSource">请求添加好友的添加来源字段非法，来源需要添加“AddSource_Type_”前缀。</string>
+    <string name="TUIKitErrorSDKFriendshipFriendGroupEmpty">好友分组字段非法，必须不为空，每个分组的名称最长30字节</string>
+    <string name="TUIKitErrorSDKNetEncodeFailed">网络链接加密失败</string>
+    <string name="TUIKitErrorSDKNetDecodeFailed">网络链接解密失败</string>
+    <string name="TUIKitErrorSDKNetAuthInvalid">网络链接未完成鉴权</string>
+    <string name="TUIKitErrorSDKNetCompressFailed">数据包压缩失败</string>
+    <string name="TUIKitErrorSDKNetUncompressFaile">数据包解压失败</string>
+    <string name="TUIKitErrorSDKNetFreqLimit">调用频率限制，最大每秒发起 5 次请求</string>
+    <string name="TUIKitErrorSDKnetReqCountLimit">请求队列満，超过同时请求的数量限制，最大同时发起1000个请求。</string>
+    <string name="TUIKitErrorSDKNetDisconnect">网络已断开，未建立连接，或者建立 socket 连接时，检测到无网络。</string>
+    <string name="TUIKitErrorSDKNetAllreadyConn">网络连接已建立，重复创建连接</string>
+    <string name="TUIKitErrorSDKNetConnTimeout">建立网络连接超时，请等网络恢复后重试。</string>
+    <string name="TUIKitErrorSDKNetConnRefuse">网络连接已被拒绝，请求过于频繁，服务端拒绝服务。</string>
+    <string name="TUIKitErrorSDKNetNetUnreach">没有到达网络的可用路由，请等网络恢复后重试。</string>
+    <string name="TUIKitErrorSDKNetSocketNoBuff">系统中没有足够的缓冲区空间资源可用来完成调用，系统过于繁忙，内部错误。</string>
+    <string name="TUIKitERRORSDKNetResetByPeer">对端重置了连接</string>
+    <string name="TUIKitErrorSDKNetSOcketInvalid">socket 套接字无效</string>
+    <string name="TUIKitErrorSDKNetHostGetAddressFailed">IP 地址解析失败</string>
+    <string name="TUIKitErrorSDKNetConnectReset">网络连接到中间节点或服务端重置</string>
+    <string name="TUIKitErrorSDKNetWaitInQueueTimeout">请求包等待进入待发送队列超时</string>
+    <string name="TUIKitErrorSDKNetWaitSendTimeout">请求包已进入待发送队列，等待进入系统的网络 buffer 超时</string>
+    <string name="TUIKitErrorSDKNetWaitAckTimeut">请求包已进入系统的网络 buffer ，等待服务端回包超时</string>
+    <string name="TUIKitErrorSDKSVRSSOConnectLimit">Server 的连接数量超出限制，服务端拒绝服务。</string>
+    <string name="TUIKitErrorSDKSVRSSOVCode">验证码下发超时。</string>
+    <string name="TUIKitErrorSVRSSOD2Expired">Key 过期。Key 是根据 UserSig 生成的内部票据，Key 的有效期小于或等于 UserSig 的有效期。请重新调用 TIMManager.getInstance().login 登录接口生成新的 Key。</string>
+    <string name="TUIKitErrorSVRA2UpInvalid">Ticket 过期。Ticket 是根据 UserSig 生成的内部票据，Ticket 的有效期小于或等于 UserSig 的有效期。请重新调用 TIMManager.getInstance().login 登录接口生成新的 Ticket。</string>
+    <string name="TUIKitErrorSVRA2DownInvalid">票据验证没通过或者被安全打击。请重新调用 TIMManager.getInstance().login 登录接口生成新的票据。</string>
+    <string name="TUIKitErrorSVRSSOEmpeyKey">不允许空 Key。</string>
+    <string name="TUIKitErrorSVRSSOUinInvalid">Key 中的帐号和请求包头的帐号不匹配。</string>
+    <string name="TUIKitErrorSVRSSOVCodeTimeout">验证码下发超时。</string>
+    <string name="TUIKitErrorSVRSSONoImeiAndA2">需要带上 Key 和 Ticket。</string>
+    <string name="TUIKitErrorSVRSSOCookieInvalid">Cookie 检查不匹配。</string>
+    <string name="TUIKitErrorSVRSSODownTips">下发提示语，Key 过期。</string>
+    <string name="TUIKitErrorSVRSSODisconnect">断链锁屏。</string>
+    <string name="TUIKitErrorSVRSSOIdentifierInvalid">失效身份。</string>
+    <string name="TUIKitErrorSVRSSOClientClose">终端自动退出。</string>
+    <string name="TUIKitErrorSVRSSOMSFSDKQuit">MSFSDK 自动退出。</string>
+    <string name="TUIKitErrorSVRSSOD2KeyWrong">解密失败次数超过阈值，通知终端需要重置，请重新调用 TIMManager.getInstance().login 登录接口生成新的 Key。</string>
+    <string name="TUIKitErrorSVRSSOUnsupport">不支持聚合，给终端返回统一的错误码。终端在该 TCP 长连接上停止聚合。</string>
+    <string name="TUIKitErrorSVRSSOPrepaidArrears">预付费欠费。</string>
+    <string name="TUIKitErrorSVRSSOPacketWrong">请求包格式错误。</string>
+    <string name="TUIKitErrorSVRSSOAppidBlackList">SDKAppID 黑名单。</string>
+    <string name="TUIKitErrorSVRSSOCmdBlackList">SDKAppID 设置 service cmd 黑名单。</string>
+    <string name="TUIKitErrorSVRSSOAppidWithoutUsing">SDKAppID 停用。</string>
+    <string name="TUIKitErrorSVRSSOFreqLimit">频率限制(用户)，频率限制是设置针对某一个协议的每秒请求数的限制。</string>
+    <string name="TUIKitErrorSVRSSOOverload">过载丢包(系统)，连接的服务端处理过多请求，处理不过来，拒绝服务。</string>
+    <string name="TUIKitErrorSVRResNotFound">要发送的资源文件不存在。</string>
+    <string name="TUIKitErrorSVRResAccessDeny">要发送的资源文件不允许访问。</string>
+    <string name="TUIKitErrorSVRResSizeLimit">文件大小超过限制。</string>
+    <string name="TUIKitErrorSVRResSendCancel">用户取消发送，如发送过程中登出等原因。</string>
+    <string name="TUIKitErrorSVRResReadFailed">读取文件内容失败。</string>
+    <string name="TUIKitErrorSVRResTransferTimeout">资源文件传输超时</string>
+    <string name="TUIKitErrorSVRResInvalidParameters">参数非法。</string>
+    <string name="TUIKitErrorSVRResInvalidFileMd5">文件 MD5 校验失败。</string>
+    <string name="TUIKitErrorSVRResInvalidPartMd5">分片 MD5 校验失败。</string>
+    <string name="TUIKitErrorSVRCommonInvalidHttpUrl">HTTP 解析错误 ，请检查 HTTP 请求 URL 格式。</string>
+    <string name="TUIKitErrorSVRCommomReqJsonParseFailed">HTTP 请求 JSON 解析错误，请检查 JSON 格式。</string>
+    <string name="TUIKitErrorSVRCommonInvalidAccount">请求 URI 或 JSON 包体中 Identifier 或 UserSig 错误。</string>
+    <string name="TUIKitErrorSVRCommonInvalidSdkappid">SDKAppID 失效，请核对 SDKAppID 有效性。</string>
+    <string name="TUIKitErrorSVRCommonRestFreqLimit">REST 接口调用频率超过限制，请降低请求频率。</string>
+    <string name="TUIKitErrorSVRCommonRequestTimeout">服务请求超时或 HTTP 请求格式错误，请检查并重试。</string>
+    <string name="TUIKitErrorSVRCommonInvalidRes">请求资源错误，请检查请求 URL。</string>
+    <string name="TUIKitErrorSVRCommonIDNotAdmin">REST API 请求的 Identifier 字段请填写 App 管理员帐号。</string>
+    <string name="TUIKitErrorSVRCommonSdkappidFreqLimit">SDKAppID 请求频率超限，请降低请求频率。</string>
+    <string name="TUIKitErrorSVRCommonSdkappidMiss">REST 接口需要带 SDKAppID，请检查请求 URL 中的 SDKAppID。</string>
+    <string name="TUIKitErrorSVRCommonRspJsonParseFailed">HTTP 响应包 JSON 解析错误。</string>
+    <string name="TUIKitErrorSVRCommonExchangeAccountTimeout">置换帐号超时。</string>
+    <string name="TUIKitErrorSVRCommonInvalidIdFormat">请求包体 Identifier 类型错误，请确认 Identifier 为字符串格式。</string>
+    <string name="TUIKitErrorSVRCommonSDkappidForbidden">SDKAppID 被禁用</string>
+    <string name="TUIKitErrorSVRCommonReqForbidden">请求被禁用</string>
+    <string name="TUIKitErrorSVRCommonReqFreqLimit">请求过于频繁，请稍后重试。</string>
+    <string name="TUIKitErrorSVRCommonInvalidService">您的专业版套餐包已到期并停用，请登录 即时通信 IM 购买页面 重新购买套餐包。购买后，将在5分钟后生效。</string>
+    <string name="TUIKitErrorSVRCommonSensitiveText">文本安全打击，文本中可能包含敏感词汇。</string>
+    <string name="TUIKitErrorSVRCommonBodySizeLimit">发消息包体过长，目前支持最大12k消息包体长度，请减少包体大小重试。</string>
+    <string name="TUIKitErrorSVRAccountUserSigExpired">UserSig 已过期，请重新生成 UserSig</string>
+    <string name="TUIKitErrorSVRAccountUserSigEmpty">UserSig 长度为0</string>
+    <string name="TUIKitErrorSVRAccountUserSigCheckFailed">UserSig 校验失败</string>
+    <string name="TUIKitErrorSVRAccountUserSigMismatchPublicKey">用公钥验证 UserSig 失败</string>
+    <string name="TUIKitErrorSVRAccountUserSigMismatchId">请求的 Identifier 与生成 UserSig 的 Identifier 不匹配。</string>
+    <string name="TUIKitErrorSVRAccountUserSigMismatchSdkAppid">请求的 SDKAppID 与生成 UserSig 的 SDKAppID 不匹配。</string>
+    <string name="TUIKitErrorSVRAccountUserSigPublicKeyNotFound">验证 UserSig 时公钥不存在</string>
+    <string name="TUIKitErrorSVRAccountUserSigSdkAppidNotFount">SDKAppID 未找到，请在云通信 IM 控制台确认应用信息。</string>
+    <string name="TUIKitErrorSVRAccountInvalidUserSig">UserSig 已经失效，请重新生成，再次尝试。</string>
+    <string name="TUIKitErrorSVRAccountNotFound">请求的用户帐号不存在。</string>
+    <string name="TUIKitErrorSVRAccountSecRstr">安全原因被限制。</string>
+    <string name="TUIKitErrorSVRAccountInternalTimeout">服务端内部超时，请重试。</string>
+    <string name="TUIKitErrorSVRAccountInvalidCount">请求中批量数量不合法。</string>
+    <string name="TUIkitErrorSVRAccountINvalidParameters">参数非法，请检查必填字段是否填充，或者字段的填充是否满足协议要求。</string>
+    <string name="TUIKitErrorSVRAccountAdminRequired">请求需要 App 管理员权限。</string>
+    <string name="TUIKitErrorSVRAccountFreqLimit">因失败且重试次数过多导致被限制，请检查 UserSig 是否正确，一分钟之后再试。</string>
+    <string name="TUIKitErrorSVRAccountBlackList">帐号被拉入黑名单。</string>
+    <string name="TUIKitErrorSVRAccountCountLimit">创建帐号数量超过免费体验版数量限制，请升级为专业版。</string>
+    <string name="TUIKitErrorSVRAccountInternalError">服务端内部错误，请重试。</string>
+    <string name="TUIKitErrorSVRProfileInvalidParameters">请求参数错误，请根据错误描述检查请求是否正确。</string>
+    <string name="TUIKitErrorSVRProfileAccountMiss">请求参数错误，没有指定需要拉取资料的用户帐号。</string>
+    <string name="TUIKitErrorSVRProfileAccountNotFound">请求的用户帐号不存在。</string>
+    <string name="TUIKitErrorSVRProfileAdminRequired">请求需要 App 管理员权限。</string>
+    <string name="TUIKitErrorSVRProfileSensitiveText">资料字段中包含敏感词。</string>
+    <string name="TUIKitErrorSVRProfileInternalError">服务端内部错误，请稍后重试。</string>
+    <string name="TUIKitErrorSVRProfileReadWritePermissionRequired">没有资料字段的读权限，详情可参见 资料字段。</string>
+    <string name="TUIKitErrorSVRProfileTagNotFound">资料字段的 Tag 不存在。</string>
+    <string name="TUIKitErrorSVRProfileSizeLimit">资料字段的 Value 长度超过500字节。</string>
+    <string name="TUIKitErrorSVRProfileValueError">标配资料字段的 Value 错误，详情可参见 标配资料字段。</string>
+    <string name="TUIKitErrorSVRProfileInvalidValueFormat">资料字段的 Value 类型不匹配，详情可参见 标配资料字段。</string>
+    <string name="TUIKitErrorSVRFriendshipInvalidParameters">请求参数错误，请根据错误描述检查请求是否正确。</string>
+    <string name="TUIKitErrorSVRFriendshipInvalidSdkAppid">SDKAppID 不匹配。</string>
+    <string name="TUIKitErrorSVRFriendshipAccountNotFound">请求的用户帐号不存在。</string>
+    <string name="TUIKitErrorSVRFriendshipAdminRequired">请求需要 App 管理员权限。</string>
+    <string name="TUIKitErrorSVRFriendshipSensitiveText">关系链字段中包含敏感词。</string>
+    <string name="TUIKitErrorSVRFriendshipNetTimeout">网络超时，请稍后重试。</string>
+    <string name="TUIKitErrorSVRFriendshipWriteConflict">并发写导致写冲突，建议使用批量方式。</string>
+    <string name="TUIKitErrorSVRFriendshipAddFriendDeny">后台禁止该用户发起加好友请求。</string>
+    <string name="TUIkitErrorSVRFriendshipCountLimit">自己的好友数已达系统上限。</string>
+    <string name="TUIKitErrorSVRFriendshipGroupCountLimit">分组已达系统上限。</string>
+    <string name="TUIKitErrorSVRFriendshipPendencyLimit">未决数已达系统上限。</string>
+    <string name="TUIKitErrorSVRFriendshipBlacklistLimit">黑名单数已达系统上限。</string>
+    <string name="TUIKitErrorSVRFriendshipPeerFriendLimit">对方的好友数已达系统上限。</string>
+    <string name="TUIKitErrorSVRFriendshipInSelfBlacklist">对方在自己的黑名单中，不允许加好友。</string>
+    <string name="TUIKitErrorSVRFriendshipAllowTypeDenyAny">对方的加好友验证方式是不允许任何人添加自己为好友。</string>
+    <string name="TUIKitErrorSVRFriendshipInPeerBlackList">自己在对方的黑名单中，不允许加好友。</string>
+    <string name="TUIKitErrorSVRFriendshipAllowTypeNeedConfirm">请求已发送，等待对方同意</string>
+    <string name="TUIKitErrorSVRFriendshipAddFriendSecRstr">添加好友请求被安全策略打击，请勿频繁发起添加好友请求。</string>
+    <string name="TUIKitErrorSVRFriendshipPendencyNotFound">请求的未决不存在。</string>
+    <string name="TUIKitErrorSVRFriendshipDelFriendSecRstr">删除好友请求被安全策略打击，请勿频繁发起删除好友请求。</string>
+    <string name="TUIKirErrorSVRFriendAccountNotFoundEx">请求的用户帐号不存在。</string>
+    <string name="TUIKitErrorSVRMsgPkgParseFailed">解析请求包失败。</string>
+    <string name="TUIKitErrorSVRMsgInternalAuthFailed">内部鉴权失败。</string>
+    <string name="TUIKitErrorSVRMsgInvalidId">Identifier 无效</string>
+    <string name="TUIKitErrorSVRMsgNetError">网络异常，请重试。</string>
+    <string name="TUIKitErrorSVRMsgPushDeny">触发发送单聊消息之前回调，App 后台返回禁止下发该消息。</string>
+    <string name="TUIKitErrorSVRMsgInPeerBlackList">发送单聊消息，被对方拉黑，禁止发送。</string>
+    <string name="TUIKitErrorSVRMsgBothNotFriend">消息发送双方互相不是好友，禁止发送。</string>
+    <string name="TUIKitErrorSVRMsgNotPeerFriend">发送单聊消息，自己不是对方的好友（单向关系），禁止发送。</string>
+    <string name="TUIkitErrorSVRMsgNotSelfFriend">发送单聊消息，对方不是自己的好友（单向关系），禁止发送。</string>
+    <string name="TUIKitErrorSVRMsgShutupDeny">因禁言，禁止发送消息。</string>
+    <string name="TUIKitErrorSVRMsgRevokeTimeLimit">消息撤回超过了时间限制（默认2分钟）。</string>
+    <string name="TUIKitErrorSVRMsgDelRambleInternalError">删除漫游内部错误。</string>
+    <string name="TUIKitErrorSVRMsgJsonParseFailed">JSON 格式解析失败，请检查请求包是否符合 JSON 规范。</string>
+    <string name="TUIKitErrorSVRMsgInvalidJsonBodyFormat">JSON 格式请求包中 MsgBody 不符合消息格式描述</string>
+    <string name="TUIKitErrorSVRMsgInvalidToAccount">JSON 格式请求包体中缺少 To_Account 字段或者 To_Account 字段不是 Integer 类型</string>
+    <string name="TUIKitErrorSVRMsgInvalidRand">JSON 格式请求包体中缺少 MsgRandom 字段或者 MsgRandom 字段不是 Integer 类型</string>
+    <string name="TUIKitErrorSVRMsgInvalidTimestamp">JSON 格式请求包体中缺少 MsgTimeStamp 字段或者 MsgTimeStamp 字段不是 Integer 类型</string>
+    <string name="TUIKitErrorSVRMsgBodyNotArray">JSON 格式请求包体中 MsgBody 类型不是 Array 类型</string>
+    <string name="TUIKitErrorSVRMsgInvalidJsonFormat">JSON 格式请求包不符合消息格式描述</string>
+    <string name="TUIKitErrorSVRMsgToAccountCountLimit">批量发消息目标帐号超过500</string>
+    <string name="TUIKitErrorSVRMsgToAccountNotFound">To_Account 没有注册或不存在</string>
+    <string name="TUIKitErrorSVRMsgTimeLimit">消息离线存储时间错误（最多不能超过7天）。</string>
+    <string name="TUIKitErrorSVRMsgInvalidSyncOtherMachine">JSON 格式请求包体中 SyncOtherMachine 字段不是 Integer 类型</string>
+    <string name="TUIkitErrorSVRMsgInvalidMsgLifeTime">JSON 格式请求包体中 MsgLifeTime 字段不是 Integer 类型</string>
+    <string name="TUIKitErrorSVRMsgBodySizeLimit">JSON 数据包超长，消息包体请不要超过12k。</string>
+    <string name="TUIKitErrorSVRmsgLongPollingCountLimit">Web 端长轮询被踢（Web 端同时在线实例个数超出限制）。</string>
+    <string name="TUIKitErrorUnsupporInterface">该功能仅限旗舰版使用，请升级至旗舰版。</string>
+    <string name="TUIKitErrorUnsupporInterfaceSuffix">功能仅限旗舰版使用，请升级至旗舰版。</string>
+
+    <string name="TUIKitErrorSVRGroupApiNameError">请求中的接口名称错误</string>
+    <string name="TUIKitErrorSVRGroupAccountCountLimit">请求包体中携带的帐号数量过多。</string>
+    <string name="TUIkitErrorSVRGroupFreqLimit">操作频率限制，请尝试降低调用的频率。</string>
+    <string name="TUIKitErrorSVRGroupPermissionDeny">操作权限不足</string>
+    <string name="TUIKitErrorSVRGroupInvalidReq">请求非法</string>
+    <string name="TUIKitErrorSVRGroupSuperNotAllowQuit">该群不允许群主主动退出。</string>
+    <string name="TUIKitErrorSVRGroupNotFound">群组不存在</string>
+    <string name="TUIKitErrorSVRGroupJsonParseFailed">解析 JSON 包体失败，请检查包体的格式是否符合 JSON 格式。</string>
+    <string name="TUIKitErrorSVRGroupInvalidId">发起操作的 Identifier 非法，请检查发起操作的用户 Identifier 是否填写正确。</string>
+    <string name="TUIKitErrorSVRGroupAllreadyMember">被邀请加入的用户已经是群成员。</string>
+    <string name="TUIKitErrorSVRGroupFullMemberCount">群已满员，无法将请求中的用户加入群组</string>
+    <string name="TUIKitErrorSVRGroupInvalidGroupId">群组 ID 非法，请检查群组 ID 是否填写正确。</string>
+    <string name="TUIKitErrorSVRGroupRejectFromThirdParty">App 后台通过第三方回调拒绝本次操作。</string>
+    <string name="TUIKitErrorSVRGroupShutDeny">因被禁言而不能发送消息，请检查发送者是否被设置禁言。</string>
+    <string name="TUIKitErrorSVRGroupRspSizeLimit">应答包长度超过最大包长</string>
+    <string name="TUIKitErrorSVRGroupAccountNotFound">请求的用户帐号不存在。</string>
+    <string name="TUIKitErrorSVRGroupGroupIdInUse">群组 ID 已被使用，请选择其他的群组 ID。</string>
+    <string name="TUIKitErrorSVRGroupSendMsgFreqLimit">发消息的频率超限，请延长两次发消息时间的间隔。</string>
+    <string name="TUIKitErrorSVRGroupReqAllreadyBeenProcessed">此邀请或者申请请求已经被处理。</string>
+    <string name="TUIKitErrorSVRGroupGroupIdUserdForSuper">群组 ID 已被使用，并且操作者为群主，可以直接使用。</string>
+    <string name="TUIKitErrorSVRGroupSDkAppidDeny">该 SDKAppID 请求的命令字已被禁用</string>
+    <string name="TUIKitErrorSVRGroupRevokeMsgNotFound">请求撤回的消息不存在。</string>
+    <string name="TUIKitErrorSVRGroupRevokeMsgTimeLimit">消息撤回超过了时间限制（默认2分钟）。</string>
+    <string name="TUIKitErrorSVRGroupRevokeMsgDeny">请求撤回的消息不支持撤回操作。</string>
+    <string name="TUIKitErrorSVRGroupNotAllowRevokeMsg">群组类型不支持消息撤回操作。</string>
+    <string name="TUIKitErrorSVRGroupRemoveMsgDeny">该消息类型不支持删除操作。</string>
+    <string name="TUIKitErrorSVRGroupNotAllowRemoveMsg">音视频聊天室和在线成员广播大群不支持删除消息。</string>
+    <string name="TUIKitErrorSVRGroupAvchatRoomCountLimit">音视频聊天室创建数量超过了限制</string>
+    <string name="TUIKitErrorSVRGroupCountLimit">单个用户可创建和加入的群组数量超过了限制”。</string>
+    <string name="TUIKitErrorSVRGroupMemberCountLimit">群成员数量超过限制</string>
+    <string name="TUIKitErrorSVRNoSuccessResult">批量操作无成功结果</string>
+    <string name="TUIKitErrorSVRToUserInvalid">IM: 无效接收方</string>
+    <string name="TUIKitErrorSVRRequestTimeout">请求超时</string>
+    <string name="TUIKitErrorSVRInitCoreFail">INIT CORE模块失败</string>
+    <string name="TUIKitErrorExpiredSessionNode">SessionNode为null</string>
+    <string name="TUIKitErrorLoggedOutBeforeLoginFinished">在登录完成前进行了登出（在登录时返回）</string>
+    <string name="TUIKitErrorTLSSDKNotInitialized">tlssdk未初始化</string>
+    <string name="TUIKitErrorTLSSDKUserNotFound">TLSSDK没有找到相应的用户信息</string>
+    <string name="TUIKitErrorBindFaildRegTimeout">注册超时</string>
+    <string name="TUIKitErrorBindFaildIsBinding">正在bind操作中</string>
+    <string name="TUIKitErrorPacketFailUnknown">发包未知错误</string>
+    <string name="TUIKitErrorPacketFailReqNoNet">发送请求包时没有网络,处理时转换成case ERR_REQ_NO_NET_ON_REQ:</string>
+    <string name="TUIKitErrorPacketFailRespNoNet">发送回复包时没有网络,处理时转换成case ERR_REQ_NO_NET_ON_RSP:</string>
+    <string name="TUIKitErrorPacketFailReqNoAuth">发送请求包时没有权限</string>
+    <string name="TUIKitErrorPacketFailSSOErr">SSO错误</string>
+    <string name="TUIKitErrorPacketFailRespTimeout">回复超时</string>
+    <string name="TUIKitErrorFriendshipProxySyncing">proxy_manager没有完成svr数据同步</string>
+    <string name="TUIKitErrorFriendshipProxySyncedFail">proxy_manager同步失败</string>
+    <string name="TUIKitErrorFriendshipProxyLocalCheckErr">proxy_manager请求参数，在本地检查不合法</string>
+    <string name="TUIKitErrorGroupInvalidField">group assistant请求字段中包含非预设字段</string>
+    <string name="TUIKitErrorGroupStoreageDisabled">group assistant群资料本地存储没有开启</string>
+    <string name="TUIKitErrorLoadGrpInfoFailed">无法从存储中加载groupinfo</string>
+    <string name="TUIKitErrorReqNoNetOnReq">请求的时候没有网络</string>
+    <string name="TUIKitErrorReqNoNetOnResp">响应的时候没有网络</string>
+    <string name="TUIKitErrorServiceNotReady">QALSDK服务未就绪</string>
+    <string name="TUIKitErrorLoginAuthFailed">账号认证失败（用户信息获取失败）</string>
+    <string name="TUIKitErrorNeverConnectAfterLaunch">在应用启动后没有尝试联网</string>
+    <string name="TUIKitErrorReqFailed">QAL执行失败</string>
+    <string name="TUIKitErrorReqInvaidReq">请求非法，toMsgService非法</string>
+    <string name="TUIKitErrorReqOnverLoaded">请求队列满</string>
+    <string name="TUIKitErrorReqKickOff">已经被其他终端踢了</string>
+    <string name="TUIKitErrorReqServiceSuspend">服务被暂停</string>
+    <string name="TUIKitErrorReqInvalidSign">SSO签名错误</string>
+    <string name="TUIKitErrorReqInvalidCookie">SSO cookie无效</string>
+    <string name="TUIKitErrorLoginTlsRspParseFailed">登录时TLS回包校验，包体长度错误</string>
+    <string name="TUIKitErrorLoginOpenMsgTimeout">登录时OPENSTATSVC向OPENMSG上报状态超时</string>
+    <string name="TUIKitErrorLoginOpenMsgRspParseFailed">登录时OPENSTATSVC向OPENMSG上报状态时解析回包失败</string>
+    <string name="TUIKitErrorLoginTslDecryptFailed">登录时TLS解密失败</string>
+    <string name="TUIKitErrorWifiNeedAuth">wifi需要认证</string>
+    <string name="TUIKitErrorUserCanceled">用户已取消</string>
+    <string name="TUIkitErrorRevokeTimeLimitExceed">消息撤回超过了时间限制（默认2分钟）</string>
+    <string name="TUIKitErrorLackUGExt">缺少UGC扩展包</string>
+    <string name="TUIKitErrorAutoLoginNeedUserSig">自动登录，本地票据过期，需要userSig手动登录</string>
+    <string name="TUIKitErrorQALNoShortConneAvailable">没有可用的短连接sso</string>
+    <string name="TUIKitErrorReqContentAttach">消息内容安全打击</string>
+    <string name="TUIKitErrorLoginSigExpire">登录返回，票据过期</string>
+    <string name="TUIKitErrorSDKHadInit">SDK 已经初始化无需重复初始化</string>
+    <string name="TUIKitErrorOpenBDHBase">openbdh 错误码</string>
+    <string name="TUIKitErrorRequestNoNetOnReq">请求时没有网络，请等网络恢复后重试</string>
+    <string name="TUIKitErrorRequestNoNetOnRsp">响应时没有网络，请等网络恢复后重试</string>
+    <string name="TUIKitErrorRequestOnverLoaded">请求队列満</string>
+    <string name="TUIKitErrorEnableUserStatusOnConsole">您未开启用户状态功能，请先登录控制台开启</string>
+</resources>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/values-zh-rCN/strings.xml b/system/tuicore/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..8271ced
--- /dev/null
+++ b/system/tuicore/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="open_file_tips">选择要打开此文件的应用</string>
+
+    <string name="date_year_short">年</string>
+    <string name="date_month_short">月</string>
+    <string name="date_day_short">天</string>
+    <string name="date_hour_short">时</string>
+    <string name="date_minute_short">分</string>
+    <string name="date_second_short">秒</string>
+    <string name="date_yesterday">昨天</string>
+
+    <string name="sure">确定</string>
+    <string name="cancel">取消</string>
+    <string name="core_permission_dialog_title">权限申请</string>
+    <string name="core_permission_dialog_positive_setting_text">去设置</string>
+    <string name="setting">设置中</string>
+    <string name="setting_fail">设置失败！</string>
+    <string name="setting_success">设置成功！</string>
+    <string name="default_text">默认背景</string>
+    <string name="core_next_step">下一步</string>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/values/attrs.xml b/system/tuicore/src/main/res/values/attrs.xml
new file mode 100644
index 0000000..ebba827
--- /dev/null
+++ b/system/tuicore/src/main/res/values/attrs.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="UserIconView">
+        <!--默认头像-->
+        <attr name="default_image" format="reference" />
+        <attr name="image_radius" format="dimension" />
+    </declare-styleable>
+
+    <declare-styleable name="SynthesizedImageView">
+        <!--合成图片的背景-->
+        <attr name="synthesized_image_bg" format="color" />
+        <!--合成图片的默认图片-->
+        <attr name="synthesized_default_image" format="reference" />
+        <!--合成图片的尺寸-->
+        <attr name="synthesized_image_size" format="dimension" />
+        <!--多图片之间的空隙间隔-->
+        <attr name="synthesized_image_gap" format="dimension" />
+    </declare-styleable>
+
+    <declare-styleable name="LineControllerView">
+        <!-- 名称 -->
+        <attr name="name" format="string"/>
+        <!-- 内容或当前状态 -->
+        <attr name="subject" format="string"/>
+        <!-- 是否是列表中最后一个 -->
+        <attr name="isBottom" format="boolean"/>
+        <!-- 是否是列表中第一个 -->
+        <attr name="isTop" format="boolean"/>
+        <!-- 是否可以跳转 -->
+        <attr name="canNav" format="boolean"/>
+        <!-- 是否是开关 -->
+        <attr name="isSwitch" format="boolean"/>
+    </declare-styleable>
+
+    <declare-styleable name="IndexBar">
+        <attr name="indexBarTextSize" format="dimension"/>
+        <attr name="indexBarPressBackground" format="color" />
+    </declare-styleable>
+
+    <declare-styleable name="core_round_rect_image_style">
+        <attr name="round_radius" format="dimension" />
+    </declare-styleable>
+
+    <declare-styleable name="TitleBarLayout">
+        <attr name="title_bar_middle_title" format="string" />
+        <attr name="title_bar_can_return" format="boolean" />
+    </declare-styleable>
+
+    <declare-styleable name="RoundFrameLayout">
+        <attr name="corner_radius" format="dimension" />
+        <attr name="left_top_corner_radius" format="dimension" />
+        <attr name="right_top_corner_radius" format="dimension" />
+        <attr name="right_bottom_corner_radius" format="dimension" />
+        <attr name="left_bottom_corner_radius" format="dimension" />
+    </declare-styleable>
+
+    <declare-styleable name="RoundCornerImageView" parent="RoundFrameLayout">
+        <attr name="corner_radius"/>
+        <attr name="left_top_corner_radius"/>
+        <attr name="right_top_corner_radius" />
+        <attr name="right_bottom_corner_radius"  />
+        <attr name="left_bottom_corner_radius"  />
+    </declare-styleable>
+
+    <declare-styleable name="UnreadCountTextView">
+        <attr name="paint_color" format="color|reference"/>
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/values/colors.xml b/system/tuicore/src/main/res/values/colors.xml
new file mode 100644
index 0000000..7e9c128
--- /dev/null
+++ b/system/tuicore/src/main/res/values/colors.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="text_color_gray">#696969</color>
+
+    <color name="status_bar_color">#00FFFFFF</color>
+    <color name="navigation_bar_color">#F7F7F7</color>
+
+    <color name="read_dot_bg">#f74c31</color>
+
+    <color name="black_font_color">#181818</color>
+    <color name="font_blue">#066fff</color>
+    <color name="black">#000000</color>
+    <color name="line">#DDDDDD</color>
+    <color name="white">#FFFFFF</color>
+    <color name="text_gray1">#777777</color>
+    <color name="dialog_line_bg">#c6c6c6</color>
+
+    <color name="core_line_controller_title_color">#444444</color>
+    <color name="core_line_controller_content_color">#000000</color>
+    <color name="core_line_controller_white_translucent_color">#80FFFFFF</color>
+
+    <color name="core_popup_card_bg">#FFFFFF</color>
+    <color name="core_popup_card_positive_normal_bg">#147AFF</color>
+    <color name="core_popup_card_positive_pressed_bg">#B9D7FF</color>
+    <color name="core_popup_card_line_bg">#E4E5E9</color>
+
+    <color name="text_select_color">#FFAFE1F4</color>
+</resources>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/values/dimens.xml b/system/tuicore/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..0aeb401
--- /dev/null
+++ b/system/tuicore/src/main/res/values/dimens.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="page_margin">10dp</dimen>
+
+    <dimen name="switch_thumb_padding">2dp</dimen>
+    <dimen name="switch_thumb_width">23dp</dimen>
+    <dimen name="switch_thumb_height">23dp</dimen>
+    <dimen name="switch_thumb_radius">20dp</dimen>
+    <dimen name="switch_mini_width">46dp</dimen>
+
+    <dimen name="core_page_title_height">48dp</dimen>
+
+    <dimen name="core_line_controller_text_size">15.36sp</dimen>
+    <dimen name="core_line_controller_margin_left">15.36dp</dimen>
+
+    <dimen name="core_popup_card_padding">20dp</dimen>
+    <dimen name="core_popup_card_line_margin">16dp</dimen>
+    <dimen name="core_popup_card_line_height">0.48dp</dimen>
+    <dimen name="core_popup_card_line_margin_left_right">-25dp</dimen>
+    <dimen name="core_popup_card_edit_height">38.4dp</dimen>
+    <dimen name="core_popup_card_title_size">16.32sp</dimen>
+    <dimen name="core_popup_card_edit_text_size">15.36sp</dimen>
+    <dimen name="core_popup_card_desc_text_size">12.48sp</dimen>
+    <dimen name="core_popup_card_desc_margin_top">10.48dp</dimen>
+    <dimen name="core_popup_card_btn_margin_top">18.8dp</dimen>
+    <dimen name="core_popup_card_btn_margin_bottom">48.8dp</dimen>
+    <dimen name="core_popup_card_btn_margin_left_right">22.8dp</dimen>
+    <dimen name="core_popup_card_btn_height">44.16dp</dimen>
+    <dimen name="core_popup_card_btn_text_size">17.28sp</dimen>
+    <dimen name="core_popup_card_edit_padding_left_right">15.36dp</dimen>
+
+    <dimen name="core_pop_menu_indicator_height">7dp</dimen>
+    <dimen name="core_pop_menu_item_space_height">7dp</dimen>
+    <dimen name="core_pop_menu_item_height">40dp</dimen>
+    <dimen name="core_pop_menu_item_width">128dp</dimen>
+    <dimen name="core_pop_menu_padding_top">16dp</dimen>
+    <dimen name="core_pop_menu_padding_bottom">8dp</dimen>
+    <dimen name="core_pop_menu_icon_size">20dp</dimen>
+
+    <dimen name="core_title_text_size">17.28sp</dimen>
+
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/values/im_error_msg.xml b/system/tuicore/src/main/res/values/im_error_msg.xml
new file mode 100644
index 0000000..f6c1a8e
--- /dev/null
+++ b/system/tuicore/src/main/res/values/im_error_msg.xml
@@ -0,0 +1,290 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="TUIKitErrorInProcess">Executing</string>
+    <string name="TUIKitErrorInvalidParameters">Invalid parameter</string>
+    <string name="TUIKitErrorIOOperateFaild">Local IO operation error</string>
+    <string name="TUIKitErrorInvalidJson">Invalid JSON format</string>
+    <string name="TUIKitErrorOutOfMemory">Out of storage</string>
+    <string name="TUIKitErrorParseResponseFaild">PB parsing failed</string>
+    <string name="TUIKitErrorSerializeReqFaild">PB serialization failed</string>
+    <string name="TUIKitErrorSDKNotInit">IM SDK is not initialized.</string>
+    <string name="TUIKitErrorLoadMsgFailed">Failed to load local database</string>
+    <string name="TUIKitErrorDatabaseOperateFailed">Local database operation failed</string>
+    <string name="TUIKitErrorCrossThread">Cross-thread error</string>
+    <string name="TUIKitErrorTinyIdEmpty">User info is empty.</string>
+    <string name="TUIKitErrorInvalidIdentifier">Invalid identifier</string>
+    <string name="TUIKitErrorFileNotFound">File not found</string>
+    <string name="TUIKitErrorFileTooLarge">File size exceeds the limit.</string>
+    <string name="TUIKitErrorEmptyFile">Empty file</string>
+    <string name="TUIKitErrorFileOpenFailed">Failed to open file</string>
+    <string name="TUIKitErrorNotLogin">Not logged in to IM SDK</string>
+    <string name="TUIKitErrorNoPreviousLogin">Not logged in to the user\'s account.</string>
+    <string name="TUIKitErrorUserSigExpired">UserSig expired</string>
+    <string name="TUIKitErrorLoginKickedOffByOther">Log in to the same account on other devices</string>
+    <string name="TUIKitErrorTLSSDKInit">TLS SDK initialization failed</string>
+    <string name="TUIKitErrorTLSSDKUninit">TLS SDK is not initialized.</string>
+    <string name="TUIKitErrorTLSSDKTRANSPackageFormat">Invalid TLS SDK TRANS packet format</string>
+    <string name="TUIKitErrorTLSDecrypt">TLS SDK decryption failed</string>
+    <string name="TUIKitErrorTLSSDKRequest">TLS SDK request failed</string>
+    <string name="TUIKitErrorTLSSDKRequestTimeout">TLS SDK request timed out</string>
+    <string name="TUIKitErrorInvalidConveration">Invalid session</string>
+    <string name="TUIKitErrorFileTransAuthFailed">Authentication failed during file transfer.</string>
+    <string name="TUIKitErrorFileTransNoServer">Failed to get the server list via FTP.</string>
+    <string name="TUIKitErrorFileTransUploadFailed">Failed to upload the file via FTP. Check your network connection.</string>
+    <string name="TUIKitErrorFileTransUploadFailedNotImage">Failed to upload the file via FTP. Check if the uploaded image can be opened normally.</string>
+    <string name="TUIKitErrorFileTransDownloadFailed">Failed to download the file via FTP. Check whether your network is connected or the file or audio has expired.</string>
+    <string name="TUIKitErrorHTTPRequestFailed">HTTP request failed</string>
+    <string name="TUIKitErrorInvalidMsgElem">Invalid IM SDK message elem</string>
+    <string name="TUIKitErrorInvalidSDKObject">Invalid object</string>
+    <string name="TUIKitSDKMsgBodySizeLimit">Message length exceeds the limit.</string>
+    <string name="TUIKitErrorSDKMsgKeyReqDifferRsp">Message key error</string>
+    <string name="TUIKitErrorSDKGroupInvalidID">Invalid group ID. Custom group ID must be printable ASCII characters (0x20-0x7e), with maximum length of 48 bytes, and cannot be prefixed with @TGS#.</string>
+    <string name="TUIKitErrorSDKGroupInvalidName">Group name is invalid, which cannot exceed 30 bytes.</string>
+    <string name="TUIKitErrorSDKGroupInvalidIntroduction">Group description is invalid, which cannot exceed 240 bytes.</string>
+    <string name="TUIKitErrorSDKGroupInvalidNotification">Group notice is invalid, which cannot exceed 300 bytes.</string>
+    <string name="TUIKitErrorSDKGroupInvalidFaceURL">Group profile photo URL is invalid, which should not exceed 100 bytes.</string>
+    <string name="TUIKitErrorSDKGroupInvalidNameCard">Group card is invalid, which cannot exceed 50 bytes.</string>
+    <string name="TUIKitErrorSDKGroupMemberCountLimit">The maximum number of group members is exceeded.</string>
+    <string name="TUIKitErrorSDKGroupJoinPrivateGroupDeny">Request to join private groups is not allowed.</string>
+    <string name="TUIKitErrorSDKGroupInviteSuperDeny">Group owners cannot be invited.</string>
+    <string name="TUIKitErrorSDKGroupInviteNoMember">The number of members to be invited cannot be 0.</string>
+    <string name="TUIKitErrorSDKFriendShipInvalidProfileKey">Invalid data field</string>
+    <string name="TUIKitErrorSDKFriendshipInvalidAddRemark">The remark field exceeds the limit of 96 bytes.</string>
+    <string name="TUIKitErrorSDKFriendshipInvalidAddWording">The description field in the friend request is invalid, which should not exceed 120 bytes.</string>
+    <string name="TUIKitErrorSDKFriendshipInvalidAddSource">The source field in the friend request is invalid, which should be prefixed with \"AddSource_Type_\".</string>
+    <string name="TUIKitErrorSDKFriendshipFriendGroupEmpty">The friend list field is invalid. It is required with each list name of 30 bytes at most.</string>
+    <string name="TUIKitErrorSDKNetEncodeFailed">Network link encryption failed</string>
+    <string name="TUIKitErrorSDKNetDecodeFailed">Network link decryption failed</string>
+    <string name="TUIKitErrorSDKNetAuthInvalid">Network link authentication not completed</string>
+    <string name="TUIKitErrorSDKNetCompressFailed">Unable to compress data packet</string>
+    <string name="TUIKitErrorSDKNetUncompressFaile">Packet decompression failed</string>
+    <string name="TUIKitErrorSDKNetFreqLimit">Call frequency is limited, with up to 5 requests per second.</string>
+    <string name="TUIKitErrorSDKnetReqCountLimit">Request queue is full. The number of concurrent requests exceeds the limit of 1000.</string>
+    <string name="TUIKitErrorSDKNetDisconnect">Network disconnected. No connection is established, or no network is detected when a socket connection is established.</string>
+    <string name="TUIKitErrorSDKNetAllreadyConn">Network connection has been established.</string>
+    <string name="TUIKitErrorSDKNetConnTimeout">Network connection timed out. Try again once network connection is restored.</string>
+    <string name="TUIKitErrorSDKNetConnRefuse">Network connection denied. Too many attempts. Service denied by the server.</string>
+    <string name="TUIKitErrorSDKNetNetUnreach">No available route to the network. Try again once network connection is restored.</string>
+    <string name="TUIKitErrorSDKNetSocketNoBuff">Call failed to due to insufficient buffer resources in the system. System busy. Internal error.</string>
+    <string name="TUIKitERRORSDKNetResetByPeer">The peer resets the connection.</string>
+    <string name="TUIKitErrorSDKNetSOcketInvalid">Invalid socket</string>
+    <string name="TUIKitErrorSDKNetHostGetAddressFailed">IP address resolution failed</string>
+    <string name="TUIKitErrorSDKNetConnectReset">Network is connected to an intermediate node or connection to the server is reset.</string>
+    <string name="TUIKitErrorSDKNetWaitInQueueTimeout">Timed out waiting for request packet to enter the to-be-sent queue.</string>
+    <string name="TUIKitErrorSDKNetWaitSendTimeout">Request packet has entered the to-be-sent queue. Timed out waiting to enter the network buffer of the system.</string>
+    <string name="TUIKitErrorSDKNetWaitAckTimeut">Request packet has entered the network buffer of the system. Timed out waiting for response from server.</string>
+    <string name="TUIKitErrorSDKSVRSSOConnectLimit">The number of Server connections exceeds the limit. Service denied by the server.</string>
+    <string name="TUIKitErrorSDKSVRSSOVCode">Sending verification code timeout.</string>
+    <string name="TUIKitErrorSVRSSOD2Expired">Key expired. Key is an internal bill generated according to usersig. The validity period of the key is less than or equal to the validity period of usersig. Please call timmanager again getInstance(). The login interface generates a new key.</string>
+    <string name="TUIKitErrorSVRA2UpInvalid">Ticket expired. Ticket is an internal bill generated according to usersig. The validity period of ticket is less than or equal to that of usersig. Please call timmanager again getInstance(). The login interface generates a new ticket.</string>
+    <string name="TUIKitErrorSVRA2DownInvalid">The bill failed verification or was hit by security. Please call timmanager again getInstance(). The login interface generates a new ticket.</string>
+    <string name="TUIKitErrorSVRSSOEmpeyKey">Empty key is not allowed.</string>
+    <string name="TUIKitErrorSVRSSOUinInvalid">The account in the key does not match the account in the request header.</string>
+    <string name="TUIKitErrorSVRSSOVCodeTimeout">Timed out sending verification code.</string>
+    <string name="TUIKitErrorSVRSSONoImeiAndA2">You need to bring your key and ticket.</string>
+    <string name="TUIKitErrorSVRSSOCookieInvalid">Cookie check mismatch.</string>
+    <string name="TUIKitErrorSVRSSODownTips">Send a prompt: Key expired.</string>
+    <string name="TUIKitErrorSVRSSODisconnect">Link disconnected and screen locked.</string>
+    <string name="TUIKitErrorSVRSSOIdentifierInvalid">Invalid identity.</string>
+    <string name="TUIKitErrorSVRSSOClientClose">The device automatically logs out.</string>
+    <string name="TUIKitErrorSVRSSOMSFSDKQuit">MSFSDK automatically logs out.</string>
+    <string name="TUIKitErrorSVRSSOD2KeyWrong">the number of decryption failures exceeds the threshold, notify the terminal that it needs to be reset, please call timmanager again getInstance(). The login interface generates a new key.</string>
+    <string name="TUIKitErrorSVRSSOUnsupport">Aggregation is not supported. A unified error code is returned to devices. The device stops aggregation on the persistent TCP connection.</string>
+    <string name="TUIKitErrorSVRSSOPrepaidArrears">Prepaid service is in arrears.</string>
+    <string name="TUIKitErrorSVRSSOPacketWrong">Invalid request packet format.</string>
+    <string name="TUIKitErrorSVRSSOAppidBlackList">SDKAppID blocked list.</string>
+    <string name="TUIKitErrorSVRSSOCmdBlackList">SDKAppID sets the service cmd blocked list.</string>
+    <string name="TUIKitErrorSVRSSOAppidWithoutUsing">SDKAppID is disabled.</string>
+    <string name="TUIKitErrorSVRSSOFreqLimit">Frequency limit (user), which is to limit the number of requests per second of a protocol.</string>
+    <string name="TUIKitErrorSVRSSOOverload">Packet loss due to overload (system). Service denied by the connected server that failed to process too many requests.</string>
+    <string name="TUIKitErrorSVRResNotFound">The resource file to be sent does not exist.</string>
+    <string name="TUIKitErrorSVRResAccessDeny">Unable to access the resource file to be sent.</string>
+    <string name="TUIKitErrorSVRResSizeLimit">File size exceeds the limit.</string>
+    <string name="TUIKitErrorSVRResSendCancel">Sending is canceled by the user due to reasons like logging out when sending a message.</string>
+    <string name="TUIKitErrorSVRResReadFailed">Failed to access the file content.</string>
+    <string name="TUIKitErrorSVRResTransferTimeout">Timed out transferring the resource file.</string>
+    <string name="TUIKitErrorSVRResInvalidParameters">Invalid parameter.</string>
+    <string name="TUIKitErrorSVRResInvalidFileMd5">File MD5 verification failed.</string>
+    <string name="TUIKitErrorSVRResInvalidPartMd5">Sharding MD5 verification failed.</string>
+    <string name="TUIKitErrorSVRCommonInvalidHttpUrl">HTTP parsing error. Check the HTTP request URL format.</string>
+    <string name="TUIKitErrorSVRCommomReqJsonParseFailed">JSON parsing error in the HTTP request. Check the JSON format.</string>
+    <string name="TUIKitErrorSVRCommonInvalidAccount">The Identifier or UserSig in the request URI or JSON packet is incorrect.</string>
+    <string name="TUIKitErrorSVRCommonInvalidSdkappid">Invalid SDKAppID. Check the SDKAppID validity.</string>
+    <string name="TUIKitErrorSVRCommonRestFreqLimit">The REST API call frequency exceeds the limit. Reduce the request rate.</string>
+    <string name="TUIKitErrorSVRCommonRequestTimeout">The service request timed out or the HTTP request format is incorrect. Check the error and try again.</string>
+    <string name="TUIKitErrorSVRCommonInvalidRes">Requested resource error. Check the request URL.</string>
+    <string name="TUIKitErrorSVRCommonIDNotAdmin">Fill in the Identifier field of the REST API request with the app admin\'s account.</string>
+    <string name="TUIKitErrorSVRCommonSdkappidFreqLimit">SDKAppID request rate exceeds the limit. Reduce the request rate.</string>
+    <string name="TUIKitErrorSVRCommonSdkappidMiss">SDKAppID is required for the REST API. Check the SDKAppID in the request URL.</string>
+    <string name="TUIKitErrorSVRCommonRspJsonParseFailed">JSON parsing error in the HTTP response packet.</string>
+    <string name="TUIKitErrorSVRCommonExchangeAccountTimeout">Account switching timed out.</string>
+    <string name="TUIKitErrorSVRCommonInvalidIdFormat">The Identifier type of the request packet body is incorrect. Confirm that the Identifier is a string.</string>
+    <string name="TUIKitErrorSVRCommonSDkappidForbidden">SDKAppID is disabled.</string>
+    <string name="TUIKitErrorSVRCommonReqForbidden">Request is disabled.</string>
+    <string name="TUIKitErrorSVRCommonReqFreqLimit">Too many requests. Try again later.</string>
+    <string name="TUIKitErrorSVRCommonInvalidService">Your professional package has expired and been deactivated. Please log in to the im purchase page to re purchase the package. After purchase, it will take effect in 5 minutes.</string>
+    <string name="TUIKitErrorSVRCommonSensitiveText">Text is filtered due to security reasons, which may contain sensitive words.</string>
+    <string name="TUIKitErrorSVRCommonBodySizeLimit">The sending message package is too long. Currently, the maximum 12K message package length is supported. Please reduce the package size and try again.</string>
+    <string name="TUIKitErrorSVRAccountUserSigExpired">UserSig has expired. Generate a new one.</string>
+    <string name="TUIKitErrorSVRAccountUserSigEmpty">UserSig length is 0.</string>
+    <string name="TUIKitErrorSVRAccountUserSigCheckFailed">UserSig verification failed.</string>
+    <string name="TUIKitErrorSVRAccountUserSigMismatchPublicKey">Failed to verify UserSig with public key</string>
+    <string name="TUIKitErrorSVRAccountUserSigMismatchId">The requested Identifier does not match the Identifier that is used to generate the UserSig.</string>
+    <string name="TUIKitErrorSVRAccountUserSigMismatchSdkAppid">The requested SDKAppID does not match the SDKAppID of the generated UserSig.</string>
+    <string name="TUIKitErrorSVRAccountUserSigPublicKeyNotFound">Public key does not exist when verifying UserSig.</string>
+    <string name="TUIKitErrorSVRAccountUserSigSdkAppidNotFount">SDKAppID not found. Check the app information in the IM console.</string>
+    <string name="TUIKitErrorSVRAccountInvalidUserSig">UserSig has expired. Generate a new one and try again.</string>
+    <string name="TUIKitErrorSVRAccountNotFound">Requested user account not found.</string>
+    <string name="TUIKitErrorSVRAccountSecRstr">Restricted for security reasons.</string>
+    <string name="TUIKitErrorSVRAccountInternalTimeout">Internal server timeout. Try again.</string>
+    <string name="TUIKitErrorSVRAccountInvalidCount">Invalid batch quantity in the request.</string>
+    <string name="TUIkitErrorSVRAccountINvalidParameters">Invalid parameter. Check whether the fields are entered as required in the protocol.</string>
+    <string name="TUIKitErrorSVRAccountAdminRequired">The request requires app admin permissions.</string>
+    <string name="TUIKitErrorSVRAccountFreqLimit">Restricted due to too many failures and retries. Check if the UserSig is correct and try again after one minute.</string>
+    <string name="TUIKitErrorSVRAccountBlackList">The account is added to the blocked list.</string>
+    <string name="TUIKitErrorSVRAccountCountLimit">The number of accounts created exceeds that allowed in the free trial version. Upgrade to the professional version.</string>
+    <string name="TUIKitErrorSVRAccountInternalError">Internal server error. Try again.</string>
+    <string name="TUIKitErrorSVRProfileInvalidParameters">Request parameter error. Check if the request is correct according to the error message.</string>
+    <string name="TUIKitErrorSVRProfileAccountMiss">Request parameter error. No user account specified to pull data.</string>
+    <string name="TUIKitErrorSVRProfileAccountNotFound">Requested user account not found.</string>
+    <string name="TUIKitErrorSVRProfileAdminRequired">The request requires app admin permissions.</string>
+    <string name="TUIKitErrorSVRProfileSensitiveText">The data field contains sensitive words.</string>
+    <string name="TUIKitErrorSVRProfileInternalError">Server internal error. Try again later.</string>
+    <string name="TUIKitErrorSVRProfileReadWritePermissionRequired">You have no permission to read the data field. See the data field for details.</string>
+    <string name="TUIKitErrorSVRProfileTagNotFound">The tag of the data field does not exist.</string>
+    <string name="TUIKitErrorSVRProfileSizeLimit">The value of the data field exceeds 500 bytes.</string>
+    <string name="TUIKitErrorSVRProfileValueError">The value of the standard data field is incorrect. See the standard data field for details.</string>
+    <string name="TUIKitErrorSVRProfileInvalidValueFormat">The value type of the data field does not match. See the standard data field for details.</string>
+    <string name="TUIKitErrorSVRFriendshipInvalidParameters">Request parameter error. Check if the request is correct according to the error message.</string>
+    <string name="TUIKitErrorSVRFriendshipInvalidSdkAppid">SDKAppID does not match.</string>
+    <string name="TUIKitErrorSVRFriendshipAccountNotFound">Requested user account not found.</string>
+    <string name="TUIKitErrorSVRFriendshipAdminRequired">The request requires app admin permissions.</string>
+    <string name="TUIKitErrorSVRFriendshipSensitiveText">The relation chain field contains sensitive words.</string>
+    <string name="TUIKitErrorSVRFriendshipNetTimeout">Network timed out. Try again later.</string>
+    <string name="TUIKitErrorSVRFriendshipWriteConflict">A write conflict occurred due to concurrent writes. The batch mode is recommended.</string>
+    <string name="TUIKitErrorSVRFriendshipAddFriendDeny">The backend blocks the user from initiating friend requests.</string>
+    <string name="TUIkitErrorSVRFriendshipCountLimit">The number of your friends exceeds the limit.</string>
+    <string name="TUIKitErrorSVRFriendshipGroupCountLimit">The number of lists exceeds the limit.</string>
+    <string name="TUIKitErrorSVRFriendshipPendencyLimit">You have reached the limit of pending friend requests.</string>
+    <string name="TUIKitErrorSVRFriendshipBlacklistLimit">The number of accounts in the blocked list exceeds the limit.</string>
+    <string name="TUIKitErrorSVRFriendshipPeerFriendLimit">The number of the other user\'s friends exceeds the limit.</string>
+    <string name="TUIKitErrorSVRFriendshipInSelfBlacklist">You have blocked the other user. Unable to send friend request.</string>
+    <string name="TUIKitErrorSVRFriendshipAllowTypeDenyAny">The other user\'s friend request verification mode is \"Decline friend request from any user\".</string>
+    <string name="TUIKitErrorSVRFriendshipInPeerBlackList">You are blocked by the other user. Unable to send friend request.</string>
+    <string name="TUIKitErrorSVRFriendshipAllowTypeNeedConfirm">Request sent. Wait for acceptance.</string>
+    <string name="TUIKitErrorSVRFriendshipAddFriendSecRstr">The friend request was filtered by the security policy. Do not initiate friend requests too frequently.</string>
+    <string name="TUIKitErrorSVRFriendshipPendencyNotFound">The pending friend request does not exist.</string>
+    <string name="TUIKitErrorSVRFriendshipDelFriendSecRstr">The friend deletion request was filtered by the security policy. Do not initiate friend deletion requests too frequently.</string>
+    <string name="TUIKirErrorSVRFriendAccountNotFoundEx">Requested user account not found.</string>
+    <string name="TUIKitErrorSVRMsgPkgParseFailed">Failed to parse the request packet.</string>
+    <string name="TUIKitErrorSVRMsgInternalAuthFailed">Internal authentication failed.</string>
+    <string name="TUIKitErrorSVRMsgInvalidId">Invalid identifier</string>
+    <string name="TUIKitErrorSVRMsgNetError">Network error. Try again.</string>
+    <string name="TUIKitErrorSVRMsgPushDeny">A callback is triggered before sending a message in the private chat, and the App backend returns \"The message is prohibited from sending\".</string>
+    <string name="TUIKitErrorSVRMsgInPeerBlackList">Unable to send messages in the private chat as you are blocked by the other user.</string>
+    <string name="TUIKitErrorSVRMsgBothNotFriend">You are not a friend of this user. Unable to send messages.</string>
+    <string name="TUIKitErrorSVRMsgNotPeerFriend">Unable to send messages in the private chat as you are not the other user\'s friend (one-way friend).</string>
+    <string name="TUIkitErrorSVRMsgNotSelfFriend">Unable to send messages in the private chat as the other user is not your friend (one-way friend).</string>
+    <string name="TUIKitErrorSVRMsgShutupDeny">Blocked from posting. Unable to send messages.</string>
+    <string name="TUIKitErrorSVRMsgRevokeTimeLimit">Timed out recalling the message (default is 2 min).</string>
+    <string name="TUIKitErrorSVRMsgDelRambleInternalError">An internal error occurred while deleting roaming messages.</string>
+    <string name="TUIKitErrorSVRMsgJsonParseFailed">Failed to parse the JSON packet. Check whether the request packet meets the JSON specifications.</string>
+    <string name="TUIKitErrorSVRMsgInvalidJsonBodyFormat">MsgBody in the JSON request packet does not conform to the message format description.</string>
+    <string name="TUIKitErrorSVRMsgInvalidToAccount">The To_Account field is missing from the JSON request packet body or the type of the To_Account field is not Integer.</string>
+    <string name="TUIKitErrorSVRMsgInvalidRand">The MsgRandom field is missing from the JSON request packet body or the type of the MsgRandom field is not Integer.</string>
+    <string name="TUIKitErrorSVRMsgInvalidTimestamp">The MsgTimeStamp field is missing from the JSON request packet body or the type of the MsgTimeStamp field is not Integer.</string>
+    <string name="TUIKitErrorSVRMsgBodyNotArray">The MsgBody type in the JSON request packet body is not Array.</string>
+    <string name="TUIKitErrorSVRMsgInvalidJsonFormat">The JSON request packet does not conform to the message format description.</string>
+    <string name="TUIKitErrorSVRMsgToAccountCountLimit">The number of accounts to which messages are sent in batch exceeds 500.</string>
+    <string name="TUIKitErrorSVRMsgToAccountNotFound">To_Account is not registered or does not exist.</string>
+    <string name="TUIKitErrorSVRMsgTimeLimit">Invalid offline message storage time (up to 7 days).</string>
+    <string name="TUIKitErrorSVRMsgInvalidSyncOtherMachine">The type of the SyncOtherMachine field in the JSON request packet body is not Integer.</string>
+    <string name="TUIkitErrorSVRMsgInvalidMsgLifeTime">The type of the MsgLifeTime field in the JSON request packet body is not Integer.</string>
+    <string name="TUIKitErrorSVRMsgBodySizeLimit">The length of JSON data packet exceeds the limit. The message packet body shall not exceed 12 KB.</string>
+    <string name="TUIKitErrorSVRmsgLongPollingCountLimit">Forced logout on the Web page during long polling (the number of online instances on the Web page exceeds the limit).</string>
+    <string name="TUIKitErrorUnsupporInterface">This feature is available only to the Ultimate edition. Please upgrade.</string>
+    <string name="TUIKitErrorUnsupporInterfaceSuffix"> feature is available only to the Ultimate edition. Please upgrade.</string>
+
+    <string name="TUIKitErrorSVRGroupApiNameError">The API name in the request is incorrect.</string>
+    <string name="TUIKitErrorSVRGroupAccountCountLimit">The number of accounts in the request packet body exceeds the limit.</string>
+    <string name="TUIkitErrorSVRGroupFreqLimit">Call frequency is limited. Reduce the call frequency.</string>
+    <string name="TUIKitErrorSVRGroupPermissionDeny">Insufficient operation permissions</string>
+    <string name="TUIKitErrorSVRGroupInvalidReq">Invalid request</string>
+    <string name="TUIKitErrorSVRGroupSuperNotAllowQuit">Group owner is not allowed to leave this group.</string>
+    <string name="TUIKitErrorSVRGroupNotFound">The group does not exist.</string>
+    <string name="TUIKitErrorSVRGroupJsonParseFailed">Failed to parse the JSON packet. Check whether the packet body conforms to the JSON format.</string>
+    <string name="TUIKitErrorSVRGroupInvalidId">The identifier that is used to initiated the operation is invalid. Check whether the identifier of the user who initiated the operation is correct.</string>
+    <string name="TUIKitErrorSVRGroupAllreadyMember">The invited user is a group member.</string>
+    <string name="TUIKitErrorSVRGroupFullMemberCount">The number of group members has reached the limit. Unable to add the user in the request to the group.</string>
+    <string name="TUIKitErrorSVRGroupInvalidGroupId">Invalid group ID. Check whether the group ID is correct.</string>
+    <string name="TUIKitErrorSVRGroupRejectFromThirdParty">The app backend rejected this operation via a third-party callback.</string>
+    <string name="TUIKitErrorSVRGroupShutDeny">This user is blocked from posting and thus cannot send messages. Check whether the sender is blocked from posting.</string>
+    <string name="TUIKitErrorSVRGroupRspSizeLimit">The response packet length exceeds the limit.</string>
+    <string name="TUIKitErrorSVRGroupAccountNotFound">Requested user account not found.</string>
+    <string name="TUIKitErrorSVRGroupGroupIdInUse">The group ID has been used. Select another one.</string>
+    <string name="TUIKitErrorSVRGroupSendMsgFreqLimit">The frequency of sending messages exceeds the limit. Extend the interval between sending messages.</string>
+    <string name="TUIKitErrorSVRGroupReqAllreadyBeenProcessed">This invitation or request has been processed.</string>
+    <string name="TUIKitErrorSVRGroupGroupIdUserdForSuper">The group ID has been used by the group owner. It can be used directly.</string>
+    <string name="TUIKitErrorSVRGroupSDkAppidDeny">The command word used in the SDKAppID request has been disabled.</string>
+    <string name="TUIKitErrorSVRGroupRevokeMsgNotFound">This message does not exist.</string>
+    <string name="TUIKitErrorSVRGroupRevokeMsgTimeLimit">Timed out recalling the message (default is 2 min).</string>
+    <string name="TUIKitErrorSVRGroupRevokeMsgDeny">Unable to recall this message.</string>
+    <string name="TUIKitErrorSVRGroupNotAllowRevokeMsg">Unable to recall messages in groups of this type.</string>
+    <string name="TUIKitErrorSVRGroupRemoveMsgDeny">Unable to delete messages of this type.</string>
+    <string name="TUIKitErrorSVRGroupNotAllowRemoveMsg">Unable to delete messages in the voice/video chat room and the broadcast group of online members.</string>
+    <string name="TUIKitErrorSVRGroupAvchatRoomCountLimit">The number of created voice/video chat rooms exceeds the limit.</string>
+    <string name="TUIKitErrorSVRGroupCountLimit">The number of groups that a single user can create and join exceeds the limit.</string>
+    <string name="TUIKitErrorSVRGroupMemberCountLimit">The number of group members exceeds the limit.</string>
+    <string name="TUIKitErrorSVRNoSuccessResult">No success result returned for the batch operation.</string>
+    <string name="TUIKitErrorSVRToUserInvalid">IM: Invalid recipient</string>
+    <string name="TUIKitErrorSVRRequestTimeout">Request timeout</string>
+    <string name="TUIKitErrorSVRInitCoreFail">INIT CORE module failed</string>
+    <string name="TUIKitErrorExpiredSessionNode">SessionNode is null.</string>
+    <string name="TUIKitErrorLoggedOutBeforeLoginFinished">Logged out before login (returned at login time)</string>
+    <string name="TUIKitErrorTLSSDKNotInitialized">tlssdk is not initialized.</string>
+    <string name="TUIKitErrorTLSSDKUserNotFound">The user information for TLSSDK was not found.</string>
+    <string name="TUIKitErrorBindFaildRegTimeout">Registration timed out</string>
+    <string name="TUIKitErrorBindFaildIsBinding">The bind operation in progress.</string>
+    <string name="TUIKitErrorPacketFailUnknown">Unknown error occurred while sending packet</string>
+    <string name="TUIKitErrorPacketFailReqNoNet">No network connection when sending request packet, which is converted to case ERR_REQ_NO_NET_ON_REQ:</string>
+    <string name="TUIKitErrorPacketFailRespNoNet">No network connection when sending response packet, which is converted to case ERR_REQ_NO_NET_ON_RSP:</string>
+    <string name="TUIKitErrorPacketFailReqNoAuth">No permission when sending request packet</string>
+    <string name="TUIKitErrorPacketFailSSOErr">SSO error</string>
+    <string name="TUIKitErrorPacketFailRespTimeout">Response timed out</string>
+    <string name="TUIKitErrorFriendshipProxySyncing">proxy_manager failed to sync SVR data</string>
+    <string name="TUIKitErrorFriendshipProxySyncedFail">proxy_manager sync failed</string>
+    <string name="TUIKitErrorFriendshipProxyLocalCheckErr">proxy_manager request parameter is invalid in local check.</string>
+    <string name="TUIKitErrorGroupInvalidField">group assistant request field contains non-preset fields.</string>
+    <string name="TUIKitErrorGroupStoreageDisabled">Local storage of group assistant group data is disabled.</string>
+    <string name="TUIKitErrorLoadGrpInfoFailed">Failed to load groupinfo from storage</string>
+    <string name="TUIKitErrorReqNoNetOnReq">No network connection when sending request</string>
+    <string name="TUIKitErrorReqNoNetOnResp">No network connection when sending response</string>
+    <string name="TUIKitErrorServiceNotReady">QALSDK service is not ready.</string>
+    <string name="TUIKitErrorLoginAuthFailed">Account verification failed (user info get failed)</string>
+    <string name="TUIKitErrorNeverConnectAfterLaunch">Failed to connect network when the app is lunched.</string>
+    <string name="TUIKitErrorReqFailed">QAL execution failed</string>
+    <string name="TUIKitErrorReqInvaidReq">Invalid request. Invalid toMsgService.</string>
+    <string name="TUIKitErrorReqOnverLoaded">Request queue is full.</string>
+    <string name="TUIKitErrorReqKickOff">Forced logout on another device</string>
+    <string name="TUIKitErrorReqServiceSuspend">Service suspended</string>
+    <string name="TUIKitErrorReqInvalidSign">SSO signature error</string>
+    <string name="TUIKitErrorReqInvalidCookie">Invalid SSO cookie</string>
+    <string name="TUIKitErrorLoginTlsRspParseFailed">TSL response packet is verified at login time. Packet length error.</string>
+    <string name="TUIKitErrorLoginOpenMsgTimeout">Timeout occurred when OPENSTATSVC attempted to report status to OPENMSG during login.</string>
+    <string name="TUIKitErrorLoginOpenMsgRspParseFailed">Response parsing failed when OPENSTATSVC reports status to OPENMSG during login.</string>
+    <string name="TUIKitErrorLoginTslDecryptFailed">TLS decryption failed at login time.</string>
+    <string name="TUIKitErrorWifiNeedAuth">Verification is required for Wi-Fi connection.</string>
+    <string name="TUIKitErrorUserCanceled">Canceled by user</string>
+    <string name="TUIkitErrorRevokeTimeLimitExceed">Timed out recalling the message (default is 2 min).</string>
+    <string name="TUIKitErrorLackUGExt">Missing UGC extension pack</string>
+    <string name="TUIKitErrorAutoLoginNeedUserSig">Local ticket for auto login expired. userSig is required for manual login.</string>
+    <string name="TUIKitErrorQALNoShortConneAvailable">No available SSO for short connections.</string>
+    <string name="TUIKitErrorReqContentAttach">Message content is filtered due to security reasons.</string>
+    <string name="TUIKitErrorLoginSigExpire">Returned at login time. Ticket expired.</string>
+    <string name="TUIKitErrorSDKHadInit">SDK has been initialized. Do not initialize again.</string>
+    <string name="TUIKitErrorOpenBDHBase">Openbdh error</string>
+    <string name="TUIKitErrorRequestNoNetOnReq">No network connection when sending request. Try again once network connection is restored.</string>
+    <string name="TUIKitErrorRequestNoNetOnRsp">No network connection when sending response. Try again once network connection is restored.</string>
+    <string name="TUIKitErrorRequestOnverLoaded">Request queue is full.</string>
+    <string name="TUIKitErrorEnableUserStatusOnConsole">The user status not supported. Please enable the ability in the console first.</string>
+</resources>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/values/strings.xml b/system/tuicore/src/main/res/values/strings.xml
new file mode 100644
index 0000000..afbcfea
--- /dev/null
+++ b/system/tuicore/src/main/res/values/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="open_file_tips">Select an app to open the file</string>
+
+    <string name="date_yesterday">Yesterday</string>
+    <string name="date_year_short">YYYY</string>
+    <string name="date_month_short">MM</string>
+    <string name="date_day_short">DD</string>
+    <string name="date_hour_short">HH</string>
+    <string name="date_minute_short">MM</string>
+    <string name="date_second_short">SS</string>
+
+    <string name="cancel">Cancel</string>
+    <string name="sure">Confirm</string>
+    <string name="core_permission_dialog_title">Authorization Request</string>
+    <string name="core_permission_dialog_positive_setting_text">Settings</string>
+    <string name="setting">setting</string>
+    <string name="setting_fail">Setup failed！</string>
+    <string name="setting_success">Setup Success！</string>
+    <string name="default_text">Default</string>
+    <string name="core_next_step">Next step</string>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/values/styles.xml b/system/tuicore/src/main/res/values/styles.xml
new file mode 100644
index 0000000..d8b3471
--- /dev/null
+++ b/system/tuicore/src/main/res/values/styles.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="TUIKit_AlertDialogStyle" parent="@android:style/Theme.Dialog">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowFrame">@null</item>
+        <item name="android:backgroundDimEnabled">true</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+    </style>
+
+    <style name="CoreActivityTranslucent">
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:colorBackgroundCacheHint">@null</item>
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:backgroundDimEnabled">false</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowAnimationStyle">@null</item>
+        <item name="android:windowDisablePreview">true</item>
+    </style>
+
+    <style name="PopupInputCardAnim">
+        <item name="android:windowEnterAnimation">@anim/core_popup_in_anim</item>
+        <item name="android:windowExitAnimation">@anim/core_popup_out_anim</item>
+    </style>
+
+    <style name="TUIBaseTheme">
+        <item name="user_status_offline">@drawable/core_icon_offline_status</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/values/tui_theme_attrs.xml b/system/tuicore/src/main/res/values/tui_theme_attrs.xml
new file mode 100644
index 0000000..bcda0af
--- /dev/null
+++ b/system/tuicore/src/main/res/values/tui_theme_attrs.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- 颜色规范 start -->
+    <attr name="core_light_bg_title_text_color" format="reference|color"/>
+    <attr name="core_light_bg_primary_text_color" format="reference|color"/>
+    <attr name="core_light_bg_secondary_text_color" format="reference|color"/>
+    <attr name="core_light_bg_secondary2_text_color" format="reference|color"/>
+    <attr name="core_light_bg_disable_text_color" format="reference|color"/>
+    <attr name="core_dark_bg_primary_text_color" format="reference|color"/>
+    <attr name="core_primary_bg_color" format="reference|color"/>
+    <attr name="core_bg_color" format="reference|color"/>
+    <attr name="core_primary_color" format="reference|color"/>
+    <attr name="core_error_tip_color" format="reference|color"/>
+    <attr name="core_success_tip_color" format="reference|color"/>
+    <attr name="core_bubble_bg_color" format="reference|color"/>
+    <attr name="core_divide_color" format="reference|color"/>
+    <attr name="core_border_color" format="reference|color"/>
+    <attr name="core_header_start_color" format="reference|color"/>
+    <attr name="core_header_end_color" format="reference|color"/>
+
+    <attr name="core_btn_normal_color" format="reference|color"/>
+    <attr name="core_btn_pressed_color" format="reference|color"/>
+    <attr name="core_btn_disable_color" format="reference|color"/>
+    <!-- 颜色规范 end -->
+
+    <attr name="core_line_controller_view_switch_btn_selected_bg" format="reference|color"/>
+    <attr name="core_selected_icon" format="reference"/>
+    <attr name="core_title_bar_bg" format="reference"/>
+    <attr name="core_title_bar_text_bg" format="reference|color"/>
+    <attr name="core_title_bar_back_icon" format="reference"/>
+    <attr name="core_default_group_icon_public" format="reference"/>
+    <attr name="core_default_group_icon_work" format="reference"/>
+    <attr name="core_default_group_icon_meeting" format="reference"/>
+    <attr name="core_default_group_icon_community" format="reference"/>
+    <attr name="core_default_user_icon" format="reference"/>
+    <attr name="user_status_online" format="reference"/>
+    <attr name="user_status_offline" format="reference"/>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuicore/src/main/res/xml/file_paths_public.xml b/system/tuicore/src/main/res/xml/file_paths_public.xml
new file mode 100644
index 0000000..e0e49c2
--- /dev/null
+++ b/system/tuicore/src/main/res/xml/file_paths_public.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <!--内置SD卡 Environment.getExternalStorageDirectory() .表示共享所有的目录，也可以指定共享的目录-->
+    <external-path
+        name="external-path"
+        path="."/>
+    <!--内置SD卡 Context.getExternalCacheDir() .表示共享所有的目录，也可以指定共享的目录-->
+    <external-cache-path
+        name="external-cache-path"
+        path="."/>
+    <!--内置SD卡 Context.getExternalFilesDir(null) .表示共享所有的目录，也可以指定共享的目录-->
+    <external-files-path
+        name="external-files-path"
+        path="."/>
+    <!--data目录下 Context.getFilesDir() .表示共享所有的目录，也可以指定共享的目录-->
+    <files-path
+        name="files_path"
+        path="."/>
+    <!--data缓存目录 Context.getCacheDir() .表示共享所有的目录，也可以指定共享的目录-->
+    <cache-path
+        name="cache-path"
+        path="."/>
+    <!--这个标签Android官方文档中是没有提及，Android设备的根目录，该目录下包含着手机内部存储器，外置SD卡等所有文件的目录-->
+    <root-path
+        name="name"
+        path="."/>
+</paths>
\ No newline at end of file
diff --git a/system/tuigroup/.gitignore b/system/tuigroup/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/system/tuigroup/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/system/tuigroup/build.gradle b/system/tuigroup/build.gradle
new file mode 100644
index 0000000..11b4a91
--- /dev/null
+++ b/system/tuigroup/build.gradle
@@ -0,0 +1,47 @@
+plugins {
+    id 'com.android.library'
+}
+
+android {
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
+
+    defaultConfig {
+        minSdkVersion 16
+        targetSdkVersion 30
+        versionCode 1
+        versionName "1.0"
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    // 主题资源文件夹
+    sourceSets {
+        main {
+            res.srcDirs += "src/main/res-light"
+            res.srcDirs += "src/main/res-lively"
+            res.srcDirs += "src/main/res-serious"
+            res.srcDirs += "src/main/res-minimalist"
+        }
+    }
+}
+afterEvaluate{
+    generateReleaseBuildConfig.enabled =false
+    generateDebugBuildConfig.enabled =false
+}
+dependencies {
+
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'com.google.android.material:material:1.3.0'
+
+    api project(':system:tuicore')
+}
\ No newline at end of file
diff --git a/system/tuigroup/src/main/AndroidManifest.xml b/system/tuigroup/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..dbb99dd
--- /dev/null
+++ b/system/tuigroup/src/main/AndroidManifest.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.tencent.qcloud.tuikit.tuigroup">
+
+    <application>
+        <provider
+            android:name=".TUIGroupService"
+            android:authorities="${applicationId}.TUIGroup.Init"
+            android:enabled="true"
+            android:exported="false" />
+
+
+
+        <!-- **************** Classic UI Activity Start **************** -->
+        <activity android:name=".classicui.page.GroupNoticeActivity"
+            android:screenOrientation="portrait" />
+        <activity android:name=".classicui.page.SetGroupManagerActivity"
+            android:screenOrientation="portrait" />
+        <activity android:name=".classicui.page.GroupMemberActivity"
+            android:screenOrientation="portrait" />
+        <activity android:name=".classicui.page.ManageGroupActivity"
+            android:screenOrientation="portrait" />
+        <activity android:name=".classicui.page.GroupInfoActivity"
+            android:screenOrientation="portrait" />
+        <activity android:name=".classicui.page.GroupApplyManagerActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateAlwaysHidden|adjustPan" />
+        <!-- **************** Classic UI Activity End **************** -->
+
+
+
+
+        <!-- **************** Minimalist UI Activity Start **************** -->
+        <activity android:name=".minimalistui.page.GroupNoticeMinimalistActivity"
+            android:screenOrientation="portrait" />
+        <activity android:name=".minimalistui.page.SetGroupManagerMinimalistActivity"
+            android:screenOrientation="portrait" />
+        <activity android:name=".minimalistui.page.GroupMemberMinimalistActivity"
+            android:screenOrientation="portrait" />
+        <activity android:name=".minimalistui.page.ManageGroupMinimalistActivity"
+            android:screenOrientation="portrait" />
+        <activity android:name=".minimalistui.page.GroupInfoMinimalistActivity"
+            android:screenOrientation="portrait" />
+        <activity android:name=".minimalistui.page.GroupApplyManagerMinimalistActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="stateAlwaysHidden|adjustPan" />
+        <!-- **************** Minimalist UI Activity End **************** -->
+
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/ITUIGroupService.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/ITUIGroupService.java
new file mode 100644
index 0000000..62f89a7
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/ITUIGroupService.java
@@ -0,0 +1,12 @@
+package com.tencent.qcloud.tuikit.tuigroup;
+
+import com.tencent.qcloud.tuicore.interfaces.ITUIService;
+
+import java.util.Map;
+
+public interface ITUIGroupService extends ITUIService {
+
+    @Override
+    Object onCall(String method, Map<String, Object> param);
+
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/TUIGroupConstants.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/TUIGroupConstants.java
new file mode 100644
index 0000000..0187a02
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/TUIGroupConstants.java
@@ -0,0 +1,39 @@
+package com.tencent.qcloud.tuikit.tuigroup;
+
+public class TUIGroupConstants {
+
+    public static final class ActivityRequest {
+        public static final int CODE_1 = 1;
+    }
+
+    public static final class Group {
+        public static final int MODIFY_GROUP_NAME = 0X01;
+        public static final int MODIFY_GROUP_NOTICE = 0X02;
+        public static final int MODIFY_GROUP_JOIN_TYPE = 0X03;
+        public static final int MODIFY_MEMBER_NAME = 0X11;
+
+        public static final String GROUP_ID = "group_id";
+        public static final String GROUP_INFO = "groupInfo";
+        public static final String MEMBER_APPLY = "apply";
+    }
+
+    public static class Selection {
+        public static final String SELECT_FRIENDS = "select_friends";
+        public static final String SELECT_FOR_CALL = "isSelectForCall";
+        public static final String IS_SELECT_MODE = "isSelectMode";
+
+        public static final String CONTENT = "content";
+        public static final String TYPE = "type";
+        public static final String TITLE = "title";
+        public static final String LIST = "list";
+        public static final String LIMIT = "limit";
+        public static final String EXCLUDE_LIST = "excludeList";
+        public static final String SELECTED_LIST = "selectedList";
+        public static final String FILTER = "filter";
+
+    }
+
+    public static final String GROUP_FACE_URL = "https://im.sdk.cloud.tencent.cn/download/tuikit-resource/group-avatar/group_avatar_%s.png";
+    public static final int GROUP_FACE_COUNT = 24;
+
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/TUIGroupService.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/TUIGroupService.java
new file mode 100644
index 0000000..769bf2f
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/TUIGroupService.java
@@ -0,0 +1,232 @@
+package com.tencent.qcloud.tuikit.tuigroup;
+
+import android.content.Context;
+
+import com.tencent.imsdk.v2.V2TIMGroupChangeInfo;
+import com.tencent.imsdk.v2.V2TIMGroupListener;
+import com.tencent.imsdk.v2.V2TIMGroupMemberChangeInfo;
+import com.tencent.imsdk.v2.V2TIMGroupMemberInfo;
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.qcloud.tuicore.ServiceInitializer;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuikit.tuigroup.interfaces.GroupEventListener;
+import com.tencent.qcloud.tuikit.tuigroup.util.TUIGroupUtils;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+public class TUIGroupService extends ServiceInitializer implements ITUIGroupService {
+    public static final String TAG = TUIGroupService.class.getSimpleName();
+    private static TUIGroupService instance;
+
+    private final List<WeakReference<GroupEventListener>> groupEventListenerList = new ArrayList<>();
+
+    public static TUIGroupService getInstance() {
+        return instance;
+    }
+
+    @Override
+    public void init(Context context) {
+        instance = this;
+        TUICore.registerService(TUIConstants.TUIGroup.SERVICE_NAME, this);
+        initIMListener();
+    }
+
+    @Override
+    public Object onCall(String method, Map<String, Object> param) {
+        return null;
+    }
+
+
+    private void initIMListener() {
+        V2TIMManager.getInstance().addGroupListener(new V2TIMGroupListener() {
+            @Override
+            public void onMemberEnter(String groupID, List<V2TIMGroupMemberInfo> memberList) {
+                HashMap<String, Object> param = new HashMap<>();
+                param.put(TUIConstants.TUIGroup.GROUP_ID, groupID);
+                ArrayList<String> userIds = new ArrayList<>();
+                for (V2TIMGroupMemberInfo memberInfo : memberList) {
+                    userIds.add(memberInfo.getUserID());
+                }
+                param.put(TUIConstants.TUIGroup.GROUP_MEMBER_ID_LIST, userIds);
+                TUICore.notifyEvent(TUIConstants.TUIGroup.EVENT_GROUP, TUIConstants.TUIGroup.EVENT_SUB_KEY_JOIN_GROUP, param);
+                if (userIds.contains(TUILogin.getLoginUser())) {
+                    TUIGroupUtils.toastGroupEvent(TUIGroupUtils.GROUP_EVENT_TIP_JOINED, groupID);
+                }
+            }
+
+            @Override
+            public void onMemberLeave(String groupID, V2TIMGroupMemberInfo member) {
+                super.onMemberLeave(groupID, member);
+            }
+
+            @Override
+            public void onMemberInvited(String groupID, V2TIMGroupMemberInfo opUser, List<V2TIMGroupMemberInfo> memberList) {
+                HashMap<String, Object> param = new HashMap<>();
+                param.put(TUIConstants.TUIGroup.GROUP_ID, groupID);
+                ArrayList<String> userIds = new ArrayList<>();
+                for (V2TIMGroupMemberInfo memberInfo : memberList) {
+                    userIds.add(memberInfo.getUserID());
+                }
+                param.put(TUIConstants.TUIGroup.GROUP_MEMBER_ID_LIST, userIds);
+                TUICore.notifyEvent(TUIConstants.TUIGroup.EVENT_GROUP, TUIConstants.TUIGroup.EVENT_SUB_KEY_INVITED_GROUP, param);
+                if (userIds.contains(TUILogin.getLoginUser())) {
+                    TUIGroupUtils.toastGroupEvent(TUIGroupUtils.GROUP_EVENT_TIP_INVITED, groupID);
+                }
+            }
+
+            @Override
+            public void onMemberKicked(String groupID, V2TIMGroupMemberInfo opUser, List<V2TIMGroupMemberInfo> memberList) {
+                HashMap<String, Object> param = new HashMap<>();
+                param.put(TUIConstants.TUIGroup.GROUP_ID, groupID);
+                ArrayList<String> userIds = new ArrayList<>();
+                for (V2TIMGroupMemberInfo memberInfo : memberList) {
+                    userIds.add(memberInfo.getUserID());
+                }
+                param.put(TUIConstants.TUIGroup.GROUP_MEMBER_ID_LIST, userIds);
+                TUICore.notifyEvent(TUIConstants.TUIGroup.EVENT_GROUP, TUIConstants.TUIGroup.EVENT_SUB_KEY_MEMBER_KICKED_GROUP, param);
+                if (userIds.contains(TUILogin.getLoginUser())) {
+                    TUIGroupUtils.toastGroupEvent(TUIGroupUtils.GROUP_EVENT_TIP_KICKED, groupID);
+                }
+            }
+
+            @Override
+            public void onMemberInfoChanged(String groupID, List<V2TIMGroupMemberChangeInfo> v2TIMGroupMemberChangeInfoList) {
+                super.onMemberInfoChanged(groupID, v2TIMGroupMemberChangeInfoList);
+            }
+
+            @Override
+            public void onGroupCreated(String groupID) {
+                super.onGroupCreated(groupID);
+            }
+
+            @Override
+            public void onGroupDismissed(String groupID, V2TIMGroupMemberInfo opUser) {
+                HashMap<String, Object> param = new HashMap<>();
+                param.put(TUIConstants.TUIGroup.GROUP_ID, groupID);
+                TUICore.notifyEvent(TUIConstants.TUIGroup.EVENT_GROUP, TUIConstants.TUIGroup.EVENT_SUB_KEY_GROUP_DISMISS, param);
+                TUIGroupUtils.toastGroupEvent(TUIGroupUtils.GROUP_EVENT_TIP_DISBANDED, groupID);
+
+            }
+
+            @Override
+            public void onGroupRecycled(String groupID, V2TIMGroupMemberInfo opUser) {
+                HashMap<String, Object> param = new HashMap<>();
+                param.put(TUIConstants.TUIGroup.GROUP_ID, groupID);
+                TUICore.notifyEvent(TUIConstants.TUIGroup.EVENT_GROUP, TUIConstants.TUIGroup.EVENT_SUB_KEY_GROUP_RECYCLE, param);
+            }
+
+            @Override
+            public void onGroupInfoChanged(String groupID, List<V2TIMGroupChangeInfo> changeInfos) {
+                List<GroupEventListener> groupEventListeners = getGroupEventListenerList();
+                for (GroupEventListener groupEventListener : groupEventListeners) {
+                    groupEventListener.onGroupInfoChanged(groupID);
+                }
+
+                HashMap<String, Object> param = new HashMap<>();
+                param.put(TUIConstants.TUIGroup.GROUP_ID, groupID);
+                for (V2TIMGroupChangeInfo changeInfo : changeInfos) {
+                    if (changeInfo.getType() == V2TIMGroupChangeInfo.V2TIM_GROUP_INFO_CHANGE_TYPE_NAME) {
+                        param.put(TUIConstants.TUIGroup.GROUP_NAME, changeInfo.getValue());
+                    } else if (changeInfo.getType() == V2TIMGroupChangeInfo.V2TIM_GROUP_INFO_CHANGE_TYPE_FACE_URL) {
+                        param.put(TUIConstants.TUIGroup.GROUP_FACE_URL, changeInfo.getValue());
+                    } else if (changeInfo.getType() == V2TIMGroupChangeInfo.V2TIM_GROUP_INFO_CHANGE_TYPE_OWNER) {
+                        param.put(TUIConstants.TUIGroup.GROUP_OWNER, changeInfo.getValue());
+                    } else if (changeInfo.getType() == V2TIMGroupChangeInfo.V2TIM_GROUP_INFO_CHANGE_TYPE_NOTIFICATION) {
+                        param.put(TUIConstants.TUIGroup.GROUP_NOTIFICATION, changeInfo.getValue());
+                    } else if (changeInfo.getType() == V2TIMGroupChangeInfo.V2TIM_GROUP_INFO_CHANGE_TYPE_INTRODUCTION) {
+                        param.put(TUIConstants.TUIGroup.GROUP_INTRODUCTION, changeInfo.getValue());
+                    } else {
+                        return;
+                    }
+                }
+                TUICore.notifyEvent(TUIConstants.TUIGroup.EVENT_GROUP, TUIConstants.TUIGroup.EVENT_SUB_KEY_GROUP_INFO_CHANGED, param);
+            }
+
+            @Override
+            public void onReceiveJoinApplication(String groupID, V2TIMGroupMemberInfo member, String opReason) {
+                super.onReceiveJoinApplication(groupID, member, opReason);
+            }
+
+            @Override
+            public void onApplicationProcessed(String groupID, V2TIMGroupMemberInfo opUser, boolean isAgreeJoin, String opReason) {
+                super.onApplicationProcessed(groupID, opUser, isAgreeJoin, opReason);
+            }
+
+            @Override
+            public void onGrantAdministrator(String groupID, V2TIMGroupMemberInfo opUser, List<V2TIMGroupMemberInfo> memberList) {
+                super.onGrantAdministrator(groupID, opUser, memberList);
+            }
+
+            @Override
+            public void onRevokeAdministrator(String groupID, V2TIMGroupMemberInfo opUser, List<V2TIMGroupMemberInfo> memberList) {
+                super.onRevokeAdministrator(groupID, opUser, memberList);
+            }
+
+            @Override
+            public void onQuitFromGroup(String groupID) {
+                HashMap<String, Object> param = new HashMap<>();
+                param.put(TUIConstants.TUIGroup.GROUP_ID, groupID);
+                TUICore.notifyEvent(TUIConstants.TUIGroup.EVENT_GROUP, TUIConstants.TUIGroup.EVENT_SUB_KEY_EXIT_GROUP, param);
+            }
+
+            @Override
+            public void onReceiveRESTCustomData(String groupID, byte[] customData) {
+                super.onReceiveRESTCustomData(groupID, customData);
+            }
+
+            @Override
+            public void onGroupAttributeChanged(String groupID, Map<String, String> groupAttributeMap) {
+                super.onGroupAttributeChanged(groupID, groupAttributeMap);
+            }
+        });
+    }
+
+    public void addGroupEventListener(GroupEventListener groupEventListener) {
+        if (groupEventListener == null) {
+            return;
+        }
+        for (WeakReference<GroupEventListener> listenerWeakReference : groupEventListenerList) {
+            if (listenerWeakReference.get() == groupEventListener) {
+                return;
+            }
+        }
+        groupEventListenerList.add(new WeakReference<>(groupEventListener));
+    }
+
+    public List<GroupEventListener> getGroupEventListenerList() {
+        List<GroupEventListener> listeners = new ArrayList<>();
+        Iterator<WeakReference<GroupEventListener>> iterator = groupEventListenerList.listIterator();
+        while(iterator.hasNext()) {
+            WeakReference<GroupEventListener> listenerWeakReference = iterator.next();
+            GroupEventListener listener = listenerWeakReference.get();
+            if (listener == null) {
+                iterator.remove();
+            } else {
+                listeners.add(listener);
+            }
+        }
+        return listeners;
+    }
+
+    @Override
+    public int getLightThemeResId() {
+        return R.style.TUIGroupLightTheme;
+    }
+
+    @Override
+    public int getLivelyThemeResId() {
+        return R.style.TUIGroupLivelyTheme;
+    }
+
+    @Override
+    public int getSeriousThemeResId() {
+        return R.style.TUIGroupSeriousTheme;
+    }
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/bean/ChatInfo.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/bean/ChatInfo.java
new file mode 100644
index 0000000..1abc1c2
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/bean/ChatInfo.java
@@ -0,0 +1,157 @@
+package com.tencent.qcloud.tuikit.tuigroup.bean;
+
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.imsdk.v2.V2TIMGroupAtInfo;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 聊天信息基本类
+ */
+public class ChatInfo implements Serializable {
+
+    public static final int TYPE_C2C = V2TIMConversation.V2TIM_C2C;
+    public static final int TYPE_GROUP = V2TIMConversation.V2TIM_GROUP;
+    public static final int TYPE_INVALID = V2TIMConversation.CONVERSATION_TYPE_INVALID;
+
+    private static List<V2TIMGroupAtInfo> atInfoList;
+
+    private String chatName;
+    private int type = V2TIMConversation.V2TIM_C2C;
+    private String id;
+    private String groupType;
+    private boolean isTopChat;
+    private boolean isFolded;
+
+
+    public ChatInfo() {
+
+    }
+
+    /**
+     * 获取聊天的标题，单聊一般为对方名称，群聊为群名字
+     * 
+     * Get the title of the chat, usually the name of the other party for a single chat, and the group name for a group chat
+     *
+     * @return
+     */
+    public String getChatName() {
+        return chatName;
+    }
+
+    /**
+     * 设置聊天的标题，单聊一般为对方名称，群聊为群名字
+     * 
+     * Set the title of the chat, usually the name of the other party for a single chat, and the group name for a group chat
+     *
+     * @param chatName
+     */
+    public void setChatName(String chatName) {
+        this.chatName = chatName;
+    }
+
+    /**
+     * 获取聊天类型，C2C为单聊，Group为群聊
+     * 
+     * Get the chat type, C2C is a single chat, Group is a group chat
+     *
+     * @return
+     */
+    public int getType() {
+        return type;
+    }
+
+    /**
+     * 设置聊天类型，C2C为单聊，Group为群聊
+     * 
+     * Set the chat type, C2C is a single chat, Group is a group chat
+     *
+     * @param type
+     */
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    /**
+     * 获取聊天唯一标识
+     * 
+     * Get chat id
+     *
+     * @return
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * 设置聊天唯一标识
+     * 
+     * Set chat id
+     *
+     * @param id
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取群组类型
+     * 
+     * Get group type
+     */
+    public String getGroupType() {
+        return groupType;
+    }
+
+    /**
+     * 设置群组类型
+     * 
+     * Set group type
+     */
+    public void setGroupType(String groupType) {
+        this.groupType = groupType;
+    }
+
+    /**
+     * 是否为置顶的会话
+     * 
+     * Is it a pinned conversation
+     *
+     * @return
+     */
+    public boolean isTopChat() {
+        return isTopChat;
+    }
+
+    /**
+     * 设置会话是否置顶
+     * 
+     * Set whether the conversation is sticky
+     *
+     * @param topChat
+     */
+    public void setTopChat(boolean topChat) {
+        isTopChat = topChat;
+    }
+
+    /**
+     * 是否为折叠的会话
+     */
+    public boolean isFolded() {
+        return isFolded;
+    }
+
+    /**
+     * 设置会话折叠
+     */
+    public void setFolded(boolean folded) {
+        isFolded = folded;
+    }
+
+    public List<V2TIMGroupAtInfo> getAtInfoList() {
+        return atInfoList;
+    }
+
+
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/bean/GroupApplyInfo.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/bean/GroupApplyInfo.java
new file mode 100644
index 0000000..99e8b72
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/bean/GroupApplyInfo.java
@@ -0,0 +1,60 @@
+package com.tencent.qcloud.tuikit.tuigroup.bean;
+
+import com.tencent.imsdk.v2.V2TIMGroupApplication;
+
+import java.io.Serializable;
+
+public class GroupApplyInfo implements Serializable {
+
+    public static final int APPLIED = 1;
+    public static final int REFUSED = -1;
+    public static final int UNHANDLED = 0;
+
+    private int status;
+    private V2TIMGroupApplication timGroupApplication;
+
+    public GroupApplyInfo(V2TIMGroupApplication timGroupApplication) {
+        this.timGroupApplication = timGroupApplication;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public V2TIMGroupApplication getGroupApplication() {
+        return timGroupApplication;
+    }
+
+    public String getFromUser() {
+        if (timGroupApplication != null) {
+            return timGroupApplication.getFromUser();
+        }
+        return "";
+    }
+
+    public String getFromUserNickName() {
+        if (timGroupApplication != null) {
+            return timGroupApplication.getFromUserNickName();
+        }
+        return "";
+    }
+
+    public String getRequestMsg() {
+        if (timGroupApplication != null) {
+            return timGroupApplication.getRequestMsg();
+        }
+        return "";
+    }
+
+    public boolean isStatusHandled() {
+        if (timGroupApplication != null) {
+            return timGroupApplication.getHandleStatus() != V2TIMGroupApplication.V2TIM_GROUP_APPLICATION_HANDLE_STATUS_UNHANDLED;
+        }
+        return false;
+    }
+
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/bean/GroupInfo.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/bean/GroupInfo.java
new file mode 100644
index 0000000..6ff4de0
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/bean/GroupInfo.java
@@ -0,0 +1,251 @@
+package com.tencent.qcloud.tuikit.tuigroup.bean;
+
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.imsdk.v2.V2TIMGroupInfoResult;
+import com.tencent.imsdk.v2.V2TIMGroupMemberFullInfo;
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMMessage;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class GroupInfo extends ChatInfo {
+
+    public static final String GROUP_TYPE_MEETING = V2TIMManager.GROUP_TYPE_MEETING;
+    public static final String GROUP_TYPE_AVCHATROOM = V2TIMManager.GROUP_TYPE_AVCHATROOM;
+    public static final String GROUP_TYPE_COMMUNITY = V2TIMManager.GROUP_TYPE_COMMUNITY;
+    public static final String GROUP_TYPE_PUBLIC = V2TIMManager.GROUP_TYPE_PUBLIC;
+    public static final String GROUP_TYPE_WORK = V2TIMManager.GROUP_TYPE_WORK;
+
+    public static final int GROUP_MEMBER_FILTER_ALL = V2TIMGroupMemberFullInfo.V2TIM_GROUP_MEMBER_FILTER_ALL;
+    public static final int GROUP_MEMBER_FILTER_OWNER = V2TIMGroupMemberFullInfo.V2TIM_GROUP_MEMBER_FILTER_OWNER;
+    public static final int GROUP_MEMBER_FILTER_ADMIN = V2TIMGroupMemberFullInfo.V2TIM_GROUP_MEMBER_FILTER_ADMIN;
+    public static final int GROUP_MEMBER_FILTER_COMMON = V2TIMGroupMemberFullInfo.V2TIM_GROUP_MEMBER_FILTER_COMMON;
+
+    private String groupType;
+    private int memberCount;
+    private String groupName;
+    private String notice;
+    private List<GroupMemberInfo> memberDetails = new ArrayList<>();
+    private int joinType;
+    private String owner;
+    private boolean messageReceiveOption;
+    private String faceUrl;
+    private long mNextSeq = 0;
+    private boolean canManagerGroup;
+    private boolean isAllMuted;
+
+    public GroupInfo() {
+        setType(V2TIMConversation.V2TIM_GROUP);
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    /**
+     * 获取群公告
+     * 
+     * Get group announcements 
+     *
+     * @return
+     */
+    public String getNotice() {
+        return notice;
+    }
+
+    /**
+     * 设置群公告
+     * 
+     * Set group announcements
+     *
+     * @param signature
+     */
+    public void setNotice(String signature) {
+        this.notice = signature;
+    }
+
+    /**
+     * 获取加群验证方式
+     * 
+     * Get the group verification method
+     *
+     * @return
+     */
+    public int getJoinType() {
+        return joinType;
+    }
+
+    /**
+     * 设置加群验证方式
+     * 
+     * Set the group verification method
+     *
+     * @param joinType
+     */
+    public void setJoinType(int joinType) {
+        this.joinType = joinType;
+    }
+
+    /**
+     * 获取群类型，Public/Private/ChatRoom
+     * 
+     * Get the group type, Public/Private/ChatRoom
+     *
+     * @return
+     */
+    public String getGroupType() {
+        return groupType;
+    }
+
+    /**
+     * 设置群类型
+     * 
+     * Set the group type
+     *
+     * @param groupType
+     */
+    public void setGroupType(String groupType) {
+        this.groupType = groupType;
+    }
+
+    /**
+     * 获取成员详细信息
+     * 
+     * Get member details
+     *
+     * @return
+     */
+    public List<GroupMemberInfo> getMemberDetails() {
+        return memberDetails;
+    }
+
+    /**
+     * 设置成员详细信息
+     * 
+     * Set member details
+     *
+     * @param memberDetails
+     */
+    public void setMemberDetails(List<GroupMemberInfo> memberDetails) {
+        this.memberDetails = memberDetails;
+    }
+
+    /**
+     * 获取群成员数量
+     * 
+     * Get the number of members that have joined the group
+     *
+     * @return
+     */
+    public int getMemberCount() {
+        return memberCount;
+    }
+
+    /**
+     * 设置群成员数量
+     * 
+     * Set the number of members that have joined the group
+     *
+     * @param memberCount
+     */
+    public void setMemberCount(int memberCount) {
+        this.memberCount = memberCount;
+    }
+
+    /**
+     * 返回是否是群主
+     * 
+     * Returns whether it is the owner of the group
+     *
+     * @return
+     */
+    public boolean isOwner() {
+        return V2TIMManager.getInstance().getLoginUser().equals(owner);
+    }
+
+    /**
+     * 设置是否是群主
+     * 
+     * Set whether it is the owner of the group
+     *
+     * @param owner
+     */
+    public void setOwner(String owner) {
+        this.owner = owner;
+    }
+
+    /**
+     * 获取消息接收选项
+     * 
+     * Get the current user's message receiving option in the group. To modify the group message receiving option, please call the setReceiveMessageOpt API.
+     *
+     * @return
+     */
+    public boolean getMessageReceiveOption() {
+        return messageReceiveOption;
+    }
+
+    /**
+     * 设置消息接收选项
+     * @param messageReceiveOption, true,免打扰； false，接收消息
+     * 
+     * 
+     * Set the current user's message receiving option in the group.
+     * @param messageReceiveOption, true,no message will be received； false，messages will be received.
+     */
+    public void setMessageReceiveOption(boolean messageReceiveOption) {
+        this.messageReceiveOption = messageReceiveOption;
+    }
+
+    public String getFaceUrl() {
+        return faceUrl;
+    }
+
+    public void setFaceUrl(String faceUrl) {
+        this.faceUrl = faceUrl;
+    }
+
+    public long getNextSeq() {
+        return mNextSeq;
+    }
+
+    public void setNextSeq(long mNextSeq) {
+        this.mNextSeq = mNextSeq;
+    }
+
+    public boolean isCanManagerGroup() {
+        return canManagerGroup;
+    }
+
+    public boolean isAllMuted() {
+        return isAllMuted;
+    }
+
+    public GroupInfo covertTIMGroupDetailInfo(V2TIMGroupInfoResult infoResult) {
+        if (infoResult.getResultCode() != 0) {
+            return this;
+        }
+        setChatName(infoResult.getGroupInfo().getGroupName());
+        setGroupName(infoResult.getGroupInfo().getGroupName());
+        setId(infoResult.getGroupInfo().getGroupID());
+        setNotice(infoResult.getGroupInfo().getNotification());
+        setMemberCount(infoResult.getGroupInfo().getMemberCount());
+        setGroupType(infoResult.getGroupInfo().getGroupType());
+        setOwner(infoResult.getGroupInfo().getOwner());
+        setJoinType(infoResult.getGroupInfo().getGroupAddOpt());
+        setMessageReceiveOption(infoResult.getGroupInfo().getRecvOpt() == V2TIMMessage.V2TIM_RECEIVE_NOT_NOTIFY_MESSAGE ? true : false);
+        setFaceUrl(infoResult.getGroupInfo().getFaceUrl());
+        int role = infoResult.getGroupInfo().getRole();
+        canManagerGroup = role == V2TIMGroupMemberFullInfo.V2TIM_GROUP_MEMBER_ROLE_OWNER
+                || role == V2TIMGroupMemberFullInfo.V2TIM_GROUP_MEMBER_ROLE_ADMIN
+                || groupType == V2TIMManager.GROUP_TYPE_WORK;
+        isAllMuted = infoResult.getGroupInfo().isAllMuted();
+        return this;
+    }
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/bean/GroupMemberInfo.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/bean/GroupMemberInfo.java
new file mode 100644
index 0000000..cf38fe6
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/bean/GroupMemberInfo.java
@@ -0,0 +1,140 @@
+package com.tencent.qcloud.tuikit.tuigroup.bean;
+
+import com.tencent.imsdk.v2.V2TIMGroupMemberFullInfo;
+import com.tencent.imsdk.v2.V2TIMGroupMemberInfo;
+
+import java.io.Serializable;
+
+public class GroupMemberInfo implements Serializable {
+
+    private String iconUrl;
+    private String account;
+    private String signature;
+    private String location;
+    private String birthday;
+    private String nameCard;
+    private String nickName;
+    private boolean isTopChat;
+    private boolean isFriend;
+    private long joinTime;
+    private long tinyId;
+    private int memberType;
+    private boolean isSelected = false;
+
+    public String getIconUrl() {
+        return iconUrl;
+    }
+
+    public void setIconUrl(String iconUrl) {
+        this.iconUrl = iconUrl;
+    }
+
+    public String getAccount() {
+        return account;
+    }
+
+    public void setAccount(String account) {
+        this.account = account;
+    }
+
+    public String getSignature() {
+        return signature;
+    }
+
+    public void setSignature(String signature) {
+        this.signature = signature;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public void setLocation(String location) {
+        this.location = location;
+    }
+
+    public String getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(String birthday) {
+        this.birthday = birthday;
+    }
+
+    public void setNameCard(String nameCard) {
+        this.nameCard = nameCard;
+    }
+
+    public String getNameCard() {
+        return nameCard;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public String getNickName() {
+        return this.nickName;
+    }
+
+    public boolean isTopChat() {
+        return isTopChat;
+    }
+
+    public void setTopChat(boolean topChat) {
+        isTopChat = topChat;
+    }
+
+    public boolean isFriend() {
+        return isFriend;
+    }
+
+    public void setFriend(boolean friend) {
+        isFriend = friend;
+    }
+
+    public long getJoinTime() {
+        return joinTime;
+    }
+
+    public void setJoinTime(long joinTime) {
+        this.joinTime = joinTime;
+    }
+
+    public long getTinyId() {
+        return tinyId;
+    }
+
+    public void setTinyId(long tinyId) {
+        this.tinyId = tinyId;
+    }
+
+    public int getMemberType() {
+        return memberType;
+    }
+
+    public void setMemberType(int memberType) {
+        this.memberType = memberType;
+    }
+
+    public void setSelected(boolean selected) {
+        isSelected = selected;
+    }
+
+    public boolean isSelected() {
+        return isSelected;
+    }
+
+    public GroupMemberInfo covertTIMGroupMemberInfo(V2TIMGroupMemberInfo info) {
+        if (info instanceof V2TIMGroupMemberFullInfo) {
+            V2TIMGroupMemberFullInfo v2TIMGroupMemberFullInfo = (V2TIMGroupMemberFullInfo)info;
+            setJoinTime(v2TIMGroupMemberFullInfo.getJoinTime());
+            setMemberType(v2TIMGroupMemberFullInfo.getRole());
+        }
+        setAccount(info.getUserID());
+        setNameCard(info.getNameCard());
+        setIconUrl(info.getFaceUrl());
+        setNickName(info.getNickName());
+        return this;
+    }
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/interfaces/IGroupMemberChangedCallback.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/interfaces/IGroupMemberChangedCallback.java
new file mode 100644
index 0000000..70d315c
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/interfaces/IGroupMemberChangedCallback.java
@@ -0,0 +1,7 @@
+package com.tencent.qcloud.tuikit.tuigroup.classicui.interfaces;
+
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupMemberInfo;
+
+public interface IGroupMemberChangedCallback {
+    void onMemberRemoved(GroupMemberInfo memberInfo);
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/interfaces/IGroupMemberListener.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/interfaces/IGroupMemberListener.java
new file mode 100644
index 0000000..58d8016
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/interfaces/IGroupMemberListener.java
@@ -0,0 +1,16 @@
+package com.tencent.qcloud.tuikit.tuigroup.classicui.interfaces;
+
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+
+import java.util.ArrayList;
+
+public interface IGroupMemberListener {
+
+    void forwardListMember(GroupInfo info);
+
+    void forwardAddMember(GroupInfo info);
+
+    void forwardDeleteMember(GroupInfo info);
+
+    default void setSelectedMember(ArrayList<String> members) {}
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/page/GroupApplyManagerActivity.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/page/GroupApplyManagerActivity.java
new file mode 100644
index 0000000..0f74a17
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/page/GroupApplyManagerActivity.java
@@ -0,0 +1,59 @@
+package com.tencent.qcloud.tuikit.tuigroup.classicui.page;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupConstants;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupApplyInfo;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.presenter.GroupApplyPresenter;
+import com.tencent.qcloud.tuikit.tuigroup.classicui.view.GroupApplyManagerLayout;
+
+public class GroupApplyManagerActivity extends BaseLightActivity {
+
+    private GroupApplyManagerLayout mManagerLayout;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.group_apply_manager_activity);
+        if (getIntent().getExtras() == null) {
+            finish();
+            return;
+        }
+        mManagerLayout = findViewById(R.id.group_apply_manager_layout);
+
+        GroupApplyPresenter presenter = new GroupApplyPresenter(mManagerLayout);
+        mManagerLayout.setPresenter(presenter);
+
+        String groupId = getIntent().getExtras().getString(TUIGroupConstants.Group.GROUP_ID);
+        GroupInfo groupInfo = new GroupInfo();
+        groupInfo.setId(groupId);
+        mManagerLayout.setDataSource(groupInfo);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode != TUIGroupConstants.ActivityRequest.CODE_1) {
+            return;
+        }
+        if (resultCode != RESULT_OK) {
+            return;
+        }
+        GroupApplyInfo info = (GroupApplyInfo) data.getSerializableExtra(TUIGroupConstants.Group.MEMBER_APPLY);
+        if (info == null) {
+            return;
+        }
+        mManagerLayout.updateItemData(info);
+    }
+
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/page/GroupInfoActivity.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/page/GroupInfoActivity.java
new file mode 100644
index 0000000..c34b3c4
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/page/GroupInfoActivity.java
@@ -0,0 +1,46 @@
+package com.tencent.qcloud.tuikit.tuigroup.classicui.page;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupConstants;
+
+import java.util.List;
+
+
+public class GroupInfoActivity extends BaseLightActivity {
+
+    public static final int REQUEST_FOR_CHANGE_OWNER = 1;
+
+    private GroupInfoFragment fragment;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.group_info_activity);
+        fragment = new GroupInfoFragment();
+        fragment.setArguments(getIntent().getExtras());
+        getSupportFragmentManager().beginTransaction().replace(R.id.group_manager_base, fragment).commitAllowingStateLoss();
+    }
+
+    @Override
+    public void finish() {
+        super.finish();
+        setResult(1001);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == REQUEST_FOR_CHANGE_OWNER && data != null) {
+            List<String> selectedList = data.getStringArrayListExtra(TUIGroupConstants.Selection.LIST);
+            if (selectedList != null && !selectedList.isEmpty()) {
+                String newOwnerId = selectedList.get(0);
+                fragment.changeGroupOwner(newOwnerId);
+            }
+        }
+    }
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/page/GroupInfoFragment.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/page/GroupInfoFragment.java
new file mode 100644
index 0000000..7477fef
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/page/GroupInfoFragment.java
@@ -0,0 +1,253 @@
+package com.tencent.qcloud.tuikit.tuigroup.classicui.page;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.component.activities.ImageSelectActivity;
+import com.tencent.qcloud.tuicore.component.fragments.BaseFragment;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupConstants;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupService;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuigroup.presenter.GroupInfoPresenter;
+import com.tencent.qcloud.tuikit.tuigroup.classicui.interfaces.IGroupMemberListener;
+import com.tencent.qcloud.tuikit.tuigroup.classicui.view.GroupInfoLayout;
+import com.tencent.qcloud.tuikit.tuigroup.util.TUIGroupLog;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+
+public class GroupInfoFragment extends BaseFragment {
+    private static final int CHOOSE_AVATAR_REQUEST_CODE = 101;
+
+    private View baseView;
+    private GroupInfoLayout groupInfoLayout;
+
+    private String groupId;
+
+    private GroupInfoPresenter groupInfoPresenter = null;
+    private String mChatBackgroundThumbnailUrl;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        baseView = inflater.inflate(R.layout.group_info_fragment, container, false);
+        initView();
+        return baseView;
+    }
+
+    private void initView() {
+        Bundle bundle = getArguments();
+        if (bundle == null) {
+            ToastUtil.toastShortMessage("groupId is empty. bundle is null");
+            return;
+        }
+        groupId = bundle.getString(TUIGroupConstants.Group.GROUP_ID);
+        mChatBackgroundThumbnailUrl = bundle.getString(TUIConstants.TUIChat.CHAT_BACKGROUND_URI);
+        groupInfoLayout = baseView.findViewById(R.id.group_info_layout);
+        // 新建 presenter 与 layout 互相绑定
+        groupInfoPresenter = new GroupInfoPresenter(groupInfoLayout);
+        groupInfoPresenter.setGroupEventListener();
+        groupInfoLayout.setGroupInfoPresenter(groupInfoPresenter);
+        groupInfoLayout.setOnModifyGroupAvatarListener(new OnModifyGroupAvatarListener() {
+            @Override
+            public void onModifyGroupAvatar(String originAvatarUrl) {
+                ArrayList<ImageSelectActivity.ImageBean> faceList = new ArrayList<>();
+                for (int i = 0; i < TUIGroupConstants.GROUP_FACE_COUNT; i++) {
+                    ImageSelectActivity.ImageBean imageBean = new ImageSelectActivity.ImageBean();
+                    imageBean.setThumbnailUri(String.format(TUIGroupConstants.GROUP_FACE_URL, (i + 1) + ""));
+                    imageBean.setImageUri(String.format(TUIGroupConstants.GROUP_FACE_URL, (i + 1) + ""));
+                    faceList.add(imageBean);
+                }
+
+                Intent intent = new Intent(getContext(), ImageSelectActivity.class);
+                intent.putExtra(ImageSelectActivity.TITLE, getResources().getString(R.string.group_choose_avatar));
+                intent.putExtra(ImageSelectActivity.SPAN_COUNT, 4);
+                intent.putExtra(ImageSelectActivity.ITEM_WIDTH, ScreenUtil.dip2px(77));
+                intent.putExtra(ImageSelectActivity.ITEM_HEIGHT, ScreenUtil.dip2px(77));
+                intent.putExtra(ImageSelectActivity.DATA, faceList);
+                intent.putExtra(ImageSelectActivity.SELECTED, new ImageSelectActivity.ImageBean(originAvatarUrl, originAvatarUrl, false));
+                startActivityForResult(intent, CHOOSE_AVATAR_REQUEST_CODE);
+            }
+        });
+        groupInfoLayout.loadGroupInfo(groupId);
+        groupInfoLayout.setRouter(new IGroupMemberListener() {
+            @Override
+            public void forwardListMember(GroupInfo info) {
+                Intent intent = new Intent(getContext(), GroupMemberActivity.class);
+                intent.putExtra(TUIConstants.TUIGroup.IS_SELECT_MODE, false);
+                intent.putExtra(TUIConstants.TUIGroup.GROUP_ID, info.getId());
+                startActivity(intent);
+            }
+
+            @Override
+            public void forwardAddMember(GroupInfo info) {
+                Bundle param = new Bundle();
+                param.putString(TUIGroupConstants.Group.GROUP_ID, info.getId());
+                param.putBoolean(TUIGroupConstants.Selection.SELECT_FRIENDS, true);
+                ArrayList<String> selectedList = new ArrayList<>();
+                for (GroupMemberInfo memberInfo : info.getMemberDetails()) {
+                    selectedList.add(memberInfo.getAccount());
+                }
+                param.putStringArrayList(TUIGroupConstants.Selection.SELECTED_LIST, selectedList);
+                TUICore.startActivity(GroupInfoFragment.this, "StartGroupMemberSelectActivity", param, 1);
+            }
+
+            @Override
+            public void forwardDeleteMember(GroupInfo info) {
+                Bundle param = new Bundle();
+                param.putString(TUIGroupConstants.Group.GROUP_ID, info.getId());
+                param.putBoolean(TUIGroupConstants.Selection.SELECT_FOR_CALL, true);
+                TUICore.startActivity(GroupInfoFragment.this, "StartGroupMemberSelectActivity", param, 2);
+            }
+        });
+
+        groupInfoLayout.setOnButtonClickListener(new GroupInfoLayout.OnButtonClickListener() {
+            @Override
+            public void onSetChatBackground() {
+                ArrayList<ImageSelectActivity.ImageBean> faceList = new ArrayList<>();
+                ImageSelectActivity.ImageBean defaultFace = new ImageSelectActivity.ImageBean();
+                defaultFace.setDefault(true);
+                faceList.add(defaultFace);
+                for (int i = 0; i < TUIConstants.TUIChat.CHAT_CONVERSATION_BACKGROUND_COUNT; i++) {
+                    ImageSelectActivity.ImageBean imageBean = new ImageSelectActivity.ImageBean();
+                    imageBean.setImageUri(String.format(TUIConstants.TUIChat.CHAT_CONVERSATION_BACKGROUND_URL, (i + 1) + ""));
+                    imageBean.setThumbnailUri(String.format(TUIConstants.TUIChat.CHAT_CONVERSATION_BACKGROUND_THUMBNAIL_URL, (i + 1) + ""));
+                    faceList.add(imageBean);
+                }
+
+                Intent intent = new Intent(getContext(), ImageSelectActivity.class);
+                intent.putExtra(ImageSelectActivity.TITLE, getResources().getString(R.string.chat_background_title));
+                intent.putExtra(ImageSelectActivity.SPAN_COUNT, 2);
+                intent.putExtra(ImageSelectActivity.ITEM_WIDTH, ScreenUtil.dip2px(186));
+                intent.putExtra(ImageSelectActivity.ITEM_HEIGHT, ScreenUtil.dip2px(124));
+                intent.putExtra(ImageSelectActivity.DATA, faceList);
+                if (TextUtils.isEmpty(mChatBackgroundThumbnailUrl) || TextUtils.equals(TUIConstants.TUIChat.CHAT_CONVERSATION_BACKGROUND_DEFAULT_URL, mChatBackgroundThumbnailUrl)) {
+                    intent.putExtra(ImageSelectActivity.SELECTED, defaultFace);
+                } else {
+                    intent.putExtra(ImageSelectActivity.SELECTED, new ImageSelectActivity.ImageBean(mChatBackgroundThumbnailUrl, "", false));
+                }
+                intent.putExtra(ImageSelectActivity.NEED_DOWLOAD_LOCAL, true);
+                startActivityForResult(intent, TUIConstants.TUIChat.CHAT_REQUEST_BACKGROUND_CODE);
+            }
+        });
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == 3) {
+            List<String> friends = (List<String>) data.getSerializableExtra(TUIGroupConstants.Selection.LIST);
+            if (requestCode == 1) {
+                inviteGroupMembers(friends);
+            } else if (requestCode == 2) {
+                deleteGroupMembers(friends);
+            }
+        } else if (requestCode == CHOOSE_AVATAR_REQUEST_CODE && resultCode == ImageSelectActivity.RESULT_CODE_SUCCESS) {
+            if (data != null) {
+                ImageSelectActivity.ImageBean imageBean = (ImageSelectActivity.ImageBean) data.getSerializableExtra(ImageSelectActivity.DATA);
+                if (imageBean == null) {
+                    return;
+                }
+
+                String avatarUrl = imageBean.getImageUri();
+                modifyGroupAvatar(avatarUrl);
+            }
+        } else if (requestCode == TUIConstants.TUIChat.CHAT_REQUEST_BACKGROUND_CODE) {
+            if (data == null) {
+                return;
+            }
+            ImageSelectActivity.ImageBean imageBean = (ImageSelectActivity.ImageBean) data.getSerializableExtra(ImageSelectActivity.DATA);
+            if (imageBean == null) {
+                TUIGroupLog.e("GroupInfoFragment", "onActivityResult imageBean is null");
+                return;
+            }
+
+            String backgroundUri = imageBean.getLocalPath();
+            String thumbnailUri = imageBean.getThumbnailUri();
+            String dataUri = thumbnailUri + "," + backgroundUri;
+            TUIGroupLog.d("GroupInfoFragment", "onActivityResult backgroundUri = " + backgroundUri);
+            mChatBackgroundThumbnailUrl = thumbnailUri;
+            HashMap<String, Object> param = new HashMap<>();
+            param.put(TUIConstants.TUIChat.CHAT_ID, groupId);
+            param.put(TUIConstants.TUIChat.CHAT_BACKGROUND_URI, dataUri);
+            TUICore.callService(TUIConstants.TUIChat.SERVICE_NAME, TUIConstants.TUIChat.METHOD_UPDATE_DATA_STORE_CHAT_URI, param);
+        }
+    }
+
+    private void modifyGroupAvatar(String avatarUrl) {
+        groupInfoLayout.modifyGroupAvatar(avatarUrl);
+    }
+
+    private void deleteGroupMembers(List<String> friends) {
+        if (friends != null && friends.size() > 0) {
+            if (groupInfoPresenter != null) {
+                groupInfoPresenter.deleteGroupMembers(groupId, friends, new IUIKitCallback<List<String>>() {
+                    @Override
+                    public void onSuccess(List<String> data) {
+                        groupInfoPresenter.loadGroupInfo(groupId);
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+
+                    }
+                });
+            }
+        }
+    }
+
+    private void inviteGroupMembers(List<String> friends) {
+        if (friends != null && friends.size() > 0) {
+            groupInfoPresenter.inviteGroupMembers(groupId, friends, new IUIKitCallback<Object>() {
+                @Override
+                public void onSuccess(Object data) {
+                    if (data instanceof String) {
+                        ToastUtil.toastLongMessage(data.toString());
+                    } else {
+                        ToastUtil.toastLongMessage(TUIGroupService.getAppContext().getString(R.string.invite_suc));
+                    }
+                }
+
+                @Override
+                public void onError(String module, int errCode, String errMsg) {
+                    ToastUtil.toastLongMessage(TUIGroupService.getAppContext().getString(R.string.invite_fail) + errCode + "=" + errMsg);
+                }
+            });
+        }
+    }
+
+    public void changeGroupOwner(String newOwnerId) {
+        groupInfoPresenter.transferGroupOwner(groupId, newOwnerId, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                groupInfoLayout.loadGroupInfo(groupId);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+
+            }
+        });
+    }
+
+
+    public interface OnModifyGroupAvatarListener {
+        void onModifyGroupAvatar(String originAvatarUrl);
+    }
+
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/page/GroupMemberActivity.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/page/GroupMemberActivity.java
new file mode 100644
index 0000000..eceb935
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/page/GroupMemberActivity.java
@@ -0,0 +1,176 @@
+package com.tencent.qcloud.tuikit.tuigroup.classicui.page;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+import android.view.View;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupService;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupConstants;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuigroup.presenter.GroupInfoPresenter;
+import com.tencent.qcloud.tuikit.tuigroup.classicui.view.GroupMemberLayout;
+import com.tencent.qcloud.tuikit.tuigroup.classicui.interfaces.IGroupMemberListener;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class GroupMemberActivity extends BaseLightActivity {
+
+    private GroupMemberLayout mMemberLayout;
+    private String groupID;
+    private GroupInfoPresenter presenter;
+
+    private boolean isSelectMode = false;
+    private ArrayList<String> excludeList;
+    private ArrayList<String> alreadySelectedList;
+    private String userData;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.group_members_list);
+        mMemberLayout = findViewById(R.id.group_member_grid_layout);
+        init();
+    }
+
+    private void init() {
+        Intent intent = getIntent();
+        groupID = intent.getStringExtra(TUIConstants.TUIGroup.GROUP_ID);
+        int limit = getIntent().getIntExtra(TUIConstants.TUIGroup.LIMIT, Integer.MAX_VALUE);
+        isSelectMode = intent.getBooleanExtra(TUIConstants.TUIGroup.IS_SELECT_MODE, true);
+        String title = intent.getStringExtra(TUIConstants.TUIGroup.TITLE);
+        excludeList = intent.getStringArrayListExtra(TUIConstants.TUIGroup.EXCLUDE_LIST);
+        alreadySelectedList = intent.getStringArrayListExtra(TUIConstants.TUIGroup.SELECTED_LIST);
+        userData = intent.getStringExtra(TUIConstants.TUIGroup.USER_DATA);
+        int filter = intent.getIntExtra(TUIConstants.TUIGroup.FILTER, GroupInfo.GROUP_MEMBER_FILTER_ALL);
+        mMemberLayout.setSelectMode(isSelectMode);
+        mMemberLayout.setTitle(title);
+        mMemberLayout.setExcludeList(excludeList);
+        mMemberLayout.setAlreadySelectedList(alreadySelectedList);
+        presenter = new GroupInfoPresenter(mMemberLayout);
+        mMemberLayout.setPresenter(presenter);
+        presenter.loadGroupInfo(groupID, filter);
+
+        mMemberLayout.getTitleBar().setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        mMemberLayout.setGroupMemberListener(new IGroupMemberListener() {
+
+            @Override
+            public void setSelectedMember(ArrayList<String> members) {
+                if (members == null || members.isEmpty()) {
+                    return;
+                }
+                if (members.size() > limit) {
+                    String overLimitTip = getString(R.string.group_over_limit_tip, limit);
+                    ToastUtil.toastShortMessage(overLimitTip);
+                    return;
+                }
+                Intent result = new Intent();
+                result.putStringArrayListExtra(TUIConstants.TUIGroup.LIST, members);
+                setResult(0, result);
+
+                Map<String, Object> param = new HashMap<>();
+                param.put(TUIConstants.TUIGroup.LIST, members);
+                param.put(TUIConstants.TUIGroup.USER_DATA, userData);
+                TUICore.notifyEvent(TUIConstants.TUIGroup.EVENT_GROUP, TUIConstants.TUIGroup.EVENT_SUB_KEY_GROUP_MEMBER_SELECTED, param);
+
+                finish();
+            }
+
+            @Override
+            public void forwardListMember(GroupInfo info) {
+
+            }
+
+            @Override
+            public void forwardAddMember(GroupInfo info) {
+                Bundle param = new Bundle();
+                param.putString(TUIGroupConstants.Group.GROUP_ID, info.getId());
+                param.putBoolean(TUIGroupConstants.Selection.SELECT_FRIENDS, true);
+                ArrayList<String> selectedList = new ArrayList<>();
+                for (GroupMemberInfo memberInfo : info.getMemberDetails()) {
+                    selectedList.add(memberInfo.getAccount());
+                }
+                param.putStringArrayList(TUIGroupConstants.Selection.SELECTED_LIST, selectedList);
+                TUICore.startActivity(GroupMemberActivity.this, "StartGroupMemberSelectActivity", param, 1);
+            }
+
+            @Override
+            public void forwardDeleteMember(GroupInfo info) {
+                Bundle param = new Bundle();
+                param.putString(TUIGroupConstants.Group.GROUP_ID, info.getId());
+                param.putBoolean(TUIGroupConstants.Selection.SELECT_FOR_CALL, true);
+                TUICore.startActivity(GroupMemberActivity.this, "StartGroupMemberSelectActivity", param, 2);
+            }
+        });
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == 3) {
+            List<String> friends = (List<String>) data.getSerializableExtra(TUIGroupConstants.Selection.LIST);
+            if (requestCode == 1) {
+                inviteGroupMembers(friends);
+            } else if (requestCode == 2) {
+                deleteGroupMembers(friends);
+            }
+        }
+    }
+
+    private void deleteGroupMembers(List<String> friends) {
+        if (friends != null && friends.size() > 0) {
+            if (presenter != null) {
+                presenter.deleteGroupMembers(groupID, friends, new IUIKitCallback<List<String>>() {
+                    @Override
+                    public void onSuccess(List<String> data) {
+                        presenter.loadGroupInfo(groupID);
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+
+                    }
+                });
+            }
+        }
+    }
+
+    private void inviteGroupMembers(List<String> friends) {
+        if (friends != null && friends.size() > 0) {
+            if (presenter != null) {
+                presenter.inviteGroupMembers(groupID, friends, new IUIKitCallback<Object>() {
+                    @Override
+                    public void onSuccess(Object data) {
+                        if (data instanceof String) {
+                            ToastUtil.toastLongMessage(data.toString());
+                        } else {
+                            ToastUtil.toastLongMessage(TUIGroupService.getAppContext().getString(R.string.invite_suc));
+                        }
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        ToastUtil.toastLongMessage(TUIGroupService.getAppContext().getString(R.string.invite_fail) + errCode + "=" + errMsg);
+                    }
+                });
+            }
+        }
+    }
+
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/page/GroupNoticeActivity.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/page/GroupNoticeActivity.java
new file mode 100644
index 0000000..461b187
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/page/GroupNoticeActivity.java
@@ -0,0 +1,152 @@
+package com.tencent.qcloud.tuikit.tuigroup.classicui.page;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.DisplayMetrics;
+import android.view.View;
+import android.view.WindowManager;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupConstants;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.presenter.GroupManagerPresenter;
+
+public class GroupNoticeActivity extends BaseLightActivity {
+
+    private static OnGroupNoticeChangedListener changedListener;
+
+    private EditText editText;
+
+    private GroupInfo groupInfo;
+
+    private TitleBarLayout titleBarLayout;
+
+    private boolean isEditModel = false;
+
+    private GroupManagerPresenter presenter;
+
+    public static void setOnGroupNoticeChangedListener(OnGroupNoticeChangedListener listener) {
+        GroupNoticeActivity.changedListener = listener;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_group_notice);
+        editText = findViewById(R.id.group_notice_text);
+        titleBarLayout = findViewById(R.id.group_notice_title_bar);
+        groupInfo = (GroupInfo) getIntent().getSerializableExtra(TUIGroupConstants.Group.GROUP_INFO);
+        presenter = new GroupManagerPresenter();
+        if (!TextUtils.isEmpty(groupInfo.getNotice())) {
+            editText.setText(groupInfo.getNotice());
+        }
+        titleBarLayout.getLeftGroup().setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        titleBarLayout.setTitle(getString(R.string.group_notice), ITitleBarLayout.Position.MIDDLE);
+        titleBarLayout.getRightIcon().setVisibility(View.GONE);
+
+        if (groupInfo.isCanManagerGroup()) {
+            titleBarLayout.setTitle(getString(R.string.group_edit), ITitleBarLayout.Position.RIGHT);
+        }
+        titleBarLayout.getRightGroup().setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (!isEditModel) {
+                    titleBarLayout.setTitle(getString(com.tencent.qcloud.tuicore.R.string.sure), ITitleBarLayout.Position.RIGHT);
+                    editText.setInputType(EditorInfo.TYPE_CLASS_TEXT);
+                    editText.setClickable(true);
+                    editText.setFocusable(true);
+                    editText.setFocusableInTouchMode(true);
+                    showSoftInput();
+                    editText.setSelection(editText.getText().toString().length());
+                    isEditModel = true;
+                } else {
+                    titleBarLayout.setTitle(getString(R.string.group_edit), ITitleBarLayout.Position.RIGHT);
+                    editText.setInputType(EditorInfo.TYPE_NULL);
+                    editText.setClickable(false);
+                    editText.setFocusable(false);
+                    editText.setFocusableInTouchMode(false);
+                    hideSoftInput();
+                    setGroupNotice(editText.getText().toString());
+                    isEditModel = false;
+                }
+            }
+        });
+    }
+
+    private void setGroupNotice(String groupNotice) {
+        if (TextUtils.equals(groupNotice, groupInfo.getNotice())) {
+            return;
+        }
+        presenter.modifyGroupNotification(groupInfo.getId(), groupNotice, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                groupInfo.setNotice(groupNotice);
+                if (changedListener != null) {
+                    changedListener.onChanged(groupNotice);
+                }
+                ToastUtil.toastShortMessage(getResources().getString(R.string.modify_group_notice_success));
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage("modifyGroupNotice error , errCode " + errCode + " errMsg " + errMsg);
+            }
+        });
+    }
+
+    private void showSoftInput() {
+        editText.requestFocus();
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        if (!isSoftInputShown()) {
+            imm.toggleSoftInput(0, 0);
+        }
+    }
+
+    public void hideSoftInput() {
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(editText.getWindowToken(), 0);
+        editText.clearFocus();
+    }
+
+    private boolean isSoftInputShown() {
+        View decorView = getWindow().getDecorView();
+        int screenHeight = decorView.getHeight();
+        Rect rect = new Rect();
+        decorView.getWindowVisibleDisplayFrame(rect);
+        return screenHeight - rect.bottom - getNavigateBarHeight() >= 0;
+    }
+
+    // 兼容有导航键的情况
+    private int getNavigateBarHeight() {
+        DisplayMetrics metrics = new DisplayMetrics();
+        WindowManager windowManager  = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
+        windowManager.getDefaultDisplay().getMetrics(metrics);
+        int usableHeight = metrics.heightPixels;
+        windowManager.getDefaultDisplay().getRealMetrics(metrics);
+        int realHeight = metrics.heightPixels;
+        if (realHeight > usableHeight) {
+            return realHeight - usableHeight;
+        } else {
+            return 0;
+        }
+    }
+
+    public interface OnGroupNoticeChangedListener {
+        void onChanged(String notice);
+    }
+}
\ No newline at end of file
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/page/ManageGroupActivity.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/page/ManageGroupActivity.java
new file mode 100644
index 0000000..cb39ecb
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/page/ManageGroupActivity.java
@@ -0,0 +1,318 @@
+package com.tencent.qcloud.tuikit.tuigroup.classicui.page;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.content.Intent;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.CompoundButton;
+import android.widget.PopupWindow;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.component.CustomLinearLayoutManager;
+import com.tencent.qcloud.tuicore.component.LineControllerView;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.gatherimage.ShadeImageView;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupConstants;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuigroup.presenter.GroupManagerPresenter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ManageGroupActivity extends BaseLightActivity {
+
+    private TitleBarLayout titleBarLayout;
+    private LineControllerView setManagerView;
+    private LineControllerView muteAllView;
+    private View addMuteMemberView;
+    private RecyclerView mutedList;
+    private MutedMemberAdapter mutedMemberAdapter;
+
+    private GroupManagerPresenter presenter;
+    private GroupInfo groupInfo;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_group_manager);
+        presenter = new GroupManagerPresenter();
+        titleBarLayout = findViewById(R.id.group_manage_title_bar);
+        setManagerView = findViewById(R.id.group_manage_set_manager);
+        muteAllView = findViewById(R.id.group_manage_mute_all);
+        addMuteMemberView = findViewById(R.id.group_manage_add_mute_member);
+        mutedList = findViewById(R.id.group_manage_muted_member_list);
+        mutedList.setLayoutManager(new CustomLinearLayoutManager(this));
+        mutedMemberAdapter = new MutedMemberAdapter();
+        mutedList.setAdapter(mutedMemberAdapter);
+
+        groupInfo = (GroupInfo) getIntent().getSerializableExtra(TUIGroupConstants.Group.GROUP_INFO);
+
+        muteAllView.setChecked(groupInfo.isAllMuted());
+        if (groupInfo.isAllMuted()) {
+            addMuteMemberView.setVisibility(View.GONE);
+            mutedList.setVisibility(View.GONE);
+        }
+
+        titleBarLayout.setTitle(getString(R.string.group_manager), ITitleBarLayout.Position.MIDDLE);
+        setClickListener();
+        loadMutedMember();
+    }
+
+    private void setClickListener() {
+        titleBarLayout.getLeftIcon().setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        muteAllView.setCheckListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                    presenter.muteAll(groupInfo.getId(), isChecked, new IUIKitCallback<Void>() {
+                        @Override
+                        public void onSuccess(Void data) {
+                            if (isChecked) {
+                                addMuteMemberView.setVisibility(View.GONE);
+                                mutedList.setVisibility(View.GONE);
+                            } else {
+                                addMuteMemberView.setVisibility(View.VISIBLE);
+                                mutedList.setVisibility(View.VISIBLE);
+                            }
+                        }
+
+                        @Override
+                        public void onError(String module, int errCode, String errMsg) {
+                            ToastUtil.toastShortMessage(errCode + ", " + errMsg);
+                        }
+                    });
+                }
+        });
+
+        setManagerView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (TextUtils.equals(groupInfo.getGroupType(), GroupInfo.GROUP_TYPE_AVCHATROOM)
+                        || TextUtils.equals(groupInfo.getGroupType(), GroupInfo.GROUP_TYPE_WORK)) {
+                    ToastUtil.toastShortMessage(getString(R.string.group_not_support_set_manager));
+                    return;
+                }
+                Intent intent = new Intent(ManageGroupActivity.this, SetGroupManagerActivity.class);
+                intent.putExtra(TUIGroupConstants.Group.GROUP_INFO, groupInfo);
+                startActivity(intent);
+            }
+        });
+
+        addMuteMemberView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (TextUtils.equals(groupInfo.getGroupType(), GroupInfo.GROUP_TYPE_AVCHATROOM)
+                        || TextUtils.equals(groupInfo.getGroupType(), GroupInfo.GROUP_TYPE_WORK)) {
+                    ToastUtil.toastShortMessage(getString(R.string.group_not_support_mute_member));
+                    return;
+                }
+
+                Intent intent = new Intent(ManageGroupActivity.this, GroupMemberActivity.class);
+                intent.putExtra(TUIConstants.TUIGroup.IS_SELECT_MODE, true);
+                intent.putExtra(TUIConstants.TUIGroup.FILTER, GroupInfo.GROUP_MEMBER_FILTER_COMMON);
+                if (mutedMemberAdapter.getGroupMemberInfoList() != null) {
+                    ArrayList<String> selectedList = new ArrayList<>();
+                    for (GroupMemberInfo memberInfo : mutedMemberAdapter.getGroupMemberInfoList()) {
+                        selectedList.add(memberInfo.getAccount());
+                    }
+                    intent.putExtra(TUIConstants.TUIGroup.SELECTED_LIST, selectedList);
+                }
+                intent.putExtra(TUIConstants.TUIGroup.GROUP_ID, groupInfo.getId());
+                startActivityForResult(intent, 1);
+            }
+        });
+
+        mutedMemberAdapter.setOnItemLongClickListener(new SetGroupManagerActivity.OnItemLongClickListener() {
+            @Override
+            public void onClick(View view, GroupMemberInfo memberInfo, int position) {
+                Drawable drawable = view.getBackground();
+                if (drawable != null) {
+                    drawable.setColorFilter(0xd9d9d9, PorterDuff.Mode.SRC_IN);
+                }
+                View itemPop = LayoutInflater.from(ManageGroupActivity.this).inflate(R.layout.group_manager_pop_menu, null);
+                PopupWindow popupWindow = new PopupWindow(itemPop, WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT);
+                popupWindow.setBackgroundDrawable(new ColorDrawable());
+                popupWindow.setOutsideTouchable(true);
+                popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+                    @Override
+                    public void onDismiss() {
+                        if (drawable != null) {
+                            drawable.clearColorFilter();
+                        }
+                    }
+                });
+                TextView popText = itemPop.findViewById(R.id.pop_text);
+                popText.setText(R.string.group_cancel_mute_label);
+                popText.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        popupWindow.dismiss();
+                        presenter.cancelMuteGroupMember(groupInfo.getId(), memberInfo.getAccount(), new IUIKitCallback<Void>() {
+                            @Override
+                            public void onSuccess(Void data) {
+                                mutedMemberAdapter.onItemRemoved(memberInfo);
+                            }
+
+                            @Override
+                            public void onError(String module, int errCode, String errMsg) {
+                                ToastUtil.toastShortMessage(errCode + ", " + errMsg);
+                            }
+                        });
+                    }
+                });
+                int x = view.getWidth() / 2;
+                int y = - view.getHeight() / 3;
+                int popHeight = ScreenUtil.dip2px(45) * 3;
+                if (y + popHeight + view.getY() + view.getHeight() > mutedList.getBottom()) {
+                    y = y - popHeight;
+                }
+                popupWindow.showAsDropDown(view, x, y, Gravity.TOP | Gravity.START);
+            }
+        });
+
+    }
+
+    private void loadMutedMember() {
+        presenter.loadMutedMembers(groupInfo.getId(), new IUIKitCallback<List<GroupMemberInfo>>() {
+            @Override
+            public void onSuccess(List<GroupMemberInfo> data) {
+                mutedMemberAdapter.setGroupMemberInfoList(data);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage(errCode + ", " + errMsg);
+            }
+        });
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 1 && data != null) {
+            List<String> selectedList = data.getStringArrayListExtra(TUIGroupConstants.Selection.LIST);
+            if (selectedList != null && !selectedList.isEmpty()) {
+                for (String userId : selectedList) {
+                    presenter.muteGroupMember(groupInfo.getId(), userId, new IUIKitCallback<Void>() {
+                        @Override
+                        public void onSuccess(Void data) {
+                            loadMutedMember();
+                        }
+
+                        @Override
+                        public void onError(String module, int errCode, String errMsg) {
+                            ToastUtil.toastShortMessage(errCode + ", " + errMsg);
+                        }
+                    });
+                }
+            }
+        }
+    }
+
+    class MutedMemberAdapter extends RecyclerView.Adapter<MutedMemberAdapter.MutedMemberViewHolder> {
+
+        private List<GroupMemberInfo> groupMemberInfoList;
+
+        private SetGroupManagerActivity.OnItemLongClickListener onItemLongClickListener;
+
+        public void setOnItemLongClickListener(SetGroupManagerActivity.OnItemLongClickListener onItemLongClickListener) {
+            this.onItemLongClickListener = onItemLongClickListener;
+        }
+
+        public void onItemRemoved(GroupMemberInfo memberInfo) {
+            int index = groupMemberInfoList.indexOf(memberInfo);
+            groupMemberInfoList.remove(memberInfo);
+            notifyItemRemoved(index);
+        }
+
+        public void setGroupMemberInfoList(List<GroupMemberInfo> groupMemberInfoList) {
+            this.groupMemberInfoList = groupMemberInfoList;
+            notifyDataSetChanged();
+        }
+
+        public List<GroupMemberInfo> getGroupMemberInfoList() {
+            return groupMemberInfoList;
+        }
+
+        @NonNull
+        @Override
+        public MutedMemberViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            View itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.group_manager_item, parent, false);
+            return new MutedMemberViewHolder(itemView);
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull MutedMemberViewHolder holder, int position) {
+            GroupMemberInfo groupMemberInfo = groupMemberInfoList.get(position);
+            holder.itemView.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    if (onItemLongClickListener != null) {
+                        onItemLongClickListener.onClick(v, groupMemberInfo, position);
+                    }
+                    return false;
+                }
+            });
+            String displayName = getDisplayName(groupMemberInfo);
+            holder.managerName.setText(displayName);
+            GlideEngine.loadUserIcon(holder.faceIcon, groupMemberInfo.getIconUrl());
+        }
+
+        @Override
+        public int getItemCount() {
+            if (groupMemberInfoList == null || groupMemberInfoList.isEmpty()) {
+                return 0;
+            }
+            return groupMemberInfoList.size();
+        }
+
+        class MutedMemberViewHolder extends RecyclerView.ViewHolder {
+            ShadeImageView faceIcon;
+            TextView managerName;
+            public MutedMemberViewHolder(@NonNull View itemView) {
+                super(itemView);
+                faceIcon = itemView.findViewById(R.id.group_manager_face);
+                managerName = itemView.findViewById(R.id.group_manage_name);
+            }
+        }
+    }
+
+    private String getDisplayName(GroupMemberInfo groupMemberInfo) {
+        String displayName = groupMemberInfo.getNameCard();
+        if (TextUtils.isEmpty(displayName)) {
+            displayName = groupMemberInfo.getNickName();
+        }
+        if (TextUtils.isEmpty(displayName)) {
+            displayName = groupMemberInfo.getAccount();
+        }
+        return displayName;
+    }
+
+    interface OnItemLongClickListener {
+        void onClick(View view, GroupMemberInfo groupMemberInfo);
+    }
+
+}
\ No newline at end of file
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/page/SetGroupManagerActivity.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/page/SetGroupManagerActivity.java
new file mode 100644
index 0000000..492de51
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/page/SetGroupManagerActivity.java
@@ -0,0 +1,288 @@
+package com.tencent.qcloud.tuikit.tuigroup.classicui.page;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.content.Intent;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.PopupWindow;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.component.CustomLinearLayoutManager;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.gatherimage.ShadeImageView;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupConstants;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuigroup.presenter.GroupManagerPresenter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SetGroupManagerActivity extends BaseLightActivity {
+    private TitleBarLayout titleBarLayout;
+    private TextView managerCountLabel;
+
+    private GroupManagerPresenter presenter;
+    private GroupInfo groupInfo;
+    private RecyclerView managerList;
+    private ManagerAdapter managerAdapter;
+    private ShadeImageView ownerFace;
+    private TextView ownerName;
+    private View setManagerView;
+    private String ownerID;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_set_group_manager);
+        titleBarLayout = findViewById(R.id.set_group_manager_title_bar);
+        managerCountLabel = findViewById(R.id.set_group_manager_manager_label);
+        managerList = findViewById(R.id.set_group_manager_manager_list);
+        ownerFace = findViewById(R.id.set_group_manager_owner_face);
+        ownerName = findViewById(R.id.set_group_manager_owner_name);
+        setManagerView = findViewById(R.id.set_group_manager_add_manager);
+
+        titleBarLayout.setTitle(getString(R.string.group_set_manager), ITitleBarLayout.Position.MIDDLE);
+        managerList.setLayoutManager(new CustomLinearLayoutManager(this));
+        managerAdapter = new ManagerAdapter();
+        managerList.setAdapter(managerAdapter);
+        groupInfo = (GroupInfo) getIntent().getSerializableExtra(TUIGroupConstants.Group.GROUP_INFO);
+
+        presenter = new GroupManagerPresenter();
+
+        setClickListener();
+        loadGroupManager();
+        loadGroupOwner();
+    }
+
+    private void loadGroupManager() {
+        presenter.loadGroupManager(groupInfo.getId(), new IUIKitCallback<List<GroupMemberInfo>>() {
+            @Override
+            public void onSuccess(List<GroupMemberInfo> data) {
+                if (data != null) {
+                    managerCountLabel.setText(getString(R.string.group_add_manager_count_label, data.size()));
+                    managerAdapter.setGroupMemberInfoList(data);
+                }
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+
+            }
+        });
+    }
+
+    private void loadGroupOwner() {
+        presenter.loadGroupOwner(groupInfo.getId(), new IUIKitCallback<GroupMemberInfo>() {
+            @Override
+            public void onSuccess(GroupMemberInfo data) {
+                ownerID = data.getAccount();
+                String faceUrl = data.getIconUrl();
+                String displayName = getDisplayName(data);
+                GlideEngine.loadUserIcon(ownerFace, faceUrl);
+                ownerName.setText(displayName);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+
+            }
+        });
+    }
+
+    private void setClickListener() {
+        titleBarLayout.getLeftIcon().setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
+        setManagerView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(SetGroupManagerActivity.this, GroupMemberActivity.class);
+                intent.putExtra(TUIConstants.TUIGroup.IS_SELECT_MODE, true);
+                ArrayList<String> selectedList = new ArrayList<>();
+                if (managerAdapter.getGroupMemberInfoList() != null) {
+                    for (GroupMemberInfo memberInfo : managerAdapter.getGroupMemberInfoList()) {
+                        selectedList.add(memberInfo.getAccount());
+                    }
+                    intent.putExtra(TUIConstants.TUIGroup.SELECTED_LIST, selectedList);
+                }
+                ArrayList<String> excludeList = new ArrayList<>();
+                excludeList.add(ownerID);
+                intent.putExtra(TUIConstants.TUIGroup.EXCLUDE_LIST, excludeList);
+                intent.putExtra(TUIConstants.TUIGroup.GROUP_ID, groupInfo.getId());
+                startActivityForResult(intent, 1);
+            }
+        });
+
+        managerAdapter.setOnItemLongClickListener(new OnItemLongClickListener() {
+            @Override
+            public void onClick(View view, GroupMemberInfo memberInfo, int position) {
+                Drawable drawable = view.getBackground();
+                if (drawable != null) {
+                    drawable.setColorFilter(0xd9d9d9, PorterDuff.Mode.SRC_IN);
+                }
+                View itemPop = LayoutInflater.from(SetGroupManagerActivity.this).inflate(R.layout.group_manager_pop_menu, null);
+                PopupWindow popupWindow = new PopupWindow(itemPop, WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT);
+                popupWindow.setBackgroundDrawable(new ColorDrawable());
+                popupWindow.setOutsideTouchable(true);
+                popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+                    @Override
+                    public void onDismiss() {
+                        if (drawable != null) {
+                            drawable.clearColorFilter();
+                        }
+                    }
+                });
+                TextView popText = itemPop.findViewById(R.id.pop_text);
+                popText.setText(R.string.group_remove_manager_label);
+                popText.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        popupWindow.dismiss();
+                        presenter.clearGroupManager(groupInfo.getId(), memberInfo.getAccount(), new IUIKitCallback<Void>() {
+                            @Override
+                            public void onSuccess(Void data) {
+                                loadGroupManager();
+                            }
+
+                            @Override
+                            public void onError(String module, int errCode, String errMsg) {
+
+                            }
+                        });
+                    }
+                });
+                int x = view.getWidth() / 2;
+                int y = - view.getHeight() / 3;
+                int popHeight = ScreenUtil.dip2px(45) * 3;
+                if (y + popHeight + view.getY() + view.getHeight() > managerList.getBottom()) {
+                    y = y - popHeight;
+                }
+                popupWindow.showAsDropDown(view, x, y, Gravity.TOP | Gravity.START);
+            }
+        });
+
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 1 && data != null) {
+            List<String> selectedList = data.getStringArrayListExtra(TUIGroupConstants.Selection.LIST);
+            if (selectedList != null && !selectedList.isEmpty()) {
+                for (String userId : selectedList) {
+                    presenter.setGroupManager(groupInfo.getId(), userId, new IUIKitCallback<Void>() {
+                        @Override
+                        public void onSuccess(Void data) {
+                            loadGroupManager();
+                        }
+
+                        @Override
+                        public void onError(String module, int errCode, String errMsg) {
+                            ToastUtil.toastShortMessage(errCode + ", " + errMsg);
+                        }
+                    });
+                }
+            }
+        }
+    }
+
+    class ManagerAdapter extends RecyclerView.Adapter<ManagerAdapter.ManagerViewHolder> {
+
+        private List<GroupMemberInfo> groupMemberInfoList;
+
+        private OnItemLongClickListener onItemLongClickListener;
+
+        public void setOnItemLongClickListener(OnItemLongClickListener onItemLongClickListener) {
+            this.onItemLongClickListener = onItemLongClickListener;
+        }
+
+        public void setGroupMemberInfoList(List<GroupMemberInfo> groupMemberInfoList) {
+            this.groupMemberInfoList = groupMemberInfoList;
+            notifyDataSetChanged();
+        }
+
+        public List<GroupMemberInfo> getGroupMemberInfoList() {
+            return groupMemberInfoList;
+        }
+
+        @NonNull
+        @Override
+        public ManagerAdapter.ManagerViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            View itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.group_manager_item, parent, false);
+            return new ManagerViewHolder(itemView);
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull ManagerViewHolder holder, int position) {
+            GroupMemberInfo groupMemberInfo = groupMemberInfoList.get(position);
+            holder.itemView.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    if (onItemLongClickListener != null) {
+                        onItemLongClickListener.onClick(v, groupMemberInfo, position);
+                    }
+                    return true;
+                }
+            });
+            String displayName = getDisplayName(groupMemberInfo);
+            holder.managerName.setText(displayName);
+            GlideEngine.loadUserIcon(holder.faceIcon, groupMemberInfo.getIconUrl());
+        }
+
+        @Override
+        public int getItemCount() {
+            if (groupMemberInfoList == null || groupMemberInfoList.isEmpty()) {
+                return 0;
+            }
+            return groupMemberInfoList.size();
+        }
+
+        class ManagerViewHolder extends RecyclerView.ViewHolder {
+            ShadeImageView faceIcon;
+            TextView managerName;
+            public ManagerViewHolder(@NonNull View itemView) {
+                super(itemView);
+                faceIcon = itemView.findViewById(R.id.group_manager_face);
+                managerName = itemView.findViewById(R.id.group_manage_name);
+            }
+        }
+    }
+
+    private String getDisplayName(GroupMemberInfo groupMemberInfo) {
+        String displayName = groupMemberInfo.getNameCard();
+        if (TextUtils.isEmpty(displayName)) {
+            displayName = groupMemberInfo.getNickName();
+        }
+        if (TextUtils.isEmpty(displayName)) {
+            displayName = groupMemberInfo.getAccount();
+        }
+        return displayName;
+    }
+
+    interface OnItemLongClickListener {
+        void onClick(View view, GroupMemberInfo groupMemberInfo, int position);
+    }
+}
\ No newline at end of file
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/view/GroupApplyAdapter.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/view/GroupApplyAdapter.java
new file mode 100644
index 0000000..169b263
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/view/GroupApplyAdapter.java
@@ -0,0 +1,170 @@
+package com.tencent.qcloud.tuikit.tuigroup.classicui.view;
+
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupService;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupApplyInfo;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.presenter.GroupApplyPresenter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class GroupApplyAdapter extends BaseAdapter {
+
+    private List<GroupApplyInfo> mGroupMembers = new ArrayList<>();
+    private OnItemClickListener mOnItemClickListener;
+    private GroupApplyPresenter presenter;
+
+    public GroupApplyAdapter() {
+
+    }
+
+    public void setPresenter(GroupApplyPresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    @Override
+    public int getCount() {
+        return mGroupMembers.size();
+    }
+
+    public int getUnHandledSize() {
+        int total = 0;
+        for (GroupApplyInfo i : mGroupMembers) {
+            if (i.getStatus() == GroupApplyInfo.UNHANDLED) {
+                total++;
+            }
+        }
+        return total;
+    }
+
+    @Override
+    public GroupApplyInfo getItem(int i) {
+        return mGroupMembers.get(i);
+    }
+
+    @Override
+    public long getItemId(int i) {
+        return 0;
+    }
+
+    @Override
+    public View getView(final int i, View view, ViewGroup viewGroup) {
+        MyViewHolder holder;
+        final GroupApplyInfo info = getItem(i);
+        if (view == null) {
+            view = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.group_member_apply_adpater, viewGroup, false);
+            view.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (mOnItemClickListener != null && info.getStatus() == GroupApplyInfo.UNHANDLED) {
+                        mOnItemClickListener.onItemClick(info);
+                    }
+                }
+            });
+            holder = new MyViewHolder();
+            holder.memberIcon = view.findViewById(R.id.group_apply_member_icon);
+            holder.memberName = view.findViewById(R.id.group_apply_member_name);
+            holder.reason = view.findViewById(R.id.group_apply_reason);
+            holder.accept = view.findViewById(R.id.group_apply_accept);
+            holder.refuse = view.findViewById(R.id.group_apply_refuse);
+            view.setTag(holder);
+        } else {
+            holder = (MyViewHolder) view.getTag();
+        }
+        holder.memberName.setText(info.getGroupApplication().getFromUser());
+        holder.reason.setText(info.getGroupApplication().getRequestMsg());
+        if (info.getStatus() == GroupApplyInfo.UNHANDLED) {
+            holder.accept.setVisibility(View.VISIBLE);
+            holder.accept.setText(R.string.accept);
+            holder.accept.setBackground(TUIGroupService.getAppContext().getResources().getDrawable(R.color.bg_positive_btn));
+            holder.accept.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    acceptApply(i, info);
+                }
+            });
+            holder.refuse.setVisibility(View.VISIBLE);
+            holder.refuse.setText(R.string.refuse);
+            holder.refuse.setBackground(TUIGroupService.getAppContext().getResources().getDrawable(R.color.bg_negative_btn));
+            holder.refuse.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    refuseApply(i, info);
+                }
+            });
+        } else if (info.getStatus() == GroupApplyInfo.APPLIED) {
+            holder.accept.setVisibility(View.VISIBLE);
+            holder.accept.setClickable(false);
+            holder.accept.setText(R.string.accepted);
+            holder.accept.setBackground(TUIGroupService.getAppContext().getResources().getDrawable(R.drawable.gray_btn_bg));
+            holder.refuse.setVisibility(View.GONE);
+        } else if (info.getStatus() == GroupApplyInfo.REFUSED) {
+            holder.refuse.setVisibility(View.VISIBLE);
+            holder.refuse.setClickable(false);
+            holder.refuse.setText(R.string.refused);
+            holder.refuse.setBackground(TUIGroupService.getAppContext().getResources().getDrawable(R.drawable.gray_btn_bg));
+            holder.accept.setVisibility(View.GONE);
+        }
+
+        return view;
+    }
+
+    public void setOnItemClickListener(OnItemClickListener l) {
+        mOnItemClickListener = l;
+    }
+
+    public void updateItemData(GroupApplyInfo info) {
+        for (GroupApplyInfo i : mGroupMembers) {
+            if (TextUtils.equals(i.getGroupApplication().getFromUser(), info.getGroupApplication().getFromUser())) {
+                i.setStatus(info.getStatus());
+                notifyDataSetChanged();
+                break;
+            }
+        }
+    }
+
+    public void setDataSource(GroupInfo info) {
+        presenter.loadGroupApplies();
+    }
+
+    public void setDataSource(List<GroupApplyInfo> applyInfoList) {
+        mGroupMembers = applyInfoList;
+        notifyDataSetChanged();
+    }
+
+    public void acceptApply(final int position, final GroupApplyInfo item) {
+        if (presenter == null) {
+            return;
+        }
+        presenter.acceptApply(item);
+    }
+
+    public void refuseApply(final int position, final GroupApplyInfo item) {
+        if (presenter == null) {
+            return;
+        }
+        presenter.refuseApply(item);
+    }
+
+    public interface OnItemClickListener {
+        void onItemClick(GroupApplyInfo info);
+    }
+
+    private class MyViewHolder {
+        private ImageView memberIcon;
+        private TextView memberName, reason;
+        private Button accept, refuse;
+    }
+
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/view/GroupApplyManagerLayout.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/view/GroupApplyManagerLayout.java
new file mode 100644
index 0000000..ae0f4ad
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/view/GroupApplyManagerLayout.java
@@ -0,0 +1,110 @@
+package com.tencent.qcloud.tuikit.tuigroup.classicui.view;
+
+import android.app.Activity;
+import android.content.Context;
+
+import androidx.annotation.Nullable;
+
+import android.os.Bundle;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupConstants;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupApplyInfo;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.interfaces.IGroupApplyLayout;
+import com.tencent.qcloud.tuikit.tuigroup.presenter.GroupApplyPresenter;
+
+import java.util.HashMap;
+import java.util.List;
+
+
+public class GroupApplyManagerLayout extends LinearLayout implements IGroupApplyLayout {
+
+    private TitleBarLayout mTitleBar;
+    private ListView mApplyMemberList;
+    private GroupApplyAdapter mAdapter;
+
+    private GroupApplyPresenter presenter;
+    public GroupApplyManagerLayout(Context context) {
+        super(context);
+        init();
+    }
+
+    public GroupApplyManagerLayout(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public GroupApplyManagerLayout(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private void init() {
+        inflate(getContext(), R.layout.group_apply_manager_layout, this);
+        mApplyMemberList = findViewById(R.id.group_apply_members);
+        mAdapter = new GroupApplyAdapter();
+        mAdapter.setOnItemClickListener(new GroupApplyAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(GroupApplyInfo info) {
+                Bundle bundle = new Bundle();
+                bundle.putString("fromUser", info.getFromUser());
+                bundle.putString("fromUserNickName", info.getFromUserNickName());
+                bundle.putString("requestMsg", info.getRequestMsg());
+                bundle.putSerializable("groupApplication", info.getGroupApplication());
+                TUICore.startActivity(getContext(),"FriendProfileActivity", bundle, TUIGroupConstants.ActivityRequest.CODE_1);
+            }
+        });
+        mApplyMemberList.setAdapter(mAdapter);
+        mTitleBar = findViewById(R.id.group_apply_title_bar);
+        mTitleBar.getRightGroup().setVisibility(View.GONE);
+        mTitleBar.setTitle(getResources().getString(R.string.group_apply_members), ITitleBarLayout.Position.MIDDLE);
+        mTitleBar.setOnLeftClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (getContext() instanceof Activity) {
+                    ((Activity) getContext()).finish();
+                }
+            }
+        });
+    }
+
+    public TitleBarLayout getTitleBar() {
+        return mTitleBar;
+    }
+
+    public void updateItemData(GroupApplyInfo info) {
+        mAdapter.updateItemData(info);
+    }
+
+    public void onDataSetChanged() {
+        mAdapter.notifyDataSetChanged();
+
+        HashMap<String, Object> param = new HashMap<>();
+        param.put(TUIConstants.TUIChat.IS_GROUP_CHAT, true);
+        param.put(TUIConstants.TUIChat.GROUP_APPLY_NUM, mAdapter.getCount()-1);
+        TUICore.callService(TUIConstants.TUIChat.SERVICE_NAME, TUIConstants.TUIChat.METHOD_GROUP_APPLICAITON_PROCESSED, param);
+    }
+
+    public void setPresenter(GroupApplyPresenter groupApplyPresenter) {
+        this.presenter = groupApplyPresenter;
+        mAdapter.setPresenter(groupApplyPresenter);
+    }
+
+    public void onGroupApplyInfoListChanged(List<GroupApplyInfo> applyInfoList) {
+        mAdapter.setDataSource(applyInfoList);
+    }
+
+    public void setDataSource(GroupInfo dataSource) {
+        presenter.setGroupInfo(dataSource);
+        mAdapter.setDataSource(dataSource);
+    }
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/view/GroupInfoAdapter.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/view/GroupInfoAdapter.java
new file mode 100644
index 0000000..650fecf
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/view/GroupInfoAdapter.java
@@ -0,0 +1,213 @@
+package com.tencent.qcloud.tuikit.tuigroup.classicui.view;
+
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.util.BackgroundTasks;
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuigroup.classicui.interfaces.IGroupMemberListener;
+import com.tencent.qcloud.tuikit.tuigroup.presenter.GroupInfoPresenter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class GroupInfoAdapter extends BaseAdapter {
+
+    private static final int ADD_TYPE = -100;
+    private static final int DEL_TYPE = -101;
+    private static final int OWNER_PRIVATE_MAX_LIMIT = 8;  //讨论组,owner可以添加成员和删除成员，
+    private static final int OWNER_PUBLIC_MAX_LIMIT = 9;   //公开群,owner不可以添加成员，但是可以删除成员
+    private static final int OWNER_CHATROOM_MAX_LIMIT = 9; //聊天室,owner不可以添加成员，但是可以删除成员
+    private static final int OWNER_COMMUNITY_MAX_LIMIT = 8; //社群,owner可以添加成员和删除成员，
+    private static final int NORMAL_PRIVATE_MAX_LIMIT = 9; //讨论组,普通人可以添加成员
+    private static final int NORMAL_PUBLIC_MAX_LIMIT = 10;  //公开群,普通人没有权限添加成员和删除成员
+    private static final int NORMAL_CHATROOM_MAX_LIMIT = 10; //聊天室,普通人没有权限添加成员和删除成员
+    private static final int NORMAL_COMMUNITY_MAX_LIMIT = 9; //社群,普通人可以添加成员
+
+    private List<GroupMemberInfo> mGroupMembers = new ArrayList<>();
+    private IGroupMemberListener mTailListener;
+    private GroupInfo mGroupInfo;
+
+    private GroupInfoPresenter presenter;
+
+    public void setPresenter(GroupInfoPresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    public void setManagerCallBack(IGroupMemberListener listener) {
+        mTailListener = listener;
+    }
+
+    @Override
+    public int getCount() {
+        return mGroupMembers.size();
+    }
+
+    @Override
+    public GroupMemberInfo getItem(int i) {
+        return mGroupMembers.get(i);
+    }
+
+    @Override
+    public long getItemId(int i) {
+        return 0;
+    }
+
+    @Override
+    public View getView(final int i, View view, final ViewGroup viewGroup) {
+        MyViewHolder holder;
+        if (view == null) {
+            view = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.group_member_item_layout, viewGroup, false);
+            holder = new MyViewHolder();
+            holder.memberIcon = view.findViewById(R.id.group_member_icon);
+            holder.memberName = view.findViewById(R.id.group_member_name);
+            view.setTag(holder);
+        } else {
+            holder = (MyViewHolder) view.getTag();
+        }
+        final GroupMemberInfo info = getItem(i);
+        GlideEngine.loadImage(holder.memberIcon, info.getIconUrl());
+        // 显示优先级 群名片->昵称->账号
+        if (!TextUtils.isEmpty(info.getNameCard())) {
+            holder.memberName.setText(info.getNameCard());
+        } else {
+            if (!TextUtils.isEmpty(info.getNickName())) {
+                holder.memberName.setText(info.getNickName());
+            } else {
+                if (!TextUtils.isEmpty(info.getAccount())) {
+                    holder.memberName.setText(info.getAccount());
+                } else {
+                    holder.memberName.setText("");
+                }
+            }
+        }
+        view.setOnClickListener(null);
+        holder.memberIcon.setBackground(null);
+        holder.memberIcon.setScaleType(ImageView.ScaleType.CENTER_CROP);
+        if (info.getMemberType() == ADD_TYPE) {
+            holder.memberIcon.setImageResource(R.drawable.add_group_member);
+            holder.memberIcon.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
+            holder.memberIcon.setBackgroundResource(R.drawable.bottom_action_border);
+            view.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (mTailListener != null) {
+                        mTailListener.forwardAddMember(mGroupInfo);
+                    }
+                }
+            });
+        } else if (info.getMemberType() == DEL_TYPE) {
+            holder.memberIcon.setImageResource(R.drawable.del_group_member);
+            holder.memberIcon.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
+            holder.memberIcon.setBackgroundResource(R.drawable.bottom_action_border);
+            view.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (mTailListener != null) {
+                        mTailListener.forwardDeleteMember(mGroupInfo);
+                    }
+                }
+            });
+        }
+        return view;
+    }
+
+    public void setDataSource(GroupInfo info) {
+        mGroupInfo = info;
+        mGroupMembers.clear();
+        List<GroupMemberInfo> members = info.getMemberDetails();
+        if (members != null) {
+            int shootMemberCount = 0;
+            if (TextUtils.equals(info.getGroupType(), TUIConstants.GroupType.TYPE_PRIVATE)
+                    || TextUtils.equals(info.getGroupType(), TUIConstants.GroupType.TYPE_WORK)) {
+                if (info.isOwner()) {
+                    shootMemberCount = members.size() > OWNER_PRIVATE_MAX_LIMIT ? OWNER_PRIVATE_MAX_LIMIT : members.size();
+                } else {
+                    shootMemberCount = members.size() > NORMAL_PRIVATE_MAX_LIMIT ? NORMAL_PRIVATE_MAX_LIMIT : members.size();
+                }
+            } else if (TextUtils.equals(info.getGroupType(), TUIConstants.GroupType.TYPE_PUBLIC)) {
+                if (info.isOwner()) {
+                    shootMemberCount = members.size() > OWNER_PUBLIC_MAX_LIMIT ? OWNER_PUBLIC_MAX_LIMIT : members.size();
+                } else {
+                    shootMemberCount = members.size() > NORMAL_PUBLIC_MAX_LIMIT ? NORMAL_PUBLIC_MAX_LIMIT : members.size();
+                }
+            } else if (TextUtils.equals(info.getGroupType(), TUIConstants.GroupType.TYPE_CHAT_ROOM)
+                    || TextUtils.equals(info.getGroupType(), TUIConstants.GroupType.TYPE_MEETING)) {
+                if (info.isOwner()) {
+                    shootMemberCount = members.size() > OWNER_CHATROOM_MAX_LIMIT ? OWNER_CHATROOM_MAX_LIMIT : members.size();
+                } else {
+                    shootMemberCount = members.size() > NORMAL_CHATROOM_MAX_LIMIT ? NORMAL_CHATROOM_MAX_LIMIT : members.size();
+                }
+            } else if (TextUtils.equals(info.getGroupType(), TUIConstants.GroupType.TYPE_COMMUNITY)) {
+                if (info.isOwner()) {
+                    shootMemberCount = members.size() > OWNER_COMMUNITY_MAX_LIMIT ? OWNER_COMMUNITY_MAX_LIMIT : members.size();
+                } else {
+                    shootMemberCount = members.size() > NORMAL_COMMUNITY_MAX_LIMIT ? NORMAL_COMMUNITY_MAX_LIMIT : members.size();
+                }
+            }
+
+            for (int i = 0; i < shootMemberCount; i++) {
+                mGroupMembers.add(members.get(i));
+            }
+            if (TextUtils.equals(info.getGroupType(), TUIConstants.GroupType.TYPE_PRIVATE)
+                    || TextUtils.equals(info.getGroupType(), TUIConstants.GroupType.TYPE_WORK)
+                    || TextUtils.equals(info.getGroupType(), TUIConstants.GroupType.TYPE_COMMUNITY)) {
+                // 公开群/聊天室 只有APP管理员可以邀请他人入群
+                GroupMemberInfo add = new GroupMemberInfo();
+                add.setMemberType(ADD_TYPE);
+                mGroupMembers.add(add);
+            }
+            GroupMemberInfo self = null;
+            for (int i = 0; i < mGroupMembers.size(); i++) {
+                GroupMemberInfo memberInfo = mGroupMembers.get(i);
+                if (isSelf(memberInfo.getAccount())) {
+                    self = memberInfo;
+                    break;
+                }
+            }
+            if (info.isOwner() || (self != null && isAdmin(self.getMemberType()))) {
+                GroupMemberInfo del = new GroupMemberInfo();
+                del.setMemberType(DEL_TYPE);
+                mGroupMembers.add(del);
+            }
+            BackgroundTasks.getInstance().runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    notifyDataSetChanged();
+                }
+            });
+        }
+
+    }
+
+    public boolean isAdmin(int memberType) {
+        if (presenter != null) {
+            return presenter.isAdmin(memberType);
+        }
+        return false;
+    }
+
+    public boolean isSelf(String userId) {
+        if (presenter != null) {
+            return presenter.isSelf(userId);
+        }
+        return false;
+    }
+
+    private class MyViewHolder {
+        private ImageView memberIcon;
+        private TextView memberName;
+    }
+
+
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/view/GroupInfoLayout.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/view/GroupInfoLayout.java
new file mode 100644
index 0000000..c712489
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/view/GroupInfoLayout.java
@@ -0,0 +1,680 @@
+package com.tencent.qcloud.tuikit.tuigroup.classicui.view;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CompoundButton;
+import android.widget.GridView;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.component.LineControllerView;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.SelectionActivity;
+import com.tencent.qcloud.tuicore.component.dialog.TUIKitDialog;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.component.popupcard.PopupInputCard;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuicore.util.TUIUtil;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupConstants;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupService;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.classicui.interfaces.IGroupMemberListener;
+import com.tencent.qcloud.tuikit.tuigroup.classicui.page.GroupInfoActivity;
+import com.tencent.qcloud.tuikit.tuigroup.classicui.page.GroupInfoFragment;
+import com.tencent.qcloud.tuikit.tuigroup.classicui.page.GroupMemberActivity;
+import com.tencent.qcloud.tuikit.tuigroup.classicui.page.GroupNoticeActivity;
+import com.tencent.qcloud.tuikit.tuigroup.classicui.page.ManageGroupActivity;
+import com.tencent.qcloud.tuikit.tuigroup.component.BottomSelectSheet;
+import com.tencent.qcloud.tuikit.tuigroup.interfaces.IGroupMemberLayout;
+import com.tencent.qcloud.tuikit.tuigroup.presenter.GroupInfoPresenter;
+import com.tencent.qcloud.tuikit.tuigroup.util.TUIGroupLog;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+public class GroupInfoLayout extends LinearLayout implements IGroupMemberLayout, View.OnClickListener {
+
+    private static final String TAG = GroupInfoLayout.class.getSimpleName();
+    private TitleBarLayout mTitleBar;
+    private LineControllerView mMemberView;
+    private GroupInfoAdapter mMemberAdapter;
+    private IGroupMemberListener mMemberPreviewListener;
+    private LineControllerView mGroupTypeView;
+    private TextView mGroupIDView;
+    private TextView mGroupNameView;
+    private View groupDetailArea;
+    private ImageView mGroupIcon;
+    private ImageView mGroupDetailArrow;
+    private View mGroupNotice;
+    private TextView mGroupNoticeText;
+    private LineControllerView mGroupManageView;
+    private LineControllerView mNickView;
+    private LineControllerView mJoinTypeView;
+    private LineControllerView mTopSwitchView;
+    private LineControllerView mMsgRevOptionSwitchView;
+    private LineControllerView mFoldGroupChatSwitchView;
+    private LineControllerView mChatBackground;
+    private View mLayoutFold;
+    private TextView mDissolveBtn;
+    private TextView mClearMsgBtn;
+    private TextView mChangeOwnerBtn;
+    private GridView memberList;
+
+    private OnButtonClickListener mListener;
+
+    private GroupInfo mGroupInfo;
+    private GroupInfoPresenter mPresenter;
+    private ArrayList<String> mJoinTypes = new ArrayList<>();
+    private GroupInfoFragment.OnModifyGroupAvatarListener onModifyGroupAvatarListener;
+    public GroupInfoLayout(Context context) {
+        super(context);
+        init();
+    }
+
+    public GroupInfoLayout(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public GroupInfoLayout(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private void init() {
+        inflate(getContext(), R.layout.group_info_layout, this);
+        // 标题
+        mTitleBar = findViewById(R.id.group_info_title_bar);
+        mTitleBar.getRightGroup().setVisibility(GONE);
+        mTitleBar.setTitle(getResources().getString(R.string.group_detail), ITitleBarLayout.Position.MIDDLE);
+        mTitleBar.setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                ((Activity) getContext()).finish();
+            }
+        });
+
+        // 成员标题
+        mMemberView = findViewById(R.id.group_member_bar);
+        mMemberView.setOnClickListener(this);
+        mMemberView.setCanNav(true);
+        // 成员列表
+        memberList = findViewById(R.id.group_members);
+        mMemberAdapter = new GroupInfoAdapter();
+        memberList.setAdapter(mMemberAdapter);
+        // 群类型，只读
+        mGroupTypeView = findViewById(R.id.group_type_bar);
+        // 群ID，只读
+        mGroupIDView = findViewById(R.id.group_account);
+        // 群聊名称
+        mGroupNameView = findViewById(R.id.group_name);
+
+        groupDetailArea = findViewById(R.id.group_detail_area);
+        groupDetailArea.setOnClickListener(this);
+        // 群头像
+        mGroupIcon = findViewById(R.id.group_icon);
+        mGroupIcon.setOnClickListener(this);
+
+        // 群详情右箭头
+        mGroupDetailArrow = findViewById(R.id.group_detail_arrow);
+
+        // 群公告
+        mGroupNotice = findViewById(R.id.group_notice);
+        mGroupNotice.setOnClickListener(this);
+        mGroupNoticeText = findViewById(R.id.group_notice_text);
+        // 群管理
+        mGroupManageView = findViewById(R.id.group_manage);
+        mGroupManageView.setOnClickListener(this);
+
+        // 加群方式
+        mJoinTypeView = findViewById(R.id.join_type_bar);
+        mJoinTypeView.setOnClickListener(this);
+        mJoinTypeView.setCanNav(true);
+        mJoinTypes.addAll(Arrays.asList(getResources().getStringArray(R.array.group_join_type)));
+        // 群昵称
+        mNickView = findViewById(R.id.self_nickname_bar);
+        mNickView.setOnClickListener(this);
+        mNickView.setCanNav(true);
+        // 是否置顶
+        mTopSwitchView = findViewById(R.id.chat_to_top_switch);
+        mTopSwitchView.setCheckListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(final CompoundButton buttonView, boolean isChecked) {
+                if (mGroupInfo == null) {
+                    return;
+                }
+                mPresenter.setTopConversation(mGroupInfo.getId(), isChecked, new IUIKitCallback<Void>() {
+                    @Override
+                    public void onSuccess(Void data) {
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        ToastUtil.toastShortMessage(module + ", Error code = " + errCode + ", desc = " + errMsg);
+                        buttonView.setChecked(false);
+                    }
+                });
+            }
+        });
+        // 消息接收选项
+        mMsgRevOptionSwitchView = findViewById(R.id.msg_rev_option);
+        // 折叠
+        mLayoutFold = findViewById(R.id.layout_fold);
+        mFoldGroupChatSwitchView = findViewById(R.id.fold_group_chat);
+
+        // 退群
+        mDissolveBtn = findViewById(R.id.group_dissolve_button);
+        mDissolveBtn.setOnClickListener(this);
+
+        // 清空群消息按钮
+        mClearMsgBtn = findViewById(R.id.group_clear_msg_button);
+        mClearMsgBtn.setOnClickListener(this);
+
+        // 转让群主
+        mChangeOwnerBtn = findViewById(R.id.group_change_owner_button);
+        mChangeOwnerBtn.setOnClickListener(this);
+
+        mChatBackground = findViewById(R.id.chat_background);
+        mChatBackground.setOnClickListener(this);
+        mChatBackground.setCanNav(true);
+    }
+
+    private void initView() {
+        int radius = ScreenUtil.dip2px(5);
+        GlideEngine.loadUserIcon(mGroupIcon, mGroupInfo.getFaceUrl(), TUIUtil.getDefaultGroupIconResIDByGroupType(getContext(), mGroupInfo.getGroupType()), radius);
+        if (!mGroupInfo.isCanManagerGroup()) {
+            mGroupDetailArrow.setVisibility(GONE);
+        }
+        if (mGroupInfo.isOwner()) {
+            mChangeOwnerBtn.setVisibility(VISIBLE);
+        } else {
+            mChangeOwnerBtn.setVisibility(GONE);
+        }
+    }
+
+    public void setGroupInfoPresenter(GroupInfoPresenter presenter) {
+        this.mPresenter = presenter;
+        if (mMemberAdapter != null) {
+            mMemberAdapter.setPresenter(presenter);
+        }
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (mGroupInfo == null) {
+            TUIGroupLog.e(TAG, "mGroupInfo is NULL");
+            return;
+        }
+        if (v.getId() == R.id.group_member_bar) {
+            if (mMemberPreviewListener != null) {
+                mMemberPreviewListener.forwardListMember(mGroupInfo);
+            }
+        } else if (v.getId() == R.id.group_detail_area) {
+            if (!mGroupInfo.isCanManagerGroup()) {
+                return;
+            }
+            PopupInputCard popupInputCard = new PopupInputCard((Activity) getContext());
+            BottomSelectSheet sheet = new BottomSelectSheet(getContext());
+            List<String> stringList = new ArrayList<>();
+            String modifyGroupName = getResources().getString(R.string.modify_group_name);
+            String modifyGroupNotice = getResources().getString(R.string.modify_group_notice);
+            stringList.add(modifyGroupName);
+            stringList.add(modifyGroupNotice);
+            sheet.setSelectList(stringList);
+            sheet.setOnClickListener(new BottomSelectSheet.BottomSelectSheetOnClickListener() {
+                @Override
+                public void onSheetClick(int index) {
+                    if (index == 0) {
+                        popupInputCard.setContent(mGroupNameView.getText().toString());
+                        popupInputCard.setTitle(modifyGroupName);
+                        popupInputCard.setOnPositive((result -> {
+                            mPresenter.modifyGroupName(result);
+                            if (!TextUtils.isEmpty(result)) {
+                                mGroupNameView.setText(result);
+                            }
+                        }));
+                        popupInputCard.show(groupDetailArea, Gravity.BOTTOM);
+                    } else if (index == 1) {
+                        popupInputCard.setContent(mGroupNoticeText.getText().toString());
+                        popupInputCard.setTitle(modifyGroupNotice);
+                        popupInputCard.setOnPositive((result -> {
+                            mPresenter.modifyGroupNotice(result);
+                            if (TextUtils.isEmpty(result)) {
+                                mGroupNoticeText.setText(getResources().getString(R.string.group_notice_empty_tip));
+                            } else {
+                                mGroupNoticeText.setText(result);
+                            }
+                        }));
+                        popupInputCard.show(groupDetailArea, Gravity.BOTTOM);
+                    }
+                }
+            });
+            sheet.show();
+        } else if (v.getId() == R.id.group_icon) {
+            if (!mGroupInfo.isCanManagerGroup()) {
+                return;
+            }
+
+            if (onModifyGroupAvatarListener != null) {
+                onModifyGroupAvatarListener.onModifyGroupAvatar(mGroupInfo.getFaceUrl());
+            }
+        } else if (v.getId() == R.id.group_notice) {
+            Intent intent = new Intent(getContext(), GroupNoticeActivity.class);
+            GroupNoticeActivity.setOnGroupNoticeChangedListener(new GroupNoticeActivity.OnGroupNoticeChangedListener() {
+                @Override
+                public void onChanged(String notice) {
+                    if (TextUtils.isEmpty(notice)) {
+                        mGroupNoticeText.setText(getResources().getString(R.string.group_notice_empty_tip));
+                    } else {
+                        mGroupNoticeText.setText(notice);
+                    }
+                }
+            });
+            intent.putExtra(TUIGroupConstants.Group.GROUP_INFO, mGroupInfo);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            getContext().startActivity(intent);
+        } else if (v.getId() == R.id.self_nickname_bar) {
+            PopupInputCard popupInputCard = new PopupInputCard((Activity) getContext());
+            popupInputCard.setContent(mNickView.getContent());
+            popupInputCard.setTitle(getResources().getString(R.string.modify_nick_name_in_goup));
+            String description = getResources().getString(R.string.group_modify_remark_rule);
+            popupInputCard.setRule("^[a-zA-Z0-9_\u4e00-\u9fa5]*$");
+            popupInputCard.setDescription(description);
+            popupInputCard.setOnPositive((result -> {
+                mPresenter.modifyMyGroupNickname(result);
+                mNickView.setContent(result);
+            }));
+            popupInputCard.show(mNickView, Gravity.BOTTOM);
+
+        } else if (v.getId() == R.id.join_type_bar) {
+            if (mGroupTypeView.getContent().equals(getContext().getString(R.string.chat_room))) {
+                ToastUtil.toastLongMessage(getContext().getString(R.string.chat_room_tip));
+                return;
+            }
+            Bundle bundle = new Bundle();
+            bundle.putString(SelectionActivity.Selection.TITLE, getResources().getString(R.string.group_join_type));
+            bundle.putStringArrayList(SelectionActivity.Selection.LIST, mJoinTypes);
+            bundle.putInt(SelectionActivity.Selection.DEFAULT_SELECT_ITEM_INDEX, mGroupInfo.getJoinType());
+            SelectionActivity.startListSelection((Activity) getContext(), bundle, new SelectionActivity.OnResultReturnListener() {
+                @Override
+                public void onReturn(final Object text) {
+                    mPresenter.modifyGroupInfo((Integer) text, TUIGroupConstants.Group.MODIFY_GROUP_JOIN_TYPE);
+                }
+            });
+        } else if (v.getId() == R.id.group_dissolve_button) {
+            if (mGroupInfo.isOwner() &&
+                    (!mGroupInfo.getGroupType().equals(TUIConstants.GroupType.TYPE_WORK)
+                            && !mGroupInfo.getGroupType().equals(TUIConstants.GroupType.TYPE_PRIVATE))) {
+                new TUIKitDialog(getContext())
+                        .builder()
+                        .setCancelable(true)
+                        .setCancelOutside(true)
+                        .setTitle(getContext().getString(R.string.dismiss_group_tip))
+                        .setDialogWidth(0.75f)
+                        .setPositiveButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.sure), new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                mPresenter.deleteGroup(new IUIKitCallback<Void>() {
+                                    @Override
+                                    public void onSuccess(Void data) {
+                                        ((Activity) GroupInfoLayout.this.getContext()).finish();
+                                    }
+
+                                    @Override
+                                    public void onError(String module, int errCode, String errMsg) {
+                                        ToastUtil.toastLongMessage(errMsg);
+                                    }
+                                });
+                            }
+                        })
+                        .setNegativeButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.cancel), new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+
+                            }
+                        })
+                        .show();
+            } else {
+                new TUIKitDialog(getContext())
+                        .builder()
+                        .setCancelable(true)
+                        .setCancelOutside(true)
+                        .setTitle(getContext().getString(R.string.quit_group_tip))
+                        .setDialogWidth(0.75f)
+                        .setPositiveButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.sure), new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                mPresenter.quitGroup(new IUIKitCallback<Void>() {
+                                    @Override
+                                    public void onSuccess(Void data) {
+                                        ((Activity) GroupInfoLayout.this.getContext()).finish();
+                                    }
+
+                                    @Override
+                                    public void onError(String module, int errCode, String errMsg) {
+                                        ((Activity) GroupInfoLayout.this.getContext()).finish();
+                                        ToastUtil.toastShortMessage("quitGroup failed, errCode =  " + errCode + " errMsg = " + errMsg);
+                                    }
+                                });
+                            }
+                        })
+                        .setNegativeButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.cancel), new View.OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+
+                            }
+                        })
+                        .show();
+            }
+        } else if (v.getId() == R.id.group_clear_msg_button) {
+            new TUIKitDialog(getContext())
+                    .builder()
+                    .setCancelable(true)
+                    .setCancelOutside(true)
+                    .setTitle(getContext().getString(R.string.clear_group_msg_tip))
+                    .setDialogWidth(0.75f)
+                    .setPositiveButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.sure), new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            Map<String, Object> hashMap = new HashMap<>();
+                            hashMap.put(TUIConstants.TUIGroup.GROUP_ID, mGroupInfo.getId());
+                            TUICore.notifyEvent(TUIConstants.TUIGroup.EVENT_GROUP,
+                                    TUIConstants.TUIGroup.EVENT_SUB_KEY_CLEAR_MESSAGE, hashMap);
+                        }
+                    })
+                    .setNegativeButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.cancel), new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+
+                        }
+                    })
+                    .show();
+        } else if (v.getId() == R.id.group_manage) {
+            Intent intent = new Intent(getContext(), ManageGroupActivity.class);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra(TUIGroupConstants.Group.GROUP_INFO, mGroupInfo);
+            getContext().startActivity(intent);
+        } else if (v == mChangeOwnerBtn) {
+            ArrayList<String> excludeList = new ArrayList<>();
+            excludeList.add(TUILogin.getLoginUser());
+            Intent intent = new Intent(getContext(), GroupMemberActivity.class);
+            intent.putExtra(TUIConstants.TUIGroup.IS_SELECT_MODE, true);
+            intent.putExtra(TUIConstants.TUIGroup.GROUP_ID, mGroupInfo.getId());
+            intent.putExtra(TUIConstants.TUIGroup.LIMIT, 1);
+            intent.putExtra(TUIConstants.TUIGroup.EXCLUDE_LIST, excludeList);
+            intent.putExtra(TUIConstants.TUIGroup.TITLE, getResources().getString(R.string.group_transfer_group_owner));
+            ((Activity) getContext()).startActivityForResult(intent, GroupInfoActivity.REQUEST_FOR_CHANGE_OWNER);
+        } else if (v.getId() == R.id.chat_background) {
+            if (mListener != null) {
+                mListener.onSetChatBackground();
+            }
+        }
+    }
+
+    public void loadGroupInfo(String groupId) {
+        mPresenter.loadGroupInfo(groupId);
+    }
+
+    public void getGroupMembers(GroupInfo groupInfo) {
+        mPresenter.getGroupMembers(groupInfo, new IUIKitCallback<GroupInfo>() {
+            @Override
+            public void onSuccess(GroupInfo data) {
+                setGroupInfo((GroupInfo) data);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+
+            }
+        });
+    }
+
+    public void setGroupInfo(GroupInfo info) {
+        if (info == null) {
+            return;
+        }
+        this.mGroupInfo = info;
+        mGroupNameView.setText(info.getGroupName());
+        mGroupIDView.setText(info.getId());
+        if (TextUtils.isEmpty(info.getNotice())) {
+            mGroupNoticeText.setText(getResources().getString(R.string.group_notice_empty_tip));
+        } else {
+            mGroupNoticeText.setText(info.getNotice());
+        }
+        mMemberView.setContent(info.getMemberCount() + "人");
+        mMemberAdapter.setDataSource(info);
+
+        int columnNum = memberList.getNumColumns();
+        int rowNum = (int) Math.ceil(mMemberAdapter.getCount() * 1.0f / columnNum);
+        int itemHeight = ScreenUtil.dip2px(88);
+        ViewGroup.LayoutParams layoutParams = memberList.getLayoutParams();
+        layoutParams.height = itemHeight * rowNum;
+        memberList.setLayoutParams(layoutParams);
+
+        mGroupTypeView.setContent(convertGroupText(info.getGroupType()));
+        mJoinTypeView.setContent(mJoinTypes.get(info.getJoinType()));
+        mNickView.setContent(mPresenter.getNickName());
+        mTopSwitchView.setChecked(mGroupInfo.isTopChat());
+
+        if (GroupInfo.GROUP_TYPE_MEETING.equals(info.getGroupType())) {
+            mMsgRevOptionSwitchView.setVisibility(GONE);
+            mLayoutFold.setVisibility(GONE);
+        } else {
+            if (mGroupInfo.getMessageReceiveOption()) {
+                mLayoutFold.setVisibility(View.VISIBLE);
+                if (mGroupInfo.isFolded()) {
+                    mFoldGroupChatSwitchView.setChecked(true);
+                }
+            } else {
+                mLayoutFold.setVisibility(View.GONE);
+            }
+            
+            mMsgRevOptionSwitchView.setChecked(mGroupInfo.getMessageReceiveOption());
+            mMsgRevOptionSwitchView.setCheckListener(new CompoundButton.OnCheckedChangeListener() {
+                @Override
+                public void onCheckedChanged(final CompoundButton buttonView, boolean isChecked) {
+                    mPresenter.setGroupNotDisturb(mGroupInfo, isChecked, new IUIKitCallback<Void>() {
+                        @Override
+                        public void onSuccess(Void data) {
+                            if (!isChecked) {
+                                mLayoutFold.setVisibility(View.GONE);
+                                if (mGroupInfo.isFolded()) {
+                                    mPresenter.setGroupFold(mGroupInfo, false, new IUIKitCallback<Void>() {
+                                        @Override
+                                        public void onSuccess(Void data) {
+                                            mFoldGroupChatSwitchView.setChecked(false);
+                                        }
+
+                                        @Override
+                                        public void onError(String module, int errCode, String errMsg) {
+                                            ToastUtil.toastShortMessage(module + ", Error code = " + errCode + ", desc = " + errMsg);
+                                        }
+                                    });
+                                }
+                            } else {
+                                mLayoutFold.setVisibility(View.VISIBLE);
+                            }
+                        }
+
+                        @Override
+                        public void onError(String module, int errCode, String errMsg) {
+                            ToastUtil.toastShortMessage(module + ", Error code = " + errCode + ", desc = " + errMsg);
+                        }
+                    });
+                }
+            });
+        }
+
+        if (mGroupInfo.isFolded()) {
+            mTopSwitchView.setMask(true);
+        }
+
+        mFoldGroupChatSwitchView.setCheckListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                mPresenter.setGroupFold(mGroupInfo, isChecked, new IUIKitCallback<Void>() {
+                    @Override
+                    public void onSuccess(Void data) {
+                        if (isChecked) {
+                            if (mGroupInfo.isTopChat()) {
+                                mPresenter.setTopConversation(mGroupInfo.getId(), false, new IUIKitCallback<Void>() {
+                                    @Override
+                                    public void onSuccess(Void data) {
+                                        mTopSwitchView.setChecked(false);
+                                        mTopSwitchView.setMask(true);
+                                    }
+
+                                    @Override
+                                    public void onError(String module, int errCode, String errMsg) {
+                                        ToastUtil.toastShortMessage(module + ", Error code = " + errCode + ", desc = " + errMsg);
+                                    }
+                                });
+                            } else {
+                                mTopSwitchView.setMask(true);
+                            }
+                        } else {
+                            mTopSwitchView.setMask(false);
+                        }
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        ToastUtil.toastShortMessage(module + ", Error code = " + errCode + ", desc = " + errMsg);
+                    }
+                });
+            }
+        });
+
+        mDissolveBtn.setText(R.string.dissolve);
+        mClearMsgBtn.setText(R.string.clear_message);
+        if (mGroupInfo.isOwner()) {
+            mJoinTypeView.setVisibility(VISIBLE);
+            if (mGroupInfo.getGroupType().equals(TUIConstants.GroupType.TYPE_WORK)
+                    || mGroupInfo.getGroupType().equals(TUIConstants.GroupType.TYPE_PRIVATE)) {
+                mDissolveBtn.setText(R.string.exit_group);
+            }
+        } else {
+            mJoinTypeView.setCanNav(false);
+            mJoinTypeView.setOnClickListener(null);
+            mDissolveBtn.setText(R.string.exit_group);
+        }
+
+        if (mGroupInfo.isCanManagerGroup()) {
+            mGroupManageView.setVisibility(VISIBLE);
+        }
+
+        initView();
+    }
+
+    private String convertGroupText(String groupType) {
+        String groupText = "";
+        if (TextUtils.isEmpty(groupType)) {
+            return groupText;
+        }
+        if (TextUtils.equals(groupType, TUIConstants.GroupType.TYPE_PRIVATE)
+                || TextUtils.equals(groupType, TUIConstants.GroupType.TYPE_WORK)) {
+            groupText = getContext().getString(R.string.private_group);
+        } else if (TextUtils.equals(groupType, TUIConstants.GroupType.TYPE_PUBLIC)) {
+            groupText = getContext().getString(R.string.public_group);
+        } else if (TextUtils.equals(groupType, TUIConstants.GroupType.TYPE_CHAT_ROOM)
+                || TextUtils.equals(groupType, TUIConstants.GroupType.TYPE_MEETING)) {
+            groupText = getContext().getString(R.string.chat_room);
+        } else if (TextUtils.equals(groupType, TUIConstants.GroupType.TYPE_COMMUNITY)) {
+            groupText = getContext().getString(R.string.community_group);
+        }
+        return groupText;
+    }
+
+    public void onGroupInfoModified(Object value, int type) {
+        switch (type) {
+            case TUIGroupConstants.Group.MODIFY_GROUP_NAME:
+                ToastUtil.toastLongMessage(getResources().getString(R.string.modify_group_name_success));
+                mGroupNameView.setText(value.toString());
+                break;
+            case TUIGroupConstants.Group.MODIFY_GROUP_NOTICE:
+                if (TextUtils.isEmpty(value.toString())) {
+                    mGroupNoticeText.setText(getResources().getString(R.string.group_notice_empty_tip));
+                } else {
+                    mGroupNoticeText.setText(value.toString());
+                }
+                ToastUtil.toastLongMessage(getResources().getString(R.string.modify_group_notice_success));
+                break;
+            case TUIGroupConstants.Group.MODIFY_GROUP_JOIN_TYPE:
+                mJoinTypeView.setContent(mJoinTypes.get((Integer) value));
+                break;
+            case TUIGroupConstants.Group.MODIFY_MEMBER_NAME:
+                ToastUtil.toastLongMessage(getResources().getString(R.string.modify_nickname_success));
+                mNickView.setContent(value.toString());
+                break;
+        }
+    }
+
+    public void setRouter(IGroupMemberListener listener) {
+        mMemberPreviewListener = listener;
+        mMemberAdapter.setManagerCallBack(listener);
+    }
+
+    public void setOnModifyGroupAvatarListener(GroupInfoFragment.OnModifyGroupAvatarListener onModifyGroupAvatarListener) {
+        this.onModifyGroupAvatarListener = onModifyGroupAvatarListener;
+    }
+
+    public void modifyGroupAvatar(String avatarUrl) {
+        mPresenter.modifyGroupFaceUrl(mGroupInfo.getId(), avatarUrl, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                mGroupInfo.setFaceUrl(avatarUrl);
+                setGroupInfo(mGroupInfo);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage(TUIGroupService.getAppContext().getString(R.string.modify_icon_fail) + ", code = " + errCode + ", info = " + errMsg);
+            }
+        });
+    }
+
+    @Override
+    public void onGroupInfoChanged(GroupInfo dataSource) {
+        setGroupInfo(dataSource);
+    }
+
+    @Override
+    public TitleBarLayout getTitleBar() {
+        return mTitleBar;
+    }
+
+    @Override
+    public void setParentLayout(Object parent) {
+
+    }
+
+    public void setOnButtonClickListener(OnButtonClickListener l) {
+        mListener = l;
+    }
+
+    public interface OnButtonClickListener {
+        default void onSetChatBackground() {};
+    }
+
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/view/GroupMemberAdapter.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/view/GroupMemberAdapter.java
new file mode 100644
index 0000000..a8c8798
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/view/GroupMemberAdapter.java
@@ -0,0 +1,238 @@
+package com.tencent.qcloud.tuikit.tuigroup.classicui.view;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.PopupWindow;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.BackgroundTasks;
+import com.tencent.qcloud.tuicore.util.PopWindowUtil;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupService;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuigroup.classicui.interfaces.IGroupMemberChangedCallback;
+import com.tencent.qcloud.tuikit.tuigroup.presenter.GroupInfoPresenter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class GroupMemberAdapter extends RecyclerView.Adapter<GroupMemberAdapter.GroupMemberViewHodler> {
+
+    private IGroupMemberChangedCallback mCallback;
+    private GroupInfo mGroupInfo;
+    private List<GroupMemberInfo> mGroupMembers = new ArrayList<>();
+    private List<GroupMemberInfo> selectedGroupMemberInfos = new ArrayList<>();
+
+    private GroupInfoPresenter presenter;
+    private boolean isSelectMode;
+    private GroupMemberLayout.OnSelectChangedListener onSelectChangedListener;
+    private ArrayList<String> selectedMember = new ArrayList<>();
+    private ArrayList<String> excludeList;
+    private ArrayList<String> alreadySelectedList;
+    public void setSelectMode(boolean selectMode) {
+        isSelectMode = selectMode;
+    }
+
+    public ArrayList<String> getSelectedMember() {
+        return selectedMember;
+    }
+
+    public List<GroupMemberInfo> getSelectedMemberInfoList() {
+        return selectedGroupMemberInfos;
+    }
+
+    public void setPresenter(GroupInfoPresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    public void setMemberChangedCallback(IGroupMemberChangedCallback callback) {
+        this.mCallback = callback;
+    }
+
+    public void setExcludeList(ArrayList<String> excludeList) {
+        this.excludeList = excludeList;
+    }
+
+    public void setAlreadySelectedList(ArrayList<String> alreadySelectedList) {
+        this.alreadySelectedList = alreadySelectedList;
+    }
+
+    public void setOnSelectChangedListener(GroupMemberLayout.OnSelectChangedListener onSelectChangedListener) {
+        this.onSelectChangedListener = onSelectChangedListener;
+    }
+
+    @NonNull
+    @Override
+    public GroupMemberViewHodler onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.group_member_list_item, parent, false);
+        return new GroupMemberViewHodler(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull GroupMemberViewHodler holder, int position) {
+        final GroupMemberInfo info = mGroupMembers.get(position);
+        GlideEngine.loadImage(holder.memberIcon, info.getIconUrl());
+        if (!TextUtils.isEmpty(info.getNameCard())) {
+            holder.memberName.setText(info.getNameCard());
+        } else {
+            if (!TextUtils.isEmpty(info.getNickName())) {
+                holder.memberName.setText(info.getNickName());
+            } else {
+                if (!TextUtils.isEmpty(info.getAccount())) {
+                    holder.memberName.setText(info.getAccount());
+                } else {
+                    holder.memberName.setText("");
+                }
+            }
+        }
+
+        if (isSelectMode) {
+            holder.checkBox.setVisibility(View.VISIBLE);
+            holder.itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    holder.checkBox.setChecked(!holder.checkBox.isChecked());
+                    if (holder.checkBox.isChecked()) {
+                        info.setSelected(true);
+                        selectedMember.add(info.getAccount());
+                        selectedGroupMemberInfos.add(info);
+                    } else {
+                        info.setSelected(false);
+                        selectedMember.remove(info.getAccount());
+                        selectedGroupMemberInfos.remove(info);
+                    }
+                    if (onSelectChangedListener != null) {
+                        onSelectChangedListener.onSelectChanged();
+                    }
+                }
+            });
+
+        } else {
+            holder.itemView.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    if (!mGroupInfo.isOwner()) {
+                        return false;
+                    }
+                    TextView delete = new TextView(holder.itemView.getContext());
+                    delete.setText(R.string.group_remove_member);
+                    int padding = ScreenUtil.getPxByDp(10);
+                    delete.setPadding(padding, padding, padding, padding);
+                    delete.setBackgroundResource(R.drawable.text_border);
+                    int location[] = new int[2];
+                    v.getLocationInWindow(location);
+                    final PopupWindow window = PopWindowUtil.popupWindow(delete, holder.itemView, location[0], location[1] + v.getMeasuredHeight() / 3);
+                    delete.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            List<GroupMemberInfo> dels = new ArrayList<>();
+                            dels.add(info);
+                            if (presenter == null) {
+                                return;
+                            }
+                            presenter.removeGroupMembers(mGroupInfo, dels, new IUIKitCallback() {
+                                @Override
+                                public void onSuccess(Object data) {
+                                    mGroupMembers.remove(info);
+                                    notifyDataSetChanged();
+                                    if (mCallback != null) {
+                                        mCallback.onMemberRemoved(info);
+                                    }
+                                }
+
+                                @Override
+                                public void onError(String module, int errCode, String errMsg) {
+                                    ToastUtil.toastLongMessage(TUIGroupService.getAppContext().getString(R.string.remove_fail_tip) + ":errCode=" + errCode);
+                                }
+                            });
+                            window.dismiss();
+                        }
+                    });
+                    return false;
+                }
+            });
+
+            holder.itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Bundle bundle = new Bundle();
+                    bundle.putString(TUIConstants.TUIChat.CHAT_ID, info.getAccount());
+                    TUICore.startActivity("FriendProfileActivity", bundle);
+                }
+            });
+        }
+
+        setAlreadySelected(holder, info);
+    }
+
+    private void setAlreadySelected(GroupMemberViewHodler holder, GroupMemberInfo memberInfo) {
+        if (alreadySelectedList != null && alreadySelectedList.contains(memberInfo.getAccount())) {
+            holder.checkBox.setChecked(true);
+            holder.itemView.setEnabled(false);
+            holder.checkBox.setEnabled(false);
+        } else {
+            holder.itemView.setEnabled(true);
+            holder.checkBox.setEnabled(true);
+            holder.checkBox.setSelected(memberInfo.isSelected());
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        if (mGroupMembers == null) {
+            return 0;
+        }
+        return mGroupMembers.size();
+    }
+
+    public void setDataSource(GroupInfo groupInfo) {
+        if (groupInfo != null) {
+            mGroupInfo = groupInfo;
+            mGroupMembers.clear();
+            if (excludeList == null || excludeList.isEmpty()) {
+                mGroupMembers.addAll(groupInfo.getMemberDetails());
+            } else {
+                for (GroupMemberInfo groupMemberInfo : groupInfo.getMemberDetails()) {
+                    if (excludeList.contains(groupMemberInfo.getAccount())) {
+                        continue;
+                    }
+                    mGroupMembers.add(groupMemberInfo);
+                }
+            }
+            BackgroundTasks.getInstance().runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    notifyDataSetChanged();
+                }
+            });
+        }
+    }
+
+    protected class GroupMemberViewHodler extends RecyclerView.ViewHolder {
+        private ImageView memberIcon;
+        private TextView memberName;
+        private CheckBox checkBox;
+
+        public GroupMemberViewHodler(@NonNull View itemView) {
+            super(itemView);
+            checkBox = itemView.findViewById(R.id.group_member_check_box);
+            memberIcon = itemView.findViewById(R.id.group_member_icon);
+            memberName = itemView.findViewById(R.id.group_member_name);
+        }
+    }
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/view/GroupMemberLayout.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/view/GroupMemberLayout.java
new file mode 100644
index 0000000..d1af19f
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/classicui/view/GroupMemberLayout.java
@@ -0,0 +1,299 @@
+package com.tencent.qcloud.tuikit.tuigroup.classicui.view;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.component.CustomLinearLayoutManager;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuigroup.classicui.interfaces.IGroupMemberChangedCallback;
+import com.tencent.qcloud.tuikit.tuigroup.classicui.interfaces.IGroupMemberListener;
+import com.tencent.qcloud.tuikit.tuigroup.component.BottomSelectSheet;
+import com.tencent.qcloud.tuikit.tuigroup.interfaces.IGroupMemberLayout;
+import com.tencent.qcloud.tuikit.tuigroup.presenter.GroupInfoPresenter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class GroupMemberLayout extends LinearLayout implements IGroupMemberLayout {
+    // 取一个足够大的偏移保证能一次性滚动到最底部
+    // Take a large enough offset to scroll to the bottom at one time
+    private static final int SCROLL_TO_END_OFFSET = -999999;
+
+    private TitleBarLayout mTitleBar;
+    private GroupMemberAdapter mAdapter;
+    private IGroupMemberListener groupMemberListener;
+    private GroupInfo mGroupInfo;
+    private RecyclerView recyclerView;
+    private boolean isSelectMode;
+    private String title;
+    private ArrayList<String> excludeList;
+    private ArrayList<String> alreadySelectedList;
+    private RecyclerView selectedList;
+    private SelectedAdapter selectedListAdapter;
+    private View selectArea;
+    private TextView confirmButton;
+
+    private GroupInfoPresenter presenter;
+
+    public GroupMemberLayout(Context context) {
+        super(context);
+        init();
+    }
+
+    public GroupMemberLayout(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public GroupMemberLayout(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private void init() {
+        inflate(getContext(), R.layout.group_member_layout, this);
+        mTitleBar = findViewById(R.id.group_member_title_bar);
+        mTitleBar.setTitle(getContext().getString(R.string.manager), ITitleBarLayout.Position.RIGHT);
+        mTitleBar.getRightIcon().setVisibility(GONE);
+        mTitleBar.setOnRightClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                buildPopMenu();
+            }
+        });
+        mAdapter = new GroupMemberAdapter();
+        mAdapter.setMemberChangedCallback(new IGroupMemberChangedCallback() {
+
+            @Override
+            public void onMemberRemoved(GroupMemberInfo memberInfo) {
+                if (!TextUtils.isEmpty(title)) {
+                    mTitleBar.setTitle(title, ITitleBarLayout.Position.MIDDLE);
+                } else {
+                    mTitleBar.setTitle(getContext().getString(R.string.group_members) +
+                            "(" + mGroupInfo.getMemberCount() + ")", TitleBarLayout.Position.MIDDLE);
+                }
+            }
+        });
+        recyclerView = findViewById(R.id.group_all_members);
+        recyclerView.setLayoutManager(new CustomLinearLayoutManager(getContext()));
+        recyclerView.setAdapter(mAdapter);
+        recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
+                super.onScrollStateChanged(recyclerView, newState);
+                if (newState == RecyclerView.SCROLL_STATE_IDLE) {
+                    LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
+                    if (layoutManager == null) {
+                        return;
+                    }
+                    int lastPosition = layoutManager.findLastCompletelyVisibleItemPosition();
+                    if (mAdapter != null) {
+                        if (lastPosition == mAdapter.getItemCount() - 1) {
+                            if (mGroupInfo != null && mGroupInfo.getNextSeq() != 0) {
+                                presenter.getGroupMembers(mGroupInfo, new IUIKitCallback<GroupInfo>() {
+                                    @Override
+                                    public void onSuccess(GroupInfo data) {
+                                        onGroupInfoChanged(data);
+                                        mAdapter.notifyDataSetChanged();
+                                    }
+
+                                    @Override
+                                    public void onError(String module, int errCode, String errMsg) {
+
+                                    }
+                                });
+                            }
+                        }
+                    }
+                }
+            }
+        });
+
+        selectArea = findViewById(R.id.select_area);
+        selectedList = findViewById(R.id.selected_list);
+        selectedListAdapter = new SelectedAdapter();
+        selectedList.setLayoutManager(new LinearLayoutManager(getContext(), RecyclerView.HORIZONTAL, false));
+        selectedList.setAdapter(selectedListAdapter);
+
+        confirmButton = findViewById(R.id.confirm_button);
+        confirmButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                confirmAndFinish();
+            }
+        });
+
+        mAdapter.setOnSelectChangedListener(new OnSelectChangedListener() {
+            @Override
+            public void onSelectChanged() {
+                selectedListAdapter.setMembers(mAdapter.getSelectedMemberInfoList());
+                selectedListAdapter.notifyDataSetChanged();
+            }
+        });
+    }
+
+    private void confirmAndFinish() {
+        if (groupMemberListener != null) {
+            groupMemberListener.setSelectedMember(mAdapter.getSelectedMember());
+        }
+    }
+
+    public TitleBarLayout getTitleBar() {
+        return mTitleBar;
+    }
+
+    public void setExcludeList(ArrayList<String> excludeList) {
+        this.excludeList = excludeList;
+        mAdapter.setExcludeList(excludeList);
+    }
+
+    public void setAlreadySelectedList(ArrayList<String> alreadySelectedList) {
+        this.alreadySelectedList = alreadySelectedList;
+        mAdapter.setAlreadySelectedList(alreadySelectedList);
+    }
+
+    public void setSelectMode(boolean selectMode) {
+        isSelectMode = selectMode;
+        if (isSelectMode) {
+            mTitleBar.setTitle(getContext().getString(com.tencent.qcloud.tuicore.R.string.sure), ITitleBarLayout.Position.RIGHT);
+            mTitleBar.getRightGroup().setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (groupMemberListener != null) {
+                        groupMemberListener.setSelectedMember(mAdapter.getSelectedMember());
+                    }
+                }
+            });
+            selectArea.setVisibility(VISIBLE);
+        }
+
+        mAdapter.setSelectMode(isSelectMode);
+    }
+
+    @Override
+    public void setParentLayout(Object parent) {
+
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public void onGroupInfoChanged(GroupInfo groupInfo) {
+        mGroupInfo = groupInfo;
+        presenter.setGroupInfo(groupInfo);
+        mAdapter.setDataSource(groupInfo);
+        if (groupInfo != null) {
+            if (!TextUtils.isEmpty(title)) {
+                mTitleBar.setTitle(title, ITitleBarLayout.Position.MIDDLE);
+            } else {
+                mTitleBar.setTitle(getContext().getString(R.string.group_members) +
+                        "(" + groupInfo.getMemberCount() + ")", TitleBarLayout.Position.MIDDLE);
+            }
+        }
+    }
+
+    @Override
+    public void onGroupInfoModified(Object value, int type) {
+
+    }
+
+    private void buildPopMenu() {
+        if (mGroupInfo == null) {
+            return;
+        }
+
+        BottomSelectSheet sheet = new BottomSelectSheet(getContext());
+        List<String> stringList = new ArrayList<>();
+        String addMember = getResources().getString(R.string.add_group_member);
+        String removeMember = getResources().getString(R.string.remove_group_member);
+        stringList.add(addMember);
+        if (mGroupInfo.isOwner()) {
+            stringList.add(removeMember);
+        }
+        sheet.setSelectList(stringList);
+        sheet.setOnClickListener(new BottomSelectSheet.BottomSelectSheetOnClickListener() {
+            @Override
+            public void onSheetClick(int index) {
+                if (index == 0) {
+                    if (groupMemberListener != null) {
+                        groupMemberListener.forwardAddMember(mGroupInfo);
+                    }
+                } else if (index == 1) {
+                    if (groupMemberListener != null) {
+                        groupMemberListener.forwardDeleteMember(mGroupInfo);
+                    }
+                }
+            }
+        });
+        sheet.show();
+    }
+
+    public void setGroupMemberListener(IGroupMemberListener listener) {
+        this.groupMemberListener = listener;
+    }
+
+    public void setPresenter(GroupInfoPresenter presenter) {
+        this.presenter = presenter;
+        mAdapter.setPresenter(presenter);
+    }
+
+    public static class SelectedAdapter extends RecyclerView.Adapter<SelectedAdapter.SelectedViewHolder> {
+        private List<GroupMemberInfo> mMembers;
+
+        public void setMembers(List<GroupMemberInfo> mMembers) {
+            this.mMembers = mMembers;
+        }
+
+        @NonNull
+        @Override
+        public SelectedViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            return new SelectedViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.group_member_selected_item, parent, false));
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull SelectedAdapter.SelectedViewHolder holder, int position) {
+            GlideEngine.loadImage(holder.userIconView, mMembers.get(position).getIconUrl());
+        }
+
+        @Override
+        public int getItemCount() {
+            if (mMembers == null) {
+                return 0;
+            }
+            return mMembers.size();
+        }
+
+        public static class SelectedViewHolder extends RecyclerView.ViewHolder {
+            public final ImageView userIconView;
+            public SelectedViewHolder(@NonNull View itemView) {
+                super(itemView);
+                userIconView = (ImageView) itemView.findViewById(R.id.ivAvatar);
+            }
+        }
+    }
+
+    public interface OnSelectChangedListener {
+        void onSelectChanged();
+    }
+
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/component/BottomSelectSheet.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/component/BottomSelectSheet.java
new file mode 100644
index 0000000..42b3a1c
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/component/BottomSelectSheet.java
@@ -0,0 +1,93 @@
+package com.tencent.qcloud.tuikit.tuigroup.component;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.view.Display;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuikit.tuigroup.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class BottomSelectSheet {
+
+    private List<String> selectList = new ArrayList<>();
+    private Dialog dialog;
+    private ArrayAdapter<String> listAdapter;
+    private BottomSelectSheetOnClickListener onClickListener;
+    public BottomSelectSheet(Context context) {
+        View view = View.inflate(context, R.layout.bottom_select_sheet, null);
+        dialog = new Dialog(context, R.style.BottomSelectSheet);
+        dialog.setContentView(view);
+        dialog.setCancelable(true);
+        dialog.setCanceledOnTouchOutside(true);
+        Window window = dialog.getWindow();
+        window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+        WindowManager m = window.getWindowManager();
+        Display d = m.getDefaultDisplay();
+        WindowManager.LayoutParams p = window.getAttributes();
+        p.width = d.getWidth();
+        p.height = ViewGroup.LayoutParams.WRAP_CONTENT;
+        window.setAttributes(p);
+        window.setGravity(Gravity.BOTTOM);
+        window.setWindowAnimations(R.style.BottomSelectSheet_Anim);  //添加动画
+
+        final ListView listView = view.findViewById(R.id.item_list);
+        listAdapter = new ArrayAdapter<>(context, R.layout.bottom_sheet_item, R.id.sheet_item, selectList);
+        listView.setAdapter(listAdapter);
+        listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                dismiss();
+                if (onClickListener != null) {
+                    onClickListener.onSheetClick(position);
+                }
+            }
+        });
+
+        TextView cancelButton = view.findViewById(R.id.cancel_button);
+        cancelButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dismiss();
+            }
+        });
+    }
+
+    public void dismiss() {
+        if (dialog != null && dialog.isShowing()) {
+            dialog.dismiss();
+        }
+    }
+
+    public void show() {
+        if (dialog != null && !dialog.isShowing()) {
+            listAdapter.notifyDataSetChanged();
+            dialog.show();
+        }
+    }
+
+    public void setSelectList(List<String> selectList) {
+        this.selectList.clear();
+        this.selectList.addAll(selectList);
+    }
+
+    public void setOnClickListener(BottomSelectSheetOnClickListener onClickListener) {
+        this.onClickListener = onClickListener;
+    }
+
+    public interface BottomSelectSheetOnClickListener {
+        void onSheetClick(int index);
+    }
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/interfaces/GroupEventListener.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/interfaces/GroupEventListener.java
new file mode 100644
index 0000000..a6bc617
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/interfaces/GroupEventListener.java
@@ -0,0 +1,5 @@
+package com.tencent.qcloud.tuikit.tuigroup.interfaces;
+
+public interface GroupEventListener {
+    void onGroupInfoChanged(String groupID);
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/interfaces/IGroupApplyLayout.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/interfaces/IGroupApplyLayout.java
new file mode 100644
index 0000000..beebff4
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/interfaces/IGroupApplyLayout.java
@@ -0,0 +1,14 @@
+package com.tencent.qcloud.tuikit.tuigroup.interfaces;
+
+import android.content.Context;
+
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupApplyInfo;
+
+import java.util.List;
+
+public interface IGroupApplyLayout {
+    void onGroupApplyInfoListChanged(List<GroupApplyInfo> dataSource);
+    void onDataSetChanged();
+    Context getContext();
+
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/interfaces/IGroupMemberLayout.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/interfaces/IGroupMemberLayout.java
new file mode 100644
index 0000000..c85c388
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/interfaces/IGroupMemberLayout.java
@@ -0,0 +1,11 @@
+package com.tencent.qcloud.tuikit.tuigroup.interfaces;
+
+import com.tencent.qcloud.tuicore.component.interfaces.ILayout;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+
+
+public interface IGroupMemberLayout extends ILayout {
+
+    void onGroupInfoChanged(GroupInfo dataSource);
+    void onGroupInfoModified(Object value, int type);
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/interfaces/IGroupMemberChangedCallback.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/interfaces/IGroupMemberChangedCallback.java
new file mode 100644
index 0000000..6a2bfda
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/interfaces/IGroupMemberChangedCallback.java
@@ -0,0 +1,7 @@
+package com.tencent.qcloud.tuikit.tuigroup.minimalistui.interfaces;
+
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupMemberInfo;
+
+public interface IGroupMemberChangedCallback {
+    void onMemberRemoved(GroupMemberInfo memberInfo);
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/interfaces/IGroupMemberListener.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/interfaces/IGroupMemberListener.java
new file mode 100644
index 0000000..18db801
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/interfaces/IGroupMemberListener.java
@@ -0,0 +1,16 @@
+package com.tencent.qcloud.tuikit.tuigroup.minimalistui.interfaces;
+
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+
+import java.util.ArrayList;
+
+public interface IGroupMemberListener {
+
+    void forwardListMember(GroupInfo info);
+
+    void forwardAddMember(GroupInfo info);
+
+    void forwardDeleteMember(GroupInfo info);
+
+    default void setSelectedMember(ArrayList<String> members) {}
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/page/GroupApplyManagerMinimalistActivity.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/page/GroupApplyManagerMinimalistActivity.java
new file mode 100644
index 0000000..9fa7b4f
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/page/GroupApplyManagerMinimalistActivity.java
@@ -0,0 +1,59 @@
+package com.tencent.qcloud.tuikit.tuigroup.minimalistui.page;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupConstants;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupApplyInfo;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.minimalistui.view.GroupApplyManagerLayout;
+import com.tencent.qcloud.tuikit.tuigroup.presenter.GroupApplyPresenter;
+
+public class GroupApplyManagerMinimalistActivity extends BaseLightActivity {
+
+    private GroupApplyManagerLayout mManagerLayout;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.group_minimalist_apply_manager_activity);
+        if (getIntent().getExtras() == null) {
+            finish();
+            return;
+        }
+        mManagerLayout = findViewById(R.id.group_apply_manager_layout);
+
+        GroupApplyPresenter presenter = new GroupApplyPresenter(mManagerLayout);
+        mManagerLayout.setPresenter(presenter);
+
+        String groupId = getIntent().getExtras().getString(TUIGroupConstants.Group.GROUP_ID);
+        GroupInfo groupInfo = new GroupInfo();
+        groupInfo.setId(groupId);
+        mManagerLayout.setDataSource(groupInfo);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode != TUIGroupConstants.ActivityRequest.CODE_1) {
+            return;
+        }
+        if (resultCode != RESULT_OK) {
+            return;
+        }
+        GroupApplyInfo info = (GroupApplyInfo) data.getSerializableExtra(TUIGroupConstants.Group.MEMBER_APPLY);
+        if (info == null) {
+            return;
+        }
+        mManagerLayout.updateItemData(info);
+    }
+
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/page/GroupInfoMinimalistActivity.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/page/GroupInfoMinimalistActivity.java
new file mode 100644
index 0000000..3df4913
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/page/GroupInfoMinimalistActivity.java
@@ -0,0 +1,46 @@
+package com.tencent.qcloud.tuikit.tuigroup.minimalistui.page;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupConstants;
+
+import java.util.List;
+
+
+public class GroupInfoMinimalistActivity extends BaseLightActivity {
+
+    public static final int REQUEST_FOR_CHANGE_OWNER = 1;
+
+    private GroupInfoMinimalistFragment fragment;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.group_info_activity);
+        fragment = new GroupInfoMinimalistFragment();
+        fragment.setArguments(getIntent().getExtras());
+        getSupportFragmentManager().beginTransaction().replace(R.id.group_manager_base, fragment).commitAllowingStateLoss();
+    }
+
+    @Override
+    public void finish() {
+        super.finish();
+        setResult(1001);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == REQUEST_FOR_CHANGE_OWNER && data != null) {
+            List<String> selectedList = data.getStringArrayListExtra(TUIGroupConstants.Selection.LIST);
+            if (selectedList != null && !selectedList.isEmpty()) {
+                String newOwnerId = selectedList.get(0);
+                fragment.changeGroupOwner(newOwnerId);
+            }
+        }
+    }
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/page/GroupInfoMinimalistFragment.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/page/GroupInfoMinimalistFragment.java
new file mode 100644
index 0000000..a0617b8
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/page/GroupInfoMinimalistFragment.java
@@ -0,0 +1,253 @@
+package com.tencent.qcloud.tuikit.tuigroup.minimalistui.page;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.component.activities.ImageSelectActivity;
+import com.tencent.qcloud.tuicore.component.fragments.BaseFragment;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupConstants;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupService;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuigroup.minimalistui.interfaces.IGroupMemberListener;
+import com.tencent.qcloud.tuikit.tuigroup.minimalistui.view.GroupInfoLayout;
+import com.tencent.qcloud.tuikit.tuigroup.presenter.GroupInfoPresenter;
+import com.tencent.qcloud.tuikit.tuigroup.util.TUIGroupLog;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+
+public class GroupInfoMinimalistFragment extends BaseFragment {
+    private static final int CHOOSE_AVATAR_REQUEST_CODE = 101;
+
+    private View baseView;
+    private GroupInfoLayout groupInfoLayout;
+
+    private String groupId;
+
+    private GroupInfoPresenter groupInfoPresenter = null;
+    private String mChatBackgroundThumbnailUrl;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
+        baseView = inflater.inflate(R.layout.group_minimalist_info_fragment, container, false);
+        initView();
+        return baseView;
+    }
+
+    private void initView() {
+        Bundle bundle = getArguments();
+        if (bundle == null) {
+            ToastUtil.toastShortMessage("groupId is empty. bundle is null");
+            return;
+        }
+        groupId = bundle.getString(TUIGroupConstants.Group.GROUP_ID);
+        mChatBackgroundThumbnailUrl = bundle.getString(TUIConstants.TUIChat.CHAT_BACKGROUND_URI);
+        groupInfoLayout = baseView.findViewById(R.id.group_info_layout);
+        // 新建 presenter 与 layout 互相绑定
+        groupInfoPresenter = new GroupInfoPresenter(groupInfoLayout);
+        groupInfoPresenter.setGroupEventListener();
+        groupInfoLayout.setGroupInfoPresenter(groupInfoPresenter);
+        groupInfoLayout.setOnModifyGroupAvatarListener(new OnModifyGroupAvatarListener() {
+            @Override
+            public void onModifyGroupAvatar(String originAvatarUrl) {
+                ArrayList<ImageSelectActivity.ImageBean> faceList = new ArrayList<>();
+                for (int i = 0; i < TUIGroupConstants.GROUP_FACE_COUNT; i++) {
+                    ImageSelectActivity.ImageBean imageBean = new ImageSelectActivity.ImageBean();
+                    imageBean.setThumbnailUri(String.format(TUIGroupConstants.GROUP_FACE_URL, (i + 1) + ""));
+                    imageBean.setImageUri(String.format(TUIGroupConstants.GROUP_FACE_URL, (i + 1) + ""));
+                    faceList.add(imageBean);
+                }
+
+                Intent intent = new Intent(getContext(), ImageSelectActivity.class);
+                intent.putExtra(ImageSelectActivity.TITLE, getResources().getString(R.string.group_choose_avatar));
+                intent.putExtra(ImageSelectActivity.SPAN_COUNT, 4);
+                intent.putExtra(ImageSelectActivity.ITEM_WIDTH, ScreenUtil.dip2px(77));
+                intent.putExtra(ImageSelectActivity.ITEM_HEIGHT, ScreenUtil.dip2px(77));
+                intent.putExtra(ImageSelectActivity.DATA, faceList);
+                intent.putExtra(ImageSelectActivity.SELECTED, new ImageSelectActivity.ImageBean(originAvatarUrl, originAvatarUrl, false));
+                startActivityForResult(intent, CHOOSE_AVATAR_REQUEST_CODE);
+            }
+        });
+        groupInfoLayout.loadGroupInfo(groupId);
+        groupInfoLayout.setRouter(new IGroupMemberListener() {
+            @Override
+            public void forwardListMember(GroupInfo info) {
+                Intent intent = new Intent(getContext(), GroupMemberMinimalistActivity.class);
+                intent.putExtra(TUIConstants.TUIGroup.IS_SELECT_MODE, false);
+                intent.putExtra(TUIConstants.TUIGroup.GROUP_ID, info.getId());
+                startActivity(intent);
+            }
+
+            @Override
+            public void forwardAddMember(GroupInfo info) {
+                Bundle param = new Bundle();
+                param.putString(TUIGroupConstants.Group.GROUP_ID, info.getId());
+                param.putBoolean(TUIGroupConstants.Selection.SELECT_FRIENDS, true);
+                ArrayList<String> selectedList = new ArrayList<>();
+                for (GroupMemberInfo memberInfo : info.getMemberDetails()) {
+                    selectedList.add(memberInfo.getAccount());
+                }
+                param.putStringArrayList(TUIGroupConstants.Selection.SELECTED_LIST, selectedList);
+                TUICore.startActivity(GroupInfoMinimalistFragment.this, "StartGroupMemberSelectMinimalistActivity", param, 1);
+            }
+
+            @Override
+            public void forwardDeleteMember(GroupInfo info) {
+                Bundle param = new Bundle();
+                param.putString(TUIGroupConstants.Group.GROUP_ID, info.getId());
+                param.putBoolean(TUIGroupConstants.Selection.SELECT_FOR_CALL, true);
+                TUICore.startActivity(GroupInfoMinimalistFragment.this, "StartGroupMemberSelectMinimalistActivity", param, 2);
+            }
+        });
+
+        groupInfoLayout.setOnButtonClickListener(new GroupInfoLayout.OnButtonClickListener() {
+            @Override
+            public void onSetChatBackground() {
+                ArrayList<ImageSelectActivity.ImageBean> faceList = new ArrayList<>();
+                ImageSelectActivity.ImageBean defaultFace = new ImageSelectActivity.ImageBean();
+                defaultFace.setDefault(true);
+                faceList.add(defaultFace);
+                for (int i = 0; i < TUIConstants.TUIChat.CHAT_CONVERSATION_BACKGROUND_COUNT; i++) {
+                    ImageSelectActivity.ImageBean imageBean = new ImageSelectActivity.ImageBean();
+                    imageBean.setImageUri(String.format(TUIConstants.TUIChat.CHAT_CONVERSATION_BACKGROUND_URL, (i + 1) + ""));
+                    imageBean.setThumbnailUri(String.format(TUIConstants.TUIChat.CHAT_CONVERSATION_BACKGROUND_THUMBNAIL_URL, (i + 1) + ""));
+                    faceList.add(imageBean);
+                }
+
+                Intent intent = new Intent(getContext(), ImageSelectActivity.class);
+                intent.putExtra(ImageSelectActivity.TITLE, getResources().getString(R.string.chat_background_title));
+                intent.putExtra(ImageSelectActivity.SPAN_COUNT, 2);
+                intent.putExtra(ImageSelectActivity.ITEM_WIDTH, ScreenUtil.dip2px(186));
+                intent.putExtra(ImageSelectActivity.ITEM_HEIGHT, ScreenUtil.dip2px(124));
+                intent.putExtra(ImageSelectActivity.DATA, faceList);
+                if (TextUtils.isEmpty(mChatBackgroundThumbnailUrl) || TextUtils.equals(TUIConstants.TUIChat.CHAT_CONVERSATION_BACKGROUND_DEFAULT_URL, mChatBackgroundThumbnailUrl)) {
+                    intent.putExtra(ImageSelectActivity.SELECTED, defaultFace);
+                } else {
+                    intent.putExtra(ImageSelectActivity.SELECTED, new ImageSelectActivity.ImageBean(mChatBackgroundThumbnailUrl, "", false));
+                }
+                intent.putExtra(ImageSelectActivity.NEED_DOWLOAD_LOCAL, true);
+                startActivityForResult(intent, TUIConstants.TUIChat.CHAT_REQUEST_BACKGROUND_CODE);
+            }
+        });
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == 3) {
+            List<String> friends = (List<String>) data.getSerializableExtra(TUIGroupConstants.Selection.LIST);
+            if (requestCode == 1) {
+                inviteGroupMembers(friends);
+            } else if (requestCode == 2) {
+                deleteGroupMembers(friends);
+            }
+        } else if (requestCode == CHOOSE_AVATAR_REQUEST_CODE && resultCode == ImageSelectActivity.RESULT_CODE_SUCCESS) {
+            if (data != null) {
+                ImageSelectActivity.ImageBean imageBean = (ImageSelectActivity.ImageBean) data.getSerializableExtra(ImageSelectActivity.DATA);
+                if (imageBean == null) {
+                    return;
+                }
+
+                String avatarUrl = imageBean.getImageUri();
+                modifyGroupAvatar(avatarUrl);
+            }
+        } else if (requestCode == TUIConstants.TUIChat.CHAT_REQUEST_BACKGROUND_CODE) {
+            if (data == null) {
+                return;
+            }
+            ImageSelectActivity.ImageBean imageBean = (ImageSelectActivity.ImageBean) data.getSerializableExtra(ImageSelectActivity.DATA);
+            if (imageBean == null) {
+                TUIGroupLog.e("GroupInfoMinimalistFragment", "onActivityResult imageBean is null");
+                return;
+            }
+
+            String backgroundUri = imageBean.getLocalPath();
+            String thumbnailUri = imageBean.getThumbnailUri();
+            String dataUri = thumbnailUri + "," + backgroundUri;
+            TUIGroupLog.d("GroupInfoMinimalistFragment", "onActivityResult backgroundUri = " + backgroundUri);
+            mChatBackgroundThumbnailUrl = thumbnailUri;
+            HashMap<String, Object> param = new HashMap<>();
+            param.put(TUIConstants.TUIChat.CHAT_ID, groupId);
+            param.put(TUIConstants.TUIChat.CHAT_BACKGROUND_URI, dataUri);
+            TUICore.callService(TUIConstants.TUIChat.SERVICE_NAME, TUIConstants.TUIChat.METHOD_UPDATE_DATA_STORE_CHAT_URI, param);
+        }
+    }
+
+    private void modifyGroupAvatar(String avatarUrl) {
+        groupInfoLayout.modifyGroupAvatar(avatarUrl);
+    }
+
+    private void deleteGroupMembers(List<String> friends) {
+        if (friends != null && friends.size() > 0) {
+            if (groupInfoPresenter != null) {
+                groupInfoPresenter.deleteGroupMembers(groupId, friends, new IUIKitCallback<List<String>>() {
+                    @Override
+                    public void onSuccess(List<String> data) {
+                        groupInfoPresenter.loadGroupInfo(groupId);
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+
+                    }
+                });
+            }
+        }
+    }
+
+    private void inviteGroupMembers(List<String> friends) {
+        if (friends != null && friends.size() > 0) {
+            groupInfoPresenter.inviteGroupMembers(groupId, friends, new IUIKitCallback<Object>() {
+                @Override
+                public void onSuccess(Object data) {
+                    if (data instanceof String) {
+                        ToastUtil.toastLongMessage(data.toString());
+                    } else {
+                        ToastUtil.toastLongMessage(TUIGroupService.getAppContext().getString(R.string.invite_suc));
+                    }
+                }
+
+                @Override
+                public void onError(String module, int errCode, String errMsg) {
+                    ToastUtil.toastLongMessage(TUIGroupService.getAppContext().getString(R.string.invite_fail) + errCode + "=" + errMsg);
+                }
+            });
+        }
+    }
+
+    public void changeGroupOwner(String newOwnerId) {
+        groupInfoPresenter.transferGroupOwner(groupId, newOwnerId, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                groupInfoLayout.loadGroupInfo(groupId);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+
+            }
+        });
+    }
+
+
+    public interface OnModifyGroupAvatarListener {
+        void onModifyGroupAvatar(String originAvatarUrl);
+    }
+
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/page/GroupMemberMinimalistActivity.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/page/GroupMemberMinimalistActivity.java
new file mode 100644
index 0000000..4ccd484
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/page/GroupMemberMinimalistActivity.java
@@ -0,0 +1,175 @@
+package com.tencent.qcloud.tuikit.tuigroup.minimalistui.page;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupConstants;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupService;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuigroup.minimalistui.interfaces.IGroupMemberListener;
+import com.tencent.qcloud.tuikit.tuigroup.minimalistui.view.GroupMemberLayout;
+import com.tencent.qcloud.tuikit.tuigroup.presenter.GroupInfoPresenter;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class GroupMemberMinimalistActivity extends BaseLightActivity {
+
+    private GroupMemberLayout mMemberLayout;
+    private String groupID;
+    private GroupInfoPresenter presenter;
+
+    private boolean isSelectMode = false;
+    private ArrayList<String> excludeList;
+    private ArrayList<String> alreadySelectedList;
+    private String userData;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.group_minimalist_members_list);
+        mMemberLayout = findViewById(R.id.group_member_grid_layout);
+        init();
+    }
+
+    private void init() {
+        Intent intent = getIntent();
+        groupID = intent.getStringExtra(TUIConstants.TUIGroup.GROUP_ID);
+        int limit = getIntent().getIntExtra(TUIConstants.TUIGroup.LIMIT, Integer.MAX_VALUE);
+        isSelectMode = intent.getBooleanExtra(TUIConstants.TUIGroup.IS_SELECT_MODE, true);
+        String title = intent.getStringExtra(TUIConstants.TUIGroup.TITLE);
+        excludeList = intent.getStringArrayListExtra(TUIConstants.TUIGroup.EXCLUDE_LIST);
+        alreadySelectedList = intent.getStringArrayListExtra(TUIConstants.TUIGroup.SELECTED_LIST);
+        userData = intent.getStringExtra(TUIConstants.TUIGroup.USER_DATA);
+        int filter = intent.getIntExtra(TUIConstants.TUIGroup.FILTER, GroupInfo.GROUP_MEMBER_FILTER_ALL);
+        mMemberLayout.setSelectMode(isSelectMode);
+        mMemberLayout.setTitle(title);
+        mMemberLayout.setExcludeList(excludeList);
+        mMemberLayout.setAlreadySelectedList(alreadySelectedList);
+        presenter = new GroupInfoPresenter(mMemberLayout);
+        mMemberLayout.setPresenter(presenter);
+        presenter.loadGroupInfo(groupID, filter);
+
+        mMemberLayout.getTitleBar().setOnLeftClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        mMemberLayout.setGroupMemberListener(new IGroupMemberListener() {
+
+            @Override
+            public void setSelectedMember(ArrayList<String> members) {
+                if (members == null || members.isEmpty()) {
+                    return;
+                }
+                if (members.size() > limit) {
+                    String overLimitTip = getString(R.string.group_over_limit_tip, limit);
+                    ToastUtil.toastShortMessage(overLimitTip);
+                    return;
+                }
+                Intent result = new Intent();
+                result.putStringArrayListExtra(TUIConstants.TUIGroup.LIST, members);
+                setResult(0, result);
+
+                Map<String, Object> param = new HashMap<>();
+                param.put(TUIConstants.TUIGroup.LIST, members);
+                param.put(TUIConstants.TUIGroup.USER_DATA, userData);
+                TUICore.notifyEvent(TUIConstants.TUIGroup.EVENT_GROUP, TUIConstants.TUIGroup.EVENT_SUB_KEY_GROUP_MEMBER_SELECTED, param);
+
+                finish();
+            }
+
+            @Override
+            public void forwardListMember(GroupInfo info) {
+
+            }
+
+            @Override
+            public void forwardAddMember(GroupInfo info) {
+                Bundle param = new Bundle();
+                param.putString(TUIGroupConstants.Group.GROUP_ID, info.getId());
+                param.putBoolean(TUIGroupConstants.Selection.SELECT_FRIENDS, true);
+                ArrayList<String> selectedList = new ArrayList<>();
+                for (GroupMemberInfo memberInfo : info.getMemberDetails()) {
+                    selectedList.add(memberInfo.getAccount());
+                }
+                param.putStringArrayList(TUIGroupConstants.Selection.SELECTED_LIST, selectedList);
+                TUICore.startActivity(GroupMemberMinimalistActivity.this, "StartGroupMemberSelectMinimalistActivity", param, 1);
+            }
+
+            @Override
+            public void forwardDeleteMember(GroupInfo info) {
+                Bundle param = new Bundle();
+                param.putString(TUIGroupConstants.Group.GROUP_ID, info.getId());
+                param.putBoolean(TUIGroupConstants.Selection.SELECT_FOR_CALL, true);
+                TUICore.startActivity(GroupMemberMinimalistActivity.this, "StartGroupMemberSelectMinimalistActivity", param, 2);
+            }
+        });
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode == 3) {
+            List<String> friends = (List<String>) data.getSerializableExtra(TUIGroupConstants.Selection.LIST);
+            if (requestCode == 1) {
+                inviteGroupMembers(friends);
+            } else if (requestCode == 2) {
+                deleteGroupMembers(friends);
+            }
+        }
+    }
+
+    private void deleteGroupMembers(List<String> friends) {
+        if (friends != null && friends.size() > 0) {
+            if (presenter != null) {
+                presenter.deleteGroupMembers(groupID, friends, new IUIKitCallback<List<String>>() {
+                    @Override
+                    public void onSuccess(List<String> data) {
+                        presenter.loadGroupInfo(groupID);
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+
+                    }
+                });
+            }
+        }
+    }
+
+    private void inviteGroupMembers(List<String> friends) {
+        if (friends != null && friends.size() > 0) {
+            if (presenter != null) {
+                presenter.inviteGroupMembers(groupID, friends, new IUIKitCallback<Object>() {
+                    @Override
+                    public void onSuccess(Object data) {
+                        if (data instanceof String) {
+                            ToastUtil.toastLongMessage(data.toString());
+                        } else {
+                            ToastUtil.toastLongMessage(TUIGroupService.getAppContext().getString(R.string.invite_suc));
+                        }
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        ToastUtil.toastLongMessage(TUIGroupService.getAppContext().getString(R.string.invite_fail) + errCode + "=" + errMsg);
+                    }
+                });
+            }
+        }
+    }
+
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/page/GroupNoticeMinimalistActivity.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/page/GroupNoticeMinimalistActivity.java
new file mode 100644
index 0000000..f6a0bf4
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/page/GroupNoticeMinimalistActivity.java
@@ -0,0 +1,152 @@
+package com.tencent.qcloud.tuikit.tuigroup.minimalistui.page;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.DisplayMetrics;
+import android.view.View;
+import android.view.WindowManager;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupConstants;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.presenter.GroupManagerPresenter;
+
+public class GroupNoticeMinimalistActivity extends BaseLightActivity {
+
+    private static OnGroupNoticeChangedListener changedListener;
+
+    private EditText editText;
+
+    private GroupInfo groupInfo;
+
+    private TitleBarLayout titleBarLayout;
+
+    private boolean isEditModel = false;
+
+    private GroupManagerPresenter presenter;
+
+    public static void setOnGroupNoticeChangedListener(OnGroupNoticeChangedListener listener) {
+        GroupNoticeMinimalistActivity.changedListener = listener;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_group_notice);
+        editText = findViewById(R.id.group_notice_text);
+        titleBarLayout = findViewById(R.id.group_notice_title_bar);
+        groupInfo = (GroupInfo) getIntent().getSerializableExtra(TUIGroupConstants.Group.GROUP_INFO);
+        presenter = new GroupManagerPresenter();
+        if (!TextUtils.isEmpty(groupInfo.getNotice())) {
+            editText.setText(groupInfo.getNotice());
+        }
+        titleBarLayout.getLeftGroup().setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        titleBarLayout.setTitle(getString(R.string.group_notice), ITitleBarLayout.Position.MIDDLE);
+        titleBarLayout.getRightIcon().setVisibility(View.GONE);
+
+        if (groupInfo.isCanManagerGroup()) {
+            titleBarLayout.setTitle(getString(R.string.group_edit), ITitleBarLayout.Position.RIGHT);
+        }
+        titleBarLayout.getRightGroup().setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (!isEditModel) {
+                    titleBarLayout.setTitle(getString(com.tencent.qcloud.tuicore.R.string.sure), ITitleBarLayout.Position.RIGHT);
+                    editText.setInputType(EditorInfo.TYPE_CLASS_TEXT);
+                    editText.setClickable(true);
+                    editText.setFocusable(true);
+                    editText.setFocusableInTouchMode(true);
+                    showSoftInput();
+                    editText.setSelection(editText.getText().toString().length());
+                    isEditModel = true;
+                } else {
+                    titleBarLayout.setTitle(getString(R.string.group_edit), ITitleBarLayout.Position.RIGHT);
+                    editText.setInputType(EditorInfo.TYPE_NULL);
+                    editText.setClickable(false);
+                    editText.setFocusable(false);
+                    editText.setFocusableInTouchMode(false);
+                    hideSoftInput();
+                    setGroupNotice(editText.getText().toString());
+                    isEditModel = false;
+                }
+            }
+        });
+    }
+
+    private void setGroupNotice(String groupNotice) {
+        if (TextUtils.equals(groupNotice, groupInfo.getNotice())) {
+            return;
+        }
+        presenter.modifyGroupNotification(groupInfo.getId(), groupNotice, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                groupInfo.setNotice(groupNotice);
+                if (changedListener != null) {
+                    changedListener.onChanged(groupNotice);
+                }
+                ToastUtil.toastShortMessage(getResources().getString(R.string.modify_group_notice_success));
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage("modifyGroupNotice error , errCode " + errCode + " errMsg " + errMsg);
+            }
+        });
+    }
+
+    private void showSoftInput() {
+        editText.requestFocus();
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        if (!isSoftInputShown()) {
+            imm.toggleSoftInput(0, 0);
+        }
+    }
+
+    public void hideSoftInput() {
+        InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(editText.getWindowToken(), 0);
+        editText.clearFocus();
+    }
+
+    private boolean isSoftInputShown() {
+        View decorView = getWindow().getDecorView();
+        int screenHeight = decorView.getHeight();
+        Rect rect = new Rect();
+        decorView.getWindowVisibleDisplayFrame(rect);
+        return screenHeight - rect.bottom - getNavigateBarHeight() >= 0;
+    }
+
+    // 兼容有导航键的情况
+    private int getNavigateBarHeight() {
+        DisplayMetrics metrics = new DisplayMetrics();
+        WindowManager windowManager  = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
+        windowManager.getDefaultDisplay().getMetrics(metrics);
+        int usableHeight = metrics.heightPixels;
+        windowManager.getDefaultDisplay().getRealMetrics(metrics);
+        int realHeight = metrics.heightPixels;
+        if (realHeight > usableHeight) {
+            return realHeight - usableHeight;
+        } else {
+            return 0;
+        }
+    }
+
+    public interface OnGroupNoticeChangedListener {
+        void onChanged(String notice);
+    }
+}
\ No newline at end of file
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/page/ManageGroupMinimalistActivity.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/page/ManageGroupMinimalistActivity.java
new file mode 100644
index 0000000..2f9b794
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/page/ManageGroupMinimalistActivity.java
@@ -0,0 +1,319 @@
+package com.tencent.qcloud.tuikit.tuigroup.minimalistui.page;
+
+import android.content.Intent;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.CompoundButton;
+import android.widget.PopupWindow;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.component.CustomLinearLayoutManager;
+import com.tencent.qcloud.tuicore.component.LineControllerView;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.gatherimage.ShadeImageView;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupConstants;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuigroup.presenter.GroupManagerPresenter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ManageGroupMinimalistActivity extends BaseLightActivity {
+
+    private TitleBarLayout titleBarLayout;
+    private LineControllerView setManagerView;
+    private LineControllerView muteAllView;
+    private View addMuteMemberView;
+    private RecyclerView mutedList;
+    private MutedMemberAdapter mutedMemberAdapter;
+
+    private GroupManagerPresenter presenter;
+    private GroupInfo groupInfo;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_group_manager);
+        presenter = new GroupManagerPresenter();
+        titleBarLayout = findViewById(R.id.group_manage_title_bar);
+        setManagerView = findViewById(R.id.group_manage_set_manager);
+        muteAllView = findViewById(R.id.group_manage_mute_all);
+        addMuteMemberView = findViewById(R.id.group_manage_add_mute_member);
+        mutedList = findViewById(R.id.group_manage_muted_member_list);
+        mutedList.setLayoutManager(new CustomLinearLayoutManager(this));
+        mutedMemberAdapter = new MutedMemberAdapter();
+        mutedList.setAdapter(mutedMemberAdapter);
+
+        groupInfo = (GroupInfo) getIntent().getSerializableExtra(TUIGroupConstants.Group.GROUP_INFO);
+
+        muteAllView.setChecked(groupInfo.isAllMuted());
+        if (groupInfo.isAllMuted()) {
+            addMuteMemberView.setVisibility(View.GONE);
+            mutedList.setVisibility(View.GONE);
+        }
+
+        titleBarLayout.setTitle(getString(R.string.group_manager), ITitleBarLayout.Position.MIDDLE);
+        setClickListener();
+        loadMutedMember();
+    }
+
+    private void setClickListener() {
+        titleBarLayout.getLeftIcon().setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+        muteAllView.setCheckListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                    presenter.muteAll(groupInfo.getId(), isChecked, new IUIKitCallback<Void>() {
+                        @Override
+                        public void onSuccess(Void data) {
+                            if (isChecked) {
+                                addMuteMemberView.setVisibility(View.GONE);
+                                mutedList.setVisibility(View.GONE);
+                            } else {
+                                addMuteMemberView.setVisibility(View.VISIBLE);
+                                mutedList.setVisibility(View.VISIBLE);
+                            }
+                        }
+
+                        @Override
+                        public void onError(String module, int errCode, String errMsg) {
+                            ToastUtil.toastShortMessage(errCode + ", " + errMsg);
+                        }
+                    });
+                }
+        });
+
+        setManagerView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (TextUtils.equals(groupInfo.getGroupType(), GroupInfo.GROUP_TYPE_AVCHATROOM)
+                        || TextUtils.equals(groupInfo.getGroupType(), GroupInfo.GROUP_TYPE_WORK)) {
+                    ToastUtil.toastShortMessage(getString(R.string.group_not_support_set_manager));
+                    return;
+                }
+                Intent intent = new Intent(ManageGroupMinimalistActivity.this, SetGroupManagerMinimalistActivity.class);
+                intent.putExtra(TUIGroupConstants.Group.GROUP_INFO, groupInfo);
+                startActivity(intent);
+            }
+        });
+
+        addMuteMemberView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (TextUtils.equals(groupInfo.getGroupType(), GroupInfo.GROUP_TYPE_AVCHATROOM)
+                        || TextUtils.equals(groupInfo.getGroupType(), GroupInfo.GROUP_TYPE_WORK)) {
+                    ToastUtil.toastShortMessage(getString(R.string.group_not_support_mute_member));
+                    return;
+                }
+
+                Intent intent = new Intent(ManageGroupMinimalistActivity.this, GroupMemberMinimalistActivity.class);
+                intent.putExtra(TUIConstants.TUIGroup.IS_SELECT_MODE, true);
+                intent.putExtra(TUIConstants.TUIGroup.FILTER, GroupInfo.GROUP_MEMBER_FILTER_COMMON);
+                if (mutedMemberAdapter.getGroupMemberInfoList() != null) {
+                    ArrayList<String> selectedList = new ArrayList<>();
+                    for (GroupMemberInfo memberInfo : mutedMemberAdapter.getGroupMemberInfoList()) {
+                        selectedList.add(memberInfo.getAccount());
+                    }
+                    intent.putExtra(TUIConstants.TUIGroup.SELECTED_LIST, selectedList);
+                }
+                intent.putExtra(TUIConstants.TUIGroup.GROUP_ID, groupInfo.getId());
+                startActivityForResult(intent, 1);
+            }
+        });
+
+        mutedMemberAdapter.setOnItemLongClickListener(new SetGroupManagerMinimalistActivity.OnItemLongClickListener() {
+            @Override
+            public void onClick(View view, GroupMemberInfo memberInfo, int position) {
+                Drawable drawable = view.getBackground();
+                if (drawable != null) {
+                    drawable.setColorFilter(0xd9d9d9, PorterDuff.Mode.SRC_IN);
+                }
+                View itemPop = LayoutInflater.from(ManageGroupMinimalistActivity.this).inflate(R.layout.group_manager_pop_menu, null);
+                PopupWindow popupWindow = new PopupWindow(itemPop, WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT);
+                popupWindow.setBackgroundDrawable(new ColorDrawable());
+                popupWindow.setOutsideTouchable(true);
+                popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+                    @Override
+                    public void onDismiss() {
+                        if (drawable != null) {
+                            drawable.clearColorFilter();
+                        }
+                    }
+                });
+                TextView popText = itemPop.findViewById(R.id.pop_text);
+                popText.setText(R.string.group_cancel_mute_label);
+                popText.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        popupWindow.dismiss();
+                        presenter.cancelMuteGroupMember(groupInfo.getId(), memberInfo.getAccount(), new IUIKitCallback<Void>() {
+                            @Override
+                            public void onSuccess(Void data) {
+                                mutedMemberAdapter.onItemRemoved(memberInfo);
+                            }
+
+                            @Override
+                            public void onError(String module, int errCode, String errMsg) {
+                                ToastUtil.toastShortMessage(errCode + ", " + errMsg);
+                            }
+                        });
+                    }
+                });
+                int x = view.getWidth() / 2;
+                int y = - view.getHeight() / 3;
+                int popHeight = ScreenUtil.dip2px(45) * 3;
+                if (y + popHeight + view.getY() + view.getHeight() > mutedList.getBottom()) {
+                    y = y - popHeight;
+                }
+                popupWindow.showAsDropDown(view, x, y, Gravity.TOP | Gravity.START);
+            }
+        });
+
+    }
+
+    private void loadMutedMember() {
+        presenter.loadMutedMembers(groupInfo.getId(), new IUIKitCallback<List<GroupMemberInfo>>() {
+            @Override
+            public void onSuccess(List<GroupMemberInfo> data) {
+                mutedMemberAdapter.setGroupMemberInfoList(data);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage(errCode + ", " + errMsg);
+            }
+        });
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 1 && data != null) {
+            List<String> selectedList = data.getStringArrayListExtra(TUIGroupConstants.Selection.LIST);
+            if (selectedList != null && !selectedList.isEmpty()) {
+                for (String userId : selectedList) {
+                    presenter.muteGroupMember(groupInfo.getId(), userId, new IUIKitCallback<Void>() {
+                        @Override
+                        public void onSuccess(Void data) {
+                            loadMutedMember();
+                        }
+
+                        @Override
+                        public void onError(String module, int errCode, String errMsg) {
+                            ToastUtil.toastShortMessage(errCode + ", " + errMsg);
+                        }
+                    });
+                }
+            }
+        }
+    }
+
+    class MutedMemberAdapter extends RecyclerView.Adapter<MutedMemberAdapter.MutedMemberViewHolder> {
+
+        private List<GroupMemberInfo> groupMemberInfoList;
+
+        private SetGroupManagerMinimalistActivity.OnItemLongClickListener onItemLongClickListener;
+
+        public void setOnItemLongClickListener(SetGroupManagerMinimalistActivity.OnItemLongClickListener onItemLongClickListener) {
+            this.onItemLongClickListener = onItemLongClickListener;
+        }
+
+        public void onItemRemoved(GroupMemberInfo memberInfo) {
+            int index = groupMemberInfoList.indexOf(memberInfo);
+            groupMemberInfoList.remove(memberInfo);
+            notifyItemRemoved(index);
+        }
+
+        public void setGroupMemberInfoList(List<GroupMemberInfo> groupMemberInfoList) {
+            this.groupMemberInfoList = groupMemberInfoList;
+            notifyDataSetChanged();
+        }
+
+        public List<GroupMemberInfo> getGroupMemberInfoList() {
+            return groupMemberInfoList;
+        }
+
+        @NonNull
+        @Override
+        public MutedMemberViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            View itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.group_manager_item, parent, false);
+            return new MutedMemberViewHolder(itemView);
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull MutedMemberViewHolder holder, int position) {
+            GroupMemberInfo groupMemberInfo = groupMemberInfoList.get(position);
+            holder.itemView.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    if (onItemLongClickListener != null) {
+                        onItemLongClickListener.onClick(v, groupMemberInfo, position);
+                    }
+                    return false;
+                }
+            });
+            String displayName = getDisplayName(groupMemberInfo);
+            holder.managerName.setText(displayName);
+            GlideEngine.loadUserIcon(holder.faceIcon, groupMemberInfo.getIconUrl());
+        }
+
+        @Override
+        public int getItemCount() {
+            if (groupMemberInfoList == null || groupMemberInfoList.isEmpty()) {
+                return 0;
+            }
+            return groupMemberInfoList.size();
+        }
+
+        class MutedMemberViewHolder extends RecyclerView.ViewHolder {
+            ShadeImageView faceIcon;
+            TextView managerName;
+            public MutedMemberViewHolder(@NonNull View itemView) {
+                super(itemView);
+                faceIcon = itemView.findViewById(R.id.group_manager_face);
+                faceIcon.setRadius(ScreenUtil.dip2px(20));
+                managerName = itemView.findViewById(R.id.group_manage_name);
+            }
+        }
+    }
+
+    private String getDisplayName(GroupMemberInfo groupMemberInfo) {
+        String displayName = groupMemberInfo.getNameCard();
+        if (TextUtils.isEmpty(displayName)) {
+            displayName = groupMemberInfo.getNickName();
+        }
+        if (TextUtils.isEmpty(displayName)) {
+            displayName = groupMemberInfo.getAccount();
+        }
+        return displayName;
+    }
+
+    interface OnItemLongClickListener {
+        void onClick(View view, GroupMemberInfo groupMemberInfo);
+    }
+
+}
\ No newline at end of file
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/page/SetGroupManagerMinimalistActivity.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/page/SetGroupManagerMinimalistActivity.java
new file mode 100644
index 0000000..38a4453
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/page/SetGroupManagerMinimalistActivity.java
@@ -0,0 +1,290 @@
+package com.tencent.qcloud.tuikit.tuigroup.minimalistui.page;
+
+import android.content.Intent;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.PopupWindow;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.component.CustomLinearLayoutManager;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.BaseLightActivity;
+import com.tencent.qcloud.tuicore.component.gatherimage.ShadeImageView;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupConstants;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuigroup.presenter.GroupManagerPresenter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SetGroupManagerMinimalistActivity extends BaseLightActivity {
+    private TitleBarLayout titleBarLayout;
+    private TextView managerCountLabel;
+
+    private GroupManagerPresenter presenter;
+    private GroupInfo groupInfo;
+    private RecyclerView managerList;
+    private ManagerAdapter managerAdapter;
+    private ShadeImageView ownerFace;
+    private TextView ownerName;
+    private View setManagerView;
+    private String ownerID;
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_set_group_manager);
+        titleBarLayout = findViewById(R.id.set_group_manager_title_bar);
+        managerCountLabel = findViewById(R.id.set_group_manager_manager_label);
+        managerList = findViewById(R.id.set_group_manager_manager_list);
+        ownerFace = findViewById(R.id.set_group_manager_owner_face);
+        ownerFace.setRadius(ScreenUtil.dip2px(20));
+        ownerName = findViewById(R.id.set_group_manager_owner_name);
+        setManagerView = findViewById(R.id.set_group_manager_add_manager);
+
+        titleBarLayout.setTitle(getString(R.string.group_set_manager), ITitleBarLayout.Position.MIDDLE);
+        managerList.setLayoutManager(new CustomLinearLayoutManager(this));
+        managerAdapter = new ManagerAdapter();
+        managerList.setAdapter(managerAdapter);
+        groupInfo = (GroupInfo) getIntent().getSerializableExtra(TUIGroupConstants.Group.GROUP_INFO);
+
+        presenter = new GroupManagerPresenter();
+
+        setClickListener();
+        loadGroupManager();
+        loadGroupOwner();
+    }
+
+    private void loadGroupManager() {
+        presenter.loadGroupManager(groupInfo.getId(), new IUIKitCallback<List<GroupMemberInfo>>() {
+            @Override
+            public void onSuccess(List<GroupMemberInfo> data) {
+                if (data != null) {
+                    managerCountLabel.setText(getString(R.string.group_add_manager_count_label, data.size()));
+                    managerAdapter.setGroupMemberInfoList(data);
+                }
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+
+            }
+        });
+    }
+
+    private void loadGroupOwner() {
+        presenter.loadGroupOwner(groupInfo.getId(), new IUIKitCallback<GroupMemberInfo>() {
+            @Override
+            public void onSuccess(GroupMemberInfo data) {
+                ownerID = data.getAccount();
+                String faceUrl = data.getIconUrl();
+                String displayName = getDisplayName(data);
+                GlideEngine.loadUserIcon(ownerFace, faceUrl);
+                ownerName.setText(displayName);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+
+            }
+        });
+    }
+
+    private void setClickListener() {
+        titleBarLayout.getLeftIcon().setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
+        setManagerView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(SetGroupManagerMinimalistActivity.this, GroupMemberMinimalistActivity.class);
+                intent.putExtra(TUIConstants.TUIGroup.IS_SELECT_MODE, true);
+                ArrayList<String> selectedList = new ArrayList<>();
+                if (managerAdapter.getGroupMemberInfoList() != null) {
+                    for (GroupMemberInfo memberInfo : managerAdapter.getGroupMemberInfoList()) {
+                        selectedList.add(memberInfo.getAccount());
+                    }
+                    intent.putExtra(TUIConstants.TUIGroup.SELECTED_LIST, selectedList);
+                }
+                ArrayList<String> excludeList = new ArrayList<>();
+                excludeList.add(ownerID);
+                intent.putExtra(TUIConstants.TUIGroup.EXCLUDE_LIST, excludeList);
+                intent.putExtra(TUIConstants.TUIGroup.GROUP_ID, groupInfo.getId());
+                startActivityForResult(intent, 1);
+            }
+        });
+
+        managerAdapter.setOnItemLongClickListener(new OnItemLongClickListener() {
+            @Override
+            public void onClick(View view, GroupMemberInfo memberInfo, int position) {
+                Drawable drawable = view.getBackground();
+                if (drawable != null) {
+                    drawable.setColorFilter(0xd9d9d9, PorterDuff.Mode.SRC_IN);
+                }
+                View itemPop = LayoutInflater.from(SetGroupManagerMinimalistActivity.this).inflate(R.layout.group_manager_pop_menu, null);
+                PopupWindow popupWindow = new PopupWindow(itemPop, WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT);
+                popupWindow.setBackgroundDrawable(new ColorDrawable());
+                popupWindow.setOutsideTouchable(true);
+                popupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+                    @Override
+                    public void onDismiss() {
+                        if (drawable != null) {
+                            drawable.clearColorFilter();
+                        }
+                    }
+                });
+                TextView popText = itemPop.findViewById(R.id.pop_text);
+                popText.setText(R.string.group_remove_manager_label);
+                popText.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        popupWindow.dismiss();
+                        presenter.clearGroupManager(groupInfo.getId(), memberInfo.getAccount(), new IUIKitCallback<Void>() {
+                            @Override
+                            public void onSuccess(Void data) {
+                                loadGroupManager();
+                            }
+
+                            @Override
+                            public void onError(String module, int errCode, String errMsg) {
+
+                            }
+                        });
+                    }
+                });
+                int x = view.getWidth() / 2;
+                int y = - view.getHeight() / 3;
+                int popHeight = ScreenUtil.dip2px(45) * 3;
+                if (y + popHeight + view.getY() + view.getHeight() > managerList.getBottom()) {
+                    y = y - popHeight;
+                }
+                popupWindow.showAsDropDown(view, x, y, Gravity.TOP | Gravity.START);
+            }
+        });
+
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == 1 && data != null) {
+            List<String> selectedList = data.getStringArrayListExtra(TUIGroupConstants.Selection.LIST);
+            if (selectedList != null && !selectedList.isEmpty()) {
+                for (String userId : selectedList) {
+                    presenter.setGroupManager(groupInfo.getId(), userId, new IUIKitCallback<Void>() {
+                        @Override
+                        public void onSuccess(Void data) {
+                            loadGroupManager();
+                        }
+
+                        @Override
+                        public void onError(String module, int errCode, String errMsg) {
+                            ToastUtil.toastShortMessage(errCode + ", " + errMsg);
+                        }
+                    });
+                }
+            }
+        }
+    }
+
+    class ManagerAdapter extends RecyclerView.Adapter<ManagerAdapter.ManagerViewHolder> {
+
+        private List<GroupMemberInfo> groupMemberInfoList;
+
+        private OnItemLongClickListener onItemLongClickListener;
+
+        public void setOnItemLongClickListener(OnItemLongClickListener onItemLongClickListener) {
+            this.onItemLongClickListener = onItemLongClickListener;
+        }
+
+        public void setGroupMemberInfoList(List<GroupMemberInfo> groupMemberInfoList) {
+            this.groupMemberInfoList = groupMemberInfoList;
+            notifyDataSetChanged();
+        }
+
+        public List<GroupMemberInfo> getGroupMemberInfoList() {
+            return groupMemberInfoList;
+        }
+
+        @NonNull
+        @Override
+        public ManagerViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            View itemView = LayoutInflater.from(parent.getContext()).inflate(R.layout.group_manager_item, parent, false);
+            return new ManagerViewHolder(itemView);
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull ManagerViewHolder holder, int position) {
+            GroupMemberInfo groupMemberInfo = groupMemberInfoList.get(position);
+            holder.itemView.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    if (onItemLongClickListener != null) {
+                        onItemLongClickListener.onClick(v, groupMemberInfo, position);
+                    }
+                    return true;
+                }
+            });
+            String displayName = getDisplayName(groupMemberInfo);
+            holder.managerName.setText(displayName);
+            GlideEngine.loadUserIcon(holder.faceIcon, groupMemberInfo.getIconUrl());
+        }
+
+        @Override
+        public int getItemCount() {
+            if (groupMemberInfoList == null || groupMemberInfoList.isEmpty()) {
+                return 0;
+            }
+            return groupMemberInfoList.size();
+        }
+
+        class ManagerViewHolder extends RecyclerView.ViewHolder {
+            ShadeImageView faceIcon;
+            TextView managerName;
+            public ManagerViewHolder(@NonNull View itemView) {
+                super(itemView);
+                faceIcon = itemView.findViewById(R.id.group_manager_face);
+                faceIcon.setRadius(ScreenUtil.dip2px(20));
+                managerName = itemView.findViewById(R.id.group_manage_name);
+            }
+        }
+    }
+
+    private String getDisplayName(GroupMemberInfo groupMemberInfo) {
+        String displayName = groupMemberInfo.getNameCard();
+        if (TextUtils.isEmpty(displayName)) {
+            displayName = groupMemberInfo.getNickName();
+        }
+        if (TextUtils.isEmpty(displayName)) {
+            displayName = groupMemberInfo.getAccount();
+        }
+        return displayName;
+    }
+
+    interface OnItemLongClickListener {
+        void onClick(View view, GroupMemberInfo groupMemberInfo, int position);
+    }
+}
\ No newline at end of file
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/view/GroupApplyAdapter.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/view/GroupApplyAdapter.java
new file mode 100644
index 0000000..5456b49
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/view/GroupApplyAdapter.java
@@ -0,0 +1,170 @@
+package com.tencent.qcloud.tuikit.tuigroup.minimalistui.view;
+
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupService;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupApplyInfo;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.presenter.GroupApplyPresenter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class GroupApplyAdapter extends BaseAdapter {
+
+    private List<GroupApplyInfo> mGroupMembers = new ArrayList<>();
+    private OnItemClickListener mOnItemClickListener;
+    private GroupApplyPresenter presenter;
+
+    public GroupApplyAdapter() {
+
+    }
+
+    public void setPresenter(GroupApplyPresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    @Override
+    public int getCount() {
+        return mGroupMembers.size();
+    }
+
+    public int getUnHandledSize() {
+        int total = 0;
+        for (GroupApplyInfo i : mGroupMembers) {
+            if (i.getStatus() == GroupApplyInfo.UNHANDLED) {
+                total++;
+            }
+        }
+        return total;
+    }
+
+    @Override
+    public GroupApplyInfo getItem(int i) {
+        return mGroupMembers.get(i);
+    }
+
+    @Override
+    public long getItemId(int i) {
+        return 0;
+    }
+
+    @Override
+    public View getView(final int i, View view, ViewGroup viewGroup) {
+        MyViewHolder holder;
+        final GroupApplyInfo info = getItem(i);
+        if (view == null) {
+            view = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.group_member_apply_adpater, viewGroup, false);
+            view.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (mOnItemClickListener != null && info.getStatus() == GroupApplyInfo.UNHANDLED) {
+                        mOnItemClickListener.onItemClick(info);
+                    }
+                }
+            });
+            holder = new MyViewHolder();
+            holder.memberIcon = view.findViewById(R.id.group_apply_member_icon);
+            holder.memberName = view.findViewById(R.id.group_apply_member_name);
+            holder.reason = view.findViewById(R.id.group_apply_reason);
+            holder.accept = view.findViewById(R.id.group_apply_accept);
+            holder.refuse = view.findViewById(R.id.group_apply_refuse);
+            view.setTag(holder);
+        } else {
+            holder = (MyViewHolder) view.getTag();
+        }
+        holder.memberName.setText(info.getGroupApplication().getFromUser());
+        holder.reason.setText(info.getGroupApplication().getRequestMsg());
+        if (info.getStatus() == GroupApplyInfo.UNHANDLED) {
+            holder.accept.setVisibility(View.VISIBLE);
+            holder.accept.setText(R.string.accept);
+            holder.accept.setBackground(TUIGroupService.getAppContext().getResources().getDrawable(R.color.bg_positive_btn));
+            holder.accept.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    acceptApply(i, info);
+                }
+            });
+            holder.refuse.setVisibility(View.VISIBLE);
+            holder.refuse.setText(R.string.refuse);
+            holder.refuse.setBackground(TUIGroupService.getAppContext().getResources().getDrawable(R.color.bg_negative_btn));
+            holder.refuse.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    refuseApply(i, info);
+                }
+            });
+        } else if (info.getStatus() == GroupApplyInfo.APPLIED) {
+            holder.accept.setVisibility(View.VISIBLE);
+            holder.accept.setClickable(false);
+            holder.accept.setText(R.string.accepted);
+            holder.accept.setBackground(TUIGroupService.getAppContext().getResources().getDrawable(R.drawable.gray_btn_bg));
+            holder.refuse.setVisibility(View.GONE);
+        } else if (info.getStatus() == GroupApplyInfo.REFUSED) {
+            holder.refuse.setVisibility(View.VISIBLE);
+            holder.refuse.setClickable(false);
+            holder.refuse.setText(R.string.refused);
+            holder.refuse.setBackground(TUIGroupService.getAppContext().getResources().getDrawable(R.drawable.gray_btn_bg));
+            holder.accept.setVisibility(View.GONE);
+        }
+
+        return view;
+    }
+
+    public void setOnItemClickListener(OnItemClickListener l) {
+        mOnItemClickListener = l;
+    }
+
+    public void updateItemData(GroupApplyInfo info) {
+        for (GroupApplyInfo i : mGroupMembers) {
+            if (TextUtils.equals(i.getGroupApplication().getFromUser(), info.getGroupApplication().getFromUser())) {
+                i.setStatus(info.getStatus());
+                notifyDataSetChanged();
+                break;
+            }
+        }
+    }
+
+    public void setDataSource(GroupInfo info) {
+        presenter.loadGroupApplies();
+    }
+
+    public void setDataSource(List<GroupApplyInfo> applyInfoList) {
+        mGroupMembers = applyInfoList;
+        notifyDataSetChanged();
+    }
+
+    public void acceptApply(final int position, final GroupApplyInfo item) {
+        if (presenter == null) {
+            return;
+        }
+        presenter.acceptApply(item);
+    }
+
+    public void refuseApply(final int position, final GroupApplyInfo item) {
+        if (presenter == null) {
+            return;
+        }
+        presenter.refuseApply(item);
+    }
+
+    public interface OnItemClickListener {
+        void onItemClick(GroupApplyInfo info);
+    }
+
+    private class MyViewHolder {
+        private ImageView memberIcon;
+        private TextView memberName, reason;
+        private Button accept, refuse;
+    }
+
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/view/GroupApplyManagerLayout.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/view/GroupApplyManagerLayout.java
new file mode 100644
index 0000000..3a387b4
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/view/GroupApplyManagerLayout.java
@@ -0,0 +1,109 @@
+package com.tencent.qcloud.tuikit.tuigroup.minimalistui.view;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupConstants;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupApplyInfo;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.interfaces.IGroupApplyLayout;
+import com.tencent.qcloud.tuikit.tuigroup.presenter.GroupApplyPresenter;
+
+import java.util.HashMap;
+import java.util.List;
+
+
+public class GroupApplyManagerLayout extends LinearLayout implements IGroupApplyLayout {
+
+    private TitleBarLayout mTitleBar;
+    private ListView mApplyMemberList;
+    private GroupApplyAdapter mAdapter;
+
+    private GroupApplyPresenter presenter;
+    public GroupApplyManagerLayout(Context context) {
+        super(context);
+        init();
+    }
+
+    public GroupApplyManagerLayout(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public GroupApplyManagerLayout(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private void init() {
+        inflate(getContext(), R.layout.group_apply_manager_layout, this);
+        mApplyMemberList = findViewById(R.id.group_apply_members);
+        mAdapter = new GroupApplyAdapter();
+        mAdapter.setOnItemClickListener(new GroupApplyAdapter.OnItemClickListener() {
+            @Override
+            public void onItemClick(GroupApplyInfo info) {
+                Bundle bundle = new Bundle();
+                bundle.putString("fromUser", info.getFromUser());
+                bundle.putString("fromUserNickName", info.getFromUserNickName());
+                bundle.putString("requestMsg", info.getRequestMsg());
+                bundle.putSerializable("groupApplication", info.getGroupApplication());
+                TUICore.startActivity(getContext(),"FriendProfileActivity", bundle, TUIGroupConstants.ActivityRequest.CODE_1);
+            }
+        });
+        mApplyMemberList.setAdapter(mAdapter);
+        mTitleBar = findViewById(R.id.group_apply_title_bar);
+        mTitleBar.getRightGroup().setVisibility(View.GONE);
+        mTitleBar.setTitle(getResources().getString(R.string.group_apply_members), ITitleBarLayout.Position.MIDDLE);
+        mTitleBar.setOnLeftClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (getContext() instanceof Activity) {
+                    ((Activity) getContext()).finish();
+                }
+            }
+        });
+    }
+
+    public TitleBarLayout getTitleBar() {
+        return mTitleBar;
+    }
+
+    public void updateItemData(GroupApplyInfo info) {
+        mAdapter.updateItemData(info);
+    }
+
+    public void onDataSetChanged() {
+        mAdapter.notifyDataSetChanged();
+
+        HashMap<String, Object> param = new HashMap<>();
+        param.put(TUIConstants.TUIChat.IS_GROUP_CHAT, true);
+        param.put(TUIConstants.TUIChat.GROUP_APPLY_NUM, mAdapter.getCount()-1);
+        TUICore.callService(TUIConstants.TUIChat.SERVICE_NAME, TUIConstants.TUIChat.METHOD_GROUP_APPLICAITON_PROCESSED, param);
+    }
+
+    public void setPresenter(GroupApplyPresenter groupApplyPresenter) {
+        this.presenter = groupApplyPresenter;
+        mAdapter.setPresenter(groupApplyPresenter);
+    }
+
+    public void onGroupApplyInfoListChanged(List<GroupApplyInfo> applyInfoList) {
+        mAdapter.setDataSource(applyInfoList);
+    }
+
+    public void setDataSource(GroupInfo dataSource) {
+        presenter.setGroupInfo(dataSource);
+        mAdapter.setDataSource(dataSource);
+    }
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/view/GroupInfoAdapter.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/view/GroupInfoAdapter.java
new file mode 100644
index 0000000..8ff3f41
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/view/GroupInfoAdapter.java
@@ -0,0 +1,216 @@
+package com.tencent.qcloud.tuikit.tuigroup.minimalistui.view;
+
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.component.gatherimage.ShadeImageView;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.util.BackgroundTasks;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuigroup.minimalistui.interfaces.IGroupMemberListener;
+import com.tencent.qcloud.tuikit.tuigroup.presenter.GroupInfoPresenter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class GroupInfoAdapter extends BaseAdapter {
+
+    private static final int ADD_TYPE = -100;
+    private static final int DEL_TYPE = -101;
+    private static final int OWNER_PRIVATE_MAX_LIMIT = 8;  //讨论组,owner可以添加成员和删除成员，
+    private static final int OWNER_PUBLIC_MAX_LIMIT = 9;   //公开群,owner不可以添加成员，但是可以删除成员
+    private static final int OWNER_CHATROOM_MAX_LIMIT = 9; //聊天室,owner不可以添加成员，但是可以删除成员
+    private static final int OWNER_COMMUNITY_MAX_LIMIT = 8; //社群,owner可以添加成员和删除成员，
+    private static final int NORMAL_PRIVATE_MAX_LIMIT = 9; //讨论组,普通人可以添加成员
+    private static final int NORMAL_PUBLIC_MAX_LIMIT = 10;  //公开群,普通人没有权限添加成员和删除成员
+    private static final int NORMAL_CHATROOM_MAX_LIMIT = 10; //聊天室,普通人没有权限添加成员和删除成员
+    private static final int NORMAL_COMMUNITY_MAX_LIMIT = 9; //社群,普通人可以添加成员
+
+    private List<GroupMemberInfo> mGroupMembers = new ArrayList<>();
+    private IGroupMemberListener mTailListener;
+    private GroupInfo mGroupInfo;
+
+    private GroupInfoPresenter presenter;
+
+    public void setPresenter(GroupInfoPresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    public void setManagerCallBack(IGroupMemberListener listener) {
+        mTailListener = listener;
+    }
+
+    @Override
+    public int getCount() {
+        return mGroupMembers.size();
+    }
+
+    @Override
+    public GroupMemberInfo getItem(int i) {
+        return mGroupMembers.get(i);
+    }
+
+    @Override
+    public long getItemId(int i) {
+        return 0;
+    }
+
+    @Override
+    public View getView(final int i, View view, final ViewGroup viewGroup) {
+        MyViewHolder holder;
+        if (view == null) {
+            view = LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.group_member_item_layout, viewGroup, false);
+            holder = new MyViewHolder();
+            holder.memberIcon = view.findViewById(R.id.group_member_icon);
+            holder.memberIcon.setRadius(ScreenUtil.dip2px(24));
+            holder.memberName = view.findViewById(R.id.group_member_name);
+            view.setTag(holder);
+        } else {
+            holder = (MyViewHolder) view.getTag();
+        }
+        final GroupMemberInfo info = getItem(i);
+        GlideEngine.loadImage(holder.memberIcon, info.getIconUrl());
+        // 显示优先级 群名片->昵称->账号
+        if (!TextUtils.isEmpty(info.getNameCard())) {
+            holder.memberName.setText(info.getNameCard());
+        } else {
+            if (!TextUtils.isEmpty(info.getNickName())) {
+                holder.memberName.setText(info.getNickName());
+            } else {
+                if (!TextUtils.isEmpty(info.getAccount())) {
+                    holder.memberName.setText(info.getAccount());
+                } else {
+                    holder.memberName.setText("");
+                }
+            }
+        }
+        view.setOnClickListener(null);
+        holder.memberIcon.setBackground(null);
+        holder.memberIcon.setScaleType(ImageView.ScaleType.CENTER_CROP);
+        if (info.getMemberType() == ADD_TYPE) {
+            holder.memberIcon.setImageResource(R.drawable.add_group_member);
+            holder.memberIcon.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
+            holder.memberIcon.setBackgroundResource(R.drawable.group_minimalist_add_border);
+            view.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (mTailListener != null) {
+                        mTailListener.forwardAddMember(mGroupInfo);
+                    }
+                }
+            });
+        } else if (info.getMemberType() == DEL_TYPE) {
+            holder.memberIcon.setImageResource(R.drawable.del_group_member);
+            holder.memberIcon.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
+            holder.memberIcon.setBackgroundResource(R.drawable.bottom_action_border);
+            view.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (mTailListener != null) {
+                        mTailListener.forwardDeleteMember(mGroupInfo);
+                    }
+                }
+            });
+        }
+        return view;
+    }
+
+    public void setDataSource(GroupInfo info) {
+        mGroupInfo = info;
+        mGroupMembers.clear();
+        List<GroupMemberInfo> members = info.getMemberDetails();
+        if (members != null) {
+            int shootMemberCount = 0;
+            if (TextUtils.equals(info.getGroupType(), TUIConstants.GroupType.TYPE_PRIVATE)
+                    || TextUtils.equals(info.getGroupType(), TUIConstants.GroupType.TYPE_WORK)) {
+                if (info.isOwner()) {
+                    shootMemberCount = members.size() > OWNER_PRIVATE_MAX_LIMIT ? OWNER_PRIVATE_MAX_LIMIT : members.size();
+                } else {
+                    shootMemberCount = members.size() > NORMAL_PRIVATE_MAX_LIMIT ? NORMAL_PRIVATE_MAX_LIMIT : members.size();
+                }
+            } else if (TextUtils.equals(info.getGroupType(), TUIConstants.GroupType.TYPE_PUBLIC)) {
+                if (info.isOwner()) {
+                    shootMemberCount = members.size() > OWNER_PUBLIC_MAX_LIMIT ? OWNER_PUBLIC_MAX_LIMIT : members.size();
+                } else {
+                    shootMemberCount = members.size() > NORMAL_PUBLIC_MAX_LIMIT ? NORMAL_PUBLIC_MAX_LIMIT : members.size();
+                }
+            } else if (TextUtils.equals(info.getGroupType(), TUIConstants.GroupType.TYPE_CHAT_ROOM)
+                    || TextUtils.equals(info.getGroupType(), TUIConstants.GroupType.TYPE_MEETING)) {
+                if (info.isOwner()) {
+                    shootMemberCount = members.size() > OWNER_CHATROOM_MAX_LIMIT ? OWNER_CHATROOM_MAX_LIMIT : members.size();
+                } else {
+                    shootMemberCount = members.size() > NORMAL_CHATROOM_MAX_LIMIT ? NORMAL_CHATROOM_MAX_LIMIT : members.size();
+                }
+            } else if (TextUtils.equals(info.getGroupType(), TUIConstants.GroupType.TYPE_COMMUNITY)) {
+                if (info.isOwner()) {
+                    shootMemberCount = members.size() > OWNER_COMMUNITY_MAX_LIMIT ? OWNER_COMMUNITY_MAX_LIMIT : members.size();
+                } else {
+                    shootMemberCount = members.size() > NORMAL_COMMUNITY_MAX_LIMIT ? NORMAL_COMMUNITY_MAX_LIMIT : members.size();
+                }
+            }
+
+            for (int i = 0; i < shootMemberCount; i++) {
+                mGroupMembers.add(members.get(i));
+            }
+            if (TextUtils.equals(info.getGroupType(), TUIConstants.GroupType.TYPE_PRIVATE)
+                    || TextUtils.equals(info.getGroupType(), TUIConstants.GroupType.TYPE_WORK)
+                    || TextUtils.equals(info.getGroupType(), TUIConstants.GroupType.TYPE_COMMUNITY)) {
+                // 公开群/聊天室 只有APP管理员可以邀请他人入群
+                GroupMemberInfo add = new GroupMemberInfo();
+                add.setMemberType(ADD_TYPE);
+                mGroupMembers.add(add);
+            }
+            GroupMemberInfo self = null;
+            for (int i = 0; i < mGroupMembers.size(); i++) {
+                GroupMemberInfo memberInfo = mGroupMembers.get(i);
+                if (isSelf(memberInfo.getAccount())) {
+                    self = memberInfo;
+                    break;
+                }
+            }
+            if (info.isOwner() || (self != null && isAdmin(self.getMemberType()))) {
+                GroupMemberInfo del = new GroupMemberInfo();
+                del.setMemberType(DEL_TYPE);
+                mGroupMembers.add(del);
+            }
+            BackgroundTasks.getInstance().runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    notifyDataSetChanged();
+                }
+            });
+        }
+
+    }
+
+    public boolean isAdmin(int memberType) {
+        if (presenter != null) {
+            return presenter.isAdmin(memberType);
+        }
+        return false;
+    }
+
+    public boolean isSelf(String userId) {
+        if (presenter != null) {
+            return presenter.isSelf(userId);
+        }
+        return false;
+    }
+
+    private class MyViewHolder {
+        private ShadeImageView memberIcon;
+        private TextView memberName;
+    }
+
+
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/view/GroupInfoLayout.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/view/GroupInfoLayout.java
new file mode 100644
index 0000000..31a8bf3
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/view/GroupInfoLayout.java
@@ -0,0 +1,682 @@
+package com.tencent.qcloud.tuikit.tuigroup.minimalistui.view;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CompoundButton;
+import android.widget.GridView;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.component.LineControllerView;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.activities.SelectionActivity;
+import com.tencent.qcloud.tuicore.component.dialog.TUIKitDialog;
+import com.tencent.qcloud.tuicore.component.gatherimage.ShadeImageView;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.component.popupcard.PopupInputCard;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuicore.util.TUIUtil;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupConstants;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupService;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.component.BottomSelectSheet;
+import com.tencent.qcloud.tuikit.tuigroup.interfaces.IGroupMemberLayout;
+import com.tencent.qcloud.tuikit.tuigroup.minimalistui.interfaces.IGroupMemberListener;
+import com.tencent.qcloud.tuikit.tuigroup.minimalistui.page.GroupInfoMinimalistActivity;
+import com.tencent.qcloud.tuikit.tuigroup.minimalistui.page.GroupInfoMinimalistFragment;
+import com.tencent.qcloud.tuikit.tuigroup.minimalistui.page.GroupMemberMinimalistActivity;
+import com.tencent.qcloud.tuikit.tuigroup.minimalistui.page.GroupNoticeMinimalistActivity;
+import com.tencent.qcloud.tuikit.tuigroup.minimalistui.page.ManageGroupMinimalistActivity;
+import com.tencent.qcloud.tuikit.tuigroup.presenter.GroupInfoPresenter;
+import com.tencent.qcloud.tuikit.tuigroup.util.TUIGroupLog;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+public class GroupInfoLayout extends LinearLayout implements IGroupMemberLayout, View.OnClickListener {
+
+    private static final String TAG = GroupInfoLayout.class.getSimpleName();
+    private TitleBarLayout mTitleBar;
+    private LineControllerView mMemberView;
+    private GroupInfoAdapter mMemberAdapter;
+    private IGroupMemberListener mMemberPreviewListener;
+    private LineControllerView mGroupTypeView;
+    private TextView mGroupIDView;
+    private TextView mGroupNameView;
+    private View groupDetailArea;
+    private ShadeImageView mGroupIcon;
+    private ImageView mGroupDetailArrow;
+    private View mGroupNotice;
+    private TextView mGroupNoticeText;
+    private LineControllerView mGroupManageView;
+    private LineControllerView mNickView;
+    private LineControllerView mJoinTypeView;
+    private LineControllerView mTopSwitchView;
+    private LineControllerView mMsgRevOptionSwitchView;
+    private LineControllerView mFoldGroupChatSwitchView;
+    private LineControllerView mChatBackground;
+    private View mLayoutFold;
+    private TextView mDissolveBtn;
+    private TextView mClearMsgBtn;
+    private TextView mChangeOwnerBtn;
+    private GridView memberList;
+
+    private OnButtonClickListener mListener;
+
+    private GroupInfo mGroupInfo;
+    private GroupInfoPresenter mPresenter;
+    private ArrayList<String> mJoinTypes = new ArrayList<>();
+    private GroupInfoMinimalistFragment.OnModifyGroupAvatarListener onModifyGroupAvatarListener;
+    public GroupInfoLayout(Context context) {
+        super(context);
+        init();
+    }
+
+    public GroupInfoLayout(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public GroupInfoLayout(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private void init() {
+        inflate(getContext(), R.layout.group_info_layout, this);
+        // 标题
+        mTitleBar = findViewById(R.id.group_info_title_bar);
+        mTitleBar.getRightGroup().setVisibility(GONE);
+        mTitleBar.setTitle(getResources().getString(R.string.group_detail), ITitleBarLayout.Position.MIDDLE);
+        mTitleBar.setOnLeftClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                ((Activity) getContext()).finish();
+            }
+        });
+
+        // 成员标题
+        mMemberView = findViewById(R.id.group_member_bar);
+        mMemberView.setOnClickListener(this);
+        mMemberView.setCanNav(true);
+        // 成员列表
+        memberList = findViewById(R.id.group_members);
+        mMemberAdapter = new GroupInfoAdapter();
+        memberList.setAdapter(mMemberAdapter);
+        // 群类型，只读
+        mGroupTypeView = findViewById(R.id.group_type_bar);
+        // 群ID，只读
+        mGroupIDView = findViewById(R.id.group_account);
+        // 群聊名称
+        mGroupNameView = findViewById(R.id.group_name);
+
+        groupDetailArea = findViewById(R.id.group_detail_area);
+        groupDetailArea.setOnClickListener(this);
+        // 群头像
+        mGroupIcon = findViewById(R.id.group_icon);
+        mGroupIcon.setRadius(ScreenUtil.dip2px(25));
+        mGroupIcon.setOnClickListener(this);
+
+        // 群详情右箭头
+        mGroupDetailArrow = findViewById(R.id.group_detail_arrow);
+
+        // 群公告
+        mGroupNotice = findViewById(R.id.group_notice);
+        mGroupNotice.setOnClickListener(this);
+        mGroupNoticeText = findViewById(R.id.group_notice_text);
+        // 群管理
+        mGroupManageView = findViewById(R.id.group_manage);
+        mGroupManageView.setOnClickListener(this);
+
+        // 加群方式
+        mJoinTypeView = findViewById(R.id.join_type_bar);
+        mJoinTypeView.setOnClickListener(this);
+        mJoinTypeView.setCanNav(true);
+        mJoinTypes.addAll(Arrays.asList(getResources().getStringArray(R.array.group_join_type)));
+        // 群昵称
+        mNickView = findViewById(R.id.self_nickname_bar);
+        mNickView.setOnClickListener(this);
+        mNickView.setCanNav(true);
+        // 是否置顶
+        mTopSwitchView = findViewById(R.id.chat_to_top_switch);
+        mTopSwitchView.setCheckListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(final CompoundButton buttonView, boolean isChecked) {
+                if (mGroupInfo == null) {
+                    return;
+                }
+                mPresenter.setTopConversation(mGroupInfo.getId(), isChecked, new IUIKitCallback<Void>() {
+                    @Override
+                    public void onSuccess(Void data) {
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        ToastUtil.toastShortMessage(module + ", Error code = " + errCode + ", desc = " + errMsg);
+                        buttonView.setChecked(false);
+                    }
+                });
+            }
+        });
+        // 消息接收选项
+        mMsgRevOptionSwitchView = findViewById(R.id.msg_rev_option);
+        // 折叠
+        mLayoutFold = findViewById(R.id.layout_fold);
+        mFoldGroupChatSwitchView = findViewById(R.id.fold_group_chat);
+
+        // 退群
+        mDissolveBtn = findViewById(R.id.group_dissolve_button);
+        mDissolveBtn.setOnClickListener(this);
+
+        // 清空群消息按钮
+        mClearMsgBtn = findViewById(R.id.group_clear_msg_button);
+        mClearMsgBtn.setOnClickListener(this);
+
+        // 转让群主
+        mChangeOwnerBtn = findViewById(R.id.group_change_owner_button);
+        mChangeOwnerBtn.setOnClickListener(this);
+
+        mChatBackground = findViewById(R.id.chat_background);
+        mChatBackground.setOnClickListener(this);
+        mChatBackground.setCanNav(true);
+    }
+
+    private void initView() {
+        int radius = ScreenUtil.dip2px(5);
+        GlideEngine.loadUserIcon(mGroupIcon, mGroupInfo.getFaceUrl(), TUIUtil.getDefaultGroupIconResIDByGroupType(getContext(), mGroupInfo.getGroupType()), radius);
+        if (!mGroupInfo.isCanManagerGroup()) {
+            mGroupDetailArrow.setVisibility(GONE);
+        }
+        if (mGroupInfo.isOwner()) {
+            mChangeOwnerBtn.setVisibility(VISIBLE);
+        } else {
+            mChangeOwnerBtn.setVisibility(GONE);
+        }
+    }
+
+    public void setGroupInfoPresenter(GroupInfoPresenter presenter) {
+        this.mPresenter = presenter;
+        if (mMemberAdapter != null) {
+            mMemberAdapter.setPresenter(presenter);
+        }
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (mGroupInfo == null) {
+            TUIGroupLog.e(TAG, "mGroupInfo is NULL");
+            return;
+        }
+        if (v.getId() == R.id.group_member_bar) {
+            if (mMemberPreviewListener != null) {
+                mMemberPreviewListener.forwardListMember(mGroupInfo);
+            }
+        } else if (v.getId() == R.id.group_detail_area) {
+            if (!mGroupInfo.isCanManagerGroup()) {
+                return;
+            }
+            PopupInputCard popupInputCard = new PopupInputCard((Activity) getContext());
+            BottomSelectSheet sheet = new BottomSelectSheet(getContext());
+            List<String> stringList = new ArrayList<>();
+            String modifyGroupName = getResources().getString(R.string.modify_group_name);
+            String modifyGroupNotice = getResources().getString(R.string.modify_group_notice);
+            stringList.add(modifyGroupName);
+            stringList.add(modifyGroupNotice);
+            sheet.setSelectList(stringList);
+            sheet.setOnClickListener(new BottomSelectSheet.BottomSelectSheetOnClickListener() {
+                @Override
+                public void onSheetClick(int index) {
+                    if (index == 0) {
+                        popupInputCard.setContent(mGroupNameView.getText().toString());
+                        popupInputCard.setTitle(modifyGroupName);
+                        popupInputCard.setOnPositive((result -> {
+                            mPresenter.modifyGroupName(result);
+                            if (!TextUtils.isEmpty(result)) {
+                                mGroupNameView.setText(result);
+                            }
+                        }));
+                        popupInputCard.show(groupDetailArea, Gravity.BOTTOM);
+                    } else if (index == 1) {
+                        popupInputCard.setContent(mGroupNoticeText.getText().toString());
+                        popupInputCard.setTitle(modifyGroupNotice);
+                        popupInputCard.setOnPositive((result -> {
+                            mPresenter.modifyGroupNotice(result);
+                            if (TextUtils.isEmpty(result)) {
+                                mGroupNoticeText.setText(getResources().getString(R.string.group_notice_empty_tip));
+                            } else {
+                                mGroupNoticeText.setText(result);
+                            }
+                        }));
+                        popupInputCard.show(groupDetailArea, Gravity.BOTTOM);
+                    }
+                }
+            });
+            sheet.show();
+        } else if (v.getId() == R.id.group_icon) {
+            if (!mGroupInfo.isCanManagerGroup()) {
+                return;
+            }
+
+            if (onModifyGroupAvatarListener != null) {
+                onModifyGroupAvatarListener.onModifyGroupAvatar(mGroupInfo.getFaceUrl());
+            }
+        } else if (v.getId() == R.id.group_notice) {
+            Intent intent = new Intent(getContext(), GroupNoticeMinimalistActivity.class);
+            GroupNoticeMinimalistActivity.setOnGroupNoticeChangedListener(new GroupNoticeMinimalistActivity.OnGroupNoticeChangedListener() {
+                @Override
+                public void onChanged(String notice) {
+                    if (TextUtils.isEmpty(notice)) {
+                        mGroupNoticeText.setText(getResources().getString(R.string.group_notice_empty_tip));
+                    } else {
+                        mGroupNoticeText.setText(notice);
+                    }
+                }
+            });
+            intent.putExtra(TUIGroupConstants.Group.GROUP_INFO, mGroupInfo);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            getContext().startActivity(intent);
+        } else if (v.getId() == R.id.self_nickname_bar) {
+            PopupInputCard popupInputCard = new PopupInputCard((Activity) getContext());
+            popupInputCard.setContent(mNickView.getContent());
+            popupInputCard.setTitle(getResources().getString(R.string.modify_nick_name_in_goup));
+            String description = getResources().getString(R.string.group_modify_remark_rule);
+            popupInputCard.setRule("^[a-zA-Z0-9_\u4e00-\u9fa5]*$");
+            popupInputCard.setDescription(description);
+            popupInputCard.setOnPositive((result -> {
+                mPresenter.modifyMyGroupNickname(result);
+                mNickView.setContent(result);
+            }));
+            popupInputCard.show(mNickView, Gravity.BOTTOM);
+
+        } else if (v.getId() == R.id.join_type_bar) {
+            if (mGroupTypeView.getContent().equals(getContext().getString(R.string.chat_room))) {
+                ToastUtil.toastLongMessage(getContext().getString(R.string.chat_room_tip));
+                return;
+            }
+            Bundle bundle = new Bundle();
+            bundle.putString(SelectionActivity.Selection.TITLE, getResources().getString(R.string.group_join_type));
+            bundle.putStringArrayList(SelectionActivity.Selection.LIST, mJoinTypes);
+            bundle.putInt(SelectionActivity.Selection.DEFAULT_SELECT_ITEM_INDEX, mGroupInfo.getJoinType());
+            SelectionActivity.startListSelection((Activity) getContext(), bundle, new SelectionActivity.OnResultReturnListener() {
+                @Override
+                public void onReturn(final Object text) {
+                    mPresenter.modifyGroupInfo((Integer) text, TUIGroupConstants.Group.MODIFY_GROUP_JOIN_TYPE);
+                }
+            });
+        } else if (v.getId() == R.id.group_dissolve_button) {
+            if (mGroupInfo.isOwner() &&
+                    (!mGroupInfo.getGroupType().equals(TUIConstants.GroupType.TYPE_WORK)
+                            && !mGroupInfo.getGroupType().equals(TUIConstants.GroupType.TYPE_PRIVATE))) {
+                new TUIKitDialog(getContext())
+                        .builder()
+                        .setCancelable(true)
+                        .setCancelOutside(true)
+                        .setTitle(getContext().getString(R.string.dismiss_group_tip))
+                        .setDialogWidth(0.75f)
+                        .setPositiveButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.sure), new OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                mPresenter.deleteGroup(new IUIKitCallback<Void>() {
+                                    @Override
+                                    public void onSuccess(Void data) {
+                                        ((Activity) GroupInfoLayout.this.getContext()).finish();
+                                    }
+
+                                    @Override
+                                    public void onError(String module, int errCode, String errMsg) {
+                                        ToastUtil.toastLongMessage(errMsg);
+                                    }
+                                });
+                            }
+                        })
+                        .setNegativeButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.cancel), new OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+
+                            }
+                        })
+                        .show();
+            } else {
+                new TUIKitDialog(getContext())
+                        .builder()
+                        .setCancelable(true)
+                        .setCancelOutside(true)
+                        .setTitle(getContext().getString(R.string.quit_group_tip))
+                        .setDialogWidth(0.75f)
+                        .setPositiveButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.sure), new OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+                                mPresenter.quitGroup(new IUIKitCallback<Void>() {
+                                    @Override
+                                    public void onSuccess(Void data) {
+                                        ((Activity) GroupInfoLayout.this.getContext()).finish();
+                                    }
+
+                                    @Override
+                                    public void onError(String module, int errCode, String errMsg) {
+                                        ((Activity) GroupInfoLayout.this.getContext()).finish();
+                                        ToastUtil.toastShortMessage("quitGroup failed, errCode =  " + errCode + " errMsg = " + errMsg);
+                                    }
+                                });
+                            }
+                        })
+                        .setNegativeButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.cancel), new OnClickListener() {
+                            @Override
+                            public void onClick(View v) {
+
+                            }
+                        })
+                        .show();
+            }
+        } else if (v.getId() == R.id.group_clear_msg_button) {
+            new TUIKitDialog(getContext())
+                    .builder()
+                    .setCancelable(true)
+                    .setCancelOutside(true)
+                    .setTitle(getContext().getString(R.string.clear_group_msg_tip))
+                    .setDialogWidth(0.75f)
+                    .setPositiveButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.sure), new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            Map<String, Object> hashMap = new HashMap<>();
+                            hashMap.put(TUIConstants.TUIGroup.GROUP_ID, mGroupInfo.getId());
+                            TUICore.notifyEvent(TUIConstants.TUIGroup.EVENT_GROUP,
+                                    TUIConstants.TUIGroup.EVENT_SUB_KEY_CLEAR_MESSAGE, hashMap);
+                        }
+                    })
+                    .setNegativeButton(getContext().getString(com.tencent.qcloud.tuicore.R.string.cancel), new OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+
+                        }
+                    })
+                    .show();
+        } else if (v.getId() == R.id.group_manage) {
+            Intent intent = new Intent(getContext(), ManageGroupMinimalistActivity.class);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra(TUIGroupConstants.Group.GROUP_INFO, mGroupInfo);
+            getContext().startActivity(intent);
+        } else if (v == mChangeOwnerBtn) {
+            ArrayList<String> excludeList = new ArrayList<>();
+            excludeList.add(TUILogin.getLoginUser());
+            Intent intent = new Intent(getContext(), GroupMemberMinimalistActivity.class);
+            intent.putExtra(TUIConstants.TUIGroup.IS_SELECT_MODE, true);
+            intent.putExtra(TUIConstants.TUIGroup.GROUP_ID, mGroupInfo.getId());
+            intent.putExtra(TUIConstants.TUIGroup.LIMIT, 1);
+            intent.putExtra(TUIConstants.TUIGroup.EXCLUDE_LIST, excludeList);
+            intent.putExtra(TUIConstants.TUIGroup.TITLE, getResources().getString(R.string.group_transfer_group_owner));
+            ((Activity) getContext()).startActivityForResult(intent, GroupInfoMinimalistActivity.REQUEST_FOR_CHANGE_OWNER);
+        } else if (v.getId() == R.id.chat_background) {
+            if (mListener != null) {
+                mListener.onSetChatBackground();
+            }
+        }
+    }
+
+    public void loadGroupInfo(String groupId) {
+        mPresenter.loadGroupInfo(groupId);
+    }
+
+    public void getGroupMembers(GroupInfo groupInfo) {
+        mPresenter.getGroupMembers(groupInfo, new IUIKitCallback<GroupInfo>() {
+            @Override
+            public void onSuccess(GroupInfo data) {
+                setGroupInfo((GroupInfo) data);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+
+            }
+        });
+    }
+
+    public void setGroupInfo(GroupInfo info) {
+        if (info == null) {
+            return;
+        }
+        this.mGroupInfo = info;
+        mGroupNameView.setText(info.getGroupName());
+        mGroupIDView.setText(info.getId());
+        if (TextUtils.isEmpty(info.getNotice())) {
+            mGroupNoticeText.setText(getResources().getString(R.string.group_notice_empty_tip));
+        } else {
+            mGroupNoticeText.setText(info.getNotice());
+        }
+        mMemberView.setContent(info.getMemberCount() + "人");
+        mMemberAdapter.setDataSource(info);
+
+        int columnNum = memberList.getNumColumns();
+        int rowNum = (int) Math.ceil(mMemberAdapter.getCount() * 1.0f / columnNum);
+        int itemHeight = ScreenUtil.dip2px(88);
+        ViewGroup.LayoutParams layoutParams = memberList.getLayoutParams();
+        layoutParams.height = itemHeight * rowNum;
+        memberList.setLayoutParams(layoutParams);
+
+        mGroupTypeView.setContent(convertGroupText(info.getGroupType()));
+        mJoinTypeView.setContent(mJoinTypes.get(info.getJoinType()));
+        mNickView.setContent(mPresenter.getNickName());
+        mTopSwitchView.setChecked(mGroupInfo.isTopChat());
+
+        if (GroupInfo.GROUP_TYPE_MEETING.equals(info.getGroupType())) {
+            mMsgRevOptionSwitchView.setVisibility(GONE);
+            mLayoutFold.setVisibility(GONE);
+        } else {
+            if (mGroupInfo.getMessageReceiveOption()) {
+                mLayoutFold.setVisibility(View.VISIBLE);
+                if (mGroupInfo.isFolded()) {
+                    mFoldGroupChatSwitchView.setChecked(true);
+                }
+            } else {
+                mLayoutFold.setVisibility(View.GONE);
+            }
+            
+            mMsgRevOptionSwitchView.setChecked(mGroupInfo.getMessageReceiveOption());
+            mMsgRevOptionSwitchView.setCheckListener(new CompoundButton.OnCheckedChangeListener() {
+                @Override
+                public void onCheckedChanged(final CompoundButton buttonView, boolean isChecked) {
+                    mPresenter.setGroupNotDisturb(mGroupInfo, isChecked, new IUIKitCallback<Void>() {
+                        @Override
+                        public void onSuccess(Void data) {
+                            if (!isChecked) {
+                                mLayoutFold.setVisibility(View.GONE);
+                                if (mGroupInfo.isFolded()) {
+                                    mPresenter.setGroupFold(mGroupInfo, false, new IUIKitCallback<Void>() {
+                                        @Override
+                                        public void onSuccess(Void data) {
+                                            mFoldGroupChatSwitchView.setChecked(false);
+                                        }
+
+                                        @Override
+                                        public void onError(String module, int errCode, String errMsg) {
+                                            ToastUtil.toastShortMessage(module + ", Error code = " + errCode + ", desc = " + errMsg);
+                                        }
+                                    });
+                                }
+                            } else {
+                                mLayoutFold.setVisibility(View.VISIBLE);
+                            }
+                        }
+
+                        @Override
+                        public void onError(String module, int errCode, String errMsg) {
+                            ToastUtil.toastShortMessage(module + ", Error code = " + errCode + ", desc = " + errMsg);
+                        }
+                    });
+                }
+            });
+        }
+
+        if (mGroupInfo.isFolded()) {
+            mTopSwitchView.setMask(true);
+        }
+
+        mFoldGroupChatSwitchView.setCheckListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                mPresenter.setGroupFold(mGroupInfo, isChecked, new IUIKitCallback<Void>() {
+                    @Override
+                    public void onSuccess(Void data) {
+                        if (isChecked) {
+                            if (mGroupInfo.isTopChat()) {
+                                mPresenter.setTopConversation(mGroupInfo.getId(), false, new IUIKitCallback<Void>() {
+                                    @Override
+                                    public void onSuccess(Void data) {
+                                        mTopSwitchView.setChecked(false);
+                                        mTopSwitchView.setMask(true);
+                                    }
+
+                                    @Override
+                                    public void onError(String module, int errCode, String errMsg) {
+                                        ToastUtil.toastShortMessage(module + ", Error code = " + errCode + ", desc = " + errMsg);
+                                    }
+                                });
+                            } else {
+                                mTopSwitchView.setMask(true);
+                            }
+                        } else {
+                            mTopSwitchView.setMask(false);
+                        }
+                    }
+
+                    @Override
+                    public void onError(String module, int errCode, String errMsg) {
+                        ToastUtil.toastShortMessage(module + ", Error code = " + errCode + ", desc = " + errMsg);
+                    }
+                });
+            }
+        });
+
+        mDissolveBtn.setText(R.string.dissolve);
+        mClearMsgBtn.setText(R.string.clear_message);
+        if (mGroupInfo.isOwner()) {
+            mJoinTypeView.setVisibility(VISIBLE);
+            if (mGroupInfo.getGroupType().equals(TUIConstants.GroupType.TYPE_WORK)
+                    || mGroupInfo.getGroupType().equals(TUIConstants.GroupType.TYPE_PRIVATE)) {
+                mDissolveBtn.setText(R.string.exit_group);
+            }
+        } else {
+            mJoinTypeView.setCanNav(false);
+            mJoinTypeView.setOnClickListener(null);
+            mDissolveBtn.setText(R.string.exit_group);
+        }
+
+        if (mGroupInfo.isCanManagerGroup()) {
+            mGroupManageView.setVisibility(VISIBLE);
+        }
+
+        initView();
+    }
+
+    private String convertGroupText(String groupType) {
+        String groupText = "";
+        if (TextUtils.isEmpty(groupType)) {
+            return groupText;
+        }
+        if (TextUtils.equals(groupType, TUIConstants.GroupType.TYPE_PRIVATE)
+                || TextUtils.equals(groupType, TUIConstants.GroupType.TYPE_WORK)) {
+            groupText = getContext().getString(R.string.private_group);
+        } else if (TextUtils.equals(groupType, TUIConstants.GroupType.TYPE_PUBLIC)) {
+            groupText = getContext().getString(R.string.public_group);
+        } else if (TextUtils.equals(groupType, TUIConstants.GroupType.TYPE_CHAT_ROOM)
+                || TextUtils.equals(groupType, TUIConstants.GroupType.TYPE_MEETING)) {
+            groupText = getContext().getString(R.string.chat_room);
+        } else if (TextUtils.equals(groupType, TUIConstants.GroupType.TYPE_COMMUNITY)) {
+            groupText = getContext().getString(R.string.community_group);
+        }
+        return groupText;
+    }
+
+    public void onGroupInfoModified(Object value, int type) {
+        switch (type) {
+            case TUIGroupConstants.Group.MODIFY_GROUP_NAME:
+                ToastUtil.toastLongMessage(getResources().getString(R.string.modify_group_name_success));
+                mGroupNameView.setText(value.toString());
+                break;
+            case TUIGroupConstants.Group.MODIFY_GROUP_NOTICE:
+                if (TextUtils.isEmpty(value.toString())) {
+                    mGroupNoticeText.setText(getResources().getString(R.string.group_notice_empty_tip));
+                } else {
+                    mGroupNoticeText.setText(value.toString());
+                }
+                ToastUtil.toastLongMessage(getResources().getString(R.string.modify_group_notice_success));
+                break;
+            case TUIGroupConstants.Group.MODIFY_GROUP_JOIN_TYPE:
+                mJoinTypeView.setContent(mJoinTypes.get((Integer) value));
+                break;
+            case TUIGroupConstants.Group.MODIFY_MEMBER_NAME:
+                ToastUtil.toastLongMessage(getResources().getString(R.string.modify_nickname_success));
+                mNickView.setContent(value.toString());
+                break;
+        }
+    }
+
+    public void setRouter(IGroupMemberListener listener) {
+        mMemberPreviewListener = listener;
+        mMemberAdapter.setManagerCallBack(listener);
+    }
+
+    public void setOnModifyGroupAvatarListener(GroupInfoMinimalistFragment.OnModifyGroupAvatarListener onModifyGroupAvatarListener) {
+        this.onModifyGroupAvatarListener = onModifyGroupAvatarListener;
+    }
+
+    public void modifyGroupAvatar(String avatarUrl) {
+        mPresenter.modifyGroupFaceUrl(mGroupInfo.getId(), avatarUrl, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                mGroupInfo.setFaceUrl(avatarUrl);
+                setGroupInfo(mGroupInfo);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastShortMessage(TUIGroupService.getAppContext().getString(R.string.modify_icon_fail) + ", code = " + errCode + ", info = " + errMsg);
+            }
+        });
+    }
+
+    @Override
+    public void onGroupInfoChanged(GroupInfo dataSource) {
+        setGroupInfo(dataSource);
+    }
+
+    @Override
+    public TitleBarLayout getTitleBar() {
+        return mTitleBar;
+    }
+
+    @Override
+    public void setParentLayout(Object parent) {
+
+    }
+
+    public void setOnButtonClickListener(OnButtonClickListener l) {
+        mListener = l;
+    }
+
+    public interface OnButtonClickListener {
+        default void onSetChatBackground() {};
+    }
+
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/view/GroupMemberAdapter.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/view/GroupMemberAdapter.java
new file mode 100644
index 0000000..91ffd12
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/view/GroupMemberAdapter.java
@@ -0,0 +1,240 @@
+package com.tencent.qcloud.tuikit.tuigroup.minimalistui.view;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.PopupWindow;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuicore.TUICore;
+import com.tencent.qcloud.tuicore.component.gatherimage.ShadeImageView;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.BackgroundTasks;
+import com.tencent.qcloud.tuicore.util.PopWindowUtil;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupService;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuigroup.minimalistui.interfaces.IGroupMemberChangedCallback;
+import com.tencent.qcloud.tuikit.tuigroup.presenter.GroupInfoPresenter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class GroupMemberAdapter extends RecyclerView.Adapter<GroupMemberAdapter.GroupMemberViewHodler> {
+
+    private IGroupMemberChangedCallback mCallback;
+    private GroupInfo mGroupInfo;
+    private List<GroupMemberInfo> mGroupMembers = new ArrayList<>();
+    private List<GroupMemberInfo> selectedGroupMemberInfos = new ArrayList<>();
+
+    private GroupInfoPresenter presenter;
+    private boolean isSelectMode;
+    private GroupMemberLayout.OnSelectChangedListener onSelectChangedListener;
+    private ArrayList<String> selectedMember = new ArrayList<>();
+    private ArrayList<String> excludeList;
+    private ArrayList<String> alreadySelectedList;
+    public void setSelectMode(boolean selectMode) {
+        isSelectMode = selectMode;
+    }
+
+    public ArrayList<String> getSelectedMember() {
+        return selectedMember;
+    }
+
+    public List<GroupMemberInfo> getSelectedMemberInfoList() {
+        return selectedGroupMemberInfos;
+    }
+
+    public void setPresenter(GroupInfoPresenter presenter) {
+        this.presenter = presenter;
+    }
+
+    public void setMemberChangedCallback(IGroupMemberChangedCallback callback) {
+        this.mCallback = callback;
+    }
+
+    public void setExcludeList(ArrayList<String> excludeList) {
+        this.excludeList = excludeList;
+    }
+
+    public void setAlreadySelectedList(ArrayList<String> alreadySelectedList) {
+        this.alreadySelectedList = alreadySelectedList;
+    }
+
+    public void setOnSelectChangedListener(GroupMemberLayout.OnSelectChangedListener onSelectChangedListener) {
+        this.onSelectChangedListener = onSelectChangedListener;
+    }
+
+    @NonNull
+    @Override
+    public GroupMemberViewHodler onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.group_member_list_item, parent, false);
+        return new GroupMemberViewHodler(view);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull GroupMemberViewHodler holder, int position) {
+        final GroupMemberInfo info = mGroupMembers.get(position);
+        GlideEngine.loadImage(holder.memberIcon, info.getIconUrl());
+        if (!TextUtils.isEmpty(info.getNameCard())) {
+            holder.memberName.setText(info.getNameCard());
+        } else {
+            if (!TextUtils.isEmpty(info.getNickName())) {
+                holder.memberName.setText(info.getNickName());
+            } else {
+                if (!TextUtils.isEmpty(info.getAccount())) {
+                    holder.memberName.setText(info.getAccount());
+                } else {
+                    holder.memberName.setText("");
+                }
+            }
+        }
+
+        if (isSelectMode) {
+            holder.checkBox.setVisibility(View.VISIBLE);
+            holder.itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    holder.checkBox.setChecked(!holder.checkBox.isChecked());
+                    if (holder.checkBox.isChecked()) {
+                        info.setSelected(true);
+                        selectedMember.add(info.getAccount());
+                        selectedGroupMemberInfos.add(info);
+                    } else {
+                        info.setSelected(false);
+                        selectedMember.remove(info.getAccount());
+                        selectedGroupMemberInfos.remove(info);
+                    }
+                    if (onSelectChangedListener != null) {
+                        onSelectChangedListener.onSelectChanged();
+                    }
+                }
+            });
+
+        } else {
+            holder.itemView.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    if (!mGroupInfo.isOwner()) {
+                        return false;
+                    }
+                    TextView delete = new TextView(holder.itemView.getContext());
+                    delete.setText(R.string.group_remove_member);
+                    int padding = ScreenUtil.getPxByDp(10);
+                    delete.setPadding(padding, padding, padding, padding);
+                    delete.setBackgroundResource(R.drawable.text_border);
+                    int location[] = new int[2];
+                    v.getLocationInWindow(location);
+                    final PopupWindow window = PopWindowUtil.popupWindow(delete, holder.itemView, location[0], location[1] + v.getMeasuredHeight() / 3);
+                    delete.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            List<GroupMemberInfo> dels = new ArrayList<>();
+                            dels.add(info);
+                            if (presenter == null) {
+                                return;
+                            }
+                            presenter.removeGroupMembers(mGroupInfo, dels, new IUIKitCallback() {
+                                @Override
+                                public void onSuccess(Object data) {
+                                    mGroupMembers.remove(info);
+                                    notifyDataSetChanged();
+                                    if (mCallback != null) {
+                                        mCallback.onMemberRemoved(info);
+                                    }
+                                }
+
+                                @Override
+                                public void onError(String module, int errCode, String errMsg) {
+                                    ToastUtil.toastLongMessage(TUIGroupService.getAppContext().getString(R.string.remove_fail_tip) + ":errCode=" + errCode);
+                                }
+                            });
+                            window.dismiss();
+                        }
+                    });
+                    return false;
+                }
+            });
+
+            holder.itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Bundle bundle = new Bundle();
+                    bundle.putString(TUIConstants.TUIChat.CHAT_ID, info.getAccount());
+                    TUICore.startActivity("FriendProfileActivity", bundle);
+                }
+            });
+        }
+
+        setAlreadySelected(holder, info);
+    }
+
+    private void setAlreadySelected(GroupMemberViewHodler holder, GroupMemberInfo memberInfo) {
+        if (alreadySelectedList != null && alreadySelectedList.contains(memberInfo.getAccount())) {
+            holder.checkBox.setChecked(true);
+            holder.itemView.setEnabled(false);
+            holder.checkBox.setEnabled(false);
+        } else {
+            holder.itemView.setEnabled(true);
+            holder.checkBox.setEnabled(true);
+            holder.checkBox.setSelected(memberInfo.isSelected());
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        if (mGroupMembers == null) {
+            return 0;
+        }
+        return mGroupMembers.size();
+    }
+
+    public void setDataSource(GroupInfo groupInfo) {
+        if (groupInfo != null) {
+            mGroupInfo = groupInfo;
+            mGroupMembers.clear();
+            if (excludeList == null || excludeList.isEmpty()) {
+                mGroupMembers.addAll(groupInfo.getMemberDetails());
+            } else {
+                for (GroupMemberInfo groupMemberInfo : groupInfo.getMemberDetails()) {
+                    if (excludeList.contains(groupMemberInfo.getAccount())) {
+                        continue;
+                    }
+                    mGroupMembers.add(groupMemberInfo);
+                }
+            }
+            BackgroundTasks.getInstance().runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    notifyDataSetChanged();
+                }
+            });
+        }
+    }
+
+    protected class GroupMemberViewHodler extends RecyclerView.ViewHolder {
+        private ShadeImageView memberIcon;
+        private TextView memberName;
+        private CheckBox checkBox;
+
+        public GroupMemberViewHodler(@NonNull View itemView) {
+            super(itemView);
+            checkBox = itemView.findViewById(R.id.group_member_check_box);
+            memberIcon = itemView.findViewById(R.id.group_member_icon);
+            memberIcon.setRadius(ScreenUtil.dip2px(20));
+            memberName = itemView.findViewById(R.id.group_member_name);
+        }
+    }
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/view/GroupMemberLayout.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/view/GroupMemberLayout.java
new file mode 100644
index 0000000..74857c3
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/minimalistui/view/GroupMemberLayout.java
@@ -0,0 +1,302 @@
+package com.tencent.qcloud.tuikit.tuigroup.minimalistui.view;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.tencent.qcloud.tuicore.component.CustomLinearLayoutManager;
+import com.tencent.qcloud.tuicore.component.RoundCornerImageView;
+import com.tencent.qcloud.tuicore.component.TitleBarLayout;
+import com.tencent.qcloud.tuicore.component.imageEngine.impl.GlideEngine;
+import com.tencent.qcloud.tuicore.component.interfaces.ITitleBarLayout;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ScreenUtil;
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuigroup.component.BottomSelectSheet;
+import com.tencent.qcloud.tuikit.tuigroup.interfaces.IGroupMemberLayout;
+import com.tencent.qcloud.tuikit.tuigroup.minimalistui.interfaces.IGroupMemberChangedCallback;
+import com.tencent.qcloud.tuikit.tuigroup.minimalistui.interfaces.IGroupMemberListener;
+import com.tencent.qcloud.tuikit.tuigroup.presenter.GroupInfoPresenter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class GroupMemberLayout extends LinearLayout implements IGroupMemberLayout {
+    // 取一个足够大的偏移保证能一次性滚动到最底部
+    // Take a large enough offset to scroll to the bottom at one time
+    private static final int SCROLL_TO_END_OFFSET = -999999;
+
+    private TitleBarLayout mTitleBar;
+    private GroupMemberAdapter mAdapter;
+    private IGroupMemberListener groupMemberListener;
+    private GroupInfo mGroupInfo;
+    private RecyclerView recyclerView;
+    private boolean isSelectMode;
+    private String title;
+    private ArrayList<String> excludeList;
+    private ArrayList<String> alreadySelectedList;
+    private RecyclerView selectedList;
+    private SelectedAdapter selectedListAdapter;
+    private View selectArea;
+    private TextView confirmButton;
+
+    private GroupInfoPresenter presenter;
+
+    public GroupMemberLayout(Context context) {
+        super(context);
+        init();
+    }
+
+    public GroupMemberLayout(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public GroupMemberLayout(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private void init() {
+        inflate(getContext(), R.layout.group_member_layout, this);
+        mTitleBar = findViewById(R.id.group_member_title_bar);
+        mTitleBar.setTitle(getContext().getString(R.string.manager), ITitleBarLayout.Position.RIGHT);
+        mTitleBar.getRightIcon().setVisibility(GONE);
+        mTitleBar.setOnRightClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                buildPopMenu();
+            }
+        });
+        mAdapter = new GroupMemberAdapter();
+        mAdapter.setMemberChangedCallback(new IGroupMemberChangedCallback() {
+
+            @Override
+            public void onMemberRemoved(GroupMemberInfo memberInfo) {
+                if (!TextUtils.isEmpty(title)) {
+                    mTitleBar.setTitle(title, ITitleBarLayout.Position.MIDDLE);
+                } else {
+                    mTitleBar.setTitle(getContext().getString(R.string.group_members) +
+                            "(" + mGroupInfo.getMemberCount() + ")", TitleBarLayout.Position.MIDDLE);
+                }
+            }
+        });
+        recyclerView = findViewById(R.id.group_all_members);
+        recyclerView.setLayoutManager(new CustomLinearLayoutManager(getContext()));
+        recyclerView.setAdapter(mAdapter);
+        recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrollStateChanged(@NonNull RecyclerView recyclerView, int newState) {
+                super.onScrollStateChanged(recyclerView, newState);
+                if (newState == RecyclerView.SCROLL_STATE_IDLE) {
+                    LinearLayoutManager layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
+                    if (layoutManager == null) {
+                        return;
+                    }
+                    int lastPosition = layoutManager.findLastCompletelyVisibleItemPosition();
+                    if (mAdapter != null) {
+                        if (lastPosition == mAdapter.getItemCount() - 1) {
+                            if (mGroupInfo != null && mGroupInfo.getNextSeq() != 0) {
+                                presenter.getGroupMembers(mGroupInfo, new IUIKitCallback<GroupInfo>() {
+                                    @Override
+                                    public void onSuccess(GroupInfo data) {
+                                        onGroupInfoChanged(data);
+                                        mAdapter.notifyDataSetChanged();
+                                    }
+
+                                    @Override
+                                    public void onError(String module, int errCode, String errMsg) {
+
+                                    }
+                                });
+                            }
+                        }
+                    }
+                }
+            }
+        });
+
+        selectArea = findViewById(R.id.select_area);
+        selectedList = findViewById(R.id.selected_list);
+        selectedListAdapter = new SelectedAdapter();
+        selectedList.setLayoutManager(new LinearLayoutManager(getContext(), RecyclerView.HORIZONTAL, false));
+        selectedList.setAdapter(selectedListAdapter);
+
+        confirmButton = findViewById(R.id.confirm_button);
+        confirmButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                confirmAndFinish();
+            }
+        });
+
+        mAdapter.setOnSelectChangedListener(new OnSelectChangedListener() {
+            @Override
+            public void onSelectChanged() {
+                selectedListAdapter.setMembers(mAdapter.getSelectedMemberInfoList());
+                selectedListAdapter.notifyDataSetChanged();
+            }
+        });
+    }
+
+    private void confirmAndFinish() {
+        if (groupMemberListener != null) {
+            groupMemberListener.setSelectedMember(mAdapter.getSelectedMember());
+        }
+    }
+
+    public TitleBarLayout getTitleBar() {
+        return mTitleBar;
+    }
+
+    public void setExcludeList(ArrayList<String> excludeList) {
+        this.excludeList = excludeList;
+        mAdapter.setExcludeList(excludeList);
+    }
+
+    public void setAlreadySelectedList(ArrayList<String> alreadySelectedList) {
+        this.alreadySelectedList = alreadySelectedList;
+        mAdapter.setAlreadySelectedList(alreadySelectedList);
+    }
+
+    public void setSelectMode(boolean selectMode) {
+        isSelectMode = selectMode;
+        if (isSelectMode) {
+            mTitleBar.setTitle(getContext().getString(com.tencent.qcloud.tuicore.R.string.sure), ITitleBarLayout.Position.RIGHT);
+            mTitleBar.getRightGroup().setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (groupMemberListener != null) {
+                        groupMemberListener.setSelectedMember(mAdapter.getSelectedMember());
+                    }
+                }
+            });
+            selectArea.setVisibility(VISIBLE);
+        }
+
+        mAdapter.setSelectMode(isSelectMode);
+    }
+
+    @Override
+    public void setParentLayout(Object parent) {
+
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public void onGroupInfoChanged(GroupInfo groupInfo) {
+        mGroupInfo = groupInfo;
+        presenter.setGroupInfo(groupInfo);
+        mAdapter.setDataSource(groupInfo);
+        if (groupInfo != null) {
+            if (!TextUtils.isEmpty(title)) {
+                mTitleBar.setTitle(title, ITitleBarLayout.Position.MIDDLE);
+            } else {
+                mTitleBar.setTitle(getContext().getString(R.string.group_members) +
+                        "(" + groupInfo.getMemberCount() + ")", TitleBarLayout.Position.MIDDLE);
+            }
+        }
+    }
+
+    @Override
+    public void onGroupInfoModified(Object value, int type) {
+
+    }
+
+    private void buildPopMenu() {
+        if (mGroupInfo == null) {
+            return;
+        }
+
+        BottomSelectSheet sheet = new BottomSelectSheet(getContext());
+        List<String> stringList = new ArrayList<>();
+        String addMember = getResources().getString(R.string.add_group_member);
+        String removeMember = getResources().getString(R.string.remove_group_member);
+        stringList.add(addMember);
+        if (mGroupInfo.isOwner()) {
+            stringList.add(removeMember);
+        }
+        sheet.setSelectList(stringList);
+        sheet.setOnClickListener(new BottomSelectSheet.BottomSelectSheetOnClickListener() {
+            @Override
+            public void onSheetClick(int index) {
+                if (index == 0) {
+                    if (groupMemberListener != null) {
+                        groupMemberListener.forwardAddMember(mGroupInfo);
+                    }
+                } else if (index == 1) {
+                    if (groupMemberListener != null) {
+                        groupMemberListener.forwardDeleteMember(mGroupInfo);
+                    }
+                }
+            }
+        });
+        sheet.show();
+    }
+
+    public void setGroupMemberListener(IGroupMemberListener listener) {
+        this.groupMemberListener = listener;
+    }
+
+    public void setPresenter(GroupInfoPresenter presenter) {
+        this.presenter = presenter;
+        mAdapter.setPresenter(presenter);
+    }
+
+    public static class SelectedAdapter extends RecyclerView.Adapter<SelectedAdapter.SelectedViewHolder> {
+        private List<GroupMemberInfo> mMembers;
+
+        public void setMembers(List<GroupMemberInfo> mMembers) {
+            this.mMembers = mMembers;
+        }
+
+        @NonNull
+        @Override
+        public SelectedViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            return new SelectedViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.group_member_selected_item, parent, false));
+        }
+
+        @Override
+        public void onBindViewHolder(@NonNull SelectedViewHolder holder, int position) {
+            GlideEngine.loadImage(holder.userIconView, mMembers.get(position).getIconUrl());
+        }
+
+        @Override
+        public int getItemCount() {
+            if (mMembers == null) {
+                return 0;
+            }
+            return mMembers.size();
+        }
+
+        public static class SelectedViewHolder extends RecyclerView.ViewHolder {
+            public final RoundCornerImageView userIconView;
+            public SelectedViewHolder(@NonNull View itemView) {
+                super(itemView);
+                userIconView = itemView.findViewById(R.id.ivAvatar);
+                userIconView.setRadius(ScreenUtil.dip2px(20));
+            }
+        }
+    }
+
+    public interface OnSelectChangedListener {
+        void onSelectChanged();
+    }
+
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/model/GroupInfoProvider.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/model/GroupInfoProvider.java
new file mode 100644
index 0000000..a58725c
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/model/GroupInfoProvider.java
@@ -0,0 +1,670 @@
+package com.tencent.qcloud.tuikit.tuigroup.model;
+
+import android.text.TextUtils;
+
+import com.tencent.imsdk.v2.V2TIMCallback;
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.imsdk.v2.V2TIMConversationOperationResult;
+import com.tencent.imsdk.v2.V2TIMGroupApplication;
+import com.tencent.imsdk.v2.V2TIMGroupApplicationResult;
+import com.tencent.imsdk.v2.V2TIMGroupInfo;
+import com.tencent.imsdk.v2.V2TIMGroupInfoResult;
+import com.tencent.imsdk.v2.V2TIMGroupMemberFullInfo;
+import com.tencent.imsdk.v2.V2TIMGroupMemberInfoResult;
+import com.tencent.imsdk.v2.V2TIMGroupMemberOperationResult;
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMMessage;
+import com.tencent.imsdk.v2.V2TIMValueCallback;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ErrorMessageConverter;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupService;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupConstants;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupApplyInfo;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuigroup.util.TUIGroupLog;
+import com.tencent.qcloud.tuikit.tuigroup.util.TUIGroupUtils;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+public class GroupInfoProvider {
+
+    private static final String TAG = GroupInfoProvider.class.getSimpleName();
+
+    private static final int PAGE = 50;
+
+    public void loadGroupInfo(final String groupId, final IUIKitCallback<GroupInfo> callBack) {
+        loadGroupInfo(groupId, V2TIMGroupMemberFullInfo.V2TIM_GROUP_MEMBER_FILTER_ALL, callBack);
+    }
+
+    public void loadGroupInfo(final String groupId, int filter, final IUIKitCallback<GroupInfo> callBack) {
+        loadGroupPublicInfo(groupId, new IUIKitCallback<V2TIMGroupInfoResult>() {
+            @Override
+            public void onSuccess(V2TIMGroupInfoResult data) {
+                GroupInfo groupInfo = new GroupInfo();
+                groupInfo.covertTIMGroupDetailInfo(data);
+                String conversationId = TUIGroupUtils.getConversationIdByUserId(groupId, true);
+                V2TIMManager.getConversationManager().getConversation(conversationId, new V2TIMValueCallback<V2TIMConversation>() {
+                    @Override
+                    public void onSuccess(V2TIMConversation v2TIMConversation) {
+                        boolean isTop = v2TIMConversation.isPinned();
+                        groupInfo.setTopChat(isTop);
+
+                        List<Long> markList = v2TIMConversation.getMarkList();
+                        if (markList.contains(V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_FOLD)) {
+                            groupInfo.setFolded(true);
+                        }
+
+                        // 异步获取群成员
+                        loadGroupMembers(groupInfo, filter , 0, callBack);
+                    }
+
+                    @Override
+                    public void onError(int code, String desc) {
+                        loadGroupMembers(groupInfo, filter, 0, callBack);
+                    }
+                });
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIGroupLog.e(TAG, "loadGroupPublicInfo failed, code: " + errCode + "|desc: " + ErrorMessageConverter.convertIMError(errCode, errMsg));
+                if (callBack != null) {
+                    callBack.onError(module, errCode, ErrorMessageConverter.convertIMError(errCode, errMsg));
+                }
+            }
+        });
+    }
+
+    public void deleteGroup(String groupId, final IUIKitCallback<Void> callBack) {
+        V2TIMManager.getInstance().dismissGroup(groupId, new V2TIMCallback() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIGroupUtils.callbackOnError(callBack, TAG, code, desc);
+                TUIGroupLog.e(TAG, "deleteGroup failed, code: " + code + "|desc: " + ErrorMessageConverter.convertIMError(code, desc));
+            }
+
+            @Override
+            public void onSuccess() {
+                TUIGroupUtils.callbackOnSuccess(callBack, null);
+            }
+        });
+    }
+
+    public void loadGroupPublicInfo(String groupId, final IUIKitCallback<V2TIMGroupInfoResult> callBack) {
+        List<String> groupList = new ArrayList<>();
+        groupList.add(groupId);
+
+        V2TIMManager.getGroupManager().getGroupsInfo(groupList, new V2TIMValueCallback<List<V2TIMGroupInfoResult>>() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIGroupLog.e(TAG, "loadGroupPublicInfo failed, code: " + code + "|desc: " + ErrorMessageConverter.convertIMError(code, desc));
+                callBack.onError(TAG, code, ErrorMessageConverter.convertIMError(code, desc));
+            }
+
+            @Override
+            public void onSuccess(List<V2TIMGroupInfoResult> v2TIMGroupInfoResults) {
+                if (v2TIMGroupInfoResults.size() > 0) {
+                    V2TIMGroupInfoResult infoResult = v2TIMGroupInfoResults.get(0);
+                    TUIGroupLog.i(TAG, infoResult.toString());
+
+                    callBack.onSuccess(infoResult);
+                }
+            }
+        });
+    }
+
+    public void loadGroupMembers(GroupInfo groupInfo, long nextSeq, final IUIKitCallback<GroupInfo> callBack) {
+        loadGroupMembers(groupInfo, V2TIMGroupMemberFullInfo.V2TIM_GROUP_MEMBER_FILTER_ALL, nextSeq, callBack);
+    }
+
+    public void loadGroupMembers(GroupInfo groupInfo, int filter, long nextSeq, final IUIKitCallback<GroupInfo> callBack) {
+        if (filter != V2TIMGroupMemberFullInfo.V2TIM_GROUP_MEMBER_FILTER_ALL && filter != V2TIMGroupMemberFullInfo.V2TIM_GROUP_MEMBER_FILTER_OWNER
+                && filter != V2TIMGroupMemberFullInfo.V2TIM_GROUP_MEMBER_FILTER_ADMIN && filter != V2TIMGroupMemberFullInfo.V2TIM_GROUP_MEMBER_FILTER_COMMON) {
+            filter = V2TIMGroupMemberFullInfo.V2TIM_GROUP_MEMBER_FILTER_ALL;
+        }
+        V2TIMManager.getGroupManager().getGroupMemberList(groupInfo.getId(), filter, nextSeq, new V2TIMValueCallback<V2TIMGroupMemberInfoResult>() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIGroupLog.e(TAG, "loadGroupMembers failed, code: " + code + "|desc: " + ErrorMessageConverter.convertIMError(code, desc));
+                TUIGroupUtils.callbackOnError(callBack, TAG, code, desc);
+            }
+
+            @Override
+            public void onSuccess(V2TIMGroupMemberInfoResult v2TIMGroupMemberInfoResult) {
+                List<GroupMemberInfo> members = new ArrayList<>();
+                for (int i = 0; i < v2TIMGroupMemberInfoResult.getMemberInfoList().size(); i++) {
+                    GroupMemberInfo member = new GroupMemberInfo();
+                    members.add(member.covertTIMGroupMemberInfo(v2TIMGroupMemberInfoResult.getMemberInfoList().get(i)));
+                }
+                List<GroupMemberInfo> memberInfoList =  groupInfo.getMemberDetails();
+                Iterator<GroupMemberInfo> iterator = members.iterator();
+                while (iterator.hasNext()) {
+                    GroupMemberInfo memberInfo = iterator.next();
+                    for (GroupMemberInfo existsMemberInfo : memberInfoList) {
+                        if (TextUtils.equals(memberInfo.getAccount(), existsMemberInfo.getAccount())) {
+                            iterator.remove();
+                            break;
+                        }
+                    }
+                }
+                memberInfoList.addAll(members);
+                groupInfo.setNextSeq(v2TIMGroupMemberInfoResult.getNextSeq());
+                TUIGroupUtils.callbackOnSuccess(callBack, groupInfo);
+            }
+        });
+    }
+
+    public void modifyGroupInfo(GroupInfo groupInfo, final Object value, final int type, final IUIKitCallback callBack) {
+        V2TIMGroupInfo v2TIMGroupInfo = new V2TIMGroupInfo();
+        v2TIMGroupInfo.setGroupID(groupInfo.getId());
+        if (type == TUIGroupConstants.Group.MODIFY_GROUP_NAME) {
+            v2TIMGroupInfo.setGroupName(value.toString());
+        } else if (type == TUIGroupConstants.Group.MODIFY_GROUP_NOTICE) {
+            v2TIMGroupInfo.setNotification(value.toString());
+        } else if (type == TUIGroupConstants.Group.MODIFY_GROUP_JOIN_TYPE) {
+            v2TIMGroupInfo.setGroupAddOpt((Integer)value);
+        }
+        V2TIMManager.getGroupManager().setGroupInfo(v2TIMGroupInfo, new V2TIMCallback() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIGroupLog.i(TAG, "modifyGroupInfo failed type| value| code| desc " + value + ":" + type + ":" + code + ":" + ErrorMessageConverter.convertIMError(code, desc));
+                TUIGroupUtils.callbackOnError(callBack, TAG, code, desc);
+            }
+
+            @Override
+            public void onSuccess() {
+                if (type == TUIGroupConstants.Group.MODIFY_GROUP_NAME) {
+                    groupInfo.setGroupName(value.toString());
+                } else if (type == TUIGroupConstants.Group.MODIFY_GROUP_NOTICE) {
+                    groupInfo.setNotice(value.toString());
+                } else if (type == TUIGroupConstants.Group.MODIFY_GROUP_JOIN_TYPE) {
+                    groupInfo.setJoinType((Integer) value);
+                }
+                TUIGroupUtils.callbackOnSuccess(callBack, value);
+            }
+        });
+    }
+
+    public void modifyMyGroupNickname(GroupInfo groupInfo, final String nickname, final IUIKitCallback callBack) {
+        if (groupInfo == null) {
+            ToastUtil.toastLongMessage("modifyMyGroupNickname fail: NO GROUP");
+            return;
+        }
+
+        V2TIMGroupMemberFullInfo v2TIMGroupMemberFullInfo = new V2TIMGroupMemberFullInfo();
+        v2TIMGroupMemberFullInfo.setUserID(V2TIMManager.getInstance().getLoginUser());
+        v2TIMGroupMemberFullInfo.setNameCard(nickname);
+        V2TIMManager.getGroupManager().setGroupMemberInfo(groupInfo.getId(), v2TIMGroupMemberFullInfo, new V2TIMCallback() {
+            @Override
+            public void onError(int code, String desc) {
+                callBack.onError(TAG, code, ErrorMessageConverter.convertIMError(code, desc));
+                ToastUtil.toastLongMessage("modifyMyGroupNickname fail: " + code + "=" + ErrorMessageConverter.convertIMError(code, desc));
+            }
+
+            @Override
+            public void onSuccess() {
+                callBack.onSuccess(null);
+            }
+        });
+    }
+
+    public void setTopConversation(String conversationId, boolean isSetTop, IUIKitCallback<Void> callBack) {
+        TUIGroupLog.i(TAG, "setConversationTop id:" + conversationId + "|isTop:" + isSetTop);
+        V2TIMManager.getConversationManager().pinConversation(conversationId, isSetTop, new V2TIMCallback() {
+            @Override
+            public void onSuccess() {
+                TUIGroupUtils.callbackOnSuccess(callBack, null);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIGroupLog.e(TAG, "setConversationTop code:" + code + "|desc:" + ErrorMessageConverter.convertIMError(code, desc));
+                TUIGroupUtils.callbackOnError(callBack, code, desc);
+            }
+        });
+    }
+
+    public void quitGroup(String groupId, final IUIKitCallback<Void> callBack) {
+        V2TIMManager.getInstance().quitGroup(groupId, new V2TIMCallback() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIGroupLog.e(TAG, "quitGroup failed, code: " + code + "|desc: " + ErrorMessageConverter.convertIMError(code, desc));
+                TUIGroupUtils.callbackOnError(callBack, TAG, code, desc);
+            }
+
+            @Override
+            public void onSuccess() {
+                TUIGroupUtils.callbackOnSuccess(callBack, null);
+            }
+        });
+    }
+
+    public void inviteGroupMembers(GroupInfo groupInfo, List<String> addMembers, final IUIKitCallback callBack) {
+        if (addMembers == null || addMembers.size() == 0) {
+            return;
+        }
+
+        V2TIMManager.getGroupManager().inviteUserToGroup(groupInfo.getId(), addMembers, new V2TIMValueCallback<List<V2TIMGroupMemberOperationResult>>() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIGroupLog.e(TAG, "addGroupMembers failed, code: " + code + "|desc: " + ErrorMessageConverter.convertIMError(code, desc));
+                callBack.onError(TAG, code, ErrorMessageConverter.convertIMError(code, desc));
+            }
+
+            @Override
+            public void onSuccess(List<V2TIMGroupMemberOperationResult> v2TIMGroupMemberOperationResults) {
+                final List<String> adds = new ArrayList<>();
+                if (v2TIMGroupMemberOperationResults.size() > 0) {
+                    for (int i = 0; i < v2TIMGroupMemberOperationResults.size(); i++) {
+                        V2TIMGroupMemberOperationResult res = v2TIMGroupMemberOperationResults.get(i);
+                        if (res.getResult() == V2TIMGroupMemberOperationResult.OPERATION_RESULT_PENDING) {
+                            callBack.onSuccess(TUIGroupService.getAppContext().getString(R.string.request_wait));
+                            return;
+                        }
+                        if (res.getResult() > 0) {
+                            adds.add(res.getMemberID());
+                        }
+                    }
+                }
+                if (adds.size() > 0) {
+                    groupInfo.getMemberDetails().clear();
+                    loadGroupMembers(groupInfo, 0, callBack);
+                }
+            }
+        });
+    }
+
+    public void removeGroupMembers(String groupId, List<String> members, final IUIKitCallback<List<String>> callBack) {
+        if (members == null || members.size() == 0) {
+            return;
+        }
+
+        V2TIMManager.getGroupManager().kickGroupMember(groupId, members, "", new V2TIMValueCallback<List<V2TIMGroupMemberOperationResult>>() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIGroupLog.e(TAG, "removeGroupMembers failed, code: " + code + "|desc: " + ErrorMessageConverter.convertIMError(code, desc));
+                callBack.onError(TAG, code, ErrorMessageConverter.convertIMError(code, desc));
+            }
+
+            @Override
+            public void onSuccess(List<V2TIMGroupMemberOperationResult> v2TIMGroupMemberOperationResults) {
+                List<String> dels = new ArrayList<>();
+                for (int i = 0; i < v2TIMGroupMemberOperationResults.size(); i++) {
+                    V2TIMGroupMemberOperationResult res = v2TIMGroupMemberOperationResults.get(i);
+                    if (res.getResult() == V2TIMGroupMemberOperationResult.OPERATION_RESULT_SUCC) {
+                        dels.add(res.getMemberID());
+                    }
+                }
+                callBack.onSuccess(dels);
+            }
+        });
+    }
+
+    public List<GroupApplyInfo> getApplyList() {
+        return null;
+    }
+
+    public void loadGroupApplies(GroupInfo groupInfo, final IUIKitCallback<List<GroupApplyInfo>> callBack) {
+        loadApplyInfo(new IUIKitCallback<List<GroupApplyInfo>>() {
+
+            @Override
+            public void onSuccess(List<GroupApplyInfo> data) {
+                if (groupInfo == null) {
+                    callBack.onError(TAG, 0, "no groupInfo");
+                    return;
+                }
+                String groupId = groupInfo.getId();
+                List<GroupApplyInfo> applyInfos = new ArrayList<>();
+                for (int i = 0; i < data.size(); i++) {
+                    GroupApplyInfo applyInfo = data.get(i);
+                    if (groupId.equals(applyInfo.getGroupApplication().getGroupID())
+                            && applyInfo.getGroupApplication().getHandleStatus() == V2TIMGroupApplication.V2TIM_GROUP_APPLICATION_HANDLE_STATUS_UNHANDLED) {
+                        applyInfos.add(applyInfo);
+                    }
+                }
+                callBack.onSuccess(applyInfos);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIGroupLog.e(TAG, "loadApplyInfo failed, code: " + errCode + "|desc: " + ErrorMessageConverter.convertIMError(errCode, errMsg));
+                callBack.onError(module, errCode, ErrorMessageConverter.convertIMError(errCode, errMsg));
+            }
+        });
+    }
+
+    private void loadApplyInfo(final IUIKitCallback<List<GroupApplyInfo>> callBack) {
+        final List<GroupApplyInfo> applies = new ArrayList<>();
+
+        V2TIMManager.getGroupManager().getGroupApplicationList(new V2TIMValueCallback<V2TIMGroupApplicationResult>() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIGroupLog.e(TAG, "getGroupPendencyList failed, code: " + code + "|desc: " + ErrorMessageConverter.convertIMError(code, desc));
+                callBack.onError(TAG, code, ErrorMessageConverter.convertIMError(code, desc));
+            }
+
+            @Override
+            public void onSuccess(V2TIMGroupApplicationResult v2TIMGroupApplicationResult) {
+                List<V2TIMGroupApplication> v2TIMGroupApplicationList = v2TIMGroupApplicationResult.getGroupApplicationList();
+                for (int i = 0; i < v2TIMGroupApplicationList.size(); i++) {
+                    GroupApplyInfo info = new GroupApplyInfo(v2TIMGroupApplicationList.get(i));
+                    info.setStatus(0);
+                    applies.add(info);
+                }
+                callBack.onSuccess(applies);
+            }
+        });
+    }
+
+    public void acceptApply(final GroupApplyInfo item, final IUIKitCallback<Void> callBack) {
+        V2TIMManager.getGroupManager().acceptGroupApplication(item.getGroupApplication(), "", new V2TIMCallback() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIGroupLog.e(TAG, "acceptApply failed, code: " + code + "|desc: " + ErrorMessageConverter.convertIMError(code, desc));
+                callBack.onError(TAG, code, ErrorMessageConverter.convertIMError(code, desc));
+            }
+
+            @Override
+            public void onSuccess() {
+                callBack.onSuccess(null);
+            }
+        });
+    }
+
+    public void refuseApply(final GroupApplyInfo item, final IUIKitCallback<Void> callBack) {
+        V2TIMManager.getGroupManager().refuseGroupApplication(item.getGroupApplication(), "", new V2TIMCallback() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIGroupLog.e(TAG, "refuseApply failed, code: " + code + "|desc: " + ErrorMessageConverter.convertIMError(code, desc));
+                TUIGroupUtils.callbackOnError(callBack, TAG, code, desc);
+            }
+
+            @Override
+            public void onSuccess() {
+                TUIGroupUtils.callbackOnSuccess(callBack, null);
+            }
+        });
+    }
+
+    public void setGroupReceiveMessageOpt(String groupId, boolean isReceive, IUIKitCallback callBack) {
+        int option;
+        if (!isReceive) {
+            option = V2TIMMessage.V2TIM_RECEIVE_NOT_NOTIFY_MESSAGE;
+        } else {
+            option = V2TIMMessage.V2TIM_RECEIVE_MESSAGE;
+        }
+        V2TIMManager.getMessageManager().setGroupReceiveMessageOpt(groupId, option, new V2TIMCallback(){
+            @Override
+            public void onSuccess() {
+                TUIGroupUtils.callbackOnSuccess(callBack, null);
+                TUIGroupLog.d(TAG, "setReceiveMessageOpt onSuccess");
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIGroupUtils.callbackOnError(callBack, code, desc);
+                TUIGroupLog.d(TAG, "setReceiveMessageOpt onError code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+            }
+        });
+    }
+
+    public void setGroupFold(String groupID, boolean isFold, IUIKitCallback callback) {
+        TUIGroupLog.i(TAG, "setGroupFold id:" + groupID + "|isTop:" + isFold);
+        String conversationID = "group_" + groupID;
+        List<String> conversationIDList = new ArrayList<>();
+        conversationIDList.add(conversationID);
+        V2TIMManager.getConversationManager().markConversation(conversationIDList,
+                V2TIMConversation.V2TIM_CONVERSATION_MARK_TYPE_FOLD, isFold,
+                new V2TIMValueCallback<List<V2TIMConversationOperationResult>>() {
+            @Override
+            public void onSuccess(List<V2TIMConversationOperationResult> v2TIMConversationOperationResults) {
+                TUIGroupUtils.callbackOnSuccess(callback, null);
+                TUIGroupLog.d(TAG, "markConversation fold onSuccess");
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIGroupUtils.callbackOnError(callback, code, desc);
+                TUIGroupLog.d(TAG, "markConversation fold onError code = " + code + ", desc = " + ErrorMessageConverter.convertIMError(code, desc));
+            }
+        });
+    }
+
+    public void modifyGroupFaceUrl(String groupId, String faceUrl, IUIKitCallback<Void> callback) {
+        V2TIMGroupInfo v2TIMGroupInfo = new V2TIMGroupInfo();
+        v2TIMGroupInfo.setGroupID(groupId);
+        v2TIMGroupInfo.setFaceUrl(faceUrl);
+        V2TIMManager.getGroupManager().setGroupInfo(v2TIMGroupInfo, new V2TIMCallback() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIGroupLog.e(TAG, "modify group icon failed, code:" + code + "|desc:" + ErrorMessageConverter.convertIMError(code, desc));
+                TUIGroupUtils.callbackOnError(callback, code, desc);
+            }
+
+            @Override
+            public void onSuccess() {
+                TUIGroupUtils.callbackOnSuccess(callback, null);
+            }
+        });
+    }
+
+    public GroupMemberInfo getSelfGroupMemberInfo(GroupInfo groupInfo) {
+        for (int i = 0; i < groupInfo.getMemberDetails().size(); i++) {
+            GroupMemberInfo memberInfo = groupInfo.getMemberDetails().get(i);
+            if (TextUtils.equals(memberInfo.getAccount(), V2TIMManager.getInstance().getLoginUser())) {
+                return memberInfo;
+            }
+
+        }
+        return null;
+    }
+
+    public boolean isAdmin(int memberType) {
+        return memberType == V2TIMGroupMemberFullInfo.V2TIM_GROUP_MEMBER_ROLE_ADMIN;
+    }
+
+    public boolean isSelf(String userId) {
+        return TextUtils.equals(userId, V2TIMManager.getInstance().getLoginUser());
+    }
+
+    public void muteAll(String groupId, boolean isAllMute, IUIKitCallback<Void> callback) {
+        V2TIMGroupInfo v2TIMGroupInfo = new V2TIMGroupInfo();
+        v2TIMGroupInfo.setGroupID(groupId);
+        v2TIMGroupInfo.setAllMuted(isAllMute);
+        V2TIMManager.getGroupManager().setGroupInfo(v2TIMGroupInfo, new V2TIMCallback() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIGroupLog.e(TAG, "muteAll failed, code:" + code + "|desc:" + ErrorMessageConverter.convertIMError(code, desc));
+                TUIGroupUtils.callbackOnError(callback, code, desc);
+            }
+
+            @Override
+            public void onSuccess() {
+                TUIGroupUtils.callbackOnSuccess(callback, null);
+            }
+        });
+    }
+
+    public void loadGroupManagers(String groupId, IUIKitCallback<List<GroupMemberInfo>> callback) {
+        List<GroupMemberInfo> managerList = new ArrayList<>();
+
+        V2TIMValueCallback<V2TIMGroupMemberInfoResult> v2TIMValueCallback =  new V2TIMValueCallback<V2TIMGroupMemberInfoResult>() {
+            @Override
+            public void onSuccess(V2TIMGroupMemberInfoResult v2TIMGroupMemberInfoResult) {
+                List<V2TIMGroupMemberFullInfo> infoList = v2TIMGroupMemberInfoResult.getMemberInfoList();
+                for (V2TIMGroupMemberFullInfo fullInfo : infoList) {
+                    GroupMemberInfo member = new GroupMemberInfo();
+                    managerList.add(member.covertTIMGroupMemberInfo(fullInfo));
+                }
+
+                long loadNextSeq = v2TIMGroupMemberInfoResult.getNextSeq();
+                if (loadNextSeq == 0) {
+                    TUIGroupUtils.callbackOnSuccess(callback, managerList);
+                } else {
+                    loadGroupManagers(groupId, loadNextSeq, this);
+                }
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIGroupUtils.callbackOnError(callback, code, desc);
+            }
+        };
+        loadGroupManagers(groupId, 0, v2TIMValueCallback);
+    }
+
+    private void loadGroupManagers(String groupId, long nextSeq, V2TIMValueCallback<V2TIMGroupMemberInfoResult> callback) {
+        int filter = V2TIMGroupMemberFullInfo.V2TIM_GROUP_MEMBER_FILTER_ADMIN;
+        V2TIMManager.getGroupManager().getGroupMemberList(groupId, filter, nextSeq, callback);
+    }
+
+    private void loadGroupMembers(String groupId, long nextSeq, V2TIMValueCallback<V2TIMGroupMemberInfoResult> callback) {
+        int filter = V2TIMGroupMemberFullInfo.V2TIM_GROUP_MEMBER_FILTER_ALL;
+        V2TIMManager.getGroupManager().getGroupMemberList(groupId, filter, nextSeq, callback);
+    }
+
+    public void loadMutedMembers(String groupId, IUIKitCallback<List<GroupMemberInfo>> callback) {
+        List<GroupMemberInfo> managerList = new ArrayList<>();
+
+        V2TIMValueCallback<V2TIMGroupMemberInfoResult> v2TIMValueCallback =  new V2TIMValueCallback<V2TIMGroupMemberInfoResult>() {
+            @Override
+            public void onSuccess(V2TIMGroupMemberInfoResult v2TIMGroupMemberInfoResult) {
+                List<V2TIMGroupMemberFullInfo> infoList = v2TIMGroupMemberInfoResult.getMemberInfoList();
+                long serverTime = V2TIMManager.getInstance().getServerTime();
+                for (V2TIMGroupMemberFullInfo fullInfo : infoList) {
+                    long mutedUntil = fullInfo.getMuteUntil();
+                    if (mutedUntil > serverTime) {
+                        GroupMemberInfo member = new GroupMemberInfo();
+                        managerList.add(member.covertTIMGroupMemberInfo(fullInfo));
+                    }
+                }
+
+                long loadNextSeq = v2TIMGroupMemberInfoResult.getNextSeq();
+                if (loadNextSeq == 0) {
+                    TUIGroupUtils.callbackOnSuccess(callback, managerList);
+                } else {
+                    loadGroupMembers(groupId, loadNextSeq, this);
+                }
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIGroupUtils.callbackOnError(callback, code, desc);
+            }
+        };
+        loadGroupMembers(groupId, 0, v2TIMValueCallback);
+    }
+
+    public void loadGroupOwner(String groupId, IUIKitCallback<GroupMemberInfo> callback) {
+        int filter = V2TIMGroupMemberFullInfo.V2TIM_GROUP_MEMBER_FILTER_OWNER;
+        V2TIMManager.getGroupManager().getGroupMemberList(groupId, filter, 0, new V2TIMValueCallback<V2TIMGroupMemberInfoResult>() {
+            @Override
+            public void onSuccess(V2TIMGroupMemberInfoResult v2TIMGroupMemberInfoResult) {
+                List<V2TIMGroupMemberFullInfo> list =  v2TIMGroupMemberInfoResult.getMemberInfoList();
+                GroupMemberInfo member = new GroupMemberInfo();
+                member.covertTIMGroupMemberInfo(list.get(0));
+                TUIGroupUtils.callbackOnSuccess(callback, member);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIGroupUtils.callbackOnError(callback, code, desc);
+            }
+        });
+    }
+
+    public void muteGroupMember(String groupId, String userId, int seconds, IUIKitCallback<Void> callback) {
+        V2TIMManager.getGroupManager().muteGroupMember(groupId, userId, seconds, new V2TIMCallback() {
+            @Override
+            public void onSuccess() {
+                TUIGroupUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIGroupUtils.callbackOnError(callback, code, desc);
+            }
+        });
+    }
+
+    public void cancelMuteGroupMember(String groupId, String userId, IUIKitCallback<Void> callback) {
+        V2TIMManager.getGroupManager().muteGroupMember(groupId, userId, 0, new V2TIMCallback() {
+            @Override
+            public void onSuccess() {
+                TUIGroupUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIGroupUtils.callbackOnError(callback, code, desc);
+            }
+        });
+    }
+
+    public void setGroupManager(String groupId, String userId, IUIKitCallback<Void> callback) {
+        int role = V2TIMGroupMemberFullInfo.V2TIM_GROUP_MEMBER_ROLE_ADMIN;
+        V2TIMManager.getGroupManager().setGroupMemberRole(groupId, userId, role, new V2TIMCallback() {
+            @Override
+            public void onSuccess() {
+                TUIGroupUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIGroupUtils.callbackOnError(callback, code, desc);
+            }
+        });
+    }
+
+    public void clearGroupManager(String groupId, String userId, IUIKitCallback<Void> callback) {
+        int role = V2TIMGroupMemberFullInfo.V2TIM_GROUP_MEMBER_ROLE_MEMBER;
+        V2TIMManager.getGroupManager().setGroupMemberRole(groupId, userId, role, new V2TIMCallback() {
+            @Override
+            public void onSuccess() {
+                TUIGroupUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIGroupUtils.callbackOnError(callback, code, desc);
+            }
+        });
+    }
+
+    public void transferGroupOwner(String groupId, String userId, IUIKitCallback<Void> callback) {
+        V2TIMManager.getGroupManager().transferGroupOwner(groupId, userId, new V2TIMCallback() {
+            @Override
+            public void onSuccess() {
+                TUIGroupUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIGroupUtils.callbackOnError(callback, code, desc);
+            }
+        });
+    }
+
+    public void modifyGroupNotification(String groupId, final String value, final IUIKitCallback callBack) {
+        V2TIMGroupInfo v2TIMGroupInfo = new V2TIMGroupInfo();
+        v2TIMGroupInfo.setGroupID(groupId);
+        v2TIMGroupInfo.setNotification(value);
+        V2TIMManager.getGroupManager().setGroupInfo(v2TIMGroupInfo, new V2TIMCallback() {
+            @Override
+            public void onError(int code, String desc) {
+                TUIGroupLog.e(TAG, "modifyGroupNotification failed value| code| desc " + value + ":" + code + ":" + desc);
+                TUIGroupUtils.callbackOnError(callBack, TAG, code, desc);
+            }
+
+            @Override
+            public void onSuccess() {
+                TUIGroupUtils.callbackOnSuccess(callBack, null);
+            }
+        });
+    }
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/presenter/GroupApplyPresenter.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/presenter/GroupApplyPresenter.java
new file mode 100644
index 0000000..7bf97cf
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/presenter/GroupApplyPresenter.java
@@ -0,0 +1,71 @@
+package com.tencent.qcloud.tuikit.tuigroup.presenter;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupApplyInfo;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.interfaces.IGroupApplyLayout;
+import com.tencent.qcloud.tuikit.tuigroup.model.GroupInfoProvider;
+
+import java.util.List;
+
+public class GroupApplyPresenter {
+    private final IGroupApplyLayout layout;
+    private final GroupInfoProvider provider;
+
+    private GroupInfo groupInfo;
+
+    public GroupApplyPresenter(IGroupApplyLayout layout) {
+        this.layout = layout;
+        provider = new GroupInfoProvider();
+    }
+
+    public void setGroupInfo(GroupInfo groupInfo) {
+        this.groupInfo = groupInfo;
+    }
+
+    public void loadGroupApplies() {
+        provider.loadGroupApplies(groupInfo, new IUIKitCallback<List<GroupApplyInfo>>() {
+            @Override
+            public void onSuccess(List<GroupApplyInfo> data) {
+                layout.onGroupApplyInfoListChanged(data);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+
+            }
+        });
+    }
+
+    public void acceptApply(GroupApplyInfo item) {
+        provider.acceptApply(item, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                item.setStatus(GroupApplyInfo.APPLIED);
+                layout.onDataSetChanged();
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastLongMessage(errMsg);
+            }
+        });
+    }
+
+    public void refuseApply(final GroupApplyInfo item) {
+        provider.refuseApply(item, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                item.setStatus(GroupApplyInfo.REFUSED);
+                layout.onDataSetChanged();
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastLongMessage(errMsg);
+
+            }
+        });
+    }
+
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/presenter/GroupInfoPresenter.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/presenter/GroupInfoPresenter.java
new file mode 100644
index 0000000..3e863b3
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/presenter/GroupInfoPresenter.java
@@ -0,0 +1,369 @@
+package com.tencent.qcloud.tuikit.tuigroup.presenter;
+
+import android.text.TextUtils;
+
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuicore.util.ToastUtil;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupConstants;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupService;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuigroup.interfaces.GroupEventListener;
+import com.tencent.qcloud.tuikit.tuigroup.interfaces.IGroupMemberLayout;
+import com.tencent.qcloud.tuikit.tuigroup.model.GroupInfoProvider;
+import com.tencent.qcloud.tuikit.tuigroup.util.TUIGroupLog;
+import com.tencent.qcloud.tuikit.tuigroup.util.TUIGroupUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class GroupInfoPresenter {
+    public static final String TAG = GroupInfoPresenter.class.getSimpleName();
+
+    private final IGroupMemberLayout layout;
+    private final GroupInfoProvider provider;
+
+    private GroupInfo groupInfo;
+    private GroupMemberInfo selfGroupMemberInfo;
+
+    private GroupEventListener groupEventListener;
+
+    public GroupInfoPresenter(IGroupMemberLayout layout) {
+        this.layout = layout;
+        provider = new GroupInfoProvider();
+    }
+
+    public void setGroupEventListener() {
+        groupEventListener = new GroupEventListener() {
+            @Override
+            public void onGroupInfoChanged(String groupID) {
+                GroupInfoPresenter.this.onGroupInfoChanged(groupID);
+            }
+        };
+        TUIGroupService.getInstance().addGroupEventListener(groupEventListener);
+    }
+
+    public void setGroupInfo(GroupInfo groupInfo) {
+        this.groupInfo = groupInfo;
+    }
+
+    public void loadGroupInfo(String groupId) {
+        loadGroupInfo(groupId, GroupInfo.GROUP_MEMBER_FILTER_ALL);
+    }
+
+    public void loadGroupInfo(String groupId, int filter) {
+        provider.loadGroupInfo(groupId, filter, new IUIKitCallback<GroupInfo>() {
+            @Override
+            public void onSuccess(GroupInfo data) {
+                groupInfo = data;
+                layout.onGroupInfoChanged(data);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIGroupLog.e("loadGroupInfo", errCode + ":" + errMsg);
+                ToastUtil.toastLongMessage(errMsg);
+            }
+        });
+    }
+
+    private void onGroupInfoChanged(String groupID) {
+        if (groupInfo != null && TextUtils.equals(groupID, groupInfo.getId())) {
+            loadGroupInfo(groupID);
+        }
+    }
+
+    public void getGroupMembers(GroupInfo groupInfo, final IUIKitCallback<GroupInfo> callBack) {
+        provider.loadGroupMembers(groupInfo, groupInfo.getNextSeq(), new IUIKitCallback<GroupInfo>() {
+            @Override
+            public void onSuccess(GroupInfo data) {
+                if (layout != null) {
+                    layout.onGroupInfoChanged(data);
+                }
+                TUIGroupUtils.callbackOnSuccess(callBack, data);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIGroupLog.e("loadGroupInfo", errCode + ":" + errMsg);
+                TUIGroupUtils.callbackOnError(callBack, errCode, errMsg);
+                ToastUtil.toastLongMessage(errMsg);
+            }
+        });
+    }
+
+    public void modifyGroupName(final String name) {
+        if (groupInfo == null) {
+            return;
+        }
+        provider.modifyGroupInfo(groupInfo, name, TUIGroupConstants.Group.MODIFY_GROUP_NAME, new IUIKitCallback() {
+            @Override
+            public void onSuccess(Object data) {
+                layout.onGroupInfoModified(name, TUIGroupConstants.Group.MODIFY_GROUP_NAME);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIGroupLog.e("modifyGroupName", errCode + ":" + errMsg);
+                ToastUtil.toastLongMessage(errMsg);
+            }
+        });
+    }
+
+    public void modifyGroupNotice(final String notice) {
+        if (groupInfo == null) {
+            return;
+        }
+        provider.modifyGroupInfo(groupInfo, notice, TUIGroupConstants.Group.MODIFY_GROUP_NOTICE, new IUIKitCallback() {
+            @Override
+            public void onSuccess(Object data) {
+                layout.onGroupInfoModified(notice, TUIGroupConstants.Group.MODIFY_GROUP_NOTICE);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIGroupLog.e("modifyGroupNotice", errCode + ":" + errMsg);
+                ToastUtil.toastLongMessage(errMsg);
+            }
+        });
+    }
+
+    public String getNickName() {
+        String nickName = "";
+        GroupMemberInfo self = getSelfGroupMemberInfo();
+        if (self != null) {
+            nickName = self.getNameCard();
+        }
+        return nickName == null ? "" : nickName;
+    }
+
+    public void modifyMyGroupNickname(final String nickname) {
+        provider.modifyMyGroupNickname(groupInfo, nickname, new IUIKitCallback() {
+            @Override
+            public void onSuccess(Object data) {
+                layout.onGroupInfoModified(nickname, TUIGroupConstants.Group.MODIFY_MEMBER_NAME);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIGroupLog.e("modifyMyGroupNickname", errCode + ":" + errMsg);
+                ToastUtil.toastLongMessage(errMsg);
+            }
+        });
+    }
+
+    public void deleteGroup(IUIKitCallback<Void> callback) {
+        if (groupInfo == null) {
+            return;
+        }
+        String groupId = groupInfo.getId();
+        provider.deleteGroup(groupId, new IUIKitCallback() {
+            @Override
+            public void onSuccess(Object data) {
+                TUIGroupUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIGroupLog.e("deleteGroup", errCode + ":" + errMsg);
+                TUIGroupUtils.callbackOnError(callback, module, errCode, errMsg);
+            }
+        });
+    }
+
+    public void setTopConversation(String groupId, boolean isSetTop, IUIKitCallback<Void> callback) {
+        String conversationId = TUIGroupUtils.getConversationIdByUserId(groupId, true);
+        provider.setTopConversation(conversationId, isSetTop, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                groupInfo.setTopChat(isSetTop);
+                TUIGroupUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIGroupUtils.callbackOnError(callback, module, errCode, errMsg);
+            }
+        });
+    }
+
+    public void quitGroup(IUIKitCallback<Void> callback) {
+        if (groupInfo == null) {
+            return;
+        }
+        String groupId = groupInfo.getId();
+        provider.quitGroup(groupId, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                TUIGroupUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIGroupUtils.callbackOnError(callback, module, errCode, errMsg);
+                TUIGroupLog.e("quitGroup", errCode + ":" + errMsg);
+            }
+        });
+    }
+
+    public void modifyGroupInfo(int value, int type) {
+        if (groupInfo == null) {
+            return;
+        }
+        provider.modifyGroupInfo(groupInfo, value, type, new IUIKitCallback() {
+            @Override
+            public void onSuccess(Object data) {
+                layout.onGroupInfoModified(data, TUIGroupConstants.Group.MODIFY_GROUP_JOIN_TYPE);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                ToastUtil.toastLongMessage("modifyGroupInfo fail :" + errCode + "=" + errMsg);
+            }
+        });
+    }
+
+    public void inviteGroupMembers(String groupId, List<String> addMembers, IUIKitCallback<Object> callback) {
+        provider.loadGroupInfo(groupId, new IUIKitCallback<GroupInfo>() {
+            @Override
+            public void onSuccess(GroupInfo data) {
+                groupInfo = data;
+                inviteGroupMembers(addMembers, callback);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIGroupUtils.callbackOnError(callback, module, errCode, errMsg);
+            }
+        });
+    }
+
+
+    public void deleteGroupMembers(String groupId, List<String> members, IUIKitCallback<List<String>> callback) {
+        provider.removeGroupMembers(groupId, members, callback);
+    }
+
+    private void inviteGroupMembers(List<String> addMembers, IUIKitCallback<Object> callback) {
+        provider.inviteGroupMembers(groupInfo, addMembers, new IUIKitCallback<Object>() {
+            @Override
+            public void onSuccess(Object data) {
+                TUIGroupUtils.callbackOnSuccess(callback, data);
+                if (layout != null) {
+                    layout.onGroupInfoChanged(groupInfo);
+                }
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIGroupUtils.callbackOnError(callback, module, errCode, errMsg);
+            }
+        });
+    }
+
+    public void removeGroupMembers(GroupInfo groupInfo, List<GroupMemberInfo> delMembers, IUIKitCallback callBack) {
+        List<String> memberAccountList = new ArrayList<>();
+        for (GroupMemberInfo memberInfo : delMembers) {
+            memberAccountList.add(memberInfo.getAccount());
+        }
+        provider.removeGroupMembers(groupInfo.getId(), memberAccountList, new IUIKitCallback<List<String>>() {
+            @Override
+            public void onSuccess(List<String> data) {
+                List<GroupMemberInfo> memberInfoList = groupInfo.getMemberDetails();
+                for (int i = 0; i < data.size(); i++) {
+                    for (int j = memberInfoList.size() - 1; j >= 0; j--) {
+                        if (memberInfoList.get(j).getAccount().equals(data.get(i))) {
+                            memberInfoList.remove(j);
+                            break;
+                        }
+                    }
+                }
+                TUIGroupUtils.callbackOnSuccess(callBack, data);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIGroupUtils.callbackOnError(callBack, errCode, errMsg);
+            }
+        });
+    }
+
+    public void setGroupNotDisturb(GroupInfo groupInfo, boolean isChecked, IUIKitCallback<Void> callback) {
+        if (groupInfo == null) {
+            TUIGroupLog.e(TAG, "mGroupInfo is NULL");
+            return;
+        }
+
+        provider.setGroupReceiveMessageOpt(groupInfo.getId(), !isChecked, new IUIKitCallback() {
+            @Override
+            public void onSuccess(Object data) {
+                groupInfo.setMessageReceiveOption(!isChecked);
+                TUIGroupUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIGroupUtils.callbackOnError(callback, module, errCode, errMsg);
+            }
+        });
+    }
+
+    public void setGroupFold(GroupInfo groupInfo, boolean isChecked, IUIKitCallback<Void> callback) {
+        if (groupInfo == null) {
+            TUIGroupLog.e(TAG, "mGroupInfo is NULL");
+            return;
+        }
+
+        provider.setGroupFold(groupInfo.getId(), isChecked, new IUIKitCallback() {
+            @Override
+            public void onSuccess(Object data) {
+                groupInfo.setFolded(isChecked);
+                TUIGroupUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIGroupUtils.callbackOnError(callback, module, errCode, errMsg);
+            }
+        });
+    }
+
+    public void modifyGroupFaceUrl(String groupId, String faceUrl, IUIKitCallback<Void> callback) {
+        provider.modifyGroupFaceUrl(groupId, faceUrl, new IUIKitCallback<Void>() {
+            @Override
+            public void onSuccess(Void data) {
+                TUIGroupUtils.callbackOnSuccess(callback, null);
+            }
+
+            @Override
+            public void onError(String module, int errCode, String errMsg) {
+                TUIGroupUtils.callbackOnError(callback, module, errCode, errMsg);
+            }
+        });
+    }
+
+    public GroupMemberInfo getSelfGroupMemberInfo() {
+        if (selfGroupMemberInfo != null) {
+            return selfGroupMemberInfo;
+        }
+        if (groupInfo == null) {
+            return null;
+        }
+
+        GroupMemberInfo groupMemberInfo = provider.getSelfGroupMemberInfo(groupInfo);
+        selfGroupMemberInfo = groupMemberInfo;
+        return selfGroupMemberInfo;
+    }
+
+    public boolean isAdmin(int memberType) {
+        return provider.isAdmin(memberType);
+    }
+
+    public boolean isSelf(String userId) {
+        return provider.isSelf(userId);
+    }
+
+    public void transferGroupOwner(String groupId, String userId, IUIKitCallback<Void> callback) {
+        provider.transferGroupOwner(groupId, userId, callback);
+    }
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/presenter/GroupManagerPresenter.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/presenter/GroupManagerPresenter.java
new file mode 100644
index 0000000..da26c79
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/presenter/GroupManagerPresenter.java
@@ -0,0 +1,52 @@
+package com.tencent.qcloud.tuikit.tuigroup.presenter;
+
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuigroup.bean.GroupMemberInfo;
+import com.tencent.qcloud.tuikit.tuigroup.model.GroupInfoProvider;
+
+import java.util.List;
+
+public class GroupManagerPresenter {
+    private final GroupInfoProvider provider;
+
+    public GroupManagerPresenter() {
+        provider = new GroupInfoProvider();
+    }
+
+    public void muteAll(String groupId, boolean isAllMute, IUIKitCallback<Void> callback) {
+        provider.muteAll(groupId, isAllMute, callback);
+    }
+
+    public void loadGroupManager(String groupId, IUIKitCallback<List<GroupMemberInfo>> callback) {
+        provider.loadGroupManagers(groupId, callback);
+    }
+
+    public void loadGroupOwner(String groupId, IUIKitCallback<GroupMemberInfo> callback) {
+        provider.loadGroupOwner(groupId, callback);
+    }
+
+    public void loadMutedMembers(String groupId, IUIKitCallback<List<GroupMemberInfo>> callback) {
+        provider.loadMutedMembers(groupId, callback);
+    }
+
+    public void muteGroupMember(String groupId, String userId, IUIKitCallback<Void> callback) {
+        int muteTime = 365 * 24 * 3600; // 365 days
+        provider.muteGroupMember(groupId, userId, muteTime, callback);
+    }
+
+    public void setGroupManager(String groupId, String userId, IUIKitCallback<Void> callback) {
+        provider.setGroupManager(groupId, userId, callback);
+    }
+
+    public void clearGroupManager(String groupId, String userId, IUIKitCallback<Void> callback) {
+        provider.clearGroupManager(groupId, userId, callback);
+    }
+
+    public void cancelMuteGroupMember(String groupId, String userId, IUIKitCallback<Void> callback) {
+        provider.cancelMuteGroupMember(groupId, userId, callback);
+    }
+
+    public void modifyGroupNotification(String groupId, String value, IUIKitCallback<Void> callback) {
+        provider.modifyGroupNotification(groupId, value, callback);
+    }
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/util/TUIGroupLog.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/util/TUIGroupLog.java
new file mode 100644
index 0000000..f470ef0
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/util/TUIGroupLog.java
@@ -0,0 +1,37 @@
+package com.tencent.qcloud.tuikit.tuigroup.util;
+
+import com.tencent.imsdk.common.IMLog;
+
+public class TUIGroupLog extends IMLog {
+
+    private static final String PRE = "TUIGroup-";
+
+    private static String mixTag(String tag) {
+        return PRE + tag;
+    }
+
+    public static void v(String strTag, String strInfo) {
+        IMLog.v(mixTag(strTag), strInfo);
+    }
+
+    public static void d(String strTag, String strInfo) {
+        IMLog.d(mixTag(strTag), strInfo);
+    }
+
+    public static void i(String strTag, String strInfo) {
+        IMLog.i(mixTag(strTag), strInfo);
+    }
+
+    public static void w(String strTag, String strInfo) {
+        IMLog.w(mixTag(strTag), strInfo);
+    }
+
+    public static void w(String strTag, String strInfo, Throwable e) {
+        IMLog.w(mixTag(strTag), strInfo + e.getMessage());
+    }
+
+    public static void e(String strTag, String strInfo) {
+        IMLog.e(mixTag(strTag), strInfo);
+    }
+
+}
diff --git a/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/util/TUIGroupUtils.java b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/util/TUIGroupUtils.java
new file mode 100644
index 0000000..1ac58ee
--- /dev/null
+++ b/system/tuigroup/src/main/java/com/tencent/qcloud/tuikit/tuigroup/util/TUIGroupUtils.java
@@ -0,0 +1,96 @@
+package com.tencent.qcloud.tuikit.tuigroup.util;
+
+import static com.tencent.qcloud.tuicore.TUIConstants.TUIConversation.CONVERSATION_C2C_PREFIX;
+import static com.tencent.qcloud.tuicore.TUIConstants.TUIConversation.CONVERSATION_GROUP_PREFIX;
+
+import android.text.TextUtils;
+
+import com.tencent.imsdk.v2.V2TIMGroupInfo;
+import com.tencent.imsdk.v2.V2TIMGroupInfoResult;
+import com.tencent.imsdk.v2.V2TIMManager;
+import com.tencent.imsdk.v2.V2TIMValueCallback;
+import com.tencent.qcloud.tuicore.TUILogin;
+import com.tencent.qcloud.tuicore.component.interfaces.IUIKitCallback;
+import com.tencent.qcloud.tuikit.tuigroup.R;
+import com.tencent.qcloud.tuikit.tuigroup.TUIGroupService;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TUIGroupUtils {
+    private static final String TAG = "TUIGroupUtils";
+
+    public static final int GROUP_EVENT_TIP_JOINED = 1;
+    public static final int GROUP_EVENT_TIP_INVITED = 2;
+    public static final int GROUP_EVENT_TIP_KICKED = 3;
+    public static final int GROUP_EVENT_TIP_DISBANDED = 4;
+
+    public static <T> void callbackOnError(IUIKitCallback<T> callBack, String module, int errCode, String desc) {
+        if (callBack != null) {
+            callBack.onError(module, errCode, desc);
+        }
+    }
+
+    public static <T> void callbackOnError(IUIKitCallback<T> callBack, int errCode, String desc) {
+        if (callBack != null) {
+            callBack.onError(null, errCode, desc);
+        }
+    }
+
+    public static <T> void callbackOnSuccess(IUIKitCallback<T> callBack, T data) {
+        if (callBack != null) {
+            callBack.onSuccess(data);
+        }
+    }
+
+    public static String getConversationIdByUserId(String id, boolean isGroup) {
+        String conversationIdPrefix = isGroup ? CONVERSATION_GROUP_PREFIX : CONVERSATION_C2C_PREFIX;
+        return conversationIdPrefix + id;
+    }
+
+    public static void toastGroupEvent(int type, String groupID) {
+        List<String> groupList = new ArrayList<>();
+        groupList.add(groupID);
+        V2TIMManager.getGroupManager().getGroupsInfo(groupList, new V2TIMValueCallback<List<V2TIMGroupInfoResult>>() {
+            @Override
+            public void onSuccess(List<V2TIMGroupInfoResult> v2TIMGroupInfoResults) {
+                V2TIMGroupInfoResult v2TIMGroupInfoResult = v2TIMGroupInfoResults.get(0);
+                if (v2TIMGroupInfoResult.getResultCode() == 0) {
+                    V2TIMGroupInfo groupInfo = v2TIMGroupInfoResult.getGroupInfo();
+                    if (TextUtils.equals(TUILogin.getLoginUser(), groupInfo.getOwner())) {
+                        return;
+                    }
+                    String groupName = groupInfo.getGroupName();
+                    if (TextUtils.isEmpty(groupName)) {
+                        groupName = groupID;
+                    }
+                    toastGroupEventByName(type, groupName);
+                } else {
+                    TUIGroupLog.e(TAG, "toastGroupEvent failed, code=" + v2TIMGroupInfoResult.getResultCode() + ", msg=" + v2TIMGroupInfoResult.getResultMessage());
+                }
+            }
+
+            @Override
+            public void onError(int code, String desc) {
+                TUIGroupLog.e(TAG, "toastGroupEvent failed, code=" + code + ", msg=" + desc);
+                toastGroupEventByName(type, groupID);
+            }
+        });
+    }
+
+    private static void toastGroupEventByName(int type, String groupName) {
+        String toastString = null;
+        if (type == GROUP_EVENT_TIP_JOINED) {
+            toastString = TUIGroupService.getAppContext().getString(R.string.joined_tip) + groupName;
+        } else if (type == GROUP_EVENT_TIP_INVITED) {
+            toastString = TUIGroupService.getAppContext().getString(R.string.join_group_tip) + groupName;
+        } else if (type == GROUP_EVENT_TIP_KICKED) {
+            toastString = TUIGroupService.getAppContext().getString(R.string.kick_group) + groupName;
+        } else if (type == GROUP_EVENT_TIP_DISBANDED) {
+            toastString = TUIGroupService.getAppContext().getString(R.string.dismiss_tip_before) + groupName + TUIGroupService.getAppContext().getString(R.string.dismiss_tip_after);
+        }
+        if (toastString != null) {
+//            ToastUtil.toastLongMessage(toastString); //当前需要不要提示，所以注释掉
+        }
+    }
+}
diff --git a/system/tuigroup/src/main/res-light/drawable-xxhdpi/group_add_icon_light.png b/system/tuigroup/src/main/res-light/drawable-xxhdpi/group_add_icon_light.png
new file mode 100644
index 0000000..c7606b3
Binary files /dev/null and b/system/tuigroup/src/main/res-light/drawable-xxhdpi/group_add_icon_light.png differ
diff --git a/system/tuigroup/src/main/res-light/values/light_colors.xml b/system/tuigroup/src/main/res-light/values/light_colors.xml
new file mode 100644
index 0000000..55344e5
--- /dev/null
+++ b/system/tuigroup/src/main/res-light/values/light_colors.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res-light/values/light_styles.xml b/system/tuigroup/src/main/res-light/values/light_styles.xml
new file mode 100644
index 0000000..fe43b01
--- /dev/null
+++ b/system/tuigroup/src/main/res-light/values/light_styles.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TUIGroupLightTheme" parent="TUIBaseLightTheme">
+        <item name="group_add_icon">@drawable/group_add_icon_light</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res-lively/drawable-xxhdpi/group_add_icon_lively.png b/system/tuigroup/src/main/res-lively/drawable-xxhdpi/group_add_icon_lively.png
new file mode 100644
index 0000000..c352fd4
Binary files /dev/null and b/system/tuigroup/src/main/res-lively/drawable-xxhdpi/group_add_icon_lively.png differ
diff --git a/system/tuigroup/src/main/res-lively/values/lively_colors.xml b/system/tuigroup/src/main/res-lively/values/lively_colors.xml
new file mode 100644
index 0000000..55344e5
--- /dev/null
+++ b/system/tuigroup/src/main/res-lively/values/lively_colors.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res-lively/values/lively_styles.xml b/system/tuigroup/src/main/res-lively/values/lively_styles.xml
new file mode 100644
index 0000000..dc7ebb6
--- /dev/null
+++ b/system/tuigroup/src/main/res-lively/values/lively_styles.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TUIGroupLivelyTheme" parent="TUIBaseLivelyTheme">
+        <item name="group_add_icon">@drawable/group_add_icon_lively</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res-minimalist/drawable/group_minimalist_add_border.xml b/system/tuigroup/src/main/res-minimalist/drawable/group_minimalist_add_border.xml
new file mode 100644
index 0000000..51e781a
--- /dev/null
+++ b/system/tuigroup/src/main/res-minimalist/drawable/group_minimalist_add_border.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <solid android:color="#ffffff" />
+    <stroke
+        android:dashGap="5dp"
+        android:dashWidth="5dp"
+        android:width="1dp"
+        android:color="#bfbfbf" />
+    <corners android:radius="25dp" />
+</shape>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res-minimalist/layout/group_minimalist_apply_manager_activity.xml b/system/tuigroup/src/main/res-minimalist/layout/group_minimalist_apply_manager_activity.xml
new file mode 100644
index 0000000..3ee789e
--- /dev/null
+++ b/system/tuigroup/src/main/res-minimalist/layout/group_minimalist_apply_manager_activity.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuikit.tuigroup.minimalistui.view.GroupApplyManagerLayout
+        android:id="@+id/group_apply_manager_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>
diff --git a/system/tuigroup/src/main/res-minimalist/layout/group_minimalist_info_fragment.xml b/system/tuigroup/src/main/res-minimalist/layout/group_minimalist_info_fragment.xml
new file mode 100644
index 0000000..f99f3d5
--- /dev/null
+++ b/system/tuigroup/src/main/res-minimalist/layout/group_minimalist_info_fragment.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuikit.tuigroup.minimalistui.view.GroupInfoLayout
+        android:id="@+id/group_info_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
diff --git a/system/tuigroup/src/main/res-minimalist/layout/group_minimalist_members_list.xml b/system/tuigroup/src/main/res-minimalist/layout/group_minimalist_members_list.xml
new file mode 100644
index 0000000..c5fe253
--- /dev/null
+++ b/system/tuigroup/src/main/res-minimalist/layout/group_minimalist_members_list.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/status_bar_color"
+    android:orientation="vertical">
+
+
+    <com.tencent.qcloud.tuikit.tuigroup.minimalistui.view.GroupMemberLayout
+        android:id="@+id/group_member_grid_layout"
+        android:layout_weight="1"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <TextView
+        android:id="@+id/limit_tips"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center"
+        android:paddingBottom="36dp"
+        android:paddingTop="12dp"
+        android:background="#F6F6F6"
+        android:textColor="#999999"
+        android:textSize="12sp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:visibility="visible"
+        tools:text="123"
+        android:visibility="gone"/>
+</LinearLayout>
diff --git a/system/tuigroup/src/main/res-serious/drawable-xxhdpi/group_add_icon_serious.png b/system/tuigroup/src/main/res-serious/drawable-xxhdpi/group_add_icon_serious.png
new file mode 100644
index 0000000..35437cc
Binary files /dev/null and b/system/tuigroup/src/main/res-serious/drawable-xxhdpi/group_add_icon_serious.png differ
diff --git a/system/tuigroup/src/main/res-serious/values/serious_colors.xml b/system/tuigroup/src/main/res-serious/values/serious_colors.xml
new file mode 100644
index 0000000..55344e5
--- /dev/null
+++ b/system/tuigroup/src/main/res-serious/values/serious_colors.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res-serious/values/serious_styles.xml b/system/tuigroup/src/main/res-serious/values/serious_styles.xml
new file mode 100644
index 0000000..763e625
--- /dev/null
+++ b/system/tuigroup/src/main/res-serious/values/serious_styles.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TUIGroupSeriousTheme" parent="TUIBaseSeriousTheme">
+        <item name="group_add_icon">@drawable/group_add_icon_serious</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/anim/bottom_select_sheet_enter.xml b/system/tuigroup/src/main/res/anim/bottom_select_sheet_enter.xml
new file mode 100644
index 0000000..b3d4b5c
--- /dev/null
+++ b/system/tuigroup/src/main/res/anim/bottom_select_sheet_enter.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromXDelta="0"
+    android:fromYDelta="100%"
+    android:toXDelta="0"
+    android:toYDelta="0"
+    android:duration="150">
+</translate>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/anim/bottom_select_sheet_exit.xml b/system/tuigroup/src/main/res/anim/bottom_select_sheet_exit.xml
new file mode 100644
index 0000000..802d60a
--- /dev/null
+++ b/system/tuigroup/src/main/res/anim/bottom_select_sheet_exit.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<translate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:fromXDelta="0"
+    android:fromYDelta="0"
+    android:toXDelta="0"
+    android:toYDelta="100"
+    android:duration="150">
+</translate>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/color/bg_negative_btn.xml b/system/tuigroup/src/main/res/color/bg_negative_btn.xml
new file mode 100644
index 0000000..41d0518
--- /dev/null
+++ b/system/tuigroup/src/main/res/color/bg_negative_btn.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:color="@color/btn_negative_hover">
+        <shape xmlns:android="http://schemas.android.com/apk/res/android"
+            android:shape="rectangle" >
+            <corners android:radius="2.5dp" />
+            <solid android:color="@color/btn_negative_hover" />
+        </shape>
+    </item>
+    <item android:color="@color/btn_negative">
+        <shape xmlns:android="http://schemas.android.com/apk/res/android"
+            android:shape="rectangle" >
+            <corners android:radius="2.5dp" />
+            <solid android:color="@color/btn_negative" />
+        </shape>
+    </item>
+</selector>
diff --git a/system/tuigroup/src/main/res/color/bg_positive_btn.xml b/system/tuigroup/src/main/res/color/bg_positive_btn.xml
new file mode 100644
index 0000000..102c1f9
--- /dev/null
+++ b/system/tuigroup/src/main/res/color/bg_positive_btn.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true" android:color="@color/btn_positive_hover" >
+        <shape xmlns:android="http://schemas.android.com/apk/res/android"
+            android:shape="rectangle" >
+            <corners android:radius="5dp" />
+            <solid android:color="@color/btn_positive_hover" />
+        </shape>
+    </item>
+    <item android:color="@color/btn_positive" >
+        <shape xmlns:android="http://schemas.android.com/apk/res/android"
+            android:shape="rectangle" >
+            <corners android:radius="5dp" />
+            <solid android:color="@color/btn_positive" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/drawable-hdpi/alert_bg.9.png b/system/tuigroup/src/main/res/drawable-hdpi/alert_bg.9.png
new file mode 100644
index 0000000..84a042e
Binary files /dev/null and b/system/tuigroup/src/main/res/drawable-hdpi/alert_bg.9.png differ
diff --git a/system/tuigroup/src/main/res/drawable-hdpi/trans_bg.png b/system/tuigroup/src/main/res/drawable-hdpi/trans_bg.png
new file mode 100644
index 0000000..0a4c3cd
Binary files /dev/null and b/system/tuigroup/src/main/res/drawable-hdpi/trans_bg.png differ
diff --git a/system/tuigroup/src/main/res/drawable-xxhdpi/add_group_member.png b/system/tuigroup/src/main/res/drawable-xxhdpi/add_group_member.png
new file mode 100644
index 0000000..d43b388
Binary files /dev/null and b/system/tuigroup/src/main/res/drawable-xxhdpi/add_group_member.png differ
diff --git a/system/tuigroup/src/main/res/drawable-xxhdpi/check_box_selected.png b/system/tuigroup/src/main/res/drawable-xxhdpi/check_box_selected.png
new file mode 100644
index 0000000..273e525
Binary files /dev/null and b/system/tuigroup/src/main/res/drawable-xxhdpi/check_box_selected.png differ
diff --git a/system/tuigroup/src/main/res/drawable-xxhdpi/check_box_unselected.png b/system/tuigroup/src/main/res/drawable-xxhdpi/check_box_unselected.png
new file mode 100644
index 0000000..949bc8b
Binary files /dev/null and b/system/tuigroup/src/main/res/drawable-xxhdpi/check_box_unselected.png differ
diff --git a/system/tuigroup/src/main/res/drawable-xxhdpi/del_group_member.png b/system/tuigroup/src/main/res/drawable-xxhdpi/del_group_member.png
new file mode 100644
index 0000000..85671e2
Binary files /dev/null and b/system/tuigroup/src/main/res/drawable-xxhdpi/del_group_member.png differ
diff --git a/system/tuigroup/src/main/res/drawable-xxhdpi/group_select_disable.png b/system/tuigroup/src/main/res/drawable-xxhdpi/group_select_disable.png
new file mode 100644
index 0000000..3244854
Binary files /dev/null and b/system/tuigroup/src/main/res/drawable-xxhdpi/group_select_disable.png differ
diff --git a/system/tuigroup/src/main/res/drawable/bottom_action_border.xml b/system/tuigroup/src/main/res/drawable/bottom_action_border.xml
new file mode 100644
index 0000000..1b5774c
--- /dev/null
+++ b/system/tuigroup/src/main/res/drawable/bottom_action_border.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#ffffff" />
+    <stroke
+        android:dashGap="5dp"
+        android:dashWidth="5dp"
+        android:width="1dp"
+        android:color="#bfbfbf" />
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/drawable/bottom_sheet_border.xml b/system/tuigroup/src/main/res/drawable/bottom_sheet_border.xml
new file mode 100644
index 0000000..7a4ca9f
--- /dev/null
+++ b/system/tuigroup/src/main/res/drawable/bottom_sheet_border.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#ffffff" />
+    <corners android:radius="10dp" />
+</shape>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/drawable/editor_border_gray.xml b/system/tuigroup/src/main/res/drawable/editor_border_gray.xml
new file mode 100644
index 0000000..54fe027
--- /dev/null
+++ b/system/tuigroup/src/main/res/drawable/editor_border_gray.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="1dp"
+        android:color="@color/item_split_color" />
+    <solid android:color="#00000000" />
+
+</shape>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/drawable/gray_btn_bg.xml b/system/tuigroup/src/main/res/drawable/gray_btn_bg.xml
new file mode 100644
index 0000000..002fa7b
--- /dev/null
+++ b/system/tuigroup/src/main/res/drawable/gray_btn_bg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="5dp" />
+
+    <solid android:color="#c3c3c3" />
+
+
+</shape>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/drawable/group_checkbox_selector.xml b/system/tuigroup/src/main/res/drawable/group_checkbox_selector.xml
new file mode 100644
index 0000000..9fcc23c
--- /dev/null
+++ b/system/tuigroup/src/main/res/drawable/group_checkbox_selector.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/check_box_selected" android:state_checked="true" android:state_enabled="true"/>
+    <item android:drawable="@drawable/group_select_disable" android:state_checked="true" android:state_enabled="false"/>
+    <item android:drawable="@drawable/check_box_unselected" android:state_checked="false" />
+    <item android:drawable="@drawable/check_box_unselected" />
+
+</selector>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/drawable/group_confirm_button_bg.xml b/system/tuigroup/src/main/res/drawable/group_confirm_button_bg.xml
new file mode 100644
index 0000000..339608e
--- /dev/null
+++ b/system/tuigroup/src/main/res/drawable/group_confirm_button_bg.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="?attr/core_primary_color"/>
+    <corners android:radius="4dp"/>
+</shape>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/drawable/group_list_divider.xml b/system/tuigroup/src/main/res/drawable/group_list_divider.xml
new file mode 100644
index 0000000..59cf049
--- /dev/null
+++ b/system/tuigroup/src/main/res/drawable/group_list_divider.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid
+        android:color="#E5E5E5"/>
+
+    <size
+        android:height="0.5dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/drawable/my_cursor.xml b/system/tuigroup/src/main/res/drawable/my_cursor.xml
new file mode 100644
index 0000000..31599ac
--- /dev/null
+++ b/system/tuigroup/src/main/res/drawable/my_cursor.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/green" />
+    <size android:width="1dp" />
+</shape>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/drawable/popu_dialog_bg.xml b/system/tuigroup/src/main/res/drawable/popu_dialog_bg.xml
new file mode 100644
index 0000000..dcf8d1a
--- /dev/null
+++ b/system/tuigroup/src/main/res/drawable/popu_dialog_bg.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape>
+            <stroke
+                android:width="1dp"
+                android:color="#cccccc" />
+            <solid android:color="#ffffff" />
+        </shape>
+
+    </item>
+
+</layer-list>
diff --git a/system/tuigroup/src/main/res/drawable/text_border.xml b/system/tuigroup/src/main/res/drawable/text_border.xml
new file mode 100644
index 0000000..a6ae34a
--- /dev/null
+++ b/system/tuigroup/src/main/res/drawable/text_border.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="1dp"
+        android:color="@color/item_split_color" />
+    <solid android:color="#fff" />
+
+</shape>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/layout/activity_group_manager.xml b/system/tuigroup/src/main/res/layout/activity_group_manager.xml
new file mode 100644
index 0000000..5900d09
--- /dev/null
+++ b/system/tuigroup/src/main/res/layout/activity_group_manager.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#F2F3F5"
+    android:orientation="vertical"
+    tools:context=".classicui.page.ManageGroupActivity">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/group_manage_title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/page_title_height" />
+
+    <com.tencent.qcloud.tuicore.component.LineControllerView
+        android:id="@+id/group_manage_set_manager"
+        app:isTop="true"
+        app:canNav="true"
+        app:name="@string/group_set_manager"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/group_profile_item_height"/>
+
+    <com.tencent.qcloud.tuicore.component.LineControllerView
+        android:id="@+id/group_manage_mute_all"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/group_profile_item_height"
+        app:name="@string/group_mute_all"
+        app:isSwitch="true"
+        app:isTop="true"
+        app:canNav="false"/>
+
+    <TextView
+        android:text="@string/group_mute_tip"
+        android:textSize="11.52sp"
+        android:lineHeight="17.28dp"
+        android:layout_marginBottom="10dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <LinearLayout
+        android:id="@+id/group_manage_add_mute_member"
+        android:orientation="horizontal"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:background="@color/white"
+        android:gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/group_profile_item_height">
+
+        <ImageView
+            android:background="?attr/group_add_icon"
+            android:scaleType="centerCrop"
+            android:layout_width="19.2dp"
+            android:layout_height="19.2dp"
+            android:layout_marginRight="13.44dp"/>
+
+        <TextView
+            android:text="@string/group_add_mute_member_tip"
+            android:textSize="15.36sp"
+            android:textColor="#444444"
+            android:lineHeight="23sp"
+            android:layout_weight="1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/group_manage_muted_member_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/layout/activity_group_notice.xml b/system/tuigroup/src/main/res/layout/activity_group_notice.xml
new file mode 100644
index 0000000..1d635dd
--- /dev/null
+++ b/system/tuigroup/src/main/res/layout/activity_group_notice.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".classicui.page.GroupNoticeActivity">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/group_notice_title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/page_title_height" />
+
+    <EditText
+        android:id="@+id/group_notice_text"
+        android:longClickable="false"
+        android:paddingTop="10dp"
+        android:paddingLeft="15.36dp"
+        android:paddingRight="15.36dp"
+        android:clickable="false"
+        android:focusable="false"
+        android:focusableInTouchMode="false"
+        android:background="@null"
+        android:gravity="start"
+        android:lines="8"
+        android:maxLines="10"
+        android:text="@string/group_notice_empty_tip"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/layout/activity_set_group_manager.xml b/system/tuigroup/src/main/res/layout/activity_set_group_manager.xml
new file mode 100644
index 0000000..994a77c
--- /dev/null
+++ b/system/tuigroup/src/main/res/layout/activity_set_group_manager.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#F2F3F5"
+    android:orientation="vertical"
+    tools:context=".classicui.page.SetGroupManagerActivity">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/set_group_manager_title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/page_title_height" />
+
+    <TextView
+        android:id="@+id/set_group_manager_owner_label"
+        android:text="@string/group_owner_label"
+        android:textSize="13.44sp"
+        android:lineHeight="19.2dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:gravity="center_vertical"
+        android:layout_width="match_parent"
+        android:layout_height="30dp"/>
+
+    <LinearLayout
+        android:id="@+id/set_group_manager_group_owner"
+        android:orientation="horizontal"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:background="@color/white"
+        android:gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="60dp">
+
+        <com.tencent.qcloud.tuicore.component.gatherimage.ShadeImageView
+            android:id="@+id/set_group_manager_owner_face"
+            android:scaleType="centerCrop"
+            android:layout_marginRight="11.52dp"
+            android:layout_width="38.4dp"
+            android:layout_height="38.4dp"/>
+
+        <TextView
+            android:id="@+id/set_group_manager_owner_name"
+            android:textSize="17.28sp"
+            android:textColor="#444444"
+            android:lineHeight="23sp"
+            android:layout_weight="1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/set_group_manager_manager_label"
+        android:textSize="13.44sp"
+        android:lineHeight="19.2dp"
+        android:layout_marginBottom="10dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
+    <LinearLayout
+        android:id="@+id/set_group_manager_add_manager"
+        android:orientation="horizontal"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:background="@color/white"
+        android:gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/group_profile_item_height">
+
+        <ImageView
+            android:background="?attr/group_add_icon"
+            android:scaleType="centerCrop"
+            android:layout_width="19.2dp"
+            android:layout_height="19.2dp"
+            android:layout_marginRight="13.44dp"/>
+
+        <TextView
+            android:text="@string/group_add_manager_label"
+            android:textSize="15.36sp"
+            android:textColor="#444444"
+            android:lineHeight="23sp"
+            android:layout_weight="1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+
+    <View
+        android:background="@drawable/group_list_divider"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:layout_width="match_parent"
+        android:layout_height="0.6dp"/>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/set_group_manager_manager_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/layout/bottom_select_sheet.xml b/system/tuigroup/src/main/res/layout/bottom_select_sheet.xml
new file mode 100644
index 0000000..98692f4
--- /dev/null
+++ b/system/tuigroup/src/main/res/layout/bottom_select_sheet.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:background="@null"
+    android:paddingBottom="15dp"
+    android:paddingLeft="10dp"
+    android:paddingRight="10dp"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ListView
+        android:id="@+id/item_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bottom_sheet_border" />
+
+    <TextView
+        android:id="@+id/cancel_button"
+        android:text="@string/cancel"
+        android:textSize="17sp"
+        android:gravity="center"
+        android:textColor="?attr/core_primary_color"
+        android:textStyle="bold"
+        android:background="@drawable/bottom_sheet_border"
+        android:layout_marginTop="10dp"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/layout/bottom_sheet_item.xml b/system/tuigroup/src/main/res/layout/bottom_sheet_item.xml
new file mode 100644
index 0000000..94adbc7
--- /dev/null
+++ b/system/tuigroup/src/main/res/layout/bottom_sheet_item.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <TextView
+        android:id="@+id/sheet_item"
+        android:textSize="17sp"
+        android:gravity="center"
+        android:background="@null"
+        android:textColor="?attr/core_primary_color"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/layout/group_apply_manager_activity.xml b/system/tuigroup/src/main/res/layout/group_apply_manager_activity.xml
new file mode 100644
index 0000000..7aeda44
--- /dev/null
+++ b/system/tuigroup/src/main/res/layout/group_apply_manager_activity.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuikit.tuigroup.classicui.view.GroupApplyManagerLayout
+        android:id="@+id/group_apply_manager_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>
diff --git a/system/tuigroup/src/main/res/layout/group_apply_manager_layout.xml b/system/tuigroup/src/main/res/layout/group_apply_manager_layout.xml
new file mode 100644
index 0000000..5c9c348
--- /dev/null
+++ b/system/tuigroup/src/main/res/layout/group_apply_manager_layout.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/group_apply_title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/page_title_height" />
+
+
+    <ListView
+        android:id="@+id/group_apply_members"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+
+</LinearLayout>
diff --git a/system/tuigroup/src/main/res/layout/group_info_activity.xml b/system/tuigroup/src/main/res/layout/group_info_activity.xml
new file mode 100644
index 0000000..e33cc91
--- /dev/null
+++ b/system/tuigroup/src/main/res/layout/group_info_activity.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/group_manager_base"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/status_bar_color"
+    android:clickable="true"
+    android:orientation="vertical">
+
+
+</LinearLayout>
diff --git a/system/tuigroup/src/main/res/layout/group_info_fragment.xml b/system/tuigroup/src/main/res/layout/group_info_fragment.xml
new file mode 100644
index 0000000..885296a
--- /dev/null
+++ b/system/tuigroup/src/main/res/layout/group_info_fragment.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuikit.tuigroup.classicui.view.GroupInfoLayout
+        android:id="@+id/group_info_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
diff --git a/system/tuigroup/src/main/res/layout/group_info_layout.xml b/system/tuigroup/src/main/res/layout/group_info_layout.xml
new file mode 100644
index 0000000..7b722d5
--- /dev/null
+++ b/system/tuigroup/src/main/res/layout/group_info_layout.xml
@@ -0,0 +1,320 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/core_bg_color"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/group_info_title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/page_title_height" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <RelativeLayout
+                android:id="@+id/group_detail_area"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/group_profile_height"
+                android:background="#FFFFFF">
+
+                <com.tencent.qcloud.tuicore.component.gatherimage.ShadeImageView
+                    android:id="@+id/group_icon"
+                    android:layout_width="@dimen/group_profile_face_size"
+                    android:layout_height="@dimen/group_profile_face_size"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="@dimen/group_profile_face_margin_left"
+                    android:layout_marginTop="@dimen/group_profile_face_margin_top"
+                    android:layout_marginRight="@dimen/group_profile_face_margin_right"
+                    android:scaleType="centerCrop" />
+
+                <TextView
+                    android:id="@+id/group_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignTop="@id/group_icon"
+                    android:layout_toEndOf="@id/group_icon"
+                    android:ellipsize="end"
+                    android:gravity="center_vertical"
+                    android:singleLine="true"
+                    android:textSize="@dimen/group_profile_group_name_size"
+                    tools:text="群聊" />
+
+                <TextView
+                    android:id="@+id/group_account_tag"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/group_name"
+                    android:layout_alignStart="@id/group_name"
+                    android:layout_marginTop="7.64dp"
+                    android:gravity="center_vertical"
+                    android:text="@string/group_account_tag"
+                    android:textSize="@dimen/group_profile_group_id_size" />
+
+                <TextView
+                    android:id="@+id/group_account"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_below="@id/group_name"
+                    android:layout_alignTop="@+id/group_account_tag"
+                    android:layout_toEndOf="@id/group_account_tag"
+                    android:gravity="center_vertical"
+                    android:textIsSelectable="true"
+                    android:textSize="@dimen/group_profile_group_id_size"
+                    tools:text="99618" />
+
+
+                <ImageView
+                    android:id="@+id/group_detail_arrow"
+                    android:layout_width="11.52dp"
+                    android:layout_height="11.52dp"
+                    android:layout_alignParentEnd="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="20dp"
+                    android:src="@drawable/arrow_right" />
+            </RelativeLayout>
+
+
+            <com.tencent.qcloud.tuicore.component.LineControllerView
+                android:id="@+id/group_member_bar"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/group_profile_item_height"
+                android:layout_marginTop="10dp"
+                app:name="@string/group_members" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp"
+                android:orientation="vertical">
+
+                <GridView
+                    android:id="@+id/group_members"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="0.6dp"
+                    android:background="@color/white"
+                    android:fadeScrollbars="true"
+                    android:numColumns="5"
+                    android:paddingLeft="@dimen/group_profile_member_grid_padding_left_right"
+                    android:paddingTop="@dimen/group_profile_member_grid_padding_top"
+                    android:scrollbars="none" />
+
+                <LinearLayout
+                    android:id="@+id/view_more_group_members"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white"
+                    android:gravity="center"
+                    android:orientation="horizontal"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="20dp"
+                        android:paddingEnd="7.68dp"
+                        android:text="@string/group_view_more_group_members" />
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/arrow_right" />
+
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/group_notice"
+                android:layout_width="match_parent"
+                android:layout_height="69dp"
+                android:background="@color/white"
+                android:paddingLeft="@dimen/group_profile_face_margin_left"
+                android:paddingRight="20dp"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="11.52dp"
+                    android:lineHeight="23.04sp"
+                    android:text="@string/group_notice"
+                    android:textColor="#444444"
+                    android:textSize="15.36sp" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="15.36dp"
+                    android:layout_marginTop="5dp"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/group_notice_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:ellipsize="end"
+                        android:text="@string/group_notice_empty_tip"
+                        android:lineHeight="17.28sp"
+                        android:singleLine="true"
+                        android:textColor="#888888"
+                        android:textSize="11.52sp" />
+
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:background="@drawable/arrow_right" />
+
+                </LinearLayout>
+            </LinearLayout>
+
+            <com.tencent.qcloud.tuicore.component.LineControllerView
+                android:id="@+id/group_notice"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/group_profile_item_height"
+                android:layout_marginTop="10dp"
+                android:visibility="gone"
+                app:name="@string/group_notice" />
+
+
+            <com.tencent.qcloud.tuicore.component.LineControllerView
+                android:id="@+id/group_manage"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/group_profile_item_height"
+                android:visibility="gone"
+                app:canNav="true"
+                app:isTop="true"
+                app:name="@string/group_manager"
+                tools:visibility="visible" />
+
+            <com.tencent.qcloud.tuicore.component.LineControllerView
+                android:id="@+id/group_type_bar"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/group_profile_item_height"
+                app:isTop="true"
+                app:name="@string/group_type" />
+
+            <com.tencent.qcloud.tuicore.component.LineControllerView
+                android:id="@+id/join_type_bar"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/group_profile_item_height"
+                app:isTop="true"
+                app:name="@string/join_group_type" />
+
+            <com.tencent.qcloud.tuicore.component.LineControllerView
+                android:id="@+id/self_nickname_bar"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/group_profile_item_height"
+                android:layout_marginTop="10dp"
+                app:name="@string/in_group_nick_name" />
+
+            <com.tencent.qcloud.tuicore.component.LineControllerView
+                android:id="@+id/msg_rev_option"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/group_profile_item_height"
+                android:layout_marginTop="10dp"
+                app:isSwitch="true"
+                app:name="@string/profile_msgrev_opt" />
+            <RelativeLayout
+                android:id="@+id/layout_fold"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white" >
+                <View
+                    android:id="@+id/fold_top_line"
+                    android:layout_width="match_parent"
+                    android:layout_height="1px"
+                    android:background="@color/line"/>
+
+                <com.tencent.qcloud.tuicore.component.LineControllerView
+                    android:id="@+id/fold_group_chat"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/group_profile_item_height"
+                    android:layout_below="@id/fold_top_line"
+                    android:layout_marginLeft="20dp"
+                    app:isSwitch="true"
+                    app:name="@string/fold_this_group_chat" />
+                <View
+                    android:id="@+id/left_line"
+                    android:layout_width="10dp"
+                    android:layout_height="2px"
+                    android:layout_marginLeft="20dp"
+                    android:layout_centerVertical="true"
+                    android:background="@color/dark_line"/>
+                <View
+                    android:layout_below="@id/fold_group_chat"
+                    android:id="@+id/fold_bottom_line"
+                    android:layout_width="match_parent"
+                    android:layout_height="1px"
+                    android:background="@color/line"/>
+            </RelativeLayout>
+
+            <com.tencent.qcloud.tuicore.component.LineControllerView
+                android:id="@+id/chat_to_top_switch"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/group_profile_item_height"
+                app:isSwitch="true"
+                app:name="@string/chat_to_top" />
+
+            <com.tencent.qcloud.tuicore.component.LineControllerView
+                android:id="@+id/chat_background"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/group_profile_item_height"
+                app:canNav="true"
+                app:name="@string/profile_chat_background"
+                tools:visibility="visible" />
+
+            <TextView
+                android:id="@+id/group_clear_msg_button"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_marginTop="10dp"
+                android:background="#ffffff"
+                android:gravity="center"
+                android:textSize="16.32sp"
+                android:textColor="?attr/core_error_tip_color"
+                tools:visibility="visible" />
+
+            <TextView
+                android:id="@+id/group_change_owner_button"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_marginTop="0.6dp"
+                android:background="#ffffff"
+                android:gravity="center"
+                android:text="@string/group_transfer_group_owner"
+                android:textColor="?attr/core_error_tip_color"
+                android:textSize="16.32sp"
+                android:visibility="gone"
+                tools:visibility="visible" />
+
+            <TextView
+                android:id="@+id/group_dissolve_button"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:layout_marginTop="0.6dp"
+                android:textSize="16.32sp"
+                android:background="#ffffff"
+                android:gravity="center"
+                android:textColor="?attr/core_error_tip_color"
+                tools:visibility="visible" />
+
+
+        </LinearLayout>
+
+
+    </ScrollView>
+
+</LinearLayout>
+
diff --git a/system/tuigroup/src/main/res/layout/group_manager_item.xml b/system/tuigroup/src/main/res/layout/group_manager_item.xml
new file mode 100644
index 0000000..d8beaed
--- /dev/null
+++ b/system/tuigroup/src/main/res/layout/group_manager_item.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="58dp"
+    android:background="@color/white"
+    android:orientation="horizontal">
+
+    <com.tencent.qcloud.tuicore.component.gatherimage.ShadeImageView
+        android:id="@+id/group_manager_face"
+        android:layout_width="38.4dp"
+        android:layout_height="38.4dp"
+        android:layout_gravity="center"
+        android:layout_marginLeft="15.36dp"
+        android:layout_marginRight="11.52dp" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/group_manage_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:layout_weight="1"
+            android:lineHeight="23.04sp"
+            android:textSize="17.28sp" />
+
+        <View
+            android:id="@+id/view_line"
+            android:layout_width="match_parent"
+            android:layout_height="0.55dp"
+            android:background="#D9D9D9" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/layout/group_manager_pop_menu.xml b/system/tuigroup/src/main/res/layout/group_manager_pop_menu.xml
new file mode 100644
index 0000000..65bafc3
--- /dev/null
+++ b/system/tuigroup/src/main/res/layout/group_manager_pop_menu.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:cardBackgroundColor="@color/white"
+    app:cardUseCompatPadding="true"
+    app:cardElevation="8dp">
+
+    <TextView
+        android:id="@+id/pop_text"
+        android:textSize="15sp"
+        android:gravity="center"
+        android:textColor="#888888"
+        android:layout_margin="15dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/layout/group_member_apply_adpater.xml b/system/tuigroup/src/main/res/layout/group_member_apply_adpater.xml
new file mode 100644
index 0000000..4a46f33
--- /dev/null
+++ b/system/tuigroup/src/main/res/layout/group_member_apply_adpater.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="60dp"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:paddingLeft="@dimen/page_margin"
+    android:paddingRight="@dimen/page_margin">
+
+    <com.tencent.qcloud.tuicore.component.gatherimage.ShadeImageView
+        android:id="@+id/group_apply_member_icon"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:scaleType="fitCenter"
+        android:background="?attr/core_default_user_icon" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/group_apply_member_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:lines="1"
+            android:textColor="@color/text_color_black" />
+
+        <TextView
+            android:id="@+id/group_apply_reason"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:lines="1"
+            android:textColor="@color/text_color_gray" />
+
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/group_apply_accept"
+        android:layout_width="60dp"
+        android:layout_height="40dp"
+        android:layout_marginRight="10dp"
+        android:background="@color/bg_positive_btn"
+        android:onClick="startConversation"
+        android:text="@string/accept"
+        android:textColor="#fff" />
+
+    <Button
+        android:id="@+id/group_apply_refuse"
+        android:layout_width="60dp"
+        android:layout_height="40dp"
+        android:layout_marginRight="10dp"
+        android:background="@color/bg_negative_btn"
+        android:onClick="startConversation"
+        android:text="@string/refuse"
+        android:textColor="#fb6155" />
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/layout/group_member_item_layout.xml b/system/tuigroup/src/main/res/layout/group_member_item_layout.xml
new file mode 100644
index 0000000..600c796
--- /dev/null
+++ b/system/tuigroup/src/main/res/layout/group_member_item_layout.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <com.tencent.qcloud.tuicore.component.gatherimage.ShadeImageView
+        android:id="@+id/group_member_icon"
+        android:layout_width="@dimen/group_profile_member_item_width"
+        android:layout_height="@dimen/group_profile_member_item_width"
+        android:scaleType="centerCrop"
+        android:background="?attr/core_default_user_icon" />
+
+
+    <TextView
+        android:id="@+id/group_member_name"
+        android:layout_width="@dimen/group_profile_member_item_width"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="9.6dp"
+        android:layout_marginTop="7.68dp"
+        android:gravity="center"
+        android:lines="1"
+        android:maxEms="3"
+        android:ellipsize="end"
+        android:textSize="@dimen/group_profile_member_item_name_size"
+        android:textColor="@color/group_profile_member_name_text_color" />
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/layout/group_member_layout.xml b/system/tuigroup/src/main/res/layout/group_member_layout.xml
new file mode 100644
index 0000000..22f9b64
--- /dev/null
+++ b/system/tuigroup/src/main/res/layout/group_member_layout.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+
+    <com.tencent.qcloud.tuicore.component.TitleBarLayout
+        android:id="@+id/group_member_title_bar"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/page_title_height" />
+
+    <!-- 搜索 -->
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/group_all_members"
+        android:layout_weight="1"
+        android:layout_width="match_parent"
+        android:layout_height="0dp" />
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/select_area"
+        android:visibility="gone"
+        tools:visibility="visible"
+        app:cardElevation="8dp"
+        app:cardBackgroundColor="@color/white"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingLeft="16dp"
+            android:paddingTop="16dp"
+            android:paddingRight="16dp"
+            android:paddingBottom="16dp">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/selected_list"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
+            <TextView
+                android:id="@+id/confirm_button"
+                android:layout_width="wrap_content"
+                android:layout_height="30dp"
+                android:layout_marginLeft="12dp"
+                android:background="@drawable/group_confirm_button_bg"
+                android:paddingLeft="12dp"
+                android:paddingTop="4dp"
+                android:paddingRight="12dp"
+                android:paddingBottom="4dp"
+                android:text="@string/sure"
+                android:textColor="@color/white"
+                android:textSize="14sp" />
+
+        </LinearLayout>
+    </androidx.cardview.widget.CardView>
+</LinearLayout>
diff --git a/system/tuigroup/src/main/res/layout/group_member_list_item.xml b/system/tuigroup/src/main/res/layout/group_member_list_item.xml
new file mode 100644
index 0000000..578df1e
--- /dev/null
+++ b/system/tuigroup/src/main/res/layout/group_member_list_item.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="58.48dp"
+    android:background="@color/white"
+    android:orientation="horizontal">
+
+    <CheckBox
+        android:id="@+id/group_member_check_box"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginRight="10dp"
+        android:layout_marginLeft="10dp"
+        android:button="@null"
+        android:background="@drawable/group_checkbox_selector"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:clickable="false"
+        android:focusable="false"
+        android:visibility="gone" />
+
+    <com.tencent.qcloud.tuicore.component.gatherimage.ShadeImageView
+        android:id="@+id/group_member_icon"
+        android:layout_width="38.4dp"
+        android:layout_height="38.4dp"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="15.36dp"
+        android:layout_marginRight="11.52dp"
+        android:scaleType="centerCrop" />
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/group_member_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:gravity="center_vertical"
+            android:layout_weight="1"
+            android:lines="1"
+            android:textColor="#ff111111"
+            android:textSize="17.28sp" />
+
+        <View
+            android:id="@+id/view_line"
+            android:layout_width="match_parent"
+            android:layout_height="0.55dp"
+            android:background="#D9D9D9" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/layout/group_member_selected_item.xml b/system/tuigroup/src/main/res/layout/group_member_selected_item.xml
new file mode 100644
index 0000000..28d2b9e
--- /dev/null
+++ b/system/tuigroup/src/main/res/layout/group_member_selected_item.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="#00FFFFFF"
+    android:paddingBottom="8dp"
+    android:paddingRight="12dp"
+    android:clickable="true">
+
+    <com.tencent.qcloud.tuicore.component.RoundCornerImageView
+        android:id="@+id/ivAvatar"
+        android:layout_width="38.4dp"
+        android:layout_height="38.4dp"
+        app:corner_radius="3.2dp"
+        android:scaleType="centerCrop"
+        android:clickable="false"
+        android:focusable="false" />
+
+</LinearLayout>
+
diff --git a/system/tuigroup/src/main/res/layout/group_members_list.xml b/system/tuigroup/src/main/res/layout/group_members_list.xml
new file mode 100644
index 0000000..06a578f
--- /dev/null
+++ b/system/tuigroup/src/main/res/layout/group_members_list.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/status_bar_color"
+    android:orientation="vertical">
+
+
+    <com.tencent.qcloud.tuikit.tuigroup.classicui.view.GroupMemberLayout
+        android:id="@+id/group_member_grid_layout"
+        android:layout_weight="1"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <TextView
+        android:id="@+id/limit_tips"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center"
+        android:paddingBottom="36dp"
+        android:paddingTop="12dp"
+        android:background="#F6F6F6"
+        android:textColor="#999999"
+        android:textSize="12sp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:visibility="visible"
+        tools:text="123"
+        android:visibility="gone"/>
+</LinearLayout>
diff --git a/system/tuigroup/src/main/res/layout/group_profile_icon_view.xml b/system/tuigroup/src/main/res/layout/group_profile_icon_view.xml
new file mode 100644
index 0000000..85970f2
--- /dev/null
+++ b/system/tuigroup/src/main/res/layout/group_profile_icon_view.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/profile_icon_group"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="#00000000">
+
+    <com.tencent.qcloud.tuicore.component.gatherimage.SynthesizedImageView
+        android:id="@+id/profile_icon"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="fitCenter" />
+
+</RelativeLayout>
diff --git a/system/tuigroup/src/main/res/layout/layout_dialog.xml b/system/tuigroup/src/main/res/layout/layout_dialog.xml
new file mode 100644
index 0000000..3be701f
--- /dev/null
+++ b/system/tuigroup/src/main/res/layout/layout_dialog.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="320dp"
+        android:layout_height="wrap_content"
+        android:background="@drawable/popu_dialog_bg"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/dialog_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="20dp"
+            android:textColor="#000"
+            android:textSize="20dp" />
+
+
+        <EditText
+            android:id="@+id/dialog_editor"
+            android:layout_width="match_parent"
+            android:longClickable="false"
+            android:layout_height="80dp"
+            android:layout_marginLeft="30dp"
+            android:layout_marginRight="30dp"
+            android:background="@drawable/editor_border_gray"
+            android:gravity="top|left"
+            android:textCursorDrawable="@drawable/my_cursor"
+            android:padding="10dp" />
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="20dp"
+            android:background="#dcdcdc" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="53.33dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/dialog_cancel_btn"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:alpha="0.9"
+                android:clickable="true"
+                android:gravity="center"
+                android:textColor="#000" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="match_parent"
+                android:background="#dcdcdc" />
+
+            <TextView
+                android:id="@+id/dialog_sure_btn"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:alpha="0.9"
+                android:clickable="true"
+                android:gravity="center"
+                android:textColor="#2979ff" />
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/layout/layout_ensure_dialog.xml b/system/tuigroup/src/main/res/layout/layout_ensure_dialog.xml
new file mode 100644
index 0000000..ed3bd01
--- /dev/null
+++ b/system/tuigroup/src/main/res/layout/layout_ensure_dialog.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="320dp"
+        android:layout_height="wrap_content"
+        android:background="@drawable/popu_dialog_bg"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/dialog_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="20dp"
+            android:textColor="#000"
+            android:textSize="20dp" />
+
+
+        <TextView
+            android:id="@+id/dialog_content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="30dp"
+            android:layout_marginRight="30dp"
+            android:gravity="top|left"
+            android:padding="10dp" />
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="20dp"
+            android:background="#dcdcdc" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="53.33dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/dialog_cancel_btn"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:alpha="0.9"
+                android:clickable="true"
+                android:gravity="center"
+                android:textColor="#000" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="match_parent"
+                android:background="#dcdcdc" />
+
+            <TextView
+                android:id="@+id/dialog_sure_btn"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:alpha="0.9"
+                android:clickable="true"
+                android:gravity="center"
+                android:textColor="#2979ff" />
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/values-zh-rCN/strings.xml b/system/tuigroup/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..f186fde
--- /dev/null
+++ b/system/tuigroup/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="group_id">群ID</string>
+    <string name="group_name">群聊名称</string>
+    <string name="group_icon">修改群头像</string>
+    <string name="group_notice">群公告</string>
+    <string name="group_notice_empty_tip">暂无群公告。</string>
+    <string name="group_members">群成员</string>
+    <string name="group_type">群类型</string>
+    <string name="add_group_member">添加成员</string>
+    <string name="remove_group_member">移除成员</string>
+    <string name="join_group_type">加群方式</string>
+    <string name="in_group_nick_name">我的群昵称</string>
+    <string name="dissolve">解散该群</string>
+    <string name="clear_message">清除聊天记录</string>
+    <string name="modify_group_notice">修改群公告</string>
+    <string name="modify_nick_name_in_goup">修改我的群昵称</string>
+    <string name="group_edit">编辑</string>
+    <string name="group_modify_remark_rule">仅限中文、字母、数字和下划线</string>
+
+    <string name="group_detail">群聊详情</string>
+
+    <string name="group_apply_members">群申请</string>
+
+    <string name="group_remove_member">移出群聊</string>
+    <string name="modify_group_name_success">修改群名称成功</string>
+    <string name="modify_group_notice_success">修改群公告成功</string>
+    <string name="exit_group">退出群聊</string>
+    <string name="modify_nickname_success">修改昵称成功</string>
+
+    <string name="search_call_hint">输入群成员名称</string>
+
+    <string name="modify_icon_fail">修改群头像失败</string>
+    <string name="modify_icon_suc">修改群头像成功</string>
+    <string name="chat_room">聊天室</string>
+    <string name="chat_room_tip">加入聊天室为自动审批，暂不支持修改</string>
+    <string name="community_group">社群</string>
+    <string name="dismiss_group_tip">您确认解散该群?</string>
+    <string name="quit_group_tip">您确认退出该群？</string>
+    <string name="clear_group_msg_tip">确认清除聊天记录？</string>
+    <string name="private_group">讨论组</string>
+    <string name="public_group">公开群</string>
+    <string name="request_wait">邀请成功，等待对方接受</string>
+    <string name="remove">移除</string>
+    <string name="remove_member">移除成员</string>
+    <string name="remove_tip_suc">删除成员成功</string>
+    <string name="remove_tip_fail">删除成员失败: </string>
+    <string name="invite_suc">邀请成员成功</string>
+    <string name="invite_fail">邀请成员失败:</string>
+    <string name="remove_fail_tip">移除成员失败</string>
+    <string name="manager">管理</string>
+    <string name="group_manager">群管理</string>
+
+    <string name="forbid_join">禁止加群</string>
+    <string name="manager_judge">管理员审批</string>
+    <string name="auto_judge">自动审批</string>
+
+    <string name="modify_group_name">修改群名称</string>
+    <string name="group_join_type">加群方式</string>
+
+    <string name="accept">同意</string>
+    <string name="refuse">拒绝</string>
+    <string name="accepted">已同意</string>
+    <string name="refused">已拒绝</string>
+
+    <string name="input_tip">没有输入昵称，请重新填写</string>
+
+    <string name="chat_to_top">置顶聊天</string>
+    <string name="profile_msgrev_opt">消息免打扰</string>
+    <string name="fold_this_group_chat">折叠该群聊</string>
+    <string name="profile_chat_background">设置当前聊天背景</string>
+    <string name="chat_background_title">更换背景</string>
+
+    <string name="join_group_tip">您已被邀请进群: </string>
+    <string name="joined_tip">您已加入群: </string>
+    <string name="reject_join_tip">您被拒绝加入群: </string>
+    <string name="kick_group">您已被踢出群: </string>
+    <string name="dismiss_tip_before">您所在的群</string>
+    <string name="dismiss_tip_after">已解散</string>
+    <string name="get_system_notice">收到自定义系统通知: </string>
+
+    <string name="group_account_tag">ID：</string>
+    <string name="group_view_more_group_members">查看更多群成员</string>
+
+    <string name="group_set_manager">设置管理员</string>
+    <string name="group_mute_all">全员禁言</string>
+    <string name="group_cancel_mute_label">取消禁言</string>
+    <string name="group_mute_tip">全员禁言开启后，只允许群主和管理员发言。</string>
+    <string name="group_add_mute_member_tip">添加需要禁言的群成员</string>
+    <string name="group_owner_label">群主</string>
+    <string name="group_manager_label">管理员</string>
+    <string name="group_add_manager_count_label">管理员（%d）</string>
+    <string name="group_add_manager_label">添加管理员</string>
+    <string name="group_remove_manager_label">取消管理员</string>
+    <string name="group_remove_manager_tip">成功取消管理员身份。</string>
+
+    <string name="group_over_limit_tip">最多只能选择%d个。</string>
+    <string name="group_transfer_group_owner">转让群主</string>
+
+    <string name="group_not_support_set_manager">当前类型群聊不支持设置管理员。</string>
+    <string name="group_not_support_mute_member">当前类型群聊不支持禁言指定群成员。</string>
+
+    <string name="group_choose_avatar">选择头像</string>
+</resources>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/values/arrays.xml b/system/tuigroup/src/main/res/values/arrays.xml
new file mode 100644
index 0000000..a7baf74
--- /dev/null
+++ b/system/tuigroup/src/main/res/values/arrays.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="group_join_type">
+        <item>@string/forbid_join</item>
+        <item>@string/manager_judge</item>
+        <item>@string/auto_judge</item>
+    </string-array>
+
+
+</resources>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/values/colors.xml b/system/tuigroup/src/main/res/values/colors.xml
new file mode 100644
index 0000000..daeebcc
--- /dev/null
+++ b/system/tuigroup/src/main/res/values/colors.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="text_color_black">#000</color>
+    <!-- 积极钮色值 -->
+    <color name="btn_positive">#00a4ff</color>
+    <color name="btn_positive_hover">#006eff</color>
+
+    <!-- 消极按钮背景色值 -->
+    <color name="btn_negative">#ffffff</color>
+    <color name="btn_negative_hover">#cc3428</color>
+
+    <color name="text_color_gray">#696969</color>
+    <color name="item_split_color">#cccccc</color>
+
+    <color name="white">#FFFFFF</color>
+    <color name="black">#000000</color>
+    <color name="green">#70C160</color>
+    <color name="text_gray1">#777777</color>
+    <color name="black_font_color">#181818</color>
+
+    <color name="line">#DDDDDD</color>
+    <color name="dark_line">#AAAAAA</color>
+    <color name="dialog_line_bg">#c6c6c6</color>
+    <color name="font_blue">#066fff</color>
+
+    <color name="group_profile_member_name_text_color">#888888</color>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/values/dimens.xml b/system/tuigroup/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..1c56c7c
--- /dev/null
+++ b/system/tuigroup/src/main/res/values/dimens.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="page_title_height">45dp</dimen>
+    <dimen name="page_margin">10dp</dimen>
+
+    <dimen name="item_width">49.35dp</dimen>
+
+    <dimen name="switch_thumb_padding">2dp</dimen>
+    <dimen name="switch_thumb_width">23dp</dimen>
+    <dimen name="switch_thumb_height">23dp</dimen>
+    <dimen name="switch_thumb_radius">20dp</dimen>
+
+    <dimen name="group_profile_height">69.12dp</dimen>
+    <dimen name="group_profile_item_height">46.08dp</dimen>
+    <dimen name="group_profile_face_size">46.08dp</dimen>
+    <dimen name="group_profile_group_name_size">17.28sp</dimen>
+    <dimen name="group_profile_group_id_size">12.48dp</dimen>
+    <dimen name="group_profile_face_margin_left">15.36dp</dimen>
+    <dimen name="group_profile_face_margin_right">15.36dp</dimen>
+    <dimen name="group_profile_face_margin_top">11.5dp</dimen>
+
+    <dimen name="group_profile_member_grid_padding_left_right">19.2dp</dimen>
+    <dimen name="group_profile_member_grid_padding_top">11.52dp</dimen>
+    <dimen name="group_profile_member_item_width">48dp</dimen>
+    <dimen name="group_profile_member_item_name_size">9.6sp</dimen>
+
+</resources>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/values/strings.xml b/system/tuigroup/src/main/res/values/strings.xml
new file mode 100644
index 0000000..95fdffe
--- /dev/null
+++ b/system/tuigroup/src/main/res/values/strings.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="group_id">Group ID</string>
+    <string name="group_name">Group Chat Name</string>
+    <string name="group_icon">Change Group Profile Photo</string>
+    <string name="group_notice">Group Notice</string>
+    <string name="group_notice_empty_tip">No group notice</string>
+    <string name="group_members">Group Members</string>
+    <string name="group_type">Group Type</string>
+    <string name="add_group_member">Add Member</string>
+    <string name="remove_group_member">Delete Member</string>
+    <string name="join_group_type">Group Joining Method</string>
+    <string name="in_group_nick_name">My Alias in Group</string>
+    <string name="dissolve">Disband Group</string>
+    <string name="clear_message">Clear Chat History</string>
+    <string name="modify_group_notice">Edit Group Notice</string>
+    <string name="modify_nick_name_in_goup">Edit My Alias in Group</string>
+    <string name="group_edit">Edit</string>
+    <string name="group_modify_remark_rule">Only letters, digits, underscores, and Chinese characters.</string>
+
+    <string name="group_detail">Group Chat Details</string>
+
+    <string name="group_apply_members">Request to Join Group</string>
+
+    <string name="group_remove_member">Remove</string>
+    <string name="modify_group_name_success">Edited</string>
+    <string name="modify_group_notice_success">Edited</string>
+    <string name="exit_group">Leave</string>
+    <string name="modify_nickname_success">Edited</string>
+
+    <string name="search_call_hint">Enter Group Member\'s Name</string>
+
+
+    <string name="modify_icon_fail">Editing failed</string>
+    <string name="modify_icon_suc">Edited</string>
+    <string name="chat_room">Chatroom</string>
+    <string name="chat_room_tip">The request to join chat room is reviewed automatically. Unable to modify it.</string>
+    <string name="community_group">Community</string>
+    <string name="dismiss_group_tip">Disband the group?</string>
+    <string name="quit_group_tip">Leave the group?</string>
+    <string name="clear_group_msg_tip">Are you sure you want to clear the chat history?</string>
+
+    <string name="private_group">Discussion Group</string>
+    <string name="public_group">Public Group</string>
+    <string name="request_wait">Invitation sent. Waiting for response.</string>
+    <string name="remove">Remove</string>
+    <string name="remove_member">Delete Member</string>
+    <string name="remove_tip_suc">Deleted</string>
+    <string name="remove_tip_fail">Deletion failed: </string>
+    <string name="invite_suc">Member invited</string>
+    <string name="invite_fail">Invitation failed:</string>
+    <string name="remove_fail_tip">Removal failed</string>
+    <string name="manager">Manage</string>
+    <string name="group_manager">Manage</string>
+
+    <string name="forbid_join">Prohibited from Joining</string>
+    <string name="manager_judge">Admin Approval</string>
+    <string name="auto_judge">Auto Approval</string>
+
+    <string name="modify_group_name">Edit Group Name</string>
+    <string name="group_join_type">Group Joining Method</string>
+
+    <string name="accept">Agree</string>
+    <string name="refuse">Decline</string>
+    <string name="accepted">Agreed</string>
+    <string name="refused">Declined</string>
+
+    <string name="input_tip">No nickname. Enter again.</string>
+
+    <string name="chat_to_top">Pin</string>
+    <string name="profile_msgrev_opt">Mute Notifications</string>
+    <string name="fold_this_group_chat">Fold this group chat</string>>
+    <string name="profile_chat_background">Background</string>
+    <string name="chat_background_title">Background</string>
+
+    <string name="join_group_tip">You have been invited to the group: </string>
+    <string name="joined_tip">You have joined the group: </string>
+    <string name="reject_join_tip">You are rejected from joining the group: </string>
+    <string name="kick_group">You have been kicked out of the group: </string>
+    <string name="dismiss_tip_before">Your group</string>
+    <string name="dismiss_tip_after">is disbanded.</string>
+    <string name="get_system_notice">Received a custom system notification: </string>
+
+    <string name="group_account_tag">ID : </string>
+    <string name="group_view_more_group_members">View more group members</string>
+
+    <string name="group_set_manager">Set as Admin</string>
+    <string name="group_mute_all">Mute All</string>
+    <string name="group_cancel_mute_label">Cancel Mute</string>
+    <string name="group_mute_tip">When Mute All is enabled, only the group owner and admins are allowed to send messages.</string>
+    <string name="group_add_mute_member_tip">Add members to mute</string>
+    <string name="group_owner_label">Group Owner</string>
+    <string name="group_manager_label">Admin</string>
+    <string name="group_add_manager_count_label">Manager (%d)</string>
+    <string name="group_add_manager_label">Add Admin</string>
+    <string name="group_remove_manager_label">Cancel Admin</string>
+    <string name="group_remove_manager_tip">Admin canceled successfully.</string>
+
+    <string name="group_over_limit_tip">Max allowed: %d</string>
+    <string name="group_transfer_group_owner">Transfer Group Owner</string>
+
+    <string name="group_not_support_set_manager">Unable to set an admin for this type of group chat.</string>
+    <string name="group_not_support_mute_member">Unable to mute specified members for this type of group chat.</string>
+
+    <string name="group_choose_avatar">Choose Avatar</string>
+</resources>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/values/styles.xml b/system/tuigroup/src/main/res/values/styles.xml
new file mode 100644
index 0000000..2747e04
--- /dev/null
+++ b/system/tuigroup/src/main/res/values/styles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="BottomSelectSheet" parent="@android:style/Theme.Dialog">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowFrame">@null</item>
+        <item name="android:backgroundDimEnabled">true</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+    </style>
+
+    <style name="BottomSelectSheet_Anim">
+        <item name="android:windowExitAnimation">@anim/bottom_select_sheet_exit</item>
+        <item name="android:windowEnterAnimation">@anim/bottom_select_sheet_enter</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/values/tui_theme_attrs.xml b/system/tuigroup/src/main/res/values/tui_theme_attrs.xml
new file mode 100644
index 0000000..ac5235f
--- /dev/null
+++ b/system/tuigroup/src/main/res/values/tui_theme_attrs.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- 参与换肤的属性 -->
+    <attr name="group_add_icon" format="reference"/>
+</resources>
\ No newline at end of file
diff --git a/system/tuigroup/src/main/res/xml/file_paths_public.xml b/system/tuigroup/src/main/res/xml/file_paths_public.xml
new file mode 100644
index 0000000..e0e49c2
--- /dev/null
+++ b/system/tuigroup/src/main/res/xml/file_paths_public.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+    <!--内置SD卡 Environment.getExternalStorageDirectory() .表示共享所有的目录，也可以指定共享的目录-->
+    <external-path
+        name="external-path"
+        path="."/>
+    <!--内置SD卡 Context.getExternalCacheDir() .表示共享所有的目录，也可以指定共享的目录-->
+    <external-cache-path
+        name="external-cache-path"
+        path="."/>
+    <!--内置SD卡 Context.getExternalFilesDir(null) .表示共享所有的目录，也可以指定共享的目录-->
+    <external-files-path
+        name="external-files-path"
+        path="."/>
+    <!--data目录下 Context.getFilesDir() .表示共享所有的目录，也可以指定共享的目录-->
+    <files-path
+        name="files_path"
+        path="."/>
+    <!--data缓存目录 Context.getCacheDir() .表示共享所有的目录，也可以指定共享的目录-->
+    <cache-path
+        name="cache-path"
+        path="."/>
+    <!--这个标签Android官方文档中是没有提及，Android设备的根目录，该目录下包含着手机内部存储器，外置SD卡等所有文件的目录-->
+    <root-path
+        name="name"
+        path="."/>
+</paths>
\ No newline at end of file
diff --git a/system/video/.gitignore b/system/video/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/system/video/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/system/video/build.gradle b/system/video/build.gradle
new file mode 100644
index 0000000..db7f4d4
--- /dev/null
+++ b/system/video/build.gradle
@@ -0,0 +1,26 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdk rootProject.ext.compileSdkVersion
+
+    defaultConfig {
+        minSdk rootProject.ext.minSdkVersion
+        targetSdk rootProject.ext.targetSdkVersion
+        versionCode rootProject.ext.versionCode
+        versionName rootProject.ext.versionName
+    }
+
+    compileOptions {
+        sourceCompatibility 11
+        targetCompatibility 11
+    }
+
+    lintOptions {
+        abortOnError false
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+}
+
diff --git a/system/video/src/main/AndroidManifest.xml b/system/video/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..b20611d
--- /dev/null
+++ b/system/video/src/main/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="cn.jzvd">
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+</manifest>
\ No newline at end of file
diff --git a/system/video/src/main/java/cn/jzvd/JZDataSource.java b/system/video/src/main/java/cn/jzvd/JZDataSource.java
new file mode 100644
index 0000000..9fcad12
--- /dev/null
+++ b/system/video/src/main/java/cn/jzvd/JZDataSource.java
@@ -0,0 +1,88 @@
+package cn.jzvd;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+
+public class JZDataSource {
+
+    public static final String URL_KEY_DEFAULT = "URL_KEY_DEFAULT";
+
+    public int currentUrlIndex;
+    public LinkedHashMap urlsMap = new LinkedHashMap();
+    public String title = "";
+    public HashMap<String, String> headerMap = new HashMap<>();
+    public boolean looping = false;
+    public Object[] objects;
+
+    public JZDataSource(String url) {
+        urlsMap.put(URL_KEY_DEFAULT, url);
+        currentUrlIndex = 0;
+    }
+
+    public JZDataSource(String url, String title) {
+        urlsMap.put(URL_KEY_DEFAULT, url);
+        this.title = title;
+        currentUrlIndex = 0;
+    }
+
+    public JZDataSource(Object url) {
+        urlsMap.put(URL_KEY_DEFAULT, url);
+        currentUrlIndex = 0;
+    }
+
+    public JZDataSource(LinkedHashMap urlsMap) {
+        this.urlsMap.clear();
+        this.urlsMap.putAll(urlsMap);
+        currentUrlIndex = 0;
+    }
+
+    public JZDataSource(LinkedHashMap urlsMap, String title) {
+        this.urlsMap.clear();
+        this.urlsMap.putAll(urlsMap);
+        this.title = title;
+        currentUrlIndex = 0;
+    }
+
+    public Object getCurrentUrl() {
+        return getValueFromLinkedMap(currentUrlIndex);
+    }
+
+    public Object getCurrentKey() {
+        return getKeyFromDataSource(currentUrlIndex);
+    }
+
+    public String getKeyFromDataSource(int index) {
+        int currentIndex = 0;
+        for (Object key : urlsMap.keySet()) {
+            if (currentIndex == index) {
+                return key.toString();
+            }
+            currentIndex++;
+        }
+        return null;
+    }
+
+    public Object getValueFromLinkedMap(int index) {
+        int currentIndex = 0;
+        for (Object key : urlsMap.keySet()) {
+            if (currentIndex == index) {
+                return urlsMap.get(key);
+            }
+            currentIndex++;
+        }
+        return null;
+    }
+
+    public boolean containsTheUrl(Object object) {
+        if (object != null) {
+            return urlsMap.containsValue(object);
+        }
+        return false;
+    }
+
+    public JZDataSource cloneMe() {
+        LinkedHashMap map = new LinkedHashMap();
+        map.putAll(urlsMap);
+        return new JZDataSource(map, title);
+    }
+}
diff --git a/system/video/src/main/java/cn/jzvd/JZMediaInterface.java b/system/video/src/main/java/cn/jzvd/JZMediaInterface.java
new file mode 100644
index 0000000..a8202b2
--- /dev/null
+++ b/system/video/src/main/java/cn/jzvd/JZMediaInterface.java
@@ -0,0 +1,47 @@
+package cn.jzvd;
+
+import android.graphics.SurfaceTexture;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.view.Surface;
+import android.view.TextureView;
+
+/**
+ * Created by Nathen on 2017/11/7.
+ * 自定义播放器
+ */
+public abstract class JZMediaInterface implements TextureView.SurfaceTextureListener {
+
+    public static SurfaceTexture SAVED_SURFACE;
+    public HandlerThread mMediaHandlerThread;
+    public Handler mMediaHandler;
+    public Handler handler;
+    public Jzvd jzvd;
+
+
+    public JZMediaInterface(Jzvd jzvd) {
+        this.jzvd = jzvd;
+    }
+
+    public abstract void start();
+
+    public abstract void prepare();
+
+    public abstract void pause();
+
+    public abstract boolean isPlaying();
+
+    public abstract void seekTo(long time);
+
+    public abstract void release();
+
+    public abstract long getCurrentPosition();
+
+    public abstract long getDuration();
+
+    public abstract void setVolume(float leftVolume, float rightVolume);
+
+    public abstract void setSpeed(float speed);
+
+    public abstract void setSurface(Surface surface);
+}
diff --git a/system/video/src/main/java/cn/jzvd/JZMediaSystem.java b/system/video/src/main/java/cn/jzvd/JZMediaSystem.java
new file mode 100644
index 0000000..477dfaf
--- /dev/null
+++ b/system/video/src/main/java/cn/jzvd/JZMediaSystem.java
@@ -0,0 +1,202 @@
+package cn.jzvd;
+
+import android.graphics.SurfaceTexture;
+import android.media.AudioManager;
+import android.media.MediaPlayer;
+import android.media.PlaybackParams;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.view.Surface;
+
+import java.lang.reflect.Method;
+import java.util.Map;
+
+/**
+ * Created by Nathen on 2017/11/8.
+ * 实现系统的播放引擎
+ */
+public class JZMediaSystem extends JZMediaInterface implements MediaPlayer.OnPreparedListener, MediaPlayer.OnCompletionListener, MediaPlayer.OnBufferingUpdateListener, MediaPlayer.OnSeekCompleteListener, MediaPlayer.OnErrorListener, MediaPlayer.OnInfoListener, MediaPlayer.OnVideoSizeChangedListener {
+
+    public MediaPlayer mediaPlayer;
+
+    public JZMediaSystem(Jzvd jzvd) {
+        super(jzvd);
+    }
+
+    @Override
+    public void prepare() {
+        release();
+        mMediaHandlerThread = new HandlerThread("JZVD");
+        mMediaHandlerThread.start();
+        mMediaHandler = new Handler(mMediaHandlerThread.getLooper());//主线程还是非主线程，就在这里
+        handler = new Handler();
+
+        mMediaHandler.post(() -> {
+            try {
+                mediaPlayer = new MediaPlayer();
+                mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
+                mediaPlayer.setLooping(jzvd.jzDataSource.looping);
+                mediaPlayer.setOnPreparedListener(JZMediaSystem.this);
+                mediaPlayer.setOnCompletionListener(JZMediaSystem.this);
+                mediaPlayer.setOnBufferingUpdateListener(JZMediaSystem.this);
+                mediaPlayer.setScreenOnWhilePlaying(true);
+                mediaPlayer.setOnSeekCompleteListener(JZMediaSystem.this);
+                mediaPlayer.setOnErrorListener(JZMediaSystem.this);
+                mediaPlayer.setOnInfoListener(JZMediaSystem.this);
+                mediaPlayer.setOnVideoSizeChangedListener(JZMediaSystem.this);
+                Class<MediaPlayer> clazz = MediaPlayer.class;
+                Method method = clazz.getDeclaredMethod("setDataSource", String.class, Map.class);
+                method.invoke(mediaPlayer, jzvd.jzDataSource.getCurrentUrl().toString(), jzvd.jzDataSource.headerMap);
+                mediaPlayer.prepareAsync();
+                mediaPlayer.setSurface(new Surface(SAVED_SURFACE));
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        });
+    }
+
+    @Override
+    public void start() {
+        mMediaHandler.post(() -> mediaPlayer.start());
+    }
+
+    @Override
+    public void pause() {
+        mMediaHandler.post(() -> mediaPlayer.pause());
+    }
+
+    @Override
+    public boolean isPlaying() {
+        return mediaPlayer.isPlaying();
+    }
+
+    @Override
+    public void seekTo(long time) {
+        mMediaHandler.post(() -> {
+            try {
+                mediaPlayer.seekTo((int) time);
+            } catch (IllegalStateException e) {
+                e.printStackTrace();
+            }
+        });
+    }
+
+    @Override
+    public void release() {//not perfect change you later
+        if (mMediaHandler != null && mMediaHandlerThread != null && mediaPlayer != null) {//不知道有没有妖孽
+            HandlerThread tmpHandlerThread = mMediaHandlerThread;
+            MediaPlayer tmpMediaPlayer = mediaPlayer;
+            JZMediaInterface.SAVED_SURFACE = null;
+
+            mMediaHandler.post(() -> {
+                tmpMediaPlayer.setSurface(null);
+                tmpMediaPlayer.release();
+                tmpHandlerThread.quit();
+            });
+            mediaPlayer = null;
+        }
+    }
+
+    //TODO 测试这种问题是否在threadHandler中是否正常，所有的操作mediaplayer是否不需要thread，挨个测试，是否有问题
+    @Override
+    public long getCurrentPosition() {
+        if (mediaPlayer != null) {
+            return mediaPlayer.getCurrentPosition();
+        } else {
+            return 0;
+        }
+    }
+
+    @Override
+    public long getDuration() {
+        if (mediaPlayer != null) {
+            return mediaPlayer.getDuration();
+        } else {
+            return 0;
+        }
+    }
+
+    @Override
+    public void setVolume(float leftVolume, float rightVolume) {
+        if (mMediaHandler == null) return;
+        mMediaHandler.post(() -> {
+            if (mediaPlayer != null) mediaPlayer.setVolume(leftVolume, rightVolume);
+        });
+    }
+
+    @Override
+    public void setSpeed(float speed) {
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+            PlaybackParams pp = mediaPlayer.getPlaybackParams();
+            pp.setSpeed(speed);
+            mediaPlayer.setPlaybackParams(pp);
+        }
+    }
+
+    @Override
+    public void onPrepared(MediaPlayer mediaPlayer) {
+        handler.post(() -> jzvd.onPrepared());//如果是mp3音频，走这里
+    }
+
+    @Override
+    public void onCompletion(MediaPlayer mediaPlayer) {
+        handler.post(() -> jzvd.onAutoCompletion());
+    }
+
+    @Override
+    public void onBufferingUpdate(MediaPlayer mediaPlayer, final int percent) {
+        handler.post(() -> jzvd.setBufferProgress(percent));
+    }
+
+    @Override
+    public void onSeekComplete(MediaPlayer mediaPlayer) {
+        handler.post(() -> jzvd.onSeekComplete());
+    }
+
+    @Override
+    public boolean onError(MediaPlayer mediaPlayer, final int what, final int extra) {
+        handler.post(() -> jzvd.onError(what, extra));
+        return true;
+    }
+
+    @Override
+    public boolean onInfo(MediaPlayer mediaPlayer, final int what, final int extra) {
+        handler.post(() -> jzvd.onInfo(what, extra));
+        return false;
+    }
+
+    @Override
+    public void onVideoSizeChanged(MediaPlayer mediaPlayer, int width, int height) {
+        handler.post(() -> jzvd.onVideoSizeChanged(width, height));
+    }
+
+    @Override
+    public void setSurface(Surface surface) {
+        mediaPlayer.setSurface(surface);
+    }
+
+    @Override
+    public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
+        if (SAVED_SURFACE == null) {
+            SAVED_SURFACE = surface;
+            prepare();
+        } else {
+            jzvd.textureView.setSurfaceTexture(SAVED_SURFACE);
+        }
+    }
+
+    @Override
+    public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
+
+    }
+
+    @Override
+    public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
+        return false;
+    }
+
+    @Override
+    public void onSurfaceTextureUpdated(SurfaceTexture surface) {
+
+    }
+}
diff --git a/system/video/src/main/java/cn/jzvd/JZTextureView.java b/system/video/src/main/java/cn/jzvd/JZTextureView.java
new file mode 100644
index 0000000..0e850c1
--- /dev/null
+++ b/system/video/src/main/java/cn/jzvd/JZTextureView.java
@@ -0,0 +1,161 @@
+package cn.jzvd;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.TextureView;
+import android.view.View;
+
+/**
+ * <p>参照Android系统的VideoView的onMeasure方法
+ * <br>注意!relativelayout中无法全屏，要嵌套一个linearlayout</p>
+ * <p>Referring Android system Video View of onMeasure method
+ * <br>NOTE! Can not fullscreen relativelayout, to nest a linearlayout</p>
+ * Created by Nathen
+ * On 2016/06/02 00:01
+ */
+public class JZTextureView extends TextureView {
+    protected static final String TAG = "JZResizeTextureView";
+
+    public int currentVideoWidth = 0;
+    public int currentVideoHeight = 0;
+
+    public JZTextureView(Context context) {
+        super(context);
+        currentVideoWidth = 0;
+        currentVideoHeight = 0;
+    }
+
+    public JZTextureView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        currentVideoWidth = 0;
+        currentVideoHeight = 0;
+    }
+
+    public void setVideoSize(int currentVideoWidth, int currentVideoHeight) {
+        if (this.currentVideoWidth != currentVideoWidth || this.currentVideoHeight != currentVideoHeight) {
+            this.currentVideoWidth = currentVideoWidth;
+            this.currentVideoHeight = currentVideoHeight;
+            requestLayout();
+        }
+    }
+
+    @Override
+    public void setRotation(float rotation) {
+        if (rotation != getRotation()) {
+            super.setRotation(rotation);
+            requestLayout();
+        }
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        Log.i(TAG, "onMeasure " + " [" + this.hashCode() + "] ");
+        int viewRotation = (int) getRotation();
+        int videoWidth = currentVideoWidth;
+        int videoHeight = currentVideoHeight;
+
+
+        int parentHeight = ((View) getParent()).getMeasuredHeight();
+        int parentWidth = ((View) getParent()).getMeasuredWidth();
+        if (parentWidth != 0 && parentHeight != 0 && videoWidth != 0 && videoHeight != 0) {
+            if (Jzvd.VIDEO_IMAGE_DISPLAY_TYPE == Jzvd.VIDEO_IMAGE_DISPLAY_TYPE_FILL_PARENT) {
+                if (viewRotation == 90 || viewRotation == 270) {
+                    int tempSize = parentWidth;
+                    parentWidth = parentHeight;
+                    parentHeight = tempSize;
+                }
+                /**强制充满**/
+                videoHeight = videoWidth * parentHeight / parentWidth;
+            }
+        }
+
+        // 如果判断成立，则说明显示的TextureView和本身的位置是有90度的旋转的，所以需要交换宽高参数。
+        if (viewRotation == 90 || viewRotation == 270) {
+            int tempMeasureSpec = widthMeasureSpec;
+            widthMeasureSpec = heightMeasureSpec;
+            heightMeasureSpec = tempMeasureSpec;
+        }
+
+        int width = getDefaultSize(videoWidth, widthMeasureSpec);
+        int height = getDefaultSize(videoHeight, heightMeasureSpec);
+        if (videoWidth > 0 && videoHeight > 0) {
+
+            int widthSpecMode = MeasureSpec.getMode(widthMeasureSpec);
+            int widthSpecSize = MeasureSpec.getSize(widthMeasureSpec);
+            int heightSpecMode = MeasureSpec.getMode(heightMeasureSpec);
+            int heightSpecSize = MeasureSpec.getSize(heightMeasureSpec);
+
+            Log.i(TAG, "widthMeasureSpec  [" + MeasureSpec.toString(widthMeasureSpec) + "]");
+            Log.i(TAG, "heightMeasureSpec [" + MeasureSpec.toString(heightMeasureSpec) + "]");
+
+            if (widthSpecMode == MeasureSpec.EXACTLY && heightSpecMode == MeasureSpec.EXACTLY) {
+                // the size is fixed
+                width = widthSpecSize;
+                height = heightSpecSize;
+                // for compatibility, we adjust size based on aspect ratio
+                if (videoWidth * height < width * videoHeight) {
+                    width = height * videoWidth / videoHeight;
+                } else if (videoWidth * height > width * videoHeight) {
+                    height = width * videoHeight / videoWidth;
+                }
+            } else if (widthSpecMode == MeasureSpec.EXACTLY) {
+                // only the width is fixed, adjust the height to match aspect ratio if possible
+                width = widthSpecSize;
+                height = width * videoHeight / videoWidth;
+                if (heightSpecMode == MeasureSpec.AT_MOST && height > heightSpecSize) {
+                    // couldn't match aspect ratio within the constraints
+                    height = heightSpecSize;
+                    width = height * videoWidth / videoHeight;
+                }
+            } else if (heightSpecMode == MeasureSpec.EXACTLY) {
+                // only the height is fixed, adjust the width to match aspect ratio if possible
+                height = heightSpecSize;
+                width = height * videoWidth / videoHeight;
+                if (widthSpecMode == MeasureSpec.AT_MOST && width > widthSpecSize) {
+                    // couldn't match aspect ratio within the constraints
+                    width = widthSpecSize;
+                    height = width * videoHeight / videoWidth;
+                }
+            } else {
+                // neither the width nor the height are fixed, try to use actual video size
+                width = videoWidth;
+                height = videoHeight;
+                if (heightSpecMode == MeasureSpec.AT_MOST && height > heightSpecSize) {
+                    // too tall, decrease both width and height
+                    height = heightSpecSize;
+                    width = height * videoWidth / videoHeight;
+                }
+                if (widthSpecMode == MeasureSpec.AT_MOST && width > widthSpecSize) {
+                    // too wide, decrease both width and height
+                    width = widthSpecSize;
+                    height = width * videoHeight / videoWidth;
+                }
+            }
+        } else {
+            // no size yet, just adopt the given spec sizes
+        }
+        if (parentWidth != 0 && parentHeight != 0 && videoWidth != 0 && videoHeight != 0) {
+            if (Jzvd.VIDEO_IMAGE_DISPLAY_TYPE == Jzvd.VIDEO_IMAGE_DISPLAY_TYPE_ORIGINAL) {
+                /**原图**/
+                height = videoHeight;
+                width = videoWidth;
+            } else if (Jzvd.VIDEO_IMAGE_DISPLAY_TYPE == Jzvd.VIDEO_IMAGE_DISPLAY_TYPE_FILL_SCROP) {
+                if (viewRotation == 90 || viewRotation == 270) {
+                    int tempSize = parentWidth;
+                    parentWidth = parentHeight;
+                    parentHeight = tempSize;
+                }
+                /**充满剪切**/
+                if (((double) videoHeight / videoWidth) > ((double) parentHeight / parentWidth)) {
+                    height = (int) (((double) parentWidth / (double) width * (double) height));
+                    width = parentWidth;
+                } else if (((double) videoHeight / videoWidth) < ((double) parentHeight / parentWidth)) {
+                    width = (int) (((double) parentHeight / (double) height * (double) width));
+                    height = parentHeight;
+                }
+            }
+        }
+        setMeasuredDimension(width, height);
+    }
+}
diff --git a/system/video/src/main/java/cn/jzvd/JZUtils.java b/system/video/src/main/java/cn/jzvd/JZUtils.java
new file mode 100644
index 0000000..d3feba7
--- /dev/null
+++ b/system/video/src/main/java/cn/jzvd/JZUtils.java
@@ -0,0 +1,169 @@
+package cn.jzvd;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.content.SharedPreferences;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.util.Log;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+
+import java.util.Formatter;
+import java.util.Locale;
+
+/**
+ * Created by Nathen
+ * On 2016/02/21 12:25
+ */
+public class JZUtils {
+    public static final String TAG = "JZVD";
+    public static int SYSTEM_UI = 0;
+
+    public static String stringForTime(long timeMs) {
+        if (timeMs <= 0 || timeMs >= 24 * 60 * 60 * 1000) {
+            return "00:00";
+        }
+        long totalSeconds = timeMs / 1000;
+        int seconds = (int) (totalSeconds % 60);
+        int minutes = (int) ((totalSeconds / 60) % 60);
+        int hours = (int) (totalSeconds / 3600);
+        StringBuilder stringBuilder = new StringBuilder();
+        Formatter mFormatter = new Formatter(stringBuilder, Locale.getDefault());
+        if (hours > 0) {
+            return mFormatter.format("%d:%02d:%02d", hours, minutes, seconds).toString();
+        } else {
+            return mFormatter.format("%02d:%02d", minutes, seconds).toString();
+        }
+    }
+
+    /**
+     * This method requires the caller to hold the permission ACCESS_NETWORK_STATE.
+     *
+     * @param context context
+     * @return if wifi is connected,return true
+     */
+    public static boolean isWifiConnected(Context context) {
+        ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
+        return networkInfo != null && networkInfo.getType() == ConnectivityManager.TYPE_WIFI;
+    }
+
+    /**
+     * Get activity from context object
+     *
+     * @param context context
+     * @return object of Activity or null if it is not Activity
+     */
+    public static Activity scanForActivity(Context context) {
+        if (context == null) return null;
+
+        if (context instanceof Activity) {
+            return (Activity) context;
+        } else if (context instanceof ContextWrapper) {
+            return scanForActivity(((ContextWrapper) context).getBaseContext());
+        }
+
+        return null;
+    }
+
+    public static void setRequestedOrientation(Context context, int orientation) {
+        if (JZUtils.scanForActivity(context) != null) {
+            JZUtils.scanForActivity(context).setRequestedOrientation(
+                    orientation);
+        } else {
+            JZUtils.scanForActivity(context).setRequestedOrientation(
+                    orientation);
+        }
+    }
+
+    public static Window getWindow(Context context) {
+        if (JZUtils.scanForActivity(context) != null) {
+            return JZUtils.scanForActivity(context).getWindow();
+        } else {
+            return JZUtils.scanForActivity(context).getWindow();
+        }
+    }
+
+    public static int dip2px(Context context, float dpValue) {
+        final float scale = context.getResources().getDisplayMetrics().density;
+        return (int) (dpValue * scale + 0.5f);
+    }
+
+    public static void saveProgress(Context context, Object url, long progress) {
+        if (!Jzvd.SAVE_PROGRESS) return;
+        Log.i(TAG, "saveProgress: " + progress);
+        if (progress < 5000) {
+            progress = 0;
+        }
+        SharedPreferences spn = context.getSharedPreferences("JZVD_PROGRESS",
+                Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = spn.edit();
+        editor.putLong("newVersion:" + url.toString(), progress).apply();
+    }
+
+    public static long getSavedProgress(Context context, Object url) {
+        if (!Jzvd.SAVE_PROGRESS) return 0;
+        SharedPreferences spn = context.getSharedPreferences("JZVD_PROGRESS",
+                Context.MODE_PRIVATE);
+        return spn.getLong("newVersion:" + url.toString(), 0);
+    }
+
+    /**
+     * if url == null, clear all progress
+     *
+     * @param context context
+     * @param url     if url!=null clear this url progress
+     */
+    public static void clearSavedProgress(Context context, Object url) {
+        if (url == null) {
+            SharedPreferences spn = context.getSharedPreferences("JZVD_PROGRESS",
+                    Context.MODE_PRIVATE);
+            spn.edit().clear().apply();
+        } else {
+            SharedPreferences spn = context.getSharedPreferences("JZVD_PROGRESS",
+                    Context.MODE_PRIVATE);
+            spn.edit().putLong("newVersion:" + url.toString(), 0).apply();
+        }
+    }
+
+    @SuppressLint("RestrictedApi")
+    public static void showStatusBar(Context context) {
+        if (Jzvd.TOOL_BAR_EXIST) {
+            JZUtils.getWindow(context).clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        }
+    }
+
+    //如果是沉浸式的，全屏前就没有状态栏
+    @SuppressLint("RestrictedApi")
+    public static void hideStatusBar(Context context) {
+        if (Jzvd.TOOL_BAR_EXIST) {
+            JZUtils.getWindow(context).setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        }
+    }
+
+    @SuppressLint("NewApi")
+    public static void hideSystemUI(Context context) {
+        int uiOptions = View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                | View.SYSTEM_UI_FLAG_FULLSCREEN
+                | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
+        ;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
+            uiOptions |= View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
+        }
+        SYSTEM_UI = JZUtils.getWindow(context).getDecorView().getSystemUiVisibility();
+        JZUtils.getWindow(context).getDecorView().setSystemUiVisibility(uiOptions);
+
+    }
+
+    @SuppressLint("NewApi")
+    public static void showSystemUI(Context context) {
+        int uiOptions = View.SYSTEM_UI_FLAG_VISIBLE;
+        JZUtils.getWindow(context).getDecorView().setSystemUiVisibility(SYSTEM_UI);
+    }
+
+}
diff --git a/system/video/src/main/java/cn/jzvd/Jzvd.java b/system/video/src/main/java/cn/jzvd/Jzvd.java
new file mode 100644
index 0000000..7eb4ae7
--- /dev/null
+++ b/system/video/src/main/java/cn/jzvd/Jzvd.java
@@ -0,0 +1,1073 @@
+package cn.jzvd;
+
+import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.media.AudioManager;
+import android.media.MediaPlayer;
+import android.provider.Settings;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+import android.view.WindowManager;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.SeekBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.LinkedList;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import javax.sql.DataSource;
+
+/**
+ * Created by Nathen on 16/7/30.
+ */
+public abstract class Jzvd extends FrameLayout implements View.OnClickListener, SeekBar.OnSeekBarChangeListener, View.OnTouchListener {
+
+    public static final String TAG = "JZVD";
+    public static Jzvd CURRENT_JZVD;
+    public static LinkedList<ViewGroup> CONTAINER_LIST = new LinkedList<>();
+
+    public static final int SCREEN_NORMAL = 0;
+    public static final int SCREEN_FULLSCREEN = 1;
+    public static final int SCREEN_TINY = 2;
+
+    public static final int STATE_IDLE = -1;
+    public static final int STATE_NORMAL = 0;
+    public static final int STATE_PREPARING = 1;
+    public static final int STATE_PREPARING_CHANGE_URL = 2;
+    public static final int STATE_PREPARING_PLAYING = 3;
+    public static final int STATE_PREPARED = 4;
+    public static final int STATE_PLAYING = 5;
+    public static final int STATE_PAUSE = 6;
+    public static final int STATE_AUTO_COMPLETE = 7;
+    public static final int STATE_ERROR = 8;
+
+    public static final int VIDEO_IMAGE_DISPLAY_TYPE_ADAPTER = 0;//DEFAULT
+    public static final int VIDEO_IMAGE_DISPLAY_TYPE_FILL_PARENT = 1;
+    public static final int VIDEO_IMAGE_DISPLAY_TYPE_FILL_SCROP = 2;
+    public static final int VIDEO_IMAGE_DISPLAY_TYPE_ORIGINAL = 3;
+    public static boolean TOOL_BAR_EXIST = true;
+    public static int FULLSCREEN_ORIENTATION = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE;
+    public static int NORMAL_ORIENTATION = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
+    public static boolean SAVE_PROGRESS = false;
+    public static boolean WIFI_TIP_DIALOG_SHOWED = false;
+    public static int VIDEO_IMAGE_DISPLAY_TYPE = 0;
+    public static long lastAutoFullscreenTime = 0;
+    public static final int THRESHOLD = 80;
+    public static int ON_PLAY_PAUSE_TMP_STATE = 0;//这个考虑不放到库里，去自定义
+
+    public int state = -1;
+    public int screen = -1;
+    public JZDataSource jzDataSource;
+    public int widthRatio = 0;
+    public int heightRatio = 0;
+    public Class mediaInterfaceClass;
+    public JZMediaInterface mediaInterface;
+    public int positionInList = -1;//很想干掉它
+    public int videoRotation = 0;
+    protected long gobakFullscreenTime = 0;//这个应该重写一下，刷新列表，新增列表的刷新，不打断播放，应该是个flag
+    protected long gotoFullscreenTime = 0;
+
+    public int seekToManulPosition = -1;
+    public long seekToInAdvance = 0;
+
+    public ImageView startButton;
+    public SeekBar progressBar;
+    public ImageView fullscreenButton;
+    public TextView currentTimeTextView, totalTimeTextView;
+    public ViewGroup textureViewContainer;
+    public ViewGroup topContainer, bottomContainer;
+    public JZTextureView textureView;
+
+
+    protected Timer UPDATE_PROGRESS_TIMER;
+    protected int mScreenWidth;
+    protected int mScreenHeight;
+    protected AudioManager mAudioManager;
+    protected ProgressTimerTask mProgressTimerTask;
+    protected boolean mTouchingProgressBar;
+    protected float mDownX;
+    protected float mDownY;
+    protected boolean mChangeVolume;
+    protected boolean mChangePosition;
+    protected boolean mChangeBrightness;
+    protected long mGestureDownPosition;
+    protected int mGestureDownVolume;
+    protected float mGestureDownBrightness;
+    protected long mSeekTimePosition;
+    private Context jzvdContext;
+
+    public Jzvd(Context context) {
+        super(context);
+        init(context);
+    }
+
+    public Jzvd(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(context);
+    }
+
+    public abstract int getLayoutId();
+
+    public void init(Context context) {
+        View.inflate(context, getLayoutId(), this);
+        startButton = findViewById(R.id.start);
+        fullscreenButton = findViewById(R.id.fullscreen);
+        progressBar = findViewById(R.id.bottom_seek_progress);
+        currentTimeTextView = findViewById(R.id.current);
+        totalTimeTextView = findViewById(R.id.total);
+        bottomContainer = findViewById(R.id.layout_bottom);
+        textureViewContainer = findViewById(R.id.surface_container);
+        topContainer = findViewById(R.id.layout_top);
+
+        startButton.setOnClickListener(this);
+        fullscreenButton.setOnClickListener(this);
+        progressBar.setOnSeekBarChangeListener(this);
+        bottomContainer.setOnClickListener(this);
+        textureViewContainer.setOnClickListener(this);
+        textureViewContainer.setOnTouchListener(this);
+
+        mScreenWidth = getContext().getResources().getDisplayMetrics().widthPixels;
+        mScreenHeight = getContext().getResources().getDisplayMetrics().heightPixels;
+
+        state = STATE_IDLE;
+    }
+
+    public void setUp(String url, String title) {
+        setUp(new JZDataSource(url, title), SCREEN_NORMAL);
+    }
+
+    public void setUp(String url, String title, int screen) {
+        setUp(new JZDataSource(url, title), screen);
+    }
+
+    public void setUp(JZDataSource jzDataSource, int screen) {
+        setUp(jzDataSource, screen, JZMediaSystem.class);
+    }
+
+    public void setUp(String url, String title, int screen, Class mediaInterfaceClass) {
+        setUp(new JZDataSource(url, title), screen, mediaInterfaceClass);
+    }
+
+    public void setUp(JZDataSource jzDataSource, int screen, Class mediaInterfaceClass) {
+
+
+        this.jzDataSource = jzDataSource;
+        this.screen = screen;
+        onStateNormal();
+        this.mediaInterfaceClass = mediaInterfaceClass;
+    }
+
+    public void setMediaInterface(Class mediaInterfaceClass) {
+        reset();
+        this.mediaInterfaceClass = mediaInterfaceClass;
+    }
+
+    @Override
+    public void onClick(View v) {
+        int i = v.getId();
+        if (i == R.id.start) {
+            Log.i(TAG, "onClick start [" + this.hashCode() + "] ");
+            if (jzDataSource == null || jzDataSource.urlsMap.isEmpty() || jzDataSource.getCurrentUrl() == null) {
+                Toast.makeText(getContext(), getResources().getString(R.string.no_url), Toast.LENGTH_SHORT).show();
+                return;
+            }
+            if (state == STATE_NORMAL) {
+                if (!jzDataSource.getCurrentUrl().toString().startsWith("file") && !
+                        jzDataSource.getCurrentUrl().toString().startsWith("/") &&
+                        !JZUtils.isWifiConnected(getContext()) && !WIFI_TIP_DIALOG_SHOWED) {//这个可以放到std中
+                    showWifiDialog();
+                    return;
+                }
+                startVideo();
+            } else if (state == STATE_PLAYING) {
+                Log.d(TAG, "pauseVideo [" + this.hashCode() + "] ");
+                mediaInterface.pause();
+                onStatePause();
+            } else if (state == STATE_PAUSE) {
+                mediaInterface.start();
+                onStatePlaying();
+            } else if (state == STATE_AUTO_COMPLETE) {
+                startVideo();
+            }
+        } else if (i == R.id.fullscreen) {
+            Log.i(TAG, "onClick fullscreen [" + this.hashCode() + "] ");
+            if (state == STATE_AUTO_COMPLETE) return;
+            if (screen == SCREEN_FULLSCREEN) {
+                //quit fullscreen
+                backPress();
+            } else {
+                Log.d(TAG, "toFullscreenActivity [" + this.hashCode() + "] ");
+                gotoScreenFullscreen();
+            }
+        }
+    }
+
+    @Override
+    public boolean onTouch(View v, MotionEvent event) {
+        float x = event.getX();
+        float y = event.getY();
+        int id = v.getId();
+        if (id == R.id.surface_container) {
+            switch (event.getAction()) {
+                case MotionEvent.ACTION_DOWN:
+                    Log.i(TAG, "onTouch surfaceContainer actionDown [" + this.hashCode() + "] ");
+                    mTouchingProgressBar = true;
+
+                    mDownX = x;
+                    mDownY = y;
+                    mChangeVolume = false;
+                    mChangePosition = false;
+                    mChangeBrightness = false;
+
+                    break;
+                case MotionEvent.ACTION_MOVE:
+                    Log.i(TAG, "onTouch surfaceContainer actionMove [" + this.hashCode() + "] ");
+                    float deltaX = x - mDownX;
+                    float deltaY = y - mDownY;
+                    float absDeltaX = Math.abs(deltaX);
+                    float absDeltaY = Math.abs(deltaY);
+                    if (screen == SCREEN_FULLSCREEN) {
+                        if (!mChangePosition && !mChangeVolume && !mChangeBrightness) {
+                            if (absDeltaX > THRESHOLD || absDeltaY > THRESHOLD) {
+                                cancelProgressTimer();
+                                if (absDeltaX >= THRESHOLD) {
+                                    // 全屏模式下的CURRENT_STATE_ERROR状态下,不响应进度拖动事件.
+                                    // 否则会因为mediaplayer的状态非法导致App Crash
+                                    if (state != STATE_ERROR) {
+                                        mChangePosition = true;
+                                        mGestureDownPosition = getCurrentPositionWhenPlaying();
+                                    }
+                                } else {
+                                    //如果y轴滑动距离超过设置的处理范围，那么进行滑动事件处理
+                                    if (mDownX < mScreenWidth * 0.5f) {//左侧改变亮度
+                                        mChangeBrightness = true;
+                                        WindowManager.LayoutParams lp = JZUtils.getWindow(getContext()).getAttributes();
+                                        if (lp.screenBrightness < 0) {
+                                            try {
+                                                mGestureDownBrightness = Settings.System.getInt(getContext().getContentResolver(), Settings.System.SCREEN_BRIGHTNESS);
+                                                Log.i(TAG, "current system brightness: " + mGestureDownBrightness);
+                                            } catch (Settings.SettingNotFoundException e) {
+                                                e.printStackTrace();
+                                            }
+                                        } else {
+                                            mGestureDownBrightness = lp.screenBrightness * 255;
+                                            Log.i(TAG, "current activity brightness: " + mGestureDownBrightness);
+                                        }
+                                    } else {//右侧改变声音
+                                        mChangeVolume = true;
+                                        mGestureDownVolume = mAudioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    if (mChangePosition) {
+                        long totalTimeDuration = getDuration();
+//                        double yddis= ((deltaX * totalTimeDuration)*0.4) / mScreenWidth;
+                        double yddis= 10000;
+                        if(deltaX < 0){
+                            yddis = -yddis;
+                        }
+                        mSeekTimePosition = (int) (mGestureDownPosition + yddis);
+//                        Log.e("zjn"," 跳转时间 " + yddis + " 当前位置 " + mGestureDownPosition);
+                        if (mSeekTimePosition > totalTimeDuration)
+                            mSeekTimePosition = totalTimeDuration;
+                        String seekTime = JZUtils.stringForTime(mSeekTimePosition);
+                        String totalTime = JZUtils.stringForTime(totalTimeDuration);
+
+                        showProgressDialog(deltaX, seekTime, mSeekTimePosition, totalTime, totalTimeDuration);
+                    }
+                    if (mChangeVolume) {
+                        deltaY = -deltaY;
+                        int max = mAudioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
+                        int deltaV = (int) (max * deltaY * 3 / mScreenHeight);
+                        mAudioManager.setStreamVolume(AudioManager.STREAM_MUSIC, mGestureDownVolume + deltaV, 0);
+                        //dialog中显示百分比
+                        int volumePercent = (int) (mGestureDownVolume * 100 / max + deltaY * 3 * 100 / mScreenHeight);
+                        showVolumeDialog(-deltaY, volumePercent);
+                    }
+
+                    if (mChangeBrightness) {
+                        deltaY = -deltaY;
+                        int deltaV = (int) (255 * deltaY * 3 / mScreenHeight);
+                        WindowManager.LayoutParams params = JZUtils.getWindow(getContext()).getAttributes();
+                        if (((mGestureDownBrightness + deltaV) / 255) >= 1) {//这和声音有区别，必须自己过滤一下负值
+                            params.screenBrightness = 1;
+                        } else if (((mGestureDownBrightness + deltaV) / 255) <= 0) {
+                            params.screenBrightness = 0.01f;
+                        } else {
+                            params.screenBrightness = (mGestureDownBrightness + deltaV) / 255;
+                        }
+                        JZUtils.getWindow(getContext()).setAttributes(params);
+                        //dialog中显示百分比
+                        int brightnessPercent = (int) (mGestureDownBrightness * 100 / 255 + deltaY * 3 * 100 / mScreenHeight);
+                        showBrightnessDialog(brightnessPercent);
+//                        mDownY = y;
+                    }
+                    break;
+                case MotionEvent.ACTION_UP:
+                    Log.i(TAG, "onTouch surfaceContainer actionUp [" + this.hashCode() + "] ");
+                    mTouchingProgressBar = false;
+                    dismissProgressDialog();
+                    dismissVolumeDialog();
+                    dismissBrightnessDialog();
+                    if (mChangePosition) {
+                        mediaInterface.seekTo(mSeekTimePosition);
+                        long duration = getDuration();
+                        int progress = (int) (mSeekTimePosition * 100 / (duration == 0 ? 1 : duration));
+                        progressBar.setProgress(progress);
+                    }
+                    if (mChangeVolume) {
+                        //change volume event
+                    }
+                    startProgressTimer();
+                    break;
+            }
+        }
+        return false;
+    }
+
+    public void onStateNormal() {
+        Log.i(TAG, "onStateNormal " + " [" + this.hashCode() + "] ");
+        state = STATE_NORMAL;
+        cancelProgressTimer();
+        if (mediaInterface != null) mediaInterface.release();
+    }
+
+    public void onStatePreparing() {
+        Log.i(TAG, "onStatePreparing " + " [" + this.hashCode() + "] ");
+        state = STATE_PREPARING;
+        resetProgressAndTime();
+    }
+
+    public void onStatePreparingPlaying() {
+        Log.i(TAG, "onStatePreparingPlaying " + " [" + this.hashCode() + "] ");
+        state = STATE_PREPARING_PLAYING;
+    }
+
+    public void onStatePreparingChangeUrl() {
+        Log.i(TAG, "onStatePreparingChangeUrl " + " [" + this.hashCode() + "] ");
+        state = STATE_PREPARING_CHANGE_URL;
+
+        releaseAllVideos();
+        startVideo();
+
+//        mediaInterface.prepare();
+    }
+
+    public void changeUrl(JZDataSource jzDataSource, long seekToInAdvance) {
+        this.jzDataSource = jzDataSource;
+        this.seekToInAdvance = seekToInAdvance;
+        onStatePreparingChangeUrl();
+    }
+
+    public void onPrepared() {
+        Log.i(TAG, "onPrepared " + " [" + this.hashCode() + "] ");
+        state = STATE_PREPARED;
+        if (!preloading) {
+            mediaInterface.start();//这里原来是非县城
+            preloading = false;
+        }
+        if (jzDataSource.getCurrentUrl().toString().toLowerCase().contains("mp3") ||
+                jzDataSource.getCurrentUrl().toString().toLowerCase().contains("wma") ||
+                jzDataSource.getCurrentUrl().toString().toLowerCase().contains("aac") ||
+                jzDataSource.getCurrentUrl().toString().toLowerCase().contains("m4a") ||
+                jzDataSource.getCurrentUrl().toString().toLowerCase().contains("wav")) {
+            onStatePlaying();
+        }
+    }
+
+    public boolean preloading = false;
+
+    public void startPreloading() {
+        preloading = true;
+        startVideo();
+    }
+
+    /**
+     * 如果STATE_PREPARED就播放，如果没准备完成就走正常的播放函数startVideo();
+     */
+    public void startVideoAfterPreloading() {
+        if (state == STATE_PREPARED) {
+            mediaInterface.start();
+        } else {
+            preloading = false;
+            startVideo();
+        }
+    }
+
+    public void onStatePlaying() {
+        Log.i(TAG, "onStatePlaying " + " [" + this.hashCode() + "] ");
+        if (state == STATE_PREPARED) {//如果是准备完成视频后第一次播放，先判断是否需要跳转进度。
+            if (seekToInAdvance != 0) {
+                mediaInterface.seekTo(seekToInAdvance);
+                seekToInAdvance = 0;
+            } else {
+                long position = JZUtils.getSavedProgress(getContext(), jzDataSource.getCurrentUrl());
+                if (position != 0) {
+                    mediaInterface.seekTo(position);//这里为什么区分开呢，第一次的播放和resume播放是不一样的。 这里怎么区分是一个问题。然后
+                }
+            }
+        }
+        state = STATE_PLAYING;
+        startProgressTimer();
+    }
+
+    public void onStatePause() {
+        Log.i(TAG, "onStatePause " + " [" + this.hashCode() + "] ");
+        state = STATE_PAUSE;
+        startProgressTimer();
+    }
+
+    public void onStateError() {
+        Log.i(TAG, "onStateError " + " [" + this.hashCode() + "] ");
+        state = STATE_ERROR;
+        cancelProgressTimer();
+    }
+
+    public void onStateAutoComplete() {
+        Log.i(TAG, "onStateAutoComplete " + " [" + this.hashCode() + "] ");
+        state = STATE_AUTO_COMPLETE;
+        cancelProgressTimer();
+        progressBar.setProgress(100);
+        currentTimeTextView.setText(totalTimeTextView.getText());
+    }
+
+    public static int backUpBufferState = -1;
+
+    public void onInfo(int what, int extra) {
+        Log.d(TAG, "onInfo what - " + what + " extra - " + extra);
+        if (what == MediaPlayer.MEDIA_INFO_VIDEO_RENDERING_START) {
+            Log.d(TAG, "MEDIA_INFO_VIDEO_RENDERING_START");
+            if (state == Jzvd.STATE_PREPARED
+                    || state == Jzvd.STATE_PREPARING_CHANGE_URL) {
+                onStatePlaying();//开始渲染图像，真正进入playing状态
+            }
+        } else if (what == MediaPlayer.MEDIA_INFO_BUFFERING_START) {
+            Log.d(TAG, "MEDIA_INFO_BUFFERING_START");
+            backUpBufferState = state;
+            setState(STATE_PREPARING_PLAYING);
+        } else if (what == MediaPlayer.MEDIA_INFO_BUFFERING_END) {
+            Log.d(TAG, "MEDIA_INFO_BUFFERING_END");
+            if (backUpBufferState != -1) {
+                setState(backUpBufferState);
+                backUpBufferState = -1;
+            }
+        }
+    }
+
+    public void onError(int what, int extra) {
+        Log.e(TAG, "onError " + what + " - " + extra + " [" + this.hashCode() + "] ");
+        if (what != 38 && extra != -38 && what != -38 && extra != 38 && extra != -19) {
+            onStateError();
+            mediaInterface.release();
+        }
+    }
+
+    public void onAutoCompletion() {
+        Runtime.getRuntime().gc();
+        Log.i(TAG, "onAutoCompletion " + " [" + this.hashCode() + "] ");
+        cancelProgressTimer();
+        dismissBrightnessDialog();
+        dismissProgressDialog();
+        dismissVolumeDialog();
+        onStateAutoComplete();
+        mediaInterface.release();
+        JZUtils.scanForActivity(getContext()).getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+        JZUtils.saveProgress(getContext(), jzDataSource.getCurrentUrl(), 0);
+
+        if (screen == SCREEN_FULLSCREEN) {
+            if (CONTAINER_LIST.size() == 0) {
+                clearFloatScreen();//直接进入全屏
+            } else {
+                gotoNormalCompletion();
+            }
+        }
+    }
+
+    public void gotoNormalCompletion() {
+        gobakFullscreenTime = System.currentTimeMillis();//退出全屏
+        ViewGroup vg = (ViewGroup) (JZUtils.scanForActivity(jzvdContext)).getWindow().getDecorView();
+        vg.removeView(this);
+        textureViewContainer.removeView(textureView);
+        CONTAINER_LIST.getLast().removeAllViews();
+        CONTAINER_LIST.getLast().addView(this, new FrameLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+        CONTAINER_LIST.pop();
+
+        setScreenNormal();
+        JZUtils.showStatusBar(jzvdContext);
+        JZUtils.setRequestedOrientation(jzvdContext, NORMAL_ORIENTATION);
+        JZUtils.showSystemUI(jzvdContext);
+    }
+
+    /**
+     * 多数表现为中断当前播放
+     */
+    public void reset() {
+        Log.i(TAG, "reset " + " [" + this.hashCode() + "] ");
+        if (state == STATE_PLAYING || state == STATE_PAUSE) {
+            long position = getCurrentPositionWhenPlaying();
+            JZUtils.saveProgress(getContext(), jzDataSource.getCurrentUrl(), position);
+        }
+        cancelProgressTimer();
+        dismissBrightnessDialog();
+        dismissProgressDialog();
+        dismissVolumeDialog();
+        onStateNormal();
+        textureViewContainer.removeAllViews();
+
+        AudioManager mAudioManager = (AudioManager) getApplicationContext().getSystemService(Context.AUDIO_SERVICE);
+        mAudioManager.abandonAudioFocus(onAudioFocusChangeListener);
+        JZUtils.scanForActivity(getContext()).getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+        if (mediaInterface != null) mediaInterface.release();
+    }
+
+    /**
+     * 里面的的onState...()其实就是setState...()，因为要可以被复写，所以参考Activity的onCreate(),onState..()的方式看着舒服一些，老铁们有何高见。
+     * @param state stateId
+     */
+    public void setState(int state) {
+        switch (state) {
+            case STATE_NORMAL:
+                onStateNormal();
+                break;
+            case STATE_PREPARING:
+                onStatePreparing();
+                break;
+            case STATE_PREPARING_PLAYING:
+                onStatePreparingPlaying();
+                break;
+            case STATE_PREPARING_CHANGE_URL:
+                onStatePreparingChangeUrl();
+                break;
+            case STATE_PLAYING:
+                onStatePlaying();
+                break;
+            case STATE_PAUSE:
+                onStatePause();
+                break;
+            case STATE_ERROR:
+                onStateError();
+                break;
+            case STATE_AUTO_COMPLETE:
+                onStateAutoComplete();
+                break;
+        }
+    }
+
+    public void setScreen(int screen) {//特殊的个别的进入全屏的按钮在这里设置  只有setup的时候能用上
+        switch (screen) {
+            case SCREEN_NORMAL:
+                setScreenNormal();
+                break;
+            case SCREEN_FULLSCREEN:
+                setScreenFullscreen();
+                break;
+            case SCREEN_TINY:
+                setScreenTiny();
+                break;
+        }
+    }
+
+    public void startVideo() {
+        Log.d(TAG, "startVideo [" + this.hashCode() + "] ");
+        setCurrentJzvd(this);
+        try {
+            Constructor<JZMediaInterface> constructor = mediaInterfaceClass.getConstructor(Jzvd.class);
+            this.mediaInterface = constructor.newInstance(this);
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (InstantiationException e) {
+            e.printStackTrace();
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();
+        }
+        addTextureView();
+        mAudioManager = (AudioManager) getApplicationContext().getSystemService(Context.AUDIO_SERVICE);
+        mAudioManager.requestAudioFocus(onAudioFocusChangeListener, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN_TRANSIENT);
+        JZUtils.scanForActivity(getContext()).getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+
+        onStatePreparing();
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        if (screen == SCREEN_FULLSCREEN || screen == SCREEN_TINY) {
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+            return;
+        }
+        if (widthRatio != 0 && heightRatio != 0) {
+            int specWidth = MeasureSpec.getSize(widthMeasureSpec);
+            int specHeight = (int) ((specWidth * (float) heightRatio) / widthRatio);
+            setMeasuredDimension(specWidth, specHeight);
+
+            int childWidthMeasureSpec = MeasureSpec.makeMeasureSpec(specWidth, MeasureSpec.EXACTLY);
+            int childHeightMeasureSpec = MeasureSpec.makeMeasureSpec(specHeight, MeasureSpec.EXACTLY);
+            getChildAt(0).measure(childWidthMeasureSpec, childHeightMeasureSpec);
+        } else {
+            super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        }
+
+    }
+
+    public void addTextureView() {
+        Log.d(TAG, "addTextureView [" + this.hashCode() + "] ");
+        if (textureView != null) textureViewContainer.removeView(textureView);
+        textureView = new JZTextureView(getContext().getApplicationContext());
+        textureView.setSurfaceTextureListener(mediaInterface);
+
+        FrameLayout.LayoutParams layoutParams =
+                new FrameLayout.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        Gravity.CENTER);
+        textureViewContainer.addView(textureView, layoutParams);
+    }
+
+    public void clearFloatScreen() {
+        JZUtils.showStatusBar(getContext());
+        JZUtils.setRequestedOrientation(getContext(), NORMAL_ORIENTATION);
+        JZUtils.showSystemUI(getContext());
+
+        ViewGroup vg = (ViewGroup) (JZUtils.scanForActivity(getContext())).getWindow().getDecorView();
+        vg.removeView(this);
+        if (mediaInterface != null) mediaInterface.release();
+        CURRENT_JZVD = null;
+    }
+
+    public void onVideoSizeChanged(int width, int height) {
+        Log.i(TAG, "onVideoSizeChanged " + " [" + this.hashCode() + "] ");
+        if (textureView != null) {
+            if (videoRotation != 0) {
+                textureView.setRotation(videoRotation);
+            }
+            textureView.setVideoSize(width, height);
+        }
+    }
+
+    public void startProgressTimer() {
+        Log.i(TAG, "startProgressTimer: " + " [" + this.hashCode() + "] ");
+        cancelProgressTimer();
+        UPDATE_PROGRESS_TIMER = new Timer();
+        mProgressTimerTask = new ProgressTimerTask();
+        UPDATE_PROGRESS_TIMER.schedule(mProgressTimerTask, 0, 300);
+    }
+
+    public void cancelProgressTimer() {
+        if (UPDATE_PROGRESS_TIMER != null) {
+            UPDATE_PROGRESS_TIMER.cancel();
+        }
+        if (mProgressTimerTask != null) {
+            mProgressTimerTask.cancel();
+        }
+    }
+
+    public void onProgress(int progress, long position, long duration) {
+//        Log.d(TAG, "onProgress: progress=" + progress + " position=" + position + " duration=" + duration);
+        if (!mTouchingProgressBar) {
+            if (seekToManulPosition != -1) {
+                if (seekToManulPosition > progress) {
+                    return;
+                } else {
+                    seekToManulPosition = -1;//这个关键帧有没有必要做
+                }
+            } else {
+                if (progress != 0) progressBar.setProgress(progress);
+            }
+        }
+        if (position != 0) currentTimeTextView.setText(JZUtils.stringForTime(position));
+        totalTimeTextView.setText(JZUtils.stringForTime(duration));
+    }
+
+    public void setBufferProgress(int bufferProgress) {
+        if (bufferProgress != 0) progressBar.setSecondaryProgress(bufferProgress);
+    }
+
+    public void resetProgressAndTime() {
+        progressBar.setProgress(0);
+        progressBar.setSecondaryProgress(0);
+        currentTimeTextView.setText(JZUtils.stringForTime(0));
+        totalTimeTextView.setText(JZUtils.stringForTime(0));
+    }
+
+    public long getCurrentPositionWhenPlaying() {
+        long position = 0;
+        if (state == STATE_PLAYING || state == STATE_PAUSE || state == STATE_PREPARING_PLAYING) {
+            try {
+                position = mediaInterface.getCurrentPosition();
+            } catch (IllegalStateException e) {
+                e.printStackTrace();
+                return position;
+            }
+        }
+        return position;
+    }
+
+    public long getDuration() {
+        long duration = 0;
+        try {
+            duration = mediaInterface.getDuration();
+        } catch (IllegalStateException e) {
+            e.printStackTrace();
+            return duration;
+        }
+        return duration;
+    }
+
+    @Override
+    public void onStartTrackingTouch(SeekBar seekBar) {
+        Log.i(TAG, "bottomProgress onStartTrackingTouch [" + this.hashCode() + "] ");
+        cancelProgressTimer();
+        ViewParent vpdown = getParent();
+        while (vpdown != null) {
+            vpdown.requestDisallowInterceptTouchEvent(true);
+            vpdown = vpdown.getParent();
+        }
+    }
+
+    @Override
+    public void onStopTrackingTouch(SeekBar seekBar) {
+        Log.i(TAG, "bottomProgress onStopTrackingTouch [" + this.hashCode() + "] ");
+        startProgressTimer();
+        ViewParent vpup = getParent();
+        while (vpup != null) {
+            vpup.requestDisallowInterceptTouchEvent(false);
+            vpup = vpup.getParent();
+        }
+        if (state != STATE_PLAYING &&
+                state != STATE_PAUSE) return;
+        long time = seekBar.getProgress() * getDuration() / 100;
+        seekToManulPosition = seekBar.getProgress();
+        mediaInterface.seekTo(time);
+        Log.i(TAG, "seekTo " + time + " [" + this.hashCode() + "] ");
+    }
+
+    @Override
+    public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+        if (fromUser) {
+            //设置这个progres对应的时间，给textview
+            long duration = getDuration();
+            currentTimeTextView.setText(JZUtils.stringForTime(progress * duration / 100));
+        }
+    }
+
+    public void cloneAJzvd(ViewGroup vg) {
+        try {
+            Constructor<Jzvd> constructor = (Constructor<Jzvd>) Jzvd.this.getClass().getConstructor(Context.class);
+            Jzvd jzvd = constructor.newInstance(getContext());
+            jzvd.setId(getId());
+            vg.addView(jzvd);
+            jzvd.setUp(jzDataSource.cloneMe(), SCREEN_NORMAL, mediaInterfaceClass);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (InstantiationException e) {
+            e.printStackTrace();
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void gotoScreenFullscreen() {
+        gotoFullscreenTime = System.currentTimeMillis();
+        jzvdContext = ((ViewGroup) getParent()).getContext();
+        ViewGroup vg = (ViewGroup) getParent();
+        vg.removeView(this);
+        cloneAJzvd(vg);
+        CONTAINER_LIST.add(vg);
+        vg = (ViewGroup) (JZUtils.scanForActivity(jzvdContext)).getWindow().getDecorView();
+
+        vg.addView(this, new FrameLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+
+        setScreenFullscreen();
+        JZUtils.hideStatusBar(jzvdContext);
+        JZUtils.setRequestedOrientation(jzvdContext, FULLSCREEN_ORIENTATION);
+        JZUtils.hideSystemUI(jzvdContext);//华为手机和有虚拟键的手机全屏时可隐藏虚拟键 issue:1326
+
+    }
+
+    public void gotoScreenNormal() {//goback本质上是goto
+        gobakFullscreenTime = System.currentTimeMillis();//退出全屏
+        ViewGroup vg = (ViewGroup) (JZUtils.scanForActivity(jzvdContext)).getWindow().getDecorView();
+        vg.removeView(this);
+        CONTAINER_LIST.getLast().removeAllViews();
+        CONTAINER_LIST.getLast().addView(this, new FrameLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+        CONTAINER_LIST.pop();
+
+        setScreenNormal();//这块可以放到jzvd中
+        JZUtils.showStatusBar(jzvdContext);
+        JZUtils.setRequestedOrientation(jzvdContext, NORMAL_ORIENTATION);
+        JZUtils.showSystemUI(jzvdContext);
+    }
+
+    public void setScreenNormal() {//TODO 这块不对呀，还需要改进，设置flag之后要设置ui，不设置ui这么写没意义呀
+        screen = SCREEN_NORMAL;
+    }
+
+    public void setScreenFullscreen() {
+        screen = SCREEN_FULLSCREEN;
+    }
+
+    public void setScreenTiny() {
+        screen = SCREEN_TINY;
+    }
+
+    //    //重力感应的时候调用的函数，、、这里有重力感应的参数，暂时不能删除
+    public void autoFullscreen(float x) {//TODO写道demo中
+        if (CURRENT_JZVD != null
+                && (state == STATE_PLAYING || state == STATE_PAUSE)
+                && screen != SCREEN_FULLSCREEN
+                && screen != SCREEN_TINY) {
+            if (x > 0) {
+                JZUtils.setRequestedOrientation(getContext(), ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+            } else {
+                JZUtils.setRequestedOrientation(getContext(), ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE);
+            }
+            gotoScreenFullscreen();
+        }
+    }
+
+    public void autoQuitFullscreen() {
+        if ((System.currentTimeMillis() - lastAutoFullscreenTime) > 2000
+//                && CURRENT_JZVD != null
+                && state == STATE_PLAYING
+                && screen == SCREEN_FULLSCREEN) {
+            lastAutoFullscreenTime = System.currentTimeMillis();
+            backPress();
+        }
+    }
+
+    //TODO 是否有用
+    public void onSeekComplete() {
+
+    }
+
+    public void showWifiDialog() {
+    }
+
+    public void showProgressDialog(float deltaX,
+                                   String seekTime, long seekTimePosition,
+                                   String totalTime, long totalTimeDuration) {
+    }
+
+    public void dismissProgressDialog() {
+
+    }
+
+    public void showVolumeDialog(float deltaY, int volumePercent) {
+
+    }
+
+    public void dismissVolumeDialog() {
+
+    }
+
+    public void showBrightnessDialog(int brightnessPercent) {
+
+    }
+
+    public void dismissBrightnessDialog() {
+
+    }
+
+    public Context getApplicationContext() {//这个函数必要吗
+        Context context = getContext();
+        if (context != null) {
+            Context applicationContext = context.getApplicationContext();
+            if (applicationContext != null) {
+                return applicationContext;
+            }
+        }
+        return context;
+    }
+
+    public static class JZAutoFullscreenListener implements SensorEventListener {
+        @Override
+        public void onSensorChanged(SensorEvent event) {//可以得到传感器实时测量出来的变化值
+            final float x = event.values[SensorManager.DATA_X];
+            float y = event.values[SensorManager.DATA_Y];
+            float z = event.values[SensorManager.DATA_Z];
+            //过滤掉用力过猛会有一个反向的大数值
+            if (x < -12 || x > 12) {
+                if ((System.currentTimeMillis() - lastAutoFullscreenTime) > 2000) {
+                    if (Jzvd.CURRENT_JZVD != null) Jzvd.CURRENT_JZVD.autoFullscreen(x);
+                    lastAutoFullscreenTime = System.currentTimeMillis();
+                }
+            }
+        }
+
+        @Override
+        public void onAccuracyChanged(Sensor sensor, int accuracy) {
+        }
+    }
+
+    public class ProgressTimerTask extends TimerTask {
+        @Override
+        public void run() {
+            if (state == STATE_PLAYING || state == STATE_PAUSE || state == STATE_PREPARING_PLAYING) {
+//                Log.v(TAG, "onProgressUpdate " + "[" + this.hashCode() + "] ");
+                post(() -> {
+                    long position = getCurrentPositionWhenPlaying();
+                    long duration = getDuration();
+                    int progress = (int) (position * 100 / (duration == 0 ? 1 : duration));
+                    onProgress(progress, position, duration);
+                });
+            }
+        }
+    }
+
+    public static AudioManager.OnAudioFocusChangeListener onAudioFocusChangeListener = new AudioManager.OnAudioFocusChangeListener() {//是否新建个class，代码更规矩，并且变量的位置也很尴尬
+        @Override
+        public void onAudioFocusChange(int focusChange) {
+            switch (focusChange) {
+                case AudioManager.AUDIOFOCUS_GAIN:
+                    break;
+                case AudioManager.AUDIOFOCUS_LOSS:
+                    releaseAllVideos();
+                    Log.d(TAG, "AUDIOFOCUS_LOSS [" + this.hashCode() + "]");
+                    break;
+                case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT:
+                    try {
+                        Jzvd player = CURRENT_JZVD;
+                        if (player != null && player.state == Jzvd.STATE_PLAYING) {
+                            player.startButton.performClick();
+                        }
+                    } catch (IllegalStateException e) {
+                        e.printStackTrace();
+                    }
+                    Log.d(TAG, "AUDIOFOCUS_LOSS_TRANSIENT [" + this.hashCode() + "]");
+                    break;
+                case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK:
+                    break;
+            }
+        }
+    };
+
+    /**
+     * 增加准备状态逻辑
+     */
+    public static void goOnPlayOnResume() {
+        if (CURRENT_JZVD != null) {
+            if (CURRENT_JZVD.state == Jzvd.STATE_PAUSE) {
+                if (ON_PLAY_PAUSE_TMP_STATE == STATE_PAUSE) {
+                    CURRENT_JZVD.onStatePause();
+                    CURRENT_JZVD.mediaInterface.pause();
+                } else {
+                    CURRENT_JZVD.onStatePlaying();
+                    CURRENT_JZVD.mediaInterface.start();
+                }
+                ON_PLAY_PAUSE_TMP_STATE = 0;
+            } else if (CURRENT_JZVD.state == Jzvd.STATE_PREPARING) {
+                //准备状态暂停后的
+                CURRENT_JZVD.startVideo();
+//                CURRENT_JZVD.mediaInterface.start();
+            }
+        }
+    }
+
+    /**
+     * 增加准备状态逻辑
+     */
+    public static void goOnPlayOnPause() {
+        if (CURRENT_JZVD != null) {
+            if (CURRENT_JZVD.state == Jzvd.STATE_AUTO_COMPLETE ||
+                    CURRENT_JZVD.state == Jzvd.STATE_NORMAL ||
+                    CURRENT_JZVD.state == Jzvd.STATE_ERROR) {
+                Jzvd.releaseAllVideos();
+            } else if (CURRENT_JZVD.state == Jzvd.STATE_PREPARING) {
+                //准备状态暂停的逻辑
+                Jzvd.setCurrentJzvd(CURRENT_JZVD);
+                CURRENT_JZVD.state = STATE_PREPARING;
+            } else {
+                ON_PLAY_PAUSE_TMP_STATE = CURRENT_JZVD.state;
+                CURRENT_JZVD.onStatePause();
+                CURRENT_JZVD.mediaInterface.pause();
+            }
+        }
+    }
+
+    public static void startFullscreenDirectly(Context context, Class _class, String url, String title) {
+        startFullscreenDirectly(context, _class, new JZDataSource(url, title));
+    }
+
+    public static void startFullscreenDirectly(Context context, Class _class, JZDataSource jzDataSource) {
+        JZUtils.hideStatusBar(context);
+        JZUtils.setRequestedOrientation(context, FULLSCREEN_ORIENTATION);
+        JZUtils.hideSystemUI(context);
+
+        ViewGroup vp = (ViewGroup) JZUtils.scanForActivity(context).getWindow().getDecorView();
+        try {
+            Constructor<Jzvd> constructor = _class.getConstructor(Context.class);
+            final Jzvd jzvd = constructor.newInstance(context);
+            FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+            vp.addView(jzvd, lp);
+            jzvd.setUp(jzDataSource, JzvdStd.SCREEN_FULLSCREEN);
+            jzvd.startVideo();
+        } catch (InstantiationException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    public static void releaseAllVideos() {
+        Log.d(TAG, "releaseAllVideos");
+        if (CURRENT_JZVD != null) {
+            CURRENT_JZVD.reset();
+            CURRENT_JZVD = null;
+        }
+    }
+
+    public static boolean backPress() {
+        Log.i(TAG, "backPress");
+        if (CONTAINER_LIST.size() != 0 && CURRENT_JZVD != null) {//判断条件，因为当前所有goBack都是回到普通窗口
+            CURRENT_JZVD.gotoScreenNormal();
+            return true;
+        } else if (CONTAINER_LIST.size() == 0 && CURRENT_JZVD != null && CURRENT_JZVD.screen != SCREEN_NORMAL) {//退出直接进入的全屏
+            CURRENT_JZVD.clearFloatScreen();
+            return true;
+        }
+        return false;
+    }
+
+    public static void setCurrentJzvd(Jzvd jzvd) {
+        if (CURRENT_JZVD != null) CURRENT_JZVD.reset();
+        CURRENT_JZVD = jzvd;
+    }
+
+    public static void setTextureViewRotation(int rotation) {
+        if (CURRENT_JZVD != null && CURRENT_JZVD.textureView != null) {
+            CURRENT_JZVD.textureView.setRotation(rotation);
+        }
+    }
+
+    public static void setVideoImageDisplayType(int type) {
+        Jzvd.VIDEO_IMAGE_DISPLAY_TYPE = type;
+        if (CURRENT_JZVD != null && CURRENT_JZVD.textureView != null) {
+            CURRENT_JZVD.textureView.requestLayout();
+        }
+    }
+
+}
diff --git a/system/video/src/main/java/cn/jzvd/JzvdStd.java b/system/video/src/main/java/cn/jzvd/JzvdStd.java
new file mode 100644
index 0000000..e0a8b0b
--- /dev/null
+++ b/system/video/src/main/java/cn/jzvd/JzvdStd.java
@@ -0,0 +1,926 @@
+package cn.jzvd;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.graphics.Color;
+import android.net.ConnectivityManager;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
+import android.widget.ProgressBar;
+import android.widget.SeekBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayDeque;
+import java.util.Date;
+import java.util.Timer;
+import java.util.TimerTask;
+
+/**
+ * Created by Nathen
+ * On 2016/04/18 16:15
+ */
+public class JzvdStd extends Jzvd {
+
+    public static long LAST_GET_BATTERYLEVEL_TIME = 0;
+    public static int LAST_GET_BATTERYLEVEL_PERCENT = 70;
+    protected static Timer DISMISS_CONTROL_VIEW_TIMER;
+
+    public ImageView backButton;
+    public ProgressBar bottomProgressBar, loadingProgressBar;
+    public TextView titleTextView;
+    public ImageView posterImageView;
+    public ImageView tinyBackImageView;
+    public LinearLayout batteryTimeLayout;
+    public ImageView batteryLevel;
+    public TextView videoCurrentTime;
+    public TextView replayTextView;
+    public TextView clarity;
+    public PopupWindow clarityPopWindow;
+    public TextView mRetryBtn;
+    public LinearLayout mRetryLayout;
+    protected DismissControlViewTimerTask mDismissControlViewTimerTask;
+    protected Dialog mProgressDialog;
+    protected ProgressBar mDialogProgressBar;
+    protected TextView mDialogSeekTime;
+    protected TextView mDialogTotalTime;
+    protected ImageView mDialogIcon;
+    protected Dialog mVolumeDialog;
+    protected ProgressBar mDialogVolumeProgressBar;
+    protected TextView mDialogVolumeTextView;
+    protected ImageView mDialogVolumeImageView;
+    protected Dialog mBrightnessDialog;
+    protected ProgressBar mDialogBrightnessProgressBar;
+    protected TextView mDialogBrightnessTextView;
+    private boolean mIsWifi;
+
+    public JzvdStd(Context context) {
+        super(context);
+    }
+
+    public JzvdStd(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public void init(Context context) {
+        super.init(context);
+        batteryTimeLayout = findViewById(R.id.battery_time_layout);
+        bottomProgressBar = findViewById(R.id.bottom_progress);
+        titleTextView = findViewById(R.id.title);
+        backButton = findViewById(R.id.back);
+        posterImageView = findViewById(R.id.poster);
+        loadingProgressBar = findViewById(R.id.loading);
+        tinyBackImageView = findViewById(R.id.back_tiny);
+        batteryLevel = findViewById(R.id.battery_level);
+        videoCurrentTime = findViewById(R.id.video_current_time);
+        replayTextView = findViewById(R.id.replay_text);
+        clarity = findViewById(R.id.clarity);
+        mRetryBtn = findViewById(R.id.retry_btn);
+        mRetryLayout = findViewById(R.id.retry_layout);
+
+        posterImageView.setOnClickListener(this);
+        backButton.setOnClickListener(this);
+        tinyBackImageView.setOnClickListener(this);
+        clarity.setOnClickListener(this);
+        mRetryBtn.setOnClickListener(this);
+    }
+
+    public void setUp(JZDataSource jzDataSource, int screen, Class mediaInterfaceClass) {
+        if ((System.currentTimeMillis() - gobakFullscreenTime) < 200) {
+            return;
+        }
+
+        if ((System.currentTimeMillis() - gotoFullscreenTime) < 200) {
+            return;
+        }
+
+
+        super.setUp(jzDataSource, screen, mediaInterfaceClass);
+        titleTextView.setText(jzDataSource.title);
+        setScreen(screen);
+    }
+
+    public void changeStartButtonSize(int size) {
+        ViewGroup.LayoutParams lp = startButton.getLayoutParams();
+        lp.height = size;
+        lp.width = size;
+        lp = loadingProgressBar.getLayoutParams();
+        lp.height = size;
+        lp.width = size;
+    }
+
+    public interface videoClickLictener{
+        void click(int type);//0全屏
+    }
+    public videoClickLictener mListener;
+    public void setVideoClickLictener(videoClickLictener listener){
+        mListener=listener;
+    }
+    @Override
+    public void gotoScreenFullscreen() {
+        if (mListener!=null) {
+            mListener.click(0);
+        }else{
+            super.gotoScreenFullscreen();
+        }
+    }
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.jz_layout_std;
+    }
+
+    @Override
+    public void onStateNormal() {
+        super.onStateNormal();
+        changeUiToNormal();
+    }
+
+    @Override
+    public void onStatePreparing() {
+        super.onStatePreparing();
+        changeUiToPreparing();
+    }
+
+    public void onStatePreparingPlaying() {
+        super.onStatePreparingPlaying();
+        changeUIToPreparingPlaying();
+    }
+
+    public void onStatePreparingChangeUrl() {
+        super.onStatePreparingChangeUrl();
+        changeUIToPreparingChangeUrl();
+    }
+
+    @Override
+    public void onStatePlaying() {
+        super.onStatePlaying();
+        changeUiToPlayingClear();
+    }
+
+    @Override
+    public void onStatePause() {
+        super.onStatePause();
+        changeUiToPauseShow();
+        cancelDismissControlViewTimer();
+    }
+
+    @Override
+    public void onStateError() {
+        super.onStateError();
+        changeUiToError();
+    }
+
+    @Override
+    public void onStateAutoComplete() {
+        super.onStateAutoComplete();
+        changeUiToComplete();
+        cancelDismissControlViewTimer();
+        bottomProgressBar.setProgress(100);
+    }
+
+    @Override
+    public void startVideo() {
+        super.startVideo();
+        registerWifiListener(getApplicationContext());
+    }
+
+    //doublClick 这两个全局变量只在ontouch中使用，就近放置便于阅读
+    private long lastClickTime = 0;
+    private long doubleTime = 200;
+    private ArrayDeque<Runnable> delayTask = new ArrayDeque<>();
+
+    @Override
+    public boolean onTouch(View v, MotionEvent event) {
+        int id = v.getId();
+        if (id == R.id.surface_container) {
+            switch (event.getAction()) {
+                case MotionEvent.ACTION_DOWN:
+                    break;
+                case MotionEvent.ACTION_MOVE:
+                    break;
+                case MotionEvent.ACTION_UP:
+                    startDismissControlViewTimer();
+                    if (mChangePosition) {
+                        long duration = getDuration();
+                        int progress = (int) (mSeekTimePosition * 100 / (duration == 0 ? 1 : duration));
+                        bottomProgressBar.setProgress(progress);
+                    }
+
+                    //加上延时是为了判断点击是否是双击之一，双击不执行这个逻辑
+                    Runnable task = () -> {
+                        if (!mChangePosition && !mChangeVolume) {
+                            onClickUiToggle();
+                        }
+                    };
+                    v.postDelayed(task, doubleTime + 20);
+                    delayTask.add(task);
+                    while (delayTask.size() > 2) {
+                        delayTask.pollFirst();
+                    }
+
+                    long currentTimeMillis = System.currentTimeMillis();
+                    if (currentTimeMillis - lastClickTime < doubleTime) {
+                        for (Runnable taskItem : delayTask) {
+                            v.removeCallbacks(taskItem);
+                        }
+                        if (state == STATE_PLAYING || state == STATE_PAUSE) {
+                            Log.d(TAG, "doublClick [" + this.hashCode() + "] ");
+                            startButton.performClick();
+                        }
+                    }
+                    lastClickTime = currentTimeMillis;
+                    break;
+            }
+        } else if (id == R.id.bottom_seek_progress) {
+            switch (event.getAction()) {
+                case MotionEvent.ACTION_DOWN:
+                    cancelDismissControlViewTimer();
+                    break;
+                case MotionEvent.ACTION_UP:
+                    startDismissControlViewTimer();
+                    break;
+            }
+        }
+        return super.onTouch(v, event);
+    }
+
+    @Override
+    public void onClick(View v) {
+        super.onClick(v);
+        int i = v.getId();
+        if (i == R.id.poster) {
+            if (jzDataSource == null || jzDataSource.urlsMap.isEmpty() || jzDataSource.getCurrentUrl() == null) {
+                Toast.makeText(getContext(), getResources().getString(R.string.no_url), Toast.LENGTH_SHORT).show();
+                return;
+            }
+            if (state == STATE_NORMAL) {
+                if (!jzDataSource.getCurrentUrl().toString().startsWith("file") &&
+                        !jzDataSource.getCurrentUrl().toString().startsWith("/") &&
+                        !JZUtils.isWifiConnected(getContext()) && !WIFI_TIP_DIALOG_SHOWED) {
+                    showWifiDialog();
+                    return;
+                }
+                startVideo();
+            } else if (state == STATE_AUTO_COMPLETE) {
+                onClickUiToggle();
+            }
+        } else if (i == R.id.surface_container) {
+            startDismissControlViewTimer();
+        } else if (i == R.id.back) {
+            backPress();
+        } else if (i == R.id.back_tiny) {
+            clearFloatScreen();
+        } else if (i == R.id.clarity) {
+            LayoutInflater inflater = (LayoutInflater) getContext()
+                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            final LinearLayout layout = (LinearLayout) inflater.inflate(R.layout.jz_layout_clarity, null);
+
+            OnClickListener mQualityListener = v1 -> {
+                int index = (int) v1.getTag();
+
+//                this.seekToInAdvance = getCurrentPositionWhenPlaying();
+                jzDataSource.currentUrlIndex = index;
+//                onStatePreparingChangeUrl();
+
+                changeUrl(jzDataSource, getCurrentPositionWhenPlaying());
+
+                clarity.setText(jzDataSource.getCurrentKey().toString());
+                for (int j = 0; j < layout.getChildCount(); j++) {//设置点击之后的颜色
+                    if (j == jzDataSource.currentUrlIndex) {
+                        ((TextView) layout.getChildAt(j)).setTextColor(Color.parseColor("#fff85959"));
+                    } else {
+                        ((TextView) layout.getChildAt(j)).setTextColor(Color.parseColor("#ffffff"));
+                    }
+                }
+                if (clarityPopWindow != null) {
+                    clarityPopWindow.dismiss();
+                }
+            };
+
+            for (int j = 0; j < jzDataSource.urlsMap.size(); j++) {
+                String key = jzDataSource.getKeyFromDataSource(j);
+                TextView clarityItem = (TextView) View.inflate(getContext(), R.layout.jz_layout_clarity_item, null);
+                clarityItem.setText(key);
+                clarityItem.setTag(j);
+                layout.addView(clarityItem, j);
+                clarityItem.setOnClickListener(mQualityListener);
+                if (j == jzDataSource.currentUrlIndex) {
+                    clarityItem.setTextColor(Color.parseColor("#fff85959"));
+                }
+            }
+
+            clarityPopWindow = new PopupWindow(layout, LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, true);
+            clarityPopWindow.setContentView(layout);
+            clarityPopWindow.showAsDropDown(clarity);
+            layout.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
+            int offsetX = clarity.getMeasuredWidth() / 3;
+            int offsetY = clarity.getMeasuredHeight() / 3;
+            clarityPopWindow.update(clarity, -offsetX, -offsetY, Math.round(layout.getMeasuredWidth() * 2), layout.getMeasuredHeight());
+        } else if (i == R.id.retry_btn) {
+            if (jzDataSource.urlsMap.isEmpty() || jzDataSource.getCurrentUrl() == null) {
+                Toast.makeText(getContext(), getResources().getString(R.string.no_url), Toast.LENGTH_SHORT).show();
+                return;
+            }
+            if (!jzDataSource.getCurrentUrl().toString().startsWith("file") && !
+                    jzDataSource.getCurrentUrl().toString().startsWith("/") &&
+                    !JZUtils.isWifiConnected(getContext()) && !WIFI_TIP_DIALOG_SHOWED) {
+                showWifiDialog();
+                return;
+            }
+            addTextureView();
+            onStatePreparing();
+        }
+    }
+
+    @Override
+    public void setScreenNormal() {
+        super.setScreenNormal();
+        fullscreenButton.setImageResource(R.drawable.jz_enlarge);
+        backButton.setVisibility(View.GONE);
+        tinyBackImageView.setVisibility(View.INVISIBLE);
+        changeStartButtonSize((int) getResources().getDimension(R.dimen.jz_start_button_w_h_normal));
+        batteryTimeLayout.setVisibility(View.GONE);
+        clarity.setVisibility(View.GONE);
+    }
+
+    @Override
+    public void setScreenFullscreen() {
+        super.setScreenFullscreen();
+        //进入全屏之后要保证原来的播放状态和ui状态不变，改变个别的ui
+        fullscreenButton.setImageResource(R.drawable.jz_shrink);
+        backButton.setVisibility(View.VISIBLE);
+        tinyBackImageView.setVisibility(View.INVISIBLE);
+        batteryTimeLayout.setVisibility(View.VISIBLE);
+        if (jzDataSource.urlsMap.size() == 1) {
+            clarity.setVisibility(GONE);
+        } else {
+            clarity.setText(jzDataSource.getCurrentKey().toString());
+            clarity.setVisibility(View.VISIBLE);
+        }
+        changeStartButtonSize((int) getResources().getDimension(R.dimen.jz_start_button_w_h_fullscreen));
+        setSystemTimeAndBattery();
+    }
+
+    @Override
+    public void setScreenTiny() {
+        super.setScreenTiny();
+        tinyBackImageView.setVisibility(View.VISIBLE);
+        setAllControlsVisiblity(View.INVISIBLE, View.INVISIBLE, View.INVISIBLE,
+                View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE);
+        batteryTimeLayout.setVisibility(View.GONE);
+        clarity.setVisibility(View.GONE);
+    }
+
+    @Override
+    public void showWifiDialog() {
+        super.showWifiDialog();
+        AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+        builder.setMessage(getResources().getString(R.string.tips_not_wifi));
+        builder.setPositiveButton(getResources().getString(R.string.tips_not_wifi_confirm), (dialog, which) -> {
+            dialog.dismiss();
+            WIFI_TIP_DIALOG_SHOWED = true;
+            if (state == STATE_PAUSE) {
+                startButton.performClick();
+            } else {
+                startVideo();
+            }
+
+        });
+        builder.setNegativeButton(getResources().getString(R.string.tips_not_wifi_cancel), (dialog, which) -> {
+            dialog.dismiss();
+            releaseAllVideos();
+            clearFloatScreen();
+        });
+        builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
+            @Override
+            public void onCancel(DialogInterface dialog) {
+                dialog.dismiss();
+                releaseAllVideos();
+                clearFloatScreen();
+            }
+        });
+
+        builder.create().show();
+    }
+
+    @Override
+    public void onStartTrackingTouch(SeekBar seekBar) {
+        super.onStartTrackingTouch(seekBar);
+        cancelDismissControlViewTimer();
+    }
+
+    @Override
+    public void onStopTrackingTouch(SeekBar seekBar) {
+        super.onStopTrackingTouch(seekBar);
+        startDismissControlViewTimer();
+    }
+
+    public void onClickUiToggle() {//这是事件
+        if (bottomContainer.getVisibility() != View.VISIBLE) {
+            setSystemTimeAndBattery();
+            clarity.setText(jzDataSource.getCurrentKey().toString());
+        }
+        if (state == STATE_PREPARING) {
+            changeUiToPreparing();
+            if (bottomContainer.getVisibility() == View.VISIBLE) {
+            } else {
+                setSystemTimeAndBattery();
+            }
+        } else if (state == STATE_PLAYING) {
+            if (bottomContainer.getVisibility() == View.VISIBLE) {
+                changeUiToPlayingClear();
+            } else {
+                changeUiToPlayingShow();
+            }
+        } else if (state == STATE_PAUSE) {
+            if (bottomContainer.getVisibility() == View.VISIBLE) {
+                changeUiToPauseClear();
+            } else {
+                changeUiToPauseShow();
+            }
+        }
+    }
+
+    public void setSystemTimeAndBattery() {
+        SimpleDateFormat dateFormater = new SimpleDateFormat("HH:mm");
+        Date date = new Date();
+        videoCurrentTime.setText(dateFormater.format(date));
+        if ((System.currentTimeMillis() - LAST_GET_BATTERYLEVEL_TIME) > 30000) {
+            LAST_GET_BATTERYLEVEL_TIME = System.currentTimeMillis();
+            getContext().registerReceiver(
+                    battertReceiver,
+                    new IntentFilter(Intent.ACTION_BATTERY_CHANGED)
+            );
+        } else {
+            setBatteryLevel();
+        }
+    }
+
+    public void setBatteryLevel() {
+        int percent = LAST_GET_BATTERYLEVEL_PERCENT;
+        if (percent < 15) {
+            batteryLevel.setBackgroundResource(R.drawable.jz_battery_level_10);
+        } else if (percent >= 15 && percent < 40) {
+            batteryLevel.setBackgroundResource(R.drawable.jz_battery_level_30);
+        } else if (percent >= 40 && percent < 60) {
+            batteryLevel.setBackgroundResource(R.drawable.jz_battery_level_50);
+        } else if (percent >= 60 && percent < 80) {
+            batteryLevel.setBackgroundResource(R.drawable.jz_battery_level_70);
+        } else if (percent >= 80 && percent < 95) {
+            batteryLevel.setBackgroundResource(R.drawable.jz_battery_level_90);
+        } else if (percent >= 95 && percent <= 100) {
+            batteryLevel.setBackgroundResource(R.drawable.jz_battery_level_100);
+        }
+    }
+
+    public void onCLickUiToggleToClear() {
+        if (state == STATE_PREPARING) {
+            if (bottomContainer.getVisibility() == View.VISIBLE) {
+                changeUiToPreparing();
+            } else {
+            }
+        } else if (state == STATE_PLAYING) {
+            if (bottomContainer.getVisibility() == View.VISIBLE) {
+                changeUiToPlayingClear();
+            } else {
+            }
+        } else if (state == STATE_PAUSE) {
+            if (bottomContainer.getVisibility() == View.VISIBLE) {
+                changeUiToPauseClear();
+            } else {
+            }
+        } else if (state == STATE_AUTO_COMPLETE) {
+            if (bottomContainer.getVisibility() == View.VISIBLE) {
+                changeUiToComplete();
+            } else {
+            }
+        }
+    }
+
+
+    @Override
+    public void onProgress(int progress, long position, long duration) {
+        super.onProgress(progress, position, duration);
+        if (progress != 0) bottomProgressBar.setProgress(progress);
+    }
+
+    @Override
+    public void setBufferProgress(int bufferProgress) {
+        super.setBufferProgress(bufferProgress);
+        if (bufferProgress != 0) bottomProgressBar.setSecondaryProgress(bufferProgress);
+    }
+
+    @Override
+    public void resetProgressAndTime() {
+        super.resetProgressAndTime();
+        bottomProgressBar.setProgress(0);
+        bottomProgressBar.setSecondaryProgress(0);
+    }
+
+    public void changeUiToNormal() {
+        switch (screen) {
+            case SCREEN_NORMAL:
+            case SCREEN_FULLSCREEN:
+                setAllControlsVisiblity(View.VISIBLE, View.INVISIBLE, View.VISIBLE,
+                        View.INVISIBLE, View.VISIBLE, View.INVISIBLE, View.INVISIBLE);
+                updateStartImage();
+                break;
+            case SCREEN_TINY:
+                break;
+        }
+    }
+
+    public void changeUiToPreparing() {
+        switch (screen) {
+            case SCREEN_NORMAL:
+            case SCREEN_FULLSCREEN:
+                setAllControlsVisiblity(View.INVISIBLE, View.INVISIBLE, View.INVISIBLE,
+                        View.VISIBLE, View.VISIBLE, View.INVISIBLE, View.INVISIBLE);
+                updateStartImage();
+                break;
+            case SCREEN_TINY:
+                break;
+        }
+    }
+
+    public void changeUIToPreparingPlaying() {
+        switch (screen) {
+            case SCREEN_NORMAL:
+            case SCREEN_FULLSCREEN:
+                setAllControlsVisiblity(View.VISIBLE, View.VISIBLE, View.INVISIBLE,
+                        View.VISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE);
+                updateStartImage();
+                break;
+            case SCREEN_TINY:
+                break;
+        }
+    }
+
+    public void changeUIToPreparingChangeUrl() {
+        switch (screen) {
+            case SCREEN_NORMAL:
+            case SCREEN_FULLSCREEN:
+                setAllControlsVisiblity(View.INVISIBLE, View.INVISIBLE, View.INVISIBLE,
+                        View.VISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE);
+                updateStartImage();
+                break;
+            case SCREEN_TINY:
+                break;
+        }
+    }
+
+    public void changeUiToPlayingShow() {
+        switch (screen) {
+            case SCREEN_NORMAL:
+            case SCREEN_FULLSCREEN:
+                setAllControlsVisiblity(View.VISIBLE, View.VISIBLE, View.VISIBLE,
+                        View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE);
+                updateStartImage();
+                break;
+            case SCREEN_TINY:
+                break;
+        }
+
+    }
+
+    public void changeUiToPlayingClear() {
+        switch (screen) {
+            case SCREEN_NORMAL:
+            case SCREEN_FULLSCREEN:
+                setAllControlsVisiblity(View.INVISIBLE, View.INVISIBLE, View.INVISIBLE,
+                        View.INVISIBLE, View.INVISIBLE, View.VISIBLE, View.INVISIBLE);
+                break;
+            case SCREEN_TINY:
+                break;
+        }
+
+    }
+
+    public void changeUiToPauseShow() {
+        switch (screen) {
+            case SCREEN_NORMAL:
+            case SCREEN_FULLSCREEN:
+                setAllControlsVisiblity(View.VISIBLE, View.VISIBLE, View.VISIBLE,
+                        View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE);
+                updateStartImage();
+                break;
+            case SCREEN_TINY:
+                break;
+        }
+    }
+
+    public void changeUiToPauseClear() {
+        switch (screen) {
+            case SCREEN_NORMAL:
+            case SCREEN_FULLSCREEN:
+                setAllControlsVisiblity(View.INVISIBLE, View.INVISIBLE, View.INVISIBLE,
+                        View.INVISIBLE, View.INVISIBLE, View.VISIBLE, View.INVISIBLE);
+                break;
+            case SCREEN_TINY:
+                break;
+        }
+
+    }
+
+    public void changeUiToComplete() {
+        switch (screen) {
+            case SCREEN_NORMAL:
+            case SCREEN_FULLSCREEN:
+                setAllControlsVisiblity(View.VISIBLE, View.INVISIBLE, View.VISIBLE,
+                        View.INVISIBLE, View.VISIBLE, View.INVISIBLE, View.INVISIBLE);
+                updateStartImage();
+                break;
+            case SCREEN_TINY:
+                break;
+        }
+
+    }
+
+    public void changeUiToError() {
+        switch (screen) {
+            case SCREEN_NORMAL:
+                setAllControlsVisiblity(View.INVISIBLE, View.INVISIBLE, View.VISIBLE,
+                        View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.VISIBLE);
+                updateStartImage();
+                break;
+            case SCREEN_FULLSCREEN:
+                setAllControlsVisiblity(View.VISIBLE, View.INVISIBLE, View.VISIBLE,
+                        View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.VISIBLE);
+                updateStartImage();
+                break;
+            case SCREEN_TINY:
+                break;
+        }
+
+    }
+
+    public void setAllControlsVisiblity(int topCon, int bottomCon, int startBtn, int loadingPro,
+                                        int posterImg, int bottomPro, int retryLayout) {
+        topContainer.setVisibility(topCon);
+        bottomContainer.setVisibility(bottomCon);
+        startButton.setVisibility(startBtn);
+        loadingProgressBar.setVisibility(loadingPro);
+        posterImageView.setVisibility(posterImg);
+        bottomProgressBar.setVisibility(bottomPro);
+        mRetryLayout.setVisibility(retryLayout);
+    }
+
+    public void updateStartImage() {
+        if (state == STATE_PLAYING) {
+            startButton.setVisibility(VISIBLE);
+            startButton.setImageResource(R.drawable.jz_click_pause_selector);
+            replayTextView.setVisibility(GONE);
+        } else if (state == STATE_ERROR) {
+            startButton.setVisibility(INVISIBLE);
+            replayTextView.setVisibility(GONE);
+        } else if (state == STATE_AUTO_COMPLETE) {
+            startButton.setVisibility(VISIBLE);
+            startButton.setImageResource(R.drawable.jz_click_replay_selector);
+            replayTextView.setVisibility(VISIBLE);
+        } else {
+            startButton.setImageResource(R.drawable.jz_click_play_selector);
+            replayTextView.setVisibility(GONE);
+        }
+    }
+
+    @Override
+    public void showProgressDialog(float deltaX, String seekTime, long seekTimePosition, String totalTime, long totalTimeDuration) {
+        super.showProgressDialog(deltaX, seekTime, seekTimePosition, totalTime, totalTimeDuration);
+        if (mProgressDialog == null) {
+            View localView = LayoutInflater.from(getContext()).inflate(R.layout.jz_dialog_progress, null);
+            mDialogProgressBar = localView.findViewById(R.id.duration_progressbar);
+            mDialogSeekTime = localView.findViewById(R.id.tv_current);
+            mDialogTotalTime = localView.findViewById(R.id.tv_duration);
+            mDialogIcon = localView.findViewById(R.id.duration_image_tip);
+            mProgressDialog = createDialogWithView(localView);
+        }
+        if (!mProgressDialog.isShowing()) {
+            mProgressDialog.show();
+        }
+
+        mDialogSeekTime.setText(seekTime);
+        mDialogTotalTime.setText(" / " + totalTime);
+        mDialogProgressBar.setProgress(totalTimeDuration <= 0 ? 0 : (int) (seekTimePosition * 100 / totalTimeDuration));
+        if (deltaX > 0) {
+            mDialogIcon.setBackgroundResource(R.drawable.jz_forward_icon);
+        } else {
+            mDialogIcon.setBackgroundResource(R.drawable.jz_backward_icon);
+        }
+        onCLickUiToggleToClear();
+    }
+
+    @Override
+    public void dismissProgressDialog() {
+        super.dismissProgressDialog();
+        if (mProgressDialog != null) {
+            mProgressDialog.dismiss();
+        }
+    }
+
+    @Override
+    public void showVolumeDialog(float deltaY, int volumePercent) {
+        super.showVolumeDialog(deltaY, volumePercent);
+        if (mVolumeDialog == null) {
+            View localView = LayoutInflater.from(getContext()).inflate(R.layout.jz_dialog_volume, null);
+            mDialogVolumeImageView = localView.findViewById(R.id.volume_image_tip);
+            mDialogVolumeTextView = localView.findViewById(R.id.tv_volume);
+            mDialogVolumeProgressBar = localView.findViewById(R.id.volume_progressbar);
+            mVolumeDialog = createDialogWithView(localView);
+        }
+        if (!mVolumeDialog.isShowing()) {
+            mVolumeDialog.show();
+        }
+        if (volumePercent <= 0) {
+            mDialogVolumeImageView.setBackgroundResource(R.drawable.jz_close_volume);
+        } else {
+            mDialogVolumeImageView.setBackgroundResource(R.drawable.jz_add_volume);
+        }
+        if (volumePercent > 100) {
+            volumePercent = 100;
+        } else if (volumePercent < 0) {
+            volumePercent = 0;
+        }
+        mDialogVolumeTextView.setText(volumePercent + "%");
+        mDialogVolumeProgressBar.setProgress(volumePercent);
+        onCLickUiToggleToClear();
+    }
+
+    @Override
+    public void dismissVolumeDialog() {
+        super.dismissVolumeDialog();
+        if (mVolumeDialog != null) {
+            mVolumeDialog.dismiss();
+        }
+    }
+
+    @Override
+    public void showBrightnessDialog(int brightnessPercent) {
+        super.showBrightnessDialog(brightnessPercent);
+        if (mBrightnessDialog == null) {
+            View localView = LayoutInflater.from(getContext()).inflate(R.layout.jz_dialog_brightness, null);
+            mDialogBrightnessTextView = localView.findViewById(R.id.tv_brightness);
+            mDialogBrightnessProgressBar = localView.findViewById(R.id.brightness_progressbar);
+            mBrightnessDialog = createDialogWithView(localView);
+        }
+        if (!mBrightnessDialog.isShowing()) {
+            mBrightnessDialog.show();
+        }
+        if (brightnessPercent > 100) {
+            brightnessPercent = 100;
+        } else if (brightnessPercent < 0) {
+            brightnessPercent = 0;
+        }
+        mDialogBrightnessTextView.setText(brightnessPercent + "%");
+        mDialogBrightnessProgressBar.setProgress(brightnessPercent);
+        onCLickUiToggleToClear();
+    }
+
+    @Override
+    public void dismissBrightnessDialog() {
+        super.dismissBrightnessDialog();
+        if (mBrightnessDialog != null) {
+            mBrightnessDialog.dismiss();
+        }
+    }
+
+    public Dialog createDialogWithView(View localView) {
+        Dialog dialog = new Dialog(getContext(), R.style.jz_style_dialog_progress);
+        dialog.setContentView(localView);
+        Window window = dialog.getWindow();
+        window.addFlags(Window.FEATURE_ACTION_BAR);
+        window.addFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL);
+        window.addFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE);
+        window.setLayout(-2, -2);
+        WindowManager.LayoutParams localLayoutParams = window.getAttributes();
+        localLayoutParams.gravity = Gravity.CENTER;
+        window.setAttributes(localLayoutParams);
+        return dialog;
+    }
+
+    public void startDismissControlViewTimer() {
+        cancelDismissControlViewTimer();
+        DISMISS_CONTROL_VIEW_TIMER = new Timer();
+        mDismissControlViewTimerTask = new DismissControlViewTimerTask();
+        DISMISS_CONTROL_VIEW_TIMER.schedule(mDismissControlViewTimerTask, 2500);
+    }
+
+    public void cancelDismissControlViewTimer() {
+        if (DISMISS_CONTROL_VIEW_TIMER != null) {
+            DISMISS_CONTROL_VIEW_TIMER.cancel();
+        }
+        if (mDismissControlViewTimerTask != null) {
+            mDismissControlViewTimerTask.cancel();
+        }
+
+    }
+
+    @Override
+    public void onAutoCompletion() {
+        super.onAutoCompletion();
+        cancelDismissControlViewTimer();
+    }
+
+    @Override
+    public void reset() {
+        super.reset();
+        cancelDismissControlViewTimer();
+        if (clarityPopWindow != null) {
+            clarityPopWindow.dismiss();
+        }
+        unregisterWifiListener(getApplicationContext());
+    }
+
+    public void dissmissControlView() {
+        if (state != STATE_NORMAL
+                && state != STATE_ERROR
+                && state != STATE_AUTO_COMPLETE) {
+            post(() -> {
+                bottomContainer.setVisibility(View.INVISIBLE);
+                topContainer.setVisibility(View.INVISIBLE);
+                startButton.setVisibility(View.INVISIBLE);
+                if (clarityPopWindow != null) {
+                    clarityPopWindow.dismiss();
+                }
+                if (screen != SCREEN_TINY) {
+                    bottomProgressBar.setVisibility(View.VISIBLE);
+                }
+            });
+        }
+    }
+
+    public class DismissControlViewTimerTask extends TimerTask {
+
+        @Override
+        public void run() {
+            dissmissControlView();
+        }
+    }
+
+    public BroadcastReceiver battertReceiver = new BroadcastReceiver() {
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (Intent.ACTION_BATTERY_CHANGED.equals(action)) {
+                int level = intent.getIntExtra("level", 0);
+                int scale = intent.getIntExtra("scale", 100);
+                int percent = level * 100 / scale;
+                LAST_GET_BATTERYLEVEL_PERCENT = percent;
+                setBatteryLevel();
+                try {
+                    getContext().unregisterReceiver(battertReceiver);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    };
+
+    public void registerWifiListener(Context context) {
+        if (context == null) return;
+        mIsWifi = JZUtils.isWifiConnected(context);
+        IntentFilter intentFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION);
+        context.registerReceiver(wifiReceiver, intentFilter);
+    }
+
+    public void unregisterWifiListener(Context context) {
+        if (context == null) return;
+        try {
+            context.unregisterReceiver(wifiReceiver);
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public BroadcastReceiver wifiReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (ConnectivityManager.CONNECTIVITY_ACTION.equals(intent.getAction())) {
+                boolean isWifi = JZUtils.isWifiConnected(context);
+                if (mIsWifi == isWifi) return;
+                mIsWifi = isWifi;
+                if (!mIsWifi && !WIFI_TIP_DIALOG_SHOWED && state == STATE_PLAYING) {
+                    startButton.performClick();
+                    showWifiDialog();
+                }
+            }
+        }
+    };
+
+}
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_add_volume.png b/system/video/src/main/res/drawable-xhdpi/jz_add_volume.png
new file mode 100644
index 0000000..868b308
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_add_volume.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_back_normal.png b/system/video/src/main/res/drawable-xhdpi/jz_back_normal.png
new file mode 100644
index 0000000..8b58353
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_back_normal.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_back_pressed.png b/system/video/src/main/res/drawable-xhdpi/jz_back_pressed.png
new file mode 100644
index 0000000..82d2ba6
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_back_pressed.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_back_tiny_normal.png b/system/video/src/main/res/drawable-xhdpi/jz_back_tiny_normal.png
new file mode 100644
index 0000000..e6ca6f4
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_back_tiny_normal.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_back_tiny_pressed.png b/system/video/src/main/res/drawable-xhdpi/jz_back_tiny_pressed.png
new file mode 100644
index 0000000..2ca8252
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_back_tiny_pressed.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_backward_icon.png b/system/video/src/main/res/drawable-xhdpi/jz_backward_icon.png
new file mode 100644
index 0000000..51f5ca3
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_backward_icon.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_battery_level_10.png b/system/video/src/main/res/drawable-xhdpi/jz_battery_level_10.png
new file mode 100644
index 0000000..1d5b5f6
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_battery_level_10.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_battery_level_100.png b/system/video/src/main/res/drawable-xhdpi/jz_battery_level_100.png
new file mode 100644
index 0000000..6f0cf51
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_battery_level_100.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_battery_level_30.png b/system/video/src/main/res/drawable-xhdpi/jz_battery_level_30.png
new file mode 100644
index 0000000..947e905
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_battery_level_30.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_battery_level_50.png b/system/video/src/main/res/drawable-xhdpi/jz_battery_level_50.png
new file mode 100644
index 0000000..e4c75ff
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_battery_level_50.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_battery_level_70.png b/system/video/src/main/res/drawable-xhdpi/jz_battery_level_70.png
new file mode 100644
index 0000000..25177bf
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_battery_level_70.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_battery_level_90.png b/system/video/src/main/res/drawable-xhdpi/jz_battery_level_90.png
new file mode 100644
index 0000000..6c681c5
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_battery_level_90.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_brightness_video.png b/system/video/src/main/res/drawable-xhdpi/jz_brightness_video.png
new file mode 100644
index 0000000..df25316
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_brightness_video.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_clarity_popwindow_bg.9.png b/system/video/src/main/res/drawable-xhdpi/jz_clarity_popwindow_bg.9.png
new file mode 100644
index 0000000..c5f67fd
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_clarity_popwindow_bg.9.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_close_volume.png b/system/video/src/main/res/drawable-xhdpi/jz_close_volume.png
new file mode 100644
index 0000000..1e08431
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_close_volume.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_enlarge.png b/system/video/src/main/res/drawable-xhdpi/jz_enlarge.png
new file mode 100644
index 0000000..bf69e8b
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_enlarge.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_forward_icon.png b/system/video/src/main/res/drawable-xhdpi/jz_forward_icon.png
new file mode 100644
index 0000000..f7e3188
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_forward_icon.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_loading_bg.png b/system/video/src/main/res/drawable-xhdpi/jz_loading_bg.png
new file mode 100644
index 0000000..b85c037
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_loading_bg.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_pause_normal.png b/system/video/src/main/res/drawable-xhdpi/jz_pause_normal.png
new file mode 100644
index 0000000..12b158e
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_pause_normal.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_pause_pressed.png b/system/video/src/main/res/drawable-xhdpi/jz_pause_pressed.png
new file mode 100644
index 0000000..3a2f8a3
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_pause_pressed.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_play_normal.png b/system/video/src/main/res/drawable-xhdpi/jz_play_normal.png
new file mode 100644
index 0000000..74db6df
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_play_normal.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_play_pressed.png b/system/video/src/main/res/drawable-xhdpi/jz_play_pressed.png
new file mode 100644
index 0000000..3aaa183
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_play_pressed.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_restart_normal.png b/system/video/src/main/res/drawable-xhdpi/jz_restart_normal.png
new file mode 100644
index 0000000..618616e
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_restart_normal.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_restart_pressed.png b/system/video/src/main/res/drawable-xhdpi/jz_restart_pressed.png
new file mode 100644
index 0000000..21d4632
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_restart_pressed.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_share_normal.png b/system/video/src/main/res/drawable-xhdpi/jz_share_normal.png
new file mode 100644
index 0000000..73d62e1
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_share_normal.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_share_pressed.png b/system/video/src/main/res/drawable-xhdpi/jz_share_pressed.png
new file mode 100644
index 0000000..e899314
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_share_pressed.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_shrink.png b/system/video/src/main/res/drawable-xhdpi/jz_shrink.png
new file mode 100644
index 0000000..70bb00c
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_shrink.png differ
diff --git a/system/video/src/main/res/drawable-xhdpi/jz_volume_icon.png b/system/video/src/main/res/drawable-xhdpi/jz_volume_icon.png
new file mode 100644
index 0000000..deb5358
Binary files /dev/null and b/system/video/src/main/res/drawable-xhdpi/jz_volume_icon.png differ
diff --git a/system/video/src/main/res/drawable/jz_bottom_bg.9.png b/system/video/src/main/res/drawable/jz_bottom_bg.9.png
new file mode 100644
index 0000000..48a5b47
Binary files /dev/null and b/system/video/src/main/res/drawable/jz_bottom_bg.9.png differ
diff --git a/system/video/src/main/res/drawable/jz_bottom_progress.xml b/system/video/src/main/res/drawable/jz_bottom_progress.xml
new file mode 100644
index 0000000..5db2949
--- /dev/null
+++ b/system/video/src/main/res/drawable/jz_bottom_progress.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape>
+            <solid android:color="#a5ffffff" />
+            <size android:height="4dp" />
+            <corners android:radius="1dp" />
+        </shape>
+    </item>
+    <item android:id="@android:id/secondaryProgress">
+        <clip>
+            <shape>
+                <solid android:color="#ffe0e0e0" />
+                <size android:height="4dp" />
+                <corners android:radius="1dp" />
+            </shape>
+        </clip>
+    </item>
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <solid android:color="#fff85959" />
+                <size android:height="4dp" />
+                <corners android:radius="1dp" />
+            </shape>
+        </clip>
+    </item>
+</layer-list>
diff --git a/system/video/src/main/res/drawable/jz_bottom_seek_poster.xml b/system/video/src/main/res/drawable/jz_bottom_seek_poster.xml
new file mode 100644
index 0000000..0cd8f9b
--- /dev/null
+++ b/system/video/src/main/res/drawable/jz_bottom_seek_poster.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/jz_seek_poster_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/jz_seek_poster_normal" />
+</selector>
diff --git a/system/video/src/main/res/drawable/jz_bottom_seek_progress.xml b/system/video/src/main/res/drawable/jz_bottom_seek_progress.xml
new file mode 100644
index 0000000..212fccc
--- /dev/null
+++ b/system/video/src/main/res/drawable/jz_bottom_seek_progress.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape>
+            <solid android:color="#a5ffffff" />
+            <size android:height="1dp" />
+            <corners android:radius="1.5dip" />
+        </shape>
+    </item>
+    <item android:id="@android:id/secondaryProgress">
+        <clip>
+            <shape>
+                <solid android:color="#ffffffff" />
+                <size android:height="1dp" />
+                <corners android:radius="1.5dip" />
+            </shape>
+        </clip>
+    </item>
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <solid android:color="#fff85959" />
+                <size android:height="1dp" />
+                <corners android:radius="1.5dip" />
+            </shape>
+        </clip>
+    </item>
+</layer-list>
diff --git a/system/video/src/main/res/drawable/jz_clarity_popwindow_bg.9.png b/system/video/src/main/res/drawable/jz_clarity_popwindow_bg.9.png
new file mode 100644
index 0000000..3bb3053
Binary files /dev/null and b/system/video/src/main/res/drawable/jz_clarity_popwindow_bg.9.png differ
diff --git a/system/video/src/main/res/drawable/jz_click_back_selector.xml b/system/video/src/main/res/drawable/jz_click_back_selector.xml
new file mode 100644
index 0000000..5379ed6
--- /dev/null
+++ b/system/video/src/main/res/drawable/jz_click_back_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/jz_back_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/jz_back_normal" />
+</selector>
diff --git a/system/video/src/main/res/drawable/jz_click_back_tiny_selector.xml b/system/video/src/main/res/drawable/jz_click_back_tiny_selector.xml
new file mode 100644
index 0000000..baca67f
--- /dev/null
+++ b/system/video/src/main/res/drawable/jz_click_back_tiny_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/jz_back_tiny_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/jz_back_tiny_normal" />
+</selector>
diff --git a/system/video/src/main/res/drawable/jz_click_pause_selector.xml b/system/video/src/main/res/drawable/jz_click_pause_selector.xml
new file mode 100644
index 0000000..93559b8
--- /dev/null
+++ b/system/video/src/main/res/drawable/jz_click_pause_selector.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/jz_pause_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/jz_pause_normal" />
+
+</selector>
diff --git a/system/video/src/main/res/drawable/jz_click_play_selector.xml b/system/video/src/main/res/drawable/jz_click_play_selector.xml
new file mode 100644
index 0000000..e99799c
--- /dev/null
+++ b/system/video/src/main/res/drawable/jz_click_play_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/jz_play_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/jz_play_normal" />
+</selector>
diff --git a/system/video/src/main/res/drawable/jz_click_replay_selector.xml b/system/video/src/main/res/drawable/jz_click_replay_selector.xml
new file mode 100644
index 0000000..9b5ca8c
--- /dev/null
+++ b/system/video/src/main/res/drawable/jz_click_replay_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/jz_restart_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/jz_restart_normal" />
+</selector>
diff --git a/system/video/src/main/res/drawable/jz_click_share_selector.xml b/system/video/src/main/res/drawable/jz_click_share_selector.xml
new file mode 100644
index 0000000..0de0b6f
--- /dev/null
+++ b/system/video/src/main/res/drawable/jz_click_share_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/jz_share_pressed" android:state_pressed="true" />
+    <item android:drawable="@drawable/jz_share_normal" />
+</selector>
diff --git a/system/video/src/main/res/drawable/jz_dialog_progress.xml b/system/video/src/main/res/drawable/jz_dialog_progress.xml
new file mode 100644
index 0000000..35179bd
--- /dev/null
+++ b/system/video/src/main/res/drawable/jz_dialog_progress.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape>
+            <solid android:color="#ffffffff" />
+            <corners android:radius="2dp" />
+        </shape>
+    </item>
+    <item android:id="@android:id/progress">
+        <clip>
+            <shape>
+                <solid android:color="#fff85959" />
+                <corners android:radius="2dp" />
+            </shape>
+        </clip>
+    </item>
+</layer-list>
diff --git a/system/video/src/main/res/drawable/jz_dialog_progress_bg.xml b/system/video/src/main/res/drawable/jz_dialog_progress_bg.xml
new file mode 100644
index 0000000..421a56c
--- /dev/null
+++ b/system/video/src/main/res/drawable/jz_dialog_progress_bg.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#cc000000" />
+    <corners
+        android:bottomLeftRadius="6dp"
+        android:bottomRightRadius="6dp"
+        android:topLeftRadius="6dp"
+        android:topRightRadius="6dp" />
+</shape>
\ No newline at end of file
diff --git a/system/video/src/main/res/drawable/jz_loading.xml b/system/video/src/main/res/drawable/jz_loading.xml
new file mode 100644
index 0000000..9eaf8e0
--- /dev/null
+++ b/system/video/src/main/res/drawable/jz_loading.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rotate xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/jz_loading_bg"
+    android:fromDegrees="0.0"
+    android:pivotX="50.0%"
+    android:pivotY="50.0%"
+    android:toDegrees="360.0" />
diff --git a/system/video/src/main/res/drawable/jz_retry.xml b/system/video/src/main/res/drawable/jz_retry.xml
new file mode 100644
index 0000000..76c211a
--- /dev/null
+++ b/system/video/src/main/res/drawable/jz_retry.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="7dp" />
+    <stroke
+        android:width="1dp"
+        android:color="@android:color/white" />
+</shape>
\ No newline at end of file
diff --git a/system/video/src/main/res/drawable/jz_seek_poster_normal.xml b/system/video/src/main/res/drawable/jz_seek_poster_normal.xml
new file mode 100644
index 0000000..e928712
--- /dev/null
+++ b/system/video/src/main/res/drawable/jz_seek_poster_normal.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#ffffffff" />
+    <size
+        android:width="15dp"
+        android:height="15dp" />
+</shape>
diff --git a/system/video/src/main/res/drawable/jz_seek_poster_pressed.xml b/system/video/src/main/res/drawable/jz_seek_poster_pressed.xml
new file mode 100644
index 0000000..14e409a
--- /dev/null
+++ b/system/video/src/main/res/drawable/jz_seek_poster_pressed.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="#fff0f0f0" />
+    <size
+        android:width="15dp"
+        android:height="15dp" />
+</shape>
diff --git a/system/video/src/main/res/drawable/jz_title_bg.9.png b/system/video/src/main/res/drawable/jz_title_bg.9.png
new file mode 100644
index 0000000..5d9df27
Binary files /dev/null and b/system/video/src/main/res/drawable/jz_title_bg.9.png differ
diff --git a/system/video/src/main/res/drawable/jz_volume_progress_bg.xml b/system/video/src/main/res/drawable/jz_volume_progress_bg.xml
new file mode 100644
index 0000000..a388074
--- /dev/null
+++ b/system/video/src/main/res/drawable/jz_volume_progress_bg.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape>
+            <solid android:color="#ffffffff" />
+            <corners android:radius="2dp" />
+        </shape>
+    </item>
+    <item android:id="@android:id/progress">
+        <clip
+            android:clipOrientation="vertical"
+            android:gravity="bottom">
+            <shape>
+                <solid android:color="#fff85959" />
+                <corners android:radius="2dp" />
+            </shape>
+        </clip>
+    </item>
+</layer-list>
diff --git a/system/video/src/main/res/layout/jz_dialog_brightness.xml b/system/video/src/main/res/layout/jz_dialog_brightness.xml
new file mode 100644
index 0000000..90c55e3
--- /dev/null
+++ b/system/video/src/main/res/layout/jz_dialog_brightness.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/jz_dialog_progress_bg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="155dp"
+        android:layout_height="120dp"
+        android:orientation="vertical">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="20dp"
+            android:src="@drawable/jz_brightness_video" />
+
+        <TextView
+            android:id="@+id/tv_brightness"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="12dp"
+            android:gravity="center_horizontal"
+            android:textColor="#ffffffff"
+            android:textSize="16sp" />
+
+        <ProgressBar
+            android:id="@+id/brightness_progressbar"
+            style="@android:style/Widget.ProgressBar.Horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="3dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginLeft="24dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginRight="24dp"
+            android:layout_marginBottom="20dp"
+            android:max="100"
+            android:progressDrawable="@drawable/jz_dialog_progress" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/system/video/src/main/res/layout/jz_dialog_progress.xml b/system/video/src/main/res/layout/jz_dialog_progress.xml
new file mode 100644
index 0000000..b16b2e7
--- /dev/null
+++ b/system/video/src/main/res/layout/jz_dialog_progress.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/jz_dialog_progress_bg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="152dp"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/duration_image_tip"
+            android:layout_width="36dp"
+            android:layout_height="27dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="16dp" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="20dp"
+            android:gravity="center_horizontal"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/tv_current"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="#fff85959"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_duration"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="#ffffffff"
+                android:textSize="14sp" />
+        </LinearLayout>
+
+        <ProgressBar
+            android:id="@+id/duration_progressbar"
+            style="@android:style/Widget.ProgressBar.Horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="4dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginLeft="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginBottom="16dp"
+            android:max="100"
+            android:progressDrawable="@drawable/jz_dialog_progress" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/system/video/src/main/res/layout/jz_dialog_volume.xml b/system/video/src/main/res/layout/jz_dialog_volume.xml
new file mode 100644
index 0000000..5b4d2a1
--- /dev/null
+++ b/system/video/src/main/res/layout/jz_dialog_volume.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/jz_dialog_progress_bg"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="155dp"
+        android:layout_height="120dp"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/volume_image_tip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="20dp" />
+
+        <TextView
+            android:id="@+id/tv_volume"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="12dp"
+            android:gravity="center_horizontal"
+            android:textColor="#ffffffff"
+            android:textSize="16sp" />
+
+        <ProgressBar
+            android:id="@+id/volume_progressbar"
+            style="@android:style/Widget.ProgressBar.Horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="3dp"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginLeft="24dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginRight="24dp"
+            android:layout_marginBottom="20dp"
+            android:max="100"
+            android:progressDrawable="@drawable/jz_dialog_progress" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/system/video/src/main/res/layout/jz_layout_clarity.xml b/system/video/src/main/res/layout/jz_layout_clarity.xml
new file mode 100644
index 0000000..7bded75
--- /dev/null
+++ b/system/video/src/main/res/layout/jz_layout_clarity.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/video_quality_wrapper_area"
+    android:layout_width="80dp"
+    android:layout_height="wrap_content"
+    android:background="@drawable/jz_clarity_popwindow_bg"
+    android:orientation="vertical"
+    android:paddingTop="10dp"
+    android:paddingBottom="16dp" />
diff --git a/system/video/src/main/res/layout/jz_layout_clarity_item.xml b/system/video/src/main/res/layout/jz_layout_clarity_item.xml
new file mode 100644
index 0000000..440e148
--- /dev/null
+++ b/system/video/src/main/res/layout/jz_layout_clarity_item.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/video_item"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:paddingLeft="10dp"
+    android:paddingTop="8dp"
+    android:paddingRight="10dp"
+    android:paddingBottom="8dp"
+    android:textColor="#FFF"
+    android:textSize="14sp" />
\ No newline at end of file
diff --git a/system/video/src/main/res/layout/jz_layout_std.xml b/system/video/src/main/res/layout/jz_layout_std.xml
new file mode 100644
index 0000000..384a726
--- /dev/null
+++ b/system/video/src/main/res/layout/jz_layout_std.xml
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/black"
+    android:descendantFocusability="afterDescendants">
+
+    <FrameLayout
+        android:id="@+id/surface_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    </FrameLayout>
+
+    <ImageView
+        android:id="@+id/poster"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentBottom="true"
+        android:background="#000000"
+        android:adjustViewBounds="true"
+        android:scaleType="fitXY" />
+
+    <LinearLayout
+        android:id="@+id/layout_bottom"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_alignParentBottom="true"
+        android:background="@drawable/jz_bottom_bg"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:visibility="invisible">
+
+        <TextView
+            android:id="@+id/current"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="14dp"
+            android:text="00:00"
+            android:textColor="#ffffff" />
+
+        <SeekBar
+            android:id="@+id/bottom_seek_progress"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1.0"
+            android:background="@null"
+            android:max="100"
+            android:maxHeight="1dp"
+            android:minHeight="1dp"
+            android:paddingLeft="12dp"
+            android:paddingTop="8dp"
+            android:paddingRight="12dp"
+            android:paddingBottom="8dp"
+            android:progressDrawable="@drawable/jz_bottom_seek_progress"
+            android:thumb="@drawable/jz_bottom_seek_poster" />
+
+        <TextView
+            android:id="@+id/total"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="00:00"
+            android:textColor="#ffffff" />
+
+        <TextView
+            android:id="@+id/clarity"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:clickable="true"
+            android:paddingLeft="20dp"
+            android:text="clarity"
+            android:textAlignment="center"
+            android:textColor="#ffffff" />
+
+        <ImageView
+            android:id="@+id/fullscreen"
+            android:layout_width="52.5dp"
+            android:layout_height="fill_parent"
+            android:paddingLeft="14dp"
+            android:paddingRight="14dp"
+            android:scaleType="centerInside"
+            android:src="@drawable/jz_enlarge" />
+    </LinearLayout>
+
+    <ProgressBar
+        android:id="@+id/bottom_progress"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="1.5dp"
+        android:layout_alignParentBottom="true"
+        android:max="100"
+        android:progressDrawable="@drawable/jz_bottom_progress" />
+
+    <ImageView
+        android:id="@+id/back_tiny"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginLeft="6dp"
+        android:layout_marginTop="6dp"
+        android:background="@drawable/jz_click_back_tiny_selector"
+        android:visibility="gone" />
+
+    <RelativeLayout
+        android:id="@+id/layout_top"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:background="@drawable/jz_title_bg"
+        android:paddingStart="10dp"
+        android:paddingLeft="10dp"
+        android:visibility="gone">
+
+        <ImageView
+            android:id="@+id/back"
+            android:layout_width="26dp"
+            android:layout_height="26dp"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentTop="true"
+            android:layout_marginTop="12dp"
+            android:padding="3dp"
+            android:scaleType="centerInside"
+            android:src="@drawable/jz_click_back_selector" />
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginEnd="12dp"
+            android:layout_marginRight="12dp"
+            android:layout_toLeftOf="@+id/battery_time_layout"
+            android:layout_toEndOf="@+id/back"
+            android:layout_toRightOf="@+id/back"
+            android:ellipsize="end"
+            android:maxLines="2"
+            android:textColor="#ffffff"
+            android:textSize="18sp" />
+
+        <LinearLayout
+            android:id="@+id/battery_time_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_marginEnd="14dp"
+            android:layout_marginRight="14dp"
+            android:gravity="center_vertical"
+            android:orientation="vertical"
+            android:visibility="invisible">
+
+            <ImageView
+                android:id="@+id/battery_level"
+                android:layout_width="23dp"
+                android:layout_height="10dp"
+                android:layout_gravity="center_horizontal"
+                android:background="@drawable/jz_battery_level_10" />
+
+            <TextView
+                android:id="@+id/video_current_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center_vertical"
+                android:maxLines="1"
+                android:textColor="#ffffffff"
+                android:textSize="12.0sp" />
+        </LinearLayout>
+    </RelativeLayout>
+
+    <ProgressBar
+        android:id="@+id/loading"
+        android:layout_width="@dimen/jz_start_button_w_h_normal"
+        android:layout_height="@dimen/jz_start_button_w_h_normal"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:indeterminateDrawable="@drawable/jz_loading"
+        android:visibility="invisible" />
+
+    <LinearLayout
+        android:id="@+id/start_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:layout_gravity="center_vertical">
+
+        <ImageView
+            android:id="@+id/start"
+            android:layout_width="@dimen/jz_start_button_w_h_normal"
+            android:layout_height="@dimen/jz_start_button_w_h_normal"
+            android:src="@drawable/jz_click_play_selector" />
+    </LinearLayout>
+
+
+    <TextView
+        android:id="@+id/replay_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/start_layout"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="6dp"
+        android:text="@string/replay"
+        android:textColor="#ffffff"
+        android:textSize="12sp"
+        android:visibility="invisible" />
+
+    <LinearLayout
+        android:id="@+id/retry_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        android:visibility="invisible">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/video_loading_failed"
+            android:textColor="@android:color/white"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/retry_btn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
+            android:background="@drawable/jz_retry"
+            android:paddingLeft="9dp"
+            android:paddingTop="4dp"
+            android:paddingRight="9dp"
+            android:paddingBottom="4dp"
+            android:text="@string/click_to_restart"
+            android:textColor="@android:color/white"
+            android:textSize="14sp" />
+    </LinearLayout>
+</RelativeLayout>
diff --git a/system/video/src/main/res/values-es/strings.xml b/system/video/src/main/res/values-es/strings.xml
new file mode 100644
index 0000000..66ea803
--- /dev/null
+++ b/system/video/src/main/res/values-es/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="tips_not_wifi">Estás conectado a una red móvil, el reproductor utilizará tus datos si continuas</string>
+    <string name="tips_not_wifi_confirm">Reproducir</string>
+    <string name="tips_not_wifi_cancel">Cancelar</string>
+    <string name="no_url">No hay vídeo</string>
+    <string name="replay">Volver a ver</string>
+    <string name="click_to_restart">Haga clic para volver a intentarlo</string>
+    <string name="video_loading_failed">Error de carga de video</string>
+</resources>
diff --git a/system/video/src/main/res/values-ja-rJP/strings.xml b/system/video/src/main/res/values-ja-rJP/strings.xml
new file mode 100644
index 0000000..0a5dfcf
--- /dev/null
+++ b/system/video/src/main/res/values-ja-rJP/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="tips_not_wifi">あなたは現在、モバイルネットワークを使用しています</string>
+    <string name="tips_not_wifi_confirm">ビデオを再開する</string>
+    <string name="tips_not_wifi_cancel">ビデオを止める</string>
+    <string name="no_url">URLエラー</string>
+    <string name="replay">リプレイ</string>
+    <string name="click_to_restart">再度試してください</string>
+    <string name="video_loading_failed">エラーが発生しました</string>
+</resources>
\ No newline at end of file
diff --git a/system/video/src/main/res/values-ko-rKR/strings.xml b/system/video/src/main/res/values-ko-rKR/strings.xml
new file mode 100644
index 0000000..98b752c
--- /dev/null
+++ b/system/video/src/main/res/values-ko-rKR/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="tips_not_wifi">현재 모바일 네트워크를 사용 중이면 계속 플레이어가 트래픽을 소비합니다</string>
+    <string name="tips_not_wifi_confirm">재생 다시 시작</string>
+    <string name="tips_not_wifi_cancel">재생을 중지</string>
+    <string name="no_url">재생 주소 없음</string>
+    <string name="replay">재생 다시 시작</string>
+    <string name="click_to_restart">다시 시도 하십시오</string>
+    <string name="video_loading_failed">버퍼링 실패</string>
+</resources>
\ No newline at end of file
diff --git a/system/video/src/main/res/values-pt/strings.xml b/system/video/src/main/res/values-pt/strings.xml
new file mode 100644
index 0000000..87ebf5a
--- /dev/null
+++ b/system/video/src/main/res/values-pt/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="tips_not_wifi">Você está usando a rede móvel, você deseja mesmo ver o vídeo?</string>
+    <string name="tips_not_wifi_confirm">Continuar</string>
+    <string name="tips_not_wifi_cancel">Parar</string>
+    <string name="no_url">Sem vídeo</string>
+    <string name="replay">Replay</string>
+    <string name="click_to_restart">Clique para tentar novamente</string>
+    <string name="video_loading_failed">O carregamento de vídeo falhou</string>
+</resources>
diff --git a/system/video/src/main/res/values-tr/strings.xml b/system/video/src/main/res/values-tr/strings.xml
new file mode 100644
index 0000000..037f81a
--- /dev/null
+++ b/system/video/src/main/res/values-tr/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="tips_not_wifi">Şu anda mobil veriyi kullanıyorsunuz, yüksek veri kaybına yol açabilir</string>
+    <string name="tips_not_wifi_confirm">Devam Et</string>
+    <string name="tips_not_wifi_cancel">Durdur</string>
+    <string name="no_url">URL Bulunamadı</string>
+    <string name="replay">Tekrar</string>
+    <string name="click_to_restart">Tekrar denemek için tıklayın</string>
+    <string name="video_loading_failed">Video yüklenemedi</string>
+</resources>
diff --git a/system/video/src/main/res/values-zh/strings.xml b/system/video/src/main/res/values-zh/strings.xml
new file mode 100644
index 0000000..944669c
--- /dev/null
+++ b/system/video/src/main/res/values-zh/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="tips_not_wifi">您当前正在使用移动网络，继续播放将消耗流量</string>
+    <string name="tips_not_wifi_confirm">继续播放</string>
+    <string name="tips_not_wifi_cancel">停止播放</string>
+    <string name="no_url">播放地址无效</string>
+    <string name="replay">重播</string>
+    <string name="click_to_restart">点击重试</string>
+    <string name="video_loading_failed">视频加载失败</string>
+</resources>
diff --git a/system/video/src/main/res/values/dimens.xml b/system/video/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..b6744b0
--- /dev/null
+++ b/system/video/src/main/res/values/dimens.xml
@@ -0,0 +1,4 @@
+<resources>
+    <dimen name="jz_start_button_w_h_normal">45dp</dimen>
+    <dimen name="jz_start_button_w_h_fullscreen">62dp</dimen>
+</resources>
diff --git a/system/video/src/main/res/values/strings.xml b/system/video/src/main/res/values/strings.xml
new file mode 100644
index 0000000..2c11f97
--- /dev/null
+++ b/system/video/src/main/res/values/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="tips_not_wifi">You are currently using the mobile network, the player will continue to consume traffic</string>
+    <string name="tips_not_wifi_confirm">Resume</string>
+    <string name="tips_not_wifi_cancel">Stop play</string>
+    <string name="no_url">No url</string>
+    <string name="replay">Replay</string>
+    <string name="click_to_restart">Click to try again</string>
+    <string name="video_loading_failed">Video loading failed</string>
+</resources>
diff --git a/system/video/src/main/res/values/styles.xml b/system/video/src/main/res/values/styles.xml
new file mode 100644
index 0000000..bb42c91
--- /dev/null
+++ b/system/video/src/main/res/values/styles.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="jz_style_dialog_progress" parent="@android:style/Theme.Dialog">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowAnimationStyle">@style/jz_popup_toast_anim</item>
+        <item name="android:backgroundDimEnabled">false</item>
+    </style>
+
+    <style name="jz_popup_toast_anim" parent="@android:style/Animation">
+        <item name="android:windowEnterAnimation">@android:anim/fade_in</item>
+        <item name="android:windowExitAnimation">@android:anim/fade_out</item>
+    </style>
+
+
+</resources>
diff --git a/system/video/src/main/res/xml/jz_network_security_config.xml b/system/video/src/main/res/xml/jz_network_security_config.xml
new file mode 100644
index 0000000..2439f15
--- /dev/null
+++ b/system/video/src/main/res/xml/jz_network_security_config.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config>
+    <base-config cleartextTrafficPermitted="true" />
+</network-security-config>