no message

RainbowPlanet/Podfile

@@ -63,7 +63,8 @@ target 'RainbowPlanet' do
   pod 'PGDatePicker'
   # 生成二维码
   pod 'EFQRCode'
-
+  # 全屏禁用手势
+#  pod 'FDFullscreenPopGesture'
   # Label扩展
   pod 'YYText'
 

RainbowPlanet/Podfile.lock

@@ -266,6 +266,6 @@ SPEC CHECKSUMS:
   YYText: 5c461d709e24d55a182d1441c41dc639a18a4849
   ZipArchive: e25a4373192673e3229ac8d6e9f64a3e5713c966
 
-PODFILE CHECKSUM: 4cddb48fff1be6a7c6857e2f178e6e2fe2d29e27
+PODFILE CHECKSUM: 72741693a8fb1e89c2f5e5afd4709d197dd89676
 
 COCOAPODS: 1.8.4

RainbowPlanet/RainbowPlanet/Base/BaseWebViewController/BaseNewWebViewController.swift

@@ -68,10 +68,4 @@ class BaseNewWebViewController: BaseViewController {
         return webView
     }()
     
-    override func willMove(toParent parent: UIViewController?) {
-        if !(parent != nil) {
-//            webView.goBack()
-        }
-    }
-    
 }

RainbowPlanet/RainbowPlanet/Macro/RainbowPlanet-Bridging-Header.h

@@ -92,6 +92,8 @@
 #import "WKWebView+PAWebCache.h"
 #import "NSObject+PARuntime.h"
 
+//#import "UINavigationController+FDFullscreenPopGesture.h"
+
 
 
 

RainbowPlanet/RainbowPlanet/Model/UserModel/UserModel.swift

@@ -202,41 +202,41 @@ public class UserModel : NSObject, NSCoding, Mappable{
         
         var userInfoDic = Dictionary<String,Any>()
         userInfoDic.updateValue("userInfo", forKey: "type")
-//        var userModelDic = Dictionary<String,Any>()
-//        if userModel?.gender == nil {
-//            userModelDic.updateValue("" as Any, forKey: "gender")
-//        }
-//        if userModel?.isPassword == nil {
-//            userModelDic.updateValue("" as Any, forKey: "is_password")
-//        }
-//        if userModel?.tokenTtl == nil {
-//            userModelDic.updateValue("" as Any, forKey: "token_ttl")
-//        }
-//        if userModel?.uid == nil {
-//            userModelDic.updateValue("" as Any, forKey: "uid")
-//        }
-//        if userModel?.isFollowSuggestTopic == nil {
-//            userModelDic.updateValue("" as Any, forKey: "is_follow_suggest_topic")
-//        }
-//        if userModel?.isNewMember == nil {
-//            userModelDic.updateValue("" as Any, forKey: "is_new_member")
-//        }
-//        if userModel?.inviteUid == nil {
-//            userModelDic.updateValue("" as Any, forKey: "invite_uid")
-//        }
-//
-//        if userModel?.bindWeixinUserModel == nil {
-//            userModel?.bindWeixinUserModel = BindThirdPartyUserModel()
-//        }
-//
-//        if userModel?.bindQQUserModel == nil {
-//            userModel?.bindQQUserModel = BindThirdPartyUserModel()
-//        }
-//
-//        userModelDic.append(dict: (userModel?.toJSON())!)
-//        userInfoDic.updateValue(userModelDic as Any, forKey: "params")
-//        NXLLog(JSON(userInfoDic).debugDescription)
-        userInfoDic.updateValue(userModel?.toJSON() as Any, forKey: "params")
+        var userModelDic = Dictionary<String,Any>()
+        if userModel?.gender == nil {
+            userModelDic.updateValue("" as Any, forKey: "gender")
+        }
+        if userModel?.isPassword == nil {
+            userModelDic.updateValue("" as Any, forKey: "is_password")
+        }
+        if userModel?.tokenTtl == nil {
+            userModelDic.updateValue("" as Any, forKey: "token_ttl")
+        }
+        if userModel?.uid == nil {
+            userModelDic.updateValue("" as Any, forKey: "uid")
+        }
+        if userModel?.isFollowSuggestTopic == nil {
+            userModelDic.updateValue("" as Any, forKey: "is_follow_suggest_topic")
+        }
+        if userModel?.isNewMember == nil {
+            userModelDic.updateValue("" as Any, forKey: "is_new_member")
+        }
+        if userModel?.inviteUid == nil {
+            userModelDic.updateValue("" as Any, forKey: "invite_uid")
+        }
+
+        if userModel?.bindWeixinUserModel == nil {
+            userModel?.bindWeixinUserModel = BindThirdPartyUserModel()
+        }
+
+        if userModel?.bindQQUserModel == nil {
+            userModel?.bindQQUserModel = BindThirdPartyUserModel()
+        }
+
+        userModelDic.append(dict: (userModel?.toJSON())!)
+        userInfoDic.updateValue(userModelDic as Any, forKey: "params")
+        NXLLog(JSON(userInfoDic).debugDescription)
+//        userInfoDic.updateValue(userModel?.toJSON() as Any, forKey: "params")
         return userInfoDic
     }
 

RainbowPlanet/RainbowPlanet/Modules/H5Modules/H5Common/ViewController/H5CommonViewController.swift

@@ -75,5 +75,7 @@ class H5CommonViewController: BaseNewWebViewController {
         
     }
     
+    
+    
 }
 

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishArticle/ViewController/PublishArticleViewController.swift

@@ -40,6 +40,13 @@ class PublishArticleViewController: BaseNewWebViewController {
     
     override func setupData() {
         super.setupData()
+        
+        WebViewJavascriptBridgeManager.shared.callHandlerH5(bridge: webView.bridge)
+        
+        WebViewJavascriptBridgeManager.shared.registerHandlerApp(bridge: webView.bridge) { (wvjbModel) in
+            WebViewJavascriptBridgeManager.shared.jump(wvjbModel: wvjbModel)
+        }
+        
         WebViewJavascriptBridgeManager.shared.callDataClosure = {
             [weak self] wbjbModel in
             switch (wbjbModel.params?.status ?? 0) {