Kaynağa Gözat

...code界面->StoryBoard

hxb 9 yıl önce
ebeveyn
işleme
113586eefb

BIN
SocketChat.xcworkspace/xcuserdata/justine.xcuserdatad/UserInterfaceState.xcuserstate


+ 26 - 42
SocketChat.xcworkspace/xcuserdata/justine.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -25,14 +25,14 @@
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "SocketChat/RecentViewController.swift"
-            timestampString = "487749349.720399"
+            filePath = "SocketChat/SMSViewController.swift"
+            timestampString = "487753455.367852"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "34"
-            endingLineNumber = "34"
-            landmarkName = "viewDidLoad()"
-            landmarkType = "5">
+            startingLineNumber = "103"
+            endingLineNumber = "103"
+            landmarkName = "SMSViewController"
+            landmarkType = "3">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -41,12 +41,12 @@
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "SocketChat/RecentViewController.swift"
-            timestampString = "487749350.419601"
+            filePath = "SocketChat/RecentViewController1.swift"
+            timestampString = "488107645.191338"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "24"
-            endingLineNumber = "24"
+            startingLineNumber = "49"
+            endingLineNumber = "49"
             landmarkName = "viewDidLoad()"
             landmarkType = "5">
          </BreakpointContent>
@@ -54,66 +54,50 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "No"
+            shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "SocketChat/RecentViewController1.swift"
-            timestampString = "487750154.170957"
+            filePath = "SocketChat/LoginViewController.swift"
+            timestampString = "488107704.39912"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "30"
-            endingLineNumber = "30"
-            landmarkName = "viewDidLoad()"
+            startingLineNumber = "120"
+            endingLineNumber = "120"
+            landmarkName = "checkUser(_:password:)"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "No"
+            shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "SocketChat/RecentViewController1.swift"
-            timestampString = "487844432.498481"
+            filePath = "SocketChat/LoginViewController.swift"
+            timestampString = "488107722.229543"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "41"
-            endingLineNumber = "41"
-            landmarkName = "viewDidLoad()"
+            startingLineNumber = "119"
+            endingLineNumber = "119"
+            landmarkName = "checkUser(_:password:)"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "No"
+            shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "SocketChat/RecentViewController1.swift"
-            timestampString = "487844432.498481"
+            timestampString = "488109703.420247"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "39"
-            endingLineNumber = "39"
+            startingLineNumber = "31"
+            endingLineNumber = "31"
             landmarkName = "viewDidLoad()"
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "SocketChat/SMSViewController.swift"
-            timestampString = "487753455.367852"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "103"
-            endingLineNumber = "103"
-            landmarkName = "SMSViewController"
-            landmarkType = "3">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 1 - 1
SocketChat/AppDelegate.swift

@@ -114,7 +114,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func showRootViewContorller(){
         
         let tabbarController = UITabBarController()
-        let RecentController = UINavigationController(rootViewController: RecentViewController())
+        let RecentController = UINavigationController(rootViewController: RecentViewController1())
         let ContactController = UINavigationController(rootViewController: ContactViewController())
         let NoticeController = UINavigationController(rootViewController: NoticeViewController())
         let SettingController = UINavigationController(rootViewController: SettingViewController())

+ 14 - 9
SocketChat/LoginViewController.swift

@@ -112,6 +112,12 @@ class LoginViewController: UIViewController{
                         print("登陆失败,服务端返回错误为\(bigDic1["message"])")
                     }
                     else{
+                        
+                        
+                        //存用户名 userID
+                        ManagerUserDefault().InsertUserDefault(self.afusername!, key: USERDEFAULT_USER_NAME)
+                        ManagerUserDefault().InsertUserDefault(self.afuserid!, key: USERDEFAULT_USER_ID)
+                        ManagerUserDefault().InsertUserDefault(self.passWord!, key: USERDEFAULT_USER_PWD)
                     //根据返回值大字典bigDic1里的小字典data["isLocked"]判断是否登陆
                         guard let dataDic1:NSDictionary = bigDic1["data"] as? NSDictionary else{
                             print("大字典bigDic1转字典dataDic1转换失败")
@@ -132,8 +138,6 @@ class LoginViewController: UIViewController{
                             ManagerUserDefault().DeleteUserDefault(USERDEFAULT_USER_NAME)
                             ManagerUserDefault().DeleteUserDefault(USERDEFAULT_USER_ID)
                             print("进入前储存用户信息")
-                            ManagerUserDefault().InsertUserDefault(self.afusername!, key: USERDEFAULT_USER_NAME)
-                            ManagerUserDefault().InsertUserDefault(self.afuserid!, key: USERDEFAULT_USER_ID)
                             self.showSMSVC()
                         }
                         //进入主界面 更新设备token
@@ -147,13 +151,6 @@ class LoginViewController: UIViewController{
                     }
                     
                     
-                    
-                    
-                    
-                    //let r:LoginRet = R.result.value! as! NSDictionary
-                    
-                    //TCPClient.shareInstance.connect(USER_APP_SERVER! as! String )
-                    
                 })
                 
                 
@@ -199,6 +196,14 @@ class LoginViewController: UIViewController{
     //转场景前 执行操作 写在调用之前,可能要进行参数的传递
     override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
         if segue.identifier == "ShowRootView"{
+            //进入主界面前 建立socket 链接 然后p_Auth认证用户可靠性
+                //认证
+            
+            
+            
+            
+            
+            
             let controller = segue.destinationViewController as! RootViewController
         }
         print("返回错误或其他原因禁止转场")

+ 4 - 1
SocketChat/RecentMessageCell.swift

@@ -7,8 +7,11 @@
 //
 
 import UIKit
-
 class RecentMessageCell: UITableViewCell {
+    @IBOutlet weak var Avatar: UIImageView!
+    @IBOutlet weak var Names: UILabel!
+    @IBOutlet weak var content: UILabel!
+    @IBOutlet weak var showtime: UILabel!
 
     override func awakeFromNib() {
         super.awakeFromNib()

+ 10 - 4
SocketChat/RecentMessageCell.xib

@@ -11,7 +11,7 @@
             <rect key="frame" x="0.0" y="0.0" width="381" height="84"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="381" height="84"/>
+                <rect key="frame" x="0.0" y="0.0" width="381" height="83.5"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6gl-c0-dbu">
@@ -20,23 +20,29 @@
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="姓名" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wMV-fb-fFh">
                         <rect key="frame" x="112" y="14" width="42" height="21"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="I1d-8w-Lmx">
                         <rect key="frame" x="112" y="55" width="219" height="21"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="6月16日周四" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VFr-Ed-dBr">
                         <rect key="frame" x="265" y="8" width="108" height="21"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                 </subviews>
             </tableViewCellContentView>
+            <connections>
+                <outlet property="Avatar" destination="6gl-c0-dbu" id="PbS-TU-QFi"/>
+                <outlet property="Names" destination="wMV-fb-fFh" id="OLO-OZ-xVv"/>
+                <outlet property="content" destination="I1d-8w-Lmx" id="cJE-wp-RbK"/>
+                <outlet property="showtime" destination="VFr-Ed-dBr" id="Nov-ct-837"/>
+            </connections>
             <point key="canvasLocation" x="573.5" y="300"/>
         </tableViewCell>
     </objects>

+ 0 - 87
SocketChat/RecentViewController.swift

@@ -1,87 +0,0 @@
-//
-//  RecentViewController.swift
-//  SocketChat
-//
-//  Created by Justine on 16/5/27.
-//  Copyright © 2016年 AppCoda. All rights reserved.
-//
-
-import UIKit
-var mysocket:TCPClient?
-class RecentViewController: UIViewController,UITableViewDelegate,UITableViewDataSource {
-    var tableView:UITableView?
-    var dataList = NSMutableArray()
-    @IBOutlet weak var lab: UILabel!
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        self.view.backgroundColor = UIColor.redColor()
-        
-        
-        
-        //登陆完成后执行的相关操作
-            //记录最近登陆用户名 头像  加盐后的密码 userdefault
-        //请求POST    /v1/user/lastDevice  -用户最后使用的设备
-//        参数说明:
-//        String serverID   -必填项,服务器ID
-//        String loginName  -必填项,登录账号
-//        String uuid       -可选项,请求唯一标识
-//        参数格式:{ serverID:"", loginName:"", uuid:"" }
-
-        
-        
-        
-        
-        //绘制基本界面
-        self.tableView?.dataSource = self
-        self.tableView?.delegate = self
-        
-        let story = UIStoryboard(name: "Main", bundle: nil)
-        let RecentVC = story.instantiateViewControllerWithIdentifier("RecentView")
-        
-        TCPClient.shareInstance.connect(GET_APP_SERVER! as! String)
-        let params:[String] = ["serverID = \(GET_SERVER_ID as! String)",
-                               "loginName = \(GET_USER_NAME as! String)",
-                               "password = a12345678",
-                               "type = 1 ",
-                               "clientType = 1",
-                               "deviceToken = \(GET_USER_TOKEN as! String)"]
-        mysocket?.send("user.auth", data: params)
-        TCPClient.shareInstance.recived("user.auth")
-        //self.presentViewController(RecentVC, animated: true, completion: { () -> Void in
-        
-        //})
-        // Do any additional setup after loading the view.
-    }
-
-    override func didReceiveMemoryWarning() {
-        super.didReceiveMemoryWarning()
-        // Dispose of any resources that can be recreated.
-    }
-    
-
-    /*
-    // MARK: - Navigation
-
-    // In a storyboard-based application, you will often want to do a little preparation before navigation
-    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
-        // Get the new view controller using segue.destinationViewController.
-        // Pass the selected object to the new view controller.
-    }
-    */
-    //实现继承的委托中的两个方法
-    func tableView(tableView: UITableView, numberOfRowsInSection section: Int) -> Int{
-        return 100;
-    }
-    
-    //返回Cell
-    func tableView(tableView:UITableView, cellForRowAtIndexPath indexPath:NSIndexPath)->UITableViewCell{
-        //根据需求自己重绘
-        let cell = UITableViewCell(style: .Default, reuseIdentifier: "cell")
-        //        let cellID="Cell ID";
-        //        var cell=tableView.dequeueReusableCellWithIdentifier(cellID) as? UITableViewCell;
-        //
-        return cell;
-    }
-
-}

+ 15 - 4
SocketChat/RecentViewController1.swift

@@ -10,6 +10,7 @@ import UIKit
 
 class RecentViewController1: UITableViewController {
     var dataList = NSMutableArray()
+    var mysocket:TCPClient?
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -27,18 +28,28 @@ class RecentViewController1: UITableViewController {
 //        let story = UIStoryboard(name: "Main", bundle: nil)
 //        let RecentVC = story.instantiateViewControllerWithIdentifier("RecentView")
         
-        TCPClient.shareInstance.connect(GET_APP_SERVER! as! String)
-        let params:[String] = ["serverID = \(GET_SERVER_ID as! String)",
+        TCPClient.shareInstance.connect(GET_APP_SERVER)
+        let params = ["serverID":GET_APP_SERVER,
+                      "loginName":GET_USER_NAME,
+                      "password":GET_USER_PWD,
+                      "type":1,
+                      "clientType":1,
+                      "deviceToken":GET_USER_TOKEN,
+                      ]
+        
+        
+        /*let params:[String] = ["serverID  \(GET_SERVER_ID as! String)",
                                "loginName = \(GET_USER_NAME as! String)",
                                "password = a12345678",
                                "type = 1 ",
                                "clientType = 1",
                                "deviceToken = \(GET_USER_TOKEN?.stringValue)"
                                //"deviceToken = \(GET_USER_TOKEN as! String)"
-        ]
+        ]*/
         TCPClient.shareInstance.recived("user.auth")
         mysocket?.send("user.auth", data: params)
-        TCPClient.shareInstance.recived("user.auth")
+        
+        //TCPClient.shareInstance.recived("user.auth")
 
    
     }

+ 0 - 3
SocketChat/SMSViewController.swift

@@ -77,9 +77,6 @@ class SMSViewController: UIViewController {
     func timer(times:Int){
         
     }
-    
-    
-
     override func viewDidLoad() {
         super.viewDidLoad()
         

+ 15 - 12
func.swift

@@ -37,31 +37,34 @@ let SERVER_ID = "SERVER_ID"
 let SOCKET_SERVER = "SOCKET_SERVER"
 
 
-let GET_CENTER_SERVER = ManagerUserDefault().SelectUserDefault(CENTER_SERVER)
-let GET_APP_SERVER = ManagerUserDefault().SelectUserDefault(APP_SERVER)
-let GET_CHAT_SERVER = ManagerUserDefault().SelectUserDefault(CHAT_SERVER)
-let GET_FILE_UP_SERVER = ManagerUserDefault().SelectUserDefault(FILE_UP_SERVER)
-let GET_FILE_DOWN_SERVER = ManagerUserDefault().SelectUserDefault(FILE_DOWN_SERVER)
-let GET_SERVER_ID = ManagerUserDefault().SelectUserDefault(SERVER_ID)
+let GET_CENTER_SERVER = ManagerUserDefault().SelectUserDefault(CENTER_SERVER) as! String
+let GET_APP_SERVER = ManagerUserDefault().SelectUserDefault(APP_SERVER) as! String
+let GET_CHAT_SERVER = ManagerUserDefault().SelectUserDefault(CHAT_SERVER) as! String
+let GET_FILE_UP_SERVER = ManagerUserDefault().SelectUserDefault(FILE_UP_SERVER) as! String
+let GET_FILE_DOWN_SERVER = ManagerUserDefault().SelectUserDefault(FILE_DOWN_SERVER) as! String
+let GET_SERVER_ID = ManagerUserDefault().SelectUserDefault(SERVER_ID) as! String
 let GET_SOCKET_SERVER = GET_APP_SERVER
-var USER_SOCKET_SERVER_URI = ((GET_APP_SERVER as! NSString).componentsSeparatedByString(":"))
+
+var USER_SOCKET_SERVER_URI = ((GET_APP_SERVER).componentsSeparatedByString(":"))
 let SOCKET_HOST = USER_SOCKET_SERVER_URI[0]
 let SOCKET_PORT = Int(USER_SOCKET_SERVER_URI[1])
 //################## About LoginMsg
 let USERDEFAULT_USER_NAME = "USERDEFAULT_USER_NAME"
 let USERDEFAULT_LOGIN_NAME = "USERDEFAULT_LOGIN_NAME"
+let USERDEFAULT_USER_PWD = "USERDEFAULT_USER_PWD"
 let USERDEFAULT_USER_ID = "USERDEFAULT_USER_ID"
 let USERDEFAULT_PASSWORD = "USERDEFAULT_PASSWORD"
 let USERDEFAULT_SERVER_ID = "USERDEFAULT_SERVER_ID"
 let USERDEFAULT_APP_TOKEN = "USERDEFAULT_APP_TOKEN"
 
 
-let GET_USER_NAME = ManagerUserDefault().SelectUserDefault(USERDEFAULT_USER_NAME)
-let GET_USER_ID = ManagerUserDefault().SelectUserDefault(USERDEFAULT_USER_ID)
-let GET_USER_TOKEN = ManagerUserDefault().SelectUserDefault(USERDEFAULT_APP_TOKEN)
+let GET_USER_NAME = ManagerUserDefault().SelectUserDefault(USERDEFAULT_USER_NAME) as! String
+let GET_USER_ID = ManagerUserDefault().SelectUserDefault(USERDEFAULT_USER_ID) as! String
+let GET_USER_TOKEN = ManagerUserDefault().SelectUserDefault(USERDEFAULT_APP_TOKEN) as! String
+let GET_USER_PWD = ManagerUserDefault().SelectUserDefault(USERDEFAULT_USER_PWD) as! String
 //############### Check SMS ###############
-let RequireSMSURL = (GET_APP_SERVER as! String) + "/zhuxunserver/sms/sendCode"
-let CheckSMSURL =  (GET_APP_SERVER as! String) + "/zhuxunserver/sms/authCode"
+let RequireSMSURL = (GET_APP_SERVER) + "/zhuxunserver/sms/sendCode"
+let CheckSMSURL =  (GET_APP_SERVER) + "/zhuxunserver/sms/authCode"