Browse Source

快讯新UI调整,个人资料,修改头像,设置昵称,设置性别,展示二维码,个性签名等

culturetown 11 months ago
parent
commit
6da315afe6
24 changed files with 949 additions and 44 deletions
  1. 16 0
      Koala/Koala.xcodeproj/project.pbxproj
  2. 1 1
      Koala/Koala.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist
  3. BIN
      Koala/Koala.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate
  4. 55 4
      Koala/Koala/Modular/Information/C/InformationFlashViewController.swift
  5. 57 13
      Koala/Koala/Modular/Information/V/InformationFlashCell.swift
  6. 2 1
      Koala/Koala/Modular/JDAssets/V/JDAccountTypeCheckCell.swift
  7. 149 0
      Koala/Koala/Modular/JDMine/VC/JDMineModifyGenderViewController.swift
  8. 143 0
      Koala/Koala/Modular/JDMine/VC/JDMineModifyNickNameViewController.swift
  9. 149 0
      Koala/Koala/Modular/JDMine/VC/JDMineModifyRemarkViewController.swift
  10. 206 0
      Koala/Koala/Modular/JDMine/VC/JDMineQrcodeViewController.swift
  11. 58 0
      Koala/Koala/Modular/JDMine/VC/JDMineUserInfoViewController.swift
  12. 22 0
      Koala/Koala/Other/Assets.xcassets/Infomation/Infomation_share.imageset/Contents.json
  13. BIN
      Koala/Koala/Other/Assets.xcassets/Infomation/Infomation_share.imageset/火备份@2x.png
  14. BIN
      Koala/Koala/Other/Assets.xcassets/Infomation/Infomation_share.imageset/火备份@3x.png
  15. 22 0
      Koala/Koala/Other/Assets.xcassets/JDMine/jdmine_qrcode_save.imageset/Contents.json
  16. BIN
      Koala/Koala/Other/Assets.xcassets/JDMine/jdmine_qrcode_save.imageset/形状@2x.png
  17. BIN
      Koala/Koala/Other/Assets.xcassets/JDMine/jdmine_qrcode_save.imageset/形状@3x.png
  18. 22 0
      Koala/Koala/Other/Assets.xcassets/JDMine/jdmine_qrcode_scan.imageset/Contents.json
  19. BIN
      Koala/Koala/Other/Assets.xcassets/JDMine/jdmine_qrcode_scan.imageset/路径备份 5@2x.png
  20. BIN
      Koala/Koala/Other/Assets.xcassets/JDMine/jdmine_qrcode_scan.imageset/路径备份 5@3x.png
  21. 22 0
      Koala/Koala/Other/Assets.xcassets/JDMine/jdmine_qrcode_share.imageset/Contents.json
  22. BIN
      Koala/Koala/Other/Assets.xcassets/JDMine/jdmine_qrcode_share.imageset/形状备份 10@2x.png
  23. BIN
      Koala/Koala/Other/Assets.xcassets/JDMine/jdmine_qrcode_share.imageset/形状备份 10@3x.png
  24. 25 25
      Koala/Pods/Pods.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

+ 16 - 0
Koala/Koala.xcodeproj/project.pbxproj

@@ -36,6 +36,10 @@
 		041D4F242AD2CB04008ABDF7 /* JDMineActiveViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041D4F232AD2CB04008ABDF7 /* JDMineActiveViewController.swift */; };
 		041D4F262AD2CB9F008ABDF7 /* JDMineVIPViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041D4F252AD2CB9F008ABDF7 /* JDMineVIPViewController.swift */; };
 		041D4F282AD392DE008ABDF7 /* JDMineJoinUsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041D4F272AD392DE008ABDF7 /* JDMineJoinUsCell.swift */; };
+		04B46A8D2AD7BEA700421177 /* JDMineModifyNickNameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B46A8C2AD7BEA700421177 /* JDMineModifyNickNameViewController.swift */; };
+		04B46A8F2AD7C67400421177 /* JDMineQrcodeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B46A8E2AD7C67400421177 /* JDMineQrcodeViewController.swift */; };
+		04B46A912AD7D3BC00421177 /* JDMineModifyGenderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B46A902AD7D3BC00421177 /* JDMineModifyGenderViewController.swift */; };
+		04B46A932AD7D72300421177 /* JDMineModifyRemarkViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B46A922AD7D72300421177 /* JDMineModifyRemarkViewController.swift */; };
 		04C283102AD5233200FC04AC /* JDMineVipOpenMindCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C2830F2AD5233200FC04AC /* JDMineVipOpenMindCell.swift */; };
 		04C283142AD5371300FC04AC /* JDMineInviteCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C283132AD5371300FC04AC /* JDMineInviteCell.swift */; };
 		04C283162AD5522200FC04AC /* JDMineInviteSecionHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C283152AD5522200FC04AC /* JDMineInviteSecionHeaderView.swift */; };
@@ -782,6 +786,10 @@
 		041D4F232AD2CB04008ABDF7 /* JDMineActiveViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JDMineActiveViewController.swift; sourceTree = "<group>"; };
 		041D4F252AD2CB9F008ABDF7 /* JDMineVIPViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JDMineVIPViewController.swift; sourceTree = "<group>"; };
 		041D4F272AD392DE008ABDF7 /* JDMineJoinUsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JDMineJoinUsCell.swift; sourceTree = "<group>"; };
+		04B46A8C2AD7BEA700421177 /* JDMineModifyNickNameViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JDMineModifyNickNameViewController.swift; sourceTree = "<group>"; };
+		04B46A8E2AD7C67400421177 /* JDMineQrcodeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JDMineQrcodeViewController.swift; sourceTree = "<group>"; };
+		04B46A902AD7D3BC00421177 /* JDMineModifyGenderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JDMineModifyGenderViewController.swift; sourceTree = "<group>"; };
+		04B46A922AD7D72300421177 /* JDMineModifyRemarkViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JDMineModifyRemarkViewController.swift; sourceTree = "<group>"; };
 		04C2830F2AD5233200FC04AC /* JDMineVipOpenMindCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JDMineVipOpenMindCell.swift; sourceTree = "<group>"; };
 		04C283132AD5371300FC04AC /* JDMineInviteCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JDMineInviteCell.swift; sourceTree = "<group>"; };
 		04C283152AD5522200FC04AC /* JDMineInviteSecionHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JDMineInviteSecionHeaderView.swift; sourceTree = "<group>"; };
@@ -1791,6 +1799,10 @@
 			children = (
 				04D38E992AA5D3970047EF9C /* JDMineViewController.swift */,
 				04C2831B2AD69C3F00FC04AC /* JDMineUserInfoViewController.swift */,
+				04B46A8C2AD7BEA700421177 /* JDMineModifyNickNameViewController.swift */,
+				04B46A8E2AD7C67400421177 /* JDMineQrcodeViewController.swift */,
+				04B46A902AD7D3BC00421177 /* JDMineModifyGenderViewController.swift */,
+				04B46A922AD7D72300421177 /* JDMineModifyRemarkViewController.swift */,
 				04CEE2972ABBCC8A00FAA760 /* JDFinancialRecordsMainViewController.swift */,
 				04CEE2992ABBCE7B00FAA760 /* JDDepositRecordsViewController.swift */,
 				04CEE2A72ABC35C700FAA760 /* JDMineServiceViewController.swift */,
@@ -3884,6 +3896,7 @@
 				6CDC5AFA29CDFBFD00E60730 /* FlashHistoryRecordCell.swift in Sources */,
 				04D38E762A9EE8A10047EF9C /* JXSegmentedTitleCell.swift in Sources */,
 				6C86530329ACF3E400A2E7FB /* TDStatisticsRecordListCell.swift in Sources */,
+				04B46A8F2AD7C67400421177 /* JDMineQrcodeViewController.swift in Sources */,
 				6CA7134F2959F6AC0047F450 /* ForgotPasswordViewModel.swift in Sources */,
 				6C86531929B4E0E500A2E7FB /* TalentReportViewController.swift in Sources */,
 				6CD200BB29E8447C00F0966D /* AWalletRecordListCell.swift in Sources */,
@@ -4047,6 +4060,7 @@
 				6CD5EB6429D5C6A40053325F /* FundsRecordCell.swift in Sources */,
 				6CDC5B1529D0814E00E60730 /* AssetsProxyHeaderView.swift in Sources */,
 				6CC8024329968A2300C36373 /* AWithdrawalsViewController.swift in Sources */,
+				04B46A8D2AD7BEA700421177 /* JDMineModifyNickNameViewController.swift in Sources */,
 				041D4EE42ABEBA0C008ABDF7 /* JDAFiatAccountListPopView.swift in Sources */,
 				6CA71342295889260047F450 /* RegisterViewModel.swift in Sources */,
 				6C4AFAED299FE01600508EA7 /* APaymentMethodViewController.swift in Sources */,
@@ -4178,6 +4192,7 @@
 				6CA7131A29572DD70047F450 /* LoginView.swift in Sources */,
 				04CEE2AC2ABC3B6100FAA760 /* JDWorkOrderListViewController.swift in Sources */,
 				041D4EEE2AC155F1008ABDF7 /* JDDealViewController.swift in Sources */,
+				04B46A912AD7D3BC00421177 /* JDMineModifyGenderViewController.swift in Sources */,
 				6CDC5B1A29D08CA600E60730 /* AssetsProxyListCell.swift in Sources */,
 				6C4AFAE9299E870400508EA7 /* AFiatWithdrawalsListCell.swift in Sources */,
 				6CDC5AEF29CC9C7600E60730 /* AFiatDepositsPayWayPopView.swift in Sources */,
@@ -4293,6 +4308,7 @@
 				6CC37FC2298971030079FA5C /* DealHintListCell.swift in Sources */,
 				6C00A9A02434314F00CE9ADB /* UpdatePopupView.swift in Sources */,
 				04CEE2962ABAE9CC00FAA760 /* JDAFiatWithdrawalsCell.swift in Sources */,
+				04B46A932AD7D72300421177 /* JDMineModifyRemarkViewController.swift in Sources */,
 				04D38E612A9EE8A10047EF9C /* JXSegmentedCollectionView.swift in Sources */,
 				6CDC5B0629CF164500E60730 /* AHistoryDetaisHeaderView.swift in Sources */,
 				04D38EC72AB29A0A0047EF9C /* JDKLineBuySellRateView.swift in Sources */,

+ 1 - 1
Koala/Koala.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>Koala.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>12</integer>
+			<integer>18</integer>
 		</dict>
 	</dict>
 </dict>

BIN
Koala/Koala.xcworkspace/xcuserdata/mac.xcuserdatad/UserInterfaceState.xcuserstate


+ 55 - 4
Koala/Koala/Modular/Information/C/InformationFlashViewController.swift

@@ -96,9 +96,60 @@ extension InformationFlashViewController : UITableViewDataSource{
     
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         
-   
-            
-            return UIView()
+        let view = UIView(frame: CGRectMake(0, 0, SCREEN_WIDTH, 50))
+        view.backgroundColor = .white
+        
+        let dateBgView = UIView()
+        dateBgView.backgroundColor = .white
+        dateBgView.layer.masksToBounds = true
+        dateBgView.layer.cornerRadius = 3
+        dateBgView.layer.borderColor = _color("#DADADA&#DADADA").cgColor
+        dateBgView.layer.borderWidth = 1
+        view.addSubview(dateBgView)
+        dateBgView.snp.makeConstraints { make in
+            make.centerY.equalTo(view)
+            make.left.equalTo(view.snp.left).offset(13)
+            make.size.equalTo(CGSize(width: 21, height: 21))
+        }
+        
+        let line  = UIView()
+        line.backgroundColor = MainBackGroundColor
+        dateBgView.addSubview(line)
+        line.snp.makeConstraints { make in
+            make.centerX.equalTo(dateBgView)
+            make.top.equalTo(dateBgView.snp.top).offset(4)
+            make.size.equalTo(CGSize(width: 7.8, height: 1))
+        }
+        
+        let now = Date()
+        let calendar = Calendar.current
+//        let year = calendar.component(.year, from: now) // 获取当前年份
+//        let month = calendar.component(.month, from: now) // 获取当前月份
+        let day = calendar.component(.day, from: now) // 获取当前日期
+        let dateLb = UILabel()
+        dateLb.textColor = _color("#232323&#232323")
+        dateLb.setTextFont(.PFSM, 12)
+        dateLb.textAlignment = .center
+        dateLb.text = "\(day)"
+        dateBgView.addSubview(dateLb)
+        dateLb.snp.makeConstraints { make in
+            make.centerX.equalTo(dateBgView)
+            make.top.equalTo(line.snp.bottom).offset(0)
+        }
+        
+        
+        
+        let todayLb = UILabel()
+        todayLb.textColor = _color("#232323&#232323")
+        todayLb.setTextFont(.PFSR, 12)
+        todayLb.text = switchLanguage("今天")
+        view.addSubview(todayLb)
+        todayLb.snp.makeConstraints { make in
+            make.centerY.equalTo(dateBgView)
+            make.left.equalTo(dateBgView.snp.right).offset(9)
+        }
+        
+        return view
         
         
     }
@@ -120,7 +171,7 @@ extension InformationFlashViewController : UITableViewDelegate{
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
         
 
-        return 0.0001
+        return 50
   
         
     }

+ 57 - 13
Koala/Koala/Modular/Information/V/InformationFlashCell.swift

@@ -44,32 +44,76 @@ class InformationFlashCell: BaseTableViewCell {
         return v
     }()
     
+    lazy var pointView : UIView = {
+        let v = UIView()
+        
+        v.backgroundColor = .white
+        v.layer.masksToBounds = true
+        v.layer.cornerRadius = 4
+        v.layer.borderWidth = 1
+        v.layer.borderColor = MainBackGroundColor.cgColor
+        
+        return v
+    }()
     
+    lazy var lineView : JXDashLineView = {
+        let v = JXDashLineView(frame: CGRect(x: 0, y: 0, width: 1.4, height: 200), lineLength: 4, lineSpacing: 3, lineColor: _color("#E3E3E3&#E3E3E3"), lineHeight: 60)
+        
+        return v
+    }()
+    
+    
+    lazy var shareBtn : UIButton = {
+        let v = UIButton(type: .custom)
+        v.setImage(_image("Infomation_share&Infomation_share"), for: .normal)
+        v.setTitle(switchLanguage("分享"), for: .normal)
+        v.setTitleColor(_color("#7E7E7E&#7E7E7E"), for: .normal)
+        v.titleLabel?.setTextFont(.PFSR, 10)
+        v.layoutButtonEdgeInsetStyle(type: .left, space: 4)
+        return v
+    }()
     
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
 
+        contentView.addSubview(lineView)
+        lineView.snp.makeConstraints { make in
+            make.top.bottom.equalTo(contentView)
+            make.left.equalTo(contentView.snp.left).offset(24)
+            make.width.equalTo(2)
+        }
+        
+        contentView.addSubview(pointView)
+        pointView.snp.makeConstraints { make in
+            make.left.equalTo(contentView.snp.left).offset(20)
+            make.top.equalTo(contentView.snp.top)
+            make.size.equalTo(CGSize(width: 8, height: 8))
+        }
+        contentView.addSubview(timeLb)
+        
+        timeLb.snp.makeConstraints { make in
+            make.centerY.equalTo(pointView)
+            make.left.equalTo(pointView.snp.right).offset(12)
+        }
+        
         contentView.addSubview(titleLb)
         titleLb.snp.makeConstraints { make in
-            make.top.equalTo(contentView.snp.top).offset(17)
-            make.left.equalTo(contentView.snp.left).offset(18)
+            make.top.equalTo(timeLb.snp.bottom).offset(8)
+            make.left.equalTo(timeLb.snp.left)
             make.right.equalTo(contentView.snp.right).offset(-18)
         }
         
-        contentView.addSubview(nickNameLb)
-        nickNameLb.snp.makeConstraints { make in
-            make.left.equalTo(titleLb.snp.left)
-            make.top.equalTo(titleLb.snp.bottom).offset(12)
-            make.bottom.equalTo(contentView.snp.bottom).offset(-1)
-        }
+
         
+        contentView.addSubview(shareBtn)
+        shareBtn.snp.makeConstraints { make in
+            make.right.equalTo(contentView.snp.right).offset(-14)
+            make.top.equalTo(titleLb.snp.bottom).offset(10)
+            make.size.equalTo(CGSize(width: 40, height: 12))
+            make.bottom.equalTo(contentView.snp.bottom).offset(-18)
+        }
         
-        contentView.addSubview(timeLb)
         
-        timeLb.snp.makeConstraints { make in
-            make.centerY.equalTo(nickNameLb)
-            make.left.equalTo(nickNameLb.snp.right).offset(23)
-        }
     }
     
     required init?(coder aDecoder: NSCoder) {

+ 2 - 1
Koala/Koala/Modular/JDAssets/V/JDAccountTypeCheckCell.swift

@@ -14,7 +14,8 @@ class JDAccountTypeCheckCell: BaseTableViewCell {
     lazy var titleLb : UILabel = {
         let v = UILabel()
         v.textColor = UIColor.pg_color(withHexString: "333333")
-        v.font = .boldSystemFont(ofSize: 18)
+
+        v.setTextFont(.PFSM, 18)
         return v
     }()
     

+ 149 - 0
Koala/Koala/Modular/JDMine/VC/JDMineModifyGenderViewController.swift

@@ -0,0 +1,149 @@
+//
+//  JDMineModifyGenderViewController.swift
+//  Koala
+//
+//  Created by mac on 2023/10/12.
+//  Copyright © 2023 刘千军. All rights reserved.
+//
+
+import Foundation
+import UIKit
+
+class JDMineModifyGenderViewController: BaseViewController {
+
+    
+    lazy var tableView : UITableView = {
+        
+        let v = UITableView(frame: .zero, style: .plain)
+        v.backgroundColor = .white
+        v.delegate = self
+        v.dataSource = self
+        v.separatorStyle = .none
+        v.tableFooterView = UIView()
+        v.register(JDAccountTypeCheckCell.self, forCellReuseIdentifier: JDAccountTypeCheckCell.description())
+//        v.ly_emptyView = emptyView
+        return v
+            
+    }()
+    
+    var selectIndex : Int = 0
+    
+    lazy var typeList : [String] = ["男","女", "保密"]
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.myNavigationBar.title_Label.text = switchLanguage("设置性别")
+ 
+        self.view.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.top.equalTo(self.myNavigationBar.snp.bottom)
+            make.left.right.bottom.equalTo(self.view)
+        }
+        
+
+        mySwitchLanguage()
+        mySwitchSkin()
+        // Do any additional setup after loading the view.
+    }
+    
+    override func subView() {
+
+        
+    }
+    
+    override func updateViewConstraints() {
+        super.updateViewConstraints()
+       
+    }
+    
+    
+    override func mySwitchLanguage() {
+
+    }
+    
+    override func mySwitchSkin() {
+
+        
+        self.view.backgroundColor = _color("#F6FAFE&#F6FAFE")
+
+      
+        
+    }
+
+
+   
+
+}
+
+extension JDMineModifyGenderViewController {
+    
+
+}
+
+
+extension JDMineModifyGenderViewController : UITableViewDelegate,UITableViewDataSource {
+    
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+      
+        return typeList.count
+    }
+    
+    
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        
+ 
+        
+        return UIView()
+        
+    }
+    
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        return 0
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 62
+    
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        
+
+            
+        let cell = tableView.dequeueReusableCell(withIdentifier: JDAccountTypeCheckCell.description()) as! JDAccountTypeCheckCell
+        
+        cell.titleLb.setTextFont(.PFSR, 16)
+        
+        cell.titleLb.text = typeList[indexPath.row]
+        
+        if indexPath.row == selectIndex {
+            cell.checkIv.image = UIImage(named: "jd_check")
+        }else{
+            cell.checkIv.image = UIImage(named: "jd_uncheck")
+        }
+        
+      
+        return cell
+
+    }
+    
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        
+        self.selectIndex = indexPath.row
+        
+        self.tableView.reloadData()
+        
+//        currentVc()?.navigationController?.popViewController(animated: true)
+    }
+    
+    
+}
+
+
+
+

+ 143 - 0
Koala/Koala/Modular/JDMine/VC/JDMineModifyNickNameViewController.swift

@@ -0,0 +1,143 @@
+//
+//  JDMineModifyNickNameViewController.swift
+//  Koala
+//
+//  Created by mac on 2023/10/12.
+//  Copyright © 2023 刘千军. All rights reserved.
+//
+
+import Foundation
+import UIKit
+
+class JDMineModifyNickNameViewController: BaseViewController {
+
+//    @IBOutlet weak var inputBgView: UIView!
+//    @IBOutlet weak var hintLab: UILabel!
+//
+//    lazy var inView:BaseInputView = {
+//        let inView:BaseInputView = BaseInputView()
+//        return inView
+//    }()
+    
+    lazy var bgView : UIView = {
+        let v = UIView()
+        v.backgroundColor = .white
+        return v
+    }()
+    
+    lazy var nicknameTF : UITextField  = {
+        
+        let v = UITextField()
+        
+        v.textColor = _color("#333333&#333333")
+        v.placeholder = switchLanguage("昵称")
+        v.setTextFont(.PFSR, 16)
+        v.rightViewMode = .always
+        v.clearButtonMode = .always
+        
+        return v
+        
+    }()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.myNavigationBar.title_Label.text = switchLanguage("设置昵称")
+        self.myNavigationBar.right_SuperView.isHidden = false
+        self.myNavigationBar.right_Button.setTitle(switchLanguage("保存")+"  ", for: .normal)
+        self.myNavigationBar.right_Button.setTitleColor(MainBackGroundColor, for: .normal)
+        self.myNavigationBar.right_Button.setTextFont(.PFSM, 15)
+        self.myNavigationBar.right_Button.addTarget(self, action: #selector(clickRightBtnAction), for: .touchUpInside)
+        
+        self.view.addSubview(bgView)
+        bgView.snp.makeConstraints { make in
+            make.left.right.equalTo(self.view)
+            make.top.equalTo(self.myNavigationBar.snp.bottom)
+            make.height.equalTo(50)
+        }
+        
+        bgView.addSubview(nicknameTF)
+        nicknameTF.snp.makeConstraints { make in
+            make.top.bottom.equalTo(bgView)
+            make.left.equalTo(bgView.snp.left).offset(18)
+            make.right.equalTo(bgView.snp.right).offset(-18)
+        }
+        
+        
+//        self.inputBgView.addSubview(self.inView)
+//
+//        self.inView.snp.makeConstraints { make in
+//            make.edges.equalToSuperview()
+//        }
+        
+        mySwitchLanguage()
+        mySwitchSkin()
+        // Do any additional setup after loading the view.
+    }
+    
+    override func subView() {
+//        self.hintLab.setTextFont(.PFSR, 12)
+        
+    }
+    
+    override func updateViewConstraints() {
+        super.updateViewConstraints()
+       
+    }
+    
+    
+    override func mySwitchLanguage() {
+//        hintLab.text = switchLanguage("昵称包含1-24位字符(包含数字,字符和空格),且每个月只能修改一次")
+//        self.inView.setTextPlaceholder(text: switchLanguage("昵称"))
+    }
+    
+    override func mySwitchSkin() {
+
+        
+        self.view.backgroundColor = _color("#F6FAFE&#F6FAFE")
+//        hintLab.textColor = MidTextColor
+      
+        
+    }
+
+
+   
+
+}
+
+extension JDMineModifyNickNameViewController {
+    func netUserImName() -> Void {
+        let text = self.nicknameTF.text ?? "" //self.inView.textField.text ?? ""
+        guard text.length > 0 else {
+            ProgressHUD.showMessage(status: switchLanguage("请输入昵称"))
+            return
+        }
+        let textCount = text.unicodeScalars
+        guard textCount.count < 24 else {
+            ProgressHUD.showMessage(status: switchLanguage("昵称1-24位字符"))
+            return
+        }
+
+        var paramDict:[String:Any] = [String:Any]()
+        paramDict = ["im_name":text]
+        NetWork.NetWorkInstance.requestData(requestType: .Post, URLString: netForUserImName,parameters:paramDict, success: {[weak self] (errno,result) in
+            ProgressHUD.showSuccess(status: switchLanguage("保存成功"))
+            OperationalUserInfoData.refreshUserInfoComplete {
+                self?.navigationController?.popViewController(animated: true)
+            }
+
+        }) { (errno,result) in
+
+            ProgressHUD.showError(status: result as! String)
+        }
+        
+    }
+    
+    
+
+}
+
+extension JDMineModifyNickNameViewController{
+    @objc func clickRightBtnAction(){
+        self.netUserImName()
+    }
+}

+ 149 - 0
Koala/Koala/Modular/JDMine/VC/JDMineModifyRemarkViewController.swift

@@ -0,0 +1,149 @@
+//
+//  JDMineModifyRemarkViewController.swift
+//  Koala
+//
+//  Created by mac on 2023/10/12.
+//  Copyright © 2023 刘千军. All rights reserved.
+//
+
+import Foundation
+import UIKit
+
+class JDMineModifyRemarkViewController: BaseViewController {
+
+//    @IBOutlet weak var inputBgView: UIView!
+//    @IBOutlet weak var hintLab: UILabel!
+//
+//    lazy var inView:BaseInputView = {
+//        let inView:BaseInputView = BaseInputView()
+//        return inView
+//    }()
+    
+    lazy var bgView : UIView = {
+        let v = UIView()
+        v.backgroundColor = .white
+        return v
+    }()
+    lazy var textView : UITextView = {
+        let v = JDTextView(frame: .zero)
+        v.backgroundColor = UIColor.white
+        v.placeHolder = switchLanguage("介绍自己的投资经验,风格或领域")
+        v.placeHolderColor = _color("#B0B0B0&#B0B0B0")
+        v.font = UIFont.systemFont(ofSize: 14)
+        return v
+    }()
+    
+    lazy var tipLb : UILabel = {
+        let v = UILabel()
+        v.textColor = _color("#B0B0B0&#B0B0B0")
+        v.setTextFont(.PFSR, 13)
+        v.textAlignment = .center
+        v.text = switchLanguage("例如;美股研究员/新股专家/量化交易员")
+        
+        return v
+    }()
+    
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.myNavigationBar.title_Label.text = switchLanguage("个人简介")
+        self.myNavigationBar.right_SuperView.isHidden = false
+        self.myNavigationBar.right_Button.setTitle(switchLanguage("完成")+"  ", for: .normal)
+        self.myNavigationBar.right_Button.setTitleColor(MainBackGroundColor, for: .normal)
+        self.myNavigationBar.right_Button.setTextFont(.PFSM, 15)
+        self.myNavigationBar.right_Button.addTarget(self, action: #selector(clickRightBtnAction), for: .touchUpInside)
+        
+        self.view.addSubview(bgView)
+        bgView.snp.makeConstraints { make in
+            make.left.right.equalTo(self.view)
+            make.top.equalTo(self.myNavigationBar.snp.bottom)
+            make.height.equalTo(165)
+        }
+        
+        bgView.addSubview(textView)
+        textView.snp.makeConstraints { make in
+            make.top.equalTo(bgView.snp.top).offset(15)
+            make.left.equalTo(bgView.snp.left).offset(18)
+            make.right.equalTo(bgView.snp.right).offset(-18)
+            make.bottom.equalTo(bgView.snp.bottom).offset(-15)
+        }
+        
+        self.view.addSubview(tipLb)
+        tipLb.snp.makeConstraints { make in
+            make.left.equalTo(self.view.snp.left).offset(18)
+            make.top.equalTo(bgView.snp.bottom).offset(15)
+        }
+        
+
+        
+        mySwitchLanguage()
+        mySwitchSkin()
+        // Do any additional setup after loading the view.
+    }
+    
+    override func subView() {
+//        self.hintLab.setTextFont(.PFSR, 12)
+        
+    }
+    
+    override func updateViewConstraints() {
+        super.updateViewConstraints()
+       
+    }
+    
+    
+    override func mySwitchLanguage() {
+
+    }
+    
+    override func mySwitchSkin() {
+
+        
+        self.view.backgroundColor = _color("#F6FAFE&#F6FAFE")
+//        hintLab.textColor = MidTextColor
+      
+        
+    }
+
+
+   
+
+}
+
+extension JDMineModifyRemarkViewController {
+    func netUserImName() -> Void {
+//        let text = self.nicknameTF.text ?? "" //self.inView.textField.text ?? ""
+//        guard text.length > 0 else {
+//            ProgressHUD.showMessage(status: switchLanguage("请输入昵称"))
+//            return
+//        }
+//        let textCount = text.unicodeScalars
+//        guard textCount.count < 24 else {
+//            ProgressHUD.showMessage(status: switchLanguage("昵称1-24位字符"))
+//            return
+//        }
+//
+//        var paramDict:[String:Any] = [String:Any]()
+//        paramDict = ["im_name":text]
+//        NetWork.NetWorkInstance.requestData(requestType: .Post, URLString: netForUserImName,parameters:paramDict, success: {[weak self] (errno,result) in
+//            ProgressHUD.showSuccess(status: switchLanguage("保存成功"))
+//            OperationalUserInfoData.refreshUserInfoComplete {
+//                self?.navigationController?.popViewController(animated: true)
+//            }
+//
+//        }) { (errno,result) in
+//
+//            ProgressHUD.showError(status: result as! String)
+//        }
+//
+    }
+    
+    
+
+}
+
+extension JDMineModifyRemarkViewController{
+    @objc func clickRightBtnAction(){
+        self.netUserImName()
+    }
+}

+ 206 - 0
Koala/Koala/Modular/JDMine/VC/JDMineQrcodeViewController.swift

@@ -0,0 +1,206 @@
+//
+//  JDMineQrcodeViewController.swift
+//  Koala
+//
+//  Created by mac on 2023/10/12.
+//  Copyright © 2023 刘千军. All rights reserved.
+//
+
+import Foundation
+import UIKit
+
+class JDMineQrcodeViewController: BaseViewController {
+    
+    
+    lazy var bgView : UIView = {
+        let v = UIView()
+        v.backgroundColor = .white
+        
+        return v
+    }()
+    
+    
+    lazy var avatarIv : UIImageView = {
+        let v = UIImageView()
+        v.image = Base_Avtor_Image
+        v.layer.masksToBounds = true
+        v.layer.cornerRadius = 18
+        return v
+    }()
+    
+    lazy var nicknameLb : UILabel = {
+        let v = UILabel()
+        v.textColor = _color("#333333&#333333")
+        v.setTextFont(.PFSR, 16)
+        v.text = "nickname"
+        
+        return v
+    }()
+    
+    lazy var qrcodeIV : UIImageView = {
+        let v = UIImageView()
+        v.image = _image("jdmine_invite_poster_qrbg&jdmine_invite_poster_qrbg")
+        
+        return v
+    }()
+    
+    lazy var tipLb : UILabel = {
+        let v = UILabel()
+        v.textColor = _color("#AAAAAA&#AAAAAA")
+        v.setTextFont(.PFSR, 14)
+        v.textAlignment = .center
+        v.text = switchLanguage("扫一扫,加极友")
+        
+        return v
+    }()
+    
+    lazy var logoIv : UIImageView = {
+        let v = UIImageView()
+        v.image = _image("Login_Logo&Login_Logo")
+        return v
+    }()
+    
+    lazy var saveBtn: UIButton = {
+        let v = UIButton(type: .custom)
+        v.backgroundColor = .white
+        v.setImage(_image("jdmine_qrcode_save&jdmine_qrcode_save"), for: .normal)
+        v.setTitle(switchLanguage("保存"), for: .normal)
+        v.titleLabel?.setTextFont(.PFSM, 14)
+        v.setTitleColor(MainBackGroundColor, for: .normal)
+        
+        v.layer.masksToBounds = true
+        v.layer.cornerRadius = 6
+        v.layer.borderColor = MainBackGroundColor.cgColor
+        v.layer.borderWidth = 0.8
+        v.addTarget(self, action: #selector(saveAction), for: .touchUpInside)
+        return v
+    }()
+    
+    lazy var shareBtn : UIButton  = {
+        let v = UIButton(type: .custom)
+        v.backgroundColor = MainBackGroundColor
+        v.setImage(_image("jdmine_qrcode_share&jdmine_qrcode_share"), for: .normal)
+        v.setTitle(switchLanguage("分享"), for: .normal)
+        v.titleLabel?.setTextFont(.PFSM, 14)
+        v.setTitleColor(.white, for: .normal)
+        
+        v.layer.masksToBounds = true
+        v.layer.cornerRadius = 6
+//        v.layer.borderColor = MainBackGroundColor.cgColor
+//        v.layer.borderWidth = 0.8
+        v.addTarget(self, action: #selector(shareAction), for: .touchUpInside)
+        return v
+    }()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.myNavigationBar.title_Label.text = switchLanguage("二维码名片")
+        self.myNavigationBar.right_SuperView.isHidden = false
+        
+        self.myNavigationBar.right_Button.setImage(_image("jdmine_qrcode_scan&jdmine_qrcode_scan"), for: .normal)
+//        self.myNavigationBar.right_Button.setTitle(switchLanguage("保存")+"  ", for: .normal)
+//        self.myNavigationBar.right_Button.setTitleColor(MainBackGroundColor, for: .normal)
+//        self.myNavigationBar.right_Button.setTextFont(.PFSM, 15)
+        self.myNavigationBar.right_Button.addTarget(self, action: #selector(clickRightBtnAction), for: .touchUpInside)
+        
+        
+        self.view.addSubview(bgView)
+        
+        bgView.snp.makeConstraints { make in
+            
+            make.top.equalTo(self.myNavigationBar.snp.bottom).offset(15)
+            make.left.equalTo(self.view.snp.left).offset(18)
+            make.right.equalTo(self.view.snp.right).offset(-18)
+            make.height.equalTo(458)
+        }
+        
+        bgView.addSubview(avatarIv)
+        avatarIv.snp.makeConstraints { make in
+            make.left.equalTo(bgView.snp.left).offset(18)
+            make.top.equalTo(bgView.snp.top).offset(17)
+            make.size.equalTo(CGSize(width: 36, height: 36))
+        }
+        
+        bgView.addSubview(nicknameLb)
+        nicknameLb.snp.makeConstraints { make in
+            make.centerY.equalTo(avatarIv)
+            make.left.equalTo(avatarIv.snp.right).offset(7)
+        }
+        
+        bgView.addSubview(qrcodeIV)
+        qrcodeIV.snp.makeConstraints { make in
+            make.centerX.equalTo(bgView)
+            make.top.equalTo(avatarIv.snp.bottom).offset(50)
+            make.size.equalTo(CGSize(width: 233, height: 233))
+        }
+        
+        bgView.addSubview(tipLb)
+        tipLb.snp.makeConstraints { make in
+            make.centerX.equalTo(bgView)
+            make.top.equalTo(qrcodeIV.snp.bottom).offset(6)
+        }
+        
+        bgView.addSubview(logoIv)
+        logoIv.snp.makeConstraints { make in
+            make.centerX.equalTo(bgView)
+            make.bottom.equalTo(bgView.snp.bottom).offset(-28)
+            make.size.equalTo(CGSize(width: 116, height: 26))
+        }
+        
+        self.view.addSubview(saveBtn)
+        saveBtn.snp.makeConstraints { make in
+            make.top.equalTo(bgView.snp.bottom).offset(33)
+            make.left.equalTo(self.view.snp.left).offset(18)
+            make.right.equalTo(self.view.snp.centerX).offset(-9)
+            make.height.equalTo(40)
+        }
+        
+        
+        self.view.addSubview(shareBtn)
+        shareBtn.snp.makeConstraints { make in
+            make.top.equalTo(bgView.snp.bottom).offset(33)
+            make.right.equalTo(self.view.snp.right).offset(-18)
+            make.left.equalTo(self.view.snp.centerX).offset(9)
+            make.height.equalTo(40)
+        }
+        mySwitchSkin()
+        
+        
+    }
+    
+    
+    override func mySwitchLanguage() {
+//        hintLab.text = switchLanguage("昵称包含1-24位字符(包含数字,字符和空格),且每个月只能修改一次")
+//        self.inView.setTextPlaceholder(text: switchLanguage("昵称"))
+    }
+    
+    override func mySwitchSkin() {
+
+        
+        self.view.backgroundColor = _color("#F6FAFE&#F6FAFE")
+//        hintLab.textColor = MidTextColor
+      
+        
+    }
+    
+}
+
+extension JDMineQrcodeViewController {
+    
+    @objc func saveAction() ->Void {
+        
+        
+    }
+    
+    
+    
+    @objc func shareAction() ->Void {
+        
+        
+    }
+    
+    
+    @objc func clickRightBtnAction() ->Void {
+        
+    }
+}

+ 58 - 0
Koala/Koala/Modular/JDMine/VC/JDMineUserInfoViewController.swift

@@ -122,6 +122,11 @@ extension JDMineUserInfoViewController : UITableViewDataSource {
             
         cell.titleLb.text = titleAry[indexPath.row]
       
+        if indexPath.row == 4 {
+            
+            cell.valueLb.text = switchLanguage("男")
+        }
+        
         cell.accessoryType = .disclosureIndicator
         return cell
     
@@ -141,6 +146,59 @@ extension JDMineUserInfoViewController : UITableViewDelegate {
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         tableView.deselectRow(at: indexPath, animated: true)
         
+        if  indexPath.row == 0 {
+            
+            if OperationalUserInfoData.getLogin() {
+                PhotoManager.shared().show { (index, imageData) in
+                    
+                    print( imageData)
+//                    self?.viewModel.imageData = imageData
+//                    self?.viewModel.uploadAvtar()
+                }
+                return
+            }else{
+                self.navigationController?.pushViewController(LoginViewController(), animated: true)
+            }
+        } else if indexPath.row == 1 {
+            
+            if OperationalUserInfoData.getLogin() {
+                self.navigationController?.pushViewController(JDMineModifyNickNameViewController(), animated: true)
+            }else{
+                self.navigationController?.pushViewController(LoginViewController(), animated: true)
+            }
+            
+        } else if indexPath.row == 2 {
+            
+            UIPasteboard.general.string = ""
+            ProgressHUD.showInfo(status: switchLanguage("已复制到剪切板"))
+            
+        } else if indexPath.row == 3 {
+            
+            if OperationalUserInfoData.getLogin() {
+                self.navigationController?.pushViewController(JDMineQrcodeViewController(), animated: true)
+            }else{
+                self.navigationController?.pushViewController(LoginViewController(), animated: true)
+            }
+            
+        } else if indexPath.row == 4 {
+            
+            
+            if OperationalUserInfoData.getLogin() {
+                self.navigationController?.pushViewController(JDMineModifyGenderViewController(), animated: true)
+            }else{
+                self.navigationController?.pushViewController(LoginViewController(), animated: true)
+            }
+            
+        } else if indexPath.row == 5 {
+            
+            if OperationalUserInfoData.getLogin() {
+                self.navigationController?.pushViewController(JDMineModifyRemarkViewController(), animated: true)
+            }else{
+                self.navigationController?.pushViewController(LoginViewController(), animated: true)
+            }
+            
+        }
+        
         
         print("111")
     }

+ 22 - 0
Koala/Koala/Other/Assets.xcassets/Infomation/Infomation_share.imageset/Contents.json

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

BIN
Koala/Koala/Other/Assets.xcassets/Infomation/Infomation_share.imageset/火备份@2x.png


BIN
Koala/Koala/Other/Assets.xcassets/Infomation/Infomation_share.imageset/火备份@3x.png


+ 22 - 0
Koala/Koala/Other/Assets.xcassets/JDMine/jdmine_qrcode_save.imageset/Contents.json

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

BIN
Koala/Koala/Other/Assets.xcassets/JDMine/jdmine_qrcode_save.imageset/形状@2x.png


BIN
Koala/Koala/Other/Assets.xcassets/JDMine/jdmine_qrcode_save.imageset/形状@3x.png


+ 22 - 0
Koala/Koala/Other/Assets.xcassets/JDMine/jdmine_qrcode_scan.imageset/Contents.json

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

BIN
Koala/Koala/Other/Assets.xcassets/JDMine/jdmine_qrcode_scan.imageset/路径备份 5@2x.png


BIN
Koala/Koala/Other/Assets.xcassets/JDMine/jdmine_qrcode_scan.imageset/路径备份 5@3x.png


+ 22 - 0
Koala/Koala/Other/Assets.xcassets/JDMine/jdmine_qrcode_share.imageset/Contents.json

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

BIN
Koala/Koala/Other/Assets.xcassets/JDMine/jdmine_qrcode_share.imageset/形状备份 10@2x.png


BIN
Koala/Koala/Other/Assets.xcassets/JDMine/jdmine_qrcode_share.imageset/形状备份 10@3x.png


+ 25 - 25
Koala/Pods/Pods.xcodeproj/xcuserdata/mac.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,127 +7,127 @@
 		<key>Alamofire.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>21</integer>
+			<integer>8</integer>
 		</dict>
 		<key>CryptoSwift.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>20</integer>
+			<integer>24</integer>
 		</dict>
 		<key>FMDB.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>7</integer>
+			<integer>19</integer>
 		</dict>
 		<key>GzipSwift.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>16</integer>
 		</dict>
 		<key>HandyJSON.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>13</integer>
+			<integer>7</integer>
 		</dict>
 		<key>IQKeyboardManagerSwift.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>6</integer>
 		</dict>
 		<key>Kingfisher.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>25</integer>
+			<integer>12</integer>
 		</dict>
 		<key>LLCycleScrollView.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>23</integer>
+			<integer>4</integer>
 		</dict>
 		<key>LiveChat.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>8</integer>
+			<integer>3</integer>
 		</dict>
 		<key>MJExtension.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>14</integer>
+			<integer>21</integer>
 		</dict>
 		<key>MJRefresh.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>11</integer>
 		</dict>
 		<key>PGDatePicker.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>6</integer>
+			<integer>27</integer>
 		</dict>
 		<key>PGPickerView.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>18</integer>
+			<integer>15</integer>
 		</dict>
 		<key>Pods-Koala.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>11</integer>
+			<integer>26</integer>
 		</dict>
 		<key>Pods-KoalaTests.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>26</integer>
+			<integer>9</integer>
 		</dict>
 		<key>Pods-KoalaUITests.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>9</integer>
+			<integer>10</integer>
 		</dict>
 		<key>ReactiveCocoa.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>24</integer>
+			<integer>2</integer>
 		</dict>
 		<key>ReactiveSwift.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>15</integer>
+			<integer>13</integer>
 		</dict>
 		<key>SVProgressHUD.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>22</integer>
+			<integer>5</integer>
 		</dict>
 		<key>SideMenu.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>19</integer>
+			<integer>20</integer>
 		</dict>
 		<key>SnapKit.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>27</integer>
+			<integer>22</integer>
 		</dict>
 		<key>Starscream.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>17</integer>
+			<integer>23</integer>
 		</dict>
 		<key>SwiftSVG.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>10</integer>
+			<integer>14</integer>
 		</dict>
 		<key>SwiftyJSON.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>25</integer>
 		</dict>
 		<key>lottie-ios.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>16</integer>
+			<integer>17</integer>
 		</dict>
 	</dict>
 </dict>