Merge branch 'master' of https://gitee.com/gomore/IFS

IFS/IFS.xcodeproj/project.pbxproj

@@ -1393,6 +1393,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = W54V2VB863;
 				ENABLE_BITCODE = NO;
@@ -1401,6 +1402,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.IFS;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "IFS/Resource/IFS-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 4.0;
@@ -1415,6 +1418,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = W54V2VB863;
 				ENABLE_BITCODE = NO;
@@ -1423,6 +1427,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.IFS;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "IFS/Resource/IFS-Bridging-Header.h";
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";

IFS/IFS/Expand/Const/Urls.swift

@@ -14,12 +14,12 @@ import Foundation
 //public let BaseAttachmentUrl: String = "http://192.168.1.176:9030"
 
 //测试环境
-//public let BaseUrl: String = "http://222.180.250.18:7080/ifs-server/rest"
-//public let BaseAttachmentUrl: String = "http://222.180.250.18:7080"
+public let BaseUrl: String = "http://222.180.250.18:7080/ifs-server/rest"
+public let BaseAttachmentUrl: String = "http://222.180.250.18:7080"
 
 //外网开发环境
-public let BaseUrl: String = "http://dev.gomoretech.com/ifs-server/rest"
-public let BaseAttachmentUrl: String = "http://dev.gomoretech.com"
+//public let BaseUrl: String = "http://dev.gomoretech.com/ifs-server/rest"
+//public let BaseAttachmentUrl: String = "http://dev.gomoretech.com"
 
 /// 登录
 public let loginUrl: String = "/user/login/%@"

IFS/IFS/Other/Login/Controller/LoginViewController.swift

@@ -71,6 +71,7 @@ class LoginViewController: UIViewController {
             }.subscribe(onNext: {[weak self] (boolValue) in
                 self?.passwordLineView.backgroundColor = boolValue ? kBlueColor : kGaryColor
             }).disposed(by: disposeBag)
+        
         Observable.combineLatest(userNameTextField.rx.text.orEmpty,passwordTextField.rx.text.orEmpty).map { (arg) -> Bool in
             let (userName, passowrd) = arg
             return userName.count > 0 && passowrd.count > 0

IFS/IFS/Resource/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.3</string>
+	<string>1.0.4</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.3</string>
+	<string>1.0.4</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

IFS/Podfile.lock

@@ -78,4 +78,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 0eaafb4a7b07d07aea77b58f3cd8a90edc556faf
 
-COCOAPODS: 1.3.0
+COCOAPODS: 1.3.1