Browse Source

fix: 修复验收问题

陈文艺 2 months ago
parent
commit
25604196c7

+ 21 - 1
Lanu/Localizable.xcstrings

@@ -6396,7 +6396,27 @@
       }
     },
     "A00280" : {
-      "extractionState" : "manual"
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Order"
+          }
+        },
+        "id" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Pesan"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "下单"
+          }
+        }
+      }
     },
     "A00281" : {
       "extractionState" : "manual",

+ 1 - 0
Lanu/Views/Game/MateList/LNGameMateListCell.swift

@@ -206,6 +206,7 @@ extension LNGameMateListCell {
         
         avatar.layer.cornerRadius = 38
         avatar.clipsToBounds = true
+        avatar.contentMode = .scaleAspectFill
         container.addSubview(avatar)
         avatar.snp.makeConstraints { make in
             make.width.height.equalTo(76)

+ 11 - 3
Lanu/Views/Game/Skill/LNSkillBottomMenuView.swift

@@ -82,9 +82,6 @@ extension LNSkillBottomMenuView {
         
         let orderButton = UIButton()
         orderButton.setBackgroundImage(.init(named: "ic_skill_order"), for: .normal)
-        orderButton.setTitle(.init(key: "A00041"), for: .normal)
-        orderButton.setTitleColor(.text_1, for: .normal)
-        orderButton.titleLabel?.font = .heading_h3
         orderButton.addAction(UIAction(handler: { [weak self] _ in
             guard let self else { return }
             guard let curDetail else { return }
@@ -96,6 +93,17 @@ extension LNSkillBottomMenuView {
             make.verticalEdges.equalToSuperview()
         }
         
+        let titleLabel = UILabel()
+        titleLabel.font = .heading_h3
+        titleLabel.textColor = .text_1
+        titleLabel.text = .init(key: "A00280")
+        titleLabel.isUserInteractionEnabled = false
+        orderButton.addSubview(titleLabel)
+        titleLabel.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.centerX.equalToSuperview().offset(4)
+        }
+        
         let descView = UIView()
         container.addSubview(descView)
         descView.snp.makeConstraints { make in

+ 1 - 1
Lanu/Views/Home/GameTab/LNHomeActivityTabItemView.swift

@@ -82,7 +82,7 @@ extension LNHomeActivityTabItemView {
         nameLabel.snp.makeConstraints { make in
             make.centerY.equalToSuperview()
             make.leading.equalToSuperview().offset(9)
-            make.width.lessThanOrEqualTo(73)
+            make.width.lessThanOrEqualTo(62)
         }
     }
 }

+ 2 - 2
Lanu/Views/Login/Setup/LNGenderSetupViewController.swift

@@ -185,7 +185,7 @@ extension LNGenderSetupViewController {
         }
         
         maleLabel.text = .init(key: "A00109")
-        maleLabel.font = .heading_h1
+        maleLabel.font = .heading_h1_5
         maleLabel.textColor = .text_5
         maleView.addSubview(maleLabel)
         maleLabel.snp.makeConstraints { make in
@@ -227,7 +227,7 @@ extension LNGenderSetupViewController {
         }
         
         femaleLabel.text = .init(key: "A00110")
-        femaleLabel.font = .heading_h1
+        femaleLabel.font = .heading_h1_5
         femaleLabel.textColor = .text_5
         femaleView.addSubview(femaleLabel)
         femaleLabel.snp.makeConstraints { make in

+ 6 - 2
Lanu/Views/Settings/LNSettingsViewController.swift

@@ -44,10 +44,11 @@ extension LNSettingsViewController {
         
         let stackView = UIStackView()
         stackView.axis = .vertical
-        stackView.spacing = 26
+        stackView.spacing = 0
         functionView.addSubview(stackView)
         stackView.snp.makeConstraints { make in
-            make.directionalEdges.equalToSuperview().inset(16)
+            make.directionalHorizontalEdges.equalToSuperview().inset(16)
+            make.verticalEdges.equalToSuperview().inset(3)
         }
         
         let language = buildFunctionItem(icName: "ic_language_18", title: .init(key: "A00256"), infoView: curLanguageLabel)
@@ -102,6 +103,9 @@ extension LNSettingsViewController {
     
     private func buildFunctionItem(icName: String, title: String, infoView: UIView?) -> UIView {
         let container = UIView()
+        container.snp.makeConstraints { make in
+            make.height.equalTo(42)
+        }
         
         let ic = UIImageView()
         ic.image = .init(named: icName)?.withRenderingMode(.alwaysTemplate)