Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

 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;
@@ -300,6 +301,32 @@
        public uint LogicEditBlackColor = 0xFF00aaf0;
        public uint LogicTimeViewColor= 0xFFFFFFFF;
        public uint LogicTimeViewSaveButton = 0xFF121212;

        //最新UI颜色
        public uint LogicTopBackgroundColor = 0xFFF9F9F9;
        public uint LogicMiddleBackgroundColor = 0xFFF5F6FA;
        public uint LogicBlankBackgroundColor = 0xFFFFFFFF;
        public uint LogicRowLayoutLineColor = 0x40cccccc;
        public uint LogicRowLayoutTopLineColor = 0x25000000;
        public uint LogicBtnCancelColor = 0xFF999999;
        public uint LogicBtnTypeColor = 0xFF232323;
        public uint LogicBtnCompleteColor = 0xFFFB744A;
        public uint LogicBtnSelectedColor = 0xFF333333;
        public uint LogicBtnNotSelectedColor = 0xFF666666;
        public uint LogicBtnSaveBackgroundColor = 0xFF232323;
        public uint LogicBtnSaveTextColor = 0xFFFFFFFF;
        public uint LogicTranslucentColor = 0x50000000;
        public uint LogicAddColor = 0xFFFC744B;
        public uint LogicIconBackgroundColor = 0xFFFEF1ED;
        public uint LogicProgressColor = 0xFFE8E8E8;
        public uint LogicProgressColorSelected = 0xffFDB500;
        public uint LogicEditBlackColor1 = 0xFF4A4A4A;
        public uint LogicDelBlackColor1 = 0xFFF75858;
        public uint LogicFunction1Color = 0xFFFFa200;
        public uint LogicScene1Color = 0xFF4A90E2;
        public uint LogicSecurity1Color = 0xFF35B87F;
        public uint LogicDelay1Color = 0xFFBF64FB;
        public uint LogicListWeekTextColor = 0xFF666666;

        #endregion
    }
}