Skip to content

pidan / FuSiLive

Go to a project
Commit 03307af3 by ludi
Options

修复一系列bug

parent 0e591228
Inline Side-by-side
Showing with 372 additions and 76 deletions
DevelopmentPods/FUSCommon/FUSCommon/Classes/Common/View/FUSRoomPushNoticeView.m
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
} }
case FUSPushNoticeViewTypeCheckIn: case FUSPushNoticeViewTypeCheckIn:
{ {
_noticeWordsLabel.text = [NSString fus_versionLocalString:@"开启系统通知权限，不再错过每天的连续签到奖励"]; _noticeWordsLabel.text = [NSString fus_localString:@"开启系统通知权限，不再错过每天的连续签到奖励"];
break; break;
} }
default: default:
......
DevelopmentPods/FUSCommon/FUSCommon/FUSRouter/Routers/LiveRouter/FUSPublicModels/Live/FUSRoomInfoModel.h
...@@ -38,6 +38,10 @@ ...@@ -38,6 +38,10 @@
@property (nonatomic, copy) NSString *owner; // 包房创建者uid @property (nonatomic, copy) NSString *owner; // 包房创建者uid
@property (nonatomic, copy) NSString *roomId; // 包房ID @property (nonatomic, copy) NSString *roomId; // 包房ID
@property (nonatomic, copy) NSString *sex; // 包房创建者性别 @property (nonatomic, copy) NSString *sex; // 包房创建者性别
/// 年龄
@property (nonatomic, copy) NSString *age;
/// 地址
@property (nonatomic, copy) NSString *addr;
@property (nonatomic, copy) NSString *livestate; // 暂离状态(0为暂停直播) @property (nonatomic, copy) NSString *livestate; // 暂离状态(0为暂停直播)
@property (nonatomic, copy) NSString *gag; // 是否被禁言 @property (nonatomic, copy) NSString *gag; // 是否被禁言
@property (nonatomic, copy) NSString *hasfamily; // 是否有家族 @property (nonatomic, copy) NSString *hasfamily; // 是否有家族
......
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese.strings
...@@ -2128,7 +2128,7 @@ ...@@ -2128,7 +2128,7 @@
"性别" = "性別"; "性别" = "性別";
"确认清除全部观看记录吗？" = "确认清除全部观看记录吗？"; "确认清除全部观看记录吗？" = "確認清除全部觀看記錄嗎？";
"编辑资料" = "編輯資料"; "编辑资料" = "編輯資料";
...@@ -2210,3 +2210,47 @@ ...@@ -2210,3 +2210,47 @@
"1.请提供高清品质的图片作为头像和封面。\n2.请确认您的头像和封面不涉及违反您所在国法律的内容。\n3.请确认您的头像和封面没有涉及暴力和过度暴露、色情的图片。\n4.请确认您的头像和封面尊重您社交群体的文化。" = "1.請提供高清品質的圖片作為頭像和封面。\n2.請確認您的頭像和封面不涉及違反您所在國的法律和內容。\n3.請確認您的頭像和封面沒有涉及暴力和過度暴露、色情的圖片。\n4.請確認您的頭像和封面尊重您社交群體的文化"; "1.请提供高清品质的图片作为头像和封面。\n2.请确认您的头像和封面不涉及违反您所在国法律的内容。\n3.请确认您的头像和封面没有涉及暴力和过度暴露、色情的图片。\n4.请确认您的头像和封面尊重您社交群体的文化。" = "1.請提供高清品質的圖片作為頭像和封面。\n2.請確認您的頭像和封面不涉及違反您所在國的法律和內容。\n3.請確認您的頭像和封面沒有涉及暴力和過度暴露、色情的圖片。\n4.請確認您的頭像和封面尊重您社交群體的文化";
"首充加赠" = "首充加贈";
"新玩家连续7天签到" = "新玩家連續7天簽到";
"新玩家连续登录签到获得奖励" = "新玩家連續登入簽到獲得獎勵";
"签到提醒" = "簽到提醒";
"撩一撩" = "撩一撩";
"撩了撩你" = "撩了撩你";
"回撩她并送出礼物" = "回撩她並送出禮物";
"回撩" = "回撩";
"回撩并关注" = "回撩並追蹤";
"关注" = "追蹤";
"您的手速太快了" = "您的手速太快了";
"快捷发言设置" = "快捷發言設置";
"暂无快捷发言" = "暫無快捷發言";
"删除快捷发言" = "刪除快捷發言";
"是否确定删除 “%@”" = "是否確定刪除 “%@”";
"编辑快捷发言" = "編輯快捷發言";
"输入快捷发言内容" = "輸入快捷發言內容";
"新增快捷发言" = "新增快捷發言";
"快捷发言说明" = "快捷發言說明";
"设置快捷发言后，观众可以点击快捷发言按钮，直接发送你已设置好的消息内容。你最多可设置4条快捷发言。" = "設置快捷發言後，觀衆可以點擊快捷發言按鈕，直接發送你已設置好的消息內容。你最多可設置4條快捷發言。";
"新增收藏" = "新增收藏";
"开启系统通知权限，不再错过每天的连续签到奖励" = "開啟系統通知權限，不再錯過每天的連續簽到獎勵";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese_Traditional.strings
...@@ -2128,7 +2128,7 @@ ...@@ -2128,7 +2128,7 @@
"性别" = "性別"; "性别" = "性別";
"确认清除全部观看记录吗？" = "确认清除全部观看记录吗？"; "确认清除全部观看记录吗？" = "確認清除全部觀看記錄嗎？";
"编辑资料" = "編輯資料"; "编辑资料" = "編輯資料";
...@@ -2210,3 +2210,47 @@ ...@@ -2210,3 +2210,47 @@
"1.请提供高清品质的图片作为头像和封面。\n2.请确认您的头像和封面不涉及违反您所在国法律的内容。\n3.请确认您的头像和封面没有涉及暴力和过度暴露、色情的图片。\n4.请确认您的头像和封面尊重您社交群体的文化。" = "1.請提供高清品質的圖片作為頭像和封面。\n2.請確認您的頭像和封面不涉及違反您所在國的法律和內容。\n3.請確認您的頭像和封面沒有涉及暴力和過度暴露、色情的圖片。\n4.請確認您的頭像和封面尊重您社交群體的文化"; "1.请提供高清品质的图片作为头像和封面。\n2.请确认您的头像和封面不涉及违反您所在国法律的内容。\n3.请确认您的头像和封面没有涉及暴力和过度暴露、色情的图片。\n4.请确认您的头像和封面尊重您社交群体的文化。" = "1.請提供高清品質的圖片作為頭像和封面。\n2.請確認您的頭像和封面不涉及違反您所在國的法律和內容。\n3.請確認您的頭像和封面沒有涉及暴力和過度暴露、色情的圖片。\n4.請確認您的頭像和封面尊重您社交群體的文化";
"首充加赠" = "首充加贈";
"新玩家连续7天签到" = "新玩家連續7天簽到";
"新玩家连续登录签到获得奖励" = "新玩家連續登入簽到獲得獎勵";
"签到提醒" = "簽到提醒";
"撩一撩" = "撩一撩";
"撩了撩你" = "撩了撩你";
"回撩她并送出礼物" = "回撩她並送出禮物";
"回撩" = "回撩";
"回撩并关注" = "回撩並追蹤";
"关注" = "追蹤";
"您的手速太快了" = "您的手速太快了";
"快捷发言设置" = "快捷發言設置";
"暂无快捷发言" = "暫無快捷發言";
"删除快捷发言" = "刪除快捷發言";
"是否确定删除 “%@”" = "是否確定刪除 “%@”";
"编辑快捷发言" = "編輯快捷發言";
"输入快捷发言内容" = "輸入快捷發言內容";
"新增快捷发言" = "新增快捷發言";
"快捷发言说明" = "快捷發言說明";
"设置快捷发言后，观众可以点击快捷发言按钮，直接发送你已设置好的消息内容。你最多可设置4条快捷发言。" = "設置快捷發言後，觀衆可以點擊快捷發言按鈕，直接發送你已設置好的消息內容。你最多可設置4條快捷發言。";
"新增收藏" = "新增收藏";
"开启系统通知权限，不再错过每天的连续签到奖励" = "開啟系統通知權限，不再錯過每天的連續簽到獎勵";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_English.strings
...@@ -784,7 +784,7 @@ ...@@ -784,7 +784,7 @@
"去试试" = "Try it"; "去试试" = "Try it";
"接通率" = "Connection success rate"; "接通率" = "Connection rate";
"邀请奖励" = "Invitation Award"; "邀请奖励" = "Invitation Award";
...@@ -2210,3 +2210,47 @@ ...@@ -2210,3 +2210,47 @@
"1.请提供高清品质的图片作为头像和封面。\n2.请确认您的头像和封面不涉及违反您所在国法律的内容。\n3.请确认您的头像和封面没有涉及暴力和过度暴露、色情的图片。\n4.请确认您的头像和封面尊重您社交群体的文化。" = "1. Please provide high-definition quality pictures as your avatar and cover. \n2. Please confirm that your avatar and cover do not violate the laws and content of your country. \n3. Please make sure that your avatar and cover do not involve violence, excessive exposure, or pornographic images. \n4. Please make sure your avatar and cover respect the culture of your social group"; "1.请提供高清品质的图片作为头像和封面。\n2.请确认您的头像和封面不涉及违反您所在国法律的内容。\n3.请确认您的头像和封面没有涉及暴力和过度暴露、色情的图片。\n4.请确认您的头像和封面尊重您社交群体的文化。" = "1. Please provide high-definition quality pictures as your avatar and cover. \n2. Please confirm that your avatar and cover do not violate the laws and content of your country. \n3. Please make sure that your avatar and cover do not involve violence, excessive exposure, or pornographic images. \n4. Please make sure your avatar and cover respect the culture of your social group";
"首充加赠" = "Top-up reward";
"新玩家连续7天签到" = "New player 7 consecutive days check-in";
"新玩家连续登录签到获得奖励" = "New player check-in continuously to get rewards";
"签到提醒" = "Check in remind";
"撩一撩" = "Flirting";
"撩了撩你" = "Flirting with you";
"回撩她并送出礼物" = "Flirt-back and send gift";
"回撩" = "flirt back";
"回撩并关注" = "Flirt-back and follow";
"关注" = "Follow";
"您的手速太快了" = "Your operations are too frequent";
"快捷发言设置" = "Shortcut message Setting";
"暂无快捷发言" = "No shortcut message";
"删除快捷发言" = "Delete shortcut message";
"是否确定删除 “%@”" = "Are you sure to delete “%@”";
"编辑快捷发言" = "Edit shortcut message";
"输入快捷发言内容" = "Input shortcut message content";
"新增快捷发言" = "Add shortcut message";
"快捷发言说明" = "Shortcut message";
"设置快捷发言后，观众可以点击快捷发言按钮，直接发送你已设置好的消息内容。你最多可设置4条快捷发言。" = "After setting up shortcut speech, audience can click the shortcut message to send the messages you have set. You can set up to 4 shortcut messages";
"新增收藏" = "Add collection";
"开启系统通知权限，不再错过每天的连续签到奖励" = "Enable system notification permission, no longer miss the daily check-in rewards.";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Japanese.strings
...@@ -2188,3 +2188,47 @@ ...@@ -2188,3 +2188,47 @@
"1.请提供高清品质的图片作为头像和封面。\n2.请确认您的头像和封面不涉及违反您所在国法律的内容。\n3.请确认您的头像和封面没有涉及暴力和过度暴露、色情的图片。\n4.请确认您的头像和封面尊重您社交群体的文化。" = "1. アバターとカバーには、高解像度の写真を提供してください。\n2. アバターとカバーがあなたの国の法律やコンテンツに違反していないことを確認してください。\n3. アバターとカバーに暴力、過度の露出、ポルノ画像が含まれていないことを確認してください。\n4. アバターとカバーがあなたの社会集団の文化を尊重していることを確認してください"; "1.请提供高清品质的图片作为头像和封面。\n2.请确认您的头像和封面不涉及违反您所在国法律的内容。\n3.请确认您的头像和封面没有涉及暴力和过度暴露、色情的图片。\n4.请确认您的头像和封面尊重您社交群体的文化。" = "1. アバターとカバーには、高解像度の写真を提供してください。\n2. アバターとカバーがあなたの国の法律やコンテンツに違反していないことを確認してください。\n3. アバターとカバーに暴力、過度の露出、ポルノ画像が含まれていないことを確認してください。\n4. アバターとカバーがあなたの社会集団の文化を尊重していることを確認してください";
"首充加赠" = "チャージ報酬";
"新玩家连续7天签到" = "新規プレイヤーの連続 7 日間のチェックイン";
"新玩家连续登录签到获得奖励" = "新しいプレイヤーは継続的にチェックインして報酬を獲得します";
"签到提醒" = "チェックインのリマインダー";
"撩一撩" = "いちゃつく";
"撩了撩你" = "あなたとのいちゃつき";
"回撩她并送出礼物" = "返事してギフトを送る";
"回撩" = "いちゃつく";
"回撩并关注" = "返事してフォローする";
"关注" = "フォロー";
"您的手速太快了" = "操作が頻繁すぎる";
"快捷发言设置" = "ショートカットメッセージの設定";
"暂无快捷发言" = "ショートカットメッセージはありません";
"删除快捷发言" = "ショートカットメッセージを削除する";
"是否确定删除 “%@”" = "「%@」を削除してもよろしいですか？";
"编辑快捷发言" = "ショートカットメッセージを編集する";
"输入快捷发言内容" = "ショートカットメッセージの内容を入力";
"新增快捷发言" = "ショートカットメッセージを追加";
"快捷发言说明" = "ショートカットメッセージ 手順";
"设置快捷发言后，观众可以点击快捷发言按钮，直接发送你已设置好的消息内容。你最多可设置4条快捷发言。" = "ショートカット音声を設定すると、聴衆はショートカット メッセージをクリックして、設定したメッセージを送信できます。 ショートカットメッセージは4つまで設定可能";
"新增收藏" = "コレクションの追加";
"开启系统通知权限，不再错过每天的连续签到奖励" = "システム通知許可を有効にすると、毎日のチェックイン特典を見逃すことがなくなります。";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Thai.strings
...@@ -774,7 +774,7 @@ ...@@ -774,7 +774,7 @@
"去试试" = "ลองใช้"; "去试试" = "ลองใช้";
"接通率" = "อัตราความสำเร็จในการเชื่อมต่อ"; "接通率" = "อัตราการเชื่อมต่อ";
"邀请奖励" = "รางวัลการเชิญ"; "邀请奖励" = "รางวัลการเชิญ";
...@@ -2102,8 +2102,6 @@ ...@@ -2102,8 +2102,6 @@
"性别" = "เพศ"; "性别" = "เพศ";
"确认清除全部观看记录吗？" = "แน่ใจว่าจะล้างประวัติการดูทั้งหมดหรือไม่";
"编辑资料" = "แก้ไขข้อมูล"; "编辑资料" = "แก้ไขข้อมูล";
"已有语音签名，是否去录制新的语音签名？" = "Already have audio signature, sure to record new audio signature?"; "已有语音签名，是否去录制新的语音签名？" = "Already have audio signature, sure to record new audio signature?";
...@@ -2184,3 +2182,47 @@ ...@@ -2184,3 +2182,47 @@
"1.请提供高清品质的图片作为头像和封面。\n2.请确认您的头像和封面不涉及违反您所在国法律的内容。\n3.请确认您的头像和封面没有涉及暴力和过度暴露、色情的图片。\n4.请确认您的头像和封面尊重您社交群体的文化。" = "1. โปรดส่งภาพคุณภาพสูงเป็นอวาตาร์และภาพหน้าปกของคุณ \n2. โปรดยืนยันว่าอวาตาร์และภาพหน้าปกของคุณไม่ได้ละเมิดกฎหมายและเนื้อหาของประเทศของคุณ \n3. โปรดตรวจสอบว่าอวาตาร์และภาพหน้าปกของคุณไม่มีเนื้อหาเกี่ยวกับความรุนแรง การเปิดเผยมากเกินไป หรือภาพลามกอนาจาร \n4. โปรดตรวจสอบว่าอวาตาร์และภาพหน้าปกของคุณเคารพวัฒนธรรมของกลุ่มสังคมของคุณ"; "1.请提供高清品质的图片作为头像和封面。\n2.请确认您的头像和封面不涉及违反您所在国法律的内容。\n3.请确认您的头像和封面没有涉及暴力和过度暴露、色情的图片。\n4.请确认您的头像和封面尊重您社交群体的文化。" = "1. โปรดส่งภาพคุณภาพสูงเป็นอวาตาร์และภาพหน้าปกของคุณ \n2. โปรดยืนยันว่าอวาตาร์และภาพหน้าปกของคุณไม่ได้ละเมิดกฎหมายและเนื้อหาของประเทศของคุณ \n3. โปรดตรวจสอบว่าอวาตาร์และภาพหน้าปกของคุณไม่มีเนื้อหาเกี่ยวกับความรุนแรง การเปิดเผยมากเกินไป หรือภาพลามกอนาจาร \n4. โปรดตรวจสอบว่าอวาตาร์และภาพหน้าปกของคุณเคารพวัฒนธรรมของกลุ่มสังคมของคุณ";
"首充加赠" = "รางวัลเติมเงิน";
"新玩家连续7天签到" = "ผู้เล่นใหม่เช็คอิน 7 วันติดต่อกัน";
"新玩家连续登录签到获得奖励" = "ผู้เล่นใหม่เช็คอินอย่างต่อเนื่องเพื่อรับรางวัล";
"签到提醒" = "เช็คอินเตือน";
"撩一撩" = "เจ้าชู้";
"撩了撩你" = "เจ้าชู้กับคุณ";
"回撩她并送出礼物" = "จีบกลับและส่งของขวัญ";
"回撩" = "จีบกลับ";
"回撩并关注" = "จีบกลับและติดตาม";
"关注" = "ติดตาม";
"您的手速太快了" = "การดำเนินการของคุณบ่อยเกินไป";
"快捷发言设置" = "การตั้งค่าข้อความทางลัด";
"暂无快捷发言" = "ไม่มีข้อความทางลัด";
"删除快捷发言" = "ลบข้อความทางลัด";
"是否确定删除 “%@”" = "คุณแน่ใจหรือว่าจะลบ “%@”";
"编辑快捷发言" = "แก้ไขข้อความทางลัด";
"输入快捷发言内容" = "ป้อนเนื้อหาข้อความทางลัด";
"新增快捷发言" = "เพิ่มข้อความทางลัด";
"快捷发言说明" = "คำแนะนำข้อความทางลัด";
"设置快捷发言后，观众可以点击快捷发言按钮，直接发送你已设置好的消息内容。你最多可设置4条快捷发言。" = "หลังจากตั้งค่าคำพูดทางลัดแล้ว ผู้ชมสามารถคลิกข้อความทางลัดเพื่อส่งข้อความที่คุณตั้งไว้ได้ คุณสามารถตั้งค่าข้อความทางลัดได้สูงสุด 4 ข้อความ";
"新增收藏" = "เพิ่มคอลเลกชัน";
"开启系统通知权限，不再错过每天的连续签到奖励" = "เปิดใช้งานการอนุญาตการแจ้งเตือนของระบบ ไม่พลาดรางวัลเช็คอินรายวันอีกต่อไป";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_vietnamese.strings
...@@ -2188,3 +2188,47 @@ ...@@ -2188,3 +2188,47 @@
"1.请提供高清品质的图片作为头像和封面。\n2.请确认您的头像和封面不涉及违反您所在国法律的内容。\n3.请确认您的头像和封面没有涉及暴力和过度暴露、色情的图片。\n4.请确认您的头像和封面尊重您社交群体的文化。" = "1. Vui lòng cung cấp hình ảnh chất lượng cao làm ảnh đại diện và ảnh bìa của bạn. \n2. Vui lòng xác nhận rằng ảnh đại diện và ảnh bìa của bạn không vi phạm luật pháp và nội dung của quốc gia bạn. \n3. Vui lòng đảm bảo rằng ảnh đại diện và ảnh bìa của bạn không liên quan đến bạo lực, phơi bày quá mức hoặc hình ảnh khiêu dâm. \n4. Vui lòng đảm bảo rằng ảnh đại diện và ảnh bìa của bạn tôn trọng văn hóa của nhóm xã hội của bạn"; "1.请提供高清品质的图片作为头像和封面。\n2.请确认您的头像和封面不涉及违反您所在国法律的内容。\n3.请确认您的头像和封面没有涉及暴力和过度暴露、色情的图片。\n4.请确认您的头像和封面尊重您社交群体的文化。" = "1. Vui lòng cung cấp hình ảnh chất lượng cao làm ảnh đại diện và ảnh bìa của bạn. \n2. Vui lòng xác nhận rằng ảnh đại diện và ảnh bìa của bạn không vi phạm luật pháp và nội dung của quốc gia bạn. \n3. Vui lòng đảm bảo rằng ảnh đại diện và ảnh bìa của bạn không liên quan đến bạo lực, phơi bày quá mức hoặc hình ảnh khiêu dâm. \n4. Vui lòng đảm bảo rằng ảnh đại diện và ảnh bìa của bạn tôn trọng văn hóa của nhóm xã hội của bạn";
"首充加赠" = "Phần thưởng nạp tiền";
"新玩家连续7天签到" = "Người chơi mới check-in 7 ngày liên tục";
"新玩家连续登录签到获得奖励" = "Người chơi mới check-in liên tục để nhận thưởng";
"签到提醒" = "Nhắc nhở đăng ký";
"撩一撩" = "Tán tỉnh";
"撩了撩你" = "Tán tỉnh bạn";
"回撩她并送出礼物" = "Tán tỉnh và gửi quà";
"回撩" = "tán tỉnh lại";
"回撩并关注" = "Tán tỉnh và theo dõi";
"关注" = "Theo dõi";
"您的手速太快了" = "Hoạt động của bạn quá thường xuyên";
"快捷发言设置" = "Cài đặt tin nhắn lối tắt";
"暂无快捷发言" = "Không có tin nhắn tắt";
"删除快捷发言" = "Xóa tin nhắn tắt";
"是否确定删除 “%@”" = "Bạn có chắc chắn muốn xóa không \"%@\"";
"编辑快捷发言" = "Chỉnh sửa tin nhắn tắt";
"输入快捷发言内容" = "Nhập nội dung tin nhắn phím tắt";
"新增快捷发言" = "Thêm tin nhắn tắt";
"快捷发言说明" = "Tin nhắn tắt Hướng dẫn";
"设置快捷发言后，观众可以点击快捷发言按钮，直接发送你已设置好的消息内容。你最多可设置4条快捷发言。" = "Sau khi thiết lập lối tắt lời nói, khán giả có thể nhấp vào tin nhắn lối tắt để gửi tin nhắn bạn đã đặt. Bạn có thể thiết lập tối đa 4 tin nhắn tắt";
"新增收藏" = "Thêm bộ sưu tập";
"开启系统通知权限，不再错过每天的连续签到奖励" = "Bật quyền thông báo hệ thống, không còn bỏ lỡ phần thưởng đăng ký hàng ngày.";
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Categories/UIView/UIView+Corner.m
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
} }
- (void)fus_addShadow{ - (void)fus_addShadow{
self.layer.shadowColor = [UIColor colorWithRed:65/255.f green:94/255.f blue:94/255.f alpha:148/255.f].CGColor; self.layer.shadowColor = [UIColor colorWithRed:65/255.f green:94/255.f blue:94/255.f alpha:90/255.f].CGColor;
self.layer.shadowOffset = CGSizeMake(1, 0); self.layer.shadowOffset = CGSizeMake(1, 0);
self.layer.shadowOpacity = 1; self.layer.shadowOpacity = 1;
self.layer.shadowRadius = 3.0; self.layer.shadowRadius = 3.0;
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/FUSEditTextFieldView.swift
...@@ -77,7 +77,7 @@ import SnapKit ...@@ -77,7 +77,7 @@ import SnapKit
self.titleLabel.textColor = .fus_textColorRich() self.titleLabel.textColor = .fus_textColorRich()
self.titleLabel.font = .fus_themeMediumFont(16) self.titleLabel.font = .fus_themeMediumFont(16)
self.titleLabel.text = .fus_versionLocalString("新增收藏") self.titleLabel.text = .fus_localString("新增收藏")
self.contentView.addSubview(self.titleLabel) self.contentView.addSubview(self.titleLabel)
self.titleLabel.snp.makeConstraints { make in self.titleLabel.snp.makeConstraints { make in
...@@ -129,7 +129,7 @@ import SnapKit ...@@ -129,7 +129,7 @@ import SnapKit
self.sureBtn.setTitleColor(.fus_textColorRich(), for: .normal) self.sureBtn.setTitleColor(.fus_textColorRich(), for: .normal)
self.sureBtn.titleLabel?.font = .fus_themeFont(15) self.sureBtn.titleLabel?.font = .fus_themeFont(15)
self.sureBtn.setTitle(.fus_versionLocalString("确认"), for: .normal) self.sureBtn.setTitle(.fus_localString("确认"), for: .normal)
self.contentView.addSubview(self.sureBtn) self.contentView.addSubview(self.sureBtn)
self.sureBtn.titleLabel?.sizeToFit() self.sureBtn.titleLabel?.sizeToFit()
......
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>73</integer> <integer>75</integer>
</dict> </dict>
<key>FUSChatCenterModule.xcscheme_^#shared#^_</key> <key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>74</integer> <integer>76</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSChatCenterModule/FUSChatCenterModule/FUSChatCenterBundle.bundle/FUSChatCenterAssets.xcassets/VideoChat/live_chat_icon_gift_type2.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_chat_icon_gift_type2@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_chat_icon_gift_type2@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/View/ToolViews/VideoChat/FUSVideoChatCommunicationView.m
...@@ -115,8 +115,9 @@ ...@@ -115,8 +115,9 @@
self.giftBtn = [UIButton buttonWithType:UIButtonTypeCustom]; self.giftBtn = [UIButton buttonWithType:UIButtonTypeCustom];
self.giftBtn.frame = CGRectMake(0, 0, bottomSize, bottomSize); self.giftBtn.frame = CGRectMake(0, 0, bottomSize, bottomSize);
self.giftBtn.centerX = UIView.fus_screenW / 6.0f * 5.0f; self.giftBtn.centerX = UIView.fus_screenW / 6.0f * 5.0f;
[self.giftBtn setImage:[FUSChatCenterBunble imageNamed:@"video_chat_gift_normal"] forState:UIControlStateNormal]; // [self.giftBtn setImage:[FUSChatCenterBunble imageNamed:@"video_chat_gift_normal"] forState:UIControlStateNormal];
[self.giftBtn setImage:[FUSChatCenterBunble imageNamed:@"video_chat_gift_highlight"] forState:UIControlStateHighlighted]; // [self.giftBtn setImage:[FUSChatCenterBunble imageNamed:@"video_chat_gift_highlight"] forState:UIControlStateHighlighted];
[self.giftBtn setImage:[FUSChatCenterBunble imageNamed:@"live_chat_icon_gift_type2"] forState:UIControlStateNormal];
[self.giftBtn addTarget:self action:@selector(fus_showGiftView) forControlEvents:UIControlEventTouchUpInside]; [self.giftBtn addTarget:self action:@selector(fus_showGiftView) forControlEvents:UIControlEventTouchUpInside];
[self.functionView addSubview:self.giftBtn]; [self.functionView addSubview:self.giftBtn];
} }
......
Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/View/ToolViews/VideoChat/FUSVoiceChatCommunicationView.m
...@@ -95,8 +95,9 @@ ...@@ -95,8 +95,9 @@
self.giftBtn = [UIButton buttonWithType:UIButtonTypeCustom]; self.giftBtn = [UIButton buttonWithType:UIButtonTypeCustom];
self.giftBtn.frame = CGRectMake(0, 0, bottomSize, bottomSize); self.giftBtn.frame = CGRectMake(0, 0, bottomSize, bottomSize);
self.giftBtn.centerX = UIView.fus_screenW * 7.0f / 8.0f; self.giftBtn.centerX = UIView.fus_screenW * 7.0f / 8.0f;
[self.giftBtn setImage:[FUSChatCenterBunble imageNamed:@"video_chat_gift_normal"] forState:UIControlStateNormal]; // [self.giftBtn setImage:[FUSChatCenterBunble imageNamed:@"video_chat_gift_normal"] forState:UIControlStateNormal];
[self.giftBtn setImage:[FUSChatCenterBunble imageNamed:@"video_chat_gift_highlight"] forState:UIControlStateHighlighted]; // [self.giftBtn setImage:[FUSChatCenterBunble imageNamed:@"video_chat_gift_highlight"] forState:UIControlStateHighlighted];
[self.giftBtn setImage:[FUSChatCenterBunble imageNamed:@"live_chat_icon_gift_type2"] forState:UIControlStateNormal];
[self.giftBtn addTarget:self action:@selector(fus_showGiftView) forControlEvents:UIControlEventTouchUpInside]; [self.giftBtn addTarget:self action:@selector(fus_showGiftView) forControlEvents:UIControlEventTouchUpInside];
[self.functionView addSubview:self.giftBtn]; [self.functionView addSubview:self.giftBtn];
......
Modules/FUSChatCenterModule/FUSChatCenterModule/Features/ZhaiXin/Main/View/FUSSingleChatTableViewCell.m
...@@ -105,7 +105,8 @@ ...@@ -105,7 +105,8 @@
} }
} else if ([_model.typeId hasPrefix:FUSChatPublicDefine.fus_officialMsgType]) { } else if ([_model.typeId hasPrefix:FUSChatPublicDefine.fus_officialMsgType]) {
_nameLabel.text = @"FuSi Service"; _nameLabel.text = @"FuSi Service";
[_headPicImageView setImage:[FUSChatCenterBunble imageNamed:@"ZhaiXin_Cell_Official"]]; // [_headPicImageView setImage:[FUSChatCenterBunble imageNamed:@"ZhaiXin_Cell_Official"]];
[_headPicImageView setImage:[FUSChatCenterBunble imageNamed:@"ZhaiXin_Cell_Notification"]];
} else if ([_model.typeId hasPrefix:FUSChatPublicDefine.fus_notificationMsgType]) { } else if ([_model.typeId hasPrefix:FUSChatPublicDefine.fus_notificationMsgType]) {
_nameLabel.text = @"FuSi Notice"; _nameLabel.text = @"FuSi Notice";
[_headPicImageView setImage:[FUSChatCenterBunble imageNamed:@"ZhaiXin_Cell_Notification"]]; [_headPicImageView setImage:[FUSChatCenterBunble imageNamed:@"ZhaiXin_Cell_Notification"]];
......
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/live_setting_quickChat_edit_tipsSample.imageset/Contents.json
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "live_setting_quickChat_edit_tipsSample@2x.png", "filename" : "20241023-143652.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/View/AlertView/FUSSevenDayCheckinAlertView.m
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
self.titleLabel.textColor = [UIColor fus_textColorRich]; self.titleLabel.textColor = [UIColor fus_textColorRich];
self.titleLabel.textAlignment = NSTextAlignmentCenter; self.titleLabel.textAlignment = NSTextAlignmentCenter;
self.titleLabel.font = [UIFont fus_themeBoldFont:16]; self.titleLabel.font = [UIFont fus_themeBoldFont:16];
self.titleLabel.text = [NSString fus_versionLocalString:@"新玩家连续7天签到"]; self.titleLabel.text = [NSString fus_localString:@"新玩家连续7天签到"];
self.titleLabel.numberOfLines = 2; self.titleLabel.numberOfLines = 2;
// self.titleLabel.strokeColor = [UIColor colorWithHex:@"#03636C"]; // self.titleLabel.strokeColor = [UIColor colorWithHex:@"#03636C"];
// self.titleLabel.strokeWidth = 0.5; // self.titleLabel.strokeWidth = 0.5;
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
self.subtitleLabel.font = [UIFont fus_themeMediumFont:12]; self.subtitleLabel.font = [UIFont fus_themeMediumFont:12];
self.subtitleLabel.textAlignment = NSTextAlignmentCenter; self.subtitleLabel.textAlignment = NSTextAlignmentCenter;
self.subtitleLabel.numberOfLines = 2; self.subtitleLabel.numberOfLines = 2;
self.subtitleLabel.text = [NSString fus_versionLocalString:@"新玩家连续登录签到获得奖励"]; self.subtitleLabel.text = [NSString fus_localString:@"新玩家连续登录签到获得奖励"];
[self.contentView addSubview:self.subtitleLabel]; [self.contentView addSubview:self.subtitleLabel];
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
[self.contentView addSubview:self.collectionView]; [self.contentView addSubview:self.collectionView];
self.noticeRemindBtn = [UIButton buttonWithType:UIButtonTypeCustom]; self.noticeRemindBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[self.noticeRemindBtn setTitle:[NSString fus_versionLocalString:@"签到提醒"] forState:UIControlStateNormal]; [self.noticeRemindBtn setTitle:[NSString fus_localString:@"签到提醒"] forState:UIControlStateNormal];
[self.noticeRemindBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal]; [self.noticeRemindBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
self.noticeRemindBtn.titleLabel.font = [UIFont fus_themeFont:13]; self.noticeRemindBtn.titleLabel.font = [UIFont fus_themeFont:13];
self.noticeRemindBtn.imageEdgeInsets = UIEdgeInsetsMake(0, -2, 0, 2); self.noticeRemindBtn.imageEdgeInsets = UIEdgeInsetsMake(0, -2, 0, 2);
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
self.checkInBtn.frame = CGRectMake(0, 0, 233, 40); self.checkInBtn.frame = CGRectMake(0, 0, 233, 40);
self.checkInBtn.style = FUSButtonStyleBlue; self.checkInBtn.style = FUSButtonStyleBlue;
self.checkInBtn.titleLabel.font = [UIFont fus_themeMediumFont:15]; self.checkInBtn.titleLabel.font = [UIFont fus_themeMediumFont:15];
[self.checkInBtn setTitle:[NSString fus_versionLocalString:@"签到"] forState:UIControlStateNormal]; [self.checkInBtn setTitle:[NSString fus_localString:@"签到"] forState:UIControlStateNormal];
self.checkInBtn.layer.cornerRadius = 20; self.checkInBtn.layer.cornerRadius = 20;
self.checkInBtn.layer.masksToBounds = YES; self.checkInBtn.layer.masksToBounds = YES;
[self.contentView addSubview:self.checkInBtn]; [self.contentView addSubview:self.checkInBtn];
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/View/AlertView/View/FUSNewUserMultiRewardItemCell.swift
...@@ -64,7 +64,7 @@ public class FUSNewUserMultiRewardItemCell: FUSSwiftCollectionViewCell { ...@@ -64,7 +64,7 @@ public class FUSNewUserMultiRewardItemCell: FUSSwiftCollectionViewCell {
self.addedRewardView.backgroundColor = .init(white: 0, alpha: 0.3) self.addedRewardView.backgroundColor = .init(white: 0, alpha: 0.3)
self.contentView.addSubview(self.addedRewardView) self.contentView.addSubview(self.addedRewardView)
self.addedRewardTipLabel.text = .fus_versionLocalString("首充加赠") self.addedRewardTipLabel.text = .fus_localString("首充加赠")
self.addedRewardTipLabel.textColor = .fus_textColorRich() self.addedRewardTipLabel.textColor = .fus_textColorRich()
self.addedRewardTipLabel.font = .fus_themeMediumFont(7) self.addedRewardTipLabel.font = .fus_themeMediumFont(7)
self.addedRewardTipLabel.textAlignment = .center self.addedRewardTipLabel.textAlignment = .center
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FunctionViewHelper/FUSLiveChatDataSourceHelper.m
...@@ -974,7 +974,8 @@ ...@@ -974,7 +974,8 @@
shadow.shadowOffset = CGSizeMake(.8, .8); shadow.shadowOffset = CGSizeMake(.8, .8);
shadow.shadowBlurRadius = 1.0; shadow.shadowBlurRadius = 1.0;
NSMutableAttributedString *atNameStr = [NSMutableAttributedString fus_createAttributedLabelStringForString:model.atNameStr withTextColor:[UIColor colorWithHex:model.atNameColour] font:FUS_LIVE_FONT(fontSize) needShadow:YES]; // 处理艾特的语句
NSMutableAttributedString *atNameStr = [NSMutableAttributedString fus_createAttributedLabelStringForString:[NSString stringWithFormat:@" @%@",model.atNameStr] withTextColor:[UIColor colorWithHex:model.atNameColour] font:FUS_LIVE_FONT(fontSize) needShadow:YES];
[attr appendAttributedString:atNameStr]; [attr appendAttributedString:atNameStr];
} }
...@@ -1803,7 +1804,7 @@ ...@@ -1803,7 +1804,7 @@
UILabel *patTitleLabel = [[UILabel alloc] init]; UILabel *patTitleLabel = [[UILabel alloc] init];
patTitleLabel.font = [UIFont fus_themeFont:_fontSize - 4]; patTitleLabel.font = [UIFont fus_themeFont:_fontSize - 4];
patTitleLabel.textColor = [UIColor colorWithHex:@"#22222B"]; patTitleLabel.textColor = [UIColor colorWithHex:@"#22222B"];
patTitleLabel.text = [NSString fus_versionLocalString:@"撩一撩"]; patTitleLabel.text = [NSString fus_localString:@"撩一撩"];
[patTitleLabel sizeToFit]; [patTitleLabel sizeToFit];
patTitleLabel.x = CGRectGetMaxX(patImageView.frame) + 2; patTitleLabel.x = CGRectGetMaxX(patImageView.frame) + 2;
patTitleLabel.centerY = (_fontSize + 2) / 2; patTitleLabel.centerY = (_fontSize + 2) / 2;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FUSLiveFunctionView.m
...@@ -605,7 +605,7 @@ UIGestureRecognizerDelegate ...@@ -605,7 +605,7 @@ UIGestureRecognizerDelegate
_headView.delegate = self; _headView.delegate = self;
[[self fus_viewWithLayer:FUSLiveFunctionLayerRoomInfos] addSubview:_headView]; [[self fus_viewWithLayer:FUSLiveFunctionLayerRoomInfos] addSubview:_headView];
self.popularView = [[FUSPopularProgressView alloc] initWithFrame:CGRectMake(12, self.headView.bottom, 60, 60)]; self.popularView = [[FUSPopularProgressView alloc] initWithFrame:CGRectMake(12, self.headView.bottom, 75, 75)];
__weak typeof(self) weakSelf = self; __weak typeof(self) weakSelf = self;
self.popularView.tapPopularViewHandler = ^{ self.popularView.tapPopularViewHandler = ^{
[weakSelf fus_headViewClickHeatPower]; [weakSelf fus_headViewClickHeatPower];
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/HeadView/FUSLivePortraitView.m
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#import <SJAttributesFactory/SJAttributesFactory.h> #import <SJAttributesFactory/SJAttributesFactory.h>
#define LIKE_BTN_MARGIN 4 #define LIKE_BTN_MARGIN 4
#define MAX_NICKNAME_WIDTH 90 #define MAX_NICKNAME_WIDTH 70
@interface FUSLivePortraitView () @interface FUSLivePortraitView ()
...@@ -333,20 +333,6 @@ ...@@ -333,20 +333,6 @@
// // 赋值文字内容 // // 赋值文字内容
// [_audienceBtn setTitle:0 forState:UIControlStateNormal]; // [_audienceBtn setTitle:0 forState:UIControlStateNormal];
// } // }
NSString *ageStr = @"0";
NSString *addrStr = @"";
if ([model.roomId isEqualToString:[FUSCacheDataShare shareStore].userDetailInfo.roomId]) {
ageStr = [FUSCacheDataShare shareStore].userDetailInfo.age;
addrStr = [FUSCacheDataShare shareStore].userDetailInfo.addr;
}else {
for (FUSBaoFangAnchorModel *tempModel in [FUSLiveHelper shareInstance].rooms) {
if ([model.roomId isEqualToString:tempModel.roomId]) {
ageStr = tempModel.age;
addrStr = tempModel.addr;
break;
}
}
}
_autoScrollMsgLabel.attributedText = [NSAttributedString sj_UIKitText:^(id<SJUIKitTextMakerProtocol> _Nonnull make) { _autoScrollMsgLabel.attributedText = [NSAttributedString sj_UIKitText:^(id<SJUIKitTextMakerProtocol> _Nonnull make) {
make.appendImage(^(id<SJUTImageAttachment> _Nonnull make) { make.appendImage(^(id<SJUTImageAttachment> _Nonnull make) {
make.image = model.sex.integerValue == 0 ? [[UIImage fus_girlIcon] resizedImageToSize:CGSizeMake(5, 8)] : [[UIImage fus_boyIcon] resizedImageToSize:CGSizeMake(8, 8)]; make.image = model.sex.integerValue == 0 ? [[UIImage fus_girlIcon] resizedImageToSize:CGSizeMake(5, 8)] : [[UIImage fus_boyIcon] resizedImageToSize:CGSizeMake(8, 8)];
...@@ -354,9 +340,9 @@ ...@@ -354,9 +340,9 @@
// make.bounds = CGRectMake(0, 0, 8, 8); // make.bounds = CGRectMake(0, 0, 8, 8);
}); });
make.append(@" "); make.append(@" ");
make.append(ageStr).textColor(model.sex.integerValue == 0 ? [UIColor colorWithHex:@"#FE96B0"] : [UIColor colorWithHex:@"#76C4FF"]); make.append(model.age).textColor(model.sex.integerValue == 0 ? [UIColor colorWithHex:@"#FE96B0"] : [UIColor colorWithHex:@"#76C4FF"]);
make.append(@" "); make.append(@" ");
make.append(addrStr).textColor([UIColor colorWithHex:@"#BBBAB8"]); make.append(model.addr).textColor([UIColor colorWithHex:@"#BBBAB8"]);
make.font([UIFont fus_themeFont:10]); make.font([UIFont fus_themeFont:10]);
}]; }];
// 更新 Frame // 更新 Frame
...@@ -369,15 +355,28 @@ ...@@ -369,15 +355,28 @@
[_autoScrollNicknameLabel sizeToFit]; [_autoScrollNicknameLabel sizeToFit];
_autoScrollNicknameLabel.height = 13; _autoScrollNicknameLabel.height = 13;
NSLog(@"_autoScrollNicknameLabel.width :%f _autoScrollMsgLabel.width: %f",_autoScrollNicknameLabel.width, _autoScrollMsgLabel.width); CGFloat nickNameLabelWidth = [_autoScrollNicknameLabel.text sizeWithFont:[UIFont fus_themeFont:11] maxWidth:MAXFLOAT].width;
CGFloat msgLabelWidth = [_autoScrollMsgLabel.attributedText boundingRectWithSize:CGSizeMake(MAXFLOAT, 13) options:NSStringDrawingUsesFontLeading | NSStringDrawingUsesLineFragmentOrigin context:nil].size.width;
// NSLog(@"_autoScrollNicknameLabel.width :%f _autoScrollMsgLabel.width: %f",nickNameLabelWidth, msgLabelWidth);
NSLog(@"weewhwwege:%f",MAX_NICKNAME_WIDTH);
// 如果超过最大长度， // 如果超过最大长度，
if (MAX(_autoScrollNicknameLabel.width, _autoScrollMsgLabel.width) > MAX_NICKNAME_WIDTH) { if (MAX(nickNameLabelWidth, msgLabelWidth) > MAX_NICKNAME_WIDTH) {
_autoScrollNicknameLabel.width = MAX_NICKNAME_WIDTH; _autoScrollNicknameLabel.width = MAX_NICKNAME_WIDTH;
_autoScrollMsgLabel.width = MAX_NICKNAME_WIDTH; _autoScrollMsgLabel.width = MAX_NICKNAME_WIDTH;
}else if (_autoScrollNicknameLabel.width < _autoScrollMsgLabel.width) { }else if (nickNameLabelWidth < msgLabelWidth) {
_autoScrollNicknameLabel.width = _autoScrollMsgLabel.width; _autoScrollNicknameLabel.width = msgLabelWidth;
_autoScrollMsgLabel.width = msgLabelWidth;
}else {
_autoScrollNicknameLabel.width = nickNameLabelWidth;
_autoScrollMsgLabel.width = nickNameLabelWidth;
} }
// if (MAX(_autoScrollNicknameLabel.width, _autoScrollMsgLabel.width) > MAX_NICKNAME_WIDTH) {
// _autoScrollNicknameLabel.width = MAX_NICKNAME_WIDTH;
// _autoScrollMsgLabel.width = MAX_NICKNAME_WIDTH;
// }else if (_autoScrollNicknameLabel.width < _autoScrollMsgLabel.width) {
// _autoScrollNicknameLabel.width = _autoScrollMsgLabel.width;
// }
// 更新 View // 更新 View
[self updateFrameWithAnimate:animate]; [self updateFrameWithAnimate:animate];
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/LiveSettingAlertView/FUSLiveAnchorSettingAlertView.m
...@@ -176,8 +176,8 @@ ...@@ -176,8 +176,8 @@
if ([FUSLiveHelper shareInstance].roomInfoModel.stateSwitch) { if ([FUSLiveHelper shareInstance].roomInfoModel.stateSwitch) {
FUSLiveAnchorSettingModel *quickChatItem = [[FUSLiveAnchorSettingModel alloc] init]; FUSLiveAnchorSettingModel *quickChatItem = [[FUSLiveAnchorSettingModel alloc] init];
quickChatItem.title = [NSString fus_versionLocalString:@"快捷发言"]; quickChatItem.title = [NSString fus_localString:@"快捷发言"];
quickChatItem.subtitle = [NSString fus_versionLocalString:@"关闭后您将看不到主播设置的快捷发言内容"]; quickChatItem.subtitle = [NSString fus_localString:@"关闭后您将看不到主播设置的快捷发言内容"];
quickChatItem.switchState = [FUSCacheDataShare shareStore].quickChatShowState; quickChatItem.switchState = [FUSCacheDataShare shareStore].quickChatShowState;
quickChatItem.switchStateHandler = ^(BOOL switchState) { quickChatItem.switchStateHandler = ^(BOOL switchState) {
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/Other/FUSLiveChatEasySendView.swift
...@@ -261,7 +261,7 @@ class FUSLiveChatEasySendItemView: UIView { ...@@ -261,7 +261,7 @@ class FUSLiveChatEasySendItemView: UIView {
UINotificationFeedbackGenerator().notificationOccurred(.success) UINotificationFeedbackGenerator().notificationOccurred(.success)
self?.clickHandle?() self?.clickHandle?()
}else { }else {
FUSDialogView.fus_showDialog(.fus_versionLocalString("您的手速太快了")) FUSDialogView.fus_showDialog(.fus_localString("您的手速太快了"))
} }
}).disposed(by: disposeBag) }).disposed(by: disposeBag)
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/Other/FUSLiveQuickChatSetAlertView.m
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
// 创建并添加标题标签 // 创建并添加标题标签
self.titleLabel = [[UILabel alloc] init]; self.titleLabel = [[UILabel alloc] init];
self.titleLabel.text = [NSString fus_versionLocalString:@"快捷发言设置"]; self.titleLabel.text = [NSString fus_localString:@"快捷发言设置"];
self.titleLabel.font = [UIFont fus_themeBoldFont:17]; self.titleLabel.font = [UIFont fus_themeBoldFont:17];
self.titleLabel.textColor = [UIColor fus_textColorRich]; self.titleLabel.textColor = [UIColor fus_textColorRich];
[self.contentView addSubview:self.titleLabel]; [self.contentView addSubview:self.titleLabel];
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
// 创建并配置空视图 // 创建并配置空视图
self.emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, self.width, 200)]; self.emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, self.width, 200)];
[self.emptyView fus_setEmptyViewIcon:[UIImage fus_emptyImg] title:[NSString fus_versionLocalString:@"暂无快捷发言"] buttonTittle:nil]; [self.emptyView fus_setEmptyViewIcon:[UIImage fus_emptyImg] title:[NSString fus_localString:@"暂无快捷发言"] buttonTittle:nil];
self.emptyView.backgroundColor = [UIColor clearColor]; self.emptyView.backgroundColor = [UIColor clearColor];
[self.tableView addSubview:self.emptyView]; [self.tableView addSubview:self.emptyView];
self.emptyView.hidden = YES; self.emptyView.hidden = YES;
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
/// 删除快捷发言 /// 删除快捷发言
-(void)fus_handleQuickChatDelete:(FUSRoomQuickChatListModel *)model{ -(void)fus_handleQuickChatDelete:(FUSRoomQuickChatListModel *)model{
MJWeakSelf MJWeakSelf
[FUSAlertView showAlertWithTitle:[NSString fus_versionLocalString:@"删除快捷发言"] message:[NSString stringWithFormat:[NSString fus_versionLocalString:@"是否确定删除 “%@”"], model.msg] cancelButtonTitle:[NSString fus_localString:@"取消"] otherButtonTitles:@[[NSString fus_localString:@"确定"]] clickBlock:^(NSInteger buttonIndex) { [FUSAlertView showAlertWithTitle:[NSString fus_localString:@"删除快捷发言"] message:[NSString stringWithFormat:[NSString fus_localString:@"是否确定删除 “%@”"], model.msg] cancelButtonTitle:[NSString fus_localString:@"取消"] otherButtonTitles:@[[NSString fus_localString:@"确定"]] clickBlock:^(NSInteger buttonIndex) {
if (buttonIndex == 1) { if (buttonIndex == 1) {
[FUSLiveHttpHelper fus_requestRoomQuickChatDelWithRoomId:[FUSLiveHelper shareInstance].roomInfoModel.roomId sid:model.sid succeed:^{ [FUSLiveHttpHelper fus_requestRoomQuickChatDelWithRoomId:[FUSLiveHelper shareInstance].roomInfoModel.roomId sid:model.sid succeed:^{
...@@ -165,10 +165,10 @@ ...@@ -165,10 +165,10 @@
-(void)fus_handleQuickChatEdit:(FUSRoomQuickChatListModel *)model{ -(void)fus_handleQuickChatEdit:(FUSRoomQuickChatListModel *)model{
MJWeakSelf MJWeakSelf
[FUSEditTextFieldView fus_createWithAnimationWithShowOn:self title:[NSString fus_versionLocalString:@"编辑快捷发言"] placeholder:[NSString fus_versionLocalString:@"输入快捷发言内容"] text:model.msg textMaxLength:20 clickHandler:^(NSString * _Nonnull text, void (^ _Nonnull dismiss)(void)) { [FUSEditTextFieldView fus_createWithAnimationWithShowOn:self title:[NSString fus_localString:@"编辑快捷发言"] placeholder:[NSString fus_localString:@"输入快捷发言内容"] text:model.msg textMaxLength:20 clickHandler:^(NSString * _Nonnull text, void (^ _Nonnull dismiss)(void)) {
if (text.length <= 0) { if (text.length <= 0) {
[FUSDialogView fus_showDialog:[NSString fus_versionLocalString:@"输入快捷发言内容"]]; [FUSDialogView fus_showDialog:[NSString fus_localString:@"输入快捷发言内容"]];
return; return;
} }
...@@ -187,10 +187,10 @@ ...@@ -187,10 +187,10 @@
/// 新增快捷发言 /// 新增快捷发言
-(void)fus_handleQuickChatAdd{ -(void)fus_handleQuickChatAdd{
MJWeakSelf MJWeakSelf
[FUSEditTextFieldView fus_createWithAnimationWithShowOn:self title:[NSString fus_versionLocalString:@"新增快捷发言"] placeholder:[NSString fus_versionLocalString:@"输入快捷发言内容"] text:@"" textMaxLength:20 clickHandler:^(NSString * _Nonnull text, void (^ _Nonnull dismiss)(void)) { [FUSEditTextFieldView fus_createWithAnimationWithShowOn:self title:[NSString fus_localString:@"新增快捷发言"] placeholder:[NSString fus_localString:@"输入快捷发言内容"] text:@"" textMaxLength:20 clickHandler:^(NSString * _Nonnull text, void (^ _Nonnull dismiss)(void)) {
if (text.length <= 0) { if (text.length <= 0) {
[FUSDialogView fus_showDialog:[NSString fus_versionLocalString:@"输入快捷发言内容"]]; [FUSDialogView fus_showDialog:[NSString fus_localString:@"输入快捷发言内容"]];
return; return;
} }
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/Other/FUSLiveQuickChatSetTipsAlertView.m
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
self.titleLabel = [[UILabel alloc] init]; self.titleLabel = [[UILabel alloc] init];
self.titleLabel.font = [UIFont fus_themeBoldFont:20]; self.titleLabel.font = [UIFont fus_themeBoldFont:20];
self.titleLabel.textColor = [UIColor fus_textColorRich]; self.titleLabel.textColor = [UIColor fus_textColorRich];
self.titleLabel.text = [NSString fus_versionLocalString:@"快捷发言说明"]; self.titleLabel.text = [NSString fus_localString:@"快捷发言说明"];
self.titleLabel.textAlignment = NSTextAlignmentCenter; self.titleLabel.textAlignment = NSTextAlignmentCenter;
[self.contentView addSubview:self.titleLabel]; [self.contentView addSubview:self.titleLabel];
[self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) { [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
self.contentLabel.font = [UIFont fus_themeFont:14]; self.contentLabel.font = [UIFont fus_themeFont:14];
self.contentLabel.textColor = [UIColor fus_textColorMedium]; self.contentLabel.textColor = [UIColor fus_textColorMedium];
self.contentLabel.numberOfLines = 0; self.contentLabel.numberOfLines = 0;
self.contentLabel.text = [NSString fus_versionLocalString:@"设置快捷发言后，观众可以点击快捷发言按钮，直接发送你已设置好的消息内容。你最多可设置4条快捷发言。"]; self.contentLabel.text = [NSString fus_localString:@"设置快捷发言后，观众可以点击快捷发言按钮，直接发送你已设置好的消息内容。你最多可设置4条快捷发言。"];
[self.contentView addSubview:self.contentLabel]; [self.contentView addSubview:self.contentLabel];
[self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) { [self.contentLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.tipsImgView.mas_bottom).offset(24); make.top.equalTo(self.tipsImgView.mas_bottom).offset(24);
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/Other/FUSPatAudienceGiftCell.swift
...@@ -73,9 +73,9 @@ import UIKit ...@@ -73,9 +73,9 @@ 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_versionLocalString("关注") nameLabel.text = .fus_localString("关注")
costBtn.setImage(nil, for: .normal) costBtn.setImage(nil, for: .normal)
costBtn.setTitle(.fus_versionLocalString("免费"), for: .normal) costBtn.setTitle(.fus_localString("免费"), for: .normal)
costBtn.setTitleColor(.fus_textColorMedium(), for: .normal) costBtn.setTitleColor(.fus_textColorMedium(), for: .normal)
}else if model.fus_modelType == 0 { }else if model.fus_modelType == 0 {
...@@ -83,7 +83,7 @@ import UIKit ...@@ -83,7 +83,7 @@ import UIKit
nameLabel.text = model.giftName nameLabel.text = model.giftName
costBtn.setImage(fus_getCurrencyImage(giftCurrency: model.giftCurrency), for: .normal) costBtn.setImage(fus_getCurrencyImage(giftCurrency: model.giftCurrency), for: .normal)
costBtn.setTitle(" \(model.giftPrice)", for: .normal) costBtn.setTitle(" \(model.giftPrice)", for: .normal)
costBtn.setTitleColor(.fus_theme(), for: .normal) costBtn.setTitleColor(.fus_diamondBlue(), for: .normal)
} }
} }
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/Other/FUSPatAudiencePromptAlertView.m
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
}]; }];
self.patTextLabel = [[UILabel alloc] init]; self.patTextLabel = [[UILabel alloc] init];
self.patTextLabel.text = [NSString fus_versionLocalString:@"撩了撩你"]; self.patTextLabel.text = [NSString fus_localString:@"撩了撩你"];
self.patTextLabel.font = [UIFont fus_themeFont:14]; self.patTextLabel.font = [UIFont fus_themeFont:14];
self.patTextLabel.textColor = [UIColor fus_textColorRich]; self.patTextLabel.textColor = [UIColor fus_textColorRich];
[self.contentView addSubview:self.patTextLabel]; [self.contentView addSubview:self.patTextLabel];
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
}]; }];
self.giftTextLabel = [[UILabel alloc] init]; self.giftTextLabel = [[UILabel alloc] init];
self.giftTextLabel.text = [NSString fus_versionLocalString:@"回撩她并送出礼物"]; self.giftTextLabel.text = [NSString fus_localString:@"回撩她并送出礼物"];
self.giftTextLabel.font = [UIFont fus_themeFont:14]; self.giftTextLabel.font = [UIFont fus_themeFont:14];
self.giftTextLabel.textColor = [UIColor fus_textColorRich]; self.giftTextLabel.textColor = [UIColor fus_textColorRich];
[self.contentView addSubview:self.giftTextLabel]; [self.contentView addSubview:self.giftTextLabel];
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
self.cancelBtn.backgroundColor = [UIColor colorWithHex:@"#DBDAD9"]; self.cancelBtn.backgroundColor = [UIColor colorWithHex:@"#DBDAD9"];
[self.cancelBtn setTitleColor:[UIColor colorWithHex:@"#333333"] forState:UIControlStateNormal]; [self.cancelBtn setTitleColor:[UIColor colorWithHex:@"#333333"] forState:UIControlStateNormal];
self.cancelBtn.titleLabel.font = [UIFont fus_themeMediumFont:14]; self.cancelBtn.titleLabel.font = [UIFont fus_themeMediumFont:14];
[self.cancelBtn setTitle:[NSString fus_versionLocalString:@"取消"] forState:UIControlStateNormal]; [self.cancelBtn setTitle:[NSString fus_localString:@"取消"] forState:UIControlStateNormal];
self.cancelBtn.layer.cornerRadius = 21; self.cancelBtn.layer.cornerRadius = 21;
self.cancelBtn.layer.masksToBounds = YES; self.cancelBtn.layer.masksToBounds = YES;
[self.contentView addSubview:self.cancelBtn]; [self.contentView addSubview:self.cancelBtn];
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
self.okBtn.backgroundColor = [UIColor fus_themeColor]; self.okBtn.backgroundColor = [UIColor fus_themeColor];
[self.okBtn setTitleColor:[UIColor colorWithHex:@"#22222B"] forState:UIControlStateNormal]; [self.okBtn setTitleColor:[UIColor colorWithHex:@"#22222B"] forState:UIControlStateNormal];
self.okBtn.titleLabel.font = [UIFont fus_themeMediumFont:14]; self.okBtn.titleLabel.font = [UIFont fus_themeMediumFont:14];
[self.okBtn setTitle:[NSString fus_versionLocalString:@"回撩"] forState:UIControlStateNormal]; [self.okBtn setTitle:[NSString fus_localString:@"回撩"] forState:UIControlStateNormal];
self.okBtn.layer.cornerRadius = 21; self.okBtn.layer.cornerRadius = 21;
self.okBtn.layer.masksToBounds = YES; self.okBtn.layer.masksToBounds = YES;
[self.contentView addSubview:self.okBtn]; [self.contentView addSubview:self.okBtn];
...@@ -230,14 +230,17 @@ ...@@ -230,14 +230,17 @@
MJWeakSelf MJWeakSelf
[FUSLoadingView fus_showProgressViewWithMessage:@"" canTouchBottomView:NO]; [FUSLoadingView fus_showProgressViewWithMessage:@"" canTouchBottomView: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;
[[FUSLiveHelper shareInstance].currentFunctionView fus_showClickLikeAnimateWithIsFollow:YES]; [[FUSLiveHelper shareInstance].currentFunctionView fus_showClickLikeAnimateWithIsFollow:YES];
[weakSelf fus_dismissWithAnimation]; [weakSelf fus_dismissWithAnimation];
} failure:^(NSString *msg, NSInteger code) { } failure:^(NSString *msg, NSInteger code) {
[FUSLoadingView fus_dismissProgressView]; [FUSLoadingView fus_dismissProgressView];
weakSelf.okBtn.userInteractionEnabled = YES;
[FUSDialogView fus_showDialog:msg]; [FUSDialogView fus_showDialog:msg];
}]; }];
}else { }else {
...@@ -245,6 +248,7 @@ ...@@ -245,6 +248,7 @@
MJWeakSelf MJWeakSelf
[FUSLiveHttpHelper fus_livePatReplyWithRoomId:self.roomId type:2 gid:giftModel.gid succeed:^(NSMutableDictionary *changed) { [FUSLiveHttpHelper fus_livePatReplyWithRoomId:self.roomId type:2 gid:giftModel.gid succeed:^(NSMutableDictionary *changed) {
[FUSLoadingView fus_dismissProgressView]; [FUSLoadingView fus_dismissProgressView];
weakSelf.okBtn.userInteractionEnabled = YES;
NSInteger lastTime = [FUSCacheDataShare shareStore].lastUpdateAccountInfoTime; NSInteger lastTime = [FUSCacheDataShare shareStore].lastUpdateAccountInfoTime;
NSInteger serverTime = [changed[@"lastTime"] integerValue]; NSInteger serverTime = [changed[@"lastTime"] integerValue];
...@@ -288,6 +292,7 @@ ...@@ -288,6 +292,7 @@
} failure:^(NSString *msg, NSInteger code) { } failure:^(NSString *msg, NSInteger code) {
[FUSLoadingView fus_dismissProgressView]; [FUSLoadingView fus_dismissProgressView];
[FUSDialogView fus_showDialog:msg]; [FUSDialogView fus_showDialog:msg];
weakSelf.okBtn.userInteractionEnabled = YES;
if (code == -116) { if (code == -116) {
// 兑换露水 // 兑换露水
...@@ -423,9 +428,9 @@ ...@@ -423,9 +428,9 @@
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_versionLocalString:@"回撩她并关注"]; self.giftTextLabel.text = [NSString fus_localString:@"回撩并关注"];
}else { }else {
self.giftTextLabel.text = [NSString fus_versionLocalString:@"回撩她并送出礼物"]; self.giftTextLabel.text = [NSString fus_localString:@"回撩她并送出礼物"];
} }
[collectionView reloadData]; [collectionView reloadData];
} }
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/Popular/ProgressView/FUSPopularProgressView.m
...@@ -44,14 +44,14 @@ ...@@ -44,14 +44,14 @@
self.progressView.y = self.progressBGView.height; self.progressView.y = self.progressBGView.height;
[self.progressBGView addSubview:self.progressView]; [self.progressBGView addSubview:self.progressView];
CGFloat iconWidth = 20; CGFloat iconWidth = 24;
self.iconImageView = [[UIImageView alloc] initWithImage:[FUSShowRoomCenterBunble imageNamed:@"live_heat_progress_icon"]]; self.iconImageView = [[UIImageView alloc] initWithImage:[FUSShowRoomCenterBunble imageNamed:@"live_heat_progress_icon"]];
self.iconImageView.frame = CGRectMake((self.width - iconWidth) / 2.0, 12, iconWidth, iconWidth); self.iconImageView.frame = CGRectMake((self.width - iconWidth) / 2.0, 12, iconWidth, iconWidth);
[self addSubview:self.iconImageView]; [self addSubview:self.iconImageView];
self.numberLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, self.iconImageView.bottom + 4, self.width, 16)]; self.numberLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, self.iconImageView.bottom + 5, self.width, 16)];
self.numberLabel.textColor = [UIColor whiteColor]; self.numberLabel.textColor = [UIColor whiteColor];
self.numberLabel.font = [UIFont fus_themeBoldFont:12]; self.numberLabel.font = [UIFont fus_themeBoldFont:15];
self.numberLabel.textAlignment = NSTextAlignmentCenter; self.numberLabel.textAlignment = NSTextAlignmentCenter;
self.numberLabel.text = @"0"; self.numberLabel.text = @"0";
[self addSubview:self.numberLabel]; [self addSubview:self.numberLabel];
......
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>76</integer> <integer>73</integer>
</dict> </dict>
<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key> <key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>75</integer> <integer>74</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneVideoCreditCell.m
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
- (void)awakeFromNib { - (void)awakeFromNib {
[super awakeFromNib]; [super awakeFromNib];
self.videoCreditLabel.text = [NSString fus_localString:@"私房评分"]; self.videoCreditLabel.text = [NSString fus_localString:@"私房信用"];
if (FUSLocalizationHelper.fus_currentLanguage.languageID.integerValue == 2) { if (FUSLocalizationHelper.fus_currentLanguage.languageID.integerValue == 2) {
self.connectionRateLabel.text = [NSString fus_localString:@"接通率"]; self.connectionRateLabel.text = [NSString fus_localString:@"接通率"];
} else { } else {
...@@ -75,10 +75,10 @@ ...@@ -75,10 +75,10 @@
_videoCreditDetailLabel.textColor = [UIColor fus_textColorRich]; _videoCreditDetailLabel.textColor = [UIColor fus_textColorRich];
} else if ([zoneModel.chatWith[@"succRatio"] floatValue] >= 60 && [zoneModel.chatWith[@"succRatio"] floatValue] < 90) { } else if ([zoneModel.chatWith[@"succRatio"] floatValue] >= 60 && [zoneModel.chatWith[@"succRatio"] floatValue] < 90) {
// _videoCreditDetailLabel.textColor = [UIColor colorWithHex:@"4FB7F2"]; // _videoCreditDetailLabel.textColor = [UIColor colorWithHex:@"4FB7F2"];
_videoCreditDetailLabel.textColor = [UIColor colorWithHex:@"#925EEB"]; _videoCreditDetailLabel.textColor = [UIColor colorWithHex:@"##5AC1F4"];
} else { } else {
// _videoCreditDetailLabel.textColor = [UIColor colorWithHex:@"58DBD7"]; // _videoCreditDetailLabel.textColor = [UIColor colorWithHex:@"58DBD7"];
_videoCreditDetailLabel.textColor = [UIColor colorWithHex:@"925EEB"]; _videoCreditDetailLabel.textColor = [UIColor colorWithHex:@"#5AC1F4"];
} }
_videoCreditDetailLabel.text = [NSString stringWithFormat:@"%@%%",[NSString stringWithFormat:@"%.1f",[zoneModel.chatWith[@"succRatio"] floatValue]]]; _videoCreditDetailLabel.text = [NSString stringWithFormat:@"%@%%",[NSString stringWithFormat:@"%.1f",[zoneModel.chatWith[@"succRatio"] floatValue]]];
} }
......
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