alqindiirsyam 2 роки тому
батько
коміт
60fc7af4f8

+ 6 - 6
appbuilder-ios/AppBuilder/AppBuilder/FourthTabViewController.swift

@@ -864,7 +864,7 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
         DispatchQueue.global().async {
             let idMe = UserDefaults.standard.string(forKey: "me") as String?
             let p_password = password
-            let md5Hex = Utils.getMD5(string: p_password).map { String(format: "%02hhx", $0) }.joined()
+            let md5Hex = p_password
             var result: Bool = false
             if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getSignInApiAdmin(p_name: idMe!, p_password: md5Hex)) {
                 if response.isOk() {
@@ -899,7 +899,7 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
         DispatchQueue.global().async {
             let idMe = UserDefaults.standard.string(forKey: "me") as String?
             let p_password = password
-            let md5Hex = Utils.getMD5(string: p_password).map { String(format: "%02hhx", $0) }.joined()
+            let md5Hex = p_password
             var result: Bool = false
             if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getSignInApiInternal(p_name: idMe!, p_password: md5Hex)) {
                 if response.isOk() {
@@ -935,8 +935,8 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
             let idMe = UserDefaults.standard.string(forKey: "me") as String?
             let p_password = oldPassword
             let n_password = newPassword
-            let md5Hex = Utils.getMD5(string: p_password).map { String(format: "%02hhx", $0) }.joined()
-            let md5HexNew = Utils.getMD5(string: n_password).map { String(format: "%02hhx", $0) }.joined()
+            let md5Hex = p_password
+            let md5HexNew = n_password
             var result: Bool = false
             if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getChangePasswordAdmin(p_f_pin: idMe!, pwd_en: md5HexNew, pwd_old: md5Hex)) {
                 if response.isOk() {
@@ -972,8 +972,8 @@ public class FourthTabViewController: UIViewController, UITableViewDelegate, UIT
             let idMe = UserDefaults.standard.string(forKey: "me") as String?
             let p_password = oldPassword
             let n_password = newPassword
-            let md5Hex = Utils.getMD5(string: p_password).map { String(format: "%02hhx", $0) }.joined()
-            let md5HexNew = Utils.getMD5(string: n_password).map { String(format: "%02hhx", $0) }.joined()
+            let md5Hex = p_password
+            let md5HexNew = n_password
             var result: Bool = false
             if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getChangePasswordInternal(p_f_pin: idMe!, pwd_en: md5HexNew, pwd_old: md5Hex)) {
                 if response.isOk() {

+ 1 - 1
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/ChangeDeviceViewController.swift

@@ -221,7 +221,7 @@ public class ChangeDeviceViewController: UIViewController {
         }
         Nexilis.showLoader()
         DispatchQueue.global().async {
-            let md5Hex = Utils.getMD5(string: password).map { String(format: "%02hhx", $0) }.joined()
+            let md5Hex = password
             if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getSignIn(p_name: name, p_password: md5Hex), timeout: 30 * 1000) {
                 if response.getBody(key: CoreMessage_TMessageKey.ERRCOD, default_value: "99") == "11" {
                     DispatchQueue.main.async {

+ 1 - 1
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/ChangeNamePassswordViewController.swift

@@ -147,7 +147,7 @@ public class ChangeNamePassswordViewController: UIViewController {
                         })
                     }
                 } else if resp.isOk() {
-                    let md5Hex = Utils.getMD5(string: password).map { String(format: "%02hhx", $0) }.joined()
+                    let md5Hex = password
                     let tMessage = CoreMessage_TMessageBank.getChangePersonInfo_New(p_f_pin: idMe)
                     tMessage.mBodies[CoreMessage_TMessageKey.FIRST_NAME] = first
                     tMessage.mBodies[CoreMessage_TMessageKey.LAST_NAME] = last

+ 2 - 2
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/ChangePasswordViewController.swift

@@ -84,8 +84,8 @@ class ChangePasswordViewController: UIViewController {
         let idMe = UserDefaults.standard.string(forKey: "me")!
         DispatchQueue.global().async {
             let tMessage = CoreMessage_TMessageBank.getChangePersonInfo_New(p_f_pin: idMe)
-            let md5HexOld = Utils.getMD5(string: odlPassword).map { String(format: "%02hhx", $0) }.joined()
-            let md5HexNew = Utils.getMD5(string: newPassword).map { String(format: "%02hhx", $0) }.joined()
+            let md5HexOld = odlPassword
+            let md5HexNew = newPassword
             tMessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = md5HexNew
             tMessage.mBodies[CoreMessage_TMessageKey.PASSWORD_OLD] = md5HexOld
             if let resp = Nexilis.writeAndWait(message: tMessage){

+ 6 - 6
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/SettingTableViewController.swift

@@ -770,7 +770,7 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
         DispatchQueue.global().async {
             let idMe = UserDefaults.standard.string(forKey: "me") as String?
             let p_password = password
-            let md5Hex = Utils.getMD5(string: p_password).map { String(format: "%02hhx", $0) }.joined()
+            let md5Hex = p_password
             var result: Bool = false
             if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getSignInApiAdmin(p_name: idMe!, p_password: md5Hex)) {
                 if response.isOk() {
@@ -805,7 +805,7 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
         DispatchQueue.global().async {
             let idMe = UserDefaults.standard.string(forKey: "me") as String?
             let p_password = password
-            let md5Hex = Utils.getMD5(string: p_password).map { String(format: "%02hhx", $0) }.joined()
+            let md5Hex = p_password
             var result: Bool = false
             if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getSignInApiInternal(p_name: idMe!, p_password: md5Hex)) {
                 if response.isOk() {
@@ -841,8 +841,8 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
             let idMe = UserDefaults.standard.string(forKey: "me") as String?
             let p_password = oldPassword
             let n_password = newPassword
-            let md5Hex = Utils.getMD5(string: p_password).map { String(format: "%02hhx", $0) }.joined()
-            let md5HexNew = Utils.getMD5(string: n_password).map { String(format: "%02hhx", $0) }.joined()
+            let md5Hex = p_password
+            let md5HexNew = n_password
             var result: Bool = false
             if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getChangePasswordAdmin(p_f_pin: idMe!, pwd_en: md5HexNew, pwd_old: md5Hex)) {
                 if response.isOk() {
@@ -878,8 +878,8 @@ public class SettingTableViewController: UITableViewController, UIGestureRecogni
             let idMe = UserDefaults.standard.string(forKey: "me") as String?
             let p_password = oldPassword
             let n_password = newPassword
-            let md5Hex = Utils.getMD5(string: p_password).map { String(format: "%02hhx", $0) }.joined()
-            let md5HexNew = Utils.getMD5(string: n_password).map { String(format: "%02hhx", $0) }.joined()
+            let md5Hex = p_password
+            let md5HexNew = n_password
             var result: Bool = false
             if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getChangePasswordInternal(p_f_pin: idMe!, pwd_en: md5HexNew, pwd_old: md5Hex)) {
                 if response.isOk() {

+ 10 - 3
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/SignUpSignIn.swift

@@ -251,7 +251,7 @@ public class SignUpSignIn: UIViewController {
         }
         Nexilis.showLoader()
         DispatchQueue.global().async {
-            let md5Hex = Utils.getMD5(string: password).map { String(format: "%02hhx", $0) }.joined()
+            let md5Hex = password
             if let response = Nexilis.writeSync(message: CoreMessage_TMessageBank.getSignUpSignInAPI(p_name: name, p_password: md5Hex), timeout: 30 * 1000) {
                 if response.getBody(key: CoreMessage_TMessageKey.ERRCOD, default_value: "99") == "20" {
                     DispatchQueue.main.async {
@@ -309,8 +309,15 @@ public class SignUpSignIn: UIViewController {
                             }
                         }
                     } else {
-                        Database.shared.database?.inTransaction({ fmdb, rollback in
-                            _ = Database.shared.updateRecord(fmdb: fmdb, table: "BUDDY", cvalues: ["first_name": first , "last_name": last], _where: "f_pin = '\(idMe)'")
+                        Database.shared.database?.inTransaction({ (fmdb, rollback) in
+                            if let cursorData = Database.shared.getRecords(fmdb: fmdb, query: "SELECT * FROM BUDDY where f_pin = '\(idMe)' ") {
+                                if !cursorData.next() {
+                                    _ = Nexilis.write(message: CoreMessage_TMessageBank.getPostRegistration(p_pin: idMe))
+                                } else {
+                                    _ = Database.shared.updateRecord(fmdb: fmdb, table: "BUDDY", cvalues: ["first_name": first , "last_name": last], _where: "f_pin = '\(idMe)'")
+                                }
+                                cursorData.close()
+                            }
                         })
                         Utils.setProfile(value: true)
                         UserDefaults.standard.synchronize()