Skip to content

Commit 450c497

Browse files
ccharlesrenoldcodefarmer
authored andcommitted
修改评测h5分享URL格式(末尾去掉ticket),详情页面返回评 测列表取消APP端刷新,分享URL参数采用透传方式不作处理,和安卓保持一致
Change-Id: I2d2c5363ba0b6254855f5d519b55e60deef65254
1 parent 4336146 commit 450c497

File tree

2 files changed

+21
-23
lines changed

2 files changed

+21
-23
lines changed

Source/LinkApp/Classes/Module/Login/Controller/TIoTWebVC.m

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -263,29 +263,29 @@ - (void)displayEvaluationDetailWebViewWithURl:(NSString *)url {
263263
NSArray *bodyUrlArray = [bodyUrlString componentsSeparatedByString:@"="];
264264
NSData *data = [bodyUrlArray.lastObject dataUsingEncoding:NSUTF8StringEncoding];
265265
NSDictionary *bodyParamDic = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableLeaves error:nil];
266-
NSDictionary *itemParamDic = @{@"articleId":bodyParamDic[@"ArticleId"],@"IsLike":bodyParamDic[@"IsLike"],@"LikeCount":bodyParamDic[@"LikeCount"],@"articleRoute":bodyParamDic[@"articleRoute"],@"articleTitle":bodyParamDic[@"articleTitle"]};
267-
NSString *itemParaString = [NSString objectToJson:itemParamDic];
266+
// NSDictionary *itemParamDic = @{@"articleId":bodyParamDic[@"ArticleId"],@"IsLike":bodyParamDic[@"IsLike"],@"LikeCount":bodyParamDic[@"LikeCount"],@"articleRoute":bodyParamDic[@"articleRoute"],@"articleTitle":bodyParamDic[@"articleTitle"]};
267+
NSString *itemParaString = [NSString objectToJson:bodyParamDic];
268268
NSString *itemJsonString = [NSString URLEncode:itemParaString];
269269
[MBProgressHUD showLodingNoneEnabledInView:[UIApplication sharedApplication].keyWindow withMessage:@""];
270-
[[TIoTRequestObject shared] post:AppGetTokenTicket Param:@{} success:^(id responseObject) {
271-
272-
WCLog(@"AppGetTokenTicket responseObject%@", responseObject);
273-
NSString *ticket = responseObject[@"TokenTicket"]?:@"";
274-
TIoTWebVC *vc = [TIoTWebVC new];
275-
NSString *url = nil;
276-
NSString *bundleId = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleIdentifier"];
277-
url = [NSString stringWithFormat:@"%@/%@/#%@=%@&appID=%@&ticket=%@&uin=%@", [TIoTCoreAppEnvironment shareEnvironment].h5Url, H5Evaluation, bodyUrlArray.firstObject,itemJsonString,bundleId, ticket,TIoTAPPConfig.GlobalDebugUin];
278-
vc.sharedMessageDic = bodyParamDic;
279-
vc.sharedURLString = [NSString stringWithFormat:@"%@/%@/?uin=%@#%@=%@&ticket=%@", [TIoTCoreAppEnvironment shareEnvironment].h5Url, H5Evaluation,TIoTAPPConfig.GlobalDebugUin,bodyUrlArray.firstObject,itemJsonString, ticket];
280-
vc.sharedPathString = [NSString stringWithFormat:@"pages/Index/TabPages/Evaluation/EvaluationDetail/EvaluationDetail?item=%@&ticket=%@&uin=%@",itemJsonString, ticket,TIoTAPPConfig.GlobalDebugUin];
281-
vc.urlPath = url;
282-
vc.needJudgeJump = YES;
283-
[self.navigationController pushViewController:vc animated:YES];
284-
[MBProgressHUD dismissInView:self.view];
285-
286-
} failure:^(NSString *reason, NSError *error,NSDictionary *dic) {
287-
[MBProgressHUD dismissInView:self.view];
288-
}];
270+
[[TIoTRequestObject shared] post:AppGetTokenTicket Param:@{} success:^(id responseObject) {
271+
272+
WCLog(@"AppGetTokenTicket responseObject%@", responseObject);
273+
NSString *ticket = responseObject[@"TokenTicket"]?:@"";
274+
TIoTWebVC *vc = [TIoTWebVC new];
275+
NSString *url = nil;
276+
NSString *bundleId = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleIdentifier"];
277+
url = [NSString stringWithFormat:@"%@/%@/#%@=%@&appID=%@&ticket=%@&uin=%@", [TIoTCoreAppEnvironment shareEnvironment].h5Url, H5Evaluation, bodyUrlArray.firstObject,itemJsonString,bundleId, ticket,TIoTAPPConfig.GlobalDebugUin];
278+
vc.sharedMessageDic = bodyParamDic;
279+
vc.sharedURLString = [NSString stringWithFormat:@"%@/%@/?uin=%@#%@=%@", [TIoTCoreAppEnvironment shareEnvironment].h5Url, H5Evaluation,TIoTAPPConfig.GlobalDebugUin,bodyUrlArray.firstObject,itemJsonString];
280+
vc.sharedPathString = [NSString stringWithFormat:@"pages/Index/TabPages/Evaluation/EvaluationDetail/EvaluationDetail?item=%@&ticket=%@&uin=%@",itemJsonString, ticket,TIoTAPPConfig.GlobalDebugUin];
281+
vc.urlPath = url;
282+
vc.needJudgeJump = YES;
283+
[self.navigationController pushViewController:vc animated:YES];
284+
[MBProgressHUD dismissInView:self.view];
285+
286+
} failure:^(NSString *reason, NSError *error,NSDictionary *dic) {
287+
[MBProgressHUD dismissInView:self.view];
288+
}];
289289
}
290290

291291
@end

Source/LinkApp/Classes/Universal/WxManage/WxManager.m

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@ - (void)authFromWxComplete:(WxBlock)blk
7070
[WXApi sendReq:req completion:^(BOOL success) {
7171

7272
}];
73-
}else if (![WXApi isWXAppInstalled]){
74-
[MBProgressHUD showError:NSLocalizedString(@"noWeichat_placeInstall", @"微信未安装,请安装后重试")];
7573
}else {
7674
[MBProgressHUD showError:NSLocalizedString(@"uninstalled_LastestWeiChat", @"未安装微信或版本过低")];
7775
}

0 commit comments

Comments
 (0)