Modified emanifest text compression method -- 修改emanifest 文字压缩方式 resolve: #80

Modify the saved detail text -- 修改 saved detail 文字 resolve: #79
Move the position of the function panel setting button -- 移动function panel setting 按钮位置 resolve: #78
Modify the 30-day statistics description -- 修改30天统计描述 resolve: #77
Move welcome position -- 移动welcome位置 resolve: #76

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 = "223"
-            endingLineNumber = "223"
+            startingLineNumber = "243"
+            endingLineNumber = "243"
             landmarkName = "-loadFunctions"
             landmarkType = "7">
          </BreakpointContent>
@@ -122,8 +122,8 @@
             filePath = "RA TradeFiling/Home/RAHomeViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "754"
-            endingLineNumber = "754"
+            startingLineNumber = "780"
+            endingLineNumber = "780"
             landmarkName = "-loadData"
             landmarkType = "7">
          </BreakpointContent>
@@ -234,8 +234,8 @@
             filePath = "RA TradeFiling/Home/RAHomeHeaderView.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "376"
-            endingLineNumber = "376"
+            startingLineNumber = "396"
+            endingLineNumber = "396"
             landmarkName = "-collectionView:didSelectItemAtIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -250,8 +250,8 @@
             filePath = "RA TradeFiling/Home/RAHomeViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1010"
-            endingLineNumber = "1010"
+            startingLineNumber = "1036"
+            endingLineNumber = "1036"
             landmarkName = "-showMoreOrderForSection:"
             landmarkType = "7">
          </BreakpointContent>
@@ -282,8 +282,8 @@
             filePath = "RA TradeFiling/Home/RAHomeViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "700"
-            endingLineNumber = "700"
+            startingLineNumber = "726"
+            endingLineNumber = "726"
             landmarkName = "-dashModelForIndexPath:"
             landmarkType = "7">
          </BreakpointContent>
@@ -906,8 +906,8 @@
             filePath = "RA TradeFiling/Home/RAHomeViewController.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "615"
-            endingLineNumber = "615"
+            startingLineNumber = "641"
+            endingLineNumber = "641"
             landmarkName = "-_updateUploadItem:withUploadCount:"
             landmarkType = "7">
          </BreakpointContent>
@@ -1194,8 +1194,8 @@
             filePath = "RA TradeFiling/Home/RAHomeHeaderView.m"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "60"
-            endingLineNumber = "60"
+            startingLineNumber = "77"
+            endingLineNumber = "77"
             landmarkName = "-onCompanyBtnClick:"
             landmarkType = "7">
          </BreakpointContent>

RA TradeFiling/RA TradeFiling/Detail/DetailTabBarController.m

@@ -193,7 +193,7 @@
         NSString* name = txt.text;
         if(name.length==0)
         {
-            [RAUtils message_alert:@"Name can not be empty." title:@"Save Detail" controller:weakSelf];
+            [RAUtils message_alert:@"Name can not be empty." title:@"Save Log" controller:weakSelf];
             return;
         }
         

RA TradeFiling/RA TradeFiling/Home/FunctionSettingViewController.m

@@ -19,6 +19,7 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
+    self.title = @"Function Panel Setting";
     
     [self loadFields];
     [self.tableView setEditing:true animated:true];

RA TradeFiling/RA TradeFiling/Home/HomeHeader.xib

@@ -63,18 +63,24 @@
             <point key="canvasLocation" x="205" y="421"/>
         </view>
         <view contentMode="scaleToFill" id="CmN-WL-UzN" customClass="RAHomeHeaderView">
-            <rect key="frame" x="0.0" y="0.0" width="658" height="180"/>
+            <rect key="frame" x="0.0" y="0.0" width="658" height="215"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="q6Y-ok-z0V">
-                    <rect key="frame" x="0.0" y="-860" width="658" height="1000"/>
+                    <rect key="frame" x="0.0" y="-825" width="658" height="1000"/>
                     <color key="backgroundColor" red="0.31186315860000002" green="0.73688559149999999" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="1000" id="fD7-Vn-lfh"/>
                     </constraints>
                 </view>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="Welcome" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HqW-Fu-IG2">
+                    <rect key="frame" x="293.5" y="8" width="71" height="21"/>
+                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                    <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                    <nil key="highlightedColor"/>
+                </label>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1xl-Et-Ukq">
-                    <rect key="frame" x="10" y="4" width="638" height="30"/>
+                    <rect key="frame" x="10" y="37" width="638" height="30"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="30" id="vBH-LF-yQh"/>
                     </constraints>
@@ -86,14 +92,14 @@
                         <action selector="onCompanyBtnClick:" destination="CmN-WL-UzN" eventType="touchUpInside" id="Qzw-cu-zcH"/>
                     </connections>
                 </button>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="This Month" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XWo-p4-U0J">
-                    <rect key="frame" x="13" y="42" width="632" height="45"/>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="In 30 Days" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XWo-p4-U0J">
+                    <rect key="frame" x="13" y="75" width="632" height="47"/>
                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                     <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kUV-Ds-Cp0">
-                    <rect key="frame" x="5" y="95" width="648" height="80"/>
+                    <rect key="frame" x="5" y="130" width="648" height="80"/>
                     <subviews>
                         <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="bzj-RG-u6W">
                             <rect key="frame" x="0.0" y="0.0" width="648" height="80"/>
@@ -134,10 +140,12 @@
                 <constraint firstItem="q6Y-ok-z0V" firstAttribute="leading" secondItem="IHY-tg-LLn" secondAttribute="leading" id="any-aM-O02"/>
                 <constraint firstItem="IHY-tg-LLn" firstAttribute="bottom" secondItem="q6Y-ok-z0V" secondAttribute="bottom" constant="40" id="gkh-x9-khp"/>
                 <constraint firstItem="IHY-tg-LLn" firstAttribute="bottom" secondItem="kUV-Ds-Cp0" secondAttribute="bottom" constant="5" id="hZr-Do-zh2"/>
-                <constraint firstItem="kUV-Ds-Cp0" firstAttribute="top" secondItem="IHY-tg-LLn" secondAttribute="top" constant="95" id="heL-3D-jmc"/>
-                <constraint firstItem="1xl-Et-Ukq" firstAttribute="top" secondItem="IHY-tg-LLn" secondAttribute="top" constant="4" id="lp8-xF-S6w"/>
+                <constraint firstItem="kUV-Ds-Cp0" firstAttribute="top" secondItem="IHY-tg-LLn" secondAttribute="top" constant="130" id="heL-3D-jmc"/>
+                <constraint firstItem="1xl-Et-Ukq" firstAttribute="top" secondItem="HqW-Fu-IG2" secondAttribute="bottom" constant="8" id="lp8-xF-S6w"/>
                 <constraint firstItem="XWo-p4-U0J" firstAttribute="top" secondItem="1xl-Et-Ukq" secondAttribute="bottom" constant="8" id="tIs-y1-MhJ"/>
+                <constraint firstItem="HqW-Fu-IG2" firstAttribute="centerX" secondItem="CmN-WL-UzN" secondAttribute="centerX" id="vN8-xP-hM8"/>
                 <constraint firstItem="kUV-Ds-Cp0" firstAttribute="top" secondItem="XWo-p4-U0J" secondAttribute="bottom" constant="8" id="x1C-fe-hhf"/>
+                <constraint firstItem="HqW-Fu-IG2" firstAttribute="top" secondItem="CmN-WL-UzN" secondAttribute="top" constant="8" id="zKE-LH-rxf"/>
             </constraints>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
@@ -145,6 +153,7 @@
                 <outlet property="btnCompany" destination="1xl-Et-Ukq" id="5cH-BE-spX"/>
                 <outlet property="buttonCollectionView" destination="bzj-RG-u6W" id="YDf-o4-c9k"/>
                 <outlet property="labelTotal" destination="XWo-p4-U0J" id="6Zi-6k-M1I"/>
+                <outlet property="labelWelcome" destination="HqW-Fu-IG2" id="bTh-jp-Gf7"/>
             </connections>
             <point key="canvasLocation" x="205" y="255.5"/>
         </view>

RA TradeFiling/RA TradeFiling/Home/RAHomeHeaderView.h

@@ -41,7 +41,7 @@
 
 + (instancetype)homeHeader;
 
-
+-(void) set_FunctionButtons:(NSMutableArray*)buttons;
 - (void)reloadUI;
 
 @end

RA TradeFiling/RA TradeFiling/Home/RAHomeHeaderView.m

@@ -23,10 +23,11 @@
    
 }
 @property (nonatomic,strong) NSMutableArray *functionButtons;
-@property (nonatomic,strong) IBOutlet UILabel *NewCountLabel;
-@property (nonatomic,strong) IBOutlet UILabel *ProcessingCountLabel;
-@property (nonatomic,strong) IBOutlet UILabel *FinishCountLabel;
+//@property (nonatomic,strong) IBOutlet UILabel *NewCountLabel;
+//@property (nonatomic,strong) IBOutlet UILabel *ProcessingCountLabel;
+//@property (nonatomic,strong) IBOutlet UILabel *FinishCountLabel;
 @property (nonatomic,strong) IBOutlet UIView *backgroundView;
+@property (weak, nonatomic) IBOutlet UILabel *labelWelcome;
 
 //@property (nonatomic,strong) IBOutlet UIButton *signoutBtn;
 //
@@ -46,6 +47,22 @@
 
 @implementation RAHomeHeaderView
 
+-(void) set_FunctionButtons:(NSMutableArray*)buttons
+{
+    self.functionButtons=buttons;
+    int height = [self collectionheight];
+
+
+
+   CGRect frame= self.frame;
+    frame.size.height=height;
+    self.frame = frame;
+    [self.buttonCollectionView reloadData];
+    if(self.onSetFunctions)
+        self.onSetFunctions();
+}
+
+
 + (instancetype)homeHeader {
     return [[[NSBundle mainBundle] loadNibNamed:@"HomeHeader" owner:nil options:nil] objectAtIndex:1];
 }
@@ -207,6 +224,9 @@
 //        [self.delegate finishedOrderClick:self.finishedCountView];
 //    }
 //}
+-(void)loadUser{
+    self.labelWelcome.text = [NSString stringWithFormat:@"Welcome: %@",RASingleton.sharedInstance.firstName];
+}
 -(void)loadFunctions{
 //    NSString *docDir = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) firstObject];
 //
@@ -230,7 +250,7 @@
     NSDictionary* dict = [NSJSONSerialization JSONObjectWithData:json options:NSJSONReadingMutableLeaves error:&error] ;
     
     self.functionButtons = [dict[@"active_functions"] mutableCopy];
-    [self.functionButtons addObject:@{@"name": @"...",@"icon": @"ic_more",@"type": @"panel_setting"}];
+//    [self.functionButtons addObject:@{@"name": @"...",@"icon": @"ic_more",@"type": @"panel_setting"}];
 }
 - (void)setupCollectionView {
     
@@ -308,7 +328,7 @@
 -(int ) collectionheight
 {
     int row=[self functionPanelRow];
-    return  12+12+56*row+ 10*(row-1)+170-80;
+    return  12+12+56*row+ 10*(row-1)+170-80+35;
 
 }
 -(int) functionPanelRow{
@@ -334,7 +354,7 @@
 //        self.parent
         ViewController.onSave = ^(NSArray* functions){
             self.functionButtons =[functions mutableCopy];
-            [self.functionButtons addObject:@{@"name": @"...",@"icon": @"ic_more",@"type": @"panel_setting"}];
+//            [self.functionButtons addObject:@{@"name": @"...",@"icon": @"ic_more",@"type": @"panel_setting"}];
             
         
             //+0.5);
@@ -388,6 +408,7 @@
 
 - (void)reloadUI
 {
+    [self loadUser];
     [self loadFunctions];
     [self setupCollectionView];
     [self.buttonCollectionView reloadData];

RA TradeFiling/RA TradeFiling/Home/RAHomeViewController.m

@@ -36,7 +36,7 @@
 #import "ResultCustomerModel.h"
 #import "ResultViewController.h"
 #import "HomeDashEmptyCell.h"
-
+#import "FunctionSettingViewController.h"
 #import "HomeDashISFCellP.h"
 #import "HomeDashISFModelP.h"
 #import "HomeDashACEM1CellP.h"
@@ -374,10 +374,10 @@
     
     // Header
     self.headerView = [RAHomeHeaderView homeHeader];
-    self.headerView.onSetFunctions=^(void)
-    {
-        [self.tableView reloadData];
-    };
+//    self.headerView.onSetFunctions=^(void)
+//    {
+//        [self.tableView reloadData];
+//    };
     self.headerView.onSetCompany=^(void)
     {
         [self loadData];
@@ -482,9 +482,12 @@
 //    logoItem.enabled = NO;
     self.tabBarController.navigationItem.leftBarButtonItem = logoItem;
     
-    UIBarButtonItem *welcomeItem =[[UIBarButtonItem alloc] initWithTitle:[NSString stringWithFormat:@"Welcome: %@",RASingleton.sharedInstance.firstName] menu:nil];
+//    UIBarButtonItem *welcomeItem =[[UIBarButtonItem alloc] initWithTitle:[NSString stringWithFormat:@"Welcome: %@",RASingleton.sharedInstance.firstName] menu:nil];
+    
+    UIBarButtonItem *functionSettingItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"ic_setting"] style:UIBarButtonItemStylePlain target:self action:@selector(settingClick:)];
+    
 //    welcomeItem.enabled = NO;
-    self.tabBarController.navigationItem.rightBarButtonItem =welcomeItem;
+    self.tabBarController.navigationItem.rightBarButtonItem =functionSettingItem;
     
     
     TFNavigationController* ranav= (TFNavigationController*)self.navigationController;
@@ -507,7 +510,30 @@
 //
 //    self.title = [NSString stringWithFormat:@"Welcome: %@",RASingleton.sharedInstance.firstName];
 }
-
+- (void)settingClick:(id)sender {
+    //        self.presenter.dirty = YES;
+
+    //        NSString *module_name = [self.params objectForKey:@"module_name"];
+            FunctionSettingViewController *ViewController = [[UIStoryboard storyboardWithName:@"Home" bundle:nil]
+                                                            instantiateViewControllerWithIdentifier:@"FunctionSettingViewController"];
+    //        ViewController.function_name = module_name;
+    //        ViewController.behavior = BEHAVIOR_RESULT;
+    //        ViewController.forNewResult = YES;
+    //        ViewController.maxDisplayCount = ResultMaxDispalyAdditionCount;
+
+    //        self.parent
+            ViewController.onSave = ^(NSArray* functions){
+                [self.headerView set_FunctionButtons:[functions mutableCopy]];
+//                self.functionButtons =[functions mutableCopy];
+//                [self.functionButtons addObject:@{@"name": @"...",@"icon": @"ic_more",@"type": @"panel_setting"}];
+
+                [self.tableView reloadData];
+                //+0.5);
+
+              
+            };
+            [self.navigationController pushViewController:ViewController animated:YES];
+        }
 - (void)registNotification {
     
     
@@ -783,7 +809,7 @@
                 
                 NSMutableDictionary* totaljson=json[@"total"];
                 
-                NSString* headertext = @"<center><font size=5 color=white><b>This Month</b>";
+                NSString* headertext = @"<center><font size=5 color=white><b>In 30 Days</b>";
 //                NSString * htmlString = headertext;
 //
 //                NSAttributedString * attrStr = [[NSAttributedString alloc] initWithData:[htmlString dataUsingEncoding:NSUnicodeStringEncoding] options:@{ NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType } documentAttributes:nil error:nil];
@@ -1058,13 +1084,13 @@
 - (void)signoutClick:(UIButton *)sender {
     [self logoutItemClick:nil];
 }
-
-- (void)settingClick:(UIButton *)sender {
-//    dispatch_async(dispatch_get_main_queue(), ^{
-//        RASettingViewController *settingVC = [RASettingViewController viewControllerFromStoryboard];
-//        [self.navigationController pushViewController:settingVC animated:YES];
-//    });
-}
+//
+//- (void)settingClick:(UIButton *)sender {
+////    dispatch_async(dispatch_get_main_queue(), ^{
+////        RASettingViewController *settingVC = [RASettingViewController viewControllerFromStoryboard];
+////        [self.navigationController pushViewController:settingVC animated:YES];
+////    });
+//}
 //
 //- (void)availableClick:(UIButton *)sender {
 //

RA TradeFiling/RA TradeFiling/Localize/en.lproj/Localizable.strings

@@ -42,7 +42,7 @@
 "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 Detail/Search";
+"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!";
@@ -57,4 +57,4 @@
 "about_support_value"="USAIRedAnt@united-us.net";
 "search_document"="Search Document";
 "share_detail"="Share With Someone";
-"save_detail"="Save Detail";
+"save_detail"="Save Log";

RA TradeFiling/RA TradeFiling/My/MylistViewController.m

@@ -89,7 +89,7 @@
     if([type isEqualToString:@"saved_detail"])
     {
         SavedDetailViewController *viewcontroller = [[UIStoryboard storyboardWithName:@"My" bundle:nil] instantiateViewControllerWithIdentifier:@"SavedDetailViewController"];
-        viewcontroller.title = @"Saved Detail";
+        viewcontroller.title = @"Saved Log";
         [self.navigationController pushViewController:viewcontroller animated:YES];
     }
     else if([type isEqualToString:@"saved_search"])

RA TradeFiling/RA TradeFiling/My/my.json

@@ -2,7 +2,7 @@
     "remark":"my菜单",
     "modelist": [
                  {
-                 "name": "Saved Detail",
+                 "name": "Saved Log",
                  "detail": "View saved detail information",
                  "icon": "mode_detail",
                  "type": "saved_detail"

RA TradeFiling/RA TradeFiling/Result/ResulteManifestCell.xib

@@ -74,7 +74,7 @@
                         <nil key="textColor"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="last action" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Plw-Uz-5qG">
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="last action" textAlignment="right" lineBreakMode="headTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Plw-Uz-5qG">
                         <rect key="frame" x="435.5" y="44" width="58.5" height="14.5"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                         <nil key="textColor"/>