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

lss

2020-06-10 b4912454b001d3287932463b9119dcdfb68e8ba4

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

@@ -2,7 +2,6 @@
//------------------------------------------------------------------------------
// <auto-generated>
//     This code was generated by a tool.
//     Runtime Version:4.0.30319.42000
//
//     Changes to this file may cause incorrect behavior and will be lost if
//     the code is regenerated.