From 10b78a1626106f18a6b2f68bd2b8cafd2a99683c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 12 八月 2020 11:31:59 +0800
Subject: [PATCH] 2020-08-12 4.喜爱页面,增加房间场景添加支持。 5.Alexa,添加设备页面增加修改备注功能,点击OK后,增加设备备注名字不匹配然后自动更新操作。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/System/SystemRemote.cs | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/System/SystemRemote.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/System/SystemRemote.cs
index bafa812..5f201db 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/System/SystemRemote.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/System/SystemRemote.cs
@@ -12,16 +12,32 @@
{
static SystemRemote ()
{
- //濡傛灉鍦ㄨ繙绋嬭繛鎺ョ殑鎯呭喌涓嬶紝灏变細鏈夊畾鏃跺彂閫佸績璺冲寘
- System.Threading.Tasks.Task.Run (() => {
- while (true) {
- System.Threading.Thread.Sleep (10 * 1000);
- if (CommonPage.IsRemote) {
- Control.ControlBytesSend (Command.ReadRemark, 0, 0, new byte [] { }, SendCount.Zero);
- Console.WriteLine ("蹇冭烦鍖�");
- }
- }
- });
+ //鍚庨潰鑰冭檻妫�娴嬬綉鍏虫槸鍚﹀湪绾匡紝鍙互杩欓噷淇敼鏂规硶妫�娴�
+ ////濡傛灉鍦ㄨ繙绋嬭繛鎺ョ殑鎯呭喌涓嬶紝灏变細鏈夊畾鏃跺彂閫佸績璺冲寘
+ //System.Threading.Tasks.Task.Run (() => {
+ // while (true) {
+ // System.Threading.Thread.Sleep (10 * 1000);
+ // if (CommonPage.IsRemote) {
+ // Control.ControlBytesSend (Command.ReadRemark, 0, 0, new byte [] { }, SendCount.Zero);
+ // Utlis.WriteLine ("蹇冭烦鍖�");
+ // }
+ // }
+ //});
+
+ ////濡傛灉鍦ㄨ繙绋嬭繛鎺ョ殑鎯呭喌涓嬶紝灏变細鏈夊畾鏃跺彂閫佸績璺冲寘
+ //System.Threading.Tasks.Task.Run (() => {
+ // while (true) {
+ // System.Threading.Thread.Sleep (10 * 1000);
+ // if (CommonPage.IsRemote) {
+ // Utlis.WriteLine ("蹇冭烦鍖�");
+ // byte [] backBytes = Control.ControlBytesSendHasReturn (Command.ReadRemark, 0, 0, new byte [] { });
+ // if (backBytes != null) {
+ // Utlis.WriteLine ("蹇冭烦鍖� 鏀跺埌鍥炲");
+ // }
+
+ // }
+ // }
+ //});
}
/// <summary>
/// 鍔犲瘑绠楁硶
@@ -162,7 +178,7 @@
byte [] bytes = null;
var dateTime = DateTime.Now;
System.Threading.Tasks.Task.Run (() => {
- bytes = new System.Net.WebClient { Proxy = null }.DownloadData ("http://www.baidu.com");
+ bytes = new System.Net.WebClient { Proxy = null }.DownloadData ("https://smarth-api.havells.com");
});
while ((DateTime.Now - dateTime).TotalMilliseconds < 8000) {
System.Threading.Thread.Sleep (100);
@@ -187,7 +203,7 @@
{
bool result = false;
bool notInternet = false;
- string linkMsg = UserConfig.Instance.CurrentRegion.RegionName + " : ";
+ string linkMsg = UserConfig.Instance.CurrentRegion.Name + " : ";
try {
if (!checeInternet ()) {
MainPage.AddTip (Language.StringByID (R.MyInternationalizationString.CheckInternet));
@@ -261,7 +277,7 @@
}
}
} catch (Exception ex) {
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
} finally {
if (!result) {
Application.RunOnMainThread (() => {
--
Gitblit v1.8.0