Просмотр исходного кода

[!]补充部分缺失的多语言文案

陈文艺 5 месяцев назад
Родитель
Сommit
5fa151093b

+ 0 - 4
MiMoLive/MiMoLive.xcodeproj/project.pbxproj

@@ -3187,7 +3187,6 @@
 		FB06A1882E82B3FB00A3CD51 /* iLiveData_Agora_POST.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A619FF992E40E83800F49C18 /* iLiveData_Agora_POST.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		FB06A1892E82B3FB00A3CD51 /* iLiveData_Agora_PRE.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A619FF9A2E40E83800F49C18 /* iLiveData_Agora_PRE.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		FB06A18A2E82B3FB00A3CD51 /* Fpnn.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A619FF982E40E83800F49C18 /* Fpnn.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		FB06A1B72E82B80100A3CD51 /* MOPreviewTestView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB06A1B62E82B80100A3CD51 /* MOPreviewTestView.swift */; };
 		FB249B902E9C99D30063E7FC /* MOThreeOptionAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = A6518D452E7C2BF20000FB4A /* MOThreeOptionAlertView.m */; };
 		FB34C9802E9CD91C00B9F4B5 /* MORtmToast.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB34C97F2E9CD91C00B9F4B5 /* MORtmToast.swift */; };
 		FB34C9812E9CD91C00B9F4B5 /* MORtmToast.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB34C97F2E9CD91C00B9F4B5 /* MORtmToast.swift */; };
@@ -6106,7 +6105,6 @@
 		FB0397952E98A15E0050B148 /* MODelayTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MODelayTask.swift; sourceTree = "<group>"; };
 		FB05B9512E8B834A0055885D /* UIView+SnapKit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+SnapKit.swift"; sourceTree = "<group>"; };
 		FB06A18E2E82B3FB00A3CD51 /* MiMoLive_Preview.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MiMoLive_Preview.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		FB06A1B62E82B80100A3CD51 /* MOPreviewTestView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MOPreviewTestView.swift; sourceTree = "<group>"; };
 		FB34C97F2E9CD91C00B9F4B5 /* MORtmToast.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MORtmToast.swift; sourceTree = "<group>"; };
 		FB34C9BB2E9CED6300B9F4B5 /* MORtmPkV2StatusExpand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MORtmPkV2StatusExpand.swift; sourceTree = "<group>"; };
 		FB3763AE2E77F2BE009AA0B6 /* MOLog.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MOLog.h; sourceTree = "<group>"; };
@@ -7140,7 +7138,6 @@
 				A695B2EB2AE14C140072644D /* MOImagePickerController.m */,
 				A6193D442E153E0600FB208A /* YYAnimatedImageView+iOS14.h */,
 				A6193D452E153E0600FB208A /* YYAnimatedImageView+iOS14.m */,
-				FB06A1B62E82B80100A3CD51 /* MOPreviewTestView.swift */,
 				FBCB31DB2E855651005E6E3C /* MOGradientLabel.swift */,
 				FB93FB5F2E85308E00624A7A /* MOPopupViewProtocol.swift */,
 			);
@@ -15560,7 +15557,6 @@
 				FB069CF52E82B3FB00A3CD51 /* UIImageView+Gift.m in Sources */,
 				FB069CF62E82B3FB00A3CD51 /* LiveGiftLuckView.m in Sources */,
 				FB069CF72E82B3FB00A3CD51 /* MOHomePageGiftShowCell.m in Sources */,
-				FB06A1B72E82B80100A3CD51 /* MOPreviewTestView.swift in Sources */,
 				FB069CF82E82B3FB00A3CD51 /* UIView+BarrageView.m in Sources */,
 				FB069CF92E82B3FB00A3CD51 /* QGVAPSafeMutableArray.m in Sources */,
 				FB069CFA2E82B3FB00A3CD51 /* MOLiveMsgTextCell.m in Sources */,

+ 0 - 73
MiMoLive/MiMoLive/Classes/Base/MOPreviewTestView.swift

@@ -1,73 +0,0 @@
-//
-//  MOPreviewTestView.swift
-//  MiMoLive
-//
-//  Created by OneeChan on 2025/9/23.
-//
-
-import Foundation
-import UIKit
-
-class MOPreviewTestView: UIView {
-    
-    override init(frame: CGRect) {
-        super.init(frame: frame)
-        
-        setupViews()
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-}
-
-extension MOPreviewTestView {
-    private func setupViews() {
-        let label = UILabel()
-        label.text = "this is a test"
-        addSubview(label)
-        label.snp.makeConstraints { make in
-            make.leading.top.equalToSuperview()
-        }
-        
-        let image = UIImageView()
-        image.image = UIImage(named: "icon_head_bgImg")
-        addSubview(image)
-        image.snp.makeConstraints { make in
-            make.leading.equalToSuperview()
-            make.top.equalTo(label.snp.bottom)
-        }
-        
-        let button = UIButton()
-        button.backgroundColor = .red
-        button.setTitle("I'm Button", for: .normal)
-        addSubview(button)
-        button.snp.makeConstraints { make in
-            make.leading.equalToSuperview()
-            make.top.equalTo(image.snp.bottom)
-            make.bottom.equalToSuperview()
-        }
-    }
-}
-
-//import SwiftUI
-//
-//struct MOPreviewTestViewPreview: UIViewRepresentable {
-//    func makeUIView(context: Context) -> some UIView {
-//        let view = UIView()
-//        let testView = MOPreviewTestView()
-//        view.addSubview(testView)
-//        testView.snp.makeConstraints { make in
-//            make.leading.centerY.equalToSuperview()
-//        }
-//        return view
-//    }
-//    
-//    func updateUIView(_ uiView: UIViewType, context: Context) {
-//        
-//    }
-//}
-//
-//#Preview {
-//    MOPreviewTestViewPreview()
-//}

+ 0 - 2
MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/LineSearch/History/MOLinePkHistoryCell.swift

@@ -147,7 +147,6 @@ extension MOLinePkHistoryCell {
     private func buildInfo() -> UIView {
         let container = UIView()
         
-        name.text = "test"
         name.textColor = .init(hex: "#17171A")
         name.font = .poppinsMediumFont(14)
         container.addSubview(name)
@@ -156,7 +155,6 @@ extension MOLinePkHistoryCell {
             make.trailing.equalToSuperview()
         }
         
-        pkTime.text = "1 sss"
         pkTime.textColor = .init(hex: "#878A99")
         pkTime.font = .poppinsRegularFont(10)
         container.addSubview(pkTime)

+ 1 - 1
MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/LineSearch/MOLinePkTimeEditView.swift

@@ -120,7 +120,7 @@ extension MOLinePkTimeEditView {
         }
         
         let saveTitle = UILabel()
-        saveTitle.text = "save"
+        saveTitle.text = .init(key: "save")
         saveTitle.textColor = .white
         saveTitle.font = .poppinsSemiBoldFont(11)
         save.addSubview(saveTitle)

+ 1 - 1
MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/LineSearch/MOLineSearchUserView.swift

@@ -203,7 +203,7 @@ extension MOLineSearchUserView {
         }
         
         input.returnKeyType = .search
-        let text = "Nama atau ID pengguna"
+        let text: String = .init(key: "mimo_contact_search_hint")
         let placeholder = NSAttributedString(string: text,
                                              attributes: [.foregroundColor: UIColor.init(hex: "#878A99", alpha: 0.5)])
         input.attributedPlaceholder = placeholder

+ 5 - 1
MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/LineSearch/MOLineUserListView.swift

@@ -175,7 +175,7 @@ extension MOLineUserListView {
         }
         
         let hint = UILabel()
-        hint.text = "Nama atau ID pengguna"
+        hint.text = .init(key: "mimo_contact_search_hint")
         hint.font = .poppinsRegularFont(14)
         hint.textColor = .init(hex: "#878A99", alpha: 0.5)
         container.addSubview(hint)
@@ -308,6 +308,10 @@ extension MOLineUserListView {
         avatar.layer.cornerRadius = 18
         avatar.layer.borderColor = UIColor.white.cgColor
         avatar.layer.borderWidth = 1
+        avatar.clipsToBounds = true
+        if let myAvatar = UserDefaults.avatar {
+            avatar.sd_setImage(with: URL(string: myAvatar))
+        }
         container.addSubview(avatar)
         avatar.snp.makeConstraints { make in
             make.centerY.equalTo(match)

+ 0 - 1
MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/MOLinePeerHostInfoView.swift

@@ -84,7 +84,6 @@ extension MOLinePeerHostInfoView {
         }
         
         nameLabel.font = .poppinsMediumFont(11)
-        nameLabel.text = "name"
         nameLabel.textColor = .white
         addSubview(nameLabel)
         nameLabel.snp.makeConstraints { make in

+ 0 - 1
MiMoLive/MiMoLive/Classes/Live/View/MOPKListView/PKContribution/MOLinePkContributionCell.swift

@@ -205,7 +205,6 @@ extension MOLinePkContributionCell {
             make.leading.equalToSuperview()
         }
         
-        beans.text = "1 sss"
         beans.textColor = .init(hex: "#878A99")
         beans.font = .poppinsRegularFont(10)
         beanView.addSubview(beans)

+ 3 - 0
MiMoLive/MiMoLive/Global/Category/UserDefaults+UserInfo.swift

@@ -12,4 +12,7 @@ extension UserDefaults {
     static var uid: String? {
         Self.standard.string(forKey: kUserId)
     }
+    static var avatar: String? {
+        Self.standard.string(forKey: kAvatar)
+    }
 }

+ 1 - 1
MiMoLive/MiMoLive/Global/NetManager/Line+PK/Models/MOLivePkLinkRoomInfoVo.swift

@@ -59,7 +59,7 @@ class MOLivePkLinkRoomCampInfoVo: Decodable {
 class MOLivePkLinkRoomCampInfoLastVo: Decodable {
     var campCode: String = ""
     var pkValue: Double = 0
-    var pkStatus: Int = 0
+    var pkStatus: LinePkResult = .none
     var campImage: String = ""
 }