After the user logs in on other devices, the current device fails to pop up to the login interface correctly -- 用户在其他设备登录后，当前设备未能正确弹到登录界面 resolve: #91

Uplink parameters increase the current language of the device to prepare for the next step of app multi-language support -- 上行参数增加设备当前语言，为下一步app 多语言支持做准备 resolve: #90
Part of the prompt message of the Chinese system is incorrect -- 中文系统部分提示信息错误 resolve: #89
The app does not correctly read the user activation status flag -- app 没有正确读取用户激活状态标志 resolve: #86
Uninitialized user login app homepage interface is chaotic -- 未初始化用户登录app首页界面混乱 resolve: #84

RA TradeFiling/RA TradeFiling.xcodeproj/xcuserdata/ruizhang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -42,8 +42,8 @@
             filePath = "RA TradeFiling/Home/RAHomeHeaderView.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "243"
-            endingLineNumber = "243"
+            startingLineNumber = "249"
+            endingLineNumber = "249"
             landmarkName = "-loadFunctions"
             landmarkType = "7">
          </BreakpointContent>
@@ -74,8 +74,8 @@
             filePath = "RA TradeFiling/DataProvider/OnlineDataProvider.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "229"
-            endingLineNumber = "229"
+            startingLineNumber = "239"
+            endingLineNumber = "239"
             landmarkName = "+request_interface:parameters:err_record_url:completionHandler:retry:"
             landmarkType = "7">
             <Locations>
@@ -234,8 +234,8 @@
             filePath = "RA TradeFiling/Home/RAHomeHeaderView.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "396"
-            endingLineNumber = "396"
+            startingLineNumber = "404"
+            endingLineNumber = "404"
             landmarkName = "-collectionView:didSelectItemAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -762,8 +762,8 @@
             filePath = "RA TradeFiling/DataProvider/OnlineDataProvider.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "231"
-            endingLineNumber = "231"
+            startingLineNumber = "241"
+            endingLineNumber = "241"
             landmarkName = "+request_interface:parameters:err_record_url:completionHandler:retry:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1178,8 +1178,8 @@
             filePath = "RA TradeFiling/DataProvider/OnlineDataProvider.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "210"
-            endingLineNumber = "210"
+            startingLineNumber = "220"
+            endingLineNumber = "220"
             landmarkName = "+prepare_additional_params:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1556,7 +1556,7 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "DBC07B02-A904-4580-AD00-499D6C18B14F"
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "RA TradeFiling/Result/ResultPresenter.m"
@@ -1572,7 +1572,7 @@
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
             uuid = "A3AD262D-0FBA-4CF8-9AF9-8B8AA88A0572"
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "RA TradeFiling/Result/ResultPresenter.m"
@@ -1584,5 +1584,165 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "DF8FE74B-E5B4-4AAD-A686-DD797B8723CE"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/Home/RAHomeHeaderView.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "339"
+            endingLineNumber = "339"
+            landmarkName = "-collectionheight"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "6B548C14-5D10-424B-A002-9BC538FA8E1F"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/Home/RAHomeViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "812"
+            endingLineNumber = "812"
+            landmarkName = "-loadData"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "00EF1C9B-EC8A-43DE-8D7C-9486C0DE119D"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/Home/RAHomeViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "897"
+            endingLineNumber = "897"
+            landmarkName = "-loadData"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "5C846591-1811-4694-8251-72E9A23E68DE"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/RASingleton.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "114"
+            endingLineNumber = "114"
+            landmarkName = "-login:password:firstName:companyList:functions:active:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "26EBACE9-934F-48E0-B3F0-FA7BFDACB7A5"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/Home/RAHomeViewController.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "315"
+            endingLineNumber = "315"
+            landmarkName = "-checkActivation"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "E2BA1C82-A1A0-457A-97E6-B6B281020A48"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/Home/RAHomeHeaderView.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "234"
+            endingLineNumber = "234"
+            landmarkName = "-loadUser"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "172DEC79-32C2-4DD7-916B-E9721114E6A0"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/Home/RAHomeHeaderView.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "229"
+            endingLineNumber = "229"
+            landmarkName = "-loadUser"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "E8563008-C8D5-4106-8536-68D1A98A073A"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/DataProvider/OnlineDataProvider.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "178"
+            endingLineNumber = "178"
+            landmarkName = "+prepare_additional_params:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "005B05BD-0D61-45AB-9D24-384C4D4640D1"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/DataProvider/OnlineDataProvider.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "251"
+            endingLineNumber = "251"
+            landmarkName = "+request_interface:parameters:err_record_url:completionHandler:retry:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "09BEEE4B-DE0A-4B13-A82F-B07EC129D761"
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "RA TradeFiling/DataProvider/OnlineDataProvider.m"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "246"
+            endingLineNumber = "246"
+            landmarkName = "+request_interface:parameters:err_record_url:completionHandler:retry:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

RA TradeFiling/RA TradeFiling/DataProvider/OnlineDataProvider.m

@@ -172,6 +172,16 @@
         params = [NSMutableDictionary dictionary];
     }
     
+    
+    
+    
+//    NSString *currentLanguageRegion = [[[NSUserDefaults standardUserDefaults] objectForKey:@"AppleLanguages"] firstObject];
+
+
+    NSString *preferredLanguage = [[[NSBundle mainBundle] preferredLocalizations] firstObject];
+    
+    [params setValue:preferredLanguage  forKey:@"language"];
+    
 //    AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
 //    if(appDelegate.user!=nil && params[@"user"] == nil)
 //        [params setValue:[AESCrypt AES128Encrypt:appDelegate.user key:@"Usai2010"] forKey:@"user"];
@@ -231,9 +241,14 @@
         if([resultjson[@"result"] intValue]==RESULT_LOGIN_ON_OTHER_DEVICE)
         {
 //            [RAUtils message_alert:@"User login on other device." title:@"Warrning" controller:nil];
-            
-            [RAUtils message_alert:@"User login on other device." title:@"Warrning" controller:[RAUtils getCurrentVC] action_handler:nil completion:^{
+            UIViewController* vc = [RAUtils getCurrentVC];
+            [RAUtils message_alert:@"User login on other device." title:@"Warrning" controller:vc action_handler:^(UIAlertAction * _Nonnull action) {
+                [vc.navigationController popToRootViewControllerAnimated:true];
                 [RASingleton.sharedInstance logout];
+                [[NSNotificationCenter defaultCenter] postNotificationName:RA_NOTIFICATION_LOGOUT object:nil];
+            } completion:^{
+                
+
                         }];
         }
         

RA TradeFiling/RA TradeFiling/Home/RAHomeHeaderView.m

@@ -225,7 +225,13 @@
 //    }
 //}
 -(void)loadUser{
-    self.labelWelcome.text = [NSString stringWithFormat:@"Welcome: %@",RASingleton.sharedInstance.firstName];
+    
+    NSString* welcome =nil;
+    if(RASingleton.sharedInstance.active)
+        welcome=[NSString stringWithFormat:@"Welcome: %@",RASingleton.sharedInstance.firstName];
+    else
+        welcome=[NSString stringWithFormat:@"Inactive User: %@",RASingleton.sharedInstance.firstName];
+    self.labelWelcome.text = welcome;
 }
 -(void)loadFunctions{
 //    NSString *docDir = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject];
@@ -328,6 +334,8 @@
 -(int ) collectionheight
 {
     int row=[self functionPanelRow];
+    if(row==0)
+        row=1;
     return  12+12+56*row+ 10*(row-1)+170-80+35;
 
 }

RA TradeFiling/RA TradeFiling/Home/RAHomeViewController.m

@@ -314,7 +314,7 @@
 {
     if(!RASingleton.sharedInstance.active)
     {
-        NSString * msg=@"Our customer service will contact you to assist you complete the user activation";
+        NSString * msg=@"Our customer service will contact you to assist you complete the user activation.";
         [RAUtils message_alert:msg title:@"Message" controller:self];
     }
 }

RA TradeFiling/RA TradeFiling/Localize/zh-Hans.lproj/Localizable.strings

@@ -6,3 +6,54 @@
   
  CN
 */
+"net_not_available"="Network connection is not available, please check.";
+"net_error"="Can not connect to the server, please try again later.";
+"auth_error"="Can not login, user or password may not correct.";
+"ver_low"="Current App version is too low, please update.";
+"about_appinfo" = "RA TradeFiling\n\nVersion:%@\nSupport:USAIRedAnt@united-us.net";
+"menuitem_setting"="Setting";
+"menuitem_savesearch"="Save Search";
+"save"="Save";
+"display_items"="Display items";
+"hide_items"="Hide items";
+"load_more"="Load more";
+"refresh"="Refresh";
+"no_more"="No more";
+"loading"="Loading...";
+"new_message" = "New message from RedAnt";
+"alert_title_error"="Warning";
+"alert_msg_upcanotempty"="User&Password can not be empty!";
+"alert_msg_customizefield"="At least keep one field visiable.";
+
+"alert_msg_uecanotempty"="User&Email can not be empty!";
+"ok"="Ok";
+"cancel"="Cancel";
+"clear"="Clear";
+"set"="Set";
+"alert_msg_fieldscanotempty"="Required fields can not be empty!";
+"attention"="Attention!";
+"alert_title_confirm_clear"="Are you sure to clear criterion?";
+"no"="No";
+"yes"="Yes";
+"select_val"="Select value";
+"alert_msg_failed_retrieve_password"="Failed to retrieve password code %d";
+"alert_title_retrieve_success"="Retrieve successfully!!";
+"alert_msg_email_sent"="Email has been sent.";
+"menuitem_showdetail"="Show Detail";
+"alert_title_create_tag"="Create a tag to save";
+"alert_msg_savehint"="You can find saved item at My->Save Log / Search";
+"close"="Close";
+"alert_msg_failed_change_password"="Failed to change password code %d";
+"alert_title_success"="Success!";
+"alert_msg_change_success"="Change password successful.";
+"alert_msg_password_notequal"="New password not equal confirm password!";
+"ask_click"="\nClick for more detail";
+"fields setting"="Setting";
+"menu"="Menu";
+"about_title"="RA TradeFiling";
+"about_ver_key"="Version:";
+"about_support_key"="Support:";
+"about_support_value"="USAIRedAnt@united-us.net";
+"search_document"="Search Document";
+"share_detail"="Share With Someone";
+"save_detail"="Save Log";

RA TradeFiling/RA TradeFiling/Login/LoginViewController.m

@@ -103,7 +103,7 @@
 //
 //            [defaults synchronize];
             
-            [RASingleton.sharedInstance login:self.editUser.text.lowercaseString password:self.editPassword.text firstName:result[@"nick_name"] companyList:result[@"company"] functions:result[@"function_panel"] active:result[@"active"]];
+            [RASingleton.sharedInstance login:self.editUser.text.lowercaseString password:self.editPassword.text firstName:result[@"nick_name"] companyList:result[@"company"] functions:result[@"function_panel"] active:[result[@"active"] boolValue]];
             RASingleton.sharedInstance.fields=result[@"fields"];
             
 //            RASingleton.sharedInstance.user=self.editUser.text.lowercaseString;

RA TradeFiling/RA TradeFiling/RASingleton.h

@@ -24,7 +24,7 @@ typedef enum {
 
 @property (nonatomic,copy,readonly) NSString *user;
 @property (nonatomic,copy,readonly) NSString *password;
-@property (nonatomic,assign) bool *active;
+@property (nonatomic,assign) bool active;
 @property (nonatomic,copy,readonly) NSArray *companylist;
 @property (nonatomic,assign) int companyid;
 //@property (nonatomic,strong) CLLocation *currentLocation;