Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 ZigbeeApp/Shared/Common/ZigbeeColor.cs

old mode 100755
new mode 100644
@@ -35,7 +35,6 @@
        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;
@@ -299,8 +298,8 @@
        public uint LogicTextBlueColor = 0xFF00AAF0;
        public uint LogicDelBackgroundColor = 0xFFFF0000;
        public uint LogicEditBlackColor = 0xFF00aaf0;
        public uint LogicTimeViewColor= 0xFFFFFFFF;
        public uint LogicTimeViewSaveButton = 0xFF121212;

        public uint LogicTimeViewColor = 0xFFFFFFFF;
        public uint LogicTimeViewSaveButton = 0xFF121212;
        //最新UI颜色
        public uint LogicTopBackgroundColor = 0xFFF9F9F9;
        public uint LogicMiddleBackgroundColor = 0xFFF5F6FA;