南鑫林 5 anni fa
parent
commit
172dc554a6

+ 1 - 1
RainbowPlanet/RainbowPlanet/Manager/RongCloudIMManager/RongCloudIMManager.swift

@@ -63,7 +63,7 @@ class RongCloudIMManager: NSObject {
         //开启多端未读状态同步
         RCIM.shared()?.enableSyncReadStatus = true
         //是否在发送的所有消息中携带当前登录的用户信息,默认值为 NO
-        RCIM.shared()?.enableMessageAttachUserInfo = false
+        RCIM.shared()?.enableMessageAttachUserInfo = true
         //设置头像为圆形
         RCIM.shared()?.globalMessagePortraitSize = CGSize(width: 50, height: 50)
         RCIM.shared()?.globalMessageAvatarStyle = .USER_AVATAR_CYCLE

+ 1 - 1
RainbowPlanet/RainbowPlanet/Modules/RongCloudIMModule/IMChatRoom/ViewController/IMChatRoomViewController.swift

@@ -45,7 +45,6 @@ class IMChatRoomViewController: RCConversationViewController {
     @objc func backAction(sender:Any) {
         // 推荐页面清理工作
         leftBarButtonItemPressed(sender)
-        UICollectionView.appearance().contentInset = UIEdgeInsets(top: 0,left: 0,bottom: 0,right: 0)
     }
     
     override func viewWillAppear(_ animated: Bool) {
@@ -53,6 +52,7 @@ class IMChatRoomViewController: RCConversationViewController {
         navigationController?.navigationBar.isHidden = false
         navigationController?.navigationBar.isTranslucent = false
         navigationItem.leftBarButtonItem = UIBarButtonItem(image: kImage(name: "navbar_back_white"), style: UIBarButtonItem.Style.done, target: self, action: #selector(backAction(sender:)))
+        UICollectionView.appearance().contentInset = UIEdgeInsets(top: 0,left: 0,bottom: 0,right: 0)
 
     }
     

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

@@ -10,20 +10,20 @@ import Foundation
 
 /// Service
 let kPersonalService = false
-let kDevelopSever = true
-let kBetaSever = false
+let kDevelopSever = false
+let kBetaSever = true
 let kProductSever = false
 
 /// H5Service
 let kH5PersonalService = false
-let kH5DevelopSever = true
-let kH5BetaSever = false
+let kH5DevelopSever = false
+let kH5BetaSever = true
 let kH5ProductSever = false
 
 // MARK: - 数据服务器
 public func kApiDataPrefix() -> String {
     if kPersonalService /** 接口前缀-个人服务器*/ {
-        return ""
+        return "http://192.168.23.238:8820"
     }else if kDevelopSever /** 接口前缀-开发服务器*/ {
         return "https://api.dev.caihongxingqiu.com"
     } else if kBetaSever /** 接口前缀-测试服务器*/{

+ 4 - 2
RainbowPlanet/RainbowPlanet/Tools/StartupPageView/StartupPageView.swift

@@ -78,8 +78,10 @@ class StartupPageView: UIView {
     
     //跳转H5
     @objc func imageViewAction() {
-        removeAnimateView()
-        Mediator.push(H5RouterModuleType.pushWeb(URLString: startupModel?.url ?? "http://www.uptoyo.com"), animated: true)
+        if startupModel?.url != "" {
+            removeAnimateView()
+            Mediator.push(H5RouterModuleType.pushWeb(URLString: startupModel?.url ?? "http://www.uptoyo.com"), animated: true)
+        }
     }
     
     //跳过