合并了全部的代码

黄学彪

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;