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/DoorLock/DoorLockScene.cs | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/DoorLock/DoorLockScene.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/DoorLock/DoorLockScene.cs
index cf7a6a6..4ecdb7a 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/DoorLock/DoorLockScene.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/DoorLock/DoorLockScene.cs
@@ -586,7 +586,7 @@
try {
var recevieResult = requestWeb (mess, "https://developer.hdlcontrol.com/api/GetOnePushMsg");
var obj = Newtonsoft.Json.JsonConvert.DeserializeObject<PushMessageResult> (recevieResult);
- if (obj.StateCode == "SUCCESS") {
+ if (obj.StateCode.ToUpper() == "SUCCESS") {
var msgEntity = Newtonsoft.Json.JsonConvert.DeserializeObject<List<MessageInfoRes>> (obj.ResponseData.ToString ());
if (msgEntity.Count == 0) {
Application.RunOnMainThread (() => {
@@ -740,6 +740,10 @@
var gateWay = Newtonsoft.Json.JsonConvert.DeserializeObject<OnePortWirelessFR> (gateWayString);
mac = gateWay.MAC.Replace (".", "");
return mac;
+ } else if (common.Type == DeviceType.OnePortMqttFR) {
+ var gateWay = Newtonsoft.Json.JsonConvert.DeserializeObject<OnePortMqttFR> (gateWayString);
+ mac = gateWay.MAC.Replace (".", "");
+ return mac;
} else if (common.Type == DeviceType.OnePortBus) {
var gateWay = Newtonsoft.Json.JsonConvert.DeserializeObject<OnePortBus> (gateWayString);
mac = gateWay.MAC.Replace (".", "");
@@ -776,7 +780,7 @@
try {
var recevieResult = requestWeb (mess, "https://developer.hdlcontrol.com/api/AddPushMessage");
var obj = Newtonsoft.Json.JsonConvert.DeserializeObject<PushMessageResult> (recevieResult);
- if (obj.StateCode == "SUCCESS") {
+ if (obj.StateCode.ToUpper() == "SUCCESS") {
Application.RunOnMainThread (() => {
new Tip () { MaxWidth = 150, Text = Language.StringByID (R.MyInternationalizationString.SendNotificationsSuccessfully), Direction = AMPopTipDirection.Down, CloseTime = 2 }.Show (btn);
});
--
Gitblit v1.8.0