From 2562ee38c58a113113a2943ae057c1937ae533cb Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 02 七月 2020 13:49:20 +0800
Subject: [PATCH] 2020-07-01 1.去掉读电能操作，去掉kwh状态显示。 2.当前是分享住宅，不允许删除备份。 3.进入搜索网关页面，切换到本地模式。 4.Alexa页面 增加添加设备失败提示。 5.子账号页面，底部增加文字提示。6.Android 默认隐藏底部虚拟按键。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs
index ab1194c..79de2bd 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Schedule/UserSchedule.cs
@@ -75,7 +75,7 @@
UserMiddle.SettingPageView.PageIndex = 2;
});
}catch(Exception ex){
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
}
finally{
Application.RunOnMainThread (() => {
@@ -113,7 +113,7 @@
ShowGetTimerListErrorInfo (revertObj.StateCode);
}
} catch (Exception ex) {
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
} finally {
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
@@ -316,7 +316,7 @@
});
}
} catch (Exception ex) {
- Console.WriteLine (ex.Message);
+ Utlis.WriteLine (ex.Message);
} finally {
Application.RunOnMainThread (() => {
MainPage.Loading.Hide ();
@@ -416,13 +416,16 @@
/// <param name="bTimersRemove"></param>
void DeleteTimerAction (string GUID, View rowView, bool bTimersRemove = false)
{
- MainPage.Loading.Start ("Please wait...");
+ //2020-01-11
+ Application.RunOnMainThread (() => {
+ MainPage.Loading.Start ("Please wait...");
+ });
var delObj = new Timer () { Id = GUID };
var delRequestJson = Newtonsoft.Json.JsonConvert.SerializeObject (delObj);
var delRevertObj = MainPage.RequestHttps (API.DeleteTimer, delRequestJson);
- MainPage.Loading.Hide ();
+
if (delRevertObj.StateCode.ToUpper () == "SUCCESS") {
rowView.RemoveFromParent ();
if (bTimersRemove) {
@@ -434,6 +437,12 @@
new Alert ("", ErrorCode.FailedDelete, Language.StringByID (R.MyInternationalizationString.Close)).Show ();
});
}
+
+ Application.RunOnMainThread (() => {
+ MainPage.Loading.Hide ();
+ });
+
+
}
}
}
--
Gitblit v1.8.0