修复外部打开网页上报的问题。添加我的页面一个扫描

DevelopmentPods/FUSCommon/FUSCommon/Classes/Common/Other/FUSDataStatisticsManager.m

@@ -121,11 +121,12 @@
 
 /// App行为日志-外部调起
 + (void)fus_behaviorExternalCallLogWithReqType:(NSInteger)reqType reqEventType:(NSInteger)reqEventType reqJson:(NSString *)reqJson{
-    [FUSCommonHttpRequest fus_behaviorExternalCallLogWithReqType:reqType reqEventType:reqEventType reqJson:reqJson];
+    
+    [FUSCommonHttpRequest fus_behaviorExternalCallLogWithReqType:reqType reqEventType:reqEventType reqJson:(reqJson ?: @"").description];
 }
 /// App行为日志-加入直播间
 + (void)fus_behaviorJoinRoomLogWithReqType:(NSInteger)reqType reqEventType:(NSInteger)reqEventType extraInfo:(NSString *)extraInfo extraJson:(NSString *)extraJson roomId:(NSString *)roomId{
-    [FUSCommonHttpRequest fus_behaviorJoinRoomLogWithReqType:reqType reqEventType:reqEventType extraInfo:extraInfo extraJson:extraJson roomId:roomId];
+    [FUSCommonHttpRequest fus_behaviorJoinRoomLogWithReqType:reqType reqEventType:reqEventType extraInfo:(extraInfo ?: @"").description extraJson:(extraJson ?: @"").description roomId:roomId];
 }
 
 #pragma --mark 登录计时

DevelopmentPods/FUSCommon/FUSCommon/Classes/Common/Other/FUSSocialShareManager.m

@@ -132,7 +132,7 @@
     }
     else {
         NSURL *shareURL = [NSURL URLWithString:@"instagram://library?LocalIdentifier=latest"];
-        [[UIApplication sharedApplication] openURL:shareURL];
+        [[UIApplication sharedApplication] openURL:shareURL options:@{} completionHandler:nil];
     }
 }
 

FuSiLive.xcodeproj/project.pbxproj

@@ -415,10 +415,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-frameworks.sh\"\n";
@@ -432,10 +436,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FuSiLive/Pods-FuSiLive-resources.sh\"\n";

FuSiLive.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -12,7 +12,7 @@
 		<key>NotificationService.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>87</integer>
+			<integer>84</integer>
 		</dict>
 	</dict>
 </dict>

FuSiLive/AppDelegate.m

@@ -152,11 +152,11 @@ typedef NS_ENUM(NSInteger, FFOutsideJumpAPPType) {
 
 - (BOOL)application:(UIApplication *)app continueUserActivity:(nonnull NSUserActivity *)userActivity restorationHandler:(nonnull void (^)(NSArray<id<UIUserActivityRestoring>> * _Nullable))restorationHandler {
     
-    if ([userActivity.activityType isEqualToString:NSUserActivityTypeBrowsingWeb]) {
-        if (userActivity.webpageURL) {
-            [self fus_handlerUrlOpenAppActionWithURL:userActivity.webpageURL];
-        }
-    }
+//    if ([userActivity.activityType isEqualToString:NSUserActivityTypeBrowsingWeb]) {
+//        if (userActivity.webpageURL) {
+//            [self fus_handlerUrlOpenAppActionWithURL:userActivity.webpageURL];
+//        }
+//    }
     
     //其他代码
     if (userActivity.activityType == NSUserActivityTypeBrowsingWeb) {
@@ -194,7 +194,8 @@ typedef NS_ENUM(NSInteger, FFOutsideJumpAPPType) {
         [FUSDataStatisticsManager fus_behaviorExternalCallLogWithReqType:4 reqEventType:1 reqJson:@""];
     }
     
-    [self fus_handlerUrlOpenAppActionWithURL:url];
+//    [self fus_handlerUrlOpenAppActionWithURL:url];
+    [[FUSHandleEventHelper shared] fus_oc_fus_handlerUrlOpenAppActionWithUrl:url];
     
     return YES;
 }

FuSiLive/Info.plist

@@ -97,6 +97,8 @@
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
+		<string>instagram</string>
+		<string>threads</string>
 		<string>whatsApp</string>
 		<string>line</string>
 		<string>weixin</string>

Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,12 +7,12 @@
 		<key>FUSChatCenterBundle.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>84</integer>
+			<integer>83</integer>
 		</dict>
 		<key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>83</integer>
+			<integer>88</integer>
 		</dict>
 	</dict>
 </dict>

Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,12 +7,12 @@
 		<key>FUSShowRoomBundle.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>89</integer>
+			<integer>87</integer>
 		</dict>
 		<key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>86</integer>
+			<integer>89</integer>
 		</dict>
 	</dict>
 </dict>

Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,12 +7,12 @@
 		<key>FUSUserCenterModule.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>85</integer>
+			<integer>86</integer>
 		</dict>
 		<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>88</integer>
+			<integer>85</integer>
 		</dict>
 	</dict>
 </dict>

Modules/FUSUserCenterModule/FUSUserCenterModule/FUSUserCenterModuleBundle.bundle/FUSUserCenterAssets.xcassets/MyUserZone/zone_pop_tip_bg.imageset/Contents.json

@@ -7,11 +7,39 @@
     {
       "filename" : "zone_pop_tip_bg@2x.png",
       "idiom" : "universal",
+      "resizing" : {
+        "cap-insets" : {
+          "bottom" : 36,
+          "left" : 40,
+          "right" : 94,
+          "top" : 50
+        },
+        "center" : {
+          "height" : 1,
+          "mode" : "stretch",
+          "width" : 1
+        },
+        "mode" : "9-part"
+      },
       "scale" : "2x"
     },
     {
       "filename" : "zone_pop_tip_bg@3x.png",
       "idiom" : "universal",
+      "resizing" : {
+        "cap-insets" : {
+          "bottom" : 55,
+          "left" : 120,
+          "right" : 82,
+          "top" : 75
+        },
+        "center" : {
+          "height" : 1,
+          "mode" : "stretch",
+          "width" : 1
+        },
+        "mode" : "9-part"
+      },
       "scale" : "3x"
     }
   ],

Modules/FUSUserCenterModule/FUSUserCenterModule/FUSUserCenterModuleBundle.bundle/FUSUserCenterAssets.xcassets/inviteReward/inviteReward_navi_scan_icon.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "inviteReward_navi_scan_icon@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "inviteReward_navi_scan_icon@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/HomeMyPage/FUSMyView.m

@@ -47,6 +47,7 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
 
 @property (nonatomic, strong) UIView *naviView;
 @property (nonatomic, strong) UIButton *publishBtn;
+@property (nonatomic, strong) UIButton *scanBtn;
 @property (nonatomic, strong) FUSMyHeaderView *headerView;
 
 // 存储填写邀请码的信息，这里需要频繁改动
@@ -88,7 +89,18 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
 - (void)fus_viewWillShow{
     [super fus_viewWillShow];
     [self fus_updateMyZoneDataSourceWithType:ReadServerBegin];
-    self.zoneCanSendNewsFeedTipView = [FUSZoneCanSendNewsFeedTipView fus_showZoneCanSendNewsFeedTipViewIfNeededOnSuperView:self];
+    NSInteger buttonIndex = 0;
+    if ([FUSCacheDataShare shareStore].settingInitDataModel.showQrCodeEntrance == 1) {
+        buttonIndex += 1;
+        
+        self.scanBtn.hidden = NO;
+        [self.publishBtn mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.top.bottom.offset(0);
+            make.right.offset(-10 - 30 - 8);
+            make.width.equalTo(self.publishBtn.mas_height);
+        }];
+    }
+    self.zoneCanSendNewsFeedTipView = [FUSZoneCanSendNewsFeedTipView fus_showZoneCanSendNewsFeedTipViewIfNeededOnSuperView:self buttonIndex:buttonIndex];
 }
 
 - (void)fus_viewDidDisappear{
@@ -118,6 +130,17 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
     self.naviView = [[UIView alloc] initWithFrame:CGRectMake(0, UIView.fus_SafeTop, UIView.fus_screenW, UIView.fus_NavgationBarHeight)];
     [self addSubview:self.naviView];
     
+    self.scanBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    [self.scanBtn setImage:[FUSUserCenterBunble imageNamed:@"inviteReward_navi_scan_icon"] forState:UIControlStateNormal];
+    [self.naviView addSubview:self.scanBtn];
+    [self.scanBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.bottom.offset(0);
+        make.right.offset(-8);
+        make.width.equalTo(self.scanBtn.mas_height);
+    }];
+    [self.scanBtn addTarget:self action:@selector(scanBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
+    self.scanBtn.hidden = YES;
+    
     if ([[[NSUserDefaults standardUserDefaults] objectForKey:FUSUserUDKeys.fus_DYNAMIC_SEND_SHOW_SWITCH] boolValue]) {    
         self.publishBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [self.publishBtn setImage:[FUSUserCenterBunble imageNamed:@"fus_my_setting_navi_publish_icon"] forState:UIControlStateNormal];
@@ -647,6 +670,14 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
     }
 }
 
+-(void)scanBtnDidClicked:(UIButton *)btn{
+    [[FUSRouter userRouter] fus_showBindAgentPageWithNeedShowSkipBtn:NO success:^{
+        [[FUSRouter userRouter] fus_showBindAgentSuccessPopViewWithSuccess:^{
+            
+        }];
+    }];
+}
+
 #pragma mark getter and setter
 - (NSMutableArray *)allGroups{
     if (!_allGroups) {

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/InviteReward/FUSInviteRewardController.swift

@@ -203,7 +203,7 @@ public class FUSInviteRewardController: FUSBaseViewController {
         }).disposed(by: disposeBag)
         
         let scanBtn = UIButton(type: .custom)
-        scanBtn.setImage(FUSInviteRewardMoreMenuType.bindEmissary.fus_getIconImage(), for: .normal)
+        scanBtn.setImage(FUSUserCenterBunble.imageNamed("inviteReward_navi_scan_icon"), for: .normal)
         scanBtn.rx.tap.subscribe(onNext: {
             FUSRouter.userRouter().fus_showBindAgentPage(withNeedShowSkipBtn: false) {
                 FUSRouter.userRouter().fus_showBindAgentSuccessPopView {

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/View/FireFlyView/View/FUSZoneCanSendNewsFeedTipView.h

@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface FUSZoneCanSendNewsFeedTipView : UIView
 
 // 判断是否弹出提示，如果需要，则直接弹出
-+ (FUSZoneCanSendNewsFeedTipView *)fus_showZoneCanSendNewsFeedTipViewIfNeededOnSuperView:(UIView *)superView;
++ (FUSZoneCanSendNewsFeedTipView *)fus_showZoneCanSendNewsFeedTipViewIfNeededOnSuperView:(UIView *)superView buttonIndex:(NSInteger)index;
 
 @end
 

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/View/FireFlyView/View/FUSZoneCanSendNewsFeedTipView.m

@@ -18,16 +18,19 @@
 @property (strong, nonatomic) IBOutlet UILabel *tipLabel;
 @property (strong, nonatomic) IBOutlet UIImageView *tipBGImageView;
 
+@property (nonatomic, assign) NSInteger buttonIndex;
+
 @end
 
 @implementation FUSZoneCanSendNewsFeedTipView
 
-+ (FUSZoneCanSendNewsFeedTipView *)fus_showZoneCanSendNewsFeedTipViewIfNeededOnSuperView:(UIView *)superView {
++ (FUSZoneCanSendNewsFeedTipView *)fus_showZoneCanSendNewsFeedTipViewIfNeededOnSuperView:(UIView *)superView buttonIndex:(NSInteger)index{
     
     BOOL hasShown = [[[NSUserDefaults standardUserDefaults] objectForKey:kFUSZoneCanSendNewsFeedTipViewHasShownUDK] boolValue];
     if (!hasShown && !FUSConfig.sharedInstanced.devConfigs.appStatus) {
 
         FUSZoneCanSendNewsFeedTipView *tipView = [[FUSZoneCanSendNewsFeedTipView alloc] initWithFrame:UIView.fus_screenFrame];
+        tipView.buttonIndex = index;
         [superView addSubview:tipView];
         [[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:kFUSZoneCanSendNewsFeedTipViewHasShownUDK];
         return tipView;
@@ -69,7 +72,7 @@
         
         [self.customConstraints addObjectsFromArray:
          [NSLayoutConstraint constraintsWithVisualFormat:
-          @"H:|[view]|" options:0 metrics:nil views:views]];
+          [NSString stringWithFormat:@"H:|[view]-%ld-|",13 + _buttonIndex*30] options:0 metrics:nil views:views]];
         [self.customConstraints addObjectsFromArray:
          [NSLayoutConstraint constraintsWithVisualFormat:
           @"V:|[view]|" options:0 metrics:nil views:views]];
@@ -109,7 +112,7 @@
 
 - (void)customInit {
     
-    self.tipLabel.text = [NSString fus_localString:@"发帖文"];
+    self.tipLabel.text = [NSString fus_localString:@"发帖文213123123123123123213"];
     self.tipLabel.textColor = [UIColor fus_textColorRich];
     self.tipLabel.font = [UIFont fus_themeBoldFont:14];
     self.tipBGImageView.image = [FUSUserCenterBunble imageNamed:@"zone_pop_tip_bg"];