Merge branch 'master' of https://github.com/next-coder/CYUtilProject

Jasper · Jasper · commit 6a8576a772f6 · 2017-11-22T19:19:23.000+08:00
diff --git a/CYUtilProject/.DS_Store b/CYUtilProject/.DS_Store
diff --git a/CYUtilProject/CYUtilProject.xcodeproj/project.pbxproj b/CYUtilProject/CYUtilProject.xcodeproj/project.pbxproj
@@ -828,6 +828,15 @@
 		61091CB31CDAF563008B7EA3 /* CYShareSDK */ = {
 			isa = PBXGroup;
 			children = (
+<<<<<<< HEAD
+				61091CB71CDAF563008B7EA3 /* CYShare.h */,
+				61091CB81CDAF563008B7EA3 /* CYShare.m */,
+				61091CB41CDAF563008B7EA3 /* CYQQ */,
+				61091CB91CDAF563008B7EA3 /* CYShareBase */,
+				61091CBC1CDAF563008B7EA3 /* CYSinaWeibo */,
+				61091CBF1CDAF563008B7EA3 /* CYSMS */,
+				61091CC21CDAF563008B7EA3 /* CYWechat */,
+=======
 				A3A81D5E1F972AD100C26475 /* CustomShare */,
 				61091CB71CDAF563008B7EA3 /* CYShare.h */,
 				61091CB81CDAF563008B7EA3 /* CYShare.m */,
@@ -836,6 +845,7 @@
 				A36F4F0F1F9091D100E7F4B6 /* CYShareModel.h */,
 				A36F4F101F9091D100E7F4B6 /* CYShareModel.m */,
 				A3A81D591F95EDAA00C26475 /* CYShareCtrlFlag.h */,
+>>>>>>> 36863ad57a8d49d4e07b6aae27803eff09653aad
 				61091CC51CDAF563008B7EA3 /* Readme */,
 			);
 			path = CYShareSDK;
diff --git a/CYUtilProjectSwift/CYUtilProjectSwift/CYUtils/CYWebViewUtils/CYJSParametersSerialization/CYJSJSONParametersSerialization.swift b/CYUtilProjectSwift/CYUtilProjectSwift/CYUtils/CYWebViewUtils/CYJSParametersSerialization/CYJSJSONParametersSerialization.swift
@@ -10,10 +10,11 @@ import UIKit
 
 class CYJSJSONParametersSerialization: CYJSParametersSerialization {
 
-    override func serializeParameters(_ paramsString: String?) -> AnyObject? {
+    override func serializeParameters( paramsString: String?) -> AnyObject? {
 
         if let paramsStr = paramsString {
 
+            let jsonData = paramsStr.dataUsingEncoding(<#T##encoding: NSStringEncoding##NSStringEncoding#>)
             let jsonData = paramsStr.data(using: String.Encoding.utf8)
             if let data = jsonData {
 
