Merge branch 'master' of ssh://61.40.220.21:/cable/git-repo/mobile/ios

OneCable/Base.lproj/Localizable.strings

@@ -253,4 +253,12 @@
 /* 멤버 삭제 */
 "멤버 삭제" = "멤버 삭제";
 /* 멤버 탈퇴 */
-"멤버 탈퇴" = "멤버 탈퇴";
+"멤버 탈퇴" = "멤버 탈퇴";
+
+
+
+
+"사진 선택" = "사진 선택";
+"사진앨범"  = "사진앨범";
+"카메라"   = "카메라";
+"취소"    = "취소";

OneCable/Classes/AppDelegate.m

@@ -68,7 +68,7 @@
     [Fabric with:@[[Crashlytics class]]];
     //set logger 
     [DDLog addLogger:[DDASLLogger sharedInstance]];
-//    [DDLog addLogger:[DDTTYLogger sharedInstance]];
+    [DDLog addLogger:[DDTTYLogger sharedInstance]];
     
     [[DDTTYLogger sharedInstance] setColorsEnabled:YES];
 }

OneCable/Classes/Definitions.h

@@ -201,8 +201,10 @@ static NSString *kSocketServer = @"wss://61.40.220.23:7792/ocs/v1";      //운
 //60 - 기타
 #define API_GET_LOCATION_CODES   @"/common/weather_location_codes"
 
-#define URL_PATH_TERMS          @"/guide/20003/service"
-#define URL_PATH_POLICY         @"/guide/20003/policy"
+#define URL_PATH_TERMS          @"/guide/20003/service" //http://61.40.220.23:7794/document/private-polish.html
+#define URL_PATH_POLICY         @"/guide/20003/policy" //http://61.40.220.23:7794/document/private-polish.html
+
+#define URL_LOGO @"http://61.40.220.23:7794/images/logo.png"
 
 
 //도움말 URL

OneCable/Classes/Util/ImageUtil.m

@@ -311,22 +311,22 @@
     _presentedViewController = vc;
     
     _alertController = [UIAlertController
-                        alertControllerWithTitle:@"사진 선택"
+                        alertControllerWithTitle:NSLocalizedString(@"사진 선택", @"사진 선택")
                         message:nil
                         preferredStyle:UIAlertControllerStyleActionSheet];
     
-    UIAlertAction* album = [UIAlertAction actionWithTitle:@"사진앨범" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+    UIAlertAction* album = [UIAlertAction actionWithTitle:NSLocalizedString(@"사진앨범", @"사진앨범") style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
         [_alertController dismissViewControllerAnimated:YES completion:nil];
         [self showImagePickerController:UIImagePickerControllerSourceTypePhotoLibrary];
     }];
     
-    UIAlertAction* camera = [UIAlertAction actionWithTitle:@"카메라" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+    UIAlertAction* camera = [UIAlertAction actionWithTitle:NSLocalizedString(@"카메라", @"카메라") style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
         [_alertController dismissViewControllerAnimated:YES completion:nil];
         [self showImagePickerController:UIImagePickerControllerSourceTypeCamera];
     }];
     
     
-    UIAlertAction* cancel = [UIAlertAction actionWithTitle:@"취소" style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) {
+    UIAlertAction* cancel = [UIAlertAction actionWithTitle:NSLocalizedString(@"취소", @"취소") style:UIAlertActionStyleDestructive handler:^(UIAlertAction *action) {
         [_alertController dismissViewControllerAnimated:YES completion:nil];
     }];
     

OneCable/Classes/ViewControllers/MainScreens/IntroViewController.m

@@ -117,8 +117,8 @@
         JDJSONModel *result = (JDJSONModel *) responseObject;
         
         if (result) {//API 성공 ,
-//            if ([result.resultCode isEqualToString:@"99"]) {//사용불가
-              if ([result.resultCode isEqualToString:@"999"]) {//사용불가
+            if ([result.resultCode isEqualToString:@"99"]) {//사용불가
+//              if ([result.resultCode isEqualToString:@"999"]) {//사용불가
                 //앱 업그레이드 유도
                 [[JDFacade facade] alert:MSG_ALERT_APP_UPDATE completionHander:^{
                     NSString *appURL = URL_APP_UPDATE;

OneCable/Classes/ViewControllers/MainScreens/LoginViewController.m

@@ -213,6 +213,11 @@
     if (loginInfo) {//API 성공함
         [JDFacade facade].loginUser = loginInfo;
         
+        [JDFacade facade].loginUser.gradeCode = KNEET_MEMBER_MASTER;
+        [JDFacade facade].loginUser.level = 90;
+        
+        NSLog(@"%@", [JDFacade facade].loginUser);
+        
         if ([[JDFacade facade].loginUser.emailId isEqualToString:[JDFacade facade].tmpEmailId]) {
             [JDFacade facade].tmpEmailId = ksEmptyString;
         }
@@ -373,9 +378,16 @@
 #pragma mark - CustomTextField
 
 - (BOOL)textFieldShouldReturn:(UITextField *)textField {
-    if ([textField isEqual:_txtPasswd]) {
+    if ([textField isEqual:_txtPasswd])
+    {
         [self btnLogInTouched:nil];
     }
+    
+    if ([textField isEqual:_txtEmail])
+    {
+        [_txtPasswd becomeFirstResponder];
+    }
+    
 
     return YES;
 }

OneCable/Info.plist

@@ -43,6 +43,12 @@
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 	</dict>
+	<key>NSBluetoothPeripheralUsageDescription</key>
+	<string>OneCable에서 블루투스에 접근하려고 합니다.</string>
+	<key>NSCameraUsageDescription</key>
+	<string>OneCable에서 카메라에 접근하려고 합니다.</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>OneCable에서 사진에 접근하려고 합니다.</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>