合并了全部的代码

黄学彪

2019-10-18 97e259d966cb5cb5d73c105d5dbaadcc1f920614

 ZigbeeApp/Shared/Common/ZigbeeColor.cs

@@ -35,6 +35,7 @@
        public uint XMGray1 = 0xff232323;
        public uint XMGray2 = 0xff666666;
        public uint XMGray3 = 0xff999999;
        public uint XMGray4 = 0xffcccccc;
        public uint XMOrange = 0xfffc744b;
        public uint XMVerticalSeekBar = 0xffececec;
        public uint XMDel = 0xffF75858;
@@ -84,14 +85,14 @@
        /// 字体浅色 0xFFCBCACA
        /// </summary>
        public uint GXCTextGrayColor3 = 0xFFCBCACA;
      /// <summary>
      /// 字体浅色 0xFF666666
      /// </summary>
      public uint GXCTextGrayColor4 = 0xFF666666;
      /// <summary>
      /// 字体选中颜色 0xFFFC744B
      /// </summary>
      public uint GXCTextSelectedColor = 0xFFFC744B;
        /// <summary>
        /// 字体浅色 0xFF666666
        /// </summary>
        public uint GXCTextGrayColor4 = 0xFF666666;
        /// <summary>
        /// 字体选中颜色 0xFFFC744B
        /// </summary>
        public uint GXCTextSelectedColor = 0xFFFC744B;
        /// <summary>
        /// 字体选中颜色 0xFFFB744A
        /// </summary>
@@ -241,20 +242,20 @@


        public uint GXCTextBlueColor = 0xFF00AAF0;
        
       
        



        public uint GXCBorderRedColor = 0xFFF44D4D;


        public uint GXCButtonBlueColor = 0xFF00AAF0;
        public uint GXCButtonUnselectedColor = 0xFFAAAAAA;
        public uint GXCTextUnselectedColor= 0xFFD5D6D7;
       
  
        public uint GXCTextUnselectedColor = 0xFFD5D6D7;


        public uint GXCSelectedColor = 0xFFFE5E00;//选中颜色
        public uint GXCButtonhardWhiteColor = 0xFFE0E0E0;//房间btn半透明背景色
       

        /// <summary>
        /// 30%透明度黑色
        /// </summary>
@@ -290,7 +291,7 @@
        public uint LogicTextBlueColor = 0xFF00AAF0;
        public uint LogicDelBackgroundColor = 0xFFFF0000;
        public uint LogicEditBlackColor = 0xFF00aaf0;
        public uint LogicTimeViewColor = 0xFFFFFFFF;
        public uint LogicTimeViewColor= 0xFFFFFFFF;
        public uint LogicTimeViewSaveButton = 0xFF121212;

        //最新UI颜色
        public uint LogicTopBackgroundColor = 0xFFF9F9F9;