Browse Source

Merge branch 'develop' into feature/circle

南鑫林 5 years ago
parent
commit
100876e21d

+ 4 - 2
RainbowPlanet/Podfile

@@ -75,8 +75,6 @@ target 'RainbowPlanet' do
   # 内存泄露
 #  pod 'MLeaksFinder'
 #  pod 'FBMemoryProfiler'
-  # bug统计
-  pod 'Bugly'
 
 
 #======================第三方平台===========
@@ -123,5 +121,9 @@ target 'RainbowPlanet' do
   pod 'RongCloudIM/IMLib', '2.9.24'
   #融云 IM 界面组件
   pod 'RongCloudIM/IMKit', '2.9.24'
+  
+  #=====================Bugly===========
+  # bug统计
+  pod 'Bugly'
 
 end

+ 0 - 1
RainbowPlanet/RainbowPlanet/Modules/BackyardModule/Backyard/ViewController/BackyardViewController.swift

@@ -75,7 +75,6 @@ class BackyardViewController: BaseJSWebViewController {
         observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("loginOut"), object: nil, queue: OperationQueue.main, using: {
             [weak self] (notification) in
             WebViewJavascriptBridgeManager.shared.callHandlerH5(bridge: self?.bridge)
-
         })
         
         //将要进入前台的时候

+ 4 - 4
RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/ApiMacro.swift

@@ -11,14 +11,14 @@ import Foundation
 /// Service
 let kPersonalService = false
 let kDevelopSever = false
-let kBetaSever = true
-let kProductSever = false
+let kBetaSever = false
+let kProductSever = true
 
 /// H5Service
 let kH5PersonalService = false
 let kH5DevelopSever = false
-let kH5BetaSever = true
-let kH5ProductSever = false
+let kH5BetaSever = false
+let kH5ProductSever = true
 
 // MARK: - 数据服务器
 public func kApiDataPrefix() -> String {