请合并最新的代码

xm

2020-03-23 115c3071ec765bed679d4b083d6799a1edb6fba6

77da402d602c9b275eb41d311cb108f034aaba2c 目录中不存在 ZigbeeApp/GateWay.Droid/ZXing/ZXingCustomScanView.cs