新版本提交，修改my页面背景，修改API地址。

doushiDev · Mar 11, 2016 · fc9fed3 · fc9fed3
1 parent 4e70aaf
commit fc9fed3
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 41 deletions.
diff --git a/ds_ios.xcworkspace/xcuserdata/songlijun.xcuserdatad/UserInterfaceState.xcuserstate b/ds_ios.xcworkspace/xcuserdata/songlijun.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/ds_ios/AppDelegate.swift b/ds_ios/AppDelegate.swift
@@ -21,6 +21,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
 
     func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
+
+
         // Override point for customization after application launch.
         Fabric.with([Answers.self])
 

diff --git a/ds_ios/Assets.xcassets/AppIcon.appiconset/Contents.json b/ds_ios/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -69,8 +69,9 @@
       "scale" : "2x"
     },
     {
-      "idiom" : "ipad",
       "size" : "83.5x83.5",
+      "idiom" : "ipad",
+      "filename" : "doushi_167.png",
       "scale" : "2x"
     }
   ],

diff --git a/ds_ios/Assets.xcassets/AppIcon.appiconset/doushi_167.png b/ds_ios/Assets.xcassets/AppIcon.appiconset/doushi_167.png
diff --git a/ds_ios/Assets.xcassets/mybk1.imageset/Contents.json b/ds_ios/Assets.xcassets/mybk1.imageset/Contents.json
@@ -2,6 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
+      "filename" : "mybk.jpg",
       "scale" : "1x"
     },
     {
@@ -10,7 +11,6 @@
     },
     {
       "idiom" : "universal",
-      "filename" : "mybk1.jpg",
       "scale" : "3x"
     }
   ],

diff --git a/ds_ios/Assets.xcassets/mybk1.imageset/mybk.jpg b/ds_ios/Assets.xcassets/mybk1.imageset/mybk.jpg
diff --git a/ds_ios/Base.lproj/My.storyboard b/ds_ios/Base.lproj/My.storyboard
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="XRW-vi-9xd">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="XRW-vi-9xd">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <customFonts key="customFonts">
@@ -871,7 +871,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="567" height="44.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="朋友需要" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="rM2-HG-zR3">
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="朋友推荐" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="rM2-HG-zR3">
                                                     <rect key="frame" x="62" y="0.0" width="503" height="44.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>

diff --git a/ds_ios/DSHttpClient.swift b/ds_ios/DSHttpClient.swift
@@ -212,7 +212,7 @@ struct HttpClientByVideo {
     enum DSRouter: URLRequestConvertible {
 
         // 逗视API地址
-        static let baseURLString = "https://api.doushi.me/v1/rest/video/"
+        static let baseURLString = "https://api.ds.itjh.net/v1/rest/video/"
 
 
         // 请求方法
@@ -274,7 +274,7 @@ struct HttpClientByUser {
     enum DSRouter: URLRequestConvertible {
 
         // 逗视API地址
-        static let baseURLString = "https://api.doushi.me/v1/rest/user/"
+        static let baseURLString = "https://api.ds.itjh.net/v1/rest/user/"
 
         // 请求方法
         case registerUser(User) //注册用户
@@ -335,7 +335,7 @@ struct HttpClientByUtil {
     enum DSRouter: URLRequestConvertible {
 
         // 逗视API地址
-        static let baseURLString = "https://api.doushi.me/v1/rest/util/"
+        static let baseURLString = "https://api.ds.itjh.net/v1/rest/util/"
 
 
         // 请求方法
@@ -381,7 +381,7 @@ struct HttpClientByUserAndVideo {
     enum DSRouter: URLRequestConvertible {
 
         // 逗视API地址
-        static let baseURLString = "https://api.doushi.me/v1/rest/userAndVideo/"
+        static let baseURLString = "https://api.ds.itjh.net/v1/rest/userAndVideo/"
 
 
         // 请求方法

diff --git a/ds_ios/Info.plist b/ds_ios/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.1</string>
+	<string>1.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.160127</string>
+	<string>1.2.160311.1</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

diff --git a/ds_ios/MyMainTableViewController.swift b/ds_ios/MyMainTableViewController.swift
@@ -238,7 +238,7 @@ class MyMainTableViewController: UITableViewController,APParallaxViewDelegate,MF
         }
 
         if indexPath.section == 2 && indexPath.row == 1 {
-            print("朋友需要")
+            print("朋友推荐")
             let share = "https://itunes.apple.com/cn/app/id1044917946"
 
 

diff --git a/ds_ios/PlayVideoInfoViewController.swift b/ds_ios/PlayVideoInfoViewController.swift
@@ -174,7 +174,7 @@ class PlayVideoInfoViewController: UIViewController {
 
 
 		print("点击了分享")
-		let share = "https://api.doushi.me/share.html?id=\(DataCenter.shareDataCenter.videoInfo.id)"
+		let share = "https://api.ds.itjh.net/share.html?id=\(DataCenter.shareDataCenter.videoInfo.id)"
 
 
 		let saimg = UIImage(data: NSData(contentsOfURL: NSURL(string: DataCenter.shareDataCenter.videoInfo.pic)!)!)

diff --git a/ds_ios/RegisterUserViewController.swift b/ds_ios/RegisterUserViewController.swift
@@ -74,6 +74,7 @@ class RegisterUserViewController: UIViewController,UIImagePickerControllerDelega
         let phoneRule = ValidationRuleLength(min: 11, max: 11, failureError: ValidationError(message: "😫"))
 
         let pwdRule = ValidationRuleLength(min: 8, failureError: ValidationError(message: "😫"))
+
         let result:ValidationResult
 
 

diff --git a/ds_ios/VideoInfo.swift b/ds_ios/VideoInfo.swift
@@ -8,8 +8,8 @@
 
 import Foundation
 
-class VideoInfo : NSObject{
-    
+class VideoInfo: NSObject {
+
 //    id: "24581", //视频id
 //    title: "绿色兵团一命通关之教学版，其实高手在民间~",//视频标题
 //    pic: "http://ww4.sinaimg.cn/orj480/736f0c7ejw1ewkybfyemuj20ds08mmz2.jpg",//视频图片
@@ -18,31 +18,29 @@ class VideoInfo : NSObject{
 //    cTime: "今天 13:39",//发布时间
 //    favo_num: "5",//分享条数
 //    zan_num: "62"//赞条数
-
-
-    let id: String
-    let title: String
-    let pic: String
-    let url: String
-    let cTime: String
-    let isCollectStatus:Int
 
-    init(id: String, title: String,pic: String,url: String,cTime: String,isCollectStatus:Int) {
-        self.id = id
-        self.title = title
-        self.pic = pic
-        self.url = url
-        self.cTime = cTime
-        self.isCollectStatus = isCollectStatus
-    }
-
-    override init() {
-        self.id = ""
-        self.title = ""
-        self.pic = ""
-        self.url = ""
-        self.cTime = ""
-        self.isCollectStatus = 0
-    }
-
+	let id: String
+	let title: String
+	let pic: String
+	let url: String
+	let cTime: String
+	let isCollectStatus: Int
+
+	init(id: String, title: String, pic: String, url: String, cTime: String, isCollectStatus: Int) {
+		self.id = id
+		self.title = title
+		self.pic = pic
+		self.url = url
+		self.cTime = cTime
+		self.isCollectStatus = isCollectStatus
+	}
+
+	override init() {
+		self.id = ""
+		self.title = ""
+		self.pic = ""
+		self.url = ""
+		self.cTime = ""
+		self.isCollectStatus = 0
+	}
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,6 +21,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {


		func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {


		// Override point for customization after application launch.
		Fabric.with([Answers.self])

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -74,6 +74,7 @@ class RegisterUserViewController: UIViewController,UIImagePickerControllerDelega
		let phoneRule = ValidationRuleLength(min: 11, max: 11, failureError: ValidationError(message: "😫"))

		let pwdRule = ValidationRuleLength(min: 8, failureError: ValidationError(message: "😫"))

		let result:ValidationResult


Expand Down