[ci skip] bug fixed

srea · Dec 3, 2019 · 90fa597 · 90fa597
1 parent a09bf98
commit 90fa597
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/Browser/src/app.js b/Browser/src/app.js
@@ -27,7 +27,7 @@ sock.addEventListener("message", e => {
         }
     } else {
         const blob = new Blob([e.data], {
-            type: 'image/jpeg'
+            type: 'image/png'
         });
         var blobURL = blobUtil.createObjectURL(blob);
         document.getElementById('capture').setAttribute('src', blobURL);

diff --git a/RIBsTreeViewerClient.xcodeproj/project.pbxproj b/RIBsTreeViewerClient.xcodeproj/project.pbxproj
@@ -312,13 +312,13 @@
 				);
 				INFOPLIST_FILE = RIBsTreeViewerClient/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = co.minipro.app.RIBsTreeViewerClient;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -346,13 +346,13 @@
 				);
 				INFOPLIST_FILE = RIBsTreeViewerClient/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = co.minipro.app.RIBsTreeViewerClient;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;

diff --git a/RIBsTreeViewerClient/Sources/RIBsTreeViewer.swift b/RIBsTreeViewerClient/Sources/RIBsTreeViewer.swift
@@ -32,7 +32,7 @@ public class RIBsTreeViewerImpl {
         if let url = url {
             self.webSocket = WebSocketClient.init(url: URL(string: url)!)
         } else {
-            self.webSocket = WebSocketClient.init(url: URL(string: "wc://0.0.0.0:8080")!)
+            self.webSocket = WebSocketClient.init(url: URL(string: "ws://0.0.0.0:8080")!)
         }
         self.webSocket.delegate = self
         self.webSocket.connect()
@@ -52,7 +52,7 @@ public class RIBsTreeViewerImpl {
                 let jsonString = String(bytes: jsonData, encoding: .utf8)!
                 self?.webSocket.send(text: jsonString)
             } catch {
-                print(error)
+                // print(error)
             }
         })
             .disposed(by: disposeBag)
@@ -158,6 +158,7 @@ class WebSocketClient: NSObject {
 
     func connect() {
         webSocketTask.resume()
+        listen()
     }
 
     func disconnect() {
@@ -197,6 +198,7 @@ class WebSocketClient: NSObject {
             case .failure(let error):
                 self.delegate?.onError(client: self, error: error)
             }
+            self.listen()
         }
     }