最新

Pods/WHKit/WHKit/WHMacro.h

@@ -7,7 +7,7 @@
 //  http://www.jianshu.com/p/c935314b078e
 
 //NSLog
-#ifdef RELEASE
+#ifdef DEBUG
 #define NSLog(...) NSLog(@"%s 第%d行: %@\n\n",__func__,__LINE__,[NSString stringWithFormat:__VA_ARGS__])
 #else
 #define NSLog(...)

ZhongJingLianMeng.xcodeproj/project.pbxproj

@@ -1471,7 +1471,7 @@
 				TargetAttributes = {
 					CC1CE923219BB579004F8F79 = {
 						CreatedOnToolsVersion = 9.2;
-						ProvisioningStyle = Automatic;
+						ProvisioningStyle = Manual;
 						SystemCapabilities = {
 							com.apple.BackgroundModes = {
 								enabled = 1;
@@ -1923,8 +1923,8 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_ENTITLEMENTS = ZhongJingLianMeng/ZhongJingLianMeng.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer: zjlmhyb@126.com (HZQH354CT4)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CODE_SIGN_STYLE = Automatic;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = N4WTU4JYW2;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2018,8 +2018,8 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.chinanet.zhongjinglianmeng;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "";
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				PROVISIONING_PROFILE = "429392cc-08f0-49ad-98fb-758b6ee45964";
+				PROVISIONING_PROFILE_SPECIFIER = ZhongJingLianMengDistribution;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
@@ -2032,8 +2032,8 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_ENTITLEMENTS = ZhongJingLianMeng/ZhongJingLianMeng.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer: zjlmhyb@126.com (HZQH354CT4)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				CODE_SIGN_STYLE = Automatic;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
 				DEVELOPMENT_TEAM = N4WTU4JYW2;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2127,8 +2127,8 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.chinanet.zhongjinglianmeng;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "";
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				PROVISIONING_PROFILE = "429392cc-08f0-49ad-98fb-758b6ee45964";
+				PROVISIONING_PROFILE_SPECIFIER = ZhongJingLianMengDistribution;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;

ZhongJingLianMeng.xcworkspace/xcuserdata/youke.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -52,7 +52,7 @@
                   moduleName = "ZhongJingLianMeng"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/youke/Desktop/ZhongJingLianMeng/ZhongJingLianMeng/main/home(%E9%A6%96%E9%A1%B5)/newsDetailVController.m"
-                  timestampString = "566559410.885981"
+                  timestampString = "570505594.912326"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "246"
@@ -67,7 +67,7 @@
                   moduleName = "ZhongJingLianMeng"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/youke/Desktop/ZhongJingLianMeng/ZhongJingLianMeng/main/home(%E9%A6%96%E9%A1%B5)/newsDetailVController.m"
-                  timestampString = "566559410.888213"
+                  timestampString = "570505594.915029"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "247"
@@ -228,7 +228,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(首页)/homePageViewController.m"
-            timestampString = "566563078.255331"
+            timestampString = "566896750.113749"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "380"
@@ -308,13 +308,45 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(首页)/joinAllianceVController.m"
-            timestampString = "566563078.255555"
+            timestampString = "570508922.783601"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "665"
-            endingLineNumber = "665"
+            startingLineNumber = "695"
+            endingLineNumber = "695"
             landmarkName = "-buttonEvent:"
             landmarkType = "7">
+            <Locations>
+               <Location
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[joinAllianceVController buttonEvent:]"
+                  moduleName = "ZhongJingLianMeng"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/youke/Desktop/ZhongJingLianMeng/ZhongJingLianMeng/main/home(%E9%A6%96%E9%A1%B5)/joinAllianceVController.m"
+                  timestampString = "570505594.984953"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "695"
+                  endingLineNumber = "695"
+                  offsetFromSymbolStart = "1963">
+               </Location>
+               <Location
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "__39-[joinAllianceVController buttonEvent:]_block_invoke"
+                  moduleName = "ZhongJingLianMeng"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/youke/Desktop/ZhongJingLianMeng/ZhongJingLianMeng/main/home(%E9%A6%96%E9%A1%B5)/joinAllianceVController.m"
+                  timestampString = "570505594.987566"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "695"
+                  endingLineNumber = "695"
+                  offsetFromSymbolStart = "16">
+               </Location>
+            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -324,11 +356,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/joinAllianceVController.m"
-            timestampString = "566563078.255617"
+            timestampString = "570508922.784175"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "661"
-            endingLineNumber = "661"
+            startingLineNumber = "691"
+            endingLineNumber = "691"
             landmarkName = "-buttonEvent:"
             landmarkType = "7">
          </BreakpointContent>
@@ -372,7 +404,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/homePageViewController.m"
-            timestampString = "566563078.255759"
+            timestampString = "566896750.116457"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "205"
@@ -388,7 +420,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/homePageViewController.m"
-            timestampString = "566563078.255814"
+            timestampString = "566896750.1166871"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "217"
@@ -452,7 +484,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/homePageViewController.m"
-            timestampString = "566563078.255978"
+            timestampString = "566896750.116951"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "414"
@@ -468,7 +500,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/homePageViewController.m"
-            timestampString = "566563078.256029"
+            timestampString = "566896750.117162"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "420"
@@ -484,7 +516,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/homePageViewController.m"
-            timestampString = "566563078.2560771"
+            timestampString = "566896750.117363"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "445"
@@ -500,11 +532,11 @@
                   moduleName = "ZhongJingLianMeng"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/youke/Desktop/ZhongJingLianMeng/ZhongJingLianMeng/main/home(%E9%A6%96%E9%A1%B5)/homePageViewController.m"
-                  timestampString = "566559411.017157"
+                  timestampString = "570505595.037734"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "441"
-                  endingLineNumber = "441"
+                  startingLineNumber = "445"
+                  endingLineNumber = "445"
                   offsetFromSymbolStart = "2288">
                </Location>
                <Location
@@ -515,11 +547,11 @@
                   moduleName = "ZhongJingLianMeng"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/youke/Desktop/ZhongJingLianMeng/ZhongJingLianMeng/main/home(%E9%A6%96%E9%A1%B5)/homePageViewController.m"
-                  timestampString = "566559411.02256"
+                  timestampString = "570505595.039696"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "441"
-                  endingLineNumber = "441"
+                  startingLineNumber = "445"
+                  endingLineNumber = "445"
                   offsetFromSymbolStart = "2296">
                </Location>
             </Locations>
@@ -580,7 +612,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/homePageViewController.m"
-            timestampString = "566563078.256233"
+            timestampString = "566896750.1176161"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "405"
@@ -628,11 +660,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/joinAllianceVController.m"
-            timestampString = "566563078.256358"
+            timestampString = "570508922.785123"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "578"
-            endingLineNumber = "578"
+            startingLineNumber = "608"
+            endingLineNumber = "608"
             landmarkName = "-loadFeeData:andCategory:"
             landmarkType = "7">
          </BreakpointContent>
@@ -643,13 +675,13 @@
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "ZhongJingLianMeng/main/me(&#x6211;&#x7684;)/controller/logInViewController.m"
-            timestampString = "566472016.7675411"
+            filePath = "ZhongJingLianMeng/main/alliance(&#x8054;&#x76df;)/allianceVController.m"
+            timestampString = "570504777.243659"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "138"
-            endingLineNumber = "138"
-            landmarkName = "-yanzhengBtnClick:"
+            startingLineNumber = "201"
+            endingLineNumber = "201"
+            landmarkName = "-mapView:viewForAnnotation:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -659,13 +691,13 @@
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "ZhongJingLianMeng/main/me(&#x6211;&#x7684;)/controller/logInViewController.m"
-            timestampString = "566472018.764042"
+            filePath = "ZhongJingLianMeng/main/alliance(&#x8054;&#x76df;)/allianceVController.m"
+            timestampString = "570504777.247682"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "134"
-            endingLineNumber = "134"
-            landmarkName = "-yanzhengBtnClick:"
+            startingLineNumber = "133"
+            endingLineNumber = "133"
+            landmarkName = "-loadDataAnnotationList"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -675,13 +707,13 @@
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "ZhongJingLianMeng/main/alliance(&#x8054;&#x76df;)/allianceVController.m"
-            timestampString = "566563078.256489"
+            filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/joinAllianceVController.m"
+            timestampString = "570508922.785454"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "201"
-            endingLineNumber = "201"
-            landmarkName = "-mapView:viewForAnnotation:"
+            startingLineNumber = "614"
+            endingLineNumber = "614"
+            landmarkName = "-loadFeeData:andCategory:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -691,13 +723,13 @@
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "ZhongJingLianMeng/main/alliance(&#x8054;&#x76df;)/allianceVController.m"
-            timestampString = "566563078.256543"
+            filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/joinAllianceVController.m"
+            timestampString = "570508922.785669"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "133"
-            endingLineNumber = "133"
-            landmarkName = "-loadDataAnnotationList"
+            startingLineNumber = "576"
+            endingLineNumber = "576"
+            landmarkName = "-loadAreaData"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -708,12 +740,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/joinAllianceVController.m"
-            timestampString = "566563078.2565939"
+            timestampString = "570508922.785871"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "584"
-            endingLineNumber = "584"
-            landmarkName = "-loadFeeData:andCategory:"
+            startingLineNumber = "574"
+            endingLineNumber = "574"
+            landmarkName = "-loadAreaData"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

ZhongJingLianMeng/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.0</string>
+	<string>2.0.1</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>1</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>weixin</string>

ZhongJingLianMeng/main/home(首页)/joinAllianceVController.m

@@ -528,6 +528,35 @@
                 
                 [self.view addSubview:_statusView];
                 
+            }else if([self.statusID3 isEqualToString:@"2"]){
+                
+                _statusView = [[selectStatusView alloc]initWithFrame:CGRectMake(0, [UIScreen mainScreen].bounds.size.height - 150, [UIScreen mainScreen].bounds.size.width, 150) andProvinceArr:self.categoryArr1 MyCitySelect:^(NSString *selectCity, NSString *areaID) {
+                    
+                    _jiBieLab.text = selectCity;
+                    _jiBieLab.textColor = [UIColor blackColor];
+                    self.statusID4 = areaID;
+                    if (!IsStrEmpty(self.statusID3)) {
+                        
+                        [self loadFeeData:self.statusID3 andCategory:self.statusID4];
+                    }
+                }];
+                
+                [self.view addSubview:_statusView];
+                
+            }else if([self.statusID3 isEqualToString:@"3"]){
+                
+                _statusView = [[selectStatusView alloc]initWithFrame:CGRectMake(0, [UIScreen mainScreen].bounds.size.height - 150, [UIScreen mainScreen].bounds.size.width, 150) andProvinceArr:self.categoryArr2 MyCitySelect:^(NSString *selectCity, NSString *areaID) {
+                    _jiBieLab.text = selectCity;
+                    _jiBieLab.textColor = [UIColor blackColor];
+                    self.statusID4 = areaID;
+                    if (!IsStrEmpty(self.statusID3)) {
+                        
+                        [self loadFeeData:self.statusID3 andCategory:self.statusID4];
+                    }
+                }];
+                
+                [self.view addSubview:_statusView];
+                
             }
         }
 //    }
@@ -656,7 +685,10 @@
     parem[@"type"] = _statusID3;
     parem[@"category"] = _statusID4;
     parem[@"feeId"]= _feeId;
-    parem[@"org"] = [NSString stringWithFormat:@"%@,%@",_statusID1,_statusID2];
+    if (!IsStrEmpty(_statusID1)) {
+        
+        parem[@"org"] = [NSString stringWithFormat:@"%@,%@",_statusID1,_statusID2];
+    }
     parem[@"orderSource"] = @"2";
     [ProgressHUD show];
     [self.sessionManager sendPostHttpRequestWithUrl:createOrderJoin params:parem bodyBlock:nil progress:nil success:^(NSDictionary *response) {

ZhongJingLianMeng/prefixHeader/AllUrl.h

@@ -9,7 +9,7 @@
 #define AllUrl_h
 #define XHS_BASE_REQUEST                  @"http://www.baidu.com"   //测试
 //正式环境
-#define RootDomain @"http://api.zhongjinglianmeng.com"
+//#define RootDomain @"http://api.zhongjinglianmeng.com"
 //卓琳
 //#define RootDomain @"http://192.168.1.229:8080"
 //李冰
@@ -19,7 +19,7 @@
 //思伟
 //#define RootDomain  @"http://192.168.1.168:8200"
 //测试服务器
-//#define RootDomain @"http://test-api.zhongjinglianmeng.com"
+#define RootDomain @"http://test-api.zhongjinglianmeng.com"
 //购买vip线上地址
 #define BuyVipAdress @"http://m.youpuchina.com/buymemberH5"