2019.12.30

gxc

2019-12-30 0a29eff6a0db2015622d682497fa868b637a115b

2019.12.30

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

@@ -2,21 +2,18 @@
  <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/RoomTemperatureSetting.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/CommonForm/SceneMainView.cs">
    <Files>
      <File FileName="Shared/R.cs" Line="809" Column="16" />
      <File FileName="GateWay.Droid/Assets/Language.ini" />
      <File FileName="Shared/Phone/Device/Category/Category.cs" />
      <File FileName="Shared/Phone/Device/Category/SelectDevice.cs" />
      <File FileName="Shared/Common/Device.cs" />
      <File FileName="Shared/Phone/UserView/UserHomeView.cs" />
      <File FileName="Shared/Phone/UserView/UserHomeView.cs" Line="1083" Column="68" />
      <File FileName="Shared/Phone/Device/Light/LightControl.cs" />
      <File FileName="Shared/Phone/Device/Category/CategoryAddScene.cs" />
      <File FileName="Shared/Phone/Device/CommonForm/RoomView.cs" Line="242" Column="62" />
      <File FileName="Shared/Phone/Device/Room/EditRoom.cs" Line="124" Column="75" />
      <File FileName="Shared/Phone/Device/Room/RoomTemperatureSetting.cs" Line="114" Column="19" />
      <File FileName="Shared/Phone/Device/Room/RoomHumiditySetting.cs" Line="110" Column="16" />
      <File FileName="Shared/Phone/Device/CommonForm/DeviceInfoWithZoneRow.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/Device/CommonForm/FunctionMainView.cs" Line="162" Column="28" />
      <File FileName="Shared/Phone/Device/CommonForm/SceneMainView.cs" Line="1" Column="1" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -26,12 +23,12 @@
              <Node name="Common" expanded="True" />
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="CommonForm" expanded="True" />
                  <Node name="CommonForm" expanded="True">
                    <Node name="SceneMainView.cs" selected="True" />
                  </Node>
                  <Node name="DeviceLogic" expanded="True" />
                  <Node name="Light" expanded="True" />
                  <Node name="Room" expanded="True">
                    <Node name="RoomTemperatureSetting.cs" selected="True" />
                  </Node>
                  <Node name="Room" expanded="True" />
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="Residence" expanded="True" />

 ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide

Binary files differ

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

@@ -101,7 +101,8 @@
                Height = Application.GetMinRealAverage(63),
                TextColor = ZigbeeColor.Current.GXCTextGrayColor,
                SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
                TextAlignment=TextAlignment.CenterLeft
                TextAlignment=TextAlignment.CenterLeft,
                TextSize=16
            };
            AddChidren(NameButton);

@@ -156,7 +157,9 @@
                Height = Application.GetMinRealAverage(60),
                TextColor = ZigbeeColor.Current.GXCTextBlackColor,
                SelectedTextColor = ZigbeeColor.Current.GXCTextSelectedColor,
                TextAlignment=TextAlignment.CenterLeft
                TextAlignment=TextAlignment.CenterLeft,
                TextSize=14,
                IsBold=true
            };
            AddChidren(StatuButton);

@@ -177,9 +180,10 @@
        /// SetStatu
        /// </summary>
        /// <param name="statu"></param>
        public void SetStatu(bool statu)
        private void SetStatu(bool statu)
        {
            NameButton.IsSelected = IconButton.IsSelected = SwitchButton.IsSelected = StatuButton.IsSelected = CardBG.IsSelected = statu;
            NameButton.IsBold = statu;
        }

        /// <summary>

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

@@ -149,6 +149,8 @@
                TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
                SelectedTextColor = ZigbeeColor.Current.GXCTextSelectedColor,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize=14,
                IsBold=true
            };
            AddChidren(SceneNameButton);
        }