|
@@ -42,7 +42,7 @@ public class CoreMessage_TMessageBank {
|
|
tmessage.mCode = CoreMessage_TMessageCode.SEND_SIGNIN
|
|
tmessage.mCode = CoreMessage_TMessageCode.SEND_SIGNIN
|
|
tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
|
|
tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
|
|
tmessage.mBodies[CoreMessage_TMessageKey.NAME] = p_name
|
|
tmessage.mBodies[CoreMessage_TMessageKey.NAME] = p_name
|
|
- tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = p_password
|
|
|
|
|
|
+ tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = p_password
|
|
// tmessage.mBodies[CoreMessage_TMessageKey.BUSINESS_ENTITY] = "74"
|
|
// tmessage.mBodies[CoreMessage_TMessageKey.BUSINESS_ENTITY] = "74"
|
|
return tmessage
|
|
return tmessage
|
|
}
|
|
}
|
|
@@ -93,7 +93,7 @@ public class CoreMessage_TMessageBank {
|
|
tMessage.mBodies[CoreMessage_TMessageKey.TYPE_REGISTER] = flag
|
|
tMessage.mBodies[CoreMessage_TMessageKey.TYPE_REGISTER] = flag
|
|
tMessage.mBodies[CoreMessage_TMessageKey.IMEI] = imei
|
|
tMessage.mBodies[CoreMessage_TMessageKey.IMEI] = imei
|
|
tMessage.mBodies[CoreMessage_TMessageKey.IMSI] = imsi
|
|
tMessage.mBodies[CoreMessage_TMessageKey.IMSI] = imsi
|
|
- tMessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = password
|
|
|
|
|
|
+ tMessage.mBodies[CoreMessage_TMessageKey.PSWD] = password
|
|
return tMessage
|
|
return tMessage
|
|
}
|
|
}
|
|
|
|
|
|
@@ -114,7 +114,7 @@ public class CoreMessage_TMessageBank {
|
|
tMessage.mBodies[CoreMessage_TMessageKey.TYPE_REGISTER] = flag
|
|
tMessage.mBodies[CoreMessage_TMessageKey.TYPE_REGISTER] = flag
|
|
tMessage.mBodies[CoreMessage_TMessageKey.IMEI] = imei
|
|
tMessage.mBodies[CoreMessage_TMessageKey.IMEI] = imei
|
|
tMessage.mBodies[CoreMessage_TMessageKey.IMSI] = imsi
|
|
tMessage.mBodies[CoreMessage_TMessageKey.IMSI] = imsi
|
|
- tMessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = password
|
|
|
|
|
|
+ tMessage.mBodies[CoreMessage_TMessageKey.PSWD] = password
|
|
return tMessage
|
|
return tMessage
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1080,8 +1080,8 @@ public class CoreMessage_TMessageBank {
|
|
tmessage.mCode = CoreMessage_TMessageCode.CHANGE_PERSON_INFO
|
|
tmessage.mCode = CoreMessage_TMessageCode.CHANGE_PERSON_INFO
|
|
tmessage.mPIN = me
|
|
tmessage.mPIN = me
|
|
tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
|
|
tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
|
|
- tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = password
|
|
|
|
- tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD_OLD] = oldpassword
|
|
|
|
|
|
+ tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = password
|
|
|
|
+ tmessage.mBodies[CoreMessage_TMessageKey.PSWD_OLD] = oldpassword
|
|
return tmessage
|
|
return tmessage
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1414,10 +1414,10 @@ public class CoreMessage_TMessageBank {
|
|
public static func checkPassword(password: String) -> TMessage {
|
|
public static func checkPassword(password: String) -> TMessage {
|
|
let me = UserDefaults.standard.string(forKey: "me")!
|
|
let me = UserDefaults.standard.string(forKey: "me")!
|
|
let tmessage = TMessage()
|
|
let tmessage = TMessage()
|
|
- tmessage.mCode = CoreMessage_TMessageCode.CHECK_PASSWORD
|
|
|
|
|
|
+ tmessage.mCode = CoreMessage_TMessageCode.CHECK_PSWD
|
|
tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
|
|
tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
|
|
tmessage.mPIN = me
|
|
tmessage.mPIN = me
|
|
- tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = password
|
|
|
|
|
|
+ tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = password
|
|
return tmessage
|
|
return tmessage
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1462,7 +1462,7 @@ public class CoreMessage_TMessageBank {
|
|
tmessage.mBodies[CoreMessage_TMessageKey.FIRST_NAME] = name
|
|
tmessage.mBodies[CoreMessage_TMessageKey.FIRST_NAME] = name
|
|
tmessage.mBodies[CoreMessage_TMessageKey.THUMB_ID] = image
|
|
tmessage.mBodies[CoreMessage_TMessageKey.THUMB_ID] = image
|
|
tmessage.mBodies[CoreMessage_TMessageKey.CATEGORY_FLAG] = role
|
|
tmessage.mBodies[CoreMessage_TMessageKey.CATEGORY_FLAG] = role
|
|
- tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = password
|
|
|
|
|
|
+ tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = password
|
|
if (role != "1"){
|
|
if (role != "1"){
|
|
tmessage.mBodies[CoreMessage_TMessageKey.DATA] = data
|
|
tmessage.mBodies[CoreMessage_TMessageKey.DATA] = data
|
|
}
|
|
}
|
|
@@ -1570,7 +1570,7 @@ public class CoreMessage_TMessageBank {
|
|
tmessage.mBodies[CoreMessage_TMessageKey.FIRST_NAME] = name
|
|
tmessage.mBodies[CoreMessage_TMessageKey.FIRST_NAME] = name
|
|
tmessage.mBodies[CoreMessage_TMessageKey.THUMB_ID] = image
|
|
tmessage.mBodies[CoreMessage_TMessageKey.THUMB_ID] = image
|
|
tmessage.mBodies[CoreMessage_TMessageKey.CATEGORY_FLAG] = "\(role)"
|
|
tmessage.mBodies[CoreMessage_TMessageKey.CATEGORY_FLAG] = "\(role)"
|
|
- tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = password
|
|
|
|
|
|
+ tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = password
|
|
if(role != 1){
|
|
if(role != 1){
|
|
tmessage.mBodies[CoreMessage_TMessageKey.DATA] = data
|
|
tmessage.mBodies[CoreMessage_TMessageKey.DATA] = data
|
|
}
|
|
}
|
|
@@ -1830,7 +1830,7 @@ public class CoreMessage_TMessageBank {
|
|
tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
|
|
tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
|
|
tmessage.mPIN = me
|
|
tmessage.mPIN = me
|
|
tmessage.mBodies[CoreMessage_TMessageKey.NAME] = p_name
|
|
tmessage.mBodies[CoreMessage_TMessageKey.NAME] = p_name
|
|
- tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = p_password
|
|
|
|
|
|
+ tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = p_password
|
|
tmessage.mBodies[CoreMessage_TMessageKey.ANDROID_ID] = ""
|
|
tmessage.mBodies[CoreMessage_TMessageKey.ANDROID_ID] = ""
|
|
return tmessage
|
|
return tmessage
|
|
}
|
|
}
|
|
@@ -1842,7 +1842,7 @@ public class CoreMessage_TMessageBank {
|
|
tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
|
|
tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
|
|
tmessage.mPIN = me
|
|
tmessage.mPIN = me
|
|
tmessage.mBodies[CoreMessage_TMessageKey.NAME] = p_name
|
|
tmessage.mBodies[CoreMessage_TMessageKey.NAME] = p_name
|
|
- tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = p_password
|
|
|
|
|
|
+ tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = p_password
|
|
tmessage.mBodies[CoreMessage_TMessageKey.ANDROID_ID] = ""
|
|
tmessage.mBodies[CoreMessage_TMessageKey.ANDROID_ID] = ""
|
|
return tmessage
|
|
return tmessage
|
|
}
|
|
}
|
|
@@ -1854,28 +1854,28 @@ public class CoreMessage_TMessageBank {
|
|
tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
|
|
tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
|
|
tmessage.mPIN = me
|
|
tmessage.mPIN = me
|
|
tmessage.mBodies[CoreMessage_TMessageKey.NAME] = p_name
|
|
tmessage.mBodies[CoreMessage_TMessageKey.NAME] = p_name
|
|
- tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = p_password
|
|
|
|
|
|
+ tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = p_password
|
|
tmessage.mBodies[CoreMessage_TMessageKey.ANDROID_ID] = ""
|
|
tmessage.mBodies[CoreMessage_TMessageKey.ANDROID_ID] = ""
|
|
return tmessage
|
|
return tmessage
|
|
}
|
|
}
|
|
|
|
|
|
public static func getChangePasswordAdmin(p_f_pin:String, pwd_en: String, pwd_old: String) -> TMessage {
|
|
public static func getChangePasswordAdmin(p_f_pin:String, pwd_en: String, pwd_old: String) -> TMessage {
|
|
let tmessage = TMessage()
|
|
let tmessage = TMessage()
|
|
- tmessage.mCode = CoreMessage_TMessageCode.CHANGE_PASSWORD_ADMIN
|
|
|
|
|
|
+ tmessage.mCode = CoreMessage_TMessageCode.CHANGE_PSWD_ADMIN
|
|
tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
|
|
tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
|
|
tmessage.mPIN = p_f_pin
|
|
tmessage.mPIN = p_f_pin
|
|
- tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = pwd_en
|
|
|
|
- tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD_OLD] = pwd_old
|
|
|
|
|
|
+ tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = pwd_en
|
|
|
|
+ tmessage.mBodies[CoreMessage_TMessageKey.PSWD_OLD] = pwd_old
|
|
return tmessage
|
|
return tmessage
|
|
}
|
|
}
|
|
|
|
|
|
public static func getChangePasswordInternal(p_f_pin:String, pwd_en: String, pwd_old: String) -> TMessage {
|
|
public static func getChangePasswordInternal(p_f_pin:String, pwd_en: String, pwd_old: String) -> TMessage {
|
|
let tmessage = TMessage()
|
|
let tmessage = TMessage()
|
|
- tmessage.mCode = CoreMessage_TMessageCode.CHANGE_PASSWORD_INTERNAL
|
|
|
|
|
|
+ tmessage.mCode = CoreMessage_TMessageCode.CHANGE_PSWD_INTERNAL
|
|
tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
|
|
tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
|
|
tmessage.mPIN = p_f_pin
|
|
tmessage.mPIN = p_f_pin
|
|
- tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = pwd_en
|
|
|
|
- tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD_OLD] = pwd_old
|
|
|
|
|
|
+ tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = pwd_en
|
|
|
|
+ tmessage.mBodies[CoreMessage_TMessageKey.PSWD_OLD] = pwd_old
|
|
return tmessage
|
|
return tmessage
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2215,7 +2215,7 @@ public class CoreMessage_TMessageBank {
|
|
tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
|
|
tmessage.mStatus = CoreMessage_TMessageUtil.getTID()
|
|
tmessage.mPIN = UserDefaults.standard.string(forKey: "me")!
|
|
tmessage.mPIN = UserDefaults.standard.string(forKey: "me")!
|
|
tmessage.mBodies[CoreMessage_TMessageKey.NAME] = p_name
|
|
tmessage.mBodies[CoreMessage_TMessageKey.NAME] = p_name
|
|
- tmessage.mBodies[CoreMessage_TMessageKey.PASSWORD] = p_password
|
|
|
|
|
|
+ tmessage.mBodies[CoreMessage_TMessageKey.PSWD] = p_password
|
|
return tmessage
|
|
return tmessage
|
|
}
|
|
}
|
|
|
|
|