From 2ec9898778d3beda89278e2a53ac0e68b3035d29 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 01 七月 2020 15:06:24 +0800
Subject: [PATCH] 2020-7-1-2

---
 ZigbeeApp/Shared/Phone/Device/Logic/Send.cs |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
old mode 100644
new mode 100755
index 0fb79bc..da81d33
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -531,6 +531,10 @@
                             case 8:
                                 {
                                     var accounts1 = new JObject();
+                                    if (dictionary.ContainsKey("Type"))
+                                    {
+                                        accounts1.Add("Type", int.Parse(dictionary["Type"]));
+                                    }
                                     if (dictionary.ContainsKey("Option4"))
                                     {
                                         accounts1.Add("Option4", dictionary["Option4"]);
@@ -869,8 +873,18 @@
                     //鏈嶅姟杩斿洖鏉ユ病鏈夐棬閿佹垚鍛樹俊鎭紝娌℃湁蹇呰鍐嶅幓璇锋眰鎴愬憳鍒楄〃锛�
                     //鍘熷洜锛氳妭绾︽椂闂达紝浣撻獙鏁堟灉濂斤紱
                     result = await UserCenter.UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
+                }
+                if (string.IsNullOrEmpty(result))
+                {
+                    //闃叉涓虹┖鎶涘紓甯革紱
+                    return userlist;
                 }
-                var listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<UserCenter.MemberInfoRes>>(result);
+                var listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<UserCenter.MemberInfoRes>>(result);
+                if (listInfo == null)
+                {
+                    //闃叉涓虹┖鎶涘紓甯革紱
+                    return userlist;
+                }
                 for (int i = 0; i < listInfo.Count; i++)
                 {
 

--
Gitblit v1.8.0