Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0

Browse Source

Former-commit-id: c535c7d1b4e61825d82f85fd23f980aa55aef0a8

TangShanKaiPing

zhengpengju 5 years ago

parent 52d315621c 4cc5b5ee9b

commit f261d026ce

2614 changed files with 497 additions and 40141 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

0

projects/IoTClient/.gitignore → labs/IoTClient/.gitignore vendored

Unescape Escape View File

0

projects/IoTClient/.vscode/settings.json → labs/IoTClient/.vscode/settings.json vendored

Unescape Escape View File

0

projects/IoTClient/Assembly-CSharp.csproj → labs/IoTClient/Assembly-CSharp.csproj

Unescape Escape View File

0

projects/IoTClient/Assembly-CSharp.csproj.user → labs/IoTClient/Assembly-CSharp.csproj.user

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins.meta → labs/IoTClient/Assets/Plugins.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/Android.meta → labs/IoTClient/Assets/Plugins/Android.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/Android/UniWebView.aar → labs/IoTClient/Assets/Plugins/Android/UniWebView.aar

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/Android/UniWebView.aar.meta → labs/IoTClient/Assets/Plugins/Android/UniWebView.aar.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/NetCoreSerial.dll → labs/IoTClient/Assets/Plugins/NetCoreSerial.dll

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/NetCoreSerial.dll.meta → labs/IoTClient/Assets/Plugins/NetCoreSerial.dll.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/UniWebView.bundle.meta → labs/IoTClient/Assets/Plugins/UniWebView.bundle.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/UniWebView.bundle/Contents.meta → labs/IoTClient/Assets/Plugins/UniWebView.bundle/Contents.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/UniWebView.bundle/Contents/Info.plist → labs/IoTClient/Assets/Plugins/UniWebView.bundle/Contents/Info.plist

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/UniWebView.bundle/Contents/Info.plist.meta → labs/IoTClient/Assets/Plugins/UniWebView.bundle/Contents/Info.plist.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/UniWebView.bundle/Contents/MacOS.meta → labs/IoTClient/Assets/Plugins/UniWebView.bundle/Contents/MacOS.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/UniWebView.bundle/Contents/MacOS/UniWebView → labs/IoTClient/Assets/Plugins/UniWebView.bundle/Contents/MacOS/UniWebView

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/UniWebView.bundle/Contents/MacOS/UniWebView.meta → labs/IoTClient/Assets/Plugins/UniWebView.bundle/Contents/MacOS/UniWebView.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/UniWebView.bundle/Contents/_CodeSignature.meta → labs/IoTClient/Assets/Plugins/UniWebView.bundle/Contents/_CodeSignature.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/UniWebView.bundle/Contents/_CodeSignature/CodeResources → labs/IoTClient/Assets/Plugins/UniWebView.bundle/Contents/_CodeSignature/CodeResources

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/UniWebView.bundle/Contents/_CodeSignature/CodeResources.meta → labs/IoTClient/Assets/Plugins/UniWebView.bundle/Contents/_CodeSignature/CodeResources.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS.meta → labs/IoTClient/Assets/Plugins/iOS.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/Decoder.h → labs/IoTClient/Assets/Plugins/iOS/Decoder.h

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/Decoder.h.meta → labs/IoTClient/Assets/Plugins/iOS/Decoder.h.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/EZCodeScannerViewController.h → labs/IoTClient/Assets/Plugins/iOS/EZCodeScannerViewController.h

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/EZCodeScannerViewController.h.meta → labs/IoTClient/Assets/Plugins/iOS/EZCodeScannerViewController.h.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/EZCodeScannerViewController.mm → labs/IoTClient/Assets/Plugins/iOS/EZCodeScannerViewController.mm

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/EZCodeScannerViewController.mm.meta → labs/IoTClient/Assets/Plugins/iOS/EZCodeScannerViewController.mm.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/Exception.h → labs/IoTClient/Assets/Plugins/iOS/Exception.h

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/Exception.h.meta → labs/IoTClient/Assets/Plugins/iOS/Exception.h.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/Image.h → labs/IoTClient/Assets/Plugins/iOS/Image.h

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/Image.h.meta → labs/IoTClient/Assets/Plugins/iOS/Image.h.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/ImageScanner.h → labs/IoTClient/Assets/Plugins/iOS/ImageScanner.h

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/ImageScanner.h.meta → labs/IoTClient/Assets/Plugins/iOS/ImageScanner.h.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/Processor.h → labs/IoTClient/Assets/Plugins/iOS/Processor.h

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/Processor.h.meta → labs/IoTClient/Assets/Plugins/iOS/Processor.h.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/Scanner.h → labs/IoTClient/Assets/Plugins/iOS/Scanner.h

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/Scanner.h.meta → labs/IoTClient/Assets/Plugins/iOS/Scanner.h.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/Symbol.h → labs/IoTClient/Assets/Plugins/iOS/Symbol.h

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/Symbol.h.meta → labs/IoTClient/Assets/Plugins/iOS/Symbol.h.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/Video.h → labs/IoTClient/Assets/Plugins/iOS/Video.h

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/Video.h.meta → labs/IoTClient/Assets/Plugins/iOS/Video.h.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/Window.h → labs/IoTClient/Assets/Plugins/iOS/Window.h

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/Window.h.meta → labs/IoTClient/Assets/Plugins/iOS/Window.h.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/ZBarCameraSimulator.h → labs/IoTClient/Assets/Plugins/iOS/ZBarCameraSimulator.h

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/ZBarCameraSimulator.h.meta → labs/IoTClient/Assets/Plugins/iOS/ZBarCameraSimulator.h.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/ZBarCaptureReader.h → labs/IoTClient/Assets/Plugins/iOS/ZBarCaptureReader.h

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/ZBarCaptureReader.h.meta → labs/IoTClient/Assets/Plugins/iOS/ZBarCaptureReader.h.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/ZBarHelpController.h → labs/IoTClient/Assets/Plugins/iOS/ZBarHelpController.h

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/ZBarHelpController.h.meta → labs/IoTClient/Assets/Plugins/iOS/ZBarHelpController.h.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/ZBarImage.h → labs/IoTClient/Assets/Plugins/iOS/ZBarImage.h

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/ZBarImage.h.meta → labs/IoTClient/Assets/Plugins/iOS/ZBarImage.h.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/ZBarImageScanner.h → labs/IoTClient/Assets/Plugins/iOS/ZBarImageScanner.h

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/ZBarImageScanner.h.meta → labs/IoTClient/Assets/Plugins/iOS/ZBarImageScanner.h.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/ZBarReaderController.h → labs/IoTClient/Assets/Plugins/iOS/ZBarReaderController.h

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/ZBarReaderController.h.meta → labs/IoTClient/Assets/Plugins/iOS/ZBarReaderController.h.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/ZBarReaderView.h → labs/IoTClient/Assets/Plugins/iOS/ZBarReaderView.h

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/ZBarReaderView.h.meta → labs/IoTClient/Assets/Plugins/iOS/ZBarReaderView.h.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/ZBarReaderViewController.h → labs/IoTClient/Assets/Plugins/iOS/ZBarReaderViewController.h

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/ZBarReaderViewController.h.meta → labs/IoTClient/Assets/Plugins/iOS/ZBarReaderViewController.h.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/ZBarSDK.h → labs/IoTClient/Assets/Plugins/iOS/ZBarSDK.h

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/ZBarSDK.h.meta → labs/IoTClient/Assets/Plugins/iOS/ZBarSDK.h.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/ZBarSymbol.h → labs/IoTClient/Assets/Plugins/iOS/ZBarSymbol.h

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/ZBarSymbol.h.meta → labs/IoTClient/Assets/Plugins/iOS/ZBarSymbol.h.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/libUniWebView.a → labs/IoTClient/Assets/Plugins/iOS/libUniWebView.a

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/libUniWebView.a.meta → labs/IoTClient/Assets/Plugins/iOS/libUniWebView.a.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/libzbar.a → labs/IoTClient/Assets/Plugins/iOS/libzbar.a

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/libzbar.a.meta → labs/IoTClient/Assets/Plugins/iOS/libzbar.a.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/zbar.h → labs/IoTClient/Assets/Plugins/iOS/zbar.h

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/iOS/zbar.h.meta → labs/IoTClient/Assets/Plugins/iOS/zbar.h.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/zxing.unity.dll → labs/IoTClient/Assets/Plugins/zxing.unity.dll

Unescape Escape View File

0

projects/IoTClient/Assets/Plugins/zxing.unity.dll.meta → labs/IoTClient/Assets/Plugins/zxing.unity.dll.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Scenes.meta → labs/IoTClient/Assets/Scenes.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Scenes/FaceDetectionScene.unity → labs/IoTClient/Assets/Scenes/FaceDetectionScene.unity

Unescape Escape View File

0

projects/IoTClient/Assets/Scenes/FaceDetectionScene.unity.meta → labs/IoTClient/Assets/Scenes/FaceDetectionScene.unity.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Scenes/SerialPortScene.unity → labs/IoTClient/Assets/Scenes/SerialPortScene.unity

Unescape Escape View File

0

projects/IoTClient/Assets/Scenes/SerialPortScene.unity.meta → labs/IoTClient/Assets/Scenes/SerialPortScene.unity.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Scenes/VlcPlayerScene.unity → labs/IoTClient/Assets/Scenes/VlcPlayerScene.unity

Unescape Escape View File

0

projects/IoTClient/Assets/Scenes/VlcPlayerScene.unity.meta → labs/IoTClient/Assets/Scenes/VlcPlayerScene.unity.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Scenes/WebViewScene.unity → labs/IoTClient/Assets/Scenes/WebViewScene.unity

Unescape Escape View File

0

projects/IoTClient/Assets/Scenes/WebViewScene.unity.meta → labs/IoTClient/Assets/Scenes/WebViewScene.unity.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Scripts.meta → labs/IoTClient/Assets/Scripts.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Scripts/BarcodeCam.cs → labs/IoTClient/Assets/Scripts/BarcodeCam.cs

Unescape Escape View File

0

projects/IoTClient/Assets/Scripts/BarcodeCam.cs.meta → labs/IoTClient/Assets/Scripts/BarcodeCam.cs.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Scripts/ButtonPress.cs → labs/IoTClient/Assets/Scripts/ButtonPress.cs

Unescape Escape View File

0

projects/IoTClient/Assets/Scripts/ButtonPress.cs.meta → labs/IoTClient/Assets/Scripts/ButtonPress.cs.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Scripts/FaceDetectionController.cs → labs/IoTClient/Assets/Scripts/FaceDetectionController.cs

Unescape Escape View File

0

projects/IoTClient/Assets/Scripts/FaceDetectionController.cs.meta → labs/IoTClient/Assets/Scripts/FaceDetectionController.cs.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Scripts/LoginResult.cs → labs/IoTClient/Assets/Scripts/LoginResult.cs

Unescape Escape View File

0

projects/IoTClient/Assets/Scripts/LoginResult.cs.meta → labs/IoTClient/Assets/Scripts/LoginResult.cs.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Scripts/SerialPortController.cs → labs/IoTClient/Assets/Scripts/SerialPortController.cs

Unescape Escape View File

0

projects/IoTClient/Assets/Scripts/SerialPortController.cs.meta → labs/IoTClient/Assets/Scripts/SerialPortController.cs.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Scripts/VlcPlayerController.cs → labs/IoTClient/Assets/Scripts/VlcPlayerController.cs

Unescape Escape View File

0

projects/IoTClient/Assets/Scripts/VlcPlayerController.cs.meta → labs/IoTClient/Assets/Scripts/VlcPlayerController.cs.meta

Unescape Escape View File

0

projects/IoTClient/Assets/Scripts/WebViewController.cs → labs/IoTClient/Assets/Scripts/WebViewController.cs

Unescape Escape View File

0

projects/IoTClient/Assets/Scripts/WebViewController.cs.meta → labs/IoTClient/Assets/Scripts/WebViewController.cs.meta

Unescape Escape View File

0

projects/IoTClient/Assets/StreamingAssets.meta → labs/IoTClient/Assets/StreamingAssets.meta

Unescape Escape View File

0

projects/IoTClient/Assets/StreamingAssets/wwwroot.meta → labs/IoTClient/Assets/StreamingAssets/wwwroot.meta

Unescape Escape View File

0

projects/IoTClient/Assets/StreamingAssets/wwwroot/config.html → labs/IoTClient/Assets/StreamingAssets/wwwroot/config.html

Unescape Escape View File

0

projects/IoTClient/Assets/StreamingAssets/wwwroot/config.html.meta → labs/IoTClient/Assets/StreamingAssets/wwwroot/config.html.meta

Unescape Escape View File

0

projects/IoTClient/Assets/StreamingAssets/wwwroot/index.html → labs/IoTClient/Assets/StreamingAssets/wwwroot/index.html

Unescape Escape View File

Some files were not shown because too many files have changed in this diff Show More

Write Preview

Loading…

Cancel

Save