Skip to content

K
kt-ios
Commit 3c9e0dd7 by Olzhas Aldabergenov
Options

pre release version

parent e855d42c
Showing with 41 additions and 11 deletions
kt/Facade/Facade+MyServices.swift
...@@ -236,6 +236,8 @@ extension Facade { ...@@ -236,6 +236,8 @@ extension Facade {
"abonent_id": Facade.accountId!, "abonent_id": Facade.accountId!,
] as [String: AnyObject] ] as [String: AnyObject]
print (parameters)
request(Router.GetAccountServices(parameters)).responseSwiftyJSON { (req, resp, json, error) in request(Router.GetAccountServices(parameters)).responseSwiftyJSON { (req, resp, json, error) in
onComplete() onComplete()
......
kt/Models/Cabinet/AbonentSettingsRequest.swift
...@@ -77,6 +77,10 @@ class AbonentSettingsRequest { ...@@ -77,6 +77,10 @@ class AbonentSettingsRequest {
validationMessage = validationMessage == "" ? LS("service_callback.label.incorrect_email") : "\(validationMessage); \(LS("service_callback.label.incorrect_email"))" validationMessage = validationMessage == "" ? LS("service_callback.label.incorrect_email") : "\(validationMessage); \(LS("service_callback.label.incorrect_email"))"
isValid = false isValid = false
} }
if ( !isValidPassword(newPassword) ) {
validationMessage = validationMessage == "" ? LS("service_callback.label.incorrect_password") : "\(validationMessage); \(LS("service_callback.label.incorrect_password"))"
isValid = false
}
return isValid return isValid
} }
......
kt/Models/reports/AccountServices.swift
...@@ -34,6 +34,7 @@ struct AccountServices { ...@@ -34,6 +34,7 @@ struct AccountServices {
var idTvOnlines: [IdTvOnline] = [] var idTvOnlines: [IdTvOnline] = []
var idPhones: [IdPhone] = [] var idPhones: [IdPhone] = []
for index in megalineIdNetArray.indices { for index in megalineIdNetArray.indices {
megalineIdNets.append(MegalineIdNet.decode(megalineIdNetArray[index])!) megalineIdNets.append(MegalineIdNet.decode(megalineIdNetArray[index])!)
} }
......
kt/Resources/en.lproj/Localization.strings
...@@ -137,6 +137,7 @@ ...@@ -137,6 +137,7 @@
"service_callback.button.send" = "Call me back"; "service_callback.button.send" = "Call me back";
"service_callback.label.incorrect_email" = "Incorrect e-mail"; "service_callback.label.incorrect_email" = "Incorrect e-mail";
"service_callback.label.incorrect_phone" = "Incorrect phone number"; "service_callback.label.incorrect_phone" = "Incorrect phone number";
"service_callback.label.incorrect_password" = "Длина пароля должна быть не менее 8 символов, содержать как минимум одну цифру, одну заглавную и одну строчную букву";
// service_subscribe // service_subscribe
"service_subscribe.title" = "Connect"; "service_subscribe.title" = "Connect";
...@@ -436,6 +437,8 @@ ...@@ -436,6 +437,8 @@
"login.text_field.your_login.placeholder" = "Login or password"; "login.text_field.your_login.placeholder" = "Login or password";
"login.text_field.your_password.placeholder" = "Password"; "login.text_field.your_password.placeholder" = "Password";
"login.type_login_or_phone" = "Type login or phone number"; "login.type_login_or_phone" = "Type login or phone number";
"login.type_login" = "Введите логин";
"login.type_phone" = "Введите телефон";
"login.type_password" = "Type password"; "login.type_password" = "Type password";
"login.recovery.successfully_sent" = "На Вашу почту %@ были отправлены данные для восстановления пароля личного кабинета."; "login.recovery.successfully_sent" = "На Вашу почту %@ были отправлены данные для восстановления пароля личного кабинета.";
"login.button.login" = "Login"; "login.button.login" = "Login";
......
kt/Resources/kk.lproj/Localization.strings
...@@ -137,6 +137,7 @@ ...@@ -137,6 +137,7 @@
"service_callback.button.send" = "Маған қайта қоңырау шалу"; "service_callback.button.send" = "Маған қайта қоңырау шалу";
"service_callback.label.incorrect_email" = "Қате e-mail"; "service_callback.label.incorrect_email" = "Қате e-mail";
"service_callback.label.incorrect_phone" = "Қате телефон нөмірі"; "service_callback.label.incorrect_phone" = "Қате телефон нөмірі";
"service_callback.label.incorrect_password" = "Длина пароля должна быть не менее 8 символов, содержать как минимум одну цифру, одну заглавную и одну строчную букву";
// service_subscribe // service_subscribe
"service_subscribe.title" = "Қосу"; "service_subscribe.title" = "Қосу";
...@@ -433,6 +434,8 @@ ...@@ -433,6 +434,8 @@
"login.text_field.your_login.placeholder" = "Логин немесу телефон"; "login.text_field.your_login.placeholder" = "Логин немесу телефон";
"login.text_field.your_password.placeholder" = "Құпиясөз"; "login.text_field.your_password.placeholder" = "Құпиясөз";
"login.type_login_or_phone" = "Логин немесе телефонды жазыңыз"; "login.type_login_or_phone" = "Логин немесе телефонды жазыңыз";
"login.type_login" = "Введите логин";
"login.type_phone" = "Введите телефон";
"login.type_password" = "Құпиясөзді жазыңыз"; "login.type_password" = "Құпиясөзді жазыңыз";
"login.recovery.successfully_sent" = "На Вашу почту %@ были отправлены данные для восстановления пароля личного кабинета."; "login.recovery.successfully_sent" = "На Вашу почту %@ были отправлены данные для восстановления пароля личного кабинета.";
"login.button.login" = "Логин"; "login.button.login" = "Логин";
......
kt/Resources/ru.lproj/Localization.strings
...@@ -137,6 +137,7 @@ ...@@ -137,6 +137,7 @@
"service_callback.button.send" = "Перезвонить мне"; "service_callback.button.send" = "Перезвонить мне";
"service_callback.label.incorrect_email" = "Некорректный e-mail"; "service_callback.label.incorrect_email" = "Некорректный e-mail";
"service_callback.label.incorrect_phone" = "Указан некорректный номер телефона"; "service_callback.label.incorrect_phone" = "Указан некорректный номер телефона";
"service_callback.label.incorrect_password" = "Длина пароля должна быть не менее 8 символов, содержать как минимум одну цифру, одну заглавную и одну строчную букву";
// service_subscribe // service_subscribe
"service_subscribe.title" = "Подключить"; "service_subscribe.title" = "Подключить";
...@@ -438,6 +439,8 @@ ...@@ -438,6 +439,8 @@
"login.text_field.your_login.placeholder" = "Логин или номер телефона с кодом города"; "login.text_field.your_login.placeholder" = "Логин или номер телефона с кодом города";
"login.text_field.your_password.placeholder" = "Пароль"; "login.text_field.your_password.placeholder" = "Пароль";
"login.type_login_or_phone" = "Введите логин или телефон"; "login.type_login_or_phone" = "Введите логин или телефон";
"login.type_login" = "Введите логин";
"login.type_phone" = "Введите телефон";
"login.type_password" = "Введите пароль"; "login.type_password" = "Введите пароль";
"login.recovery.successfully_sent" = "На Вашу почту %@ были отправлены данные для восстановления пароля личного кабинета."; "login.recovery.successfully_sent" = "На Вашу почту %@ были отправлены данные для восстановления пароля личного кабинета.";
"login.button.login" = "Логин"; "login.button.login" = "Логин";
......
kt/Supporting Files/Info.plist
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
<dict> <dict>
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>en</string> <string>en</string>
<key>CFBundleDisplayName</key>
<string>Telecom</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string> <string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
...@@ -19,7 +21,7 @@ ...@@ -19,7 +21,7 @@
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>65</string> <string>71</string>
<key>Fabric</key> <key>Fabric</key>
<dict> <dict>
<key>APIKey</key> <key>APIKey</key>
......
kt/Utils/CustomAlertViewController.swift
...@@ -57,12 +57,15 @@ class CustomAlertViewController: ScrolledViewController, StoryboardFetchable { ...@@ -57,12 +57,15 @@ class CustomAlertViewController: ScrolledViewController, StoryboardFetchable {
var kbRect = info[UIKeyboardFrameBeginUserInfoKey]!.CGRectValue var kbRect = info[UIKeyboardFrameBeginUserInfoKey]!.CGRectValue
kbRect = view.convertRect(kbRect, fromView: nil) kbRect = view.convertRect(kbRect, fromView: nil)
keyboardDidShowCallback?(self) keyboardDidShowCallback?(self)
originalOrigin = view.frame.origin if ( originalOrigin == nil ) {
originalOrigin = view.frame.origin
}
// if keyboardShown { // if keyboardShown {
// originalOrigin = CGPoint(x: 0, y: view.frame.origin.y + kbRect.height - 75) // originalOrigin = CGPoint(x: 0, y: view.frame.origin.y + kbRect.height - 75)
// } // }
if !keyboardShown { if !keyboardShown {
view.frame.origin = CGPoint(x: view.frame.origin.x, y: kbRect.origin.y - (kbRect.height + 95)) //view.frame.origin = CGPoint(x: view.frame.origin.x, y: kbRect.origin.y - (kbRect.height + 95))
view.frame.origin = CGPoint(x: view.frame.origin.x, y: originalOrigin!.y - 100)
keyboardShown = true keyboardShown = true
} }
} }
...@@ -75,8 +78,10 @@ class CustomAlertViewController: ScrolledViewController, StoryboardFetchable { ...@@ -75,8 +78,10 @@ class CustomAlertViewController: ScrolledViewController, StoryboardFetchable {
override func keyboardWillBeHidden(notification: NSNotification) { override func keyboardWillBeHidden(notification: NSNotification) {
tapGestureRecognizer.enabled = false tapGestureRecognizer.enabled = false
keyboardShown = false if ( keyboardShown ) {
view.frame.origin = CGPoint(x: view.frame.origin.x, y: originalOrigin == nil ? 0 : originalOrigin!.y) view.frame.origin = originalOrigin!//CGPoint(x: view.frame.origin.x, y: /*originalOrigin == nil ? 0 :*/ originalOrigin!.y)
keyboardShown = false
}
} }
override func viewDidLoad() { override func viewDidLoad() {
......
kt/Utils/ValidationUtil.swift
...@@ -44,3 +44,10 @@ func isValidMacAddress(testStr: String) -> Bool { ...@@ -44,3 +44,10 @@ func isValidMacAddress(testStr: String) -> Bool {
let result = macTest.evaluateWithObject(testStr) let result = macTest.evaluateWithObject(testStr)
return result return result
} }
func isValidPassword(password: String) -> Bool {
let pwdRegEx = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)[a-zA-Z\\d]{8,}$"
let pwdTest = NSPredicate(format:"SELF MATCHES %@", pwdRegEx)
let result = pwdTest.evaluateWithObject(password)
return result
}
kt/ViewControllers/Cabinet/AccountServicesViewController.swift
...@@ -18,7 +18,7 @@ class AccountServicesViewController: ViewControllerWithMenu { ...@@ -18,7 +18,7 @@ class AccountServicesViewController: ViewControllerWithMenu {
super.viewDidLoad() super.viewDidLoad()
self.navigationItem.title = "Мои услуги" self.navigationItem.title = LS("my_services.title")//, desc) "Мои услуги"
configureRightIDTVCreate() configureRightIDTVCreate()
......
kt/ViewControllers/Cabinet/LKSettingsViewController.swift
...@@ -493,7 +493,7 @@ class LKSettingsViewController: ViewControllerWithCustomTitle, UITableViewDelega ...@@ -493,7 +493,7 @@ class LKSettingsViewController: ViewControllerWithCustomTitle, UITableViewDelega
mobilePhone: Int64(mobilePhone), mobilePhone: Int64(mobilePhone),
oldPassword: oldPassword, oldPassword: oldPassword,
newPassword: newPassword) newPassword: newPassword)
print (abSet)
guard abSet.validateFields() guard abSet.validateFields()
else { else {
AlertViewUtil.showAlert(abSet.validationMessage); AlertViewUtil.showAlert(abSet.validationMessage);
......
kt/ViewControllers/Cabinet/myServices/deviceSettings/DeviceSettingsViewController.swift
...@@ -29,8 +29,8 @@ class DeviceSettingsViewController : UIViewController, UITableViewDataSource, UI ...@@ -29,8 +29,8 @@ class DeviceSettingsViewController : UIViewController, UITableViewDataSource, UI
[switchedCellIdentifier, "lock"], [switchedCellIdentifier, "lock"],
[switchedCellIdentifier, "service_messages"], [switchedCellIdentifier, "service_messages"],
[buttonedCellIdentifier, "promised_payment"], [buttonedCellIdentifier, "promised_payment"],
[switchedCellIdentifier, "parental_control"], //[switchedCellIdentifier, "parental_control"],
[switchedCellIdentifier, "static_ip"], //[switchedCellIdentifier, "static_ip"],
[buttonedCellIdentifier, "tariff_plan_change_history"]] [buttonedCellIdentifier, "tariff_plan_change_history"]]
var switches: [String: UISwitch] = [String: UISwitch]() var switches: [String: UISwitch] = [String: UISwitch]()
var buttons: [String: UIButton] = [String: UIButton]() var buttons: [String: UIButton] = [String: UIButton]()
...@@ -87,8 +87,8 @@ class DeviceSettingsViewController : UIViewController, UITableViewDataSource, UI ...@@ -87,8 +87,8 @@ class DeviceSettingsViewController : UIViewController, UITableViewDataSource, UI
self.tableView.delegate = self self.tableView.delegate = self
self.tableView.reloadData() self.tableView.reloadData()
self.getPromisedPayment() self.getPromisedPayment()
self.getParentalControl() //self.getParentalControl()
self.getStaticIp() //self.getStaticIp()
} }
self.loadingIndicator?.stopAnimating() self.loadingIndicator?.stopAnimating()
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment