From 4f77f25be40deb678936f3ee247bc299bc1d0874 Mon Sep 17 00:00:00 2001
From: yezhiqiu <123456@qq.com>
Date: Tue, 7 Jul 2026 14:59:05 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=BC=8F=E6=B4=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/deploymentTargetSelector.xml              |  2 +-
 .idea/gradle.xml                                |  1 -
 .../abbidot/tracker/util/SocketUtilManageV2.kt  | 17 +++++++++++------
 app/src/main/res/values/strings.xml             |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 8fca315..ae3fb96 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,7 +4,7 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-07-01T08:15:08.155754600Z">
+        <DropdownSelection timestamp="2026-07-06T09:43:36.982037600Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="PhysicalDevice" identifier="serial=3A251FDJH000CE" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 4396204..444f2c8 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -19,6 +19,5 @@
         </option>
       </GradleProjectSettings>
     </option>
-    <option name="offlineMode" value="true" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/com/abbidot/tracker/util/SocketUtilManageV2.kt b/app/src/main/java/com/abbidot/tracker/util/SocketUtilManageV2.kt
index 35b398f..7324f41 100644
--- a/app/src/main/java/com/abbidot/tracker/util/SocketUtilManageV2.kt
+++ b/app/src/main/java/com/abbidot/tracker/util/SocketUtilManageV2.kt
@@ -62,12 +62,17 @@ class SocketUtilManageV2 {
         //监听socket相关行为
         EasySocket.getInstance().subscribeSocketAction(object : ISocketActionListener {
             override fun onSocketConnSuccess(socketAddress: SocketAddress?) {
-                LogUtil.e("socket连接成功")
-                //发送
-                mTimer.schedule(timerTask {
-                    LogUtil.e("发送")
-                    EasySocket.getInstance().upMessage(mNeedSendMessage)
-                }, 500)
+                try {
+                    mTimer.cancel()
+                    LogUtil.e("socket连接成功")
+                    //发送
+                    mTimer.schedule(timerTask {
+                        LogUtil.e("发送")
+                        EasySocket.getInstance().upMessage(mNeedSendMessage)
+                    }, 500)
+                } catch (e: Exception) {
+                    LogUtil.e("onSocketConnSuccess 异常:${e.message}")
+                }
             }
 
             override fun onSocketConnFail(socketAddress: SocketAddress?, isNeedReconnect: Boolean) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f68682c..8bd962d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -944,7 +944,7 @@
     <string name="txt_furr_timer_friend_dec2">Five years of commitment will unlock the Furr-timer Friend badge!</string>
     <string name="txt_how_to_get">How to get?</string>
     <string name="txt_family_invitation">Family Invitation</string>
-    <string name="txt_active_time1">Active Time:</string>
+    <string name="txt_active_time1">Activated Time:</string>
     <string name="txt_family_invitation_dec1">Your friend</string>
     <string name="txt_family_invitation_dec2">invites you to become</string>
     <string name="txt_family_invitation_dec3">family.</string>