2020-07-20-2

陈嘉乐

2020-07-20 da9905ebb2794d276f37d798f1624c8c59dc074e

2020-07-20-2

优化UI界面

 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml

@@ -1,33 +1,41 @@
<Properties StartupConfiguration="{F1296E2C-3777-4385-85B2-DA77617E3178}|Default">
<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/CurrentDeviceState.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Logic/SkipView.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Logic/RoomAndDeviceView.cs" Line="487" Column="54" />
      <File FileName="Shared/Phone/Device/Logic/RoomAndDeviceView.cs" Line="341" Column="59" />
      <File FileName="GateWay.Droid/Assets/Language.ini" Line="687" Column="6" />
      <File FileName="Shared/R.cs" Line="1160" Column="22" />
      <File FileName="Shared/Phone/Category/CategoryMainForm.cs" Line="372" Column="1" />
      <File FileName="Shared/Phone/Category/CategoryMainForm.cs" Line="304" Column="24" />
      <File FileName="Shared/Phone/MainPage/Controls/DeviceFunctionUnallocatedControl.cs" Line="55" Column="73" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Controls/FrameLayoutControls/FrameLayoutStatuControl.cs" Line="358" Column="27" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/RoomDeviceGroupMenuControl.cs" Line="164" Column="1" />
      <File FileName="Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SafeguardLogControl.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/Device/Logic/AddScenePage.cs" Line="40" Column="83" />
      <File FileName="Shared/Phone/Device/Logic/LogicView/RoomClickView.cs" Line="8" Column="10" />
      <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="25" Column="16" />
      <File FileName="Shared/Phone/Device/Logic/AddScenePage.cs" Line="232" Column="34" />
      <File FileName="Shared/Phone/Device/Logic/LogicView/RoomClickView.cs" Line="37" Column="72" />
      <File FileName="Shared/Phone/Device/Logic/CurrentDeviceState.cs" Line="33" Column="1" />
      <File FileName="Shared/Common/ZigbeeColor.cs" Line="352" Column="42" />
      <File FileName="Shared/Phone/Device/Logic/SkipView.cs" Line="68" Column="47" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="GateWay" expanded="True">
            <Node name="GateWay.Droid" expanded="True" />
            <Node name="GateWay.Droid" expanded="True">
              <Node name="Assets" expanded="True">
                <Node name="Phone" expanded="True">
                  <Node name="ZigeeLogic" expanded="True" />
                </Node>
              </Node>
            </Node>
            <Node name="Home.IOS" expanded="True" />
            <Node name="Shared" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="Phone" expanded="True">
                <Node name="Category" expanded="True" />
                <Node name="Device" expanded="True">
                  <Node name="Logic" expanded="True">
                    <Node name="LogicView" expanded="True" />
                    <Node name="CurrentDeviceState.cs" selected="True" />
                    <Node name="SkipView.cs" selected="True" />
                  </Node>
                </Node>
                <Node name="UserCenter" expanded="True">

 ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs

@@ -249,8 +249,6 @@
                    roomTextButton = roomClickView.roomnameBtn;
                    roomClickView.roomnameBtn.IsSelected = true;

                    roomClickView.roombjBtn.IsSelected = true;
                    roomClickView.roomnameBtn.IsSelected = true;
                    SceneView(room.ListSceneId);

                }

 ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs

@@ -23,7 +23,11 @@
        /// <summary>
        /// 记录点击设备
        /// </summary>
        Button devicetypeButton = new Button();
        Button deviceTypeBjButton = new Button();
        /// <summary>
        /// 记录点击设备类型
        /// </summary>
        Button deviceTypeTextButton = new Button();
        FrameLayout clickframeLayout = new FrameLayout();
        Button clickbutton = new Button();
        Button clicktextcolcrbutton = new Button();
@@ -40,6 +44,18 @@
            Height = Application.GetRealHeight(204),
            X = Application.GetRealWidth(29),
            Y = Application.GetRealHeight(184),
        };
        /// <summary>
        /// 圆角17
        /// </summary>
        public HorizontalScrolViewLayout devicetypehorizontalScrol1 = new HorizontalScrolViewLayout
        {
            Width = Application.GetRealWidth(1080 - 52),
            Height = Application.GetRealHeight(50),
            Y = Application.GetRealHeight(184 + 204),
            BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
            X = Application.GetRealWidth(52),

        };
        /// <summary>
        /// 设备类型滑动的控件
@@ -97,15 +113,18 @@
            if (roomlists.Count == 0)
            {
                //返回没有房间隐藏下面整块;
                devicetypehorizontalScrol1.Height = 0;
                devicetypehorizontalScrol.Height = 0;
                middle.Height = 0;
            }
            /// 设备类型列表
            var deviceTypeList = Method.GetDevice(IfType);
            this.AddChidren(roomhorizontalScrol);
            this.AddChidren(devicetypehorizontalScrol1);
            this.AddChidren(devicetypehorizontalScrol);
            this.AddChidren(middle);
            devicetypehorizontalScrol.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerBottomLeft);
            devicetypehorizontalScrol1.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerTopLeft);
            devicetypehorizontalScrol.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerBottomLeft|HDLUtils.RectCornerTopLeft);
            middle.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerTopLeft);
            ///楼层点击事件
            view.foolrclickBtn.MouseUpEventHandler += (sender, e) =>
@@ -196,11 +215,13 @@
                          var list = Method.GetRoomList(IfType, btnfoolrname.Tag.ToString());
                          if (list.Count == 0)
                          {
                              devicetypehorizontalScrol1.Height = 0;
                              devicetypehorizontalScrol.Height = 0;
                              middle.Height = 0;
                          }
                          else
                          {
                              devicetypehorizontalScrol1.Height = 50;
                              devicetypehorizontalScrol.Height = Application.GetRealHeight(280);
                              middle.Height = Application.GetRealHeight(1920 - 40 - 184 - 280 - 200);
                          }
@@ -242,10 +263,6 @@
                    roomClickView.roomnameBtn.X = Application.GetRealWidth(60);
                    roomTextButton = roomClickView.roomnameBtn;
                    roomClickView.roomnameBtn.IsSelected = true;

                    roomClickView.roombjBtn.IsSelected = true;
                    roomClickView.roomnameBtn.IsSelected = true;


                    var list = Method.GetDeviceUIList(room, deviceTypeList);
                    AllDeviceTypeView(list);
@@ -343,8 +360,9 @@
                    Text = devicetype,
                    TextAlignment = TextAlignment.Center,
                    Y = backgroundColor.Bottom,
                    TextColor = ZigbeeColor.Current.LogicAddColor,
                    TextSize = 10,
                    TextColor =ZigbeeColor.Current.LogicBtnSelectedColor,
                    SelectedTextColor =ZigbeeColor.Current.LogicAddColor,
                };
                deviceRowLayout.AddChidren(devicetypename);

@@ -360,9 +378,15 @@

                EventHandler<MouseEventArgs> devicetypeclick = (sender13, e13) =>
                {
                    devicetypeButton.IsSelected = false;
                    devicetypeButton = backgroundColor;
                    deviceTypeBjButton.IsSelected = false;
                    deviceTypeBjButton = backgroundColor;
                    backgroundColor.IsSelected = true;

                    deviceTypeTextButton.IsSelected = false;
                    deviceTypeTextButton = devicetypename;
                    devicetypename.IsSelected = true;


                    var list = Method.GetDeviceType(devicetypename.Text);
                    ConditionDeviceView(list, devicelist);
                };

 ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs

@@ -74,6 +74,19 @@
            //functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
            #region   ---推荐模板的组件
            //推荐模板背景控件
          
           
            var bjFrameLayout1 = new FrameLayout
            {
                Width = Application.GetRealWidth(1080 - 58),
                Height = Application.GetRealHeight(50),
                BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
                X = Application.GetRealWidth(58),
                //Radius = (uint)Application.GetRealHeight(50),
                Y = Application.GetRealHeight(30),

            };
            functionSceneAutoBodyView.AddChidren(bjFrameLayout1);
            var bjFrameLayout = new FrameLayout
            {
                Width = Application.GetRealWidth(1080 - 58),
@@ -82,10 +95,10 @@
                X = Application.GetRealWidth(58),
                //Radius = (uint)Application.GetRealHeight(50),
                Y = Application.GetRealHeight(30),

            };
            functionSceneAutoBodyView.AddChidren(bjFrameLayout);
            bjFrameLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);
            bjFrameLayout1.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerTopLeft);
            bjFrameLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft|HDLUtils.RectCornerBottomLeft);
            //图标控件
            var sigBtn = new Button
            {