chore: 版本升级至 1.0.11 并切换正式环境
- 版本号 1.0.10 → 1.0.11,Build 号 1 → 2 - API 环境切换至正式地址(api-jkglpt.iosp.ydpt.tech) - 首页 Banner 请求增加 loading 状态显示 - 重构 QuestionViewController:移除 verifyToken 流程,改用 isLogin 判断 - 删除废弃方法(verifyTokenData、getUpDateinfo、backUp、updateHomeDate) - 更新首页顶部图片资源(组7 → 组9) - 清理 AppDelegate 中空的 DEBUG 编译条件块
This commit is contained in:
@@ -375,7 +375,7 @@
|
|||||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||||
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
CURRENT_PROJECT_VERSION = 1;
|
CURRENT_PROJECT_VERSION = 2;
|
||||||
DEVELOPMENT_TEAM = A7CC5LW224;
|
DEVELOPMENT_TEAM = A7CC5LW224;
|
||||||
ENABLE_USER_SCRIPT_SANDBOXING = NO;
|
ENABLE_USER_SCRIPT_SANDBOXING = NO;
|
||||||
GCC_PREFIX_HEADER = "$(SRCROOT)/XinjiangProject/Supporting Files/PrefixHeader.pch";
|
GCC_PREFIX_HEADER = "$(SRCROOT)/XinjiangProject/Supporting Files/PrefixHeader.pch";
|
||||||
@@ -400,7 +400,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.0.10;
|
MARKETING_VERSION = 1.0.11;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.questionTools.XinjiangProject;
|
PRODUCT_BUNDLE_IDENTIFIER = com.questionTools.XinjiangProject;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
||||||
@@ -419,7 +419,7 @@
|
|||||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||||
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
CURRENT_PROJECT_VERSION = 1;
|
CURRENT_PROJECT_VERSION = 2;
|
||||||
DEVELOPMENT_TEAM = A7CC5LW224;
|
DEVELOPMENT_TEAM = A7CC5LW224;
|
||||||
ENABLE_USER_SCRIPT_SANDBOXING = NO;
|
ENABLE_USER_SCRIPT_SANDBOXING = NO;
|
||||||
GCC_PREFIX_HEADER = "$(SRCROOT)/XinjiangProject/Supporting Files/PrefixHeader.pch";
|
GCC_PREFIX_HEADER = "$(SRCROOT)/XinjiangProject/Supporting Files/PrefixHeader.pch";
|
||||||
@@ -444,7 +444,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.0.10;
|
MARKETING_VERSION = 1.0.11;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = com.questionTools.XinjiangProject;
|
PRODUCT_BUNDLE_IDENTIFIER = com.questionTools.XinjiangProject;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
|
||||||
|
|||||||
@@ -68,10 +68,10 @@
|
|||||||
//#define SCHEME @"https" //
|
//#define SCHEME @"https" //
|
||||||
|
|
||||||
//正式地址
|
//正式地址
|
||||||
//#define Http @"https://api-jkglpt.iosp.ydpt.tech"//
|
#define Http @"https://api-jkglpt.iosp.ydpt.tech"//
|
||||||
//#define H5DevHost @"api-jkglpt.iosp.ydpt.tech"//
|
#define H5DevHost @"api-jkglpt.iosp.ydpt.tech"//
|
||||||
//#define IntervenH5 @"https://console-jkglpt.iosp.ydpt.tech"
|
#define IntervenH5 @"https://console-jkglpt.iosp.ydpt.tech"
|
||||||
//#define SCHEME @"https" //
|
#define SCHEME @"https" //
|
||||||
|
|
||||||
//卫鑫本地
|
//卫鑫本地
|
||||||
//#define Http @"https://api-jkglpt.iosp.ydpt.tech"//
|
//#define Http @"https://api-jkglpt.iosp.ydpt.tech"//
|
||||||
@@ -84,11 +84,11 @@
|
|||||||
// 最新地址
|
// 最新地址
|
||||||
//#define Http @"http://192.168.1.47"//王昊
|
//#define Http @"http://192.168.1.47"//王昊
|
||||||
|
|
||||||
#define Http @"https://xj-api.mcrm.vip:8888"//
|
//#define Http @"https://xj-api.mcrm.vip:8888"//
|
||||||
//#define Http @"http://192.168.1.47"//王昊
|
////#define Http @"http://192.168.1.47"//王昊
|
||||||
#define H5DevHost @"xj-api.mcrm.vip:8888"//
|
//#define H5DevHost @"xj-api.mcrm.vip:8888"//
|
||||||
#define IntervenH5 @"https://xj-admin.mcrm.vip:8888"
|
//#define IntervenH5 @"https://xj-admin.mcrm.vip:8888"
|
||||||
#define SCHEME @"https" //
|
//#define SCHEME @"https" //
|
||||||
|
|
||||||
//新疆项目后期的调试环境由阿里云迁移至公司内部主机服务器,功能联调和测试可用以下的环境地址
|
//新疆项目后期的调试环境由阿里云迁移至公司内部主机服务器,功能联调和测试可用以下的环境地址
|
||||||
//https://api-xj.tri.icdat.cn
|
//https://api-xj.tri.icdat.cn
|
||||||
|
|||||||
@@ -34,12 +34,6 @@
|
|||||||
SDImageWebPCoder*webPCoder = [SDImageWebPCoder sharedCoder];
|
SDImageWebPCoder*webPCoder = [SDImageWebPCoder sharedCoder];
|
||||||
[[SDImageCodersManager sharedManager] addCoder:webPCoder];
|
[[SDImageCodersManager sharedManager] addCoder:webPCoder];
|
||||||
|
|
||||||
#if DEBUG
|
|
||||||
|
|
||||||
#else
|
|
||||||
// [CheckProjectTool testAll];
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
return YES;
|
return YES;
|
||||||
|
|||||||
@@ -549,6 +549,7 @@ static CGFloat const kEmptyTableMinHeight = 250; // 或屏幕高度的一半
|
|||||||
}
|
}
|
||||||
if ([tag isEqualToString:@"BANNER"]) {
|
if ([tag isEqualToString:@"BANNER"]) {
|
||||||
|
|
||||||
|
[self hiddenAllMBProgressHUD];
|
||||||
NSArray * array = response;
|
NSArray * array = response;
|
||||||
|
|
||||||
//自己处理数据
|
//自己处理数据
|
||||||
@@ -1022,7 +1023,9 @@ static CGFloat const kEmptyTableMinHeight = 250; // 或屏幕高度的一半
|
|||||||
|
|
||||||
#pragma mark: 请求banner图
|
#pragma mark: 请求banner图
|
||||||
- (void)getBannerListData {
|
- (void)getBannerListData {
|
||||||
|
if (![HQCommonUtils isLogin]) {
|
||||||
|
[self showMBProgressHUDWithString:@"数据加载中,请稍候..." autoHidden:false];
|
||||||
|
}
|
||||||
NSMutableDictionary * dic = [[NSMutableDictionary alloc] init];
|
NSMutableDictionary * dic = [[NSMutableDictionary alloc] init];
|
||||||
//2 首页Banner
|
//2 首页Banner
|
||||||
XJPNetAPI * searchApi = [[XJPNetAPI alloc] init:self tag:@"BANNER" NeedToken:@""];
|
XJPNetAPI * searchApi = [[XJPNetAPI alloc] init:self tag:@"BANNER" NeedToken:@""];
|
||||||
|
|||||||
+9
-79
@@ -101,18 +101,12 @@ static CGFloat const kEmptyTableMinHeight = 300; // 或屏幕高度的一半
|
|||||||
// Request the desired authorization
|
// Request the desired authorization
|
||||||
[self.userlocationManager requestWhenInUseAuthorization];
|
[self.userlocationManager requestWhenInUseAuthorization];
|
||||||
self.isHidenNaviBar = true;
|
self.isHidenNaviBar = true;
|
||||||
//IM登录状态
|
|
||||||
[[NSNotificationCenter defaultCenter] addObserver:self
|
|
||||||
selector:@selector(updateHomeDate)
|
|
||||||
name:KNotificAgreeProtoocl
|
|
||||||
object:nil];
|
|
||||||
// [self createUI];
|
|
||||||
[self updateV2UI];
|
[self updateV2UI];
|
||||||
// [self getUpDateinfo];
|
|
||||||
//请求banner图
|
//请求banner图
|
||||||
// [self getBannerListData];
|
// [self getBannerListData];
|
||||||
self.page = 1;
|
self.page = 1;
|
||||||
[self verifyTokenData];
|
// [self verifyTokenData];
|
||||||
[self initCompleteBlock];
|
[self initCompleteBlock];
|
||||||
[self configLocationManager];
|
[self configLocationManager];
|
||||||
[self reGeocodeAction];
|
[self reGeocodeAction];
|
||||||
@@ -124,43 +118,18 @@ static CGFloat const kEmptyTableMinHeight = 300; // 或屏幕高度的一半
|
|||||||
[[TUICallEngine createInstance] addObserver:self];
|
[[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 {
|
- (void)viewWillAppear:(BOOL)animated {
|
||||||
|
|
||||||
[super viewWillAppear:animated];
|
[super viewWillAppear:animated];
|
||||||
|
|
||||||
[self verifyTokenData];
|
if ([HQCommonUtils isLogin]) {
|
||||||
|
[self getData];
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
- (void)reGeocodeAction
|
- (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
|
- (void)initCompleteBlock
|
||||||
{
|
{
|
||||||
self.completionBlock = ^(CLLocation *location, AMapLocationReGeocode *regeocode, NSError *error)
|
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 {
|
- (void)getData {
|
||||||
|
|
||||||
[self showMBProgressHUDWithString:@"数据加载中,请稍候..." autoHidden:false];
|
[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"]) {
|
if ([tag isEqualToString:@"IMAPI"]) {
|
||||||
[self hiddenAllMBProgressHUD];
|
[self hiddenAllMBProgressHUD];
|
||||||
@@ -636,7 +563,10 @@ static CGFloat const kEmptyTableMinHeight = 300; // 或屏幕高度的一半
|
|||||||
MJWeakSelf
|
MJWeakSelf
|
||||||
self.mainScrollView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
|
self.mainScrollView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
|
||||||
self.page = 1;
|
self.page = 1;
|
||||||
[self verifyTokenData];
|
|
||||||
|
if ([HQCommonUtils isLogin]) {
|
||||||
|
[self getData];
|
||||||
|
}
|
||||||
}];
|
}];
|
||||||
|
|
||||||
HealthyQuestionHeardView * topView = [[HealthyQuestionHeardView alloc] initWithFrame:CGRectZero];
|
HealthyQuestionHeardView * topView = [[HealthyQuestionHeardView alloc] initWithFrame:CGRectZero];
|
||||||
|
|||||||
+1
-1
@@ -5,7 +5,7 @@
|
|||||||
"scale" : "1x"
|
"scale" : "1x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"filename" : "组 7.png",
|
"filename" : "组 9.png",
|
||||||
"idiom" : "universal",
|
"idiom" : "universal",
|
||||||
"scale" : "2x"
|
"scale" : "2x"
|
||||||
},
|
},
|
||||||
|
|||||||
BIN
Binary file not shown.
|
Before Width: | Height: | Size: 83 KiB |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 86 KiB |
Reference in New Issue
Block a user