2019.11.15-1

gxc

2019-11-15 05ce435c3b58e53eeab04c672affdeeab75f3036

2019.11.15-1

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

@@ -4,17 +4,12 @@
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Category/Category.cs">
    <Files>
      <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1034" Column="60" />
      <File FileName="Shared/Phone/UserView/UserHomeView.cs" Line="1673" Column="25" />
      <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1463" Column="65" />
      <File FileName="Shared/Phone/UserView/UserHomeView.cs" Line="1671" Column="53" />
      <File FileName="Shared/Phone/Device/Room/EditRoom.cs" />
      <File FileName="Shared/Phone/Device/Account/AccountLogin.cs" Line="509" Column="33" />
      <File FileName="Shared/Phone/UserCenter/UserMain/QRCodeForm.cs" />
      <File FileName="GateWay.Droid/Application.cs" Line="106" Column="28" />
      <File FileName="Shared/Phone/Device/CommonForm/FunctionMainView.cs" Line="228" Column="36" />
      <File FileName="Shared/Phone/Device/CommonForm/TopFrameLayout.cs" Line="82" Column="35" />
      <File FileName="Shared/Common/DeviceUI.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/Device/Light/DimmableLightControl.cs" Line="1" Column="1" />
      <File FileName="Shared/Phone/Device/CommonForm/CategoryFunctionRow.cs" Line="1" Column="1" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">

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

Binary files differ

 ZigbeeApp/Shared/Common/ZigbeeColor.cs

@@ -186,6 +186,11 @@
        /// </summary>
        public uint GXCGrayLineColor2 = 0x66CCCCCC;
        /// <summary>
        /// 浅色线条 0xFFB7B8BB
        /// </summary>
        public uint GXCGrayLineColor3 = 0xFFB7B8BB;

        /// <summary>
        /// 按钮未选中状态 0xFF656565;
        /// </summary>
        public uint GXCButtonUnSelectedColor = 0xFF656565;

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

@@ -12,7 +12,7 @@
        /// </summary>
        public BackButton()
        {
            X = Application.GetRealWidth(58);
            X = Application.GetRealWidth(28);
            Height = Application.GetMinRealAverage(110);
            Width = Application.GetMinRealAverage(110);
            UnSelectedImagePath = "Account/Back.png";

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

@@ -68,6 +68,14 @@
                Width = Application.GetRealWidth(CommonPage.AppRealWidth)
            };
            AddChidren(topView);

            var line = new Button
            {
                Y=Height-1,
                Height=1,
                BackgroundColor=ZigbeeColor.Current.GXCGrayLineColor3
            };
            AddChidren(line);
        }

        #endregion