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/FingerprintAndProximityScene.cs | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/DoorLock/FingerprintAndProximityScene.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/DoorLock/FingerprintAndProximityScene.cs
index 0f10274..d083ba1 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/DoorLock/FingerprintAndProximityScene.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/DoorLock/FingerprintAndProximityScene.cs
@@ -105,13 +105,13 @@
var editbox = new EditText () {
Height = Application.GetRealHeight (180),
Width = Application.GetRealWidth (520),
+ PlaceholderTextColor = SkinStyle.Current.PlaceholderTextColor,
PlaceholderText = Language.StringByID (R.MyInternationalizationString.EditPushContent),
TextAlignment = TextAlignment.Center,
Radius = (uint)Application.GetRealHeight (10),
TextColor = SkinStyle.Current.TextColor1,
BackgroundColor = SkinStyle.Current.LineColor2,
TextSize = 15,
- PlaceholderTextColor = SkinStyle.Current.PlaceholderTextColor,
};
editMessageView.AddChidren (editbox);
@@ -696,6 +696,9 @@
if (common.Type == DeviceType.OnePortWirelessFR) {
var gateWay = Newtonsoft.Json.JsonConvert.DeserializeObject<OnePortWirelessFR> (gateWayString);
mac = gateWay.MAC.Replace (".", "");
+ } else if (common.Type == DeviceType.OnePortMqttFR) {
+ var gateWay = Newtonsoft.Json.JsonConvert.DeserializeObject<OnePortMqttFR> (gateWayString);
+ mac = gateWay.MAC.Replace (".", "");
} else if (common.Type == DeviceType.OnePortBus) {
var gateWay = Newtonsoft.Json.JsonConvert.DeserializeObject<OnePortBus> (gateWayString);
mac = gateWay.MAC.Replace (".", "");
@@ -722,7 +725,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);
});
@@ -769,6 +772,9 @@
if (common.Type == DeviceType.OnePortWirelessFR) {
var gateWay = Newtonsoft.Json.JsonConvert.DeserializeObject<OnePortWirelessFR> (gateWayString);
mac = gateWay.MAC.Replace (".", "");
+ } else if (common.Type == DeviceType.OnePortMqttFR) {
+ var gateWay = Newtonsoft.Json.JsonConvert.DeserializeObject<OnePortMqttFR> (gateWayString);
+ mac = gateWay.MAC.Replace (".", "");
} else if (common.Type == DeviceType.OnePortBus) {
var gateWay = Newtonsoft.Json.JsonConvert.DeserializeObject<OnePortBus> (gateWayString);
mac = gateWay.MAC.Replace (".", "");
@@ -791,7 +797,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 ());
foreach (var msg in msgEntity) {
--
Gitblit v1.8.0