引导页替换完成

RainbowPlanet/NotificationService/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.2</string>
+	<string>1.1.0</string>
 	<key>CFBundleVersion</key>
-	<string>14</string>
+	<string>15</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate+Window.swift

@@ -154,7 +154,7 @@ extension AppDelegate {
 
     //设置引导页
     func setGuidePageView() {
-        GuidePageView.guidePageView(images: ["guide_1","guide_2","guide_3","guide_4"])
+        GuidePageView.guidePageView(images: ["guide_1","guide_2","guide_3","guide_4","guide_5","guide_6"])
     }
     
     //设置启动页

RainbowPlanet/RainbowPlanet/Modules/RongCloudIMModule/IMChatRoom/ViewController/IMChatRoomViewController.swift

@@ -72,19 +72,16 @@ class IMChatRoomViewController: RCConversationViewController {
         // 刷新页面
         conversationMessageCollectionView.reloadData()
         // 删除地理位置
-        // chatSessionInputBarControl.pluginBoardView.removeItem(withTag: 1003)
+        chatSessionInputBarControl.pluginBoardView.removeItem(withTag: 1003)
         // 添加文件
-        let fileImage = RCKitUtility.imageNamed("actionbar_file_icon", ofBundle: "RongCloud.bundle")
-        chatSessionInputBarControl.pluginBoardView.insertItem(with: fileImage, title: NSLocalizedString("File", tableName: "RongCloudKit", comment: ""), at: 2, tag: 1006)
-        
+//        let fileImage = RCKitUtility.imageNamed("actionbar_file_icon", ofBundle: "RongCloud.bundle")
+//        chatSessionInputBarControl.pluginBoardView.insertItem(with: fileImage, title: NSLocalizedString("File", tableName: "RongCloudKit", comment: ""), at: 2, tag: 1006)
         
 //        #define INPUT_MENTIONED_SELECT_TAG 1000
 //        #define PLUGIN_BOARD_ITEM_ALBUM_TAG 1001
 //        #define PLUGIN_BOARD_ITEM_CAMERA_TAG 1002
-//        #define PLUGIN_BOARD_ITEM_FILE_TAG 1006
 //        #define PLUGIN_BOARD_ITEM_VOIP_TAG 1101
 //        #define PLUGIN_BOARD_ITEM_VIDEO_VOIP_TAG 1102
-//        #define PLUGIN_BOARD_ITEM_EVA_TAG 1103
 //        #define PLUGIN_BOARD_ITEM_RED_PACKET_TAG 1104
 //        #define PLUGIN_BOARD_ITEM_VOICE_INPUT_TAG 1105
 //        #define PLUGIN_BOARD_ITEM_PTT_TAG 1106

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/guide/guide_5.imageset/Contents.json

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

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/guide/guide_6.imageset/Contents.json

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

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/guide/guide_btn_login.imageset/Contents.json

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

RainbowPlanet/RainbowPlanet/Supporting Files/Assets.xcassets/guide/guide_uptoyou.imageset/Contents.json

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

RainbowPlanet/RainbowPlanet/Supporting Files/Info.plist

@@ -22,7 +22,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.2</string>
+	<string>1.1.0</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -87,7 +87,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>14</string>
+	<string>15</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>wechat</string>

RainbowPlanet/RainbowPlanet/Tools/GuidePageView/GuidePageView.swift

@@ -45,7 +45,7 @@ class GuidePageView: UIView {
             make.edges.equalToSuperview()
         }
         
-        let pageControlWidth = CGFloat((self.images?.count)! - 1) * 8 +  CGFloat((self.images?.count)! - 1) * 15 + 24
+        let pageControlWidth = CGFloat((self.images?.count)! - 1) * 8 +  CGFloat((self.images?.count)! - 1) * 10 + 8
         
         pageControl.snp.makeConstraints { (make) in
             make.centerX.equalToSuperview()
@@ -71,10 +71,10 @@ class GuidePageView: UIView {
         let pageControl = NXLPageControl()
         pageControl.numberOfPages = self.images?.count ?? 0
         pageControl.pointSize = CGSize.init(width: 8, height: 8)
-        pageControl.currentWidthMultiple = 3//当前点的宽度为其他点的3倍
-        pageControl.localPointSpace = 15
-        pageControl.currentColor = UIColor.black
-        pageControl.otherColor = kEDEEF0Color
+        pageControl.currentWidthMultiple = 1//当前点的宽度为其他点的3倍
+        pageControl.localPointSpace = 10
+        pageControl.currentColor = kffffffColor
+        pageControl.otherColor = kffffffColor.withAlphaComponent(0.3)
         pageControl.clickPoint { _ in }
         return pageControl
     }()

RainbowPlanet/RainbowPlanet/Tools/GuidePageView/GuidePageViewCell.swift

@@ -47,6 +47,7 @@ class GuidePageViewCell: FSPagerViewCell {
     private func setupViews() {
         addSubview(bgImageView)
         addSubview(startButton)
+        addSubview(iconImageView)
     }
     
     private func setupLayouts() {
@@ -54,11 +55,15 @@ class GuidePageViewCell: FSPagerViewCell {
             make.top.bottom.left.right.equalToSuperview()
         }
         startButton.snp.makeConstraints { (make) in
-            make.bottom.equalTo(-50)
+            make.bottom.equalTo(-91)
             make.height.equalTo(44)
             make.left.equalTo(52.5)
             make.right.equalTo(-52.5)
         }
+        iconImageView.snp.makeConstraints { (make) in
+            make.centerX.equalToSuperview()
+            make.bottom.equalTo(-20)
+        }
     }
     
     private func setupdata() {
@@ -79,16 +84,23 @@ class GuidePageViewCell: FSPagerViewCell {
     
     private lazy var startButton: UIButton = {
         let startButton = UIButton(type: UIButton.ButtonType.custom)
-        startButton.backgroundColor = UIColor.black
-        startButton.setTitle("开启由你", for: UIControl.State.normal)
-        startButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
-        startButton.titleLabel?.font = kBoldFont20
-        startButton.isHidden = true
-        startButton.cornerRadius = 22
-        startButton.masksToBounds = true
+//        startButton.backgroundColor = UIColor.black
+        startButton.setBackgroundImage(kImage(name: "guide_btn_login"), for: UIControl.State.normal)
+//        startButton.setTitle("开启由你", for: UIControl.State.normal)
+//        startButton.setTitleColor(kffffffColor, for: UIControl.State.normal)
+//        startButton.titleLabel?.font = kBoldFont20
+//        startButton.isHidden = true
+//        startButton.cornerRadius = 22
+//        startButton.masksToBounds = true
         return startButton
     }()
     
+    private lazy var iconImageView: UIImageView = {
+        let iconImageView = UIImageView()
+        iconImageView.image = kImage(name: "guide_uptoyou")
+        return iconImageView
+    }()
+    
     var images : Array<String>? {
         didSet{
             bgImageView.image = kImage(name: images?[index!] ?? "default_pic")