From c0ce2f57a4f836ebeb9e7b8b4b5a4407fd78dc86 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 23 九月 2020 10:06:05 +0800
Subject: [PATCH] 上传
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
index 938c65c..26a24b1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
@@ -81,6 +81,15 @@
return null;
}
var dataResult = Newtonsoft.Json.JsonConvert.DeserializeObject<GetShardInfoResult>(result);
+ //瀵瑰簲鏃х増鏈殑璁惧鏂囦欢 Device_OnoffOutput_abcdfrtgg_01
+ if (dataResult.ShareName.StartsWith("Device_") == true)
+ {
+ var strArry = dataResult.ShareName.Split(new string[] { "_" }, StringSplitOptions.None);
+ if (strArry.Length == 4)
+ {
+ dataResult.ShareName = strArry[0] + "_" + strArry[2] + "_" + strArry[3];
+ }
+ }
//鏂囦欢鍚嶅瓧
listFile.Add(dataResult.ShareName);
//淇濆瓨鍒版寚瀹氭枃浠跺す涓�
@@ -494,6 +503,15 @@
{
//鎬ц兘浼樺寲锛氬鏋滄湰鍦版嫢鏈夎繖涓枃浠剁殑璇�,鐩存帴浣跨敤閭ｄ釜鏂囦欢
string fileName = data.ShareName;
+ if (fileName.StartsWith("Device_") == true)
+ {
+ string[] Arry = fileName.Split(new string[] { "_" }, StringSplitOptions.RemoveEmptyEntries);
+ if (Arry.Length == 4)
+ {
+ //瀵瑰簲鏃ф暟鎹細Device_OnOffOutput_abcjdffdfj_01
+ fileName = Arry[0] + "_" + Arry[2] + "_" + Arry[3];
+ }
+ }
//璁板綍璧峰畠鐨勪富閿�
memberShardInfo.dicAllShardKeys[fileName] = data.DistributedMark;
@@ -574,11 +592,21 @@
else if (fileName.StartsWith("Device_") == true)
{
string[] Arry = fileName.Split(new string[] { "_" }, StringSplitOptions.RemoveEmptyEntries);
- string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(Arry[2], Convert.ToInt32(Arry[3]));
- this.dicShardDeviceFile[mainKeys] = fileName;
-
- //璁惧鏂囦欢
- dicDeviceFile[mainKeys] = fileName;
+ if (Arry.Length == 4)
+ {
+ //瀵瑰簲鏃ф暟鎹細Device_OnOffOutput_abcjdffdfj_01
+ string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(Arry[2], Convert.ToInt32(Arry[3]));
+ this.dicShardDeviceFile[mainKeys] = Arry[0] + "_" + Arry[2] + "_" + Arry[3];
+ //璁惧鏂囦欢
+ dicDeviceFile[mainKeys] = this.dicShardDeviceFile[mainKeys];
+ }
+ else
+ {
+ string mainKeys = Common.LocalDevice.Current.GetDeviceMainKeys(Arry[1], Convert.ToInt32(Arry[2]));
+ this.dicShardDeviceFile[mainKeys] = fileName;
+ //璁惧鏂囦欢
+ dicDeviceFile[mainKeys] = fileName;
+ }
}
else if (fileName.StartsWith("Scene_") == true)
{
--
Gitblit v1.8.0