alqindiirsyam 2 年之前
父節點
當前提交
094440641a

+ 14 - 2
appbuilder-ios/AppBuilder/AppBuilder/FourthTabViewController.swift

@@ -471,8 +471,9 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
                             UserDefaults.standard.setValue(id, forKey: "me")
                             Utils.setProfile(value: false)
                             UserDefaults.standard.synchronize()
-                            // pos registration
-                            _ = Nexilis.write(message: CoreMessage_TMessageBank.getPostRegistration(p_pin: id))
+                            if Utils.getForceAnonymous() {
+                                _ = Nexilis.write(message: CoreMessage_TMessageBank.getPostRegistration(p_pin: id))
+                            }
                             DispatchQueue.main.async {
                                 Nexilis.hideLoader()
                                 let imageView = UIImageView(image: UIImage(systemName: "checkmark.circle.fill"))
@@ -485,6 +486,17 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
                                 self.makeMenu()
                                 self.tableView.reloadData()
                             }
+                            if !Utils.getForceAnonymous() {
+                                DispatchQueue.main.asyncAfter(deadline: .now() + 0.5, execute: {
+                                    var viewController = UIApplication.shared.windows.first!.rootViewController
+                                    if !(viewController is ViewController) {
+                                        viewController = self.parent
+                                    }
+                                    if let viewController = viewController as? ViewController {
+                                        viewController.viewWillAppear(false)
+                                    }
+                                })
+                            }
                         } else {
                             Nexilis.hideLoader()
                             let imageView = UIImageView(image: UIImage(systemName: "xmark.circle.fill"))

+ 2 - 4
appbuilder-ios/AppBuilder/AppBuilder/ThirdTabViewController.swift

@@ -246,10 +246,8 @@ class ThirdTabViewController: UIViewController, UIScrollViewDelegate, UIGestureR
                   let param1 = dict["param1"] as? Bool else {
                 return
             }
-            if param1 {
-                
-            } else {
-                
+            if !param1 {
+                self.webView.evaluateJavaScript("closeModal(true);")
             }
         } else if message.name == "toggleVoiceSearch" {
             if !isAllowSpeech {