Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

 ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs

@@ -170,17 +170,18 @@
        {

            //清空桌布

            this.frameTable.RemoveAll();



            var listView = new VerticalFrameControl(29);

            listView.Height = frameTable.Height;

            frameTable.AddChidren(listView);



            HdlThreadLogic.Current.RunMainInThread(() =>

            {

                if (this.frameTable == null)

                if (lookRoom.SceneUIList.Count == 0)

                {

                    //还没有添加场景哦

                    this.ShowNotDataImage(frameTable, Language.StringByID(R.MyInternationalizationString.uDoNotHadAddScenceMsg));

                    return;

                }

                var listView = new VerticalFrameControl(29);

                listView.Height = frameTable.Height;

                frameTable.AddChidren(listView);



                foreach (var data in lookRoom.SceneUIList)

                {

                    var frameContr = new FrameLayout();

@@ -207,27 +208,30 @@
            //清空桌布

            this.frameTable.RemoveAll();



            var frameBack = new FrameLayout();

            frameBack.X = ControlCommonResourse.XXLeft;

            frameBack.BackgroundColor = UserCenterColor.Current.White;

            frameBack.Width = bodyFrameLayout.Width;

            frameBack.Height = Application.GetRealHeight(1650);

            frameBack.Radius = (uint)Application.GetMinRealAverage(20);

            frameTable.AddChidren(frameBack);



            var listView = new VerticalListControl(23);

            listView.Y = Application.GetRealHeight(23);

            listView.Height = Application.GetRealHeight(1549 - 23);

            frameBack.AddChidren(listView);



            HdlThreadLogic.Current.RunMainInThread(() =>

            {

                if (listView == null)

                {

                    return;

                }

                //获取分组后的设备列表

                var dicGroupDevice = this.GetAllGroupDevice();

                if (dicGroupDevice.Count == 0)

                {

                    //还没有添加设备哦

                    this.ShowNotDataImage(frameTable, Language.StringByID(R.MyInternationalizationString.uDoNotHadAddDeviceMsg));

                    return;

                }



                var frameBack = new FrameLayout();

                frameBack.X = ControlCommonResourse.XXLeft;

                frameBack.BackgroundColor = UserCenterColor.Current.White;

                frameBack.Width = bodyFrameLayout.Width;

                frameBack.Height = Application.GetRealHeight(1650);

                frameBack.Radius = (uint)Application.GetMinRealAverage(20);

                frameTable.AddChidren(frameBack);



                var listView = new VerticalListControl(23);

                listView.Y = Application.GetRealHeight(23);

                listView.Height = Application.GetRealHeight(1549 - 23);

                frameBack.AddChidren(listView);



                var dicData = new Dictionary<string, DeviceRowInfo>();

                var listGwId = new List<string>();

                foreach (var textId in dicGroupDevice.Keys)

@@ -370,7 +374,7 @@
        /// <param name="dicData">以回路作为索引去指定对象</param>

        private void StartCheckDeviceOnline(VerticalListControl listView, List<string> listGwId, Dictionary<string, DeviceRowInfo> dicData)

        {

            HdlThreadLogic.Current.RunThread(async () =>

            HdlThreadLogic.Current.RunThread(() =>

            {

                for (int i = 0; i < listGwId.Count; i++)

                {

@@ -380,7 +384,7 @@
                    }

                    //这里主要只是获取在线状态

                    var zbway = HdlGatewayLogic.Current.GetLocalGateway(listGwId[i]);

                    var result = await Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, false, (device) =>

                    var result = Common.LocalDevice.Current.GetDeviceListFromGateway(zbway, false, (device) =>

                     {

                         string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);

                         if (listView.Parent == null)