Commit 6f5dfe5b by pierce

1、fixed bugs

2、修改TTSDKLisence
parent 72a1a73f
......@@ -41,6 +41,9 @@ typedef NS_ENUM(NSUInteger, FUSNavigationBackBtnStyle) {
// 左上角放回按钮
@property (nonatomic, copy) void(^onClickBackHandle)(void);
// 初始化导航栏
- (void)initBaseNavigation;
- (UIViewController *)swipeGesturesFinishBlock:(void(^)(double value))value;
- (BOOL)fus_clickLeftBackItemAction;
......
......@@ -146,7 +146,6 @@
if (@available(iOS 15.0, *)) {
UINavigationBarAppearance *barApp = [UINavigationBarAppearance new];
// barApp.titleTextAttributes = @{NSForegroundColorAttributeName : [UIColor colorWithHex:@"#E3E3E3"]};
barApp.titleTextAttributes = @{NSForegroundColorAttributeName : [UIColor fus_textColorRich]};
barApp.backgroundColor = UIColor.fus_navBarColor;; // 设置为你项目中的颜色
self.navigationController.navigationBar.scrollEdgeAppearance = barApp; // 可滑动界面配置
......
{
"Signature": "zJpB2aILtvz2LfE3mJbhdnYvnsKpOJhZYpIMZztpfW0rpJnA7EhSfN9laqf4W+K2LzzYyrLdr4y3lFv0r7EopHHU8VcqVtUbL/GEKmHXL3ty3pQ8EztyMvKzUjhl7shE+odjf7mwM8ctQF/9NO6Itr7C//kncLTqB1vZEm5BGms84PR9v/jB0nrDahvCtTt8CR0P55PrTW4FhEO1bQg/nXjlSM37jyriDVqtBV4pm6ymEgi/Uo4HSqBFuK9M6ip+ODs0HPDxIH8TngIGaL/3/gVX5llfxNwRe9m3VrpAWCpbxn3byO7axRpA9l4lP4mi/DSIUtBR0v5NUBbeBQQaMg==",
"Content": "eyJJZCI6IjEwMDkwMyIsICJWZXJzaW9uIjoyLCAiQ2hhbm5lbCI6InZvZCIsICJUeXBlIjoyLCAiUGFja2FnZU5hbWUiOiJjb20uc2FrdXJhLnNob3ciLCAiQnVuZGxlSWQiOiJjb20uZmlyZWx5eC5pb3MiLCAiTW9kdWxlcyI6W3siTmFtZSI6InZvZF9wbGF5IiwgIkVkaXRpb24iOiJwcmVtaXVtX2VkaXRpb24iLCAiU3RhcnRUaW1lIjoxNjQ3OTIyNDExNzI4LCAiRXhwaXJlVGltZSI6MTcxMDk5NDQxMTcyOCwgIkV4cGlyZUJ1ZmZlciI6MTU1NTIwMDAwMDB9LCB7Ik5hbWUiOiJsaXZlX3B1c2giLCAiRWRpdGlvbiI6InByZW1pdW1fZWRpdGlvbiIsICJTdGFydFRpbWUiOjE2NDc5MjI0MTE3MjgsICJFeHBpcmVUaW1lIjoxNzEwOTk0NDExNzI4LCAiRXhwaXJlQnVmZmVyIjoxNTU1MjAwMDAwMH0sIHsiTmFtZSI6ImxpdmVfcHVsbCIsICJFZGl0aW9uIjoicHJlbWl1bV9lZGl0aW9uIiwgIlN0YXJ0VGltZSI6MTY0NzkyMjQxMTcyOCwgIkV4cGlyZVRpbWUiOjE3MTA5OTQ0MTE3MjgsICJFeHBpcmVCdWZmZXIiOjE1NTUyMDAwMDAwfV0sICJGaWxlVmVyc2lvbiI6IjE2NDc5MjI0MTE3NDMzNzY4MzQifQ==",
"MainURL": "https://vod-license-m.volccdn.com/vod-license/l-100903-ch-vod-a-209564.lic?x-expires=4801522411&x-signature=J41SS%2FW5Diuhjo9lKIj2X9KDwIE%3D",
"BackupURL": "https://vod-license-b.volccdn.com/vod-license/l-100903-ch-vod-a-209564.lic?x-expires=4801522411&x-signature=GhqKNInxoDN0X7RChrsQhKfpIYo%3D",
"Id": "100903"
"Signature": "uEdniqEXaqUfQl+3lCZxyGgsKmWZTSJIQe11EvcgYLvdFW3ICs7uwWJ4IdWM7X8aIxJwbZZ+PZnXQ394zw7FVgK1HAuDvJsjOlA677WYbWW5h/p40HBTJ4fxEo0SJsYdzsnBYVmzq4t6jRv9FyTEu5gTrGwyQgC49EqFrp14m5L0zR+1B8OVMlKY0Diq7z6xt3NjZrUQz/yFAC0DNvtQWNQ72i8AvfOyRcznx3h/jqiatQK2EnwVg/XGPOo1e9jVYVzoaheH94kLHq483WstMPMFFwRokrzcFTdG30Bzv0Z1rv+i0bqC+NVK7jQTe8ylPNMtSuNf/9YIy90VLwHNoQ==",
"Content": "eyJJZCI6Ijk4MDMwMjMzOCIsICJWZXJzaW9uIjoyLCAiQ2hhbm5lbCI6ImxpdmUiLCAiVHlwZSI6MiwgIkJ1bmRsZUlkIjoiY29tLmZ1c2kubWVldC5saXZlLmNoYXQudmlkZW8uYW1vbmcuZnJpZW5kcyIsICJNb2R1bGVzIjpbeyJOYW1lIjoibGl2ZV9wdXNoIiwgIkVkaXRpb24iOiJwcmVtaXVtX2VkaXRpb24iLCAiU3RhcnRUaW1lIjoxNzI0NDAzMDg2MjI2LCAiRXhwaXJlVGltZSI6MTc1NTkzOTA4NjIyNiwgIkV4cGlyZUJ1ZmZlciI6MTU1NTIwMDAwMDB9LCB7Ik5hbWUiOiJsaXZlX3B1bGwiLCAiRWRpdGlvbiI6InByZW1pdW1fZWRpdGlvbiIsICJTdGFydFRpbWUiOjE3MjQ0MDMwODYyMjYsICJFeHBpcmVUaW1lIjoxNzU1OTM5MDg2MjI2LCAiRXhwaXJlQnVmZmVyIjoxNTU1MjAwMDAwMH1dLCAiRmlsZVZlcnNpb24iOiIxNzI0NDAzMDg2MjM5Mjg5NTc1In0=",
"MainURL": "https://vod-license-m.volccdn.com/vod-license/l-980302338-ch-live-a-642006.lic?lk3s=0d9f7a7d&x-expires=4878003086&x-signature=OuyhczqZaNon1D4P7Xd9Wp7FuiA%3D",
"BackupURL": "https://vod-license-b.volccdn.com/vod-license/l-980302338-ch-live-a-642006.lic?lk3s=0d9f7a7d&x-expires=4878003086&x-signature=As%2FM9U1MevQNKT%2B%2F3%2B9Lxz87YSw%3D",
"Id": "980302338"
}
......@@ -1123,7 +1123,6 @@ FUSLinkMicUserListDelegate
self.realtimeActivityWebView.wkWebView.scrollView.showsVerticalScrollIndicator = NO;
self.realtimeActivityWebView.wkWebView.scrollView.showsHorizontalScrollIndicator = NO;
self.realtimeActivityWebView.hideProgress = YES;
// [self.realtimeActivityWebView loadWebURL:@"https://ceshi.yabolive.tv/webAppBridge.html"];
[self.realtimeActivityWebView configWebViewWithWebUrl:FUSCacheDataShare.shareStore.settingInitDataModel.roomWebFramework.horizontalUrl];
[[self fus_viewWithLayer:FUSLiveFunctionLayerFunctionButtons] addSubview:self.realtimeActivityWebView];
......
......@@ -261,8 +261,7 @@
FUSWKWebViewController *wkwVC = [[FUSWKWebViewController alloc] init];
wkwVC.needHideWebTitleBar = YES;
wkwVC.closeToPopAllWebView = NO;
//TODO: 暂时写死榜单的,等阿甘回来再说,FUSShowRoomURLs.fus_FUSCommonWebURLs.fus_homeRank这个定义里有地址
wkwVC.webUrlString = @"https://ceshi.yabolive.tv/fusi/allRank/index.html";
wkwVC.webUrlString = [FUSCacheDataShare shareStore].settingInitDataModel.fusiConfig.rankAddress;
[self.navigationController pushViewController:wkwVC animated:YES];
}
......
......@@ -506,10 +506,10 @@
NSString *lisenceFilePath = @"TTSDKLisenceFileForTest";
// NSInteger appId = 100903;
// NSString *appname = @"FlyFire";
// NSInteger appId = 980302338;
// NSString *appname = @"FusiClub";
// NSString *channel = [FUSDeviceHelper fus_getChannelId];
// NSString *bundleID = @"com.firelyx.ios";
// NSString *bundleID = @"com.fusi.meet.live.chat.video.among.friends";
// NSString *lisenceFilePath = @"TTSDKLisenceFile";
TTSDKConfiguration *configuration = [TTSDKConfiguration defaultConfigurationWithAppID:@(appId).description];
......
......@@ -765,11 +765,7 @@
{
FUSWKWebViewController *webViewCtrl = [[FUSWKWebViewController alloc] init];
NSString *lang = FUSLocalizationHelper.fus_currentLanguage.languageID;
if (lang.integerValue == 0 || lang.integerValue == 2) {
webViewCtrl.webUrlString = @"http://yabolive.com/archive/terms.html";
}else{
webViewCtrl.webUrlString = FUSCommonWebURLs.fus_agreement;
}
webViewCtrl.webUrlString = FUSCommonWebURLs.fus_agreement;
[self.navigationController pushViewController:webViewCtrl animated:YES];
}
......
......@@ -595,7 +595,6 @@ WKScriptMessageHandler
if (obj) {
//上传成功
fileM.state = WGUploadFileStateSuccess;
// NSString *testUrl = @"https://ss0.baidu.com/6ONWsjip0QIZ8tyhnq/it/u=210671490,1554278141&fm=173&app=25&f=JPEG?w=638&h=445&s=9C366790E4892B4F26293C810300A088";
[weakSelf successWithKey:fileM.key url:[FUSConfig.sharedInstanced.pathConfigs webImagePath:obj]];
}else{
//上传失败
......
......@@ -61,6 +61,11 @@
[self initView];
}
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
[self initBaseNavigation];
}
// 初始化UI
- (void)initView
{
......@@ -68,7 +73,7 @@
tapGesture.delegate = self;
[self.bgScrollView addGestureRecognizer:tapGesture];
// 初始化导航栏
self.title = [NSString stringWithFormat:@"%@%@",[NSString fus_localString:@"举报"], self.name?self.name:@""];
self.navigationItem.title = [NSString stringWithFormat:@"%@%@",[NSString fus_localString:@"举报"], self.name?self.name:@""];
[self fus_enableNavigationBackWithPopFunction:popViewController withAnimated:YES];
//v5.9取消
__weak typeof(self) weakSelf = self;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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