From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs | 54 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
index 76cb9dc..02092c1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
@@ -364,6 +364,7 @@
//鍒犻櫎褰撳墠妤煎眰鐨勮瘽,闇�瑕佸幓鍒锋柊涓婚〉宸﹁竟鐨勬埧闂村垪琛�
HdlRoomLogic.Current.RefreshRoomListView();
}
+ var uploadRoom = false;
var listDeleteId = new List<string>();
var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
for (int i = 0; i < listAllRoom.Count; i++)
@@ -371,6 +372,11 @@
if (listAllRoom[i].FloorId == keys)
{
listDeleteId.Add(listAllRoom[i].Id);
+ }
+ if (listAllRoom[i].ListDevice.Count > 0)
+ {
+ //闇�瑕佷笂浼犵┖闂村尯鍩�
+ uploadRoom = true;
}
}
//鍒犻櫎鎴块棿
@@ -405,6 +411,11 @@
frameRow.RemoveFromParent();
//璋冩暣妗屽竷楂樺害
this.AdjustContrlTableHeight();
+ }
+ if (uploadRoom == true)
+ {
+ //涓婁紶绌洪棿鍖哄煙淇℃伅
+ HdlRoomLogic.Current.SetRoomInfoToGateway();
}
//鍒犻櫎妤煎眰鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
UserView.UserPage.Instance.RefreshAllForm = true;
@@ -625,6 +636,11 @@
//璋冩暣妗屽竷楂樺害
this.AdjustContrlTableHeight();
}
+ if (room.ListDevice.Count > 0)
+ {
+ //涓婁紶绌洪棿鍖哄煙淇℃伅
+ HdlRoomLogic.Current.SetRoomInfoToGateway();
+ }
//鍒犻櫎鎴块棿鐨勮瘽,涓婚〉闇�瑕侀噸鏂板埛鏂�
UserView.UserPage.Instance.RefreshAllForm = true;
});
@@ -734,25 +750,25 @@
private void CheckAuthorityAndShowMap(NormalViewControl btnLocation)
{
#if Android
- //鏄剧ず鍦板浘
- this.ShowMap(btnLocation);
- ////鐢宠瀹氫綅鏉冮檺
- //((BaseActivity)Application.Activity).SetGPSLocationPermission((result1) =>
- //{
- // if (result1 == false) { return; }
- // //鐢宠璇绘潈闄�
- // ((BaseActivity)Application.Activity).ReadWriteContact((result2) =>
- // {
- // if (result2 == false) { return; }
- // //鐢宠璇诲彇鎵嬫満鍙锋潈闄�
- // ((BaseActivity)Application.Activity).SetPermission((result3) =>
- // {
- // if (result3 == false) { return; }
- // //鏄剧ず鍦板浘
- // this.ShowMap(btnLocation);
- // }, "android.permission.READ_PHONE_STATE");
- // });
- //});
+ //鐢宠瀹氫綅鏉冮檺
+ ((BaseActivity)Application.Activity).SetGPSLocationPermission((result1) =>
+ {
+ if (result1 == false) { return; }
+
+ //鐢宠鍏佽绋嬪簭鍐欏叆澶栭儴瀛樺偍锛屽SD鍗′笂鍐欐枃浠�
+ ((BaseActivity)Application.Activity).SetPermission((result2) =>
+ {
+ if (result2 == false) { return; }
+ //璇诲彇鐢佃瘽鐘舵�佹潈闄�
+ ((BaseActivity)Application.Activity).SetPermission((result3) =>
+ {
+ if (result3 == false) { return; }
+ //鏄剧ず鍦板浘
+ this.ShowMap(btnLocation);
+ }, "android.permission.READ_PHONE_STATE");
+
+ }, "android.permission.WRITE_EXTERNAL_STORAGE");
+ });
#endif
#if iOS
//鏄剧ず鍦板浘
--
Gitblit v1.8.0