From d7d1a03f56880d5edb3541df39d3ba62869dd655 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 22 十二月 2020 10:41:29 +0800
Subject: [PATCH] 2020-12-22 1.网络变化，断开重连一次
---
HDL_ON/Common/HDLCommon.cs | 9 ++++++++-
.vs/HDL_APP_Project/xs/UserPrefs.xml | 27 ++++++++-------------------
2 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index c4d0436..7651f61 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,16 +1,6 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.08FD445C-3EE8-4ED2-BF28-B42ADD0DA92C" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Common/HDLCommon.cs">
- <Files>
- <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs" Line="220" Column="1" />
- <File FileName="HDL-ON_iOS/AppDelegate.cs" Line="417" Column="16" />
- <File FileName="HDL_ON/DAL/DriverLayer/UdpSocket.cs" />
- <File FileName="HDL-ON_Android/Application.cs" Line="365" Column="18" />
- <File FileName="HDL_ON/Entity/Function/Function.cs" Line="164" Column="18" />
- <File FileName="HDL_ON/Common/HDLCommon.cs" Line="326" Column="52" />
- <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" Line="129" Column="29" />
- <File FileName="HDL_ON/UI/MainPage.cs" Line="50" Column="47" />
- </Files>
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
+ <MonoDevelop.Ide.Workbench>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
@@ -20,13 +10,12 @@
<Node name="Utlis" expanded="True" />
<Node name="HDLCommon.cs" selected="True" />
</Node>
- <Node name="Entity" expanded="True">
- <Node name="Device" expanded="True" />
- <Node name="Function" expanded="True" />
+ <Node name="DAL" expanded="True">
+ <Node name="DriverLayer" expanded="True" />
+ <Node name="Mqtt" expanded="True" />
+ <Node name="Server" expanded="True" />
</Node>
- <Node name="UI" expanded="True">
- <Node name="UI1-Login" expanded="True" />
- </Node>
+ <Node name="UI" expanded="True" />
</Node>
<Node name="HDL-ON_Android" expanded="True" />
<Node name="HDL-ON_iOS" expanded="True" />
@@ -41,7 +30,7 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.364c4b3158493098" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 6c1045e..07ddc1c 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -450,9 +450,16 @@
//缃戠粶鐘舵�佸彉鍖� 閲嶇疆缃戝叧鐘舵�侀噸鏂版悳绱�
Control.Ins.GatewayOnline = false;
+ //缃戠粶鍙樺寲锛屾柇寮�閲嶈繛涓�娆�
+ if (Control.Ins.IsRemote)
+ {
+ Control.Ins.IsRemote = false;
+ DAL.Mqtt.MqttClient.DisConnectRemote("UpdateInternetStatus", false);
+ }
+
if (internetStatus == 0)//娌℃湁缃戠粶杩炴帴 0
{
- //Control.Ins.GatewayOnline = false;
+ Control.Ins.GatewayOnline = false;
Control.Ins.IsRemote = false;
MainPage.InternetStatus = 0;
}
--
Gitblit v1.8.0