Merge pull request #29 from hyhSuper/v3.3.0beta

hyhSuper · web-flow · commit d15198355930 · 2019-05-27T09:57:18.000+08:00
优化UI,  JMessage版本使用3.8.1
diff --git a/JChat.xcodeproj/project.pbxproj b/JChat.xcodeproj/project.pbxproj
@@ -1465,7 +1465,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-JChat/Pods-JChat-resources.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-JChat/Pods-JChat-resources.sh",
 				"${PODS_ROOT}/BaiduMapKit/BaiduMapKit/BaiduMapAPI_Map.framework/Resources/mapapi.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
@@ -1474,7 +1474,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-JChat/Pods-JChat-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-JChat/Pods-JChat-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		B8FCE143076776F1905564C8 /* [CP] Check Pods Manifest.lock */ = {
@@ -1501,7 +1501,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-JChat/Pods-JChat-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-JChat/Pods-JChat-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
 				"${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework",
 				"${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework",
@@ -1524,7 +1524,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-JChat/Pods-JChat-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-JChat/Pods-JChat-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
diff --git a/JChat/Src/ChatModule/Chat/Model/JCCEmoticonGroup.swift b/JChat/Src/ChatModule/Chat/Model/JCCEmoticonGroup.swift
@@ -9,7 +9,7 @@
 import UIKit
 
 class JCCEmoticonGroup: JCEmoticonGroup {
-     init?(contentsOfFile: String) {
+    @objc init?(contentsOfFile: String) {
         guard let dic = NSDictionary(contentsOfFile: contentsOfFile), let arr = dic["emoticons"] as? NSArray else {
             return nil
         }
diff --git a/JChat/Src/ChatRoomModule/ViewController/JCCRSearchResultViewController.swift b/JChat/Src/ChatRoomModule/ViewController/JCCRSearchResultViewController.swift
@@ -181,6 +181,7 @@ extension JCCRSearchResultViewController: UITableViewDelegate,UITableViewDataSou
         selectChatRoom = self.searchResultList[indexPath.row]
         _clearHistoricalRecord()
         self.searchController.isActive = false
+        
     }
 }
 
diff --git a/JChat/Src/ChatRoomModule/ViewController/JCChatRoomChatViewController.swift b/JChat/Src/ChatRoomModule/ViewController/JCChatRoomChatViewController.swift
@@ -539,6 +539,9 @@ extension JCChatRoomChatViewController: JMessageDelegate {
             let jcMsg = JCMessage.init(content: noticeContent)
             messages.append(jcMsg)
             chatView.append(jcMsg)
+            if !chatView.isRoll {
+                chatView.scrollToLast(animated: true)
+            }
         }
     }
 }
diff --git a/JChat/Src/ChatRoomModule/ViewController/JCChatRoomIntroduceViewController.xib b/JChat/Src/ChatRoomModule/ViewController/JCChatRoomIntroduceViewController.xib
@@ -21,18 +21,28 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="聊天室介绍" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0ad-Bk-tBP">
-                    <rect key="frame" x="22" y="30" width="87" height="41"/>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iN9-PF-ssE">
+                    <rect key="frame" x="0.0" y="44" width="375" height="300"/>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="41" id="gX8-QO-DWa"/>
+                        <constraint firstAttribute="height" constant="300" id="I6q-Fe-iTG"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <nil key="textColor"/>
                     <nil key="highlightedColor"/>
                 </label>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="聊天室介绍" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0ad-Bk-tBP">
+                    <rect key="frame" x="22" y="25" width="72" height="30"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="30" id="gX8-QO-DWa"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                    <nil key="textColor"/>
+                    <nil key="highlightedColor"/>
+                </label>
                 <textView autoresizesSubviews="NO" clipsSubviews="YES" multipleTouchEnabled="YES" alpha="0.5" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" editable="NO" textAlignment="natural" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4IY-88-30G">
-                    <rect key="frame" x="16" y="79" width="343" height="200"/>
-                    <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <rect key="frame" x="16" y="63" width="343" height="200"/>
+                    <color key="backgroundColor" red="0.90980392156862744" green="0.92941176470588238" blue="0.95294117647058818" alpha="1" colorSpace="calibratedRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="200" id="IPC-Nx-hHH"/>
                     </constraints>
@@ -44,14 +54,17 @@
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="4IY-88-30G" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leadingMargin" id="Kws-oo-gAx"/>
+                <constraint firstItem="iN9-PF-ssE" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="LvA-Xv-uJh"/>
+                <constraint firstItem="iN9-PF-ssE" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" constant="44" id="PIs-S4-zQm"/>
                 <constraint firstItem="4IY-88-30G" firstAttribute="top" secondItem="0ad-Bk-tBP" secondAttribute="bottom" constant="8" id="RKo-MO-uaU"/>
-                <constraint firstItem="0ad-Bk-tBP" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" constant="10" id="Xgh-1c-UBE"/>
+                <constraint firstItem="0ad-Bk-tBP" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" constant="5" id="Xgh-1c-UBE"/>
                 <constraint firstItem="4IY-88-30G" firstAttribute="top" secondItem="0ad-Bk-tBP" secondAttribute="bottom" constant="8" symbolic="YES" id="lYm-i7-rvc"/>
+                <constraint firstItem="iN9-PF-ssE" firstAttribute="trailing" secondItem="fnl-2z-Ty3" secondAttribute="trailing" id="mmf-dR-GQ0"/>
                 <constraint firstItem="4IY-88-30G" firstAttribute="trailing" secondItem="i5M-Pr-FkT" secondAttribute="trailingMargin" id="r6b-oL-B0N"/>
                 <constraint firstItem="0ad-Bk-tBP" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" constant="22" id="tJZ-iR-DDO"/>
             </constraints>
             <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
-            <point key="canvasLocation" x="79.710144927536234" y="39.508928571428569"/>
+            <point key="canvasLocation" x="79.200000000000003" y="39.130434782608695"/>
         </view>
     </objects>
 </document>
diff --git a/JChat/Src/ChatRoomModule/ViewController/JCChatRoomListViewController.swift b/JChat/Src/ChatRoomModule/ViewController/JCChatRoomListViewController.swift
@@ -222,8 +222,8 @@ extension JCChatRoomListViewController: UISearchControllerDelegate {
         listTableView.isHidden = false
         let nav = searchController.searchResultsController as! JCNavigationController
         nav.isNavigationBarHidden = true
-//        nav.popToRootViewController(animated: false)
-//        navigationController?.tabBarController?.tabBar.isHidden = false
+        nav.popToRootViewController(animated: false)
+        navigationController?.tabBarController?.tabBar.isHidden = false
     }
     
     func didDismissSearchController(_ searchController: UISearchController){
diff --git a/JChat/Src/ChatRoomModule/ViewController/JCChatRoomNameInfoViewController.xib b/JChat/Src/ChatRoomModule/ViewController/JCChatRoomNameInfoViewController.xib
@@ -22,8 +22,11 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UZX-pR-jzv">
-                    <rect key="frame" x="0.0" y="20" width="375" height="166"/>
+                    <rect key="frame" x="0.0" y="20" width="375" height="105"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="105" id="JML-Ay-der"/>
+                    </constraints>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                     <nil key="textColor"/>
                     <nil key="highlightedColor"/>
@@ -39,11 +42,11 @@
                 </label>
                 <textView autoresizesSubviews="NO" clipsSubviews="YES" multipleTouchEnabled="YES" alpha="0.5" contentMode="scaleToFill" editable="NO" text="志愿者" translatesAutoresizingMaskIntoConstraints="NO" id="ScF-mX-r5U">
                     <rect key="frame" x="16" y="74" width="343" height="44"/>
-                    <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <color key="backgroundColor" red="0.90980392156862744" green="0.92941176470588238" blue="0.95294117647058818" alpha="1" colorSpace="calibratedRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="44" id="oDL-Eb-SMH"/>
                     </constraints>
-                    <fontDescription key="fontDescription" type="system" pointSize="20"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
                     <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                 </textView>
             </subviews>
@@ -54,10 +57,9 @@
                 <constraint firstItem="97k-3G-FI0" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" constant="8" id="WcV-se-Zbm"/>
                 <constraint firstItem="UZX-pR-jzv" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="Y3X-Pi-7GN"/>
                 <constraint firstItem="97k-3G-FI0" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leadingMargin" id="Z4r-Wo-GFn"/>
-                <constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="UZX-pR-jzv" secondAttribute="bottom" constant="481" id="cnd-aD-QXy"/>
                 <constraint firstItem="ScF-mX-r5U" firstAttribute="trailing" secondItem="i5M-Pr-FkT" secondAttribute="trailingMargin" id="l8U-pN-xgy"/>
-                <constraint firstItem="UZX-pR-jzv" firstAttribute="centerX" secondItem="ScF-mX-r5U" secondAttribute="centerX" id="m7T-xw-kds"/>
                 <constraint firstItem="ScF-mX-r5U" firstAttribute="top" secondItem="97k-3G-FI0" secondAttribute="bottom" constant="5" id="uCw-BZ-G01"/>
+                <constraint firstItem="UZX-pR-jzv" firstAttribute="trailing" secondItem="fnl-2z-Ty3" secondAttribute="trailing" id="wiF-44-3SP"/>
             </constraints>
             <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
             <point key="canvasLocation" x="34.399999999999999" y="34.632683658170919"/>
diff --git a/Podfile b/Podfile
@@ -9,7 +9,7 @@ target 'JChat' do
   pod 'YHPopupView'
   pod 'YHPhotoKit'
   pod 'MJRefresh'
-  pod 'JMessage'
+  pod 'JMessage','~> 3.8.1'
   pod 'FMDB'
   pod 'RxSwift','~> 4.2.0'
   pod 'RxCocoa','~> 4.4.1'

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`import UIKit`
`10`	`10`
`11`	`11`	`class JCCEmoticonGroup: JCEmoticonGroup {`
`12`		`- init?(contentsOfFile: String) {`
	`12`	`+ @objc init?(contentsOfFile: String) {`
`13`	`13`	`guard let dic = NSDictionary(contentsOfFile: contentsOfFile), let arr = dic["emoticons"] as? NSArray else {`
`14`	`14`	`return nil`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,7 @@ extension JCCRSearchResultViewController: UITableViewDelegate,UITableViewDataSou`
`181`	`181`	`selectChatRoom = self.searchResultList[indexPath.row]`
`182`	`182`	`_clearHistoricalRecord()`
`183`	`183`	`self.searchController.isActive = false`
	`184`	`+`
`184`	`185`	`}`
`185`	`186`	`}`
`186`	`187`
Original file line number	Diff line number	Diff line change
`@@ -539,6 +539,9 @@ extension JCChatRoomChatViewController: JMessageDelegate {`
`539`	`539`	`let jcMsg = JCMessage.init(content: noticeContent)`
`540`	`540`	`messages.append(jcMsg)`
`541`	`541`	`chatView.append(jcMsg)`
	`542`	`+ if !chatView.isRoll {`
	`543`	`+ chatView.scrollToLast(animated: true)`
	`544`	`+ }`
`542`	`545`	`}`
`543`	`546`	`}`
`544`	`547`	`}`