替换im聊天底部的工具图标

o2ios/O2Platform/App/BBS-论坛/c/BBSSubjectDetailViewController.swift

@@ -61,7 +61,7 @@ class BBSSubjectDetailViewController: BaseWebViewUIViewController {
         self.window?.makeKeyAndVisible()
     }
     
-    func replyAction(sender:Any?){
+    @objc func replyAction(sender:Any?){
         self.performSegue(withIdentifier:"showReplyActionSegue", sender: nil)
     }
     

o2ios/O2Platform/App/BBS-论坛/c/BBSSubjectListViewController.swift

@@ -84,7 +84,7 @@ class BBSSubjectListViewController: UIViewController {
         self.window?.makeKeyAndVisible()
     }
     
-    func createAction(sender:Any?){
+    @objc func createAction(sender:Any?){
         self.performSegue(withIdentifier: "showCreateSubjectSegue", sender: nil)
     }
     
@@ -92,7 +92,7 @@ class BBSSubjectListViewController: UIViewController {
         self.subjects.removeAll()
         let url = AppDelegate.o2Collect.generateURLWithAppContextKey(BBSContext.bbsContextKey, query: BBSContext.subjectFromSectionByPageQuery, parameter: ["##pageNumber##":self.pageModel.pageNumber.toString as AnyObject,"##pageSize##":self.pageModel.pageSize.toString as AnyObject])
         Alamofire.request(url!, method: .put, parameters: ["sectionId":(sectionData?.id)!,"withTopSubject":true], encoding: JSONEncoding.default, headers: nil).responseJSON { (response) in
-            debugPrint("sectionId = \(self.sectionData?.id)!")
+            debugPrint("sectionId = \(String(describing: self.sectionData?.id))!")
             debugPrint(response)
             switch response.result {
             case .success(let val):

o2ios/O2Platform/App/IM-聊天/IMChatViewController.xib

@@ -52,7 +52,7 @@
                                     <constraints>
                                         <constraint firstAttribute="height" constant="32" id="L8w-G8-QcX"/>
                                     </constraints>
-                                    <state key="normal" image="chat_mic"/>
+                                    <state key="normal" image="icon_yuyin"/>
                                     <connections>
                                         <action selector="micBtnClick:" destination="-1" eventType="touchUpInside" id="qN7-d7-8AE"/>
                                     </connections>
@@ -62,7 +62,7 @@
                                     <constraints>
                                         <constraint firstAttribute="height" constant="32" id="NCL-G0-g4l"/>
                                     </constraints>
-                                    <state key="normal" image="chat_img"/>
+                                    <state key="normal" image="icon_tupian"/>
                                     <connections>
                                         <action selector="imgBtnClick:" destination="-1" eventType="touchUpInside" id="Jbr-NQ-U7b"/>
                                     </connections>
@@ -72,7 +72,7 @@
                                     <constraints>
                                         <constraint firstAttribute="height" constant="32" id="mDx-JV-z4Q"/>
                                     </constraints>
-                                    <state key="normal" image="chat_camera"/>
+                                    <state key="normal" image="icon_xiangji"/>
                                     <connections>
                                         <action selector="cameraBtnClick:" destination="-1" eventType="touchUpInside" id="v70-6D-pKx"/>
                                     </connections>
@@ -82,7 +82,7 @@
                                     <constraints>
                                         <constraint firstAttribute="height" constant="32" id="Fae-3Q-Qrq"/>
                                     </constraints>
-                                    <state key="normal" image="chat_location"/>
+                                    <state key="normal" image="icon_ditu"/>
                                     <connections>
                                         <action selector="locationBtnClick:" destination="-1" eventType="touchUpInside" id="Jwe-pL-EpP"/>
                                     </connections>
@@ -127,10 +127,10 @@
         </view>
     </objects>
     <resources>
-        <image name="chat_camera" width="42" height="32"/>
         <image name="chat_emoji" width="24" height="24"/>
-        <image name="chat_img" width="32" height="32"/>
-        <image name="chat_location" width="41" height="32"/>
-        <image name="chat_mic" width="32" height="32"/>
+        <image name="icon_ditu" width="22" height="22"/>
+        <image name="icon_tupian" width="22" height="22"/>
+        <image name="icon_xiangji" width="22" height="22"/>
+        <image name="icon_yuyin" width="22" height="22"/>
     </resources>
 </document>

o2ios/O2Platform/App/Login-绑定登录/c/OOLoginViewController.swift

@@ -148,7 +148,7 @@ class OOLoginViewController: OOBaseViewController {
     }
     
     @IBAction func btnReBindNodeAction(_ sender: UIButton) {
-        self.showSystemAlert(title: "重新绑定", message: "重新绑定到新的服务节点，原节点信息将被清空，确认吗？") { (action) in
+        self.showDefaultConfirm(title: "重新绑定", message: "重新绑定到新的服务节点，原节点信息将被清空，确认吗？") { (action) in
             O2AuthSDK.shared.clearAllInformationBeforeReBind(callback: { (result, msg) in
                 DDLogInfo("清空登录和绑定信息，result:\(result), msg:\(msg ?? "")")
                 DBManager.shared.removeAll()

o2ios/O2Platform/Assets.xcassets/im/chat_camera.imageset/Contents.json → o2ios/O2Platform/Assets.xcassets/im/icon_ditu.imageset/Contents.json

@@ -5,11 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "chat_camera.png",
+      "filename" : "icon_ditu@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "icon_ditu@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

o2ios/O2Platform/Assets.xcassets/im/chat_img.imageset/Contents.json → o2ios/O2Platform/Assets.xcassets/im/icon_tupian.imageset/Contents.json

@@ -5,11 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "chat_img.png",
+      "filename" : "icon_tupian@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "icon_tupian@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

o2ios/O2Platform/Assets.xcassets/im/icon_xiangji.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "icon_xiangji@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "icon_xiangji@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

o2ios/O2Platform/Assets.xcassets/im/chat_location.imageset/Contents.json → o2ios/O2Platform/Assets.xcassets/im/icon_yuyin.imageset/Contents.json

@@ -5,11 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "chat_location.png",
+      "filename" : "icon_yuyin@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "icon_yuyin@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }