From a12b9d305ea8c6b2040d184b7aca1ef691ea86b9 Mon Sep 17 00:00:00 2001
From: xuqm <xuqinmin@bjca.org.cn>
Date: Mon, 29 May 2023 14:18:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                              |  1 -
 .idea/misc.xml                                |  3 +-
 SzyxBaseSdk/.gitignore                        |  1 -
 SzyxBaseSdk/build.gradle                      | 36 ---------
 SzyxBaseSdk/consumer-rules.pro                |  0
 SzyxBaseSdk/proguard-rules.pro                | 21 -----
 .../lib/base/ExampleInstrumentedTest.java     | 26 -------
 SzyxBaseSdk/src/main/AndroidManifest.xml      |  4 -
 .../android/lib/base/ExampleUnitTest.java     | 17 ----
 SzyxImSdk/build.gradle                        |  2 -
 .../trust/android/lib/im/bean/UserInfo.java   |  7 ++
 .../android/lib/im/enums/PacketType.java      | 11 ++-
 .../android/lib/im/im/bean/PacketMessage.java | 47 +++++++++++
 .../android/lib/im/im/kit/IMInterface.java    |  1 +
 .../android/lib/im/im/manager/ImManager.java  | 33 ++++++--
 .../android/lib/im/im/msg/ConnectMessage.java | 12 +++
 .../android/lib/im/manager/SZYXImManager.java |  5 +-
 .../android/lib/im/repository/Service.java    |  4 +-
 app/build.gradle                              |  4 +
 app/src/main/AndroidManifest.xml              |  6 +-
 .../trust/android/imdemo/MainActivity.java    | 14 ----
 .../trust/android/imdemo/MyApplication.java   |  6 +-
 .../android/imdemo/data/item/MainItem.java    | 42 ++++++++++
 .../android/imdemo/data/item/UserItem.java    | 53 +++++++++++++
 .../android/imdemo/ui/FriendsActivity.java    | 35 +++++++++
 .../trust/android/imdemo/ui/MainActivity.java | 77 +++++++++++++++++++
 .../imdemo/ui/login/LoginActivity.java        |  2 +-
 .../trust/android/imdemo/vm/FriendsVM.java    | 17 ++++
 .../bjca/trust/android/imdemo/vm/MainVM.java  | 26 +++++++
 app/src/main/res/layout/activity_main.xml     | 44 +++++++----
 app/src/main/res/layout/item_friends.xml      | 32 ++++++++
 app/src/main/res/layout/item_main.xml         | 30 ++++++++
 gradle.properties                             |  3 +-
 settings.gradle                               |  1 -
 34 files changed, 466 insertions(+), 157 deletions(-)
 delete mode 100644 SzyxBaseSdk/.gitignore
 delete mode 100644 SzyxBaseSdk/build.gradle
 delete mode 100644 SzyxBaseSdk/consumer-rules.pro
 delete mode 100644 SzyxBaseSdk/proguard-rules.pro
 delete mode 100644 SzyxBaseSdk/src/androidTest/java/cn/org/bjca/trust/android/lib/base/ExampleInstrumentedTest.java
 delete mode 100644 SzyxBaseSdk/src/main/AndroidManifest.xml
 delete mode 100644 SzyxBaseSdk/src/test/java/cn/org/bjca/trust/android/lib/base/ExampleUnitTest.java
 create mode 100644 SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/bean/PacketMessage.java
 create mode 100644 SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/msg/ConnectMessage.java
 delete mode 100644 app/src/main/java/cn/org/bjca/trust/android/imdemo/MainActivity.java
 create mode 100644 app/src/main/java/cn/org/bjca/trust/android/imdemo/data/item/MainItem.java
 create mode 100644 app/src/main/java/cn/org/bjca/trust/android/imdemo/data/item/UserItem.java
 create mode 100644 app/src/main/java/cn/org/bjca/trust/android/imdemo/ui/FriendsActivity.java
 create mode 100644 app/src/main/java/cn/org/bjca/trust/android/imdemo/ui/MainActivity.java
 create mode 100644 app/src/main/java/cn/org/bjca/trust/android/imdemo/vm/FriendsVM.java
 create mode 100644 app/src/main/java/cn/org/bjca/trust/android/imdemo/vm/MainVM.java
 create mode 100644 app/src/main/res/layout/item_friends.xml
 create mode 100644 app/src/main/res/layout/item_main.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 22ea877..049a366 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -10,7 +10,6 @@
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/SzyxBaseSdk" />
             <option value="$PROJECT_DIR$/SzyxImSdk" />
             <option value="$PROJECT_DIR$/app" />
           </set>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0ad17cb..773fe0f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/SzyxBaseSdk/.gitignore b/SzyxBaseSdk/.gitignore
deleted file mode 100644
index 42afabf..0000000
--- a/SzyxBaseSdk/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/SzyxBaseSdk/build.gradle b/SzyxBaseSdk/build.gradle
deleted file mode 100644
index 07da29e..0000000
--- a/SzyxBaseSdk/build.gradle
+++ /dev/null
@@ -1,36 +0,0 @@
-plugins {
-    id 'com.android.library'
-}
-
-android {
-    namespace 'cn.org.bjca.trust.android.lib.base'
-    compileSdk 33
-
-    defaultConfig {
-        minSdk 26
-        targetSdk 33
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
-    }
-
-    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 {
-
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.5.0'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-}
\ No newline at end of file
diff --git a/SzyxBaseSdk/consumer-rules.pro b/SzyxBaseSdk/consumer-rules.pro
deleted file mode 100644
index e69de29..0000000
diff --git a/SzyxBaseSdk/proguard-rules.pro b/SzyxBaseSdk/proguard-rules.pro
deleted file mode 100644
index 481bb43..0000000
--- a/SzyxBaseSdk/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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/SzyxBaseSdk/src/androidTest/java/cn/org/bjca/trust/android/lib/base/ExampleInstrumentedTest.java b/SzyxBaseSdk/src/androidTest/java/cn/org/bjca/trust/android/lib/base/ExampleInstrumentedTest.java
deleted file mode 100644
index 27b391f..0000000
--- a/SzyxBaseSdk/src/androidTest/java/cn/org/bjca/trust/android/lib/base/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package cn.org.bjca.trust.android.lib.base;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("cn.org.bjca.trust.android.lib.base.test", appContext.getPackageName());
-    }
-}
\ No newline at end of file
diff --git a/SzyxBaseSdk/src/main/AndroidManifest.xml b/SzyxBaseSdk/src/main/AndroidManifest.xml
deleted file mode 100644
index a5918e6..0000000
--- a/SzyxBaseSdk/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-</manifest>
\ No newline at end of file
diff --git a/SzyxBaseSdk/src/test/java/cn/org/bjca/trust/android/lib/base/ExampleUnitTest.java b/SzyxBaseSdk/src/test/java/cn/org/bjca/trust/android/lib/base/ExampleUnitTest.java
deleted file mode 100644
index 7b9d962..0000000
--- a/SzyxBaseSdk/src/test/java/cn/org/bjca/trust/android/lib/base/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package cn.org.bjca.trust.android.lib.base;
-
-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() {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/SzyxImSdk/build.gradle b/SzyxImSdk/build.gradle
index e63830b..9786a87 100644
--- a/SzyxImSdk/build.gradle
+++ b/SzyxImSdk/build.gradle
@@ -34,8 +34,6 @@ android {
 
 dependencies {
 
-    api project(path: ':SzyxBaseSdk')
-
     implementation 'androidx.appcompat:appcompat:1.4.1'
     implementation 'com.google.android.material:material:1.5.0'
     testImplementation 'junit:junit:4.13.2'
diff --git a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/bean/UserInfo.java b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/bean/UserInfo.java
index 4a4ab18..c0eae12 100644
--- a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/bean/UserInfo.java
+++ b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/bean/UserInfo.java
@@ -10,6 +10,13 @@ public class UserInfo {
         this.userId = userId;
     }
 
+    public UserInfo(String userId, String nickName, String faceUrl, String gender) {
+        this.userId = userId;
+        this.nickName = nickName;
+        this.faceUrl = faceUrl;
+        this.gender = gender;
+    }
+
     public String getUserId() {
         return userId;
     }
diff --git a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/enums/PacketType.java b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/enums/PacketType.java
index 4423509..f0af72f 100644
--- a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/enums/PacketType.java
+++ b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/enums/PacketType.java
@@ -3,15 +3,18 @@ package cn.org.bjca.trust.android.lib.im.enums;
 public enum PacketType {
     //连接请求
     CONNECT(10),
-    CONNACK(11),
+    CONNECTED(11),
     //发送消息
     SEND(20),
-    SENDACK(21),
+    ARRIVE(21),
     //心跳包
     PING(30),
     PANG(31),
-    // 离线通知
-    DISCONNECT(40),
+    //数据请求
+    REQUEST(40),
+    RESULT(41),
+    //系统通知
+    SYSTEM(50),
     UNKNOWN(-1);
 
     private int type = -1;
diff --git a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/bean/PacketMessage.java b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/bean/PacketMessage.java
new file mode 100644
index 0000000..c953a26
--- /dev/null
+++ b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/bean/PacketMessage.java
@@ -0,0 +1,47 @@
+package cn.org.bjca.trust.android.lib.im.im.bean;
+
+import cn.org.bjca.trust.android.lib.im.cfg.Constant;
+import cn.org.bjca.trust.android.lib.im.enums.PacketType;
+
+public abstract class PacketMessage {
+    private PacketType packetType;
+    private long timestamp = System.currentTimeMillis();
+    private String appId = Constant.getSdkAppID();
+    private String userName = Constant.getUserId();
+
+    public PacketMessage(PacketType packetType) {
+        this.packetType = packetType;
+    }
+
+    public PacketType getPacketType() {
+        return packetType;
+    }
+
+    public void setPacketType(PacketType packetType) {
+        this.packetType = packetType;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+}
diff --git a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/kit/IMInterface.java b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/kit/IMInterface.java
index 8c8e8e5..d6b107f 100644
--- a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/kit/IMInterface.java
+++ b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/kit/IMInterface.java
@@ -13,4 +13,5 @@ public interface IMInterface {
     void logout();
     boolean isConnect();
     boolean isConnecting();
+
 }
diff --git a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/manager/ImManager.java b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/manager/ImManager.java
index b8d9b0b..6d688cb 100644
--- a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/manager/ImManager.java
+++ b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/manager/ImManager.java
@@ -11,10 +11,14 @@ import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
 
 import cn.org.bjca.trust.android.lib.im.cfg.Constant;
+import cn.org.bjca.trust.android.lib.im.common.json.GsonImplHelp;
+import cn.org.bjca.trust.android.lib.im.im.bean.PacketMessage;
 import cn.org.bjca.trust.android.lib.im.im.kit.IMInterface;
 import cn.org.bjca.trust.android.lib.im.im.opt.ImConnectOptions;
+import cn.org.bjca.trust.android.lib.im.kit.IMSDKCallback;
 import cn.org.bjca.trust.android.lib.im.kit.IMSDKListener;
 import cn.org.bjca.trust.android.lib.im.kit.MsgListener;
+import kotlin.text.Charsets;
 
 public class ImManager implements IMInterface {
     private final String TAG = "ImManager";
@@ -69,10 +73,11 @@ public class ImManager implements IMInterface {
                     status = 0;
                     if (reconnect) return;
                     try {
-                        mqttClient.subscribe(Constant.getSdkAppID() + "/message" + Constant.getUserId(), 2);
-                        mqttClient.subscribe(Constant.getSdkAppID() + "/pang" + Constant.getUserId(), 2);
-                        mqttClient.subscribe(Constant.getSdkAppID() + "/login" + Constant.getUserId(), 2);
-                        mqttClient.subscribe(Constant.getSdkAppID() + "/data" + Constant.getUserId(), 2);
+                        mqttClient.subscribe(Constant.getSdkAppID() + "/message:" + Constant.getUserId(), 2);
+                        mqttClient.subscribe(Constant.getSdkAppID() + "/pang:" + Constant.getUserId(), 2);
+                        mqttClient.subscribe(Constant.getSdkAppID() + "/connect:" + Constant.getUserId(), 2);
+                        mqttClient.subscribe(Constant.getSdkAppID() + "/result:" + Constant.getUserId(), 2);
+                        mqttClient.subscribe(Constant.getSdkAppID() + "/notice:" + Constant.getUserId(), 2);
                     } catch (MqttException e) {
                         Log.e(TAG, "=====>connectComplete", e);
                     }
@@ -87,7 +92,7 @@ public class ImManager implements IMInterface {
 
                 @Override
                 public void messageArrived(String topic, MqttMessage message) throws Exception {
-                    Log.e("======>messageArrived", topic + "::" + message.getPayload().toString());
+                    Log.e("======>messageArrived", topic + "::" + new String(message.getPayload(), Charsets.UTF_8));
                 }
 
                 @Override
@@ -134,4 +139,22 @@ public class ImManager implements IMInterface {
     public boolean isConnecting() {
         return this.status == 1;
     }
+
+    private void sendPacketMessage(PacketMessage message, IMSDKCallback callback) {
+        if (null == connectOptions) {
+            if (null != callback) callback.failed(204, "未登录");
+            return;
+        }
+        if (!isConnect() || isConnecting()) {
+            if (null != callback) callback.failed(205, "im未连接");
+            return;
+        }
+        String msg = GsonImplHelp.get().toJson(message);
+        try {
+            mqttClient.publish("server", msg.getBytes(Charsets.UTF_8), 2, false);
+        } catch (MqttException e) {
+
+        }
+
+    }
 }
diff --git a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/msg/ConnectMessage.java b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/msg/ConnectMessage.java
new file mode 100644
index 0000000..1085306
--- /dev/null
+++ b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/im/msg/ConnectMessage.java
@@ -0,0 +1,12 @@
+package cn.org.bjca.trust.android.lib.im.im.msg;
+
+import cn.org.bjca.trust.android.lib.im.db.device.DeviceEntity;
+import cn.org.bjca.trust.android.lib.im.enums.PacketType;
+import cn.org.bjca.trust.android.lib.im.im.bean.PacketMessage;
+
+public class ConnectMessage extends PacketMessage {
+    public ConnectMessage() {
+        super(PacketType.CONNECT);
+    }
+    private DeviceEntity device;
+}
diff --git a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/manager/SZYXImManager.java b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/manager/SZYXImManager.java
index 8e7a481..b7c5d20 100644
--- a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/manager/SZYXImManager.java
+++ b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/manager/SZYXImManager.java
@@ -45,9 +45,12 @@ public class SZYXImManager implements SdkInterface {
 
     @Override
     public void login(String userID, String userSig, IMSDKCallback callback) {
+        if (null == Constant.getSdkAppID()) {
+            if (null != callback) callback.failed(203, "未初始化");
+        }
         Constant.setUserId(userID);
         Disposable d = HttpManage.getApi(Service.class)
-                .login(new LoginData(userID, userSig))
+                .register(new LoginData(userID, userSig))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(httpResult -> {
diff --git a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/repository/Service.java b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/repository/Service.java
index b769965..0cd76b8 100644
--- a/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/repository/Service.java
+++ b/SzyxImSdk/src/main/java/cn/org/bjca/trust/android/lib/im/repository/Service.java
@@ -15,6 +15,6 @@ public interface Service {
     @GET("hello/{id}")
     Observable<HttpResult<String>> test(@Path("id") String id);
 
-    @POST("user/v1/login")
-    Observable<HttpResult<LoginBean>> login(@Body LoginData loginData);
+    @POST("user/v1/register")
+    Observable<HttpResult<LoginBean>> register(@Body LoginData loginData);
 }
diff --git a/app/build.gradle b/app/build.gradle
index 25cef0b..aed22d5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,6 +5,7 @@ plugins {
 android {
     namespace 'cn.org.bjca.trust.android.imdemo'
     compileSdk 33
+    buildFeatures.dataBinding = true
 
     defaultConfig {
         applicationId "cn.org.bjca.trust.android.imdemo"
@@ -43,4 +44,7 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+
+    //基础库
+    implementation 'cn.org.bjca.trust.android:base:0.0.1.101'
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b5ea9ac..bce395f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,6 +12,7 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/Theme.ImAndroid"
+        android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
             android:name=".ui.login.LoginActivity"
@@ -24,7 +25,10 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".MainActivity"
+            android:name=".ui.MainActivity"
+            android:exported="true" />
+        <activity
+            android:name=".ui.FriendsActivity"
             android:exported="true" />
     </application>
 
diff --git a/app/src/main/java/cn/org/bjca/trust/android/imdemo/MainActivity.java b/app/src/main/java/cn/org/bjca/trust/android/imdemo/MainActivity.java
deleted file mode 100644
index 64017da..0000000
--- a/app/src/main/java/cn/org/bjca/trust/android/imdemo/MainActivity.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package cn.org.bjca.trust.android.imdemo;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.os.Bundle;
-
-public class MainActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/cn/org/bjca/trust/android/imdemo/MyApplication.java b/app/src/main/java/cn/org/bjca/trust/android/imdemo/MyApplication.java
index 24587af..f365d7a 100644
--- a/app/src/main/java/cn/org/bjca/trust/android/imdemo/MyApplication.java
+++ b/app/src/main/java/cn/org/bjca/trust/android/imdemo/MyApplication.java
@@ -3,12 +3,14 @@ package cn.org.bjca.trust.android.imdemo;
 import android.app.Application;
 import android.widget.Toast;
 
+import com.xuqm.base.App;
+
 import cn.org.bjca.trust.android.lib.im.SZYXImSdk;
 import cn.org.bjca.trust.android.lib.im.bean.IMUserFullInfo;
 import cn.org.bjca.trust.android.lib.im.kit.IMSDKCallback;
 import cn.org.bjca.trust.android.lib.im.kit.IMSDKListener;
 
-public class MyApplication extends Application {
+public class MyApplication extends App {
     @Override
     public void onCreate() {
         super.onCreate();
@@ -43,7 +45,7 @@ public class MyApplication extends Application {
 
             }
         });
-        SZYXImSdk.getInstance().init(this, "202305181830247", new IMSDKCallback() {
+        SZYXImSdk.getInstance().init(this, "202305191821982941292", new IMSDKCallback() {
             @Override
             public void success() {
                 Toast.makeText(MyApplication.this, "IM初始化完成", Toast.LENGTH_SHORT).show();
diff --git a/app/src/main/java/cn/org/bjca/trust/android/imdemo/data/item/MainItem.java b/app/src/main/java/cn/org/bjca/trust/android/imdemo/data/item/MainItem.java
new file mode 100644
index 0000000..48ba641
--- /dev/null
+++ b/app/src/main/java/cn/org/bjca/trust/android/imdemo/data/item/MainItem.java
@@ -0,0 +1,42 @@
+package cn.org.bjca.trust.android.imdemo.data.item;
+
+import com.xuqm.base.adapter.BaseItem;
+
+public class MainItem extends BaseItem {
+    private int id;
+    private String name;
+    private String des;
+
+    public MainItem() {
+    }
+
+    public MainItem(int id, String name, String des) {
+        this.id = id;
+        this.name = name;
+        this.des = des;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDes() {
+        return des;
+    }
+
+    public void setDes(String des) {
+        this.des = des;
+    }
+}
diff --git a/app/src/main/java/cn/org/bjca/trust/android/imdemo/data/item/UserItem.java b/app/src/main/java/cn/org/bjca/trust/android/imdemo/data/item/UserItem.java
new file mode 100644
index 0000000..dd570ce
--- /dev/null
+++ b/app/src/main/java/cn/org/bjca/trust/android/imdemo/data/item/UserItem.java
@@ -0,0 +1,53 @@
+package cn.org.bjca.trust.android.imdemo.data.item;
+
+import com.xuqm.base.adapter.BaseItem;
+
+public class UserItem extends BaseItem {
+    private String userId;
+    private String nickName;
+    private String faceUrl;
+    private String gender;
+
+    public UserItem(String userId) {
+        this.userId = userId;
+    }
+
+    public UserItem(String userId, String nickName, String faceUrl, String gender) {
+        this.userId = userId;
+        this.nickName = nickName;
+        this.faceUrl = faceUrl;
+        this.gender = gender;
+    }
+
+    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 getFaceUrl() {
+        return faceUrl;
+    }
+
+    public void setFaceUrl(String faceUrl) {
+        this.faceUrl = faceUrl;
+    }
+
+    public String getGender() {
+        return gender;
+    }
+
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
+}
diff --git a/app/src/main/java/cn/org/bjca/trust/android/imdemo/ui/FriendsActivity.java b/app/src/main/java/cn/org/bjca/trust/android/imdemo/ui/FriendsActivity.java
new file mode 100644
index 0000000..e094086
--- /dev/null
+++ b/app/src/main/java/cn/org/bjca/trust/android/imdemo/ui/FriendsActivity.java
@@ -0,0 +1,35 @@
+package cn.org.bjca.trust.android.imdemo.ui;
+
+import android.os.Bundle;
+
+import com.xuqm.base.adapter.BasePagedAdapter;
+import com.xuqm.base.adapter.CommonPagedAdapter;
+import com.xuqm.base.adapter.ViewHolder;
+import com.xuqm.base.ui.BaseListActivity;
+
+import cn.org.bjca.trust.android.imdemo.R;
+import cn.org.bjca.trust.android.imdemo.data.item.UserItem;
+import cn.org.bjca.trust.android.imdemo.vm.FriendsVM;
+
+public class FriendsActivity extends BaseListActivity<UserItem, FriendsVM> {
+    @Override
+    public void initView(Bundle savedInstanceState) {
+        super.initView(savedInstanceState);
+        setTitleText("好友列表");
+        setConfirmText("添加好友", v -> {
+
+        });
+    }
+
+    @Override
+    public BasePagedAdapter<UserItem> adapter() {
+        return adapter;
+    }
+
+    private final CommonPagedAdapter<UserItem> adapter = new CommonPagedAdapter<UserItem>(R.layout.item_main) {
+        @Override
+        protected void convert(ViewHolder holder, UserItem item, int position) {
+        }
+
+    };
+}
diff --git a/app/src/main/java/cn/org/bjca/trust/android/imdemo/ui/MainActivity.java b/app/src/main/java/cn/org/bjca/trust/android/imdemo/ui/MainActivity.java
new file mode 100644
index 0000000..94b3d2d
--- /dev/null
+++ b/app/src/main/java/cn/org/bjca/trust/android/imdemo/ui/MainActivity.java
@@ -0,0 +1,77 @@
+package cn.org.bjca.trust.android.imdemo.ui;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.recyclerview.widget.DividerItemDecoration;
+
+import com.xuqm.base.adapter.BasePagedAdapter;
+import com.xuqm.base.adapter.CommonPagedAdapter;
+import com.xuqm.base.adapter.ViewHolder;
+import com.xuqm.base.ui.BaseListFormLayoutActivity;
+
+import cn.org.bjca.trust.android.imdemo.R;
+import cn.org.bjca.trust.android.imdemo.data.item.MainItem;
+import cn.org.bjca.trust.android.imdemo.databinding.ActivityMainBinding;
+import cn.org.bjca.trust.android.imdemo.vm.MainVM;
+import cn.org.bjca.trust.android.lib.im.SZYXImSdk;
+import cn.org.bjca.trust.android.lib.im.kit.IMSDKCallback;
+
+public class MainActivity extends BaseListFormLayoutActivity<MainItem, MainVM, ActivityMainBinding> {
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_main;
+    }
+
+    @Override
+    public void initView(Bundle savedInstanceState) {
+        super.initView(savedInstanceState);
+        showBack(false);
+        setTitleText("工作台");
+        setConfirmText("退出", v -> SZYXImSdk.getInstance().logout(new IMSDKCallback() {
+            @Override
+            public void success() {
+
+            }
+
+            @Override
+            public void failed(int code, String error) {
+
+            }
+        }));
+
+        getBinding().baseRecyclerView.addItemDecoration(new DividerItemDecoration(MainActivity.this, DividerItemDecoration.VERTICAL));
+
+        adapter.setItemClickListener((view, item, position) -> {
+            switch (item.getId()) {
+                case 3:
+//                    startActivity(new Intent(mContext, FriendsActivity.class));
+                    break;
+                case 4:
+                    startActivity(new Intent(mContext, FriendsActivity.class));
+                    break;
+                case 5:
+//                    startActivity(new Intent(mContext, FriendsActivity.class));
+                    break;
+            }
+        });
+        getBinding().baseRefreshLayout.setEnabled(false);
+
+    }
+
+    @Override
+    public BasePagedAdapter<MainItem> adapter() {
+        return adapter;
+    }
+
+    private final CommonPagedAdapter<MainItem> adapter = new CommonPagedAdapter<MainItem>(R.layout.item_main) {
+        @Override
+        protected void convert(ViewHolder holder, MainItem item, int position) {
+            holder.setText(R.id.title, item.getName());
+            holder.setText(R.id.des, item.getDes());
+        }
+
+    };
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/cn/org/bjca/trust/android/imdemo/ui/login/LoginActivity.java b/app/src/main/java/cn/org/bjca/trust/android/imdemo/ui/login/LoginActivity.java
index 39a04bf..d821d76 100644
--- a/app/src/main/java/cn/org/bjca/trust/android/imdemo/ui/login/LoginActivity.java
+++ b/app/src/main/java/cn/org/bjca/trust/android/imdemo/ui/login/LoginActivity.java
@@ -20,7 +20,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 
-import cn.org.bjca.trust.android.imdemo.MainActivity;
+import cn.org.bjca.trust.android.imdemo.ui.MainActivity;
 import cn.org.bjca.trust.android.imdemo.databinding.ActivityLoginBinding;
 import cn.org.bjca.trust.android.lib.im.SZYXImSdk;
 import cn.org.bjca.trust.android.lib.im.kit.IMSDKCallback;
diff --git a/app/src/main/java/cn/org/bjca/trust/android/imdemo/vm/FriendsVM.java b/app/src/main/java/cn/org/bjca/trust/android/imdemo/vm/FriendsVM.java
new file mode 100644
index 0000000..cbd1e13
--- /dev/null
+++ b/app/src/main/java/cn/org/bjca/trust/android/imdemo/vm/FriendsVM.java
@@ -0,0 +1,17 @@
+package cn.org.bjca.trust.android.imdemo.vm;
+
+import com.xuqm.base.viewmodel.BaseListViewModel;
+import com.xuqm.base.viewmodel.callback.Response;
+
+import java.util.ArrayList;
+
+import cn.org.bjca.trust.android.imdemo.data.item.UserItem;
+import cn.org.bjca.trust.android.lib.im.bean.UserInfo;
+
+public class FriendsVM extends BaseListViewModel<UserItem> {
+
+    @Override
+    public void loadData(int page, Response<UserItem> onResponse) {
+        onResponse.onResponse(new ArrayList<>());
+    }
+}
diff --git a/app/src/main/java/cn/org/bjca/trust/android/imdemo/vm/MainVM.java b/app/src/main/java/cn/org/bjca/trust/android/imdemo/vm/MainVM.java
new file mode 100644
index 0000000..a54ce57
--- /dev/null
+++ b/app/src/main/java/cn/org/bjca/trust/android/imdemo/vm/MainVM.java
@@ -0,0 +1,26 @@
+package cn.org.bjca.trust.android.imdemo.vm;
+
+import com.xuqm.base.viewmodel.BaseListViewModel;
+import com.xuqm.base.viewmodel.callback.Response;
+
+import java.util.ArrayList;
+
+import cn.org.bjca.trust.android.imdemo.data.item.MainItem;
+
+public class MainVM extends BaseListViewModel<MainItem> {
+    private final ArrayList<MainItem> list = new ArrayList<MainItem>() {
+        {
+//            add(new MainItem(1,"初始化","初始化sdk"));
+//            add(new MainItem(2,"登录","登录"));
+//            add(new MainItem(2,"登出","登出"));
+            add(new MainItem(3,"会话相关","会话相关"));
+            add(new MainItem(4,"好友相关","好友列表&群组列表"));
+            add(new MainItem(5,"个人配置","个人配置"));
+        }
+    };
+
+    @Override
+    public void loadData(int page, Response<MainItem> onResponse) {
+        onResponse.onResponse(list);
+    }
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 17eab17..6842247 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,18 +1,32 @@
 <?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="match_parent"
-    tools:context=".MainActivity">
+<layout>
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <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="match_parent"
+        tools:context=".ui.MainActivity">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:id="@+id/baseRefreshLayout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:tag="layout/activity_base_list_0">
+
+            <com.xuqm.base.view.EmptyView
+                android:id="@+id/baseEmptyView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/baseRecyclerView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:overScrollMode="never" />
+
+            </com.xuqm.base.view.EmptyView>
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_friends.xml b/app/src/main/res/layout/item_friends.xml
new file mode 100644
index 0000000..6842247
--- /dev/null
+++ b/app/src/main/res/layout/item_friends.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+
+    <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="match_parent"
+        tools:context=".ui.MainActivity">
+
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:id="@+id/baseRefreshLayout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:tag="layout/activity_base_list_0">
+
+            <com.xuqm.base.view.EmptyView
+                android:id="@+id/baseEmptyView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/baseRecyclerView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:overScrollMode="never" />
+
+            </com.xuqm.base.view.EmptyView>
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_main.xml b/app/src/main/res/layout/item_main.xml
new file mode 100644
index 0000000..1f8c247
--- /dev/null
+++ b/app/src/main/res/layout/item_main.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="match_parent"
+    android:layout_height="65dp"
+    android:paddingHorizontal="15dp">
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="21sp"
+        android:textColor="#666666"
+        android:text="title"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/des"
+        android:layout_width="wrap_content"
+        android:textSize="15sp"
+        android:layout_height="wrap_content"
+        android:text="des"
+        android:textColor="#999999"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 3a131ca..11b05d4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,4 +20,5 @@ android.useAndroidX=true
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 android.defaults.buildfeatures.buildconfig=true
-android.nonFinalResIds=false
\ No newline at end of file
+android.nonFinalResIds=false
+android.enableJetifier=true
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 0091513..92f7c21 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -26,4 +26,3 @@ dependencyResolutionManagement {
 rootProject.name = "ImAndroid"
 include ':app'
 include ':SzyxImSdk'
-include ':SzyxBaseSdk'