From bd6570bcdc0be144d8b04e8adf15f607ca8bc9be Mon Sep 17 00:00:00 2001
From: gallonyin <gallonyin@gmail.com>
Date: Fri, 6 Jan 2023 12:08:16 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=92=8C=E5=93=8D=E5=BA=94=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/org/yameida/worktool/Constant.kt           | 2 +-
 .../java/org/yameida/worktool/model/WeworkMessageBean.java   | 2 ++
 .../java/org/yameida/worktool/model/WeworkMessageListBean.kt | 3 +++
 .../main/java/org/yameida/worktool/service/GlobalMethod.kt   | 5 ++++-
 app/src/main/java/org/yameida/worktool/service/MyLooper.kt   | 5 ++++-
 .../java/org/yameida/worktool/service/WeworkOperationImpl.kt | 2 ++
 6 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/yameida/worktool/Constant.kt b/app/src/main/java/org/yameida/worktool/Constant.kt
index 4ae88b7..4db8872 100644
--- a/app/src/main/java/org/yameida/worktool/Constant.kt
+++ b/app/src/main/java/org/yameida/worktool/Constant.kt
@@ -54,7 +54,7 @@ object Constant {
 
     fun getMyConfig() = "${getBaseUrl()}/robot/robotInfo/get?robotId=$robotId"
 
-    fun getRobotUpdateUrl() = "${getBaseUrl()}/robot/robotInfo/update"
+    fun getRobotUpdateUrl() = "${getBaseUrl()}/robot/robotInfo/update?robotId=$robotId"
 
     fun getTestUrl() = "${getBaseUrl()}/test"
 
diff --git a/app/src/main/java/org/yameida/worktool/model/WeworkMessageBean.java b/app/src/main/java/org/yameida/worktool/model/WeworkMessageBean.java
index 8ed3cdf..94e6911 100644
--- a/app/src/main/java/org/yameida/worktool/model/WeworkMessageBean.java
+++ b/app/src/main/java/org/yameida/worktool/model/WeworkMessageBean.java
@@ -142,6 +142,8 @@ public class WeworkMessageBean {
 
     //消息id(解析指令时同步)
     public String messageId;
+    //api类型(解析指令时同步) 0=后台消息 1=API指令调用
+    public Integer apiSend;
 
     //标题 通常是群名或联系人
     public List<String> titleList;
diff --git a/app/src/main/java/org/yameida/worktool/model/WeworkMessageListBean.kt b/app/src/main/java/org/yameida/worktool/model/WeworkMessageListBean.kt
index f9d27a8..ec15c4a 100644
--- a/app/src/main/java/org/yameida/worktool/model/WeworkMessageListBean.kt
+++ b/app/src/main/java/org/yameida/worktool/model/WeworkMessageListBean.kt
@@ -28,6 +28,9 @@ class WeworkMessageListBean<T> {
     //消息id
     var messageId = TimeUtils.date2String(Date()).replace(" ", "#") + "#" + UUID.randomUUID()
 
+    //api类型 0=后台消息 1=API指令调用
+    var apiSend: Int? = null
+
     //消息列表
     var list: ArrayList<T> = arrayListOf()
 
diff --git a/app/src/main/java/org/yameida/worktool/service/GlobalMethod.kt b/app/src/main/java/org/yameida/worktool/service/GlobalMethod.kt
index c6952cd..16fdf25 100644
--- a/app/src/main/java/org/yameida/worktool/service/GlobalMethod.kt
+++ b/app/src/main/java/org/yameida/worktool/service/GlobalMethod.kt
@@ -191,7 +191,10 @@ fun uploadCommandResult(message: WeworkMessageBean, errorCode: Int, errorReason:
         ), true
     )
     if (errorCode != 0) {
-        ToastUtils.show("错误提示 错误码: $errorCode 错误信息: $errorReason")
+        if (message.apiSend == 1) {
+            ToastUtils.show("错误提示 错误码: $errorCode 错误信息: $errorReason")
+        }
+        LogUtils.v("错误提示 错误码: $errorCode 错误信息: $errorReason")
     }
 }
 
diff --git a/app/src/main/java/org/yameida/worktool/service/MyLooper.kt b/app/src/main/java/org/yameida/worktool/service/MyLooper.kt
index 2f499f6..95d0c0e 100644
--- a/app/src/main/java/org/yameida/worktool/service/MyLooper.kt
+++ b/app/src/main/java/org/yameida/worktool/service/MyLooper.kt
@@ -96,7 +96,10 @@ object MyLooper {
                     LogUtils.v("加入指令到执行队列", if (message.fileBase64.isNullOrEmpty()) GsonUtils.toJson(message) else message.type)
                     getInstance().sendMessage(Message.obtain().apply {
                         what = message.type * message.hashCode()
-                        obj = message.apply { messageId = messageList.messageId }
+                        obj = message.apply {
+                            messageId = messageList.messageId
+                            apiSend = messageList.apiSend
+                        }
                     })
                 }
                 getInstance().removeMessages(WeworkMessageBean.LOOP_RECEIVE_NEW_MESSAGE)
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 a910e5a..069f026 100644
--- a/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt
+++ b/app/src/main/java/org/yameida/worktool/service/WeworkOperationImpl.kt
@@ -86,6 +86,8 @@ object WeworkOperationImpl {
         val startTime = System.currentTimeMillis()
         if (receivedContent.isNullOrEmpty()) {
             LogUtils.d("未发现回复内容")
+            uploadCommandResult(message, ExecCallbackBean.ERROR_ILLEGAL_DATA, "回复内容为空", startTime, listOf(), titleList)
+            goHome()
             return false
         }
         for (title in titleList) {