From 89dba7bdb299ac8992dbaced2e3c0460540480fc Mon Sep 17 00:00:00 2001
From: gallonyin <gallonyin@gmail.com>
Date: Wed, 4 Jan 2023 10:32:18 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=9B=B4=E6=96=B0=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  8 ++--
 .../java/org/yameida/worktool/Constant.kt     |  7 ++++
 .../worktool/activity/ListenActivity.kt       |  3 +-
 .../worktool/activity/SettingsActivity.kt     |  5 +++
 .../yameida/worktool/model/MyConfigBean.kt    | 18 +++++++++
 .../model/network/GetMyConfigResult.java      | 11 +++++
 .../worktool/service/WeworkOperationImpl.kt   |  2 +-
 .../utils/{UpdateUtil.kt => HttpUtil.kt}      | 40 ++++++++++++++++++-
 app/src/main/res/layout/activity_listen.xml   |  2 +-
 9 files changed, 86 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/java/org/yameida/worktool/model/MyConfigBean.kt
 create mode 100644 app/src/main/java/org/yameida/worktool/model/network/GetMyConfigResult.java
 rename app/src/main/java/org/yameida/worktool/utils/{UpdateUtil.kt => HttpUtil.kt} (62%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8f3939d..c7a5d5c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,30 +46,28 @@
         </activity>
         <activity
             android:name="org.yameida.worktool.activity.LoginActivity"
-            android:launchMode="singleInstance"
+            android:launchMode="singleTop"
             android:theme="@style/AppTheme">
         </activity>
         <activity
             android:name="org.yameida.worktool.activity.SettingsActivity"
-            android:launchMode="singleInstance"
+            android:launchMode="singleTop"
             android:theme="@style/AppTheme">
         </activity>
         <activity
             android:name="org.yameida.worktool.activity.BrowserActivity"
             android:windowSoftInputMode="adjustUnspecified|stateHidden"
-            android:launchMode="singleInstance"
+            android:launchMode="singleTop"
             android:theme="@style/AppTheme">
         </activity>
         <activity
             android:name="org.yameida.worktool.activity.FloatViewGuideActivity"
             android:windowSoftInputMode="adjustUnspecified|stateHidden"
-            android:launchMode="singleInstance"
             android:theme="@style/AppTheme">
         </activity>
         <activity
             android:name="org.yameida.worktool.activity.AccessibilityGuideActivity"
             android:windowSoftInputMode="adjustUnspecified|stateHidden"
-            android:launchMode="singleInstance"
             android:theme="@style/AppTheme">
         </activity>
         <service
diff --git a/app/src/main/java/org/yameida/worktool/Constant.kt b/app/src/main/java/org/yameida/worktool/Constant.kt
index 3021945..d974739 100644
--- a/app/src/main/java/org/yameida/worktool/Constant.kt
+++ b/app/src/main/java/org/yameida/worktool/Constant.kt
@@ -36,6 +36,11 @@ object Constant {
         set(value) {
             SPUtils.getInstance().put("qaUrl", value)
         }
+    var openCallback: Int
+        get() = SPUtils.getInstance().getInt("openCallback", 0)
+        set(value) {
+            SPUtils.getInstance().put("openCallback", value)
+        }
     var host: String
         get() = SPUtils.getInstance().getString("host", DEFAULT_HOST)
         set(value) {
@@ -46,6 +51,8 @@ object Constant {
 
     fun getCheckUpdateUrl() = "${getBaseUrl()}/appUpdate/checkUpdate"
 
+    fun getMyConfig() = "${getBaseUrl()}/robot/robotInfo/get?robotId=$robotId"
+
     fun getRobotUpdateUrl() = "${getBaseUrl()}/robot/robotInfo/update"
 
     fun getTestUrl() = "${getBaseUrl()}/test"
diff --git a/app/src/main/java/org/yameida/worktool/activity/ListenActivity.kt b/app/src/main/java/org/yameida/worktool/activity/ListenActivity.kt
index c95b5ab..b0d8d41 100644
--- a/app/src/main/java/org/yameida/worktool/activity/ListenActivity.kt
+++ b/app/src/main/java/org/yameida/worktool/activity/ListenActivity.kt
@@ -4,7 +4,6 @@ import android.os.Bundle
 import android.provider.Settings
 import android.view.WindowManager
 import android.widget.CompoundButton
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import com.blankj.utilcode.util.*
 import com.umeng.analytics.MobclickAgent
@@ -43,7 +42,7 @@ class ListenActivity : AppCompatActivity() {
         initView()
         initAccessibility()
         initOverlays()
-        UpdateUtil.checkUpdate()
+        HttpUtil.checkUpdate()
         PermissionUtils.permission("android.permission.READ_EXTERNAL_STORAGE").request()
         registerReceiver(openWsReceiver, IntentFilter(Constant.WEWORK_NOTIFY))
     }
diff --git a/app/src/main/java/org/yameida/worktool/activity/SettingsActivity.kt b/app/src/main/java/org/yameida/worktool/activity/SettingsActivity.kt
index dbb7f5e..7b72df6 100644
--- a/app/src/main/java/org/yameida/worktool/activity/SettingsActivity.kt
+++ b/app/src/main/java/org/yameida/worktool/activity/SettingsActivity.kt
@@ -45,6 +45,7 @@ class SettingsActivity : AppCompatActivity() {
         setContentView(R.layout.activity_settings)
 
         initView()
+        initData()
     }
 
     override fun onResume() {
@@ -101,6 +102,10 @@ class SettingsActivity : AppCompatActivity() {
         }
     }
 
+    private fun initData() {
+        HttpUtil.getMyConfig()
+    }
+
     private fun showReplyStrategyDialog() {
         val strategyArray = arrayOf("只读消息不回调", "仅私聊和群聊@机器人回调", "私聊群聊全部回调")
         QMUIDialog.CheckableDialogBuilder(this)
diff --git a/app/src/main/java/org/yameida/worktool/model/MyConfigBean.kt b/app/src/main/java/org/yameida/worktool/model/MyConfigBean.kt
new file mode 100644
index 0000000..eba6b11
--- /dev/null
+++ b/app/src/main/java/org/yameida/worktool/model/MyConfigBean.kt
@@ -0,0 +1,18 @@
+package org.yameida.worktool.model
+
+data class MyConfigBean(
+    //QA类型 0未配置 1第三方QA 2微信对话平台
+    var openCallback: Int? = null,
+
+    //第三方QA回调地址
+    var callbackUrl: String? = null,
+
+    //回复策略 -1只读消息不回调 0仅私聊和群聊@机器人回调 1私聊群聊全部回调
+    var replyAll: Int? = null,
+
+    //key校验 0未开启 1开启
+    var robotKeyCheck: Int? = null,
+
+    //通讯加密 0不加密 1加密
+    var encryptType: Int? = null
+)
\ No newline at end of file
diff --git a/app/src/main/java/org/yameida/worktool/model/network/GetMyConfigResult.java b/app/src/main/java/org/yameida/worktool/model/network/GetMyConfigResult.java
new file mode 100644
index 0000000..b8c94af
--- /dev/null
+++ b/app/src/main/java/org/yameida/worktool/model/network/GetMyConfigResult.java
@@ -0,0 +1,11 @@
+package org.yameida.worktool.model.network;
+
+import org.yameida.worktool.model.MyConfigBean;
+
+public class GetMyConfigResult {
+
+    public Integer code;
+    public String message;
+    public MyConfigBean data;
+
+}
diff --git a/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt b/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt
index eadc9f8..feafb15 100644
--- a/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt
+++ b/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt
@@ -139,6 +139,7 @@ object WeworkOperationImpl {
 
     /**
      * 在房间内转发消息
+     * @see WeworkMessageBean.RELAY_MESSAGE
      * @param titleList 房间名称
      * @param receivedName 原始消息的发送者姓名
      * @param originalContent 原始消息的内容
@@ -169,7 +170,6 @@ object WeworkOperationImpl {
                     )
                 ) {
                     LogUtils.d("开始转发")
-                    sleep(1000)
                     if (relaySelectTarget(nameList, extraText)) {
                         LogUtils.d("$title: 转发成功")
                     } else {
diff --git a/app/src/main/java/org/yameida/worktool/utils/UpdateUtil.kt b/app/src/main/java/org/yameida/worktool/utils/HttpUtil.kt
similarity index 62%
rename from app/src/main/java/org/yameida/worktool/utils/UpdateUtil.kt
rename to app/src/main/java/org/yameida/worktool/utils/HttpUtil.kt
index 8caba14..17ee350 100644
--- a/app/src/main/java/org/yameida/worktool/utils/UpdateUtil.kt
+++ b/app/src/main/java/org/yameida/worktool/utils/HttpUtil.kt
@@ -11,9 +11,10 @@ import model.UpdateConfig
 import org.yameida.worktool.Constant
 import org.yameida.worktool.R
 import org.yameida.worktool.model.network.CheckUpdateResult
+import org.yameida.worktool.model.network.GetMyConfigResult
 import update.UpdateAppUtils
 
-object UpdateUtil {
+object HttpUtil {
 
     fun checkUpdate() {
         OkGo.get<String>(Constant.getCheckUpdateUrl())
@@ -61,4 +62,41 @@ object UpdateUtil {
                 }
             })
     }
+
+    fun getMyConfig() {
+        if (Constant.robotId.isBlank()) {
+            ToastUtils.showLong("请先填写机器人ID")
+            return
+        }
+        OkGo.get<String>(Constant.getMyConfig())
+            .execute(object : StringCallback() {
+                override fun onSuccess(response: Response<String>) {
+                    try {
+                        val commonResult =
+                            GsonUtils.fromJson(
+                                response.body(),
+                                GetMyConfigResult::class.java
+                            )
+                        if (commonResult.code != 200) {
+                            return onError(response)
+                        }
+                        LogUtils.i(commonResult.data)
+                        commonResult.data?.apply {
+                            Constant.qaUrl = this.callbackUrl ?: ""
+                            Constant.openCallback = this.openCallback ?: 0
+                            Constant.replyStrategy = (this.replyAll ?: 0) + 1
+                            return
+                        }
+                    } catch (e: Exception) {
+                        LogUtils.e(e)
+                        onError(response)
+                    }
+                }
+
+                override fun onError(response: Response<String>) {
+                    ToastUtils.showLong("获取配置失败 请检查机器人ID")
+                    LogUtils.e("获取配置失败 请检查机器人ID")
+                }
+            })
+    }
 }
diff --git a/app/src/main/res/layout/activity_listen.xml b/app/src/main/res/layout/activity_listen.xml
index eeb8d3c..4f99c8d 100644
--- a/app/src/main/res/layout/activity_listen.xml
+++ b/app/src/main/res/layout/activity_listen.xml
@@ -330,7 +330,7 @@
                         android:id="@+id/et_channel"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:hint="请输入申请的链接号"
+                        android:hint="请输入申请的机器人ID"
                         android:textColor="@color/color_999999"
                         android:textSize="@dimen/setting_end_font_size" />