fix(*):merge master conflict

Documentation.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e5655844e77cd49d8a69c4a299e31419
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Documentations.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: e4ba437884454210a12d7af49d0debbd
-timeCreated: 1616744125

Plugins/Android/libs/TapCommon_2.0.0.aar.meta

@@ -0,0 +1,32 @@
+fileFormatVersion: 2
+guid: 2944ce6fc8cb3410b91c55267d05e83b
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Plugins/iOS/TapCommonSDK.framework/Headers/TDSWSWebSocket.h

@@ -100,9 +100,10 @@
 - (nonnull instancetype)initWithURL:(nonnull NSURL *)url protocols:(nullable NSArray*)protocols callbackQueue:(nonnull dispatch_queue_t)callbackQueue connectTimeout:(NSTimeInterval)connectTimeout;
 
 /**
- connect to the host
+ connect to the host - blocking
+ @return YES if successfully connected
  */
-- (void)connect;
+- (BOOL)connect;
 
 /**
  disconnect to the host. This sends the close Connection opcode to terminate cleanly.

README.md

@@ -1,2 +1,2 @@
-## [TapTap.Common](./Documentations/README.md)
+## [TapTap.Common](./Documentation/README.md)
 

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "com.tapsdk.common",
+  "name": "com.taptap.tds.common",
-  "displayName": "Tap Common",
+  "displayName": "TapTap Common",
   "description": "TapTap Develop Service",
   "version": "2.0.0",
   "unity": "2018.3",