From f441a3c49f8b5cedee3e4def6fbb448ef40eb9cb Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 10 六月 2020 14:46:58 +0800
Subject: [PATCH] Crabtree-ON 2020-06-10 基于最新HDL ON 优化问题，Crabtree-ONAPP部分功能同步修改优化调整 1. 增加大图片大文件上传处理. 2.远程连接交互提示，由原来的Loading修改成顶部Tip提示。 3.灯光全开、全关和场景控制多线程发送，和HDLON同样加锁处理。 4.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