上传一个版本

黄学彪

2020-03-11 06802250b4b9041d39d568c1dbe77684075006b2

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

@@ -63,9 +63,9 @@
        /// </summary>
        private Dictionary<int, DeviceConcreteType> typeIdDic;
        /// <summary>

        /// 当前选择的分支  1:场景 2:功能

        /// 当前选择的分支  0:场景 1:功能

        /// </summary>
        private int NowSelectIndex = 1;
        private int NowSelectIndex = 0;

        #endregion

@@ -176,10 +176,13 @@
                Height = Application.GetRealHeight(1607),
                BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor
            };
            bodyFrameLayout.AddChidren(functionSceneBodyView);

            //开始初始化场景功能切换控件
            btnSceneFunctionSwitch.InitControl();
            bodyFrameLayout.AddChidren(functionSceneBodyView);



            //开始初始化场景功能切换控件

            var listTitle = new List<string>();

            listTitle.Add(Language.StringByID(R.MyInternationalizationString.uScence));

            listTitle.Add(Language.StringByID(R.MyInternationalizationString.uFunction));
            btnSceneFunctionSwitch.InitControl(listTitle);
        }

        #endregion
@@ -192,11 +195,11 @@
        {
            functionSceneBodyView.RemoveAll();

            if (this.NowSelectIndex == 2)
            if (this.NowSelectIndex == 1)
            {
                ShowFunction();
            }
            else if (this.NowSelectIndex == 1)
            else if (this.NowSelectIndex == 0)
            {
                ShowScene();
            }