2019.12.24

gxc

2019-12-24 0f6bf2b39fe1d3838c385eee86dc47a2260ad024

2019.12.24

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

@@ -2,21 +2,16 @@
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.8c0bdb303f25d82c2a42fb8bfca449bfaca00260" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Room/RoomHumiditySetting.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Category/Category.cs">
    <Files>
      <File FileName="Shared/R.cs" Line="2042" Column="35" />
      <File FileName="GateWay.Droid/Assets/Language.ini" />
      <File FileName="Shared/Phone/Device/Category/Category.cs" Line="664" Column="34" />
      <File FileName="Shared/Phone/Device/Category/Category.cs" Line="636" Column="9" />
      <File FileName="Shared/Phone/Device/Category/SelectDevice.cs" Line="1" Column="1" />
      <File FileName="Shared/Common/Device.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/UserView/UserHomeView.cs" Line="689" Column="63" />
      <File FileName="Shared/Phone/Device/Room/RoomManagement.cs" Line="190" Column="15" />
      <File FileName="Shared/Phone/UserView/UserPage.cs" Line="278" Column="26" />
      <File FileName="Shared/Phone/Device/CommonForm/CategoryFunctionForWinRow.cs" Line="227" Column="95" />
      <File FileName="Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs" Line="187" Column="21" />
      <File FileName="Shared/Common/Room.cs" Line="346" Column="47" />
      <File FileName="Shared/Phone/Device/Category/SelectFloor.cs" Line="123" Column="1" />
      <File FileName="Shared/Phone/Device/Room/RoomHumiditySetting.cs" Line="1" Column="1" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -27,11 +22,11 @@
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="Account" expanded="True" />
                  <Node name="Category" expanded="True" />
                  <Node name="CommonForm" expanded="True" />
                  <Node name="Room" expanded="True">
                    <Node name="RoomHumiditySetting.cs" selected="True" />
                  <Node name="Category" expanded="True">
                    <Node name="Category.cs" selected="True" />
                  </Node>
                  <Node name="CommonForm" expanded="True" />
                  <Node name="Room" expanded="True" />
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="CommonBase" expanded="True" />

 ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionForWinRow.cs

@@ -116,6 +116,7 @@
                TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                SelectedTextColor = ZigbeeColor.Current.GXCTextSelectedColor,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize=14
            };
            AddChidren(NameBtn);

@@ -126,7 +127,8 @@
                Width = Application.GetRealWidth(400),
                Height = Application.GetRealHeight(49),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2
                TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2,
                TextSize=10
            };
            AddChidren(StatuBtn);

@@ -235,7 +237,7 @@
        public void SetOnLineStatu(bool statu)
        {
            NameBtn.IsSelected = ImageBG.IsSelected = ImageBtn.IsSelected = statu;

            NameBtn.IsBold = statu;
        }

        /// <summary>

 ZigbeeApp/Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs

@@ -110,6 +110,7 @@
                TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                SelectedTextColor = ZigbeeColor.Current.GXCTextSelectedColor,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize=14,
                Tag = Tag
            };
            AddChidren(NameBtn);
@@ -121,7 +122,8 @@
                Width = Application.GetRealWidth(400),
                Height = Application.GetRealHeight(49),
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2
                TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2,
                TextSize=10
            };
            AddChidren(StatuBtn);

@@ -140,9 +142,9 @@
            var line = new Button()
            {
                X = Application.GetRealWidth(200),
                Y = Height - 2,
                Y = Height - 1,
                Width = Application.GetRealWidth(821),
                Height = 2,
                Height = 1,
                BackgroundColor = ZigbeeColor.Current.GXCGrayLineColor,
                Tag = Tag
            };
@@ -188,6 +190,7 @@
        {
            SwitchBtn.IsSelected = statu;
            NameBtn.IsSelected = ImageBG.IsSelected = ImageBtn.IsSelected = statu;
            NameBtn.IsBold = statu;
        }

        /// <summary>

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

@@ -91,7 +91,7 @@
            };
            bodyFrameLayout.AddChidren(verticalScrolView);

            var confirm = new Device.CommonForm.CompleteButton(1700, 700, 127);
            var confirm = new Device.CommonForm.CompleteButton(1700, 900, 127);
            confirm.SetTitle(R.MyInternationalizationString.Save);
            AddChidren(confirm);
            confirm.MouseUpEventHandler += (sender, e) =>