Merge branch 'home_xm' of http://172.16.1.23:6688/r/~xm/HomeApp into home_xm

xm

2020-08-28 36036ca3b0258a2bcee1201f5aeae61192e313c8

Merge branch 'home_xm' of http://172.16.1.23:6688/r/~xm/HomeApp into home_xm

 ZigbeeApp20200825/GateWay.Droid/Resources/Resource.designer.cs

Diff too large

 ZigbeeApp20200825/Shared/Phone/ZigBee/Common/OwnCodes.cs

@@ -8,7 +8,7 @@
    {

        /// <summary>

        /// 将RGB转换为颜色

        /// 将RGB转换为颜色。。。

        /// </summary>

        /// <param name="R"></param>

        /// <param name="G"></param>