Browse Source

tradefiling demo 1.01 fix login issue

Ray Zhang 5 years ago
parent
commit
4f59d15dd3

+ 6 - 2
RA TradeFiling/RA TradeFiling.xcodeproj/project.pbxproj

@@ -1415,14 +1415,16 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 47883;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
+				GCC_OPTIMIZATION_LEVEL = 0;
 				INFOPLIST_FILE = "RA TradeFiling/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.01;
 				PRODUCT_BUNDLE_IDENTIFIER = "USAI.RA-TradeFiling";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
 		};
@@ -1434,14 +1436,16 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 47883;
 				DEVELOPMENT_TEAM = HXWLAA5YN5;
+				GCC_OPTIMIZATION_LEVEL = s;
 				INFOPLIST_FILE = "RA TradeFiling/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.01;
 				PRODUCT_BUNDLE_IDENTIFIER = "USAI.RA-TradeFiling";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				TARGETED_DEVICE_FAMILY = "1,2";
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;
 		};

BIN
RA TradeFiling/RA TradeFiling.xcodeproj/project.xcworkspace/xcuserdata/ruizhang.xcuserdatad/UserInterfaceState.xcuserstate


+ 48 - 0
RA TradeFiling/RA TradeFiling.xcodeproj/xcuserdata/ruizhang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -859,5 +859,53 @@
             landmarkType = "9">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "5BDD95CB-E351-4725-B6D9-236E0833C6D1"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/Login/LoginViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "79"
+            endingLineNumber = "79"
+            landmarkName = "-LoginButtonClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "ABB218B1-5064-4552-BB0F-9F9285F10655"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/Login/LoginViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "53"
+            endingLineNumber = "53"
+            landmarkName = "-LoginButtonClick:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "18B770EB-1BD5-4631-A285-963A27361327"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/DataProvider/RADataProvider.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "25"
+            endingLineNumber = "25"
+            landmarkName = "+Login:password:completionHandler:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 18 - 0
RA TradeFiling/RA TradeFiling.xcodeproj/xcuserdata/ruizhang.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -10,5 +10,23 @@
 			<integer>0</integer>
 		</dict>
 	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>3C0CB330255E56BF00718A03</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>3C0CB34B255E56C000718A03</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>3C0CB356255E56C000718A03</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
 </dict>
 </plist>

+ 1 - 1
RA TradeFiling/RA TradeFiling/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>

+ 1 - 1
RA TradeFiling/RA TradeFiling/Login/LoginViewController.m

@@ -284,7 +284,7 @@
     
     NSString* shortNum =[infoDict objectForKey:@"CFBundleShortVersionString"];
     NSString* versionNum =[infoDict objectForKey:@"CFBundleVersion"];
-    versionNum = [NSString stringWithFormat:@"ver:%@.A%@",shortNum,versionNum];
+    versionNum = [NSString stringWithFormat:@"ver:%@.%@",shortNum,versionNum];
     
     self.verLabel.text = versionNum;
 }

+ 3 - 3
RA TradeFiling/RA TradeFiling/config.h

@@ -10,12 +10,12 @@
 
 //连接超时
 #define JSON_TIMEOUT 60
-
+#define fake_data true
 #ifdef DEBUG
 //    #define test_server
-    #define fake_data true
+//    #define fake_data true
 #else
-    #define fake_data false
+//    #define fake_data false
 # endif
 
 #ifdef test_server