Skip to content

pidan / FuSiLive

Go to a project
Commit 26531a95 by ludi
Options

修复一些bug

parent 35c172d2
Inline Side-by-side
Showing with 42 additions and 12 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/FUSStyleButton.m
...@@ -251,7 +251,6 @@ ...@@ -251,7 +251,6 @@
self.backgroundColor = [UIColor clearColor]; self.backgroundColor = [UIColor clearColor];
[self setTitleColor:[UIColor fus_diamondBlue] forState:(UIControlStateNormal)]; [self setTitleColor:[UIColor fus_diamondBlue] forState:(UIControlStateNormal)];
[self setTitleColor:[UIColor fus_diamondBlue] forState:(UIControlStateDisabled)];
} }
break; break;
default: default:
...@@ -377,6 +376,11 @@ ...@@ -377,6 +376,11 @@
self.alpha = 0.5; self.alpha = 0.5;
} }
} }
// ludy: 其他颜色设置enable=no会沿用FUSButtonStyleBlue的颜色
if (_style != FUSButtonStyleBlue) {
[self setTitleColor:[self titleColorForState:UIControlStateNormal] forState:UIControlStateSelected];
}
} }
- (void)setHighlighted:(BOOL)highlighted - (void)setHighlighted:(BOOL)highlighted
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/WebView/FUSWKWebView.m
...@@ -366,8 +366,12 @@ ...@@ -366,8 +366,12 @@
if (![_webUrlString containsString:@"appname="]) { if (![_webUrlString containsString:@"appname="]) {
// urlString = [FUSHttpManager fus_getHttUrl:urlString params:@{@"appname":NSBundle.mainBundle.bundleIdentifier}]; // urlString = [FUSHttpManager fus_getHttUrl:urlString params:@{@"appname":NSBundle.mainBundle.bundleIdentifier}];
//TODO: 暂时先改成这个，正式服使用上面那个 //ludy: appname测试的和正式的不同
urlString = [FUSHttpManager fus_getHttUrl:urlString params:@{@"appname":@"com.fusi.live.ios"}]; if ([FUSConfig sharedInstanced].devConfigs.devLevel == FUSDevlopLevelRelease) {
urlString = [FUSHttpManager fus_getHttUrl:urlString params:@{@"appname":NSBundle.mainBundle.bundleIdentifier}];
}else {
urlString = [FUSHttpManager fus_getHttUrl:urlString params:@{@"appname":@"com.fusi.meet.live.chat.video.among.friends"}];
}
} }
// 增加安全区高度数据注入 // 增加安全区高度数据注入
urlString = [FUSHttpManager fus_getHttUrl:urlString params:@{@"safeAreaTop":@((NSInteger)((UIView.fus_SafeTop / UIView.fus_screenH) * 100))}]; urlString = [FUSHttpManager fus_getHttUrl:urlString params:@{@"safeAreaTop":@((NSInteger)((UIView.fus_SafeTop / UIView.fus_screenH) * 100))}];
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/WebView/FUSWebMorePopListView.m
...@@ -66,7 +66,7 @@ static const NSInteger FUSWebMoreListViewModuleSpace = 10; ...@@ -66,7 +66,7 @@ static const NSInteger FUSWebMoreListViewModuleSpace = 10;
self.cancelBtn = [UIButton buttonWithType:UIButtonTypeCustom]; self.cancelBtn = [UIButton buttonWithType:UIButtonTypeCustom];
self.cancelBtn.backgroundColor = [UIColor fus_listBGColor]; self.cancelBtn.backgroundColor = [UIColor fus_listBGColor];
[self.cancelBtn setTitleColor:[UIColor fus_appSubColor] forState:UIControlStateNormal]; [self.cancelBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
[self.cancelBtn setTitle:[NSString fus_localString:@"取消"] forState:UIControlStateNormal]; [self.cancelBtn setTitle:[NSString fus_localString:@"取消"] forState:UIControlStateNormal];
self.cancelBtn.titleLabel.font = [UIFont fus_themeFont:16]; self.cancelBtn.titleLabel.font = [UIFont fus_themeFont:16];
self.cancelBtn.layer.cornerRadius = 10; self.cancelBtn.layer.cornerRadius = 10;
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/AlertView/ResponsibilityConfirm/FUSResponsibilityConfirmAlertView.m
...@@ -144,7 +144,9 @@ ...@@ -144,7 +144,9 @@
if (self.clickHandler) { if (self.clickHandler) {
self.clickHandler(isConfirmAll ? 1 : 0); self.clickHandler(isConfirmAll ? 1 : 0);
} }
[self fus_dismissWithAnimate]; if (isConfirmAll) {
[self fus_dismissWithAnimate];
}
} }
-(void)fus_showWithAnimate{ -(void)fus_showWithAnimate{
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSHomeView.m
...@@ -42,6 +42,8 @@ ...@@ -42,6 +42,8 @@
@property (nonatomic, assign) CGFloat columnMargin; //每一列之间的间距 @property (nonatomic, assign) CGFloat columnMargin; //每一列之间的间距
@property (nonatomic, assign) CGFloat rowMargin; //每一行之间的间距 @property (nonatomic, assign) CGFloat rowMargin; //每一行之间的间距
@property (nonatomic, assign) int columnsCount; //显示多少列 @property (nonatomic, assign) int columnsCount; //显示多少列
/// collectionview的头部空出多少，不能动态获取，因为这个collectionview它会下拉刷新，下拉刷新还没完全上去之前，会变长
@property (nonatomic, assign) CGFloat collectionViewContentInsetTop;
/// 追踪列表需要刷新 /// 追踪列表需要刷新
@property (nonatomic, assign) BOOL followNeedUpdate; @property (nonatomic, assign) BOOL followNeedUpdate;
...@@ -55,6 +57,7 @@ ...@@ -55,6 +57,7 @@
self = [super init]; self = [super init];
if (self) { if (self) {
self.followNeedUpdate = NO; self.followNeedUpdate = NO;
self.collectionViewContentInsetTop = 0;
[self fus_setup]; [self fus_setup];
[self fus_createUI]; [self fus_createUI];
...@@ -101,11 +104,12 @@ ...@@ -101,11 +104,12 @@
self.titleContainerView.height = self.broadcastView.bottom + 3; self.titleContainerView.height = self.broadcastView.bottom + 3;
// collection // collection
self.collectionViewContentInsetTop = self.titleContainerView.height + 4;
self.collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH) self.collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH)
collectionViewLayout:[[UICollectionViewFlowLayout alloc]init]]; collectionViewLayout:[[UICollectionViewFlowLayout alloc]init]];
self.collectionView.scrollsToTop = YES; self.collectionView.scrollsToTop = YES;
// self.collectionView.contentInset = UIEdgeInsetsMake(self.titleContainerView.height + 0, 0, UIView.fus_tabbarHeight, 0); // self.collectionView.contentInset = UIEdgeInsetsMake(self.titleContainerView.height + 0, 0, UIView.fus_tabbarHeight, 0);
self.collectionView.contentInset = UIEdgeInsetsMake(self.titleContainerView.height + 4, 0, 0, 0); self.collectionView.contentInset = UIEdgeInsetsMake(self.collectionViewContentInsetTop, 0, 0, 0);
self.collectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; self.collectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
self.collectionView.backgroundColor = [UIColor clearColor]; self.collectionView.backgroundColor = [UIColor clearColor];
...@@ -164,7 +168,7 @@ ...@@ -164,7 +168,7 @@
NSInteger last = self.viewModel.dataList.count % self.columnsCount; NSInteger last = self.viewModel.dataList.count % self.columnsCount;
contentH = [self fus_itemWidth] * line; contentH = [self fus_itemWidth] * line;
// contentH = contentH + (last > 1 ? 1 : 0) * [self fus_itemWidth]; // contentH = contentH + (last > 1 ? 1 : 0) * [self fus_itemWidth];
contentH += collectionView.contentInset.top; contentH += self.collectionViewContentInsetTop;
[self.fus_baseDelegate fus_homeView:self didUpdateScrollViewCntentMaxHeightWithFloor:contentH]; [self.fus_baseDelegate fus_homeView:self didUpdateScrollViewCntentMaxHeightWithFloor:contentH];
} }
return self.viewModel.dataList.count; return self.viewModel.dataList.count;
......
FuSiLive/Classes/NewsFeed/RichEditor/Controller/FUSPublishNewsFeedViewController.m
...@@ -147,7 +147,7 @@ FUSImagePickerViewControllerDelegate> ...@@ -147,7 +147,7 @@ FUSImagePickerViewControllerDelegate>
_inputTextView = [[FUSTextView alloc] initWithFrame:_headerView.bounds]; _inputTextView = [[FUSTextView alloc] initWithFrame:_headerView.bounds];
[_headerView addSubview:_inputTextView]; [_headerView addSubview:_inputTextView];
[_inputTextView setTextColor:[UIColor whiteColor]]; [_inputTextView setTextColor:[UIColor fus_textColorRich]];
_inputTextView.placeholder = [NSString fus_localString:@"请输入内容"]; _inputTextView.placeholder = [NSString fus_localString:@"请输入内容"];
_inputTextView.backgroundColor = [UIColor clearColor]; _inputTextView.backgroundColor = [UIColor clearColor];
_inputTextView.font = [UIFont systemFontOfSize:18]; _inputTextView.font = [UIFont systemFontOfSize:18];
...@@ -678,7 +678,7 @@ FUSImagePickerViewControllerDelegate> ...@@ -678,7 +678,7 @@ FUSImagePickerViewControllerDelegate>
} }
-(void)fus_pushBtnDidClicked:(UIButton *)btn{ -(void)fus_pushBtnDidClicked:(UIButton *)btn{
[self.view endEditing:YES];
NSString *isShow = [NSUserDefaults fus_readCurrentUserObjectWithKey:UDKEY_ACCOUNT_FIRST_PUBLISH_AND_SHARE_PROTOCOL]; NSString *isShow = [NSUserDefaults fus_readCurrentUserObjectWithKey:UDKEY_ACCOUNT_FIRST_PUBLISH_AND_SHARE_PROTOCOL];
if (isShow == nil || isShow.length <= 0) { if (isShow == nil || isShow.length <= 0) {
......
FuSiLive/FUSAPPConfigs/FUSFuSiWebViewEventHelper.m
...@@ -240,10 +240,18 @@ static NSString *FUSWebRightBtnExtraInfoKey = @"FUSWebRightBtnExtraInfoKey"; ...@@ -240,10 +240,18 @@ static NSString *FUSWebRightBtnExtraInfoKey = @"FUSWebRightBtnExtraInfoKey";
//分享的类型：1.邀请分享 2.普通分享 （默认为邀请分享） //分享的类型：1.邀请分享 2.普通分享 （默认为邀请分享）
NSInteger sharingType = [dataDict[@"shareContent"][@"whichShare"] integerValue]; NSInteger sharingType = [dataDict[@"shareContent"][@"whichShare"] integerValue];
if (sharingType == 1) { // if (sharingType == 1) {
if ([self.wkVC isKindOfClass:[FUSWKWebViewController class]]) { // if ([self.wkVC isKindOfClass:[FUSWKWebViewController class]]) {
FUSWKWebViewController *tmpWKVC = (FUSWKWebViewController *)self.wkVC; // FUSWKWebViewController *tmpWKVC = (FUSWKWebViewController *)self.wkVC;
// tmpWKVC.from = FUSFromInvitShare;
// }
// }
if ([self.wkVC isKindOfClass:[FUSWKWebViewController class]]) {
FUSWKWebViewController *tmpWKVC = (FUSWKWebViewController *)self.wkVC;
if (sharingType == 1) {
tmpWKVC.from = FUSFromInvitShare; tmpWKVC.from = FUSFromInvitShare;
}else {
tmpWKVC.from = FUSFromTopic;
} }
} }
...@@ -1310,9 +1318,17 @@ static NSString *FUSWebRightBtnExtraInfoKey = @"FUSWebRightBtnExtraInfoKey"; ...@@ -1310,9 +1318,17 @@ static NSString *FUSWebRightBtnExtraInfoKey = @"FUSWebRightBtnExtraInfoKey";
NSString *imageUrl = shareContentDict[@"pic"]; NSString *imageUrl = shareContentDict[@"pic"];
NSString *content = shareContentDict[@"text"]; NSString *content = shareContentDict[@"text"];
NSString *webUrl = shareContentDict[@"webpage"]; NSString *webUrl = shareContentDict[@"webpage"];
// NSInteger needCode = [shareContentDict[@"whichShare"] interval];
__weak typeof(self) weakSelf = self; __weak typeof(self) weakSelf = self;
[[UIApplication sharedApplication].keyWindow addSubview:self.shareView]; [[UIApplication sharedApplication].keyWindow addSubview:self.shareView];
// if (needCode == 1) {
// _shareView = [[FUSWebShareView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH) from:FUSFromInvitShare];
// [self.shareView fus_showShareViewWithViewController:self.wkVC title:title content:content imageOrUrl:imageUrl shareUrl:webUrl from:FUSFromInvitShare roomId:nil shareTypeInfo:shareTypeDict success:nil failure:nil];
// }else{
// _shareView = [[FUSWebShareView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH) from:FUSFromTopic];
// [self.shareView fus_showShareViewWithViewController:self.wkVC title:title content:content imageOrUrl:imageUrl shareUrl:webUrl from:FUSFromTopic roomId:nil shareTypeInfo:shareTypeDict success:nil failure:nil];
// }
[self.shareView fus_showShareViewWithViewController:self.wkVC title:title content:content imageOrUrl:imageUrl shareUrl:webUrl from:FUSFromTopic roomId:nil shareTypeInfo:shareTypeDict success:nil failure:nil]; [self.shareView fus_showShareViewWithViewController:self.wkVC title:title content:content imageOrUrl:imageUrl shareUrl:webUrl from:FUSFromTopic roomId:nil shareTypeInfo:shareTypeDict success:nil failure:nil];
_shareView.dismissWhenClick = NO; _shareView.dismissWhenClick = NO;
......
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