From 49add64d7f25448baa06ac5a9ebbeac0a3ae97e0 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 13 一月 2020 13:50:29 +0800
Subject: [PATCH] Version 2.50113 1.优化更新。 2.第一次引导或者添加住宅，默认添加2个房间。编辑住宅不处理。 3.设备名超过20字节限制。 4.修复编辑住宅名字重复不提示问题。 5.优化添加住宅逻辑。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs
index dd93b39..f8a1686 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddGateway.cs
@@ -309,9 +309,10 @@
bool enable = backBytes [0] == 0 ? false : true;
//杩斿洖浣忓畢ID 杞负string绫诲瀷
string backIDStr = CommonPage.MyEncodingGB2312.GetString (backBytes, 1, 36).Trim ('\0');
- //36FF"每每每每每每每每每每每每每每"
- //32FF 每每每每每每每每每每
- if (enable || backIDStr == UserConfig.Instance.CurrentRegion.Id || string.IsNullOrEmpty (backIDStr) || backIDStr.Equals("每每每每每每每每每每每每每每")) {
+ backIDStr = backIDStr.Replace ("每", "");
+ //2020-01-12
+ backIDStr = backIDStr.Replace ("\0", "");
+ if (enable || backIDStr == UserConfig.Instance.CurrentRegion.Id || string.IsNullOrEmpty (backIDStr) ) {
goNext = true;
} else {
//#if DEBUG
--
Gitblit v1.8.0