Skip to content

pidan / FuSiLive

Go to a project
Commit 9d4b33cf by ludi
Options

通知打开增加了一个判定登陆状态，修复一些bug

parent 68c066f7
Inline Side-by-side
Showing with 66 additions and 41 deletions
FuSiLive.xcodeproj/project.pbxproj
...@@ -672,7 +672,7 @@ ...@@ -672,7 +672,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements; CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 202506260012; CURRENT_PROJECT_VERSION = 202506260013;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6GG26BHUMC; DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_ON_DEMAND_RESOURCES = NO; ENABLE_ON_DEMAND_RESOURCES = NO;
...@@ -940,7 +940,7 @@ ...@@ -940,7 +940,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements; CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 202506260012; CURRENT_PROJECT_VERSION = 202506260013;
DEFINES_MODULE = YES; DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6GG26BHUMC; DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_ON_DEMAND_RESOURCES = NO; ENABLE_ON_DEMAND_RESOURCES = NO;
......
FuSiLive.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<key>NotificationService.xcscheme_^#shared#^_</key> <key>NotificationService.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>84</integer> <integer>85</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
FuSiLive/AppDelegate.m
...@@ -367,41 +367,45 @@ typedef NS_ENUM(NSInteger, FFOutsideJumpAPPType) { ...@@ -367,41 +367,45 @@ typedef NS_ENUM(NSInteger, FFOutsideJumpAPPType) {
} }
if ([NSDictionary isNull:transmissionContent] == NO) { if ([NSDictionary isNull:transmissionContent] == NO) {
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ MJWeakSelf
if (FUSCacheDataShare.shareStore.userDetailInfo.uid) { [FUSRouter.userRouter fus_loginSucceedListener:^{
// 准备上报的材料 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
NSMutableDictionary *reqDataJSON = [[NSMutableDictionary alloc] initWithDictionary:[transmissionContent copy]]; if (FUSCacheDataShare.shareStore.userDetailInfo.uid) {
reqDataJSON[@"data"][@"title"] = notificontent.title;
// 准备上报的材料
if ([reqDataJSON[@"data"][@"text"] stringValue].length <= 0) { NSMutableDictionary *reqDataJSON = [[NSMutableDictionary alloc] initWithDictionary:[transmissionContent copy]];
reqDataJSON[@"data"][@"text"] = notificontent.body; reqDataJSON[@"data"][@"title"] = notificontent.title;
}
if (isChatNotification == NO) {
// 个推打开的,增加一个media
NSArray *grinfo = content[@"_grinfo_"]; if ([reqDataJSON[@"data"][@"text"] stringValue].length <= 0) {
if (grinfo != nil && [grinfo isKindOfClass:[NSArray class]] && [grinfo count] > 0) { reqDataJSON[@"data"][@"text"] = notificontent.body;
NSDictionary *grinfoFirst = [grinfo firstObject];
NSString *grinfoUrl = [grinfoFirst[@"url"] stringValue];
reqDataJSON[@"data"][@"media"] = grinfoUrl;
} }
if (isChatNotification == NO) {
// 个推打开的,增加一个media
NSArray *grinfo = content[@"_grinfo_"];
if (grinfo != nil && [grinfo isKindOfClass:[NSArray class]] && [grinfo count] > 0) {
NSDictionary *grinfoFirst = [grinfo firstObject];
NSString *grinfoUrl = [grinfoFirst[@"url"] stringValue];
reqDataJSON[@"data"][@"media"] = grinfoUrl;
}
}
// 2. 转换为 JSON Data
NSError *jsonError;
NSData *jsonData = [NSJSONSerialization dataWithJSONObject:reqDataJSON
options:NSJSONWritingPrettyPrinted
error:&jsonError];
NSString *jsonString = @"";
if (jsonError == nil) {
jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
}
[FUSDataStatisticsManager fus_behaviorExternalCallLogWithReqType:5 reqEventType:-1 reqJson:jsonString];
[weakSelf startJumpIntoPage:transmissionContent logExtraJson:jsonString];
} }
// 2. 转换为 JSON Data });
NSError *jsonError; }];
NSData *jsonData = [NSJSONSerialization dataWithJSONObject:reqDataJSON
options:NSJSONWritingPrettyPrinted
error:&jsonError];
NSString *jsonString = @"";
if (jsonError == nil) {
jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
}
[FUSDataStatisticsManager fus_behaviorExternalCallLogWithReqType:5 reqEventType:-1 reqJson:jsonString];
[self startJumpIntoPage:transmissionContent logExtraJson:jsonString];
}
});
} }
} }
......
Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>FUSChatCenterBundle.xcscheme_^#shared#^_</key> <key>FUSChatCenterBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>83</integer> <integer>84</integer>
</dict> </dict>
<key>FUSChatCenterModule.xcscheme_^#shared#^_</key> <key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>88</integer> <integer>87</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>FUSShowRoomBundle.xcscheme_^#shared#^_</key> <key>FUSShowRoomBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>87</integer> <integer>88</integer>
</dict> </dict>
<key>FUSShowRoomModule.xcscheme_^#shared#^_</key> <key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>89</integer> <integer>86</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>FUSUserCenterModule.xcscheme_^#shared#^_</key> <key>FUSUserCenterModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>86</integer> <integer>83</integer>
</dict> </dict>
<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key> <key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>85</integer> <integer>89</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/BindAgentVC/FUSRegisteredBindAgentInfoAlertView.swift
...@@ -45,6 +45,9 @@ class FUSRegisteredBindAgentInfoAlertView: FUSBaseView { ...@@ -45,6 +45,9 @@ class FUSRegisteredBindAgentInfoAlertView: FUSBaseView {
self.backgroundColor = .fus_alertViewBackground() self.backgroundColor = .fus_alertViewBackground()
contentView.isUserInteractionEnabled = true contentView.isUserInteractionEnabled = true
contentView.backgroundColor = .white
contentView.layer.cornerRadius = 12
contentView.layer.masksToBounds = true
self.addSubview(contentView) self.addSubview(contentView)
contentView.snp.makeConstraints { make in contentView.snp.makeConstraints { make in
make.center.equalToSuperview() make.center.equalToSuperview()
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/FUSMyEmissaryQRCodeController.swift
...@@ -53,6 +53,8 @@ class FUSMyEmissaryQRCodeController: FUSBaseViewController { ...@@ -53,6 +53,8 @@ class FUSMyEmissaryQRCodeController: FUSBaseViewController {
make.centerX.equalToSuperview() make.centerX.equalToSuperview()
make.size.equalTo(CGSizeMake(260, 44)) make.size.equalTo(CGSizeMake(260, 44))
} }
fus_addRightBtns()
} }
func bindViewModel() { func bindViewModel() {
...@@ -71,5 +73,21 @@ class FUSMyEmissaryQRCodeController: FUSBaseViewController { ...@@ -71,5 +73,21 @@ class FUSMyEmissaryQRCodeController: FUSBaseViewController {
}).disposed(by: disposeBag) }).disposed(by: disposeBag)
} }
func fus_addRightBtns(){
let serviceBtn = UIButton(type: .custom)
serviceBtn.setImage(.com_ImageNamed("fus_common_navi_service_btn"), for: .normal)
serviceBtn.snp.makeConstraints { make in
make.size.equalTo(CGSizeMake(26, 26))
}
serviceBtn.rx.tap.subscribe(onNext: { _ in
// 点击客服
FUSRouter.chatRouter().fus_pushToServiceController(withAnimate: true)
})
.disposed(by: disposeBag)
self.fus_addRightNavigationButton(with: [serviceBtn])
}
} }
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