Skip to content

pidan / FuSiLive

Go to a project
Commit cff1ad7d by ludi
Options

备份一下

parent fb4b2ae1
Inline Side-by-side
Showing with 20 additions and 17 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Categories/NSString/NSString+FUSHTML.m
......@@ -67,7 +67,7 @@
+ (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 *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)) {
// 如果没有设置宽高，则不需要图片宽高标签
return [NSString stringWithFormat:@"<head>%@%@%@</head>",mata,script,css];
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/FUSRotationImageCropper/FUSRotationCropperImageViewController.m
......@@ -58,7 +58,7 @@
UILabel *contentTitleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 200, 44)];
contentTitleLabel.font = [UIFont systemFontOfSize:18];
contentTitleLabel.text = FUSLocalizationHelper.localString(@"更換頭像");
contentTitleLabel.text = FUSLocalizationHelper.localString(@"更换头像");
contentTitleLabel.textColor = [UIColor whiteColor];
contentTitleLabel.textAlignment = NSTextAlignmentCenter;
[naviContentView addSubview:contentTitleLabel];
......@@ -82,7 +82,7 @@
[rotationBtn addTarget:self action:@selector(fus_rotationBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
UIButton *restoreBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[restoreBtn setTitle:FUSLocalizationHelper.localString(@"還原") forState:UIControlStateNormal];
[restoreBtn setTitle:FUSLocalizationHelper.localString(@"还原") forState:UIControlStateNormal];
restoreBtn.titleLabel.font = [UIFont systemFontOfSize:15];
[restoreBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[controlView addSubview:restoreBtn];
......@@ -109,7 +109,7 @@
okBtn.layer.cornerRadius = 20;
okBtn.layer.masksToBounds = YES;
[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 addTarget:self action:@selector(fus_okBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
......
FuSiLive/Classes/Login/Controller/FUSForgetPasswordViewController.m
......@@ -287,6 +287,8 @@
}
[self displayCountryNameAndCountryCode];
}else if (self.countryInfoDict == nil) {
[self setupCountryAndArea];
}
if (_phoneTextField.text.length > 0 && (_verifyCodeButton.userInteractionEnabled || _verifyCodeButton2.userInteractionEnabled)&& self.countryInfoDict) {
......
FuSiLive/Classes/NewsFeed/Views/NewsFeedDetailHeaderView/FUSNewsFeedDetailArticleHeaderView.m
......@@ -170,7 +170,7 @@
if (!_webView) {
_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.scrollView.scrollEnabled = NO;
_webView.navigationDelegate = self;
......
FuSiLive/Classes/Setting/Controller/FUSSettingViewController.m
......@@ -431,19 +431,20 @@
_item11 = [FUSCustomSettingItem fus_itemWithTitle:FUSLocalizationHelper.localString(@"版本") type:CustomSettingItemTypeShowText];
_item11.rightShowText = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
_item11.itemClick = ^(FUSCustomSettingItem *item) {
[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)];
[alertView fus_setDetailWithModel:model];
[[UIApplication sharedApplication].keyWindow addSubview:alertView];
} failure:^(NSString *msg, int code) {
if (code == -21) {
[FUSDialogView fus_showDialog:msg autoDismiss:YES];
}
}];
// [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)];
//
// [alertView fus_setDetailWithModel:model];
// [[UIApplication sharedApplication].keyWindow addSubview:alertView];
// } failure:^(NSString *msg, int code) {
//
// if (code == -21) {
// [FUSDialogView fus_showDialog:msg autoDismiss:YES];
// }
// }];
};
_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