Merge branch '推广版' of http://156.254.127.134:3000/tomy/JD_iOS into 推广版

Koala/Koala.xcworkspace/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -883,22 +883,6 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "9858FCA8-7BBB-4858-A558-C9A15B502F69"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Koala/Modular/JDAssets/VC/JDAFiatWithdrawViewController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "364"
-            endingLineNumber = "364"
-            landmarkName = "tableView(_:cellForRowAt:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
             uuid = "C28BFBC0-869F-4675-942D-34C900277C75"
             shouldBeEnabled = "No"
             ignoreCount = "0"
@@ -1135,22 +1119,6 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "0DD36949-C0BF-4029-96F9-8918F1B2A799"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Koala/Modular/JDAssets/VC/JDAFiatWithdrawViewController.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "225"
-            endingLineNumber = "225"
-            landmarkName = "clickRightBtnAction()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
             uuid = "7F274D16-0770-4315-BB4D-B6E8D184288C"
             shouldBeEnabled = "No"
             ignoreCount = "0"
@@ -1692,5 +1660,21 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "F629686A-57C0-4739-B6C2-A83FC52441EF"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Koala/Modular/JDAssets/V/JDWithdrawAmountInputCell.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "224"
+            endingLineNumber = "224"
+            landmarkName = "setupCellByWithdrawParam(param:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

Koala/Koala/Modular/Deal/V/Deal/Views/Order/KKOrderModificationAlert.swift

@@ -181,8 +181,8 @@ class KKOrderModificationAlert: UIView, KKAlertProtol {
         
         let isAsk =  model.cmd == "1" || model.cmd == "3" || model.cmd == "5"
         
-        self.slEditItem.tipLabel.text = (isAsk ? switchLanguage("止损价至少高于现价") : switchLanguage("止损价至少低于现价")) + "\(spread)或%5"
-        self.spEditItem.tipLabel.text = (isAsk ? switchLanguage("止盈价至少低于现价") : switchLanguage("止盈价至少高于现价")) + "\(spread)或%5"
+        self.slEditItem.tipLabel.text = (isAsk ? switchLanguage("止损价至少高于现价") : switchLanguage("止损价至少低于现价")) + "\(spread)"+switchLanguage("或")+"5%"
+        self.spEditItem.tipLabel.text = (isAsk ? switchLanguage("止盈价至少低于现价") : switchLanguage("止盈价至少高于现价")) + "\(spread)"+switchLanguage("或")+"5%"
         
         updateCurrentPrice()
     }

Koala/Koala/Modular/JDAssets/VC/JDAFiatWithdrawViewController.swift

@@ -171,11 +171,15 @@ extension JDAFiatWithdrawViewController {
     }
     
     func netForGetWithdrawParamsInfo(group: DispatchGroup) {
+        
+        let model = self.accountTypeList[self.selectIndex]
+        
+        
         let param = [
-            "type": "1",
+            "type": model.type,
         ]
         
-        NetWork.NetWorkInstance.requestData(requestType: .Post, URLString: netForGetWithdrawParams, parameters: param) { _, result in
+        NetWork.NetWorkInstance.requestData(requestType: .Post, URLString: netForGetWithdrawParams, parameters: param as [String : Any]) { _, result in
             if let dict: NSDictionary = getDictionaryFromJSONString(jsonString: result as! String) as? NSDictionary {
                 self.paramsModel = JDWithdrawParamsModel.deserialize(from: dict)!
             }
@@ -215,6 +219,27 @@ extension JDAFiatWithdrawViewController {
             ProgressHUD.showError(status: result as! String)
         }
     }
+    
+    func netForWithdrawParamsInfoChange() {
+        
+        let model = self.accountTypeList[self.selectIndex]
+        
+        
+        let param = [
+            "type": model.type,
+        ]
+        
+        NetWork.NetWorkInstance.requestData(requestType: .Post, URLString: netForGetWithdrawParams, parameters: param as [String : Any]) { _, result in
+            if let dict: NSDictionary = getDictionaryFromJSONString(jsonString: result as! String) as? NSDictionary {
+                self.paramsModel = JDWithdrawParamsModel.deserialize(from: dict)!
+            }
+            self.tableView.reloadData()
+        } failured: { _, result in
+            ProgressHUD.showError(status: result as! String)
+
+        }
+    }
+    
 }
 
 extension JDAFiatWithdrawViewController {
@@ -302,6 +327,8 @@ extension JDAFiatWithdrawViewController {
             }
             
             self.tableView.reloadData()
+            
+            self.netForWithdrawParamsInfoChange()
         }
         
         currentVc()?.navigationController?.pushViewController(vc, animated: true)
@@ -415,7 +442,7 @@ extension JDAFiatWithdrawViewController: UITableViewDelegate, UITableViewDataSou
             return cell
         }
         
-        return UITableViewCell()
+      
     }
     
     @objc func closePayTypeViewAction() {
@@ -446,6 +473,8 @@ extension JDAFiatWithdrawViewController: UITableViewDelegate, UITableViewDataSou
                 self.selectIndex = index
                 self.selectCollection = nil
                 self.tableView.reloadData()
+                
+                self.netForWithdrawParamsInfoChange()
             }
         }
     }

Koala/Koala/Other/Language_CH.plist

@@ -4018,5 +4018,9 @@
     <array>
         <string>邀请码</string>
     </array>
+    <key>或</key>
+    <array>
+        <string>或</string>
+    </array>
 </dict>
 </plist>

Koala/Koala/Other/Language_CHF.plist

@@ -4064,5 +4064,9 @@
     <array>
         <string>邀請碼</string>
     </array>
+    <key>或</key>
+    <array>
+        <string>或</string>
+    </array>
 </dict>
 </plist>

Koala/Koala/Other/Language_EN.plist

@@ -4556,5 +4556,9 @@
     <array>
         <string>Code</string>
     </array>
+    <key>或</key>
+    <array>
+        <string> or </string>
+    </array>
 </dict>
 </plist>

Koala/Koala/Other/Language_RU.plist

@@ -4322,5 +4322,9 @@
     <array>
         <string>ярд</string>
     </array>
+    <key>或</key>
+    <array>
+        <string>ил</string>
+    </array>
 </dict>
 </plist>

Koala/Koala/Other/Language_TH.plist

@@ -4143,5 +4143,9 @@
     <array>
         <string>ขนาด</string>
     </array>
+    <key>或</key>
+    <array>
+        <string>หรือ...</string>
+    </array>
 </dict>
 </plist>

Koala/Koala/Other/Language_VT.plist

@@ -4136,5 +4136,9 @@ Công thức tính tỷ lệ ký quỹ: </string>
     <array>
         <string>thước</string>
     </array>
+    <key>或</key>
+    <array>
+        <string>hoặc</string>
+    </array>
 </dict>
 </plist>