2 Commits 184d79dc55 ... bf04284551

Auteur SHA1 Message Date
  lintong bf04284551 Merge branch '推广版' of http://156.254.127.134:3000/tomy/JD_iOS into 推广版 il y a 3 semaines
  lintong 8af4e8551b 持倉未滿30分鐘提示 il y a 3 semaines

+ 10 - 4
Koala/Koala.xcodeproj/project.pbxproj

@@ -6658,10 +6658,12 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Koala/KoalaRelease.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
 				COMPILER_INDEX_STORE_ENABLE = NO;
 				CURRENT_PROJECT_VERSION = 22;
-				DEVELOPMENT_TEAM = F78TLQ9HLR;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = F78TLQ9HLR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Koala/FX/OtherClass/OtherClass/PanoRtc",
@@ -6679,6 +6681,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = jd.trader.inc;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = tomyCreated;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
@@ -6698,10 +6701,12 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Koala/KoalaRelease.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				CODE_SIGN_STYLE = Manual;
 				COMPILER_INDEX_STORE_ENABLE = NO;
 				CURRENT_PROJECT_VERSION = 2;
-				DEVELOPMENT_TEAM = F78TLQ9HLR;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = F78TLQ9HLR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Koala/FX/OtherClass/OtherClass/PanoRtc",
@@ -6719,6 +6724,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = jd.trader.inc;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = tomyCreated;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;

+ 2 - 0
Koala/Koala/FX/NetClass/Network.swift

@@ -1072,6 +1072,8 @@ extension NetWork {
             return switchLanguage("该产品当前禁止交易")
         case 6006:
             return switchLanguage("已达最大持仓量")
+        case 7000:
+            return switchLanguage("持仓未满30分钟,无法平仓")
         default:
             return switchLanguage("网络拥堵,请稍后再试")
         }

+ 2 - 2
Koala/Koala/Modular/Deal/V/Deal/DealProCell.swift

@@ -503,7 +503,7 @@ extension DealProCell {
     func buyIn() {
         guard let VM = self.VM else {return}
         guard (VM.num).length > 0 else {
-            ProgressHUD.showInfo(status: switchLanguage("请输入单位"))
+            ProgressHUD.showInfo(status: switchLanguage("请输入数量"))
             return
         }
         /// 是否是市单价
@@ -591,7 +591,7 @@ extension DealProCell {
     func sell() {
         guard let VM = self.VM else {return}
         guard (VM.num).length > 0 else {
-            ProgressHUD.showInfo(status: switchLanguage("请输入单位"))
+            ProgressHUD.showInfo(status: switchLanguage("请输入数量"))
             return
         }
         /// 是否是市单价

+ 1 - 1
Koala/Koala/Modular/Deal/V/Deal/DealSimCell.swift

@@ -402,7 +402,7 @@ extension DealSimCell {
 
     func buyAndSell() {
         guard (self.VM?.num ?? "1.00").length > 0 else {
-            ProgressHUD.showInfo(status: switchLanguage("请输入单位"))
+            ProgressHUD.showInfo(status: switchLanguage("请输入数量"))
             return
         }
         /// 是否是市单价

+ 1 - 1
Koala/Koala/Modular/Deal/V/Deal/Views/Info/KKTRBasicInfoView.swift

@@ -519,7 +519,7 @@ class KKTRBasicInfoView: UIView {
     func submit(_ direction:KKDirection) -> Bool {
         guard let vm = vm else {return false}
         guard vm.tradeCount.value > 0, vm.num.count > 0 else {
-            ProgressHUD.showInfo(status: switchLanguage("请输入单位"))
+            ProgressHUD.showInfo(status: switchLanguage("请输入数量"))
             return false
         }
         

+ 2 - 2
Koala/Koala/Modular/Deal/V/Deal/Views/KKTREditView.swift

@@ -47,9 +47,9 @@ class KKTREditView: UIView {
             case .amount:
                 return switchLanguage("请输入金额")
             case .loss:
-                return switchLanguage("请输入")
+                return switchLanguage("请输入止损价格")
             case .profit:
-                return switchLanguage("请输入")
+                return switchLanguage("请输入止盈价格")
             }
         }
         

+ 8 - 0
Koala/Koala/Other/Language_CH.plist

@@ -4094,5 +4094,13 @@
 	<array>
 		<string>不在交易时间段</string>
 	</array>
+	<key>请输入价格</key>
+	<array>
+		<string>请输入价格</string>
+	</array>
+	<key>持仓未满30分钟,无法平仓</key>
+	<array>
+		<string>持仓未满30分钟,无法平仓</string>
+	</array>
 </dict>
 </plist>

+ 8 - 0
Koala/Koala/Other/Language_CHF.plist

@@ -4140,5 +4140,13 @@
 	<array>
 		<string>不在交易時間段</string>
 	</array>
+	<key>请输入价格</key>
+	<array>
+		<string>請輸入價格</string>
+	</array>
+	<key>持仓未满30分钟,无法平仓</key>
+	<array>
+		<string>持倉未滿30分鐘,無法平倉</string>
+	</array>
 </dict>
 </plist>

+ 8 - 0
Koala/Koala/Other/Language_EN.plist

@@ -4632,5 +4632,13 @@
 	<array>
 		<string>Out of trading hours</string>
 	</array>
+	<key>请输入价格</key>
+	<array>
+		<string>Please enter price</string>
+	</array>
+	<key>持仓未满30分钟,无法平仓</key>
+	<array>
+		<string>Position cannot be closed for less than 30 minutes</string>
+	</array>
 </dict>
 </plist>

+ 8 - 0
Koala/Koala/Other/Language_RU.plist

@@ -4398,5 +4398,13 @@
 	<array>
 		<string>Не в рабочее время</string>
 	</array>
+	<key>请输入价格</key>
+	<array>
+		<string>Введите цену</string>
+	</array>
+	<key>持仓未满30分钟,无法平仓</key>
+	<array>
+		<string>Хранилище не может быть очищено до 30 минут</string>
+	</array>
 </dict>
 </plist>

+ 8 - 0
Koala/Koala/Other/Language_TH.plist

@@ -4219,5 +4219,13 @@
 	<array>
 		<string>ไม่มีเวลาแลกเปลี่ยน</string>
 	</array>
+	<key>请输入价格</key>
+	<array>
+		<string>กรุณาใส่ราคา</string>
+	</array>
+	<key>持仓未满30分钟,无法平仓</key>
+	<array>
+		<string>ต่ำกว่า 30 นาทีไม่สามารถลดระดับได้</string>
+	</array>
 </dict>
 </plist>

+ 8 - 0
Koala/Koala/Other/Language_VT.plist

@@ -4212,5 +4212,13 @@ Công thức tính tỷ lệ ký quỹ: </string>
 	<array>
 		<string>Không có thời gian giao dịch</string>
 	</array>
+	<key>请输入价格</key>
+	<array>
+		<string>กรุณาใส่ราคา</string>
+	</array>
+	<key>持仓未满30分钟,无法平仓</key>
+	<array>
+		<string>Giữ vị trí ít hơn 30 phút, không thể đóng cửa</string>
+	</array>
 </dict>
 </plist>