From 22c5c030f2262b6a9d6840bf3b5196b7ab2d4dd5 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 10 三月 2020 14:31:53 +0800
Subject: [PATCH] 2020-03-10  1.替换最新控件库,增加无网络监听,Loading效果优化。 2.电能插座修复点亮统计个数问题。 3 .定时检测网关是否在线,发送CheckGateway间隔为10S,收到主题刷新该时间,重置发送次数,发送次数到达3次以上,则判定网关为离线状态。 4.远程重复增加为3次,重发后等待5s才回调结果。 5.修复去掉普通继电器读电能操作。 6.读状态间隔缩短为200ms。

---
 Crabtree/ON/Application.cs |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/Crabtree/ON/Application.cs b/Crabtree/ON/Application.cs
index 34ad22e..c82b8fa 100644
--- a/Crabtree/ON/Application.cs
+++ b/Crabtree/ON/Application.cs
@@ -157,20 +157,26 @@
             JPushInterface.Init (this);//淇濆瓨鎵嬫満鍚嶇О鍒版湰鍦版枃浠�
             //鑾峰彇缁忕含搴� 
             Shared.Application.LocationAction = (arg1, arg2) => {
-                Shared.Application.LocationAction = null;
-                System.Threading.Tasks.Task.Run (() => {
-                    while (true) {
-                        try {
-                            Shared.SimpleControl.CommonPage.AirQuality = new service.hdlcontrol.com_WebServiceAirQuality.WebServiceAirQuality ().GetAirQuality (arg2.ToString (), arg1.ToString ());
-                            if (Shared.SimpleControl.CommonPage.AirQuality != null)
-                                break;
-                        } catch { }
-                    }
-                    Shared.Application.RunOnMainThread (() => {
-                        if (CommonPage.RefreshAir != null)
-                            CommonPage.RefreshAir ();
+
+                try {
+                    Shared.Application.LocationAction = null;
+                    Shared.Application.StopGPSLocationService ();
+
+                    System.Threading.Tasks.Task.Run (() => {
+                        while (true) {
+                            try {
+                                Shared.SimpleControl.CommonPage.AirQuality = new service.hdlcontrol.com_WebServiceAirQuality.WebServiceAirQuality ().GetAirQuality (arg2.ToString (), arg1.ToString ());
+                                if (Shared.SimpleControl.CommonPage.AirQuality != null)
+                                    break;
+                            } catch { }
+                        }
+                        Shared.Application.RunOnMainThread (() => {
+                            if (CommonPage.RefreshAir != null)
+                                CommonPage.RefreshAir ();
+                        });
                     });
-                });
+                } catch {
+                }
             };
         }
         void checkSomeInfo ()

--
Gitblit v1.8.0