Skip to content

pidan / FuSiLive

Go to a project
Commit e513f81c by pierce
Options

Merge branch 'feature/UI修改版本' of http://git.yabolive.net:88/pidan/FuSiLive into feature/UI修改版本

parents 359fc834 cff1ad7d
Inline Side-by-side
Showing with 21 additions and 18 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Categories/NSString/NSString+FUSHTML.m
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
+ (NSString *)fus_imageStringWithHeight:(NSString *)height width:(NSString *)width { + (NSString *)fus_imageStringWithHeight:(NSString *)height width:(NSString *)width {
NSString *mata = @"<meta content=\"width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0\" name=\"viewport\">"; NSString *mata = @"<meta content=\"width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0\" name=\"viewport\">";
NSString *script = @"<script type=text/javascript src=https://app.ixiulive.com/static/js/fsize.js></script>"; NSString *script = @"<script type=text/javascript src=https://app.ixiulive.com/static/js/fsize.js></script>";
NSString *css = [NSString stringWithFormat:@"<link rel=stylesheet href=https://app.ixiulive.com/static/css/news.css?v=%ld />",(long)[NSDate date].timeIntervalSince1970]; NSString *css = [NSString stringWithFormat:@"<link rel=stylesheet href=https://app.ixiulive.com/static/css/ftnews.css?v=%ld />",(long)[NSDate date].timeIntervalSince1970];
if ((height.length == 0 || height.integerValue == 0) && (width.length == 0 || width.integerValue == 0)) { if ((height.length == 0 || height.integerValue == 0) && (width.length == 0 || width.integerValue == 0)) {
// 如果没有设置宽高，则不需要图片宽高标签 // 如果没有设置宽高，则不需要图片宽高标签
return [NSString stringWithFormat:@"<head>%@%@%@</head>",mata,script,css]; return [NSString stringWithFormat:@"<head>%@%@%@</head>",mata,script,css];
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/FUSRotationImageCropper/FUSRotationCropperImageViewController.m
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
UILabel *contentTitleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 200, 44)]; UILabel *contentTitleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 200, 44)];
contentTitleLabel.font = [UIFont systemFontOfSize:18]; contentTitleLabel.font = [UIFont systemFontOfSize:18];
contentTitleLabel.text = FUSLocalizationHelper.localString(@"更換頭像"); contentTitleLabel.text = FUSLocalizationHelper.localString(@"更换头像");
contentTitleLabel.textColor = [UIColor whiteColor]; contentTitleLabel.textColor = [UIColor whiteColor];
contentTitleLabel.textAlignment = NSTextAlignmentCenter; contentTitleLabel.textAlignment = NSTextAlignmentCenter;
[naviContentView addSubview:contentTitleLabel]; [naviContentView addSubview:contentTitleLabel];
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
[rotationBtn addTarget:self action:@selector(fus_rotationBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside]; [rotationBtn addTarget:self action:@selector(fus_rotationBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
UIButton *restoreBtn = [UIButton buttonWithType:UIButtonTypeCustom]; UIButton *restoreBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[restoreBtn setTitle:FUSLocalizationHelper.localString(@"還原") forState:UIControlStateNormal]; [restoreBtn setTitle:FUSLocalizationHelper.localString(@"还原") forState:UIControlStateNormal];
restoreBtn.titleLabel.font = [UIFont systemFontOfSize:15]; restoreBtn.titleLabel.font = [UIFont systemFontOfSize:15];
[restoreBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; [restoreBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[controlView addSubview:restoreBtn]; [controlView addSubview:restoreBtn];
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
okBtn.layer.cornerRadius = 20; okBtn.layer.cornerRadius = 20;
okBtn.layer.masksToBounds = YES; okBtn.layer.masksToBounds = YES;
[confirmView addSubview:okBtn]; [confirmView addSubview:okBtn];
btnSize = [FUSLocalizationHelper.localString(@"確認&更換") sizeWithFont:cancelBtn.titleLabel.font maxWidth:MAXFLOAT]; btnSize = [FUSLocalizationHelper.localString(@"确认&更换") sizeWithFont:cancelBtn.titleLabel.font maxWidth:MAXFLOAT];
okBtn.frame = CGRectMake(screenWidth - 117 - 13, 12, 117, 40); okBtn.frame = CGRectMake(screenWidth - 117 - 13, 12, 117, 40);
[okBtn addTarget:self action:@selector(fus_okBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside]; [okBtn addTarget:self action:@selector(fus_okBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
......
FuSiLive/Classes/Login/Controller/FUSForgetPasswordViewController.m
...@@ -287,6 +287,8 @@ ...@@ -287,6 +287,8 @@
} }
[self displayCountryNameAndCountryCode]; [self displayCountryNameAndCountryCode];
}else if (self.countryInfoDict == nil) {
[self setupCountryAndArea];
} }
if (_phoneTextField.text.length > 0 && (_verifyCodeButton.userInteractionEnabled || _verifyCodeButton2.userInteractionEnabled)&& self.countryInfoDict) { if (_phoneTextField.text.length > 0 && (_verifyCodeButton.userInteractionEnabled || _verifyCodeButton2.userInteractionEnabled)&& self.countryInfoDict) {
......
FuSiLive/Classes/NewsFeed/Views/NewsFeedDetailHeaderView/FUSNewsFeedDetailArticleHeaderView.m
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
if (!_webView) { if (!_webView) {
_webView = [[WKWebView alloc] initWithFrame:CGRectMake(FUSNFDAHVContentLeftMargin, 0, UIView.fus_screenW - FUSNFDAHVContentLeftMargin * 2, self.model.headerContentHeight)]; _webView = [[WKWebView alloc] initWithFrame:CGRectMake(FUSNFDAHVContentLeftMargin, 0, UIView.fus_screenW - FUSNFDAHVContentLeftMargin * 2, self.model.headerContentHeight)];
_webView.backgroundColor = [UIColor clearColor]; _webView.backgroundColor = [UIColor whiteColor];
_webView.opaque = NO; _webView.opaque = NO;
_webView.scrollView.scrollEnabled = NO; _webView.scrollView.scrollEnabled = NO;
_webView.navigationDelegate = self; _webView.navigationDelegate = self;
......
FuSiLive/Classes/Setting/Controller/FUSSettingViewController.m
...@@ -431,19 +431,20 @@ ...@@ -431,19 +431,20 @@
_item11 = [FUSCustomSettingItem fus_itemWithTitle:FUSLocalizationHelper.localString(@"版本") type:CustomSettingItemTypeShowText]; _item11 = [FUSCustomSettingItem fus_itemWithTitle:FUSLocalizationHelper.localString(@"版本") type:CustomSettingItemTypeShowText];
_item11.rightShowText = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"]; _item11.rightShowText = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
_item11.itemClick = ^(FUSCustomSettingItem *item) { _item11.itemClick = ^(FUSCustomSettingItem *item) {
[FUSCommonHttpRequest fus_checkIsLastedVerionSource:@"1" success:^(BOOL isUpdate, NSDictionary *dict) {
// [FUSCommonHttpRequest fus_checkIsLastedVerionSource:@"1" success:^(BOOL isUpdate, NSDictionary *dict) {
FUSUpdateModel *model = [FUSUpdateModel fus_modelWithDict:dict]; //
FUSUpdateAlertView *alertView = [[FUSUpdateAlertView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH)]; // FUSUpdateModel *model = [FUSUpdateModel fus_modelWithDict:dict];
// FUSUpdateAlertView *alertView = [[FUSUpdateAlertView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH)];
[alertView fus_setDetailWithModel:model]; //
[[UIApplication sharedApplication].keyWindow addSubview:alertView]; // [alertView fus_setDetailWithModel:model];
} failure:^(NSString *msg, int code) { // [[UIApplication sharedApplication].keyWindow addSubview:alertView];
// } failure:^(NSString *msg, int code) {
if (code == -21) { //
[FUSDialogView fus_showDialog:msg autoDismiss:YES]; // if (code == -21) {
} // [FUSDialogView fus_showDialog:msg autoDismiss:YES];
}]; // }
// }];
}; };
_item11_1 = [FUSCustomSettingItem fus_itemWithTitle:FUSLocalizationHelper.localString(@"访问官网") type:CustomSettingItemTypeArrow]; _item11_1 = [FUSCustomSettingItem fus_itemWithTitle:FUSLocalizationHelper.localString(@"访问官网") type:CustomSettingItemTypeArrow];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment