Commit 327434f4 by pierce

關注全部改成追蹤

parent 01329047
Showing with 83 additions and 93 deletions
...@@ -182,7 +182,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -182,7 +182,7 @@ NS_ASSUME_NONNULL_BEGIN
+(NSString *)fus_NOTIFICATION_REMIND_soundVideo; +(NSString *)fus_NOTIFICATION_REMIND_soundVideo;
/// 通知提醒(发布动态) /// 通知提醒(发布动态)
+(NSString *)fus_NOTIFICATION_REMIND_postDynamic; +(NSString *)fus_NOTIFICATION_REMIND_postDynamic;
/// 通知提醒(观众端直播间关注 /// 通知提醒(观众端直播间追踪
+(NSString *)fus_NOTIFICATION_REMIND_liveRoomFollowBottomAltertView; +(NSString *)fus_NOTIFICATION_REMIND_liveRoomFollowBottomAltertView;
/// 通知提醒(观众端直播间私聊的横幅) /// 通知提醒(观众端直播间私聊的横幅)
+(NSString *)fus_NOTIFICATION_REMIND_liveRoomMessageBannerView; +(NSString *)fus_NOTIFICATION_REMIND_liveRoomMessageBannerView;
......
...@@ -294,7 +294,7 @@ ...@@ -294,7 +294,7 @@
+(NSString *)fus_NOTIFICATION_REMIND_postDynamic{ +(NSString *)fus_NOTIFICATION_REMIND_postDynamic{
return @"fus_NOTIFICATION_REMIND_postDynamic"; return @"fus_NOTIFICATION_REMIND_postDynamic";
} }
/// 通知提醒(观众端直播间关注 /// 通知提醒(观众端直播间追踪
+(NSString *)fus_NOTIFICATION_REMIND_liveRoomFollowBottomAltertView{ +(NSString *)fus_NOTIFICATION_REMIND_liveRoomFollowBottomAltertView{
return @"fus_NOTIFICATION_REMIND_liveRoomFollowBottomAltertView"; return @"fus_NOTIFICATION_REMIND_liveRoomFollowBottomAltertView";
} }
......
...@@ -898,7 +898,7 @@ ...@@ -898,7 +898,7 @@
"跳过" = "跳過"; "跳过" = "跳過";
"很遗憾,您的年龄未满足Fusi的注册条件。但是还是非常感谢对我们的关注!" = "很遺憾,您的年龄未滿足Fusi的註冊條件。但是還是非常感謝對我們的關注!"; "很遗憾,您的年龄未满足Fusi的注册条件。但是还是非常感谢对我们的追踪!" = "很遺憾,您的年龄未滿足Fusi的註冊條件。但是還是非常感謝對我們的"追蹤"!";
"1分 (很差)" = "1分 (很差)"; "1分 (很差)" = "1分 (很差)";
...@@ -2214,9 +2214,9 @@ ...@@ -2214,9 +2214,9 @@
"回撩" = "回撩"; "回撩" = "回撩";
"回撩并关注" = "回撩並追蹤"; "回撩并追踪" = "回撩並追蹤";
"关注" = "追蹤"; "追踪" = "追蹤";
"您的手速太快了" = "您的手速太快了"; "您的手速太快了" = "您的手速太快了";
...@@ -2432,7 +2432,7 @@ ...@@ -2432,7 +2432,7 @@
"开启通知权限,分享內容收到评论和点赞露水将主动通知您" = "開啟通知權限,分享內容收到評論和點讚露水將主動通知您"; "开启通知权限,分享內容收到评论和点赞露水将主动通知您" = "開啟通知權限,分享內容收到評論和點讚露水將主動通知您";
"自己不能关注自己哦" = "自己不能關注自己哦"; "自己不能追踪自己哦" = "自己不能"追蹤"自己哦";
"您只需花30秒完成一下个人资料的补充,即可解锁私房价格的设定。" = "您只需花30秒完成一下個人資料的補充,即可解鎖私房價格的設定。"; "您只需花30秒完成一下个人资料的补充,即可解锁私房价格的设定。" = "您只需花30秒完成一下個人資料的補充,即可解鎖私房價格的設定。";
...@@ -2532,7 +2532,7 @@ ...@@ -2532,7 +2532,7 @@
"个人资料正在审核中,请耐心等候" = "個人資料正在審覈中,請耐心等候"; "个人资料正在审核中,请耐心等候" = "個人資料正在審覈中,請耐心等候";
"你关注的主播" = "你追蹤的主播"; "你追踪的主播" = "你追蹤的主播";
"亲密私信" = "親密私信"; "亲密私信" = "親密私信";
...@@ -2554,7 +2554,7 @@ ...@@ -2554,7 +2554,7 @@
"每天固定时间提醒您完成进入签到" = "每天固定時間提醒您完成進入簽到"; "每天固定时间提醒您完成进入签到" = "每天固定時間提醒您完成進入簽到";
"已关注的主播开播时的通知" = "已追蹤的主播開播時的通知"; "已追踪的主播开播时的通知" = "已追蹤的主播開播時的通知";
"通知权限未开启,您将无法收到讯息通知" = "通知權限未開啓,您將無法收到訊息通知"; "通知权限未开启,您将无法收到讯息通知" = "通知權限未開啓,您將無法收到訊息通知";
......
...@@ -898,7 +898,7 @@ ...@@ -898,7 +898,7 @@
"跳过" = "跳過"; "跳过" = "跳過";
"很遗憾,您的年龄未满足Fusi的注册条件。但是还是非常感谢对我们的关注!" = "很遺憾,您的年龄未滿足Fusi的註冊條件。但是還是非常感謝對我們的關注!"; "很遗憾,您的年龄未满足Fusi的注册条件。但是还是非常感谢对我们的追踪!" = "很遺憾,您的年龄未滿足Fusi的註冊條件。但是還是非常感謝對我們的"追蹤"!";
"1分 (很差)" = "1分 (很差)"; "1分 (很差)" = "1分 (很差)";
...@@ -2214,9 +2214,9 @@ ...@@ -2214,9 +2214,9 @@
"回撩" = "回撩"; "回撩" = "回撩";
"回撩并关注" = "回撩並追蹤"; "回撩并追踪" = "回撩並追蹤";
"关注" = "追蹤"; "追踪" = "追蹤";
"您的手速太快了" = "您的手速太快了"; "您的手速太快了" = "您的手速太快了";
...@@ -2432,7 +2432,7 @@ ...@@ -2432,7 +2432,7 @@
"开启通知权限,分享內容收到评论和点赞露水将主动通知您" = "開啟通知權限,分享內容收到評論和點讚露水將主動通知您"; "开启通知权限,分享內容收到评论和点赞露水将主动通知您" = "開啟通知權限,分享內容收到評論和點讚露水將主動通知您";
"自己不能关注自己哦" = "自己不能關注自己哦"; "自己不能追踪自己哦" = "自己不能"追蹤"自己哦";
"您只需花30秒完成一下个人资料的补充,即可解锁私房价格的设定。" = "您只需花30秒完成一下個人資料的補充,即可解鎖私房價格的設定。"; "您只需花30秒完成一下个人资料的补充,即可解锁私房价格的设定。" = "您只需花30秒完成一下個人資料的補充,即可解鎖私房價格的設定。";
...@@ -2532,7 +2532,7 @@ ...@@ -2532,7 +2532,7 @@
"个人资料正在审核中,请耐心等候" = "個人資料正在審覈中,請耐心等候"; "个人资料正在审核中,请耐心等候" = "個人資料正在審覈中,請耐心等候";
"你关注的主播" = "你追蹤的主播"; "你追踪的主播" = "你追蹤的主播";
"亲密私信" = "親密私信"; "亲密私信" = "親密私信";
...@@ -2554,7 +2554,7 @@ ...@@ -2554,7 +2554,7 @@
"每天固定时间提醒您完成进入签到" = "每天固定時間提醒您完成進入簽到"; "每天固定时间提醒您完成进入签到" = "每天固定時間提醒您完成進入簽到";
"已关注的主播开播时的通知" = "已追蹤的主播開播時的通知"; "已追踪的主播开播时的通知" = "已追蹤的主播開播時的通知";
"通知权限未开启,您将无法收到讯息通知" = "通知權限未開啓,您將無法收到訊息通知"; "通知权限未开启,您将无法收到讯息通知" = "通知權限未開啓,您將無法收到訊息通知";
......
...@@ -898,7 +898,7 @@ ...@@ -898,7 +898,7 @@
"跳过" = "Skip"; "跳过" = "Skip";
"很遗憾,您的年龄未满足Fusi的注册条件。但是还是非常感谢对我们的关注!" = "Unfortunately, your age does not meet the registration requirements for Fusi. But thank you very much for paying attention to us!"; "很遗憾,您的年龄未满足Fusi的注册条件。但是还是非常感谢对我们的追踪!" = "Unfortunately, your age does not meet the registration requirements for Fusi. But thank you very much for paying attention to us!";
"1分 (很差)" = "1 point (very bad)"; "1分 (很差)" = "1 point (very bad)";
...@@ -2214,9 +2214,9 @@ ...@@ -2214,9 +2214,9 @@
"回撩" = "flirt back"; "回撩" = "flirt back";
"回撩并关注" = "Flirt-back and follow"; "回撩并追踪" = "Flirt-back and follow";
"关注" = "Follow"; "追踪" = "Follow";
"您的手速太快了" = "Your operations are too frequent"; "您的手速太快了" = "Your operations are too frequent";
...@@ -2432,7 +2432,7 @@ ...@@ -2432,7 +2432,7 @@
"开启通知权限,分享內容收到评论和点赞露水将主动通知您" = "Turn on the notification permission and you will be notified when comments and likes are received on the shared content."; "开启通知权限,分享內容收到评论和点赞露水将主动通知您" = "Turn on the notification permission and you will be notified when comments and likes are received on the shared content.";
"自己不能关注自己哦" = "Can't follow yourself"; "自己不能追踪自己哦" = "Can't follow yourself";
"您只需花30秒完成一下个人资料的补充,即可解锁私房价格的设定。" = "You only need to spend 30 seconds to complete the supplement of your personal information to unlock the private call price settings."; "您只需花30秒完成一下个人资料的补充,即可解锁私房价格的设定。" = "You only need to spend 30 seconds to complete the supplement of your personal information to unlock the private call price settings.";
...@@ -2532,7 +2532,7 @@ ...@@ -2532,7 +2532,7 @@
"个人资料正在审核中,请耐心等候" = "Personal information is being reviewed, please wait patiently."; "个人资料正在审核中,请耐心等候" = "Personal information is being reviewed, please wait patiently.";
"你关注的主播" = "The broadcasters you follow"; "你追踪的主播" = "The broadcasters you follow";
"亲密私信" = "Intimate private message"; "亲密私信" = "Intimate private message";
...@@ -2554,7 +2554,7 @@ ...@@ -2554,7 +2554,7 @@
"每天固定时间提醒您完成进入签到" = "Remind you to check in everyday at a fixed time"; "每天固定时间提醒您完成进入签到" = "Remind you to check in everyday at a fixed time";
"已关注的主播开播时的通知" = "Notification of followed broadcaster starts broadcast"; "已追踪的主播开播时的通知" = "Notification of followed broadcaster starts broadcast";
"通知权限未开启,您将无法收到讯息通知" = "Notification permission is not turned on, you will not be able to receive message notifications"; "通知权限未开启,您将无法收到讯息通知" = "Notification permission is not turned on, you will not be able to receive message notifications";
......
...@@ -890,7 +890,7 @@ ...@@ -890,7 +890,7 @@
"跳过" = "スキップ"; "跳过" = "スキップ";
"很遗憾,您的年龄未满足Fusi的注册条件。但是还是非常感谢对我们的关注!" = "残念ながら、あなたの年齢はFusiの登録要件を満たしていません。しかし、私たちに注意を払っていただき、ありがとうございます!"; "很遗憾,您的年龄未满足Fusi的注册条件。但是还是非常感谢对我们的追踪!" = "残念ながら、あなたの年齢はFusiの登録要件を満たしていません。しかし、私たちに注意を払っていただき、ありがとうございます!";
"1分 (很差)" = "1点(非常に悪い)"; "1分 (很差)" = "1点(非常に悪い)";
...@@ -2192,9 +2192,9 @@ ...@@ -2192,9 +2192,9 @@
"回撩" = "いちゃつく"; "回撩" = "いちゃつく";
"回撩并关注" = "返事してフォローする"; "回撩并追踪" = "返事してフォローする";
"关注" = "フォロー"; "追踪" = "フォロー";
"您的手速太快了" = "操作が頻繁すぎる"; "您的手速太快了" = "操作が頻繁すぎる";
...@@ -2410,7 +2410,7 @@ ...@@ -2410,7 +2410,7 @@
"开启通知权限,分享內容收到评论和点赞露水将主动通知您" = "通知の許可をオンにすると、共有コンテンツにコメントやいいねが届いたときに通知されます。"; "开启通知权限,分享內容收到评论和点赞露水将主动通知您" = "通知の許可をオンにすると、共有コンテンツにコメントやいいねが届いたときに通知されます。";
"自己不能关注自己哦" = "自分自身をフォローすることはできません"; "自己不能追踪自己哦" = "自分自身をフォローすることはできません";
"您只需花30秒完成一下个人资料的补充,即可解锁私房价格的设定。" = "プライベート通話の価格設定を解除するには、個人情報の補足を完了するのに30秒しかかかりません。"; "您只需花30秒完成一下个人资料的补充,即可解锁私房价格的设定。" = "プライベート通話の価格設定を解除するには、個人情報の補足を完了するのに30秒しかかかりません。";
...@@ -2510,7 +2510,7 @@ ...@@ -2510,7 +2510,7 @@
"个人资料正在审核中,请耐心等候" = "個人情報を確認中です。しばらくお待ちください。"; "个人资料正在审核中,请耐心等候" = "個人情報を確認中です。しばらくお待ちください。";
"你关注的主播" = "あなたがフォローしている放送局"; "你追踪的主播" = "あなたがフォローしている放送局";
"亲密私信" = "親密なプライベートメッセージ"; "亲密私信" = "親密なプライベートメッセージ";
...@@ -2532,7 +2532,7 @@ ...@@ -2532,7 +2532,7 @@
"每天固定时间提醒您完成进入签到" = "毎日決まった時間にチェックインするようにリマインドする"; "每天固定时间提醒您完成进入签到" = "毎日決まった時間にチェックインするようにリマインドする";
"已关注的主播开播时的通知" = "フォローしている配信者の配信開始通知"; "已追踪的主播开播时的通知" = "フォローしている配信者の配信開始通知";
"通知权限未开启,您将无法收到讯息通知" = "通知許可がオンになっていないため、メッセージ通知を受け取ることができません"; "通知权限未开启,您将无法收到讯息通知" = "通知許可がオンになっていないため、メッセージ通知を受け取ることができません";
......
...@@ -888,7 +888,7 @@ ...@@ -888,7 +888,7 @@
"跳过" = "ข้าม"; "跳过" = "ข้าม";
"很遗憾,您的年龄未满足Fusi的注册条件。但是还是非常感谢对我们的关注!" = "น่าเสียดายที่อายุของคุณไม่ตรงตามข้อกำหนดในการลงทะเบียนสำหรับ Fusi แต่ขอบคุณมากที่ให้ความสนใจเรา!"; "很遗憾,您的年龄未满足Fusi的注册条件。但是还是非常感谢对我们的追踪!" = "น่าเสียดายที่อายุของคุณไม่ตรงตามข้อกำหนดในการลงทะเบียนสำหรับ Fusi แต่ขอบคุณมากที่ให้ความสนใจเรา!";
"1分 (很差)" = "1 คะแนน (แย่มาก)"; "1分 (很差)" = "1 คะแนน (แย่มาก)";
...@@ -2186,9 +2186,9 @@ ...@@ -2186,9 +2186,9 @@
"回撩" = "จีบกลับ"; "回撩" = "จีบกลับ";
"回撩并关注" = "จีบกลับและติดตาม"; "回撩并追踪" = "จีบกลับและติดตาม";
"关注" = "ติดตาม"; "追踪" = "ติดตาม";
"您的手速太快了" = "การดำเนินการของคุณบ่อยเกินไป"; "您的手速太快了" = "การดำเนินการของคุณบ่อยเกินไป";
...@@ -2404,7 +2404,7 @@ ...@@ -2404,7 +2404,7 @@
"开启通知权限,分享內容收到评论和点赞露水将主动通知您" = "เปิดการอนุญาตการแจ้งเตือนแล้วคุณจะได้รับแจ้งเมื่อได้รับความคิดเห็นและการถูกใจในเนื้อหาที่แชร์"; "开启通知权限,分享內容收到评论和点赞露水将主动通知您" = "เปิดการอนุญาตการแจ้งเตือนแล้วคุณจะได้รับแจ้งเมื่อได้รับความคิดเห็นและการถูกใจในเนื้อหาที่แชร์";
"自己不能关注自己哦" = "ไม่สามารถติดตามตนเองได้"; "自己不能追踪自己哦" = "ไม่สามารถติดตามตนเองได้";
"您只需花30秒完成一下个人资料的补充,即可解锁私房价格的设定。" = "คุณต้องใช้เวลาเพียง 30 วินาทีในการกรอกข้อมูลส่วนตัวให้ครบถ้วนเพื่อปลดล็อกการตั้งค่าราคาการโทรส่วนตัว"; "您只需花30秒完成一下个人资料的补充,即可解锁私房价格的设定。" = "คุณต้องใช้เวลาเพียง 30 วินาทีในการกรอกข้อมูลส่วนตัวให้ครบถ้วนเพื่อปลดล็อกการตั้งค่าราคาการโทรส่วนตัว";
...@@ -2504,7 +2504,7 @@ ...@@ -2504,7 +2504,7 @@
"个人资料正在审核中,请耐心等候" = "กำลังตรวจสอบข้อมูลส่วนตัว โปรดรอสักครู่"; "个人资料正在审核中,请耐心等候" = "กำลังตรวจสอบข้อมูลส่วนตัว โปรดรอสักครู่";
"你关注的主播" = "ผู้แพร่ภาพกระจายเสียงที่คุณติดตาม"; "你追踪的主播" = "ผู้แพร่ภาพกระจายเสียงที่คุณติดตาม";
"亲密私信" = "ข้อความส่วนตัวที่ใกล้ชิด"; "亲密私信" = "ข้อความส่วนตัวที่ใกล้ชิด";
...@@ -2526,7 +2526,7 @@ ...@@ -2526,7 +2526,7 @@
"每天固定时间提醒您完成进入签到" = "เตือนให้คุณเช็คอินทุกวันตามเวลาที่กำหนด"; "每天固定时间提醒您完成进入签到" = "เตือนให้คุณเช็คอินทุกวันตามเวลาที่กำหนด";
"已关注的主播开播时的通知" = "การแจ้งเตือนของผู้ประกาศที่ติดตามเริ่มออกอากาศ"; "已追踪的主播开播时的通知" = "การแจ้งเตือนของผู้ประกาศที่ติดตามเริ่มออกอากาศ";
"通知权限未开启,您将无法收到讯息通知" = "การอนุญาตการแจ้งเตือนไม่ได้เปิดอยู่ คุณจะไม่สามารถรับการแจ้งเตือนข้อความได้"; "通知权限未开启,您将无法收到讯息通知" = "การอนุญาตการแจ้งเตือนไม่ได้เปิดอยู่ คุณจะไม่สามารถรับการแจ้งเตือนข้อความได้";
......
...@@ -890,7 +890,7 @@ ...@@ -890,7 +890,7 @@
"跳过" = "Bỏ qua"; "跳过" = "Bỏ qua";
"很遗憾,您的年龄未满足Fusi的注册条件。但是还是非常感谢对我们的关注!" = "Thật không may, độ tuổi của bạn không đáp ứng các yêu cầu đăng ký Fusi. Nhưng cảm ơn bạn rất nhiều vì đã chú ý đến chúng tôi!"; "很遗憾,您的年龄未满足Fusi的注册条件。但是还是非常感谢对我们的追踪!" = "Thật không may, độ tuổi của bạn không đáp ứng các yêu cầu đăng ký Fusi. Nhưng cảm ơn bạn rất nhiều vì đã chú ý đến chúng tôi!";
"1分 (很差)" = "1 điểm (quá kém)"; "1分 (很差)" = "1 điểm (quá kém)";
...@@ -2192,9 +2192,9 @@ ...@@ -2192,9 +2192,9 @@
"回撩" = "tán tỉnh lại"; "回撩" = "tán tỉnh lại";
"回撩并关注" = "Tán tỉnh và theo dõi"; "回撩并追踪" = "Tán tỉnh và theo dõi";
"关注" = "Theo dõi"; "追踪" = "Theo dõi";
"您的手速太快了" = "Hoạt động của bạn quá thường xuyên"; "您的手速太快了" = "Hoạt động của bạn quá thường xuyên";
...@@ -2410,7 +2410,7 @@ ...@@ -2410,7 +2410,7 @@
"开启通知权限,分享內容收到评论和点赞露水将主动通知您" = "Bật quyền thông báo và bạn sẽ được thông báo khi nhận được bình luận và lượt thích về nội dung được chia sẻ."; "开启通知权限,分享內容收到评论和点赞露水将主动通知您" = "Bật quyền thông báo và bạn sẽ được thông báo khi nhận được bình luận và lượt thích về nội dung được chia sẻ.";
"自己不能关注自己哦" = "Không thể theo dõi chính mình"; "自己不能追踪自己哦" = "Không thể theo dõi chính mình";
"您只需花30秒完成一下个人资料的补充,即可解锁私房价格的设定。" = "Bạn chỉ cần dành 30 giây để hoàn tất việc bổ sung thông tin cá nhân của mình để mở khóa cài đặt giá cuộc gọi riêng."; "您只需花30秒完成一下个人资料的补充,即可解锁私房价格的设定。" = "Bạn chỉ cần dành 30 giây để hoàn tất việc bổ sung thông tin cá nhân của mình để mở khóa cài đặt giá cuộc gọi riêng.";
...@@ -2510,7 +2510,7 @@ ...@@ -2510,7 +2510,7 @@
"个人资料正在审核中,请耐心等候" = "Thông tin cá nhân đang được xem xét, vui lòng kiên nhẫn chờ đợi."; "个人资料正在审核中,请耐心等候" = "Thông tin cá nhân đang được xem xét, vui lòng kiên nhẫn chờ đợi.";
"你关注的主播" = "Các đài truyền hình bạn theo dõi"; "你追踪的主播" = "Các đài truyền hình bạn theo dõi";
"亲密私信" = "Tin nhắn riêng thân mật"; "亲密私信" = "Tin nhắn riêng thân mật";
...@@ -2532,7 +2532,7 @@ ...@@ -2532,7 +2532,7 @@
"每天固定时间提醒您完成进入签到" = "Nhắc nhở bạn kiểm tra hàng ngày vào một thời điểm cố định"; "每天固定时间提醒您完成进入签到" = "Nhắc nhở bạn kiểm tra hàng ngày vào một thời điểm cố định";
"已关注的主播开播时的通知" = "Thông báo của đài truyền hình được theo dõi bắt đầu phát sóng"; "已追踪的主播开播时的通知" = "Thông báo của đài truyền hình được theo dõi bắt đầu phát sóng";
"通知权限未开启,您将无法收到讯息通知" = "Quyền thông báo chưa được bật, bạn sẽ không thể nhận được thông báo tin nhắn"; "通知权限未开启,您将无法收到讯息通知" = "Quyền thông báo chưa được bật, bạn sẽ không thể nhận được thông báo tin nhắn";
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface FUSCallOrderInfoModel : FUSBaseModel @interface FUSCallOrderInfoModel : FUSBaseModel
/// 是否关注被叫人(0:否、1:是) /// 是否追踪被叫人(0:否、1:是)
@property (nonatomic, assign) NSInteger follow; @property (nonatomic, assign) NSInteger follow;
/// 通话订单ID /// 通话订单ID
@property (nonatomic, copy) NSString *callId; @property (nonatomic, copy) NSString *callId;
......
...@@ -59,7 +59,7 @@ typedef NS_OPTIONS(NSUInteger, FUSChatUserOnceRecordItem) { ...@@ -59,7 +59,7 @@ typedef NS_OPTIONS(NSUInteger, FUSChatUserOnceRecordItem) {
/// 是否拉黑 /// 是否拉黑
@property (nonatomic, assign) BOOL friendIsBlack; @property (nonatomic, assign) BOOL friendIsBlack;
/// 是否已关注该用户 /// 是否已追踪该用户
@property (nonatomic, assign) BOOL isFollow; @property (nonatomic, assign) BOOL isFollow;
// 过期时间(单位:小时) // 过期时间(单位:小时)
......
...@@ -201,7 +201,7 @@ import SJAttributesStringMaker ...@@ -201,7 +201,7 @@ import SJAttributesStringMaker
self.callOrderId.accept(model.callId) self.callOrderId.accept(model.callId)
self.timeIncomeTotal.accept(model.callIncome) self.timeIncomeTotal.accept(model.callIncome)
// 更新关注数据 // 更新追踪数据
if let friendInfo = FUSZhaiXinDBOperate.fus_selectZhaiXinChatUserInfo(withUid: fid) { if let friendInfo = FUSZhaiXinDBOperate.fus_selectZhaiXinChatUserInfo(withUid: fid) {
friendInfo.isFollow = model.follow == 0 ? false : true friendInfo.isFollow = model.follow == 0 ? false : true
FUSZhaiXinDBOperate.fus_writeChatUserInfoIntoTable(with: friendInfo) FUSZhaiXinDBOperate.fus_writeChatUserInfoIntoTable(with: friendInfo)
...@@ -1500,7 +1500,7 @@ extension FUSChatCallHelper { ...@@ -1500,7 +1500,7 @@ extension FUSChatCallHelper {
} }
} }
/// 单独拉取接口获取当前用户的关注状态 /// 单独拉取接口获取当前用户的追踪状态
func fus_getCurrentUserFollowState() { func fus_getCurrentUserFollowState() {
guard let fid = callOtherInfo.value?.uid else { return } guard let fid = callOtherInfo.value?.uid else { return }
let parm = ["fid": fid, let parm = ["fid": fid,
......
...@@ -525,7 +525,7 @@ class FUSChatCallConnectingView: FUSBaseView { ...@@ -525,7 +525,7 @@ class FUSChatCallConnectingView: FUSBaseView {
self?.fus_showUserInfoCard() self?.fus_showUserInfoCard()
})) }))
// 关注按钮 // 追踪按钮
portraitFollowBtn.rx.tap.subscribe(onNext: { _ in portraitFollowBtn.rx.tap.subscribe(onNext: { _ in
guard let fid = FUSChatCallHelper.shared.callOtherInfo.value?.uid, guard let fid = FUSChatCallHelper.shared.callOtherInfo.value?.uid,
......
...@@ -54,7 +54,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -54,7 +54,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, strong) NSString *uid; @property (nonatomic, strong) NSString *uid;
/// 用户头像 /// 用户头像
@property (nonatomic, strong) NSString *face; @property (nonatomic, strong) NSString *face;
/// 本场新增关注 /// 本场新增追踪
@property (nonatomic, assign) NSInteger newLikeTotal; @property (nonatomic, assign) NSInteger newLikeTotal;
/// 本场人气值 /// 本场人气值
@property (nonatomic, assign) NSInteger popularTotal; @property (nonatomic, assign) NSInteger popularTotal;
...@@ -78,7 +78,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -78,7 +78,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, assign) NSInteger bondsRank; @property (nonatomic, assign) NSInteger bondsRank;
/// 本场送礼人数今日排名 /// 本场送礼人数今日排名
@property (nonatomic, assign) NSInteger giveGiftRank; @property (nonatomic, assign) NSInteger giveGiftRank;
/// 本场新增关注今日排名 /// 本场新增追踪今日排名
@property (nonatomic, assign) NSInteger newLikeRank; @property (nonatomic, assign) NSInteger newLikeRank;
/// 本场人气指数今日排名 /// 本场人气指数今日排名
@property (nonatomic, assign) NSInteger popularRank; @property (nonatomic, assign) NSInteger popularRank;
......
...@@ -22,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -22,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, assign) NSInteger giftPrice; @property (nonatomic, assign) NSInteger giftPrice;
/// 是否默认选择 /// 是否默认选择
@property (nonatomic, assign) BOOL selected; @property (nonatomic, assign) BOOL selected;
/// 内部属性,用于区分礼物的类型,用于卡片展示,-1=关注,0=礼物 /// 内部属性,用于区分礼物的类型,用于卡片展示,-1=追踪,0=礼物
@property (nonatomic, assign) NSInteger fus_modelType; @property (nonatomic, assign) NSInteger fus_modelType;
...@@ -30,7 +30,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -30,7 +30,7 @@ NS_ASSUME_NONNULL_BEGIN
@interface FUSPatAudiencePatDataModel : FUSBaseModel @interface FUSPatAudiencePatDataModel : FUSBaseModel
///关注(0:关闭、1:显示) ///追踪(0:关闭、1:显示)
@property (nonatomic, assign) NSInteger follow; @property (nonatomic, assign) NSInteger follow;
/// 普通礼物列表 /// 普通礼物列表
@property (nonatomic, strong) NSMutableArray<FUSPatAudienceGiftModel *> *giftList; @property (nonatomic, strong) NSMutableArray<FUSPatAudienceGiftModel *> *giftList;
......
...@@ -779,7 +779,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -779,7 +779,7 @@ NS_ASSUME_NONNULL_BEGIN
/// 回撩 /// 回撩
/// @param roomId 房间id /// @param roomId 房间id
/// @param type 类型(1:关注、2:送礼) /// @param type 类型(1:追踪、2:送礼)
/// @param gid 礼物ID(type=2必传) /// @param gid 礼物ID(type=2必传)
+(void)fus_livePatReplyWithRoomId:(NSString *)roomId +(void)fus_livePatReplyWithRoomId:(NSString *)roomId
type:(NSInteger)type type:(NSInteger)type
...@@ -906,7 +906,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -906,7 +906,7 @@ NS_ASSUME_NONNULL_BEGIN
succeed:(void (^)(NSArray<FUSFansGroupUserModel *> *modelList))succeed succeed:(void (^)(NSArray<FUSFansGroupUserModel *> *modelList))succeed
failure:(void (^)(NSString *msg, NSInteger code))failure; failure:(void (^)(NSString *msg, NSInteger code))failure;
/// 本场直播新关注列表 /// 本场直播新追踪列表
/// @param roomId 房间id /// @param roomId 房间id
/// @param channelId 直播场次ID /// @param channelId 直播场次ID
/// @param page 页码 /// @param page 页码
......
...@@ -2487,7 +2487,7 @@ ...@@ -2487,7 +2487,7 @@
if (failure) failure(dataDict[@"msg"],code); if (failure) failure(dataDict[@"msg"],code);
}]; }];
} }
/// 本场直播新关注列表 /// 本场直播新追踪列表
+ (void)fus_requestNewFansListWithRoomid:(NSString *)roomId channelId:(NSString *)channelId page:(NSInteger)page succeed:(void (^)(NSArray<FUSFansGroupUserModel *> *))succeed failure:(void (^)(NSString *, NSInteger))failure{ + (void)fus_requestNewFansListWithRoomid:(NSString *)roomId channelId:(NSString *)channelId page:(NSInteger)page succeed:(void (^)(NSArray<FUSFansGroupUserModel *> *))succeed failure:(void (^)(NSString *, NSInteger))failure{
NSDictionary *parm = @{@"roomId": roomId, NSDictionary *parm = @{@"roomId": roomId,
@"channelId": channelId, @"channelId": channelId,
......
...@@ -133,7 +133,7 @@ class FUSVideoEndV2CustomCell: UITableViewCell { ...@@ -133,7 +133,7 @@ class FUSVideoEndV2CustomCell: UITableViewCell {
case .newFollow: case .newFollow:
self.titleLabel.text = .fus_versionLocalString("新增关注") self.titleLabel.text = .fus_versionLocalString("新增追踪")
self.scoreLabel.text = (model.newLikeTotal > 0 ? "+" : "") + "\(model.newLikeTotal)" self.scoreLabel.text = (model.newLikeTotal > 0 ? "+" : "") + "\(model.newLikeTotal)"
self.rankView.isHidden = false self.rankView.isHidden = false
self.rankView.rankType = .common self.rankView.rankType = .common
......
...@@ -249,7 +249,7 @@ class FUSVideoEndV2DetailAlertView: FUSBaseView { ...@@ -249,7 +249,7 @@ class FUSVideoEndV2DetailAlertView: FUSBaseView {
case .giftSenderNum: case .giftSenderNum:
self.titleLabel.text = .fus_versionLocalString("萤火贡献榜") self.titleLabel.text = .fus_versionLocalString("萤火贡献榜")
case .newFollow: case .newFollow:
self.titleLabel.text = .fus_versionLocalString("新增关注") self.titleLabel.text = .fus_versionLocalString("新增追踪")
case .fansMember: case .fansMember:
self.titleLabel.text = .fus_versionLocalString("珍爱团新成员") self.titleLabel.text = .fus_versionLocalString("珍爱团新成员")
case .fansTaskRank: case .fansTaskRank:
......
...@@ -14,7 +14,7 @@ import UIKit ...@@ -14,7 +14,7 @@ import UIKit
case allPopularity case allPopularity
/// 送礼人数 /// 送礼人数
case giftSenderNum case giftSenderNum
/// 新增关注 /// 新增追踪
case newFollow case newFollow
/// 露水 /// 露水
case lushui case lushui
......
...@@ -2553,14 +2553,6 @@ static FUSLiveGiftView *giftView = nil; ...@@ -2553,14 +2553,6 @@ static FUSLiveGiftView *giftView = nil;
if (!weakSelf.diamondAlertTimer) { if (!weakSelf.diamondAlertTimer) {
weakSelf.diamondAlertTimer = [NSTimer scheduledTimerWithTimeInterval:.2 target:[YYWeakProxy proxyWithTarget:self] selector:@selector(showAlertViewWithDelay:) userInfo:@{@"msg":msg, @"code":@(code), @"btnArr":btnArr} repeats:NO]; weakSelf.diamondAlertTimer = [NSTimer scheduledTimerWithTimeInterval:.2 target:[YYWeakProxy proxyWithTarget:self] selector:@selector(showAlertViewWithDelay:) userInfo:@{@"msg":msg, @"code":@(code), @"btnArr":btnArr} repeats:NO];
} }
}else if (code == -101){
// 银币不足
btnArr = @[/*[NSString fus_localString:@"赚取银币"],*/[NSString fus_localString:@"兑换宝石"], [NSString fus_localString:@"取消"]];
msg = [NSString fus_localString:@"银币不足"];
if (!weakSelf.coinAlertTimer) {
weakSelf.coinAlertTimer = [NSTimer scheduledTimerWithTimeInterval:.2 target:[YYWeakProxy proxyWithTarget:self] selector:@selector(showAlertViewWithDelay:) userInfo:@{@"msg":msg, @"code":@(code), @"btnArr":btnArr} repeats:NO];
}
} else if (code == -201) { } else if (code == -201) {
if (weakSelf.isUpdating) { if (weakSelf.isUpdating) {
[FUSDialogView fus_showDialog:[NSString fus_localString:@"正在更新礼物..."]]; [FUSDialogView fus_showDialog:[NSString fus_localString:@"正在更新礼物..."]];
......
...@@ -385,7 +385,7 @@ typedef NS_ENUM(NSInteger, FUSFunctionMode) { ...@@ -385,7 +385,7 @@ typedef NS_ENUM(NSInteger, FUSFunctionMode) {
/// @param url 动画图片url /// @param url 动画图片url
- (void)fus_startHeadViewReceiveGiftAnimWithImgUrl:(NSString *)url; - (void)fus_startHeadViewReceiveGiftAnimWithImgUrl:(NSString *)url;
/// 显示点击关注的动画,给外面某些比如一个接口就是送礼并且自动关注的动作调用 /// 显示点击追踪的动画,给外面某些比如一个接口就是送礼并且自动追踪的动作调用
-(void)fus_showClickLikeAnimateWithIsFollow:(BOOL)isFollow; -(void)fus_showClickLikeAnimateWithIsFollow:(BOOL)isFollow;
/// 接收富豪等级变化通知 /// 接收富豪等级变化通知
......
...@@ -5193,7 +5193,7 @@ UIGestureRecognizerDelegate ...@@ -5193,7 +5193,7 @@ UIGestureRecognizerDelegate
[self.headView fus_startHeadViewReceiveGiftAnimWithImgUrl:url]; [self.headView fus_startHeadViewReceiveGiftAnimWithImgUrl:url];
} }
/// 显示点击关注的动画,给外面某些比如一个接口就是送礼并且自动关注的动作调用 /// 显示点击追踪的动画,给外面某些比如一个接口就是送礼并且自动追踪的动作调用
- (void)fus_showClickLikeAnimateWithIsFollow:(BOOL)isFollow{ - (void)fus_showClickLikeAnimateWithIsFollow:(BOOL)isFollow{
if (FUSLiveHelper.shareInstance.roomInfoModel.liked.boolValue == isFollow) { if (FUSLiveHelper.shareInstance.roomInfoModel.liked.boolValue == isFollow) {
return; return;
......
...@@ -160,7 +160,7 @@ typedef NS_ENUM(NSInteger, FUSLiveHeadViewType) { ...@@ -160,7 +160,7 @@ typedef NS_ENUM(NSInteger, FUSLiveHeadViewType) {
*/ */
- (void)fus_setupLiked:(BOOL)liked; - (void)fus_setupLiked:(BOOL)liked;
/// 显示点击关注的动画,给外面某些比如一个接口就是送礼并且自动关注的动作调用,这个会弹出关注成功的toast,与fus_setupLiked的区别就是,fus_setupLiked仅仅作为更新其状态 /// 显示点击追踪的动画,给外面某些比如一个接口就是送礼并且自动追踪的动作调用,这个会弹出追踪成功的toast,与fus_setupLiked的区别就是,fus_setupLiked仅仅作为更新其状态
-(void)fus_showClickLikeAnimateWithIsFollow:(BOOL)isFollow; -(void)fus_showClickLikeAnimateWithIsFollow:(BOOL)isFollow;
/** /**
......
...@@ -53,11 +53,11 @@ ...@@ -53,11 +53,11 @@
#pragma mark - Method #pragma mark - Method
/// 设置是否关注 /// 设置是否追踪
/// @param isLike 是否关注 /// @param isLike 是否追踪
-(void)fus_setLike:(BOOL)isLike; -(void)fus_setLike:(BOOL)isLike;
/// 显示点击关注的动画,给外面某些比如一个接口就是送礼并且自动关注的动作调用,说白了,就是会显示动画,比如多一个toast提示 /// 显示点击追踪的动画,给外面某些比如一个接口就是送礼并且自动追踪的动作调用,说白了,就是会显示动画,比如多一个toast提示
-(void)fus_showClickLikeAnimateWithIsFollow:(BOOL)isFollow; -(void)fus_showClickLikeAnimateWithIsFollow:(BOOL)isFollow;
/** /**
......
...@@ -366,7 +366,7 @@ ...@@ -366,7 +366,7 @@
CGFloat nickNameLabelWidth = [_autoScrollNicknameLabel.text sizeWithFont:[UIFont fus_themeFont:11] maxWidth:MAXFLOAT].width + 4; CGFloat nickNameLabelWidth = [_autoScrollNicknameLabel.text sizeWithFont:[UIFont fus_themeFont:11] maxWidth:MAXFLOAT].width + 4;
CGFloat msgLabelWidth = [_autoScrollMsgLabel.attributedText boundingRectWithSize:CGSizeMake(MAXFLOAT, 13) options:NSStringDrawingUsesFontLeading | NSStringDrawingUsesLineFragmentOrigin context:nil].size.width + 4; CGFloat msgLabelWidth = [_autoScrollMsgLabel.attributedText boundingRectWithSize:CGSizeMake(MAXFLOAT, 13) options:NSStringDrawingUsesFontLeading | NSStringDrawingUsesLineFragmentOrigin context:nil].size.width + 4;
// 兼容如果自己开播,没有关注按钮的时候,最长可以加一个关注按钮的长度 // 兼容如果自己开播,没有追踪按钮的时候,最长可以加一个追踪按钮的长度
CGFloat maxNickNameWidth = MAX_NICKNAME_WIDTH; CGFloat maxNickNameWidth = MAX_NICKNAME_WIDTH;
if ([_currentModel.roomId isEqualToString:[[FUSCacheDataShare shareStore]userDetailInfo].uid]) { if ([_currentModel.roomId isEqualToString:[[FUSCacheDataShare shareStore]userDetailInfo].uid]) {
maxNickNameWidth += (LIKE_BTN_MARGIN + _likeBtn.width + rightSpace); maxNickNameWidth += (LIKE_BTN_MARGIN + _likeBtn.width + rightSpace);
...@@ -808,7 +808,7 @@ ...@@ -808,7 +808,7 @@
} }
} }
/// 显示点击关注的动画,给外面某些比如一个接口就是送礼并且自动关注的动作调用 /// 显示点击追踪的动画,给外面某些比如一个接口就是送礼并且自动追踪的动作调用
-(void)fus_showClickLikeAnimateWithIsFollow:(BOOL)isFollow{ -(void)fus_showClickLikeAnimateWithIsFollow:(BOOL)isFollow{
[self fus_setLike:isFollow]; [self fus_setLike:isFollow];
......
...@@ -73,7 +73,7 @@ import UIKit ...@@ -73,7 +73,7 @@ import UIKit
iconImageView.image = nil iconImageView.image = nil
if model.fus_modelType == -1 { if model.fus_modelType == -1 {
iconImageView.image = FUSShowRoomCenterBunble.imageNamed("live_chat_patAudience_gift_follow") iconImageView.image = FUSShowRoomCenterBunble.imageNamed("live_chat_patAudience_gift_follow")
nameLabel.text = .fus_localString("关注") nameLabel.text = .fus_localString("追踪")
costBtn.setImage(nil, for: .normal) costBtn.setImage(nil, for: .normal)
costBtn.setTitle(.fus_localString("免费"), for: .normal) costBtn.setTitle(.fus_localString("免费"), for: .normal)
costBtn.setTitleColor(.fus_textColorMedium(), for: .normal) costBtn.setTitleColor(.fus_textColorMedium(), for: .normal)
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
@property (nonatomic, copy) NSString *userId; @property (nonatomic, copy) NSString *userId;
/// 显示礼物的列表 /// 显示礼物的列表
@property (nonatomic, strong) NSMutableArray<FUSPatAudienceGiftModel *> *dataSourceList; @property (nonatomic, strong) NSMutableArray<FUSPatAudienceGiftModel *> *dataSourceList;
/// 请求下来的撩一撩数据,里面只有礼物,自己创建一个回拍并关注的模型添加进去dataSourceList用来作为显示骨架 /// 请求下来的撩一撩数据,里面只有礼物,自己创建一个回拍并追踪的模型添加进去dataSourceList用来作为显示骨架
@property (nonatomic, strong) FUSPatAudiencePatDataModel *patDataModel; @property (nonatomic, strong) FUSPatAudiencePatDataModel *patDataModel;
@property (nonatomic, assign) NSInteger itemSelect; @property (nonatomic, assign) NSInteger itemSelect;
...@@ -232,7 +232,7 @@ ...@@ -232,7 +232,7 @@
[FUSLoadingView fus_showProgressViewWithMessage:@"" canTouchBottomView:NO]; [FUSLoadingView fus_showProgressViewWithMessage:@"" canTouchBottomView:NO];
self.okBtn.userInteractionEnabled = NO; self.okBtn.userInteractionEnabled = NO;
if (giftModel.fus_modelType == -1) { if (giftModel.fus_modelType == -1) {
// 关注 // 追踪
[FUSLiveHttpHelper fus_livePatReplyWithRoomId:self.roomId type:1 gid:@"" succeed:^(NSMutableDictionary *changed) { [FUSLiveHttpHelper fus_livePatReplyWithRoomId:self.roomId type:1 gid:@"" succeed:^(NSMutableDictionary *changed) {
[FUSLoadingView fus_dismissProgressView]; [FUSLoadingView fus_dismissProgressView];
weakSelf.okBtn.userInteractionEnabled = YES; weakSelf.okBtn.userInteractionEnabled = YES;
...@@ -434,7 +434,7 @@ ...@@ -434,7 +434,7 @@
self.itemSelect = indexPath.row; self.itemSelect = indexPath.row;
FUSPatAudienceGiftModel *model = self.dataSourceList[self.itemSelect]; FUSPatAudienceGiftModel *model = self.dataSourceList[self.itemSelect];
if (model.fus_modelType == -1) { if (model.fus_modelType == -1) {
self.giftTextLabel.text = [NSString fus_localString:@"回撩并关注"]; self.giftTextLabel.text = [NSString fus_localString:@"回撩并追踪"];
}else { }else {
self.giftTextLabel.text = [NSString fus_localString:@"回撩她并送出礼物"]; self.giftTextLabel.text = [NSString fus_localString:@"回撩她并送出礼物"];
} }
......
...@@ -46,7 +46,7 @@ import FUSCommon ...@@ -46,7 +46,7 @@ import FUSCommon
case .follow: case .follow:
self.privacyImageView.image = FUSShowRoomCenterBunble.imageNamed("live_start_followScope_img") self.privacyImageView.image = FUSShowRoomCenterBunble.imageNamed("live_start_followScope_img")
self.privacyLabel.text = .fus_localString("关注圈") self.privacyLabel.text = .fus_localString("追踪圈")
case .intimacy: case .intimacy:
self.privacyImageView.image = FUSShowRoomCenterBunble.imageNamed("live_start_intimacyScope_img") self.privacyImageView.image = FUSShowRoomCenterBunble.imageNamed("live_start_intimacyScope_img")
......
...@@ -107,8 +107,8 @@ import FUSCommon ...@@ -107,8 +107,8 @@ import FUSCommon
//这里特殊用户有不一样的逻辑 //这里特殊用户有不一样的逻辑
let iconImagesList = ["live_start_openScope_cell","live_start_followScope_cell","live_start_intimacyScope_cell"] let iconImagesList = ["live_start_openScope_cell","live_start_followScope_cell","live_start_intimacyScope_cell"]
let titlesList = [String.fus_localString("全公开"), .fus_localString("关注圈"), .fus_localString("亲密圈")] let titlesList = [String.fus_localString("全公开"), .fus_localString("追踪圈"), .fus_localString("亲密圈")]
let subTitlesList = [String.fus_localString("所有人可进入房间"), .fus_localString("仅关注主播超过24小的粉丝可进入房间"), .fus_localString("仅亲密好友可进入房间")] let subTitlesList = [String.fus_localString("所有人可进入房间"), .fus_localString("仅追踪主播超过24小的粉丝可进入房间"), .fus_localString("仅亲密好友可进入房间")]
let selectIndex = fus_getIndexWithScopeType() let selectIndex = fus_getIndexWithScopeType()
for (index, iconStr) in iconImagesList.enumerated() { for (index, iconStr) in iconImagesList.enumerated() {
...@@ -224,7 +224,7 @@ import FUSCommon ...@@ -224,7 +224,7 @@ import FUSCommon
case .open: case .open:
FUSDialogView.fus_showDialog(.fus_localString("房间已切换到全公开模式,所有人可进入房间")) FUSDialogView.fus_showDialog(.fus_localString("房间已切换到全公开模式,所有人可进入房间"))
case .follow: case .follow:
FUSDialogView.fus_showDialog(.fus_localString("房间已切换到关注圈模式,仅关注直播超过24小时的粉丝可进入房间,直播时长不计入直播奖励活动")) FUSDialogView.fus_showDialog(.fus_localString("房间已切换到追踪圈模式,仅追踪直播超过24小时的粉丝可进入房间,直播时长不计入直播奖励活动"))
case .intimacy: case .intimacy:
FUSDialogView.fus_showDialog(.fus_localString("房间已切换到亲密圈模式,仅亲密好友的用户可进入房间,直播时长不计入直播奖励活动")) FUSDialogView.fus_showDialog(.fus_localString("房间已切换到亲密圈模式,仅亲密好友的用户可进入房间,直播时长不计入直播奖励活动"))
@unknown default: @unknown default:
......
...@@ -379,7 +379,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -379,7 +379,7 @@ NS_ASSUME_NONNULL_BEGIN
/// 设置新人7天签到提醒 /// 设置新人7天签到提醒
+ (NSString *)fus_URL_USER_NOVICE_CHECKIN_REMIND_SET; + (NSString *)fus_URL_USER_NOVICE_CHECKIN_REMIND_SET;
/// 回拍 类型(1:关注、2:送礼) /// 回拍 类型(1:追踪、2:送礼)
+ (NSString *)fus_URL_LIVE_PAT_REPLY; + (NSString *)fus_URL_LIVE_PAT_REPLY;
/// 拍一拍用户 /// 拍一拍用户
...@@ -406,7 +406,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -406,7 +406,7 @@ NS_ASSUME_NONNULL_BEGIN
/// 本场直播萤火贡献列表 /// 本场直播萤火贡献列表
+(NSString *)fus_URL_bondsRankList; +(NSString *)fus_URL_bondsRankList;
///本场直播新关注列表 ///本场直播新追踪列表
+(NSString *)fus_URL_newFansList; +(NSString *)fus_URL_newFansList;
///本场直播新珍爱团成员列表 ///本场直播新珍爱团成员列表
......
...@@ -489,7 +489,7 @@ ...@@ -489,7 +489,7 @@
+ (NSString *)fus_URL_GET_IM_SEND_CHAT_RESULT { + (NSString *)fus_URL_GET_IM_SEND_CHAT_RESULT {
return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/imchat/getInSendChatResult.html"]; return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/imchat/getInSendChatResult.html"];
} }
/// 回拍 类型(1:关注、2:送礼) /// 回拍 类型(1:追踪、2:送礼)
+ (NSString *)fus_URL_LIVE_PAT_REPLY{ + (NSString *)fus_URL_LIVE_PAT_REPLY{
return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/live/pat/reply"]; return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/live/pat/reply"];
} }
...@@ -526,7 +526,7 @@ ...@@ -526,7 +526,7 @@
+(NSString *)fus_URL_bondsRankList{ +(NSString *)fus_URL_bondsRankList{
return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/live/channel/bonds/rank/list"]; return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/live/channel/bonds/rank/list"];
} }
///本场直播新关注列表 ///本场直播新追踪列表
+(NSString *)fus_URL_newFansList{ +(NSString *)fus_URL_newFansList{
return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/live/channel/follow/new/list"]; return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/live/channel/follow/new/list"];
} }
......
...@@ -49,7 +49,6 @@ class FUSCompleteUserInfoAvatarView: FUSBaseView { ...@@ -49,7 +49,6 @@ class FUSCompleteUserInfoAvatarView: FUSBaseView {
messageLabel.font = .fus_themeFont(14) messageLabel.font = .fus_themeFont(14)
messageLabel.textColor = .fus_textColorLight2() messageLabel.textColor = .fus_textColorLight2()
// messageLabel.text = .fus_localString("您只需花30秒完成一下信息的补充,即可获得FIREFLY新星认定,并获得相关专属的推荐。根据历史经验,您个人信息越真实,获得的关注者会越多。")
messageLabel.text = .fus_localString("您只需花30秒完成一下个人资料的补充,即可解锁私房价格的设定。") messageLabel.text = .fus_localString("您只需花30秒完成一下个人资料的补充,即可解锁私房价格的设定。")
messageLabel.numberOfLines = 0; messageLabel.numberOfLines = 0;
contentView.addSubview(messageLabel) contentView.addSubview(messageLabel)
......
...@@ -24,7 +24,6 @@ class FUSCompleteUserInfoNameView: FUSBaseView { ...@@ -24,7 +24,6 @@ class FUSCompleteUserInfoNameView: FUSBaseView {
messageLabel.font = .fus_themeFont(14) messageLabel.font = .fus_themeFont(14)
messageLabel.textColor = .fus_textColorLight2() messageLabel.textColor = .fus_textColorLight2()
// messageLabel.text = .fus_localString("您只需花30秒完成一下信息的补充,即可获得FIREFLY新星认定,并获得相关专属的推荐。根据历史经验,您个人信息越真实,获得的关注者会越多。")
messageLabel.text = .fus_localString("您只需花30秒完成一下个人资料的补充,即可解锁私房价格的设定。") messageLabel.text = .fus_localString("您只需花30秒完成一下个人资料的补充,即可解锁私房价格的设定。")
messageLabel.numberOfLines = 0; messageLabel.numberOfLines = 0;
self.addSubview(messageLabel) self.addSubview(messageLabel)
......
...@@ -543,7 +543,7 @@ ...@@ -543,7 +543,7 @@
- (IBAction)onClickNextStepBtn:(UIButton *)sender { - (IBAction)onClickNextStepBtn:(UIButton *)sender {
if (!self.checkAgeBtn.selected) { if (!self.checkAgeBtn.selected) {
[FUSAlertView showAlertWithTitle:[NSString fus_localString:@"遗憾"] message:[NSString fus_localString:@"很遗憾,您的年龄未满足Fusi的注册条件。但是还是非常感谢对我们的关注!"] cancelButtonTitle:nil otherButtonTitles:@[[NSString fus_localString:@"确定"]] clickBlock:nil]; [FUSAlertView showAlertWithTitle:[NSString fus_localString:@"遗憾"] message:[NSString fus_localString:@"很遗憾,您的年龄未满足Fusi的注册条件。但是还是非常感谢对我们的追踪!"] cancelButtonTitle:nil otherButtonTitles:@[[NSString fus_localString:@"确定"]] clickBlock:nil];
return; return;
} }
......
...@@ -787,7 +787,7 @@ ...@@ -787,7 +787,7 @@
{ {
// 追踪 // 追踪
if (isSelf) { if (isSelf) {
[FUSDialogView fus_showDialog:[NSString fus_localString:@"自己不能关注自己哦"]]; [FUSDialogView fus_showDialog:[NSString fus_localString:@"自己不能追踪自己哦"]];
}else { }else {
[[FUSRouter liveRouter] fus_likeRoomWithRoomId:weakSelf.model.uid success:^{ [[FUSRouter liveRouter] fus_likeRoomWithRoomId:weakSelf.model.uid success:^{
[FUSDialogView fus_showDialog:[NSString fus_localString:@"追踪成功"]]; [FUSDialogView fus_showDialog:[NSString fus_localString:@"追踪成功"]];
......
...@@ -328,7 +328,7 @@ ...@@ -328,7 +328,7 @@
_likeBtn = [UIButton buttonWithType:UIButtonTypeCustom]; _likeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[_likeBtn addTarget:self action:@selector(fus_clickLikeBtnAction:) forControlEvents:UIControlEventTouchUpInside]; [_likeBtn addTarget:self action:@selector(fus_clickLikeBtnAction:) forControlEvents:UIControlEventTouchUpInside];
_likeBtn.frame = CGRectMake(0, 0, 30, 30); _likeBtn.frame = CGRectMake(0, 0, 30, 30);
[_likeBtn setTitle:[NSString fus_localString:@"0"] forState:UIControlStateNormal]; [_likeBtn setTitle:@"0" forState:UIControlStateNormal];
[_likeBtn setTitleColor:[UIColor colorWithHex:@"#808080"] forState:UIControlStateNormal]; [_likeBtn setTitleColor:[UIColor colorWithHex:@"#808080"] forState:UIControlStateNormal];
_likeBtn.titleLabel.font = [UIFont fus_themeFont:14]; _likeBtn.titleLabel.font = [UIFont fus_themeFont:14];
} }
......
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
self.liveUserGroup.groupHeaderHeight = 22; self.liveUserGroup.groupHeaderHeight = 22;
self.liveUserGroup.groupHeaderBgColor = [UIColor clearColor]; self.liveUserGroup.groupHeaderBgColor = [UIColor clearColor];
self.liveUserGroup.groupHeaderTextBgColor = [UIColor clearColor]; self.liveUserGroup.groupHeaderTextBgColor = [UIColor clearColor];
self.liveUserGroup.groupHeaderText = [NSString fus_localString:@"你关注的主播"]; self.liveUserGroup.groupHeaderText = [NSString fus_localString:@"你追踪的主播"];
self.liveUserGroup.groupHeaderTextFont = [UIFont fus_themeMediumFont:14]; self.liveUserGroup.groupHeaderTextFont = [UIFont fus_themeMediumFont:14];
self.liveUserGroup.groupHeaderTextColor = [UIColor fus_textColorRich]; self.liveUserGroup.groupHeaderTextColor = [UIColor fus_textColorRich];
...@@ -316,7 +316,7 @@ ...@@ -316,7 +316,7 @@
self.liveNoticeItem.cellStyle = UITableViewCellStyleSubtitle; self.liveNoticeItem.cellStyle = UITableViewCellStyleSubtitle;
self.liveNoticeItem.rightShowTextFont = [UIFont fus_themeFont:11]; self.liveNoticeItem.rightShowTextFont = [UIFont fus_themeFont:11];
self.liveNoticeItem.rightShowTextColor = [UIColor fus_textColorLight2]; self.liveNoticeItem.rightShowTextColor = [UIColor fus_textColorLight2];
self.liveNoticeItem.rightShowText = [NSString fus_localString:@"已关注的主播开播时的通知"]; self.liveNoticeItem.rightShowText = [NSString fus_localString:@"已追踪的主播开播时的通知"];
self.liveNoticeItem.showSeparatorLine = YES; self.liveNoticeItem.showSeparatorLine = YES;
self.liveNoticeItem.switchClick = ^(FUSCustomSettingItem *item){ self.liveNoticeItem.switchClick = ^(FUSCustomSettingItem *item){
if (![weakSelf fus_checkClickSwichButtonCheck]) { if (![weakSelf fus_checkClickSwichButtonCheck]) {
......
...@@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, assign) NSInteger pageSize; @property (nonatomic, assign) NSInteger pageSize;
/// 总的记录数 /// 总的记录数
@property (nonatomic, assign) NSInteger pageTotal; @property (nonatomic, assign) NSInteger pageTotal;
/// 所有关注的主播list /// 所有追踪的主播list
@property (nonatomic, strong) NSArray<FUSNotificationUserLikeItemModel *> *pageList; @property (nonatomic, strong) NSArray<FUSNotificationUserLikeItemModel *> *pageList;
@end @end
......
...@@ -280,7 +280,7 @@ ...@@ -280,7 +280,7 @@
failure:(void (^)(NSString * msg, int code))failure; failure:(void (^)(NSString * msg, int code))failure;
/** /**
获取用户关注主播-设置通知开关 获取用户追踪主播-设置通知开关
@param success 成功回调 @param success 成功回调
@param failure 失败回调 @param failure 失败回调
......
...@@ -558,7 +558,7 @@ ...@@ -558,7 +558,7 @@
} }
/** /**
获取用户关注主播-设置通知开关 获取用户追踪主播-设置通知开关
@param success 成功回调 @param success 成功回调
@param failure 失败回调 @param failure 失败回调
......
...@@ -38,7 +38,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -38,7 +38,7 @@ NS_ASSUME_NONNULL_BEGIN
// 绑定手机 // 绑定手机
+ (NSString *)fus_URL_PHONE_AUTH; + (NSString *)fus_URL_PHONE_AUTH;
/// 获取用户关注主播-设置通知开关 /// 获取用户追踪主播-设置通知开关
+ (NSString *)fus_URL_GetUserLikePushList; + (NSString *)fus_URL_GetUserLikePushList;
/// 用户设置接收/不接收某个主播开播通知 /// 用户设置接收/不接收某个主播开播通知
......
...@@ -265,7 +265,7 @@ ...@@ -265,7 +265,7 @@
return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/userManager/changePush"]; return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/userManager/changePush"];
} }
/// 获取用户关注主播-设置通知开关 /// 获取用户追踪主播-设置通知开关
+ (NSString *)fus_URL_GetUserLikePushList { + (NSString *)fus_URL_GetUserLikePushList {
return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/userManager/getUserLikePushList"]; return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/userManager/getUserLikePushList"];
} }
......
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