My 菜单关联

Apex Mobile/Apex Mobile.xcodeproj/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -26,7 +26,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Apex Mobile/DetailPageViewController.m"
-            timestampString = "538976298.218757"
+            timestampString = "538990474.185914"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "544"
@@ -106,7 +106,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Apex Mobile/ToolslistViewController.m"
-            timestampString = "538976298.219445"
+            timestampString = "538990474.1862431"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "76"
@@ -122,7 +122,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Apex Mobile/ToolslistViewController.m"
-            timestampString = "538976298.219702"
+            timestampString = "538990474.186319"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "113"
@@ -131,5 +131,21 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Apex Mobile/SearchlistViewController.m"
+            timestampString = "538990474.18641"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "93"
+            endingLineNumber = "93"
+            landmarkName = "-PerformAction:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

Apex Mobile/Apex Mobile/Main.storyboard

@@ -1018,6 +1018,92 @@
             </objects>
             <point key="canvasLocation" x="4721" y="-329"/>
         </scene>
+        <!--Change password-->
+        <scene sceneID="rLy-3n-3Of">
+            <objects>
+                <viewController storyboardIdentifier="ChangePassword" useStoryboardIdentifierAsRestorationIdentifier="YES" id="adW-Ar-52t" customClass="ChangePasswordViewController" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="OyU-Fh-lP6"/>
+                        <viewControllerLayoutGuide type="bottom" id="oJN-0J-fi0"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="XVG-tV-s5j">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Old password *required" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="XR8-ML-teu">
+                                <rect key="frame" x="21" y="77" width="280" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <inset key="insetFor6xAndEarlier" minX="0.0" minY="60" maxX="0.0" maxY="-60"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <textInputTraits key="textInputTraits" returnKeyType="done" secureTextEntry="YES"/>
+                                <connections>
+                                    <outlet property="delegate" destination="adW-Ar-52t" id="8j3-wI-PrU"/>
+                                </connections>
+                            </textField>
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="New password *required" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="oiA-1a-FH6">
+                                <rect key="frame" x="21" y="115" width="280" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <inset key="insetFor6xAndEarlier" minX="0.0" minY="60" maxX="0.0" maxY="-60"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <textInputTraits key="textInputTraits" returnKeyType="done" secureTextEntry="YES"/>
+                                <connections>
+                                    <outlet property="delegate" destination="adW-Ar-52t" id="6Ug-bV-qAI"/>
+                                </connections>
+                            </textField>
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Confirm new password *required" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="x3N-fn-QfS">
+                                <rect key="frame" x="21" y="153" width="280" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <inset key="insetFor6xAndEarlier" minX="0.0" minY="60" maxX="0.0" maxY="-60"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <textInputTraits key="textInputTraits" returnKeyType="done" secureTextEntry="YES"/>
+                                <connections>
+                                    <outlet property="delegate" destination="adW-Ar-52t" id="Fhr-0F-cwc"/>
+                                </connections>
+                            </textField>
+                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gUy-8S-kFU">
+                                <rect key="frame" x="21" y="272" width="48" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <state key="normal" title="Cancel">
+                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                </state>
+                                <connections>
+                                    <action selector="onCancel:" destination="adW-Ar-52t" eventType="touchUpInside" id="bo5-sE-1dQ"/>
+                                </connections>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EZm-dC-lQ4">
+                                <rect key="frame" x="302" y="191" width="54" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                                <inset key="insetFor6xAndEarlier" minX="0.0" minY="60" maxX="0.0" maxY="-60"/>
+                                <state key="normal" title="Change">
+                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                </state>
+                                <connections>
+                                    <action selector="onChange:" destination="adW-Ar-52t" eventType="touchUpInside" id="Dd1-AG-iYq"/>
+                                </connections>
+                            </button>
+                            <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="hjm-ij-Anz">
+                                <rect key="frame" x="142" y="266" width="37" height="37"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <inset key="insetFor6xAndEarlier" minX="0.0" minY="60" maxX="0.0" maxY="-60"/>
+                                <color key="color" red="0.40000000600000002" green="0.80000001190000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            </activityIndicatorView>
+                        </subviews>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    </view>
+                    <navigationItem key="navigationItem" title="Change password" id="1o1-l5-SjW"/>
+                    <connections>
+                        <outlet property="btnCancel" destination="gUy-8S-kFU" id="Mfu-t4-a0j"/>
+                        <outlet property="btnChange" destination="EZm-dC-lQ4" id="94R-cP-whc"/>
+                        <outlet property="editConfirm" destination="x3N-fn-QfS" id="AKW-Ng-3L5"/>
+                        <outlet property="editNew" destination="oiA-1a-FH6" id="egi-Gq-E9m"/>
+                        <outlet property="editOld" destination="XR8-ML-teu" id="Fxk-UG-gU9"/>
+                        <outlet property="mum" destination="hjm-ij-Anz" id="dVv-d1-IXi"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Yff-OS-eqV" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="5482" y="-330"/>
+        </scene>
     </scenes>
     <resources>
         <image name="apexlogo-2" width="129" height="32"/>

Apex Mobile/Apex Mobile/MylistViewController.h

@@ -9,5 +9,5 @@
 #import "StaticModelistViewController.h"
 
 @interface MylistViewController : StaticModelistViewController
-
+@property (nonatomic , copy) void (^logoutSuccessful)(void);
 @end

Apex Mobile/Apex Mobile/MylistViewController.m

@@ -7,6 +7,12 @@
 //
 
 #import "MylistViewController.h"
+#import "FavoritesViewController.h"
+#import "HistoryViewController.h"
+#import "LocalDocumentsViewController.h"
+#import "MessageViewController.h"
+#import "ChangePasswordViewController.h"
+
 
 @interface MylistViewController ()
 
@@ -74,6 +80,53 @@
     
     //    NSAssert(true, ([NSString stringWithFormat:@"%s LoadModelist not impl",object_getClassName([self class])]));
 }
+
+-(void)PerformAction:(NSString*) type
+{
+    
+    if([type isEqualToString:@"saved_detail"])
+    {
+        FavoritesViewController *viewcontroller = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"FavoritesViewController"];
+        [self.navigationController pushViewController:viewcontroller animated:YES];
+    }
+    else if([type isEqualToString:@"saved_search"])
+    {
+        HistoryViewController *viewcontroller = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"HistoryViewController"];
+        [self.navigationController pushViewController:viewcontroller animated:YES];
+    }
+    else if([type isEqualToString:@"saved_document"])
+    {
+        LocalDocumentsViewController *viewcontroller=[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"LocalDocumentsViewController"];
+        //        viewcontroller.module_name = @"Announcements";
+        [self.navigationController pushViewController:viewcontroller animated:YES];
+    }
+    else if([type isEqualToString:@"message"])
+    {
+        MessageViewController *viewcontroller=[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"MessageViewController"];
+        //        viewcontroller.module_name = @"Announcements";
+        [self.navigationController pushViewController:viewcontroller animated:YES];
+        
+    }
+    
+    else if([type isEqualToString:@"change_password"])
+    {
+
+        ChangePasswordViewController *viewcontroller=[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"ChangePassword"];
+        //        newsview.module_name = @"Market news";
+        [self.navigationController pushViewController:viewcontroller animated:YES];
+    }
+    else if([type isEqualToString:@"logout"])
+    {
+
+        
+        ApexMobileAppDelegate *appDelegate = [[UIApplication sharedApplication] delegate];
+        [appDelegate Logout];
+        if(self.logoutSuccessful)
+            self.logoutSuccessful();
+        //[self performSegueWithIdentifier:@"LOGIN" sender:self];
+    }
+    
+}
 /*
 #pragma mark - Navigation
 

Apex Mobile/Apex Mobile/RootViewController.m

@@ -47,6 +47,12 @@
     SearchlistViewController* searchVC = [[SearchlistViewController alloc] initWithNibName:@"StaticModelistViewController" bundle:nil];
     //[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"SearchPanel"];
     MylistViewController* myVC = [[MylistViewController alloc] initWithNibName:@"StaticModelistViewController" bundle:nil];
+    
+    myVC.logoutSuccessful = ^(void)
+    {
+        // 登陆成功后重新刷新tabbar
+        self.viewControllers = self.logoutbar;
+    };
     //[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"MyPanel"];
     OrderHistoryViewController* historyVC = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"HistoryPanel"];
 //    toolVC.tabBarItem =  [self itemWithSelectedImage:@"tools" image:@"tools" title:@"tools"];

Apex Mobile/Apex Mobile/SearchlistViewController.m

@@ -90,7 +90,7 @@ function_name = @"Ocean Booking";
     {
          function_name = @"Ocean B/L info.";
     }
-    else if([type isEqualToString:@"container"])
+    else if([type isEqualToString:@"container_detail"])
     {
           function_name = @"Container detail";
     }

Apex Mobile/Apex Mobile/my.json

@@ -5,37 +5,37 @@
                  "name": "Saved Detail",
                  "detail": "View saved detail information",
                  "icon": "mode_detail",
-                 "type": "market news"
+                 "type": "saved_detail"
                  },
                  {
                  "name": "Saved Search",
                  "detail": "View saved search criteria",
                  "icon": "mode_search",
-                 "type": "market news"
+                 "type": "saved_search"
                  },
                  {
                  "name": "Saved Documents",
                  "detail": "Documents you have downloaded",
                  "icon": "mode_document",
-                 "type": "market news"
+                 "type": "saved_document"
                  },
                  {
                  "name": "Message",
                  "detail": "Notifacation message",
                  "icon": "mode_message",
-                 "type": "market news"
+                 "type": "message"
                  },
                  {
                  "name": "Change Password",
                  "detail": "Update login password",
                  "icon": "mode_change_password",
-                 "type": "market news"
+                 "type": "change_password"
                  },
                  {
                  "name": "Logout",
                  "detail": "Sign out",
                  "icon": "mode_logout",
-                 "type": "market news"
+                 "type": "logout"
                  }
                  ],
     "title": "My",

RedAnt ERP Mobile/RedAnt ERP Mobile.xcworkspace/xcuserdata/Ray.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -10,7 +10,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/HomerModelDetailHeaderCell.m"
-            timestampString = "538624150.626388"
+            timestampString = "538984709.337212"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "383"
@@ -26,7 +26,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/HomerModelDetailHeaderCell.m"
-            timestampString = "538624150.62699"
+            timestampString = "538984709.340925"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "114"
@@ -74,7 +74,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/HomerModelDetailHeaderCell.m"
-            timestampString = "538624150.627551"
+            timestampString = "538984709.341668"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "96"
@@ -90,7 +90,7 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "common/Functions/modelDetail/HomerModelDetailHeaderCell.m"
-            timestampString = "538624150.627978"
+            timestampString = "538984709.342626"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "152"
@@ -193,6 +193,38 @@
             endingLineNumber = "1998"
             landmarkName = "-collectionView:didSelectItemAtIndexPath:"
             landmarkType = "7">
+            <Locations>
+               <Location
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[ItemSearchViewController collectionView:didSelectItemAtIndexPath:]"
+                  moduleName = "Homer App"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/ray/Documents/CODE_ERPSuiteIOS/RedAnt%20ERP%20Mobile/common/Functions/search+itemsearch/ItemSearchViewController.m"
+                  timestampString = "538984710.464723"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1999"
+                  endingLineNumber = "1999"
+                  offsetFromSymbolStart = "1544">
+               </Location>
+               <Location
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "-[ItemSearchViewController collectionView:didSelectItemAtIndexPath:]"
+                  moduleName = "Homer App"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Users/ray/Documents/CODE_ERPSuiteIOS/RedAnt%20ERP%20Mobile/common/Functions/search+itemsearch/ItemSearchViewController.m"
+                  timestampString = "538984710.4687231"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1999"
+                  endingLineNumber = "1999"
+                  offsetFromSymbolStart = "1552">
+               </Location>
+            </Locations>
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy