diff --git a/XinjiangProject/XinjiangProject.xcodeproj/project.pbxproj b/XinjiangProject/XinjiangProject.xcodeproj/project.pbxproj index a7e9d50..8e4fecf 100644 --- a/XinjiangProject/XinjiangProject.xcodeproj/project.pbxproj +++ b/XinjiangProject/XinjiangProject.xcodeproj/project.pbxproj @@ -375,7 +375,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = A7CC5LW224; ENABLE_USER_SCRIPT_SANDBOXING = NO; GCC_PREFIX_HEADER = "$(SRCROOT)/XinjiangProject/Supporting Files/PrefixHeader.pch"; @@ -400,7 +400,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.10; + MARKETING_VERSION = 1.0.11; PRODUCT_BUNDLE_IDENTIFIER = com.questionTools.XinjiangProject; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -419,7 +419,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEVELOPMENT_TEAM = A7CC5LW224; ENABLE_USER_SCRIPT_SANDBOXING = NO; GCC_PREFIX_HEADER = "$(SRCROOT)/XinjiangProject/Supporting Files/PrefixHeader.pch"; @@ -444,7 +444,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.10; + MARKETING_VERSION = 1.0.11; PRODUCT_BUNDLE_IDENTIFIER = com.questionTools.XinjiangProject; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; diff --git a/XinjiangProject/XinjiangProject/Define/StatusMacros.h b/XinjiangProject/XinjiangProject/Define/StatusMacros.h index 17994cd..84e01cc 100755 --- a/XinjiangProject/XinjiangProject/Define/StatusMacros.h +++ b/XinjiangProject/XinjiangProject/Define/StatusMacros.h @@ -68,10 +68,10 @@ //#define SCHEME @"https" // //正式地址 -//#define Http @"https://api-jkglpt.iosp.ydpt.tech"// -//#define H5DevHost @"api-jkglpt.iosp.ydpt.tech"// -//#define IntervenH5 @"https://console-jkglpt.iosp.ydpt.tech" -//#define SCHEME @"https" // +#define Http @"https://api-jkglpt.iosp.ydpt.tech"// +#define H5DevHost @"api-jkglpt.iosp.ydpt.tech"// +#define IntervenH5 @"https://console-jkglpt.iosp.ydpt.tech" +#define SCHEME @"https" // //卫鑫本地 //#define Http @"https://api-jkglpt.iosp.ydpt.tech"// @@ -84,11 +84,11 @@ // 最新地址 //#define Http @"http://192.168.1.47"//王昊 -#define Http @"https://xj-api.mcrm.vip:8888"// -//#define Http @"http://192.168.1.47"//王昊 -#define H5DevHost @"xj-api.mcrm.vip:8888"// -#define IntervenH5 @"https://xj-admin.mcrm.vip:8888" -#define SCHEME @"https" // +//#define Http @"https://xj-api.mcrm.vip:8888"// +////#define Http @"http://192.168.1.47"//王昊 +//#define H5DevHost @"xj-api.mcrm.vip:8888"// +//#define IntervenH5 @"https://xj-admin.mcrm.vip:8888" +//#define SCHEME @"https" // //新疆项目后期的调试环境由阿里云迁移至公司内部主机服务器,功能联调和测试可用以下的环境地址 //https://api-xj.tri.icdat.cn diff --git a/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate.m b/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate.m index 7f8dc66..11aaa70 100644 --- a/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate.m +++ b/XinjiangProject/XinjiangProject/Project/AppDelegate/AppDelegate.m @@ -33,13 +33,7 @@ SDImageWebPCoder*webPCoder = [SDImageWebPCoder sharedCoder]; [[SDImageCodersManager sharedManager] addCoder:webPCoder]; - -#if DEBUG - -#else -// [CheckProjectTool testAll]; - -#endif + return YES; diff --git a/XinjiangProject/XinjiangProject/Project/HomeV2/XJHomePageV2ViewController.m b/XinjiangProject/XinjiangProject/Project/HomeV2/XJHomePageV2ViewController.m index 1d913c4..49049a4 100644 --- a/XinjiangProject/XinjiangProject/Project/HomeV2/XJHomePageV2ViewController.m +++ b/XinjiangProject/XinjiangProject/Project/HomeV2/XJHomePageV2ViewController.m @@ -549,6 +549,7 @@ static CGFloat const kEmptyTableMinHeight = 250; // 或屏幕高度的一半 } if ([tag isEqualToString:@"BANNER"]) { + [self hiddenAllMBProgressHUD]; NSArray * array = response; //自己处理数据 @@ -1022,7 +1023,9 @@ static CGFloat const kEmptyTableMinHeight = 250; // 或屏幕高度的一半 #pragma mark: 请求banner图 - (void)getBannerListData { - + if (![HQCommonUtils isLogin]) { + [self showMBProgressHUDWithString:@"数据加载中,请稍候..." autoHidden:false]; + } NSMutableDictionary * dic = [[NSMutableDictionary alloc] init]; //2 首页Banner XJPNetAPI * searchApi = [[XJPNetAPI alloc] init:self tag:@"BANNER" NeedToken:@""]; diff --git a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionViewController.m b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionViewController.m index 3e89b53..cb55ba9 100644 --- a/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionViewController.m +++ b/XinjiangProject/XinjiangProject/Project/Qusetion/Controller/QuestionViewController.m @@ -101,18 +101,12 @@ static CGFloat const kEmptyTableMinHeight = 300; // 或屏幕高度的一半 // Request the desired authorization [self.userlocationManager requestWhenInUseAuthorization]; self.isHidenNaviBar = true; - //IM登录状态 - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(updateHomeDate) - name:KNotificAgreeProtoocl - object:nil]; -// [self createUI]; + [self updateV2UI]; -// [self getUpDateinfo]; //请求banner图 // [self getBannerListData]; self.page = 1; - [self verifyTokenData]; +// [self verifyTokenData]; [self initCompleteBlock]; [self configLocationManager]; [self reGeocodeAction]; @@ -124,43 +118,18 @@ static CGFloat const kEmptyTableMinHeight = 300; // 或屏幕高度的一半 [[TUICallEngine createInstance] addObserver:self]; -} - -#pragma mark:校验token -- (void)verifyTokenData { - - - - NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; - // 获取应用的版本号 - HQUserInfo * user = [HQCommonUtils keyedUnarchiverWithKey:LoginUserInfo]; - - - if (ValidStr(user.token)) { - - [parmDic setObject:@"" forKey:@"token"]; - } - else - { - [parmDic setObject:user.token forKey:@"token"]; - } - XJPNetAPI * homeRemakerApi = [[XJPNetAPI alloc] init:self tag:@"verifyToken" NeedToken:@""]; - - [homeRemakerApi GetverifyToken:parmDic]; - - } - (void)viewWillAppear:(BOOL)animated { [super viewWillAppear:animated]; - [self verifyTokenData]; - + if ([HQCommonUtils isLogin]) { + [self getData]; + } } - - (void)reGeocodeAction { //进行单次带逆地理定位请求 @@ -203,19 +172,6 @@ static CGFloat const kEmptyTableMinHeight = 300; // 或屏幕高度的一半 } -#pragma mark:更新 -- (void)getUpDateinfo { - - NSMutableDictionary * parmDic = [[NSMutableDictionary alloc] init]; - // 获取应用的版本号 - [parmDic setObject:@"com.questionTools.XinjiangProject" forKey:@"packageName"]; - [parmDic setObject:@"2" forKey:@"androidOrIos"]; - - XJPNetAPI * homeRemakerApi = [[XJPNetAPI alloc] init:self tag:@"UPVERSION" NeedToken:@""]; - [homeRemakerApi GetAppVesionUpdata:parmDic]; - -} - - (void)initCompleteBlock { self.completionBlock = ^(CLLocation *location, AMapLocationReGeocode *regeocode, NSError *error) @@ -267,25 +223,6 @@ static CGFloat const kEmptyTableMinHeight = 300; // 或屏幕高度的一半 }; } -- (void)backUp { - - [self.navigationController popToRootViewControllerAnimated:YES]; - -} - -- (void)updateHomeDate { - - - if (self.homeTable) { - - }else - { - [self verifyTokenData]; - - } -} - - - (void)getData { [self showMBProgressHUDWithString:@"数据加载中,请稍候..." autoHidden:false]; @@ -333,17 +270,7 @@ static CGFloat const kEmptyTableMinHeight = 300; // 或屏幕高度的一半 } - if ([tag isEqualToString:@"verifyToken"]) { - - BOOL isLogin = [response boolValue]; - - if (isLogin == true) { - - [self getData]; - } - - } if ([tag isEqualToString:@"IMAPI"]) { [self hiddenAllMBProgressHUD]; @@ -636,7 +563,10 @@ static CGFloat const kEmptyTableMinHeight = 300; // 或屏幕高度的一半 MJWeakSelf self.mainScrollView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{ self.page = 1; - [self verifyTokenData]; + + if ([HQCommonUtils isLogin]) { + [self getData]; + } }]; HealthyQuestionHeardView * topView = [[HealthyQuestionHeardView alloc] initWithFrame:CGRectZero]; diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/HOMEV2/homePageHeardTop.imageset/Contents.json b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/HOMEV2/homePageHeardTop.imageset/Contents.json index bb831cb..62fec2a 100644 --- a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/HOMEV2/homePageHeardTop.imageset/Contents.json +++ b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/HOMEV2/homePageHeardTop.imageset/Contents.json @@ -5,7 +5,7 @@ "scale" : "1x" }, { - "filename" : "组 7.png", + "filename" : "组 9.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/HOMEV2/homePageHeardTop.imageset/组 7.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/HOMEV2/homePageHeardTop.imageset/组 7.png deleted file mode 100644 index 1d69f5c..0000000 Binary files a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/HOMEV2/homePageHeardTop.imageset/组 7.png and /dev/null differ diff --git a/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/HOMEV2/homePageHeardTop.imageset/组 9.png b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/HOMEV2/homePageHeardTop.imageset/组 9.png new file mode 100644 index 0000000..1da04af Binary files /dev/null and b/XinjiangProject/XinjiangProject/Supporting Files/Assets.xcassets/HOMEV2/homePageHeardTop.imageset/组 9.png differ