微调+群组消息

app/src/main/java/cn/org/bjca/trust/pushdemo/MainActivity.kt

@@ -44,6 +44,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
             SendMessageHelper.sendTextMessage("xuqm", "hello${System.currentTimeMillis()}")
 //            r.launch("image/*")
         }
+        binding.sendG.setOnClickListener {
+            SendMessageHelper.sendTextMessage("G_hfisoahfisaohdisa", "hello,Group_${System.currentTimeMillis()}")
+//            r.launch("image/*")
+        }
 
     }
 

app/src/main/res/layout/activity_main.xml

@@ -29,6 +29,15 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintVertical_bias="0.188" />
+        <TextView
+            android:id="@+id/sendG"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="发送群组消息"
+            app:layout_constraintEnd_toEndOf="parent"
+            android:layout_marginTop="10dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/send" />
         <ImageView
             android:layout_width="200dp"
             android:layout_height="200dp"

push/src/main/java/cn/org/bjca/trust/push/manager/PushSdkManager.kt

@@ -25,7 +25,7 @@ class PushSdkManager : SdkInterface {
 
 //        runBlocking {
 //            HttpManager.getApi(
-//                HttpManager.getAppComponent("http://192.168.115.173:8080"),
+//                HttpManager.getAppComponent("http://192.168.115.137:8080"),
 //                PushService::class.java
 //            )
 //                .getArticle(42)
@@ -40,16 +40,16 @@ class PushSdkManager : SdkInterface {
 
         if (::imConnectOptions.isInitialized) {
             imConnectOptions.clientId = userId
-            imConnectOptions.host = "192.168.115.173"
-            imConnectOptions.port = 18884
+            imConnectOptions.host = "192.168.115.137"
+            imConnectOptions.port = 18883
             imConnectOptions.deviceId = DeviceHelper.getDeviceId()
             imConnectOptions.token = "token"
             imConnectOptions.osType = OsType.ANDROID
             imConnectOptions.sdkVersion = BuildConfig.versionName
         } else {
             imConnectOptions = ImConnectOptions(
-                "192.168.115.173",
-                18884,
+                "192.168.115.137",
+                18883,
                 userId,
                 DeviceHelper.getDeviceId(),
                 "token",

push/src/main/java/cn/org/bjca/trust/push/message/client/ImClient.kt

@@ -62,7 +62,7 @@ class ImClient : ImClientInterface {
         if (!::mqttArrivedClient.isInitialized) {
             mqttArrivedClient = MqttClient(
                 "tcp://${connectOptions.host}:${connectOptions.port}",
-                connectOptions.clientId,
+                connectOptions.clientId + System.currentTimeMillis(),
                 MemoryPersistence()
             )
             options = MqttConnectOptions()