合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 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

            //显示地图