Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-02 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9

 ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs

@@ -94,7 +94,7 @@
            InitData();
            AddTop();
            AddBodyView();
            

        }

        /// <summary>
@@ -250,7 +250,7 @@
        public void RefreshBodyView()
        {
            functionSceneBodyView.RemoveAll();
            

            if (functionBtn.IsSelected)
            {
                ShowFunction();
@@ -305,7 +305,7 @@
                    Width = Application.GetRealWidth(1028)
                };
                functionSceneBodyView.AddChidren(functionTypeScrowView);
                

                deviceListScrolView = new VerticalScrolViewLayout
                {
                    X = Application.GetRealWidth(CommonFormResouce.X_Left),
@@ -334,7 +334,7 @@
                    };
                    string imgPath=string.Empty;
                    string imgSeletedPath=string.Empty;
                    Common.LocalDevice.Current.GetDeviceBeloneIcon(deviceType.Value, ref imgPath ,ref imgSeletedPath);
                    Common.LocalDevice.Current.GetDeviceObjectIcon(deviceType.Value, ref imgPath ,ref imgSeletedPath);
                    functionTypeIMG.Init(imgPath,imgSeletedPath);
                    functionTypeIMG.SetTitle(deviceType.Key);
                    typeRowLayout.AddChidren(functionTypeIMG);
@@ -477,7 +477,7 @@
                        r.AddDevice(d.CommonDevice, true);
                        deviceListScrolView.RemoveViewByTag(d);
                    }
                    

                    if (sameTypeList.Count == selectedList.Count)
                    {
                        RefreshData();
@@ -536,7 +536,7 @@
                ShowNoSceneTip();
            }
            else
            {
            {

                var sceneScrolView = new VerticalScrolViewLayout
                {
                    Y = Application.GetRealHeight(22),
@@ -656,7 +656,7 @@
                            var frame = sceneScrolView.GetChildren(i) as FrameLayout;
                            (frame.GetChildren(1) as Button).IsSelected = (sender as Button).IsSelected;
                        }
                        

                        if ((sender as Button).IsSelected)
                        {
                            (sender as Button).TextID = R.MyInternationalizationString.Cancel;