zuixin

ZhongJingLianMeng.xcodeproj/project.pbxproj

@@ -101,6 +101,7 @@
 		CC140BF821B9241900AFE57C /* MyActivityModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C5962AF21B907C9001FED0A /* MyActivityModel.m */; };
 		CC140BF921B9241F00AFE57C /* BaseWebController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9C5962A921B8E9F0001FED0A /* BaseWebController.m */; };
 		CC1C380921BA197100D81BCB /* eventActivityVController.m in Sources */ = {isa = PBXBuildFile; fileRef = CC1C380821BA197100D81BCB /* eventActivityVController.m */; };
+		CC1C8A2921C0E766001053AB /* XWAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = CC1C8A2821C0E765001053AB /* XWAlertView.m */; };
 		CC1CE929219BB579004F8F79 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CC1CE928219BB579004F8F79 /* AppDelegate.m */; };
 		CC1CE92C219BB579004F8F79 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CC1CE92B219BB579004F8F79 /* ViewController.m */; };
 		CC1CE92F219BB579004F8F79 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = CC1CE92D219BB579004F8F79 /* Main.storyboard */; };
@@ -383,6 +384,8 @@
 		CC140BF121B911FC00AFE57C /* activityDetailVController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = activityDetailVController.m; sourceTree = "<group>"; };
 		CC1C380721BA197100D81BCB /* eventActivityVController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = eventActivityVController.h; sourceTree = "<group>"; };
 		CC1C380821BA197100D81BCB /* eventActivityVController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = eventActivityVController.m; sourceTree = "<group>"; };
+		CC1C8A2721C0E765001053AB /* XWAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XWAlertView.h; sourceTree = "<group>"; };
+		CC1C8A2821C0E765001053AB /* XWAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XWAlertView.m; sourceTree = "<group>"; };
 		CC1CE924219BB579004F8F79 /* ZhongJingLianMeng.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ZhongJingLianMeng.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		CC1CE927219BB579004F8F79 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		CC1CE928219BB579004F8F79 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -903,6 +906,8 @@
 			children = (
 				CC1CE927219BB579004F8F79 /* AppDelegate.h */,
 				CC1CE928219BB579004F8F79 /* AppDelegate.m */,
+				CC1C8A2721C0E765001053AB /* XWAlertView.h */,
+				CC1C8A2821C0E765001053AB /* XWAlertView.m */,
 			);
 			path = AppDelegate;
 			sourceTree = "<group>";
@@ -1668,6 +1673,7 @@
 				9C21635B219EB7F000FAFE94 /* MyActivityController.m in Sources */,
 				9C21639521A2937F00FAFE94 /* VipDemandController.m in Sources */,
 				9C21635C219EB7F000FAFE94 /* MyCollectController.m in Sources */,
+				CC1C8A2921C0E766001053AB /* XWAlertView.m in Sources */,
 				CC89C1D4219EB737001AAFA9 /* homeHeaderView.h in Sources */,
 				9C59629E21B4CEB1001FED0A /* OSSImageUploader.m in Sources */,
 				CC89C1D3219EB5FB001AAFA9 /* OrderAirportPayCancelView.h in Sources */,

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 = "566289127.483178"
+                  timestampString = "566301656.9068249"
                   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 = "566289127.485419"
+                  timestampString = "566301656.909532"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "247"
@@ -132,12 +132,12 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/AppDelegate/AppDelegate.m"
-            timestampString = "566135026.6973079"
+            timestampString = "566301726.826654"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "204"
-            endingLineNumber = "204"
-            landmarkName = "-jumpToApageWithUserInfo:"
+            startingLineNumber = "214"
+            endingLineNumber = "214"
+            landmarkName = "-userNotificationCenter:didReceiveNotificationResponse:withCompletionHandler:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -148,7 +148,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/activityDetailVController.m"
-            timestampString = "566289127.308367"
+            timestampString = "566301726.826772"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "270"
@@ -164,7 +164,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/eventActivityVController.m"
-            timestampString = "566225963.142318"
+            timestampString = "566301726.82686"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "277"
@@ -180,11 +180,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/activityDetailVController.m"
-            timestampString = "566289127.308452"
+            timestampString = "566301726.8269221"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "435"
-            endingLineNumber = "435"
+            startingLineNumber = "432"
+            endingLineNumber = "432"
             landmarkName = "-loadActivityStatus"
             landmarkType = "7">
          </BreakpointContent>
@@ -196,7 +196,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/eventActivityVController.m"
-            timestampString = "566225963.142496"
+            timestampString = "566301726.8269759"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "122"
@@ -212,11 +212,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/AppDelegate/AppDelegate.m"
-            timestampString = "566135026.697684"
+            timestampString = "566301726.827027"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "256"
-            endingLineNumber = "256"
+            startingLineNumber = "266"
+            endingLineNumber = "266"
             landmarkName = "-jumpToApageWithUserInfo:"
             landmarkType = "7">
          </BreakpointContent>
@@ -228,11 +228,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/AppDelegate/AppDelegate.m"
-            timestampString = "566135026.697722"
+            timestampString = "566301726.827073"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "263"
-            endingLineNumber = "263"
+            startingLineNumber = "273"
+            endingLineNumber = "273"
             landmarkName = "-jumpToApageWithUserInfo:"
             landmarkType = "7">
          </BreakpointContent>
@@ -244,11 +244,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/homePageViewController.m"
-            timestampString = "566289127.308565"
+            timestampString = "566301726.82713"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "378"
-            endingLineNumber = "378"
+            startingLineNumber = "376"
+            endingLineNumber = "376"
             landmarkName = "-isPersionStatus:"
             landmarkType = "7">
          </BreakpointContent>
@@ -260,11 +260,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/homePageViewController.m"
-            timestampString = "566289127.308612"
+            timestampString = "566301726.827216"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "402"
-            endingLineNumber = "402"
+            startingLineNumber = "400"
+            endingLineNumber = "400"
             landmarkName = "-cancelView"
             landmarkType = "7">
          </BreakpointContent>
@@ -276,7 +276,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/applyForDirectorController.m"
-            timestampString = "566289127.308654"
+            timestampString = "566301726.82731"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "423"
@@ -292,7 +292,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/applyForDirectorController.m"
-            timestampString = "566289127.3086931"
+            timestampString = "566301726.827376"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "469"
@@ -308,7 +308,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/applyForDirectorController.m"
-            timestampString = "566289127.30873"
+            timestampString = "566301726.827428"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "434"
@@ -324,7 +324,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/applyForDirectorController.m"
-            timestampString = "566289127.308766"
+            timestampString = "566301726.827507"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "473"
@@ -340,7 +340,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/joinAllianceVController.m"
-            timestampString = "566289127.308823"
+            timestampString = "566301726.827562"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "659"
@@ -356,7 +356,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/joinAllianceVController.m"
-            timestampString = "566289127.308866"
+            timestampString = "566301726.8276139"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "655"
@@ -372,7 +372,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/eventActivityVController.m"
-            timestampString = "566225963.1439641"
+            timestampString = "566301726.827667"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "301"
@@ -388,7 +388,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/eventActivityVController.m"
-            timestampString = "566225963.144058"
+            timestampString = "566301726.8277169"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "280"
@@ -404,7 +404,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/joinAllianceVController.m"
-            timestampString = "566289127.308959"
+            timestampString = "566301726.827768"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "463"
@@ -420,7 +420,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/homePageViewController.m"
-            timestampString = "566289127.308997"
+            timestampString = "566301726.827837"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "205"
@@ -436,7 +436,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/homePageViewController.m"
-            timestampString = "566289127.309036"
+            timestampString = "566301726.8279181"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "217"
@@ -452,7 +452,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/activityDetailVController.m"
-            timestampString = "566289127.309076"
+            timestampString = "566301726.827987"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "89"
@@ -484,7 +484,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/activityDetailVController.m"
-            timestampString = "566289127.309146"
+            timestampString = "566301726.828141"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "57"
@@ -500,11 +500,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/homePageViewController.m"
-            timestampString = "566289127.309186"
+            timestampString = "566301726.828234"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "412"
-            endingLineNumber = "412"
+            startingLineNumber = "410"
+            endingLineNumber = "410"
             landmarkName = "-VipLevelBystr:"
             landmarkType = "7">
          </BreakpointContent>
@@ -516,11 +516,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/homePageViewController.m"
-            timestampString = "566289127.309227"
+            timestampString = "566301726.828293"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "418"
-            endingLineNumber = "418"
+            startingLineNumber = "416"
+            endingLineNumber = "416"
             landmarkName = "-VipLevelBystr:"
             landmarkType = "7">
          </BreakpointContent>
@@ -532,11 +532,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "ZhongJingLianMeng/main/home(&#x9996;&#x9875;)/homePageViewController.m"
-            timestampString = "566289127.309267"
+            timestampString = "566301726.828371"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "443"
-            endingLineNumber = "443"
+            startingLineNumber = "441"
+            endingLineNumber = "441"
             landmarkName = "-VipLevelBystr:"
             landmarkType = "7">
             <Locations>
@@ -548,11 +548,11 @@
                   moduleName = "ZhongJingLianMeng"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/youke/Desktop/ZhongJingLianMeng/ZhongJingLianMeng/main/home(%E9%A6%96%E9%A1%B5)/homePageViewController.m"
-                  timestampString = "566289127.591819"
+                  timestampString = "566301657.02765"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "443"
-                  endingLineNumber = "443"
+                  startingLineNumber = "441"
+                  endingLineNumber = "441"
                   offsetFromSymbolStart = "2288">
                </Location>
                <Location
@@ -563,15 +563,47 @@
                   moduleName = "ZhongJingLianMeng"
                   usesParentBreakpointCondition = "Yes"
                   urlString = "file:///Users/youke/Desktop/ZhongJingLianMeng/ZhongJingLianMeng/main/home(%E9%A6%96%E9%A1%B5)/homePageViewController.m"
-                  timestampString = "566289127.593627"
+                  timestampString = "566301657.02987"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
-                  startingLineNumber = "443"
-                  endingLineNumber = "443"
+                  startingLineNumber = "441"
+                  endingLineNumber = "441"
                   offsetFromSymbolStart = "2296">
                </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/cell/activityCell.m"
+            timestampString = "566301726.828431"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "145"
+            endingLineNumber = "145"
+            landmarkName = "-fillData:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ZhongJingLianMeng/main/activity(&#x6d3b;&#x52a8;)/ActivityTableController.m"
+            timestampString = "566301726.82881"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "111"
+            endingLineNumber = "111"
+            landmarkName = "-loadStutasList:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

ZhongJingLianMeng/AppDelegate/AppDelegate.m

@@ -16,13 +16,23 @@
 #import <ShareSDK/ShareSDK.h>
 #import <ShareSDKConnector/ShareSDKConnector.h>
 #import "ThirdPartyManager.h"
+#import "XWAlertView.h"
 @interface AppDelegate ()
 @property(nonatomic,strong)BMKMapManager *mapManager;
+
+@property (strong, nonatomic) HttpRequestManger *sessionManager;
+@property(nonatomic,assign)BOOL isClick;
+@property(nonatomic,strong)XWAlertView *alertView;
 @end
 
 @implementation AppDelegate
 
-
+- (HttpRequestManger*) sessionManager{
+    if (!_sessionManager) {
+        _sessionManager = [[HttpRequestManger alloc]init];
+    }
+    return _sessionManager;
+}
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     
     //取token  手机号
@@ -317,6 +327,13 @@
 
 
 - (void)applicationDidBecomeActive:(UIApplication *)application {
+    
+    if (_isClick == NO) {
+        
+        [self checkVersion];
+        
+    }
+    
     // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
 }
 
@@ -326,4 +343,77 @@
 }
 
 
+-(void)checkVersion{
+    
+    NSMutableDictionary *dic =[NSMutableDictionary dictionary];
+    
+    dic[@"platform"] = @2;
+    
+    [self.sessionManager sendPostHttpRequestWithUrl:nil params:dic bodyBlock:nil progress:nil success:^(NSDictionary *response) {
+        NSDictionary *infoDic=[[NSBundle mainBundle] infoDictionary];
+        NSString *currentVersion=infoDic[@"CFBundleShortVersionString"];
+        NSString *serverVersion = response[@"data"][@"versionName"];
+        NSString *message = response[@"data"][@"upgradeDesc"];
+        if ([self compareServerVersion:serverVersion withLocalVersion:currentVersion]){
+            
+            NSString *str1 = message;
+            
+            _alertView = [[XWAlertView alloc]initWithimage:[UIImage imageNamed:@"huojian"] message:str1 versionId:[NSString stringWithFormat:@"V%@",serverVersion] isForcedUpdating:[NSString stringWithFormat:@"%@",response[@"data"][@"forcedUpdating"]]];
+            _alertView.resultIndex = ^(NSInteger index) {
+                
+                [[UIApplication sharedApplication]openURL:[NSURL URLWithString:@"https://itunes.apple.com/us/app/中经联盟官方手机应用/id1102697591?mt=8"]];
+                _isClick = YES;
+            };
+            [_alertView showAlertView];
+        }
+        
+    } failure:^(NSError *error) {
+        
+        NSLog(@"%@",error);
+    }];
+    
+    
+}
+- (BOOL)compareServerVersion:(NSString*)serverVersion withLocalVersion:(NSString*)localVersion
+{
+    BOOL ret =NO;
+    if (serverVersion ==nil || [serverVersion isEqualToString:@""]) {
+        NSLog(@"Server version is empty.");
+        return ret;
+    }
+    if (localVersion ==nil || [localVersion isEqualToString:@""]) {
+        NSLog(@"Local version is empty.");
+        return ret;
+    }
+    
+    NSArray *serComps = [serverVersion componentsSeparatedByString:@"."];
+    NSArray *locComps = [localVersion componentsSeparatedByString:@"."];
+    for (int index =0; index < serComps.count; index++) {
+        int numServer = [[serComps objectAtIndex:index] intValue];
+        int numLocal = -1;
+        if (locComps.count > index) {
+            numLocal = [[locComps objectAtIndex:index]intValue];
+        }
+        if (numServer > numLocal) {
+            ret =YES;
+            break;
+        }else if (numServer < numLocal) {
+            ret =NO;
+            break;
+        }
+    }
+    return ret;
+}
+
+
+
+
+- (void)dealloc {
+    if (_sessionManager) {
+        [_sessionManager cancelAllTask];
+    }
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    DebugLog(@"%@没有造成循环引用", [self class]);
+}
+
 @end

ZhongJingLianMeng/AppDelegate/XWAlertView.h

@@ -0,0 +1,21 @@
+//
+//  XWAlertView.h
+//  YouPu
+//
+//  Created by youke on 2018/4/18.
+//  Copyright © 2018年 youke. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+typedef void(^AlertResult)(NSInteger index);
+
+@interface XWAlertView : UIView
+
+@property (nonatomic,copy) AlertResult resultIndex;
+
+
+- (instancetype)initWithimage:(UIImage *)image message:(NSString*)message versionId:(NSString *)version isForcedUpdating:(NSString *)status;
+
+- (void)showAlertView;
+
+@end

ZhongJingLianMeng/AppDelegate/XWAlertView.m

@@ -0,0 +1,143 @@
+//
+//  XWAlertView.m
+//  YouPu
+//
+//  Created by youke on 2018/4/18.
+//  Copyright © 2018年 youke. All rights reserved.
+//
+
+//alertView 宽
+#define AlertW [UIScreen mainScreen].bounds.size.width -100
+//各个栏目之间的距离
+#define XLSpace 10.0
+#import "XWAlertView.h"
+@interface XWAlertView()
+//弹窗
+@property (nonatomic, strong) UIView *alertView;
+//图片
+@property (nonatomic, strong) UIImageView *imageView;
+
+@property(nonatomic,strong)UITextView *textView;
+
+@end
+@implementation XWAlertView
+- (instancetype)initWithimage:(UIImage *)image message:(NSString*)message versionId:(NSString *)version isForcedUpdating:(NSString *)status
+{
+    if (self == [super init]) {
+        self.frame= [UIScreen mainScreen].bounds;
+        self.backgroundColor= [UIColor colorWithWhite:0.8 alpha:0.6];
+        if (image) {
+            self.imageView = [[UIImageView alloc]initWithFrame:CGRectMake(50, 110, AlertW, 130)];
+            self.imageView.image= image;
+            [self addSubview:self.imageView];
+        }
+        UIView *view = [[UIView alloc]initWithFrame:CGRectMake(50, 235, AlertW, 210)];
+        view.backgroundColor = [UIColor whiteColor];
+        UIBezierPath *maskPath =[UIBezierPath bezierPathWithRoundedRect:view.bounds byRoundingCorners:UIRectCornerBottomLeft|UIRectCornerBottomRight cornerRadii:CGSizeMake(15.0, 15.0)];
+        CAShapeLayer *maskLayer= [[CAShapeLayer alloc]init];
+        maskLayer.frame = view.bounds;
+        maskLayer.path =maskPath.CGPath;
+        view.layer.mask = maskLayer;
+        [self addSubview:view];
+        UILabel *label = [[UILabel alloc]init];
+        label.frame = CGRectMake(15, 10, AlertW - 20, 25);
+        label.text =[NSString stringWithFormat:@"%@更新内容：",version];
+        label.textAlignment = NSTextAlignmentLeft;
+        label.font = [UIFont systemFontOfSize:18.0];
+        label.textColor = [UIColor colorWithRed:106/255.0 green:181/255.0 blue:246/255.0 alpha:1];
+        [view addSubview:label];
+        _textView = [[UITextView alloc]initWithFrame:CGRectMake(10,35,AlertW - 20,100)];
+        _textView.editable =NO;
+        _textView.selectable =NO;
+        _textView.font = [UIFont systemFontOfSize:16];
+        _textView.backgroundColor = [UIColor clearColor];
+        _textView.text =message;
+        _textView.textColor = [UIColor lightGrayColor];
+        _textView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+        if ([self IOS8])
+        {
+            UIEdgeInsets e =UIEdgeInsetsMake(0,0,0, 0);
+            
+            [_textView setTextContainerInset:e];
+            
+        }
+        [view addSubview:_textView];
+        UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
+        button.frame = CGRectMake(self.frame.size.width/2 -125, _textView.frame.origin.y +100 +20, 150, 40);
+        [button setBackgroundImage:[UIImage imageNamed:@"circle"] forState:UIControlStateNormal];
+        [button setTitle:@"立即更新" forState:UIControlStateNormal];
+        [button setTintColor:[UIColor whiteColor]];
+        [button addTarget:self action:@selector(buttonEvent:) forControlEvents:UIControlEventTouchUpInside];
+        [view addSubview:button];
+        
+        UIView *lineView = [[UIView alloc]initWithFrame:CGRectMake(self.frame.size.width/2,  view.frame.size.height +235, 1, 20)];
+        lineView.backgroundColor = [UIColor whiteColor];
+        UIImageView *imageCanle = [[UIImageView alloc]initWithImage:[UIImage imageNamed:@"close"]];
+        imageCanle.userInteractionEnabled = YES;
+        UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(tapClick:)];
+        [imageCanle addGestureRecognizer:tap];
+        imageCanle.frame = CGRectMake(self.frame.size.width/2 -20, view.frame.size.height +235 +20, 40, 40);
+        if ([status isEqualToString:@"0"]) {
+             [self addSubview:lineView];
+            [self addSubview:imageCanle];
+        }else{
+            [lineView removeFromSuperview];
+            [imageCanle removeFromSuperview];
+        }
+       
+    }
+    return self;
+}
+- (BOOL)IOS8
+{
+    BOOL b =false;
+    NSString *ver = [[UIDevice currentDevice]systemVersion];
+    if (NSOrderedAscending != [ver compare:@"8.0"]) {
+        b =true;
+    }
+    return b;
+}
+
+#pragma mark - 弹出
+- (void)showAlertView
+{
+    UIWindow *rootWindow = [UIApplication sharedApplication].keyWindow;
+    [rootWindow addSubview:self];
+    [self creatShowAnimation];
+}
+//
+//   // 弹出显示后，其他区域的背景为半透明状态
+- (void)creatShowAnimation
+{
+    self.backgroundColor =  [UIColor colorWithRed:70.0 / 255.0 green:70.0 / 255.0 blue:70.0 / 255.0 alpha:0.5] ;
+    
+    self.alertView.layer.position = self.center;
+    //   self.alertView.transform = CGAffineTransformMakeScale(0.90, 0.90);
+    [UIView animateWithDuration:0.25 delay:0 usingSpringWithDamping:0.8 initialSpringVelocity:1 options:UIViewAnimationOptionCurveLinear animations:^{
+        self.alertView.transform = CGAffineTransformMakeScale(1.0, 1.0);
+    } completion:^(BOOL finished) {
+    }];
+}
+
+#pragma mark - 回调 -设置只有2 -- > 确定才回调
+- (void)buttonEvent:(UIButton*)sender
+{
+    if (self.resultIndex) {
+        self.resultIndex(sender.tag);
+    }
+    [self removeFromSuperview];
+}
+-(void)tapClick:(UITapGestureRecognizer *)tap{
+    
+    [self removeFromSuperview];
+}
+/*
+ 
+ // Only override drawRect: if you perform custom drawing.
+ // An empty implementation adversely affects performance during animation.
+ - (void)drawRect:(CGRect)rect {
+ // Drawing code
+ }
+ */
+
+@end

ZhongJingLianMeng/Assets.xcassets/首页/circle.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "circle@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "circle@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

ZhongJingLianMeng/Assets.xcassets/首页/close.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "close@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "close@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

ZhongJingLianMeng/Assets.xcassets/首页/huojian.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "huojian@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "huojian@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

ZhongJingLianMeng/main/activity(活动)/ActivityTableController.m

@@ -95,6 +95,10 @@
 
 -(void)loadStutasList:(NSString *)typeStr{
     
+    if (_backgroundView) {
+        
+        [_backgroundView removeFromSuperview];
+    }
     
     NSMutableDictionary *parme = [NSMutableDictionary dictionary];
     parme[@"type"] = typeStr;

ZhongJingLianMeng/main/activity(活动)/activityDetailVController.m

@@ -344,12 +344,9 @@
 -(void)showShareView{
     
     NSArray *arr =@[[UIImage imageNamed:@"projectItem"]];
-    
     if (IsStrEmpty(_shareTitle)) {
-        
         _shareTitle = @"";
     }
-    
     if (arr) {
         
         NSMutableDictionary *shareParams = [NSMutableDictionary dictionary];

ZhongJingLianMeng/main/activity(活动)/cell/activityCell.m

@@ -117,7 +117,7 @@
     [self.contentView addSubview:_timeLb];
     [_timeLb mas_makeConstraints:^(MASConstraintMaker *make) {
         
-        make.size.mas_equalTo(CGSizeMake(65, 10));
+        make.size.mas_equalTo(CGSizeMake(80, 10));
         make.right.equalTo(backGroundView.mas_right).offset(-15);
         make.bottom.equalTo(backGroundView.mas_bottom).offset(-10);
     }];
@@ -143,7 +143,7 @@
     
     _titleLb.text = model.title;
     
-    _timeLb.text = model.createTime;
+    _timeLb.text = model.create_time;
     
     [_ImageNew sd_setImageWithURL:[NSURL URLWithString:[NSString stringWithFormat:@"%@",model.img_path]] placeholderImage:[UIImage imageNamed:@"projectItem"]];
     

ZhongJingLianMeng/main/activity(活动)/eventActivityVController.m

@@ -46,7 +46,7 @@
     
     _titleLab.textColor = [UIColor whiteColor];
     
-    _titleLab.text = @"加入联盟";
+    _titleLab.text = @"活动报名";
     
     [self.navigationView setNavigationBackgroundColor:[UIColor colorWithHexValue:0x3C915C]];
     

ZhongJingLianMeng/main/activity(活动)/model/activityModel.h

@@ -12,6 +12,6 @@
 @property (nonatomic, copy) NSString *img_path;
 @property (nonatomic, copy) NSString *news_Id;
 @property (nonatomic, copy) NSString *title;
-@property (nonatomic, copy) NSString *createTime;
+@property (nonatomic, copy) NSString *create_time;
 @property (nonatomic, copy) NSString *status;
 @end

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

@@ -61,7 +61,7 @@
     [self.navigationView setTitle:@"会员权益"];
     self.navigationView.titleLabel.textColor=[UIColor whiteColor];
     
-    if ([_VipStatus isEqualToString:@"1"]||[self.UserInfoModel.level isEqualToString:@"3"]) {
+    if ([_VipStatus isEqualToString:@"1"]||[self.UserInfoModel.level isEqualToString:@"3"]||[self.UserInfoModel.level isEqualToString:@"2"]) {
         
         _commitBtn.hidden = YES;
     }else{

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

@@ -340,13 +340,11 @@
 
             }else {
                 
-                [ToastView showToast:@"您还不是会员，请加入联盟"];
+//                [ToastView showToast:@"您还不是会员，请加入联盟"];
                 joinAllianceVController *joinVC = [[joinAllianceVController alloc]init];
                 joinVC.phone = weakself.userInfoModel.phone;
                 joinVC.model = weakself.userInfoModel;
-                
                 [self.navigationController pushViewController:joinVC animated:YES];
-                
             }
         }else if ([weakself.userInfoModel.level isEqualToString:@"1"]){
             //普通会员

ZhongJingLianMeng/main/me(我的)/controller/BaseWebController.m

@@ -21,6 +21,8 @@
     // Do any additional setup after loading the view.
     kWeakSelf(self);
     [self.navigationView removeAllLeftButton];
+    [self.navigationView setNavigationBackgroundColor:[UIColor colorWithHexValue:0x3C915C]];
+
     [self.navigationView addLeftButtonWithImage:[UIImage imageNamed:@"btn_back"] clickCallBack:^(UIView *view) {
         [weakself.navigationController popViewControllerAnimated:YES];
     }];
@@ -28,6 +30,7 @@
     //type:  1：关于
     if ([self.type isEqualToString:@"1"]) {
         [self.navigationView setTitle:self.titleName];
+        self.navigationView.titleLabel.textColor=[UIColor whiteColor];
         self.BGView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 80, 44)];
         [self.navigationView addRightView: self.BGView clickCallback:nil];
         _commitBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, self.BGView.frame.size.width, self.BGView.frame.size.height)];