From 64b5d3b0eab77341795cc7d6634ffa7cf60848e2 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 16 十一月 2020 14:39:00 +0800
Subject: [PATCH] 2020-11-16 1.界面问题优化。2.上传和下载增加失败重新操作处理。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/System/SystemWirelessGateway.cs | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/System/SystemWirelessGateway.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/System/SystemWirelessGateway.cs
index 74f1404..a0370e2 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/System/SystemWirelessGateway.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/System/SystemWirelessGateway.cs
@@ -176,7 +176,7 @@
textButton.Enable = false;
textButton.IsSelected = false;
MainPage.Loading.Hide ();
- System.Console.WriteLine ("OnePortWirelessFR Remark Update");
+ Utlis.WriteLine ("OnePortWirelessFR Remark Update");
} else {
textButton.Enable = true;
textButton.IsSelected = true;
@@ -1103,8 +1103,8 @@
return;
}
- gatewayDevice.Remote_GroupName = etGroupName.Text = UserConfig.Instance.CurrentRegion.RegionName;
- gatewayDevice.Remote_ProjectName = etProjectName.Text = UserConfig.Instance.CurrentRegion.RegionName;
+ gatewayDevice.Remote_GroupName = etGroupName.Text = UserConfig.Instance.CurrentRegion.Name;
+ gatewayDevice.Remote_ProjectName = etProjectName.Text = UserConfig.Instance.CurrentRegion.Name;
gatewayDevice.Remote_UserName = etUserName.Text = "Admin";
gatewayDevice.Remote_Password = etGatewayPassWrod.Text = etRemoteAutoPW.Text.Trim ();
@@ -1294,7 +1294,7 @@
};
spinnerband.AdapterStr = bandText;//.AddAdapter(bandText);
spinnerband.SelectedItemChanged += (sender, e) => {
- System.Console.WriteLine (e);
+ Utlis.WriteLine (e);
gatewayDevice.WirelessBand = (byte)e;
};
flRadioParameterBody.AddChidren (spinnerband);
@@ -1370,7 +1370,7 @@
};
spinnerChannel.AdapterStr = channelTextSpinner;//.AddAdapter(channelTextSpinner);
spinnerChannel.SelectedItemChanged += (sender, e) => {
- System.Console.WriteLine (e);
+ Utlis.WriteLine (e);
gatewayDevice.WirelessChannel = (byte)e;
};
flRadioParameterBody.AddChidren (spinnerChannel);
@@ -1437,7 +1437,7 @@
// }
//}
//MainPage.Loading.Hide ();
- //System.Console.WriteLine ("UpdateWirelessManage send.");
+ //Utlis.WriteLine ("UpdateWirelessManage send.");
};
#endregion
@@ -1982,7 +1982,7 @@
});
}
} catch (Exception ex) {
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
} finally {
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
@@ -2156,13 +2156,13 @@
Common common = CommonPage.DeviceList [i];
if (common.Type == DeviceType.MusicModel)
continue;
- //Console.WriteLine(common.DeviceID);
+ //Utlis.WriteLine(common.DeviceID);
if (common.SubnetID == subnetID && common.DeviceID != 0) {
int btnY = tipView.Y + (countDevcie + 1) * Application.GetRealHeight (80);
countDevcie++;
if (common.isMixBox) {
- Console.WriteLine ("IsMixBox");
+ Utlis.WriteLine ("IsMixBox");
countDevcie--;
continue;
}
@@ -2399,7 +2399,7 @@
countDevcie++;
if (common.isMixBox) {
- Console.WriteLine ("IsMixBox");
+ Utlis.WriteLine ("IsMixBox");
countDevcie--;
continue;
}
@@ -2489,7 +2489,7 @@
var common = listCommonEquipment [i];
if (common == null)
continue;
- Console.WriteLine ("璇诲彇璁惧鍚勪釜鍥炶矾鐨勫叿浣撲俊鎭紝褰撳墠璁惧鍚嶇О:" + common.Name + " 鍥炶矾鎬绘暟:" + common.LoopCount);
+ Utlis.WriteLine ("璇诲彇璁惧鍚勪釜鍥炶矾鐨勫叿浣撲俊鎭紝褰撳墠璁惧鍚嶇О:" + common.Name + " 鍥炶矾鎬绘暟:" + common.LoopCount);
byte bigClass = common.BigClass;
byte minClass = common.MinClass;
int count = common.LoopCount;
@@ -2530,7 +2530,7 @@
);
}
} catch (Exception ex) {
- Console.WriteLine (ex.ToString ());
+ Utlis.WriteLine (ex.ToString ());
} finally {
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
@@ -2570,7 +2570,7 @@
ms.WriteByte (common.SubnetID);
ms.WriteByte (common.DeviceID);
}
- Console.WriteLine ("鎼滅储闈炵綉鍏宠澶囷紝缃戠粶鍦板潃鏄�:" + CommonPage.EndPoint.ToString ());
+ Utlis.WriteLine ("鎼滅储闈炵綉鍏宠澶囷紝缃戠粶鍦板潃鏄�:" + CommonPage.EndPoint.ToString ());
Control control = new Control ();
control.Send (new Target () {
IPEndPoint = CommonPage.EndPoint,
--
Gitblit v1.8.0